testing/freeradius3: backport from edge

(cherry picked from commit a286ee9c925bd1ae64378020f0fb6af1372ca69d)

10 files changed, 180 insertions, 85 deletions

diff --git a/testing/freeradius3/APKBUILD b/main/freeradius3/APKBUILD
index 75acc94fab..9d9add8018 100644
--- a/testing/freeradius3/APKBUILD
+++ b/main/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=4
 pkgdesc="RADIUS (Remote Authentication Dial-In User Service) server"
 url="http://freeradius.org/"
 arch="all"
@@ -18,14 +18,14 @@ install="$pkgname.pre-install"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-dbg $pkgname-ldap $pkgname-lib
 	$pkgname-mssql $pkgname-mysql $pkgname-sql $pkgname-perl
 	$pkgname-postgresql $pkgname-python $pkgname-radclient $pkgname-sqlite
-	$pkgname-unixodbc $pkgname-pam $pkgname-eap"
+	$pkgname-unixodbc $pkgname-pam $pkgname-eap $pkgname-dbg"
 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() {
@@ -84,16 +86,22 @@ build() {
 
 package() {
 	cd "$_builddir"
-	install -d -m0750 -o root -g radius "${pkgdir}"${radconfdir} || exit 1
-	install -d -m0750 -o radius -g radius "$pkgdir"/var/run/radius || exit 1
-	install -d -m0750 -o radius -g radius "$pkgdir"/var/log/radius || exit 1
-	install -d -m0750 -o radius -g radius "$pkgdir"/var/log/radius/radacct || exit 1
-
-	make -j1 R="$pkgdir" install
+	install -d -m0750 -o root -g radius \
+		"${pkgdir}"${radconfdir} || return 1
+	install -d -m0750 -o radius -g radius \
+		"$pkgdir"/var/run/radius || return 1
+	install -d -m0750 -o radius -g radius \
+		"$pkgdir"/var/log/radius || return 1
+	install -d -m0750 -o radius -g radius \
+		"$pkgdir"/var/log/radius/radacct || return 1
+
+	make -j1 R="$pkgdir" install || return 1
 	chown -R root:radius "$pkgdir"/etc/raddb/*
 	rm -f "$pkgdir"/usr/sbin/rc.radiusd
-	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/radiusd || exit 1
-	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/radiusd || exit 1
+	install -m755 -D "$srcdir"/$pkgname.initd \
+		"$pkgdir"/etc/init.d/radiusd || return 1
+	install -m644 -D "$srcdir"/$pkgname.confd \
+		"$pkgdir"/etc/conf.d/radiusd || return 1
 	#Install misses to create this
 	mkdir -p "${pkgdir}"${radmodsconfdir}/sql/ippool-dhcp/postgresql
 	find "$pkgdir" -iname *.la -delete
@@ -103,50 +111,59 @@ _mvdb() {
 	for dir in ippool-dhcp ippool counter main cui; do
 		mkdir -p "${subpkgdir}"${radmodsconfdir}/sql/$dir
 		mv "${pkgdir}"${radmodsconfdir}/sql/$dir/$1 \
-		 "${subpkgdir}"${radmodsconfdir}/sql/$dir || exit 1
+		 "${subpkgdir}"${radmodsconfdir}/sql/$dir || return 1
 	done
 	mkdir -p "${subpkgdir}"${radlibdir}
-	mv "${pkgdir}"${radlibdir}/rlm_sql_${1}.so "${subpkgdir}"${radlibdir} || exit 1
+	mv "${pkgdir}"${radlibdir}/rlm_sql_${1}.so "${subpkgdir}"${radlibdir} \
+		|| return 1
 }
 
 eap() {
 	depends="freeradius3"
 	mkdir -p "${subpkgdir}"${radlibdir}
-	mv "${pkgdir}"${radlibdir}/rlm_eap*.so "${subpkgdir}"${radlibdir} || exit 1
+	mv "${pkgdir}"${radlibdir}/rlm_eap*.so "${subpkgdir}"${radlibdir} \
+		|| return 1
 	mkdir -p "${subpkgdir}"${radmodsdir}
-	mv "${pkgdir}"${radmodsdir}/eap "${subpkgdir}"${radmodsdir} || exit 1
+	mv "${pkgdir}"${radmodsdir}/eap "${subpkgdir}"${radmodsdir} || return 1
+	mkdir -p "${subpkgdir}"${radconfdir}
+	mv "${pkgdir}"${radconfdir}/certs "${subpkgdir}"${radconfdir} || return 1
 }
 
 ldap() {
 	depends="freeradius3"
 	mkdir -p "${subpkgdir}"${radlibdir}
-	mv "${pkgdir}"${radlibdir}/rlm_ldap* "${subpkgdir}"${radlibdir} || exit 1
+	mv "${pkgdir}"${radlibdir}/rlm_ldap* "${subpkgdir}"${radlibdir} \
+		|| return 1
 }
 
 lib() {
 	depends=""
 	mkdir -p "${subpkgdir}"${radlibdir} "${subpkgdir}"${radconfdir} \
-	 "$subpkgdir"/usr/share || exit 1
+	 "$subpkgdir"/usr/share/freeradius || return 1
 	mv "${pkgdir}"${radlibdir}/libfreeradius-*.so \
-	 "${subpkgdir}"${radlibdir} || exit 1
+	 "${subpkgdir}"${radlibdir} || return 1
+	cp "$_builddir"/share/* \
+	 "${subpkgdir}"/usr/share/freeradius || return 1
 }
 
 sql() {
 	depends="freeradius3"
 	mkdir -p "${subpkgdir}"${radlibdir}
 	for lib in sql sqlippool sql_null sqlcounter; do
-		mv "${pkgdir}"${radlibdir}/rlm_${lib}.so "${subpkgdir}"${radlibdir} || exit 1
+		mv "${pkgdir}"${radlibdir}/rlm_${lib}.so \
+			"${subpkgdir}"${radlibdir} || return 1
 	done
 	mkdir -p "${subpkgdir}"${radconfdir}/sites-available
 	mv "${pkgdir}"${radconfdir}/sites-available/buffered-sql \
-	 "${subpkgdir}"${radconfdir}/sites-available || exit 1
+	 "${subpkgdir}"${radconfdir}/sites-available || return 1
 	mkdir -p "${subpkgdir}"${radmodsdir}
-	mv "${pkgdir}"${radmodsdir}/*sql* "${subpkgdir}"${radmodsdir} || exit 1
+	mv "${pkgdir}"${radmodsdir}/*sql* "${subpkgdir}"${radmodsdir} \
+		|| return 1
 }
 
 mysql() {
 	depends="freeradius3-sql"
-	_mvdb mysql || exit 1
+	_mvdb mysql || return 1
 }
 
 mssql() {
@@ -154,75 +171,82 @@ mssql() {
 	arch="noarch"
 	mkdir -p "${subpkgdir}"${radmodsconfdir}/sql/main
 	mv "${pkgdir}"${radmodsconfdir}/sql/main/mssql \
-	 "${subpkgdir}"${radmodsconfdir}/sql/main || exit 1
+	 "${subpkgdir}"${radmodsconfdir}/sql/main || return 1
 }
 
 perl() {
 	depends="freeradius3 perl"
 	mkdir -p "${subpkgdir}"${radlibdir}
-	mv "${pkgdir}"${radlibdir}/rlm_perl* "${subpkgdir}"${radlibdir} || exit 1
+	mv "${pkgdir}"${radlibdir}/rlm_perl* "${subpkgdir}"${radlibdir} \
+		|| return 1
 	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/sbin/checkrad "$subpkgdir"/usr/bin/checkrad || exit 1
+	mv "$pkgdir"/usr/sbin/checkrad "$subpkgdir"/usr/bin/checkrad \
+		|| return 1
 	mkdir -p "${subpkgdir}"${radconfdir}/mods-available
-	mv "${pkgdir}"${radconfdir}/mods-available/perl "${subpkgdir}"${radconfdir}/mods-available/perl || exit 1
+	mv "${pkgdir}"${radconfdir}/mods-available/perl \
+		"${subpkgdir}"${radconfdir}/mods-available/perl || return 1
 }
 
 postgresql() {
 	depends="freeradius3-sql"
-	_mvdb postgresql || exit 1
+	_mvdb postgresql || return 1
 }
 
 python() {
 	depends="freeradius3 python"
 	mkdir -p "${subpkgdir}"${radlibdir}
-	mv "${pkgdir}"${radlibdir}/rlm_python* "${subpkgdir}"${radlibdir} || exit 1
+	mv "${pkgdir}"${radlibdir}/rlm_python* "${subpkgdir}"${radlibdir} \
+		|| return 1
 	for dir in $radmodsdir $radmodsconfdir; do
 		mkdir -p "${subpkgdir}"$dir
-		mv "${pkgdir}"$dir/python "${subpkgdir}"$dir || exit 1
+		mv "${pkgdir}"$dir/python "${subpkgdir}"$dir || return 1
 	done
 }
 
 radclient() {
 	depends=""
 	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/radclient "$subpkgdir"/usr/bin/radclient || exit 1
+	mv "$pkgdir"/usr/bin/radclient "$subpkgdir"/usr/bin/radclient \
+		|| return 1
 }
 
 sqlite() {
 	depends="freeradius3-sql"
-	_mvdb sqlite || exit 1
+	_mvdb sqlite || return 1
 }
 
 unixodbc() {
 	depends="freeradius3"
 	mkdir -p "${subpkgdir}"${radlibdir}
-	mv "${pkgdir}"${radlibdir}/rlm_sql_unixodbc.so "${subpkgdir}"${radlibdir} || exit 1
+	mv "${pkgdir}"${radlibdir}/rlm_sql_unixodbc.so \
+		"${subpkgdir}"${radlibdir} || return 1
 }
 
 pam() {
 	depends="freeradius3"
 	mkdir -p "${subpkgdir}"${radlibdir}
-	mv "${pkgdir}"${radlibdir}/rlm_pam* "${subpkgdir}"${radlibdir} || exit 1
+	mv "${pkgdir}"${radlibdir}/rlm_pam* "${subpkgdir}"${radlibdir} \
+		|| return 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
+d332a0c1fcbab07f50461ae887279df2  freeradius3-301-default-config.patch
+d86558365a1deea4914ed139797805b0  musl-fix-headers.patch
+7097584dba2b344caf5c32475bf8da16  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
+edde20a808ad4c589d456ccf9e693a8ee9922e75366b1187994f0b982e856021  freeradius3-301-default-config.patch
+872aaebf86a663f819460d98924a9dc1f3e428facac6930dc98d1e442df1633f  musl-fix-headers.patch
+a72a0454f047bbbf258ffa90bd496e48cdfd95bc03a3863ab01750382ce566e3  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"
+f32ca8fbd0d082f962c5e42c78742f7b099d2e518ee246003a7860c6d69bad745dcad974b2fb98f8e51ddecb78222f88bc778dd2f33efdb02b3f8e4298ea3e79  freeradius3-301-default-config.patch
+c49e5eec7497fccde5fd09dba1ea9b846e57bc88015bd81640aa531fb5c9b449f37136f42c85fe1d7940c5963aed664b85da28442b388c9fb8cc27873df03b2d  musl-fix-headers.patch
+d027627ac302c39de9342f5f97d2b44752e33d0def311aa5e140e9365b6a501cd5e4f311b1751d5efa3aa63666f07fc58bc222f95bba0a478a7828c6aea07770  disable-cert-generation.patch
+1bf8587bfbf6109cfe8b34ffb4e3100d1d06be24678d9358c0cccc84e84e277822c01117bd4a038b11da35fcb86110588f5bd54177cbd632036977db3a53376d  freeradius3-303-main-log-include.patch"
diff --git a/main/freeradius3/disable-cert-generation.patch b/main/freeradius3/disable-cert-generation.patch
new file mode 100644
index 0000000000..3606c911cd
--- /dev/null
+++ b/main/freeradius3/disable-cert-generation.patch
@@ -0,0 +1,52 @@
+--- 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 @@
+ LOCAL_CERT_FILES :=	Makefile README xpextensions \
+ 			ca.cnf server.cnf client.cnf bootstrap
+ 
+-LOCAL_CERT_PRODUCTS :=	$(addprefix $(R)$(raddbdir)/certs/,ca.key ca.pem \
+-			client.key client.pem server.key server.pem)
+-
+ 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/%,$@)
+ 	@[ -e $@ ] || ln -s $(patsubst $(R)$(raddbdir)/%,./%,$<) $@
+-
+-$(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.
diff --git a/testing/freeradius3/fix-potential-crash-with-SSHA-and-salts.patch b/main/freeradius3/fix-potential-crash-with-SSHA-and-salts.patch
index 29c1a27f2a..29c1a27f2a 100644
--- a/testing/freeradius3/fix-potential-crash-with-SSHA-and-salts.patch
+++ b/main/freeradius3/fix-potential-crash-with-SSHA-and-salts.patch
diff --git a/testing/freeradius3/freeradius3-301-default-config.patch b/main/freeradius3/freeradius3-301-default-config.patch
index 6308879327..dc30a6d436 100644
--- a/testing/freeradius3/freeradius3-301-default-config.patch
+++ b/main/freeradius3/freeradius3-301-default-config.patch
@@ -1,6 +1,48 @@
+--- 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
-@@ -376,8 +376,8 @@
+@@ -415,8 +415,8 @@
  	#  member.  This can allow for some finer-grained access
  	#  controls.
  	#
diff --git a/main/freeradius3/freeradius3-303-main-log-include.patch b/main/freeradius3/freeradius3-303-main-log-include.patch
new file mode 100644
index 0000000000..3f84eb639f
--- /dev/null
+++ b/main/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;
+ 
+ /*
diff --git a/testing/freeradius3/freeradius3.confd b/main/freeradius3/freeradius3.confd
index 9811289ba4..9811289ba4 100644
--- a/testing/freeradius3/freeradius3.confd
+++ b/main/freeradius3/freeradius3.confd
diff --git a/testing/freeradius3/freeradius3.initd b/main/freeradius3/freeradius3.initd
index 251f34ff0a..251f34ff0a 100644
--- a/testing/freeradius3/freeradius3.initd
+++ b/main/freeradius3/freeradius3.initd
diff --git a/testing/freeradius3/freeradius3.pre-install b/main/freeradius3/freeradius3.pre-install
index 30ff04814e..30ff04814e 100644
--- a/testing/freeradius3/freeradius3.pre-install
+++ b/main/freeradius3/freeradius3.pre-install
diff --git a/testing/freeradius3/musl-fix-headers.patch b/main/freeradius3/musl-fix-headers.patch
index cb8f5c0a71..cb8f5c0a71 100644
--- a/testing/freeradius3/musl-fix-headers.patch
+++ b/main/freeradius3/musl-fix-headers.patch
diff --git a/testing/freeradius3/disable-cert-generation.patch b/testing/freeradius3/disable-cert-generation.patch
deleted file mode 100644
index 771787dc30..0000000000
--- a/testing/freeradius3/disable-cert-generation.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- 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
--	@$(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 @@
- .PHONY: TAGS
- TAGS:
- 	etags `find src -type f -name '*.[ch]' -print` > $@
--
--#
--#  Make test certificates.
--#
--.PHONY: certs
--certs:
--	@cd raddb/certs && $(MAKE)
- 
- ######################################################################
- #
---- 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)