Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-nds/openldap: ChangeLog openldap-2.3.39-r1.ebuild
Date: Tue, 27 Nov 2007 03:18:26
Message-Id: E1Iwqxo-000501-Ox@stork.gentoo.org
1 jer 07/11/27 03:18:20
2
3 Modified: ChangeLog openldap-2.3.39-r1.ebuild
4 Log:
5 Stable for HPPA (bug #197446). Fixed quoting and whitespace issues.
6 (Portage version: 2.1.4_rc3)
7
8 Revision Changes Path
9 1.292 net-nds/openldap/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-nds/openldap/ChangeLog?rev=1.292&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-nds/openldap/ChangeLog?rev=1.292&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-nds/openldap/ChangeLog?r1=1.291&r2=1.292
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v
18 retrieving revision 1.291
19 retrieving revision 1.292
20 diff -u -r1.291 -r1.292
21 --- ChangeLog 27 Nov 2007 01:28:24 -0000 1.291
22 +++ ChangeLog 27 Nov 2007 03:18:20 -0000 1.292
23 @@ -1,6 +1,9 @@
24 # ChangeLog for net-nds/openldap
25 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.291 2007/11/27 01:28:24 ranger Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.292 2007/11/27 03:18:20 jer Exp $
28 +
29 + 27 Nov 2007; Jeroen Roovers <jer@g.o> openldap-2.3.39-r1.ebuild:
30 + Stable for HPPA (bug #197446). Fixed quoting and whitespace issues.
31
32 27 Nov 2007; Brent Baude <ranger@g.o> openldap-2.3.39-r1.ebuild:
33 Marking openldap-2.3.39-r1 ppc64 stable for bug 197446
34
35
36
37 1.4 net-nds/openldap/openldap-2.3.39-r1.ebuild
38
39 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-nds/openldap/openldap-2.3.39-r1.ebuild?rev=1.4&view=markup
40 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-nds/openldap/openldap-2.3.39-r1.ebuild?rev=1.4&content-type=text/plain
41 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-nds/openldap/openldap-2.3.39-r1.ebuild?r1=1.3&r2=1.4
42
43 Index: openldap-2.3.39-r1.ebuild
44 ===================================================================
45 RCS file: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.39-r1.ebuild,v
46 retrieving revision 1.3
47 retrieving revision 1.4
48 diff -u -r1.3 -r1.4
49 --- openldap-2.3.39-r1.ebuild 27 Nov 2007 01:28:24 -0000 1.3
50 +++ openldap-2.3.39-r1.ebuild 27 Nov 2007 03:18:20 -0000 1.4
51 @@ -1,6 +1,6 @@
52 # Copyright 1999-2007 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.39-r1.ebuild,v 1.3 2007/11/27 01:28:24 ranger Exp $
55 +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.39-r1.ebuild,v 1.4 2007/11/27 03:18:20 jer Exp $
56
57 WANT_AUTOCONF="latest"
58 WANT_AUTOMAKE="latest"
59 @@ -13,7 +13,7 @@
60
61 LICENSE="OPENLDAP"
62 SLOT="0"
63 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
64 +KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
65 IUSE="berkdb crypt debug gdbm ipv6 kerberos minimal odbc overlays perl readline
66 samba sasl slp smbkrb5passwd ssl tcpd selinux"
67
68 @@ -79,7 +79,7 @@
69 openldap_find_versiontags() {
70 # scan for all datadirs
71 openldap_datadirs=""
72 - if [ -f ${ROOT}/etc/openldap/slapd.conf ]; then
73 + if [ -f "${ROOT}"/etc/openldap/slapd.conf ]; then
74 openldap_datadirs="$(awk '{if($1 == "directory") print $2 }' ${ROOT}/etc/openldap/slapd.conf)"
75 fi
76 openldap_datadirs="${openldap_datadirs} ${OPENLDAP_DEFAULTDIR_VERSIONTAG}"
77 @@ -178,14 +178,14 @@
78 # (the net result is that "passwd" can be used to change ldap passwords w/
79 # proper pam support)
80 sed -i -e 's/$(SECURITY_LIBS) $(LDIF_LIBS) $(LUTIL_LIBS)/$(LUTIL_LIBS) $(SECURITY_LIBS) $(LDIF_LIBS)/' \
81 - ${S}/servers/slapd/Makefile.in
82 + "${S}"/servers/slapd/Makefile.in
83
84 # supersedes old fix for bug #31202
85 EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-2.2.14-perlthreadsfix.patch
86
87 # ensure correct SLAPI path by default
88 sed -i -e 's,\(#define LDAPI_SOCK\).*,\1 "/var/run/openldap/slapd.sock",' \
89 - ${S}/include/ldap_defaults.h
90 + "${S}"/include/ldap_defaults.h
91
92 EPATCH_OPTS="-p0 -d ${S}"
93
94 @@ -261,7 +261,7 @@
95 # slapd overlay options
96 myconf="${myconf} --enable-dyngroup --enable-proxycache"
97 use overlays && myconf="${myconf} --enable-overlays=mod"
98 - myconf="${myconf} --enable-syncprov"
99 + myconf="${myconf} --enable-syncprov"
100 else
101 myconf="${myconf} --disable-slapd --disable-slurpd"
102 myconf="${myconf} --disable-bdb --disable-ldbm"
103 @@ -366,9 +366,9 @@
104 fperms 0700 /var/lib/openldap-${x}
105 done
106
107 - echo "OLDPF='${PF}'" >${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}
108 - echo "# do NOT delete this. it is used" >>${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}
109 - echo "# to track versions for upgrading." >>${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}
110 + echo "OLDPF='${PF}'" >"${D}"${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}
111 + echo "# do NOT delete this. it is used" >>"${D}"${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}
112 + echo "# to track versions for upgrading." >>"${D}"${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}
113
114 # manually remove /var/tmp references in .la
115 # because it is packaged with an ancient libtool
116
117
118
119 --
120 gentoo-commits@g.o mailing list