3 files changed, 0 insertions, 65 deletions

diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoonctl-build-fix.patch b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoonctl-build-fix.patch
deleted file mode 100644
index f77fa8638..000000000
--- a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoonctl-build-fix.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Subject: [PATCH] ipsec-tools: racoonctl buildfix
-
-Upstream-Status: Pending
-
-building ipsec-tools failed building/linking racoonctl with some errors:
- - missing "yylex" error
- - some linking errors for variables defined in racoon but not racoonctl
- - some symbols from nattraversal.c where not found as it wasn't linked
-    when building with NAT support.
-
-Signed-off-by: Liviu Gheorghisan <liviu.gheorghisan@enea.com>
-Signed-off-by: Daniel BORNAZ <daniel.bornaz@enea.com>
----
-diff -rupN a/src/racoon/Makefile.am b/src/racoon/Makefile.am
---- a/src/racoon/Makefile.am    2014-03-05 12:16:52.907101044 +0100
-+++ b/src/racoon/Makefile.am    2014-03-05 12:17:10.946320064 +0100
-@@ -44,7 +44,17 @@ racoon_DEPENDENCIES = \
-        $(CRYPTOBJS) $(HYBRID_OBJS) $(NATT_OBJS) $(FRAG_OBJS) $(SECCTX_OBJS) \
-        vmbuf.o sockmisc.o misc.o
- 
--racoonctl_SOURCES = racoonctl.c str2val.c 
-+racoonctl_SOURCES = \
-+       session.c isakmp.c handler.c \
-+       isakmp_ident.c isakmp_agg.c isakmp_base.c \
-+       isakmp_quick.c isakmp_inf.c isakmp_newg.c \
-+       gssapi.c dnssec.c getcertsbyname.c privsep.c \
-+       pfkey.c admin.c evt.c ipsec_doi.c oakley.c grabmyaddr.c vendorid.c \
-+       policy.c localconf.c remoteconf.c crypto_openssl.c algorithm.c \
-+       proposal.c sainfo.c strnames.c nattraversal.c \
-+       plog.c logger.c schedule.c str2val.c \
-+       safefile.c backupsa.c genlist.c rsalist.c \
-+       cftoken.l cfparse.y prsa_tok.l prsa_par.y racoonctl.c
- racoonctl_LDADD = libracoon.la ../libipsec/libipsec.la 
- 
- libracoon_la_SOURCES = kmpstat.c vmbuf.c sockmisc.c misc.c
-
-diff -rupN a/src/racoon/racoonctl.c b/src/racoon/racoonctl.c
---- a/src/racoon/racoonctl.c    2014-03-05 12:16:52.915100698 +0100
-+++ b/src/racoon/racoonctl.c    2014-03-05 12:17:17.906018754 +0100
-@@ -247,6 +247,9 @@ usage()
- #error "Incompatible racoonctl interface"
- #endif
- 
-+int f_local = 0;       /* local test mode.  behave like a wall. */
-+int dump_config =0;
-+
- int
- main(ac, av)
-        int ac;
diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/with-flexdir.patch b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/with-flexdir.patch
deleted file mode 100644
index da1169218..000000000
--- a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/with-flexdir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ipsec-tools-0.8.1.old/configure.ac  2014-03-04 16:24:57.431207664 +0100
-+++ ipsec-tools-0.8.1/configure.ac      2014-03-04 16:26:00.372461304 +0100
-@@ -171,9 +171,9 @@ if test $with_readline != "no"; then
- fi
- 
- 
--AC_MSG_CHECKING(if --with-flex option is specified)
-+AC_MSG_CHECKING(if --with-flexdir option is specified)
- AC_ARG_WITH(flexdir,
--       [AC_HELP_STRING([--with-flex], [use directiory (default: no)])],
-+       [AC_HELP_STRING([--with-flexdir], [use directory (default: no)])],
-        [flexdir="$withval"])
- AC_MSG_RESULT(${flexdir-dirdefault})
- 
diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb b/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb
index 0969af930..c526820aa 100644
--- a/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb
+++ b/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb
@@ -10,8 +10,6 @@ DEPENDS = "virtual/kernel openssl readline flex-native bison-native"
 SRC_URI = "ftp://ftp.netbsd.org/pub/NetBSD/misc/ipsec-tools/0.8/ipsec-tools-${PV}.tar.bz2 \
            file://0002-Don-t-link-against-libfl.patch \
            file://configure.patch \
-           file://racoonctl-build-fix.patch \
-           file://with-flexdir.patch \
            file://0001-racoon-pfkey-avoid-potential-null-pointer-dereferenc.patch \
            file://racoon-check-invalid-pointers.patch \
            file://racoon-check-invalid-ivm.patch \