pkg/kamailio/deb: remove dnssec from stretch/sid due #851

kamailio · Jan 30, 2017 · 02cca18 · 02cca18
1 parent 4d12867
commit 02cca18
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 34 deletions.
diff --git a/pkg/kamailio/deb/debian/backports/sid b/pkg/kamailio/deb/debian/backports/sid
@@ -14,6 +14,12 @@ sed -i -e '/libxmlrpc-c3-dev/d' -e '/^Package: kamailio-xmlrpc-modules/,/^$/d' \
 sed -i -e 's/ mi_xmlrpc[ ,$]*/ /' ${DIST}/rules
 sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ mi_xmlrpc/' ${DIST}/rules
 
+# No dnssec module:
+sed -i -e '/libval-dev/d' -e '/^Package: kamailio-dnssec-modules/,/^$/d' \
+  ${DIST}/control
+sed -i -e 's/ dnssec[ ,$]*/ /' ${DIST}/rules
+sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ dnssec/' ${DIST}/rules
+
 # clean backports scripts
 rm -rf ${DIST}/backports
 exit 0
diff --git a/pkg/kamailio/deb/debian/backports/stretch b/pkg/kamailio/deb/debian/backports/stretch
@@ -14,6 +14,12 @@ sed -i -e '/libxmlrpc-c3-dev/d' -e '/^Package: kamailio-xmlrpc-modules/,/^$/d' \
 sed -i -e 's/ mi_xmlrpc[ ,$]*/ /' ${DIST}/rules
 sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ mi_xmlrpc/' ${DIST}/rules
 
+# No dnssec module:
+sed -i -e '/libval-dev/d' -e '/^Package: kamailio-dnssec-modules/,/^$/d' \
+  ${DIST}/control
+sed -i -e 's/ dnssec[ ,$]*/ /' ${DIST}/rules
+sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ dnssec/' ${DIST}/rules
+
 # clean backports scripts
 rm -rf ${DIST}/backports
 exit 0
diff --git a/pkg/kamailio/deb/sid/control b/pkg/kamailio/deb/sid/control
@@ -40,7 +40,6 @@ Build-Depends: bison,
                libsqlite3-dev,
                libsystemd-dev,
                libunistring-dev,
-               libval-dev,
                libxml2-dev,
                openssl,
                pkg-config,
@@ -554,20 +553,6 @@ Description: Websocket module for kamailio
  .
  This package contains the module implementing WebSocket transport layer.
 
-Package: kamailio-dnssec-modules
-Architecture: linux-any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: kamailio (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Description: contains the dnssec module
- Kamailio is a very fast and flexible SIP (RFC3261)
- proxy server. Written entirely in C, Kamailio can handle thousands calls
- per second even on low-budget hardware.
- .
- This package provides the dnssec module for Kamailio.
-
 Package: kamailio-autheph-modules
 Architecture: linux-any
 Multi-Arch: same

diff --git a/pkg/kamailio/deb/sid/rules b/pkg/kamailio/deb/sid/rules
@@ -27,7 +27,7 @@ EXCLUDED_MODULES=
 # extra modules to skip, because they are not compilable now
 # - regardless if they go to the main kamailio package or to some module package,
 # they will be excluded from compile and install of all
-EXTRA_EXCLUDED_MODULES=bdb dbtext oracle pa iptrtpproxy mi_xmlrpc
+EXTRA_EXCLUDED_MODULES=bdb dbtext oracle pa iptrtpproxy mi_xmlrpc dnssec
 
 # module groups that are packaged in seperate packages
 # (with the name kamailio-$(group_name)-modules)
@@ -37,7 +37,7 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \
 			   ldap xml perl utils lua memcached \
 			   snmpstats carrierroute xmpp cpl redis python geoip\
 			   sqlite json mono ims sctp java \
-			   tls outbound websocket autheph dnssec kazoo cnxcc \
+			   tls outbound websocket autheph kazoo cnxcc \
 			   erlang systemd
 
 # module groups to be packaged onto kamailio-extra-modules

diff --git a/pkg/kamailio/deb/stretch/control b/pkg/kamailio/deb/stretch/control
@@ -40,7 +40,6 @@ Build-Depends: bison,
                libsqlite3-dev,
                libsystemd-dev,
                libunistring-dev,
-               libval-dev,
                libxml2-dev,
                openssl,
                pkg-config,
@@ -554,20 +553,6 @@ Description: Websocket module for kamailio
  .
  This package contains the module implementing WebSocket transport layer.
 
-Package: kamailio-dnssec-modules
-Architecture: linux-any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: kamailio (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Description: contains the dnssec module
- Kamailio is a very fast and flexible SIP (RFC3261)
- proxy server. Written entirely in C, Kamailio can handle thousands calls
- per second even on low-budget hardware.
- .
- This package provides the dnssec module for Kamailio.
-
 Package: kamailio-autheph-modules
 Architecture: linux-any
 Multi-Arch: same

diff --git a/pkg/kamailio/deb/stretch/rules b/pkg/kamailio/deb/stretch/rules
@@ -27,7 +27,7 @@ EXCLUDED_MODULES=
 # extra modules to skip, because they are not compilable now
 # - regardless if they go to the main kamailio package or to some module package,
 # they will be excluded from compile and install of all
-EXTRA_EXCLUDED_MODULES=bdb dbtext oracle pa iptrtpproxy mi_xmlrpc
+EXTRA_EXCLUDED_MODULES=bdb dbtext oracle pa iptrtpproxy mi_xmlrpc dnssec
 
 # module groups that are packaged in seperate packages
 # (with the name kamailio-$(group_name)-modules)
@@ -37,7 +37,7 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \
 			   ldap xml perl utils lua memcached \
 			   snmpstats carrierroute xmpp cpl redis python geoip\
 			   sqlite json mono ims sctp java \
-			   tls outbound websocket autheph dnssec kazoo cnxcc \
+			   tls outbound websocket autheph kazoo cnxcc \
 			   erlang systemd
 
 # module groups to be packaged onto kamailio-extra-modules