summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-firewall/ipsec-tools/files')
-rw-r--r--net-firewall/ipsec-tools/files/digest-ipsec-tools-0.4-r23
-rw-r--r--net-firewall/ipsec-tools/files/digest-ipsec-tools-0.6.2-r13
-rw-r--r--net-firewall/ipsec-tools/files/digest-ipsec-tools-0.6.33
-rw-r--r--net-firewall/ipsec-tools/files/digest-ipsec-tools-0.6.73
-rw-r--r--net-firewall/ipsec-tools/files/ipsec-tools-0.4-dos-fix.diff29
-rw-r--r--net-firewall/ipsec-tools/files/ipsec-tools-0.4-gcc34.diff31
-rw-r--r--net-firewall/ipsec-tools/files/ipsec-tools-0.5-ipv6.diff10
-rw-r--r--net-firewall/ipsec-tools/files/ipsec-tools-0.5-isakmp-underrun.diff22
-rw-r--r--net-firewall/ipsec-tools/files/ipsec-tools-0.6.2-dos-fix.diff29
-rw-r--r--net-firewall/ipsec-tools/files/ipsec.conf.sample10
-rw-r--r--net-firewall/ipsec-tools/files/racoon.init.d4
11 files changed, 5 insertions, 142 deletions
diff --git a/net-firewall/ipsec-tools/files/digest-ipsec-tools-0.4-r2 b/net-firewall/ipsec-tools/files/digest-ipsec-tools-0.4-r2
deleted file mode 100644
index 7a3e4dcf311e..000000000000
--- a/net-firewall/ipsec-tools/files/digest-ipsec-tools-0.4-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 dceea3b72328a580cf156d74cbee6f80 ipsec-tools-0.4.tar.gz 915420
-RMD160 3bdb7f6013ec98db29d0c1bd307f7a49335f4edd ipsec-tools-0.4.tar.gz 915420
-SHA256 bc25b398f8a0e0b3456c968961ccf972f66c02422c4d3e549e14d331f977e155 ipsec-tools-0.4.tar.gz 915420
diff --git a/net-firewall/ipsec-tools/files/digest-ipsec-tools-0.6.2-r1 b/net-firewall/ipsec-tools/files/digest-ipsec-tools-0.6.2-r1
deleted file mode 100644
index 812190d9d5af..000000000000
--- a/net-firewall/ipsec-tools/files/digest-ipsec-tools-0.6.2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3d94d4a13daff63c1bd57a4f1f6462d0 ipsec-tools-0.6.2.tar.bz2 663760
-RMD160 427c394e3af1cc9a23ee2dd6a5753481ee528908 ipsec-tools-0.6.2.tar.bz2 663760
-SHA256 d59f8441000cb6a4e6108eeecca1f1233e43575eb5bd16c2cff7a2e0fae5602c ipsec-tools-0.6.2.tar.bz2 663760
diff --git a/net-firewall/ipsec-tools/files/digest-ipsec-tools-0.6.3 b/net-firewall/ipsec-tools/files/digest-ipsec-tools-0.6.3
deleted file mode 100644
index 4fc0eb65ad35..000000000000
--- a/net-firewall/ipsec-tools/files/digest-ipsec-tools-0.6.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8070f90402919d8d313c32c2ee465b2f ipsec-tools-0.6.3.tar.bz2 664796
-RMD160 b9569a7af2069d3b7fe9d7153dac96ffab59c64c ipsec-tools-0.6.3.tar.bz2 664796
-SHA256 b5755278226d7ca7fecddc50ecd78ec98b0551d11977c8739466709fea3584da ipsec-tools-0.6.3.tar.bz2 664796
diff --git a/net-firewall/ipsec-tools/files/digest-ipsec-tools-0.6.7 b/net-firewall/ipsec-tools/files/digest-ipsec-tools-0.6.7
new file mode 100644
index 000000000000..37b4293bbb67
--- /dev/null
+++ b/net-firewall/ipsec-tools/files/digest-ipsec-tools-0.6.7
@@ -0,0 +1,3 @@
+MD5 4fb764f282dc21cf9a656c58e13dacbb ipsec-tools-0.6.7.tar.bz2 723032
+RMD160 97c27922f5be941fd6c69e35e69bed921b9f13e7 ipsec-tools-0.6.7.tar.bz2 723032
+SHA256 4239f836dc610a2443ded7ba35cb3b87de9d582c800e5d9eb5eed37defd61ef2 ipsec-tools-0.6.7.tar.bz2 723032
diff --git a/net-firewall/ipsec-tools/files/ipsec-tools-0.4-dos-fix.diff b/net-firewall/ipsec-tools/files/ipsec-tools-0.4-dos-fix.diff
deleted file mode 100644
index a7b44c268897..000000000000
--- a/net-firewall/ipsec-tools/files/ipsec-tools-0.4-dos-fix.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -aur ipsec-tools-0.4-orig/src/racoon/isakmp_agg.c ipsec-tools-0.4/src/racoon/isakmp_agg.c
---- ipsec-tools-0.4-orig/src/racoon/isakmp_agg.c 2004-03-23 04:50:27.000000000 -0800
-+++ ipsec-tools-0.4/src/racoon/isakmp_agg.c 2005-12-03 11:25:10.000000000 -0800
-@@ -400,7 +400,11 @@
- }
-
- /* payload existency check */
-- /* XXX to be checked each authentication method. */
-+ if (iph1->dhpub_p == NULL || iph1->nonce_p == NULL) {
-+ plog(LLV_ERROR, LOCATION, iph1->remote,
-+ "few isakmp message received.\n");
-+ goto end;
-+ }
-
- /* verify identifier */
- if (ipsecdoi_checkid1(iph1) != 0) {
-@@ -755,7 +759,11 @@
- }
-
- /* payload existency check */
-- /* XXX to be checked each authentication method. */
-+ if (iph1->dhpub_p == NULL || iph1->nonce_p == NULL) {
-+ plog(LLV_ERROR, LOCATION, iph1->remote,
-+ "few isakmp message received.\n");
-+ goto end;
-+ }
-
- /* verify identifier */
- if (ipsecdoi_checkid1(iph1) != 0) {
diff --git a/net-firewall/ipsec-tools/files/ipsec-tools-0.4-gcc34.diff b/net-firewall/ipsec-tools/files/ipsec-tools-0.4-gcc34.diff
deleted file mode 100644
index 7f6caec6b2f0..000000000000
--- a/net-firewall/ipsec-tools/files/ipsec-tools-0.4-gcc34.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -aur ipsec-tools-0.4-orig/src/racoon/sockmisc.c ipsec-tools-0.4/src/racoon/sockmisc.c
---- ipsec-tools-0.4-orig/src/racoon/sockmisc.c 2004-11-16 11:15:42.000000000 -0500
-+++ ipsec-tools-0.4/src/racoon/sockmisc.c 2004-12-16 14:42:25.543888328 -0500
-@@ -834,7 +834,7 @@
- if (saddr == NULL)
- return NULL;
-
-- GETNAMEINFO(saddr, addr, NULL);
-+ GETNAMEINFO_NULL(saddr, addr);
- snprintf(buf, sizeof(buf), "%s", addr);
-
- return buf;
-diff -aur ipsec-tools-0.4-orig/src/racoon/var.h ipsec-tools-0.4/src/racoon/var.h
---- ipsec-tools-0.4-orig/src/racoon/var.h 2004-06-11 12:00:17.000000000 -0400
-+++ ipsec-tools-0.4/src/racoon/var.h 2004-12-16 14:42:14.983493752 -0500
-@@ -82,6 +82,15 @@
- } \
- } while (0);
-
-+#define GETNAMEINFO_NULL(x, y) \
-+do { \
-+ if (getnameinfo((x), sysdep_sa_len(x), (y), sizeof(y), NULL, 0, \
-+ NIFLAGS) != 0) { \
-+ if (y) \
-+ strncpy((y), "(invalid)", sizeof(y)); \
-+ } \
-+} while (0);
-+
- #include <sys/queue.h>
- #ifndef LIST_FOREACH
- #define LIST_FOREACH(elm, head, field) \
diff --git a/net-firewall/ipsec-tools/files/ipsec-tools-0.5-ipv6.diff b/net-firewall/ipsec-tools/files/ipsec-tools-0.5-ipv6.diff
deleted file mode 100644
index e2939f046f23..000000000000
--- a/net-firewall/ipsec-tools/files/ipsec-tools-0.5-ipv6.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.ac.orig 2005-04-10 21:56:50.000000000 +0900
-+++ configure.ac 2005-04-10 21:56:37.000000000 +0900
-@@ -326,6 +326,7 @@
- ))
-
- if test "$ipv6" = "yes"; then
-+ AC_DEFINE([INET6], [], [Support IPv6])
- AC_MSG_CHECKING(for advanced API support)
- AC_TRY_COMPILE([#ifndef INET6
- #define INET6
diff --git a/net-firewall/ipsec-tools/files/ipsec-tools-0.5-isakmp-underrun.diff b/net-firewall/ipsec-tools/files/ipsec-tools-0.5-isakmp-underrun.diff
deleted file mode 100644
index 87453d98421f..000000000000
--- a/net-firewall/ipsec-tools/files/ipsec-tools-0.5-isakmp-underrun.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-? configure.lineno
-? src/racoon/kmpstat.lo
-? src/racoon/libracoon.la
-? src/racoon/misc.lo
-? src/racoon/sockmisc.lo
-? src/racoon/vmbuf.lo
-Index: src/racoon/isakmp.c
-===================================================================
-RCS file: /cvsroot/ipsec-tools/ipsec-tools/src/racoon/isakmp.c,v
-retrieving revision 1.36
-diff -u -r1.36 isakmp.c
---- src/racoon/isakmp.c 7 Mar 2005 00:30:37 -0000 1.36
-+++ src/racoon/isakmp.c 7 Mar 2005 16:31:24 -0000
-@@ -1352,7 +1352,7 @@
-
- p->type = np;
- p->len = ntohs(gen->len);
-- if (p->len == 0 || p->len > tlen) {
-+ if (p->len < sizeof(struct isakmp_gen) || p->len > tlen) {
- plog(LLV_DEBUG, LOCATION, NULL,
- "invalid length of payload\n");
- vfree(result);
diff --git a/net-firewall/ipsec-tools/files/ipsec-tools-0.6.2-dos-fix.diff b/net-firewall/ipsec-tools/files/ipsec-tools-0.6.2-dos-fix.diff
deleted file mode 100644
index 385d5a14000f..000000000000
--- a/net-firewall/ipsec-tools/files/ipsec-tools-0.6.2-dos-fix.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -aur ipsec-tools-0.6.2-orig/src/racoon/isakmp_agg.c ipsec-tools-0.6.2/src/racoon/isakmp_agg.c
---- ipsec-tools-0.6.2-orig/src/racoon/isakmp_agg.c 2005-09-26 09:12:20.000000000 -0700
-+++ ipsec-tools-0.6.2/src/racoon/isakmp_agg.c 2005-12-02 01:04:23.000000000 -0800
-@@ -488,7 +488,11 @@
- }
-
- /* payload existency check */
-- /* XXX to be checked each authentication method. */
-+ if (iph1->dhpub_p == NULL || iph1->nonce_p == NULL) {
-+ plog(LLV_ERROR, LOCATION, iph1->remote,
-+ "few isakmp message received.\n");
-+ goto end;
-+ }
-
- /* verify identifier */
- if (ipsecdoi_checkid1(iph1) != 0) {
-@@ -888,7 +892,11 @@
- }
-
- /* payload existency check */
-- /* XXX to be checked each authentication method. */
-+ if (iph1->dhpub_p == NULL || iph1->nonce_p == NULL) {
-+ plog(LLV_ERROR, LOCATION, iph1->remote,
-+ "few isakmp message received.\n");
-+ goto end;
-+ }
-
- /* verify identifier */
- if (ipsecdoi_checkid1(iph1) != 0) {
diff --git a/net-firewall/ipsec-tools/files/ipsec.conf.sample b/net-firewall/ipsec-tools/files/ipsec.conf.sample
deleted file mode 100644
index 078d5baf5fe8..000000000000
--- a/net-firewall/ipsec-tools/files/ipsec.conf.sample
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/sbin/setkey -f
-
-flush;
-spdflush;
-
-spdadd xxx.xxx.xxx.xxx/32 0.0.0.0/0 any
- -P out ipsec esp/tunnel/xxx.xxx.xxx.xxx-yyy.yyy.yyy.yyy/require;
-
-spdadd 0.0.0.0/0 xxx.xxx.xxx.xxx/32 any
- -P in ipsec esp/tunnel/yyy.yyy.yyy.yyy-xxx.xxx.xxx.xxx/require;
diff --git a/net-firewall/ipsec-tools/files/racoon.init.d b/net-firewall/ipsec-tools/files/racoon.init.d
index a0b47237a768..16fdec7e3a37 100644
--- a/net-firewall/ipsec-tools/files/racoon.init.d
+++ b/net-firewall/ipsec-tools/files/racoon.init.d
@@ -41,13 +41,13 @@ start() {
eerror "Error while loading ipsec policies"
fi
ebegin "Starting racoon"
- /usr/sbin/racoon -f ${RACOON_CONF} ${RACOON_OPTS}
+ start-stop-daemon -S -x /usr/sbin/racoon -- -f ${RACOON_CONF} ${RACOON_OPTS}
eend $?
}
stop() {
ebegin "Stopping racoon"
- kill `cat /var/run/racoon.pid`
+ start-stop-daemon -K -p /var/run/racoon.pid
eend $?
if [ -n "${RACOON_RESET_TABLES}" ]; then
ebegin "Flushing policy entries"