1 |
commit: 25198d476d3a61d3376ba0b0c49de7d426601583 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 28 20:35:00 2018 +0000 |
4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 28 20:35:00 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25198d47 |
7 |
|
8 |
sys-auth/nss-pam-ldapd: 0.9.10 stable amd64 and x86 with cleanup |
9 |
|
10 |
Package-Manager: Portage-2.3.49, Repoman-2.3.11 |
11 |
|
12 |
sys-auth/nss-pam-ldapd/Manifest | 1 - |
13 |
sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.10.ebuild | 4 +- |
14 |
sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.8.ebuild | 128 --------------------- |
15 |
3 files changed, 2 insertions(+), 131 deletions(-) |
16 |
|
17 |
diff --git a/sys-auth/nss-pam-ldapd/Manifest b/sys-auth/nss-pam-ldapd/Manifest |
18 |
index a46c9a22370..8d59483dae9 100644 |
19 |
--- a/sys-auth/nss-pam-ldapd/Manifest |
20 |
+++ b/sys-auth/nss-pam-ldapd/Manifest |
21 |
@@ -1,4 +1,3 @@ |
22 |
DIST nss-pam-ldapd-0.8.14.tar.gz 508949 BLAKE2B ad8532bf86ef93c62394b91b7c3c035dc1090a70b60ab190ed8af012d533e61fe067b4383388af0d3a53142dbc96da3468d2aa09c2a30f92b9cf56434160c6d6 SHA512 70abb1836b5b3304e583fd3b71f11fee7586e181b26f4630779ec1d90b856da6e4fcc76327c51b20a158aa36708dd12ceb5f543a33c826881f2ad3e092f542c9 |
23 |
DIST nss-pam-ldapd-0.9.10.tar.gz 749302 BLAKE2B 38cdc0e2a5b971d18412d7a583a265cdc87249342139dd4af9cddc61d17bc3d4d19b43c6705fdabc9dccc5ad4f7dad5ea473f75cde2915e485252fdf9116a1c6 SHA512 be559bc0d60bcf25af94919d456922bee4abb2c0417a8d2daf954d9aa9af2d41cb06a20cef04d9afd61c1316a744331753ee1cb25ef4a9c5411c508193231218 |
24 |
-DIST nss-pam-ldapd-0.9.8.tar.gz 771247 BLAKE2B bef3e5ede2b4747277ee400dfa8be620281e4e2a596acff236008e1f0bf6b79d6e309a4ca4bad852f6b0a8f79888cffcfffe09ddea8fde8e53b8450a894598eb SHA512 f0d24afd4cb5cea8155aa719b598448d3d81a896f7bc431f7d73e0617a7b2aa7e0ceb6de0b50163848c5554d96a3c415226e32a92e64ed91772fec4c64ad135b |
25 |
DIST nss-pam-ldapd-0.9.9.tar.gz 772059 BLAKE2B 0c1da79d58f19f0c310c0589ca9f286a73ada025028d1a00df938d40dd1211f4dd5ba694de94a37a3596b64b5f8a511127c359a86a60271eb091082dec69e6bb SHA512 8148467523003da397d03b70bb01e52dbc63b0528540aea1d85f6af2ee8af69300e107617b69608397b210e825a2351cfd61b88c4fa146d2e8e9fb9c5cd358e3 |
26 |
|
27 |
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.10.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.10.ebuild |
28 |
index 397ac40543d..485ff3752e9 100644 |
29 |
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.10.ebuild |
30 |
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.10.ebuild |
31 |
@@ -1,4 +1,4 @@ |
32 |
-# Copyright 1999-2018 Gentoo Foundation |
33 |
+# Copyright 1999-2018 Gentoo Authors |
34 |
# Distributed under the terms of the GNU General Public License v2 |
35 |
|
36 |
EAPI=6 |
37 |
@@ -12,7 +12,7 @@ SRC_URI="https://arthurdejong.org/${PN}/${P}.tar.gz" |
38 |
|
39 |
LICENSE="LGPL-2.1" |
40 |
SLOT="0" |
41 |
-KEYWORDS="~amd64 ~x86" |
42 |
+KEYWORDS="amd64 x86" |
43 |
IUSE="debug kerberos +pam pynslcd sasl test +utils" |
44 |
|
45 |
COMMON_DEP=" |
46 |
|
47 |
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.8.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.8.ebuild |
48 |
deleted file mode 100644 |
49 |
index c57719dcc88..00000000000 |
50 |
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.8.ebuild |
51 |
+++ /dev/null |
52 |
@@ -1,128 +0,0 @@ |
53 |
-# Copyright 1999-2018 Gentoo Foundation |
54 |
-# Distributed under the terms of the GNU General Public License v2 |
55 |
- |
56 |
-EAPI=5 |
57 |
- |
58 |
-PYTHON_COMPAT=(python2_7) |
59 |
-inherit eutils prefix user python-r1 multilib multilib-minimal systemd s6 |
60 |
- |
61 |
-DESCRIPTION="NSS module for name lookups using LDAP" |
62 |
-HOMEPAGE="https://arthurdejong.org/nss-pam-ldapd/" |
63 |
-SRC_URI="https://arthurdejong.org/${PN}/${P}.tar.gz" |
64 |
- |
65 |
-LICENSE="LGPL-2.1" |
66 |
-SLOT="0" |
67 |
-KEYWORDS="amd64 x86" |
68 |
-IUSE="debug kerberos +pam sasl test +utils" |
69 |
- |
70 |
-COMMON_DEP=" |
71 |
- net-nds/openldap[${MULTILIB_USEDEP}] |
72 |
- dev-python/python-ldap[${PYTHON_USEDEP}] |
73 |
- sasl? ( dev-libs/cyrus-sasl[${MULTILIB_USEDEP}] ) |
74 |
- kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
75 |
- virtual/pam[${MULTILIB_USEDEP}] |
76 |
- utils? ( ${PYTHON_DEPS} ) |
77 |
- !sys-auth/nss_ldap |
78 |
- !sys-auth/pam_ldap" |
79 |
-RDEPEND="${COMMON_DEP}" |
80 |
-DEPEND="${COMMON_DEP} |
81 |
- test? ( |
82 |
- ${PYTHON_DEPS} |
83 |
- dev-python/pylint[${PYTHON_USEDEP}] |
84 |
- ) |
85 |
- sys-devel/automake" |
86 |
- |
87 |
-REQUIRED_USE=" |
88 |
- utils? ( ${PYTHON_REQUIRED_USE} ) |
89 |
- test? ( ${PYTHON_REQUIRED_USE} )" |
90 |
- |
91 |
-pkg_setup() { |
92 |
- enewgroup nslcd |
93 |
- enewuser nslcd -1 -1 -1 nslcd |
94 |
-} |
95 |
- |
96 |
-src_prepare() { |
97 |
- epatch "${FILESDIR}"/${PN}-0.9.4-disable-py3-only-linters.patch |
98 |
- epatch_user |
99 |
- use utils && python_setup |
100 |
-} |
101 |
- |
102 |
-multilib_src_configure() { |
103 |
- local -a myconf |
104 |
- |
105 |
- myconf=( |
106 |
- --disable-utils |
107 |
- --enable-warnings |
108 |
- --with-ldap-lib=openldap |
109 |
- --with-ldap-conf-file=/etc/nslcd.conf |
110 |
- --with-nslcd-pidfile=/run/nslcd/nslcd.pid |
111 |
- --with-nslcd-socket=/run/nslcd/socket |
112 |
- $(usex x86-fbsd '--with-nss-flavour=' '--with-nss-flavour=' 'freebsd' 'glibc') |
113 |
- $(use_enable debug) |
114 |
- $(use_enable kerberos) |
115 |
- $(use_enable pam) |
116 |
- $(use_enable sasl) |
117 |
- ) |
118 |
- |
119 |
- # nss libraries always go in /lib on Gentoo |
120 |
- if multilib_is_native_abi ; then |
121 |
- myconf+=("--with-pam-seclib-dir=${EPREFIX}/$(get_libdir)/security") |
122 |
- myconf+=("--libdir=${EPREFIX}/$(get_libdir)") |
123 |
- else |
124 |
- myconf+=("--with-pam-seclib-dir=/$(get_libdir)/security") |
125 |
- myconf+=("--libdir=/$(get_libdir)") |
126 |
- fi |
127 |
- |
128 |
- ECONF_SOURCE="${S}" econf "${myconf[@]}" |
129 |
-} |
130 |
- |
131 |
-multilib_src_install_all() { |
132 |
- local script |
133 |
- |
134 |
- newinitd "${FILESDIR}"/nslcd-init-r1 nslcd |
135 |
- newinitd "${FILESDIR}"/nslcd-init-r2 nslcd |
136 |
- s6_install_service nslcd "${FILESDIR}"/nslcd-run-s6 |
137 |
- |
138 |
- insinto /usr/share/nss-pam-ldapd |
139 |
- doins "${WORKDIR}/${P}/nslcd.conf" |
140 |
- |
141 |
- fperms o-r /etc/nslcd.conf |
142 |
- |
143 |
- if use utils; then |
144 |
- python_moduleinto nslcd |
145 |
- python_foreach_impl && python_domodule utils/*.py |
146 |
- |
147 |
- for script in chsh getent; do |
148 |
- python_foreach_impl python_newscript utils/${script}.py ${script}.ldap |
149 |
- done |
150 |
- fi |
151 |
- |
152 |
- systemd_newtmpfilesd "${FILESDIR}"/nslcd-tmpfiles.conf nslcd.conf |
153 |
- systemd_dounit "${FILESDIR}"/nslcd.service |
154 |
-} |
155 |
- |
156 |
-multilib_src_test() { |
157 |
- python_foreach_impl emake check |
158 |
-} |
159 |
- |
160 |
-pkg_postinst() { |
161 |
- echo |
162 |
- elog "For this to work you must configure /etc/nslcd.conf" |
163 |
- elog "This configuration is similar to pam_ldap's /etc/ldap.conf" |
164 |
- echo |
165 |
- elog "In order to use nss-pam-ldapd, nslcd needs to be running. You can" |
166 |
- elog "start it like this:" |
167 |
- elog " # /etc/init.d/nslcd start" |
168 |
- echo |
169 |
- elog "You can add it to the default runlevel like so:" |
170 |
- elog " # rc-update add nslcd default" |
171 |
- elog |
172 |
- elog "If you have >=sys-apps/openrc-0.16.3, you can also use s6" |
173 |
- elog "to supervise this service." |
174 |
- elog "To do this, emerge sys-apps/s6 then add nslcd-s6" |
175 |
- elog "default runlevel instead of nslcd." |
176 |
- elog |
177 |
- elog "If you are upgrading, keep in mind that /etc/nss-ldapd.conf" |
178 |
- elog " is now named /etc/nslcd.conf" |
179 |
- echo |
180 |
-} |