main/freeradius: tell install that we are building a package

2 files changed, 2 insertions, 33 deletions

diff --git a/main/freeradius/APKBUILD b/main/freeradius/APKBUILD
index c7f7611d63..1a32e8ce98 100644
--- a/main/freeradius/APKBUILD
+++ b/main/freeradius/APKBUILD
@@ -5,7 +5,7 @@
 pkgname=freeradius
 _realname=freeradius
 pkgver=3.0.11
-pkgrel=0
+pkgrel=1
 pkgdesc="RADIUS (Remote Authentication Dial-In User Service) server"
 url="http://freeradius.org/"
 arch="all"
@@ -29,7 +29,6 @@ source="ftp://ftp.freeradius.org/pub/freeradius/$_realname-server-$pkgver.tar.gz
         $pkgname.initd
 
         musl-fix-headers.patch
-        disable-cert-generation.patch
         freeradius-305-default-config.patch
         fix-scopeid.patch
         "
@@ -109,7 +108,7 @@ package() {
         install -d -m0750 -o radius -g radius \
                 "$pkgdir"/var/log/radius/radacct || return 1
 
-        make -j1 R="$pkgdir" install || return 1
+        PACKAGE=yes 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 \
@@ -296,20 +295,17 @@ md5sums="9428ba0d25293a2b5acd3b85f3dd46d0  freeradius-server-3.0.11.tar.gz
 fc6693f3df5a0694610110287a28568a  freeradius.confd
 e27f11a11fa167b5185d3e11de79d3bc  freeradius.initd
 d86558365a1deea4914ed139797805b0  musl-fix-headers.patch
-ecd9ecfba4cf86a203de6faf8398c44a  disable-cert-generation.patch
 f8a7b00835f2108acc06af212cede16e  freeradius-305-default-config.patch
 5171fca6629baeb274a9b17e02683163  fix-scopeid.patch"
 sha256sums="b97b72915315f2dcd34001af2c1737947f91ad9104a40408b92b030356e25d59  freeradius-server-3.0.11.tar.gz
 2d5b3e1af1299373182f2c8021bdf45c29db5d82b0a077b965a16ded32cb6292  freeradius.confd
 a5208f13420c28446b85dfc48cb9193a4651c994d15cc2c9b0bc43734c66e8f0  freeradius.initd
 872aaebf86a663f819460d98924a9dc1f3e428facac6930dc98d1e442df1633f  musl-fix-headers.patch
-008fa3a4da7b3c01df238bf492a8ccda4077289c02c553a60ad8f4439ec136a2  disable-cert-generation.patch
 02cad546ffaf3f9be531cb45b96c7fb31f83c717e40ece4ff28a73c86f921f33  freeradius-305-default-config.patch
 aad4796f06a5891b3d48d6ded926ffeb7b9fa84cc1c4a1f1be76bced02694023  fix-scopeid.patch"
 sha512sums="451ba4052db68f9855aff96e12df282b31a98973361001f393dac23cb030274d9d9fb9ae85f7feef077e69d7d57152e427fb861892c8fd700b3e17e3389fea64  freeradius-server-3.0.11.tar.gz
 e248159c0a44f722e405c51c8015d9ad672e42ad0d38ca28f8a051ff911aa4d3e630b9bd4543e9d610940bc4ae50c022594e219ce341b36abe85c572acad418b  freeradius.confd
 ba3c424d4eabb147c7aa3e31575a87ddb26b6a792d2a8714e73d8763e07854326a03a83991a7420246ca06bf0b93d0a6f23ec198f5e48647f9d25b40067e852a  freeradius.initd
 c49e5eec7497fccde5fd09dba1ea9b846e57bc88015bd81640aa531fb5c9b449f37136f42c85fe1d7940c5963aed664b85da28442b388c9fb8cc27873df03b2d  musl-fix-headers.patch
-09b78c6baa992f82ab81c43aad6792536a4708d460170f0a373e242a5fafe8db10662dc7fcef99a966b828ed91fa7fe38567c961c938de9a447f1ee03aebb142  disable-cert-generation.patch
 b69b899da6f80dbdb7422847536e37461315ba587a07fedc1eee28b96be7d16993b758ccd34e3a271ce2937d72c6ddff878aec61a3a4c0750deaaa959d10ed5e  freeradius-305-default-config.patch
 41d478c0e40ff82fc36232964037c1ab8ffca9fdbb7dca02ed49319906e751c133b5d7bc7773c645cec6d9d39d1de69cba25e8d59afa8d6662563dd17f35f234  fix-scopeid.patch"
diff --git a/main/freeradius/disable-cert-generation.patch b/main/freeradius/disable-cert-generation.patch
deleted file mode 100644
index 69cc13b5c4..0000000000
--- a/main/freeradius/disable-cert-generation.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- 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 \
-@@ -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/%,$@) $@
- else
- $(R)$(raddbdir)/certs/bootstrap:
-        @echo INSTALL $(patsubst $(R)$(raddbdir)/%,raddb/%,$@)