On Thu, Sep 28, 2017 at 11:00:43AM +0200, Juergen Borleis wrote:
> The configure script handles the "--*-largefile" parameter badly. It
> defaults to large file support if not given and always disables largefile
> support if given (and it doesn't matter if 'enable' or 'disable' was used)

IPTABLES_CFLAGS:= -D_FILE_OFFSET_BITS=64

Should be removed, right?

The version bump should be noted in the commit messsage.

> Signed-off-by: Juergen Borleis <j...@pengutronix.de>
> ---
>  ...d-xtables-config-parser.h-to-BUILT_SOURCE.patch | 34 
> ----------------------

Is this no longer needed? If so, add a comment.

Michael

>  patches/iptables-1.6.0/series                      |  4 ---
>  ...fine-macros-if-large-file-feature-is-enab.patch | 28 ++++++++++++++++++
>  .../{iptables-1.6.0 => iptables-1.6.1}/autogen.sh  |  0
>  patches/iptables-1.6.1/series                      |  4 +++
>  rules/iptables.make                                |  4 +--
>  6 files changed, 34 insertions(+), 40 deletions(-)
>  delete mode 100644 
> patches/iptables-1.6.0/0001-iptables-add-xtables-config-parser.h-to-BUILT_SOURCE.patch
>  delete mode 100644 patches/iptables-1.6.0/series
>  create mode 100644 
> patches/iptables-1.6.1/0001-iptables-define-macros-if-large-file-feature-is-enab.patch
>  rename patches/{iptables-1.6.0 => iptables-1.6.1}/autogen.sh (100%)
>  create mode 100644 patches/iptables-1.6.1/series
> 
> diff --git 
> a/patches/iptables-1.6.0/0001-iptables-add-xtables-config-parser.h-to-BUILT_SOURCE.patch
>  
> b/patches/iptables-1.6.0/0001-iptables-add-xtables-config-parser.h-to-BUILT_SOURCE.patch
> deleted file mode 100644
> index 20dab363c..000000000
> --- 
> a/patches/iptables-1.6.0/0001-iptables-add-xtables-config-parser.h-to-BUILT_SOURCE.patch
> +++ /dev/null
> @@ -1,34 +0,0 @@
> -From: Gustavo Zacarias <gust...@zacarias.com.ar>
> -Date: Wed, 30 Dec 2015 14:51:30 -0300
> -Subject: [PATCH] iptables: add xtables-config-parser.h to BUILT_SOURCES
> -
> -Otherwise other sources that use it might be built before it's ready leading
> -to build failure, for example by iptables/nft.c
> -
> -Signed-off-by: Gustavo Zacarias <gust...@zacarias.com.ar>
> -Signed-off-by: Pablo Neira Ayuso <pa...@netfilter.org>
> ----
> - iptables/Makefile.am | 3 +++
> - 1 file changed, 3 insertions(+)
> -
> -diff --git a/iptables/Makefile.am b/iptables/Makefile.am
> -index 3c0faa5a54df..c3eb8a81a445 100644
> ---- a/iptables/Makefile.am
> -+++ b/iptables/Makefile.am
> -@@ -4,6 +4,8 @@ AM_CFLAGS        = ${regular_CFLAGS}
> - AM_CPPFLAGS      = ${regular_CPPFLAGS} -I${top_builddir}/include 
> -I${top_srcdir}/include ${kinclude_CPPFLAGS} ${libmnl_CFLAGS} 
> ${libnftnl_CFLAGS} ${libnetfilter_conntrack_CFLAGS}
> - AM_YFLAGS = -d
> - 
> -+BUILT_SOURCES =
> -+
> - xtables_multi_SOURCES  = xtables-multi.c iptables-xml.c
> - xtables_multi_CFLAGS   = ${AM_CFLAGS}
> - xtables_multi_LDADD    = ../extensions/libext.a
> -@@ -27,6 +29,7 @@ xtables_multi_LDADD   += ../libxtables/libxtables.la -lm
> - 
> - # nftables compatibility layer
> - if ENABLE_NFTABLES
> -+BUILT_SOURCES += xtables-config-parser.h
> - xtables_compat_multi_SOURCES  = xtables-compat-multi.c iptables-xml.c
> - xtables_compat_multi_CFLAGS   = ${AM_CFLAGS}
> - xtables_compat_multi_LDADD    = ../extensions/libext.a 
> ../extensions/libext_ebt.a
> diff --git a/patches/iptables-1.6.0/series b/patches/iptables-1.6.0/series
> deleted file mode 100644
> index 5237a6efd..000000000
> --- a/patches/iptables-1.6.0/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-iptables-add-xtables-config-parser.h-to-BUILT_SOURCE.patch
> -# e834e669cfa6ff965112ccc3771de5a0  - git-ptx-patches magic
> diff --git 
> a/patches/iptables-1.6.1/0001-iptables-define-macros-if-large-file-feature-is-enab.patch
>  
> b/patches/iptables-1.6.1/0001-iptables-define-macros-if-large-file-feature-is-enab.patch
> new file mode 100644
> index 000000000..857e3e7e1
> --- /dev/null
> +++ 
> b/patches/iptables-1.6.1/0001-iptables-define-macros-if-large-file-feature-is-enab.patch
> @@ -0,0 +1,28 @@
> +From: Juergen Borleis <j...@pengutronix.de>
> +Date: Fri, 25 Aug 2017 14:31:45 +0200
> +Subject: [PATCH] iptables: define macros if large file feature is enabled
> +
> +Currently the feature is enabled by default, but always disabled when
> +the large file parameter is defined.
> +
> +Signed-off-by: Juergen Borleis <j...@pengutronix.de>
> +---
> + configure.ac | 5 +++--
> + 1 file changed, 3 insertions(+), 2 deletions(-)
> +
> +diff --git a/configure.ac b/configure.ac
> +index eda7871405b3..30445d7deda8 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -42,8 +42,9 @@ AC_ARG_ENABLE([ipv6],
> + AC_ARG_ENABLE([largefile],
> +     AS_HELP_STRING([--disable-largefile], [Do not build largefile support]),
> +     [enable_largefile="$enableval"],
> +-    [enable_largefile="yes";
> +-    largefile_cppflags='-D_LARGEFILE_SOURCE=1 -D_LARGE_FILES 
> -D_FILE_OFFSET_BITS=64'])
> ++    [enable_largefile="yes"])
> ++AS_IF([test "$enable_largefile" = "yes"], 
> [largefile_cppflags='-D_LARGEFILE_SOURCE=1 -D_LARGE_FILES 
> -D_FILE_OFFSET_BITS=64'])
> ++
> + AC_ARG_ENABLE([devel],
> +     AS_HELP_STRING([--enable-devel],
> +     [Install Xtables development headers]),
> diff --git a/patches/iptables-1.6.0/autogen.sh 
> b/patches/iptables-1.6.1/autogen.sh
> similarity index 100%
> rename from patches/iptables-1.6.0/autogen.sh
> rename to patches/iptables-1.6.1/autogen.sh
> diff --git a/patches/iptables-1.6.1/series b/patches/iptables-1.6.1/series
> new file mode 100644
> index 000000000..fb8e9a3d3
> --- /dev/null
> +++ b/patches/iptables-1.6.1/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-iptables-define-macros-if-large-file-feature-is-enab.patch
> +# 181c8cbca17b2bae3bba2e32f6c163ad  - git-ptx-patches magic
> diff --git a/rules/iptables.make b/rules/iptables.make
> index 721030aac..e8aa9f498 100644
> --- a/rules/iptables.make
> +++ b/rules/iptables.make
> @@ -21,8 +21,8 @@ PACKAGES-$(PTXCONF_IPTABLES) += iptables
>  #
>  # Paths and names
>  #
> -IPTABLES_VERSION     := 1.6.0
> -IPTABLES_MD5         := 27ba3451cb622467fc9267a176f19a31
> +IPTABLES_VERSION     := 1.6.1
> +IPTABLES_MD5         := ab38a33806b6182c6f53d6afb4619add
>  IPTABLES             := iptables-$(IPTABLES_VERSION)
>  IPTABLES_SUFFIX              := tar.bz2
>  IPTABLES_URL         := 
> http://ftp.netfilter.org/pub/iptables/$(IPTABLES).$(IPTABLES_SUFFIX)
> -- 
> 2.11.0
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Reply via email to