Fix #446922, thanks to Bradley Broom for the patch

Package-Manager: portage-2.2.0_alpha157/cvs/Linux x86_64

4 files changed, 34 insertions, 16 deletions

diff --git a/net-misc/mediatomb/ChangeLog b/net-misc/mediatomb/ChangeLog
index d382426a0371..454108933498 100644
--- a/net-misc/mediatomb/ChangeLog
+++ b/net-misc/mediatomb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/mediatomb
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/ChangeLog,v 1.40 2012/11/25 15:16:05 lu_zero Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/ChangeLog,v 1.41 2013/01/20 16:28:11 thev00d00 Exp $
+
+*mediatomb-0.12.1-r5 (20 Jan 2013)
+
+  20 Jan 2013; Ian Whyman <thev00d00@gentoo.org>
+  +files/mediatomb-0.12.1-avformatcontext-pointer.patch,
+  +mediatomb-0.12.1-r5.ebuild, -mediatomb-0.12.1-r4.ebuild:
+  Fix #446922, thanks to Bradley Broom for the patch
 
   25 Nov 2012; Luca Barbato <lu_zero@gentoo.org> mediatomb-0.12.1-r4.ebuild,
   +files/mediatomb-0.12.1-libav9.patch,
diff --git a/net-misc/mediatomb/Manifest b/net-misc/mediatomb/Manifest
index b7e2989040d9..c832942d0330 100644
--- a/net-misc/mediatomb/Manifest
+++ b/net-misc/mediatomb/Manifest
@@ -1,9 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX mediatomb-0.12.0.confd 805 SHA256 21b1b9d31a6db76c5c1ccfbf00e5cd553eecfeb0e2bb161ccc024eab2243293c SHA512 74d2866c749272fe71e97e73ddf349070c51879967e7fd55716bb2dfc49f89d80d0655ac05e01fdb107fb057a62540116dcebdda87840b16c7bd11962c12065c WHIRLPOOL 3b545b860f61c5a91db2d9ba0ee8a30b572bb073ae7a82456488a2d8bacfa03e89218722d6e072ed7ab32f995bc5465f8da53c5bdaa4a049eb5d7caa8a71c5d8
 AUX mediatomb-0.12.0.config 6180 SHA256 cb43e92639e5e53908567c050c9a2fc0e5c349fd11a149414590c2c6a402b4d2 SHA512 310f408d6925ac7c2a4b5cbb0a8a854ba41c8aaa678b1e1805649e73be86d9e438da2fce7731df0e244b78271da98751e66624af15328633833603f7645be081 WHIRLPOOL abc2ad05aa92fa540ea4c69db24e205fa84babd308ff769eda68a7e4d68c004b96191c63566db71a308a2c309b10999ab9925af8e00cbf9caa90e16d90467871
 AUX mediatomb-0.12.0.initd 541 SHA256 8dfe99d619a3384b2fb9105051daae1fc6c88402364d4203b21344f766a6b696 SHA512 5aab06ea989986350f6002f67946a9abd0e3c4ec538f4b143454ed92fc5384344db862cf190b632f6b343b4e5fa268b55922ec1eafa3859705185c14af066e47 WHIRLPOOL c07afad49c46c633e32ac33a82de8316fc0ccf2dbdb65662f79bcf40b4a5e991ca710648537278f4e6eb82afd34b47df22c713b86ca6bececf79183126cfdac8
+AUX mediatomb-0.12.1-avformatcontext-pointer.patch 552 SHA256 a286d67e0c248c2c8e37273d3a40bd9c9598dc0837f2cb92ad304408ec0df870 SHA512 4ab0d0fec7a31d913ba0f2643614e6c3ed7ece7ac99f0463bbbbec3f300810a723d2ad6ff12123d77a6e2361d329adcab3b68250b87b941074a0e0a4fc1db566 WHIRLPOOL b133bc4e04b54c6988af54381463645a84a549fb51d627ad243c401807e8d4e683908d9bf8574d3da64b5912ddc82ac18cfb002b853d22a7a5ffdacaff0fa287
 AUX mediatomb-0.12.1-gcc46.patch 297 SHA256 58379e733518bc5ef61fee9156d430ef283278eb3a69f6bdad4cad794df75146 SHA512 d200eaa003b2054f1d0ed07ae4c3660903fb4355d745573941bf2a6fe4dbff24c360ae758d062fab84ddea1a6388f70b79ac2f7c37beb74115a12794b238879a WHIRLPOOL 5b7773b014c939d566137ba3a0098c3d103acdb8b45f8fc8b198efb204cd0a89a8320313e33c0ddffd67dc68017aa8382ddf0fc84668a445a3215d41a687f1bb
 AUX mediatomb-0.12.1-gcc47.patch 4128 SHA256 ddcfa266ecb57f522575b42b2f96171eb4e0d634a61bafd2d03ac0d672f7f166 SHA512 8b9f9748be42b172f420f49aaf929bc9ca7e94e0924f8147fb4bed72e299cfdc308378f2a76905a1ce7734899b851938f6b7721a7d30375644448c59c6bfcbdd WHIRLPOOL ba05083c138157a8d02ec6208e8f0c9bc9c0339df6de5407b5f7fe60cfb7c2a4da0ed02c0a06fa6e494eed3402e232d49d8839663c77d90f23422c0b06dba43d
 AUX mediatomb-0.12.1-inotify-hard-links.patch 1483 SHA256 7a7475305d0d5376884e31c5220e9cad281a401a5ee6a4cf4243f084e9975832 SHA512 f9062fc0fa86045b325bbc38a9b31142c1d6e6227e2560f6429390917f675e5d9b3e4910b957b9bf3337b88f79cd2f66353fcd5460218a619303342670592206 WHIRLPOOL 4945f0bf2e21054764c8eeeebb398d3a8817b518f2ad1063ebc8464d73fb1a8dfae4d0d6d871726731fbb225c3d4a2d0155896e068dd9e444ac3d884b4b479d9
@@ -22,13 +20,6 @@ DIST mediatomb_0.12.1-4.debian.tar.gz 34161 SHA256 b1e48d01f4f99362ef554c9220df2
 EBUILD mediatomb-0.12.1-r1.ebuild 3792 SHA256 f2e6e0aca325d095d92f6f6bba51b398461151ebbb6495fff5da1719bd0a3c48 SHA512 07fd3cf9d22e5f28525dceae5889b60e5846e14bfd4abd0b5ea893b7c6e99caad7f67285bab147f3dc9b7b0e6ce48c2185dd99dc134c8b7016bdebd27164441d WHIRLPOOL aad1ca88de7d922d25dbc7dd1278c337dd7e4e90ac1e891cf7d60986f110b524400835c03bdd10493d99b216680c3be3a78bc527baad994ba591f1276ef74866
 EBUILD mediatomb-0.12.1-r2.ebuild 3889 SHA256 923070cbdadb4f1b04e604371734a28f3a6db7ae3270e27c880dddd432e5cb06 SHA512 33217cf659c746244293bbcfdcec90e6499cba612cbbfe8d12f425be383cd28ee24a928ebfafb239bb47eebade6fc75821295ac0bc3972c8f720f12b0cf00d95 WHIRLPOOL 6ba2c8038eb3213ed552a6772d9782b45f5cfa69a46912d55dd273fcb2df8927edcb94523077d1aa45d8fbe14dc07686aec45f76de648df181d5691702c62488
 EBUILD mediatomb-0.12.1-r3.ebuild 4113 SHA256 5c16826cfedc24d7428f47e19295c533f2706cc8c66597f16073b867214429bc SHA512 910146f4c7c768d0f2d7d766ada937b332f509984ec9c4a69f7e1493292d5f433dfc5a428afca97081b49b09af93e361199b145b5e6f88a7ff96a56f20d962f1 WHIRLPOOL 29689bc441ff1d0550ee3ca76cdf6fd7e0225c5aef680bd20ab763b31f4bbbee10595b74879356167359f9d06d42e008df6595168b948d61c6695e430e4e3fd8
-EBUILD mediatomb-0.12.1-r4.ebuild 4297 SHA256 ca65ad871bf1b0db6c99a7baa63246556ffd4297e7fc7f3674e4ecaaad588ccd SHA512 8e7605ee1769af4ae775cc9b69f837a3a7de2fe4ca5966c4e09f6f7e0ddb16a6e4dd8dff40d5af5afcee989a5994ffc0c8033cc9946e0beb42a8d89a6a2f6eba WHIRLPOOL 616836c2cf4e45d2eb7a85dcfa164b07c2f9e1c3039bf5f9d841c57b2cb3450b04fbabc442e9063281a4dc0567504fd77db73563065e2ac8bf109156c4bb7c2a
-MISC ChangeLog 7434 SHA256 74016926712aa6b64ab52b5a113c45a7944fdcc978585c9f5c8ff2ac4dbbe1d4 SHA512 e2f0cff81e527ca157aa7ac56d2e557dad938e3b16f3619343e6d825491f43e2523f06ca162071de58841e34c771582f7eb238a07a95ed670df3548cd28dfd18 WHIRLPOOL 43b291d47c19baa02eaf4212084710e368af33ca3ecc480d5b6db35bcdbc40dc7c2430bc94f22f707097a8c15a4fbfe781ecb6a1acdc55fdf240667c7b3c2052
+EBUILD mediatomb-0.12.1-r5.ebuild 4364 SHA256 66b8165247012e2a459708956c01a0db59ee463f535f2359b85916d67f3f5278 SHA512 787203930a22ab223358f4a437c306387608113430eca32bb93fc7e0f5e8c61427f0edeff5cdcc0ad803ca7f68b3fbe9df4a25fc453bf3210c5898fbf9355018 WHIRLPOOL 1bf4e655168925c35a91defc5141df5e997d2e1957cdb0519e3cfae5585e1477963c5308e71ced63db7bd6c0f65d20cc5d6fc2726e1cab4c114a334ee4547717
+MISC ChangeLog 7692 SHA256 0f8acfb3e4fb4cf0c84183c5bd539d5f385b2e64c66c7441d8849a1c7c53f201 SHA512 bb829992212c6e049850f32cbbb7053d8bf6439f06323f1c5da24879d267c68db1f5ab8122b60f194e4d1a75c934b9e0404911b9c654e2ec89edaa0bda6cb2ad WHIRLPOOL eeaf7008271df632ccbf2db67c464580c4c1979133bd2d2ad9beadfd9bdcafd847ceec07a0140f48ebef2541c75706e8184c272de19a555329e775c331171f35
 MISC metadata.xml 868 SHA256 1d1c5d3778c67556255786a5082e7c45b598a2edf20159b6e337ed04ebe15bd4 SHA512 a20d44b05d6a4ebf31deed0289a4d7f0d96a8a1ff370a4bbec1d1f8b5b12823a047e846a95e24fd0e47c0020478d3ff0402642309a8fb8554db841db2fa89e05 WHIRLPOOL c68c00fe9cf9902c4c3a4edef9d223b6a68627c1c26aede016aaed4b7d8f7bcae6e280a9ddf8dea435e53c017a56eec303b3aab0d72bae0ca2c59e063d8f1720
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iF4EAREIAAYFAlCyNj8ACgkQcXOrnRGRc46/xwD/ZQUIO/J3c7nm+ikWejfNFly8
-OO0sB9ksPffD7NFCcvIA/0PkIgNCyD0WKMNLuWc3CGo18DCgG/ymAGCJ/ezhQef3
-=HIAq
------END PGP SIGNATURE-----
diff --git a/net-misc/mediatomb/files/mediatomb-0.12.1-avformatcontext-pointer.patch b/net-misc/mediatomb/files/mediatomb-0.12.1-avformatcontext-pointer.patch
new file mode 100644
index 000000000000..ab3e7cf7e17d
--- /dev/null
+++ b/net-misc/mediatomb/files/mediatomb-0.12.1-avformatcontext-pointer.patch
@@ -0,0 +1,19 @@
+When opening a file to check its avformat, the AVFormatContext pointer was
+not initialized to NULL before it was passed by reference to the open
+function.
+
+Patch by Bradley Broom <bmbroom@gmail.com>
+
+https://bugs.gentoo.org/show_bug.cgi?id=446922
+
+--- mediatomb-0.12.1/src/metadata/ffmpeg_handler.cc
++++ mediatomb-0.12.1/src/metadata/ffmpeg_handler.cc
+@@ -281,7 +281,7 @@
+     int x = 0;
+     int y = 0;
+ 
+-	AVFormatContext *pFormatCtx;
++	AVFormatContext *pFormatCtx = NULL;
+ 	
+ 	// Suppress all log messages
+ 	av_log_set_callback(FfmpegNoOutputStub);
diff --git a/net-misc/mediatomb/mediatomb-0.12.1-r4.ebuild b/net-misc/mediatomb/mediatomb-0.12.1-r5.ebuild
index 8dac38434756..33c8b3ee41fd 100644
--- a/net-misc/mediatomb/mediatomb-0.12.1-r4.ebuild
+++ b/net-misc/mediatomb/mediatomb-0.12.1-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/mediatomb-0.12.1-r4.ebuild,v 1.2 2012/11/25 15:16:05 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/mediatomb-0.12.1-r5.ebuild,v 1.1 2013/01/20 16:28:11 thev00d00 Exp $
 
 EAPI="4"
 inherit autotools eutils linux-info user
@@ -67,6 +67,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-thumb-cache.patch
 	epatch "${FILESDIR}"/${P}-libav9.patch
 	epatch "${FILESDIR}"/${P}-no-thumbnail.patch
+	epatch "${FILESDIR}"/${P}-avformatcontext-pointer.patch #446922
 	eautoreconf
 }