Fixed build issue with gnutls[nettle], bug #361381 thank Diego Elio Pettenò for report.

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

4 files changed, 36 insertions, 15 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index b5638b21531f..b179f1b96446 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.293 2011/05/07 16:37:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.294 2011/05/15 13:41:04 pva Exp $
+
+  15 May 2011; Peter Volkov <pva@gentoo.org> wireshark-1.4.6-r1.ebuild,
+  +files/wireshark-1.4.6-gnutls_nettle.patch:
+  Fixed build issue with gnutls[nettle], bug #361381 thank Diego Elio
+  Pettenò for report.
 
   07 May 2011; Raúl Porcel <armin76@gentoo.org> wireshark-1.4.6-r1.ebuild:
   ia64/sparc stable wrt #363895
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index d6a62983585a..07058b26fa3f 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,12 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX wireshark-0.99.7-asneeded.patch 339 RMD160 faa516dd3dfd8bd6218f66d3bedb5490b0896f5b SHA1 ec2b8952f8fe55471e923c086a6e9b48e06ce7a8 SHA256 9fc8b3ec3fcf1cca714c78c28c1883503abfcfce4fe175e43c6d7ec14ddc9478
 AUX wireshark-0.99.8-as-needed.patch 395 RMD160 2e06f641e9789db717544bfd1568e4bf6e85855c SHA1 a18b6fcc85b40c00fc1d30bcdfc81d13dc33e904 SHA256 d2f996a79fa3117296b25c10a1d4a3f0f8027a678de4e37e6c60bfb47a4754b9
 AUX wireshark-1.0-sigpipe.patch 850 RMD160 a240a1317681516d207ca1694b0e44584008530b SHA1 8f127c22daa77ce9f658f3b1d3f897e428ee9dde SHA256 3a5130838a48b65cb21b4e25913347cee05689b4641c1dfb407facf9fa4f9f59
 AUX wireshark-1.0.5-text2pcap-protos.patch 487 RMD160 20e64be01b281c48516969c508c04455111de300 SHA1 432751cd931baefba3bd13cfa07c3d9863b7c82e SHA256 991e12325670c81f4927c6dc2b665eb8c8938d8f3f0cdfab58601dd37a00d8a4
 AUX wireshark-1.1.2--as-needed.patch 830 RMD160 fd192d107147c65ef52625b51b59a2bf4e2f65c3 SHA1 7a743a42542fa59423870a0205e8ed7aa6bde70e SHA256 34aa27c611021c9a515cc4fed9778148395761bf6f4272130d3e83abcc13a499
 AUX wireshark-1.2.8-zlib-1.2.5-capture.patch 779 RMD160 7440a7d8a04a1b43057fc7c1e29540a49a77ac0f SHA1 01ab94564003bb230f15a637b355fca31774e27e SHA256 936be11853d8eaf846a28be1dce7e098d386fc58d84ed521bc4f6965e387c69d
+AUX wireshark-1.4.6-gnutls_nettle.patch 733 RMD160 9b8839b432b5c6231068d784d9fd3e151c509dd1 SHA1 2592ac7fd110cfff4b70a6456fdf655f5aca45cf SHA256 6698b83bd455b626f46c2d446a6c69f6f4c6822f63207ffb1052accde881fc76
 AUX wireshark-1.4.6-wspy_dissectors_dir.patch 460 RMD160 098cc8aa80433dff0423cf64d88be89d7716fffa SHA1 fd23ab1494482e8825c79dfc5df2cac42fbcf97d SHA256 ed59b5d0af20d3c7adffa7742c245e8640e593e519200149810df4022eb8442e
 AUX wireshark-except-double-free.diff 664 RMD160 2b61f03f5148975f6438351c11de18a500deabc5 SHA1 0239e19ba0ebd2cfb4ab4987a8a4c56646cd9250 SHA256 dc02a5f3e4bdbd128a2ba08f38880358f747661a93ca0b3fe1918c67b255c369
 DIST wireshark-1.4.4.tar.bz2 20479081 RMD160 47f9274cd6933684339b4c7c0b7c723d8c9b1512 SHA1 4d1d7e7bf07683723b661eb7b7124b2e90106087 SHA256 6033e627c40ac4eec7e95c03728b497ee2bc5851af8c9e58bb89b7496717dc0d
@@ -14,13 +12,6 @@ DIST wireshark-1.4.5.tar.bz2 20501797 RMD160 c6e66948c6a6573c85e0812cbd57845d08c
 DIST wireshark-1.4.6.tar.bz2 20496268 RMD160 7ecb1c006eb70858e21019a731d038478a3f7879 SHA1 dd283b3957d1096bd643ab4b83b19dd2d7d6bfd8 SHA256 f923f1e923dcb479b7fdb9bc6d4ce4c27ae8ac1f0148f2820bece476872df1d7
 EBUILD wireshark-1.4.4.ebuild 6421 RMD160 1fbf49245dd450987856071934644cf22ced3920 SHA1 71a83f0e0309cedfd22fbfb8b29a4cac32508bfb SHA256 e0d6357ba32e47652a5b315f955a4e67ae63c2e504d50749804b2d3dd0441ef9
 EBUILD wireshark-1.4.5.ebuild 6422 RMD160 f0438528d51f0e13eef4f471c4cab6c89e5165ff SHA1 04bd74ac6178257681b06e44994bc76b84047344 SHA256 bce48d5dd1005638fbdecc320bf6ec9f2c640e9b1659088a177949864610ecf3
-EBUILD wireshark-1.4.6-r1.ebuild 6393 RMD160 a5e1383145a0c494dd074e516eeeabb57e67161f SHA1 8d7f6dbd652f2b697c70e7a4b4e8f336f8e94169 SHA256 cb7123d762a53c40249ff6b711edd032975f18d243f8d3ad81a495d1e342b43b
-MISC ChangeLog 42718 RMD160 d52e2c56465af9d5b495bc43d6580b8247e56333 SHA1 f126a2350646a2009cb07435970e160a8b58619d SHA256 a3d4768bd75cd37c9c083bba7986c03e1dec431a9e9173f77d8c1e2d20e78cee
+EBUILD wireshark-1.4.6-r1.ebuild 6438 RMD160 b9396760261ba162392ad478c01f5483352306cd SHA1 29ca80c30971bbc29307513228a756e265fb0c1e SHA256 445a08c69835d3d5fc36bd343b44c09819719203b1d707d1b7327d43be22d05b
+MISC ChangeLog 42926 RMD160 e9ea2e7fedb29bbd4647c6f78a0c1da558ff442a SHA1 67f07765b3732afb20ecc6d3d39926ed83603140 SHA256 fd38e3d324883a66646db08dd06dc844ed29f1396654d6129bd221cdb653077b
 MISC metadata.xml 2242 RMD160 66dbbb758acc194df17217183b60a56f61fced38 SHA1 4498ea4c0f0f04213fd1cba2fd3de44565058f7d SHA256 2dfaef45c385c37c7ae8af96f5d8c58d9bff8f6186d55be8f2d034ebd0c60869
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAk3FdWEACgkQuQc30/atMkDYlgCfTaO84Jt+Yhxq2ydjEIbHq04F
-iTUAoIgrD8JAA/1xJsefX90kZCDjeSD6
-=dz5Z
------END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/files/wireshark-1.4.6-gnutls_nettle.patch b/net-analyzer/wireshark/files/wireshark-1.4.6-gnutls_nettle.patch
new file mode 100644
index 000000000000..422e2ea71a8c
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-1.4.6-gnutls_nettle.patch
@@ -0,0 +1,24 @@
+https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5800
+
+Index: epan/dissectors/packet-ssl-utils.c
+===================================================================
+--- epan/dissectors/packet-ssl-utils.c	(revision 37067)
++++ epan/dissectors/packet-ssl-utils.c	(working copy)
+@@ -946,7 +946,7 @@
+     str->data_len = len;
+ }
+ 
+-#ifdef HAVE_LIBGNUTLS
++#if defined(HAVE_LIBGNUTLS) && defined(HAVE_LIBGCRYPT)
+ 
+ static gint ver_major, ver_minor, ver_patch;
+ 
+@@ -2747,7 +2747,7 @@
+     sscanf(str, "%d.%d.%d", &ver_major, &ver_minor, &ver_patch);
+ }
+ 
+-#else /* HAVE_LIBGNUTLS */
++#else /* defined(HAVE_LIBGNUTLS) && defined(HAVE_LIBGCRYPT) */
+ /* no libgnutl: dummy operation to keep interface consistent*/
+ void
+ ssl_lib_init(void)
diff --git a/net-analyzer/wireshark/wireshark-1.4.6-r1.ebuild b/net-analyzer/wireshark/wireshark-1.4.6-r1.ebuild
index f9e0237a2489..f779bda49899 100644
--- a/net-analyzer/wireshark/wireshark-1.4.6-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.4.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.4.6-r1.ebuild,v 1.7 2011/05/07 16:37:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.4.6-r1.ebuild,v 1.8 2011/05/15 13:41:04 pva Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -13,7 +13,7 @@ SRC_URI="http://www.wireshark.org/download/src/all-versions/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="adns ares doc doc-pdf gtk ipv6 lua gcrypt geoip kerberos
 profile +pcap portaudio python +caps selinux smi ssl threads zlib"
 
@@ -103,6 +103,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}/${P}-gnutls_nettle.patch"
 	epatch "${FILESDIR}/${P}-wspy_dissectors_dir.patch"
 	eautoreconf
 }