Bug#925383: Processed: Re: Bug#925383: unblock: shorewall/5.2.3.2-1
Control: tags -1 - moreinfo Hi Paul, On Sun, Mar 31, 2019 at 10:35:35AM +0200, Paul Gevers wrote: > Control: tags -1 moreinfo confirmed > > Hi Roberto, > > On 30-03-2019 13:24, Roberto C. Sánchez wrote: > > I removed the moreinfo tag nearly a week ago. Did I misunderstand what > > else I needed to do? Did I need to go ahead and upload as well? > > That. Jonathan said "I suggest you go ahead and remove the moreinfo tag > when it's ready for review". I agree that there is a slight ambiguity > there, but he meant, "I suggest you go ahead *with the upload* and > remove the moreinfo tag when it's ready for review *of the difference > between what is in buster and what is in sid*". > OK. That was clearly a reading comprehension failure on my part. Thank you for clarifying. > > I was > > waiting for a pre-approval, but if uploading now makes more sense and > > saves you work (since you could review and then unblock the waiting > > package), I can upload right away. > > I have added the moreinfo tag again, please remove it again once the > upload happened and we can review the delta between sid and buster. > I have uploaded the packages and also removed the moreinfo tag. Regards, -Roberto -- Roberto C. Sánchez
Bug#925383: Processed: Re: Bug#925383: unblock: shorewall/5.2.3.2-1
Control: tags -1 moreinfo confirmed Hi Roberto, On 30-03-2019 13:24, Roberto C. Sánchez wrote: > I removed the moreinfo tag nearly a week ago. Did I misunderstand what > else I needed to do? Did I need to go ahead and upload as well? That. Jonathan said "I suggest you go ahead and remove the moreinfo tag when it's ready for review". I agree that there is a slight ambiguity there, but he meant, "I suggest you go ahead *with the upload* and remove the moreinfo tag when it's ready for review *of the difference between what is in buster and what is in sid*". > I was > waiting for a pre-approval, but if uploading now makes more sense and > saves you work (since you could review and then unblock the waiting > package), I can upload right away. I have added the moreinfo tag again, please remove it again once the upload happened and we can review the delta between sid and buster. Paul signature.asc Description: OpenPGP digital signature
Bug#925383: Processed: Re: Bug#925383: unblock: shorewall/5.2.3.2-1
On Sun, Mar 24, 2019 at 06:51:04PM +, Debian Bug Tracking System wrote: > Processing commands for cont...@bugs.debian.org: > > > tags 925383 - moreinfo > Bug #925383 [release.debian.org] unblock: shorewall/5.2.3.2-1 > Removed tag(s) moreinfo. > > thanks > Stopping processing here. > Hi Jonathan, I removed the moreinfo tag nearly a week ago. Did I misunderstand what else I needed to do? Did I need to go ahead and upload as well? I was waiting for a pre-approval, but if uploading now makes more sense and saves you work (since you could review and then unblock the waiting package), I can upload right away. Regards, -Roberto -- Roberto C. Sánchez
Bug#925383: unblock: shorewall/5.2.3.2-1
tags 925383 - moreinfo thanks On Sun, Mar 24, 2019 at 04:39:20PM +, Jonathan Wiltshire wrote: > Control: tag -1 moreinfo > > On Sat, Mar 23, 2019 at 10:09:49PM -0400, Roberto C. Sanchez wrote: > > 5.2.3.2 > > > > 1) Shorewall 5.2 automatically converts and existing 'masq' file to an > > equivalent 'snat' file. Regrettably, Shorewall 5.2.3 broke that > > automatic update, such that the following error message was issued: > > > >Use of uninitialized value $Shorewall::Nat::raw::currentline in > >pattern match (m//) at /usr/share/shorewall/Shorewall/Nat.pm > >line 511, <$currentfile> line nnn. > > > > and the generted 'masq' file contains only initial comments. > > > > That has been corrected. > > > > I have attached debdiffs for all 6 packages. > > It can't be unblocked until it's in unstable; are you asking for > pre-approval? I didn't read the diffs in detail yet but it sounds like a > fix we'd want so I suggest you go ahead and remove the moreinfo tag when > it's ready for review. > Yes, it was my intent to request pre-approval. My apologies for the confusion. Regards, -Roberto -- Roberto C. Sánchez signature.asc Description: PGP signature
Bug#925383: unblock: shorewall/5.2.3.2-1
Control: tag -1 moreinfo On Sat, Mar 23, 2019 at 10:09:49PM -0400, Roberto C. Sanchez wrote: > 5.2.3.2 > > 1) Shorewall 5.2 automatically converts and existing 'masq' file to an > equivalent 'snat' file. Regrettably, Shorewall 5.2.3 broke that > automatic update, such that the following error message was issued: > >Use of uninitialized value $Shorewall::Nat::raw::currentline in >pattern match (m//) at /usr/share/shorewall/Shorewall/Nat.pm >line 511, <$currentfile> line nnn. > > and the generted 'masq' file contains only initial comments. > > That has been corrected. > > I have attached debdiffs for all 6 packages. It can't be unblocked until it's in unstable; are you asking for pre-approval? I didn't read the diffs in detail yet but it sounds like a fix we'd want so I suggest you go ahead and remove the moreinfo tag when it's ready for review. Thanks, -- Jonathan Wiltshire j...@debian.org Debian Developer http://people.debian.org/~jmw 4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC 74C3 5394 479D D352 4C51
Bug#925383: unblock: shorewall/5.2.3.2-1
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512
Shorewall upstream released version 5.2.3.2 a few days ago. While this
unblock request is for 6 packages, only shorewall contains any
functional changes. The other five packages contain only a version
increment and release notes entry.
Here is the explanation of the upstream change:
5.2.3.2
1) Shorewall 5.2 automatically converts and existing 'masq' file to an
equivalent 'snat' file. Regrettably, Shorewall 5.2.3 broke that
automatic update, such that the following error message was issued:
Use of uninitialized value $Shorewall::Nat::raw::currentline in
pattern match (m//) at /usr/share/shorewall/Shorewall/Nat.pm
line 511, <$currentfile> line nnn.
and the generted 'masq' file contains only initial comments.
That has been corrected.
I have attached debdiffs for all 6 packages.
Given the small scope and size of the fix and that the Shorewall
upstream project is undergoing some changes that most likely make this
the last release for quite some time, I would very much like to see this
make it into Buster.
Regards,
- -Roberto
unblock shorewall/5.2.3.2-1
unblock shorewall6/5.2.3.2-1
unblock shorewall-lite/5.2.3.2-1
unblock shorewall6-lite/5.2.3.2-1
unblock shorewall-core/5.2.3.2-1
unblock shorewall-init/5.2.3.2-1
-BEGIN PGP SIGNATURE-
iQIzBAEBCgAdFiEEz9ERzDttUsU/BH8iLNd4Xt2nsg8FAlyW5u0ACgkQLNd4Xt2n
sg+C4w/9FvQBTnKgjT3o+jNamHNw5fTofLCM0x+7uVSWzI4v9YjwJnBBjhGSvd/7
t8NsOLTj6bjplylRiiOrvqUAgfl3p8LxkSNYHtxZdgUhU8kKcTHYmWOgOtHDrp/+
2wB2YSGTjkMl6QzsvK9e/P35xZ7Sd/iQlEU9miwmYWlT5b3l18M5ekZRZmroM8VU
Wn8yhfJzWBZs1MKcaV58rtVM3yl/ZfwhtjFIIvWVqc94w20POFTZR7FkEMTxd5NQ
9C+bzrZS13+QP6wYs7XLekFDtNGGn9s5PK/k67syuT7q6YdjRfhyHKMxHM/hsY22
ppGUd1qqcRspxOod/EPI5AqE4BUmUpVkfF3I2OmbWPFgK+UNrkYd3NIzdkBn1ahW
T2LrSPJPYvmN3/bo+tSP1U1m0Hh5+g0XDllTNBExQZq7JiAgoHPKVdgmUzihEl6c
71ao9kS/FzpuwwciFcg/TrTEFFJdm1VLBMviNatZhMTttkD8Fmrot2SBtpVGvOkg
ddiEHzpR7Ba95hrBOI3Jyu7Z8Ff3iF2hrd31IrMCjYKiJmXCisPHyUeJReKo6pIB
kj4Qm8STO6rwc2hm4/nKHrrbP3pMo9nRaY8Kumqo7Qc/hv1/90WhMJdPdd75kg/s
SaQjkiyfe/egZihShkJYsZNhRXfSSTsPSkgp7csN1kDzJiYZva4=
=SmkF
-END PGP SIGNATURE-
diff --git a/Perl/Shorewall/Config.pm b/Perl/Shorewall/Config.pm
index bb68bb3d..ba800020 100644
--- a/Perl/Shorewall/Config.pm
+++ b/Perl/Shorewall/Config.pm
@@ -684,7 +684,6 @@ our $shorewall_dir; # Shorewall Directory; if
non-empty, search here fi
our $debug; # Global debugging flag
our $confess;# If true, use Carp to report errors with stack
trace.
-our $update; # True if this is an update
our $family; # Protocol family (4 or 6)
our $export; # True when compiling for export
@@ -851,7 +850,7 @@ sub initialize( $;$$$) {
TC_SCRIPT => '',
EXPORT => 0,
KLUDGEFREE => '',
- VERSION => "5.2.3.1",
+ VERSION => "5.2.3.2",
CAPVERSION => 50200 ,
BLACKLIST_LOG_TAG => '',
RELATED_LOG_TAG => '',
@@ -1192,7 +1191,6 @@ sub initialize( $;$$$) {
$debug = 0;
$confess = 0;
-$update = 0;
%params = ();
@@ -4023,9 +4021,9 @@ sub read_a_line($) {
#
handle_first_entry if $first_entry;
#
- # Save Raw Image if we are updating
+ # Save Raw Image
#
- $rawcurrentline = $currentline if $update;
+ $rawcurrentline = $currentline;
#
# Expand Shell Variables using %params and %actparams
#
@@ -4075,14 +4073,16 @@ sub process_shorewallrc( $$ ) {
my ( $shorewallrc , $product ) = @_;
$shorewallrc{PRODUCT} = $product;
+$variables{PRODUCT} = $product;
if ( open_file $shorewallrc ) {
- while ( read_a_line( STRIP_COMMENTS | SUPPRESS_WHITESPACE | CHECK_GUNK
) ) {
+ while ( read_a_line( STRIP_COMMENTS | SUPPRESS_WHITESPACE | CHECK_GUNK
| EXPAND_VARIABLES ) ) {
if ( $currentline =~ /^([a-zA-Z]\w*)=(.*)$/ ) {
my ($var, $val) = ($1, $2);
$val = $1 if $val =~ /^\"([^\"]*)\"$/;
expand_shorewallrc_variables($val) if supplied $val;
$shorewallrc{$var} = $val;
+ $variables{$var} = $val;
} else {
fatal_error "Unrecognized shorewallrc entry";
}
@@ -5593,8 +5593,8 @@ EOF
#
# Small functions called by get_configuration. We separate them so profiling
is more useful
#
-sub process_shorewall_conf( $ ) {
-my ( $annotate ) = @_;
+sub process_shorewall_conf( $$ ) {
+my ( $update, $annotate ) = @_;
my $file = find_file "$product.conf";
my @vars;
@@
