Re: [STABLE][PATCH] tcp-wrappers: use LDFLAGS (fixes QA error)

[Koen Kooi <k.kooi@student.utwente.nl>]

On 06-04-09 13:20, Jeremy Lainé wrote:
> From: Jeremy Lainé<jeremy.laine@m4x.org>

Acked-by: Koen Kooi <koen@openembedded.org>

>
> Signed-off-by: Jeremy Lainé<jeremy.laine@m4x.org>
> ---
>   recipes/tcp-wrappers/tcp-wrappers-7.6/ldflags |   43 +++++++++++++++++++++++++
>   recipes/tcp-wrappers/tcp-wrappers_7.6.bb      |    3 +-
>   2 files changed, 45 insertions(+), 1 deletions(-)
>   create mode 100644 recipes/tcp-wrappers/tcp-wrappers-7.6/ldflags
>
> diff --git a/recipes/tcp-wrappers/tcp-wrappers-7.6/ldflags b/recipes/tcp-wrappers/tcp-wrappers-7.6/ldflags
> new file mode 100644
> index 0000000..2e89765
> --- /dev/null
> +++ b/recipes/tcp-wrappers/tcp-wrappers-7.6/ldflags
> @@ -0,0 +1,43 @@
> +Index: tcp_wrappers_7.6.orig/Makefile
> +===================================================================
> +--- tcp_wrappers_7.6.orig.orig/Makefile	2009-04-06 10:55:47.000000000 +0000
> ++++ tcp_wrappers_7.6.orig/Makefile	2009-04-06 10:57:04.000000000 +0000
> +@@ -748,31 +748,31 @@
> +
> + $(SHLIB): $(SHLIB_OBJ)
> + 	rm -f $(SHLIB)
> +-	$(CC) -o $(SHLIB) $(SHLINKFLAGS) $(SHLIB_OBJ)
> ++	$(CC) $(LDFLAGS) -o $(SHLIB) $(SHLINKFLAGS) $(SHLIB_OBJ)
> + 	ln -sf $(notdir $(SHLIB)) $(SHLIBSOMAJ)
> + 	ln -sf $(notdir $(SHLIBSOMAJ)) $(SHLIBSO)
> +
> + tcpd:	tcpd.o $(SHLIB)
> +-	$(CC) $(CFLAGS) -o $@ tcpd.o $(SHLIBFLAGS)
> ++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ tcpd.o $(SHLIBFLAGS)
> +
> + miscd:	miscd.o $(LIB)
> +-	$(CC) $(CFLAGS) -o $@ miscd.o $(LIB) $(LIBS)
> ++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ miscd.o $(LIB) $(LIBS)
> +
> + safe_finger: safe_finger.o $(SHLIB)
> +-	$(CC) $(CFLAGS) -o $@ safe_finger.o $(SHLIBFLAGS)
> ++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ safe_finger.o $(SHLIBFLAGS)
> +
> + TCPDMATCH_OBJ = tcpdmatch.o fakelog.o inetcf.o scaffold.o
> +
> + tcpdmatch: $(TCPDMATCH_OBJ) $(SHLIB)
> +-	$(CC) $(CFLAGS) -o $@ $(TCPDMATCH_OBJ) $(SHLIBFLAGS)
> ++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TCPDMATCH_OBJ) $(SHLIBFLAGS)
> +
> + try-from: try-from.o fakelog.o $(SHLIB)
> +-	$(CC) $(CFLAGS) -o $@ try-from.o fakelog.o $(SHLIBFLAGS)
> ++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ try-from.o fakelog.o $(SHLIBFLAGS)
> +
> + TCPDCHK_OBJ = tcpdchk.o fakelog.o inetcf.o scaffold.o
> +
> + tcpdchk: $(TCPDCHK_OBJ) $(SHLIB)
> +-	$(CC) $(CFLAGS) -o $@ $(TCPDCHK_OBJ) $(SHLIBFLAGS)
> ++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TCPDCHK_OBJ) $(SHLIBFLAGS)
> +
> + shar:	$(KIT)
> + 	@shar $(KIT)
> diff --git a/recipes/tcp-wrappers/tcp-wrappers_7.6.bb b/recipes/tcp-wrappers/tcp-wrappers_7.6.bb
> index a047c55..1f1afc1 100644
> --- a/recipes/tcp-wrappers/tcp-wrappers_7.6.bb
> +++ b/recipes/tcp-wrappers/tcp-wrappers_7.6.bb
> @@ -3,7 +3,7 @@ DESCRIPTION = "Tools for monitoring and filtering incoming requests for tcp \
>   LICENSE = "tcp-wrappers"
>   PRIORITY = "optional"
>   SECTION = "console/network"
> -PR ="r2"
> +PR ="r3"
>
>
>   PACKAGES = "${PN}-dbg libwrap libwrap-doc libwrap-dev tcp-wrappers tcp-wrappers-doc"
> @@ -35,6 +35,7 @@ SRC_URI = "ftp://ftp.porcupine.org/pub/security/tcp_wrappers_${PV}.tar.gz \
>              file://siglongjmp;patch=1 \
>              file://size_t;patch=1 \
>              file://tcpdchk_libwrapped;patch=1 \
> +           file://ldflags;patch=1 \
>              \
>              file://try-from.8 \
>              file://safe_finger.8"