Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Alin Nastac (mrness)" <mrness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/openswan: ChangeLog openswan-2.6.18.ebuild openswan-2.6.19.ebuild openswan-2.4.13-r2.ebuild openswan-2.4.12.ebuild openswan-2.6.16.ebuild openswan-2.4.11.ebuild openswan-2.4.13-r1.ebuild
Date: Wed, 03 Dec 2008 23:30:32
Message-Id: E1L81Aq-0008PA-GY@stork.gentoo.org
1 mrness 08/12/03 23:30:28
2
3 Modified: ChangeLog openswan-2.6.18.ebuild
4 Added: openswan-2.6.19.ebuild openswan-2.4.13-r2.ebuild
5 Removed: openswan-2.4.12.ebuild openswan-2.6.16.ebuild
6 openswan-2.4.11.ebuild openswan-2.4.13-r1.ebuild
7 Log:
8 Remove obsolete versions.
9 Correct doc install path (#241976).
10 Version bump.
11 (Portage version: 2.1.4.4, RepoMan options: --force)
12
13 Revision Changes Path
14 1.55 net-misc/openswan/ChangeLog
15
16 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openswan/ChangeLog?rev=1.55&view=markup
17 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openswan/ChangeLog?rev=1.55&content-type=text/plain
18 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openswan/ChangeLog?r1=1.54&r2=1.55
19
20 Index: ChangeLog
21 ===================================================================
22 RCS file: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v
23 retrieving revision 1.54
24 retrieving revision 1.55
25 diff -u -r1.54 -r1.55
26 --- ChangeLog 12 Oct 2008 16:39:13 -0000 1.54
27 +++ ChangeLog 3 Dec 2008 23:30:28 -0000 1.55
28 @@ -1,6 +1,23 @@
29 # ChangeLog for net-misc/openswan
30 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
31 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.54 2008/10/12 16:39:13 mrness Exp $
32 +# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.55 2008/12/03 23:30:28 mrness Exp $
33 +
34 +*openswan-2.6.19 (03 Dec 2008)
35 +*openswan-2.4.13-r2 (03 Dec 2008)
36 +
37 + 03 Dec 2008; Alin Năstac <mrness@g.o>
38 + -files/openswan-2.4.11-gentoo.patch,
39 + -files/openswan-2.4.11-implicit-decl.patch,
40 + -files/openswan-2.4.12-deprecated-ldap.patch,
41 + -files/openswan-2.4.12-gentoo.patch, -files/openswan-2.6.16-gentoo.patch,
42 + -files/openswan-2.6.16-qa-fixes.patch,
43 + -files/openswan-2.6.16-refine-connection.patch,
44 + +files/openswan-2.6.19-gentoo.patch,
45 + +files/openswan-2.6.19-qa-fixes.patch, -openswan-2.4.11.ebuild,
46 + -openswan-2.4.12.ebuild, -openswan-2.4.13-r1.ebuild,
47 + +openswan-2.4.13-r2.ebuild, -openswan-2.6.16.ebuild,
48 + openswan-2.6.18.ebuild, +openswan-2.6.19.ebuild:
49 + Remove obsolete versions. Correct doc install path (#241976). Version bump.
50
51 *openswan-2.6.18 (12 Oct 2008)
52 *openswan-2.4.13-r1 (12 Oct 2008)
53
54
55
56 1.2 net-misc/openswan/openswan-2.6.18.ebuild
57
58 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openswan/openswan-2.6.18.ebuild?rev=1.2&view=markup
59 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openswan/openswan-2.6.18.ebuild?rev=1.2&content-type=text/plain
60 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openswan/openswan-2.6.18.ebuild?r1=1.1&r2=1.2
61
62 Index: openswan-2.6.18.ebuild
63 ===================================================================
64 RCS file: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.18.ebuild,v
65 retrieving revision 1.1
66 retrieving revision 1.2
67 diff -u -r1.1 -r1.2
68 --- openswan-2.6.18.ebuild 12 Oct 2008 16:39:13 -0000 1.1
69 +++ openswan-2.6.18.ebuild 3 Dec 2008 23:30:28 -0000 1.2
70 @@ -1,6 +1,6 @@
71 # Copyright 1999-2008 Gentoo Foundation
72 # Distributed under the terms of the GNU General Public License v2
73 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.18.ebuild,v 1.1 2008/10/12 16:39:13 mrness Exp $
74 +# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.18.ebuild,v 1.2 2008/12/03 23:30:28 mrness Exp $
75
76 inherit eutils linux-info
77
78 @@ -68,11 +68,11 @@
79
80 get_make_options() {
81 echo KERNELSRC=\"${KERNEL_DIR}\" \
82 - FINALEXAMPLECONFDIR=/usr/share/doc/${P} \
83 + FINALEXAMPLECONFDIR=/usr/share/doc/${PF} \
84 INC_RCDEFAULT=/etc/init.d \
85 INC_USRLOCAL=/usr \
86 INC_MANDIR=share/man \
87 - FINALDOCDIR=/usr/share/doc/${P} \
88 + FINALDOCDIR=/usr/share/doc/${PF}/html \
89 DESTDIR=\"${D}\" \
90 USERCOMPILE=\"${CFLAGS}\"
91 if use smartcard ; then
92
93
94
95 1.1 net-misc/openswan/openswan-2.6.19.ebuild
96
97 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openswan/openswan-2.6.19.ebuild?rev=1.1&view=markup
98 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openswan/openswan-2.6.19.ebuild?rev=1.1&content-type=text/plain
99
100 Index: openswan-2.6.19.ebuild
101 ===================================================================
102 # Copyright 1999-2008 Gentoo Foundation
103 # Distributed under the terms of the GNU General Public License v2
104 # $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.19.ebuild,v 1.1 2008/12/03 23:30:28 mrness Exp $
105
106 inherit eutils linux-info
107
108 DESCRIPTION="Open Source implementation of IPsec for the Linux operating system (was SuperFreeS/WAN)."
109 HOMEPAGE="http://www.openswan.org/"
110 SRC_URI="http://www.openswan.org/download/${P}.tar.gz"
111
112 LICENSE="GPL-2"
113 SLOT="0"
114 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
115 IUSE="curl ldap smartcard extra-algorithms weak-algorithms nocrypto-algorithms"
116
117 COMMON_DEPEND="!net-misc/strongswan
118 dev-libs/gmp
119 dev-lang/perl
120 smartcard? ( dev-libs/opensc )
121 curl? ( net-misc/curl )
122 ldap? ( net-nds/openldap )"
123 DEPEND="${COMMON_DEPEND}
124 virtual/linux-sources
125 app-text/xmlto"
126 RDEPEND="${COMMON_DEPEND}
127 virtual/logger
128 sys-apps/iproute2"
129
130 pkg_setup() {
131 if use nocrypto-algorithms && ! use weak-algorithms; then
132 ewarn "Enabling nocrypto-algorithms USE flag has no effect when"
133 ewarn "weak-algorithms USE flag is disabled"
134 fi
135
136 linux-info_pkg_setup
137
138 if kernel_is 2 6; then
139 einfo "This ebuild will set ${P} to use 2.6 native IPsec (KAME)."
140 einfo "KLIPS will not be compiled/installed."
141 MYMAKE="programs"
142
143 elif kernel_is 2 4; then
144 if ! [[ -d "${KERNEL_DIR}/net/ipsec" ]]; then
145 eerror "You need to have an IPsec enabled 2.4.x kernel."
146 eerror "Ensure you have one running and make a symlink to it in /usr/src/linux"
147 die
148 fi
149
150 einfo "Using patched-in IPsec code for kernel 2.4"
151 einfo "Your kernel only supports KLIPS for kernel level IPsec."
152 MYMAKE="confcheck programs"
153
154 else
155 die "Unsupported kernel version"
156 fi
157 }
158
159 src_unpack() {
160 unpack ${A}
161
162 cd "${S}"
163 epatch "${FILESDIR}"/${P}-gentoo.patch
164 epatch "${FILESDIR}"/${P}-qa-fixes.patch
165
166 find . -regex '.*[.][1-8]' -exec sed -i \
167 -e s:/usr/local:/usr:g '{}' \; ||
168 die "failed to replace text in xml docs"
169 }
170
171 get_make_options() {
172 echo KERNELSRC=\"${KERNEL_DIR}\" \
173 FINALEXAMPLECONFDIR=/usr/share/doc/${PF} \
174 INC_RCDEFAULT=/etc/init.d \
175 INC_USRLOCAL=/usr \
176 INC_MANDIR=share/man \
177 FINALDOCDIR=/usr/share/doc/${PF}/html \
178 DESTDIR=\"${D}\" \
179 USERCOMPILE=\"${CFLAGS}\"
180 if use smartcard ; then
181 echo USE_SMARTCARD=true
182 fi
183 if use extra-algorithms ; then
184 echo USE_EXTRACRYPTO=true
185 else
186 echo USE_EXTRACRYPTO=false
187 fi
188 if use weak-algorithms ; then
189 echo USE_WEAKSTUFF=true
190 if use nocrypto-algorithms; then
191 echo USE_NOCRYPTO=true
192 fi
193 fi
194 echo USE_LWRES=false # needs bind9 with lwres support
195 local USETHREADS=false
196 if use curl; then
197 echo USE_LIBCURL=true
198 USETHREADS=true
199 fi
200 if use ldap; then
201 echo USE_LDAP=true
202 USETHREADS=true
203 fi
204 echo HAVE_THREADS=${USETHREADS}
205 }
206
207 src_compile() {
208 eval set -- $(get_make_options)
209 emake "$@" \
210 ${MYMAKE} || die "emake failed"
211 }
212
213 src_install() {
214 eval set -- $(get_make_options)
215 emake "$@" \
216 install || die "emake install failed"
217
218 newinitd "${FILESDIR}"/ipsec-initd ipsec || die "failed to install init script"
219
220 dodir /var/run/pluto || die "failed to create /var/run/pluto"
221 }
222
223 pkg_preinst() {
224 if has_version "<net-misc/openswan-2.6.14" && pushd "${ROOT}etc/ipsec"; then
225 ewarn "Following files and directories were moved from '${ROOT}etc/ipsec' to '${ROOT}etc':"
226 local i err=0
227 if [ -h "../ipsec.d" ]; then
228 rm "../ipsec.d" || die "failed to remove ../ipsec.d symlink"
229 fi
230 for i in *; do
231 if [ -e "../$i" ]; then
232 eerror " $i NOT MOVED, ../$i already exists!"
233 err=1
234 elif [ -d "$i" ]; then
235 mv "$i" .. || die "failed to move $i directory"
236 ewarn " directory $i"
237 elif [ -f "$i" ]; then
238 sed -i -e 's:/etc/ipsec/:/etc/:g' "$i" && \
239 mv "$i" .. && ewarn " file $i" || \
240 die "failed to move $i file"
241 else
242 eerror " $i NOT MOVED, it is not a file nor a directory!"
243 err=1
244 fi
245 done
246 popd
247 if [ $err -eq 0 ]; then
248 rmdir "${ROOT}etc/ipsec" || eerror "Failed to remove ${ROOT}etc/ipsec"
249 else
250 ewarn "${ROOT}etc/ipsec is not empty, you will have to remove it yourself"
251 fi
252 fi
253 }
254
255 pkg_postinst() {
256 if kernel_is 2 6; then
257 CONFIG_CHECK="~NET_KEY ~INET_XFRM_MODE_TRANSPORT ~INET_XFRM_MODE_TUNNEL ~INET_AH ~INET_ESP ~INET_IPCOMP"
258 WARNING_INET_AH="CONFIG_INET_AH:\tmissing IPsec AH support (needed if you want only authentication)"
259 WARNING_INET_ESP="CONFIG_INET_ESP:\tmissing IPsec ESP support (needed if you want authentication and encryption)"
260 WARNING_INET_IPCOMP="CONFIG_INET_IPCOMP:\tmissing IPsec Payload Compression (required for compress=yes)"
261 check_extra_config
262 fi
263 }
264
265
266
267 1.1 net-misc/openswan/openswan-2.4.13-r2.ebuild
268
269 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openswan/openswan-2.4.13-r2.ebuild?rev=1.1&view=markup
270 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openswan/openswan-2.4.13-r2.ebuild?rev=1.1&content-type=text/plain
271
272 Index: openswan-2.4.13-r2.ebuild
273 ===================================================================
274 # Copyright 1999-2008 Gentoo Foundation
275 # Distributed under the terms of the GNU General Public License v2
276 # $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.4.13-r2.ebuild,v 1.1 2008/12/03 23:30:28 mrness Exp $
277
278 inherit eutils linux-info
279
280 DESCRIPTION="Open Source implementation of IPsec for the Linux operating system (was SuperFreeS/WAN)."
281 HOMEPAGE="http://www.openswan.org/"
282 SRC_URI="http://www.openswan.org/download/${P}.tar.gz"
283
284 LICENSE="GPL-2"
285 SLOT="0"
286 KEYWORDS="amd64 ~ppc ~sparc x86"
287 IUSE="curl ldap smartcard extra-algorithms weak-algorithms"
288
289 COMMON_DEPEND="!net-misc/strongswan
290 dev-libs/gmp
291 dev-lang/perl
292 smartcard? ( dev-libs/opensc )
293 curl? ( net-misc/curl )
294 ldap? ( net-nds/openldap )"
295 DEPEND="${COMMON_DEPEND}
296 virtual/linux-sources"
297 RDEPEND="${COMMON_DEPEND}
298 virtual/logger
299 sys-apps/iproute2"
300
301 pkg_setup() {
302 linux-info_pkg_setup
303
304 if kernel_is 2 6; then
305 einfo "This ebuild will set ${P} to use 2.6 native IPsec (KAME)."
306 einfo "KLIPS will not be compiled/installed."
307 MYMAKE="programs"
308
309 elif kernel_is 2 4; then
310 if ! [[ -d "${KERNEL_DIR}/net/ipsec" ]]; then
311 eerror "You need to have an IPsec enabled 2.4.x kernel."
312 eerror "Ensure you have one running and make a symlink to it in /usr/src/linux"
313 die
314 fi
315
316 einfo "Using patched-in IPsec code for kernel 2.4"
317 einfo "Your kernel only supports KLIPS for kernel level IPsec."
318 MYMAKE="confcheck programs"
319
320 else
321 die "Unsupported kernel version"
322 fi
323 }
324
325 src_unpack() {
326 unpack ${A}
327
328 cd "${S}"
329 epatch "${FILESDIR}"/${P}-gentoo-fixed.patch
330 epatch "${FILESDIR}"/${P}-deprecated-ldap.patch
331
332 find . -regex '.*[.][1-8]' -exec sed -i \
333 -e s:/usr/local:/usr:g \
334 -e s:/etc/ipsec[.]conf:/etc/ipsec/ipsec.conf:g \
335 -e s:/etc/ipsec[.]secrets:/etc/ipsec/ipsec.secrets:g '{}' \; ||
336 die "failed to replace text in xml docs"
337 }
338
339 get_make_options() {
340 echo KERNELSRC=\"${KERNEL_DIR}\" \
341 FINALCONFDIR=/etc/ipsec \
342 FINALCONFFILE=/etc/ipsec/ipsec.conf \
343 FINALEXAMPLECONFDIR=/usr/share/doc/${PF} \
344 INC_RCDEFAULT=/etc/init.d \
345 INC_USRLOCAL=/usr \
346 INC_MANDIR=share/man \
347 FINALDOCDIR=/usr/share/doc/${PF} \
348 DESTDIR=\"${D}\" \
349 USERCOMPILE=\"${CFLAGS}\"
350 if use smartcard ; then
351 echo USE_SMARTCARD=true
352 fi
353 if use extra-algorithms ; then
354 echo USE_EXTRACRYPTO=true
355 fi
356 if use weak-algorithms ; then
357 echo USE_WEAKSTUFF=true
358 fi
359 echo USE_OE=false # by default, turn off Opportunistic Encryption
360 echo USE_LWRES=false # needs bind9 with lwres support
361 local USETHREADS=false
362 if use curl; then
363 echo USE_LIBCURL=true
364 USETHREADS=true
365 fi
366 if use ldap; then
367 echo USE_LDAP=true
368 USETHREADS=true
369 fi
370 echo HAVE_THREADS=${USETHREADS}
371 }
372
373 src_compile() {
374 eval set -- $(get_make_options)
375 emake "$@" \
376 ${MYMAKE} || die "emake failed"
377 }
378
379 src_install() {
380 eval set -- $(get_make_options)
381 emake "$@" \
382 install || die "emake install failed"
383
384 dosym /etc/ipsec/ipsec.d /etc/ipsec.d
385
386 doinitd "${FILESDIR}"/ipsec || die "failed to install init script"
387
388 dodir /var/run/pluto || die "failed to create /var/run/pluto"
389 }
390
391 pkg_postinst() {
392 if kernel_is 2 6; then
393 CONFIG_CHECK="~NET_KEY ~INET_XFRM_MODE_TRANSPORT ~INET_XFRM_MODE_TUNNEL ~INET_AH ~INET_ESP ~INET_IPCOMP"
394 WARNING_INET_AH="CONFIG_INET_AH:\tmissing IPsec AH support (needed if you want only authentication)"
395 WARNING_INET_ESP="CONFIG_INET_ESP:\tmissing IPsec ESP support (needed if you want authentication and encryption)"
396 WARNING_INET_IPCOMP="CONFIG_INET_IPCOMP:\tmissing IPsec Payload Compression (required for compress=yes)"
397 check_extra_config
398 fi
399 }
Report Message
Find on MARC Find on Google Groups