diff options
Diffstat (limited to 'meta/packages/openswan')
5 files changed, 785 insertions, 0 deletions
diff --git a/meta/packages/openswan/openswan-2.2.0/gcc4-fixes.patch b/meta/packages/openswan/openswan-2.2.0/gcc4-fixes.patch new file mode 100644 index 0000000000..0e5f6ebe47 --- /dev/null +++ b/meta/packages/openswan/openswan-2.2.0/gcc4-fixes.patch | |||
@@ -0,0 +1,329 @@ | |||
1 | Index: openswan-2.2.0/linux/lib/libfreeswan/pfkey_v2_build.c | ||
2 | =================================================================== | ||
3 | --- openswan-2.2.0.orig/linux/lib/libfreeswan/pfkey_v2_build.c 2004-04-12 02:59:06.000000000 +0000 | ||
4 | +++ openswan-2.2.0/linux/lib/libfreeswan/pfkey_v2_build.c 2005-11-14 13:49:01.000000000 +0000 | ||
5 | @@ -173,9 +173,9 @@ | ||
6 | SENDERR(EINVAL); | ||
7 | } | ||
8 | |||
9 | - if(!(*pfkey_ext = (struct sadb_ext*) | ||
10 | - pfkey_msg = (struct sadb_msg*) | ||
11 | - MALLOC(sizeof(struct sadb_msg)))) { | ||
12 | + pfkey_msg = (struct sadb_msg*)MALLOC(sizeof(struct sadb_msg)); | ||
13 | + *pfkey_ext = (struct sadb_ext*)pfkey_msg; | ||
14 | + if(NULL == pfkey_msg) { | ||
15 | DEBUGGING(PF_KEY_DEBUG_BUILD, | ||
16 | "pfkey_msg_hdr_build: " | ||
17 | "memory allocation failed\n"); | ||
18 | @@ -297,9 +297,9 @@ | ||
19 | SENDERR(EINVAL); | ||
20 | } | ||
21 | |||
22 | - if(!(*pfkey_ext = (struct sadb_ext*) | ||
23 | - pfkey_sa = (struct sadb_sa*) | ||
24 | - MALLOC(sizeof(struct sadb_sa)))) { | ||
25 | + pfkey_sa = (struct sadb_sa*)MALLOC(sizeof(struct sadb_sa)); | ||
26 | + *pfkey_ext = (struct sadb_ext*)pfkey_sa; | ||
27 | + if (NULL == pfkey_sa) { | ||
28 | DEBUGGING(PF_KEY_DEBUG_BUILD, | ||
29 | "pfkey_sa_build: " | ||
30 | "memory allocation failed\n"); | ||
31 | @@ -374,9 +374,9 @@ | ||
32 | SENDERR(EINVAL); | ||
33 | } | ||
34 | |||
35 | - if(!(*pfkey_ext = (struct sadb_ext*) | ||
36 | - pfkey_lifetime = (struct sadb_lifetime*) | ||
37 | - MALLOC(sizeof(struct sadb_lifetime)))) { | ||
38 | + pfkey_lifetime = (struct sadb_lifetime*)MALLOC(sizeof(struct sadb_lifetime)); | ||
39 | + *pfkey_ext = (struct sadb_ext*)pfkey_lifetime; | ||
40 | + if (NULL == pfkey_lifetime) { | ||
41 | DEBUGGING(PF_KEY_DEBUG_BUILD, | ||
42 | "pfkey_lifetime_build: " | ||
43 | "memory allocation failed\n"); | ||
44 | @@ -563,10 +563,11 @@ | ||
45 | SENDERR(EINVAL); | ||
46 | } | ||
47 | |||
48 | - if(!(*pfkey_ext = (struct sadb_ext*) | ||
49 | - pfkey_key = (struct sadb_key*) | ||
50 | - MALLOC(sizeof(struct sadb_key) + | ||
51 | - DIVUP(key_bits, 64) * IPSEC_PFKEYv2_ALIGN))) { | ||
52 | + pfkey_key = (struct sadb_key*) | ||
53 | + MALLOC(sizeof(struct sadb_key) + | ||
54 | + DIVUP(key_bits, 64) * IPSEC_PFKEYv2_ALIGN); | ||
55 | + *pfkey_ext = (struct sadb_ext*)pfkey_key; | ||
56 | + if (NULL == pfkey_key) { | ||
57 | ERROR("pfkey_key_build: " | ||
58 | "memory allocation failed\n"); | ||
59 | SENDERR(ENOMEM); | ||
60 | @@ -643,10 +644,11 @@ | ||
61 | if((ident_type == SADB_IDENTTYPE_USERFQDN) ) { | ||
62 | } | ||
63 | #endif | ||
64 | - | ||
65 | - if(!(*pfkey_ext = (struct sadb_ext*) | ||
66 | - pfkey_ident = (struct sadb_ident*) | ||
67 | - MALLOC(ident_len * IPSEC_PFKEYv2_ALIGN))) { | ||
68 | + | ||
69 | + pfkey_ident = (struct sadb_ident*) | ||
70 | + MALLOC(ident_len * IPSEC_PFKEYv2_ALIGN); | ||
71 | + *pfkey_ext = (struct sadb_ext*)pfkey_ident; | ||
72 | + if (NULL == pfkey_ident) { | ||
73 | ERROR("pfkey_ident_build: " | ||
74 | "memory allocation failed\n"); | ||
75 | SENDERR(ENOMEM); | ||
76 | @@ -696,10 +698,11 @@ | ||
77 | (*pfkey_ext)->sadb_ext_type); | ||
78 | SENDERR(EINVAL); /* don't process these yet */ | ||
79 | |||
80 | - if(!(*pfkey_ext = (struct sadb_ext*) | ||
81 | - pfkey_sens = (struct sadb_sens*) | ||
82 | - MALLOC(sizeof(struct sadb_sens) + | ||
83 | - (sens_len + integ_len) * sizeof(uint64_t)))) { | ||
84 | + pfkey_sens = (struct sadb_sens*) | ||
85 | + MALLOC(sizeof(struct sadb_sens) + | ||
86 | + (sens_len + integ_len) * sizeof(uint64_t)); | ||
87 | + *pfkey_ext = (struct sadb_ext*)pfkey_sens; | ||
88 | + if (NULL == pfkey_sens) { | ||
89 | ERROR("pfkey_sens_build: " | ||
90 | "memory allocation failed\n"); | ||
91 | SENDERR(ENOMEM); | ||
92 | @@ -753,10 +756,11 @@ | ||
93 | SENDERR(EINVAL); | ||
94 | } | ||
95 | |||
96 | - if(!(*pfkey_ext = (struct sadb_ext*) | ||
97 | - pfkey_prop = (struct sadb_prop*) | ||
98 | - MALLOC(sizeof(struct sadb_prop) + | ||
99 | - comb_num * sizeof(struct sadb_comb)))) { | ||
100 | + pfkey_prop = (struct sadb_prop*) | ||
101 | + MALLOC(sizeof(struct sadb_prop) + | ||
102 | + comb_num * sizeof(struct sadb_comb)); | ||
103 | + *pfkey_ext = (struct sadb_ext*)pfkey_prop; | ||
104 | + if (NULL == pfkey_prop) { | ||
105 | ERROR("pfkey_prop_build: " | ||
106 | "memory allocation failed\n"); | ||
107 | SENDERR(ENOMEM); | ||
108 | @@ -833,11 +837,11 @@ | ||
109 | SENDERR(EINVAL); | ||
110 | } | ||
111 | |||
112 | - if(!(*pfkey_ext = (struct sadb_ext*) | ||
113 | - pfkey_supported = (struct sadb_supported*) | ||
114 | - MALLOC(sizeof(struct sadb_supported) + | ||
115 | - alg_num * | ||
116 | - sizeof(struct sadb_alg)))) { | ||
117 | + pfkey_supported = (struct sadb_supported*) | ||
118 | + MALLOC(sizeof(struct sadb_supported) + | ||
119 | + alg_num * sizeof(struct sadb_alg)); | ||
120 | + *pfkey_ext = (struct sadb_ext*)pfkey_supported; | ||
121 | + if (NULL == pfkey_supported) { | ||
122 | DEBUGGING(PF_KEY_DEBUG_BUILD, | ||
123 | "pfkey_supported_build: " | ||
124 | "memory allocation failed\n"); | ||
125 | @@ -913,10 +917,11 @@ | ||
126 | ntohl(min)); | ||
127 | SENDERR(EEXIST); | ||
128 | } | ||
129 | - | ||
130 | - if(!(*pfkey_ext = (struct sadb_ext*) | ||
131 | - pfkey_spirange = (struct sadb_spirange*) | ||
132 | - MALLOC(sizeof(struct sadb_spirange)))) { | ||
133 | + | ||
134 | + pfkey_spirange = (struct sadb_spirange*) | ||
135 | + MALLOC(sizeof(struct sadb_spirange)); | ||
136 | + *pfkey_ext = (struct sadb_ext*)pfkey_spirange; | ||
137 | + if (NULL == pfkey_spirange) { | ||
138 | DEBUGGING(PF_KEY_DEBUG_BUILD, | ||
139 | "pfkey_spirange_build: " | ||
140 | "memory allocation failed\n"); | ||
141 | @@ -958,9 +963,10 @@ | ||
142 | (*pfkey_ext)->sadb_ext_type); | ||
143 | SENDERR(EINVAL); /* don't process these yet */ | ||
144 | |||
145 | - if(!(*pfkey_ext = (struct sadb_ext*) | ||
146 | - pfkey_x_kmprivate = (struct sadb_x_kmprivate*) | ||
147 | - MALLOC(sizeof(struct sadb_x_kmprivate)))) { | ||
148 | + pfkey_x_kmprivate = (struct sadb_x_kmprivate*) | ||
149 | + MALLOC(sizeof(struct sadb_x_kmprivate)); | ||
150 | + *pfkey_ext = (struct sadb_ext*)pfkey_x_kmprivate; | ||
151 | + if (NULL == pfkey_x_kmprivate) { | ||
152 | DEBUGGING(PF_KEY_DEBUG_BUILD, | ||
153 | "pfkey_x_kmprivate_build: " | ||
154 | "memory allocation failed\n"); | ||
155 | @@ -1009,8 +1015,10 @@ | ||
156 | SENDERR(EINVAL); | ||
157 | } | ||
158 | |||
159 | - if(!(*pfkey_ext = (struct sadb_ext*)pfkey_x_satype = (struct sadb_x_satype*) | ||
160 | - MALLOC(sizeof(struct sadb_x_satype)))) { | ||
161 | + pfkey_x_satype = (struct sadb_x_satype*) | ||
162 | + MALLOC(sizeof(struct sadb_x_satype)); | ||
163 | + *pfkey_ext = (struct sadb_ext*)pfkey_x_satype; | ||
164 | + if (NULL == pfkey_x_satype) { | ||
165 | ERROR("pfkey_x_satype_build: " | ||
166 | "memory allocation failed\n"); | ||
167 | SENDERR(ENOMEM); | ||
168 | @@ -1064,8 +1072,10 @@ | ||
169 | "tunnel=%x netlink=%x xform=%x eroute=%x spi=%x radij=%x esp=%x ah=%x rcv=%x pfkey=%x ipcomp=%x verbose=%x?\n", | ||
170 | tunnel, netlink, xform, eroute, spi, radij, esp, ah, rcv, pfkey, ipcomp, verbose); | ||
171 | |||
172 | - if(!(*pfkey_ext = (struct sadb_ext*)pfkey_x_debug = (struct sadb_x_debug*) | ||
173 | - MALLOC(sizeof(struct sadb_x_debug)))) { | ||
174 | + pfkey_x_debug = (struct sadb_x_debug*) | ||
175 | + MALLOC(sizeof(struct sadb_x_debug)); | ||
176 | + *pfkey_ext = (struct sadb_ext*)pfkey_x_debug; | ||
177 | + if (NULL == pfkey_x_debug) { | ||
178 | ERROR("pfkey_x_debug_build: " | ||
179 | "memory allocation failed\n"); | ||
180 | SENDERR(ENOMEM); | ||
181 | @@ -1122,8 +1132,10 @@ | ||
182 | "pfkey_x_nat_t_type_build: " | ||
183 | "type=%d\n", type); | ||
184 | |||
185 | - if(!(*pfkey_ext = (struct sadb_ext*)pfkey_x_nat_t_type = (struct sadb_x_nat_t_type*) | ||
186 | - MALLOC(sizeof(struct sadb_x_nat_t_type)))) { | ||
187 | + pfkey_x_nat_t_type = (struct sadb_x_nat_t_type*) | ||
188 | + MALLOC(sizeof(struct sadb_x_nat_t_type)); | ||
189 | + *pfkey_ext = (struct sadb_ext*)pfkey_x_nat_t_type; | ||
190 | + if (NULL == pfkey_x_nat_t_type) { | ||
191 | DEBUGGING(PF_KEY_DEBUG_BUILD, | ||
192 | "pfkey_x_nat_t_type_build: " | ||
193 | "memory allocation failed\n"); | ||
194 | @@ -1174,8 +1186,10 @@ | ||
195 | "pfkey_x_nat_t_port_build: " | ||
196 | "ext=%d, port=%d\n", exttype, port); | ||
197 | |||
198 | - if(!(*pfkey_ext = (struct sadb_ext*)pfkey_x_nat_t_port = (struct sadb_x_nat_t_port*) | ||
199 | - MALLOC(sizeof(struct sadb_x_nat_t_port)))) { | ||
200 | + pfkey_x_nat_t_port = (struct sadb_x_nat_t_port*) | ||
201 | + MALLOC(sizeof(struct sadb_x_nat_t_port)); | ||
202 | + *pfkey_ext = (struct sadb_ext*)pfkey_x_nat_t_port; | ||
203 | + if (NULL == pfkey_x_nat_t_port) { | ||
204 | DEBUGGING(PF_KEY_DEBUG_BUILD, | ||
205 | "pfkey_x_nat_t_port_build: " | ||
206 | "memory allocation failed\n"); | ||
207 | @@ -1328,7 +1342,12 @@ | ||
208 | memcpy(pfkey_ext, | ||
209 | extensions[ext], | ||
210 | (extensions[ext])->sadb_ext_len * IPSEC_PFKEYv2_ALIGN); | ||
211 | - ((char*)pfkey_ext) += (extensions[ext])->sadb_ext_len * IPSEC_PFKEYv2_ALIGN; | ||
212 | + { | ||
213 | + char *pfkey_ext_c = (char *)pfkey_ext; | ||
214 | + | ||
215 | + pfkey_ext_c += (extensions[ext])->sadb_ext_len * IPSEC_PFKEYv2_ALIGN; | ||
216 | + pfkey_ext = (struct sadb_ext *)pfkey_ext_c; | ||
217 | + } | ||
218 | /* Mark that we have seen this extension and remember the header location */ | ||
219 | extensions_seen |= ( 1 << ext ); | ||
220 | } | ||
221 | Index: openswan-2.2.0/programs/pluto/connections.c | ||
222 | =================================================================== | ||
223 | --- openswan-2.2.0.orig/programs/pluto/connections.c 2004-06-27 20:46:15.000000000 +0000 | ||
224 | +++ openswan-2.2.0/programs/pluto/connections.c 2005-11-14 14:01:09.000000000 +0000 | ||
225 | @@ -30,6 +30,7 @@ | ||
226 | |||
227 | #include <openswan.h> | ||
228 | #include <openswan/ipsec_policy.h> | ||
229 | +#include "pfkeyv2.h" | ||
230 | #include "kameipsec.h" | ||
231 | |||
232 | #include "constants.h" | ||
233 | Index: openswan-2.2.0/programs/pluto/ipsec_doi.c | ||
234 | =================================================================== | ||
235 | --- openswan-2.2.0.orig/programs/pluto/ipsec_doi.c 2004-09-02 01:24:23.000000000 +0000 | ||
236 | +++ openswan-2.2.0/programs/pluto/ipsec_doi.c 2005-11-14 14:03:17.000000000 +0000 | ||
237 | @@ -31,6 +31,7 @@ | ||
238 | |||
239 | #include <openswan.h> | ||
240 | #include <openswan/ipsec_policy.h> | ||
241 | +#include "pfkeyv2.h" | ||
242 | |||
243 | #include "constants.h" | ||
244 | #include "defs.h" | ||
245 | Index: openswan-2.2.0/programs/pluto/rcv_whack.c | ||
246 | =================================================================== | ||
247 | --- openswan-2.2.0.orig/programs/pluto/rcv_whack.c 2004-06-14 02:01:32.000000000 +0000 | ||
248 | +++ openswan-2.2.0/programs/pluto/rcv_whack.c 2005-11-14 14:04:08.000000000 +0000 | ||
249 | @@ -31,6 +31,7 @@ | ||
250 | #include <sys/queue.h> | ||
251 | |||
252 | #include <openswan.h> | ||
253 | +#include "pfkeyv2.h" | ||
254 | |||
255 | #include "constants.h" | ||
256 | #include "defs.h" | ||
257 | Index: openswan-2.2.0/programs/pluto/log.c | ||
258 | =================================================================== | ||
259 | --- openswan-2.2.0.orig/programs/pluto/log.c 2004-06-14 01:46:03.000000000 +0000 | ||
260 | +++ openswan-2.2.0/programs/pluto/log.c 2005-11-14 14:02:33.000000000 +0000 | ||
261 | @@ -30,6 +30,7 @@ | ||
262 | #include <sys/types.h> | ||
263 | |||
264 | #include <openswan.h> | ||
265 | +#include "pfkeyv2.h" | ||
266 | |||
267 | #include "constants.h" | ||
268 | #include "oswlog.h" | ||
269 | Index: openswan-2.2.0/programs/pluto/spdb.c | ||
270 | =================================================================== | ||
271 | --- openswan-2.2.0.orig/programs/pluto/spdb.c 2004-05-25 22:25:02.000000000 +0000 | ||
272 | +++ openswan-2.2.0/programs/pluto/spdb.c 2005-11-14 14:02:55.000000000 +0000 | ||
273 | @@ -24,6 +24,7 @@ | ||
274 | |||
275 | #include <openswan.h> | ||
276 | #include <openswan/ipsec_policy.h> | ||
277 | +#include "pfkeyv2.h" | ||
278 | |||
279 | #include "constants.h" | ||
280 | #include "oswlog.h" | ||
281 | Index: openswan-2.2.0/programs/pluto/db_ops.c | ||
282 | =================================================================== | ||
283 | --- openswan-2.2.0.orig/programs/pluto/db_ops.c 2004-06-04 01:59:33.000000000 +0000 | ||
284 | +++ openswan-2.2.0/programs/pluto/db_ops.c 2005-11-14 13:54:10.000000000 +0000 | ||
285 | @@ -181,7 +181,13 @@ | ||
286 | ctx->trans0 = ctx->prop.trans = new_trans; | ||
287 | /* update trans_cur (by offset) */ | ||
288 | offset = (char *)(new_trans) - (char *)(old_trans); | ||
289 | - (char *)(ctx->trans_cur) += offset; | ||
290 | + | ||
291 | + { | ||
292 | + char *cctx = (char *)(ctx->trans_cur); | ||
293 | + | ||
294 | + cctx += offset; | ||
295 | + ctx->trans_cur = (struct db_trans *)cctx; | ||
296 | + } | ||
297 | /* update elem count */ | ||
298 | ctx->max_trans = max_trans; | ||
299 | PFREE_ST(old_trans, db_trans_st); | ||
300 | @@ -213,12 +219,25 @@ | ||
301 | |||
302 | /* update attrs0 and attrs_cur (obviously) */ | ||
303 | offset = (char *)(new_attrs) - (char *)(old_attrs); | ||
304 | - (char *)ctx->attrs0 += offset; | ||
305 | - (char *)ctx->attrs_cur += offset; | ||
306 | + { | ||
307 | + char *actx = (char *)(ctx->attrs0); | ||
308 | + | ||
309 | + actx += offset; | ||
310 | + ctx->attrs0 = (struct db_attr *)actx; | ||
311 | + | ||
312 | + actx = (char *)ctx->attrs_cur; | ||
313 | + actx += offset; | ||
314 | + ctx->attrs_cur = (struct db_attr *)actx; | ||
315 | + } | ||
316 | + | ||
317 | /* for each transform, rewrite attrs pointer by offsetting it */ | ||
318 | - for (t=ctx->prop.trans, ti=0; ti < ctx->prop.trans_cnt; t++, ti++) { | ||
319 | - (char *)(t->attrs) += offset; | ||
320 | + for (t=ctx->prop.trans, ti=0; ti < ctx->prop.trans_cnt; t++, ti++) { | ||
321 | + char *actx = (char *)(t->attrs); | ||
322 | + | ||
323 | + actx += offset; | ||
324 | + t->attrs = (struct db_attr *)actx; | ||
325 | } | ||
326 | + | ||
327 | /* update elem count */ | ||
328 | ctx->max_attrs = max_attrs; | ||
329 | PFREE_ST(old_attrs, db_attrs_st); | ||
diff --git a/meta/packages/openswan/openswan-2.2.0/ld-library-path-breakage.patch b/meta/packages/openswan/openswan-2.2.0/ld-library-path-breakage.patch new file mode 100644 index 0000000000..e3cc8762cc --- /dev/null +++ b/meta/packages/openswan/openswan-2.2.0/ld-library-path-breakage.patch | |||
@@ -0,0 +1,26 @@ | |||
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.2.0/makefile-whitespace-fix.patch b/meta/packages/openswan/openswan-2.2.0/makefile-whitespace-fix.patch new file mode 100644 index 0000000000..e54ff1c63a --- /dev/null +++ b/meta/packages/openswan/openswan-2.2.0/makefile-whitespace-fix.patch | |||
@@ -0,0 +1,11 @@ | |||
1 | --- openswan-2.2.0/programs/Makefile.program.orig 2005-12-17 17:15:13 +0100 | ||
2 | +++ openswan-2.2.0/programs/Makefile.program 2005-12-17 17:15:36 +0100 | ||
3 | @@ -114,7 +110,7 @@ | ||
4 | endif | ||
5 | |||
6 | # cancel the rule that compiles directly | ||
7 | -%: %.c | ||
8 | +%: %.c | ||
9 | |||
10 | %: %.o $(OBJS) $(OPENSWANLIB) | ||
11 | $(CC) $(CFLAGS) -o $@ $@.o ${OBJS} $(LDFLAGS) $(LIBS) | ||
diff --git a/meta/packages/openswan/openswan-2.2.0/openswan-2.2.0-gentoo.patch b/meta/packages/openswan/openswan-2.2.0/openswan-2.2.0-gentoo.patch new file mode 100644 index 0000000000..9ccc80cacf --- /dev/null +++ b/meta/packages/openswan/openswan-2.2.0/openswan-2.2.0-gentoo.patch | |||
@@ -0,0 +1,382 @@ | |||
1 | diff -Naupr openswan-2.2.0/Makefile.inc openswan-2.2.0-gentoo/Makefile.inc | ||
2 | --- openswan-2.2.0/Makefile.inc 2004-07-19 21:06:32.000000000 -0500 | ||
3 | +++ openswan-2.2.0-gentoo/Makefile.inc 2004-09-17 21:31:29.810687485 -0500 | ||
4 | @@ -64,7 +64,7 @@ POLICYLIB=${OPENSWANSRCDIR}/lib/libipsec | ||
5 | DESTDIR?= | ||
6 | |||
7 | # "local" part of tree, used in building other pathnames | ||
8 | -INC_USRLOCAL=/usr/local | ||
9 | +INC_USRLOCAL=/usr | ||
10 | |||
11 | # PUBDIR is where the "ipsec" command goes; beware, many things define PATH | ||
12 | # settings which are assumed to include it (or at least, to include *some* | ||
13 | @@ -98,7 +98,7 @@ MANTREE=$(DESTDIR)$(INC_USRLOCAL)/$(INC_ | ||
14 | MANPLACES=man3 man5 man8 | ||
15 | |||
16 | # where configuration files go | ||
17 | -FINALCONFFILE?=/etc/ipsec.conf | ||
18 | +FINALCONFFILE?=/etc/ipsec/ipsec.conf | ||
19 | CONFFILE=$(DESTDIR)$(FINALCONFFILE) | ||
20 | |||
21 | FINALCONFDIR?=/etc | ||
22 | @@ -109,10 +109,10 @@ CONFDDIR=$(DESTDIR)$(FINALCONFDDIR) | ||
23 | |||
24 | # sample configuration files go into | ||
25 | INC_DOCDIR?=share/doc | ||
26 | -FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan | ||
27 | +FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan-2.2.0 | ||
28 | EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR} | ||
29 | |||
30 | -FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan | ||
31 | +FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan-2.2.0 | ||
32 | DOCDIR=${DESTDIR}${FINALDOCDIR} | ||
33 | |||
34 | # where per-conn pluto logs go | ||
35 | @@ -243,7 +243,7 @@ RH_KERNELSRC?=/usr/src/linux-2.4 | ||
36 | # installed one in RH 7.2, won't work - you wind up depending upon | ||
37 | # openssl. | ||
38 | |||
39 | -BIND9STATICLIBDIR?=/usr/local/lib | ||
40 | +BIND9STATICLIBDIR?=/usr/lib | ||
41 | |||
42 | # if you install elsewere, you may need to point the include files to it. | ||
43 | #BIND9STATICLIBDIR?=/sandel/lib | ||
44 | diff -Naupr openswan-2.2.0/lib/libdes/Makefile openswan-2.2.0-gentoo/lib/libdes/Makefile | ||
45 | --- openswan-2.2.0/lib/libdes/Makefile 2004-04-03 13:44:41.000000000 -0600 | ||
46 | +++ openswan-2.2.0-gentoo/lib/libdes/Makefile 2004-09-17 21:31:29.810687485 -0500 | ||
47 | @@ -60,7 +60,7 @@ MAKE=make -f Makefile | ||
48 | # normally overridden by FreeS/WAN Makefiles anyway | ||
49 | CFLAG= -O3 -fomit-frame-pointer -I${KLIPSD}/include -I${SRCDIR} | ||
50 | |||
51 | -CFLAGS=$(OPTS) $(CFLAG) | ||
52 | +CFLAGS=$(OPTS) $(CFLAG) $(USERCOMPILE) | ||
53 | CPP=$(CC) -E | ||
54 | |||
55 | # Assember version of des_encrypt*(). | ||
56 | diff -Naupr openswan-2.2.0/linux/crypto/ciphers/des/asm/crypt586.pl openswan-2.2.0-gentoo/linux/crypto/ciphers/des/asm/crypt586.pl | ||
57 | --- openswan-2.2.0/linux/crypto/ciphers/des/asm/crypt586.pl 2002-04-24 02:36:37.000000000 -0500 | ||
58 | +++ openswan-2.2.0-gentoo/linux/crypto/ciphers/des/asm/crypt586.pl 2004-09-17 21:31:29.811687312 -0500 | ||
59 | @@ -1,4 +1,4 @@ | ||
60 | -#!/usr/local/bin/perl | ||
61 | +#!/usr/bin/perl | ||
62 | # | ||
63 | # The inner loop instruction sequence and the IP/FP modifications are from | ||
64 | # Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk> | ||
65 | diff -Naupr openswan-2.2.0/linux/crypto/ciphers/des/asm/des-586.pl openswan-2.2.0-gentoo/linux/crypto/ciphers/des/asm/des-586.pl | ||
66 | --- openswan-2.2.0/linux/crypto/ciphers/des/asm/des-586.pl 2002-04-24 02:36:37.000000000 -0500 | ||
67 | +++ openswan-2.2.0-gentoo/linux/crypto/ciphers/des/asm/des-586.pl 2004-09-17 21:31:29.811687312 -0500 | ||
68 | @@ -1,4 +1,4 @@ | ||
69 | -#!/usr/local/bin/perl | ||
70 | +#!/usr/bin/perl | ||
71 | # | ||
72 | # The inner loop instruction sequence and the IP/FP modifications are from | ||
73 | # Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk> | ||
74 | diff -Naupr openswan-2.2.0/linux/crypto/ciphers/des/asm/des686.pl openswan-2.2.0-gentoo/linux/crypto/ciphers/des/asm/des686.pl | ||
75 | --- openswan-2.2.0/linux/crypto/ciphers/des/asm/des686.pl 2002-04-24 02:36:37.000000000 -0500 | ||
76 | +++ openswan-2.2.0-gentoo/linux/crypto/ciphers/des/asm/des686.pl 2004-09-17 21:31:29.812687139 -0500 | ||
77 | @@ -1,4 +1,4 @@ | ||
78 | -#!/usr/local/bin/perl | ||
79 | +#!/usr/bin/perl | ||
80 | |||
81 | $prog="des686.pl"; | ||
82 | |||
83 | diff -Naupr openswan-2.2.0/linux/crypto/ciphers/des/asm/desboth.pl openswan-2.2.0-gentoo/linux/crypto/ciphers/des/asm/desboth.pl | ||
84 | --- openswan-2.2.0/linux/crypto/ciphers/des/asm/desboth.pl 2002-04-24 02:36:37.000000000 -0500 | ||
85 | +++ openswan-2.2.0-gentoo/linux/crypto/ciphers/des/asm/desboth.pl 2004-09-17 21:31:29.812687139 -0500 | ||
86 | @@ -1,4 +1,4 @@ | ||
87 | -#!/usr/local/bin/perl | ||
88 | +#!/usr/bin/perl | ||
89 | |||
90 | $L="edi"; | ||
91 | $R="esi"; | ||
92 | diff -Naupr openswan-2.2.0/linux/crypto/ciphers/des/asm/perlasm/cbc.pl openswan-2.2.0-gentoo/linux/crypto/ciphers/des/asm/perlasm/cbc.pl | ||
93 | --- openswan-2.2.0/linux/crypto/ciphers/des/asm/perlasm/cbc.pl 2002-04-24 02:36:37.000000000 -0500 | ||
94 | +++ openswan-2.2.0-gentoo/linux/crypto/ciphers/des/asm/perlasm/cbc.pl 2004-09-17 21:31:29.812687139 -0500 | ||
95 | @@ -1,4 +1,4 @@ | ||
96 | -#!/usr/local/bin/perl | ||
97 | +#!/usr/bin/perl | ||
98 | |||
99 | # void des_ncbc_encrypt(input, output, length, schedule, ivec, enc) | ||
100 | # des_cblock (*input); | ||
101 | diff -Naupr openswan-2.2.0/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl openswan-2.2.0-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl | ||
102 | --- openswan-2.2.0/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl 2002-04-24 02:36:37.000000000 -0500 | ||
103 | +++ openswan-2.2.0-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl 2004-09-17 21:31:29.813686966 -0500 | ||
104 | @@ -1,4 +1,4 @@ | ||
105 | -#!/usr/local/bin/perl | ||
106 | +#!/usr/bin/perl | ||
107 | |||
108 | # require 'x86asm.pl'; | ||
109 | # &asm_init("cpp","des-586.pl"); | ||
110 | diff -Naupr openswan-2.2.0/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl openswan-2.2.0-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl | ||
111 | --- openswan-2.2.0/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl 2002-04-24 02:36:37.000000000 -0500 | ||
112 | +++ openswan-2.2.0-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl 2004-09-17 21:31:29.813686966 -0500 | ||
113 | @@ -1,4 +1,4 @@ | ||
114 | -#!/usr/local/bin/perl | ||
115 | +#!/usr/bin/perl | ||
116 | |||
117 | package x86ms; | ||
118 | |||
119 | diff -Naupr openswan-2.2.0/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl openswan-2.2.0-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl | ||
120 | --- openswan-2.2.0/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl 2002-04-24 02:36:37.000000000 -0500 | ||
121 | +++ openswan-2.2.0-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl 2004-09-17 21:31:29.814686793 -0500 | ||
122 | @@ -1,4 +1,4 @@ | ||
123 | -#!/usr/local/bin/perl | ||
124 | +#!/usr/bin/perl | ||
125 | |||
126 | package x86unix; | ||
127 | |||
128 | diff -Naupr openswan-2.2.0/programs/_include/_include.in openswan-2.2.0-gentoo/programs/_include/_include.in | ||
129 | --- openswan-2.2.0/programs/_include/_include.in 2003-01-06 15:44:04.000000000 -0600 | ||
130 | +++ openswan-2.2.0-gentoo/programs/_include/_include.in 2004-09-17 21:31:29.814686793 -0500 | ||
131 | @@ -47,10 +47,10 @@ for f | ||
132 | do | ||
133 | if test ! -r "$f" | ||
134 | then | ||
135 | - if test ! "$f" = "/etc/ipsec.conf" | ||
136 | + if test ! "$f" = "/etc/ipsec/ipsec.conf" | ||
137 | then | ||
138 | echo "#:cannot open configuration file \'$f\'" | ||
139 | - if test "$f" = "/etc/ipsec.secrets" | ||
140 | + if test "$f" = "/etc/ipsec/ipsec.secrets" | ||
141 | then | ||
142 | echo "#:Your secrets file will be created when you start FreeS/WAN for the first time." | ||
143 | fi | ||
144 | diff -Naupr openswan-2.2.0/programs/barf/barf.in openswan-2.2.0-gentoo/programs/barf/barf.in | ||
145 | --- openswan-2.2.0/programs/barf/barf.in 2004-06-07 20:02:11.000000000 -0500 | ||
146 | +++ openswan-2.2.0-gentoo/programs/barf/barf.in 2004-09-17 21:31:29.815686620 -0500 | ||
147 | @@ -16,7 +16,7 @@ | ||
148 | |||
149 | LOGS=${LOGS-/var/log} | ||
150 | CONFS=${IPSEC_CONFS-/etc} | ||
151 | -CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec.d} | ||
152 | +CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec/ipsec.d} | ||
153 | me="ipsec barf" | ||
154 | |||
155 | # kludge to produce no barf output mentioning policygroups if none are present. | ||
156 | @@ -229,13 +229,13 @@ then | ||
157 | done | ||
158 | fi | ||
159 | _________________________ ipsec/ls-libdir | ||
160 | -ls -l ${IPSEC_LIBDIR-/usr/local/lib/ipsec} | ||
161 | +ls -l ${IPSEC_LIBDIR-/usr/lib/ipsec} | ||
162 | _________________________ ipsec/ls-execdir | ||
163 | -ls -l ${IPSEC_EXECDIR-/usr/local/libexec/ipsec} | ||
164 | +ls -l ${IPSEC_EXECDIR-/usr/libexec/ipsec} | ||
165 | _________________________ ipsec/updowns | ||
166 | -for f in `ls ${IPSEC_EXECDIR-/usr/local/libexec/ipsec} | egrep updown` | ||
167 | +for f in `ls ${IPSEC_EXECDIR-/usr/libexec/ipsec} | egrep updown` | ||
168 | do | ||
169 | - cat ${IPSEC_EXECDIR-/usr/local/libexec/ipsec}/$f | ||
170 | + cat ${IPSEC_EXECDIR-/usr/libexec/ipsec}/$f | ||
171 | done | ||
172 | _________________________ proc/net/dev | ||
173 | cat /proc/net/dev | ||
174 | diff -Naupr openswan-2.2.0/programs/eroute/eroute.5 openswan-2.2.0-gentoo/programs/eroute/eroute.5 | ||
175 | --- openswan-2.2.0/programs/eroute/eroute.5 2003-10-30 20:32:27.000000000 -0600 | ||
176 | +++ openswan-2.2.0-gentoo/programs/eroute/eroute.5 2004-09-17 21:31:29.815686620 -0500 | ||
177 | @@ -223,7 +223,7 @@ Parameters Index of | ||
178 | in hexadecimal using Authentication Header protocol (51, | ||
179 | IPPROTO_AH) with no identies defined for either end. | ||
180 | .SH FILES | ||
181 | -/proc/net/ipsec_eroute, /usr/local/bin/ipsec | ||
182 | +/proc/net/ipsec_eroute, /usr/bin/ipsec | ||
183 | .SH "SEE ALSO" | ||
184 | ipsec(8), ipsec_manual(8), ipsec_tncfg(5), ipsec_spi(5), | ||
185 | ipsec_spigrp(5), ipsec_klipsdebug(5), ipsec_eroute(8), ipsec_version(5), | ||
186 | diff -Naupr openswan-2.2.0/programs/eroute/eroute.8 openswan-2.2.0-gentoo/programs/eroute/eroute.8 | ||
187 | --- openswan-2.2.0/programs/eroute/eroute.8 2003-10-30 20:32:27.000000000 -0600 | ||
188 | +++ openswan-2.2.0-gentoo/programs/eroute/eroute.8 2004-09-17 21:31:29.816686447 -0500 | ||
189 | @@ -308,7 +308,7 @@ will be in clear text. | ||
190 | .br | ||
191 | .LP | ||
192 | .SH FILES | ||
193 | -/proc/net/ipsec_eroute, /usr/local/bin/ipsec | ||
194 | +/proc/net/ipsec_eroute, /usr/bin/ipsec | ||
195 | .SH "SEE ALSO" | ||
196 | ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_spi(8), | ||
197 | ipsec_spigrp(8), ipsec_klipsdebug(8), ipsec_eroute(5) | ||
198 | diff -Naupr openswan-2.2.0/programs/ipsec/ipsec.8 openswan-2.2.0-gentoo/programs/ipsec/ipsec.8 | ||
199 | --- openswan-2.2.0/programs/ipsec/ipsec.8 2003-02-27 10:51:54.000000000 -0600 | ||
200 | +++ openswan-2.2.0-gentoo/programs/ipsec/ipsec.8 2004-09-17 21:31:29.816686447 -0500 | ||
201 | @@ -81,7 +81,7 @@ reports where | ||
202 | .I ipsec | ||
203 | thinks the IPsec configuration files are stored. | ||
204 | .SH FILES | ||
205 | -/usr/local/lib/ipsec usual utilities directory | ||
206 | +/usr/lib/ipsec usual utilities directory | ||
207 | .SH ENVIRONMENT | ||
208 | .PP | ||
209 | The following environment variables control where FreeS/WAN finds its | ||
210 | diff -Naupr openswan-2.2.0/programs/klipsdebug/klipsdebug.5 openswan-2.2.0-gentoo/programs/klipsdebug/klipsdebug.5 | ||
211 | --- openswan-2.2.0/programs/klipsdebug/klipsdebug.5 2002-04-24 02:35:38.000000000 -0500 | ||
212 | +++ openswan-2.2.0-gentoo/programs/klipsdebug/klipsdebug.5 2004-09-17 21:31:29.817686275 -0500 | ||
213 | @@ -103,7 +103,7 @@ full | ||
214 | sockets debugging has been set and everything else is not set. | ||
215 | .LP | ||
216 | .SH FILES | ||
217 | -/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec | ||
218 | +/proc/net/ipsec_klipsdebug, /usr/bin/ipsec | ||
219 | .SH "SEE ALSO" | ||
220 | ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8), | ||
221 | ipsec_spi(8), ipsec_spigrp(8), ipsec_klipsdebug(5), ipsec_version(5), | ||
222 | diff -Naupr openswan-2.2.0/programs/klipsdebug/klipsdebug.8 openswan-2.2.0-gentoo/programs/klipsdebug/klipsdebug.8 | ||
223 | --- openswan-2.2.0/programs/klipsdebug/klipsdebug.8 2002-04-24 02:35:39.000000000 -0500 | ||
224 | +++ openswan-2.2.0-gentoo/programs/klipsdebug/klipsdebug.8 2004-09-17 21:31:29.817686275 -0500 | ||
225 | @@ -117,7 +117,7 @@ turns off only the | ||
226 | debugging messages. | ||
227 | .LP | ||
228 | .SH FILES | ||
229 | -/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec | ||
230 | +/proc/net/ipsec_klipsdebug, /usr/bin/ipsec | ||
231 | .SH "SEE ALSO" | ||
232 | ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8), | ||
233 | ipsec_spi(8), ipsec_spigrp(8), ipsec_klipsdebug(5) | ||
234 | diff -Naupr openswan-2.2.0/programs/lwdnsq/lwdnsq.xml.in openswan-2.2.0-gentoo/programs/lwdnsq/lwdnsq.xml.in | ||
235 | --- openswan-2.2.0/programs/lwdnsq/lwdnsq.xml.in 2004-04-03 19:50:56.000000000 -0600 | ||
236 | +++ openswan-2.2.0-gentoo/programs/lwdnsq/lwdnsq.xml.in 2004-09-17 21:31:29.817686275 -0500 | ||
237 | @@ -430,7 +430,7 @@ information. | ||
238 | <refsect1><title>Special IPSECKEY processing</title> | ||
239 | |||
240 | <programlisting> | ||
241 | -/etc/ipsec.d/lwdnsq.conf | ||
242 | +/etc/ipsec/ipsec.d/lwdnsq.conf | ||
243 | </programlisting> | ||
244 | |||
245 | </refsect1> | ||
246 | diff -Naupr openswan-2.2.0/programs/mailkey/mailkey.in openswan-2.2.0-gentoo/programs/mailkey/mailkey.in | ||
247 | --- openswan-2.2.0/programs/mailkey/mailkey.in 2003-06-30 00:34:22.000000000 -0500 | ||
248 | +++ openswan-2.2.0-gentoo/programs/mailkey/mailkey.in 2004-09-17 21:31:29.818686102 -0500 | ||
249 | @@ -60,7 +60,7 @@ with the following error: | ||
250 | |||
251 | "$test1st" | ||
252 | |||
253 | -Common concerns: This account must be able to read /etc/ipsec.secrets. | ||
254 | +Common concerns: This account must be able to read /etc/ipsec/ipsec.secrets. | ||
255 | If you haven't generated your key yet, please run 'ipsec newhostkey'." | ||
256 | exit 0 | ||
257 | } | ||
258 | diff -Naupr openswan-2.2.0/programs/pluto/Makefile openswan-2.2.0-gentoo/programs/pluto/Makefile | ||
259 | --- openswan-2.2.0/programs/pluto/Makefile 2004-07-19 21:05:23.000000000 -0500 | ||
260 | +++ openswan-2.2.0-gentoo/programs/pluto/Makefile 2004-09-17 21:31:29.819685929 -0500 | ||
261 | @@ -224,7 +224,7 @@ CPPFLAGS = $(HDRDIRS) $(DEFINES) \ | ||
262 | -DPOLICYGROUPSDIR=\"${FINALCONFDDIR}/policies\" \ | ||
263 | -DPERPEERLOGDIR=\"${FINALLOGDIR}/pluto/peer\" | ||
264 | |||
265 | -ALLFLAGS = $(CPPFLAGS) $(CFLAGS) | ||
266 | +ALLFLAGS = $(CPPFLAGS) $(CFLAGS) $(USERCOMPILE) | ||
267 | |||
268 | # libefence is a free memory allocation debugger | ||
269 | # Solaris 2 needs -lsocket -lnsl | ||
270 | diff -Naupr openswan-2.2.0/programs/setup/Makefile openswan-2.2.0-gentoo/programs/setup/Makefile | ||
271 | --- openswan-2.2.0/programs/setup/Makefile 2004-04-03 13:44:48.000000000 -0600 | ||
272 | +++ openswan-2.2.0-gentoo/programs/setup/Makefile 2004-09-17 21:31:29.819685929 -0500 | ||
273 | @@ -33,25 +33,10 @@ install:: setup | ||
274 | @rm -f $(BINDIR)/setup | ||
275 | @$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec | ||
276 | @ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup | ||
277 | - -@for i in 0 1 2 3 4 5 6; do mkdir -p $(RCDIR)/../rc$$i.d; done | ||
278 | - -@cd $(RCDIR)/../rc0.d && ln -f -s ../init.d/ipsec K76ipsec | ||
279 | - -@cd $(RCDIR)/../rc1.d && ln -f -s ../init.d/ipsec K76ipsec | ||
280 | - -@cd $(RCDIR)/../rc2.d && ln -f -s ../init.d/ipsec S47ipsec | ||
281 | - -@cd $(RCDIR)/../rc3.d && ln -f -s ../init.d/ipsec S47ipsec | ||
282 | - -@cd $(RCDIR)/../rc4.d && ln -f -s ../init.d/ipsec S47ipsec | ||
283 | - -@cd $(RCDIR)/../rc5.d && ln -f -s ../init.d/ipsec S47ipsec | ||
284 | - -@cd $(RCDIR)/../rc6.d && ln -f -s ../init.d/ipsec K76ipsec | ||
285 | |||
286 | install_file_list:: | ||
287 | @echo $(RCDIR)/ipsec | ||
288 | @echo $(BINDIR)/setup | ||
289 | - @echo $(RCDIR)/../rc0.d/K76ipsec | ||
290 | - @echo $(RCDIR)/../rc1.d/K76ipsec | ||
291 | - @echo $(RCDIR)/../rc2.d/S47ipsec | ||
292 | - @echo $(RCDIR)/../rc3.d/S47ipsec | ||
293 | - @echo $(RCDIR)/../rc4.d/S47ipsec | ||
294 | - @echo $(RCDIR)/../rc5.d/S47ipsec | ||
295 | - @echo $(RCDIR)/../rc6.d/K76ipsec | ||
296 | |||
297 | clean:: | ||
298 | @rm -f setup | ||
299 | diff -Naupr openswan-2.2.0/programs/showhostkey/showhostkey.in openswan-2.2.0-gentoo/programs/showhostkey/showhostkey.in | ||
300 | --- openswan-2.2.0/programs/showhostkey/showhostkey.in 2004-03-24 15:08:22.000000000 -0600 | ||
301 | +++ openswan-2.2.0-gentoo/programs/showhostkey/showhostkey.in 2004-09-17 21:31:29.820685756 -0500 | ||
302 | @@ -18,7 +18,7 @@ me="ipsec showhostkey" | ||
303 | usage="Usage: $me [--file secrets] [--left] [--right] [--txt gateway] [--id id] | ||
304 | [--dhclient]" | ||
305 | |||
306 | -file=/etc/ipsec.secrets | ||
307 | +file=/etc/ipsec/ipsec.secrets | ||
308 | fmt="" | ||
309 | gw= | ||
310 | id= | ||
311 | diff -Naupr openswan-2.2.0/programs/spi/spi.5 openswan-2.2.0-gentoo/programs/spi/spi.5 | ||
312 | --- openswan-2.2.0/programs/spi/spi.5 2002-04-24 02:35:39.000000000 -0500 | ||
313 | +++ openswan-2.2.0-gentoo/programs/spi/spi.5 2004-09-17 21:31:29.820685756 -0500 | ||
314 | @@ -162,7 +162,7 @@ since 1 of 8 bits is a parity bit), has | ||
315 | 3858 seconds ago and has been idle for 23 seconds. | ||
316 | .LP | ||
317 | .SH FILES | ||
318 | -/proc/net/ipsec_spi, /usr/local/bin/ipsec | ||
319 | +/proc/net/ipsec_spi, /usr/bin/ipsec | ||
320 | .SH "SEE ALSO" | ||
321 | ipsec(8), ipsec_manual(8), ipsec_tncfg(5), ipsec_eroute(5), | ||
322 | ipsec_spigrp(5), ipsec_klipsdebug(5), ipsec_spi(8), ipsec_version(5), | ||
323 | diff -Naupr openswan-2.2.0/programs/spi/spi.8 openswan-2.2.0-gentoo/programs/spi/spi.8 | ||
324 | --- openswan-2.2.0/programs/spi/spi.8 2002-04-24 02:35:40.000000000 -0500 | ||
325 | +++ openswan-2.2.0-gentoo/programs/spi/spi.8 2004-09-17 21:31:29.820685756 -0500 | ||
326 | @@ -461,7 +461,7 @@ and protocol | ||
327 | (4). | ||
328 | .LP | ||
329 | .SH FILES | ||
330 | -/proc/net/ipsec_spi, /usr/local/bin/ipsec | ||
331 | +/proc/net/ipsec_spi, /usr/bin/ipsec | ||
332 | .SH "SEE ALSO" | ||
333 | ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8), | ||
334 | ipsec_spigrp(8), ipsec_klipsdebug(8), ipsec_spi(5) | ||
335 | diff -Naupr openswan-2.2.0/programs/spigrp/spigrp.5 openswan-2.2.0-gentoo/programs/spigrp/spigrp.5 | ||
336 | --- openswan-2.2.0/programs/spigrp/spigrp.5 2002-04-24 02:35:40.000000000 -0500 | ||
337 | +++ openswan-2.2.0-gentoo/programs/spigrp/spigrp.5 2004-09-17 21:31:29.821685583 -0500 | ||
338 | @@ -77,7 +77,7 @@ be an incoming or outgoing group, depend | ||
339 | machine. | ||
340 | .LP | ||
341 | .SH FILES | ||
342 | -/proc/net/ipsec_spigrp, /usr/local/bin/ipsec | ||
343 | +/proc/net/ipsec_spigrp, /usr/bin/ipsec | ||
344 | .SH "SEE ALSO" | ||
345 | ipsec(8), ipsec_manual(8), ipsec_tncfg(5), ipsec_eroute(5), | ||
346 | ipsec_spi(5), ipsec_klipsdebug(5), ipsec_spigrp(8), ipsec_version(5), | ||
347 | diff -Naupr openswan-2.2.0/programs/spigrp/spigrp.8 openswan-2.2.0-gentoo/programs/spigrp/spigrp.8 | ||
348 | --- openswan-2.2.0/programs/spigrp/spigrp.8 2002-04-24 02:35:41.000000000 -0500 | ||
349 | +++ openswan-2.2.0-gentoo/programs/spigrp/spigrp.8 2004-09-17 21:31:29.821685583 -0500 | ||
350 | @@ -128,7 +128,7 @@ and finally an AH header to authenticate | ||
351 | .BR 0x236 . | ||
352 | .LP | ||
353 | .SH FILES | ||
354 | -/proc/net/ipsec_spigrp, /usr/local/bin/ipsec | ||
355 | +/proc/net/ipsec_spigrp, /usr/bin/ipsec | ||
356 | .SH "SEE ALSO" | ||
357 | ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8), | ||
358 | ipsec_spi(8), ipsec_klipsdebug(8), ipsec_spigrp(5) | ||
359 | diff -Naupr openswan-2.2.0/programs/tncfg/tncfg.5 openswan-2.2.0-gentoo/programs/tncfg/tncfg.5 | ||
360 | --- openswan-2.2.0/programs/tncfg/tncfg.5 2002-04-24 02:35:41.000000000 -0500 | ||
361 | +++ openswan-2.2.0-gentoo/programs/tncfg/tncfg.5 2004-09-17 21:31:29.821685583 -0500 | ||
362 | @@ -75,7 +75,7 @@ shows that virtual device | ||
363 | is not connected to any physical device. | ||
364 | .LP | ||
365 | .SH "FILES" | ||
366 | -/proc/net/ipsec_tncfg, /usr/local/bin/ipsec | ||
367 | +/proc/net/ipsec_tncfg, /usr/bin/ipsec | ||
368 | .SH "SEE ALSO" | ||
369 | ipsec(8), ipsec_manual(8), ipsec_eroute(5), ipsec_spi(5), | ||
370 | ipsec_spigrp(5), ipsec_klipsdebug(5), ipsec_tncfg(8), ipsec_version(5), | ||
371 | diff -Naupr openswan-2.2.0/programs/tncfg/tncfg.8 openswan-2.2.0-gentoo/programs/tncfg/tncfg.8 | ||
372 | --- openswan-2.2.0/programs/tncfg/tncfg.8 2002-04-24 02:35:41.000000000 -0500 | ||
373 | +++ openswan-2.2.0-gentoo/programs/tncfg/tncfg.8 2004-09-17 21:31:29.822685410 -0500 | ||
374 | @@ -76,7 +76,7 @@ virtual device to the | ||
375 | physical device. | ||
376 | .LP | ||
377 | .SH "FILES" | ||
378 | -/proc/net/ipsec_tncfg, /usr/local/bin/ipsec | ||
379 | +/proc/net/ipsec_tncfg, /usr/bin/ipsec | ||
380 | .SH "SEE ALSO" | ||
381 | ipsec(8), ipsec_manual(8), ipsec_eroute(8), ipsec_spi(8), | ||
382 | ipsec_spigrp(8), ipsec_klipsdebug(8), ipsec_tncfg(5) | ||
diff --git a/meta/packages/openswan/openswan_2.2.0.bb b/meta/packages/openswan/openswan_2.2.0.bb new file mode 100644 index 0000000000..197fed95f6 --- /dev/null +++ b/meta/packages/openswan/openswan_2.2.0.bb | |||
@@ -0,0 +1,37 @@ | |||
1 | SECTION = "console/network" | ||
2 | DESCRIPTION = "Openswan is an Open Source implementation of IPsec for the \ | ||
3 | Linux operating system." | ||
4 | HOMEPAGE = "http://www.openswan.org" | ||
5 | LICENSE = "GPLv2" | ||
6 | MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" | ||
7 | DEPENDS = "gmp flex-native" | ||
8 | RRECOMMENDS = "kernel-module-ipsec" | ||
9 | RDEPENDS_nylon = "perl" | ||
10 | PR = "r4" | ||
11 | |||
12 | SRC_URI = "http://www.openswan.org/download/old/openswan-${PV}.tar.gz \ | ||
13 | file://openswan-2.2.0-gentoo.patch;patch=1 \ | ||
14 | file://gcc4-fixes.patch;patch=1 \ | ||
15 | file://makefile-whitespace-fix.patch;patch=1 \ | ||
16 | file://ld-library-path-breakage.patch;patch=1" | ||
17 | S = "${WORKDIR}/openswan-${PV}" | ||
18 | |||
19 | PARALLEL_MAKE = "" | ||
20 | EXTRA_OEMAKE = "DESTDIR=${D} \ | ||
21 | USERCOMPILE="${CFLAGS}" \ | ||
22 | FINALCONFDIR=${sysconfdir}/ipsec \ | ||
23 | INC_RCDEFAULT=${sysconfdir}/init.d \ | ||
24 | INC_USRLOCAL=${prefix} \ | ||
25 | INC_MANDIR=share/man WERROR=''" | ||
26 | |||
27 | do_compile () { | ||
28 | oe_runmake programs | ||
29 | } | ||
30 | |||
31 | do_install () { | ||
32 | oe_runmake install | ||
33 | } | ||
34 | |||
35 | FILES_${PN} += "${libdir}/ipsec/" | ||
36 | |||
37 | CONFFILES_${PN} = "${sysconfdir}/ipsec/ipsec.conf" | ||