Browse code

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

Victor Seva authored on 25/09/2019 08:08:05
Showing 10 changed files
... ...
@@ -25,9 +25,6 @@ sed -i -e '/^export JAVA_HOME/d' ${DIST}/rules
25 25
 sed -i -e 's/ java[ ,$]*/ /' ${DIST}/rules
26 26
 sed -i -e '/^EXCLUDED_MODULES=/s/$/ java/' ${DIST}/rules
27 27
 
28
-# libssl1.0-dev conflicts with libcurl4-openssl-dev dependencies
29
-sed -i -e 's/libssl-dev (<<1.1)/libssl-dev/' ${DIST}/control
30
-
31 28
 wrap-and-sort -sat -d ${DIST}
32 29
 
33 30
 # clean backports scripts
... ...
@@ -25,9 +25,6 @@ sed -i -e '/^export JAVA_HOME/d' ${DIST}/rules
25 25
 sed -i -e 's/ java[ ,$]*/ /' ${DIST}/rules
26 26
 sed -i -e '/^EXCLUDED_MODULES=/s/$/ java/' ${DIST}/rules
27 27
 
28
-# no libssl-dev 1.0
29
-sed -i -e 's/libssl-dev (<<1.1)/libssl-dev/' ${DIST}/control
30
-
31 28
 wrap-and-sort -sat -d ${DIST}
32 29
 
33 30
 # clean backports scripts
... ...
@@ -24,9 +24,6 @@ echo "kamailio source: build-depends-on-obsolete-package build-depends: libmysql
24 24
 echo "kamailio-mysql-modules: depends-on-obsolete-package depends: mysql-client => default-mysql-client" >> \
25 25
 	${DIST}/kamailio-mysql-modules.lintian-overrides
26 26
 
27
-# no libssl-dev
28
-sed -i -e '/libssl-dev/d' ${DIST}/control
29
-
30 27
 # No geoip2 module
31 28
 sed -i -e '/libmaxminddb-dev/d' -e '/^Package: kamailio-geoip2-modules/,/^$/d' \
32 29
 	${DIST}/control
... ...
@@ -25,9 +25,6 @@ sed -i -e '/^export JAVA_HOME/d' ${DIST}/rules
25 25
 sed -i -e 's/ java[ ,$]*/ /' ${DIST}/rules
26 26
 sed -i -e '/^EXCLUDED_MODULES=/s/$/ java/' ${DIST}/rules
27 27
 
28
-# no libssl-dev 1.0
29
-sed -i -e 's/libssl-dev (<<1.1)/libssl-dev/' ${DIST}/control
30
-
31 28
 wrap-and-sort -sat -d ${DIST}
32 29
 
33 30
 # clean backports scripts
... ...
@@ -22,9 +22,6 @@ sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ dnssec/' ${DIST}/rules
22 22
 sed -i 's/libmongoc-dev/libbson-dev,\n libmongoc-dev/' \
23 23
 	${DIST}/control
24 24
 
25
-# use libssl1.0-dev
26
-sed -i -e 's/libssl-dev (<<1.1)/libssl1.0-dev/' ${DIST}/control
27
-
28 25
 wrap-and-sort -sat -d ${DIST}
29 26
 
30 27
 # clean backports scripts
... ...
@@ -17,9 +17,6 @@ echo "kamailio source: build-depends-on-obsolete-package build-depends: libmysql
17 17
 echo "kamailio-mysql-modules: depends-on-obsolete-package depends: mysql-client => default-mysql-client" >> \
18 18
 	${DIST}/kamailio-mysql-modules.lintian-overrides
19 19
 
20
-# no libssl-dev
21
-sed -i -e '/libssl-dev/d' ${DIST}/control
22
-
23 20
 # geocoding not in libphonenumber
24 21
 sed -i 's/libphonenumber-dev/libgeocoding-dev \(>= 7\),\n libphonenumber-dev/' \
25 22
 	${DIST}/control
... ...
@@ -43,7 +43,7 @@ Build-Depends:
43 43
  libsctp-dev,
44 44
  libsnmp-dev,
45 45
  libsqlite3-dev,
46
- libssl-dev (<<1.1),
46
+ libssl-dev,
47 47
  libsystemd-dev,
48 48
  libunistring-dev,
49 49
  libval-dev,
... ...
@@ -40,6 +40,7 @@ Build-Depends:
40 40
  libsctp-dev,
41 41
  libsnmp-dev,
42 42
  libsqlite3-dev,
43
+ libssl-dev,
43 44
  libsystemd-dev,
44 45
  libunistring-dev,
45 46
  libval-dev,
... ...
@@ -44,7 +44,7 @@ Build-Depends:
44 44
  libsctp-dev,
45 45
  libsnmp-dev,
46 46
  libsqlite3-dev,
47
- libssl1.0-dev,
47
+ libssl-dev,
48 48
  libsystemd-dev,
49 49
  libunistring-dev,
50 50
  libxml2-dev,
... ...
@@ -45,6 +45,7 @@ Build-Depends:
45 45
  libsctp-dev,
46 46
  libsnmp-dev,
47 47
  libsqlite3-dev,
48
+ libssl-dev,
48 49
  libsystemd-dev,
49 50
  libunistring-dev,
50 51
  libval-dev,