RPATH security fix, bug #117606.

Package-Manager: portage-2.1_pre3-r1

5 files changed, 159 insertions, 3 deletions

diff --git a/gnome-base/orbit/ChangeLog b/gnome-base/orbit/ChangeLog
index f4425a547178..73573c6514de 100644
--- a/gnome-base/orbit/ChangeLog
+++ b/gnome-base/orbit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/orbit
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/ChangeLog,v 1.39 2005/12/30 16:43:44 corsair Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/ChangeLog,v 1.40 2006/01/13 01:18:10 robbat2 Exp $
+
+*orbit-0.5.17-r1 (13 Jan 2006)
+
+  13 Jan 2006; Robin H. Johnson <robbat2@gentoo.org>
+  +files/orbit-0.5.17-rpath-security-fix.patch, +orbit-0.5.17-r1.ebuild:
+  RPATH security fix, bug #117606.
 
   30 Dec 2005; Markus Rothe <corsair@gentoo.org> orbit-2.12.3.ebuild:
   Stable on ppc64
diff --git a/gnome-base/orbit/Manifest b/gnome-base/orbit/Manifest
index c65adb5603c7..9a008db23172 100644
--- a/gnome-base/orbit/Manifest
+++ b/gnome-base/orbit/Manifest
@@ -1,10 +1,13 @@
-MD5 90063f2e72ccc194b3f7ec4d344d004e ChangeLog 4448
+MD5 7bad8aa9e94d2c79031e5e16bed15128 ChangeLog 4642
 MD5 51bfc1efb763de186ee1b1f1e594891a files/digest-orbit-0.5.17 66
+MD5 51bfc1efb763de186ee1b1f1e594891a files/digest-orbit-0.5.17-r1 66
 MD5 66a18f0f92e9cd0f658690bf1e5c862c files/digest-orbit-2.12.2 66
 MD5 855e570b505cfbb5e8748ba5baf471bc files/digest-orbit-2.12.3 66
 MD5 baa740810613ffcd2d1af90c6c82765f files/digest-orbit-2.12.4 66
 MD5 7105f3bdc076c48f0458e20ea8eaba34 files/orbit-0.5.17-m4.patch 472
+MD5 f9325ad3ff0c1a2d06d5c26442679fd4 files/orbit-0.5.17-rpath-security-fix.patch 3628
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 58ccd3cd716ca1dd42f5ca6420d91165 orbit-0.5.17-r1.ebuild 1754
 MD5 6f6fa3795d0324df35315d2215d55248 orbit-0.5.17.ebuild 1650
 MD5 e3a8dc018eb029f302884b2fc80adf56 orbit-2.12.2.ebuild 1017
 MD5 de5762757b63214d7f117d5141114acf orbit-2.12.3.ebuild 1064
diff --git a/gnome-base/orbit/files/digest-orbit-0.5.17-r1 b/gnome-base/orbit/files/digest-orbit-0.5.17-r1
new file mode 100644
index 000000000000..0acb59acfc03
--- /dev/null
+++ b/gnome-base/orbit/files/digest-orbit-0.5.17-r1
@@ -0,0 +1 @@
+MD5 35acc6f8d49d930b566104fcceb893d3 ORBit-0.5.17.tar.bz2 1065003
diff --git a/gnome-base/orbit/files/orbit-0.5.17-rpath-security-fix.patch b/gnome-base/orbit/files/orbit-0.5.17-rpath-security-fix.patch
new file mode 100644
index 000000000000..c4737e275ccd
--- /dev/null
+++ b/gnome-base/orbit/files/orbit-0.5.17-rpath-security-fix.patch
@@ -0,0 +1,75 @@
+diff -Nuar ORBit-0.5.17.orig/aclocal.m4 ORBit-0.5.17.maybe/aclocal.m4
+--- ORBit-0.5.17.orig/aclocal.m4	2002-06-06 04:27:07.000000000 -0700
++++ ORBit-0.5.17.maybe/aclocal.m4	2006-01-12 16:53:21.000000000 -0800
+@@ -1492,7 +1492,7 @@
+ 
+   if test "$ld_shlibs" = yes; then
+     runpath_var=LD_RUN_PATH
+-    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
++    hardcode_libdir_flag_spec='${wl}-L${wl}$libdir'
+     export_dynamic_flag_spec='${wl}--export-dynamic'
+     case $host_os in
+     cygwin* | mingw* | pw32*)
+@@ -1717,7 +1717,7 @@
+     else
+       archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+     fi
+-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++    hardcode_libdir_flag_spec='${wl}-L${wl}$libdir'
+     hardcode_libdir_separator=:
+     link_all_deplibs=yes
+     ;;
+@@ -1736,7 +1736,7 @@
+   newsos6)
+     archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+     hardcode_direct=yes
+-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++    hardcode_libdir_flag_spec='${wl}-L${wl}$libdir'
+     hardcode_libdir_separator=:
+     hardcode_shlibpath_var=no
+     ;;
+@@ -1746,7 +1746,7 @@
+     hardcode_shlibpath_var=no
+     if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+       archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++      hardcode_libdir_flag_spec='${wl}-L$libdir'
+       export_dynamic_flag_spec='${wl}-E'
+     else
+       case "$host_os" in
+@@ -1756,7 +1756,7 @@
+         ;;
+       *)
+         archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
+-        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++        hardcode_libdir_flag_spec='${wl}-L$libdir'
+         ;;
+       esac
+     fi
+@@ -1778,7 +1778,7 @@
+       allow_undefined_flag=' -expect_unresolved \*'
+       archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+     fi
+-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++    hardcode_libdir_flag_spec='${wl}-L${wl}$libdir'
+     hardcode_libdir_separator=:
+     ;;
+ 
+@@ -1786,7 +1786,7 @@
+     if test "$GCC" = yes; then
+       allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+       archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_flag_spec='${wl}-L${wl}$libdir'
+     else
+       allow_undefined_flag=' -expect_unresolved \*'
+       archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+@@ -1794,7 +1794,7 @@
+       $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+ 
+       #Both c and cxx compiler support -rpath directly
+-      hardcode_libdir_flag_spec='-rpath $libdir'
++      hardcode_libdir_flag_spec='-L$libdir'
+     fi
+     hardcode_libdir_separator=:
+     ;;
diff --git a/gnome-base/orbit/orbit-0.5.17-r1.ebuild b/gnome-base/orbit/orbit-0.5.17-r1.ebuild
new file mode 100644
index 000000000000..fe5ae896ae49
--- /dev/null
+++ b/gnome-base/orbit/orbit-0.5.17-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-0.5.17-r1.ebuild,v 1.1 2006/01/13 01:18:10 robbat2 Exp $
+
+inherit gnome.org libtool gnuconfig eutils multilib
+
+MY_P="ORBit-${PV}"
+PVP=(${PV//[-\._]/ })
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="A high-performance, lightweight CORBA ORB aiming for CORBA 2.2 compliance"
+HOMEPAGE="http://www.labs.redhat.com/orbit/"
+SRC_URI="mirror://gnome/sources/ORBit/${PVP[0]}.${PVP[1]}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="sys-devel/gettext
+		>=sys-apps/tcp-wrappers-7.6
+		=dev-libs/glib-1.2*"
+RDEPEND="=dev-libs/glib-1.2*"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-m4.patch
+	epatch "${FILESDIR}"/${P}-rpath-security-fix.patch
+	gnuconfig_update
+	# Libtoolize to fix "relink bug" in older libtool's distributed
+	# with packages.
+	elibtoolize
+}
+
+src_compile() {
+	econf \
+		--host=${CHOST} \
+		--prefix=/usr \
+		--libdir=/usr/$(get_libdir) \
+		--infodir=/usr/share/info \
+		--sysconfdir=/etc \
+		--localstatedir=/var/lib \
+		|| die
+
+	make || die # Doesn't work with -j 4 (hallski)
+}
+
+src_install() {
+	#make prefix=${D}/usr \
+	#	libdir=${D}/usr/$(get_libdir) \
+	#	sysconfdir=${D}/etc \
+	#	infodir=${D}/usr/share/info \
+	#	localstatedir=${D}/var/lib \
+	#	install || die
+	make install DESTDIR="${D}" || die
+
+	dodoc AUTHORS ChangeLog README NEWS TODO
+	dodoc docs/*.txt docs/IDEA1
+
+	docinto idl
+	cd libIDL
+	dodoc AUTHORS BUGS NEWS README*
+
+	docinto popt
+	cd ../popt
+	dodoc CHANGES README
+
+	sed -i -e 's:-I/usr/include":-I/usr/include/libIDL-1.0":' \
+		${D}/usr/$(get_libdir)/libIDLConf.sh || die
+}