SOURCES: wireshark-as_needed.patch - better patch

baggins baggins at pld-linux.org
Thu Sep 6 18:41:18 CEST 2007


Author: baggins                      Date: Thu Sep  6 16:41:18 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- better patch

---- Files affected:
SOURCES:
   wireshark-as_needed.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/wireshark-as_needed.patch
diff -u SOURCES/wireshark-as_needed.patch:1.2 SOURCES/wireshark-as_needed.patch:1.3
--- SOURCES/wireshark-as_needed.patch:1.2	Tue Aug 21 13:39:54 2007
+++ SOURCES/wireshark-as_needed.patch	Thu Sep  6 18:41:13 2007
@@ -1,11 +1,14 @@
---- wireshark-0.99.5/epan/Makefile.am.orig	2007-03-12 05:37:04.000000000 +0000
-+++ wireshark-0.99.5/epan/Makefile.am	2007-03-12 05:42:59.000000000 +0000
-@@ -102,7 +102,7 @@
+diff -ur wireshark-0.99.6.orig/epan/Makefile.am wireshark-0.99.6/epan/Makefile.am
+--- wireshark-0.99.6.orig/epan/Makefile.am	2007-07-05 22:25:05.000000000 +0300
++++ wireshark-0.99.6/epan/Makefile.am	2007-07-10 16:11:02.000000000 +0300
+@@ -108,8 +108,8 @@
  #
  # Add the object files for missing routines, if any.
  #
 -libwireshark_la_LIBADD = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la $(wslua_lib) @ADNS_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @KRB5_LIBS@ @SNMP_LIBS@ @SSL_LIBS@ -lm
-+libwireshark_la_LIBADD = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libdissectors.la $(wslua_lib) @ADNS_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @KRB5_LIBS@ @SNMP_LIBS@ @SSL_LIBS@ -lm $(top_srcdir)/wiretap/libwiretap.la $(top_srcdir)/wiretap/libwiretap.la
- libwireshark_la_DEPENDENCIES = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la $(wslua_lib)
+-libwireshark_la_DEPENDENCIES = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la $(wslua_lib)
++libwireshark_la_LIBADD = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la ${top_builddir}/wiretap/libwiretap.la $(wslua_lib) @ADNS_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @KRB5_LIBS@ @SNMP_LIBS@ @SSL_LIBS@ -lm
++libwireshark_la_DEPENDENCIES = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la ${top_builddir}/wiretap/libwiretap.la $(wslua_lib)
  
  #EXTRA_PROGRAMS = reassemble_test
+ #reassemble_test_LDADD = $(GLIB_LIBS)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/wireshark-as_needed.patch?r1=1.2&r2=1.3&f=u



More information about the pld-cvs-commit mailing list