Browse Source

pkg/kamailio/deb: switch back to libssl-dev 1.1 where available

Victor Seva 6 năm trước cách đây
mục cha
commit
f31f0814fa

+ 0 - 3
pkg/kamailio/deb/debian/backports/bionic

@@ -25,9 +25,6 @@ sed -i -e '/^export JAVA_HOME/d' ${DIST}/rules
 sed -i -e 's/ java[ ,$]*/ /' ${DIST}/rules
 sed -i -e '/^EXCLUDED_MODULES=/s/$/ java/' ${DIST}/rules
 
-# libssl1.0-dev conflicts with libcurl4-openssl-dev dependencies
-sed -i -e 's/libssl-dev (<<1.1)/libssl-dev/' ${DIST}/control
-
 wrap-and-sort -sat -d ${DIST}
 
 # clean backports scripts

+ 0 - 3
pkg/kamailio/deb/debian/backports/buster

@@ -25,9 +25,6 @@ sed -i -e '/^export JAVA_HOME/d' ${DIST}/rules
 sed -i -e 's/ java[ ,$]*/ /' ${DIST}/rules
 sed -i -e '/^EXCLUDED_MODULES=/s/$/ java/' ${DIST}/rules
 
-# no libssl-dev 1.0
-sed -i -e 's/libssl-dev (<<1.1)/libssl-dev/' ${DIST}/control
-
 wrap-and-sort -sat -d ${DIST}
 
 # clean backports scripts

+ 0 - 3
pkg/kamailio/deb/debian/backports/jessie

@@ -24,9 +24,6 @@ echo "kamailio source: build-depends-on-obsolete-package build-depends: libmysql
 echo "kamailio-mysql-modules: depends-on-obsolete-package depends: mysql-client => default-mysql-client" >> \
 	${DIST}/kamailio-mysql-modules.lintian-overrides
 
-# no libssl-dev
-sed -i -e '/libssl-dev/d' ${DIST}/control
-
 # No geoip2 module
 sed -i -e '/libmaxminddb-dev/d' -e '/^Package: kamailio-geoip2-modules/,/^$/d' \
 	${DIST}/control

+ 0 - 3
pkg/kamailio/deb/debian/backports/sid

@@ -25,9 +25,6 @@ sed -i -e '/^export JAVA_HOME/d' ${DIST}/rules
 sed -i -e 's/ java[ ,$]*/ /' ${DIST}/rules
 sed -i -e '/^EXCLUDED_MODULES=/s/$/ java/' ${DIST}/rules
 
-# no libssl-dev 1.0
-sed -i -e 's/libssl-dev (<<1.1)/libssl-dev/' ${DIST}/control
-
 wrap-and-sort -sat -d ${DIST}
 
 # clean backports scripts

+ 0 - 3
pkg/kamailio/deb/debian/backports/stretch

@@ -22,9 +22,6 @@ sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ dnssec/' ${DIST}/rules
 sed -i 's/libmongoc-dev/libbson-dev,\n libmongoc-dev/' \
 	${DIST}/control
 
-# use libssl1.0-dev
-sed -i -e 's/libssl-dev (<<1.1)/libssl1.0-dev/' ${DIST}/control
-
 wrap-and-sort -sat -d ${DIST}
 
 # clean backports scripts

+ 0 - 3
pkg/kamailio/deb/debian/backports/xenial

@@ -17,9 +17,6 @@ echo "kamailio source: build-depends-on-obsolete-package build-depends: libmysql
 echo "kamailio-mysql-modules: depends-on-obsolete-package depends: mysql-client => default-mysql-client" >> \
 	${DIST}/kamailio-mysql-modules.lintian-overrides
 
-# no libssl-dev
-sed -i -e '/libssl-dev/d' ${DIST}/control
-
 # geocoding not in libphonenumber
 sed -i 's/libphonenumber-dev/libgeocoding-dev \(>= 7\),\n libphonenumber-dev/' \
 	${DIST}/control

+ 1 - 1
pkg/kamailio/deb/debian/control

@@ -43,7 +43,7 @@ Build-Depends:
  libsctp-dev,
  libsnmp-dev,
  libsqlite3-dev,
- libssl-dev (<<1.1),
+ libssl-dev,
  libsystemd-dev,
  libunistring-dev,
  libval-dev,

+ 1 - 0
pkg/kamailio/deb/jessie/control

@@ -40,6 +40,7 @@ Build-Depends:
  libsctp-dev,
  libsnmp-dev,
  libsqlite3-dev,
+ libssl-dev,
  libsystemd-dev,
  libunistring-dev,
  libval-dev,

+ 1 - 1
pkg/kamailio/deb/stretch/control

@@ -44,7 +44,7 @@ Build-Depends:
  libsctp-dev,
  libsnmp-dev,
  libsqlite3-dev,
- libssl1.0-dev,
+ libssl-dev,
  libsystemd-dev,
  libunistring-dev,
  libxml2-dev,

+ 1 - 0
pkg/kamailio/deb/xenial/control

@@ -45,6 +45,7 @@ Build-Depends:
  libsctp-dev,
  libsnmp-dev,
  libsqlite3-dev,
+ libssl-dev,
  libsystemd-dev,
  libunistring-dev,
  libval-dev,