Add upstream patch to init TLS for shared object. #390425

Package-Manager: portage-2.2.0_alpha75/cvs/FreeBSD i386

4 files changed, 120 insertions, 6 deletions

diff --git a/sys-freebsd/freebsd-libexec/ChangeLog b/sys-freebsd/freebsd-libexec/ChangeLog
index 086bfe11175a..b1636319edbc 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/ChangeLog,v 1.45 2012/01/16 16:37:09 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/ChangeLog,v 1.46 2012/03/08 11:02:04 naota Exp $
+
+*freebsd-libexec-8.2-r1 (08 Mar 2012)
+
+  08 Mar 2012; Naohiro Aota <naota@gentoo.org>
+  +files/freebsd-libexec-8.2-rtld.patch, +freebsd-libexec-8.2-r1.ebuild:
+  Add upstream patch to init TLS for shared object. #390425
 
 *freebsd-libexec-9.0 (16 Jan 2012)
 
diff --git a/sys-freebsd/freebsd-libexec/Manifest b/sys-freebsd/freebsd-libexec/Manifest
index 5967d01fb382..c40730859c21 100644
--- a/sys-freebsd/freebsd-libexec/Manifest
+++ b/sys-freebsd/freebsd-libexec/Manifest
@@ -7,6 +7,7 @@ AUX freebsd-libexec-7.0-libfallback.patch 3955 RMD160 1ba757f14a96b70f8864880d3d
 AUX freebsd-libexec-7.2-pic.patch 348 RMD160 59f8d21553276a36e6299d400659333d0e58ab7e SHA1 6ca0a8e94a726b59bcf4a0b75e611621d56d3b1b SHA256 424ed7b69067d3a3a77ad387026548b77d41412f52ae17c737e96e57b6cb3b0f
 AUX freebsd-libexec-7.2-rtld7.patch 855 RMD160 bc1a1ab1089f0bce0d2958e53bad8cbbcfe2cd67 SHA1 20dd7d590018668eb7653aea474edf6c565242d7 SHA256 d31c269fec13a65267053b527909b2912158aa82da3d04dd576dc6a00f1e8557
 AUX freebsd-libexec-7.2-rtldnoload.patch 2180 RMD160 f1d3aeccc68c05de74bfc747a9c6456335bee1ab SHA1 008509c89f9c709567ba9e61293b8cf7f858877c SHA256 5eb62ec2603467f4a7e9c2ad5faaf481270402b8fb892c4931a5f7f035502d29
+AUX freebsd-libexec-8.2-rtld.patch 1332 RMD160 af1964024de38e1169552a72663f25d659f7ac34 SHA1 56ebb64ca556bac27a304e31ea92828ea927e652 SHA256 0f0dc285b4797ab3be266db02f905ca72ffb39589c927311f74678acd9517e4d
 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
@@ -66,17 +67,18 @@ DIST freebsd-usbin-9.0_rc2.tar.bz2 2606905 RMD160 d63519382e2405c6d255ff492677cc
 DIST freebsd-usbin-9.0_rc3.tar.bz2 2607387 RMD160 4a871db21567bfbe27a2951a4b9ce73281adc534 SHA1 403bd3bb5294fdda39a374cfa54690de7c27e1ce SHA256 720da53962d38737f1d5af7cfceebecddd7a06f959820f6f1ab9f1ebfb7ef8f0
 EBUILD freebsd-libexec-7.2-r2.ebuild 2204 RMD160 000315fbf6820b0c9bd5dca9c2c716968729a7fb SHA1 597df60c2d645de578427f35e173bf3be62db09d SHA256 c2e529d205f269cc7c5f1f6534b84ee9e71281fd5822b2c7d090d4a2e45939d2
 EBUILD freebsd-libexec-8.0.ebuild 1857 RMD160 3496a5fdade99cfa0dec47257170ac1f863e38c5 SHA1 d1d95f8f0e0e20f17e77b9840486b50f8cb09d82 SHA256 1afbc6668ec31b4b266f08ecc59cf6f3937a2317feeb6f7f40066d07b799f207
+EBUILD freebsd-libexec-8.2-r1.ebuild 1894 RMD160 41bcc65954ad007b1480f0d7bab3f7b1f6c33f8d SHA1 e7ef661ff4e13a326428d47aca896bfc336e3274 SHA256 ed3dcc78748dcea071cba1ef617b1547914ca525d9b9e3f3e5ddd64f6018e36d
 EBUILD freebsd-libexec-8.2.ebuild 1857 RMD160 f81bad5d80653b48bb89a7fa4dd68a2ef224833a SHA1 6b97ad526baaa0d7cd4f15caff4a8c498990f8a0 SHA256 df286327a737425ab4d190dca16008bb2d26bd24e021c7f7a4303e7221db4f84
 EBUILD freebsd-libexec-9.0.ebuild 1811 RMD160 3808fbc1c51cf1c89802749d0d2cc8c98d4d1d1d SHA1 5627ab7343b42b04038b1fe7abf479cf9f7c6f74 SHA256 cff5f1f5b27033f33121d879db2b517b401e63e036ff801aeefc018c0df66157
 EBUILD freebsd-libexec-9.0_rc1.ebuild 1815 RMD160 ad583821e26f69961731dd1275999f8dae83432f SHA1 c6cca1d280347732d3b493abfe619553706387a1 SHA256 f59bcf9185a70dfa0070eec0028cdfef070d00e79c8f1835a95c710ae6e4c118
 EBUILD freebsd-libexec-9.0_rc2.ebuild 1815 RMD160 525c86fddc14edd345633c593d931b1bebde7cec SHA1 ab68943391bc941a2e835ab7e1a12b042826f1d7 SHA256 264e5e28d007f31fd03b781af88f51e2d53fdf7674f9168abbec21fe3e7f4a4d
 EBUILD freebsd-libexec-9.0_rc3.ebuild 1815 RMD160 9c4ec4551b2b3393d42c9230b399aa24bceda376 SHA1 e8c65f287638f8e00e5444759149308f8b468aac SHA256 5c9857a5d4db7aeed0e8d9fc7d7e2b0770a4a8d069cc16bb1e8c3d88d4175cf9
-MISC ChangeLog 10036 RMD160 9ffbf984a070a0998ff9ead7554d53bbbb0eae2b SHA1 19e798feec47feb82f6f199e4d2d0d47b8ebd037 SHA256 bec814ba9d762451671f7fa25e0c86c744b84cf1d0d837b014bb6f5d3b94a133
+MISC ChangeLog 10253 RMD160 193ab820f3209e153c9f37417ad378adbd9efaa0 SHA1 82d5f8ea6d99157893bb528d1ecdbcf5ac019703 SHA256 b5cf87ab17a03a2dc1bbb3f0108ff1029a53ccc4fd015b4b4ede7fa58d784ab5
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.18 (FreeBSD)
 
-iEYEARECAAYFAk8UUjsACgkQvFcC4BYPU0oivgCdHXACysGh2w9OSzesI4q12Qr4
-jRUAoJRKdlExm1SDZjdgYsJhTN5W0D32
-=N1l1
+iEYEARECAAYFAk9Ykb8ACgkQGpDnPLSHuMCjTQCgrf1zXo+psYP/a/kM1NHuyPsV
+KkgAn0EtjBi6drzCDawhRqXvUjTWQVyb
+=Es81
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-8.2-rtld.patch b/sys-freebsd/freebsd-libexec/files/freebsd-libexec-8.2-rtld.patch
new file mode 100644
index 000000000000..c60b2fec102c
--- /dev/null
+++ b/sys-freebsd/freebsd-libexec/files/freebsd-libexec-8.2-rtld.patch
@@ -0,0 +1,40 @@
+--- head/libexec/rtld-elf/rtld.c	2011/09/15 11:50:09	225582
++++ head/libexec/rtld-elf/rtld.c	2011/10/08 12:39:47	226155
+@@ -495,8 +495,12 @@
+        exit (0);
+     }
+ 
+-    /* setup TLS for main thread */
+-    dbg("initializing initial thread local storage");
++    /*
++     * Processing tls relocations requires having the tls offsets
++     * initialized.  Prepare offsets before starting initial
++     * relocation processing.
++     */
++    dbg("initializing initial thread local storage offsets");
+     STAILQ_FOREACH(entry, &list_main, link) {
+ 	/*
+ 	 * Allocate all the initial objects out of the static TLS
+@@ -504,7 +508,6 @@
+ 	 */
+ 	allocate_tls_offset(entry->obj);
+     }
+-    allocate_initial_tls(obj_list);
+ 
+     if (relocate_objects(obj_main,
+       ld_bind_now != NULL && *ld_bind_now != '\0', &obj_rtld, NULL) == -1)
+@@ -519,6 +522,14 @@
+        exit (0);
+     }
+ 
++    /*
++     * Setup TLS for main thread.  This must be done after the
++     * relocations are processed, since tls initialization section
++     * might be the subject for relocations.
++     */
++    dbg("initializing initial thread local storage");
++    allocate_initial_tls(obj_list);
++
+     dbg("initializing key program variables");
+     set_program_var("__progname", argv[0] != NULL ? basename(argv[0]) : "");
+     set_program_var("environ", env);
diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-8.2-r1.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-8.2-r1.ebuild
new file mode 100644
index 000000000000..d5c40f794d05
--- /dev/null
+++ b/sys-freebsd/freebsd-libexec/freebsd-libexec-8.2-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/freebsd-libexec-8.2-r1.ebuild,v 1.1 2012/03/08 11:02:04 naota 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}-7.2-pic.patch" 
+	"${FILESDIR}/${PN}-8.2-rtld.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_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
+}