Patchwork Assorted fixes v3

login
register
mail settings
Submitter Jan Engelhardt
Date Feb. 6, 2013, 12:47 a.m.
Message ID <1360111625-1759-1-git-send-email-jengelh@inai.de>
Download mbox
Permalink /patch/218470/
State Superseded
Headers show

Pull-request

git://git.inai.de/iptables master

Comments

Jan Engelhardt - Feb. 6, 2013, 12:47 a.m.
Removed
  build: also use libtool for install stage
  iptables: reword warning on using an alias
Added:
  build: bump SONAME for libxtables

===
The following changes since commit 817ac5a5e54d083983b7c834194b46c4366d71d2:

  Merge branch 'master' of vishnu.netfilter.org:/data/git/iptables (2013-01-31 20:36:27 +0100)

are available in the git repository at:


  git://git.inai.de/iptables master

for you to fetch changes up to 80722f5b0c2723d34782affec7dc247352d9be33:

  iptables: fall back to using save function when print is not defined (2013-02-06 01:40:43 +0100)

----------------------------------------------------------------
Jan Engelhardt (4):
      build: bump SONAME for libxtables
      libxtables: centralize checking for a .save function
      extensions: eui64: set userspacesize=0
      iptables: fall back to using save function when print is not defined

 configure.ac                |    2 +-
 extensions/libip6t_eui64.c  |    2 +-
 extensions/libxt_standard.c |   14 ++++++++++++++
 iptables/ip6tables.c        |   22 ++++++++--------------
 iptables/iptables.c         |   22 ++++++++--------------
 libxtables/xtables.c        |   21 +++++++++++++++++++++
 tests/options-most.rules    |    2 ++
 7 files changed, 55 insertions(+), 30 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Pablo Neira - Feb. 7, 2013, 6:53 p.m.
On Wed, Feb 06, 2013 at 01:47:01AM +0100, Jan Engelhardt wrote:
> Removed
>   build: also use libtool for install stage
>   iptables: reword warning on using an alias
> Added:
>   build: bump SONAME for libxtables
> 
> ===
> The following changes since commit 817ac5a5e54d083983b7c834194b46c4366d71d2:
> 
>   Merge branch 'master' of vishnu.netfilter.org:/data/git/iptables (2013-01-31 20:36:27 +0100)
> 
> are available in the git repository at:
> 
> 
>   git://git.inai.de/iptables master
> 
> for you to fetch changes up to 80722f5b0c2723d34782affec7dc247352d9be33:
> 
>   iptables: fall back to using save function when print is not defined (2013-02-06 01:40:43 +0100)
> 
> ----------------------------------------------------------------
> Jan Engelhardt (4):
>       build: bump SONAME for libxtables

Applied this one, thanks a lot for catching up this.

>       libxtables: centralize checking for a .save function
>       extensions: eui64: set userspacesize=0
>       iptables: fall back to using save function when print is not defined

Not applying these, they are not fixes, sorry.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jan Engelhardt - Feb. 8, 2013, 1:11 a.m.
On Thursday 2013-02-07 19:53, Pablo Neira Ayuso wrote:
>> ----------------------------------------------------------------
>> Jan Engelhardt (4):
>>       build: bump SONAME for libxtables
>
>Applied this one, thanks a lot for catching up this.
>
>>       libxtables: centralize checking for a .save function
>>       extensions: eui64: set userspacesize=0
>>       iptables: fall back to using save function when print is not defined
>
>Not applying these, they are not fixes, sorry.

If you say so. (But it would have been nice to get told that the first time.)

Now, I can't put these onto nf/next without someone having to go through
a merge conflict later on, so besides getting put on hold again,
what is the preferable action?
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html