Fix security bug #117063.

Package-Manager: portage-2.1_pre2

4 files changed, 25 insertions, 8 deletions

diff --git a/x11-misc/xnview/ChangeLog b/x11-misc/xnview/ChangeLog
index ae32cfb62f0c..dcf05d0fb8bc 100644
--- a/x11-misc/xnview/ChangeLog
+++ b/x11-misc/xnview/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/xnview
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnview/ChangeLog,v 1.15 2005/12/28 19:32:36 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnview/ChangeLog,v 1.16 2005/12/29 16:51:58 nelchael Exp $
+
+*xnview-1.70-r1 (29 Dec 2005)
+
+  29 Dec 2005; Krzysiek Pawlik <nelchael@gentoo.org> -xnview-1.70.ebuild,
+  +xnview-1.70-r1.ebuild:
+  Fix security bug #117063.
 
 *xnview-1.70 (28 Dec 2005)
 
diff --git a/x11-misc/xnview/Manifest b/x11-misc/xnview/Manifest
index 0276b147bf16..71cf0510280c 100644
--- a/x11-misc/xnview/Manifest
+++ b/x11-misc/xnview/Manifest
@@ -1,9 +1,9 @@
-MD5 644014e380af836605f39bfda256e4fa ChangeLog 2544
+MD5 490d0551bf6c5c8bdb9c5ea6aef72e27 ChangeLog 2704
 MD5 fe2cf2952d86b4eed345d6a7e405d64b files/99XnView 44
 MD5 7497208eecea3974c348190b50713744 files/digest-xnview-1.50 145
 MD5 8906b1ca75ddac450c6030f18d60aefb files/digest-xnview-1.68 73
-MD5 41da862cceba7502ffb2f29c4c6afb7a files/digest-xnview-1.70 88
+MD5 41da862cceba7502ffb2f29c4c6afb7a files/digest-xnview-1.70-r1 88
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 MD5 dbc56ab365e37ffd99d6bcfc6a21a313 xnview-1.50.ebuild 1142
 MD5 7e9339d33d4316430227eef8e79ef1a7 xnview-1.68.ebuild 1097
-MD5 2d3225d6ccc0856ebc16360699e4148f xnview-1.70.ebuild 863
+MD5 b489513b539cef8d3aa5fd9b92c04633 xnview-1.70-r1.ebuild 1084
diff --git a/x11-misc/xnview/files/digest-xnview-1.70 b/x11-misc/xnview/files/digest-xnview-1.70-r1
index 5ce701cbba53..5ce701cbba53 100644
--- a/x11-misc/xnview/files/digest-xnview-1.70
+++ b/x11-misc/xnview/files/digest-xnview-1.70-r1
diff --git a/x11-misc/xnview/xnview-1.70.ebuild b/x11-misc/xnview/xnview-1.70-r1.ebuild
index b701f2b1aad2..9302ed1f9232 100644
--- a/x11-misc/xnview/xnview-1.70.ebuild
+++ b/x11-misc/xnview/xnview-1.70-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnview/xnview-1.70.ebuild,v 1.1 2005/12/28 19:32:36 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnview/xnview-1.70-r1.ebuild,v 1.1 2005/12/29 16:51:58 nelchael Exp $
 
 DESCRIPTION="XnView image viewer/converter"
 HOMEPAGE="http://www.xnview.com/"
@@ -15,15 +15,25 @@ DEPEND="virtual/x11"
 
 S="${WORKDIR}/XnView-1.70-x86-unknown-linux2.x-static-fc4"
 
+src_unpack() {
+
+	unpack "${A}"
+
+	einfo "Fixing RPATH"
+	cd "${S}"
+	sed -i -e 's#.:/usr/local/lib#/opt/XnView/lib\x00#g' bin/xnview
+	sed -i -e 's#.:/usr/local/lib#/opt/XnView/lib\x00#g' bin/nview
+	sed -i -e 's#.:/usr/local/lib#/opt/XnView/lib\x00#g' bin/nconvert
+
+}
+
 src_install() {
+
 	BASE_DIR=/opt/XnView
 
 	into /opt
 	dobin bin/{xnview,nview,nconvert}
 
-	insinto /etc/env.d
-	doins ${FILESDIR}/99XnView
-
 	cp app-defaults/XnView.ad app-defaults/XnView
 	insinto /usr/lib/X11/app-defaults/XnView
 	doins app-defaults/XnView
@@ -32,4 +42,5 @@ src_install() {
 	doman man/*.1
 
 	dodoc *.txt
+
 }