From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1054910-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 4C7E1138334
for <garchives@archives.gentoo.org>; Tue, 30 Oct 2018 08:55:32 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 00036E088A;
Tue, 30 Oct 2018 08:55:29 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id AE6B5E088A
for <gentoo-commits@lists.gentoo.org>; Tue, 30 Oct 2018 08:55:29 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 87E57335CB7
for <gentoo-commits@lists.gentoo.org>; Tue, 30 Oct 2018 08:55:27 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id BE801451
for <gentoo-commits@lists.gentoo.org>; Tue, 30 Oct 2018 08:55:25 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" <mgorny@gentoo.org>
Message-ID: <1540889461.61773bc879afe76a4b00c2e5e0670b37fe956985.mgorny@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-dialup/freeradius/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-dialup/freeradius/freeradius-3.0.17.ebuild net-dialup/freeradius/metadata.xml
X-VCS-Directories: net-dialup/freeradius/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: 61773bc879afe76a4b00c2e5e0670b37fe956985
X-VCS-Branch: master
Date: Tue, 30 Oct 2018 08:55:25 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: a2221a66-11b7-4633-9c89-a4b6d5ef0b67
X-Archives-Hash: 536481d5df9c9c1978132014e8115be7
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>