From f353cc14de7474efb944621675e4681d724d2215 Mon Sep 17 00:00:00 2001
From: Alarig Le Lay <alarig@swordarmor.fr>
Date: Mon, 30 Jan 2023 13:55:29 +0100
Subject: [PATCH] =?UTF-8?q?net-dialup/freeradius/files:=20C=E2=80=99est=20?=
 =?UTF-8?q?pas=20facile=20la=20vie?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 net-dialup/freeradius/files/radius.conf-r4    | 16 ----------
 .../files/{radius.conf-r5 => radius.conf-r6}  |  6 +++-
 net-dialup/freeradius/files/radius.init-r3    | 31 -------------------
 3 files changed, 5 insertions(+), 48 deletions(-)
 delete mode 100644 net-dialup/freeradius/files/radius.conf-r4
 rename net-dialup/freeradius/files/{radius.conf-r5 => radius.conf-r6} (76%)
 delete mode 100644 net-dialup/freeradius/files/radius.init-r3

diff --git a/net-dialup/freeradius/files/radius.conf-r4 b/net-dialup/freeradius/files/radius.conf-r4
deleted file mode 100644
index a5760d2..0000000
--- a/net-dialup/freeradius/files/radius.conf-r4
+++ /dev/null
@@ -1,16 +0,0 @@
-# Config file for /etc/init.d/radiusd
-
-# see man pages for radiusd run `radiusd -h`
-# for valid cmdline options
-#RADIUSD_OPTS=""
-
-# Change this value if you change it in /etc/raddb/radiusd.conf
-pidfile=/var/run/radiusd/radiusd.pid
-
-# Change these values if you change them in /etc/raddb/radiusd.conf
-RADIUSD_USER=radius
-RADIUSD_GROUP=radius
-
-# If you set up logging to syslog in /etc/raddb/radiusd.conf, you want
-# to uncomment the following line.
-#rc_use="logger"
diff --git a/net-dialup/freeradius/files/radius.conf-r5 b/net-dialup/freeradius/files/radius.conf-r6
similarity index 76%
rename from net-dialup/freeradius/files/radius.conf-r5
rename to net-dialup/freeradius/files/radius.conf-r6
index 7114c32..50d2a1c 100644
--- a/net-dialup/freeradius/files/radius.conf-r5
+++ b/net-dialup/freeradius/files/radius.conf-r6
@@ -5,7 +5,7 @@
 #RADIUSD_OPTS=""
 
 # Change this value if you change it in /etc/raddb/radiusd.conf
-pidfile=/var/run/radiusd/radiusd.pid
+pidfile=/run/radiusd/radiusd.pid
 
 # Change these values if you change them in /etc/raddb/radiusd.conf
 RADIUSD_USER=radius
@@ -16,3 +16,7 @@ RADIUSD_LOGPATH=/var/log/radius
 # If you set up logging to syslog in /etc/raddb/radiusd.conf, you want
 # to uncomment the following line.
 #rc_use="logger"
+
+# If you use ldap, start the ldap server prior to FreeRADIUS to avoid
+# startup crashes.
+#rc_use="ldap"
diff --git a/net-dialup/freeradius/files/radius.init-r3 b/net-dialup/freeradius/files/radius.init-r3
deleted file mode 100644
index 9c16ac5..0000000
--- a/net-dialup/freeradius/files/radius.init-r3
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command=/usr/sbin/radiusd
-command_args="${RADIUSD_OPTS}"
-pidfile="${pidfile:-/run/radiusd/radiusd.pid}"
-extra_started_commands="reload"
-
-depend() {
-	need localmount
-	use dns
-}
-
-start_pre() {
-	if [ ! -f /etc/raddb/radiusd.conf ] ; then
-		eerror "No /etc/raddb/radiusd.conf file exists!"
-		return 1
-	fi
-
-	checkpath -m0750 -o "${RADIUSD_USER:-root}:${RADIUSD_GROUP:-root}" -d \
-		$(dirname ${pidfile}) /var/log/radius
-	checkpath -m0750 -o "${RADIUSD_USER:-root}:${RADIUSD_GROUP:-root}" -d \
-		$(dirname ${pidfile}) /run/radiusd
-}
-
-reload() {
-	ebegin "Reloading radiusd"
-	kill -HUP $(cat ${pidfile})
-	eend $?
-}