Skip to Content.
Sympa Menu

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

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 (b312b2df775056759fd98ea9b1019c3d19943859)
  • Date: Sun, 19 Jun 2011 17:18:08 -0500

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

net/iproute2/HISTORY | 4 ++++
net/iproute2/PRE_BUILD | 4 +++-
net/iproute2/m_xt.patch | 28 ++++++++++++++++++++++++++++
net/ipsec-tools/BUILD | 1 +
net/ipsec-tools/CONFIGURE | 11 +++++++++++
net/ipsec-tools/DEPENDS | 5 +++++
net/ipsec-tools/HISTORY | 5 +++++
7 files changed, 57 insertions(+), 1 deletion(-)

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

iproute2: fixed compilation with iptables 1.4.11

commit 9cb52ff828061b851d6c6d62a290315db39dc20e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ipsec-tools: post-update fixes

diff --git a/net/iproute2/HISTORY b/net/iproute2/HISTORY
index 76a2ec6..ab07823 100644
--- a/net/iproute2/HISTORY
+++ b/net/iproute2/HISTORY
@@ -1,3 +1,7 @@
+2011-06-20 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: quoting paths; apply the patch
+ * m_xt.patch: added, to fix compilation with recent iptables
+
2011-06-07 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: 2.6.38

diff --git a/net/iproute2/PRE_BUILD b/net/iproute2/PRE_BUILD
index a669f2a..0f624ed 100755
--- a/net/iproute2/PRE_BUILD
+++ b/net/iproute2/PRE_BUILD
@@ -1,5 +1,7 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/m_xt.patch" &&

sedit "s/-O2/$CFLAGS/" Makefile &&
sedit "s:DESTDIR=/usr/:DESTDIR=:" Makefile &&
diff --git a/net/iproute2/m_xt.patch b/net/iproute2/m_xt.patch
new file mode 100644
index 0000000..43ea142
--- /dev/null
+++ b/net/iproute2/m_xt.patch
@@ -0,0 +1,28 @@
+--- tc/m_xt.c.orig
++++ tc/m_xt.c
+@@ -162,7 +162,11 @@ static int parse_ipt(struct action_util *a,int *argc_p,
+ return -1;
+ }
+ tcipt_globals.opts =
+- xtables_merge_options(tcipt_globals.opts,
++ xtables_merge_options(
++#if XTABLES_VERSION_CODE > 5
++
tcipt_globals.orig_opts,
++#endif
++ tcipt_globals.opts,
+ m->extra_opts,
+ &m->option_offset);
+ } else {
+@@ -307,7 +311,11 @@ print_ipt(struct action_util *au,FILE * f, struct
rtattr *arg)
+ }
+
+ tcipt_globals.opts =
+- xtables_merge_options(tcipt_globals.opts,
++ xtables_merge_options(
++#if XTABLES_VERSION_CODE > 5
++ tcipt_globals.orig_opts,
++#endif
++ tcipt_globals.opts,
+ m->extra_opts,
+ &m->option_offset);
+ } else {
diff --git a/net/ipsec-tools/BUILD b/net/ipsec-tools/BUILD
index 147f5f1..37e663e 100755
--- a/net/ipsec-tools/BUILD
+++ b/net/ipsec-tools/BUILD
@@ -1,5 +1,6 @@
OPTS="--with-kernel-headers=$TRACK_ROOT/usr/include \
--enable-shared \
+ $IPSEC_TOOLS_OPTS \
$OPTS" &&

# fixes compilation with GCC 4.4
diff --git a/net/ipsec-tools/CONFIGURE b/net/ipsec-tools/CONFIGURE
new file mode 100755
index 0000000..767f68b
--- /dev/null
+++ b/net/ipsec-tools/CONFIGURE
@@ -0,0 +1,11 @@
+config_query_option IPSEC_TOOLS_OPTS "Enable IPv6?" y \
+ "--enable-ipv6" \
+ "--disable-ipv6" &&
+
+config_query_option IPSEC_TOOLS_OPTS "Enable NAT-Traversal support?" n \
+ "--enable-natt" \
+ "--disable-natt" &&
+
+config_query_option IPSEC_TOOLS_OPTS "Enable statistics logging function?" y
\
+ "--enable-stats" \
+ "--disable-stats"
diff --git a/net/ipsec-tools/DEPENDS b/net/ipsec-tools/DEPENDS
index 62925f3..c521d73 100755
--- a/net/ipsec-tools/DEPENDS
+++ b/net/ipsec-tools/DEPENDS
@@ -1,5 +1,10 @@
depends openssl &&

+optional_depends readline \
+ "--with-readline" \
+ "--without-readline" \
+ "to support readline input" &&
+
optional_depends libselinux \
"--enable-security-context" \
"--disable-security-context" \
diff --git a/net/ipsec-tools/HISTORY b/net/ipsec-tools/HISTORY
index 9fd1a43..1fa7f15 100644
--- a/net/ipsec-tools/HISTORY
+++ b/net/ipsec-tools/HISTORY
@@ -1,3 +1,8 @@
+2011-06-19 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFIGURE: added, for several options
+ * BUILD: apply IPSEC_TOOLS_OPTS
+ * DEPENDS: added readline optional dependency
+
2011-06-17 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.8.0




  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (b312b2df775056759fd98ea9b1019c3d19943859), Vlad Glagolev, 06/19/2011

Archive powered by MHonArc 2.6.24.

Top of Page