openSUSE Commits
Threads by month
- ----- 2024 -----
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
June 2012
- 1 participants
- 1446 discussions
Hello community,
here is the log from the commit of package perl-Data-Dump-Streamer for openSUSE:Factory checked in at 2012-06-01 18:55:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Data-Dump-Streamer (Old)
and /work/SRC/openSUSE:Factory/.perl-Data-Dump-Streamer.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Data-Dump-Streamer", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-Data-Dump-Streamer/perl-Data-Dump-Streamer.changes 2012-02-14 19:04:57.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.perl-Data-Dump-Streamer.new/perl-Data-Dump-Streamer.changes 2012-06-01 18:55:02.000000000 +0200
@@ -1,0 +2,17 @@
+Wed May 30 08:52:16 UTC 2012 - coolo(a)suse.com
+
+- updated to 2.33
+ Caught up with various RT reports, and fixed a bunch of them.
+
+ [RT#74198] fixed dumps containing read-only objects (obtained via JSON::XS)
+
+ [RT#74198], Fixed stringification of code compiled under strict in later
+ perls. Thanks to Father Chrysotomos for the patch and nudge.
+
+ Also eliminated a false-fail prone test which was actually pretty useless,
+ which should close several tickets which I wont bother to list.
+
+ This release also is the first from the new git repository at
+ https://github.com/demerphq/Data-Dump-Streamer
+
+-------------------------------------------------------------------
Old:
----
Data-Dump-Streamer-2.32.tar.gz
New:
----
Data-Dump-Streamer-2.33.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Data-Dump-Streamer.spec ++++++
--- /var/tmp/diff_new_pack.xUsmcO/_old 2012-06-01 18:55:06.000000000 +0200
+++ /var/tmp/diff_new_pack.xUsmcO/_new 2012-06-01 18:55:06.000000000 +0200
@@ -17,59 +17,30 @@
Name: perl-Data-Dump-Streamer
-Version: 2.32
+Version: 2.33
Release: 0
%define cpan_name Data-Dump-Streamer
Summary: Accurately serialize a data structure as Perl code.
-License: GPL-1.0+ or Artistic-1.0
+License: Artistic-1.0 or GPL-1.0+
Group: Development/Libraries/Perl
Url: http://search.cpan.org/dist/Data-Dump-Streamer/
-#Source: http://www.cpan.org/authors/id/J/JJ/JJORE/Data-Dump-Streamer-%{version}.tar…
-Source: %{cpan_name}-%{version}.tar.gz
+Source: http://www.cpan.org/authors/id/Y/YV/YVES/%{cpan_name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: perl
BuildRequires: perl-macros
-BuildRequires: perl(Algorithm::Diff)
-BuildRequires: perl(B)
-BuildRequires: perl(B::Deparse)
BuildRequires: perl(B::Utils)
-BuildRequires: perl(Carp)
-BuildRequires: perl(Config)
-BuildRequires: perl(Data::Dumper)
-BuildRequires: perl(DynaLoader)
-BuildRequires: perl(Exporter)
-BuildRequires: perl(IO::File)
+BuildRequires: perl(ExtUtils::CBuilder)
+BuildRequires: perl(ExtUtils::Depends)
+BuildRequires: perl(JSON::XS)
BuildRequires: perl(Module::Build)
-BuildRequires: perl(PadWalker) >= 0.99
-BuildRequires: perl(Symbol)
-BuildRequires: perl(Text::Abbrev)
-BuildRequires: perl(Text::Balanced)
-BuildRequires: perl(base)
-BuildRequires: perl(overload)
-BuildRequires: perl(re)
-BuildRequires: perl(strict)
-BuildRequires: perl(utf8)
-BuildRequires: perl(vars)
-BuildRequires: perl(warnings)
-BuildRequires: perl(warnings::register)
-Requires: perl(Algorithm::Diff)
-Requires: perl(B)
-Requires: perl(B::Deparse)
+#BuildRequires: perl(Compress::Zlib)
+#BuildRequires: perl(Data::Dump::Streamer)
+#BuildRequires: perl(Data::Dump::Streamer::_::Printers)
+#BuildRequires: perl(My::Builder)
Requires: perl(B::Utils)
-Requires: perl(Data::Dumper)
-Requires: perl(DynaLoader)
-Requires: perl(Exporter)
-Requires: perl(IO::File)
-Requires: perl(overload)
-Requires: perl(PadWalker) >= 0.99
-Requires: perl(re)
-Requires: perl(strict)
-Requires: perl(Symbol)
-Requires: perl(Text::Abbrev)
-Requires: perl(Text::Balanced)
-Requires: perl(vars)
-Requires: perl(warnings)
-Requires: perl(warnings::register)
+Recommends: perl(Algorithm::Diff)
+Recommends: perl(Compress::Zlib)
+Recommends: perl(PadWalker) >= 0.99
%{perl_requires}
%description
@@ -107,11 +78,8 @@
./Build install destdir=%{buildroot} create_packlist=0
%perl_gen_filelist
-%clean
-%{__rm} -rf %{buildroot}
-
%files -f %{name}.files
-%defattr(644,root,root,755)
+%defattr(-,root,root,755)
%doc Changes INSTALL.SKIP README
%changelog
++++++ Data-Dump-Streamer-2.32.tar.gz -> Data-Dump-Streamer-2.33.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Data-Dump-Streamer-2.32/Build.PL new/Data-Dump-Streamer-2.33/Build.PL
--- old/Data-Dump-Streamer-2.32/Build.PL 2011-02-05 05:53:11.000000000 +0100
+++ new/Data-Dump-Streamer-2.33/Build.PL 2012-04-01 17:21:57.000000000 +0200
@@ -35,6 +35,7 @@
'utf8' => 0,
'vars' => 0,
'warnings' => 0,
+ 'JSON::XS' => 0,
$] >= 5.012
? ( 're' => 0 )
: (),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Data-Dump-Streamer-2.32/Changes new/Data-Dump-Streamer-2.33/Changes
--- old/Data-Dump-Streamer-2.32/Changes 2011-02-05 05:53:11.000000000 +0100
+++ new/Data-Dump-Streamer-2.33/Changes 2012-04-01 17:21:57.000000000 +0200
@@ -1,3 +1,18 @@
+2.33
+Caught up with various RT reports, and fixed a bunch of them.
+
+[RT #74198] fixed dumps containing read-only objects (obtained via JSON::XS)
+
+[RT #74198], Fixed stringification of code compiled under strict in later
+perls. Thanks to Father Chrysotomos for the patch and nudge.
+
+Also eliminated a false-fail prone test which was actually pretty useless,
+which should close several tickets which I wont bother to list.
+
+This release also is the first from the new git repository at
+https://github.com/demerphq/Data-Dump-Streamer
+
+
2.32
Disable overloading in a <=5.8.8 safe way [RT #53700]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Data-Dump-Streamer-2.32/META.yml new/Data-Dump-Streamer-2.33/META.yml
--- old/Data-Dump-Streamer-2.32/META.yml 2011-02-05 05:53:11.000000000 +0100
+++ new/Data-Dump-Streamer-2.33/META.yml 2012-04-01 17:21:57.000000000 +0200
@@ -8,6 +8,7 @@
Data::Dumper: 0
Devel::Peek: 0
ExtUtils::CBuilder: 0
+ JSON::XS: 0
Symbol: 0
Test::More: 0
Text::Abbrev: 0
@@ -31,10 +32,10 @@
provides:
Data::Dump::Streamer:
file: lib/Data/Dump/Streamer.pm
- version: 2.32
+ version: 2.33
Data::Dump::Streamer::Deparser:
file: lib/Data/Dump/Streamer.pm
- version: 2.32
+ version: 2.33
recommends:
Algorithm::Diff: 0
Compress::Zlib: 0
@@ -60,4 +61,4 @@
warnings::register: 0
resources:
license: http://dev.perl.org/licenses/
-version: 2.32
+version: 2.33
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Data-Dump-Streamer-2.32/lib/Data/Dump/Streamer.pm new/Data-Dump-Streamer-2.33/lib/Data/Dump/Streamer.pm
--- old/Data-Dump-Streamer-2.32/lib/Data/Dump/Streamer.pm 2011-02-05 05:53:11.000000000 +0100
+++ new/Data-Dump-Streamer-2.33/lib/Data/Dump/Streamer.pm 2012-04-01 17:21:57.000000000 +0200
@@ -1,6 +1,7 @@
package Data::Dump::Streamer;
use strict;
use warnings;
+use warnings::register;
use B ();
use B::Deparse ();
@@ -17,8 +18,6 @@
use Data::Dump::Streamer::_::Printers;
# use overload qw("" printit); # does diabolical stuff.
-use warnings;
-use warnings::register;
use vars qw(
$VERSION
@@ -35,7 +34,7 @@
BEGIN{ $HasPadWalker=eval "use PadWalker 0.99; 1"; }
BEGIN {
- $VERSION ='2.32';
+ $VERSION ='2.33';
$VERSION = eval $VERSION; # used for beta stuff.
@ISA = qw(Exporter DynaLoader);
@EXPORT=qw(Dump DumpLex DumpVars);
@@ -229,10 +228,12 @@
};
} else {
*disable_overloading = sub ($) {
- bless $_[0], 'Does::Not::Exist';
+ # we use eval because $_[0] might be read-only
+ # its a crappy solution, but whatever, it works
+ eval { bless $_[0], 'Does::Not::Exist' };
};
*restore_overloading = sub ($$) {
- bless $_[0], $_[1];
+ eval { bless $_[0], $_[1] }
};
}
my %fail=map { ( $_ => 1 ) } @EXPORT_FAIL;
@@ -1009,7 +1010,7 @@
unless substr( $name, 0, 1 ) eq $type and $type ne '$';
} else {
- no warnings;
+ no warnings; # XXX - why is this here? Yves
Carp::confess "unimplemented _build_name";
}
$DEBUG>1 and print "$name )\n";
@@ -2333,7 +2334,7 @@
} else {
my $quoted;
if ($self->{style}{dualvars}) {
- no warnings 'numeric';
+ no warnings 'numeric'; # XXX: is this required?
if (_could_be_dualvar($item) && 0+$item ne $item && "$item" != $item ) {
$quoted="dualvar( ".join(",$optspace",0+$item,_quote("$item"))."$optspace)";
}
@@ -2458,7 +2459,7 @@
$default_key_sorters{alphabetical}=$default_key_sorters{lexical};
$default_key_sorters{intelligent}=$default_key_sorters{smart};
for my $h (\%default_key_sorters) {
- my $abr=Text::Abbrev::abbrev keys %$h;
+ my $abr=Text::Abbrev::abbrev(keys %$h);
foreach my $short (keys %$abr) {
$h->{$short}=$h->{$abr->{$short}};
}
@@ -3734,7 +3735,7 @@
our @ISA=qw(B::Deparse);
my %cache;
-our $VERSION = '2.32';
+our $VERSION = '2.33';
if ( $VERSION ne $Data::Dump::Streamer::VERSION ) {
die "Incompatible Data::Dump::Streamer::Deparser v$VERSION vs Data::Dump::Streamer v$Data::Dump::Streamer::VERSION";
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Data-Dump-Streamer-2.32/t/madness.t new/Data-Dump-Streamer-2.33/t/madness.t
--- old/Data-Dump-Streamer-2.32/t/madness.t 2011-02-05 05:53:11.000000000 +0100
+++ new/Data-Dump-Streamer-2.33/t/madness.t 2012-04-01 17:21:57.000000000 +0200
@@ -6,7 +6,7 @@
use strict;
use warnings;
use Data::Dumper;
-
+use JSON::XS qw(decode_json);
# imports same()
(my $helper=$0)=~s/\w+\.\w+$/test_helper.pl/;
require $helper;
@@ -226,13 +226,13 @@
else {
$expected_dot = 'undef';
}
+ my $jstrue= decode_json("true");
my %hash = (
UND => undef,
IV => 1,
NV => 3.14159265358979,
PV => "string",
PV8 => "ab\ncd\x{20ac}\t",
- PVM => "$!",
RV => \$.,
AR => [ 1..2 ],
HR => { key => "value" },
@@ -240,7 +240,8 @@
GLB => *STDERR,
IO => *{$::{STDERR}}{IO},
FMT => \*{$::{STDOUT}}{FORMAT},
- OBJ => bless qr/("[^"]+")/,"Zorp",
+ OBJ => bless(qr/("[^"]+")/,"Zorp"),
+ JSB => $jstrue,
);
# Dumping differences per perl version:
@@ -249,7 +250,7 @@
# IO handles are now blessed into IO::File, I guess?
#
if ( $] >= 5.012_000 ) {
- same( $dump= $o->Data(\%hash)->Out, template( <<'EXPECT', expected_dot => $expected_dot ), "", $o);
+ my $expect = <<'EXPECT';
$HASH1 = {
AR => [
1,
@@ -271,15 +272,23 @@
HR => { key => 'value' },
IO => bless( *{Symbol::gensym()}{IO}, 'IO::File' ),
IV => 1,
+ JSB => \1,
NV => 3.14159265358979,
OBJ => bless( qr/("[^"]+")/, 'Zorp' ),
PV => 'string',
PV8 => "ab\ncd\x{20ac}\t",
- PVM => '',
RV => \do { my $v = expected_dot },
UND => undef
};
+bless( $HASH1->{JSB}, 'JSON::XS::Boolean' );
EXPECT
+ require B::Deparse;
+ if (new B::Deparse -> coderef2text (
+ sub { no strict; 1; use strict; 1; }
+ ) !~ 'refs') {
+ $expect =~ s/strict 'refs'/strict/;
+ }
+ same( $dump= $o->Data(\%hash)->Out, template( $expect, expected_dot => $expected_dot ), "", $o);
}
elsif ( $] >= 5.008_008 ) {
same( $dump= $o->Data(\%hash)->Out, template( <<'EXPECT', expected_dot => $expected_dot ), "", $o);
@@ -304,14 +313,15 @@
HR => { key => 'value' },
IO => bless( *{Symbol::gensym()}{IO}, 'IO::Handle' ),
IV => 1,
+ JSB => \1,
NV => 3.14159265358979,
OBJ => bless( qr/("[^"]+")/, 'Zorp' ),
PV => 'string',
PV8 => "ab\ncd\x{20ac}\t",
- PVM => '',
RV => \do { my $v = expected_dot },
UND => undef
};
+bless( $HASH1->{JSB}, 'JSON::XS::Boolean' );
EXPECT
}
elsif ( $] >= 5.008_000 ) {
@@ -337,14 +347,15 @@
HR => { key => 'value' },
IO => bless( *{Symbol::gensym()}{IO}, 'IO::Handle' ),
IV => 1,
+ JSB => \1,
NV => 3.14159265358979,
OBJ => bless( qr/("[^"]+")/, 'Zorp' ),
PV => 'string',
PV8 => "ab\ncd\x{20ac}\t",
- PVM => '',
RV => \do { my $v = expected_dot },
UND => undef
};
+bless( $HASH1->{JSB}, 'JSON::XS::Boolean' );
EXPECT
}
else {
@@ -362,14 +373,15 @@
HR => { key => 'value' },
IO => bless( *{Symbol::gensym()}{IO}, 'IO::Handle' ),
IV => 1,
+ JSB => \1,
NV => 3.14159265358979,
OBJ => bless( qr/("[^"]+")/, 'Zorp' ),
PV => 'string',
PV8 => "ab\ncd\x{20ac}\t",
- PVM => '',
RV => \do { my $v = expected_dot },
UND => undef
};
+bless( $HASH1->{JSB}, 'JSON::XS::Boolean' );
EXPECT
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Data-Dump-Streamer-2.32/t/test_helper.pl new/Data-Dump-Streamer-2.33/t/test_helper.pl
--- old/Data-Dump-Streamer-2.32/t/test_helper.pl 2011-02-05 05:53:11.000000000 +0100
+++ new/Data-Dump-Streamer-2.33/t/test_helper.pl 2012-04-01 17:21:57.000000000 +0200
@@ -133,18 +133,19 @@
sub _dumper {
my ($todump)=@_;
- my ($dump,$error);
+ my $dump;
+ my $error= "";
foreach my $use_perl (1) {
my $warned="";
local $SIG{__WARN__}=sub { my $err=join ('',@_); $warned.=$err unless $err=~/^Subroutine|Encountered/};
$dump=eval { scalar Data::Dumper->new( $todump )->Purity(1)->Sortkeys(1)->Quotekeys(1)->Useperl($use_perl)->Dump() };
- unless ($@) {
+ if ( !$@ ) {
normalize($dump);
- return ($dump,$error.$warned);
- }else {
+ return ($dump, $error . $warned);
+ } else {
unless ($version) {
$version="\tSomething is wrong with Data::Dumper v" . Data::Dumper->VERSION . "\n";
- $error=$version;
+ $error= $version;
}
my $msg=$@.$warned;
unless ($errors{$msg}) {
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package maxima for openSUSE:Factory checked in at 2012-06-01 18:54:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/maxima (Old)
and /work/SRC/openSUSE:Factory/.maxima.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maxima", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/maxima/maxima.changes 2012-05-29 12:18:51.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.maxima.new/maxima.changes 2012-06-01 18:54:52.000000000 +0200
@@ -1,0 +2,6 @@
+Thu May 31 13:55:50 UTC 2012 - badshah400(a)gmail.com
+
+- Touch debugsources.list in the spec file to fix build failures
+ when the debuginfo flag is enabled (e.g. in openSUSE:Factory).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ maxima.spec ++++++
--- /var/tmp/diff_new_pack.vkFj1Z/_old 2012-06-01 18:54:54.000000000 +0200
+++ /var/tmp/diff_new_pack.vkFj1Z/_new 2012-06-01 18:54:54.000000000 +0200
@@ -200,7 +200,8 @@
mandir=%{?buildroot:%{buildroot}}%{_mandir} \
infodir=%{?buildroot:%{buildroot}}%{_infodir} \
install-info
-# touch debugfiles.list
+
+touch debugsources.list
# Deal with info/dir
rm -f %{buildroot}%{_infodir}/dir
# set executable rights for example scripts
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package entangle for openSUSE:Factory checked in at 2012-06-01 18:54:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/entangle (Old)
and /work/SRC/openSUSE:Factory/.entangle.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "entangle", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/entangle/entangle.changes 2012-03-11 20:03:47.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.entangle.new/entangle.changes 2012-06-01 18:54:33.000000000 +0200
@@ -1,0 +2,18 @@
+Thu May 31 15:03:16 CEST 2012 - meissner(a)suse.de
+
+- Updated to 0.3.3
+ * Fix deadlock when starting app with glib >= 2.32
+ * Remove use of deprecated API calls
+ * Remove use of deprecated GTK widgets
+ * Fix debugging with glib >= 2.32
+ * Fix creation of session browser widget to avoid warnings
+ * Refresh translations
+ * Fix check for glib-compile-schemas binary
+
+
+-------------------------------------------------------------------
+Thu May 31 15:02:39 CEST 2012 - meissner(a)suse.de
+
+- buildrequire glib2-tools
+
+-------------------------------------------------------------------
Old:
----
entangle-0.3.1.tar.gz
New:
----
entangle-0.3.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ entangle.spec ++++++
--- /var/tmp/diff_new_pack.WuU7KZ/_old 2012-06-01 18:54:35.000000000 +0200
+++ /var/tmp/diff_new_pack.WuU7KZ/_new 2012-06-01 18:54:35.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package hello (Version 2.3)
+# spec file for package entangle
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -14,17 +14,26 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
+
Name: entangle
+BuildRequires: dbus-1-glib-devel
+BuildRequires: glib2-tools
+BuildRequires: gobject-introspection-devel
+BuildRequires: gtk3-devel
+BuildRequires: intltool
+BuildRequires: libgexiv2-devel
BuildRequires: libgphoto2-devel
-BuildRequires: perl-Template-Toolkit liblcms-devel
-BuildRequires: gtk3-devel libgudev-1_0-devel dbus-1-glib-devel libgexiv2-devel
-BuildRequires: gobject-introspection-devel libpeas-devel libtool
+BuildRequires: libgudev-1_0-devel
+BuildRequires: liblcms-devel
+BuildRequires: libpeas-devel
+BuildRequires: libtool
+BuildRequires: perl-Template-Toolkit
+Summary: A photobooth like application for libgphoto2
License: GPL-3.0+
Group: Development/Tools/Other
-AutoReqProv: on
-Summary: A photobooth like application for libgphoto2
-Version: 0.3.1
-Release: 79
+Version: 0.3.3
+Release: 0
Url: http://entangle-photo.org/
Source0: http://entangle-photo.org/download/sources/%name-%version.tar.gz
Patch0: entangle-desktop.patch
@@ -69,4 +78,8 @@
%dir /usr/share/gtk-doc/html
/usr/share/gtk-doc/html/Entangle
+%dir /usr/share/locale/si
+%dir /usr/share/locale/si/LC_MESSAGES
+/usr/share/locale/*/LC_MESSAGES/entangle.mo
+
%changelog
++++++ entangle-0.3.1.tar.gz -> entangle-0.3.3.tar.gz ++++++
++++ 30323 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at 2012-06-01 18:54:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
and /work/SRC/openSUSE:Factory/.xorg-x11-server.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xorg-x11-server", Maintainer is "sndirsch(a)suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes 2012-05-29 11:37:36.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xorg-x11-server.new/xorg-x11-server.changes 2012-06-01 18:54:25.000000000 +0200
@@ -1,0 +2,5 @@
+Wed May 30 14:56:53 UTC 2012 - tobias.johannes.klausmann(a)mni.thm.de
+
+- Update to version 1.12.2
+
+-------------------------------------------------------------------
Old:
----
xorg-server-1.12.1.tar.bz2
New:
----
xorg-server-1.12.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-server.spec ++++++
--- /var/tmp/diff_new_pack.8NHnxl/_old 2012-06-01 18:54:27.000000000 +0200
+++ /var/tmp/diff_new_pack.8NHnxl/_new 2012-06-01 18:54:27.000000000 +0200
@@ -16,12 +16,11 @@
#
-
Name: xorg-x11-server
-%define dirsuffix 1.12.1
+%define dirsuffix 1.12.2
%define vnc 1
-License: GPL-2.0+ ; MIT
Summary: X
+License: GPL-2.0+ ; MIT
Group: System/X11/Servers/XF86_4
Source0: xorg-server-%{dirsuffix}.tar.bz2
Source1: sysconfig.displaymanager.template
++++++ xorg-server-1.12.1.tar.bz2 -> xorg-server-1.12.2.tar.bz2 ++++++
++++ 271583 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package shorewall for openSUSE:Factory checked in at 2012-06-01 18:54:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/shorewall (Old)
and /work/SRC/openSUSE:Factory/.shorewall.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "shorewall", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/shorewall/shorewall.changes 2012-05-29 10:36:22.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.shorewall.new/shorewall.changes 2012-06-01 18:54:19.000000000 +0200
@@ -1,0 +2,27 @@
+Fri Jun 1 07:27:24 UTC 2012 - toganm(a)opensuse.org
+
+- Update to 4.5.4.1 For more details see changelog.txt and
+ releasenotes.txt
+
+ * Beginning with Shorewall 4.4.22, the 'pptpserver' tunnel type
+ has been configured as a PPTP client running on the firewall
+ rather than as a server on the firewall. It is now correctly
+ configured as a server.
+
+ * The shorewall-accounting (5) and shorewall6-accounting (5)
+ documentation for the IPSEC column is incorrect. Rather than
+ 'accountin' and 'accountout', the chain names should be
+ 'accipsecin' and 'accipsecout'.
+
+ * IPSEC accounting did not work if the accounting file was
+ sectioned. Beginning with this release, the IPSEC column can
+ be specified in any section. As always, the IPSEC column
+ contains a comma-separated list of items. In the FORWARD
+ chain, the first (or only) item in the list must be either
+ 'in' or 'out' to indicate whether the rule matches incoming
+ packets that have been decrypted ('in') or outgoing packets
+ that will be encrypted ('out'). There are no restrictions with
+ respect to which chain IPSEC rules can appear in a sectioned
+ file.
+
+-------------------------------------------------------------------
Old:
----
shorewall-4.5.4.tar.bz2
shorewall-core-4.5.4.tar.bz2
shorewall-docs-html-4.5.4.tar.bz2
shorewall-init-4.5.4.tar.bz2
shorewall-lite-4.5.4.tar.bz2
shorewall6-4.5.4.tar.bz2
shorewall6-lite-4.5.4.tar.bz2
New:
----
shorewall-4.5.4.1.tar.bz2
shorewall-core-4.5.4.1.tar.bz2
shorewall-docs-html-4.5.4.1.tar.bz2
shorewall-init-4.5.4.1.tar.bz2
shorewall-lite-4.5.4.1.tar.bz2
shorewall6-4.5.4.1.tar.bz2
shorewall6-lite-4.5.4.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ shorewall.spec ++++++
--- /var/tmp/diff_new_pack.8U528A/_old 2012-06-01 18:54:22.000000000 +0200
+++ /var/tmp/diff_new_pack.8U528A/_new 2012-06-01 18:54:22.000000000 +0200
@@ -17,7 +17,7 @@
Name: shorewall
-Version: 4.5.4
+Version: 4.5.4.1
Release: 0
Summary: Shoreline Firewall is an iptables-based firewall for Linux systems
License: GPL-2.0
++++++ shorewall-4.5.4.tar.bz2 -> shorewall-4.5.4.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/Perl/Shorewall/Accounting.pm new/shorewall-4.5.4.1/Perl/Shorewall/Accounting.pm
--- old/shorewall-4.5.4/Perl/Shorewall/Accounting.pm 2012-05-26 00:48:03.000000000 +0200
+++ new/shorewall-4.5.4.1/Perl/Shorewall/Accounting.pm 2012-05-31 21:45:24.000000000 +0200
@@ -46,6 +46,7 @@
my %accountingjumps;
my $asection;
my $defaultchain;
+my $ipsecdir;
my $defaultrestriction;
my $restriction;
my $accounting_commands = { COMMENT => 0, SECTION => 2 };
@@ -92,6 +93,7 @@
# These are the legacy values
#
$defaultchain = 'accounting';
+ $ipsecdir = '';
$defaultrestriction = NO_RESTRICT;
$sectionname = '';
}
@@ -111,20 +113,25 @@
if ( $sectionname eq 'INPUT' ) {
$defaultchain = 'accountin';
+ $ipsecdir = 'in';
$defaultrestriction = INPUT_RESTRICT;
} elsif ( $sectionname eq 'OUTPUT' ) {
$defaultchain = 'accountout';
+ $ipsecdir = 'out';
$defaultrestriction = OUTPUT_RESTRICT;
} elsif ( $sectionname eq 'FORWARD' ) {
$defaultchain = 'accountfwd';
+ $ipsecdir = '';
$defaultrestriction = NO_RESTRICT;
} else {
fatal_error "The $sectionname SECTION is not allowed when ACCOUNTING_TABLE=filter" unless $acctable eq 'mangle';
if ( $sectionname eq 'PREROUTING' ) {
$defaultchain = 'accountpre';
+ $ipsecdir = 'in';
$defaultrestriction = PREROUTE_RESTRICT;
} else {
$defaultchain = 'accountpost';
+ $ipsecdir = 'out';
$defaultrestriction = POSTROUTE_RESTRICT;
}
}
@@ -285,7 +292,21 @@
}
my $chainref = $chain_table{$config{ACCOUNTING_TABLE}}{$chain};
- my $dir;
+ my $dir = $ipsecdir;
+
+ if ( $asection && $ipsec ne '-' ) {
+ if ( $ipsecdir ) {
+ fatal_error "Invalid IPSEC ($ipsec)" if $ipsec =~ /^(?:in|out)\b/;
+ } else {
+ if ( $ipsec =~ s/^(?:(in|out)\b)// ) {
+ $dir = $1;
+ } else {
+ fatal_error q(IPSEC rules in the $asection section require that the value begin with 'in' or 'out');
+ }
+ }
+
+ $rule .= do_ipsec( $dir, $ipsec );
+ }
if ( ! $chainref ) {
if ( reserved_chain_name( $chain ) ) {
@@ -297,28 +318,32 @@
$chainref = ensure_accounting_chain $chain, 0 , $restriction;
}
- $dir = ipsec_chain_name( $chain );
+ unless ( $asection ) {
+ $dir = ipsec_chain_name( $chain );
- if ( $ipsec ne '-' ) {
- if ( $dir ) {
- $rule .= do_ipsec( $dir, $ipsec );
- $chainref->{ipsec} = $dir;
+ if ( $ipsec ne '-' ) {
+ if ( $dir ) {
+ $rule .= do_ipsec( $dir, $ipsec );
+ $chainref->{ipsec} = $dir;
+ } else {
+ fatal_error "Adding an IPSEC rule to an unreferenced accounting chain is not allowed";
+ }
} else {
- fatal_error "Adding an IPSEC rule to an unreferenced accounting chain is not allowed";
+ warning_message "Adding rule to unreferenced accounting chain $chain" unless reserved_chain_name( $chain );
+ $chainref->{ipsec} = $dir;
}
- } else {
- warning_message "Adding rule to unreferenced accounting chain $chain" unless reserved_chain_name( $chain );
- $chainref->{ipsec} = $dir;
}
} else {
fatal_error "$chain is not an accounting chain" unless $chainref->{accounting};
- if ( $ipsec ne '-' ) {
- $dir = $chainref->{ipsec};
- fatal_error "Adding an IPSEC rule into a non-IPSEC chain is not allowed" unless $dir;
- $rule .= do_ipsec( $dir , $ipsec );
- } elsif ( $asection ) {
- $restriction |= $chainref->{restriction};
+ unless ( $asection ) {
+ if ( $ipsec ne '-' ) {
+ $dir = $chainref->{ipsec};
+ fatal_error "Adding an IPSEC rule into a non-IPSEC chain is not allowed" unless $dir;
+ $rule .= do_ipsec( $dir , $ipsec );
+ } elsif ( $asection ) {
+ $restriction |= $chainref->{restriction};
+ }
}
}
@@ -366,7 +391,6 @@
} else {
$jumpchainref->{ipsec} = $chainref->{ipsec};
}
-
}
if ( $rule2 ) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/Perl/Shorewall/Config.pm new/shorewall-4.5.4.1/Perl/Shorewall/Config.pm
--- old/shorewall-4.5.4/Perl/Shorewall/Config.pm 2012-05-26 00:48:04.000000000 +0200
+++ new/shorewall-4.5.4.1/Perl/Shorewall/Config.pm 2012-05-31 21:45:24.000000000 +0200
@@ -515,7 +515,7 @@
KLUDGEFREE => '',
STATEMATCH => '-m state --state',
UNTRACKED => 0,
- VERSION => "4.5.4",
+ VERSION => "4.5.4.1",
CAPVERSION => 40504 ,
);
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/Perl/Shorewall/Rules.pm new/shorewall-4.5.4.1/Perl/Shorewall/Rules.pm
--- old/shorewall-4.5.4/Perl/Shorewall/Rules.pm 2012-05-26 00:48:04.000000000 +0200
+++ new/shorewall-4.5.4.1/Perl/Shorewall/Rules.pm 2012-05-31 21:45:24.000000000 +0200
@@ -2107,7 +2107,7 @@
} elsif ( $server =~ /^(.+)-(.+)$/ ) {
validate_range( $1, $2 );
} else {
- unless ( ( $actiontype & ACTION ) && $server eq ALLIP ) {
+ unless ( $server eq ALLIP ) {
my @servers = validate_address $server, 1;
$server = join ',', @servers;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/Perl/Shorewall/Tunnels.pm new/shorewall-4.5.4.1/Perl/Shorewall/Tunnels.pm
--- old/shorewall-4.5.4/Perl/Shorewall/Tunnels.pm 2012-05-26 00:48:04.000000000 +0200
+++ new/shorewall-4.5.4.1/Perl/Shorewall/Tunnels.pm 2012-05-31 21:45:24.000000000 +0200
@@ -2,7 +2,6 @@
# Shorewall 4.4 -- /usr/share/shorewall/Shorewall/Tunnels.pm
#
# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
-#
# (c) 2007,2008,2009,2010,2011 - Tom Eastep (teastep(a)shorewall.net)
#
# Complete documentation is available at http://shorewall.net
@@ -126,9 +125,9 @@
sub setup_pptp_server {
my ($inchainref, $outchainref, $kind, $source, $dest ) = @_;
- add_tunnel_rule $inchainref, p => 47, @$dest;
- add_tunnel_rule $outchainref, p => 47, @$source;
- add_tunnel_rule $inchainref, p => 'tcp --dport 1723', @$dest
+ add_tunnel_rule $inchainref, p => 47, @$source;
+ add_tunnel_rule $outchainref, p => 47, @$dest;
+ add_tunnel_rule $inchainref, p => 'tcp --dport 1723', @$source
}
sub setup_one_openvpn {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/changelog.txt new/shorewall-4.5.4.1/changelog.txt
--- old/shorewall-4.5.4/changelog.txt 2012-05-26 00:48:03.000000000 +0200
+++ new/shorewall-4.5.4.1/changelog.txt 2012-05-31 21:45:24.000000000 +0200
@@ -1,3 +1,9 @@
+Changes in 4.5.4.1
+
+1) Correct 'pptpserver' tunnel configuration.
+
+2) Fix IPSEC accounting.
+
Changes in 4.5.4 Final
1) Update the release documents.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/configfiles/accounting.annotated new/shorewall-4.5.4.1/configfiles/accounting.annotated
--- old/shorewall-4.5.4/configfiles/accounting.annotated 2012-05-26 00:49:28.000000000 +0200
+++ new/shorewall-4.5.4.1/configfiles/accounting.annotated 2012-05-31 21:46:49.000000000 +0200
@@ -269,7 +269,8 @@
# Designates a connection mark. If omitted, the packet mark's value is
# tested.
#
-# IPSEC - option-list (Optional - Added in Shorewall 4.4.13 )
+# IPSEC - option-list (Optional - Added in Shorewall 4.4.13 but broken until
+# 4.5.4.1 )
#
# The option-list consists of a comma-separated list of options from the
# following list. Only packets that will be encrypted or have been de-crypted
@@ -323,16 +324,27 @@
# When used by itself, causes all traffic that will not be encrypted/
# encapsulated or has been decrypted/un-encapsulted to match the rule.
#
-# If this column is non-empty, then:
+# in
#
-# ● A chain NAME may appearing in the ACTION column must be a chain
-# branched either directly or indirectly from the accountin or accountout
-# chain.
+# May only be used in the FORWARD section and must be the first or the
+# only item the list. Indicates that matching packets have been decrypted
+# in input.
#
-# ● The CHAIN column must contain either accountin or accountout or a chain
-# branched either directly or indirectly from those chains.
+# out
#
-# These rules will NOT appear in the accounting chain.
+# May only be used in the FORWARD section and must be the first or the
+# only item in the list. Indicates that matching packets will be
+# encrypted on output.
+#
+# If this column is non-empty and sections are not used, then:
+#
+# ● A chain NAME appearing in the ACTION column must be a chain branched
+# either directly or indirectly from the accipsecin or accipsecout chain.
+#
+# ● The CHAIN column must contain either accipsecin or accipsecout or a
+# chain branched either directly or indirectly from those chains.
+#
+# ● These rules will NOT appear in the accounting chain.
#
# In all of the above columns except ACTION and CHAIN, the values -, any and all
# may be used as wildcards. Omitted trailing columns are also treated as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/configure new/shorewall-4.5.4.1/configure
--- old/shorewall-4.5.4/configure 2012-05-26 00:48:03.000000000 +0200
+++ new/shorewall-4.5.4.1/configure 2012-05-31 21:45:24.000000000 +0200
@@ -28,7 +28,7 @@
#
# Build updates this
#
-VERSION=4.5.4
+VERSION=4.5.4.1
case "$BASH_VERSION" in
[4-9].*)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/configure.pl new/shorewall-4.5.4.1/configure.pl
--- old/shorewall-4.5.4/configure.pl 2012-05-26 00:48:03.000000000 +0200
+++ new/shorewall-4.5.4.1/configure.pl 2012-05-31 21:45:24.000000000 +0200
@@ -31,7 +31,7 @@
# Build updates this
#
use constant {
- VERSION => '4.5.4'
+ VERSION => '4.5.4.1'
};
my %params;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/install.sh new/shorewall-4.5.4.1/install.sh
--- old/shorewall-4.5.4/install.sh 2012-05-26 00:48:03.000000000 +0200
+++ new/shorewall-4.5.4.1/install.sh 2012-05-31 21:45:24.000000000 +0200
@@ -22,7 +22,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
-VERSION=4.5.4
+VERSION=4.5.4.1
#
# Change to the directory containing this script
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/known_problems.txt new/shorewall-4.5.4.1/known_problems.txt
--- old/shorewall-4.5.4/known_problems.txt 2012-05-26 00:48:03.000000000 +0200
+++ new/shorewall-4.5.4.1/known_problems.txt 2012-05-31 21:45:24.000000000 +0200
@@ -1,2 +1,20 @@
1) On systems running Upstart, shorewall-init cannot reliably secure
the firewall before interfaces are brought up.
+
+2) Beginning with Shorewall 4.4.22, the 'pptpserver' tunnel type has
+ been configured as a PPTP client running on the firewall rather
+ than as a server on the firewall.
+
+ Workaround: Configure the tunnel in the rules file rather than in
+ the tunnels file:
+
+ #ACTION SOURCE DEST PROTO DEST
+ # PORT(S)
+ ACCEPT net:<gateway> fw tcp 1723
+ ACCEPT net:<gateway> fw 47
+ ACCEPT fw net:<gateway> 47
+
+3) The shorewall-accounting (5) and shorewall6-accounting (5)
+ documentation for the IPSEC column is incorrect. Rather than
+ 'accountin' and 'accountout', the chain names should be
+ 'accipsecin' and 'accipsecout'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/manpages/shorewall-accounting.5 new/shorewall-4.5.4.1/manpages/shorewall-accounting.5
--- old/shorewall-4.5.4/manpages/shorewall-accounting.5 2012-05-26 00:48:06.000000000 +0200
+++ new/shorewall-4.5.4.1/manpages/shorewall-accounting.5 2012-05-31 21:45:27.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-accounting
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\-ACCOUNTIN" "5" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-ACCOUNTIN" "5" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -559,7 +559,7 @@
.RE
.RE
.PP
-\fBIPSEC \- \fR\fB\fIoption\-list\fR\fR\fB (Optional \- Added in Shorewall 4\&.4\&.13 )\fR
+\fBIPSEC \- \fR\fB\fIoption\-list\fR\fR\fB (Optional \- Added in Shorewall 4\&.4\&.13 but broken until 4\&.5\&.4\&.1 )\fR
.RS 4
The option\-list consists of a comma\-separated list of options from the following list\&. Only packets that will be encrypted or have been de\-crypted via an SA that matches these options will have their source address changed\&.
.PP
@@ -622,8 +622,18 @@
.RS 4
When used by itself, causes all traffic that will not be encrypted/encapsulated or has been decrypted/un\-encapsulted to match the rule\&.
.RE
+.PP
+\fBin\fR
+.RS 4
+May only be used in the FORWARD section and must be the first or the only item the list\&. Indicates that matching packets have been decrypted in input\&.
+.RE
+.PP
+\fBout\fR
+.RS 4
+May only be used in the FORWARD section and must be the first or the only item in the list\&. Indicates that matching packets will be encrypted on output\&.
+.RE
.sp
-If this column is non\-empty, then:
+If this column is non\-empty and sections are not used, then:
.sp
.RS 4
.ie n \{\
@@ -633,10 +643,10 @@
.sp -1
.IP \(bu 2.3
.\}
-A chain NAME may appearing in the ACTION column must be a chain branched either directly or indirectly from the
-\fBaccountin\fR
+A chain NAME appearing in the ACTION column must be a chain branched either directly or indirectly from the
+\fBaccipsecin\fR
or
-\fBaccountout\fR
+\fBaccipsecout\fR
chain\&.
.RE
.sp
@@ -649,16 +659,25 @@
.IP \(bu 2.3
.\}
The CHAIN column must contain either
-\fBaccountin\fR
+\fBaccipsecin\fR
or
-\fBaccountout\fR
+\fBaccipsecout\fR
or a chain branched either directly or indirectly from those chains\&.
.RE
.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
These rules will NOT appear in the
\fBaccounting\fR
chain\&.
.RE
+.RE
.PP
In all of the above columns except
\fBACTION\fR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/manpages/shorewall-actions.5 new/shorewall-4.5.4.1/manpages/shorewall-actions.5
--- old/shorewall-4.5.4/manpages/shorewall-actions.5 2012-05-26 00:48:08.000000000 +0200
+++ new/shorewall-4.5.4.1/manpages/shorewall-actions.5 2012-05-31 21:45:29.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-actions
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\-ACTIONS" "5" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-ACTIONS" "5" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/manpages/shorewall-blacklist.5 new/shorewall-4.5.4.1/manpages/shorewall-blacklist.5
--- old/shorewall-4.5.4/manpages/shorewall-blacklist.5 2012-05-26 00:48:10.000000000 +0200
+++ new/shorewall-4.5.4.1/manpages/shorewall-blacklist.5 2012-05-31 21:45:31.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-blacklist
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\-BLACKLIST" "5" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-BLACKLIST" "5" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/manpages/shorewall-blrules.5 new/shorewall-4.5.4.1/manpages/shorewall-blrules.5
--- old/shorewall-4.5.4/manpages/shorewall-blrules.5 2012-05-26 00:48:12.000000000 +0200
+++ new/shorewall-4.5.4.1/manpages/shorewall-blrules.5 2012-05-31 21:45:33.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-blrules
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\-BLRULES" "5" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-BLRULES" "5" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/manpages/shorewall-ecn.5 new/shorewall-4.5.4.1/manpages/shorewall-ecn.5
--- old/shorewall-4.5.4/manpages/shorewall-ecn.5 2012-05-26 00:48:18.000000000 +0200
+++ new/shorewall-4.5.4.1/manpages/shorewall-ecn.5 2012-05-31 21:45:39.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-ecn
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\-ECN" "5" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-ECN" "5" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/manpages/shorewall-exclusion.5 new/shorewall-4.5.4.1/manpages/shorewall-exclusion.5
--- old/shorewall-4.5.4/manpages/shorewall-exclusion.5 2012-05-26 00:48:20.000000000 +0200
+++ new/shorewall-4.5.4.1/manpages/shorewall-exclusion.5 2012-05-31 21:45:41.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-exclusion
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\-EXCLUSION" "5" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-EXCLUSION" "5" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/manpages/shorewall-hosts.5 new/shorewall-4.5.4.1/manpages/shorewall-hosts.5
--- old/shorewall-4.5.4/manpages/shorewall-hosts.5 2012-05-26 00:48:22.000000000 +0200
+++ new/shorewall-4.5.4.1/manpages/shorewall-hosts.5 2012-05-31 21:45:43.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-hosts
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\-HOSTS" "5" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-HOSTS" "5" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/manpages/shorewall-init.8 new/shorewall-4.5.4.1/manpages/shorewall-init.8
--- old/shorewall-4.5.4/manpages/shorewall-init.8 2012-05-26 00:48:24.000000000 +0200
+++ new/shorewall-4.5.4.1/manpages/shorewall-init.8 2012-05-31 21:45:45.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-init
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\-INIT" "8" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-INIT" "8" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/manpages/shorewall-interfaces.5 new/shorewall-4.5.4.1/manpages/shorewall-interfaces.5
--- old/shorewall-4.5.4/manpages/shorewall-interfaces.5 2012-05-26 00:48:27.000000000 +0200
+++ new/shorewall-4.5.4.1/manpages/shorewall-interfaces.5 2012-05-31 21:45:48.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-interfaces
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\-INTERFACE" "5" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-INTERFACE" "5" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/manpages/shorewall-ipsets.5 new/shorewall-4.5.4.1/manpages/shorewall-ipsets.5
--- old/shorewall-4.5.4/manpages/shorewall-ipsets.5 2012-05-26 00:48:29.000000000 +0200
+++ new/shorewall-4.5.4.1/manpages/shorewall-ipsets.5 2012-05-31 21:45:50.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-ipsets
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\-IPSETS" "5" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-IPSETS" "5" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/manpages/shorewall-maclist.5 new/shorewall-4.5.4.1/manpages/shorewall-maclist.5
--- old/shorewall-4.5.4/manpages/shorewall-maclist.5 2012-05-26 00:48:31.000000000 +0200
+++ new/shorewall-4.5.4.1/manpages/shorewall-maclist.5 2012-05-31 21:45:52.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-maclist
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\-MACLIST" "5" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-MACLIST" "5" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/manpages/shorewall-masq.5 new/shorewall-4.5.4.1/manpages/shorewall-masq.5
--- old/shorewall-4.5.4/manpages/shorewall-masq.5 2012-05-26 00:48:33.000000000 +0200
+++ new/shorewall-4.5.4.1/manpages/shorewall-masq.5 2012-05-31 21:45:54.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-masq
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\-MASQ" "5" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-MASQ" "5" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/manpages/shorewall-modules.5 new/shorewall-4.5.4.1/manpages/shorewall-modules.5
--- old/shorewall-4.5.4/manpages/shorewall-modules.5 2012-05-26 00:48:35.000000000 +0200
+++ new/shorewall-4.5.4.1/manpages/shorewall-modules.5 2012-05-31 21:45:56.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-modules
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\-MODULES" "5" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-MODULES" "5" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/manpages/shorewall-nat.5 new/shorewall-4.5.4.1/manpages/shorewall-nat.5
--- old/shorewall-4.5.4/manpages/shorewall-nat.5 2012-05-26 00:48:37.000000000 +0200
+++ new/shorewall-4.5.4.1/manpages/shorewall-nat.5 2012-05-31 21:45:58.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-nat
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\-NAT" "5" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-NAT" "5" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/manpages/shorewall-nesting.5 new/shorewall-4.5.4.1/manpages/shorewall-nesting.5
--- old/shorewall-4.5.4/manpages/shorewall-nesting.5 2012-05-26 00:48:39.000000000 +0200
+++ new/shorewall-4.5.4.1/manpages/shorewall-nesting.5 2012-05-31 21:46:00.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-nesting
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\-NESTING" "5" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-NESTING" "5" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/manpages/shorewall-netmap.5 new/shorewall-4.5.4.1/manpages/shorewall-netmap.5
--- old/shorewall-4.5.4/manpages/shorewall-netmap.5 2012-05-26 00:48:41.000000000 +0200
+++ new/shorewall-4.5.4.1/manpages/shorewall-netmap.5 2012-05-31 21:46:02.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-netmap
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\-NETMAP" "5" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-NETMAP" "5" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/manpages/shorewall-notrack.5 new/shorewall-4.5.4.1/manpages/shorewall-notrack.5
--- old/shorewall-4.5.4/manpages/shorewall-notrack.5 2012-05-26 00:48:43.000000000 +0200
+++ new/shorewall-4.5.4.1/manpages/shorewall-notrack.5 2012-05-31 21:46:04.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall6-notrack
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL6\-NOTRACK" "5" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL6\-NOTRACK" "5" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/manpages/shorewall-params.5 new/shorewall-4.5.4.1/manpages/shorewall-params.5
--- old/shorewall-4.5.4/manpages/shorewall-params.5 2012-05-26 00:48:45.000000000 +0200
+++ new/shorewall-4.5.4.1/manpages/shorewall-params.5 2012-05-31 21:46:06.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-params
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\-PARAMS" "5" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-PARAMS" "5" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/manpages/shorewall-policy.5 new/shorewall-4.5.4.1/manpages/shorewall-policy.5
--- old/shorewall-4.5.4/manpages/shorewall-policy.5 2012-05-26 00:48:47.000000000 +0200
+++ new/shorewall-4.5.4.1/manpages/shorewall-policy.5 2012-05-31 21:46:08.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-policy
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\-POLICY" "5" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-POLICY" "5" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/manpages/shorewall-providers.5 new/shorewall-4.5.4.1/manpages/shorewall-providers.5
--- old/shorewall-4.5.4/manpages/shorewall-providers.5 2012-05-26 00:48:49.000000000 +0200
+++ new/shorewall-4.5.4.1/manpages/shorewall-providers.5 2012-05-31 21:46:10.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-providers
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\-PROVIDERS" "5" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-PROVIDERS" "5" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/manpages/shorewall-proxyarp.5 new/shorewall-4.5.4.1/manpages/shorewall-proxyarp.5
--- old/shorewall-4.5.4/manpages/shorewall-proxyarp.5 2012-05-26 00:48:51.000000000 +0200
+++ new/shorewall-4.5.4.1/manpages/shorewall-proxyarp.5 2012-05-31 21:46:12.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-proxyarp
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\-PROXYARP" "5" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-PROXYARP" "5" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/manpages/shorewall-routes.5 new/shorewall-4.5.4.1/manpages/shorewall-routes.5
--- old/shorewall-4.5.4/manpages/shorewall-routes.5 2012-05-26 00:48:55.000000000 +0200
+++ new/shorewall-4.5.4.1/manpages/shorewall-routes.5 2012-05-31 21:46:16.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-routes
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\-ROUTES" "5" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-ROUTES" "5" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/manpages/shorewall-routestopped.5 new/shorewall-4.5.4.1/manpages/shorewall-routestopped.5
--- old/shorewall-4.5.4/manpages/shorewall-routestopped.5 2012-05-26 00:48:53.000000000 +0200
+++ new/shorewall-4.5.4.1/manpages/shorewall-routestopped.5 2012-05-31 21:46:14.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-routestopped
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\-ROUTESTOP" "5" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-ROUTESTOP" "5" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/manpages/shorewall-rtrules.5 new/shorewall-4.5.4.1/manpages/shorewall-rtrules.5
--- old/shorewall-4.5.4/manpages/shorewall-rtrules.5 2012-05-26 00:48:57.000000000 +0200
+++ new/shorewall-4.5.4.1/manpages/shorewall-rtrules.5 2012-05-31 21:46:19.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-rtrules
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\-RTRULES" "5" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-RTRULES" "5" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/manpages/shorewall-rules.5 new/shorewall-4.5.4.1/manpages/shorewall-rules.5
--- old/shorewall-4.5.4/manpages/shorewall-rules.5 2012-05-26 00:49:00.000000000 +0200
+++ new/shorewall-4.5.4.1/manpages/shorewall-rules.5 2012-05-31 21:46:21.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-rules
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\-RULES" "5" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-RULES" "5" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/manpages/shorewall-secmarks.5 new/shorewall-4.5.4.1/manpages/shorewall-secmarks.5
--- old/shorewall-4.5.4/manpages/shorewall-secmarks.5 2012-05-26 00:49:02.000000000 +0200
+++ new/shorewall-4.5.4.1/manpages/shorewall-secmarks.5 2012-05-31 21:46:23.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-secmarks
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\-SECMARKS" "5" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-SECMARKS" "5" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/manpages/shorewall-tcclasses.5 new/shorewall-4.5.4.1/manpages/shorewall-tcclasses.5
--- old/shorewall-4.5.4/manpages/shorewall-tcclasses.5 2012-05-26 00:49:04.000000000 +0200
+++ new/shorewall-4.5.4.1/manpages/shorewall-tcclasses.5 2012-05-31 21:46:26.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-tcclasses
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\-TCCLASSES" "5" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-TCCLASSES" "5" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/manpages/shorewall-tcdevices.5 new/shorewall-4.5.4.1/manpages/shorewall-tcdevices.5
--- old/shorewall-4.5.4/manpages/shorewall-tcdevices.5 2012-05-26 00:49:06.000000000 +0200
+++ new/shorewall-4.5.4.1/manpages/shorewall-tcdevices.5 2012-05-31 21:46:28.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-tcdevices
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\-TCDEVICES" "5" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-TCDEVICES" "5" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/manpages/shorewall-tcfilters.5 new/shorewall-4.5.4.1/manpages/shorewall-tcfilters.5
--- old/shorewall-4.5.4/manpages/shorewall-tcfilters.5 2012-05-26 00:49:09.000000000 +0200
+++ new/shorewall-4.5.4.1/manpages/shorewall-tcfilters.5 2012-05-31 21:46:30.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-tcfilters
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\-TCFILTERS" "5" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-TCFILTERS" "5" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/manpages/shorewall-tcinterfaces.5 new/shorewall-4.5.4.1/manpages/shorewall-tcinterfaces.5
--- old/shorewall-4.5.4/manpages/shorewall-tcinterfaces.5 2012-05-26 00:49:11.000000000 +0200
+++ new/shorewall-4.5.4.1/manpages/shorewall-tcinterfaces.5 2012-05-31 21:46:32.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-tcinterfaces
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\-TCINTERFA" "5" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-TCINTERFA" "5" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/manpages/shorewall-tcpri.5 new/shorewall-4.5.4.1/manpages/shorewall-tcpri.5
--- old/shorewall-4.5.4/manpages/shorewall-tcpri.5 2012-05-26 00:49:13.000000000 +0200
+++ new/shorewall-4.5.4.1/manpages/shorewall-tcpri.5 2012-05-31 21:46:34.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-tcpri
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\-TCPRI" "5" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-TCPRI" "5" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/manpages/shorewall-tcrules.5 new/shorewall-4.5.4.1/manpages/shorewall-tcrules.5
--- old/shorewall-4.5.4/manpages/shorewall-tcrules.5 2012-05-26 00:49:15.000000000 +0200
+++ new/shorewall-4.5.4.1/manpages/shorewall-tcrules.5 2012-05-31 21:46:36.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-tcrules
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\-TCRULES" "5" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-TCRULES" "5" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/manpages/shorewall-tos.5 new/shorewall-4.5.4.1/manpages/shorewall-tos.5
--- old/shorewall-4.5.4/manpages/shorewall-tos.5 2012-05-26 00:49:17.000000000 +0200
+++ new/shorewall-4.5.4.1/manpages/shorewall-tos.5 2012-05-31 21:46:38.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-tos
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\-TOS" "5" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-TOS" "5" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/manpages/shorewall-tunnels.5 new/shorewall-4.5.4.1/manpages/shorewall-tunnels.5
--- old/shorewall-4.5.4/manpages/shorewall-tunnels.5 2012-05-26 00:49:19.000000000 +0200
+++ new/shorewall-4.5.4.1/manpages/shorewall-tunnels.5 2012-05-31 21:46:40.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-tunnels
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\-TUNNELS" "5" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-TUNNELS" "5" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/manpages/shorewall-vardir.5 new/shorewall-4.5.4.1/manpages/shorewall-vardir.5
--- old/shorewall-4.5.4/manpages/shorewall-vardir.5 2012-05-26 00:49:21.000000000 +0200
+++ new/shorewall-4.5.4.1/manpages/shorewall-vardir.5 2012-05-31 21:46:42.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-vardir
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\-VARDIR" "5" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-VARDIR" "5" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/manpages/shorewall-zones.5 new/shorewall-4.5.4.1/manpages/shorewall-zones.5
--- old/shorewall-4.5.4/manpages/shorewall-zones.5 2012-05-26 00:49:26.000000000 +0200
+++ new/shorewall-4.5.4.1/manpages/shorewall-zones.5 2012-05-31 21:46:47.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-zones
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\-ZONES" "5" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-ZONES" "5" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/manpages/shorewall.8 new/shorewall-4.5.4.1/manpages/shorewall.8
--- old/shorewall-4.5.4/manpages/shorewall.8 2012-05-26 00:49:24.000000000 +0200
+++ new/shorewall-4.5.4.1/manpages/shorewall.8 2012-05-31 21:46:45.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL" "8" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL" "8" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/manpages/shorewall.conf.5 new/shorewall-4.5.4.1/manpages/shorewall.conf.5
--- old/shorewall-4.5.4/manpages/shorewall.conf.5 2012-05-26 00:48:16.000000000 +0200
+++ new/shorewall-4.5.4.1/manpages/shorewall.conf.5 2012-05-31 21:45:37.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall.conf
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\&.CONF" "5" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\&.CONF" "5" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/releasenotes.txt new/shorewall-4.5.4.1/releasenotes.txt
--- old/shorewall-4.5.4/releasenotes.txt 2012-05-26 00:48:03.000000000 +0200
+++ new/shorewall-4.5.4.1/releasenotes.txt 2012-05-31 21:45:24.000000000 +0200
@@ -1,7 +1,7 @@
----------------------------------------------------------------------------
- S H O R E W A L L 4 . 5 . 4
+ S H O R E W A L L 4 . 5 . 4 . 1
------------------------------------
- M a y 2 6 , 2 0 1 2
+ J u n e 0 1 , 2 0 1 2
----------------------------------------------------------------------------
I. PROBLEMS CORRECTED IN THIS RELEASE
@@ -15,6 +15,20 @@
I. P R O B L E M S C O R R E C T E D I N T H I S R E L E A S E
----------------------------------------------------------------------------
+4.5.4.1
+
+1) Beginning with Shorewall 4.4.22, the 'pptpserver' tunnel type has
+ been configured as a PPTP client running on the firewall rather
+ than as a server on the firewall. It is now correctly configured as
+ a server.
+
+2) The shorewall-accounting (5) and shorewall6-accounting (5)
+ documentation for the IPSEC column is incorrect. Rather than
+ 'accountin' and 'accountout', the chain names should be
+ 'accipsecin' and 'accipsecout'.
+
+4.5.4
+
1) This release includes all defect repairs from Shorewall 4.5.3.1.
2) When EXPORTMODULES=No in shorewall.conf, the following errors were
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/shorewall.spec new/shorewall-4.5.4.1/shorewall.spec
--- old/shorewall-4.5.4/shorewall.spec 2012-05-26 00:48:03.000000000 +0200
+++ new/shorewall-4.5.4.1/shorewall.spec 2012-05-31 21:45:24.000000000 +0200
@@ -1,6 +1,6 @@
%define name shorewall
%define version 4.5.4
-%define release 0base
+%define release 1
Summary: Shoreline Firewall is an iptables-based firewall for Linux systems.
Name: %{name}
@@ -118,6 +118,8 @@
%doc COPYING INSTALL changelog.txt releasenotes.txt Contrib/* Samples
%changelog
+* Tue May 29 2012 Tom Eastep tom(a)shorewall.net
+- Updated to 4.5.4-1
* Thu May 24 2012 Tom Eastep tom(a)shorewall.net
- Updated to 4.5.4-0base
* Tue May 22 2012 Tom Eastep tom(a)shorewall.net
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.4/uninstall.sh new/shorewall-4.5.4.1/uninstall.sh
--- old/shorewall-4.5.4/uninstall.sh 2012-05-26 00:48:03.000000000 +0200
+++ new/shorewall-4.5.4.1/uninstall.sh 2012-05-31 21:45:24.000000000 +0200
@@ -26,7 +26,7 @@
# You may only use this script to uninstall the version
# shown below. Simply run this script to remove Shorewall Firewall
-VERSION=4.5.4
+VERSION=4.5.4.1
usage() # $1 = exit status
{
++++++ shorewall-core-4.5.4.tar.bz2 -> shorewall-core-4.5.4.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-4.5.4/changelog.txt new/shorewall-core-4.5.4.1/changelog.txt
--- old/shorewall-core-4.5.4/changelog.txt 2012-05-26 00:48:03.000000000 +0200
+++ new/shorewall-core-4.5.4.1/changelog.txt 2012-05-31 21:45:24.000000000 +0200
@@ -1,3 +1,9 @@
+Changes in 4.5.4.1
+
+1) Correct 'pptpserver' tunnel configuration.
+
+2) Fix IPSEC accounting.
+
Changes in 4.5.4 Final
1) Update the release documents.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-4.5.4/configure new/shorewall-core-4.5.4.1/configure
--- old/shorewall-core-4.5.4/configure 2012-05-26 00:48:03.000000000 +0200
+++ new/shorewall-core-4.5.4.1/configure 2012-05-31 21:45:24.000000000 +0200
@@ -28,7 +28,7 @@
#
# Build updates this
#
-VERSION=4.5.4
+VERSION=4.5.4.1
case "$BASH_VERSION" in
[4-9].*)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-4.5.4/configure.pl new/shorewall-core-4.5.4.1/configure.pl
--- old/shorewall-core-4.5.4/configure.pl 2012-05-26 00:48:03.000000000 +0200
+++ new/shorewall-core-4.5.4.1/configure.pl 2012-05-31 21:45:24.000000000 +0200
@@ -31,7 +31,7 @@
# Build updates this
#
use constant {
- VERSION => '4.5.4'
+ VERSION => '4.5.4.1'
};
my %params;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-4.5.4/install.sh new/shorewall-core-4.5.4.1/install.sh
--- old/shorewall-core-4.5.4/install.sh 2012-05-26 00:48:03.000000000 +0200
+++ new/shorewall-core-4.5.4.1/install.sh 2012-05-31 21:45:24.000000000 +0200
@@ -22,7 +22,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
-VERSION=4.5.4
+VERSION=4.5.4.1
usage() # $1 = exit status
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-4.5.4/known_problems.txt new/shorewall-core-4.5.4.1/known_problems.txt
--- old/shorewall-core-4.5.4/known_problems.txt 2012-05-26 00:48:03.000000000 +0200
+++ new/shorewall-core-4.5.4.1/known_problems.txt 2012-05-31 21:45:24.000000000 +0200
@@ -1,2 +1,20 @@
1) On systems running Upstart, shorewall-init cannot reliably secure
the firewall before interfaces are brought up.
+
+2) Beginning with Shorewall 4.4.22, the 'pptpserver' tunnel type has
+ been configured as a PPTP client running on the firewall rather
+ than as a server on the firewall.
+
+ Workaround: Configure the tunnel in the rules file rather than in
+ the tunnels file:
+
+ #ACTION SOURCE DEST PROTO DEST
+ # PORT(S)
+ ACCEPT net:<gateway> fw tcp 1723
+ ACCEPT net:<gateway> fw 47
+ ACCEPT fw net:<gateway> 47
+
+3) The shorewall-accounting (5) and shorewall6-accounting (5)
+ documentation for the IPSEC column is incorrect. Rather than
+ 'accountin' and 'accountout', the chain names should be
+ 'accipsecin' and 'accipsecout'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-4.5.4/releasenotes.txt new/shorewall-core-4.5.4.1/releasenotes.txt
--- old/shorewall-core-4.5.4/releasenotes.txt 2012-05-26 00:48:03.000000000 +0200
+++ new/shorewall-core-4.5.4.1/releasenotes.txt 2012-05-31 21:45:24.000000000 +0200
@@ -1,7 +1,7 @@
----------------------------------------------------------------------------
- S H O R E W A L L 4 . 5 . 4
+ S H O R E W A L L 4 . 5 . 4 . 1
------------------------------------
- M a y 2 6 , 2 0 1 2
+ J u n e 0 1 , 2 0 1 2
----------------------------------------------------------------------------
I. PROBLEMS CORRECTED IN THIS RELEASE
@@ -15,6 +15,20 @@
I. P R O B L E M S C O R R E C T E D I N T H I S R E L E A S E
----------------------------------------------------------------------------
+4.5.4.1
+
+1) Beginning with Shorewall 4.4.22, the 'pptpserver' tunnel type has
+ been configured as a PPTP client running on the firewall rather
+ than as a server on the firewall. It is now correctly configured as
+ a server.
+
+2) The shorewall-accounting (5) and shorewall6-accounting (5)
+ documentation for the IPSEC column is incorrect. Rather than
+ 'accountin' and 'accountout', the chain names should be
+ 'accipsecin' and 'accipsecout'.
+
+4.5.4
+
1) This release includes all defect repairs from Shorewall 4.5.3.1.
2) When EXPORTMODULES=No in shorewall.conf, the following errors were
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-4.5.4/shorewall-core.spec new/shorewall-core-4.5.4.1/shorewall-core.spec
--- old/shorewall-core-4.5.4/shorewall-core.spec 2012-05-26 00:48:03.000000000 +0200
+++ new/shorewall-core-4.5.4.1/shorewall-core.spec 2012-05-31 21:45:24.000000000 +0200
@@ -1,6 +1,6 @@
%define name shorewall-core
%define version 4.5.4
-%define release 0base
+%define release 1
Summary: Shoreline Firewall is an iptables-based firewall for Linux systems.
Name: %{name}
@@ -62,6 +62,8 @@
%doc COPYING INSTALL changelog.txt releasenotes.txt
%changelog
+* Tue May 29 2012 Tom Eastep tom(a)shorewall.net
+- Updated to 4.5.4-1
* Thu May 24 2012 Tom Eastep tom(a)shorewall.net
- Updated to 4.5.4-0base
* Tue May 22 2012 Tom Eastep tom(a)shorewall.net
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-4.5.4/uninstall.sh new/shorewall-core-4.5.4.1/uninstall.sh
--- old/shorewall-core-4.5.4/uninstall.sh 2012-05-26 00:48:03.000000000 +0200
+++ new/shorewall-core-4.5.4.1/uninstall.sh 2012-05-31 21:45:24.000000000 +0200
@@ -26,7 +26,7 @@
# You may only use this script to uninstall the version
# shown below. Simply run this script to remove Shorewall Firewall
-VERSION=4.5.4
+VERSION=4.5.4.1
usage() # $1 = exit status
{
++++++ shorewall-docs-html-4.5.4.tar.bz2 -> shorewall-docs-html-4.5.4.1.tar.bz2 ++++++
++++ 6190 lines of diff (skipped)
++++++ shorewall-init-4.5.4.tar.bz2 -> shorewall-init-4.5.4.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-init-4.5.4/changelog.txt new/shorewall-init-4.5.4.1/changelog.txt
--- old/shorewall-init-4.5.4/changelog.txt 2012-05-26 00:48:04.000000000 +0200
+++ new/shorewall-init-4.5.4.1/changelog.txt 2012-05-31 21:45:25.000000000 +0200
@@ -1,3 +1,9 @@
+Changes in 4.5.4.1
+
+1) Correct 'pptpserver' tunnel configuration.
+
+2) Fix IPSEC accounting.
+
Changes in 4.5.4 Final
1) Update the release documents.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-init-4.5.4/configure new/shorewall-init-4.5.4.1/configure
--- old/shorewall-init-4.5.4/configure 2012-05-26 00:48:04.000000000 +0200
+++ new/shorewall-init-4.5.4.1/configure 2012-05-31 21:45:25.000000000 +0200
@@ -28,7 +28,7 @@
#
# Build updates this
#
-VERSION=4.5.4
+VERSION=4.5.4.1
case "$BASH_VERSION" in
[4-9].*)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-init-4.5.4/configure.pl new/shorewall-init-4.5.4.1/configure.pl
--- old/shorewall-init-4.5.4/configure.pl 2012-05-26 00:48:04.000000000 +0200
+++ new/shorewall-init-4.5.4.1/configure.pl 2012-05-31 21:45:25.000000000 +0200
@@ -31,7 +31,7 @@
# Build updates this
#
use constant {
- VERSION => '4.5.4'
+ VERSION => '4.5.4.1'
};
my %params;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-init-4.5.4/install.sh new/shorewall-init-4.5.4.1/install.sh
--- old/shorewall-init-4.5.4/install.sh 2012-05-26 00:48:04.000000000 +0200
+++ new/shorewall-init-4.5.4.1/install.sh 2012-05-31 21:45:25.000000000 +0200
@@ -23,7 +23,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
-VERSION=4.5.4
+VERSION=4.5.4.1
usage() # $1 = exit status
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-init-4.5.4/releasenotes.txt new/shorewall-init-4.5.4.1/releasenotes.txt
--- old/shorewall-init-4.5.4/releasenotes.txt 2012-05-26 00:48:04.000000000 +0200
+++ new/shorewall-init-4.5.4.1/releasenotes.txt 2012-05-31 21:45:25.000000000 +0200
@@ -1,7 +1,7 @@
----------------------------------------------------------------------------
- S H O R E W A L L 4 . 5 . 4
+ S H O R E W A L L 4 . 5 . 4 . 1
------------------------------------
- M a y 2 6 , 2 0 1 2
+ J u n e 0 1 , 2 0 1 2
----------------------------------------------------------------------------
I. PROBLEMS CORRECTED IN THIS RELEASE
@@ -15,6 +15,20 @@
I. P R O B L E M S C O R R E C T E D I N T H I S R E L E A S E
----------------------------------------------------------------------------
+4.5.4.1
+
+1) Beginning with Shorewall 4.4.22, the 'pptpserver' tunnel type has
+ been configured as a PPTP client running on the firewall rather
+ than as a server on the firewall. It is now correctly configured as
+ a server.
+
+2) The shorewall-accounting (5) and shorewall6-accounting (5)
+ documentation for the IPSEC column is incorrect. Rather than
+ 'accountin' and 'accountout', the chain names should be
+ 'accipsecin' and 'accipsecout'.
+
+4.5.4
+
1) This release includes all defect repairs from Shorewall 4.5.3.1.
2) When EXPORTMODULES=No in shorewall.conf, the following errors were
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-init-4.5.4/shorewall-init.spec new/shorewall-init-4.5.4.1/shorewall-init.spec
--- old/shorewall-init-4.5.4/shorewall-init.spec 2012-05-26 00:48:04.000000000 +0200
+++ new/shorewall-init-4.5.4.1/shorewall-init.spec 2012-05-31 21:45:25.000000000 +0200
@@ -1,6 +1,6 @@
%define name shorewall-init
%define version 4.5.4
-%define release 0base
+%define release 1
Summary: Shorewall-init adds functionality to Shoreline Firewall (Shorewall).
Name: %{name}
@@ -123,6 +123,8 @@
%doc COPYING changelog.txt releasenotes.txt
%changelog
+* Tue May 29 2012 Tom Eastep tom(a)shorewall.net
+- Updated to 4.5.4-1
* Thu May 24 2012 Tom Eastep tom(a)shorewall.net
- Updated to 4.5.4-0base
* Tue May 22 2012 Tom Eastep tom(a)shorewall.net
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-init-4.5.4/uninstall.sh new/shorewall-init-4.5.4.1/uninstall.sh
--- old/shorewall-init-4.5.4/uninstall.sh 2012-05-26 00:48:04.000000000 +0200
+++ new/shorewall-init-4.5.4.1/uninstall.sh 2012-05-31 21:45:25.000000000 +0200
@@ -26,7 +26,7 @@
# You may only use this script to uninstall the version
# shown below. Simply run this script to remove Shorewall Firewall
-VERSION=4.5.4
+VERSION=4.5.4.1
usage() # $1 = exit status
{
++++++ shorewall-lite-4.5.4.tar.bz2 -> shorewall-lite-4.5.4.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.5.4/changelog.txt new/shorewall-lite-4.5.4.1/changelog.txt
--- old/shorewall-lite-4.5.4/changelog.txt 2012-05-26 00:48:04.000000000 +0200
+++ new/shorewall-lite-4.5.4.1/changelog.txt 2012-05-31 21:45:25.000000000 +0200
@@ -1,3 +1,9 @@
+Changes in 4.5.4.1
+
+1) Correct 'pptpserver' tunnel configuration.
+
+2) Fix IPSEC accounting.
+
Changes in 4.5.4 Final
1) Update the release documents.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.5.4/configure new/shorewall-lite-4.5.4.1/configure
--- old/shorewall-lite-4.5.4/configure 2012-05-26 00:48:04.000000000 +0200
+++ new/shorewall-lite-4.5.4.1/configure 2012-05-31 21:45:25.000000000 +0200
@@ -28,7 +28,7 @@
#
# Build updates this
#
-VERSION=4.5.4
+VERSION=4.5.4.1
case "$BASH_VERSION" in
[4-9].*)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.5.4/configure.pl new/shorewall-lite-4.5.4.1/configure.pl
--- old/shorewall-lite-4.5.4/configure.pl 2012-05-26 00:48:04.000000000 +0200
+++ new/shorewall-lite-4.5.4.1/configure.pl 2012-05-31 21:45:25.000000000 +0200
@@ -31,7 +31,7 @@
# Build updates this
#
use constant {
- VERSION => '4.5.4'
+ VERSION => '4.5.4.1'
};
my %params;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.5.4/install.sh new/shorewall-lite-4.5.4.1/install.sh
--- old/shorewall-lite-4.5.4/install.sh 2012-05-26 00:48:04.000000000 +0200
+++ new/shorewall-lite-4.5.4.1/install.sh 2012-05-31 21:45:25.000000000 +0200
@@ -22,7 +22,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
-VERSION=4.5.4
+VERSION=4.5.4.1
usage() # $1 = exit status
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.5.4/manpages/shorewall-lite-vardir.5 new/shorewall-lite-4.5.4.1/manpages/shorewall-lite-vardir.5
--- old/shorewall-lite-4.5.4/manpages/shorewall-lite-vardir.5 2012-05-26 00:53:32.000000000 +0200
+++ new/shorewall-lite-4.5.4.1/manpages/shorewall-lite-vardir.5 2012-05-31 21:50:55.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-lite-vardir
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\-LITE\-VAR" "5" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-LITE\-VAR" "5" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.5.4/manpages/shorewall-lite.8 new/shorewall-lite-4.5.4.1/manpages/shorewall-lite.8
--- old/shorewall-lite-4.5.4/manpages/shorewall-lite.8 2012-05-26 00:53:34.000000000 +0200
+++ new/shorewall-lite-4.5.4.1/manpages/shorewall-lite.8 2012-05-31 21:50:57.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-lite
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\-LITE" "8" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-LITE" "8" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.5.4/manpages/shorewall-lite.conf.5 new/shorewall-lite-4.5.4.1/manpages/shorewall-lite.conf.5
--- old/shorewall-lite-4.5.4/manpages/shorewall-lite.conf.5 2012-05-26 00:53:30.000000000 +0200
+++ new/shorewall-lite-4.5.4.1/manpages/shorewall-lite.conf.5 2012-05-31 21:50:52.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-lite.conf
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 05/25/2012
+.\" Date: 05/31/2012
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\-LITE\&.CO" "5" "05/25/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-LITE\&.CO" "5" "05/31/2012" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.5.4/releasenotes.txt new/shorewall-lite-4.5.4.1/releasenotes.txt
--- old/shorewall-lite-4.5.4/releasenotes.txt 2012-05-26 00:48:04.000000000 +0200
+++ new/shorewall-lite-4.5.4.1/releasenotes.txt 2012-05-31 21:45:25.000000000 +0200
@@ -1,7 +1,7 @@
----------------------------------------------------------------------------
- S H O R E W A L L 4 . 5 . 4
+ S H O R E W A L L 4 . 5 . 4 . 1
------------------------------------
- M a y 2 6 , 2 0 1 2
+ J u n e 0 1 , 2 0 1 2
----------------------------------------------------------------------------
I. PROBLEMS CORRECTED IN THIS RELEASE
@@ -15,6 +15,20 @@
I. P R O B L E M S C O R R E C T E D I N T H I S R E L E A S E
----------------------------------------------------------------------------
+4.5.4.1
+
+1) Beginning with Shorewall 4.4.22, the 'pptpserver' tunnel type has
+ been configured as a PPTP client running on the firewall rather
+ than as a server on the firewall. It is now correctly configured as
+ a server.
+
+2) The shorewall-accounting (5) and shorewall6-accounting (5)
+ documentation for the IPSEC column is incorrect. Rather than
+ 'accountin' and 'accountout', the chain names should be
+ 'accipsecin' and 'accipsecout'.
+
+4.5.4
+
1) This release includes all defect repairs from Shorewall 4.5.3.1.
2) When EXPORTMODULES=No in shorewall.conf, the following errors were
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.5.4/shorewall-lite.spec new/shorewall-lite-4.5.4.1/shorewall-lite.spec
--- old/shorewall-lite-4.5.4/shorewall-lite.spec 2012-05-26 00:48:04.000000000 +0200
+++ new/shorewall-lite-4.5.4.1/shorewall-lite.spec 2012-05-31 21:45:25.000000000 +0200
@@ -1,6 +1,6 @@
%define name shorewall-lite
%define version 4.5.4
-%define release 0base
+%define release 1
%define initdir /etc/init.d
Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems.
@@ -105,6 +105,8 @@
%doc COPYING changelog.txt releasenotes.txt
%changelog
+* Tue May 29 2012 Tom Eastep tom(a)shorewall.net
+- Updated to 4.5.4-1
* Thu May 24 2012 Tom Eastep tom(a)shorewall.net
- Updated to 4.5.4-0base
* Tue May 22 2012 Tom Eastep tom(a)shorewall.net
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.5.4/uninstall.sh new/shorewall-lite-4.5.4.1/uninstall.sh
--- old/shorewall-lite-4.5.4/uninstall.sh 2012-05-26 00:48:04.000000000 +0200
+++ new/shorewall-lite-4.5.4.1/uninstall.sh 2012-05-31 21:45:25.000000000 +0200
@@ -26,7 +26,7 @@
# You may only use this script to uninstall the version
# shown below. Simply run this script to remove Shorewall Firewall
-VERSION=4.5.4
+VERSION=4.5.4.1
usage() # $1 = exit status
{
++++++ shorewall-4.5.4.tar.bz2 -> shorewall6-4.5.4.1.tar.bz2 ++++++
++++ 99110 lines of diff (skipped)
++++++ shorewall-lite-4.5.4.tar.bz2 -> shorewall6-lite-4.5.4.1.tar.bz2 ++++++
++++ 6642 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package libGLw for openSUSE:Factory checked in at 2012-06-01 18:54:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libGLw (Old)
and /work/SRC/openSUSE:Factory/.libGLw.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libGLw", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/libGLw/libGLw.changes 2012-05-10 14:33:16.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libGLw.new/libGLw.changes 2012-06-01 18:54:16.000000000 +0200
@@ -1,0 +2,6 @@
+Wed May 30 18:35:12 UTC 2012 - crrodriguez(a)opensuse.org
+
+- Fix -devel package requires, it needs pkgconfig(gl)
+- Fix buildrequires to require explicitely all needed libraries.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libGLw.spec ++++++
--- /var/tmp/diff_new_pack.oT1kBm/_old 2012-06-01 18:54:17.000000000 +0200
+++ /var/tmp/diff_new_pack.oT1kBm/_new 2012-06-01 18:54:17.000000000 +0200
@@ -16,11 +16,11 @@
#
-
Name: libGLw
%define lname libGLw1
BuildRequires: pkgconfig
BuildRequires: pkgconfig(gl)
+BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xt)
Url: http://www.mesa3d.org
Provides: Mesa:%{_libdir}/libGLw.so.1
@@ -57,6 +57,7 @@
%package devel
Requires: libGLw1 = %version
+Requires: pkgconfig(gl)
Summary: Libraries, includes and more to develop MesaGLw applications
Group: Development/Libraries/C and C++
Provides: Mesa-devel:%{_libdir}/libGLw.so
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package filesystem for openSUSE:Factory checked in at 2012-06-01 18:54:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/filesystem (Old)
and /work/SRC/openSUSE:Factory/.filesystem.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "filesystem", Maintainer is "kkaempf(a)suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/filesystem/filesystem.changes 2012-03-16 13:12:14.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.filesystem.new/filesystem.changes 2012-06-01 18:54:14.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Jun 1 07:24:32 UTC 2012 - lnussel(a)suse.de
+
+- remove /var/cache/fonts (bnc#764885)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ filesystem.spec ++++++
--- /var/tmp/diff_new_pack.4kCCEu/_old 2012-06-01 18:54:15.000000000 +0200
+++ /var/tmp/diff_new_pack.4kCCEu/_new 2012-06-01 18:54:15.000000000 +0200
@@ -16,6 +16,7 @@
#
+
Name: filesystem
Summary: Basic Directory Layout
License: GPL-2.0+
@@ -183,6 +184,7 @@
+
++++++ directory.list ++++++
--- /var/tmp/diff_new_pack.4kCCEu/_old 2012-06-01 18:54:15.000000000 +0200
+++ /var/tmp/diff_new_pack.4kCCEu/_new 2012-06-01 18:54:15.000000000 +0200
@@ -169,7 +169,6 @@
0755 root root /var/adm/SuSEconfig/bin
0755 root root /var/adm/SuSEconfig/md5
0755 root root /var/cache
-1777 root root /var/cache/fonts
0755 man root /var/cache/man
0755 root root /var/crash
0755 root root /var/lib
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package openwsman for openSUSE:Factory checked in at 2012-06-01 18:53:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openwsman (Old)
and /work/SRC/openSUSE:Factory/.openwsman.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openwsman", Maintainer is "PRusnak(a)suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/openwsman/openwsman.changes 2012-05-31 17:07:42.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.openwsman.new/openwsman.changes 2012-06-01 18:54:11.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Jun 1 07:30:45 UTC 2012 - kkaempf(a)suse.com
+
+- Update to 2.3.5
+ - Release serializer lock only after use (satya.chittidi(a)emc.com)
+
+-------------------------------------------------------------------
Old:
----
openwsman-2.3.4.tar.bz2
New:
----
openwsman-2.3.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openwsman.spec ++++++
--- /var/tmp/diff_new_pack.aVLvrs/_old 2012-06-01 18:54:13.000000000 +0200
+++ /var/tmp/diff_new_pack.aVLvrs/_new 2012-06-01 18:54:13.000000000 +0200
@@ -92,7 +92,7 @@
%endif
Requires(pre): sed coreutils grep /bin/hostname
-Version: 2.3.4
+Version: 2.3.5
Release: 0
# Mandriva:
# Release %mkrel 1
++++++ openwsman-2.3.4.tar.bz2 -> openwsman-2.3.5.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.3.4/ChangeLog new/openwsman-2.3.5/ChangeLog
--- old/openwsman-2.3.4/ChangeLog 2012-05-28 10:16:18.000000000 +0200
+++ new/openwsman-2.3.5/ChangeLog 2012-06-01 09:34:24.000000000 +0200
@@ -1,3 +1,7 @@
+2.3.5
+- Bugfixes
+ - Release serializer lock only after use (Satya Chittidi)
+
2.3.4
- Bugfixes
- Adapt to Swig 2.0.5 bugfix for renamed construtors/destructors.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.3.4/VERSION.cmake new/openwsman-2.3.5/VERSION.cmake
--- old/openwsman-2.3.4/VERSION.cmake 2012-05-28 10:16:18.000000000 +0200
+++ new/openwsman-2.3.5/VERSION.cmake 2012-06-01 09:34:24.000000000 +0200
@@ -47,7 +47,7 @@
# Package version 2.3.0
SET(OPENWSMAN_MAJOR "2")
SET(OPENWSMAN_MINOR "3")
-SET(OPENWSMAN_PATCH "4")
+SET(OPENWSMAN_PATCH "5")
# Plugin API 2.2
SET(OPENWSMAN_PLUGIN_API_MAJOR "2")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.3.4/package/openwsman.spec.in new/openwsman-2.3.5/package/openwsman.spec.in
--- old/openwsman-2.3.4/package/openwsman.spec.in 2012-05-28 10:16:18.000000000 +0200
+++ new/openwsman-2.3.5/package/openwsman.spec.in 2012-06-01 09:34:24.000000000 +0200
@@ -182,12 +182,16 @@
License: BSD-3-Clause
Group: System/Management
Requires: ruby
+%{!?ruby_version: %global ruby_version %(ruby -r rbconfig -e 'print(RbConfig::CONFIG["ruby_version"])')}
+
%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel}
-Requires: ruby(abi) = 1.8
+Requires: ruby(abi) = %{ruby_version}
%endif
+
%if 0%{?suse_version} > 1120
-Requires: ruby(abi) = 1.8
+Requires: ruby(abi) = %{ruby_version}
%endif
+
%if 0%{?ruby_sitelib} == 0
%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel}
# Fedora, RHEL and CentOS don't have vendor lib
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.3.4/src/lib/wsman-xml-serialize.c new/openwsman-2.3.5/src/lib/wsman-xml-serialize.c
--- old/openwsman-2.3.4/src/lib/wsman-xml-serialize.c 2012-05-28 10:16:18.000000000 +0200
+++ new/openwsman-2.3.5/src/lib/wsman-xml-serialize.c 2012-06-01 09:34:24.000000000 +0200
@@ -89,8 +89,8 @@
int ws_serializer_cleanup(WsSerializerContextH serctx)
{
if(serctx && serctx->WsSerializerAllocList) {
- u_destroy_lock(serctx);
ws_serializer_free_all(serctx);
+ u_destroy_lock(serctx);
list_destroy(serctx->WsSerializerAllocList);
u_free(serctx);
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package Mesa for openSUSE:Factory checked in at 2012-06-01 18:53:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/Mesa (Old)
and /work/SRC/openSUSE:Factory/.Mesa.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "Mesa", Maintainer is "sndirsch(a)suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/Mesa/Mesa.changes 2012-05-26 12:55:13.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.Mesa.new/Mesa.changes 2012-06-01 18:53:53.000000000 +0200
@@ -1,0 +2,12 @@
+Wed May 30 16:56:11 UTC 2012 - fcrozat(a)suse.com
+
+- Add u_mesa-8.0.1-fix-16bpp.patch (Fedora): fix 16bpp mode under
+ llvmpipe.
+
+-------------------------------------------------------------------
+Sat May 26 22:29:41 UTC 2012 - sndirsch(a)suse.com
+
+- added configure options "--enable-gbm --enable-glx-tls" (required
+ for glamor support)
+
+-------------------------------------------------------------------
New:
----
u_mesa-8.0.1-fix-16bpp.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ Mesa.spec ++++++
--- /var/tmp/diff_new_pack.vGJ2bW/_old 2012-06-01 18:53:54.000000000 +0200
+++ /var/tmp/diff_new_pack.vGJ2bW/_new 2012-06-01 18:53:54.000000000 +0200
@@ -16,6 +16,8 @@
#
+%define glamor 1
+
#
%define _version 8.0.3
%define _name_archive mesa
@@ -88,6 +90,8 @@
Patch11: u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch
# Patch from upstream master to resolve build issues with llvm 3.1
Patch12: upstream-llvm-patch.diff
+# Patch from Fedora, fix 16bpp in llvmpipe
+Patch13: u_mesa-8.0.1-fix-16bpp.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -396,6 +400,7 @@
rm -rf docs/README.{VMS,WIN32,OS2}
#%patch11 -p1
%patch12 -p1
+%patch13 -p1
%build
@@ -412,6 +417,10 @@
--enable-shared-dricore \
--enable-xa \
--enable-texture-float \
+%if %glamor
+ --enable-gbm \
+ --enable-glx-tls \
+%endif
--with-dri-searchpath=/usr/%{_lib}/dri/updates:/usr/%{_lib}/dri \
%ifarch %ix86 x86_64
--enable-gallium-llvm \
++++++ u_mesa-8.0.1-fix-16bpp.patch ++++++
diff -up Mesa-8.0.1/src/mesa/state_tracker/st_manager.c.jx Mesa-8.0.1/src/mesa/state_tracker/st_manager.c
--- Mesa-8.0.1/src/mesa/state_tracker/st_manager.c.jx 2012-02-14 18:44:00.000000000 -0500
+++ Mesa-8.0.1/src/mesa/state_tracker/st_manager.c 2012-04-02 12:02:14.613964417 -0400
@@ -528,6 +528,9 @@ st_context_teximage(struct st_context_if
if (util_format_get_component_bits(internal_format,
UTIL_FORMAT_COLORSPACE_RGB, 3) > 0)
internalFormat = GL_RGBA;
+ else if (util_format_get_component_bits(internal_format,
+ UTIL_FORMAT_COLORSPACE_RGB, 0) == 5)
+ internalFormat = GL_RGB5;
else
internalFormat = GL_RGB;
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package smartmontools for openSUSE:Factory checked in at 2012-06-01 18:53:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/smartmontools (Old)
and /work/SRC/openSUSE:Factory/.smartmontools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "smartmontools", Maintainer is "sbrabec(a)suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/smartmontools/smartmontools.changes 2012-03-01 17:27:49.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.smartmontools.new/smartmontools.changes 2012-06-01 18:53:41.000000000 +0200
@@ -1,0 +2,8 @@
+Thu May 31 20:25:44 UTC 2012 - sweet_f_a(a)gmx.de
+
+- update to the _latest_ smartmontools-5.42 tarball, see
+ http://sourceforge.net/mailarchive/message.php?msg_id=28262364
+ "The PKG_PROG_PKG_CONFIG macro was not expanded in configure"
+- remove automake dependency
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ smartmontools.spec ++++++
--- /var/tmp/diff_new_pack.3kcEdB/_old 2012-06-01 18:53:43.000000000 +0200
+++ /var/tmp/diff_new_pack.3kcEdB/_new 2012-06-01 18:53:43.000000000 +0200
@@ -16,12 +16,9 @@
#
-
Name: smartmontools
Version: 5.42
Release: 0
-License: GPL-2.0+
-Group: Hardware/Other
Source: %{name}-%{version}.tar.bz2
Source2: smartmontools.sysconfig
Source3: %{name}-rpmlintrc
@@ -46,7 +43,7 @@
%endif
%{?systemd_requires}
Url: http://smartmontools.sourceforge.net/
-BuildRequires: automake gcc-c++
+BuildRequires: gcc-c++
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} >= 1110
BuildRequires: libselinux-devel
@@ -55,6 +52,8 @@
BuildRequires: libcap-ng-devel
%endif
Summary: Monitor for SMART devices
+License: GPL-2.0+
+Group: Hardware/Other
%description
SMARTmontools controls and monitors storage devices using the
@@ -81,7 +80,6 @@
%patch11
%build
-AUTOMAKE=/usr/bin/automake-1.11 ./autogen.sh
%if %suse_version > 1000
export CFLAGS="%{optflags} -fPIE"
export CXXFLAGS="%{optflags} -fPIE"
++++++ smartmontools-5.42.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smartmontools-5.42/Makefile.in new/smartmontools-5.42/Makefile.in
--- old/smartmontools-5.42/Makefile.in 2011-10-20 21:20:37.000000000 +0200
+++ new/smartmontools-5.42/Makefile.in 2011-10-21 17:47:51.000000000 +0200
@@ -308,6 +308,9 @@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smartmontools-5.42/aclocal.m4 new/smartmontools-5.42/aclocal.m4
--- old/smartmontools-5.42/aclocal.m4 2011-10-20 21:20:24.000000000 +0200
+++ new/smartmontools-5.42/aclocal.m4 2011-10-21 17:47:36.000000000 +0200
@@ -19,6 +19,165 @@
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+#
+# Copyright © 2004 Scott James Remnant <scott(a)netsplit.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=m4_default([$1], [0.9.0])
+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ PKG_CONFIG=""
+ fi
+
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists. Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+#
+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+# this or PKG_CHECK_MODULES is called, or make sure to call
+# PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+ m4_ifval([$2], [$2], [:])
+m4_ifvaln([$3], [else
+ $3])dnl
+fi])
+
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+ PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_failed=yes])
+ else
+ pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+ _PKG_SHORT_ERRORS_SUPPORTED
+ if test $_pkg_short_errors_supported = yes; then
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+ else
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+ ifelse([$4], , [AC_MSG_ERROR(dnl
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT
+])],
+ [AC_MSG_RESULT([no])
+ $4])
+elif test $pkg_failed = untried; then
+ ifelse([$4], , [AC_MSG_FAILURE(dnl
+[The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+ [$4])
+else
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+ AC_MSG_RESULT([yes])
+ ifelse([$3], , :, [$3])
+fi[]dnl
+])# PKG_CHECK_MODULES
+
# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smartmontools-5.42/configure new/smartmontools-5.42/configure
--- old/smartmontools-5.42/configure 2011-10-20 21:20:40.000000000 +0200
+++ new/smartmontools-5.42/configure 2011-10-21 17:47:54.000000000 +0200
@@ -675,6 +675,9 @@
MAKENSIS
WINDRES
WINDMC
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
+PKG_CONFIG
am__fastdepCCAS_FALSE
am__fastdepCCAS_TRUE
CCASDEPMODE
@@ -799,6 +802,9 @@
CFLAGS
CCAS
CCASFLAGS
+PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
WINDMC
WINDRES
MAKENSIS
@@ -1471,6 +1477,11 @@
CFLAGS C compiler flags
CCAS assembler compiler command (defaults to CC)
CCASFLAGS assembler compiler flags (defaults to CFLAGS)
+ PKG_CONFIG path to pkg-config utility
+ PKG_CONFIG_PATH
+ directories to add to pkg-config's search path
+ PKG_CONFIG_LIBDIR
+ path overriding pkg-config's built-in search path
WINDMC Windows message compiler command
WINDRES Windows resource compiler command
MAKENSIS NSIS compiler command
@@ -4428,7 +4439,126 @@
if test "$cross_compiling" = "no"; then
- PKG_PROG_PKG_CONFIG
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $ac_pt_PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_pt_PKG_CONFIG" = x; then
+ PKG_CONFIG=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
+ fi
+else
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=0.9.0
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ PKG_CONFIG=""
+ fi
+
+fi
fi
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0