Gentoo Archives: gentoo-commits

From: "Robin H. Johnson (robbat2)" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-nds/openldap: openldap-2.4.21.ebuild openldap-2.4.25.ebuild openldap-2.4.25-r1.ebuild openldap-2.4.23.ebuild openldap-2.3.43-r1.ebuild openldap-2.4.24.ebuild openldap-2.4.19-r1.ebuild ChangeLog
Date: Thu, 02 Feb 2012 09:07:02
Message-Id: 20120202084207.E506220061@flycatcher.gentoo.org
1 robbat2 12/02/02 08:42:07
2
3 Modified: openldap-2.4.21.ebuild openldap-2.4.25.ebuild
4 openldap-2.4.25-r1.ebuild openldap-2.4.23.ebuild
5 openldap-2.3.43-r1.ebuild openldap-2.4.24.ebuild
6 openldap-2.4.19-r1.ebuild ChangeLog
7 Log:
8 When upgrading a replicated setup, you need to remove contextCSN as well as the usual entryCSN that is needed in non-replicated setups.
9
10 (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
11
12 Revision Changes Path
13 1.2 net-nds/openldap/openldap-2.4.21.ebuild
14
15 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/openldap-2.4.21.ebuild?rev=1.2&view=markup
16 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/openldap-2.4.21.ebuild?rev=1.2&content-type=text/plain
17 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/openldap-2.4.21.ebuild?r1=1.1&r2=1.2
18
19 Index: openldap-2.4.21.ebuild
20 ===================================================================
21 RCS file: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.21.ebuild,v
22 retrieving revision 1.1
23 retrieving revision 1.2
24 diff -p -w -b -B -u -u -r1.1 -r1.2
25 --- openldap-2.4.21.ebuild 11 Apr 2010 15:14:48 -0000 1.1
26 +++ openldap-2.4.21.ebuild 2 Feb 2012 08:42:07 -0000 1.2
27 @@ -1,6 +1,6 @@
28 -# Copyright 1999-2010 Gentoo Foundation
29 +# Copyright 1999-2012 Gentoo Foundation
30 # Distributed under the terms of the GNU General Public License v2
31 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.21.ebuild,v 1.1 2010/04/11 15:14:48 jokey Exp $
32 +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.21.ebuild,v 1.2 2012/02/02 08:42:07 robbat2 Exp $
33
34 EAPI="2"
35 inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs
36 @@ -183,7 +183,7 @@ openldap_upgrade_howto() {
37 i="${l}.raw"
38 eerror " 1. /etc/init.d/slurpd stop ; /etc/init.d/slapd stop"
39 eerror " 2. slapcat -l ${i}"
40 - eerror " 3. egrep -v '^entryCSN:' <${i} >${l}"
41 + eerror " 3. egrep -v '^(entry|context)CSN:' <${i} >${l}"
42 eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/"
43 eerror " 5. emerge --update \=net-nds/${PF}"
44 eerror " 6. etc-update, and ensure that you apply the changes"
45
46
47
48 1.2 net-nds/openldap/openldap-2.4.25.ebuild
49
50 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/openldap-2.4.25.ebuild?rev=1.2&view=markup
51 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/openldap-2.4.25.ebuild?rev=1.2&content-type=text/plain
52 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/openldap-2.4.25.ebuild?r1=1.1&r2=1.2
53
54 Index: openldap-2.4.25.ebuild
55 ===================================================================
56 RCS file: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.25.ebuild,v
57 retrieving revision 1.1
58 retrieving revision 1.2
59 diff -p -w -b -B -u -u -r1.1 -r1.2
60 --- openldap-2.4.25.ebuild 6 May 2011 15:45:59 -0000 1.1
61 +++ openldap-2.4.25.ebuild 2 Feb 2012 08:42:07 -0000 1.2
62 @@ -1,6 +1,6 @@
63 -# Copyright 1999-2011 Gentoo Foundation
64 +# Copyright 1999-2012 Gentoo Foundation
65 # Distributed under the terms of the GNU General Public License v2
66 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.25.ebuild,v 1.1 2011/05/06 15:45:59 robbat2 Exp $
67 +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.25.ebuild,v 1.2 2012/02/02 08:42:07 robbat2 Exp $
68
69 EAPI="2"
70 inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs
71 @@ -183,7 +183,7 @@ openldap_upgrade_howto() {
72 i="${l}.raw"
73 eerror " 1. /etc/init.d/slurpd stop ; /etc/init.d/slapd stop"
74 eerror " 2. slapcat -l ${i}"
75 - eerror " 3. egrep -v '^entryCSN:' <${i} >${l}"
76 + eerror " 3. egrep -v '^(entry|context)CSN:' <${i} >${l}"
77 eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/"
78 eerror " 5. emerge --update \=net-nds/${PF}"
79 eerror " 6. etc-update, and ensure that you apply the changes"
80
81
82
83 1.2 net-nds/openldap/openldap-2.4.25-r1.ebuild
84
85 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/openldap-2.4.25-r1.ebuild?rev=1.2&view=markup
86 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/openldap-2.4.25-r1.ebuild?rev=1.2&content-type=text/plain
87 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/openldap-2.4.25-r1.ebuild?r1=1.1&r2=1.2
88
89 Index: openldap-2.4.25-r1.ebuild
90 ===================================================================
91 RCS file: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.25-r1.ebuild,v
92 retrieving revision 1.1
93 retrieving revision 1.2
94 diff -p -w -b -B -u -u -r1.1 -r1.2
95 --- openldap-2.4.25-r1.ebuild 11 Aug 2011 07:56:54 -0000 1.1
96 +++ openldap-2.4.25-r1.ebuild 2 Feb 2012 08:42:07 -0000 1.2
97 @@ -1,6 +1,6 @@
98 -# Copyright 1999-2011 Gentoo Foundation
99 +# Copyright 1999-2012 Gentoo Foundation
100 # Distributed under the terms of the GNU General Public License v2
101 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.25-r1.ebuild,v 1.1 2011/08/11 07:56:54 abcd Exp $
102 +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.25-r1.ebuild,v 1.2 2012/02/02 08:42:07 robbat2 Exp $
103
104 EAPI="3"
105 inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs
106 @@ -183,7 +183,7 @@ openldap_upgrade_howto() {
107 i="${l}.raw"
108 eerror " 1. /etc/init.d/slurpd stop ; /etc/init.d/slapd stop"
109 eerror " 2. slapcat -l ${i}"
110 - eerror " 3. egrep -v '^entryCSN:' <${i} >${l}"
111 + eerror " 3. egrep -v '^(entry|context)CSN:' <${i} >${l}"
112 eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/"
113 eerror " 5. emerge --update \=net-nds/${PF}"
114 eerror " 6. etc-update, and ensure that you apply the changes"
115
116
117
118 1.8 net-nds/openldap/openldap-2.4.23.ebuild
119
120 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/openldap-2.4.23.ebuild?rev=1.8&view=markup
121 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/openldap-2.4.23.ebuild?rev=1.8&content-type=text/plain
122 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/openldap-2.4.23.ebuild?r1=1.7&r2=1.8
123
124 Index: openldap-2.4.23.ebuild
125 ===================================================================
126 RCS file: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.23.ebuild,v
127 retrieving revision 1.7
128 retrieving revision 1.8
129 diff -p -w -b -B -u -u -r1.7 -r1.8
130 --- openldap-2.4.23.ebuild 12 Sep 2010 04:34:43 -0000 1.7
131 +++ openldap-2.4.23.ebuild 2 Feb 2012 08:42:07 -0000 1.8
132 @@ -1,6 +1,6 @@
133 -# Copyright 1999-2010 Gentoo Foundation
134 +# Copyright 1999-2012 Gentoo Foundation
135 # Distributed under the terms of the GNU General Public License v2
136 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.23.ebuild,v 1.7 2010/09/12 04:34:43 josejx Exp $
137 +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.23.ebuild,v 1.8 2012/02/02 08:42:07 robbat2 Exp $
138
139 EAPI="2"
140 inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs
141 @@ -183,7 +183,7 @@ openldap_upgrade_howto() {
142 i="${l}.raw"
143 eerror " 1. /etc/init.d/slurpd stop ; /etc/init.d/slapd stop"
144 eerror " 2. slapcat -l ${i}"
145 - eerror " 3. egrep -v '^entryCSN:' <${i} >${l}"
146 + eerror " 3. egrep -v '^(entry|context)CSN:' <${i} >${l}"
147 eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/"
148 eerror " 5. emerge --update \=net-nds/${PF}"
149 eerror " 6. etc-update, and ensure that you apply the changes"
150
151
152
153 1.10 net-nds/openldap/openldap-2.3.43-r1.ebuild
154
155 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/openldap-2.3.43-r1.ebuild?rev=1.10&view=markup
156 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/openldap-2.3.43-r1.ebuild?rev=1.10&content-type=text/plain
157 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/openldap-2.3.43-r1.ebuild?r1=1.9&r2=1.10
158
159 Index: openldap-2.3.43-r1.ebuild
160 ===================================================================
161 RCS file: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.43-r1.ebuild,v
162 retrieving revision 1.9
163 retrieving revision 1.10
164 diff -p -w -b -B -u -u -r1.9 -r1.10
165 --- openldap-2.3.43-r1.ebuild 22 Aug 2011 23:22:47 -0000 1.9
166 +++ openldap-2.3.43-r1.ebuild 2 Feb 2012 08:42:07 -0000 1.10
167 @@ -1,6 +1,6 @@
168 -# Copyright 1999-2011 Gentoo Foundation
169 +# Copyright 1999-2012 Gentoo Foundation
170 # Distributed under the terms of the GNU General Public License v2
171 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.43-r1.ebuild,v 1.9 2011/08/22 23:22:47 robbat2 Exp $
172 +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.43-r1.ebuild,v 1.10 2012/02/02 08:42:07 robbat2 Exp $
173
174 EAPI="2"
175
176 @@ -75,7 +75,7 @@ openldap_upgrade_howto() {
177 i="${l}.raw"
178 eerror " 1. /etc/init.d/slurpd stop ; /etc/init.d/slapd stop"
179 eerror " 2. slapcat -l ${i}"
180 - eerror " 3. egrep -v '^entryCSN:' <${i} >${l}"
181 + eerror " 3. egrep -v '^(entry|context)CSN:' <${i} >${l}"
182 eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/"
183 eerror " 5. emerge --update \=net-nds/${PF}"
184 eerror " 6. etc-update, and ensure that you apply the changes"
185
186
187
188 1.7 net-nds/openldap/openldap-2.4.24.ebuild
189
190 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/openldap-2.4.24.ebuild?rev=1.7&view=markup
191 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/openldap-2.4.24.ebuild?rev=1.7&content-type=text/plain
192 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/openldap-2.4.24.ebuild?r1=1.6&r2=1.7
193
194 Index: openldap-2.4.24.ebuild
195 ===================================================================
196 RCS file: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.24.ebuild,v
197 retrieving revision 1.6
198 retrieving revision 1.7
199 diff -p -w -b -B -u -u -r1.6 -r1.7
200 --- openldap-2.4.24.ebuild 26 Feb 2011 16:44:43 -0000 1.6
201 +++ openldap-2.4.24.ebuild 2 Feb 2012 08:42:07 -0000 1.7
202 @@ -1,6 +1,6 @@
203 -# Copyright 1999-2011 Gentoo Foundation
204 +# Copyright 1999-2012 Gentoo Foundation
205 # Distributed under the terms of the GNU General Public License v2
206 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.24.ebuild,v 1.6 2011/02/26 16:44:43 armin76 Exp $
207 +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.24.ebuild,v 1.7 2012/02/02 08:42:07 robbat2 Exp $
208
209 EAPI="2"
210 inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs
211 @@ -183,7 +183,7 @@ openldap_upgrade_howto() {
212 i="${l}.raw"
213 eerror " 1. /etc/init.d/slurpd stop ; /etc/init.d/slapd stop"
214 eerror " 2. slapcat -l ${i}"
215 - eerror " 3. egrep -v '^entryCSN:' <${i} >${l}"
216 + eerror " 3. egrep -v '^(entry|context)CSN:' <${i} >${l}"
217 eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/"
218 eerror " 5. emerge --update \=net-nds/${PF}"
219 eerror " 6. etc-update, and ensure that you apply the changes"
220
221
222
223 1.12 net-nds/openldap/openldap-2.4.19-r1.ebuild
224
225 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/openldap-2.4.19-r1.ebuild?rev=1.12&view=markup
226 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/openldap-2.4.19-r1.ebuild?rev=1.12&content-type=text/plain
227 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/openldap-2.4.19-r1.ebuild?r1=1.11&r2=1.12
228
229 Index: openldap-2.4.19-r1.ebuild
230 ===================================================================
231 RCS file: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.19-r1.ebuild,v
232 retrieving revision 1.11
233 retrieving revision 1.12
234 diff -p -w -b -B -u -u -r1.11 -r1.12
235 --- openldap-2.4.19-r1.ebuild 12 Jan 2010 20:05:41 -0000 1.11
236 +++ openldap-2.4.19-r1.ebuild 2 Feb 2012 08:42:07 -0000 1.12
237 @@ -1,6 +1,6 @@
238 -# Copyright 1999-2010 Gentoo Foundation
239 +# Copyright 1999-2012 Gentoo Foundation
240 # Distributed under the terms of the GNU General Public License v2
241 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.19-r1.ebuild,v 1.11 2010/01/12 20:05:41 cardoe Exp $
242 +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.19-r1.ebuild,v 1.12 2012/02/02 08:42:07 robbat2 Exp $
243
244 EAPI="2"
245 inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs
246 @@ -183,7 +183,7 @@ openldap_upgrade_howto() {
247 i="${l}.raw"
248 eerror " 1. /etc/init.d/slurpd stop ; /etc/init.d/slapd stop"
249 eerror " 2. slapcat -l ${i}"
250 - eerror " 3. egrep -v '^entryCSN:' <${i} >${l}"
251 + eerror " 3. egrep -v '^(entry|context)CSN:' <${i} >${l}"
252 eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/"
253 eerror " 5. emerge --update \=net-nds/${PF}"
254 eerror " 6. etc-update, and ensure that you apply the changes"
255
256
257
258 1.387 net-nds/openldap/ChangeLog
259
260 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/ChangeLog?rev=1.387&view=markup
261 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/ChangeLog?rev=1.387&content-type=text/plain
262 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/ChangeLog?r1=1.386&r2=1.387
263
264 Index: ChangeLog
265 ===================================================================
266 RCS file: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v
267 retrieving revision 1.386
268 retrieving revision 1.387
269 diff -p -w -b -B -u -u -r1.386 -r1.387
270 --- ChangeLog 22 Aug 2011 23:22:47 -0000 1.386
271 +++ ChangeLog 2 Feb 2012 08:42:07 -0000 1.387
272 @@ -1,6 +1,12 @@
273 # ChangeLog for net-nds/openldap
274 -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
275 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.386 2011/08/22 23:22:47 robbat2 Exp $
276 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
277 +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.387 2012/02/02 08:42:07 robbat2 Exp $
278 +
279 + 02 Feb 2012; Robin H. Johnson <robbat2@g.o> openldap-2.3.43-r1.ebuild,
280 + openldap-2.4.19-r1.ebuild, openldap-2.4.21.ebuild, openldap-2.4.23.ebuild,
281 + openldap-2.4.24.ebuild, openldap-2.4.25-r1.ebuild, openldap-2.4.25.ebuild:
282 + When upgrading a replicated setup, you need to remove contextCSN as well as
283 + the usual entryCSN that is needed in non-replicated setups.
284
285 22 Aug 2011; Robin H. Johnson <robbat2@g.o> openldap-2.3.43-r1.ebuild:
286 Backport FORCE_UPGRADE to old 2.3 major series.