Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock

Please unblock package ferm

Unfortunatly the fix for the domain handling in -4 wasn't complete and
resulted in #696130 which hitted several users. I prepared a fix
for the (picked from upstreams git).

The debdiff is fairly small:

diff --git a/debian/changelog b/debian/changelog
index d5ba908..0d97810 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ferm (2.1-5) unstable; urgency=low
+
+  * [f4e216a] Backport a fix from 2.1.2 which fixes a regression from the
+              domain (ip ip6) fix introduced in 2.1.1 (backported to 2.1-4)
+              (Closes: #696130)
+
+ -- Alexander Wirt <formo...@debian.org>  Sat, 29 Dec 2012 11:30:56 +0100
+
 ferm (2.1-4) unstable; urgency=low
 
   * [4ede608] Backport a patch that fixes a regression in functions containing
diff --git a/src/ferm b/src/ferm
index 2214969..a97fae1 100755
--- a/src/ferm
+++ b/src/ferm
@@ -2044,6 +2044,7 @@ sub enter($$) {
                     my $old_line = $script->{line};
                     my $old_handle = $script->{handle};
                     my $old_tokens = $script->{tokens};
+                    my $old_base_level = $script->{base_level};
                     unshift @$old_tokens, make_line_token($script->{line});
                     delete $script->{handle};
 
@@ -2051,10 +2052,12 @@ sub enter($$) {
                         my %inner;
                         new_level(%inner, \%rule);
                         set_domain(%inner, $domain) or next;
+                        $script->{base_level} = 0;
                         $script->{tokens} = [ @$tokens ];
                         enter(0, \%inner);
                     }
 
+                    $script->{base_level} = $old_base_level;
                     $script->{tokens} = $old_tokens;
                     $script->{handle} = $old_handle;
                     $script->{line} = $old_line;

Thanks in advance

Alex

unblock ferm/2.1-5

-- System Information:
Debian Release: 7.0
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.8.0-rc1+ (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to