openswan: update to 2.4.7 (from OE)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1496 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Marcin Juszkiewicz
parent
74679918ba
commit
5230a5a1f6
|
|
@ -1,329 +0,0 @@
|
|||
Index: openswan-2.2.0/linux/lib/libfreeswan/pfkey_v2_build.c
|
||||
===================================================================
|
||||
--- openswan-2.2.0.orig/linux/lib/libfreeswan/pfkey_v2_build.c 2004-04-12 02:59:06.000000000 +0000
|
||||
+++ openswan-2.2.0/linux/lib/libfreeswan/pfkey_v2_build.c 2005-11-14 13:49:01.000000000 +0000
|
||||
@@ -173,9 +173,9 @@
|
||||
SENDERR(EINVAL);
|
||||
}
|
||||
|
||||
- if(!(*pfkey_ext = (struct sadb_ext*)
|
||||
- pfkey_msg = (struct sadb_msg*)
|
||||
- MALLOC(sizeof(struct sadb_msg)))) {
|
||||
+ pfkey_msg = (struct sadb_msg*)MALLOC(sizeof(struct sadb_msg));
|
||||
+ *pfkey_ext = (struct sadb_ext*)pfkey_msg;
|
||||
+ if(NULL == pfkey_msg) {
|
||||
DEBUGGING(PF_KEY_DEBUG_BUILD,
|
||||
"pfkey_msg_hdr_build: "
|
||||
"memory allocation failed\n");
|
||||
@@ -297,9 +297,9 @@
|
||||
SENDERR(EINVAL);
|
||||
}
|
||||
|
||||
- if(!(*pfkey_ext = (struct sadb_ext*)
|
||||
- pfkey_sa = (struct sadb_sa*)
|
||||
- MALLOC(sizeof(struct sadb_sa)))) {
|
||||
+ pfkey_sa = (struct sadb_sa*)MALLOC(sizeof(struct sadb_sa));
|
||||
+ *pfkey_ext = (struct sadb_ext*)pfkey_sa;
|
||||
+ if (NULL == pfkey_sa) {
|
||||
DEBUGGING(PF_KEY_DEBUG_BUILD,
|
||||
"pfkey_sa_build: "
|
||||
"memory allocation failed\n");
|
||||
@@ -374,9 +374,9 @@
|
||||
SENDERR(EINVAL);
|
||||
}
|
||||
|
||||
- if(!(*pfkey_ext = (struct sadb_ext*)
|
||||
- pfkey_lifetime = (struct sadb_lifetime*)
|
||||
- MALLOC(sizeof(struct sadb_lifetime)))) {
|
||||
+ pfkey_lifetime = (struct sadb_lifetime*)MALLOC(sizeof(struct sadb_lifetime));
|
||||
+ *pfkey_ext = (struct sadb_ext*)pfkey_lifetime;
|
||||
+ if (NULL == pfkey_lifetime) {
|
||||
DEBUGGING(PF_KEY_DEBUG_BUILD,
|
||||
"pfkey_lifetime_build: "
|
||||
"memory allocation failed\n");
|
||||
@@ -563,10 +563,11 @@
|
||||
SENDERR(EINVAL);
|
||||
}
|
||||
|
||||
- if(!(*pfkey_ext = (struct sadb_ext*)
|
||||
- pfkey_key = (struct sadb_key*)
|
||||
- MALLOC(sizeof(struct sadb_key) +
|
||||
- DIVUP(key_bits, 64) * IPSEC_PFKEYv2_ALIGN))) {
|
||||
+ pfkey_key = (struct sadb_key*)
|
||||
+ MALLOC(sizeof(struct sadb_key) +
|
||||
+ DIVUP(key_bits, 64) * IPSEC_PFKEYv2_ALIGN);
|
||||
+ *pfkey_ext = (struct sadb_ext*)pfkey_key;
|
||||
+ if (NULL == pfkey_key) {
|
||||
ERROR("pfkey_key_build: "
|
||||
"memory allocation failed\n");
|
||||
SENDERR(ENOMEM);
|
||||
@@ -643,10 +644,11 @@
|
||||
if((ident_type == SADB_IDENTTYPE_USERFQDN) ) {
|
||||
}
|
||||
#endif
|
||||
-
|
||||
- if(!(*pfkey_ext = (struct sadb_ext*)
|
||||
- pfkey_ident = (struct sadb_ident*)
|
||||
- MALLOC(ident_len * IPSEC_PFKEYv2_ALIGN))) {
|
||||
+
|
||||
+ pfkey_ident = (struct sadb_ident*)
|
||||
+ MALLOC(ident_len * IPSEC_PFKEYv2_ALIGN);
|
||||
+ *pfkey_ext = (struct sadb_ext*)pfkey_ident;
|
||||
+ if (NULL == pfkey_ident) {
|
||||
ERROR("pfkey_ident_build: "
|
||||
"memory allocation failed\n");
|
||||
SENDERR(ENOMEM);
|
||||
@@ -696,10 +698,11 @@
|
||||
(*pfkey_ext)->sadb_ext_type);
|
||||
SENDERR(EINVAL); /* don't process these yet */
|
||||
|
||||
- if(!(*pfkey_ext = (struct sadb_ext*)
|
||||
- pfkey_sens = (struct sadb_sens*)
|
||||
- MALLOC(sizeof(struct sadb_sens) +
|
||||
- (sens_len + integ_len) * sizeof(uint64_t)))) {
|
||||
+ pfkey_sens = (struct sadb_sens*)
|
||||
+ MALLOC(sizeof(struct sadb_sens) +
|
||||
+ (sens_len + integ_len) * sizeof(uint64_t));
|
||||
+ *pfkey_ext = (struct sadb_ext*)pfkey_sens;
|
||||
+ if (NULL == pfkey_sens) {
|
||||
ERROR("pfkey_sens_build: "
|
||||
"memory allocation failed\n");
|
||||
SENDERR(ENOMEM);
|
||||
@@ -753,10 +756,11 @@
|
||||
SENDERR(EINVAL);
|
||||
}
|
||||
|
||||
- if(!(*pfkey_ext = (struct sadb_ext*)
|
||||
- pfkey_prop = (struct sadb_prop*)
|
||||
- MALLOC(sizeof(struct sadb_prop) +
|
||||
- comb_num * sizeof(struct sadb_comb)))) {
|
||||
+ pfkey_prop = (struct sadb_prop*)
|
||||
+ MALLOC(sizeof(struct sadb_prop) +
|
||||
+ comb_num * sizeof(struct sadb_comb));
|
||||
+ *pfkey_ext = (struct sadb_ext*)pfkey_prop;
|
||||
+ if (NULL == pfkey_prop) {
|
||||
ERROR("pfkey_prop_build: "
|
||||
"memory allocation failed\n");
|
||||
SENDERR(ENOMEM);
|
||||
@@ -833,11 +837,11 @@
|
||||
SENDERR(EINVAL);
|
||||
}
|
||||
|
||||
- if(!(*pfkey_ext = (struct sadb_ext*)
|
||||
- pfkey_supported = (struct sadb_supported*)
|
||||
- MALLOC(sizeof(struct sadb_supported) +
|
||||
- alg_num *
|
||||
- sizeof(struct sadb_alg)))) {
|
||||
+ pfkey_supported = (struct sadb_supported*)
|
||||
+ MALLOC(sizeof(struct sadb_supported) +
|
||||
+ alg_num * sizeof(struct sadb_alg));
|
||||
+ *pfkey_ext = (struct sadb_ext*)pfkey_supported;
|
||||
+ if (NULL == pfkey_supported) {
|
||||
DEBUGGING(PF_KEY_DEBUG_BUILD,
|
||||
"pfkey_supported_build: "
|
||||
"memory allocation failed\n");
|
||||
@@ -913,10 +917,11 @@
|
||||
ntohl(min));
|
||||
SENDERR(EEXIST);
|
||||
}
|
||||
-
|
||||
- if(!(*pfkey_ext = (struct sadb_ext*)
|
||||
- pfkey_spirange = (struct sadb_spirange*)
|
||||
- MALLOC(sizeof(struct sadb_spirange)))) {
|
||||
+
|
||||
+ pfkey_spirange = (struct sadb_spirange*)
|
||||
+ MALLOC(sizeof(struct sadb_spirange));
|
||||
+ *pfkey_ext = (struct sadb_ext*)pfkey_spirange;
|
||||
+ if (NULL == pfkey_spirange) {
|
||||
DEBUGGING(PF_KEY_DEBUG_BUILD,
|
||||
"pfkey_spirange_build: "
|
||||
"memory allocation failed\n");
|
||||
@@ -958,9 +963,10 @@
|
||||
(*pfkey_ext)->sadb_ext_type);
|
||||
SENDERR(EINVAL); /* don't process these yet */
|
||||
|
||||
- if(!(*pfkey_ext = (struct sadb_ext*)
|
||||
- pfkey_x_kmprivate = (struct sadb_x_kmprivate*)
|
||||
- MALLOC(sizeof(struct sadb_x_kmprivate)))) {
|
||||
+ pfkey_x_kmprivate = (struct sadb_x_kmprivate*)
|
||||
+ MALLOC(sizeof(struct sadb_x_kmprivate));
|
||||
+ *pfkey_ext = (struct sadb_ext*)pfkey_x_kmprivate;
|
||||
+ if (NULL == pfkey_x_kmprivate) {
|
||||
DEBUGGING(PF_KEY_DEBUG_BUILD,
|
||||
"pfkey_x_kmprivate_build: "
|
||||
"memory allocation failed\n");
|
||||
@@ -1009,8 +1015,10 @@
|
||||
SENDERR(EINVAL);
|
||||
}
|
||||
|
||||
- if(!(*pfkey_ext = (struct sadb_ext*)pfkey_x_satype = (struct sadb_x_satype*)
|
||||
- MALLOC(sizeof(struct sadb_x_satype)))) {
|
||||
+ pfkey_x_satype = (struct sadb_x_satype*)
|
||||
+ MALLOC(sizeof(struct sadb_x_satype));
|
||||
+ *pfkey_ext = (struct sadb_ext*)pfkey_x_satype;
|
||||
+ if (NULL == pfkey_x_satype) {
|
||||
ERROR("pfkey_x_satype_build: "
|
||||
"memory allocation failed\n");
|
||||
SENDERR(ENOMEM);
|
||||
@@ -1064,8 +1072,10 @@
|
||||
"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",
|
||||
tunnel, netlink, xform, eroute, spi, radij, esp, ah, rcv, pfkey, ipcomp, verbose);
|
||||
|
||||
- if(!(*pfkey_ext = (struct sadb_ext*)pfkey_x_debug = (struct sadb_x_debug*)
|
||||
- MALLOC(sizeof(struct sadb_x_debug)))) {
|
||||
+ pfkey_x_debug = (struct sadb_x_debug*)
|
||||
+ MALLOC(sizeof(struct sadb_x_debug));
|
||||
+ *pfkey_ext = (struct sadb_ext*)pfkey_x_debug;
|
||||
+ if (NULL == pfkey_x_debug) {
|
||||
ERROR("pfkey_x_debug_build: "
|
||||
"memory allocation failed\n");
|
||||
SENDERR(ENOMEM);
|
||||
@@ -1122,8 +1132,10 @@
|
||||
"pfkey_x_nat_t_type_build: "
|
||||
"type=%d\n", type);
|
||||
|
||||
- if(!(*pfkey_ext = (struct sadb_ext*)pfkey_x_nat_t_type = (struct sadb_x_nat_t_type*)
|
||||
- MALLOC(sizeof(struct sadb_x_nat_t_type)))) {
|
||||
+ pfkey_x_nat_t_type = (struct sadb_x_nat_t_type*)
|
||||
+ MALLOC(sizeof(struct sadb_x_nat_t_type));
|
||||
+ *pfkey_ext = (struct sadb_ext*)pfkey_x_nat_t_type;
|
||||
+ if (NULL == pfkey_x_nat_t_type) {
|
||||
DEBUGGING(PF_KEY_DEBUG_BUILD,
|
||||
"pfkey_x_nat_t_type_build: "
|
||||
"memory allocation failed\n");
|
||||
@@ -1174,8 +1186,10 @@
|
||||
"pfkey_x_nat_t_port_build: "
|
||||
"ext=%d, port=%d\n", exttype, port);
|
||||
|
||||
- if(!(*pfkey_ext = (struct sadb_ext*)pfkey_x_nat_t_port = (struct sadb_x_nat_t_port*)
|
||||
- MALLOC(sizeof(struct sadb_x_nat_t_port)))) {
|
||||
+ pfkey_x_nat_t_port = (struct sadb_x_nat_t_port*)
|
||||
+ MALLOC(sizeof(struct sadb_x_nat_t_port));
|
||||
+ *pfkey_ext = (struct sadb_ext*)pfkey_x_nat_t_port;
|
||||
+ if (NULL == pfkey_x_nat_t_port) {
|
||||
DEBUGGING(PF_KEY_DEBUG_BUILD,
|
||||
"pfkey_x_nat_t_port_build: "
|
||||
"memory allocation failed\n");
|
||||
@@ -1328,7 +1342,12 @@
|
||||
memcpy(pfkey_ext,
|
||||
extensions[ext],
|
||||
(extensions[ext])->sadb_ext_len * IPSEC_PFKEYv2_ALIGN);
|
||||
- ((char*)pfkey_ext) += (extensions[ext])->sadb_ext_len * IPSEC_PFKEYv2_ALIGN;
|
||||
+ {
|
||||
+ char *pfkey_ext_c = (char *)pfkey_ext;
|
||||
+
|
||||
+ pfkey_ext_c += (extensions[ext])->sadb_ext_len * IPSEC_PFKEYv2_ALIGN;
|
||||
+ pfkey_ext = (struct sadb_ext *)pfkey_ext_c;
|
||||
+ }
|
||||
/* Mark that we have seen this extension and remember the header location */
|
||||
extensions_seen |= ( 1 << ext );
|
||||
}
|
||||
Index: openswan-2.2.0/programs/pluto/connections.c
|
||||
===================================================================
|
||||
--- openswan-2.2.0.orig/programs/pluto/connections.c 2004-06-27 20:46:15.000000000 +0000
|
||||
+++ openswan-2.2.0/programs/pluto/connections.c 2005-11-14 14:01:09.000000000 +0000
|
||||
@@ -30,6 +30,7 @@
|
||||
|
||||
#include <openswan.h>
|
||||
#include <openswan/ipsec_policy.h>
|
||||
+#include "pfkeyv2.h"
|
||||
#include "kameipsec.h"
|
||||
|
||||
#include "constants.h"
|
||||
Index: openswan-2.2.0/programs/pluto/ipsec_doi.c
|
||||
===================================================================
|
||||
--- openswan-2.2.0.orig/programs/pluto/ipsec_doi.c 2004-09-02 01:24:23.000000000 +0000
|
||||
+++ openswan-2.2.0/programs/pluto/ipsec_doi.c 2005-11-14 14:03:17.000000000 +0000
|
||||
@@ -31,6 +31,7 @@
|
||||
|
||||
#include <openswan.h>
|
||||
#include <openswan/ipsec_policy.h>
|
||||
+#include "pfkeyv2.h"
|
||||
|
||||
#include "constants.h"
|
||||
#include "defs.h"
|
||||
Index: openswan-2.2.0/programs/pluto/rcv_whack.c
|
||||
===================================================================
|
||||
--- openswan-2.2.0.orig/programs/pluto/rcv_whack.c 2004-06-14 02:01:32.000000000 +0000
|
||||
+++ openswan-2.2.0/programs/pluto/rcv_whack.c 2005-11-14 14:04:08.000000000 +0000
|
||||
@@ -31,6 +31,7 @@
|
||||
#include <sys/queue.h>
|
||||
|
||||
#include <openswan.h>
|
||||
+#include "pfkeyv2.h"
|
||||
|
||||
#include "constants.h"
|
||||
#include "defs.h"
|
||||
Index: openswan-2.2.0/programs/pluto/log.c
|
||||
===================================================================
|
||||
--- openswan-2.2.0.orig/programs/pluto/log.c 2004-06-14 01:46:03.000000000 +0000
|
||||
+++ openswan-2.2.0/programs/pluto/log.c 2005-11-14 14:02:33.000000000 +0000
|
||||
@@ -30,6 +30,7 @@
|
||||
#include <sys/types.h>
|
||||
|
||||
#include <openswan.h>
|
||||
+#include "pfkeyv2.h"
|
||||
|
||||
#include "constants.h"
|
||||
#include "oswlog.h"
|
||||
Index: openswan-2.2.0/programs/pluto/spdb.c
|
||||
===================================================================
|
||||
--- openswan-2.2.0.orig/programs/pluto/spdb.c 2004-05-25 22:25:02.000000000 +0000
|
||||
+++ openswan-2.2.0/programs/pluto/spdb.c 2005-11-14 14:02:55.000000000 +0000
|
||||
@@ -24,6 +24,7 @@
|
||||
|
||||
#include <openswan.h>
|
||||
#include <openswan/ipsec_policy.h>
|
||||
+#include "pfkeyv2.h"
|
||||
|
||||
#include "constants.h"
|
||||
#include "oswlog.h"
|
||||
Index: openswan-2.2.0/programs/pluto/db_ops.c
|
||||
===================================================================
|
||||
--- openswan-2.2.0.orig/programs/pluto/db_ops.c 2004-06-04 01:59:33.000000000 +0000
|
||||
+++ openswan-2.2.0/programs/pluto/db_ops.c 2005-11-14 13:54:10.000000000 +0000
|
||||
@@ -181,7 +181,13 @@
|
||||
ctx->trans0 = ctx->prop.trans = new_trans;
|
||||
/* update trans_cur (by offset) */
|
||||
offset = (char *)(new_trans) - (char *)(old_trans);
|
||||
- (char *)(ctx->trans_cur) += offset;
|
||||
+
|
||||
+ {
|
||||
+ char *cctx = (char *)(ctx->trans_cur);
|
||||
+
|
||||
+ cctx += offset;
|
||||
+ ctx->trans_cur = (struct db_trans *)cctx;
|
||||
+ }
|
||||
/* update elem count */
|
||||
ctx->max_trans = max_trans;
|
||||
PFREE_ST(old_trans, db_trans_st);
|
||||
@@ -213,12 +219,25 @@
|
||||
|
||||
/* update attrs0 and attrs_cur (obviously) */
|
||||
offset = (char *)(new_attrs) - (char *)(old_attrs);
|
||||
- (char *)ctx->attrs0 += offset;
|
||||
- (char *)ctx->attrs_cur += offset;
|
||||
+ {
|
||||
+ char *actx = (char *)(ctx->attrs0);
|
||||
+
|
||||
+ actx += offset;
|
||||
+ ctx->attrs0 = (struct db_attr *)actx;
|
||||
+
|
||||
+ actx = (char *)ctx->attrs_cur;
|
||||
+ actx += offset;
|
||||
+ ctx->attrs_cur = (struct db_attr *)actx;
|
||||
+ }
|
||||
+
|
||||
/* for each transform, rewrite attrs pointer by offsetting it */
|
||||
- for (t=ctx->prop.trans, ti=0; ti < ctx->prop.trans_cnt; t++, ti++) {
|
||||
- (char *)(t->attrs) += offset;
|
||||
+ for (t=ctx->prop.trans, ti=0; ti < ctx->prop.trans_cnt; t++, ti++) {
|
||||
+ char *actx = (char *)(t->attrs);
|
||||
+
|
||||
+ actx += offset;
|
||||
+ t->attrs = (struct db_attr *)actx;
|
||||
}
|
||||
+
|
||||
/* update elem count */
|
||||
ctx->max_attrs = max_attrs;
|
||||
PFREE_ST(old_attrs, db_attrs_st);
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- openswan-2.2.0/programs/Makefile.program.orig 2005-12-17 17:15:13 +0100
|
||||
+++ openswan-2.2.0/programs/Makefile.program 2005-12-17 17:15:36 +0100
|
||||
@@ -114,7 +110,7 @@
|
||||
endif
|
||||
|
||||
# cancel the rule that compiles directly
|
||||
-%: %.c
|
||||
+%: %.c
|
||||
|
||||
%: %.o $(OBJS) $(OPENSWANLIB)
|
||||
$(CC) $(CFLAGS) -o $@ $@.o ${OBJS} $(LDFLAGS) $(LIBS)
|
||||
|
|
@ -1,382 +0,0 @@
|
|||
diff -Naupr openswan-2.2.0/Makefile.inc openswan-2.2.0-gentoo/Makefile.inc
|
||||
--- openswan-2.2.0/Makefile.inc 2004-07-19 21:06:32.000000000 -0500
|
||||
+++ openswan-2.2.0-gentoo/Makefile.inc 2004-09-17 21:31:29.810687485 -0500
|
||||
@@ -64,7 +64,7 @@ POLICYLIB=${OPENSWANSRCDIR}/lib/libipsec
|
||||
DESTDIR?=
|
||||
|
||||
# "local" part of tree, used in building other pathnames
|
||||
-INC_USRLOCAL=/usr/local
|
||||
+INC_USRLOCAL=/usr
|
||||
|
||||
# PUBDIR is where the "ipsec" command goes; beware, many things define PATH
|
||||
# settings which are assumed to include it (or at least, to include *some*
|
||||
@@ -98,7 +98,7 @@ MANTREE=$(DESTDIR)$(INC_USRLOCAL)/$(INC_
|
||||
MANPLACES=man3 man5 man8
|
||||
|
||||
# where configuration files go
|
||||
-FINALCONFFILE?=/etc/ipsec.conf
|
||||
+FINALCONFFILE?=/etc/ipsec/ipsec.conf
|
||||
CONFFILE=$(DESTDIR)$(FINALCONFFILE)
|
||||
|
||||
FINALCONFDIR?=/etc
|
||||
@@ -109,10 +109,10 @@ CONFDDIR=$(DESTDIR)$(FINALCONFDDIR)
|
||||
|
||||
# sample configuration files go into
|
||||
INC_DOCDIR?=share/doc
|
||||
-FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
|
||||
+FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan-2.2.0
|
||||
EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
|
||||
|
||||
-FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
|
||||
+FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan-2.2.0
|
||||
DOCDIR=${DESTDIR}${FINALDOCDIR}
|
||||
|
||||
# where per-conn pluto logs go
|
||||
@@ -243,7 +243,7 @@ RH_KERNELSRC?=/usr/src/linux-2.4
|
||||
# installed one in RH 7.2, won't work - you wind up depending upon
|
||||
# openssl.
|
||||
|
||||
-BIND9STATICLIBDIR?=/usr/local/lib
|
||||
+BIND9STATICLIBDIR?=/usr/lib
|
||||
|
||||
# if you install elsewere, you may need to point the include files to it.
|
||||
#BIND9STATICLIBDIR?=/sandel/lib
|
||||
diff -Naupr openswan-2.2.0/lib/libdes/Makefile openswan-2.2.0-gentoo/lib/libdes/Makefile
|
||||
--- openswan-2.2.0/lib/libdes/Makefile 2004-04-03 13:44:41.000000000 -0600
|
||||
+++ openswan-2.2.0-gentoo/lib/libdes/Makefile 2004-09-17 21:31:29.810687485 -0500
|
||||
@@ -60,7 +60,7 @@ MAKE=make -f Makefile
|
||||
# normally overridden by FreeS/WAN Makefiles anyway
|
||||
CFLAG= -O3 -fomit-frame-pointer -I${KLIPSD}/include -I${SRCDIR}
|
||||
|
||||
-CFLAGS=$(OPTS) $(CFLAG)
|
||||
+CFLAGS=$(OPTS) $(CFLAG) $(USERCOMPILE)
|
||||
CPP=$(CC) -E
|
||||
|
||||
# Assember version of des_encrypt*().
|
||||
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
|
||||
--- openswan-2.2.0/linux/crypto/ciphers/des/asm/crypt586.pl 2002-04-24 02:36:37.000000000 -0500
|
||||
+++ openswan-2.2.0-gentoo/linux/crypto/ciphers/des/asm/crypt586.pl 2004-09-17 21:31:29.811687312 -0500
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/local/bin/perl
|
||||
+#!/usr/bin/perl
|
||||
#
|
||||
# The inner loop instruction sequence and the IP/FP modifications are from
|
||||
# Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk>
|
||||
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
|
||||
--- openswan-2.2.0/linux/crypto/ciphers/des/asm/des-586.pl 2002-04-24 02:36:37.000000000 -0500
|
||||
+++ openswan-2.2.0-gentoo/linux/crypto/ciphers/des/asm/des-586.pl 2004-09-17 21:31:29.811687312 -0500
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/local/bin/perl
|
||||
+#!/usr/bin/perl
|
||||
#
|
||||
# The inner loop instruction sequence and the IP/FP modifications are from
|
||||
# Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk>
|
||||
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
|
||||
--- openswan-2.2.0/linux/crypto/ciphers/des/asm/des686.pl 2002-04-24 02:36:37.000000000 -0500
|
||||
+++ openswan-2.2.0-gentoo/linux/crypto/ciphers/des/asm/des686.pl 2004-09-17 21:31:29.812687139 -0500
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/local/bin/perl
|
||||
+#!/usr/bin/perl
|
||||
|
||||
$prog="des686.pl";
|
||||
|
||||
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
|
||||
--- openswan-2.2.0/linux/crypto/ciphers/des/asm/desboth.pl 2002-04-24 02:36:37.000000000 -0500
|
||||
+++ openswan-2.2.0-gentoo/linux/crypto/ciphers/des/asm/desboth.pl 2004-09-17 21:31:29.812687139 -0500
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/local/bin/perl
|
||||
+#!/usr/bin/perl
|
||||
|
||||
$L="edi";
|
||||
$R="esi";
|
||||
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
|
||||
--- openswan-2.2.0/linux/crypto/ciphers/des/asm/perlasm/cbc.pl 2002-04-24 02:36:37.000000000 -0500
|
||||
+++ openswan-2.2.0-gentoo/linux/crypto/ciphers/des/asm/perlasm/cbc.pl 2004-09-17 21:31:29.812687139 -0500
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/local/bin/perl
|
||||
+#!/usr/bin/perl
|
||||
|
||||
# void des_ncbc_encrypt(input, output, length, schedule, ivec, enc)
|
||||
# des_cblock (*input);
|
||||
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
|
||||
--- openswan-2.2.0/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl 2002-04-24 02:36:37.000000000 -0500
|
||||
+++ openswan-2.2.0-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl 2004-09-17 21:31:29.813686966 -0500
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/local/bin/perl
|
||||
+#!/usr/bin/perl
|
||||
|
||||
# require 'x86asm.pl';
|
||||
# &asm_init("cpp","des-586.pl");
|
||||
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
|
||||
--- openswan-2.2.0/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl 2002-04-24 02:36:37.000000000 -0500
|
||||
+++ openswan-2.2.0-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl 2004-09-17 21:31:29.813686966 -0500
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/local/bin/perl
|
||||
+#!/usr/bin/perl
|
||||
|
||||
package x86ms;
|
||||
|
||||
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
|
||||
--- openswan-2.2.0/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl 2002-04-24 02:36:37.000000000 -0500
|
||||
+++ openswan-2.2.0-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl 2004-09-17 21:31:29.814686793 -0500
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/local/bin/perl
|
||||
+#!/usr/bin/perl
|
||||
|
||||
package x86unix;
|
||||
|
||||
diff -Naupr openswan-2.2.0/programs/_include/_include.in openswan-2.2.0-gentoo/programs/_include/_include.in
|
||||
--- openswan-2.2.0/programs/_include/_include.in 2003-01-06 15:44:04.000000000 -0600
|
||||
+++ openswan-2.2.0-gentoo/programs/_include/_include.in 2004-09-17 21:31:29.814686793 -0500
|
||||
@@ -47,10 +47,10 @@ for f
|
||||
do
|
||||
if test ! -r "$f"
|
||||
then
|
||||
- if test ! "$f" = "/etc/ipsec.conf"
|
||||
+ if test ! "$f" = "/etc/ipsec/ipsec.conf"
|
||||
then
|
||||
echo "#:cannot open configuration file \'$f\'"
|
||||
- if test "$f" = "/etc/ipsec.secrets"
|
||||
+ if test "$f" = "/etc/ipsec/ipsec.secrets"
|
||||
then
|
||||
echo "#:Your secrets file will be created when you start FreeS/WAN for the first time."
|
||||
fi
|
||||
diff -Naupr openswan-2.2.0/programs/barf/barf.in openswan-2.2.0-gentoo/programs/barf/barf.in
|
||||
--- openswan-2.2.0/programs/barf/barf.in 2004-06-07 20:02:11.000000000 -0500
|
||||
+++ openswan-2.2.0-gentoo/programs/barf/barf.in 2004-09-17 21:31:29.815686620 -0500
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
LOGS=${LOGS-/var/log}
|
||||
CONFS=${IPSEC_CONFS-/etc}
|
||||
-CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec.d}
|
||||
+CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec/ipsec.d}
|
||||
me="ipsec barf"
|
||||
|
||||
# kludge to produce no barf output mentioning policygroups if none are present.
|
||||
@@ -229,13 +229,13 @@ then
|
||||
done
|
||||
fi
|
||||
_________________________ ipsec/ls-libdir
|
||||
-ls -l ${IPSEC_LIBDIR-/usr/local/lib/ipsec}
|
||||
+ls -l ${IPSEC_LIBDIR-/usr/lib/ipsec}
|
||||
_________________________ ipsec/ls-execdir
|
||||
-ls -l ${IPSEC_EXECDIR-/usr/local/libexec/ipsec}
|
||||
+ls -l ${IPSEC_EXECDIR-/usr/libexec/ipsec}
|
||||
_________________________ ipsec/updowns
|
||||
-for f in `ls ${IPSEC_EXECDIR-/usr/local/libexec/ipsec} | egrep updown`
|
||||
+for f in `ls ${IPSEC_EXECDIR-/usr/libexec/ipsec} | egrep updown`
|
||||
do
|
||||
- cat ${IPSEC_EXECDIR-/usr/local/libexec/ipsec}/$f
|
||||
+ cat ${IPSEC_EXECDIR-/usr/libexec/ipsec}/$f
|
||||
done
|
||||
_________________________ proc/net/dev
|
||||
cat /proc/net/dev
|
||||
diff -Naupr openswan-2.2.0/programs/eroute/eroute.5 openswan-2.2.0-gentoo/programs/eroute/eroute.5
|
||||
--- openswan-2.2.0/programs/eroute/eroute.5 2003-10-30 20:32:27.000000000 -0600
|
||||
+++ openswan-2.2.0-gentoo/programs/eroute/eroute.5 2004-09-17 21:31:29.815686620 -0500
|
||||
@@ -223,7 +223,7 @@ Parameters Index of
|
||||
in hexadecimal using Authentication Header protocol (51,
|
||||
IPPROTO_AH) with no identies defined for either end.
|
||||
.SH FILES
|
||||
-/proc/net/ipsec_eroute, /usr/local/bin/ipsec
|
||||
+/proc/net/ipsec_eroute, /usr/bin/ipsec
|
||||
.SH "SEE ALSO"
|
||||
ipsec(8), ipsec_manual(8), ipsec_tncfg(5), ipsec_spi(5),
|
||||
ipsec_spigrp(5), ipsec_klipsdebug(5), ipsec_eroute(8), ipsec_version(5),
|
||||
diff -Naupr openswan-2.2.0/programs/eroute/eroute.8 openswan-2.2.0-gentoo/programs/eroute/eroute.8
|
||||
--- openswan-2.2.0/programs/eroute/eroute.8 2003-10-30 20:32:27.000000000 -0600
|
||||
+++ openswan-2.2.0-gentoo/programs/eroute/eroute.8 2004-09-17 21:31:29.816686447 -0500
|
||||
@@ -308,7 +308,7 @@ will be in clear text.
|
||||
.br
|
||||
.LP
|
||||
.SH FILES
|
||||
-/proc/net/ipsec_eroute, /usr/local/bin/ipsec
|
||||
+/proc/net/ipsec_eroute, /usr/bin/ipsec
|
||||
.SH "SEE ALSO"
|
||||
ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_spi(8),
|
||||
ipsec_spigrp(8), ipsec_klipsdebug(8), ipsec_eroute(5)
|
||||
diff -Naupr openswan-2.2.0/programs/ipsec/ipsec.8 openswan-2.2.0-gentoo/programs/ipsec/ipsec.8
|
||||
--- openswan-2.2.0/programs/ipsec/ipsec.8 2003-02-27 10:51:54.000000000 -0600
|
||||
+++ openswan-2.2.0-gentoo/programs/ipsec/ipsec.8 2004-09-17 21:31:29.816686447 -0500
|
||||
@@ -81,7 +81,7 @@ reports where
|
||||
.I ipsec
|
||||
thinks the IPsec configuration files are stored.
|
||||
.SH FILES
|
||||
-/usr/local/lib/ipsec usual utilities directory
|
||||
+/usr/lib/ipsec usual utilities directory
|
||||
.SH ENVIRONMENT
|
||||
.PP
|
||||
The following environment variables control where FreeS/WAN finds its
|
||||
diff -Naupr openswan-2.2.0/programs/klipsdebug/klipsdebug.5 openswan-2.2.0-gentoo/programs/klipsdebug/klipsdebug.5
|
||||
--- openswan-2.2.0/programs/klipsdebug/klipsdebug.5 2002-04-24 02:35:38.000000000 -0500
|
||||
+++ openswan-2.2.0-gentoo/programs/klipsdebug/klipsdebug.5 2004-09-17 21:31:29.817686275 -0500
|
||||
@@ -103,7 +103,7 @@ full
|
||||
sockets debugging has been set and everything else is not set.
|
||||
.LP
|
||||
.SH FILES
|
||||
-/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec
|
||||
+/proc/net/ipsec_klipsdebug, /usr/bin/ipsec
|
||||
.SH "SEE ALSO"
|
||||
ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8),
|
||||
ipsec_spi(8), ipsec_spigrp(8), ipsec_klipsdebug(5), ipsec_version(5),
|
||||
diff -Naupr openswan-2.2.0/programs/klipsdebug/klipsdebug.8 openswan-2.2.0-gentoo/programs/klipsdebug/klipsdebug.8
|
||||
--- openswan-2.2.0/programs/klipsdebug/klipsdebug.8 2002-04-24 02:35:39.000000000 -0500
|
||||
+++ openswan-2.2.0-gentoo/programs/klipsdebug/klipsdebug.8 2004-09-17 21:31:29.817686275 -0500
|
||||
@@ -117,7 +117,7 @@ turns off only the
|
||||
debugging messages.
|
||||
.LP
|
||||
.SH FILES
|
||||
-/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec
|
||||
+/proc/net/ipsec_klipsdebug, /usr/bin/ipsec
|
||||
.SH "SEE ALSO"
|
||||
ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8),
|
||||
ipsec_spi(8), ipsec_spigrp(8), ipsec_klipsdebug(5)
|
||||
diff -Naupr openswan-2.2.0/programs/lwdnsq/lwdnsq.xml.in openswan-2.2.0-gentoo/programs/lwdnsq/lwdnsq.xml.in
|
||||
--- openswan-2.2.0/programs/lwdnsq/lwdnsq.xml.in 2004-04-03 19:50:56.000000000 -0600
|
||||
+++ openswan-2.2.0-gentoo/programs/lwdnsq/lwdnsq.xml.in 2004-09-17 21:31:29.817686275 -0500
|
||||
@@ -430,7 +430,7 @@ information.
|
||||
<refsect1><title>Special IPSECKEY processing</title>
|
||||
|
||||
<programlisting>
|
||||
-/etc/ipsec.d/lwdnsq.conf
|
||||
+/etc/ipsec/ipsec.d/lwdnsq.conf
|
||||
</programlisting>
|
||||
|
||||
</refsect1>
|
||||
diff -Naupr openswan-2.2.0/programs/mailkey/mailkey.in openswan-2.2.0-gentoo/programs/mailkey/mailkey.in
|
||||
--- openswan-2.2.0/programs/mailkey/mailkey.in 2003-06-30 00:34:22.000000000 -0500
|
||||
+++ openswan-2.2.0-gentoo/programs/mailkey/mailkey.in 2004-09-17 21:31:29.818686102 -0500
|
||||
@@ -60,7 +60,7 @@ with the following error:
|
||||
|
||||
"$test1st"
|
||||
|
||||
-Common concerns: This account must be able to read /etc/ipsec.secrets.
|
||||
+Common concerns: This account must be able to read /etc/ipsec/ipsec.secrets.
|
||||
If you haven't generated your key yet, please run 'ipsec newhostkey'."
|
||||
exit 0
|
||||
}
|
||||
diff -Naupr openswan-2.2.0/programs/pluto/Makefile openswan-2.2.0-gentoo/programs/pluto/Makefile
|
||||
--- openswan-2.2.0/programs/pluto/Makefile 2004-07-19 21:05:23.000000000 -0500
|
||||
+++ openswan-2.2.0-gentoo/programs/pluto/Makefile 2004-09-17 21:31:29.819685929 -0500
|
||||
@@ -224,7 +224,7 @@ CPPFLAGS = $(HDRDIRS) $(DEFINES) \
|
||||
-DPOLICYGROUPSDIR=\"${FINALCONFDDIR}/policies\" \
|
||||
-DPERPEERLOGDIR=\"${FINALLOGDIR}/pluto/peer\"
|
||||
|
||||
-ALLFLAGS = $(CPPFLAGS) $(CFLAGS)
|
||||
+ALLFLAGS = $(CPPFLAGS) $(CFLAGS) $(USERCOMPILE)
|
||||
|
||||
# libefence is a free memory allocation debugger
|
||||
# Solaris 2 needs -lsocket -lnsl
|
||||
diff -Naupr openswan-2.2.0/programs/setup/Makefile openswan-2.2.0-gentoo/programs/setup/Makefile
|
||||
--- openswan-2.2.0/programs/setup/Makefile 2004-04-03 13:44:48.000000000 -0600
|
||||
+++ openswan-2.2.0-gentoo/programs/setup/Makefile 2004-09-17 21:31:29.819685929 -0500
|
||||
@@ -33,25 +33,10 @@ install:: setup
|
||||
@rm -f $(BINDIR)/setup
|
||||
@$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec
|
||||
@ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup
|
||||
- -@for i in 0 1 2 3 4 5 6; do mkdir -p $(RCDIR)/../rc$$i.d; done
|
||||
- -@cd $(RCDIR)/../rc0.d && ln -f -s ../init.d/ipsec K76ipsec
|
||||
- -@cd $(RCDIR)/../rc1.d && ln -f -s ../init.d/ipsec K76ipsec
|
||||
- -@cd $(RCDIR)/../rc2.d && ln -f -s ../init.d/ipsec S47ipsec
|
||||
- -@cd $(RCDIR)/../rc3.d && ln -f -s ../init.d/ipsec S47ipsec
|
||||
- -@cd $(RCDIR)/../rc4.d && ln -f -s ../init.d/ipsec S47ipsec
|
||||
- -@cd $(RCDIR)/../rc5.d && ln -f -s ../init.d/ipsec S47ipsec
|
||||
- -@cd $(RCDIR)/../rc6.d && ln -f -s ../init.d/ipsec K76ipsec
|
||||
|
||||
install_file_list::
|
||||
@echo $(RCDIR)/ipsec
|
||||
@echo $(BINDIR)/setup
|
||||
- @echo $(RCDIR)/../rc0.d/K76ipsec
|
||||
- @echo $(RCDIR)/../rc1.d/K76ipsec
|
||||
- @echo $(RCDIR)/../rc2.d/S47ipsec
|
||||
- @echo $(RCDIR)/../rc3.d/S47ipsec
|
||||
- @echo $(RCDIR)/../rc4.d/S47ipsec
|
||||
- @echo $(RCDIR)/../rc5.d/S47ipsec
|
||||
- @echo $(RCDIR)/../rc6.d/K76ipsec
|
||||
|
||||
clean::
|
||||
@rm -f setup
|
||||
diff -Naupr openswan-2.2.0/programs/showhostkey/showhostkey.in openswan-2.2.0-gentoo/programs/showhostkey/showhostkey.in
|
||||
--- openswan-2.2.0/programs/showhostkey/showhostkey.in 2004-03-24 15:08:22.000000000 -0600
|
||||
+++ openswan-2.2.0-gentoo/programs/showhostkey/showhostkey.in 2004-09-17 21:31:29.820685756 -0500
|
||||
@@ -18,7 +18,7 @@ me="ipsec showhostkey"
|
||||
usage="Usage: $me [--file secrets] [--left] [--right] [--txt gateway] [--id id]
|
||||
[--dhclient]"
|
||||
|
||||
-file=/etc/ipsec.secrets
|
||||
+file=/etc/ipsec/ipsec.secrets
|
||||
fmt=""
|
||||
gw=
|
||||
id=
|
||||
diff -Naupr openswan-2.2.0/programs/spi/spi.5 openswan-2.2.0-gentoo/programs/spi/spi.5
|
||||
--- openswan-2.2.0/programs/spi/spi.5 2002-04-24 02:35:39.000000000 -0500
|
||||
+++ openswan-2.2.0-gentoo/programs/spi/spi.5 2004-09-17 21:31:29.820685756 -0500
|
||||
@@ -162,7 +162,7 @@ since 1 of 8 bits is a parity bit), has
|
||||
3858 seconds ago and has been idle for 23 seconds.
|
||||
.LP
|
||||
.SH FILES
|
||||
-/proc/net/ipsec_spi, /usr/local/bin/ipsec
|
||||
+/proc/net/ipsec_spi, /usr/bin/ipsec
|
||||
.SH "SEE ALSO"
|
||||
ipsec(8), ipsec_manual(8), ipsec_tncfg(5), ipsec_eroute(5),
|
||||
ipsec_spigrp(5), ipsec_klipsdebug(5), ipsec_spi(8), ipsec_version(5),
|
||||
diff -Naupr openswan-2.2.0/programs/spi/spi.8 openswan-2.2.0-gentoo/programs/spi/spi.8
|
||||
--- openswan-2.2.0/programs/spi/spi.8 2002-04-24 02:35:40.000000000 -0500
|
||||
+++ openswan-2.2.0-gentoo/programs/spi/spi.8 2004-09-17 21:31:29.820685756 -0500
|
||||
@@ -461,7 +461,7 @@ and protocol
|
||||
(4).
|
||||
.LP
|
||||
.SH FILES
|
||||
-/proc/net/ipsec_spi, /usr/local/bin/ipsec
|
||||
+/proc/net/ipsec_spi, /usr/bin/ipsec
|
||||
.SH "SEE ALSO"
|
||||
ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8),
|
||||
ipsec_spigrp(8), ipsec_klipsdebug(8), ipsec_spi(5)
|
||||
diff -Naupr openswan-2.2.0/programs/spigrp/spigrp.5 openswan-2.2.0-gentoo/programs/spigrp/spigrp.5
|
||||
--- openswan-2.2.0/programs/spigrp/spigrp.5 2002-04-24 02:35:40.000000000 -0500
|
||||
+++ openswan-2.2.0-gentoo/programs/spigrp/spigrp.5 2004-09-17 21:31:29.821685583 -0500
|
||||
@@ -77,7 +77,7 @@ be an incoming or outgoing group, depend
|
||||
machine.
|
||||
.LP
|
||||
.SH FILES
|
||||
-/proc/net/ipsec_spigrp, /usr/local/bin/ipsec
|
||||
+/proc/net/ipsec_spigrp, /usr/bin/ipsec
|
||||
.SH "SEE ALSO"
|
||||
ipsec(8), ipsec_manual(8), ipsec_tncfg(5), ipsec_eroute(5),
|
||||
ipsec_spi(5), ipsec_klipsdebug(5), ipsec_spigrp(8), ipsec_version(5),
|
||||
diff -Naupr openswan-2.2.0/programs/spigrp/spigrp.8 openswan-2.2.0-gentoo/programs/spigrp/spigrp.8
|
||||
--- openswan-2.2.0/programs/spigrp/spigrp.8 2002-04-24 02:35:41.000000000 -0500
|
||||
+++ openswan-2.2.0-gentoo/programs/spigrp/spigrp.8 2004-09-17 21:31:29.821685583 -0500
|
||||
@@ -128,7 +128,7 @@ and finally an AH header to authenticate
|
||||
.BR 0x236 .
|
||||
.LP
|
||||
.SH FILES
|
||||
-/proc/net/ipsec_spigrp, /usr/local/bin/ipsec
|
||||
+/proc/net/ipsec_spigrp, /usr/bin/ipsec
|
||||
.SH "SEE ALSO"
|
||||
ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8),
|
||||
ipsec_spi(8), ipsec_klipsdebug(8), ipsec_spigrp(5)
|
||||
diff -Naupr openswan-2.2.0/programs/tncfg/tncfg.5 openswan-2.2.0-gentoo/programs/tncfg/tncfg.5
|
||||
--- openswan-2.2.0/programs/tncfg/tncfg.5 2002-04-24 02:35:41.000000000 -0500
|
||||
+++ openswan-2.2.0-gentoo/programs/tncfg/tncfg.5 2004-09-17 21:31:29.821685583 -0500
|
||||
@@ -75,7 +75,7 @@ shows that virtual device
|
||||
is not connected to any physical device.
|
||||
.LP
|
||||
.SH "FILES"
|
||||
-/proc/net/ipsec_tncfg, /usr/local/bin/ipsec
|
||||
+/proc/net/ipsec_tncfg, /usr/bin/ipsec
|
||||
.SH "SEE ALSO"
|
||||
ipsec(8), ipsec_manual(8), ipsec_eroute(5), ipsec_spi(5),
|
||||
ipsec_spigrp(5), ipsec_klipsdebug(5), ipsec_tncfg(8), ipsec_version(5),
|
||||
diff -Naupr openswan-2.2.0/programs/tncfg/tncfg.8 openswan-2.2.0-gentoo/programs/tncfg/tncfg.8
|
||||
--- openswan-2.2.0/programs/tncfg/tncfg.8 2002-04-24 02:35:41.000000000 -0500
|
||||
+++ openswan-2.2.0-gentoo/programs/tncfg/tncfg.8 2004-09-17 21:31:29.822685410 -0500
|
||||
@@ -76,7 +76,7 @@ virtual device to the
|
||||
physical device.
|
||||
.LP
|
||||
.SH "FILES"
|
||||
-/proc/net/ipsec_tncfg, /usr/local/bin/ipsec
|
||||
+/proc/net/ipsec_tncfg, /usr/bin/ipsec
|
||||
.SH "SEE ALSO"
|
||||
ipsec(8), ipsec_manual(8), ipsec_eroute(8), ipsec_spi(8),
|
||||
ipsec_spigrp(8), ipsec_klipsdebug(8), ipsec_tncfg(5)
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
Index: openswan-2.4.7/Makefile.inc
|
||||
===================================================================
|
||||
--- openswan-2.4.7.orig/Makefile.inc 2006-12-25 18:05:40.608503250 +0100
|
||||
+++ openswan-2.4.7/Makefile.inc 2006-12-25 18:06:39.028154250 +0100
|
||||
@@ -158,7 +158,7 @@
|
||||
# how backup names are composed.
|
||||
# Note that the install procedures will never overwrite an existing config
|
||||
# file, which is why -b is not specified for them.
|
||||
-INSTBINFLAGS=-b --suffix=.old
|
||||
+INSTBINFLAGS=
|
||||
INSTSUIDFLAGS=--mode=u+rxs,g+rx,o+rx --group=root -b --suffix=.old
|
||||
INSTMANFLAGS=
|
||||
INSTCONFFLAGS=
|
||||
|
|
@ -0,0 +1,377 @@
|
|||
diff -Nru openswan-2.4.7.orig/doc/Makefile openswan-2.4.7/doc/Makefile
|
||||
--- openswan-2.4.7.orig/doc/Makefile 2005-11-08 23:32:45.000000000 +0200
|
||||
+++ openswan-2.4.7/doc/Makefile 2006-12-06 22:46:54.732830840 +0200
|
||||
@@ -1,6 +1,6 @@
|
||||
# Makefile to generate various formats from HTML source
|
||||
#
|
||||
-# Assumes the htmldoc utility is available.
|
||||
+# No longer cares if the htmldoc utility is available.
|
||||
# This can be downloaded from www.easysw.com
|
||||
#
|
||||
# Also needs lynx(1) for HTML-to-text conversion
|
||||
diff -Nru openswan-2.4.7.orig/lib/libcrypto/libdes/asm/crypt586.pl openswan-2.4.7/lib/libcrypto/libdes/asm/crypt586.pl
|
||||
--- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/crypt586.pl 2004-07-16 03:24:45.000000000 +0300
|
||||
+++ openswan-2.4.7/lib/libcrypto/libdes/asm/crypt586.pl 2006-12-06 22:46:54.732830840 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/local/bin/perl
|
||||
+#!/usr/bin/perl
|
||||
#
|
||||
# The inner loop instruction sequence and the IP/FP modifications are from
|
||||
# Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk>
|
||||
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
|
||||
--- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/cbc.pl 2004-07-10 11:07:06.000000000 +0300
|
||||
+++ openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/cbc.pl 2006-12-06 22:46:54.736831090 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/local/bin/perl
|
||||
+#!/usr/bin/perl
|
||||
|
||||
# void des_ncbc_encrypt(input, output, length, schedule, ivec, enc)
|
||||
# des_cblock (*input);
|
||||
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
|
||||
--- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86asm.pl 2004-07-10 11:07:06.000000000 +0300
|
||||
+++ openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86asm.pl 2006-12-06 22:46:54.736831090 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/local/bin/perl
|
||||
+#!/usr/bin/perl
|
||||
|
||||
# require 'x86asm.pl';
|
||||
# &asm_init("cpp","des-586.pl");
|
||||
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
|
||||
--- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86ms.pl 2004-07-10 11:07:07.000000000 +0300
|
||||
+++ openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86ms.pl 2006-12-06 22:46:54.736831090 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/local/bin/perl
|
||||
+#!/usr/bin/perl
|
||||
|
||||
package x86ms;
|
||||
|
||||
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
|
||||
--- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86unix.pl 2004-07-10 11:07:07.000000000 +0300
|
||||
+++ openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86unix.pl 2006-12-06 22:46:54.736831090 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/local/bin/perl
|
||||
+#!/usr/bin/perl
|
||||
|
||||
package x86unix;
|
||||
|
||||
diff -Nru openswan-2.4.7.orig/lib/liblwres/Makefile openswan-2.4.7/lib/liblwres/Makefile
|
||||
--- openswan-2.4.7.orig/lib/liblwres/Makefile 2004-12-18 20:13:34.000000000 +0200
|
||||
+++ openswan-2.4.7/lib/liblwres/Makefile 2006-12-06 22:46:54.736831090 +0200
|
||||
@@ -20,7 +20,7 @@
|
||||
CDEFINES = -g
|
||||
CWARNINGS = -Werror
|
||||
|
||||
-CFLAGS=${CINCLUDES} ${CDEFINES} ${CWARNINGS}
|
||||
+CFLAGS=${CINCLUDES} ${CDEFINES} ${CWARNINGS} $(USERCOMPILE)
|
||||
|
||||
VERSION="@(\#) openswan-hacking-9.3-for-osw2"
|
||||
LIBINTERFACE=2
|
||||
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
|
||||
--- openswan-2.4.7.orig/linux/net/ipsec/des/asm/des-586.pl 2004-07-10 11:06:50.000000000 +0300
|
||||
+++ openswan-2.4.7/linux/net/ipsec/des/asm/des-586.pl 2006-12-06 22:46:54.736831090 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/local/bin/perl
|
||||
+#!/usr/bin/perl
|
||||
#
|
||||
# The inner loop instruction sequence and the IP/FP modifications are from
|
||||
# Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk>
|
||||
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
|
||||
--- openswan-2.4.7.orig/linux/net/ipsec/des/asm/des686.pl 2004-07-10 11:06:50.000000000 +0300
|
||||
+++ openswan-2.4.7/linux/net/ipsec/des/asm/des686.pl 2006-12-06 22:46:54.740831340 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/local/bin/perl
|
||||
+#!/usr/bin/perl
|
||||
|
||||
$prog="des686.pl";
|
||||
|
||||
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
|
||||
--- openswan-2.4.7.orig/linux/net/ipsec/des/asm/desboth.pl 2004-07-10 11:06:50.000000000 +0300
|
||||
+++ openswan-2.4.7/linux/net/ipsec/des/asm/desboth.pl 2006-12-06 22:46:54.740831340 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/local/bin/perl
|
||||
+#!/usr/bin/perl
|
||||
|
||||
$L="edi";
|
||||
$R="esi";
|
||||
diff -Nru openswan-2.4.7.orig/Makefile.inc openswan-2.4.7/Makefile.inc
|
||||
--- openswan-2.4.7.orig/Makefile.inc 2006-11-14 19:56:09.000000000 +0200
|
||||
+++ openswan-2.4.7/Makefile.inc 2006-12-06 22:48:32.534943089 +0200
|
||||
@@ -46,7 +46,7 @@
|
||||
DESTDIR?=
|
||||
|
||||
# "local" part of tree, used in building other pathnames
|
||||
-INC_USRLOCAL=/usr/local
|
||||
+INC_USRLOCAL?=/usr
|
||||
|
||||
# PUBDIR is where the "ipsec" command goes; beware, many things define PATH
|
||||
# settings which are assumed to include it (or at least, to include *some*
|
||||
@@ -80,7 +80,7 @@
|
||||
MANPLACES=man3 man5 man8
|
||||
|
||||
# where configuration files go
|
||||
-FINALCONFFILE?=/etc/ipsec.conf
|
||||
+FINALCONFFILE?=/etc/ipsec/ipsec.conf
|
||||
CONFFILE=$(DESTDIR)$(FINALCONFFILE)
|
||||
|
||||
FINALCONFDIR?=/etc
|
||||
@@ -91,7 +91,7 @@
|
||||
|
||||
# sample configuration files go into
|
||||
INC_DOCDIR?=share/doc
|
||||
-FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
|
||||
+FINALEXAMPLECONFDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
|
||||
EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
|
||||
|
||||
FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
|
||||
@@ -239,7 +239,7 @@
|
||||
# installed one in RH 7.2, won't work - you wind up depending upon
|
||||
# openssl.
|
||||
|
||||
-BIND9STATICLIBDIR?=/usr/local/lib
|
||||
+BIND9STATICLIBDIR?=/usr/lib
|
||||
|
||||
# if you install elsewere, you may need to point the include files to it.
|
||||
#BIND9STATICLIBDIR?=/sandel/lib
|
||||
diff -Nru openswan-2.4.7.orig/programs/barf/barf.in openswan-2.4.7/programs/barf/barf.in
|
||||
--- openswan-2.4.7.orig/programs/barf/barf.in 2006-11-07 05:49:18.000000000 +0200
|
||||
+++ openswan-2.4.7/programs/barf/barf.in 2006-12-06 22:46:54.740831340 +0200
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
LOGS=${LOGS-/var/log}
|
||||
CONFS=${IPSEC_CONFS-/etc}
|
||||
-CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec.d}
|
||||
+CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec/ipsec.d}
|
||||
me="ipsec barf"
|
||||
# Max lines to use for things like 'route -n'
|
||||
maxlines=100
|
||||
@@ -238,13 +238,13 @@
|
||||
done
|
||||
fi
|
||||
_________________________ ipsec/ls-libdir
|
||||
-ls -l ${IPSEC_LIBDIR-/usr/local/lib/ipsec}
|
||||
+ls -l ${IPSEC_LIBDIR-/usr/lib/ipsec}
|
||||
_________________________ ipsec/ls-execdir
|
||||
-ls -l ${IPSEC_EXECDIR-/usr/local/libexec/ipsec}
|
||||
+ls -l ${IPSEC_EXECDIR-/usr/libexec/ipsec}
|
||||
_________________________ ipsec/updowns
|
||||
-for f in `ls ${IPSEC_EXECDIR-/usr/local/libexec/ipsec} | egrep updown`
|
||||
+for f in `ls ${IPSEC_EXECDIR-/usr/libexec/ipsec} | egrep updown`
|
||||
do
|
||||
- cat ${IPSEC_EXECDIR-/usr/local/libexec/ipsec}/$f
|
||||
+ cat ${IPSEC_EXECDIR-/usr/libexec/ipsec}/$f
|
||||
done
|
||||
_________________________ /proc/net/dev
|
||||
cat /proc/net/dev
|
||||
diff -Nru openswan-2.4.7.orig/programs/eroute/eroute.5 openswan-2.4.7/programs/eroute/eroute.5
|
||||
--- openswan-2.4.7.orig/programs/eroute/eroute.5 2006-10-26 23:40:43.000000000 +0300
|
||||
+++ openswan-2.4.7/programs/eroute/eroute.5 2006-12-06 22:57:19.307864340 +0200
|
||||
@@ -168,7 +168,7 @@
|
||||
.SH "FILES"
|
||||
|
||||
.PP
|
||||
-/proc/net/ipsec_eroute, /usr/local/bin/ipsec
|
||||
+/proc/net/ipsec_eroute, /usr/bin/ipsec
|
||||
|
||||
.SH "SEE ALSO"
|
||||
|
||||
diff -Nru openswan-2.4.7.orig/programs/eroute/eroute.8 openswan-2.4.7/programs/eroute/eroute.8
|
||||
--- openswan-2.4.7.orig/programs/eroute/eroute.8 2003-10-31 04:32:27.000000000 +0200
|
||||
+++ openswan-2.4.7/programs/eroute/eroute.8 2006-12-06 22:46:54.740831340 +0200
|
||||
@@ -308,7 +308,7 @@
|
||||
.br
|
||||
.LP
|
||||
.SH FILES
|
||||
-/proc/net/ipsec_eroute, /usr/local/bin/ipsec
|
||||
+/proc/net/ipsec_eroute, /usr/bin/ipsec
|
||||
.SH "SEE ALSO"
|
||||
ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_spi(8),
|
||||
ipsec_spigrp(8), ipsec_klipsdebug(8), ipsec_eroute(5)
|
||||
diff -Nru openswan-2.4.7.orig/programs/_include/_include.in openswan-2.4.7/programs/_include/_include.in
|
||||
--- openswan-2.4.7.orig/programs/_include/_include.in 2003-01-06 23:44:04.000000000 +0200
|
||||
+++ openswan-2.4.7/programs/_include/_include.in 2006-12-06 22:46:54.740831340 +0200
|
||||
@@ -47,10 +47,10 @@
|
||||
do
|
||||
if test ! -r "$f"
|
||||
then
|
||||
- if test ! "$f" = "/etc/ipsec.conf"
|
||||
+ if test ! "$f" = "/etc/ipsec/ipsec.conf"
|
||||
then
|
||||
echo "#:cannot open configuration file \'$f\'"
|
||||
- if test "$f" = "/etc/ipsec.secrets"
|
||||
+ if test "$f" = "/etc/ipsec/ipsec.secrets"
|
||||
then
|
||||
echo "#:Your secrets file will be created when you start FreeS/WAN for the first time."
|
||||
fi
|
||||
diff -Nru openswan-2.4.7.orig/programs/ipsec/ipsec.8 openswan-2.4.7/programs/ipsec/ipsec.8
|
||||
--- openswan-2.4.7.orig/programs/ipsec/ipsec.8 2003-02-27 18:51:54.000000000 +0200
|
||||
+++ openswan-2.4.7/programs/ipsec/ipsec.8 2006-12-06 22:46:54.744831590 +0200
|
||||
@@ -81,7 +81,7 @@
|
||||
.I ipsec
|
||||
thinks the IPsec configuration files are stored.
|
||||
.SH FILES
|
||||
-/usr/local/lib/ipsec usual utilities directory
|
||||
+/usr/lib/ipsec usual utilities directory
|
||||
.SH ENVIRONMENT
|
||||
.PP
|
||||
The following environment variables control where FreeS/WAN finds its
|
||||
diff -Nru openswan-2.4.7.orig/programs/klipsdebug/klipsdebug.5 openswan-2.4.7/programs/klipsdebug/klipsdebug.5
|
||||
--- openswan-2.4.7.orig/programs/klipsdebug/klipsdebug.5 2006-10-27 01:21:25.000000000 +0300
|
||||
+++ openswan-2.4.7/programs/klipsdebug/klipsdebug.5 2006-12-06 22:58:04.150666840 +0200
|
||||
@@ -114,7 +114,7 @@
|
||||
.SH "FILES"
|
||||
|
||||
.PP
|
||||
-/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec
|
||||
+/proc/net/ipsec_klipsdebug, /usr/bin/ipsec
|
||||
|
||||
.SH "SEE ALSO"
|
||||
|
||||
diff -Nru openswan-2.4.7.orig/programs/klipsdebug/klipsdebug.8 openswan-2.4.7/programs/klipsdebug/klipsdebug.8
|
||||
--- openswan-2.4.7.orig/programs/klipsdebug/klipsdebug.8 2006-10-27 01:21:25.000000000 +0300
|
||||
+++ openswan-2.4.7/programs/klipsdebug/klipsdebug.8 2006-12-06 22:58:22.295800840 +0200
|
||||
@@ -111,7 +111,7 @@
|
||||
.SH "FILES"
|
||||
|
||||
.PP
|
||||
-/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec
|
||||
+/proc/net/ipsec_klipsdebug, /usr/bin/ipsec
|
||||
|
||||
.SH "SEE ALSO"
|
||||
|
||||
diff -Nru openswan-2.4.7.orig/programs/mailkey/mailkey.in openswan-2.4.7/programs/mailkey/mailkey.in
|
||||
--- openswan-2.4.7.orig/programs/mailkey/mailkey.in 2006-10-29 02:49:23.000000000 +0300
|
||||
+++ openswan-2.4.7/programs/mailkey/mailkey.in 2006-12-06 22:46:54.828836839 +0200
|
||||
@@ -60,7 +60,7 @@
|
||||
|
||||
"$test1st"
|
||||
|
||||
-Common concerns: This account must be able to read /etc/ipsec.secrets.
|
||||
+Common concerns: This account must be able to read /etc/ipsec/ipsec.secrets.
|
||||
If you haven't generated your key yet, please run 'ipsec newhostkey'."
|
||||
exit 0
|
||||
}
|
||||
diff -Nru openswan-2.4.7.orig/programs/pluto/Makefile openswan-2.4.7/programs/pluto/Makefile
|
||||
--- openswan-2.4.7.orig/programs/pluto/Makefile 2006-11-07 17:55:52.000000000 +0200
|
||||
+++ openswan-2.4.7/programs/pluto/Makefile 2006-12-06 22:46:54.832837088 +0200
|
||||
@@ -256,7 +256,7 @@
|
||||
-DPOLICYGROUPSDIR=\"${FINALCONFDDIR}/policies\" \
|
||||
-DPERPEERLOGDIR=\"${FINALLOGDIR}/pluto/peer\"
|
||||
|
||||
-ALLFLAGS = $(CPPFLAGS) $(CFLAGS)
|
||||
+ALLFLAGS = $(CPPFLAGS) $(CFLAGS) $(USERCOMPILE)
|
||||
|
||||
# libefence is a free memory allocation debugger
|
||||
# Solaris 2 needs -lsocket -lnsl
|
||||
diff -Nru openswan-2.4.7.orig/programs/setup/Makefile openswan-2.4.7/programs/setup/Makefile
|
||||
--- openswan-2.4.7.orig/programs/setup/Makefile 2004-12-18 20:13:43.000000000 +0200
|
||||
+++ openswan-2.4.7/programs/setup/Makefile 2006-12-06 22:46:54.832837088 +0200
|
||||
@@ -33,25 +33,10 @@
|
||||
@rm -f $(BINDIR)/setup
|
||||
@$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec
|
||||
@ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup
|
||||
- -@for i in 0 1 2 3 4 5 6; do mkdir -p $(RCDIR)/../rc$$i.d; done
|
||||
- -@cd $(RCDIR)/../rc0.d && ln -f -s ../init.d/ipsec K76ipsec
|
||||
- -@cd $(RCDIR)/../rc1.d && ln -f -s ../init.d/ipsec K76ipsec
|
||||
- -@cd $(RCDIR)/../rc2.d && ln -f -s ../init.d/ipsec S47ipsec
|
||||
- -@cd $(RCDIR)/../rc3.d && ln -f -s ../init.d/ipsec S47ipsec
|
||||
- -@cd $(RCDIR)/../rc4.d && ln -f -s ../init.d/ipsec S47ipsec
|
||||
- -@cd $(RCDIR)/../rc5.d && ln -f -s ../init.d/ipsec S47ipsec
|
||||
- -@cd $(RCDIR)/../rc6.d && ln -f -s ../init.d/ipsec K76ipsec
|
||||
|
||||
install_file_list::
|
||||
@echo $(RCDIR)/ipsec
|
||||
@echo $(BINDIR)/setup
|
||||
- @echo $(RCDIR)/../rc0.d/K76ipsec
|
||||
- @echo $(RCDIR)/../rc1.d/K76ipsec
|
||||
- @echo $(RCDIR)/../rc2.d/S47ipsec
|
||||
- @echo $(RCDIR)/../rc3.d/S47ipsec
|
||||
- @echo $(RCDIR)/../rc4.d/S47ipsec
|
||||
- @echo $(RCDIR)/../rc5.d/S47ipsec
|
||||
- @echo $(RCDIR)/../rc6.d/K76ipsec
|
||||
|
||||
clean::
|
||||
@rm -f setup
|
||||
diff -Nru openswan-2.4.7.orig/programs/showhostkey/showhostkey.in openswan-2.4.7/programs/showhostkey/showhostkey.in
|
||||
--- openswan-2.4.7.orig/programs/showhostkey/showhostkey.in 2004-11-14 15:40:41.000000000 +0200
|
||||
+++ openswan-2.4.7/programs/showhostkey/showhostkey.in 2006-12-06 22:46:54.844837840 +0200
|
||||
@@ -18,7 +18,7 @@
|
||||
usage="Usage: $me [--file secrets] [--left] [--right] [--txt gateway] [--id id]
|
||||
[--dhclient] [--ipseckey]"
|
||||
|
||||
-file=/etc/ipsec.secrets
|
||||
+file=/etc/ipsec/ipsec.secrets
|
||||
fmt=""
|
||||
gw=
|
||||
id=
|
||||
diff -Nru openswan-2.4.7.orig/programs/spi/spi.5 openswan-2.4.7/programs/spi/spi.5
|
||||
--- openswan-2.4.7.orig/programs/spi/spi.5 2006-10-26 23:53:59.000000000 +0300
|
||||
+++ openswan-2.4.7/programs/spi/spi.5 2006-12-06 23:00:11.910340779 +0200
|
||||
@@ -157,7 +157,7 @@
|
||||
.SH "FILES"
|
||||
|
||||
.PP
|
||||
-/proc/net/ipsec_spi, /usr/local/bin/ipsec
|
||||
+/proc/net/ipsec_spi, /usr/bin/ipsec
|
||||
|
||||
.SH "SEE ALSO"
|
||||
|
||||
diff -Nru openswan-2.4.7.orig/programs/spi/spi.8 openswan-2.4.7/programs/spi/spi.8
|
||||
--- openswan-2.4.7.orig/programs/spi/spi.8 2006-10-30 22:00:04.000000000 +0200
|
||||
+++ openswan-2.4.7/programs/spi/spi.8 2006-12-06 23:00:27.043286530 +0200
|
||||
@@ -215,7 +215,7 @@
|
||||
.SH "FILES"
|
||||
|
||||
.PP
|
||||
-/proc/net/ipsec_spi, /usr/local/bin/ipsec
|
||||
+/proc/net/ipsec_spi, /usr/bin/ipsec
|
||||
|
||||
.SH "SEE ALSO"
|
||||
|
||||
diff -Nru openswan-2.4.7.orig/programs/spigrp/spigrp.5 openswan-2.4.7/programs/spigrp/spigrp.5
|
||||
--- openswan-2.4.7.orig/programs/spigrp/spigrp.5 2006-10-26 23:50:29.000000000 +0300
|
||||
+++ openswan-2.4.7/programs/spigrp/spigrp.5 2006-12-06 23:01:25.650949280 +0200
|
||||
@@ -67,7 +67,7 @@
|
||||
.SH "FILES"
|
||||
|
||||
.PP
|
||||
-/proc/net/ipsec_spigrp, /usr/local/bin/ipsec
|
||||
+/proc/net/ipsec_spigrp, /usr/bin/ipsec
|
||||
|
||||
.SH "SEE ALSO"
|
||||
|
||||
diff -Nru openswan-2.4.7.orig/programs/spigrp/spigrp.8 openswan-2.4.7/programs/spigrp/spigrp.8
|
||||
--- openswan-2.4.7.orig/programs/spigrp/spigrp.8 2006-10-26 23:50:29.000000000 +0300
|
||||
+++ openswan-2.4.7/programs/spigrp/spigrp.8 2006-12-06 23:01:39.079788532 +0200
|
||||
@@ -87,7 +87,7 @@
|
||||
.SH "FILES"
|
||||
|
||||
.PP
|
||||
-/proc/net/ipsec_spigrp, /usr/local/bin/ipsec
|
||||
+/proc/net/ipsec_spigrp, /usr/bin/ipsec
|
||||
|
||||
.SH "SEE ALSO"
|
||||
|
||||
diff -Nru openswan-2.4.7.orig/programs/tncfg/tncfg.5 openswan-2.4.7/programs/tncfg/tncfg.5
|
||||
--- openswan-2.4.7.orig/programs/tncfg/tncfg.5 2006-10-26 23:58:11.000000000 +0300
|
||||
+++ openswan-2.4.7/programs/tncfg/tncfg.5 2006-12-06 23:01:59.385057530 +0200
|
||||
@@ -101,7 +101,7 @@
|
||||
.SH "FILES"
|
||||
|
||||
.PP
|
||||
-/proc/net/ipsec_tncfg, /usr/local/bin/ipsec
|
||||
+/proc/net/ipsec_tncfg, /usr/bin/ipsec
|
||||
|
||||
.SH "SEE ALSO"
|
||||
|
||||
diff -Nru openswan-2.4.7.orig/programs/tncfg/tncfg.8 openswan-2.4.7/programs/tncfg/tncfg.8
|
||||
--- openswan-2.4.7.orig/programs/tncfg/tncfg.8 2006-10-26 23:58:11.000000000 +0300
|
||||
+++ openswan-2.4.7/programs/tncfg/tncfg.8 2006-12-06 23:02:09.245673780 +0200
|
||||
@@ -63,7 +63,7 @@
|
||||
.SH "FILES"
|
||||
|
||||
.PP
|
||||
-/proc/net/ipsec_tncfg, /usr/local/bin/ipsec
|
||||
+/proc/net/ipsec_tncfg, /usr/bin/ipsec
|
||||
|
||||
.SH "SEE ALSO"
|
||||
|
||||
|
|
@ -6,12 +6,11 @@ LICENSE = "GPLv2"
|
|||
DEPENDS = "gmp flex-native"
|
||||
RRECOMMENDS = "kernel-module-ipsec"
|
||||
RDEPENDS_nylon = "perl"
|
||||
PR = "r4"
|
||||
PR = "r0"
|
||||
|
||||
SRC_URI = "http://www.openswan.org/download/old/openswan-${PV}.tar.gz \
|
||||
file://openswan-2.2.0-gentoo.patch;patch=1 \
|
||||
file://gcc4-fixes.patch;patch=1 \
|
||||
file://makefile-whitespace-fix.patch;patch=1 \
|
||||
SRC_URI = "http://www.openswan.org/download/openswan-${PV}.tar.gz \
|
||||
file://openswan-2.4.7-gentoo.patch;patch=1 \
|
||||
file://installflags.patch;patch=1 \
|
||||
file://ld-library-path-breakage.patch;patch=1"
|
||||
S = "${WORKDIR}/openswan-${PV}"
|
||||
|
||||
|
|
@ -31,6 +30,7 @@ do_install () {
|
|||
oe_runmake install
|
||||
}
|
||||
|
||||
FILES_${PN} += "${libdir}/ipsec/"
|
||||
FILES_${PN} = "${sysconfdir} ${libdir}/ipsec/* ${sbindir}/* ${libexecdir}/ipsec/*"
|
||||
FILES_${PN}-dbg += "${libdir}/ipsec/.debug ${libexecdir}/ipsec/.debug"
|
||||
|
||||
CONFFILES_${PN} = "${sysconfdir}/ipsec/ipsec.conf"
|
||||
Loading…
Reference in New Issue