Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (c0fbc7ee73759864dd05732cf4ab3f44c84dbe58)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (c0fbc7ee73759864dd05732cf4ab3f44c84dbe58)
  • Date: Tue, 17 Mar 2015 16:23:11 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

net/ipsec-tools/DEPENDS | 1
net/ipsec-tools/HISTORY | 10 +++-
net/ipsec-tools/PRE_BUILD | 5 ++
net/ipsec-tools/glibc.patch | 11 ++++
net/ipsec-tools/no-flex-link.patch | 87
+++++++++++++++++++++++++++++++++++++
5 files changed, 112 insertions(+), 2 deletions(-)

New commits:
commit c0fbc7ee73759864dd05732cf4ab3f44c84dbe58
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ipsec-tools: fixed build & added missing dependency

diff --git a/net/ipsec-tools/DEPENDS b/net/ipsec-tools/DEPENDS
index 9808176..8c9cf18 100755
--- a/net/ipsec-tools/DEPENDS
+++ b/net/ipsec-tools/DEPENDS
@@ -1,3 +1,4 @@
+depends flex &&
depends SSL &&

optional_depends readline \
diff --git a/net/ipsec-tools/HISTORY b/net/ipsec-tools/HISTORY
index f1268d0..2b0c74c 100644
--- a/net/ipsec-tools/HISTORY
+++ b/net/ipsec-tools/HISTORY
@@ -1,5 +1,11 @@
-2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: openssl => SSL
+2015-03-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added missing required flex dependency
+ * PRE_BUILD: added, to apply patches
+ * no-flex-link.patch: added official patch, to fix build with recent
flex
+ * glibc.patch: added, to fix build with recent glibc
+
+2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: openssl => SSL

2014-04-27 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.8.2
diff --git a/net/ipsec-tools/PRE_BUILD b/net/ipsec-tools/PRE_BUILD
new file mode 100755
index 0000000..5afd462
--- /dev/null
+++ b/net/ipsec-tools/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 < "$SPELL_DIRECTORY/no-flex-link.patch" &&
+patch -p0 < "$SPELL_DIRECTORY/glibc.patch"
diff --git a/net/ipsec-tools/glibc.patch b/net/ipsec-tools/glibc.patch
new file mode 100644
index 0000000..1d2ee01
--- /dev/null
+++ b/net/ipsec-tools/glibc.patch
@@ -0,0 +1,11 @@
+--- src/include-glibc/glibc-bugs.h.orig 2006-09-09 20:22:08.000000000
+0400
++++ src/include-glibc/glibc-bugs.h 2015-03-17 23:00:06.741748063 +0300
+@@ -4,7 +4,7 @@
+ #define __GLIBC_BUGS_H__ 1
+
+ #define _XOPEN_SOURCE 500
+-#define _BSD_SOURCE
++#define _DEFAULT_SOURCE
+
+ #include <features.h>
+ #include <sys/types.h>
diff --git a/net/ipsec-tools/no-flex-link.patch
b/net/ipsec-tools/no-flex-link.patch
new file mode 100644
index 0000000..13e9d73
--- /dev/null
+++ b/net/ipsec-tools/no-flex-link.patch
@@ -0,0 +1,87 @@
+From e48b9097dce7bc2bfbb9e9c542124d3b5cebab39 Mon Sep 17 00:00:00 2001
+From: Paul Barker <paul AT paulbarker.me.uk>
+Date: Wed, 5 Mar 2014 13:39:14 +0000
+Subject: [PATCH] Don't link against libfl
+
+We can remove all references to yywrap by adding "%option noyywrap"
statements
+to each flex source file that doesn't override yywrap. After this, we no
longer
+need to link against libfl and so no longer get errors about undefined
+references to yylex.
+
+Signed-off-by: Paul Barker <paul AT paulbarker.me.uk>
+Upstream-status: Submitted 2014-03-11
+ see
http://sourceforge.net/p/ipsec-tools/mailman/ipsec-tools-devel/thread/CANyK_8ewmxGA3vBVJW6s1APXPmxPR%2BDFWZ61EL8pCt288aKQ6w%40mail.gmail.com/#msg32088797
+---
+ src/libipsec/Makefile.am | 1 -
+ src/racoon/Makefile.am | 2 +-
+ src/racoon/cftoken.l | 2 ++
+ src/setkey/Makefile.am | 1 -
+ src/setkey/token.l | 2 ++
+ 5 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/libipsec/Makefile.am b/src/libipsec/Makefile.am
+index 6a4e3b3..df1e106 100644
+--- a/src/libipsec/Makefile.am
++++ b/src/libipsec/Makefile.am
+@@ -26,7 +26,6 @@ libipsec_la_SOURCES = \
+ # version is current:revision:age.
+ # See:
http://www.gnu.org/manual/libtool-1.4.2/html_chapter/libtool_6.html#SEC32
+ libipsec_la_LDFLAGS = -version-info 0:1:0
+-libipsec_la_LIBADD = $(LEXLIB)
+
+ noinst_HEADERS = ipsec_strerror.h
+
+diff --git a/src/racoon/Makefile.am b/src/racoon/Makefile.am
+index dbaded9..0662957 100644
+--- a/src/racoon/Makefile.am
++++ b/src/racoon/Makefile.am
+@@ -38,7 +38,7 @@ racoon_SOURCES = \
+ cftoken.l cfparse.y prsa_tok.l prsa_par.y
+ EXTRA_racoon_SOURCES = isakmp_xauth.c isakmp_cfg.c isakmp_unity.c
throttle.c \
+ isakmp_frag.c nattraversal.c security.c $(MISSING_ALGOS)
+-racoon_LDADD = $(CRYPTOBJS) $(HYBRID_OBJS) $(NATT_OBJS) $(FRAG_OBJS)
$(LEXLIB) \
++racoon_LDADD = $(CRYPTOBJS) $(HYBRID_OBJS) $(NATT_OBJS) $(FRAG_OBJS) \
+ $(SECCTX_OBJS) vmbuf.o sockmisc.o misc.o ../libipsec/libipsec.la
+ racoon_DEPENDENCIES = \
+ $(CRYPTOBJS) $(HYBRID_OBJS) $(NATT_OBJS) $(FRAG_OBJS) $(SECCTX_OBJS) \
+diff --git a/src/racoon/cftoken.l b/src/racoon/cftoken.l
+index 490242c..1701922 100644
+--- a/src/racoon/cftoken.l
++++ b/src/racoon/cftoken.l
+@@ -106,6 +106,8 @@ static int incstackp = 0;
+ static int yy_first_time = 1;
+ %}
+
++%option noyywrap
++
+ /* common seciton */
+ nl \n
+ ws [ \t]+
+diff --git a/src/setkey/Makefile.am b/src/setkey/Makefile.am
+index 746c1f1..389e6cf 100644
+--- a/src/setkey/Makefile.am
++++ b/src/setkey/Makefile.am
+@@ -13,7 +13,6 @@ setkey_SOURCES = \
+
+ setkey_LDFLAGS = ../libipsec/libipsec.la
+ setkey_DEPENDENCIES = ../libipsec/libipsec.la
+-setkey_LDADD = $(LEXLIB)
+
+ noinst_HEADERS = vchar.h extern.h
+ man8_MANS = setkey.8
+diff --git a/src/setkey/token.l b/src/setkey/token.l
+index ad3d843..eb23b76 100644
+--- a/src/setkey/token.l
++++ b/src/setkey/token.l
+@@ -88,6 +88,8 @@
+ #endif
+ %}
+
++%option noyywrap
++
+ /* common section */
+ nl \n
+ ws [ \t]+
+--
+1.9.0
+



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (c0fbc7ee73759864dd05732cf4ab3f44c84dbe58), Vlad Glagolev, 03/17/2015

Archive powered by MHonArc 2.6.24.

Top of Page