gentoo resync : 03.11.2018

4 files changed, 28 insertions, 11 deletions

diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index 66a3a5da9cf9..f7866d0f58a3 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -4,6 +4,6 @@ AUX radius.conf-r4 465 BLAKE2B 1c17f57c088be0612b3db23e8a909d7e1f6fc114d3ff31ee1
 AUX radius.init-r3 734 BLAKE2B ba6918cf5da5ad29ca8062045c3318c2bb30e0a803bc6e6bb9104fe6e8bc2f662bddb4749e6fa57fda55d57ad41b2cb4014d5efcac557a2213f190a5dcc2f7b6 SHA512 826fd3fd576b09e7e590095b1ac63dfaec587a3b46ae1ccdec68134264fb689827aea4a446522bc2a253b9885469b6788a3dddc466ad47483dd62ef67262de49
 DIST freeradius-server-3.0.15.tar.gz 4818244 BLAKE2B 24cded2c4f0c6fc6a6135058c40bb2c9d100a55161f2edfc388efba991ff85ecd0f546bc2008cc0c50f2753cf93ece8e67dc3fc0fe13a8b935193ff1f68514b9 SHA512 9b92045b445032bde9d421499fdc0f6a08d602c501730c31a8d3974b21cc5c12c78abb024ed62a176c7aa7fe260fe1d19386aaf558e0fecfcd3a0ba7aa47499c
 DIST freeradius-server-3.0.17.tar.gz 4843020 BLAKE2B 9e1f54a9f5ad8ede471881ffe4ec987c3ac655a3c39fcd920094760c006102be02f3b7f25b14379a0bac876ac0944e8698c2781bbd804cd22d8b915b6c13a693 SHA512 381222e452288c56a1bf68953be57379a5568f0c92de022abc3004cc6a15078d46535b867b31801de3eb096ba7af92e745e79decfa7cc8151a1ffb371b1aea79
-EBUILD freeradius-3.0.15.ebuild 5995 BLAKE2B 2685b85c868d06961a1d552ff88371b485d090f08806d960a97e302361dad61238ffdacf7fa292403a3f652efe9ceff510ee1c53932bd68869a222dcc354555b SHA512 1dc84e269e26768da54a05a46e7e539b6ba06c5d5fd7ca3fd255457aca3d9e64cc4adc7a7a3d45cbe956c25a698b51bc6f5c20bd6b899e044363887cac1994b4
-EBUILD freeradius-3.0.17.ebuild 6384 BLAKE2B 65d5245912bfc975dd3bc259fe3e3e4ac130e47ce53dfc5f3ba9fe5782e9006e24334471a1997bdf80a603604717b9d318b93dd96b0aa737ae7ded299a32927d SHA512 5257fb0463b00582676a9af1325e8ed977341317bf513615c026799d101816cfb6e6288223f4ba789faa4104fd9a77e50bd0188a57b8c74432423c75107af38a
-MISC metadata.xml 496 BLAKE2B c33709968ac35ff318966b7698ec73d52cf2f34eb4b964d184d7c72cd781266b18630aa929ce76455c871972ba500d6b1b0fbfa2a038d33f2b08c0f41e49b2a1 SHA512 63696cf2d237e124e91f465655f7b94de51a2260b492f8518c37855e07b55e3470f917e769a400f8d7aaa492b00c2f6dd6ca65950175f997ea8c17da3fd5d68d
+EBUILD freeradius-3.0.15.ebuild 6008 BLAKE2B 817e8aebe29f8bee672c3df92f3caab7e00a10f3d0f78688822e61c0fd7414ffff7398a80b72c3f52514c59f420f7b19dd4b8dd716c840e1cabd9c6496a3867e SHA512 f86167e707fbb91a06afeb94a155fae9a786523af31ea33adbf8544fcc2a8f8ca1fb64aa5544e1db5ff24754af0801c4ed0f9e4a037c2f3d17c7c73241049058
+EBUILD freeradius-3.0.17.ebuild 6756 BLAKE2B 432fe8a118dd70f91c7cd89b3178d6b19395815cdfd5c46f0a88b8f52102c3827727a417043439feeb4a3ff8c3e116789ff88e8828e80e7aafd911b19bd81e8f SHA512 48f61cc95b5431642887e62a5acc1f1be656b1d8fc8a5974b5e47858ed0bd472312a4ed70c710311c1330ad3a094de664afd5cabc6fec170a7d0075ea26b7b9b
+MISC metadata.xml 783 BLAKE2B c543f46ba6b40f3a290a1610016a65be011feeb5f9876c44f4c0957580dadef153f90a0779717d435f5f74da66c6ae2b00db43a7f1292c7543a3ec426181ec5d SHA512 77860b155c6fd58008b229cc5ad1b36644efdb9ccddcf1767e36afed25ab975a43726bcde80b17399a19644577212631aa1043e8e6a430a560c33969d8ac613b
diff --git a/net-dialup/freeradius/freeradius-3.0.15.ebuild b/net-dialup/freeradius/freeradius-3.0.15.ebuild
index 5fa080433788..bf595e6d93b7 100644
--- a/net-dialup/freeradius/freeradius-3.0.15.ebuild
+++ b/net-dialup/freeradius/freeradius-3.0.15.ebuild
@@ -34,7 +34,7 @@ RDEPEND="!net-dialup/cistronradius
 	python? ( ${PYTHON_DEPS} )
 	readline? ( sys-libs/readline:0= )
 	pcap? ( net-libs/libpcap )
-	mysql? ( virtual/mysql )
+	mysql? ( dev-db/mysql-connector-c:= )
 	postgres? ( dev-db/postgresql:= )
 	firebird? ( dev-db/firebird )
 	pam? ( virtual/pam )
diff --git a/net-dialup/freeradius/freeradius-3.0.17.ebuild b/net-dialup/freeradius/freeradius-3.0.17.ebuild
index 59c9dfd3515e..8aa7879f35c5 100644
--- a/net-dialup/freeradius/freeradius-3.0.17.ebuild
+++ b/net-dialup/freeradius/freeradius-3.0.17.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 inherit autotools pam python-single-r1 systemd user
 
 MY_P="${PN}-server-${PV}"
@@ -21,10 +21,13 @@ SLOT="0"
 
 IUSE="
 	debug firebird iodbc kerberos ldap libressl memcached mysql odbc oracle pam
-	pcap postgres python readline rest samba sqlite ssl
+	pcap postgres python readline rest samba sqlite ssl redis
 "
 RESTRICT="test firebird? ( bindist )"
 
+# NOTE: Temporary freeradius doesn't support linking with mariadb client
+#       libs also if code is compliant, will be available in the next release.
+#       (http://lists.freeradius.org/pipermail/freeradius-devel/2018-October/013228.html)
 RDEPEND="!net-dialup/cistronradius
 	!net-dialup/gnuradius
 	sys-devel/libtool
@@ -35,12 +38,13 @@ RDEPEND="!net-dialup/cistronradius
 	readline? ( sys-libs/readline:0= )
 	pcap? ( net-libs/libpcap )
 	memcached? ( dev-libs/libmemcached )
-	mysql? ( virtual/mysql )
+	mysql? ( dev-db/mysql-connector-c )
 	postgres? ( dev-db/postgresql:= )
 	firebird? ( dev-db/firebird )
 	pam? ( virtual/pam )
 	rest? ( dev-libs/json-c:= )
 	samba? ( net-fs/samba )
+	redis? ( dev-libs/hiredis:= )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0=[-bindist] )
 		libressl? ( dev-libs/libressl:0= )
@@ -61,8 +65,10 @@ pkg_setup() {
 	enewgroup radius
 	enewuser radius -1 -1 /var/log/radius radius
 
-	python-single-r1_pkg_setup
-	export PYTHONBIN="${EPYTHON}"
+	if use python ; then
+		python-single-r1_pkg_setup
+		export PYTHONBIN="${EPYTHON}"
+	fi
 }
 
 src_prepare() {
@@ -80,6 +86,7 @@ src_prepare() {
 	use pam || { rm -r src/modules/rlm_pam || die ; }
 	use python || { rm -r src/modules/rlm_python || die ; }
 	use rest || { rm -r src/modules/rlm_rest || die ; }
+	use redis || { rm -r src/modules/rlm_redis{,who} || die ; }
 	# can't just nuke rlm_mschap because many modules rely on smbdes.h
 	use samba || { rm -r src/modules/rlm_mschap/{configure,*.mk} || die ; }
 	# Do not install ruby rlm module, bug #483108
@@ -90,7 +97,6 @@ src_prepare() {
 	rm -r src/modules/rlm_eap/types/rlm_eap_tnc || die # requires TNCS library
 	rm -r src/modules/rlm_eap/types/rlm_eap_ikev2 || die # requires libeap-ikev2
 	rm -r src/modules/rlm_opendirectory || die # requires some membership.h
-	rm -r src/modules/rlm_redis{,who} || die # requires redis
 	rm -r src/modules/rlm_sql/drivers/rlm_sql_{db2,freetds} || die
 
 	# sql drivers that are not part of experimental are loaded from a
@@ -201,6 +207,7 @@ src_install() {
 		install
 
 	fowners -R root:radius /etc/raddb
+	fowners -R radius:radius /var/log/radius
 
 	pamd_mimic_system radiusd auth account password session
 
diff --git a/net-dialup/freeradius/metadata.xml b/net-dialup/freeradius/metadata.xml
index abccf7906065..0f82cd9f9ed5 100644
--- a/net-dialup/freeradius/metadata.xml
+++ b/net-dialup/freeradius/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!--maintainer-needed-->
+  <maintainer type="person">
+    <email>geaaru@gmail.com</email>
+    <name>Daniele Rondina</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <use>
     <flag name="memcached">
       Include <pkg>dev-libs/libmemcached</pkg> in caching drivers
@@ -12,5 +19,8 @@
     <flag name="rest">
       Include support for sending and receiving HTTP requests
     </flag>
+    <flag name="redis">
+      Include support for Redis database
+    </flag>
   </use>
 </pkgmetadata>