Version bump, includes fix for bug #373971. Also add patch to compile on hardened (Bug #368777). Clean out some older versions.

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

5 files changed, 41 insertions, 116 deletions

diff --git a/www-plugins/nspluginwrapper/ChangeLog b/www-plugins/nspluginwrapper/ChangeLog
index 2245e13de0d1..5ec0841c2cfb 100644
--- a/www-plugins/nspluginwrapper/ChangeLog
+++ b/www-plugins/nspluginwrapper/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-plugins/nspluginwrapper
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog,v 1.16 2011/06/17 02:25:58 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog,v 1.17 2011/07/04 15:29:08 chutzpah Exp $
+
+*nspluginwrapper-1.4.4 (04 Jul 2011)
+
+  04 Jul 2011; Patrick McLean <chutzpah@gentoo.org>
+  -nspluginwrapper-1.4.0-r1.ebuild, -nspluginwrapper-1.4.2.ebuild,
+  +nspluginwrapper-1.4.4.ebuild,
+  +files/nspluginwrapper-1.4.4-compile-on-hardened.patch:
+  Version bump, includes fix for bug #373971. Also add patch to compile on
+  hardened (Bug #368777). Clean out some older versions.
 
 *nspluginwrapper-1.4.2 (17 Jun 2011)
 
diff --git a/www-plugins/nspluginwrapper/Manifest b/www-plugins/nspluginwrapper/Manifest
index 91e3b8bb2d78..5d77917c90f8 100644
--- a/www-plugins/nspluginwrapper/Manifest
+++ b/www-plugins/nspluginwrapper/Manifest
@@ -12,30 +12,29 @@ AUX nspluginwrapper-1.3.0-inst-crash.patch 592 RMD160 814f5f7491eb96539f78ac4c74
 AUX nspluginwrapper-1.3.0-offsetof.patch 245 RMD160 63003f206042d1c303c09f46d73714e3f366d26b SHA1 90423132c6f9d08cca27667d9f8619a0c5c97391 SHA256 b087e057c2b6a0d49d5b3ee28deb9deb6d2b24490876a08d982c11730d92eb16
 AUX nspluginwrapper-1.4.0-parallel-make.patch 1377 RMD160 593ece5d468e4cb7e9546d8eaec00ea83e43459e SHA1 8c69bb55c19ba0b342d4b77bf42f0e3b7bd1c959 SHA256 64e525abda2af1e5bd24134c4fc8c2b18ed4f4c1b72e4f7ffc3152a075bc8972
 AUX nspluginwrapper-1.4.2-parallel-make.patch 2993 RMD160 da60c94b536097446d85e0bf43893808ffa030e1 SHA1 de1f8ec1b308b1c65b4ff4f27f24ffb64104a46f SHA256 b236074764cfc6ef051f8414386bc47b41a84799204388f6cf09d3f826b039b4
+AUX nspluginwrapper-1.4.4-compile-on-hardened.patch 464 RMD160 234b87864fde979610178cc4ccbee9091b401192 SHA1 06f8d2e986df226cce2b3b0b7bfabe5b533880af SHA256 3c1386036ae4825f59ac755acbf2cb40913d9d9cddf9252fab87279ccff0cc35
 DIST nspluginwrapper-1.2.2.tar.bz2 327947 RMD160 d5aa265966f87c51bb9ea4f2a079a87b74fdcbf3 SHA1 be581c39dcc1a8d9a5b3f81e4650f553a30cf249 SHA256 4e6cbb7aeda1c9f0d6e5a17e729160b5d3f3e7048f90353238806289752175c3
-DIST nspluginwrapper-1.4.0.tar.gz 412189 RMD160 47705e90f2f4002091f1cb0f475414833498f05e SHA1 94701126808be4923b6c8e12a8f4d95676c57f5b SHA256 39b9034dc840ac6a21701406d96449e578b787aad7f6a09d97113776cf8251b3
-DIST nspluginwrapper-1.4.2.tar.gz 412348 RMD160 6fbe056bb4f8259bf56b355a67e901794c41a1df SHA1 6bf94c070d8a34d6b7f00f6487bcb9d323284fa3 SHA256 ea9c90bf9fdf55ff5dd4e934e97430f85c75fcfe9d0a7954a6c4403bdbc53fd5
+DIST nspluginwrapper-1.4.4.tar.gz 412513 RMD160 6acd93653aa8466e1e3703c2b794f32691c10d12 SHA1 ffb271a741215874808d4a77d0a0dd65588a8440 SHA256 f2ed94d42dbbb5370b000a3f30d2b601eb2b09d5742b2842cd0d70e862fab2bb
 DIST nspluginwrapper_1.3.0.orig.tar.gz 431176 RMD160 4d01263a010b155e578901913648ed1202f49629 SHA1 4558ed89411e53965cbbf974bf881ac88cff863d SHA256 0af7e2ae4c6258d5c17addbcc4658b84c979860da843873f0d15d90ee9a8259d
 EBUILD nspluginwrapper-1.2.2-r2.ebuild 2680 RMD160 30559e005b6749b863791ff5b083ffe3b1fab5bb SHA1 bce21b74e327b941c59dc72251fba9e7ef08ae8b SHA256 2094c56f5991d9bd802c239e441f8a75827f79a0dc83b00843386e4a9bc284af
 EBUILD nspluginwrapper-1.3.0.ebuild 2897 RMD160 f6fbd1ad9fe162f0f6abb81d44f858600681d0dc SHA1 be234e1b3eb50f90ae948b69c59fea14b5f7332e SHA256 b153edb8dfcd4c9054d5a3ad8297ef599d0ae487eea19061efdebb1c3703e7d0
-EBUILD nspluginwrapper-1.4.0-r1.ebuild 2600 RMD160 f5e3c65c33463890db4e0bdf7bdf2489ed3ba3ef SHA1 d3bf0e5b3c2f9c2d53f4ccfc67df1efc8e93dd28 SHA256 80ab82cdaeb15a53da0918469732130318d43fe80aed3636c1f274a91dc211c7
-EBUILD nspluginwrapper-1.4.2.ebuild 2597 RMD160 77762dffd1b50c4e7bf0d9981413a1e4f9569854 SHA1 3c1374879b3c323d702d68d1d9459f3afcbb43bf SHA256 9e65aac6fdfe27ee0cec4552470c71b7102836ed298b3b7a25b1f25810c65465
-MISC ChangeLog 10036 RMD160 5d964130fca6055758c7710f5dd64ced70766887 SHA1 b84fc651217624771d4d4a4addb8dab1fc9fa042 SHA256 7a593a5fa89a8110b62ff6ef2174cd74e7423f5b9b8039569aa16c1a969d5515
+EBUILD nspluginwrapper-1.4.4.ebuild 2657 RMD160 e0af1f0ebbec07c1a349c4a85a4357cd19c1a11a SHA1 1dfa9fc5d5ebefc6fb965e586b3d7c40acb3cb21 SHA256 f93ce772c594a911a6beb4139b03cd600d887b777e546723b837837edc79d9c0
+MISC ChangeLog 10417 RMD160 8344a49c82a66f5ab95287e2f521634adb83fc3a SHA1 c4a46122eaf7cdf301931b7ba07eb102927144e1 SHA256 e9ab106c95b2173b2c88c05047af8d66e2384fb17a7b5a1d9fbb7bf5f71d2f0b
 MISC metadata.xml 253 RMD160 37a89adccd0388cf014f6768a21b1ec09252d21c SHA1 fa43576fb2327afb837b5b2ea57dc6ab8525494b SHA256 0b0d878d1f93316b2966ec90c1f80c46fe67fb3f5647b28f7c30d9647dbb1854
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJN+rtzAAoJEHy/RO9cNQiD6PsP/2a93FKd/LV2miAwFIse8k52
-oRSNJExU+oj/Nxo3ci0VnSsa2S+DEbSl6VWsoOWXDeVc3drGDddo4PjQW9I9bsKj
-r42eSsf/duQSG7HqVouAB+VG/TfH/EPfltvO14EVemA31Aupvf1pc8VmNSNGA9bn
-OTpckmIzj4lF8LjzFec2cUA5thQ2Ne9iXUKjl1/WuZwLOZIsG6YnMQyLboEmXNlH
-HgpcF1Q3aXw10pB/hg/CrNEAFvdgqtIfav8TYAzPzJSUSUKdsqL7WDNrbHAKPfuV
-SrSrO2XZcdxLQ2aoX6GlheePW1TJ6DczEt44Tq4aaUCqm6X/pgN6iwcpoq/6PHQP
-quXwhhvjMOu+ftMNVlJJXljCFxejlydjglfCSu3n+PEcfCSDimAaca24V8oWM4uE
-BfKEVIs4UHliAFJyVADEnC7PLe/t01BAWK/IpZowAxZjzk4Lfm+XuxfDqTauybbs
-6T97OVqHRkWZYxKH5LSGHIi50Od1CXGUJ96zSuChg6X52EW/SloTH28KfZ31ITr8
-j8402mTgvOQ0uN43uJi1aTbGMJxvPWGVWsvK4/xcBACftHVWptLF4wsDDiB3vO3s
-3sxRFMvv0rVEZleXqEnuXBvPLbhuJLSvjhIbLBrew9Quic7/t1Kp5zsHnk23w83d
-t3JcKE8/poLFcZCA1cT2
-=8H5f
+iQIcBAEBCAAGBQJOEdxTAAoJEHy/RO9cNQiDb0IQAKuAK5a8ALoZUfJc+Vag+RDH
+kW429Wm1lZuGlgi1lqbO0yYiIm7coXLWmenwlr7DRFubZmeJZ1det6dhMk14F308
+SVHay2HkKympZMwRqU1dQLZi6tDW/4Yaz0keFaJEwve3eRwgs2IuJScUOpN4tXQ4
+7JAiSctUCCenoHdr5Y3EQDadTUQwmzZZbXlfHfMM4K2rXbET/ATSApQK0pHWkkEO
+hgAXlJDawdgamWSLTahdBvvD02vBCLHmvpbaMA6eJZ0fzQe+09etfTQFspRwOkVr
+a38cPGA4XCSER47oJHXJUD6adS8n5O15PlAvx1Zpk0lRYJGh3WPRkAn/pQKhihHb
++zAVMlxkrAdtl0NzWbH9oKnAxUZgSiajqsV1UCL6HLc/IyKpwtWNLxhsueRJnVGA
+f333tdx+t9mnhS8IVo9XJGsd0pNazes3VEKEmFkhvNSUrZSi7/n09YYgFexlnnDs
+d5SrklKZecJx4s7jzuFCDgYofGIXK9yhqkr17PFAeMGnOzL5x/Goyq9vu09b3Uwj
+dHRdwnv2bHuAOTgdz7Oy3iekG/Y98u+3ISSXxhrN4E63w+l5493aUHBcxF0bZPl4
+fPVP0xDaLJrJc4Aar+xk9D0qNUn9sZCYWCL/O/RHWIEtW4r6pT7QtHf/h/iGeHUr
+TJKdiTe9/ol7iUHVPcIR
+=Hd8a
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.4-compile-on-hardened.patch b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.4-compile-on-hardened.patch
new file mode 100644
index 000000000000..45d6be54e999
--- /dev/null
+++ b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.4-compile-on-hardened.patch
@@ -0,0 +1,11 @@
+--- b/Makefile	2011-06-29 02:10:27.000000000 +0200
++++ a/Makefile	2011-06-29 02:09:06.000000000 +0200
+@@ -333,7 +333,7 @@
+ 	@[ -d $(LSB_OBJ_DIR) ] || mkdir $(LSB_OBJ_DIR) > /dev/null 2>&1
+ 
+ $(LSB_OBJ_DIR)/%.o: $(LSB_SRC_DIR)/%.c
+-	$(CC) $(CFLAGS_32) -nostdinc -fno-builtin -I. -I$(LSB_INC_DIR) -c $< -o $@
++	$(CC) $(CFLAGS_32) -nostdinc -fno-builtin -I. -I$(LSB_INC_DIR) -c -fno-stack-protector $< -o $@
+ 
+ $(LSB_OBJ_DIR)/%.a: $(LSB_OBJ_DIR)/%.o
+ 	$(AR) rc $@ $<
diff --git a/www-plugins/nspluginwrapper/nspluginwrapper-1.4.0-r1.ebuild b/www-plugins/nspluginwrapper/nspluginwrapper-1.4.0-r1.ebuild
deleted file mode 100644
index 43c345d911a9..000000000000
--- a/www-plugins/nspluginwrapper/nspluginwrapper-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.4.0-r1.ebuild,v 1.3 2011/05/30 14:24:04 chutzpah Exp $
-
-EAPI=2
-
-inherit eutils multilib nsplugins flag-o-matic
-
-DESCRIPTION="Netscape Plugin Wrapper - Load 32bit plugins on 64bit browser"
-HOMEPAGE="http://nspluginwrapper.davidben.net/"
-SRC_URI="http://web.mit.edu/davidben/Public/nspluginwrapper/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2:2
-	net-misc/curl
-	app-emulation/emul-linux-x86-xlibs
-	app-emulation/emul-linux-x86-gtklibs
-	>=sys-apps/util-linux-2.13"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-autoinstall() {
-	if [[ -x /usr/bin/${PN} ]]; then
-		einfo "Auto installing 32bit plugins..."
-		${PN} -a -i
-		ls /usr/$(get_libdir)/nsbrowser/plugins
-
-		# Remove wrappers if equivalent 64-bit plugins exist
-		# TODO: May be better to patch nspluginwrapper so it doesn't create
-		#       duplicate wrappers in the first place...
-		local DIR64="${ROOT}/usr/$(get_libdir)/nsbrowser/plugins/"
-		for f in "${DIR64}"/npwrapper.*.so; do
-			local PLUGIN=${f##*/npwrapper.}
-			if [[ -f ${DIR64}/${PLUGIN} ]]; then
-				einfo "  Removing duplicate wrapper for native 64-bit ${PLUGIN}"
-				${PN} -r "${f}"
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.3.0-gdk-native-windows.patch"
-	epatch "${FILESDIR}/${P}-parallel-make.patch"
-}
-
-src_configure() {
-	replace-flags -O3 -O2
-
-	./configure --enable-biarch \
-		--target-cpu=i386 \
-		--with-lib32=$(ABI=x86 get_libdir) \
-		--with-lib64=$(get_libdir) \
-		--pkglibdir=/usr/$(get_libdir)/${PN}
-}
-
-src_compile() {
-	emake LDFLAGS_32="-m32 ${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dosym "/usr/$(get_libdir)/${PN}/x86_64/linux/npconfig" "/usr/bin/${PN}"
-	keepdir "/usr/$(get_libdir)/${PLUGINS_DIR}"
-
-	dodoc NEWS README TODO
-}
-
-pkg_postinst() {
-	autoinstall
-	elog "Any 32bit plugins you currently have installed have now been"
-	elog "configured to work in a 64bit browser. Any plugins you install in"
-	elog "the future will first need to be setup with:"
-	elog "  \"nspluginwrapper -i <path-to-32bit-plugin>\""
-	elog "before they will function in a 64bit browser"
-	elog
-}
-
-# this is terribly ugly, but without a way to query portage as to whether
-# we are upgrading/reinstalling a package versus unmerging, I can't think of
-# a better way
-
-pkg_prerm() {
-	einfo "Removing wrapper plugins..."
-	${PN} --auto --remove
-}
-
-pkg_postrm() {
-	autoinstall
-}
diff --git a/www-plugins/nspluginwrapper/nspluginwrapper-1.4.2.ebuild b/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4.ebuild
index 02c6c94014e2..bb1de05bebc3 100644
--- a/www-plugins/nspluginwrapper/nspluginwrapper-1.4.2.ebuild
+++ b/www-plugins/nspluginwrapper/nspluginwrapper-1.4.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/www-plugins/nspluginwrapper/nspluginwrapper-1.4.2.ebuild,v 1.1 2011/06/17 02:25:58 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4.ebuild,v 1.1 2011/07/04 15:29:08 chutzpah Exp $
 
 EAPI=2
 
@@ -45,7 +45,8 @@ autoinstall() {
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.3.0-gdk-native-windows.patch"
-	epatch "${FILESDIR}/${P}-parallel-make.patch"
+	epatch "${FILESDIR}/${PN}-1.4.2-parallel-make.patch"
+	epatch "${FILESDIR}/${P}-compile-on-hardened.patch"
 }
 
 src_configure() {