diff options
| -rw-r--r-- | testing/freeradius3/APKBUILD | 10 | ||||
| -rw-r--r-- | testing/freeradius3/disable-cert-generation.patch | 43 |
2 files changed, 48 insertions, 5 deletions
diff --git a/testing/freeradius3/APKBUILD b/testing/freeradius3/APKBUILD index 96bd7f6e03..ed0c380f0b 100644 --- a/testing/freeradius3/APKBUILD +++ b/testing/freeradius3/APKBUILD @@ -3,7 +3,7 @@ pkgname=freeradius3 _realname=freeradius pkgver=3.0.3 -pkgrel=1 +pkgrel=2 pkgdesc="RADIUS (Remote Authentication Dial-In User Service) server" url="http://freeradius.org/" arch="all" @@ -95,7 +95,7 @@ package() { install -d -m0750 -o radius -g radius \ "$pkgdir"/var/log/radius/radacct || return 1 - make -j1 R="$pkgdir" install + 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 \ @@ -232,19 +232,19 @@ fc6693f3df5a0694610110287a28568a freeradius3.confd 3a50b7f233e74daf3f87da63b3e9579d freeradius3.initd 53b74f75456427a27df9f3489706ae3e freeradius3-301-default-config.patch d86558365a1deea4914ed139797805b0 musl-fix-headers.patch -d4aaf44dd5a8758606d6ace3b63bd4d9 disable-cert-generation.patch +f1e9c97b6ecbdc78ecd2ee84c6568997 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 472279b7831ea85a9d0a2237af8ee0c3235d01c53c08c6152633e6699f6c7990 freeradius3-301-default-config.patch 872aaebf86a663f819460d98924a9dc1f3e428facac6930dc98d1e442df1633f musl-fix-headers.patch -cd71744d71c3b32af5e5ef348c02e63e7905f287a3f043b3c14fc21fdfde8282 disable-cert-generation.patch +d29ed64bcf4d514f254b782b821292d48c44f0dc1112948800f9d4b9229183eb 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 459e47b74c4340edecd544bdb5e0b0720975c2aa7697d2237044812b7d42adb2818d1846b20af77f330972f77ae10f584c8767409202f3e39b2654ee31fd96ab freeradius3-301-default-config.patch c49e5eec7497fccde5fd09dba1ea9b846e57bc88015bd81640aa531fb5c9b449f37136f42c85fe1d7940c5963aed664b85da28442b388c9fb8cc27873df03b2d musl-fix-headers.patch -4b4b4f096d53f1e1274817d0f6d92ab27463e688cc94e17dda1fb22f6e92273e684b59608c135430c7514a8d6a49772a735704ba4227ba2ee5afd7b91f3c3e1f disable-cert-generation.patch +26cb001508bdcf315c4bbf233552bb386b7e9796e041c844296c4fb63965d134882d248efed1030b136fb75c69ac352fcc49b31f92973fa807b17db5375e2865 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 900c446221..8c739ec36f 100644 --- a/testing/freeradius3/disable-cert-generation.patch +++ b/testing/freeradius3/disable-cert-generation.patch @@ -22,3 +22,46 @@ ###################################################################### # +--- a/raddb/all.mk ++++ b/raddb/all.mk +@@ -15,15 +15,9 @@ + + LOCAL_MODULES := $(addprefix raddb/mods-enabled/,$(DEFAULT_MODULES)) + +-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 \ ++RADDB_DIRS := mods-available mods-enabled policy.d \ + sites-available sites-enabled \ + $(patsubst raddb/%,%,$(shell find raddb/mods-config -type d -print)) + +@@ -33,7 +27,6 @@ + # Grab files from the various subdirectories + INSTALL_FILES := $(wildcard raddb/sites-available/* raddb/mods-available/*) \ + $(addprefix raddb/,$(LOCAL_FILES)) \ +- $(addprefix raddb/certs/,$(LOCAL_CERT_FILES)) \ + $(shell find raddb/mods-config -type f -print) \ + $(shell find raddb/policy.d -type f -print) + +@@ -111,15 +104,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. |