Fix segfault, see ChangeLog for more

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 108 insertions, 3 deletions

diff --git a/sys-apps/lshw/ChangeLog b/sys-apps/lshw/ChangeLog
index c499ccb8cf55..265446c614b2 100644
--- a/sys-apps/lshw/ChangeLog
+++ b/sys-apps/lshw/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/lshw
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/ChangeLog,v 1.115 2013/08/08 19:42:32 mr_bones_ Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/ChangeLog,v 1.116 2014/05/31 14:45:01 ssuominen Exp $
+
+*lshw-02.17b-r1 (31 May 2014)
+
+  31 May 2014; Samuli Suominen <ssuominen@gentoo.org> +lshw-02.17b-r1.ebuild,
+  +files/lshw-02.17b-fat.patch:
+  Fix segmentation fault with `lshw --short` while accessing a block device with
+  corrupt partition wrt #485496. Thanks to Ben Kohler and Juergen Rose.
 
 *lshw-02.17b (08 Aug 2013)
 
diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index 89c283df49b8..a8327ade8948 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -1,11 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX lshw-02.15b-build.patch 3303 SHA256 3e445965e06e2c658f2bb7e822a2e5dcf082c3965fefd4e1ee285aa781581a01 SHA512 667ec1020c967a134708e3191ff97d2c57a5f93c54df6e5ccc332ce230242bd661269c93fbd63c55b25f6aafc5f14e52b805b0101f4394b0629b9aa70e9ef2dc WHIRLPOOL 4165d6f02760f3d85c7bcd01da9d4828d90f1e305d48fb3e87e5574b3c01db8504d2be1dcb595d86aa034189c1031070149647abe6e0fb84cf636a2c489cdf38
 AUX lshw-02.16b-gentoo.patch 4998 SHA256 4ea3260b90d6295f89218ed2a0ba3fb2370f1cb19bb2ba38a7d7623905c3237c SHA512 f79579998aae5fe4aae06bba2cbf18e0f6bcc5cd7ac4c4b85a468ccacbee69f9b011184d34a812a82d2e9a3fbb328cc300708feeb4101c8c975a6601c7155f35 WHIRLPOOL b430992dac235cadb20719815acd598f909fd456945c45983bbf8349e1672beb15a2a702266897faba34225275d45462e8fc2735210372fe7ecb69a559b51d6d
+AUX lshw-02.17b-fat.patch 310 SHA256 ba8f5cd5a9872bb377558448864962045e8742bb06cc093463cc63a7ad374e81 SHA512 e42421b3b46880ca946eaa9b9b5f33436c829b28fbb660e4190b2a381fd855611dc061bbcd183074cde93f28bb9c6c7dce336e2de8be925a57da9ada256019f6 WHIRLPOOL 50e777800dee4a46301c0a0c352ed3254f78b24dd702703bf2aa6460a3d018efb1d93065d4c11cb604400a54c9abf05d31e0f357e11fdf941d01216ab7771169
 AUX lshw-02.17b-gentoo.patch 4826 SHA256 0596eee063c0449a168a344ef6ec4914581a40444e947c7cd922e7a4e50efce1 SHA512 01deba11db4ad0fbb07f14e75f521adf901b81dc3b2e51febaf51a82bbc0214558250a762bca92d9fd154d634ae1213a4c647c747732b3f00577dddb41deb191 WHIRLPOOL 6ef39e2bb9b2f731ca1df7e96b4c1402aba25efbb9a223ce997f10dd7702e68e9f46785e436bdeb51fc690c052564e9a33259eef8441659e1f0bacc97eb50a5c
 DIST lshw-B.02.15.tar.gz 1384466 SHA256 fb01cec64bc9067cce61cd64f8ad81f2f0082985fad5b627cf4bd71ba43735a6 SHA512 e0e2e6f4644416f4b15fe36cbc4d2954ee658f79c3f594f1a0bd467109593f2f746e9d70dbf16e968f699dba0249dc9d43459c5a986df8de1c5de47481411296 WHIRLPOOL 0d43e44cf6c9b304367315b42ba98bb0792fea3e0bca202ae0fc7b9c23f852d9d61053fc08533a6d5ef2f9ab37ef3e8b1027f72324647ad565ea7e14642864a9
 DIST lshw-B.02.16.tar.gz 1845891 SHA256 809882429555b93259785cc261dbff04c16c93d064db5f445a51945bc47157cb SHA512 ad3bd3d7b6f36f912265f0853f5aa37158c6d420a90a5e84b3e8fcd8a3c6137f7505cb5361e3eceb49954332d2466c686c946dcda8db0da3d51b3c48e343c2ab WHIRLPOOL 8e3200b726432859965be744c6afa437ffb4b57166084432064621773018b6f997a282ddea813916bc7faeced22a1286044b91bd69422b83372f03cf0878ca2d
 DIST lshw-B.02.17.tar.gz 2005737 SHA256 eb9cc053fa0f1e78685cb695596e73931bfb55d2377e3bc3b8b94aff4c5a489c SHA512 868899dce98e786a08a2134d6e132c388d71ab0f03fa6e10881e14d7a882c1882b46bbc6bd6ddb021cfab87ad6c9fd369453c3916f0b3353027eb2d470e55d9b WHIRLPOOL 5b18df2732e50f38dd8d9168adb6083e9a637cf9596f692a7e6806cda2ad05c777babdbeab470d948604f45bbbf1282be6d9fc68bf5c70741acf2d884e93e749
 EBUILD lshw-02.15b.ebuild 1409 SHA256 5e84ead5a119b2cbcd67fbc8e42eed648fa2be0d21a812785b26c5a2b35f70b7 SHA512 f824f207cb103040a3ac8ac02bc8dd2ca0b3b6ce18514d7f324aceeb237464048fae35a92fed82cfc76ebc501fe9312667cb6a3a8bf6293d263dfd8ae30fcab8 WHIRLPOOL d419116adc4ee5f08f24ec0f38aa3e79661f7ccd34561c491f9263a852f73ca10529b71bf042b7adda5ca10fa6d9fb081a0601b463c3ebc36f94d823b608bfbd
 EBUILD lshw-02.16b-r2.ebuild 1684 SHA256 3b362d6e2ddb1246dd06c8199871623cba95ea660c8e89ca6fa6771a94369dc7 SHA512 827ccad43be848381d2fbb77d8a2b7dda05d48d0bb5f47dc61096a518745ab022cf0b004612196a53225460cb007017f403e898f1792f5ea6cecd65aa3a2b05f WHIRLPOOL 1ab8180f2ed1f8457390dde76ec918f9998a65a8abd1c7e9b484222295ad4c8c199b7d15611a1420ffc58aec436a6592e7fede6584885643f991d2724ad4d7ef
+EBUILD lshw-02.17b-r1.ebuild 1733 SHA256 67d59f6f23581442e3490c27d6d07bc7af8b25a298e16709196594fa443ede5e SHA512 cd04d3d489e31379d0ec680ef7fc04242357bc0a8815e00527282107e8e91814340ddb605a43a0d5035b44569aa0098be72d7a0ea701baca525e5874f08656d3 WHIRLPOOL 8fcba957d11a30294673689d4bdcdef453d308bb57c3ff02b975000341b2b4458695ddae32402af8d3b2b23b6d68bd839877b599e0734b336681066d0b12d7d4
 EBUILD lshw-02.17b.ebuild 1693 SHA256 b7de8fd8afdea6429bfdc5c23e9d9b5053c5e801ea15ace50540d75da18d94fb SHA512 88757c436294518286d3597983400945764e8b9564e71f99722caa8bafc896a2a68c15f46bc54deff8c12f53f8fcb1306aa7606d09d1278e6077fa0d24bdc3ea WHIRLPOOL dc0778ac67a408b31cafe7fd50dfdfb02e82092b72e89aee31ce1b15724b9129c9776200a9d49e1963782d394bb481dc2f9d4b7c08c1a454423baf8cf659cd4e
-MISC ChangeLog 14295 SHA256 785d6456f4a053fd3f7beae52eca4b984c3bd4bfad53b8d1ddba72120f7accd1 SHA512 225ecc45ec330e081b9d8c5ee47d3e49027a15f25230d4ee739d8c077948d23bcad6911608c6a780c448c9ee049006c4486cb1debde6012bf6f1b259e65b0c77 WHIRLPOOL 77eec60c916e06252027eb1ead3c1e52973781e5183151fe648deb08f6c8a82a8e101bec10c49b0ceba411e9442834dfab8928a5b546173e3a743e2a1b5e8c1a
+MISC ChangeLog 14590 SHA256 ad49b41a36e5b3f5cdb330f1b73167dee72077827e69fd38d5b3dee7814b38e6 SHA512 c5053776bf810bec7a4f1e441ef6887666adaa69f5dc59b2a329daa1383a98c98491ab5b5d26027abbcd98f129d5f5b1b4313d45d0efd654ce40f094c4f12d49 WHIRLPOOL d14921c4dd47b0cbfc0252ff47667aea1d75303520228c4d714ba587fd2f27235f9367da208c8761aec6260619153135908c997b4a5722d0ebbe76f706762e69
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJTiepzAAoJEEdUh39IaPFNOcsIAIOghaI7UxLOovj+R9C8YQwa
+u5T+lEksoIyJryANjEc6OKz3zYAH0SlHMZteIuDjBTU9uSCYgrnWwM887/+twP7O
+giadc1bjQTUXVczy8tx6X8JO2A4DfKpNBXZT5isNUYYq6RVu5Fqn5hfuqWDqpMea
+1DizyufCNqsi3RIkmgNTBw9agENNP6VT0hAOKB3EvwxJqXi6Rzv0w7DTOdK+AskG
+5xjKJgHf6At+S5vEnQkiZxNScRy+/EWdDytd7xJtZXBoRFeOfD/WYD4rqC2a3g4z
+qch+T77vnpxCaqz5ZJUIzKWCz+N/g62g74DjmBFHqz5rPh8yjwK3VbYB4yT69LE=
+=9Q9j
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/lshw/files/lshw-02.17b-fat.patch b/sys-apps/lshw/files/lshw-02.17b-fat.patch
new file mode 100644
index 000000000000..08654fd5af6f
--- /dev/null
+++ b/sys-apps/lshw/files/lshw-02.17b-fat.patch
@@ -0,0 +1,10 @@
+http://bugs.gentoo.org/485496
+
+--- src/core/fat.cc
++++ src/core/fat.cc
+@@ -82,4 +82,5 @@
+ 			uint8_t pmagic[2];
+ 		} __attribute__((__packed__)) fat32;
++		char sector[512];       // to make sure the whole struct is at least 512 bytes long 
+ 	} __attribute__((__packed__)) type;
+ } __attribute__((__packed__));
diff --git a/sys-apps/lshw/lshw-02.17b-r1.ebuild b/sys-apps/lshw/lshw-02.17b-r1.ebuild
new file mode 100644
index 000000000000..5f23ee709246
--- /dev/null
+++ b/sys-apps/lshw/lshw-02.17b-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-02.17b-r1.ebuild,v 1.1 2014/05/31 14:45:01 ssuominen Exp $
+
+EAPI=5
+inherit flag-o-matic eutils toolchain-funcs
+
+MAJ_PV=${PV:0:${#PV}-1}
+MIN_PVE=${PV:0-1}
+MIN_PV=${MIN_PVE/b/B}
+
+MY_P="$PN-$MIN_PV.$MAJ_PV"
+DESCRIPTION="Hardware Lister"
+HOMEPAGE="http://ezix.org/project/wiki/HardwareLiSter"
+SRC_URI="http://ezix.org/software/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="gtk sqlite static"
+
+REQUIRED_USE="static? ( !gtk )"
+
+RDEPEND="gtk? ( x11-libs/gtk+:2 )
+	sqlite? ( dev-db/sqlite:3 )"
+DEPEND="${RDEPEND}
+	gtk? ( virtual/pkgconfig )
+	sqlite? ( virtual/pkgconfig )"
+RDEPEND="${RDEPEND}
+	sys-apps/hwids"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-fat.patch
+	# correct gettext behavior
+	if [[ -n "${LINGUAS+x}" ]] ; then
+		local langs
+
+		for i in $(cd src/po ; echo *.po | sed 's/\.po//') ; do
+			if has ${i} ${LINGUAS} ; then
+				langs += " ${i}"
+			fi
+		done
+		sed -i \
+			-e "/^LANGUAGES =/ s/=.*/= $langs/" \
+			src/po/Makefile || die
+	fi
+}
+
+src_compile() {
+	tc-export CC CXX AR
+	use static && append-ldflags -static
+
+	local sqlite=$(usex sqlite 1 0)
+
+	emake SQLITE=$sqlite all
+	if use gtk ; then
+		emake SQLITE=$sqlite gui
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	dodoc README docs/*
+	if use gtk ; then
+		emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install-gui
+		make_desktop_entry /usr/sbin/gtk-lshw "Hardware Lister" "/usr/share/lshw/artwork/logo.svg"
+	fi
+}