Build results of 5a0f0c5 (on master)

hknutzen · Aug 28, 2013 · 5d2436c · 5d2436c
1 parent aee5135
commit 5d2436c
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 12 deletions.
diff --git a/Changes b/Changes
@@ -1,3 +1,7 @@
+3.034     2013-08-28 17:57:24 Europe/Berlin
+
+ - Fixed wrongly sorted IP addresses in object-groups introduced in 3.033.
+
 3.033     2013-08-28 16:26:33 Europe/Berlin
 
  - A NAT definition can be given at an area now.

diff --git a/META.yml b/META.yml
@@ -31,4 +31,4 @@ requires:
   strict: 0
   utf8: 0
   warnings: 0
-version: 3.033
+version: 3.034
diff --git a/Makefile.PL b/Makefile.PL
@@ -46,7 +46,7 @@ my %WriteMakefileArgs = (
     "utf8" => 0,
     "warnings" => 0
   },
-  "VERSION" => "3.033",
+  "VERSION" => "3.034",
   "test" => {
     "TESTS" => "t/*.t"
   }

diff --git a/README b/README
@@ -1,7 +1,7 @@
 
 
 This archive contains the distribution Netspoc,
-version 3.033:
+version 3.034:
 
   Generates rules for many firewalls from a central ruleset.
 

diff --git a/bin/cut-netspoc b/bin/cut-netspoc
@@ -27,7 +27,7 @@ use Netspoc;
 #use open ':locale';
 use locale;
 
-our $VERSION = '3.033'; # VERSION: inserted by DZP::OurPkgVersion
+our $VERSION = '3.034'; # VERSION: inserted by DZP::OurPkgVersion
 
 ####################################################################
 # Argument processing

diff --git a/bin/netspoc b/bin/netspoc
@@ -136,7 +136,7 @@ use Netspoc;
 use Getopt::Long;
 use Pod::Usage;
 
-our $VERSION = '3.033'; # VERSION: inserted by DZP::OurPkgVersion
+our $VERSION = '3.034'; # VERSION: inserted by DZP::OurPkgVersion
 
 ####################################################################
 # Argument processing

diff --git a/bin/print-group b/bin/print-group
@@ -79,7 +79,7 @@ use Netspoc;
 use Getopt::Long;
 use Pod::Usage;
 
-our $VERSION = '3.033'; # VERSION: inserted by DZP::OurPkgVersion
+our $VERSION = '3.034'; # VERSION: inserted by DZP::OurPkgVersion
 
 ####################################################################
 # Argument processing

diff --git a/bin/rename-netspoc b/bin/rename-netspoc
@@ -85,7 +85,7 @@ use open qw(:std :utf8);
 use utf8;
 use Encode;
 
-our $VERSION = '3.033'; # VERSION: inserted by DZP::OurPkgVersion
+our $VERSION = '3.034'; # VERSION: inserted by DZP::OurPkgVersion
 my $filename_encode = 'UTF-8';
 
 my $ignore_files = '^(raw|config|CVS|RCS|\.#.*|.*~)$';

diff --git a/bin/watchers-to-json b/bin/watchers-to-json
@@ -14,7 +14,7 @@ use utf8;
 use Encode;
 use File::Path qw(make_path);
 use JSON;
-our $VERSION = '3.033'; # VERSION: inserted by DZP::OurPkgVersion
+our $VERSION = '3.034'; # VERSION: inserted by DZP::OurPkgVersion
 my $filename_encode = 'UTF-8';
 
 my $ignore_files = '^(raw|config|JSON|CVS|RCS|\.#.*|.*~)$';

diff --git a/lib/Netspoc.pm b/lib/Netspoc.pm
@@ -34,7 +34,7 @@ use open qw(:std :utf8);
 use Encode;
 my $filename_encode = 'UTF-8';
 
-our $VERSION = '3.033'; # VERSION: inserted by DZP::OurPkgVersion
+our $VERSION = '3.034'; # VERSION: inserted by DZP::OurPkgVersion
 my $program = 'Network Security Policy Compiler';
 my $version = __PACKAGE__->VERSION || 'devel';
 
@@ -13558,9 +13558,11 @@ sub find_object_groups  {
 
             my $calc_ip_mask_strings = sub {
                 my ($keys, $no_nat_set) = @_;
-                return(sort map({ join('/', @{ address($_, $no_nat_set) }) } 
-                                map({ $ref2obj{$_} || internal_err($_) } 
-                                    @$keys)));
+                return(map { join('/', @$_) }
+                       sort { $a->[0] <=> $b->[0] || $a->[1] <=> $b->[1] }
+                       map { address($_, $no_nat_set) }
+                       map { $ref2obj{$_} || internal_err($_) }
+                       @$keys);
             };
 
             my $build_group = sub {