Add a patch for latest FreeBSD security advisory

Package-Manager: portage-2.2_rc55/cvs/Linux x86_64

4 files changed, 112 insertions, 5 deletions

diff --git a/sys-freebsd/freebsd-libexec/ChangeLog b/sys-freebsd/freebsd-libexec/ChangeLog
index 81fd8d7ed40a..113ec65c7ce5 100644
--- a/sys-freebsd/freebsd-libexec/ChangeLog
+++ b/sys-freebsd/freebsd-libexec/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-freebsd/freebsd-libexec
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/ChangeLog,v 1.33 2009/12/04 20:02:06 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/ChangeLog,v 1.34 2009/12/05 09:48:09 aballier Exp $
+
+*freebsd-libexec-7.2-r1 (05 Dec 2009)
+
+  05 Dec 2009; Alexis Ballier <aballier@gentoo.org>
+  +freebsd-libexec-7.2-r1.ebuild, +files/freebsd-libexec-7.2-rtld7.patch:
+  Add a patch for latest FreeBSD security advisory
 
   04 Dec 2009; Alexis Ballier <aballier@gentoo.org>
   -freebsd-libexec-7.1.ebuild:
diff --git a/sys-freebsd/freebsd-libexec/Manifest b/sys-freebsd/freebsd-libexec/Manifest
index 1ff2eb7d6ff0..67c89d64b175 100644
--- a/sys-freebsd/freebsd-libexec/Manifest
+++ b/sys-freebsd/freebsd-libexec/Manifest
@@ -6,6 +6,7 @@ AUX bootpd.initd 553 RMD160 15e4cd00d83d969ed3dbeb8c3cd1a6bbfb05c999 SHA1 9ca5dc
 AUX freebsd-libexec-6.1-libfallback.patch 4230 RMD160 ec9a2d6b85945932f3d2c463c55730663961e9e5 SHA1 f67aab56a84a14c38aab467572d68d3be622cdc9 SHA256 a9db8a93a973be10c9c9f7044f9d40ed4a58a16906b3da089db9873aa7597380
 AUX freebsd-libexec-6.2-dl_iterate_phdr.patch 8194 RMD160 8670b61fe0cfdb9cf9d5515254496e58d0eb1a84 SHA1 1134db8a9ff9dfe9bd8d9199bd807ff0fb32558b SHA256 9a79cd621086f91a1959adbfabdb1834e6d4cd83c0f4c517c35d3d4c706ba96a
 AUX freebsd-libexec-7.0-libfallback.patch 3955 RMD160 1ba757f14a96b70f8864880d3da7aceeb923226a SHA1 b2f120ed69c45b494f3a2bab80465e38de24018e SHA256 5850a3b9bc5c25fca8c70547926423b44a9123878d37e40a0fc6323ebc8a843c
+AUX freebsd-libexec-7.2-rtld7.patch 855 RMD160 bc1a1ab1089f0bce0d2958e53bad8cbbcfe2cd67 SHA1 20dd7d590018668eb7653aea474edf6c565242d7 SHA256 d31c269fec13a65267053b527909b2912158aa82da3d04dd576dc6a00f1e8557
 AUX freebsd-libexec-nossp.patch 434 RMD160 7b63e750f7d1364b1a4cc8af139788d163899563 SHA1 93bc3197fa5dd5d857ec295ebc3c0ca2574c93e3 SHA256 8ee38006be649adf95dc9742a9356e337e769c11c48206566023d9c8e85c3364
 AUX freebsd-libexec-setXid.patch 270 RMD160 70cb184d02b3a3102eeb6332226db42b2abf04f5 SHA1 0e9332ab2a6951abfdfd58bd134368e7e437fa28 SHA256 b96e8adef3276e5bd2b2518641b9d971202476803b82bdea7077603510116b8e
 AUX ftpd.pamd 192 RMD160 e178eab9e4caf6e8cfa0c24c16d764c0d0111ce6 SHA1 d816a5040a6ddc1112f7213c4417ee2f7bbd8bd3 SHA256 4b789fb18bc0d1f9b0a9b0f1bf5dac6d86166a7106e966e5f65ffd4faf5ce024
@@ -37,13 +38,14 @@ DIST freebsd-usbin-7.1.tar.bz2 2584691 RMD160 cf6adf2f1cc60e667417f647cb99bbc310
 DIST freebsd-usbin-7.2.tar.bz2 2654480 RMD160 af0a94e0affce332cf30532ea45251563e65632e SHA1 b52db981e0250357b40d10ebc7ffd6ca3ea9cc4c SHA256 56574e81ac4ab54a20d83d9a2d1ba3a42b5677691675f1db162fde161da0907f
 EBUILD freebsd-libexec-6.2-r2.ebuild 1812 RMD160 d13830b604bb7b3d47f02003f72a0d150a5a1130 SHA1 7a888657a8488267650f7a3da6babbb8b8b68060 SHA256 eb1faec030f8872e8c79110eba6baba658797664bed2cec1fa007742c4fd921e
 EBUILD freebsd-libexec-7.1-r1.ebuild 2063 RMD160 ae843df1662c8b7aaf830306a546b286e8503f85 SHA1 407a9edd44d371c492949b63239af67cfd87b262 SHA256 412bb592c35c7d6f5c1e2bdd1093fcc2a1e9714babc22abab8b979321980533a
+EBUILD freebsd-libexec-7.2-r1.ebuild 2103 RMD160 96d80650825dd6f39d0f5e38d5762fb468e65703 SHA1 c0de5759e520da90fade99b75221e2ca0a963c2f SHA256 ddd033a95cd08b7e2ae3835a234014fa568bb1a7d329d54fd4e08200968e93bc
 EBUILD freebsd-libexec-7.2.ebuild 2068 RMD160 2c8d572f7041cfad8802bdaa2aabe0ffca5ff528 SHA1 b99d9e1c56394c376309b0d68e4e1cc8dc173d3b SHA256 f6089efadcf3a5ab59fabf06511c1287561c2ba3e9193fe9741484256c044d71
-MISC ChangeLog 8082 RMD160 bb3e498c3a42e8bcffb3adb046b8158d7dddaaf3 SHA1 c632a07fe259a8731543af6298f2857553a2d09a SHA256 cf6edc8177af28d8a2acdb49bfa70604de95abf23b85c7fa089bc9bf4c79e1f0
+MISC ChangeLog 8299 RMD160 a70fb0508ddef76e56abb0b1ad3b7efa02961795 SHA1 b306b574a81910a1779fd6d581b728fe3c8b1f7c SHA256 924d3a4e2f804a0af3a041a1222532e6d23222abf4746b00446a09cecadd71a9
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAksZasMACgkQvFcC4BYPU0pHVwCcDLHYxEPqhwtJSmYuH0VR2+up
-p9gAn1JRltAnCuLXL1BqjqNq/BM5c6PE
-=UvXS
+iEYEARECAAYFAksaLF8ACgkQvFcC4BYPU0qC0ACgtMAMag3kbQMjof8bX9l5ysXB
+J+YAnA7GOUpoYHouYxy/rDRYiKh1q16G
+=6R2X
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-7.2-rtld7.patch b/sys-freebsd/freebsd-libexec/files/freebsd-libexec-7.2-rtld7.patch
new file mode 100644
index 000000000000..6c6f0adf5fa8
--- /dev/null
+++ b/sys-freebsd/freebsd-libexec/files/freebsd-libexec-7.2-rtld7.patch
@@ -0,0 +1,24 @@
+http://security.freebsd.org/advisories/FreeBSD-SA-09:16.rtld.asc
+
+Index: libexec/rtld-elf/rtld.c
+===================================================================
+--- libexec/rtld-elf/rtld.c
++++ libexec/rtld-elf/rtld.c
+@@ -358,11 +358,12 @@
+      * future processes to honor the potentially un-safe variables.
+      */
+     if (!trust) {
+-        unsetenv(LD_ "PRELOAD");
+-        unsetenv(LD_ "LIBMAP");
+-        unsetenv(LD_ "LIBRARY_PATH");
+-        unsetenv(LD_ "LIBMAP_DISABLE");
+-        unsetenv(LD_ "DEBUG");
++        if (unsetenv(LD_ "PRELOAD") || unsetenv(LD_ "LIBMAP") ||
++	    unsetenv(LD_ "LIBRARY_PATH") || unsetenv(LD_ "LIBMAP_DISABLE") ||
++	    unsetenv(LD_ "DEBUG")) {
++		_rtld_error("environment corrupt; aborting");
++		die();
++	}
+     }
+     ld_debug = getenv(LD_ "DEBUG");
+     libmap_disable = getenv(LD_ "LIBMAP_DISABLE") != NULL;
diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-7.2-r1.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-7.2-r1.ebuild
new file mode 100644
index 000000000000..fab71ce68bd5
--- /dev/null
+++ b/sys-freebsd/freebsd-libexec/freebsd-libexec-7.2-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/freebsd-libexec-7.2-r1.ebuild,v 1.1 2009/12/05 09:48:09 aballier Exp $
+
+EAPI=2
+
+inherit bsdmk freebsd pam
+
+DESCRIPTION="FreeBSD libexec things"
+SLOT="0"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
+
+SRC_URI="mirror://gentoo/${LIBEXEC}.tar.bz2
+	mirror://gentoo/${UBIN}.tar.bz2
+	mirror://gentoo/${BIN}.tar.bz2
+	mirror://gentoo/${CONTRIB}.tar.bz2
+	mirror://gentoo/${LIB}.tar.bz2
+	mirror://gentoo/${ETC}.tar.bz2
+	mirror://gentoo/${USBIN}.tar.bz2"
+
+RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
+	pam? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	=sys-freebsd/freebsd-mk-defs-${RV}*
+	=sys-freebsd/freebsd-sources-${RV}*"
+RDEPEND="${RDEPEND}
+	xinetd? ( sys-apps/xinetd )"
+
+S="${WORKDIR}/libexec"
+
+PATCHES=( "${FILESDIR}/${PN}-setXid.patch"
+	"${FILESDIR}/${PN}-nossp.patch"
+	"${FILESDIR}/${PN}-7.0-libfallback.patch"
+	"${FILESDIR}/${P}-rtld7.patch" )
+
+# Remove sendmail, tcp_wrapper and other useless stuff
+REMOVE_SUBDIRS="smrsh mail.local tcpd telnetd rshd rlogind lukemftpd ftpd"
+
+IUSE="pam ssl kerberos ipv6 nis xinetd"
+
+pkg_setup() {
+	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
+	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
+	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
+	use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
+	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
+
+	mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_PF= WITHOUT_RCMDS= "
+}
+
+src_prepare() {
+	ln -s /usr/include "${WORKDIR}/include"
+}
+
+src_compile() {
+	NOSSP_FLAGS="$(test-flags -fno-stack-protector -fno-stack-protector-all)"
+	export NOSSP_FLAGS
+	freebsd_src_compile
+}
+
+src_install() {
+	freebsd_src_install
+
+	insinto /etc
+	doins "${WORKDIR}/etc/gettytab"
+	newinitd "${FILESDIR}/bootpd.initd" bootpd
+	newconfd "${FILESDIR}/bootpd.confd" bootpd
+
+	if use xinetd; then
+		for rpcd in rstatd rusersd walld rquotad sprayd; do
+			insinto /etc/xinetd.d
+			newins "${FILESDIR}/${rpcd}.xinetd" ${rpcd}
+		done
+	fi
+}