Version bump. Removed old. Fixed compilation on hardened (bug #326345)

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

7 files changed, 142 insertions, 55 deletions

diff --git a/sys-libs/libsmbios/ChangeLog b/sys-libs/libsmbios/ChangeLog
index 2549d5ee6c4c..832eea125f2d 100644
--- a/sys-libs/libsmbios/ChangeLog
+++ b/sys-libs/libsmbios/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-libs/libsmbios
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsmbios/ChangeLog,v 1.29 2011/05/29 10:10:23 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsmbios/ChangeLog,v 1.30 2011/08/20 21:41:23 polynomial-c Exp $
+
+*libsmbios-2.2.28 (20 Aug 2011)
+
+  20 Aug 2011; Lars Wendler <polynomial-c@gentoo.org>
+  -libsmbios-0.13.13.ebuild, libsmbios-2.2.26.ebuild, +libsmbios-2.2.28.ebuild,
+  +files/libsmbios-2.2.28-gcc46.patch, +files/libsmbios-fix-pie.patch:
+  Version bump. Removed old. Fixed compilation on hardened (bug #326345).
+  Thanks to blueness who provided a working fix.
 
   29 May 2011; Lars Wendler <polynomial-c@gentoo.org> libsmbios-2.2.26.ebuild,
   +files/libsmbios-2.2.26-gcc46.patch:
diff --git a/sys-libs/libsmbios/Manifest b/sys-libs/libsmbios/Manifest
index aecdc390539d..11d577d21889 100644
--- a/sys-libs/libsmbios/Manifest
+++ b/sys-libs/libsmbios/Manifest
@@ -2,28 +2,30 @@
 Hash: SHA512
 
 AUX libsmbios-2.2.26-gcc46.patch 1375 RMD160 dc44975b8a48f183e633aec8c9008328cff1b9bf SHA1 f73196bb2c7db499db9bc87b1152eac90970ecf5 SHA256 fa09c9782d8132302abc6ad941c1fec5c89a4257bf33b15a586ac8c9605a9f59
-DIST libsmbios-0.13.13.tar.gz 3802626 RMD160 22051306c8ff7d9d039810f2b311e1ca6c332785 SHA1 813ccce09590c14ff671a40629693d0e23074242 SHA256 5201329dc5c2a8e7a0722d099148c828d5026cdaebcbdb6313397c52e7d1a7c1
+AUX libsmbios-2.2.28-gcc46.patch 492 RMD160 aabcf91f3ad2d7d35af340636b72cb8d4cdf26d7 SHA1 c62282fb109e1bbc1768b6a233da2bdc2845f67d SHA256 366512344135b64a49f7d85115f109741f952468fbaba04418b6edface260313
+AUX libsmbios-fix-pie.patch 1005 RMD160 6b239d60b352af3768758a6a1b5e81d323e1d9c4 SHA1 9591eca8da3d52d5aa54e85f2415bbb9a25988bf SHA256 fdf57f4efbd0cb5b0887f19481e72e6c35a3980a9ebb521271449c9bcf7dccae
 DIST libsmbios-2.2.19.tar.bz2 860647 RMD160 f169a17291524cf7d1f18edc9cecfecbe94e2c15 SHA1 0566d247171266fbab17e623f08f9756622bc223 SHA256 2ff784ab9195db17bc578cdc9f6eb7419fae108e62d09b0af37da8e1bc86bad0
 DIST libsmbios-2.2.26.tar.bz2 905847 RMD160 99503b289e81b4c28be3c11b419340070fe01a95 SHA1 cab94459c6f846bad9330d3b8843d8db53fb714a SHA256 dc5512f64783c4160822e77070a80dd783010e0bd844c240495b7662b774a46d
-EBUILD libsmbios-0.13.13.ebuild 886 RMD160 d79ef177a7000d274763168d81b842ccb150e5f0 SHA1 385eaf76852263cd9949aec70d44baa422a3a4c3 SHA256 07716cb057d8f4349dcdafa2981faee7ba15338715ed4041992fa26cf0d218da
+DIST libsmbios-2.2.28.tar.bz2 943292 RMD160 10ec844ed93f41645d19799c700b2caa523241f9 SHA1 54c267411d2225cd54a3c8a696ca5c2a74e9d66e SHA256 dd247fd43296df3352435b090dd789a22a89c4b316e98b46b915323290a3e350
 EBUILD libsmbios-2.2.19.ebuild 1482 RMD160 103b361147e3769d5841e17fee14fd47ecdb5e7d SHA1 f7aa612398dc46d480143b02c184356493603e7a SHA256 715dac1eb231dcc442407a81550655b6c35edeb06d0e973f57893968c7857655
-EBUILD libsmbios-2.2.26.ebuild 1672 RMD160 b4b31237d548a4d8417e05f7fc4a936ca2a5830b SHA1 fc466b89823310eded1f4f4ddee1da09cf249486 SHA256 fc5fe21ad82e271dfda6a91ae35229f84c5049eb339e104dddc0f88852db8edd
-MISC ChangeLog 4036 RMD160 e06607be25f3846e42500ed417ad9a47aba9755b SHA1 7bbcb1bd8201404c09fa1749e7fb6c3d71a6ae95 SHA256 3ac1ba4b8b6b2de821d4dcad6f463200b64cc90010a0e089ca01d6d044ad0f4b
+EBUILD libsmbios-2.2.26.ebuild 1710 RMD160 f5fb71660d3f41942be20ff9929159f95b67db47 SHA1 36cd0d657dc66ccc181565e8d6fb2df911869783 SHA256 ef039e89bee10575e23ede734d468ca4544e9080f3e8b6233ca413a43c166820
+EBUILD libsmbios-2.2.28.ebuild 1710 RMD160 ce3c273ea09adef0892795163d581bc3c2a8458b SHA1 375b4aef7beb2d3253b6983d0f9c86220146dccd SHA256 5cff14773da3268cd738e593af97699d92e7246bfc86d8cb1dc88b00cb521fe1
+MISC ChangeLog 4398 RMD160 2306d488bb6fdbd6b08fcbc0f29293cb9fbba91e SHA1 016491872d1f84aed4298725d8b931abd9f022c3 SHA256 324b05e96db79f61ec7534eeba2283d6b4feecd982239fd3f2d84740c4758f6c
 MISC metadata.xml 478 RMD160 94bc5d0d4d4033cca6622104814b24a11360da91 SHA1 2c31d004ffe60441f5508e0b17a490a380163695 SHA256 96aa099693294b8bd0ec4b607e0abbc02172fe75775b21d290da4bfb8419a65d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJN4huUAAoJEPiazRVxLXTFzgUP/0OBgao2XwfQhCq+xGdG4/yU
-6ugaSxeoItI5ccWax0qEKGV9M2HeyQwp0Mtq8y2lwryK0AipDdsWsqWAklcy5Soy
-QhpJG/4M3AABBruPl4ImJZY3KB+fEZf3P4d/lWKOpZKAiXOSKr3fOnzgqxkvKPt0
-448Ak49NRfiWgcsujv4DbjcTJH0yLbeE+IAvzBY3L4Zop90KP/IBSGYUAHYiYK7m
-DWB6/vKDVkcNKiyuhW0tg77+v9YBMYaw9Gl1Z6eRLjlRUoebhS5RNBRFfX5SCUAj
-hU0FgWBpCOlORsDGDoZVW7pwYXHrMgB0ZvtyimEE/7nExspLxN5AJP7iRRgnSWwC
-ttoVUhbOneMmonef/pSiOr6BdUVAQ57t4hp+uRs1CsrPjJ3+CahFV/tQqNHu4t74
-qXlYfieozYFPUpQQflIXNEPQt4bDXf67YzZCCMBYEvzjTfZPAqw9ycI+uFersy+g
-CBmQ8W/6C+tygiFETBp6NXByT4O5tHdqq/HpV5ou4AoMbS4F4x5/cHONwoZrV7TP
-6/QbxM8plXjzpA/RE7LtJCnbLPeaBY74xFL5VafeH4212VVxg4iSQvo8CcVTNGDw
-Dd3W4eXieETZL+LkFM3JzBumO7te0avdPJc9ku/R/jMwxJyUdhPhHOlrhcD+6PLH
-0EIA+U5oJuGOKVGVXk5K
-=R2Me
+iQIcBAEBCgAGBQJOUCoJAAoJEPiazRVxLXTFib4QANz9NWgFBvdGFtp0/NU+U5lg
+FvIeycSMYxrIqNVRZ/8dQRuppQNNiJYHl11ts+TiqTbqP/2V/6KYZc/9FqYYidhi
+sUJlnya3t8yi+P77eeaQ81D/WmSpaGx4+YI2FAdYx6MS2KpttI3Ov7MHfjf+WGEz
+t7+I74myrXhapl+3k0wcDNFA6dxgD2qJ6yaI436a0WeI7G4NTQo3oDYzpVAivW19
+EAtuEuFwQyvljSr0QUntSlCXWhU/HjMlltQ76WcY9VO0UXdQdHG8GmPEK0lUSnAJ
+NBbB3PsW3vSKqCG4q59XRj+D4eBL3W/SQZNLx2fIkQeAKy5pLRFjrNchwaD1BDu8
++rMzZnjHz3kFsz8kBA8JOwlNWiUs6LvhUImR1J4UXliUv4yg9DZR402AVHbXO6u0
+ZLSAKymyqGIZrTfVso3emZtmiCD3TNXSG1Ztk03DZLpE1/mTIvDLSp9OWIOnSXaD
+KsTTRRZBkWVl4TswnBsmtsqs2g78l9/R6/5CLcdJ8RC/MVDxgCcAe196dBVECMXp
+x9fGzNmk+NhdvftXS1PCSXIehayKtwgpKZjg/FsuBBrfDL6tdYd4t+X6+lY+r6Bg
+FJjwbNkGXhNy5KB1x268IFjq/0Q+tXN1QkTz4uxmGJNuAeQ8oTEthlJvA6i389FD
+hhsqKbtxeo3MQCytkzEo
+=OtmJ
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libsmbios/files/libsmbios-2.2.28-gcc46.patch b/sys-libs/libsmbios/files/libsmbios-2.2.28-gcc46.patch
new file mode 100644
index 000000000000..0532e01b4363
--- /dev/null
+++ b/sys-libs/libsmbios/files/libsmbios-2.2.28-gcc46.patch
@@ -0,0 +1,11 @@
+--- libsmbios-2.2.28/src/include/smbios/config/compiler/gcc.hpp
++++ libsmbios-2.2.28/src/include/smbios/config/compiler/gcc.hpp
+@@ -113,7 +113,7 @@
+ #  error "Compiler not configured - please reconfigure"
+ #endif
+ //
+-#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5))
++#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 7))
+ #  if defined(LIBSMBIOS_ASSERT_CONFIG)
+ #     error "Unknown compiler version - please run the configure tests and report the results"
+ #  else
diff --git a/sys-libs/libsmbios/files/libsmbios-fix-pie.patch b/sys-libs/libsmbios/files/libsmbios-fix-pie.patch
new file mode 100644
index 000000000000..9162044169e2
--- /dev/null
+++ b/sys-libs/libsmbios/files/libsmbios-fix-pie.patch
@@ -0,0 +1,30 @@
+diff -Naur libsmbios-2.2.19.orig/src/bin/dellMediaDirectCtl.cpp libsmbios-2.2.19/src/bin/dellMediaDirectCtl.cpp
+--- libsmbios-2.2.19.orig/src/bin/dellMediaDirectCtl.cpp	2009-02-26 14:29:03.000000000 +0000
++++ libsmbios-2.2.19/src/bin/dellMediaDirectCtl.cpp	2011-01-20 06:55:48.000000000 +0000
+@@ -183,16 +183,21 @@
+ {
+     iopl(3);
+ 
++    u32 tmpebx;
+     __asm__ __volatile__ (
+-           //   magic    port
+-        "outb   %%al,    %%dx     \n\t"
+-
++          "movl   %%ebx,%[tmpebx]\n\t"
++          "movl   %[ebx],%%ebx\n\t"
++      //   magic    port
++          "outb   %%al,    %%dx     \n\t"
++          "movl   %%ebx,%[ebx]\n\t"
++          "movl   %[tmpebx],%%ebx\n\t"
+         : /* output args */
+           "=a" (r->eax),
+-          "=b" (r->ebx),
++          [ebx] "=rm" (r->ebx),
+           "=c" (r->ecx),
+           "=S" (r->esi),
+-          "=D" (r->edi)
++          "=D" (r->edi),
++          [tmpebx] "+m" (tmpebx)
+         : /* input args */
+           "0" (r->eax),
+           "1" (r->ebx),
diff --git a/sys-libs/libsmbios/libsmbios-0.13.13.ebuild b/sys-libs/libsmbios/libsmbios-0.13.13.ebuild
deleted file mode 100644
index 89f58ee4db61..000000000000
--- a/sys-libs/libsmbios/libsmbios-0.13.13.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsmbios/libsmbios-0.13.13.ebuild,v 1.4 2008/08/08 21:37:15 maekke Exp $
-
-DESCRIPTION="Provide access to (SM)BIOS information"
-HOMEPAGE="http://linux.dell.com/libsmbios/main/index.html"
-SRC_URI="http://linux.dell.com/libsmbios/download/libsmbios/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2 OSL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ia64 x86"
-IUSE="test"
-
-DEPEND="dev-libs/libxml2
-	sys-libs/zlib
-	test? ( dev-util/cppunit )"
-RDEPEND=${DEPEND}
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_test() {
-	einfo "testing currently broken - bypassing"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-	insinto /usr/include/
-	doins -r include/smbios/
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/sys-libs/libsmbios/libsmbios-2.2.26.ebuild b/sys-libs/libsmbios/libsmbios-2.2.26.ebuild
index e672e0551b4f..ac8c6af43b42 100644
--- a/sys-libs/libsmbios/libsmbios-2.2.26.ebuild
+++ b/sys-libs/libsmbios/libsmbios-2.2.26.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/sys-libs/libsmbios/libsmbios-2.2.26.ebuild,v 1.2 2011/05/29 10:10:23 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsmbios/libsmbios-2.2.26.ebuild,v 1.3 2011/08/20 21:41:23 polynomial-c Exp $
 
 EAPI=2
 PYTHON_DEPEND="python? *:2.4"
@@ -27,7 +27,8 @@ DEPEND="${RDEPEND}
 	test? ( >=dev-util/cppunit-1.9.6 )"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.2.26-gcc46.patch
+	epatch "${FILESDIR}"/${PN}-2.2.26-gcc46.patch \
+		"${FILESDIR}"/${PN}-fix-pie.patch
 	rm pkg/py-compile
 	ln -s "$(type -P true)" pkg/py-compile || die
 	eautoreconf
diff --git a/sys-libs/libsmbios/libsmbios-2.2.28.ebuild b/sys-libs/libsmbios/libsmbios-2.2.28.ebuild
new file mode 100644
index 000000000000..13a7b897fdc8
--- /dev/null
+++ b/sys-libs/libsmbios/libsmbios-2.2.28.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsmbios/libsmbios-2.2.28.ebuild,v 1.1 2011/08/20 21:41:23 polynomial-c Exp $
+
+EAPI=2
+PYTHON_DEPEND="python? *:2.4"
+
+inherit eutils python flag-o-matic autotools
+
+DESCRIPTION="Provide access to (SM)BIOS information"
+HOMEPAGE="http://linux.dell.com/libsmbios/main/index.html"
+SRC_URI="http://linux.dell.com/libsmbios/download/libsmbios/${P}/${P}.tar.bz2"
+
+LICENSE="GPL-2 OSL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE="doc graphviz nls python test"
+
+RDEPEND="dev-libs/libxml2
+	sys-libs/zlib
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9.0
+	doc? ( app-doc/doxygen )
+	graphviz? ( media-gfx/graphviz )
+	nls? ( sys-devel/gettext )
+	test? ( >=dev-util/cppunit-1.9.6 )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.2.28-gcc46.patch \
+		"${FILESDIR}"/${PN}-fix-pie.patch
+	rm pkg/py-compile
+	ln -s "$(type -P true)" pkg/py-compile || die
+	eautoreconf
+}
+
+src_configure() {
+	#Remove -O3 for bug #290097
+	replace-flags -O3 -O2
+	econf \
+		$(use_enable doc doxygen) \
+		$(use_enable graphviz) \
+		$(use_enable nls) \
+		$(use_enable python) || die
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "emake install failed"
+
+	rm -rf "${D}etc/yum"
+	rm -rf "${D}usr/lib/yum-plugins"
+	if ! use python ; then
+		rmdir "${D}libsmbios_c" "${D}usr/share/smbios-utils"
+		rm -rf "${D}etc"
+	fi
+
+	insinto /usr/include/
+	doins -r src/include/smbios/
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize /usr/share/smbios-utils
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup /usr/share/smbios-utils
+}