1 |
commit: 067375ba80190e4a89c66f578849ecaa7d00cbf1 |
2 |
Author: Wes Cilldhaire <wes <AT> sol1 <DOT> com <DOT> au> |
3 |
AuthorDate: Mon Nov 28 03:06:32 2016 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 28 04:47:43 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=067375ba |
7 |
|
8 |
net-nds/389-ds-base: Update to 1.3.4.14 and 1.3.5.15 |
9 |
|
10 |
Acked-by wibrown <AT> redhat.com |
11 |
|
12 |
Package-Manager: portage-2.3.2 |
13 |
|
14 |
net-nds/389-ds-base/389-ds-base-1.3.4.14.ebuild | 139 ++++++++++++++++++++++++ |
15 |
net-nds/389-ds-base/389-ds-base-1.3.5.15.ebuild | 124 +++++++++++++++++++++ |
16 |
net-nds/389-ds-base/Manifest | 2 + |
17 |
net-nds/389-ds-base/files/389-ds.initd-r1 | 9 +- |
18 |
4 files changed, 271 insertions(+), 3 deletions(-) |
19 |
|
20 |
diff --git a/net-nds/389-ds-base/389-ds-base-1.3.4.14.ebuild b/net-nds/389-ds-base/389-ds-base-1.3.4.14.ebuild |
21 |
new file mode 100644 |
22 |
index 00000000..ae9230b |
23 |
--- /dev/null |
24 |
+++ b/net-nds/389-ds-base/389-ds-base-1.3.4.14.ebuild |
25 |
@@ -0,0 +1,139 @@ |
26 |
+# Copyright 1999-2016 Gentoo Foundation |
27 |
+# Distributed under the terms of the GNU General Public License v2 |
28 |
+# $Id$ |
29 |
+ |
30 |
+EAPI=5 |
31 |
+ |
32 |
+WANT_AUTOMAKE="1.9" |
33 |
+ |
34 |
+inherit user eutils multilib flag-o-matic autotools |
35 |
+ |
36 |
+DESCRIPTION="389 Directory Server (core librares and daemons )" |
37 |
+HOMEPAGE="http://port389.org/" |
38 |
+SRC_URI="http://directory.fedoraproject.org/sources/${P}.tar.bz2" |
39 |
+ |
40 |
+LICENSE="GPL-3+" |
41 |
+SLOT="0" |
42 |
+KEYWORDS="~amd64 ~x86" |
43 |
+IUSE="autobind auto-dn-suffix debug doc +pam-passthru +dna +ldapi +bitwise +presence kerberos selinux" |
44 |
+ |
45 |
+# Pinned to db:4.8 as it is the current stable, can change to a later db version < 6 when they stabilize. |
46 |
+# The --with-db-inc line in econf will need to be updated as well when changing db version. |
47 |
+COMMON_DEPEND=" |
48 |
+ sys-libs/db:4.8 |
49 |
+ >=dev-libs/cyrus-sasl-2.1.19 |
50 |
+ >=net-analyzer/net-snmp-5.1.2 |
51 |
+ >=dev-libs/icu-3.4:= |
52 |
+ dev-libs/nss[utils] |
53 |
+ dev-libs/nspr |
54 |
+ dev-libs/svrcore |
55 |
+ dev-libs/openssl:0= |
56 |
+ dev-libs/libpcre:3 |
57 |
+ >=dev-perl/perl-mozldap-1.5.3 |
58 |
+ dev-perl/NetAddr-IP |
59 |
+ net-nds/openldap |
60 |
+ sys-libs/pam |
61 |
+ sys-libs/zlib |
62 |
+ kerberos? ( >=app-crypt/mit-krb5-1.7-r100[openldap] )" |
63 |
+ |
64 |
+DEPEND="${COMMON_DEPEND} |
65 |
+ virtual/pkgconfig |
66 |
+ doc? ( app-doc/doxygen )" |
67 |
+ |
68 |
+RDEPEND="${COMMON_DEPEND} |
69 |
+ selinux? ( sec-policy/selinux-dirsrv ) |
70 |
+ virtual/perl-Time-Local |
71 |
+ virtual/perl-MIME-Base64" |
72 |
+ |
73 |
+pkg_setup() { |
74 |
+ enewgroup dirsrv |
75 |
+ enewuser dirsrv -1 -1 -1 dirsrv |
76 |
+} |
77 |
+ |
78 |
+src_prepare() { |
79 |
+ #0001-Ticket-47840-add-configure-option-to-disable-instanc.patch |
80 |
+ epatch "${FILESDIR}/389-ds-base-1.3.4-no-instance-script.patch" |
81 |
+ |
82 |
+ # as per 389 documentation, when 64bit, export USE_64 |
83 |
+ use amd64 && export USE_64=1 |
84 |
+ |
85 |
+ # This will be changed in 1.3.5.X |
86 |
+ sed -i -e 's/nobody/dirsrv/g' configure.ac || die "sed failed on configure.ac" |
87 |
+ eautoreconf |
88 |
+ |
89 |
+ append-lfs-flags |
90 |
+} |
91 |
+ |
92 |
+src_configure() { |
93 |
+ # for 1.3.5.X, will add --enable-gcc-security. |
94 |
+ # auto-dn-suffix currently throws warning in configure script, |
95 |
+ # see https://fedorahosted.org/389/ticket/48710 |
96 |
+ econf \ |
97 |
+ $(use_enable debug) \ |
98 |
+ $(use_enable pam-passthru) \ |
99 |
+ $(use_enable ldapi) \ |
100 |
+ $(use_enable autobind) \ |
101 |
+ $(use_enable dna) \ |
102 |
+ $(use_enable bitwise) \ |
103 |
+ $(use_enable presence) \ |
104 |
+ $(use_with kerberos) \ |
105 |
+ $(use_enable auto-dn-suffix) \ |
106 |
+ --enable-maintainer-mode \ |
107 |
+ --with-fhs \ |
108 |
+ --with-openldap \ |
109 |
+ --sbindir=/usr/sbin \ |
110 |
+ --bindir=/usr/bin \ |
111 |
+ --with-db-inc=/usr/include/db4.8 |
112 |
+ |
113 |
+} |
114 |
+ |
115 |
+src_compile() { |
116 |
+ default |
117 |
+ if use doc; then |
118 |
+ doxygen slapi.doxy || die "cannot run doxygen" |
119 |
+ fi |
120 |
+} |
121 |
+ |
122 |
+src_install () { |
123 |
+ emake DESTDIR="${D}" install |
124 |
+ |
125 |
+ # remove redhat style init script |
126 |
+ rm -rf "${D}"/etc/rc.d || die |
127 |
+ # Needs a config option to remove this. |
128 |
+ rm -rf "${D}"/etc/default || die |
129 |
+ |
130 |
+ # and install gentoo style init script |
131 |
+ # Get these merged upstream |
132 |
+ newinitd "${FILESDIR}"/389-ds.initd-r1 389-ds |
133 |
+ newinitd "${FILESDIR}"/389-ds-snmp.initd 389-ds-snmp |
134 |
+ |
135 |
+ # cope with libraries being in /usr/lib/dirsrv |
136 |
+ dodir /etc/env.d |
137 |
+ echo "LDPATH=/usr/$(get_libdir)/dirsrv" > "${D}"/etc/env.d/08dirsrv |
138 |
+ |
139 |
+ if use doc; then |
140 |
+ cd "${S}" || die |
141 |
+ docinto html/ |
142 |
+ dodoc -r docs/html/. |
143 |
+ fi |
144 |
+} |
145 |
+ |
146 |
+pkg_postinst() { |
147 |
+ echo |
148 |
+ elog "If you are planning to use 389-ds-snmp (ldap-agent)," |
149 |
+ elog "make sure to properly configure: /etc/dirsrv/config/ldap-agent.conf" |
150 |
+ elog "adding proper 'server' entries, and adding the lines below to" |
151 |
+ elog " => /etc/snmp/snmpd.conf" |
152 |
+ elog |
153 |
+ elog "master agentx" |
154 |
+ elog "agentXSocket /var/agentx/master" |
155 |
+ elog |
156 |
+ elog "To start 389 Directory Server (LDAP service) at boot:" |
157 |
+ elog |
158 |
+ elog " rc-update add 389-ds default" |
159 |
+ elog |
160 |
+ elog "If you are upgrading from previous 1.2.6 release candidates" |
161 |
+ elog "please see:" |
162 |
+ elog "http://directory.fedoraproject.org/wiki/Subtree_Rename#warning:_upgrade_from_389_v1.2.6_.28a.3F.2C_rc1_.7E_rc6.29_to_v1.2.6_rc6_or_newer" |
163 |
+ echo |
164 |
+} |
165 |
|
166 |
diff --git a/net-nds/389-ds-base/389-ds-base-1.3.5.15.ebuild b/net-nds/389-ds-base/389-ds-base-1.3.5.15.ebuild |
167 |
new file mode 100644 |
168 |
index 00000000..374642f |
169 |
--- /dev/null |
170 |
+++ b/net-nds/389-ds-base/389-ds-base-1.3.5.15.ebuild |
171 |
@@ -0,0 +1,124 @@ |
172 |
+# Copyright 1999-2016 Gentoo Foundation |
173 |
+# Distributed under the terms of the GNU General Public License v2 |
174 |
+# $Id$ |
175 |
+ |
176 |
+EAPI=5 |
177 |
+ |
178 |
+WANT_AUTOMAKE="1.13" |
179 |
+ |
180 |
+inherit user eutils multilib flag-o-matic autotools |
181 |
+ |
182 |
+DESCRIPTION="389 Directory Server (core librares and daemons )" |
183 |
+HOMEPAGE="http://www.port389.org/" |
184 |
+SRC_URI="http://www.port389.org/sources/${P}.tar.bz2" |
185 |
+ |
186 |
+LICENSE="GPL-3+" |
187 |
+SLOT="0" |
188 |
+KEYWORDS="~amd64 ~x86" |
189 |
+IUSE="autobind auto-dn-suffix debug doc +pam-passthru +dna +ldapi +bitwise presence kerberos selinux" |
190 |
+ |
191 |
+# Pinned to db:4.8 as it is the current stable, can change to a later db version < 6 when they stabilize. |
192 |
+# The --with-db-inc line in econf will need to be updated as well when changing db version. |
193 |
+COMMON_DEPEND=" |
194 |
+ sys-libs/db:4.8 |
195 |
+ >=dev-libs/cyrus-sasl-2.1.19 |
196 |
+ >=net-analyzer/net-snmp-5.1.2 |
197 |
+ >=dev-libs/icu-3.4:= |
198 |
+ >=dev-libs/nss-3.22[utils] |
199 |
+ dev-libs/nspr |
200 |
+ >=dev-libs/svrcore-4.1.2 |
201 |
+ dev-libs/openssl:0= |
202 |
+ dev-libs/libpcre:3 |
203 |
+ >=dev-perl/perl-mozldap-1.5.3 |
204 |
+ dev-perl/NetAddr-IP |
205 |
+ net-nds/openldap |
206 |
+ sys-libs/pam |
207 |
+ sys-libs/zlib |
208 |
+ kerberos? ( >=app-crypt/mit-krb5-1.7-r100[openldap] )" |
209 |
+ |
210 |
+DEPEND="${COMMON_DEPEND} |
211 |
+ virtual/pkgconfig |
212 |
+ doc? ( app-doc/doxygen )" |
213 |
+ |
214 |
+RDEPEND="${COMMON_DEPEND} |
215 |
+ selinux? ( sec-policy/selinux-dirsrv ) |
216 |
+ virtual/perl-Time-Local |
217 |
+ virtual/perl-MIME-Base64" |
218 |
+ |
219 |
+pkg_setup() { |
220 |
+ enewgroup dirsrv |
221 |
+ enewuser dirsrv -1 -1 -1 dirsrv |
222 |
+} |
223 |
+ |
224 |
+src_prepare() { |
225 |
+ # as per 389 documentation, when 64bit, export USE_64 |
226 |
+ use amd64 && export USE_64=1 |
227 |
+ |
228 |
+ eautoreconf |
229 |
+ |
230 |
+ append-lfs-flags |
231 |
+} |
232 |
+ |
233 |
+src_configure() { |
234 |
+ econf \ |
235 |
+ $(use_enable debug) \ |
236 |
+ $(use_enable pam-passthru) \ |
237 |
+ $(use_enable ldapi) \ |
238 |
+ $(use_enable autobind) \ |
239 |
+ $(use_enable dna) \ |
240 |
+ $(use_enable bitwise) \ |
241 |
+ $(use_enable presence) \ |
242 |
+ $(use_with kerberos) \ |
243 |
+ $(use_enable auto-dn-suffix) \ |
244 |
+ --with-initddir=no \ |
245 |
+ --enable-maintainer-mode \ |
246 |
+ --with-fhs \ |
247 |
+ --with-openldap \ |
248 |
+ --sbindir=/usr/sbin \ |
249 |
+ --bindir=/usr/bin \ |
250 |
+ --with-db-inc=/usr/include/db4.8 |
251 |
+ |
252 |
+} |
253 |
+ |
254 |
+src_compile() { |
255 |
+ default |
256 |
+ if use doc; then |
257 |
+ doxygen slapi.doxy || die "cannot run doxygen" |
258 |
+ fi |
259 |
+} |
260 |
+ |
261 |
+src_install () { |
262 |
+ emake DESTDIR="${D}" install |
263 |
+ |
264 |
+ # Install gentoo style init script |
265 |
+ # Get these merged upstream |
266 |
+ newinitd "${FILESDIR}"/389-ds.initd-r1 389-ds |
267 |
+ newinitd "${FILESDIR}"/389-ds-snmp.initd 389-ds-snmp |
268 |
+ |
269 |
+ # cope with libraries being in /usr/lib/dirsrv |
270 |
+ dodir /etc/env.d |
271 |
+ echo "LDPATH=/usr/$(get_libdir)/dirsrv" > "${D}"/etc/env.d/08dirsrv |
272 |
+ |
273 |
+ if use doc; then |
274 |
+ cd "${S}" || die |
275 |
+ docinto html/ |
276 |
+ dodoc -r docs/html/. |
277 |
+ fi |
278 |
+} |
279 |
+ |
280 |
+pkg_postinst() { |
281 |
+ echo |
282 |
+ elog "If you are planning to use 389-ds-snmp (ldap-agent)," |
283 |
+ elog "make sure to properly configure: /etc/dirsrv/config/ldap-agent.conf" |
284 |
+ elog "adding proper 'server' entries, and adding the lines below to" |
285 |
+ elog " => /etc/snmp/snmpd.conf" |
286 |
+ elog |
287 |
+ elog "master agentx" |
288 |
+ elog "agentXSocket /var/agentx/master" |
289 |
+ elog |
290 |
+ elog "To start 389 Directory Server (LDAP service) at boot:" |
291 |
+ elog |
292 |
+ elog " rc-update add 389-ds default" |
293 |
+ elog |
294 |
+ echo |
295 |
+} |
296 |
|
297 |
diff --git a/net-nds/389-ds-base/Manifest b/net-nds/389-ds-base/Manifest |
298 |
index f3b174d..a329a84 100644 |
299 |
--- a/net-nds/389-ds-base/Manifest |
300 |
+++ b/net-nds/389-ds-base/Manifest |
301 |
@@ -1,2 +1,4 @@ |
302 |
+DIST 389-ds-base-1.3.4.14.tar.bz2 3433905 SHA256 4408e61c52dc56d8e0ffee530dde70c2af00aa86b385cc40b389ef8bcce55aaa SHA512 1043b3e3437d1d24d1eec54c5c5ca39692151d05b8eb035224db78e68a1f4011bd2e0916f54609387903e2bbe9345f954be5c0a578f90a107958f74604908d6c WHIRLPOOL f2bf87c450c870ad1b886000f49f5d1b6def760c9b1634cffe4871da755932d43cb9253bebe12092032359097a7786e9d29fc64d4326fb3a079a79163a2ccc01 |
303 |
DIST 389-ds-base-1.3.4.8.tar.bz2 3396105 SHA256 a00468afcfa50de375f921a827a04dd53b6a11b632982bb0db98cafca509e701 SHA512 ac85223cb38d4cebb3ff61b23e3c0312b0cd30a0c6bf0d9644842c6ecfbc9379ea4a639c80b3e78a13a67f273342fec78e9ecf4672cc72e289d72d74c2fa0d8f WHIRLPOOL 4c7645be5b70c108ef437aaf6d50293a99fa6a552c859f649904c6974c8830e5bf96286a0f998c5d187c1f66f3e0922bbe1e756889e6b0a33e8d9db56f0aa005 |
304 |
+DIST 389-ds-base-1.3.5.15.tar.bz2 3554197 SHA256 21dd81525422b64d2760144a4dedf1d3351ecdea7e8e40ae97cd7645b2b527fc SHA512 af1e82f5de80e493241c9d58f0127cd24517e18305ec0ba918bff8b2fa96dc69b32d7172d9b411a544251abfc04098ea9d0c1b41bf9d88e6caaaeae9cb15200b WHIRLPOOL 6f07f20e54dc9e8d7ff2c519d5826f0606d1a2d9113ba2441cdc600790f844f3b02b2d334f111fddaded50e87fc1a6cdca38a5cfe294c4f3d20930b5756c943c |
305 |
DIST 389-ds-base-1.3.5.4.tar.bz2 3520056 SHA256 a82f78e56473db4c3aca7a73e012fcd66a508d3b4734bb54936974e4272739b8 SHA512 0cf3a1e403bc6d417525f908263d59689bbee1db887c5ba552fdae28252a59c37ee8e47ec29c48eb18fc1384652b94667f5768df87602f4c37b86d7ef0df284e WHIRLPOOL 1300126fe21c2adcb014364ead33f6766475f2b9dbe43531a11284a0ba21f61e63591804ec227aa118378482e91b34ef44f60f600fa4da5416b68176b2bb1b7b |
306 |
|
307 |
diff --git a/net-nds/389-ds-base/files/389-ds.initd-r1 b/net-nds/389-ds-base/files/389-ds.initd-r1 |
308 |
index 0cd8e0e..474c270 100644 |
309 |
--- a/net-nds/389-ds-base/files/389-ds.initd-r1 |
310 |
+++ b/net-nds/389-ds-base/files/389-ds.initd-r1 |
311 |
@@ -1,10 +1,11 @@ |
312 |
#!/sbin/openrc-run |
313 |
-# Copyright 1999-2010 Gentoo Foundation |
314 |
+# Copyright 1999-2016 Gentoo Foundation |
315 |
# Distributed under the terms of the GNU General Public License v2 |
316 |
# $Id$ |
317 |
|
318 |
DIRSRV_EXEC="/usr/sbin/ns-slapd" |
319 |
PID_DIRECTORY="/var/run/dirsrv" |
320 |
+LOCK_DIRECTORY="/var/lock/dirsrv" |
321 |
DIRSRV_CONF_DIR="/etc/dirsrv" |
322 |
DS_INSTANCES=${DIRSRV_CONF_DIR}/slapd-* |
323 |
F389DS_INSTANCES="" |
324 |
@@ -33,9 +34,11 @@ start() { |
325 |
continue |
326 |
fi |
327 |
# Create the required directories in case they got nuked |
328 |
- mkdir -p /var/lock/dirsrv/${instance} |
329 |
+ mkdir -p ${PID_DIRECTORY} |
330 |
+ mkdir -p ${LOCK_DIRECTORY}/${instance} |
331 |
# This will probably break one day, we should be pulling out the suitespotuser from dse.ldif |
332 |
- chown dirsrv: /var/lock/dirsrv/${instance} |
333 |
+ chown dirsrv: ${PID_DIRECTORY} |
334 |
+ chown dirsrv: ${LOCK_DIRECTORY}/${instance} |
335 |
ebegin "Starting 389 Directory Server: instance ${instance}" |
336 |
start-stop-daemon --start --quiet -m \ |
337 |
--pidfile ${PID_DIRECTORY}/${instance}.startpid \ |