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