testing/freeradius3: upgrade to 3.0.3

3 files changed, 38 insertions, 35 deletions

diff --git a/testing/freeradius3/APKBUILD b/testing/freeradius3/APKBUILD
index 75acc94fab..e4d709b36d 100644
--- a/testing/freeradius3/APKBUILD
+++ b/testing/freeradius3/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=freeradius3
 _realname=freeradius
-pkgver=3.0.1
-pkgrel=1
+pkgver=3.0.3
+pkgrel=0
 pkgdesc="RADIUS (Remote Authentication Dial-In User Service) server"
 url="http://freeradius.org/"
 arch="all"
@@ -22,10 +22,10 @@ subpackages="$pkgname-doc $pkgname-dev $pkgname-dbg $pkgname-ldap $pkgname-lib
 source="ftp://ftp.freeradius.org/pub/freeradius/$_realname-server-$pkgver.tar.gz
 	$pkgname.confd
 	$pkgname.initd
-	fix-potential-crash-with-SSHA-and-salts.patch
-	disable-cert-generation.patch
 	freeradius3-301-default-config.patch
 	musl-fix-headers.patch
+	disable-cert-generation.patch
+	freeradius3-303-main-log-include.patch
 	"
 conflict="freeradius freeradius-lib freeradius-radclient"
 
@@ -47,6 +47,8 @@ prepare() {
                 esac
         done
 	update_config_sub || return 1
+	# remove certs generation
+	rm -rf raddb/certs || return 1
 }
 
 build() {
@@ -205,24 +207,24 @@ pam() {
 	mv "${pkgdir}"${radlibdir}/rlm_pam* "${subpkgdir}"${radlibdir} || exit 1
 }
 
-md5sums="552f375530252c4567ee11c1b23bbbe9  freeradius-server-3.0.1.tar.gz
+md5sums="f031cdf90b94957b05a12468c95172d9  freeradius-server-3.0.3.tar.gz
 fc6693f3df5a0694610110287a28568a  freeradius3.confd
 3a50b7f233e74daf3f87da63b3e9579d  freeradius3.initd
-4780cb9da2b16b0db51d95ce30e7c4a6  fix-potential-crash-with-SSHA-and-salts.patch
-8696554123f7ee87b44f1fa5dc699dd1  disable-cert-generation.patch
 53b74f75456427a27df9f3489706ae3e  freeradius3-301-default-config.patch
-d86558365a1deea4914ed139797805b0  musl-fix-headers.patch"
-sha256sums="caba74385d574fe5257f9479e59a882e7adfa02c756693451fd2e99e69a0af42  freeradius-server-3.0.1.tar.gz
+d86558365a1deea4914ed139797805b0  musl-fix-headers.patch
+d4aaf44dd5a8758606d6ace3b63bd4d9  disable-cert-generation.patch
+b3f62ccbba7aab3e7c009767372d71ed  freeradius3-303-main-log-include.patch"
+sha256sums="57e9932e5401670d0f0000080b942aee2cd6ca80422f76acd21f13a4be46335e  freeradius-server-3.0.3.tar.gz
 2d5b3e1af1299373182f2c8021bdf45c29db5d82b0a077b965a16ded32cb6292  freeradius3.confd
 e173cce3b8a4c2ed4d1fdd58fff8ec21e9166f011ec052f5f4c01712493e72b3  freeradius3.initd
-fc317518af37a09ac5ac7bba27b50e599bd90b2c772f75f57c00de56dbbd0f70  fix-potential-crash-with-SSHA-and-salts.patch
-8d9b48a56b8638412249c05749725dbd230568d3b7c3eecc97bb46f1815f5b3d  disable-cert-generation.patch
 472279b7831ea85a9d0a2237af8ee0c3235d01c53c08c6152633e6699f6c7990  freeradius3-301-default-config.patch
-872aaebf86a663f819460d98924a9dc1f3e428facac6930dc98d1e442df1633f  musl-fix-headers.patch"
-sha512sums="09bdce706ad839f9eba2407ad4d9770777655f33b0d40b07d80ca727b52ae49f1b6b15a5e66d088a1a5288fad46e94830552e7d6dc6e5e0833a743e862297c22  freeradius-server-3.0.1.tar.gz
+872aaebf86a663f819460d98924a9dc1f3e428facac6930dc98d1e442df1633f  musl-fix-headers.patch
+cd71744d71c3b32af5e5ef348c02e63e7905f287a3f043b3c14fc21fdfde8282  disable-cert-generation.patch
+37b3a67a9fe5a34d82fd6274b95732298561f19a0e7c81faf5ad0bf9a8f7874a  freeradius3-303-main-log-include.patch"
+sha512sums="a4fbb0a19f5946182c0cac6d62270db378674e48350c7c3b8f7d8a2a1b16c95c9b205af8d7ed22009b6392d4ab7cb251694d2593a39d9e4efc8eec9ff736bd01  freeradius-server-3.0.3.tar.gz
 e248159c0a44f722e405c51c8015d9ad672e42ad0d38ca28f8a051ff911aa4d3e630b9bd4543e9d610940bc4ae50c022594e219ce341b36abe85c572acad418b  freeradius3.confd
 b29bf9090a2be7af77a3e104346a23024baf78a343e7f2fd6f6ddb02c223ac66d9b77c80d02b2cb26cbef2e64cb59c46462bb54b063b862e5a3a61c72653a63d  freeradius3.initd
-429e50d18b5657e07ac4fcdd9d00c3936f04b7e60d9785aae4cdb8c3cecc81fc7e3fc3fc3152fea1c475cead7ecf42e81d63d69677ee912833a8c4069e3fe793  fix-potential-crash-with-SSHA-and-salts.patch
-d46c94ec7245dbcdcb6fe321956b305eedf5481f2d533556c6fe127318dadc1dbe25be2bf694adef2160ea02e8fa138371300eae264e854bc658d73f1c135867  disable-cert-generation.patch
 459e47b74c4340edecd544bdb5e0b0720975c2aa7697d2237044812b7d42adb2818d1846b20af77f330972f77ae10f584c8767409202f3e39b2654ee31fd96ab  freeradius3-301-default-config.patch
-c49e5eec7497fccde5fd09dba1ea9b846e57bc88015bd81640aa531fb5c9b449f37136f42c85fe1d7940c5963aed664b85da28442b388c9fb8cc27873df03b2d  musl-fix-headers.patch"
+c49e5eec7497fccde5fd09dba1ea9b846e57bc88015bd81640aa531fb5c9b449f37136f42c85fe1d7940c5963aed664b85da28442b388c9fb8cc27873df03b2d  musl-fix-headers.patch
+4b4b4f096d53f1e1274817d0f6d92ab27463e688cc94e17dda1fb22f6e92273e684b59608c135430c7514a8d6a49772a735704ba4227ba2ee5afd7b91f3c3e1f  disable-cert-generation.patch
+1bf8587bfbf6109cfe8b34ffb4e3100d1d06be24678d9358c0cccc84e84e277822c01117bd4a038b11da35fcb86110588f5bd54177cbd632036977db3a53376d  freeradius3-303-main-log-include.patch"
diff --git a/testing/freeradius3/disable-cert-generation.patch b/testing/freeradius3/disable-cert-generation.patch
index 771787dc30..900c446221 100644
--- a/testing/freeradius3/disable-cert-generation.patch
+++ b/testing/freeradius3/disable-cert-generation.patch
@@ -1,14 +1,14 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -28,7 +28,6 @@
- #  Run "radiusd -C", looking for errors.
- #
- $(BUILD_DIR)/tests/radiusd-c: ${BUILD_DIR}/bin/radiusd | build.raddb
+@@ -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
- 	@if ! ./build/make/jlibtool --mode=execute ./build/bin/radiusd -XCMd ./raddb -n debug -D ./share > $(BUILD_DIR)/tests/radiusd.config.log 2>&1; then \
- 		cat $(BUILD_DIR)/tests/radiusd.config.log; \
- 		echo "FAIL: radiusd -C"; \
-@@ -205,13 +204,6 @@
+ 	@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` > $@
@@ -18,17 +18,7 @@
 -#
 -.PHONY: certs
 -certs:
--	@cd raddb/certs && $(MAKE)
+-	@$(MAKE) -C raddb/certs
  
  ######################################################################
  #
---- a/raddb/all.mk
-+++ b/raddb/all.mk
-@@ -114,7 +114,6 @@
- 
- $(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)
diff --git a/testing/freeradius3/freeradius3-303-main-log-include.patch b/testing/freeradius3/freeradius3-303-main-log-include.patch
new file mode 100644
index 0000000000..3f84eb639f
--- /dev/null
+++ b/testing/freeradius3/freeradius3-303-main-log-include.patch
@@ -0,0 +1,11 @@
+--- a/src/main/log.c
++++ b/src/main/log.c
+@@ -42,6 +42,8 @@
+ #include <pthread.h>
+ #endif
+ 
++#include <fcntl.h>
++
+ bool rate_limit = true;
+ 
+ /*