Skip to Content.
Sympa Menu

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

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 (6c674c28e0792a83782e33588e3291a586048a5f)
  • Date: Tue, 24 Dec 2013 05:07:04 -0600

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

net/ipset/BUILD | 8 +++++---
net/ipset/CONFIGURE | 5 +++++
net/ipset/FINAL | 3 +++
net/ipset/HISTORY | 6 ++++++
net/ipset/INSTALL | 5 ++++-
net/ipset/PREPARE | 10 ++++++++++
net/ipset/PRE_BUILD | 2 +-
7 files changed, 34 insertions(+), 5 deletions(-)

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

ipset: added HISTORY entry

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

ipset: => 6.20.1

diff --git a/net/ipset/BUILD b/net/ipset/BUILD
index f5c9db3..c5ec8e5 100755
--- a/net/ipset/BUILD
+++ b/net/ipset/BUILD
@@ -1,8 +1,10 @@
if [[ ${VERSION/.*} == 4 ]]; then
make PREFIX="$INSTALL_ROOT/usr"
else
- ./autogen.sh &&
-
+ OPTS="$IPSET_OPTS $OPTS" &&
default_build &&
- make modules
+
+ if list_find "$IPSET_OPTS" "--with-kmod"; then
+ make modules
+ fi
fi
diff --git a/net/ipset/CONFIGURE b/net/ipset/CONFIGURE
new file mode 100755
index 0000000..ba5cd1f
--- /dev/null
+++ b/net/ipset/CONFIGURE
@@ -0,0 +1,5 @@
+if [[ ${VERSION/.*} != 4 ]]; then
+ config_query_option IPSET_OPTS "Do you want to compile $SPELL kernel
modules?" $IPSET_KMOD \
+ "--with-kmod" \
+ "--without-kmod"
+fi
diff --git a/net/ipset/FINAL b/net/ipset/FINAL
new file mode 100755
index 0000000..34afa43
--- /dev/null
+++ b/net/ipset/FINAL
@@ -0,0 +1,3 @@
+if [[ ${VERSION/.*} == 4 ]] || list_find "$IPSET_OPTS" "--with-kmod"; then
+ depmod -a
+fi
diff --git a/net/ipset/HISTORY b/net/ipset/HISTORY
index cc97499..4491d0b 100644
--- a/net/ipset/HISTORY
+++ b/net/ipset/HISTORY
@@ -1,5 +1,11 @@
2013-12-24 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 6.20.1 (2.6 branch)
+ * BUILD: dropped deprecated autogen.sh run; use IPSET_OPTS
+ * FINAL: added, to run depmod for registering modules
+ * CONFIGURE: added, to choose modules compilation
+ * PREPARE: added, to detect ip_set kernel module for 2.6 branch and
+ default answer in CONFIGURE
+ * PRE_BUILD: replaced sed with sedit

2012-05-12 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 6.12.1
diff --git a/net/ipset/INSTALL b/net/ipset/INSTALL
index 9e463c3..a177b2a 100755
--- a/net/ipset/INSTALL
+++ b/net/ipset/INSTALL
@@ -2,5 +2,8 @@ if [[ ${VERSION/.*} == 4 ]]; then
make PREFIX="$INSTALL_ROOT/usr" install
else
default_install &&
- make modules_install
+
+ if list_find "$IPSET_OPTS" "--with-kmod"; then
+ make modules_install
+ fi
fi
diff --git a/net/ipset/PREPARE b/net/ipset/PREPARE
new file mode 100755
index 0000000..c0e0c57
--- /dev/null
+++ b/net/ipset/PREPARE
@@ -0,0 +1,10 @@
+. $GRIMOIRE/FUNCTIONS &&
+
+persistent_add IPSET_KMOD &&
+
+if [[ $(get_sorcery_kernel_config CONFIG_IP_SET) != y ]] && [[
$(get_sorcery_kernel_config CONFIG_IP_SET) != m ]]; then
+ message "${MESSAGE_COLOR}You don't have ipset modules enabled in you
kernel; compiling external modules is highly recommended.${DEFAULT_COLOR}" &&
+ IPSET_KMOD=y
+else
+ IPSET_KMOD=n
+fi
diff --git a/net/ipset/PRE_BUILD b/net/ipset/PRE_BUILD
index c420cc0..23e69b6 100755
--- a/net/ipset/PRE_BUILD
+++ b/net/ipset/PRE_BUILD
@@ -2,7 +2,7 @@ default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

if [[ ${VERSION/.*} == 4 ]]; then
- sed -i "s:/man:/share/man:;s:share/man8:man8:" Makefile
+ sedit "s:/man:/share/man:;s:share/man8:man8:" Makefile
else
cd "$INSTALL_ROOT/usr/src/linux" &&




  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6c674c28e0792a83782e33588e3291a586048a5f), Vlad Glagolev, 12/24/2013

Archive powered by MHonArc 2.6.24.

Top of Page