2
0
Эх сурвалжийг харах

pkg/kamailio/deb: restore tls_wolfssl for bookworm and jammy

fixed build error at 43ec11a7e0a37dfdaead873d555b26cb65589bd1
Victor Seva 1 жил өмнө
parent
commit
247e6164cb

+ 18 - 0
pkg/kamailio/deb/bookworm/control

@@ -48,6 +48,7 @@ Build-Depends:
  libsystemd-dev,
  libunistring-dev,
  libwebsockets-dev,
+ libwolfssl-dev,
  libxml2-dev,
  openssl,
  pkg-config,
@@ -619,6 +620,23 @@ Description: TLS support for the Kamailio SIP server (authentication, transport)
  This package provides TLS support for encrypted and authenticated
  SIP connections as well as generic TLS support for many Kamailio modules.
 
+Package: kamailio-wolftls-modules
+Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ kamailio (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Description: TLS support for the Kamailio SIP server (authentication, transport)
+ Kamailio is a very fast and flexible SIP (RFC3261)
+ server. Written entirely in C, Kamailio can handle thousands calls
+ per second even on low-budget hardware.
+ .
+ This package provides TLS support for encrypted and authenticated using wolfssl
+ SIP connections as well as generic TLS support for many Kamailio modules.
+
 Package: kamailio-outbound-modules
 Architecture: any
 Multi-Arch: same

+ 1 - 1
pkg/kamailio/deb/bookworm/rules

@@ -38,7 +38,6 @@ EXTRA_EXCLUDED_MODULES += iptrtpproxy
 EXTRA_EXCLUDED_MODULES += dnssec
 EXTRA_EXCLUDED_MODULES += java
 EXTRA_EXCLUDED_MODULES += python
-EXTRA_EXCLUDED_MODULES += tls_wolfssl
 ## --EXCLUDED--
 
 
@@ -87,6 +86,7 @@ PACKAGE_GROUPS += mqtt
 PACKAGE_GROUPS += secsipid
 PACKAGE_GROUPS += lwsc
 PACKAGE_GROUPS += nats
+PACKAGE_GROUPS += tls_wolfssl
 PACKAGE_GROUPS += microhttpd
 
 # Module groups to be packaged onto kamailio-extra-modules.

+ 0 - 7
pkg/kamailio/deb/debian/backports/bookworm

@@ -35,13 +35,6 @@ sed -i -e '/lsb-base/d' ${DIST}/control
 # libncurses
 sed -i -e 's/libncurses5-dev/libncurses-dev/g' ${DIST}/control
 
-# libwolfssl-dev < 5.6.6
-sed -i -e '/^ libwolfssl-dev,/d' \
-  -e '/^Package: kamailio-wolftls-modules/,/^$/d' \
-  ${DIST}/control
-sed -i -e '/^PACKAGE_GROUPS += tls_wolfssl/d' ${DIST}/rules
-sed -i -e '/--EXCLUDED--/i EXTRA_EXCLUDED_MODULES += tls_wolfssl' ${DIST}/rules
-
 wrap-and-sort -sat -d ${DIST}
 
 # clean backports scripts

+ 0 - 7
pkg/kamailio/deb/debian/backports/jammy

@@ -29,13 +29,6 @@ sed -i -e '/^ python,/d' -e '/python-dev/d' \
 sed -i -e '/^PACKAGE_GROUPS += python$/d' ${DIST}/rules
 sed -i -e '/--EXCLUDED--/i EXTRA_EXCLUDED_MODULES += python' ${DIST}/rules
 
-# libwolfssl-dev < 5.6.6
-sed -i -e '/^ libwolfssl-dev,/d' \
-  -e '/^Package: kamailio-wolftls-modules/,/^$/d' \
-  ${DIST}/control
-sed -i -e '/^PACKAGE_GROUPS += tls_wolfssl/d' ${DIST}/rules
-sed -i -e '/--EXCLUDED--/i EXTRA_EXCLUDED_MODULES += tls_wolfssl' ${DIST}/rules
-
 wrap-and-sort -sat -d ${DIST}
 
 # clean backports scripts

+ 18 - 0
pkg/kamailio/deb/jammy/control

@@ -48,6 +48,7 @@ Build-Depends:
  libsystemd-dev,
  libunistring-dev,
  libwebsockets-dev,
+ libwolfssl-dev,
  libxml2-dev,
  openssl,
  pkg-config,
@@ -620,6 +621,23 @@ Description: TLS support for the Kamailio SIP server (authentication, transport)
  This package provides TLS support for encrypted and authenticated
  SIP connections as well as generic TLS support for many Kamailio modules.
 
+Package: kamailio-wolftls-modules
+Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ kamailio (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Description: TLS support for the Kamailio SIP server (authentication, transport)
+ Kamailio is a very fast and flexible SIP (RFC3261)
+ server. Written entirely in C, Kamailio can handle thousands calls
+ per second even on low-budget hardware.
+ .
+ This package provides TLS support for encrypted and authenticated using wolfssl
+ SIP connections as well as generic TLS support for many Kamailio modules.
+
 Package: kamailio-outbound-modules
 Architecture: any
 Multi-Arch: same

+ 1 - 1
pkg/kamailio/deb/jammy/rules

@@ -38,7 +38,6 @@ EXTRA_EXCLUDED_MODULES += iptrtpproxy
 EXTRA_EXCLUDED_MODULES += dnssec
 EXTRA_EXCLUDED_MODULES += java
 EXTRA_EXCLUDED_MODULES += python
-EXTRA_EXCLUDED_MODULES += tls_wolfssl
 ## --EXCLUDED--
 
 
@@ -87,6 +86,7 @@ PACKAGE_GROUPS += mqtt
 PACKAGE_GROUPS += secsipid
 PACKAGE_GROUPS += lwsc
 PACKAGE_GROUPS += nats
+PACKAGE_GROUPS += tls_wolfssl
 PACKAGE_GROUPS += microhttpd
 
 # Module groups to be packaged onto kamailio-extra-modules.