Bug#921319: stretch-pu: package iptables-persistent/1.0.4+nmu2

[Julien Cristau <jcristau@debian.org>]

Control: tag -1 confirmed

On Tue, Feb 05, 2019 at 12:56:50PM +0800, gustavo panizzo wrote:
> hello
> 
> On Mon, Feb 04, 2019 at 05:05:25PM +0100, Bastian Blank wrote:
> > On Mon, Feb 04, 2019 at 10:55:26PM +0800, gustavo panizzo wrote:
> > > On Mon, Feb 04, 2019 at 09:59:06AM +0000, Adam D. Barratt wrote:
> > > > Control: tags -1 + moreinfo
> > > >
> > > > On 2019-02-04 08:11, gustavo panizzo wrote:
> > > > > I'd like to fix the bug #921186 in stable, only adding a dependency to
> > > > > iptables-persistent the bug can be closed
> > > >
> > > > The metadata for that bug suggests that the bug also affects the package
> > > > in unstable, and is not yet fixed there - is that correct? If so, please
> > > > fix the bug in unstable first; if not, please fix the metadata.
> > > I've fixed the metadata, thanks
> > 
> > The bug is fixed differently in unstable?
> > 
> 
> After thinking on how I solved this issue in unstable (#794037,
> #720110) I came up with another solution, similar to what's done in
> unstable
> 
> Initially I didn't want to modify the scripts but the initial fix (add
> kmod to deps) won't solve #720110 for the reporter, I think the current
> proposed fix is better and the risk of regressions is low
> 
> debdiff attached
> 
Looks OK, but:

> diff -Nru iptables-persistent-1.0.4+nmu2/debian/changelog iptables-persistent-1.0.4+nmu3/debian/changelog
> --- iptables-persistent-1.0.4+nmu2/debian/changelog	2017-03-18 21:11:49.000000000 +0800
> +++ iptables-persistent-1.0.4+nmu3/debian/changelog	2019-02-03 19:18:27.000000000 +0800
> @@ -1,3 +1,10 @@
> +iptables-persistent (1.0.4+nmu3) stable; urgency=medium

Please make that "1.0.4+nmu2+deb9u1" and "stretch".

Cheers,
Julien

> +
> +  * Non-maintainer upload
> +  * Catch errors in calls to modprobe, thanks Hugo, Closes (#921186)
> +
> + -- gustavo panizzo <gfa@zumbi.com.ar>  Sun, 03 Feb 2019 19:18:27 +0800
> +
>  iptables-persistent (1.0.4+nmu2) unstable; urgency=medium
>  
>    * Non-maintainer upload.
> diff -Nru iptables-persistent-1.0.4+nmu2/plugins/15-ip4tables iptables-persistent-1.0.4+nmu3/plugins/15-ip4tables
> --- iptables-persistent-1.0.4+nmu2/plugins/15-ip4tables	2017-03-18 21:11:49.000000000 +0800
> +++ iptables-persistent-1.0.4+nmu3/plugins/15-ip4tables	2019-02-03 19:18:27.000000000 +0800
> @@ -31,7 +31,7 @@
>  {
>  	#save IPv4 rules
>  	#need at least iptable_filter loaded:
> -	/sbin/modprobe -q iptable_filter
> +	/sbin/modprobe -q iptable_filter || true
>  	if [ ! -f /proc/net/ip_tables_names ]; then
>  		echo "Warning: skipping IPv4 (no modules loaded)"
>  	elif [ -x /sbin/iptables-save ]; then
> diff -Nru iptables-persistent-1.0.4+nmu2/plugins/25-ip6tables iptables-persistent-1.0.4+nmu3/plugins/25-ip6tables
> --- iptables-persistent-1.0.4+nmu2/plugins/25-ip6tables	2017-03-18 21:11:49.000000000 +0800
> +++ iptables-persistent-1.0.4+nmu3/plugins/25-ip6tables	2019-02-03 19:18:27.000000000 +0800
> @@ -31,7 +31,7 @@
>  {
>  	#save IPv6 rules
>  	#need at least ip6table_filter loaded:
> -	/sbin/modprobe -q ip6table_filter
> +	/sbin/modprobe -q ip6table_filter || true
>  	if [ ! -f /proc/net/ip6_tables_names ]; then
>  		log_action_cont_msg "Warning: skipping IPv6 (no modules loaded)"
>  	elif [ -x /sbin/ip6tables-save ]; then