Fix from Debian for crash when importing the python module.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 96 insertions, 22 deletions

diff --git a/media-gfx/zbar/ChangeLog b/media-gfx/zbar/ChangeLog
index fff0edc70b93..77023dafb80c 100644
--- a/media-gfx/zbar/ChangeLog
+++ b/media-gfx/zbar/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/zbar
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/ChangeLog,v 1.13 2013/06/29 09:37:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/ChangeLog,v 1.14 2013/11/27 23:11:56 vapier Exp $
+
+*zbar-0.10-r4 (27 Nov 2013)
+
+  27 Nov 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/zbar-0.10-python-crash.patch, +zbar-0.10-r4.ebuild:
+  Fix from Debian for crash when importing the python module.
 
   29 Jun 2013; Agostino Sarubbo <ago@gentoo.org> zbar-0.10-r3.ebuild:
   Stable for x86, wrt bug #474522
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index c3f8c0670b5d..a68063c1dd14 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -1,26 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX zbar-0.10-errors.patch 178 SHA256 664434317c666147927fa23af138122c7248b06f37f8ae10a005713c1cb804ce SHA512 0978f9d52bed844448c5a92349806134e4b03bf069307fad2f3944b92b6f1c8dda094574ae4829860263d735ba7d20e71d435308185503634f9e46897479c7f1 WHIRLPOOL 1f9095a53d9320a4526fa773a0171a1176bda0b383982347b138175bed2aa0623cdacd23c48e35afd07f7a4dcd13f58d50dfa6dfd8ac1bd78152525bca41260a
 AUX zbar-0.10-no-v4l1-check.patch 2270 SHA256 fe41b3855be44d0f61e6e21dfd3fd90fc56b6f01b1e6633e3d2ab9ed9617f5c8 SHA512 f2f66476769469d701206bf1efae16d384cfbaa138c877a0ea32bedcd39b5abfd6dae630e7d729b009ab50052db0166198949f49ddfb66d708792000808da74d WHIRLPOOL 3e2c65812ada05197085a6823b0c063f6264d72c55a91383d25c8b8576a4cb50ff707ad655993723fcae87f42f366f6ea637640db21ba6d15544443e07269db6
+AUX zbar-0.10-python-crash.patch 604 SHA256 a8f27e03a58be705ea9f7a4b139f5c831171a44bd15d775fb5477c406f3e321c SHA512 56e1848466b2178fb25a1f88f1a35113c01d370927b5778af96f1b96bcdaa8349308ac7ef14fb247bc5ec4165b2f7daa717159f3f7786ced9c043428afd641ba WHIRLPOOL f135563cbe4742412e6c2c41fabec6725d034bacbc9ee6d71aa315ce708a17e19807d06798c452089237b8a214c06f7d340c22f6985575b17d7118a448b394bd
 DIST zbar-0.10.tar.bz2 592602 SHA256 234efb39dbbe5cef4189cc76f37afbe3cfcfb45ae52493bfe8e191318bdbadc6 SHA512 76cb8a469e3ac9ea7932a95c500cf933501249cdb8dce4df558bf5681bd44c62111327b494e6e887079a5fd30b32154887dcc12962e6d27b1453f55457483db4 WHIRLPOOL b4d8f6b2f6deb52fc7a60721888c3bbec2f4a94d5e29488167908e8a448ca698d64db7f78fb22408d4e3360eda44fd82195a0d762b71d203ca87d549461cde7f
 EBUILD zbar-0.10-r3.ebuild 1697 SHA256 e44f7d279ccf7586ce96ed2a88cfb936e114a57c1614799e25a0dada5de5e63c SHA512 ae384bcd7d19b3979826c13c206df3e2a816b9eb19c4bf16352663e8fe1c636c5dbf3e128fbdf73b280479e28de6e51f4fde7ec189735691bfcf568c9c3964ff WHIRLPOOL dde0c659661c0ec1ff958d2930a7891cee2232f79c82370f32eff91d9b043ff158b1e01655382bc6d2d974be22f9bd0189fb4831745404eae54f17807328c557
-MISC ChangeLog 2094 SHA256 6d6a5e77ef44515a1efe2da12a0de9f3168bd1134f63ba4fc39e28a10cbb09c6 SHA512 a763309b5735197b80e0d3aadb7b749bcd9bb989c3334394e7fa43d7971de89a26c9aa7bcbc8fde4dfd4b9d7a8609dbf9938966462bfe542713acb0acc798396 WHIRLPOOL e5f182900579babec10d013f09cd72684f7d413f24966c7177115b3ed4f2087213725bd4df0b0847542c79fa6ac689a2c41906985f310607797cd78ce023d560
+EBUILD zbar-0.10-r4.ebuild 1755 SHA256 f75a1e7ef7449d9ddd46e3b768ab9cacfa1aaa2df9262db1baa08eff762aca09 SHA512 1a24e3d5089f706823b7b04821c61423572b50c324ba6328e4e56ef5911aee8a1d64c7f873973654615f95f05fe6f95e9b16fadb7be3c0145aa8ce960cbcfc67 WHIRLPOOL dcd68fb4dc28b6c5fecf979fffac76d2494fc41d9bc97dac76bf40c7b2fbace023490ec0289ffc772085c5b45c431fb4c3c4917444ef4a03a721129b7763e137
+MISC ChangeLog 2300 SHA256 8d4a464293bfad97243fbda9f707fe0fab364f07d15802763be9942b6e9973e0 SHA512 b900ecae303ab845a7ac3ebf70ed6e0598ff5ada4305ea31398e1e0223d64af5b1a8166955df368797da721d788e101eab103a89ce54f55c778c977c3df83316 WHIRLPOOL ee151970e0e0e198cd9f6c2ddfe7aff897ca48541c8d745ea29f4cf43991a6c71ef19895c19337ba0cc457c5e9de5598738d45ed80e35208178bc8c5d039313c
 MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
-
-iQIcBAEBCgAGBQJRzqrHAAoJELp701BxlEWfhPgP/2dNW9GOsWeJQMFFCcy1Fnm2
-lv/caqK7UUpqRIwzjXYszai/KqNbJUUyjn9mGDmfbOp3vuYNBvvP2Mdmw4GE8FYQ
-4zmj6sbN5KeZGcqJr38A6Ccs02QQaFfZmXwH713V9cdNPTbuGTP7IRFGV++oOKVU
-i8wLCC3qYO+7xomD4vad4OXEBEt5ia0o6ObhB/0TC0qKtiTxTICHrr7iOwveDQM9
-RGi7C4wo+K/0nY1UshLNCW45oNmDAkaFg70bvY3eI5/tlnVI6jDcBIE9aPY2lcff
-PIxe3G5O0qvSAydBWt7tD8o1Mqi0Xxs63mLIZj2uKpWshCBiRlZk5rhOj+cbnmeJ
-Zshv2bFaXc3024y3HFp7dnmBgGrhHT6ICf9B1VvYVEzpTKh2/ywUazeA+rzCwGSM
-GLU6fNCttUBikmtP2QJf+NVPhDZM1A1N0WgeAp9Tfkn65OcfBZwMTtNJ65aBFN41
-O8wPzeWtKXqKKiY28/kO9+t4Eg6lIeLArJl5jLi2jdcRMIKro7dZVSu4YnvaaC1n
-YGajcpzLkCZzAVMRRZrgXcBBQi5pHasGj4dIY7cjkD15AAVQD/wxJBESCqwJUnDO
-U+yMxYen80KYdNPQYmJbh67SRpTNPNR8ET0hGVKC3X0oEu51FTbhBrzxIi3RWE8y
-k9QzsvgJWNenba9uJ2j7
-=1dwS
------END PGP SIGNATURE-----
diff --git a/media-gfx/zbar/files/zbar-0.10-python-crash.patch b/media-gfx/zbar/files/zbar-0.10-python-crash.patch
new file mode 100644
index 000000000000..a6f7a96e34db
--- /dev/null
+++ b/media-gfx/zbar/files/zbar-0.10-python-crash.patch
@@ -0,0 +1,19 @@
+https://sourceforge.net/p/zbar/patches/37/
+
+fix from Debian for crashes when importing the python module.
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=702499
+
+this doesn't happen on some arches as the data naturally ends up with zero
+data after the structure, but on some (like arm), it isn't so we crash when
+python walks the list.
+
+--- a/python/imagescanner.c
++++ b/python/imagescanner.c
+@@ -68,6 +68,7 @@ imagescanner_get_results (zbarImageScanner *self,
+ 
+ static PyGetSetDef imagescanner_getset[] = {
+     { "results", (getter)imagescanner_get_results, },
++    { NULL },
+ };
+ 
+ static PyObject*
diff --git a/media-gfx/zbar/zbar-0.10-r4.ebuild b/media-gfx/zbar/zbar-0.10-r4.ebuild
new file mode 100644
index 000000000000..0838330ca674
--- /dev/null
+++ b/media-gfx/zbar/zbar-0.10-r4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/zbar-0.10-r4.ebuild,v 1.1 2013/11/27 23:11:55 vapier Exp $
+
+EAPI=5
+PYTHON_DEPEND="2:2.6"
+
+inherit autotools eutils flag-o-matic python
+
+DESCRIPTION="Library and tools for reading barcodes from images or video"
+HOMEPAGE="http://zbar.sourceforge.net/"
+SRC_URI="mirror://sourceforge/zbar/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="gtk imagemagick jpeg python qt4 static-libs +threads v4l X xv"
+
+RDEPEND="gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 )
+	imagemagick? (
+		|| ( media-gfx/imagemagick
+		media-gfx/graphicsmagick[imagemagick] ) )
+	jpeg? ( virtual/jpeg )
+	python? ( gtk? ( >=dev-python/pygtk-2 ) )
+	qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
+	X? ( x11-libs/libXext
+		xv? ( x11-libs/libXv ) )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-no-v4l1-check.patch
+	epatch "${FILESDIR}"/${P}-errors.patch
+	epatch "${FILESDIR}"/${P}-python-crash.patch
+
+	python_convert_shebangs 2 examples/upcrpc.py test/{barcodetest,test_pygtk}.py
+
+	sed -i -e '/AM_INIT_AUTOMAKE/s:-Werror ::' configure.ac || die #423581
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -DNDEBUG
+	econf \
+		$(use_with jpeg) \
+		$(use_with gtk) \
+		$(use_with imagemagick) \
+		$(use_with python) \
+		$(use_with qt4 qt) \
+		$(use_enable static-libs static) \
+		$(use_enable threads pthread) \
+		$(use_with X x) \
+		$(use_with xv xv) \
+		$(use_enable v4l video)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc HACKING NEWS README TODO
+	rm -r "${ED}"/usr/share/doc/${PN}
+	prune_libtool_files --all
+}