Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (c7dfcba740115736765d7028d02ff56bf1e55f12)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pol Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (c7dfcba740115736765d7028d02ff56bf1e55f12)
  • Date: Mon, 4 Feb 2008 14:24:22 -0600

GIT changes to master grimoire by Pol Vinogradov <vin.public AT gmail.com>:

net/firehol/DETAILS | 1 +
net/firehol/HISTORY | 8 ++++++--
net/firehol/PRE_BUILD | 2 +-
net/firehol/firehol.diff | 40 ++++++++++++++++++++++++++++++++++++----
4 files changed, 44 insertions(+), 7 deletions(-)

New commits:
commit 5f15849b1d5a2c334bf3bb3e56a0127f51206967
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

net/firehol: fixed the patch itself and its parameter, PATCHLEVEL++,
cleaned up HISTORY's entries

diff --git a/net/firehol/DETAILS b/net/firehol/DETAILS
index b0e0037..620c258 100755
--- a/net/firehol/DETAILS
+++ b/net/firehol/DETAILS
@@ -6,6 +6,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_HASH=sha512:9daf4cdcfcdbf7ad663798e6267aaa1ee41278d2a42e918df7af66310b3518836f8a1ff0d2c337936f55193872d2534547084f2d58235e5826a48ba4d8c72748
WEB_SITE=http://firehol.sourceforge.net/
ENTERED=20041102
+ PATCHLEVEL=1
LICENSE[0]=GPL
KEYWORDS="firewall net"
SHORT="A stateful packet filtering firewall builder for iptables."
diff --git a/net/firehol/HISTORY b/net/firehol/HISTORY
index adff6e3..0188de0 100644
--- a/net/firehol/HISTORY
+++ b/net/firehol/HISTORY
@@ -1,3 +1,7 @@
+2008-02-05 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: PATCHLEVEL++
+ * PRE_BUILD, firehol.diff: fixed the patch itself and its parameter
+
2007-07-24 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: updated to 1.255
* firehol.diff: updated, wrong quoting fix added for line 94
@@ -22,7 +26,7 @@
2005-12-28 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: updated to 1.226
* INSTALL: fixed $IR assignment, fixed condition of if statement
- (path was wrong), (bug 9265)
+ (path was wrong), (bug 9265)

2005-11-29 Seth Woolley <seth AT tautology.org>
* DETAILS: MD5 -> SHA512
@@ -40,5 +44,5 @@

2004-11-02 Richard Johns <johnsr1 AT lincoln.ac.nz>
* DETAILS, DEPENDS, HISTORY, BUILD, INSTALL,
- firhol.diff, init.d :Created spell
+ firehol.diff, init.d: Created spell

diff --git a/net/firehol/PRE_BUILD b/net/firehol/PRE_BUILD
index a45a320..dc8a844 100755
--- a/net/firehol/PRE_BUILD
+++ b/net/firehol/PRE_BUILD
@@ -1,4 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

-patch -p1 < ${SCRIPT_DIRECTORY}/firehol.diff
+patch -p0 < ${SCRIPT_DIRECTORY}/firehol.diff
diff --git a/net/firehol/firehol.diff b/net/firehol/firehol.diff
index efae9a1..b30a307 100644
--- a/net/firehol/firehol.diff
+++ b/net/firehol/firehol.diff
@@ -1,6 +1,5 @@
-diff -Nurp firehol-1.255.orig/firehol.sh firehol-1.255/firehol.sh
---- firehol-1.255.orig/firehol.sh 2007-07-24 05:03:26.000000000 +0500
-+++ firehol-1.255/firehol.sh 2007-07-24 05:32:00.000000000 +0500
+--- firehol.sh.orig 2007-05-21 13:07:35.000000000 +0500
++++ firehol.sh 2008-02-05 00:15:17.000000000 +0500
@@ -13,6 +13,11 @@
# $Id: firehol.sh,v 1.255 2007/05/06 14:42:43 ktsaou Exp $
#
@@ -18,7 +17,40 @@ diff -Nurp firehol-1.255.orig/firehol.sh
firehol-1.255/firehol.sh
for x in $1
do
- eval var=`echo ${x} | tr 'a-z' 'A-Z'`_CMD
-+ eval var="echo ${x} | tr 'a-z' 'A-Z'"_CMD
++ eval var=$(tr '[[:lower:]]' '[[:upper:]]' <<< "$x")_CMD
eval val=\$\{${var}\}
if [ -z "${val}" ]
then
+@@ -129,7 +134,7 @@ require_cmd() {
+ # (i.e. Command on Demand)
+ #
+ # wget or curl (either is fine)
+-# gzcat
++# zcat
+ # ip
+ # netstat
+ # date
+@@ -2749,8 +2754,8 @@ protection() {
+ # new firewall has been activated. Here we just keep a list of the required
+ # kernel modules.
+
+-# optionaly require command gzcat
+-require_cmd -n gzcat
++# optionaly require command zcat
++require_cmd -n zcat
+
+ KERNEL_CONFIG=
+ if [ -f "/proc/config" ]
+@@ -2759,10 +2764,10 @@ then
+ ${CAT_CMD} /proc/config >${FIREHOL_DIR}/kcfg
+ source ${FIREHOL_DIR}/kcfg
+ ${RM_CMD} -f ${FIREHOL_DIR}/kcfg
+-elif [ -f "/proc/config.gz" -a ! -z "${GZCAT_CMD}" ]
++elif [ -f "/proc/config.gz" -a ! -z "${ZCAT_CMD}" ]
+ then
+ KERNEL_CONFIG="/proc/config.gz"
+- ${GZCAT_CMD} /proc/config.gz >${FIREHOL_DIR}/kcfg
++ ${ZCAT_CMD} /proc/config.gz >${FIREHOL_DIR}/kcfg
+ source ${FIREHOL_DIR}/kcfg
+ ${RM_CMD} -f ${FIREHOL_DIR}/kcfg
+



  • [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (c7dfcba740115736765d7028d02ff56bf1e55f12), Pol Vinogradov, 02/04/2008

Archive powered by MHonArc 2.6.24.

Top of Page