diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 4333ad90c6b..2b77da2a3d9 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -22,7 +22,7 @@ arch="all" pkgusers="kamailio" pkggroups="kamailio" arch="all" -license="GPL2+" +license="GPL-2.0" depends="gawk" options="!check" makedepends="bison db-dev flex freeradius-client-dev expat-dev lksctp-tools-dev perl-dev postgresql-dev python2-dev pcre-dev mariadb-dev @@ -32,6 +32,10 @@ makedepends="bison db-dev flex freeradius-client-dev expat-dev lksctp-tools-dev rabbitmq-c-dev hiredis-dev libmaxminddb-dev libunistring-dev" install="$pkgname.pre-install $pkgname.pre-upgrade" +# secfixes: +# 5.1.4-r0: +# - CVE-2018-14767 + # See Makefile.groups for the list of recommended modules for # each package. What follows is a simplified version of Makefile.groups # @@ -548,4 +552,4 @@ sipdump() { sha512sums="51ea5fccd27a9d3d1783cfc5596eb28ab27e34faeec3268600363f43c48a3634c3c584c479ba874fdb53b85766a0ce8fe7df0e20954c9c6514b1d9d41d9237e6 kamailio-5.1.0.20171125-991fe9b.tar.gz 6badfb611c02ffcb4c2e9937731162ea1a4b737f042ed52120e2f96ebb80b5b7d240b5612c9ca565e693eec9b8c52c1ee5db04dfc47d204501021f984b4b11db 0001-kamdbctl.base.patch af8362201957eae6b66baf7368c9ca884024209a396d77c5c52180c9aabe13772e9c6513e59721d39503e5bb7a8c1030f5c10301ea9055bddafb7f01ee2f3076 0004-src_core_tcp_read_c.patch -cd6e3b677d803cd78561ad14d9b2589fd35ad0096f48047fdcb4ddc7d9103871357efba3b350946844cb53dbb081210746421fc420c22ac845b90251168a628e kamailio.initd" +321b1b160434150bcde3c0ad7f47ddf259791b68d4ce74ba4c35034026421a2bc6f5e86f26f393f5fcdb523d8cd75f944709473065553ce860b0ea06b3dc2a1b kamailio.initd" diff --git a/pkg/kamailio/alpine/kamailio.initd b/pkg/kamailio/alpine/kamailio.initd index 67131dd63c3..6373932335d 100644 --- a/pkg/kamailio/alpine/kamailio.initd +++ b/pkg/kamailio/alpine/kamailio.initd @@ -7,7 +7,7 @@ extra_started_commands="reload" depend() { need net - after firewall + after firewall mariadb postgresql } start() { diff --git a/pkg/kamailio/alpine/kamctl_build.patch b/pkg/kamailio/alpine/kamctl_build.patch deleted file mode 100644 index 3342ec3f0fa..00000000000 --- a/pkg/kamailio/alpine/kamctl_build.patch +++ /dev/null @@ -1,236 +0,0 @@ ---- a/utils/kamctl/Makefile -+++ b/utils/kamctl/Makefile -@@ -25,63 +25,63 @@ - cat kamctl | \ - sed -e "s#/usr/local/sbin#$(bin_target)#g" | \ - sed -e "s#/usr/local/lib/kamailio#$(lib_target)#g" | \ -- sed -e "s#/usr/local/etc/kamailio#$(cfg_target)#g" >/tmp/kamctl -+ sed -e "s#/usr/local/etc/kamailio#$(cfg_target)#g" >$(basedir)/kamctl - $(INSTALL_TOUCH) $(bin_prefix)/$(bin_dir)/kamctl -- $(INSTALL_BIN) /tmp/kamctl $(bin_prefix)/$(bin_dir) -- rm -fr /tmp/kamctl -+ $(INSTALL_BIN) $(basedir)/kamctl $(bin_prefix)/$(bin_dir) -+ rm -fr $(basedir)/kamctl - sed -e "s#/usr/local/sbin#$(bin_target)#g" \ -- < kamctl.base > /tmp/kamctl.base -+ < kamctl.base > $(basedir)/kamctl.base - mkdir -p $(modules_prefix)/$(lib_dir)/kamctl - $(INSTALL_TOUCH) \ - $(modules_prefix)/$(lib_dir)/kamctl -- $(INSTALL_CFG) /tmp/kamctl.base \ -+ $(INSTALL_CFG) $(basedir)/kamctl.base \ - $(modules_prefix)/$(lib_dir)/kamctl/kamctl.base -- rm -fr /tmp/kamctl.base -+ rm -fr $(basedir)/kamctl.base - sed -e "s#/usr/local#$(bin_target)#g" \ -- < kamctl.ctlbase > /tmp/kamctl.ctlbase -- $(INSTALL_CFG) /tmp/kamctl.ctlbase \ -+ < kamctl.ctlbase > $(basedir)/kamctl.ctlbase -+ $(INSTALL_CFG) $(basedir)/kamctl.ctlbase \ - $(modules_prefix)/$(lib_dir)/kamctl/kamctl.ctlbase -- rm -fr /tmp/kamctl.ctlbase -+ rm -fr $(basedir)/kamctl.ctlbase - sed -e "s#/usr/local#$(bin_target)#g" \ -- < kamctl.fifo > /tmp/kamctl.fifo -- $(INSTALL_CFG) /tmp/kamctl.fifo \ -+ < kamctl.fifo > $(basedir)/kamctl.fifo -+ $(INSTALL_CFG) $(basedir)/kamctl.fifo \ - $(modules_prefix)/$(lib_dir)/kamctl/kamctl.fifo -- rm -fr /tmp/kamctl.fifo -+ rm -fr $(basedir)/kamctl.fifo - sed -e "s#/usr/local#$(bin_target)#g" \ -- < kamctl.ser > /tmp/kamctl.ser -- $(INSTALL_CFG) /tmp/kamctl.ser \ -+ < kamctl.ser > $(basedir)/kamctl.ser -+ $(INSTALL_CFG) $(basedir)/kamctl.ser \ - $(modules_prefix)/$(lib_dir)/kamctl/kamctl.ser -- rm -fr /tmp/kamctl.ser -+ rm -fr $(basedir)/kamctl.ser - sed -e "s#/usr/local#$(bin_target)#g" \ -- < kamctl.ser_mi > /tmp/kamctl.ser_mi -- $(INSTALL_CFG) /tmp/kamctl.ser_mi \ -+ < kamctl.ser_mi > $(basedir)/kamctl.ser_mi -+ $(INSTALL_CFG) $(basedir)/kamctl.ser_mi \ - $(modules_prefix)/$(lib_dir)/kamctl/kamctl.ser_mi -- rm -fr /tmp/kamctl.ser_mi -+ rm -fr $(basedir)/kamctl.ser_mi - sed -e "s#/usr/local#$(bin_target)#g" \ -- < kamctl.unixsock > /tmp/kamctl.unixsock -- $(INSTALL_CFG) /tmp/kamctl.unixsock \ -+ < kamctl.unixsock > $(basedir)/kamctl.unixsock -+ $(INSTALL_CFG) $(basedir)/kamctl.unixsock \ - $(modules_prefix)/$(lib_dir)/kamctl/kamctl.unixsock -- rm -fr /tmp/kamctl.unixsock -+ rm -fr $(basedir)/kamctl.unixsock - sed -e "s#/usr/local#$(bin_target)#g" \ -- < kamctl.sqlbase > /tmp/kamctl.sqlbase -- $(INSTALL_CFG) /tmp/kamctl.sqlbase \ -+ < kamctl.sqlbase > $(basedir)/kamctl.sqlbase -+ $(INSTALL_CFG) $(basedir)/kamctl.sqlbase \ - $(modules_prefix)/$(lib_dir)/kamctl/kamctl.sqlbase -- rm -fr /tmp/kamctl.sqlbase -+ rm -fr $(basedir)/kamctl.sqlbase - # install db setup base script - sed -e "s#/usr/local/sbin#$(bin_target)#g" \ - -e "s#/usr/local/etc/kamailio#$(cfg_target)#g" \ - -e "s#/usr/local/share/kamailio#$(data_target)#g" \ -- < kamdbctl.base > /tmp/kamdbctl.base -- $(INSTALL_CFG) /tmp/kamdbctl.base \ -+ < kamdbctl.base > $(basedir)/kamdbctl.base -+ $(INSTALL_CFG) $(basedir)/kamdbctl.base \ - $(modules_prefix)/$(lib_dir)/kamctl/kamdbctl.base -- rm -fr /tmp/kamdbctl.base -+ rm -fr $(basedir)/kamdbctl.base - cat kamdbctl | \ - sed -e "s#/usr/local/sbin#$(bin_target)#g" | \ - sed -e "s#/usr/local/lib/kamailio#$(lib_target)#g" | \ -- sed -e "s#/usr/local/etc/kamailio#$(cfg_target)#g" >/tmp/kamdbctl -+ sed -e "s#/usr/local/etc/kamailio#$(cfg_target)#g" >$(basedir)/kamdbctl - $(INSTALL_TOUCH) $(bin_prefix)/$(bin_dir)/kamdbctl -- $(INSTALL_BIN) /tmp/kamdbctl $(bin_prefix)/$(bin_dir) -- rm -fr /tmp/kamdbctl -+ $(INSTALL_BIN) $(basedir)/kamdbctl $(bin_prefix)/$(bin_dir) -+ rm -fr $(basedir)/kamdbctl - - install-man: $(man_prefix)/$(man_dir)/man8 $(man_prefix)/$(man_dir)/man5 - sed -e "s#/etc/$(NAME)/$(NAME)\.cfg#$(cfg_target)$(NAME).cfg#g" \ -@@ -105,15 +105,15 @@ - if [ "$(MYSQLON)" = "yes" ]; then \ - mkdir -p $(modules_prefix)/$(lib_dir)/kamctl ; \ - sed -e "s#/usr/local/sbin#$(bin_target)#g" \ -- < kamctl.mysql > /tmp/kamctl.mysql ; \ -- $(INSTALL_CFG) /tmp/kamctl.mysql \ -+ < kamctl.mysql > $(basedir)/kamctl.mysql ; \ -+ $(INSTALL_CFG) $(basedir)/kamctl.mysql \ - $(modules_prefix)/$(lib_dir)/kamctl/kamctl.mysql ; \ -- rm -fr /tmp/kamctl.mysql ; \ -+ rm -fr $(basedir)/kamctl.mysql ; \ - sed -e "s#/usr/local/share/kamailio#$(data_target)#g" \ -- < kamdbctl.mysql > /tmp/kamdbctl.mysql ; \ -+ < kamdbctl.mysql > $(basedir)/kamdbctl.mysql ; \ - $(INSTALL_TOUCH) $(modules_prefix)/$(lib_dir)/kamctl/kamdbctl.mysql ; \ -- $(INSTALL_CFG) /tmp/kamdbctl.mysql $(modules_prefix)/$(lib_dir)/kamctl/ ; \ -- rm -fr /tmp/kamdbctl.mysql ; \ -+ $(INSTALL_CFG) $(basedir)/kamdbctl.mysql $(modules_prefix)/$(lib_dir)/kamctl/ ; \ -+ rm -fr $(basedir)/kamdbctl.mysql ; \ - mkdir -p $(data_prefix)/$(data_dir)/mysql ; \ - for FILE in $(wildcard mysql/*) ; do \ - if [ -f $$FILE ] ; then \ -@@ -128,15 +128,15 @@ - if [ "$(PGSQLON)" = "yes" ]; then \ - mkdir -p $(modules_prefix)/$(lib_dir)/kamctl ; \ - sed -e "s#/usr/local/sbin#$(bin_target)#g" \ -- < kamctl.pgsql > /tmp/kamctl.pgsql ; \ -- $(INSTALL_CFG) /tmp/kamctl.pgsql \ -+ < kamctl.pgsql > $(basedir)/kamctl.pgsql ; \ -+ $(INSTALL_CFG) $(basedir)/kamctl.pgsql \ - $(modules_prefix)/$(lib_dir)/kamctl/kamctl.pgsql ; \ -- rm -fr /tmp/kamctl.pgsql ; \ -+ rm -fr $(basedir)/kamctl.pgsql ; \ - sed -e "s#/usr/local/share/kamailio#$(data_target)#g" \ -- < kamdbctl.pgsql > /tmp/kamdbctl.pgsql ; \ -+ < kamdbctl.pgsql > $(basedir)/kamdbctl.pgsql ; \ - $(INSTALL_TOUCH) $(modules_prefix)/$(lib_dir)/kamctl/kamdbctl.pgsql ; \ -- $(INSTALL_CFG) /tmp/kamdbctl.pgsql $(modules_prefix)/$(lib_dir)/kamctl/ ; \ -- rm -fr /tmp/kamdbctl.pgsql ; \ -+ $(INSTALL_CFG) $(basedir)/kamdbctl.pgsql $(modules_prefix)/$(lib_dir)/kamctl/ ; \ -+ rm -fr $(basedir)/kamdbctl.pgsql ; \ - mkdir -p $(data_prefix)/$(data_dir)/postgres ; \ - for FILE in $(wildcard postgres/*) ; do \ - if [ -f $$FILE ] ; then \ -@@ -151,20 +151,20 @@ - if [ "$(ORACLEON)" = "yes" ]; then \ - mkdir -p $(modules_prefix)/$(lib_dir)/kamctl ; \ - sed -e "s#/usr/local/sbin#$(bin_target)#g" \ -- < kamctl.oracle > /tmp/kamctl.oracle ; \ -- $(INSTALL_CFG) /tmp/kamctl.oracle \ -+ < kamctl.oracle > $(basedir)/kamctl.oracle ; \ -+ $(INSTALL_CFG) $(basedir)/kamctl.oracle \ - $(modules_prefix)/$(lib_dir)/kamctl/kamctl.oracle ; \ -- rm -fr /tmp/kamctl.oracle ; \ -+ rm -fr $(basedir)/kamctl.oracle ; \ - sed -e "s#/usr/local/share/kamailio#$(data_target)#g" \ -- < kamdbctl.oracle > /tmp/kamdbctl.oracle ; \ -+ < kamdbctl.oracle > $(basedir)/kamdbctl.oracle ; \ - $(INSTALL_TOUCH) $(modules_prefix)/$(lib_dir)/kamctl/kamdbctl.oracle ; \ -- $(INSTALL_CFG) /tmp/kamdbctl.oracle $(modules_prefix)/$(lib_dir)/kamctl/ ; \ -- rm -fr /tmp/kamdbctl.oracle ; \ -+ $(INSTALL_CFG) $(basedir)/kamdbctl.oracle $(modules_prefix)/$(lib_dir)/kamctl/ ; \ -+ rm -fr $(basedir)/kamdbctl.oracle ; \ - sed -e "s#/usr/local/share/kamailio#$(data_target)#g" \ -- < kamdbfunc.oracle > /tmp/kamdbfunc.oracle ; \ -+ < kamdbfunc.oracle > $(basedir)/kamdbfunc.oracle ; \ - $(INSTALL_TOUCH) $(modules_prefix)/$(lib_dir)/kamctl/kamdbfunc.oracle ; \ -- $(INSTALL_CFG) /tmp/kamdbfunc.oracle $(modules_prefix)/$(lib_dir)/kamctl/ ; \ -- rm -fr /tmp/kamdbfunc.oracle ; \ -+ $(INSTALL_CFG) $(basedir)/kamdbfunc.oracle $(modules_prefix)/$(lib_dir)/kamctl/ ; \ -+ rm -fr $(basedir)/kamdbfunc.oracle ; \ - mkdir -p $(data_prefix)/$(data_dir)/oracle ; \ - for FILE in $(wildcard oracle/*) ; do \ - if [ -f $$FILE ] ; then \ -@@ -199,15 +199,15 @@ - if [ "$(BERKELEYDBON)" = "yes" ]; then \ - mkdir -p $(modules_prefix)/$(lib_dir)/kamctl ; \ - sed -e "s#/usr/local/share/kamailio/#$(data_target)#g" \ -- < kamctl.db_berkeley > /tmp/kamctl.db_berkeley ; \ -- $(INSTALL_CFG) /tmp/kamctl.db_berkeley \ -+ < kamctl.db_berkeley > $(basedir)/kamctl.db_berkeley ; \ -+ $(INSTALL_CFG) $(basedir)/kamctl.db_berkeley \ - $(modules_prefix)/$(lib_dir)/kamctl/kamctl.db_berkeley ; \ -- rm -fr /tmp/kamctl.db_berkeley ; \ -+ rm -fr $(basedir)/kamctl.db_berkeley ; \ - sed -e "s#/usr/local/share/kamailio#$(data_target)#g" \ -- < kamdbctl.db_berkeley > /tmp/kamdbctl.db_berkeley ; \ -+ < kamdbctl.db_berkeley > $(basedir)/kamdbctl.db_berkeley ; \ - $(INSTALL_TOUCH) $(modules_prefix)/$(lib_dir)/kamctl/kamdbctl.db_berkeley ; \ -- $(INSTALL_CFG) /tmp/kamdbctl.db_berkeley $(modules_prefix)/$(lib_dir)/kamctl/ ; \ -- rm -fr /tmp/kamdbctl.db_berkeley ; \ -+ $(INSTALL_CFG) $(basedir)/kamdbctl.db_berkeley $(modules_prefix)/$(lib_dir)/kamctl/ ; \ -+ rm -fr $(basedir)/kamdbctl.db_berkeley ; \ - mkdir -p $(data_prefix)/$(data_dir)/db_berkeley/kamailio ; \ - for FILE in $(wildcard db_berkeley/kamailio/*) ; do \ - if [ -f $$FILE ] ; then \ -@@ -224,15 +224,15 @@ - if [ "$(DBTEXTON)" = "yes" ]; then \ - mkdir -p $(modules_prefix)/$(lib_dir)/kamctl ; \ - sed -e "s#/usr/local/share/kamailio/#$(data_target)#g" \ -- < kamctl.dbtext > /tmp/kamctl.dbtext ; \ -- $(INSTALL_CFG) /tmp/kamctl.dbtext \ -+ < kamctl.dbtext > $(basedir)/kamctl.dbtext ; \ -+ $(INSTALL_CFG) $(basedir)/kamctl.dbtext \ - $(modules_prefix)/$(lib_dir)/kamctl/kamctl.dbtext ; \ -- rm -fr /tmp/kamctl.dbtext ; \ -+ rm -fr $(basedir)/kamctl.dbtext ; \ - sed -e "s#/usr/local/share/kamailio#$(data_target)#g" \ -- < kamdbctl.dbtext > /tmp/kamdbctl.dbtext ; \ -+ < kamdbctl.dbtext > $(basedir)/kamdbctl.dbtext ; \ - $(INSTALL_TOUCH) $(modules_prefix)/$(lib_dir)/kamctl/kamdbctl.dbtext ; \ -- $(INSTALL_CFG) /tmp/kamdbctl.dbtext $(modules_prefix)/$(lib_dir)/kamctl/ ; \ -- rm -fr /tmp/kamdbctl.dbtext ; \ -+ $(INSTALL_CFG) $(basedir)/kamdbctl.dbtext $(modules_prefix)/$(lib_dir)/kamctl/ ; \ -+ rm -fr $(basedir)/kamdbctl.dbtext ; \ - mkdir -p $(modules_prefix)/$(lib_dir)/kamctl/dbtextdb ; \ - $(INSTALL_TOUCH) $(modules_prefix)/$(lib_dir)/kamctl/dbtextdb/dbtextdb.py ; \ - $(INSTALL_BIN) dbtextdb/dbtextdb.py $(modules_prefix)/$(lib_dir)/kamctl/dbtextdb/ ; \ -@@ -250,15 +250,15 @@ - if [ "$(SQLITEON)" = "yes" ]; then \ - mkdir -p $(modules_prefix)/$(lib_dir)/kamctl ; \ - sed -e "s#/usr/local/sbin#$(bin_target)#g" \ -- < kamctl.sqlite > /tmp/kamctl.sqlite ; \ -- $(INSTALL_CFG) /tmp/kamctl.sqlite \ -+ < kamctl.sqlite > $(basedir)/kamctl.sqlite ; \ -+ $(INSTALL_CFG) $(basedir)/kamctl.sqlite \ - $(modules_prefix)/$(lib_dir)/kamctl/kamctl.sqlite ; \ -- rm -fr /tmp/kamctl.sqlite ; \ -+ rm -fr $(basedir)/kamctl.sqlite ; \ - sed -e "s#/usr/local/share/kamailio#$(data_target)#g" \ -- < kamdbctl.sqlite > /tmp/kamdbctl.sqlite ; \ -+ < kamdbctl.sqlite > $(basedir)/kamdbctl.sqlite ; \ - $(INSTALL_TOUCH) $(modules_prefix)/$(lib_dir)/kamctl/kamdbctl.sqlite ; \ -- $(INSTALL_CFG) /tmp/kamdbctl.sqlite $(modules_prefix)/$(lib_dir)/kamctl/ ; \ -- rm -fr /tmp/kamdbctl.sqlite ; \ -+ $(INSTALL_CFG) $(basedir)/kamdbctl.sqlite $(modules_prefix)/$(lib_dir)/kamctl/ ; \ -+ rm -fr $(basedir)/kamdbctl.sqlite ; \ - mkdir -p $(data_prefix)/$(data_dir)/db_sqlite ; \ - for FILE in $(wildcard db_sqlite/*) ; do \ - if [ -f $$FILE ] ; then \