CVS commit: pkgsrc/net/freeradius

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Wed Jul 20 01:19:55 UTC 2022

Modified Files:
        pkgsrc/net/freeradius: DEINSTALL INSTALL Makefile config.mk

Log Message:
freeradius: correct config installation and de-installation

The script that un-installs the configuration content placed under the
PKG_SYSCONFDIR wasn't removing one of the files that's installed. (This
had been incorrect since it was added to the installation script back
in 2017.)

Separately, simplify the previous changes I made to fix installation of
configuration files to PKG_SYSCONFDIR. I had used redundancy to force
certain directories necessary for startup to be present and populated,
but the pre-existing code in the scripts had almost all of it covered,
just not the creation of the directories themselves and a single file.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/freeradius/DEINSTALL
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/freeradius/INSTALL
cvs rdiff -u -r1.115 -r1.116 pkgsrc/net/freeradius/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/freeradius/config.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/freeradius/DEINSTALL
diff -u pkgsrc/net/freeradius/DEINSTALL:1.3 pkgsrc/net/freeradius/DEINSTALL:1.4
--- pkgsrc/net/freeradius/DEINSTALL:1.3 Mon Dec 30 18:17:22 2019
+++ pkgsrc/net/freeradius/DEINSTALL     Wed Jul 20 01:19:55 2022
@@ -1,4 +1,4 @@
-# $NetBSD: DEINSTALL,v 1.3 2019/12/30 18:17:22 adam Exp $
+# $NetBSD: DEINSTALL,v 1.4 2022/07/20 01:19:55 gutteridge Exp $
 #
 # Remove default symlinks in ${PKG_SYSCONFDIR} for enabled modules/sites
 #
@@ -7,7 +7,7 @@ SITES_ENABLED="default inner-tunnel"
 MODS_ENABLED="always attr_filter cache_eap chap date detail detail.log
              digest dynamic_clients eap echo exec expiration expr
              files linelog logintime mschap ntlm_auth pap passwd preprocess
-             radutmp realm replicate soh sradutmp unix unpack utf8"
+             radutmp realm replicate soh sradutmp totp unix unpack utf8"
 
 case ${STAGE} in
 DEINSTALL)
@@ -19,8 +19,9 @@ DEINSTALL)
            ${RM} -f @PKG_SYSCONFDIR@/mods-enabled/${m}
        done
        ${RMDIR} @PKG_SYSCONFDIR@/sites-enabled
-       ${RMDIR} @PKG_SYSCONFDIR@/mods-enabled  
+       ${RMDIR} @PKG_SYSCONFDIR@/mods-enabled
        ${RM} @PKG_SYSCONFDIR@/hints
        ${RM} @PKG_SYSCONFDIR@/huntgroups
+       ${RM} @PKG_SYSCONFDIR@/users
        ;;
 esac

Index: pkgsrc/net/freeradius/INSTALL
diff -u pkgsrc/net/freeradius/INSTALL:1.2 pkgsrc/net/freeradius/INSTALL:1.3
--- pkgsrc/net/freeradius/INSTALL:1.2   Thu Apr 12 01:21:07 2018
+++ pkgsrc/net/freeradius/INSTALL       Wed Jul 20 01:19:55 2022
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.2 2018/04/12 01:21:07 nonaka Exp $
+# $NetBSD: INSTALL,v 1.3 2022/07/20 01:19:55 gutteridge Exp $
 #
 # Create default symlinks in ${PKG_SYSCONFDIR} for enabled modules/sites
 #
@@ -7,7 +7,7 @@ SITES_ENABLED="default inner-tunnel"
 MODS_ENABLED="always attr_filter cache_eap chap date detail detail.log
              digest dynamic_clients eap echo exec expiration expr
              files linelog logintime mschap ntlm_auth pap passwd preprocess
-             radutmp realm replicate soh sradutmp unix unpack utf8"
+             radutmp realm replicate soh sradutmp totp unix unpack utf8"
 
 case ${STAGE} in
 POST-INSTALL)

Index: pkgsrc/net/freeradius/Makefile
diff -u pkgsrc/net/freeradius/Makefile:1.115 pkgsrc/net/freeradius/Makefile:1.116
--- pkgsrc/net/freeradius/Makefile:1.115        Tue Jun 28 11:34:59 2022
+++ pkgsrc/net/freeradius/Makefile      Wed Jul 20 01:19:55 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.115 2022/06/28 11:34:59 wiz Exp $
+# $NetBSD: Makefile,v 1.116 2022/07/20 01:19:55 gutteridge Exp $
 
 .include "Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/-server//}
-PKGREVISION=   2
+PKGREVISION=   3
 COMMENT=       Free RADIUS server implementation
 
 BUILD_DEFS+=           VARBASE

Index: pkgsrc/net/freeradius/config.mk
diff -u pkgsrc/net/freeradius/config.mk:1.4 pkgsrc/net/freeradius/config.mk:1.5
--- pkgsrc/net/freeradius/config.mk:1.4 Tue Apr 12 01:02:47 2022
+++ pkgsrc/net/freeradius/config.mk     Wed Jul 20 01:19:55 2022
@@ -1,6 +1,10 @@
-# $NetBSD: config.mk,v 1.4 2022/04/12 01:02:47 gutteridge Exp $
+# $NetBSD: config.mk,v 1.5 2022/07/20 01:19:55 gutteridge Exp $
 
-# cd ${DESTDIR}${EGDIR}/raddb; find . -type f -or -type l | sort | sed 's,^./,EGFILES+=\t,'
+# cd ${DESTDIR}${EGDIR}/raddb; find . -type f | sort | sed 's,^./,EGFILES+=\t,'
+#
+# Separately, any symlinks intended to be placed in the mods-enabled or
+# sites-enabled directories must be added to the respective variables in the
+# INSTALL and DEINSTALL scripts.
 EGFILES+=      README.rst
 EGFILES+=      certs/Makefile
 EGFILES+=      certs/README.md
@@ -195,37 +199,6 @@ EGFILES+=  mods-config/sql/moonshot-targe
 EGFILES+=      mods-config/sql/moonshot-targeted-ids/sqlite/queries.conf
 EGFILES+=      mods-config/sql/moonshot-targeted-ids/sqlite/schema.sql
 EGFILES+=      mods-config/unbound/default.conf
-EGFILES+=      mods-enabled/always
-EGFILES+=      mods-enabled/attr_filter
-EGFILES+=      mods-enabled/cache_eap
-EGFILES+=      mods-enabled/chap
-EGFILES+=      mods-enabled/date
-EGFILES+=      mods-enabled/detail
-EGFILES+=      mods-enabled/detail.log
-EGFILES+=      mods-enabled/digest
-EGFILES+=      mods-enabled/dynamic_clients
-EGFILES+=      mods-enabled/eap
-EGFILES+=      mods-enabled/echo
-EGFILES+=      mods-enabled/exec
-EGFILES+=      mods-enabled/expiration
-EGFILES+=      mods-enabled/expr
-EGFILES+=      mods-enabled/files
-EGFILES+=      mods-enabled/linelog
-EGFILES+=      mods-enabled/logintime
-EGFILES+=      mods-enabled/mschap
-EGFILES+=      mods-enabled/ntlm_auth
-EGFILES+=      mods-enabled/pap
-EGFILES+=      mods-enabled/passwd
-EGFILES+=      mods-enabled/preprocess
-EGFILES+=      mods-enabled/radutmp
-EGFILES+=      mods-enabled/realm
-EGFILES+=      mods-enabled/replicate
-EGFILES+=      mods-enabled/soh
-EGFILES+=      mods-enabled/sradutmp
-EGFILES+=      mods-enabled/totp
-EGFILES+=      mods-enabled/unix
-EGFILES+=      mods-enabled/unpack
-EGFILES+=      mods-enabled/utf8
 EGFILES+=      panic.gdb
 EGFILES+=      policy.d/abfab-tr
 EGFILES+=      policy.d/accounting
@@ -269,8 +242,6 @@ EGFILES+=   sites-available/tls
 EGFILES+=      sites-available/totp
 EGFILES+=      sites-available/virtual.example.com
 EGFILES+=      sites-available/vmps
-EGFILES+=      sites-enabled/default
-EGFILES+=      sites-enabled/inner-tunnel
 EGFILES+=      templates.conf
 EGFILES+=      trigger.conf