Fixed -lm problem with ulibc (bug #186424; thank Natanael Copa <natanael.copa AT gmail.com> for report. Commited fix for bug #184529 and enabled warnings treated as errors for gtk-2.0 build like upstream wants us. Fix for libgcrypt problem reported by armin76 and fixed by drac.

Package-Manager: portage-2.1.3_rc8

5 files changed, 122 insertions, 0 deletions

diff --git a/net-analyzer/wireshark/files/digest-wireshark-0.99.6-r1 b/net-analyzer/wireshark/files/digest-wireshark-0.99.6-r1
new file mode 100644
index 000000000000..1593025f3afe
--- /dev/null
+++ b/net-analyzer/wireshark/files/digest-wireshark-0.99.6-r1
@@ -0,0 +1,3 @@
+MD5 e57a8c8b364c38df3da97e2ee9f0d0bc wireshark-0.99.6.tar.bz2 11826043
+RMD160 7c69e71e54d521d942bcbad9894547d9785f0948 wireshark-0.99.6.tar.bz2 11826043
+SHA256 118c4a5bfef00651fbe248e1d5c4e4f907b5e2982f47ccfecca2f7f48ab9d3b8 wireshark-0.99.6.tar.bz2 11826043
diff --git a/net-analyzer/wireshark/files/wireshark-0.99.6-asneeded-r1.patch b/net-analyzer/wireshark/files/wireshark-0.99.6-asneeded-r1.patch
new file mode 100644
index 000000000000..c80010834dd6
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-0.99.6-asneeded-r1.patch
@@ -0,0 +1,13 @@
+--- ./epan/Makefile.am.orig	2007-07-17 12:01:21.000000000 +0400
++++ ./epan/Makefile.am	2007-07-17 12:02:27.000000000 +0400
+@@ -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_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 ../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 ../wiretap/libwiretap.la $(wslua_lib)
+ 
+ #EXTRA_PROGRAMS = reassemble_test
+ #reassemble_test_LDADD = $(GLIB_LIBS)
diff --git a/net-analyzer/wireshark/files/wireshark-0.99.6-gint64-warnings.patch b/net-analyzer/wireshark/files/wireshark-0.99.6-gint64-warnings.patch
new file mode 100644
index 000000000000..3d2e00e2b4dd
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-0.99.6-gint64-warnings.patch
@@ -0,0 +1,64 @@
+diff -Naur wireshark-0.99.6.orig/configure.in wireshark-0.99.6/configure.in
+--- wireshark-0.99.6.orig/configure.in	2007-07-05 23:25:24.000000000 +0400
++++ wireshark-0.99.6/configure.in	2007-07-10 14:45:20.000000000 +0400
+@@ -1215,16 +1215,19 @@
+   ],
+   [
+     AC_MSG_RESULT(no)
+-    AC_WIRESHARK_CHECK_64BIT_FORMAT(ll,
++    AC_WIRESHARK_CHECK_64BIT_FORMAT(l,
+       [
+-	AC_WIRESHARK_CHECK_64BIT_FORMAT(L,
+-	  [
+-	    AC_WIRESHARK_CHECK_64BIT_FORMAT(q,
+-	      [
+-		AC_MSG_ERROR([neither %llx nor %Lx nor %qx worked on a 64-bit integer])
+-	      ])
+-	  ])
+-      ])
++      AC_WIRESHARK_CHECK_64BIT_FORMAT(ll,
++       [
++         AC_WIRESHARK_CHECK_64BIT_FORMAT(L,
++           [
++             AC_WIRESHARK_CHECK_64BIT_FORMAT(q,
++               [
++                 AC_MSG_ERROR([neither %lx nor %llx nor %Lx nor %qx worked on a 64-bit integer])
++               ])
++           ])
++       ])
++    ])
+   ])
+ 
+ GETOPT_C=""
+diff -Naur wireshark-0.99.6.orig/wiretap/configure.in wireshark-0.99.6/wiretap/configure.in
+--- wireshark-0.99.6.orig/wiretap/configure.in	2007-07-05 23:25:16.000000000 +0400
++++ wireshark-0.99.6/wiretap/configure.in	2007-07-10 14:49:20.000000000 +0400
+@@ -288,16 +288,19 @@
+   ],
+   [
+     AC_MSG_RESULT(no)
+-    AC_WIRETAP_CHECK_64BIT_FORMAT(ll,
++    AC_WIRETAP_CHECK_64BIT_FORMAT(l,
+       [
+-	AC_WIRETAP_CHECK_64BIT_FORMAT(L,
+-	  [
+-	    AC_WIRETAP_CHECK_64BIT_FORMAT(q,
+-	      [
+-		AC_MSG_ERROR([neither %llx nor %Lx nor %qx worked on a 64-bit integer])
+-	      ])
+-	  ])
+-      ])
++      AC_WIRETAP_CHECK_64BIT_FORMAT(ll,
++       [
++         AC_WIRETAP_CHECK_64BIT_FORMAT(L,
++           [
++             AC_WIRETAP_CHECK_64BIT_FORMAT(q,
++               [
++                 AC_MSG_ERROR([neither %lx nor %llx nor %Lx nor %qx worked on a 64-bit integer])
++               ])
++           ])
++       ])
++    ])
+   ])
+ 
+ #
diff --git a/net-analyzer/wireshark/files/wireshark-0.99.6-libgcrypt.patch b/net-analyzer/wireshark/files/wireshark-0.99.6-libgcrypt.patch
new file mode 100644
index 000000000000..139e3885142c
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-0.99.6-libgcrypt.patch
@@ -0,0 +1,11 @@
+--- ./epan/Makefile.am.orig	2007-07-17 12:03:46.000000000 +0400
++++ ./epan/Makefile.am	2007-07-17 12:04:54.000000000 +0400
+@@ -108,7 +108,7 @@
+ #
+ # 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 ../wiretap/libwiretap.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@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la ../wiretap/libwiretap.la $(wslua_lib) @ADNS_LIBS@ @LIBGCRYPT_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 ../wiretap/libwiretap.la $(wslua_lib)
+ 
+ #EXTRA_PROGRAMS = reassemble_test
diff --git a/net-analyzer/wireshark/files/wireshark-0.99.6-lm.patch b/net-analyzer/wireshark/files/wireshark-0.99.6-lm.patch
new file mode 100644
index 000000000000..a89d7bf145e5
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-0.99.6-lm.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/show_bug.cgi?id=186424
+
+"Forgetting" -lm is a common mistake since glibc works without it. Other libc's
+are not as forgiving.
+
+--- ./wiretap/configure.in.orig	2007-07-24 13:38:56.000000000 +0400
++++ ./wiretap/configure.in	2007-07-24 13:50:08.000000000 +0400
+@@ -324,6 +324,10 @@
+ ])
+ AC_WIRETAP_PCAP_CHECK
+ 
++# C libraries that are not libc (like ulibc) requre -lm. bug #1704
++AC_CHECK_LIBM
++AC_SUBST(LIBM)
++
+ dnl zlib check
+ AC_MSG_CHECKING(whether to use zlib for reading compressed capture files)
+ 
+--- ./wiretap/Makefile.am.orig	2007-07-24 13:38:46.000000000 +0400
++++ ./wiretap/Makefile.am	2007-07-24 13:43:10.000000000 +0400
+@@ -69,8 +69,8 @@
+ 	$(GENERATOR_SOURCES) 	\
+ 	$(GENERATED_FILES)
+ 
+-libwiretap_la_LIBADD = libwiretap_generated.la
+-libwiretap_la_DEPENDENCIES = libwiretap_generated.la
++libwiretap_la_LIBADD = libwiretap_generated.la @LIBM@
++libwiretap_la_DEPENDENCIES = libwiretap_generated.la @LIBM@
+ 
+ ascend-grammar.c : ascend-grammar.y
+ 	@if [ -z "$(YACC)" ]; then \