gentoo resync : 16.06.2019

4 files changed, 41 insertions, 3 deletions

diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 78a8ccae905e..71696e21b124 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index a553b1819fcc..1d32410a3d8d 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -1,4 +1,5 @@
 AUX freeradius-3.0.18-libressl.patch 2503 BLAKE2B 45b5ca45af2bb145f5876892d02686f0896fb0cdafdf0deb00789e5c927c74b4a6793b9084208a3ae282947241d949ef1a84c621bbd7c9c90907624062d1a1cd SHA512 4dd638736c23af2428481ff6f1dd247f29ee11205bc88b9f59347a9d0baa504f67bc4139c854e52a8ca95a39ab70e72c54bcc58a18f752b07f62bf029626204a
+AUX freeradius-3.0.18-systemd-service.patch 1131 BLAKE2B 468fb9e26d5890c643f8fef2d6677a9d8fea8c6457c7d540ff6f1c7a3a8e9cd91afe67acaf7349e0e8063d8b15bf776e7fb6d005ae397de25dab71619c2af1d6 SHA512 ef28a98720fceeddaeabc5d99b3448322b59ef00848604a872067d9ebdf5288a0d7bdd857436e0769fe9e26c83cc220df9cf569e90a72588e6f2d6c081bbaf48
 AUX freeradius.service 392 BLAKE2B c45290bf56e49244da8f135fb7f1726db7e73d66b24b970926065100e047bd8abcff55d164f5274b092a6735132eca898e271666ed9c9e9062b01fe4ef145f84 SHA512 c2e153f0e8543758dff81835b17c6221ca031fc66f17828b6380d40501c8b6f6ed7e33096218e44326f731245c24386427bb3c9eda48ac185b67104fc878b692
 AUX freeradius.tmpfiles 36 BLAKE2B 612c6ca79a678a3a82114ec142d33aa831b5b19c3e6774b2332334bffbeeb592aeac43d443a5f8fc1380528f3a5de4cfe125eb388d36c0b4f1f7f84f2bfb36bc SHA512 cf364cd860588318d49089946739bb30a6259a5aa7977c768155449fbb495473fe24c1ddccc75dc822e25b1f0d404589d7606590fd2018cc6503dd2767463a7c
 AUX radius.conf-r4 465 BLAKE2B 1c17f57c088be0612b3db23e8a909d7e1f6fc114d3ff31ee1c82f199e3962db57f3042498cf135b3a29c8a730695ed99612e490e0b3253f0644462d28f61215d SHA512 4142869fb61b2938232002c9cb5b843590785560da7db4f2b2a9c9d55c76d0e2d4a6cb946a5347dfa505cd82f5e86c7315cf71f3443a86632090cf4bd025748a
@@ -8,5 +9,5 @@ DIST freeradius-server-3.0.17.tar.gz 4843020 BLAKE2B 9e1f54a9f5ad8ede471881ffe4e
 DIST freeradius-server-3.0.18.tar.gz 4884192 BLAKE2B 21df490f5eba4e0eca42127181fa02a9451abf5fc2b0d7c5e6d0c5c287eda739585500a31f480dccc618c3bbb4096fbe9258c1b2d3a2047951abf85d68784862 SHA512 b81c40cd22170adb1126b9dde6dd84411dfafce33e27da6c4665cb4fc524aab854a7cd4c80757db50899604d7980aec7216e1c53b8184af482c7113692a26458
 EBUILD freeradius-3.0.15.ebuild 6062 BLAKE2B a1f47e8b6f571769d697910b6a402b537cad200991436ade1c65b9da7e3f842c58a2f3dc32c7c31d56878683fe6474dab40823b931d41452011ef7a1e92cbeee SHA512 8e871943ae4a31e098568e44d72fc2717efb463f7382a5b63340857e3cdec4819ecf916cd6829a8f02c1d31ad180944a81f27622a53af44afb767ff2dfb3d48f
 EBUILD freeradius-3.0.17.ebuild 6739 BLAKE2B f8fc308368fce5bfd3d5a87cc07612ab919aef79760b6b272cb3df0c269ba701ffac537d65ac9196d94ca5928e19d4f4f2110152ce26b03d3b1484b149474138 SHA512 7170084ab9faed0a110d534558c3f72e3cb2c86450105eda9f3140e66e6c8a02d140eee5591f55bc7a50e787d92f4ed3c6713c7b418e3b05a61a9d751fed3e24
-EBUILD freeradius-3.0.18.ebuild 6841 BLAKE2B 4ccf3c6284fac6d1c1213c87119603f5c7683c58e025eae3db130c00e28ecab16dc066b3e94a2f45d19ad66efe2c99bd5012812b7ea196490d6a8fe566b21e35 SHA512 639d6e082b1b6a3247d299a9cd01b27f95ed4094e131b95e14db24f2e4ae4ed69a59d88d3af927094983d2d7e74d7c85d5a03d6687e830bce6410cc93aaf4e5d
+EBUILD freeradius-3.0.18-r1.ebuild 6884 BLAKE2B b4902a65a693dcf7d72690516396424836ad81c2093126d1e9eee44c10e2714dac7f7c849a17cff94a9cafb12d0bc0fddc4834a1f0e705bb6b235c6222f01d20 SHA512 209e8f233122c5696621aa1fb5f273ee51df47d4f2984f46ed02f25e0d764b9693874f9c43fc56ff562ece4c21008a2f2b1423eea26bc4e0f9e73a08fa409782
 MISC metadata.xml 783 BLAKE2B c543f46ba6b40f3a290a1610016a65be011feeb5f9876c44f4c0957580dadef153f90a0779717d435f5f74da66c6ae2b00db43a7f1292c7543a3ec426181ec5d SHA512 77860b155c6fd58008b229cc5ad1b36644efdb9ccddcf1767e36afed25ab975a43726bcde80b17399a19644577212631aa1043e8e6a430a560c33969d8ac613b
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
new file mode 100644
index 000000000000..3da4b422f5d9
--- /dev/null
+++ b/net-dialup/freeradius/files/freeradius-3.0.18-systemd-service.patch
@@ -0,0 +1,34 @@
+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/freeradius-3.0.18.ebuild b/net-dialup/freeradius/freeradius-3.0.18-r1.ebuild
index 6b772f41f1fd..44d5b7baa7ed 100644
--- a/net-dialup/freeradius/freeradius-3.0.18.ebuild
+++ b/net-dialup/freeradius/freeradius-3.0.18-r1.ebuild
@@ -60,7 +60,10 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}"/${P}-libressl.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-libressl.patch
+	"${FILESDIR}"/${P}-systemd-service.patch
+)
 
 pkg_setup() {
 	enewgroup radius
@@ -220,7 +223,7 @@ src_install() {
 	newconfd "${FILESDIR}/radius.conf-r4" radiusd
 
 	systemd_newtmpfilesd "${FILESDIR}"/freeradius.tmpfiles freeradius.conf
-	systemd_dounit "${FILESDIR}"/freeradius.service
+	systemd_dounit "${S}"/debian/freeradius.service
 
 	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
 }