diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-08 14:25:59 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-08 14:49:16 +0100 |
commit | 67f6baa72a2c4ab868ec9c333863476e4e77513a (patch) | |
tree | 00b72871d7f12e556eb98c67c1a0b3b0c94c3871 /meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7 | |
parent | 71e56f8d89c05859ddb817731653d39a8145fb98 (diff) | |
download | poky-67f6baa72a2c4ab868ec9c333863476e4e77513a.tar.gz |
meta-demoapps: Remove except for xeyes and pong-clock
http://lists.linuxtogo.org/pipermail/openembedded-core/2012-May/022059.html
As proposed by Martin Jansa with a couple of changes from me.
(From OE-Core rev: 204ee7391c19f9b2fa7f8b2ef46d04c7ccf5bd42)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7')
3 files changed, 0 insertions, 422 deletions
diff --git a/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/installflags.patch b/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/installflags.patch deleted file mode 100644 index ffebf2b504..0000000000 --- a/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/installflags.patch +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | Index: openswan-2.4.7/Makefile.inc | ||
4 | =================================================================== | ||
5 | --- openswan-2.4.7.orig/Makefile.inc 2006-12-25 18:05:40.608503250 +0100 | ||
6 | +++ openswan-2.4.7/Makefile.inc 2006-12-25 18:06:39.028154250 +0100 | ||
7 | @@ -158,7 +158,7 @@ | ||
8 | # how backup names are composed. | ||
9 | # Note that the install procedures will never overwrite an existing config | ||
10 | # file, which is why -b is not specified for them. | ||
11 | -INSTBINFLAGS=-b --suffix=.old | ||
12 | +INSTBINFLAGS= | ||
13 | INSTSUIDFLAGS=--mode=u+rxs,g+rx,o+rx --group=root -b --suffix=.old | ||
14 | INSTMANFLAGS= | ||
15 | INSTCONFFLAGS= | ||
diff --git a/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/ld-library-path-breakage.patch b/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/ld-library-path-breakage.patch deleted file mode 100644 index 92f3547f90..0000000000 --- a/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/ld-library-path-breakage.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | --- openswan-2.2.0.orig/programs/Makefile.program 2004-06-03 03:06:27.000000000 +0200 | ||
4 | +++ openswan-2.2.0/programs/Makefile.program 2005-03-05 13:50:19.000000000 +0100 | ||
5 | @@ -30,10 +30,6 @@ | ||
6 | |||
7 | CFLAGS+= ${WERROR} | ||
8 | |||
9 | -ifneq ($(LD_LIBRARY_PATH),) | ||
10 | -LDFLAGS=-L$(LD_LIBRARY_PATH) | ||
11 | -endif | ||
12 | - | ||
13 | MANDIR8=$(MANTREE)/man8 | ||
14 | MANDIR5=$(MANTREE)/man5 | ||
15 | |||
16 | --- openswan-2.2.0.orig/programs/pluto/Makefile 2005-01-03 20:40:45.000000000 +0100 | ||
17 | +++ openswan-2.2.0/programs/pluto/Makefile 2005-03-05 13:51:21.000000000 +0100 | ||
18 | @@ -234,10 +234,6 @@ | ||
19 | LIBSPLUTO+=${CURL_LIBS} | ||
20 | LIBSPLUTO+= -lgmp -lresolv # -lefence | ||
21 | |||
22 | -ifneq ($(LD_LIBRARY_PATH),) | ||
23 | -LDFLAGS=-L$(LD_LIBRARY_PATH) | ||
24 | -endif | ||
25 | - | ||
26 | LIBSADNS = $(OPENSWANLIB) | ||
27 | LIBSADNS += -lresolv # -lefence | ||
28 | |||
diff --git a/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/openswan-2.4.7-gentoo.patch b/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/openswan-2.4.7-gentoo.patch deleted file mode 100644 index c24227c18f..0000000000 --- a/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/openswan-2.4.7-gentoo.patch +++ /dev/null | |||
@@ -1,379 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | diff -Nru openswan-2.4.7.orig/doc/Makefile openswan-2.4.7/doc/Makefile | ||
4 | --- openswan-2.4.7.orig/doc/Makefile 2005-11-08 23:32:45.000000000 +0200 | ||
5 | +++ openswan-2.4.7/doc/Makefile 2006-12-06 22:46:54.732830840 +0200 | ||
6 | @@ -1,6 +1,6 @@ | ||
7 | # Makefile to generate various formats from HTML source | ||
8 | # | ||
9 | -# Assumes the htmldoc utility is available. | ||
10 | +# No longer cares if the htmldoc utility is available. | ||
11 | # This can be downloaded from www.easysw.com | ||
12 | # | ||
13 | # Also needs lynx(1) for HTML-to-text conversion | ||
14 | diff -Nru openswan-2.4.7.orig/lib/libcrypto/libdes/asm/crypt586.pl openswan-2.4.7/lib/libcrypto/libdes/asm/crypt586.pl | ||
15 | --- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/crypt586.pl 2004-07-16 03:24:45.000000000 +0300 | ||
16 | +++ openswan-2.4.7/lib/libcrypto/libdes/asm/crypt586.pl 2006-12-06 22:46:54.732830840 +0200 | ||
17 | @@ -1,4 +1,4 @@ | ||
18 | -#!/usr/local/bin/perl | ||
19 | +#!/usr/bin/perl | ||
20 | # | ||
21 | # The inner loop instruction sequence and the IP/FP modifications are from | ||
22 | # Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk> | ||
23 | diff -Nru openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/cbc.pl openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/cbc.pl | ||
24 | --- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/cbc.pl 2004-07-10 11:07:06.000000000 +0300 | ||
25 | +++ openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/cbc.pl 2006-12-06 22:46:54.736831090 +0200 | ||
26 | @@ -1,4 +1,4 @@ | ||
27 | -#!/usr/local/bin/perl | ||
28 | +#!/usr/bin/perl | ||
29 | |||
30 | # void des_ncbc_encrypt(input, output, length, schedule, ivec, enc) | ||
31 | # des_cblock (*input); | ||
32 | diff -Nru openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86asm.pl openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86asm.pl | ||
33 | --- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86asm.pl 2004-07-10 11:07:06.000000000 +0300 | ||
34 | +++ openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86asm.pl 2006-12-06 22:46:54.736831090 +0200 | ||
35 | @@ -1,4 +1,4 @@ | ||
36 | -#!/usr/local/bin/perl | ||
37 | +#!/usr/bin/perl | ||
38 | |||
39 | # require 'x86asm.pl'; | ||
40 | # &asm_init("cpp","des-586.pl"); | ||
41 | diff -Nru openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86ms.pl openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86ms.pl | ||
42 | --- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86ms.pl 2004-07-10 11:07:07.000000000 +0300 | ||
43 | +++ openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86ms.pl 2006-12-06 22:46:54.736831090 +0200 | ||
44 | @@ -1,4 +1,4 @@ | ||
45 | -#!/usr/local/bin/perl | ||
46 | +#!/usr/bin/perl | ||
47 | |||
48 | package x86ms; | ||
49 | |||
50 | diff -Nru openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86unix.pl openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86unix.pl | ||
51 | --- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86unix.pl 2004-07-10 11:07:07.000000000 +0300 | ||
52 | +++ openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86unix.pl 2006-12-06 22:46:54.736831090 +0200 | ||
53 | @@ -1,4 +1,4 @@ | ||
54 | -#!/usr/local/bin/perl | ||
55 | +#!/usr/bin/perl | ||
56 | |||
57 | package x86unix; | ||
58 | |||
59 | diff -Nru openswan-2.4.7.orig/lib/liblwres/Makefile openswan-2.4.7/lib/liblwres/Makefile | ||
60 | --- openswan-2.4.7.orig/lib/liblwres/Makefile 2004-12-18 20:13:34.000000000 +0200 | ||
61 | +++ openswan-2.4.7/lib/liblwres/Makefile 2006-12-06 22:46:54.736831090 +0200 | ||
62 | @@ -20,7 +20,7 @@ | ||
63 | CDEFINES = -g | ||
64 | CWARNINGS = -Werror | ||
65 | |||
66 | -CFLAGS=${CINCLUDES} ${CDEFINES} ${CWARNINGS} | ||
67 | +CFLAGS=${CINCLUDES} ${CDEFINES} ${CWARNINGS} $(USERCOMPILE) | ||
68 | |||
69 | VERSION="@(\#) openswan-hacking-9.3-for-osw2" | ||
70 | LIBINTERFACE=2 | ||
71 | diff -Nru openswan-2.4.7.orig/linux/net/ipsec/des/asm/des-586.pl openswan-2.4.7/linux/net/ipsec/des/asm/des-586.pl | ||
72 | --- openswan-2.4.7.orig/linux/net/ipsec/des/asm/des-586.pl 2004-07-10 11:06:50.000000000 +0300 | ||
73 | +++ openswan-2.4.7/linux/net/ipsec/des/asm/des-586.pl 2006-12-06 22:46:54.736831090 +0200 | ||
74 | @@ -1,4 +1,4 @@ | ||
75 | -#!/usr/local/bin/perl | ||
76 | +#!/usr/bin/perl | ||
77 | # | ||
78 | # The inner loop instruction sequence and the IP/FP modifications are from | ||
79 | # Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk> | ||
80 | diff -Nru openswan-2.4.7.orig/linux/net/ipsec/des/asm/des686.pl openswan-2.4.7/linux/net/ipsec/des/asm/des686.pl | ||
81 | --- openswan-2.4.7.orig/linux/net/ipsec/des/asm/des686.pl 2004-07-10 11:06:50.000000000 +0300 | ||
82 | +++ openswan-2.4.7/linux/net/ipsec/des/asm/des686.pl 2006-12-06 22:46:54.740831340 +0200 | ||
83 | @@ -1,4 +1,4 @@ | ||
84 | -#!/usr/local/bin/perl | ||
85 | +#!/usr/bin/perl | ||
86 | |||
87 | $prog="des686.pl"; | ||
88 | |||
89 | diff -Nru openswan-2.4.7.orig/linux/net/ipsec/des/asm/desboth.pl openswan-2.4.7/linux/net/ipsec/des/asm/desboth.pl | ||
90 | --- openswan-2.4.7.orig/linux/net/ipsec/des/asm/desboth.pl 2004-07-10 11:06:50.000000000 +0300 | ||
91 | +++ openswan-2.4.7/linux/net/ipsec/des/asm/desboth.pl 2006-12-06 22:46:54.740831340 +0200 | ||
92 | @@ -1,4 +1,4 @@ | ||
93 | -#!/usr/local/bin/perl | ||
94 | +#!/usr/bin/perl | ||
95 | |||
96 | $L="edi"; | ||
97 | $R="esi"; | ||
98 | diff -Nru openswan-2.4.7.orig/Makefile.inc openswan-2.4.7/Makefile.inc | ||
99 | --- openswan-2.4.7.orig/Makefile.inc 2006-11-14 19:56:09.000000000 +0200 | ||
100 | +++ openswan-2.4.7/Makefile.inc 2006-12-06 22:48:32.534943089 +0200 | ||
101 | @@ -46,7 +46,7 @@ | ||
102 | DESTDIR?= | ||
103 | |||
104 | # "local" part of tree, used in building other pathnames | ||
105 | -INC_USRLOCAL=/usr/local | ||
106 | +INC_USRLOCAL?=/usr | ||
107 | |||
108 | # PUBDIR is where the "ipsec" command goes; beware, many things define PATH | ||
109 | # settings which are assumed to include it (or at least, to include *some* | ||
110 | @@ -80,7 +80,7 @@ | ||
111 | MANPLACES=man3 man5 man8 | ||
112 | |||
113 | # where configuration files go | ||
114 | -FINALCONFFILE?=/etc/ipsec.conf | ||
115 | +FINALCONFFILE?=/etc/ipsec/ipsec.conf | ||
116 | CONFFILE=$(DESTDIR)$(FINALCONFFILE) | ||
117 | |||
118 | FINALCONFDIR?=/etc | ||
119 | @@ -91,7 +91,7 @@ | ||
120 | |||
121 | # sample configuration files go into | ||
122 | INC_DOCDIR?=share/doc | ||
123 | -FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan | ||
124 | +FINALEXAMPLECONFDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan | ||
125 | EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR} | ||
126 | |||
127 | FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan | ||
128 | @@ -239,7 +239,7 @@ | ||
129 | # installed one in RH 7.2, won't work - you wind up depending upon | ||
130 | # openssl. | ||
131 | |||
132 | -BIND9STATICLIBDIR?=/usr/local/lib | ||
133 | +BIND9STATICLIBDIR?=/usr/lib | ||
134 | |||
135 | # if you install elsewere, you may need to point the include files to it. | ||
136 | #BIND9STATICLIBDIR?=/sandel/lib | ||
137 | diff -Nru openswan-2.4.7.orig/programs/barf/barf.in openswan-2.4.7/programs/barf/barf.in | ||
138 | --- openswan-2.4.7.orig/programs/barf/barf.in 2006-11-07 05:49:18.000000000 +0200 | ||
139 | +++ openswan-2.4.7/programs/barf/barf.in 2006-12-06 22:46:54.740831340 +0200 | ||
140 | @@ -16,7 +16,7 @@ | ||
141 | |||
142 | LOGS=${LOGS-/var/log} | ||
143 | CONFS=${IPSEC_CONFS-/etc} | ||
144 | -CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec.d} | ||
145 | +CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec/ipsec.d} | ||
146 | me="ipsec barf" | ||
147 | # Max lines to use for things like 'route -n' | ||
148 | maxlines=100 | ||
149 | @@ -238,13 +238,13 @@ | ||
150 | done | ||
151 | fi | ||
152 | _________________________ ipsec/ls-libdir | ||
153 | -ls -l ${IPSEC_LIBDIR-/usr/local/lib/ipsec} | ||
154 | +ls -l ${IPSEC_LIBDIR-/usr/lib/ipsec} | ||
155 | _________________________ ipsec/ls-execdir | ||
156 | -ls -l ${IPSEC_EXECDIR-/usr/local/libexec/ipsec} | ||
157 | +ls -l ${IPSEC_EXECDIR-/usr/libexec/ipsec} | ||
158 | _________________________ ipsec/updowns | ||
159 | -for f in `ls ${IPSEC_EXECDIR-/usr/local/libexec/ipsec} | egrep updown` | ||
160 | +for f in `ls ${IPSEC_EXECDIR-/usr/libexec/ipsec} | egrep updown` | ||
161 | do | ||
162 | - cat ${IPSEC_EXECDIR-/usr/local/libexec/ipsec}/$f | ||
163 | + cat ${IPSEC_EXECDIR-/usr/libexec/ipsec}/$f | ||
164 | done | ||
165 | _________________________ /proc/net/dev | ||
166 | cat /proc/net/dev | ||
167 | diff -Nru openswan-2.4.7.orig/programs/eroute/eroute.5 openswan-2.4.7/programs/eroute/eroute.5 | ||
168 | --- openswan-2.4.7.orig/programs/eroute/eroute.5 2006-10-26 23:40:43.000000000 +0300 | ||
169 | +++ openswan-2.4.7/programs/eroute/eroute.5 2006-12-06 22:57:19.307864340 +0200 | ||
170 | @@ -168,7 +168,7 @@ | ||
171 | .SH "FILES" | ||
172 | |||
173 | .PP | ||
174 | -/proc/net/ipsec_eroute, /usr/local/bin/ipsec | ||
175 | +/proc/net/ipsec_eroute, /usr/bin/ipsec | ||
176 | |||
177 | .SH "SEE ALSO" | ||
178 | |||
179 | diff -Nru openswan-2.4.7.orig/programs/eroute/eroute.8 openswan-2.4.7/programs/eroute/eroute.8 | ||
180 | --- openswan-2.4.7.orig/programs/eroute/eroute.8 2003-10-31 04:32:27.000000000 +0200 | ||
181 | +++ openswan-2.4.7/programs/eroute/eroute.8 2006-12-06 22:46:54.740831340 +0200 | ||
182 | @@ -308,7 +308,7 @@ | ||
183 | .br | ||
184 | .LP | ||
185 | .SH FILES | ||
186 | -/proc/net/ipsec_eroute, /usr/local/bin/ipsec | ||
187 | +/proc/net/ipsec_eroute, /usr/bin/ipsec | ||
188 | .SH "SEE ALSO" | ||
189 | ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_spi(8), | ||
190 | ipsec_spigrp(8), ipsec_klipsdebug(8), ipsec_eroute(5) | ||
191 | diff -Nru openswan-2.4.7.orig/programs/_include/_include.in openswan-2.4.7/programs/_include/_include.in | ||
192 | --- openswan-2.4.7.orig/programs/_include/_include.in 2003-01-06 23:44:04.000000000 +0200 | ||
193 | +++ openswan-2.4.7/programs/_include/_include.in 2006-12-06 22:46:54.740831340 +0200 | ||
194 | @@ -47,10 +47,10 @@ | ||
195 | do | ||
196 | if test ! -r "$f" | ||
197 | then | ||
198 | - if test ! "$f" = "/etc/ipsec.conf" | ||
199 | + if test ! "$f" = "/etc/ipsec/ipsec.conf" | ||
200 | then | ||
201 | echo "#:cannot open configuration file \'$f\'" | ||
202 | - if test "$f" = "/etc/ipsec.secrets" | ||
203 | + if test "$f" = "/etc/ipsec/ipsec.secrets" | ||
204 | then | ||
205 | echo "#:Your secrets file will be created when you start FreeS/WAN for the first time." | ||
206 | fi | ||
207 | diff -Nru openswan-2.4.7.orig/programs/ipsec/ipsec.8 openswan-2.4.7/programs/ipsec/ipsec.8 | ||
208 | --- openswan-2.4.7.orig/programs/ipsec/ipsec.8 2003-02-27 18:51:54.000000000 +0200 | ||
209 | +++ openswan-2.4.7/programs/ipsec/ipsec.8 2006-12-06 22:46:54.744831590 +0200 | ||
210 | @@ -81,7 +81,7 @@ | ||
211 | .I ipsec | ||
212 | thinks the IPsec configuration files are stored. | ||
213 | .SH FILES | ||
214 | -/usr/local/lib/ipsec usual utilities directory | ||
215 | +/usr/lib/ipsec usual utilities directory | ||
216 | .SH ENVIRONMENT | ||
217 | .PP | ||
218 | The following environment variables control where FreeS/WAN finds its | ||
219 | diff -Nru openswan-2.4.7.orig/programs/klipsdebug/klipsdebug.5 openswan-2.4.7/programs/klipsdebug/klipsdebug.5 | ||
220 | --- openswan-2.4.7.orig/programs/klipsdebug/klipsdebug.5 2006-10-27 01:21:25.000000000 +0300 | ||
221 | +++ openswan-2.4.7/programs/klipsdebug/klipsdebug.5 2006-12-06 22:58:04.150666840 +0200 | ||
222 | @@ -114,7 +114,7 @@ | ||
223 | .SH "FILES" | ||
224 | |||
225 | .PP | ||
226 | -/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec | ||
227 | +/proc/net/ipsec_klipsdebug, /usr/bin/ipsec | ||
228 | |||
229 | .SH "SEE ALSO" | ||
230 | |||
231 | diff -Nru openswan-2.4.7.orig/programs/klipsdebug/klipsdebug.8 openswan-2.4.7/programs/klipsdebug/klipsdebug.8 | ||
232 | --- openswan-2.4.7.orig/programs/klipsdebug/klipsdebug.8 2006-10-27 01:21:25.000000000 +0300 | ||
233 | +++ openswan-2.4.7/programs/klipsdebug/klipsdebug.8 2006-12-06 22:58:22.295800840 +0200 | ||
234 | @@ -111,7 +111,7 @@ | ||
235 | .SH "FILES" | ||
236 | |||
237 | .PP | ||
238 | -/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec | ||
239 | +/proc/net/ipsec_klipsdebug, /usr/bin/ipsec | ||
240 | |||
241 | .SH "SEE ALSO" | ||
242 | |||
243 | diff -Nru openswan-2.4.7.orig/programs/mailkey/mailkey.in openswan-2.4.7/programs/mailkey/mailkey.in | ||
244 | --- openswan-2.4.7.orig/programs/mailkey/mailkey.in 2006-10-29 02:49:23.000000000 +0300 | ||
245 | +++ openswan-2.4.7/programs/mailkey/mailkey.in 2006-12-06 22:46:54.828836839 +0200 | ||
246 | @@ -60,7 +60,7 @@ | ||
247 | |||
248 | "$test1st" | ||
249 | |||
250 | -Common concerns: This account must be able to read /etc/ipsec.secrets. | ||
251 | +Common concerns: This account must be able to read /etc/ipsec/ipsec.secrets. | ||
252 | If you haven't generated your key yet, please run 'ipsec newhostkey'." | ||
253 | exit 0 | ||
254 | } | ||
255 | diff -Nru openswan-2.4.7.orig/programs/pluto/Makefile openswan-2.4.7/programs/pluto/Makefile | ||
256 | --- openswan-2.4.7.orig/programs/pluto/Makefile 2006-11-07 17:55:52.000000000 +0200 | ||
257 | +++ openswan-2.4.7/programs/pluto/Makefile 2006-12-06 22:46:54.832837088 +0200 | ||
258 | @@ -256,7 +256,7 @@ | ||
259 | -DPOLICYGROUPSDIR=\"${FINALCONFDDIR}/policies\" \ | ||
260 | -DPERPEERLOGDIR=\"${FINALLOGDIR}/pluto/peer\" | ||
261 | |||
262 | -ALLFLAGS = $(CPPFLAGS) $(CFLAGS) | ||
263 | +ALLFLAGS = $(CPPFLAGS) $(CFLAGS) $(USERCOMPILE) | ||
264 | |||
265 | # libefence is a free memory allocation debugger | ||
266 | # Solaris 2 needs -lsocket -lnsl | ||
267 | diff -Nru openswan-2.4.7.orig/programs/setup/Makefile openswan-2.4.7/programs/setup/Makefile | ||
268 | --- openswan-2.4.7.orig/programs/setup/Makefile 2004-12-18 20:13:43.000000000 +0200 | ||
269 | +++ openswan-2.4.7/programs/setup/Makefile 2006-12-06 22:46:54.832837088 +0200 | ||
270 | @@ -33,25 +33,10 @@ | ||
271 | @rm -f $(BINDIR)/setup | ||
272 | @$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec | ||
273 | @ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup | ||
274 | - -@for i in 0 1 2 3 4 5 6; do mkdir -p $(RCDIR)/../rc$$i.d; done | ||
275 | - -@cd $(RCDIR)/../rc0.d && ln -f -s ../init.d/ipsec K76ipsec | ||
276 | - -@cd $(RCDIR)/../rc1.d && ln -f -s ../init.d/ipsec K76ipsec | ||
277 | - -@cd $(RCDIR)/../rc2.d && ln -f -s ../init.d/ipsec S47ipsec | ||
278 | - -@cd $(RCDIR)/../rc3.d && ln -f -s ../init.d/ipsec S47ipsec | ||
279 | - -@cd $(RCDIR)/../rc4.d && ln -f -s ../init.d/ipsec S47ipsec | ||
280 | - -@cd $(RCDIR)/../rc5.d && ln -f -s ../init.d/ipsec S47ipsec | ||
281 | - -@cd $(RCDIR)/../rc6.d && ln -f -s ../init.d/ipsec K76ipsec | ||
282 | |||
283 | install_file_list:: | ||
284 | @echo $(RCDIR)/ipsec | ||
285 | @echo $(BINDIR)/setup | ||
286 | - @echo $(RCDIR)/../rc0.d/K76ipsec | ||
287 | - @echo $(RCDIR)/../rc1.d/K76ipsec | ||
288 | - @echo $(RCDIR)/../rc2.d/S47ipsec | ||
289 | - @echo $(RCDIR)/../rc3.d/S47ipsec | ||
290 | - @echo $(RCDIR)/../rc4.d/S47ipsec | ||
291 | - @echo $(RCDIR)/../rc5.d/S47ipsec | ||
292 | - @echo $(RCDIR)/../rc6.d/K76ipsec | ||
293 | |||
294 | clean:: | ||
295 | @rm -f setup | ||
296 | diff -Nru openswan-2.4.7.orig/programs/showhostkey/showhostkey.in openswan-2.4.7/programs/showhostkey/showhostkey.in | ||
297 | --- openswan-2.4.7.orig/programs/showhostkey/showhostkey.in 2004-11-14 15:40:41.000000000 +0200 | ||
298 | +++ openswan-2.4.7/programs/showhostkey/showhostkey.in 2006-12-06 22:46:54.844837840 +0200 | ||
299 | @@ -18,7 +18,7 @@ | ||
300 | usage="Usage: $me [--file secrets] [--left] [--right] [--txt gateway] [--id id] | ||
301 | [--dhclient] [--ipseckey]" | ||
302 | |||
303 | -file=/etc/ipsec.secrets | ||
304 | +file=/etc/ipsec/ipsec.secrets | ||
305 | fmt="" | ||
306 | gw= | ||
307 | id= | ||
308 | diff -Nru openswan-2.4.7.orig/programs/spi/spi.5 openswan-2.4.7/programs/spi/spi.5 | ||
309 | --- openswan-2.4.7.orig/programs/spi/spi.5 2006-10-26 23:53:59.000000000 +0300 | ||
310 | +++ openswan-2.4.7/programs/spi/spi.5 2006-12-06 23:00:11.910340779 +0200 | ||
311 | @@ -157,7 +157,7 @@ | ||
312 | .SH "FILES" | ||
313 | |||
314 | .PP | ||
315 | -/proc/net/ipsec_spi, /usr/local/bin/ipsec | ||
316 | +/proc/net/ipsec_spi, /usr/bin/ipsec | ||
317 | |||
318 | .SH "SEE ALSO" | ||
319 | |||
320 | diff -Nru openswan-2.4.7.orig/programs/spi/spi.8 openswan-2.4.7/programs/spi/spi.8 | ||
321 | --- openswan-2.4.7.orig/programs/spi/spi.8 2006-10-30 22:00:04.000000000 +0200 | ||
322 | +++ openswan-2.4.7/programs/spi/spi.8 2006-12-06 23:00:27.043286530 +0200 | ||
323 | @@ -215,7 +215,7 @@ | ||
324 | .SH "FILES" | ||
325 | |||
326 | .PP | ||
327 | -/proc/net/ipsec_spi, /usr/local/bin/ipsec | ||
328 | +/proc/net/ipsec_spi, /usr/bin/ipsec | ||
329 | |||
330 | .SH "SEE ALSO" | ||
331 | |||
332 | diff -Nru openswan-2.4.7.orig/programs/spigrp/spigrp.5 openswan-2.4.7/programs/spigrp/spigrp.5 | ||
333 | --- openswan-2.4.7.orig/programs/spigrp/spigrp.5 2006-10-26 23:50:29.000000000 +0300 | ||
334 | +++ openswan-2.4.7/programs/spigrp/spigrp.5 2006-12-06 23:01:25.650949280 +0200 | ||
335 | @@ -67,7 +67,7 @@ | ||
336 | .SH "FILES" | ||
337 | |||
338 | .PP | ||
339 | -/proc/net/ipsec_spigrp, /usr/local/bin/ipsec | ||
340 | +/proc/net/ipsec_spigrp, /usr/bin/ipsec | ||
341 | |||
342 | .SH "SEE ALSO" | ||
343 | |||
344 | diff -Nru openswan-2.4.7.orig/programs/spigrp/spigrp.8 openswan-2.4.7/programs/spigrp/spigrp.8 | ||
345 | --- openswan-2.4.7.orig/programs/spigrp/spigrp.8 2006-10-26 23:50:29.000000000 +0300 | ||
346 | +++ openswan-2.4.7/programs/spigrp/spigrp.8 2006-12-06 23:01:39.079788532 +0200 | ||
347 | @@ -87,7 +87,7 @@ | ||
348 | .SH "FILES" | ||
349 | |||
350 | .PP | ||
351 | -/proc/net/ipsec_spigrp, /usr/local/bin/ipsec | ||
352 | +/proc/net/ipsec_spigrp, /usr/bin/ipsec | ||
353 | |||
354 | .SH "SEE ALSO" | ||
355 | |||
356 | diff -Nru openswan-2.4.7.orig/programs/tncfg/tncfg.5 openswan-2.4.7/programs/tncfg/tncfg.5 | ||
357 | --- openswan-2.4.7.orig/programs/tncfg/tncfg.5 2006-10-26 23:58:11.000000000 +0300 | ||
358 | +++ openswan-2.4.7/programs/tncfg/tncfg.5 2006-12-06 23:01:59.385057530 +0200 | ||
359 | @@ -101,7 +101,7 @@ | ||
360 | .SH "FILES" | ||
361 | |||
362 | .PP | ||
363 | -/proc/net/ipsec_tncfg, /usr/local/bin/ipsec | ||
364 | +/proc/net/ipsec_tncfg, /usr/bin/ipsec | ||
365 | |||
366 | .SH "SEE ALSO" | ||
367 | |||
368 | diff -Nru openswan-2.4.7.orig/programs/tncfg/tncfg.8 openswan-2.4.7/programs/tncfg/tncfg.8 | ||
369 | --- openswan-2.4.7.orig/programs/tncfg/tncfg.8 2006-10-26 23:58:11.000000000 +0300 | ||
370 | +++ openswan-2.4.7/programs/tncfg/tncfg.8 2006-12-06 23:02:09.245673780 +0200 | ||
371 | @@ -63,7 +63,7 @@ | ||
372 | .SH "FILES" | ||
373 | |||
374 | .PP | ||
375 | -/proc/net/ipsec_tncfg, /usr/local/bin/ipsec | ||
376 | +/proc/net/ipsec_tncfg, /usr/bin/ipsec | ||
377 | |||
378 | .SH "SEE ALSO" | ||
379 | |||