iptables build fixes

iptables build fixes

[Jan Engelhardt]

The following changes since commit 88e0a097c3f23dadf041b60445c6c9802c502f15:

  Merge branch 'master' of git://dev.medozas.de/iptables (2011-07-11 10:41:10 +0200)

are available in the git repository at:

  git://dev.medozas.de/iptables master

Jan Engelhardt (7):
      extensions: use multi-target registration
      libxt_TCPMSS: restore build with IPv6-less libcs
      libxt_string: define _GNU_SOURCE for strnlen
      build: workaround broken linux-headers on RHEL-5
      build: strengthen check for overlong lladdr components
      build: abort autogen on subcommand failure
      libipq: add pkgconfig file

 autogen.sh                |    2 +-
 configure.ac              |    4 ++-
 extensions/GNUmakefile.in |    2 +-
 extensions/libxt_TCPMSS.c |   62 ++++++++++++++++++++++----------------------
 extensions/libxt_TEE.c    |   56 ++++++++++++++++++++--------------------
 extensions/libxt_string.c |    1 +
 iptables/xtables.c        |    2 +
 iptables/xtoptions.c      |    4 +-
 libipq/.gitignore         |    1 +
 libipq/Makefile.am        |    2 +
 libipq/libipq.pc.in       |   11 ++++++++
 11 files changed, 83 insertions(+), 64 deletions(-)
 create mode 100644 libipq/.gitignore
 create mode 100644 libipq/libipq.pc.in

Re: iptables build fixes

[Patrick McHardy]

On 08.08.2011 02:42, Jan Engelhardt wrote:
> The following changes since commit 88e0a097c3f23dadf041b60445c6c9802c502f15:
> 
>   Merge branch 'master' of git://dev.medozas.de/iptables (2011-07-11 10:41:10 +0200)
> 
> are available in the git repository at:
> 
>   git://dev.medozas.de/iptables master
> 
> Jan Engelhardt (7):
>       extensions: use multi-target registration
>       libxt_TCPMSS: restore build with IPv6-less libcs
>       libxt_string: define _GNU_SOURCE for strnlen
>       build: workaround broken linux-headers on RHEL-5
>       build: strengthen check for overlong lladdr components
>       build: abort autogen on subcommand failure
>       libipq: add pkgconfig file

Pulled, thanks Jan.

iptables: build fixes

[Jan Engelhardt]

The following changes since commit 983196ceb4d3bb7b6d3cf6da18bb6d5a5eafb347:

  doc: document the -4 and -6 options (2013-01-07 02:26:16 +0100)

are available in the git repository at:

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

for you to fetch changes up to dd5fd152645c572e76ad7a02084ea8ef19552a93:

  build: do not dereference symlinks on installation (2013-01-10 16:02:09 +0100)

----------------------------------------------------------------
Jan Engelhardt (2):
      build: also use libtool for install stage
      build: do not dereference symlinks on installation

 extensions/GNUmakefile.in |   21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

[PATCH 1/2] build: also use libtool for install stage

[Jan Engelhardt]

The just-built library has DT_RPATH entries to be runnable from
whereever it is. If we just install that, the distro build systems
will throw warnings like

	(Open Build Service) ERROR: RPATH
	"/home/abuild/rpmbuild/BUILD/iptables-1.4.17a/libxtables/.libs"
	on /home/abuild/rpmbuild/BUILDROOT/iptables-1.4.17a-0.x86_64/usr/lib64/xtables/libxt_unclean.so
	is not allowed

These RPATH entries are indeed undesired for libraries is in a system
location, which is why libtool produces another copy of the library on
installation. The makefile however missed using libtool during
installation (introduced with commit v1.4.17-1-g68e77a2).
This patch now resolves this.

Signed-off-by: Jan Engelhardt <jengelh@inai.de>
---
 extensions/GNUmakefile.in |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
index adad4d6..e520c86 100644
--- a/extensions/GNUmakefile.in
+++ b/extensions/GNUmakefile.in
@@ -49,6 +49,9 @@ pf6_build_mod := $(filter-out @blacklist_modules@,${pf6_build_mod})
 pfx_objs      := $(patsubst %,libxt_%.o,${pfx_build_mod})
 pf4_objs      := $(patsubst %,libipt_%.o,${pf4_build_mod})
 pf6_objs      := $(patsubst %,libip6t_%.o,${pf6_build_mod})
+pfx_lalibs    := $(patsubst %,libxt_%.la,${pfx_build_mod})
+pf4_lalibs    := $(patsubst %,libipt_%.la,${pf4_build_mod})
+pf6_lalibs    := $(patsubst %,libip6t_%.la,${pf6_build_mod})
 pfx_solibs    := $(patsubst %,libxt_%.so,${pfx_build_mod} ${pfx_symlinks})
 pf4_solibs    := $(patsubst %,libipt_%.so,${pf4_build_mod})
 pf6_solibs    := $(patsubst %,libip6t_%.so,${pf6_build_mod})
@@ -63,7 +66,8 @@ targets_install :=
 @ENABLE_STATIC_TRUE@ libext4_objs := ${pf4_objs}
 @ENABLE_STATIC_TRUE@ libext6_objs := ${pf6_objs}
 @ENABLE_STATIC_FALSE@ targets += ${pfx_solibs} ${pf4_solibs} ${pf6_solibs}
-@ENABLE_STATIC_FALSE@ targets_install += ${pfx_solibs} ${pf4_solibs} ${pf6_solibs}
+@ENABLE_STATIC_FALSE@ targets_la_install += ${pfx_lalibs} ${pf4_lalibs} ${pf6_lalibs}
+@ENABLE_STATIC_FALSE@ targets_so_install += ${pfx_solibs}
 
 .SECONDARY:
 
@@ -71,9 +75,11 @@ targets_install :=
 
 all: ${targets}
 
-install: ${targets_install}
+install: ${targets_la_install} ${targets_so_install}
 	@mkdir -p "${DESTDIR}${xtlibdir}";
-	if test -n "${targets_install}"; then install -pm0755 $^ "${DESTDIR}${xtlibdir}/"; fi;
+	${AM_VERBOSE_NULL} ../libtool ${AM_LIBTOOL_SILENT} --mode=install install -pm0755 ${targets_la_install} "${DESTDIR}${xtlibdir}/"
+	rm -f "${DESTDIR}${xtlibdir}"/*.la;
+	install -pm0755 ${targets_so_install} "${DESTDIR}${xtlibdir}/"
 
 clean:
 	rm -f *.la *.o *.lo *.so *.a {matches,targets}.man initext.c initext4.c initext6.c;
@@ -94,7 +100,7 @@ lib%.so: lib%.la
 	${AM_VERBOSE_NULL} ln -fs .libs/$@ $@
 
 lib%.la: lib%.lo
-	${AM_VERBOSE_CCLD} ../libtool ${AM_LIBTOOL_SILENT} --tag=CC --mode=link ${CCLD} ${AM_LDFLAGS} -module ${LDFLAGS} -o $@ $< ../libxtables/libxtables.la ${$*_LIBADD} -rpath ${xtlibdir}
+	${AM_VERBOSE_CCLD} ../libtool ${AM_LIBTOOL_SILENT} --tag=CC --mode=link ${CCLD} ${AM_LDFLAGS} -avoid-version -module ${LDFLAGS} -o $@ $< ../libxtables/libxtables.la ${$*_LIBADD} -rpath ${xtlibdir}
 
 lib%.lo: ${srcdir}/lib%.c
 	${AM_VERBOSE_CC} ../libtool ${AM_LIBTOOL_SILENT} --tag=CC --mode=compile ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init ${CFLAGS} -o $@ -c $<
-- 
1.7.10.4

[PATCH 2/2] build: do not dereference symlinks on installation

[Jan Engelhardt]

By using install(1), libxt_NOTRACK.so was inadvertently installed as
an actual file to /usr/lib/xtables rather than as a symlink. Switch to
using cp(1).

Signed-off-by: Jan Engelhardt <jengelh@inai.de>
---
 extensions/GNUmakefile.in |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
index e520c86..15ede9f 100644
--- a/extensions/GNUmakefile.in
+++ b/extensions/GNUmakefile.in
@@ -52,9 +52,10 @@ pf6_objs      := $(patsubst %,libip6t_%.o,${pf6_build_mod})
 pfx_lalibs    := $(patsubst %,libxt_%.la,${pfx_build_mod})
 pf4_lalibs    := $(patsubst %,libipt_%.la,${pf4_build_mod})
 pf6_lalibs    := $(patsubst %,libip6t_%.la,${pf6_build_mod})
-pfx_solibs    := $(patsubst %,libxt_%.so,${pfx_build_mod} ${pfx_symlinks})
+pfx_solibs    := $(patsubst %,libxt_%.so,${pfx_build_mod})
 pf4_solibs    := $(patsubst %,libipt_%.so,${pf4_build_mod})
 pf6_solibs    := $(patsubst %,libip6t_%.so,${pf6_build_mod})
+pfx_solinks   := $(patsubst %,libxt_%.so,${pfx_symlinks})
 
 
 #
@@ -65,9 +66,9 @@ targets_install :=
 @ENABLE_STATIC_TRUE@ libext_objs := ${pfx_objs}
 @ENABLE_STATIC_TRUE@ libext4_objs := ${pf4_objs}
 @ENABLE_STATIC_TRUE@ libext6_objs := ${pf6_objs}
-@ENABLE_STATIC_FALSE@ targets += ${pfx_solibs} ${pf4_solibs} ${pf6_solibs}
+@ENABLE_STATIC_FALSE@ targets += ${pfx_solibs} ${pf4_solibs} ${pf6_solibs} ${pfx_solinks}
 @ENABLE_STATIC_FALSE@ targets_la_install += ${pfx_lalibs} ${pf4_lalibs} ${pf6_lalibs}
-@ENABLE_STATIC_FALSE@ targets_so_install += ${pfx_solibs}
+@ENABLE_STATIC_FALSE@ targets_so_install += ${pfx_solinks}
 
 .SECONDARY:
 
@@ -79,7 +80,9 @@ install: ${targets_la_install} ${targets_so_install}
 	@mkdir -p "${DESTDIR}${xtlibdir}";
 	${AM_VERBOSE_NULL} ../libtool ${AM_LIBTOOL_SILENT} --mode=install install -pm0755 ${targets_la_install} "${DESTDIR}${xtlibdir}/"
 	rm -f "${DESTDIR}${xtlibdir}"/*.la;
-	install -pm0755 ${targets_so_install} "${DESTDIR}${xtlibdir}/"
+	# targets_so_install contains symlinks, and these should be preserved,
+	# so using install(1) is out of the question for them.
+	cp -a ${targets_so_install} "${DESTDIR}${xtlibdir}/"
 
 clean:
 	rm -f *.la *.o *.lo *.so *.a {matches,targets}.man initext.c initext4.c initext6.c;
-- 
1.7.10.4

Re: iptables: build fixes

[Dmitry V. Levin]

[-- Attachment #1: Type: text/plain, Size: 384 bytes --]

On Thu, Jan 10, 2013 at 04:15:17PM +0100, Jan Engelhardt wrote:
[...]
> Jan Engelhardt (2):
>       build: also use libtool for install stage
>       build: do not dereference symlinks on installation
> 
>  extensions/GNUmakefile.in |   21 +++++++++++++++------
>  1 file changed, 15 insertions(+), 6 deletions(-)

Acked-by: Dmitry V. Levin <ldv@altlinux.org>


-- 
ldv

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: iptables: build fixes

[Dmitry V. Levin]

[-- Attachment #1: Type: text/plain, Size: 522 bytes --]

On Sat, Jan 12, 2013 at 06:49:15AM +0400, Dmitry V. Levin wrote:
> On Thu, Jan 10, 2013 at 04:15:17PM +0100, Jan Engelhardt wrote:
> [...]
> > Jan Engelhardt (2):
> >       build: also use libtool for install stage
> >       build: do not dereference symlinks on installation
> > 
> >  extensions/GNUmakefile.in |   21 +++++++++++++++------
> >  1 file changed, 15 insertions(+), 6 deletions(-)
> 
> Acked-by: Dmitry V. Levin <ldv@altlinux.org>

Any idea why these fixed didn't get into 1.4.18?


-- 
ldv

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: iptables: build fixes

[Jan Engelhardt]

On Wednesday 2013-03-06 01:08, Dmitry V. Levin wrote:
>On Sat, Jan 12, 2013 at 06:49:15AM +0400, Dmitry V. Levin wrote:
>> On Thu, Jan 10, 2013 at 04:15:17PM +0100, Jan Engelhardt wrote:
>> [...]
>> > Jan Engelhardt (2):
>> >       build: also use libtool for install stage
>> >       build: do not dereference symlinks on installation
>> > 
>> >  extensions/GNUmakefile.in |   21 +++++++++++++++------
>> >  1 file changed, 15 insertions(+), 6 deletions(-)
>> 
>> Acked-by: Dmitry V. Levin <ldv@altlinux.org>
>
>Any idea why these fixed didn't get into 1.4.18?

http://www.spinics.net/lists/netfilter-devel/msg25045.html
and its reply ("Thread Next" link).