Skip to Content.
Sympa Menu

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

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 (e17e2ffd9a4b5c9c1fcac6df4488613a1dac2adf)
  • Date: Thu, 24 Jul 2008 06:32:04 -0500

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

dev/null |binary
net/ferm/BUILD | 2 +-
net/ferm/DETAILS | 4 ++--
net/ferm/HISTORY | 5 +++++
net/ferm/PRE_BUILD | 11 -----------
net/ferm/ferm-2.0.1.tar.gz.sig |binary
net/ferm/ferm-2.0.tar.gz.sig | 0
net/ferm/flush.patch | 38 --------------------------------------
8 files changed, 8 insertions(+), 52 deletions(-)

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

ferm: => 2.0.1

diff --git a/net/ferm/BUILD b/net/ferm/BUILD
index 8f58e6d..27ba77d 100755
--- a/net/ferm/BUILD
+++ b/net/ferm/BUILD
@@ -1 +1 @@
-make
+true
diff --git a/net/ferm/DETAILS b/net/ferm/DETAILS
index 882283f..f8f253b 100755
--- a/net/ferm/DETAILS
+++ b/net/ferm/DETAILS
@@ -1,7 +1,7 @@
SPELL=ferm
- VERSION=2.0
+ VERSION=2.0.1
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_URL[0]=http://ferm.foo-projects.org/download/$VERSION/$SOURCE
+ SOURCE_URL[0]=http://ferm.foo-projects.org/download/${VERSION%.?}/$SOURCE
SOURCE_GPG=gurus.gpg:$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://ferm.foo-projects.org/
diff --git a/net/ferm/HISTORY b/net/ferm/HISTORY
index 677ce83..da26f10 100644
--- a/net/ferm/HISTORY
+++ b/net/ferm/HISTORY
@@ -1,3 +1,8 @@
+2008-07-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.0.1
+ * PRE_BUILD: removed dirty hacks (upstreamly fixed)
+ * BUILD: make's not needed really
+
2008-07-23 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: Fixed SOURCE_URL[0], updated spell to 2.0
* PRE_BUILD: added some comments, fixed a bug about flushing the rules
diff --git a/net/ferm/PRE_BUILD b/net/ferm/PRE_BUILD
deleted file mode 100755
index 622ef5d..0000000
--- a/net/ferm/PRE_BUILD
+++ /dev/null
@@ -1,11 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-# bug, found in 2.0 while flushing the rules, fixed in trunk
-patch -p0 < "$SPELL_DIRECTORY/flush.patch" &&
-
-# install man page to the correct location
-sed -i "s:man/:share/man/:" config.mk &&
-
-# use correct path for iptables-save
-sed -i "s:sbin:usr/sbin:g" src/import-ferm
diff --git a/net/ferm/ferm-2.0.1.tar.gz.sig b/net/ferm/ferm-2.0.1.tar.gz.sig
new file mode 100644
index 0000000..05f0526
Binary files /dev/null and b/net/ferm/ferm-2.0.1.tar.gz.sig differ
diff --git a/net/ferm/ferm-2.0.tar.gz.sig b/net/ferm/ferm-2.0.tar.gz.sig
deleted file mode 100644
index 4370c5c..0000000
Binary files a/net/ferm/ferm-2.0.tar.gz.sig and /dev/null differ
diff --git a/net/ferm/flush.patch b/net/ferm/flush.patch
deleted file mode 100644
index 90028c9..0000000
--- a/net/ferm/flush.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/ferm.orig 2008-07-22 21:44:45.000000000 +0400
-+++ src/ferm 2008-07-23 15:13:02.000000000 +0400
-@@ -2089,6 +2089,17 @@
- return $status;
- }
-
-+sub table_to_save($$) {
-+ my ($result_r, $table_info) = @_;
-+
-+ foreach my $chain (sort keys %{$table_info->{chains}}) {
-+ my $chain_info = $table_info->{chains}{$chain};
-+ foreach my $rule (@{$chain_info->{rules}}) {
-+ $$result_r .= "-A $chain$rule->{rule}\n";
-+ }
-+ }
-+}
-+
- sub rules_to_save($) {
- my ($domain_info) = @_;
-
-@@ -2113,15 +2124,8 @@
- $result .= ":$chain $policy\ [0:0]\n";
- }
-
-- next if $option{flush};
--
-- # dump rules
-- foreach my $chain (sort keys %{$table_info->{chains}}) {
-- my $chain_info = $table_info->{chains}{$chain};
-- foreach my $rule (@{$chain_info->{rules}}) {
-- $result .= "-A $chain$rule->{rule}\n";
-- }
-- }
-+ table_to_save(\$result, $table_info)
-+ unless $option{flush};
-
- # do it
- $result .= "COMMIT\n";



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (e17e2ffd9a4b5c9c1fcac6df4488613a1dac2adf), Vlad Glagolev, 07/24/2008

Archive powered by MHonArc 2.6.24.

Top of Page