[sr-dev] git:master:6ed93bc8: pkg/kamailio/deb: bionic can't use libssl1.0-dev due conflicts with libcurl4-openssl-dev dependencies

Module: kamailio Branch: master Commit: 6ed93bc8b3fdaa0919ad4aa427cb99891eadbdd2 URL: https://github.com/kamailio/kamailio/commit/6ed93bc8b3fdaa0919ad4aa427cb998… Author: Victor Seva &lt;linuxmaniac(a)torreviejawireless.org&gt; Committer: Victor Seva &lt;linuxmaniac(a)torreviejawireless.org&gt; Date: 2019-04-12T14:52:55+02:00 pkg/kamailio/deb: bionic can't use libssl1.0-dev due conflicts with libcurl4-openssl-dev dependencies --- Modified: pkg/kamailio/deb/bionic/control Modified: pkg/kamailio/deb/debian/backports/bionic Modified: pkg/kamailio/deb/debian/backports/buster Modified: pkg/kamailio/deb/debian/backports/sid Modified: pkg/kamailio/deb/debian/backports/stretch Modified: pkg/kamailio/deb/debian/control --- Diff: https://github.com/kamailio/kamailio/commit/6ed93bc8b3fdaa0919ad4aa427cb998… Patch: https://github.com/kamailio/kamailio/commit/6ed93bc8b3fdaa0919ad4aa427cb998… --- diff --git a/pkg/kamailio/deb/bionic/control b/pkg/kamailio/deb/bionic/control index b38ce443c7..338568ab73 100644 --- a/pkg/kamailio/deb/bionic/control +++ b/pkg/kamailio/deb/bionic/control @@ -42,7 +42,7 @@ Build-Depends: libsctp-dev, libsnmp-dev, libsqlite3-dev, - libssl1.0-dev, + libssl-dev, libsystemd-dev, libunistring-dev, libxml2-dev, diff --git a/pkg/kamailio/deb/debian/backports/bionic b/pkg/kamailio/deb/debian/backports/bionic index d0848153b3..8512ae421f 100755 --- a/pkg/kamailio/deb/debian/backports/bionic +++ b/pkg/kamailio/deb/debian/backports/bionic @@ -25,8 +25,8 @@ 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 -# use libssl1.0-dev -sed -i -e 's/libssl-dev (<1.1)/libssl1.0-dev/' ${DIST}/control +# 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} diff --git a/pkg/kamailio/deb/debian/backports/buster b/pkg/kamailio/deb/debian/backports/buster index 969909e4d9..a4c4473827 100755 --- a/pkg/kamailio/deb/debian/backports/buster +++ b/pkg/kamailio/deb/debian/backports/buster @@ -26,7 +26,7 @@ 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 +sed -i -e 's/libssl-dev (<<1.1)/libssl-dev/' ${DIST}/control wrap-and-sort -sat -d ${DIST} diff --git a/pkg/kamailio/deb/debian/backports/sid b/pkg/kamailio/deb/debian/backports/sid index 9e7d792173..6b1c5d4eac 100755 --- a/pkg/kamailio/deb/debian/backports/sid +++ b/pkg/kamailio/deb/debian/backports/sid @@ -26,7 +26,7 @@ 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 +sed -i -e 's/libssl-dev (<<1.1)/libssl-dev/' ${DIST}/control wrap-and-sort -sat -d ${DIST} diff --git a/pkg/kamailio/deb/debian/backports/stretch b/pkg/kamailio/deb/debian/backports/stretch index 05a4705f87..0f9780acf0 100755 --- a/pkg/kamailio/deb/debian/backports/stretch +++ b/pkg/kamailio/deb/debian/backports/stretch @@ -23,7 +23,7 @@ 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 +sed -i -e 's/libssl-dev (<<1.1)/libssl1.0-dev/' ${DIST}/control wrap-and-sort -sat -d ${DIST} diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control index 7581509dca..ffe8437181 100644 --- a/pkg/kamailio/deb/debian/control +++ b/pkg/kamailio/deb/debian/control @@ -43,7 +43,7 @@ Build-Depends: libsctp-dev, libsnmp-dev, libsqlite3-dev, - libssl-dev (<1.1), + libssl-dev (<<1.1), libsystemd-dev, libunistring-dev, libval-dev,