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