SOURCES: wireshark-as_needed.patch - update for 1.0.0

[sls]

Author: sls                          Date: Tue Apr  1 06:45:20 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- update for 1.0.0

---- Files affected:
SOURCES:
   wireshark-as_needed.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/wireshark-as_needed.patch
diff -u SOURCES/wireshark-as_needed.patch:1.4 SOURCES/wireshark-as_needed.patch:1.5
--- SOURCES/wireshark-as_needed.patch:1.4	Thu Dec 20 22:38:44 2007
+++ SOURCES/wireshark-as_needed.patch	Tue Apr  1 08:45:15 2008
@@ -1,14 +1,34 @@
-diff -urN wireshark-0.99.7.orig/epan/Makefile.am wireshark-0.99.7/epan/Makefile.am
---- wireshark-0.99.7.orig/epan/Makefile.am	2007-12-20 21:19:06.000000000 +0100
-+++ wireshark-0.99.7/epan/Makefile.am	2007-12-20 21:49:29.000000000 +0100
-@@ -115,8 +115,8 @@
- #
- # Add the object files for missing routines, if any.
- #
--libwireshark_la_LIBADD = @G_ASCII_STRCASECMP_LO@ @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@ @SSL_LIBS@ @LIBSMI_LDFLAGS@ -lm
--libwireshark_la_DEPENDENCIES = @G_ASCII_STRCASECMP_LO@ @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_STRCASECMP_LO@ @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@ @SSL_LIBS@ @LIBSMI_LDFLAGS@ -lm
-+libwireshark_la_DEPENDENCIES = @G_ASCII_STRCASECMP_LO@ @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)
+--- wireshark-1.0.0/epan/Makefile.am.orig	2008-04-01 05:57:15.796355855 +0200
++++ wireshark-1.0.0/epan/Makefile.am	2008-04-01 05:59:06.288761964 +0200
+@@ -129,15 +129,17 @@
+ 	libwireshark_asmopt.la crypt/libairpdcap.la ftypes/libftypes.la \
+ 	dfilter/libdfilter.la dissectors/libcleandissectors.la \
+ 	dissectors/libdissectors.la dissectors/libasndissectors.la \
+-	dissectors/libpidldissectors.la $(wslua_lib) @SOCKET_LIBS@ @NSL_LIBS@ \
++	dissectors/libpidldissectors.la ${top_builddir}/wiretap/libwiretap.la \
++	$(wslua_lib) @SOCKET_LIBS@ @NSL_LIBS@ \
+ 	@ADNS_LIBS@ @LIBGCRYPT_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @KRB5_LIBS@ \
+-	@SSL_LIBS@ @LIBSMI_LDFLAGS@ -lm
++	@SSL_LIBS@ @LIBSMI_LDFLAGS@ -lm -lgmodule-2.0
+ libwireshark_la_DEPENDENCIES = @G_ASCII_STRCASECMP_LO@ @G_ASCII_STRTOULL_LO@ \
+	@INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la \
+ 	libwireshark_asmopt.la crypt/libairpdcap.la ftypes/libftypes.la \
+ 	dfilter/libdfilter.la dissectors/libcleandissectors.la \
+ 	dissectors/libdissectors.la dissectors/libasndissectors.la \
+-	dissectors/libpidldissectors.la $(wslua_lib)
++	dissectors/libpidldissectors.la ${top_builddir}/wiretap/libwiretap.la \
++	$(wslua_lib)
  
  #EXTRA_PROGRAMS = reassemble_test
  #reassemble_test_LDADD = $(GLIB_LIBS)
+--- wireshark-1.0.0/wiretap/Makefile.am.orig	2008-04-01 05:56:08.300994660 +0200
++++ wireshark-1.0.0/wiretap/Makefile.am	2008-04-01 05:56:47.298314463 +0200
+@@ -67,7 +67,7 @@
+ 	$(GENERATOR_FILES) 	\
+ 	$(GENERATED_FILES)
+ 
+-libwiretap_la_LIBADD = libwiretap_generated.la
++libwiretap_la_LIBADD = libwiretap_generated.la -lglib-2.0
+ libwiretap_la_DEPENDENCIES = libwiretap_generated.la
+ 
+ RUNLEX = $(top_srcdir)/tools/runlex.sh
================================================================

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