commit: 61773bc879afe76a4b00c2e5e0670b37fe956985 Author: Daniele Rondina <geaaru <AT> gmail <DOT> com> AuthorDate: Sun Oct 21 07:05:44 2018 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Tue Oct 30 08:51:01 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61773bc8
net-dialup/freeradius: Add support to redis and py3 Fix call to python-single-r1_pkg_setup only if use flag python is set. Signed-off-by: Daniele Rondina <geaaru <AT> gmail.com> Package-Manager: Portage-2.3.40, Repoman-2.3.9 Closes: https://github.com/gentoo/gentoo/pull/10176 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> net-dialup/freeradius/freeradius-3.0.17.ebuild | 14 +++++++++----- net-dialup/freeradius/metadata.xml | 3 +++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/net-dialup/freeradius/freeradius-3.0.17.ebuild b/net-dialup/freeradius/freeradius-3.0.17.ebuild index 92b83344ad5..8aa7879f35c 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,7 +21,7 @@ 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 )" @@ -44,6 +44,7 @@ RDEPEND="!net-dialup/cistronradius 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= ) @@ -64,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() { @@ -83,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 @@ -93,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 @@ -204,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 14d04cc60c0..0f82cd9f9ed 100644 --- a/net-dialup/freeradius/metadata.xml +++ b/net-dialup/freeradius/metadata.xml @@ -19,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>
