Build results of 66ec6c3 (on master)

hknutzen · Apr 17, 2013 · 88f4c36 · 88f4c36
1 parent f183cc6
commit 88f4c36
Show file tree

Hide file tree

Showing 18 changed files with 240 additions and 338 deletions.
diff --git a/Changes b/Changes
@@ -1,3 +1,11 @@
+3.029     2013-04-17 15:53:38 Europe/Berlin
+
+  - Fixed duplicate ACL line from unmanaged virtual interface.
+  - Fixed superfluous warning on unused owner.
+  - Changed default: check_service_unknown_owner = 0 (was 'warn').
+  - Minor fixes with NAT and minimal topology.
+  - Moved programs newpolicy and newpolicy.pl to project Netspoc-Approve.
+
 3.028     2013-03-26 12:08:23 Europe/Berlin
 
 - Fixed minor bug: Prevent deep recursion in set_routes_in_zone.

diff --git a/MANIFEST b/MANIFEST
@@ -18,8 +18,6 @@ cvs-support/append-commitlog.c
 cvs-support/cvs-SETXID_SUPPORT.patch
 cvs-support/cvs-log.pl
 cvs-support/loginfo
-cvs-support/newpolicy.c
-cvs-support/newpolicy.pl
 cvs-support/suid-cvs.c
 dist.ini
 doc/CSPM.pod
@@ -78,3 +76,5 @@ t/secondary.t
 t/unnumbered.t
 t/unnumbered.t~
 t/virtual-loopback-nat.t
+t/virtual-pathrestrict.t
+t/virtual-pathrestrict.t~
diff --git a/META.yml b/META.yml
@@ -31,4 +31,4 @@ requires:
   strict: 0
   utf8: 0
   warnings: 0
-version: 3.028
+version: 3.029
diff --git a/Makefile.PL b/Makefile.PL
@@ -46,7 +46,7 @@ my %WriteMakefileArgs = (
     "utf8" => 0,
     "warnings" => 0
   },
-  "VERSION" => "3.028",
+  "VERSION" => "3.029",
   "test" => {
     "TESTS" => "t/*.t"
   }

diff --git a/README b/README
@@ -1,7 +1,7 @@
 
 
 This archive contains the distribution Netspoc,
-version 3.028:
+version 3.029:
 
   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.028'; # VERSION: inserted by DZP::OurPkgVersion
+our $VERSION = '3.029'; # 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.028'; # VERSION: inserted by DZP::OurPkgVersion
+our $VERSION = '3.029'; # 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.028'; # VERSION: inserted by DZP::OurPkgVersion
+our $VERSION = '3.029'; # VERSION: inserted by DZP::OurPkgVersion
 
 ####################################################################
 # Argument processing

diff --git a/bin/rename-netspoc b/bin/rename-netspoc
@@ -30,6 +30,7 @@ A SUBSTITUTION of type B<network> also changes B<interface> and B<host:id>
 which reference the given network.  A SUBSTITUTION of type B<router>
 also changes B<interfaces> which reference the given router.
 A SUBSTITUTION of type B<nat> also changes the corresponding B<bind_nat> list.
+A SUBSTITUTION of type B<owner> also changes the corresponding B<sub_owner>.
 
 =head1 OPTIONS
 
@@ -84,7 +85,7 @@ use open qw(:std :utf8);
 use utf8;
 use Encode;
 
-our $VERSION = '3.028'; # VERSION: inserted by DZP::OurPkgVersion
+our $VERSION = '3.029'; # VERSION: inserted by DZP::OurPkgVersion
 my $filename_encode = 'UTF-8';
 
 my $ignore_files = '^(raw|config|CVS|RCS|\.#.*|.*~)$';
@@ -106,7 +107,9 @@ policy servicegroup
 );
 
 # NAT is applied with bind_nat.
-my %aliases = ( nat => ['bind_nat'] );
+# Owner is optionally referenced as sub_owner.
+my %aliases = ( nat   => ['bind_nat'],
+                owner => ['sub_owner'], );
 
 my %subst;
 

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.028'; # VERSION: inserted by DZP::OurPkgVersion
+our $VERSION = '3.029'; # VERSION: inserted by DZP::OurPkgVersion
 my $filename_encode = 'UTF-8';
 
 my $ignore_files = '^(raw|config|JSON|CVS|RCS|\.#.*|.*~)$';

diff --git a/cvs-support/Makefile b/cvs-support/Makefile
@@ -1,8 +1,6 @@
 # Makefile for cvs-support
 
-all:	newpolicy append-commitlog suid-cvs
-
-newpolicy: newpolicy.c
+all:	append-commitlog suid-cvs
 
 append-commitlog: append-commitlog.c
 

diff --git a/cvs-support/newpolicy.c b/cvs-support/newpolicy.c
diff --git a/cvs-support/newpolicy.pl b/cvs-support/newpolicy.pl
diff --git a/cvs-support/suid-cvs.c b/cvs-support/suid-cvs.c
@@ -8,7 +8,7 @@ static char vcid[] = "$Id$";
 
 #include <stdio.h>
 
-char program[] = "/usr/bin/cvs";
+char program[] = "/usr/local/bin/cvs";
 
 void usage( void ) {
     fprintf(stderr, "Usage: suid-cvs server\n");

diff --git a/dist.ini b/dist.ini
@@ -16,7 +16,10 @@ abstract = Generates rules for many firewalls from a central ruleset.
 [MakeMaker]
 [Manifest]
 [TestRelease]
+[CheckChangesHasContent]
 [Git::Check]
+[Git::CheckFor::CorrectBranch]
+  release_branch = master
 [Git::NextVersion]
    first_version = 3.003
 [NextRelease]