main/freeradius3: upgrade to 3.0.10

4 files changed, 22 insertions, 132 deletions

diff --git a/main/freeradius3/APKBUILD b/main/freeradius3/APKBUILD
index afbc6328a3..859a1827b7 100644
--- a/main/freeradius3/APKBUILD
+++ b/main/freeradius3/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=freeradius3
 _realname=freeradius
-pkgver=3.0.3
-pkgrel=9
+pkgver=3.0.10
+pkgrel=0
 pkgdesc="RADIUS (Remote Authentication Dial-In User Service) server"
 url="http://freeradius.org/"
 arch="all"
@@ -22,10 +22,8 @@ subpackages="$pkgname-doc $pkgname-dev $pkgname-ldap $pkgname-lib
 source="ftp://ftp.freeradius.org/pub/freeradius/$_realname-server-$pkgver.tar.gz
 	$pkgname.confd
 	$pkgname.initd
-	freeradius3-301-default-config.patch
+
 	disable-cert-generation.patch
-	freeradius3-303-main-log-include.patch
-	freeradius-fix-openssl-version-check.patch
 	freeradius3-3.0.3-rlm_linelog-1.patch
 	freeradius3-3.0.3-rlm_linelog-2.patch
 	"
@@ -232,30 +230,21 @@ pam() {
 		|| return 1
 }
 
-md5sums="f031cdf90b94957b05a12468c95172d9  freeradius-server-3.0.3.tar.gz
+md5sums="b34a8b99beb2f225511f5a645dc8cc40  freeradius-server-3.0.10.tar.gz
 fc6693f3df5a0694610110287a28568a  freeradius3.confd
 3a50b7f233e74daf3f87da63b3e9579d  freeradius3.initd
-d332a0c1fcbab07f50461ae887279df2  freeradius3-301-default-config.patch
-7097584dba2b344caf5c32475bf8da16  disable-cert-generation.patch
-b3f62ccbba7aab3e7c009767372d71ed  freeradius3-303-main-log-include.patch
-07e9bf8a42f253b599f86f34c93390b6  freeradius-fix-openssl-version-check.patch
+931a845c55628f6d490360423a4ef751  disable-cert-generation.patch
 6551bee903625e5b91b89f997b7029ca  freeradius3-3.0.3-rlm_linelog-1.patch
 be0aefbf2b6cae4c12b1b68012a3af87  freeradius3-3.0.3-rlm_linelog-2.patch"
-sha256sums="57e9932e5401670d0f0000080b942aee2cd6ca80422f76acd21f13a4be46335e  freeradius-server-3.0.3.tar.gz
+sha256sums="e8825518bde1d9787f7f9ea1e9fec7ae5282af9c3362d2fa360f60c4db6f77ec  freeradius-server-3.0.10.tar.gz
 2d5b3e1af1299373182f2c8021bdf45c29db5d82b0a077b965a16ded32cb6292  freeradius3.confd
 e173cce3b8a4c2ed4d1fdd58fff8ec21e9166f011ec052f5f4c01712493e72b3  freeradius3.initd
-edde20a808ad4c589d456ccf9e693a8ee9922e75366b1187994f0b982e856021  freeradius3-301-default-config.patch
-a72a0454f047bbbf258ffa90bd496e48cdfd95bc03a3863ab01750382ce566e3  disable-cert-generation.patch
-37b3a67a9fe5a34d82fd6274b95732298561f19a0e7c81faf5ad0bf9a8f7874a  freeradius3-303-main-log-include.patch
-d0191479423aa8b91e98693c8ee0c962a463736f79fa58af92d291d7c7aff3e1  freeradius-fix-openssl-version-check.patch
+6e194796f5827548145e8db288fb7f082ebfc05b37d6a94fafaf9069e760e2e9  disable-cert-generation.patch
 62f9a1ee01720a3cb7b055e089fb3041c4f9ba5f9f48c858868e1b3e6abb81d2  freeradius3-3.0.3-rlm_linelog-1.patch
 6608476d89b2fa4be087507a2cbcc1979c76ff56155ab08cdf036835747b4af3  freeradius3-3.0.3-rlm_linelog-2.patch"
-sha512sums="a4fbb0a19f5946182c0cac6d62270db378674e48350c7c3b8f7d8a2a1b16c95c9b205af8d7ed22009b6392d4ab7cb251694d2593a39d9e4efc8eec9ff736bd01  freeradius-server-3.0.3.tar.gz
+sha512sums="7546d54ca9ae1189f17fa97a8c6f6e15486d61dda8819b15f883ba48fbd6629f4728ba41490b51cb08eb1399090c16eca1b559c22ee19f3a770f1ce7ce23a8d5  freeradius-server-3.0.10.tar.gz
 e248159c0a44f722e405c51c8015d9ad672e42ad0d38ca28f8a051ff911aa4d3e630b9bd4543e9d610940bc4ae50c022594e219ce341b36abe85c572acad418b  freeradius3.confd
 b29bf9090a2be7af77a3e104346a23024baf78a343e7f2fd6f6ddb02c223ac66d9b77c80d02b2cb26cbef2e64cb59c46462bb54b063b862e5a3a61c72653a63d  freeradius3.initd
-f32ca8fbd0d082f962c5e42c78742f7b099d2e518ee246003a7860c6d69bad745dcad974b2fb98f8e51ddecb78222f88bc778dd2f33efdb02b3f8e4298ea3e79  freeradius3-301-default-config.patch
-d027627ac302c39de9342f5f97d2b44752e33d0def311aa5e140e9365b6a501cd5e4f311b1751d5efa3aa63666f07fc58bc222f95bba0a478a7828c6aea07770  disable-cert-generation.patch
-1bf8587bfbf6109cfe8b34ffb4e3100d1d06be24678d9358c0cccc84e84e277822c01117bd4a038b11da35fcb86110588f5bd54177cbd632036977db3a53376d  freeradius3-303-main-log-include.patch
-98db9464b5915ef3bcff4d0767817013a83d23e23362539f2a5620306831a1f6b864377b4979db6ef99db18261a11aba13eb74bc8de121e9612ae65d2ad3f333  freeradius-fix-openssl-version-check.patch
+6dc20bc70cbea44f4b0cf48e7b9cc678d1e45b2f171b45e291697fffc80e877ef3f0920195be7929f67e4284c0d1f699db623f6380ad133d4948c5aab789e3a5  disable-cert-generation.patch
 78621dacbc3d6d798a94fe1e860cbe39340ae6cab9de722aad2d4f32c35e85db1bf67759c785911f59468731c79857ffc14ea7f1247ce8d08fd6cc9d8d289aac  freeradius3-3.0.3-rlm_linelog-1.patch
 4c2fe2011fd338b9762e3c6de79da1b83af0ab99c73e8ebe0693b66dc00b638a5b4824caab29cf4db9c2bc4135d1a85a7141f2b4838c29da01b5d00ac24fdcbe  freeradius3-3.0.3-rlm_linelog-2.patch"
diff --git a/main/freeradius3/disable-cert-generation.patch b/main/freeradius3/disable-cert-generation.patch
index 3606c911cd..52ad5cf246 100644
--- a/main/freeradius3/disable-cert-generation.patch
+++ b/main/freeradius3/disable-cert-generation.patch
@@ -1,27 +1,3 @@
---- a/Makefile
-+++ b/Makefile
-@@ -40,7 +40,6 @@
- # Only redirect STDOUT, which should contain details of why the test failed.
- # Don't molest STDERR as this may be used to receive output from a debugger.
- $(BUILD_DIR)/tests/radiusd-c: raddb/test.conf ${BUILD_DIR}/bin/radiusd | build.raddb
--	@$(MAKE) -C raddb/certs
- 	@printf "radiusd -C... "
- 	@if ! ./build/make/jlibtool --mode=execute ./build/bin/radiusd -XCMd ./raddb -D ./share -n test > $(BUILD_DIR)/tests/radiusd.config.log; then \
- 		@rm -f raddb/test.conf; \
-@@ -224,13 +223,6 @@
- .PHONY: TAGS
- TAGS:
- 	etags `find src -type f -name '*.[ch]' -print` > $@
--
--#
--#  Make test certificates.
--#
--.PHONY: certs
--certs:
--	@$(MAKE) -C raddb/certs
- 
- ######################################################################
- #
 --- a/raddb/all.mk
 +++ b/raddb/all.mk
 @@ -18,9 +18,6 @@
@@ -34,19 +10,19 @@
  LEGACY_LINKS :=		$(addprefix $(R)$(raddbdir)/,users huntgroups hints)
  
  RADDB_DIRS :=		certs mods-available mods-enabled policy.d \
-@@ -111,15 +108,6 @@
- $(R)$(raddbdir)/users: $(R)$(modconfdir)/files/authorize
- 	@[ -e $@ ] || echo LN-S $(patsubst $(R)$(raddbdir)/%,raddb/%,$@)
+@@ -113,14 +110,7 @@
  	@[ -e $@ ] || ln -s $(patsubst $(R)$(raddbdir)/%,./%,$<) $@
--
+ 
+ ifeq ("$(PACKAGE)","")
 -$(LOCAL_CERT_PRODUCTS):
 -	@echo BOOTSTRAP raddb/certs/
 -	@$(MAKE) -C $(R)$(raddbdir)/certs/
--
+ 
 -# Bootstrap is special
 -$(R)$(raddbdir)/certs/bootstrap: | raddb/certs/bootstrap $(LOCAL_CERT_PRODUCTS)
 -	@echo INSTALL $(patsubst $(R)$(raddbdir)/%,raddb/%,$@)
 -	@$(INSTALL) -m 750 $(patsubst $(R)$(raddbdir)/%,raddb/%,$@) $@
- 
- #  List directories before the file targets.
- #  It's not clear why GNU Make doesn't deal well with this.
+ else
+ $(R)$(raddbdir)/certs/bootstrap:
+ 	@echo INSTALL $(patsubst $(R)$(raddbdir)/%,raddb/%,$@)
+
diff --git a/main/freeradius3/freeradius3-301-default-config.patch b/main/freeradius3/freeradius3-301-default-config.patch
index dc30a6d436..3f6e631280 100644
--- a/main/freeradius3/freeradius3-301-default-config.patch
+++ b/main/freeradius3/freeradius3-301-default-config.patch
@@ -1,45 +1,3 @@
---- a/raddb/policy.d/accounting
-+++ b/raddb/policy.d/accounting
-@@ -34,7 +34,7 @@
- 	#
- 	if("%{string:Class}" =~ /${policy.class_value_prefix}([0-9a-f]{32})/i) {
- 		update request {
--			Acct-Unique-Session-Id := "%{md5:%{1},%{Acct-Session-ID}}"
-+			&Acct-Unique-Session-Id := "%{md5:%{1},%{Acct-Session-ID}}"
- 		}
- 	}
- 
-@@ -46,7 +46,7 @@
- 	#
- 	else {
- 		update request {
--			Acct-Unique-Session-Id := "%{md5:%{User-Name},%{Acct-Session-ID},%{%{NAS-IPv6-Address}:-%{NAS-IP-Address}},%{NAS-Identifier},%{NAS-Port-ID},%{NAS-Port}}"
-+			&Acct-Unique-Session-Id := "%{md5:%{User-Name},%{Acct-Session-ID},%{%{NAS-IPv6-Address}:-%{NAS-IP-Address}},%{NAS-Identifier},%{NAS-Port-ID},%{NAS-Port}}"
- 		 }
- 	}
- }
-@@ -65,8 +65,8 @@
- #
- acct_counters64.preacct {
- 	update request {
--		Acct-Input-Octets64 = "%{expr:(%{%{Acct-Input-Gigawords}:-0} * 4294967296) + %{%{Acct-Input-Octets}:-0}}"
--		Acct-Output-Octets64 = "%{expr:(%{%{Acct-Output-Gigawords}:-0} * 4294967296) + %{%{Acct-Output-Octets}:-0}}"
-+		&Acct-Input-Octets64 = "%{expr:(%{%{Acct-Input-Gigawords}:-0} * 4294967296) + %{%{Acct-Input-Octets}:-0}}"
-+		&Acct-Output-Octets64 = "%{expr:(%{%{Acct-Output-Gigawords}:-0} * 4294967296) + %{%{Acct-Output-Octets}:-0}}"
- 	}
- }
- 
---- a/raddb/policy.d/eap
-+++ b/raddb/policy.d/eap
-@@ -76,7 +76,7 @@
- remove_reply_message_if_eap {
- 	if(reply:EAP-Message && reply:Reply-Message) {
- 		update reply {
--			Reply-Message !* ANY
-+			&Reply-Message !* ANY
- 		}
- 	}
- 	else {
 --- a/raddb/radiusd.conf.in
 +++ b/raddb/radiusd.conf.in
 @@ -415,8 +415,8 @@
@@ -95,36 +53,3 @@
  
  	#
  	#  If the server tries to proxy a request and fails, then the
---- a/raddb/sites-available/inner-tunnel
-+++ b/raddb/sites-available/inner-tunnel
-@@ -116,9 +116,9 @@
- 	#  for the many packets that go back and forth to set up TTLS
- 	#  or PEAP.  The load on those servers will therefore be reduced.
- 	#
--	eap {
--		ok = return
--	}
-+#	eap {
-+#		ok = return
-+#	}
- 
- 	#
- 	#  Read the 'users' file
-@@ -227,7 +227,7 @@
- 
- 	#
- 	#  Allow EAP authentication.
--	eap
-+#	eap
- }
- 
- ######################################################################
-@@ -380,7 +380,7 @@
- 	#  hidden inside of the EAP packet, and the end server will
- 	#  reject the EAP request.
- 	#
--	eap
-+#	eap
- 
- 	#
- 	#  If the server tries to proxy a request and fails, then the
diff --git a/main/kamailio/APKBUILD b/main/kamailio/APKBUILD
index 33ba7e3b63..87ad65a1a7 100644
--- a/main/kamailio/APKBUILD
+++ b/main/kamailio/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Nathan Angelacos <nangel@alpinelinux.org>
 pkgname=kamailio
-pkgver=4.0.4
-pkgrel=4
+pkgver=4.0.7
+pkgrel=0
 pkgdesc="Open Source SIP Server"
 url="http://www.kamailio.org/"
 pkgusers="kamailio"
@@ -403,17 +403,17 @@ websocket() {
         "$_mod_list_websocket"
 }
 
-md5sums="e625f52d53ed00da97a50b3ecd451b8d  kamailio-4.0.4_src.tar.gz
+md5sums="45e4f2fbdd90ba068209e225e256b3a9  kamailio-4.0.7_src.tar.gz
 7ca9394c4987c83a27f492c5b6b055f0  kamailio-4.0-backslash.patch
 c76507d21eef8091756a74153fc68994  sqlops-fix-use-after-free-by-deep-copying-result-nam.patch
 a3c959ec568c43a905710e7d25cd8c25  kamailio.cfg
 0e0a271fd3ddb7e87c01c26c7d041d59  kamailio.initd"
-sha256sums="abd6e8a1076d8e58d80a3bb6efc32d784b130796add03961f4bbdbd6f58049a7  kamailio-4.0.4_src.tar.gz
+sha256sums="7dc907d31cb6533a568df18c6d118479a1f43d6fe2eae12b011f7df69fe2c8b5  kamailio-4.0.7_src.tar.gz
 2cb24070809718deac1a32fd4de73eaea47c685d9608fd06ae6531bd34fe4604  kamailio-4.0-backslash.patch
 1182e3af5b771aa027caa0c1f6c4195532b51b8fcd274621593fcd086d4d2a58  sqlops-fix-use-after-free-by-deep-copying-result-nam.patch
 8024266849033a917147827c3579a382f10f3796989bebc6de3d7c80c965fb72  kamailio.cfg
 a90d3ab09a3ed58892e94710a1f80492a61ffad1ccf7ccb5b851bb8f538d32c4  kamailio.initd"
-sha512sums="5b486ca72094edef3f617a5285af5519614d3b470babf78db921cf3c321eccc2314e3bbf745e86929fb51249e25c1d55abd519f4559acbd6cfe5cf527485bb0f  kamailio-4.0.4_src.tar.gz
+sha512sums="6aa25e8f1b97ad1e23efd722acfaa1bcd984f9b718ff186a3e6f01eb83fade5c9784e057f5eedeac5e87be41b66f5d9847841f9af9cfb9f01260471efb9ecf4e  kamailio-4.0.7_src.tar.gz
 f83ca7e4feaa02ba4c97fe8b3ff72857b334b6ba27f90b1cc4a2819c77bf40a1d6b77cc8d9b9afa045da5a1a4706b737b73f93c39c0cdb57c14088ca691afbf9  kamailio-4.0-backslash.patch
 284a13873cf7cf4ae4c1d90c757974ef634863bdde146d4af9feb86e4d96e07a694c299189e8acef838246637dcf36199ac386cecfc4871cefe64b71aa6278b3  sqlops-fix-use-after-free-by-deep-copying-result-nam.patch
 0b666bfa10fd0af97b62749f8691cb3f76d9b40d1abe0a33e810e367bd733d2e8189c89f7f23010ec591116aada6e1a8a403b17449fe775038917617f281ad4d  kamailio.cfg