| 1 |
commit: 61773bc879afe76a4b00c2e5e0670b37fe956985 |
| 2 |
Author: Daniele Rondina <geaaru <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Oct 21 07:05:44 2018 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 30 08:51:01 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61773bc8 |
| 7 |
|
| 8 |
net-dialup/freeradius: Add support to redis and py3 |
| 9 |
|
| 10 |
Fix call to python-single-r1_pkg_setup only if use flag |
| 11 |
python is set. |
| 12 |
|
| 13 |
Signed-off-by: Daniele Rondina <geaaru <AT> gmail.com> |
| 14 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 15 |
Closes: https://github.com/gentoo/gentoo/pull/10176 |
| 16 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 17 |
|
| 18 |
net-dialup/freeradius/freeradius-3.0.17.ebuild | 14 +++++++++----- |
| 19 |
net-dialup/freeradius/metadata.xml | 3 +++ |
| 20 |
2 files changed, 12 insertions(+), 5 deletions(-) |
| 21 |
|
| 22 |
diff --git a/net-dialup/freeradius/freeradius-3.0.17.ebuild b/net-dialup/freeradius/freeradius-3.0.17.ebuild |
| 23 |
index 92b83344ad5..8aa7879f35c 100644 |
| 24 |
--- a/net-dialup/freeradius/freeradius-3.0.17.ebuild |
| 25 |
+++ b/net-dialup/freeradius/freeradius-3.0.17.ebuild |
| 26 |
@@ -3,7 +3,7 @@ |
| 27 |
|
| 28 |
EAPI=6 |
| 29 |
|
| 30 |
-PYTHON_COMPAT=( python2_7 ) |
| 31 |
+PYTHON_COMPAT=( python{2_7,3_5,3_6} ) |
| 32 |
inherit autotools pam python-single-r1 systemd user |
| 33 |
|
| 34 |
MY_P="${PN}-server-${PV}" |
| 35 |
@@ -21,7 +21,7 @@ SLOT="0" |
| 36 |
|
| 37 |
IUSE=" |
| 38 |
debug firebird iodbc kerberos ldap libressl memcached mysql odbc oracle pam |
| 39 |
- pcap postgres python readline rest samba sqlite ssl |
| 40 |
+ pcap postgres python readline rest samba sqlite ssl redis |
| 41 |
" |
| 42 |
RESTRICT="test firebird? ( bindist )" |
| 43 |
|
| 44 |
@@ -44,6 +44,7 @@ RDEPEND="!net-dialup/cistronradius |
| 45 |
pam? ( virtual/pam ) |
| 46 |
rest? ( dev-libs/json-c:= ) |
| 47 |
samba? ( net-fs/samba ) |
| 48 |
+ redis? ( dev-libs/hiredis:= ) |
| 49 |
ssl? ( |
| 50 |
!libressl? ( dev-libs/openssl:0=[-bindist] ) |
| 51 |
libressl? ( dev-libs/libressl:0= ) |
| 52 |
@@ -64,8 +65,10 @@ pkg_setup() { |
| 53 |
enewgroup radius |
| 54 |
enewuser radius -1 -1 /var/log/radius radius |
| 55 |
|
| 56 |
- python-single-r1_pkg_setup |
| 57 |
- export PYTHONBIN="${EPYTHON}" |
| 58 |
+ if use python ; then |
| 59 |
+ python-single-r1_pkg_setup |
| 60 |
+ export PYTHONBIN="${EPYTHON}" |
| 61 |
+ fi |
| 62 |
} |
| 63 |
|
| 64 |
src_prepare() { |
| 65 |
@@ -83,6 +86,7 @@ src_prepare() { |
| 66 |
use pam || { rm -r src/modules/rlm_pam || die ; } |
| 67 |
use python || { rm -r src/modules/rlm_python || die ; } |
| 68 |
use rest || { rm -r src/modules/rlm_rest || die ; } |
| 69 |
+ use redis || { rm -r src/modules/rlm_redis{,who} || die ; } |
| 70 |
# can't just nuke rlm_mschap because many modules rely on smbdes.h |
| 71 |
use samba || { rm -r src/modules/rlm_mschap/{configure,*.mk} || die ; } |
| 72 |
# Do not install ruby rlm module, bug #483108 |
| 73 |
@@ -93,7 +97,6 @@ src_prepare() { |
| 74 |
rm -r src/modules/rlm_eap/types/rlm_eap_tnc || die # requires TNCS library |
| 75 |
rm -r src/modules/rlm_eap/types/rlm_eap_ikev2 || die # requires libeap-ikev2 |
| 76 |
rm -r src/modules/rlm_opendirectory || die # requires some membership.h |
| 77 |
- rm -r src/modules/rlm_redis{,who} || die # requires redis |
| 78 |
rm -r src/modules/rlm_sql/drivers/rlm_sql_{db2,freetds} || die |
| 79 |
|
| 80 |
# sql drivers that are not part of experimental are loaded from a |
| 81 |
@@ -204,6 +207,7 @@ src_install() { |
| 82 |
install |
| 83 |
|
| 84 |
fowners -R root:radius /etc/raddb |
| 85 |
+ fowners -R radius:radius /var/log/radius |
| 86 |
|
| 87 |
pamd_mimic_system radiusd auth account password session |
| 88 |
|
| 89 |
|
| 90 |
diff --git a/net-dialup/freeradius/metadata.xml b/net-dialup/freeradius/metadata.xml |
| 91 |
index 14d04cc60c0..0f82cd9f9ed 100644 |
| 92 |
--- a/net-dialup/freeradius/metadata.xml |
| 93 |
+++ b/net-dialup/freeradius/metadata.xml |
| 94 |
@@ -19,5 +19,8 @@ |
| 95 |
<flag name="rest"> |
| 96 |
Include support for sending and receiving HTTP requests |
| 97 |
</flag> |
| 98 |
+ <flag name="redis"> |
| 99 |
+ Include support for Redis database |
| 100 |
+ </flag> |
| 101 |
</use> |
| 102 |
</pkgmetadata> |
Archives