Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-analyzer/nessus-libraries/files: nessus-libraries-2.3.1-ldflags.patch
Date: Tue, 31 Aug 2010 00:57:35
Message-Id: 20100831005731.6FEE020054@flycatcher.gentoo.org
1 jer 10/08/31 00:57:31
2
3 Modified: nessus-libraries-2.3.1-ldflags.patch
4 Log:
5 Respect LDFLAGS (bug #334405).
6
7 (Portage version: 2.2_rc72/cvs/Linux i686)
8
9 Revision Changes Path
10 1.2 net-analyzer/nessus-libraries/files/nessus-libraries-2.3.1-ldflags.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nessus-libraries/files/nessus-libraries-2.3.1-ldflags.patch?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nessus-libraries/files/nessus-libraries-2.3.1-ldflags.patch?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nessus-libraries/files/nessus-libraries-2.3.1-ldflags.patch?r1=1.1&r2=1.2
15
16 Index: nessus-libraries-2.3.1-ldflags.patch
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nessus-libraries/files/nessus-libraries-2.3.1-ldflags.patch,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- nessus-libraries-2.3.1-ldflags.patch 21 Jan 2007 19:26:27 -0000 1.1
23 +++ nessus-libraries-2.3.1-ldflags.patch 31 Aug 2010 00:57:31 -0000 1.2
24 @@ -1,19 +1,30 @@
25 -diff -ru nessus-libraries~/libnessus/Makefile nessus-libraries/libnessus/Makefile
26 ---- nessus-libraries~/libnessus/Makefile 2007-01-21 19:49:30.000000000 +0100
27 -+++ nessus-libraries/libnessus/Makefile 2007-01-21 20:17:59.000000000 +0100
28 -@@ -101,7 +101,7 @@
29 +--- a/libnessus/Makefile 2004-08-31 19:15:07.000000000 +0200
30 ++++ b/libnessus/Makefile 2010-08-31 02:47:45.000000000 +0200
31 +@@ -100,8 +100,8 @@
32 + snprintf.o : snprintf.c
33 $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c snprintf.c
34 libnessus.la: $(OBJS)
35 - $(LIBTOOL) $(CC) -o libnessus.la $(LO_OBJS) -rpath ${libdir} \
36 +- $(LIBTOOL) $(CC) -o libnessus.la $(LO_OBJS) -rpath ${libdir} \
37 - -version-info ${PACKAGE_VERSION}
38 ++ $(LIBTOOL) $(CC) $(LDFLAGS) -o libnessus.la $(LO_OBJS) -rpath ${libdir} \
39 + -version-info ${PACKAGE_VERSION} ${PCAP_FLAG} ${SSL_FLAG}
40
41 install : libnessus.la
42 test -d $(DESTDIR)${libdir} || $(INSTALL_DIR) -m 755 $(DESTDIR)${libdir}
43 -diff -ru nessus-libraries~/nessus.tmpl.in nessus-libraries/nessus.tmpl.in
44 ---- nessus-libraries~/nessus.tmpl.in 2007-01-21 19:49:30.000000000 +0100
45 -+++ nessus-libraries/nessus.tmpl.in 2007-01-21 20:17:45.000000000 +0100
46 -@@ -61,6 +61,9 @@
47 +--- a/libhosts_gatherer/Makefile 2003-04-07 04:06:49.000000000 +0200
48 ++++ b/libhosts_gatherer/Makefile 2010-08-31 02:47:45.000000000 +0200
49 +@@ -22,7 +22,7 @@
50 + $(LIBTOOL) --finish $(DESTDIR)${libdir}
51 +
52 + libhosts_gatherer.la : $(OBJS)
53 +- $(LIBTOOL) $(CC) -o libhosts_gatherer.la $(LO_OBJS) -rpath ${libdir} \
54 ++ $(LIBTOOL) $(CC) $(LDFLAGS) -o libhosts_gatherer.la $(LO_OBJS) -rpath ${libdir} \
55 + -version-info ${PACKAGE_VERSION}
56 +
57 + hg_utils.o : hg_utils.h hosts_gatherer.h hg_utils.c
58 +--- a/nessus.tmpl.in 2003-02-17 15:52:01.000000000 +0100
59 ++++ b/nessus.tmpl.in 2010-08-31 02:47:45.000000000 +0200
60 +@@ -61,10 +61,12 @@
61 #
62 BUILD_PCAP=@BUILD_PCAP@
63
64 @@ -23,3 +34,7 @@
65
66 # Some defines you may want to modify
67 DEFS=@DEFS@ $(DEBUG_SSL) $(USE_CIPHER) $(DEBUG)
68 +-LDFLAGS=
69 +
70 + # Your C compiler
71 + CC=@CC@