MT#64749 db berkeley: remove fully support of it

Upstream beginning from the 6.1.1 doesn't support
db berkeley, and we also don't use it at all.

Hence update packaging and debian part to exclude
the compilation of the according berkeley files
and also building the package.

Reference to the upstream commit:
39baada2ab45300ee3925dc57682f6d524984073

Change-Id: I9d8b413e3e310db3759827c59faf6b153946ea6f
master
Donat Zenichev 2 months ago
parent fe5208a02e
commit c00fd58d10

2
debian/.gitignore vendored

@ -5,8 +5,6 @@
/debhelper-build-stamp /debhelper-build-stamp
/files /files
/ngcp-kamailio-autheph-modules/ /ngcp-kamailio-autheph-modules/
/ngcp-kamailio-berkeley-bin/
/ngcp-kamailio-berkeley-modules/
/ngcp-kamailio-carrierroute-modules/ /ngcp-kamailio-carrierroute-modules/
/ngcp-kamailio-cnxcc-modules/ /ngcp-kamailio-cnxcc-modules/
/ngcp-kamailio-cpl-modules/ /ngcp-kamailio-cpl-modules/

47
debian/control vendored

@ -11,7 +11,6 @@ Build-Depends:
flex, flex,
libconfuse-dev, libconfuse-dev,
libcurl4-openssl-dev, libcurl4-openssl-dev,
libdb-dev (>= 4.6.19),
libev-dev, libev-dev,
libevent-dev, libevent-dev,
libexpat1-dev, libexpat1-dev,
@ -68,7 +67,6 @@ Depends:
${misc:Depends}, ${misc:Depends},
${shlibs:Depends}, ${shlibs:Depends},
Suggests: Suggests:
ngcp-kamailio-berkeley-modules,
ngcp-kamailio-cpl-modules, ngcp-kamailio-cpl-modules,
ngcp-kamailio-ldap-modules, ngcp-kamailio-ldap-modules,
ngcp-kamailio-lua-modules, ngcp-kamailio-lua-modules,
@ -477,51 +475,6 @@ Description: XML based extensions for Kamailio's Management Interface
Management and Control Interface. Management and Control Interface.
- xmlops module for XPath operations in configuration file - xmlops module for XPath operations in configuration file
Package: ngcp-kamailio-berkeley-modules
Architecture: any
Multi-Arch: same
Pre-Depends:
${misc:Pre-Depends},
Depends:
db-util (>= 4.6.19),
ngcp-kamailio (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
Conflicts:
kamailio-berkeley-modules,
Replaces:
kamailio-berkeley-modules,
Description: Berkeley database module for Kamailio
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 Berkeley database module for Kamailio, a
high-performance embedded DB kernel. All database tables are stored
in files, no additional server is necessary.
Package: ngcp-kamailio-berkeley-bin
Architecture: any
Multi-Arch: foreign
Pre-Depends:
${misc:Pre-Depends},
Depends:
ngcp-kamailio (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
Conflicts:
kamailio-berkeley-bin,
Replaces:
kamailio-berkeley-bin,
Description: Berkeley database module for Kamailio - helper program
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 helper modules for the Berkeley database module for
Kamailio, a high-performance embedded DB kernel. You should normally
install kamailio-berkeley-modules and not this package directly.
Package: ngcp-kamailio-ldap-modules Package: ngcp-kamailio-ldap-modules
Architecture: any Architecture: any
Multi-Arch: same Multi-Arch: same

6
debian/rules vendored

@ -32,6 +32,7 @@ EXTRA_EXCLUDED_MODULES += mi_xmlrpc
EXTRA_EXCLUDED_MODULES += oracle EXTRA_EXCLUDED_MODULES += oracle
EXTRA_EXCLUDED_MODULES += pa EXTRA_EXCLUDED_MODULES += pa
EXTRA_EXCLUDED_MODULES += purple EXTRA_EXCLUDED_MODULES += purple
EXTRA_EXCLUDED_MODULES += berkeley
# Module groups that are packaged in seperate packages (with the name # Module groups that are packaged in seperate packages (with the name
# kamailio-$(group_name)-modules). # kamailio-$(group_name)-modules).
@ -39,7 +40,6 @@ EXTRA_EXCLUDED_MODULES += purple
# on which other depend first) # on which other depend first)
PACKAGE_GROUPS += mysql PACKAGE_GROUPS += mysql
PACKAGE_GROUPS += postgres PACKAGE_GROUPS += postgres
PACKAGE_GROUPS += berkeley
PACKAGE_GROUPS += unixodbc PACKAGE_GROUPS += unixodbc
PACKAGE_GROUPS += radius PACKAGE_GROUPS += radius
PACKAGE_GROUPS += presence PACKAGE_GROUPS += presence
@ -216,10 +216,6 @@ override_dh_auto_clean:
rm -f configure-stamp test_build_all-stamp test_install_all-stamp rm -f configure-stamp test_build_all-stamp test_install_all-stamp
override_dh_auto_install: $(INSTALL_MODULES) $(INSTALL_EXTRA) override_dh_auto_install: $(INSTALL_MODULES) $(INSTALL_EXTRA)
# Move binaries of kamailio-berkeley-modules to kamailio-berkeley-bin.
mkdir -p $(D)-berkeley-bin/usr/
mv $(D)-berkeley-modules/usr/sbin \
$(D)-berkeley-bin/usr/
override_dh_installexamples: override_dh_installexamples:
dh_installexamples -Xobsoleted -Xsr dh_installexamples -Xobsoleted -Xsr

Loading…
Cancel
Save