Fix validity error in release-notes.xml, bug #394433 wrt Juergen Rose.

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

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 35381b14d1fe123344d720866d8fa8ce8f96c2b3..dd73fe365d5850219c70f14bd3c065e8e0b1fd89 100644 (file)
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,10 @@
 # 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.320 2011/12/12 06:42:36 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.321 2011/12/12 16:10:29 pva Exp $
+
+  12 Dec 2011; Peter Volkov <pva@gentoo.org> wireshark-1.6.4.ebuild,
+  +files/wireshark-1.6.4-doc-build.patch:
+  Fix validity error in release-notes.xml, bug #394433 wrt Juergen Rose.
 
 *wireshark-1.6.4 (12 Dec 2011)
 

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 2a24d631cd681f9737a2ebfd431f265aabbcaaa8..c99064d9eb2694ead170421a272039b961a95e53 100644 (file)
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -2,18 +2,19 @@
 Hash: SHA256
 
 AUX wireshark-1.6.4-build.patch 396 RMD160 fa909e374c80f0c637a459750d305cd636e7e18a SHA1 825cb721d7d30cfdec5f53e0b38fa7ee8891ec20 SHA256 8648c0eda8fd4393d4b0513c4d6673d0568b7341f920e55e7ebe7391d1e3b430
+AUX wireshark-1.6.4-doc-build.patch 501 RMD160 65ea45bc7014c5f0bb556b3c964c45d2b0d2f582 SHA1 ea7c00ed98613581791c7c9e53f009efee5e6c08 SHA256 2ae9ad7ce2ceb1b7a2430ae71d04cdb4f9173d74e0d67667965226d8f43d1945
 DIST wireshark-1.4.9.tar.bz2 20604645 RMD160 e8f6d68b5b49607fa337ef05ff6bd6c5acdb2e60 SHA1 242e8faf76ec219ddc28688517865ce19c611cd6 SHA256 e554f855cba4091779feb3d9d452716a8f87a549d8c27a4e2c700b0cb12dc984
 DIST wireshark-1.6.2.tar.bz2 21408664 RMD160 e343d9bb5600b236dea708bb68ecad805a9ee20a SHA1 a18d4e8eaf56fe0214b19d7fde0eb91a06817a49 SHA256 5343f514ce98c28498ec4734e40e34e2bbf779a6c57d958837e3f70234471e7f
 DIST wireshark-1.6.4.tar.bz2 21464517 RMD160 9437c416a5963aee1c049c0275bdfd3edd7488e8 SHA1 8abd7681e8c05841b7cf31d5dc83c1092c54e79f SHA256 7f98191f53d375f020312a99a9747ff3b846ac4029af4027fc883f685fabef5d
 EBUILD wireshark-1.4.9.ebuild 6308 RMD160 1cc754917fc9fa2b67dcde05296c031c5b3dbc58 SHA1 40233e735c52457737c555fe196ac92a9b5780de SHA256 d968bdf0343ff49a3809dfc995233ce612662bc0903afa641b3e4fb9bf18d1f5
 EBUILD wireshark-1.6.2.ebuild 6315 RMD160 7bd88e4d7009dee6cc65d2e2a0ccb7411804f49e SHA1 c24b9b04671fb26c508185997ff11ca2a10ac4b4 SHA256 1eee0327c11708795aaac2af165f31bb0ee8039a1698b58ecf07f421f6551a1d
-EBUILD wireshark-1.6.4.ebuild 6444 RMD160 f3779685c49eb4e125ed923faab6c8d8cbab2042 SHA1 1453b66a49035265fc521ee9f67ef316ee7f0034 SHA256 d50bf57ee207eb5837f55ec6910667dfe4508781b5ecb63626cd964893a7e9a4
-MISC ChangeLog 46782 RMD160 ab7d3454941a14985f6bd73fce051b3056b69fdc SHA1 c7e84700afafee4d96fd1e9b4414eab8131e7b2c SHA256 54d2a5238f976336031534e9d919c42e458963d3912ecf8e1189bac4aa47d900
+EBUILD wireshark-1.6.4.ebuild 6487 RMD160 2fb52a176093346ea20b43e015063dfdb80d0a36 SHA1 5efdcbe60c05a7ccdf9c766aaf3d4c4e3268e8e9 SHA256 ff2303770153ce29a3cc6df928cb74c3e55a4b93acf2a3d88b47fceff2a0225e
+MISC ChangeLog 46967 RMD160 7bfe16adac6f0b7cff96d166f2a446a7db64d091 SHA1 63050cccaf9d580cae9474c511c7a3a82170d8ac SHA256 9123cea4925b069092d8a43e6bf7aa64220a855bfe6f0bd8478f7525aed62a21
 MISC metadata.xml 2242 RMD160 66dbbb758acc194df17217183b60a56f61fced38 SHA1 4498ea4c0f0f04213fd1cba2fd3de44565058f7d SHA256 2dfaef45c385c37c7ae8af96f5d8c58d9bff8f6186d55be8f2d034ebd0c60869
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk7lolwACgkQGrk+8vGYmwfA3wD9FxIeJzjK6SNM5ERC6SRzV75d
-i4FOxm+p+3u/rrHJHSoA/3vel72xYFCYnkkj3k0E87lTYjAfbhqdM8l5uTIjsm5I
-=mTZi
+iF4EAREIAAYFAk7mJ3UACgkQGrk+8vGYmwem4gD+MhWKy2CEQilQGyIUnqMi+JFJ
+HtkiwR+I/uX5u4KBpCoBAJFAb/TboJsvrJ5ppsD9bICCEUsahVLvgk45QjWJKoEH
+=F6i4
 -----END PGP SIGNATURE-----

diff --git a/net-analyzer/wireshark/files/wireshark-1.6.4-doc-build.patch b/net-analyzer/wireshark/files/wireshark-1.6.4-doc-build.patch
new file mode 100644 (file)
index 0000000..9bd9230
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-1.6.4-doc-build.patch
@@ -0,0 +1,16 @@
+https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6662
+
+--- docbook/release-notes.xml  2011-12-12 15:38:59 +0000
++++ docbook/release-notes.xml  2011-12-12 15:39:56 +0000
+@@ -43,9 +43,9 @@
+           (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=0000">Bug
+           0000</ulink>)
+         </para></listitem>
+--->
+ 
+         Compilation on Windows using the release tarball has been fixed.
++-->
+ 
+         <listitem><para>
+           Patch to fix memory leaks/errors in Lua plugin.
+

diff --git a/net-analyzer/wireshark/wireshark-1.6.4.ebuild b/net-analyzer/wireshark/wireshark-1.6.4.ebuild
index 7160d7d146e04d9b350ec56546b64d05b1664cec..bc14c0f225a16608f51dc1231d5cf53d41e450fe 100644 (file)
--- a/net-analyzer/wireshark/wireshark-1.6.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.6.4.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.6.4.ebuild,v 1.1 2011/12/12 06:42:36 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.4.ebuild,v 1.2 2011/12/12 16:10:29 pva Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -104,6 +104,7 @@ pkg_setup() {
 
 src_prepare() {
        epatch "${FILESDIR}/${P}-build.patch"
+       epatch "${FILESDIR}/${P}-doc-build.patch"
 }
 
 src_configure() {