summaryrefslogtreecommitdiff
path: root/security/racoon2/files
diff options
context:
space:
mode:
Diffstat (limited to 'security/racoon2/files')
-rw-r--r--security/racoon2/files/patch-Makefile.am10
-rw-r--r--security/racoon2/files/patch-configure.ac34
-rw-r--r--security/racoon2/files/patch-iked__ikev2_child.c11
-rw-r--r--security/racoon2/files/patch-kinkd_pathnames.h11
-rw-r--r--security/racoon2/files/patch-lib_if__pfkkeyv2.h10
-rw-r--r--security/racoon2/files/patch-pskgen_Makefile.am7
-rw-r--r--security/racoon2/files/patch-samples_Makefile.am11
-rw-r--r--security/racoon2/files/patch-samples_init.d_Makefile.am8
-rw-r--r--security/racoon2/files/patch-samples_rc.d_Makefile.am9
-rw-r--r--security/racoon2/files/patch-spmd-spmd_internal.h11
10 files changed, 0 insertions, 122 deletions
diff --git a/security/racoon2/files/patch-Makefile.am b/security/racoon2/files/patch-Makefile.am
deleted file mode 100644
index bdbf0dc883b3..000000000000
--- a/security/racoon2/files/patch-Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.am.orig 2020-03-18 13:57:19.000000000 -0700
-+++ Makefile.am 2020-06-29 12:53:16.217963000 -0700
-@@ -2,6 +2,6 @@
-
- ACLOCAL_AMFLAGS = -I m4
-
--SUBDIRS = lib spmd kinkd iked pskgen samples
-+SUBDIRS = lib spmd iked pskgen samples
-
-
diff --git a/security/racoon2/files/patch-configure.ac b/security/racoon2/files/patch-configure.ac
deleted file mode 100644
index 273e50220e13..000000000000
--- a/security/racoon2/files/patch-configure.ac
+++ /dev/null
@@ -1,34 +0,0 @@
---- configure.ac.orig 2020-03-18 13:57:19.000000000 -0700
-+++ configure.ac 2020-06-29 12:55:22.015784000 -0700
-@@ -16,7 +16,7 @@
- AC_PROG_MAKE_SET
- RC_IF_INSTALL_OPTS
-
--AC_CONFIG_SUBDIRS([lib spmd iked kinkd])
-+AC_CONFIG_SUBDIRS([lib spmd iked])
-
- dnl Set the debug option by default for now.
- AC_MSG_CHECKING(if --enable-debug option is specified)
-@@ -57,7 +57,7 @@
- netbsd*1.[[56]]*|netbsd*[[2-9]].*)
- startup_scripts=rc.d
- ;;
-- freebsd[[5-9]].*)
-+ freebsd*)
- startup_scripts=rc.d
- ;;
- *)
-@@ -90,13 +90,11 @@
- samples/hook/Makefile
- samples/Makefile
- samples/rc.d/iked
-- samples/rc.d/kinkd
- samples/rc.d/racoon2
- samples/rc.d/spmd
- samples/rc.d/Makefile
- samples/racoon2.conf
- samples/init.d/iked
-- samples/init.d/kinkd
- samples/init.d/spmd
- samples/init.d/Makefile
- samples/vals.conf])
diff --git a/security/racoon2/files/patch-iked__ikev2_child.c b/security/racoon2/files/patch-iked__ikev2_child.c
deleted file mode 100644
index 548f132e011a..000000000000
--- a/security/racoon2/files/patch-iked__ikev2_child.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- iked/ikev2_child.c.orig 2008-09-10 01:30:58.000000000 -0700
-+++ iked/ikev2_child.c 2014-10-22 23:33:18.140601874 -0700
-@@ -1171,7 +1171,7 @@
- * used to do update or add.
- */
- param->flags = 0;
-- if (child_sa->is_initiator)
-+ if (child_sa->is_initiator && child_sa->preceding_satype == 0)
- param->flags |= PFK_FLAG_NOPORTS;
-
- param->wsize = ikev2_ipsec_window_size;
diff --git a/security/racoon2/files/patch-kinkd_pathnames.h b/security/racoon2/files/patch-kinkd_pathnames.h
deleted file mode 100644
index 01d1ea0f80ce..000000000000
--- a/security/racoon2/files/patch-kinkd_pathnames.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- kinkd/pathnames.h.orig 2018-08-15 21:36:53.000000000 -0700
-+++ kinkd/pathnames.h 2018-12-15 10:53:06.611652000 -0800
-@@ -30,7 +30,7 @@
-
- #define PIDFILE_DIR "/var/run"
- #define CACHE_DIR "/var/run" /* or "/var/db" */
--#define RACOON2_CONFIG_FILE SYSCONFDIR "/racoon2.conf"
-+#define RACOON2_CONFIG_FILE "SYSCONFDIR/racoon2.conf"
-
- #ifdef MAKE_KINK_LIST_FILE
- #define KINK_LIST_FILE "/var/run/kink-handle.list"
diff --git a/security/racoon2/files/patch-lib_if__pfkkeyv2.h b/security/racoon2/files/patch-lib_if__pfkkeyv2.h
deleted file mode 100644
index 2c0630a7375e..000000000000
--- a/security/racoon2/files/patch-lib_if__pfkkeyv2.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/if_pfkeyv2.h.orig 2018-08-15 21:36:53.000000000 -0700
-+++ lib/if_pfkeyv2.h 2018-10-19 12:48:45.115311000 -0700
-@@ -29,6 +29,7 @@
- * SUCH DAMAGE.
- */
-
-+#include "config.h"
- #include <sys/socket.h>
- #ifdef HAVE_NET_PFKEYV2_H
- # include <net/pfkeyv2.h>
diff --git a/security/racoon2/files/patch-pskgen_Makefile.am b/security/racoon2/files/patch-pskgen_Makefile.am
deleted file mode 100644
index c669e7019b1b..000000000000
--- a/security/racoon2/files/patch-pskgen_Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
---- pskgen/Makefile.am.orig 2020-09-08 04:43:18.000000000 -0700
-+++ pskgen/Makefile.am 2020-09-23 17:34:55.946263000 -0700
-@@ -7,4 +7,3 @@
-
- install-exec-hook:
- $(INSTALL) -d $(DESTDIR)$(sysconfdir)
-- sh ./autogen.spmd.pwd
diff --git a/security/racoon2/files/patch-samples_Makefile.am b/security/racoon2/files/patch-samples_Makefile.am
deleted file mode 100644
index 017e00d5cc82..000000000000
--- a/security/racoon2/files/patch-samples_Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- samples/Makefile.am.orig 2020-03-18 13:57:19.000000000 -0700
-+++ samples/Makefile.am 2020-06-29 13:05:24.670094000 -0700
-@@ -13,8 +13,6 @@
- $(INSTALL) -m 600 transport_ike.conf $(DESTDIR)$(sysconfdir)/transport_ike.conf.sample
- $(INSTALL) -m 600 tunnel_ike.conf $(DESTDIR)$(sysconfdir)/tunnel_ike.conf.sample
- $(INSTALL) -m 600 tunnel_ike_natt.conf $(DESTDIR)$(sysconfdir)/tunnel_ike_natt.conf.sample
-- $(INSTALL) -m 600 transport_kink.conf $(DESTDIR)$(sysconfdir)/transport_kink.conf.sample
-- $(INSTALL) -m 600 tunnel_kink.conf $(DESTDIR)$(sysconfdir)/tunnel_kink.conf.sample
- $(INSTALL) -m 600 local-test.conf $(DESTDIR)$(sysconfdir)/local-test.conf.sample
- $(INSTALL) -d -m 700 $(DESTDIR)$(sysconfdir)/psk
- $(INSTALL) -d -m 700 $(DESTDIR)$(sysconfdir)/cert
diff --git a/security/racoon2/files/patch-samples_init.d_Makefile.am b/security/racoon2/files/patch-samples_init.d_Makefile.am
deleted file mode 100644
index 9a38e8c0f018..000000000000
--- a/security/racoon2/files/patch-samples_init.d_Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
---- samples/init.d/Makefile.am.orig 2020-03-18 13:57:19.000000000 -0700
-+++ samples/init.d/Makefile.am 2020-06-29 14:52:07.468234000 -0700
-@@ -5,5 +5,4 @@
- install-exec-hook:
- $(INSTALL) -d $(DESTDIR)$(sysconfdir)/init.d
- $(INSTALL_SCRIPT) iked $(DESTDIR)$(sysconfdir)/init.d/iked
-- $(INSTALL_SCRIPT) kinkd $(DESTDIR)$(sysconfdir)/init.d/kinkd
- $(INSTALL_SCRIPT) spmd $(DESTDIR)$(sysconfdir)/init.d/spmd
diff --git a/security/racoon2/files/patch-samples_rc.d_Makefile.am b/security/racoon2/files/patch-samples_rc.d_Makefile.am
deleted file mode 100644
index f58a0cc0ba9e..000000000000
--- a/security/racoon2/files/patch-samples_rc.d_Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
---- samples/rc.d/Makefile.am.orig 2020-03-18 13:57:19.000000000 -0700
-+++ samples/rc.d/Makefile.am 2020-06-29 14:50:50.509434000 -0700
-@@ -5,6 +5,5 @@
- install-exec-hook:
- $(INSTALL) -d $(sysconfdir)/rc.d
- $(INSTALL_SCRIPT) iked $(sysconfdir)/rc.d/iked
-- $(INSTALL_SCRIPT) kinkd $(sysconfdir)/rc.d/kinkd
- $(INSTALL_SCRIPT) spmd $(sysconfdir)/rc.d/spmd
- $(INSTALL_SCRIPT) racoon2 $(sysconfdir)/rc.d/racoon2
diff --git a/security/racoon2/files/patch-spmd-spmd_internal.h b/security/racoon2/files/patch-spmd-spmd_internal.h
deleted file mode 100644
index eae7442e9eb0..000000000000
--- a/security/racoon2/files/patch-spmd-spmd_internal.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- spmd/spmd_internal.h.orig 2008-07-06 11:41:36.000000000 +0900
-+++ spmd/spmd_internal.h 2009-03-30 13:35:24.000000000 +0900
-@@ -35,7 +35,7 @@
-
- extern int spmd_foreground;
-
--#define RACOON2_CONFIG_FILE SYSCONFDIR"/racoon2.conf"
-+#define RACOON2_CONFIG_FILE RACOON_CONF
-
- #if defined(HAVE_NSSWITCH_CONF)
- # define NSSWITCH_CONF_FILE "/etc/nsswitch.conf"