[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (4de5615d331d446bbe32d55541530f87961245ab)

Vlad Glagolev scm at sourcemage.org
Wed Jun 18 22:34:36 EDT 2008


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

 net/iptables/BUILD     |    3 ---
 net/iptables/DETAILS   |   21 ++++++++++-----------
 net/iptables/HISTORY   |    7 ++++++-
 net/iptables/INSTALL   |   18 ------------------
 net/iptables/PRE_BUILD |   12 +++++-------
 5 files changed, 21 insertions(+), 40 deletions(-)

New commits:
commit 4de5615d331d446bbe32d55541530f87961245ab
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    iptables: => 1.4.1.1, updated grsecurity patch

diff --git a/net/iptables/BUILD b/net/iptables/BUILD
deleted file mode 100755
index b998101..0000000
--- a/net/iptables/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-# sedit  "s/-O2/$CFLAGS/"  Makefile  &&
-make_single                              &&
-make  LIBDIR=$TRACK_ROOT/usr/lib  KERNEL_DIR=$TRACK_ROOT/usr
diff --git a/net/iptables/DETAILS b/net/iptables/DETAILS
index c0cd3b4..79427fb 100755
--- a/net/iptables/DETAILS
+++ b/net/iptables/DETAILS
@@ -1,29 +1,28 @@
            SPELL=iptables
-         VERSION=1.4.0
+         VERSION=1.4.1.1
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sig
-      SOURCE_URL=http://www.iptables.org/projects/$SPELL/files/$SOURCE
-     SOURCE2_URL=http://www.iptables.org/projects/$SPELL/files/$SOURCE2
+   SOURCE_URL[0]=http://www.iptables.org/projects/$SPELL/files/$SOURCE
+  SOURCE2_URL[0]=$SOURCE_URL.sig
       SOURCE_GPG=iptables.gpg:$SOURCE2:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 
-  if [ "$GRSECPATCH" == "y" ]
-  then
-	GRSECVERSION=1.3.5
+if [[ $GRSECPATCH == y ]]; then
+    GRSECVERSION=1.4.0
          SOURCE3=grsecurity-$SPELL-$GRSECVERSION.patch
          SOURCE4=$SOURCE3.sign
-     SOURCE3_URL=http://www.grsecurity.org/$SOURCE3
-     SOURCE4_URL=http://www.grsecurity.org/$SOURCE4
+  SOURCE3_URL[0]=http://www.grsecurity.org/$SOURCE3
+  SOURCE4_URL[0]=$SOURCE3_URL.sign
      SOURCE3_GPG=grsecurity.gpg:$SOURCE4:UPSTREAM_KEY
   SOURCE4_IGNORE=signature
-  fi
+fi
 
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=http://www.iptables.org/projects/iptables/index.html
+        WEB_SITE=http://www.iptables.org/projects/iptables/
          ENTERED=20010922
       LICENSE[0]=GPL
         KEYWORDS="net"
-           SHORT="Creation of packet alteration and firwall rules."
+           SHORT="creation of packet alteration and firwall rules"
 cat << EOF
 iptables is built on top of netfilter: the new packet alteration
 framework for Linux 2.4. It is an enhancement on ipchains, and is used
diff --git a/net/iptables/HISTORY b/net/iptables/HISTORY
index dcb588f..108aee8 100644
--- a/net/iptables/HISTORY
+++ b/net/iptables/HISTORY
@@ -1,3 +1,9 @@
+2008-06-19 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 1.4.1.1, added some bashism, cleaned up,
+	  corrected the urls, fixed website, corrected short comment
+	* BUILD, INSTALL: removed, useless due to autotools usage
+	* PRE_BUILD: fixed patching process
+
 2008-01-21 Pol Vinogradov <vin.public at gmail.com>
 	* DETAILS: made grsec patch optional
 	* CONFIGURE: moved to PREPARE
@@ -113,4 +119,3 @@
 
 2002-03-26 Jeff Schmidt <jschmidt at fnal.gov>
 	* HISTORY: Added
-
diff --git a/net/iptables/INSTALL b/net/iptables/INSTALL
deleted file mode 100755
index f889bf2..0000000
--- a/net/iptables/INSTALL
+++ /dev/null
@@ -1,18 +0,0 @@
-make_normal                                  &&
-make  LIBDIR=$INSTALL_ROOT/usr/lib           \
-      BINDIR=$INSTALL_ROOT/usr/sbin          \
-      MANDIR=$INSTALL_ROOT/usr/share/man     \
-      INCDIR=$INSTALL_ROOT/usr/include       \
-      KERNEL_DIR=$INSTALL_ROOT/usr           \
-      install                                &&
-make  LIBDIR=$INSTALL_ROOT/usr/lib           \
-      BINDIR=$INSTALL_ROOT/usr/sbin          \
-      MANDIR=$INSTALL_ROOT/usr/share/man     \
-      INCDIR=$INSTALL_ROOT/usr/include       \
-      KERNEL_DIR=$INSTALL_ROOT/usr           \
-      install-devel                          &&
-cd $SOURCE_DIRECTORY                         &&
-mkdir -p $INSTALL_ROOT/usr/include/libiptc   &&
-mkdir -p $INSTALL_ROOT/usr/include/libipulog &&
-mkdir -p $INSTALL_ROOT/usr/include/linux
-cp -av include/* $INSTALL_ROOT/usr/include/
diff --git a/net/iptables/PRE_BUILD b/net/iptables/PRE_BUILD
index b852c2e..d59e2ac 100755
--- a/net/iptables/PRE_BUILD
+++ b/net/iptables/PRE_BUILD
@@ -1,9 +1,7 @@
 default_pre_build &&
-if [ "$GRSECPATCH" == "y" ]
-then
-	unpack_file 3 &&
-	cd $SOURCE_DIRECTORY &&
-	patch -p1 <${SOURCE_CACHE}/$SOURCE3
-	message "Ignore the patch failure, it's just a Makefile issue, fixed it with sed" &&
-	sed -i -e "s/PF_EXT_SLIB:=ah/PF_EXT_SLIB:=stealth ah/" extensions/Makefile
+cd $SOURCE_DIRECTORY &&
+
+if [[ $GRSECPATCH == y ]]; then
+  unpack_file 3 &&
+  patch -p1 < $SOURCE_CACHE/$SOURCE3
 fi



More information about the SM-Commit mailing list