From 38423c67c8a23f6a1bc42038193182e2da3116eb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Apr 2020 11:37:10 +0100 Subject: gentoo resync : 25.04.2020 --- .../files/freeradius-3.0.18-systemd-service.patch | 34 -------------- .../files/freeradius-3.0.19-systemd-service.patch | 53 ---------------------- net-dialup/freeradius/files/freeradius.service | 15 ------ 3 files changed, 102 deletions(-) delete mode 100644 net-dialup/freeradius/files/freeradius-3.0.18-systemd-service.patch delete mode 100644 net-dialup/freeradius/files/freeradius-3.0.19-systemd-service.patch delete mode 100644 net-dialup/freeradius/files/freeradius.service (limited to 'net-dialup/freeradius/files') diff --git a/net-dialup/freeradius/files/freeradius-3.0.18-systemd-service.patch b/net-dialup/freeradius/files/freeradius-3.0.18-systemd-service.patch deleted file mode 100644 index 3da4b422f5d9..000000000000 --- a/net-dialup/freeradius/files/freeradius-3.0.18-systemd-service.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/debian/freeradius.service b/debian/freeradius.service -index 99873c0..97efc66 100644 ---- a/debian/freeradius.service -+++ b/debian/freeradius.service -@@ -17,12 +17,26 @@ Environment=HOSTNAME=%H - # a leak somewhere. - MemoryLimit=2G - --RuntimeDirectory=freeradius -+RuntimeDirectory=radiusd - RuntimeDirectoryMode=0775 --ExecStartPre=/usr/sbin/freeradius $FREERADIUS_OPTIONS -Cx -lstdout --ExecStart=/usr/sbin/freeradius $FREERADIUS_OPTIONS -+Group=radius -+User=radius -+ExecStartPre=/usr/sbin/radiusd $RADIUSD_OPTS -Cx -lstdout -+ExecStart=/usr/sbin/radiusd -f $RADIUSD_OPTS -+ExecReload=/usr/sbin/radiusd -C $RADIUSD_OPTS -+ExecReload=/bin/kill -HUP $MAINPID - Restart=on-failure - RestartSec=5 -+ReadOnlyDirectories=/etc/raddb/ -+ReadWriteDirectories=/var/log/radius/ -+# Security options (https://github.com/FreeRADIUS/freeradius-server/issues/2637) -+NoNewPrivileges=true -+CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET_RAW -+PrivateTmp=true -+ProtectControlGroups=true -+ProtectKernelModules=true -+ProtectKernelTunables=true -+SystemCallArchitectures=native - - [Install] - WantedBy=multi-user.target diff --git a/net-dialup/freeradius/files/freeradius-3.0.19-systemd-service.patch b/net-dialup/freeradius/files/freeradius-3.0.19-systemd-service.patch deleted file mode 100644 index 37b67dfb21a5..000000000000 --- a/net-dialup/freeradius/files/freeradius-3.0.19-systemd-service.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- a/debian/freeradius.service 2019-12-01 10:02:31.453150556 +0100 -+++ b/debian/freeradius.service 2019-12-01 10:08:16.781370632 +0100 -@@ -4,11 +4,10 @@ - Documentation=man:radiusd(8) man:radiusd.conf(5) http://wiki.freeradius.org/ http://networkradius.com/doc/ - - [Service] --Type=notify --WatchdogSec=60 --NotifyAccess=all --PIDFile=/run/freeradius/freeradius.pid --EnvironmentFile=-/etc/default/freeradius -+# In 3.0.19 SystemD integration is broken. -+# Type=notify -+# WatchdogSec=60 -+# NotifyAccess=all - - # FreeRADIUS can do static evaluation of policy language rules based - # on environmental variables which is very useful for doing per-host -@@ -26,17 +25,27 @@ - # Ensure the daemon can still write its pidfile after it drops - # privileges. Combination of options that work on a variety of - # systems. Test very carefully if you alter these lines. --RuntimeDirectory=freeradius -+RuntimeDirectory=radiusd - RuntimeDirectoryMode=0775 - # This does not work on Debian Jessie: --Group=freerad --# This does not work on Ubuntu Bionic: --ExecStartPre=/bin/chown freerad:freerad /var/run/freeradius -- --ExecStartPre=/usr/sbin/freeradius $FREERADIUS_OPTIONS -Cx -lstdout --ExecStart=/usr/sbin/freeradius $FREERADIUS_OPTIONS -+Group=radius -+User=radius -+ExecStartPre=/usr/sbin/radiusd $RADIUSD_OPTS -Cx -lstdout -+ExecStart=/usr/sbin/radiusd -f $RADIUSD_OPTS -+ExecReload=/usr/sbin/radiusd -C $RADIUSD_OPTS -+ExecReload=/bin/kill -HUP $MAINPID - Restart=on-failure - RestartSec=5 -+ReadOnlyDirectories=/etc/raddb/ -+ReadWriteDirectories=/var/log/radius/ -+# Security options (https://github.com/FreeRADIUS/freeradius-server/issues/2637) -+NoNewPrivileges=true -+CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET_RAW -+PrivateTmp=true -+ProtectControlGroups=true -+ProtectKernelModules=true -+ProtectKernelTunables=true -+SystemCallArchitectures=native - - [Install] - WantedBy=multi-user.target diff --git a/net-dialup/freeradius/files/freeradius.service b/net-dialup/freeradius/files/freeradius.service deleted file mode 100644 index 5304f076119b..000000000000 --- a/net-dialup/freeradius/files/freeradius.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=FreeRADIUS high performance RADIUS server. -After=syslog.target network.target - -[Service] -Type=simple -PIDFile=/run/radiusd/radiusd.pid -ExecStartPre=-/bin/chown -R radius.radius /run/radiusd -ExecStartPre=/usr/sbin/radiusd -C -ExecStart=/usr/sbin/radiusd -d /etc/raddb -f -ExecReload=/usr/sbin/radiusd -C -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target -- cgit v1.2.3