1 |
commit: bf1d06c93a409672033199f839bc1606ab69f43f |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 18 23:31:20 2018 +0000 |
4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 18 23:36:36 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf1d06c9 |
7 |
|
8 |
sys-auth/nss-pam-ldapd: 0.9.9 bup |
9 |
|
10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
11 |
|
12 |
sys-auth/nss-pam-ldapd/Manifest | 2 +- |
13 |
...apd-0.9.7.ebuild => nss-pam-ldapd-0.9.9.ebuild} | 54 ++++++++++++++++++---- |
14 |
2 files changed, 46 insertions(+), 10 deletions(-) |
15 |
|
16 |
diff --git a/sys-auth/nss-pam-ldapd/Manifest b/sys-auth/nss-pam-ldapd/Manifest |
17 |
index a1c61609131..245b9264ea5 100644 |
18 |
--- a/sys-auth/nss-pam-ldapd/Manifest |
19 |
+++ b/sys-auth/nss-pam-ldapd/Manifest |
20 |
@@ -1,3 +1,3 @@ |
21 |
DIST nss-pam-ldapd-0.8.14.tar.gz 508949 BLAKE2B ad8532bf86ef93c62394b91b7c3c035dc1090a70b60ab190ed8af012d533e61fe067b4383388af0d3a53142dbc96da3468d2aa09c2a30f92b9cf56434160c6d6 SHA512 70abb1836b5b3304e583fd3b71f11fee7586e181b26f4630779ec1d90b856da6e4fcc76327c51b20a158aa36708dd12ceb5f543a33c826881f2ad3e092f542c9 |
22 |
-DIST nss-pam-ldapd-0.9.7.tar.gz 762743 BLAKE2B 7e0266dc7f1f3086ea52175c2389dc55adff932153990347bfcfc511321aa04c76d873eea048ac4be1d574b9e50bfbb882ddadaf2a6b3be43d6689a1ccef88cd SHA512 2117262f41c4fc54987f9f663ed71126100420ecff391cc280e98d7864094db201a81a4ebf7e5634436982092be3c751971d8aee53e39c42a8572ab57b561284 |
23 |
DIST nss-pam-ldapd-0.9.8.tar.gz 771247 BLAKE2B bef3e5ede2b4747277ee400dfa8be620281e4e2a596acff236008e1f0bf6b79d6e309a4ca4bad852f6b0a8f79888cffcfffe09ddea8fde8e53b8450a894598eb SHA512 f0d24afd4cb5cea8155aa719b598448d3d81a896f7bc431f7d73e0617a7b2aa7e0ceb6de0b50163848c5554d96a3c415226e32a92e64ed91772fec4c64ad135b |
24 |
+DIST nss-pam-ldapd-0.9.9.tar.gz 772059 BLAKE2B 0c1da79d58f19f0c310c0589ca9f286a73ada025028d1a00df938d40dd1211f4dd5ba694de94a37a3596b64b5f8a511127c359a86a60271eb091082dec69e6bb SHA512 8148467523003da397d03b70bb01e52dbc63b0528540aea1d85f6af2ee8af69300e107617b69608397b210e825a2351cfd61b88c4fa146d2e8e9fb9c5cd358e3 |
25 |
|
26 |
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.7.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.9.ebuild |
27 |
similarity index 71% |
28 |
rename from sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.7.ebuild |
29 |
rename to sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.9.ebuild |
30 |
index 22abd70bba2..7b25079038a 100644 |
31 |
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.7.ebuild |
32 |
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.9.ebuild |
33 |
@@ -1,7 +1,7 @@ |
34 |
-# Copyright 1999-2017 Gentoo Foundation |
35 |
+# Copyright 1999-2018 Gentoo Foundation |
36 |
# Distributed under the terms of the GNU General Public License v2 |
37 |
|
38 |
-EAPI=5 |
39 |
+EAPI=6 |
40 |
|
41 |
PYTHON_COMPAT=(python2_7) |
42 |
inherit eutils prefix user python-r1 multilib multilib-minimal systemd s6 |
43 |
@@ -12,8 +12,8 @@ SRC_URI="http://arthurdejong.org/${PN}/${P}.tar.gz" |
44 |
|
45 |
LICENSE="LGPL-2.1" |
46 |
SLOT="0" |
47 |
-KEYWORDS="amd64 x86" |
48 |
-IUSE="debug kerberos +pam sasl test +utils" |
49 |
+KEYWORDS="~amd64 ~x86" |
50 |
+IUSE="debug kerberos +pam pynslcd sasl test +utils" |
51 |
|
52 |
COMMON_DEP=" |
53 |
net-nds/openldap[${MULTILIB_USEDEP}] |
54 |
@@ -21,6 +21,10 @@ COMMON_DEP=" |
55 |
kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
56 |
virtual/pam[${MULTILIB_USEDEP}] |
57 |
utils? ( ${PYTHON_DEPS} ) |
58 |
+ pynslcd? ( |
59 |
+ dev-python/python-ldap[${PYTHON_USEDEP}] |
60 |
+ dev-python/python-daemon[${PYTHON_USEDEP}] |
61 |
+ ) |
62 |
!sys-auth/nss_ldap |
63 |
!sys-auth/pam_ldap" |
64 |
RDEPEND="${COMMON_DEP}" |
65 |
@@ -33,7 +37,12 @@ DEPEND="${COMMON_DEP} |
66 |
|
67 |
REQUIRED_USE=" |
68 |
utils? ( ${PYTHON_REQUIRED_USE} ) |
69 |
- test? ( ${PYTHON_REQUIRED_USE} )" |
70 |
+ test? ( ${PYTHON_REQUIRED_USE} pynslcd )" |
71 |
+ |
72 |
+PATCHES=( |
73 |
+ "${FILESDIR}"/${PN}-0.9.4-disable-py3-only-linters.patch |
74 |
+ "${FILESDIR}"/${PN}-0.9.8-pynslcd-module-paths.patch |
75 |
+) |
76 |
|
77 |
pkg_setup() { |
78 |
enewgroup nslcd |
79 |
@@ -41,9 +50,11 @@ pkg_setup() { |
80 |
} |
81 |
|
82 |
src_prepare() { |
83 |
- epatch "${FILESDIR}"/${PN}-0.9.4-disable-py3-only-linters.patch |
84 |
- epatch_user |
85 |
+ cp pynslcd/pynslcd.py "${S}" || die "Copying pynslcd failed" |
86 |
+ |
87 |
+ default |
88 |
use utils && python_setup |
89 |
+ touch pynslcd/__init__.py || die "Could not create __init__.py for pynslcd" |
90 |
} |
91 |
|
92 |
multilib_src_configure() { |
93 |
@@ -57,6 +68,7 @@ multilib_src_configure() { |
94 |
--with-nslcd-pidfile=/run/nslcd/nslcd.pid |
95 |
--with-nslcd-socket=/run/nslcd/socket |
96 |
$(usex x86-fbsd '--with-nss-flavour=' '--with-nss-flavour=' 'freebsd' 'glibc') |
97 |
+ $(use_enable pynslcd) |
98 |
$(use_enable debug) |
99 |
$(use_enable kerberos) |
100 |
$(use_enable pam) |
101 |
@@ -89,19 +101,43 @@ multilib_src_install_all() { |
102 |
|
103 |
if use utils; then |
104 |
python_moduleinto nslcd |
105 |
- python_foreach_impl && python_domodule utils/*.py |
106 |
+ python_foreach_impl python_domodule utils/*.py |
107 |
|
108 |
for script in chsh getent; do |
109 |
python_foreach_impl python_newscript utils/${script}.py ${script}.ldap |
110 |
done |
111 |
fi |
112 |
+ if use pynslcd; then |
113 |
+ rm -rf "${D}"/usr/share/pynslcd |
114 |
+ python_moduleinto pynslcd |
115 |
+ python_foreach_impl python_domodule pynslcd/*.py |
116 |
+ python_scriptinto /usr/sbin |
117 |
+ python_newscript pynslcd.py pynslcd |
118 |
+ newinitd "${FILESDIR}"/pynslcd.initd pynslcd |
119 |
+ fi |
120 |
|
121 |
systemd_newtmpfilesd "${FILESDIR}"/nslcd-tmpfiles.conf nslcd.conf |
122 |
systemd_dounit "${FILESDIR}"/nslcd.service |
123 |
} |
124 |
|
125 |
+multilib_src_install() { |
126 |
+ emake DESTDIR="${D}" install |
127 |
+ |
128 |
+ if use pynslcd; then |
129 |
+ python_moduleinto pynslcd |
130 |
+ python_foreach_impl python_domodule pynslcd/*.py |
131 |
+ fi |
132 |
+} |
133 |
+ |
134 |
+python_test() { |
135 |
+ PYTHONPATH="${S}" emake check |
136 |
+} |
137 |
+ |
138 |
multilib_src_test() { |
139 |
- python_foreach_impl emake check |
140 |
+ pushd "${BUILD_DIR}" |
141 |
+ ln -s ../pynslcd/constants.py utils/constants.py |
142 |
+ python_foreach_impl python_test |
143 |
+ popd |
144 |
} |
145 |
|
146 |
pkg_postinst() { |