summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2007-12-20 17:49:23 +0000
committerPeter Volkov <pva@gentoo.org>2007-12-20 17:49:23 +0000
commit1883503c9be0b707ae004689ee432698a5eee60e (patch)
tree33d631be72c7d908e802130e89db4c2e160b2c07 /net-analyzer
parentversion bump, remove old (diff)
downloadgentoo-2-1883503c9be0b707ae004689ee432698a5eee60e.tar.gz
gentoo-2-1883503c9be0b707ae004689ee432698a5eee60e.tar.bz2
gentoo-2-1883503c9be0b707ae004689ee432698a5eee60e.zip
Missed patches added, bug 202866 reported by <kroemmelbein AT gmx.de>
(Portage version: 2.1.3.19)
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/wireshark/ChangeLog6
-rw-r--r--net-analyzer/wireshark/files/wireshark-0.99.7-asneeded.patch10
-rw-r--r--net-analyzer/wireshark/files/wireshark-0.99.7-libgcrypt.patch11
3 files changed, 26 insertions, 1 deletions
diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 9f4d14477272..1a0718e60278 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-analyzer/wireshark
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.69 2007/12/20 14:19:04 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.70 2007/12/20 17:49:23 pva Exp $
+
+ 20 Dec 2007; <pva@gentoo.org> +files/wireshark-0.99.7-asneeded.patch,
+ +files/wireshark-0.99.7-libgcrypt.patch:
+ Missed patches added, bug 202866 reported by <kroemmelbein AT gmx.de>
*wireshark-0.99.7 (20 Dec 2007)
diff --git a/net-analyzer/wireshark/files/wireshark-0.99.7-asneeded.patch b/net-analyzer/wireshark/files/wireshark-0.99.7-asneeded.patch
new file mode 100644
index 000000000000..36069368e141
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-0.99.7-asneeded.patch
@@ -0,0 +1,10 @@
+--- ./epan/dissectors/Makefile.am.orig 2007-12-11 16:38:03.000000000 +0300
++++ ./epan/dissectors/Makefile.am 2007-12-11 16:38:37.000000000 +0300
+@@ -32,6 +32,7 @@
+
+ libasndissectors_la_SOURCES = \
+ $(ASN_DISSECTOR_SRC)
++libasndissectors_la_LIBADD = ../../wiretap/libwiretap.la
+
+ libpidldissectors_la_SOURCES = \
+ $(PIDL_DISSECTOR_SRC)
diff --git a/net-analyzer/wireshark/files/wireshark-0.99.7-libgcrypt.patch b/net-analyzer/wireshark/files/wireshark-0.99.7-libgcrypt.patch
new file mode 100644
index 000000000000..c8184df7b25d
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-0.99.7-libgcrypt.patch
@@ -0,0 +1,11 @@
+--- ./epan/Makefile.am.orig 2007-12-11 13:23:59.000000000 +0300
++++ ./epan/Makefile.am 2007-12-11 13:24:36.000000000 +0300
+@@ -115,7 +115,7 @@
+ #
+ # 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_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@ @LIBGCRYPT_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)
+
+ #EXTRA_PROGRAMS = reassemble_test