public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-lib/
@ 2015-09-21  9:06 Michał Górny
  0 siblings, 0 replies; 15+ messages in thread
From: Michał Górny @ 2015-09-21  9:06 UTC (permalink / raw
  To: gentoo-commits

commit:     254e298253e4174babae680bbedacaa73a9d7964
Author:     Yuta Satoh <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Mon Sep 21 08:37:56 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 08:37:56 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=254e2982

sys-freebsd/freebsd-lib: Fix eratta, FreeBSD-EN-15:17.libc

 sys-freebsd/freebsd-lib/Manifest                                       | 1 +
 .../{freebsd-lib-10.2.ebuild => freebsd-lib-10.2-r1.ebuild}            | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index fc5e1af..1cbebfc 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -11,6 +11,7 @@ DIST freebsd-include-8.2.tar.bz2 138992 SHA256 fade90621a8e4880c9583c1ee49965400
 DIST freebsd-include-9.1.tar.bz2 146881 SHA256 861dce3f39e6806762b102361017cbe148f0e2b768b3fca152f8426f44a2942f SHA512 779c8315ce2b10b343bb62e331525d510b0d68ce5d665a1672bd6f4d1eff6445bc6b7a0f178b319828aa203c4e4c04c561ce793052703f4f936ce9711280a0c9 WHIRLPOOL e16ba45d380591ba007ca59579d45f61ffc1aa1a4c08fc11ed2794979b0a189a346c81b4f70a44ee199d50a72024930f28587ad62a9cd6854fc937eb466ec115
 DIST freebsd-lib-8.2.tar.bz2 3323878 SHA256 e3590c12794fcb5ba8eb7a1f58b497587cf19f9200b3254c194a793da3b5bfb0 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007 WHIRLPOOL 95f98a372f44a89bc8ac3029ec065dbbfec338e6f889d057d75644bfcdfb9d27fdc0421d7e392cad5a823712b97f0857297ec3d321580254c63032c22b95792e
 DIST freebsd-lib-9.1.tar.bz2 3206685 SHA256 f31fa8107b4de711c548f6d0c1bb1f81d09f51bcc3b14a1e9e90bb0e7cc4a35d SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e WHIRLPOOL 581878bf9c43184b043b4293409b85901c9ed1f9bd279e965414aca41ba50950848ebda3ee10a503a028135dfd2765e95a11acd4e62a11c528e104392bbbd8d0
+DIST freebsd-lib-EN-1517-libc.patch 24159 SHA256 d9662fc730a3cd8f45763cb23ffb8500606123b91947fe3aaad250b36791bf91 SHA512 bc08438974eafe038298f9b1c01b02b85503ac909af7aa9d852929bac3620afc24d0339cbe5b2368c05879619d3ba4fb377cd2a805c261e2f4eec3ef5bdd6da6 WHIRLPOOL 0cb41d381856e6a25ae9505f68d392646e0f47cbb8b5d395fc88da36115fa876fff55cde85c62cedbd48427dc4944b5343f49a3beb5e7a9ded544ff2c89e9363
 DIST freebsd-libexec-8.2.tar.bz2 289147 SHA256 10b996d1d8cd044ee2e7a877e5e6ad2bf050cce9b3bd402a5e0dea7d290b595d SHA512 abe6cf5a268675d7dcb1c214c46fef47a3fb09b31947f5d8a0b938d352295efe0249beb5007649c52187bf4c221b6ebf074d18dfe9bafd168cae09ee02ab608d WHIRLPOOL 27e854fe465eb933dd8e27c5a09b063e4d3798b54e0914c79a9120dcdc34cc5d525a0c92da7b645ff7ab2ab4f34c7f7b2783012dfa5004407acd11150062b7ad
 DIST freebsd-libexec-9.1.tar.bz2 304592 SHA256 71e6e9e41328c2148c54b81ad9b59f912a1d5f0d52e17ac07f223aa7a94b82be SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92 WHIRLPOOL d800f477ac5c9ad6dae3e0091c83e107609b5a1e3aa79e9533fcd10a8dd34ff7733ab9523eae7c292310fe94f6a529209cae6b9e8bac6b47244e59834593e74b
 DIST freebsd-src-10.2.tar.xz 124551336 SHA256 6a59ea716bae96135983ad70cd7123e3b35ec91b191a82fe282ade88a61560b1 SHA512 fba4588fdaa94fa4582a8de566a84cf4f2badc87c7b2e0745d7a31c1e349b2d5f59dbdbb16a9d43421155c1ac4bdec8db24c5d32ac5a92be687d4ed70fe35835 WHIRLPOOL e325db3c07118762021d802c4f20c7a5fd4b816f08cab6f92b408399f1b3bf8ad89728d51c354ab21478265a4539463c94aae9ae49f0ac10cd3c3f8f640dc186

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r1.ebuild
similarity index 99%
rename from sys-freebsd/freebsd-lib/freebsd-lib-10.2.ebuild
rename to sys-freebsd/freebsd-lib/freebsd-lib-10.2-r1.ebuild
index 4d91673..1bd3bd1 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-10.2.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r1.ebuild
@@ -9,6 +9,9 @@ inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs eutils multibuild mu
 DESCRIPTION="FreeBSD's base system libraries"
 SLOT="0"
 
+# Security Advisory and Errata patches.
+UPSTREAM_PATCHES=( "EN-15:17/libc.patch" )
+
 # Crypto is needed to have an internal OpenSSL header
 # sys is needed for libalias, probably we can just extract that instead of
 # extracting the whole tarball


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-lib/
@ 2016-01-16 22:31 Michał Górny
  0 siblings, 0 replies; 15+ messages in thread
From: Michał Górny @ 2016-01-16 22:31 UTC (permalink / raw
  To: gentoo-commits

commit:     2ba85b0f74516b8afa0ab60beae2260a6aa95767
Author:     Yuta Satoh <nigoro.dev <AT> gmail <DOT> com>
AuthorDate: Sat Jan 16 08:50:02 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jan 16 08:50:02 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ba85b0f

sys-freebsd/freebsd-lib: Fix eratta, FreeBSD-EN-16:03.ypclnt

 sys-freebsd/freebsd-lib/Manifest                                       | 1 +
 .../{freebsd-lib-10.2-r1.ebuild => freebsd-lib-10.2-r2.ebuild}         | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 1cbebfc..a99130f 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -12,6 +12,7 @@ DIST freebsd-include-9.1.tar.bz2 146881 SHA256 861dce3f39e6806762b102361017cbe14
 DIST freebsd-lib-8.2.tar.bz2 3323878 SHA256 e3590c12794fcb5ba8eb7a1f58b497587cf19f9200b3254c194a793da3b5bfb0 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007 WHIRLPOOL 95f98a372f44a89bc8ac3029ec065dbbfec338e6f889d057d75644bfcdfb9d27fdc0421d7e392cad5a823712b97f0857297ec3d321580254c63032c22b95792e
 DIST freebsd-lib-9.1.tar.bz2 3206685 SHA256 f31fa8107b4de711c548f6d0c1bb1f81d09f51bcc3b14a1e9e90bb0e7cc4a35d SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e WHIRLPOOL 581878bf9c43184b043b4293409b85901c9ed1f9bd279e965414aca41ba50950848ebda3ee10a503a028135dfd2765e95a11acd4e62a11c528e104392bbbd8d0
 DIST freebsd-lib-EN-1517-libc.patch 24159 SHA256 d9662fc730a3cd8f45763cb23ffb8500606123b91947fe3aaad250b36791bf91 SHA512 bc08438974eafe038298f9b1c01b02b85503ac909af7aa9d852929bac3620afc24d0339cbe5b2368c05879619d3ba4fb377cd2a805c261e2f4eec3ef5bdd6da6 WHIRLPOOL 0cb41d381856e6a25ae9505f68d392646e0f47cbb8b5d395fc88da36115fa876fff55cde85c62cedbd48427dc4944b5343f49a3beb5e7a9ded544ff2c89e9363
+DIST freebsd-lib-EN-1603-yplib.patch 2358 SHA256 f4151d7188cf5a925d120008a03dd9f1088fcec20bdc46cc91b3a3bebaa712c5 SHA512 0cde2e0edbdd080a44ff90806d4a349fbffa3fae9737e10d2b22b89aaf07da95202aa520e2fcd042126ca6ebdf8504de550835d022c3d53cf16a4c4cdee35b9c WHIRLPOOL 7d1706c31ea976272761ca749aeef886c6f76163dcd6f5988b6e449125b745d25a0f85bead8ec75a93784a25caf237a15a79de0b444a2dd2ddcf73308f89c64f
 DIST freebsd-libexec-8.2.tar.bz2 289147 SHA256 10b996d1d8cd044ee2e7a877e5e6ad2bf050cce9b3bd402a5e0dea7d290b595d SHA512 abe6cf5a268675d7dcb1c214c46fef47a3fb09b31947f5d8a0b938d352295efe0249beb5007649c52187bf4c221b6ebf074d18dfe9bafd168cae09ee02ab608d WHIRLPOOL 27e854fe465eb933dd8e27c5a09b063e4d3798b54e0914c79a9120dcdc34cc5d525a0c92da7b645ff7ab2ab4f34c7f7b2783012dfa5004407acd11150062b7ad
 DIST freebsd-libexec-9.1.tar.bz2 304592 SHA256 71e6e9e41328c2148c54b81ad9b59f912a1d5f0d52e17ac07f223aa7a94b82be SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92 WHIRLPOOL d800f477ac5c9ad6dae3e0091c83e107609b5a1e3aa79e9533fcd10a8dd34ff7733ab9523eae7c292310fe94f6a529209cae6b9e8bac6b47244e59834593e74b
 DIST freebsd-src-10.2.tar.xz 124551336 SHA256 6a59ea716bae96135983ad70cd7123e3b35ec91b191a82fe282ade88a61560b1 SHA512 fba4588fdaa94fa4582a8de566a84cf4f2badc87c7b2e0745d7a31c1e349b2d5f59dbdbb16a9d43421155c1ac4bdec8db24c5d32ac5a92be687d4ed70fe35835 WHIRLPOOL e325db3c07118762021d802c4f20c7a5fd4b816f08cab6f92b408399f1b3bf8ad89728d51c354ab21478265a4539463c94aae9ae49f0ac10cd3c3f8f640dc186

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild
similarity index 99%
rename from sys-freebsd/freebsd-lib/freebsd-lib-10.2-r1.ebuild
rename to sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild
index 7168bea..e5d7309 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r1.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild
@@ -10,7 +10,8 @@ DESCRIPTION="FreeBSD's base system libraries"
 SLOT="0"
 
 # Security Advisory and Errata patches.
-UPSTREAM_PATCHES=( "EN-15:17/libc.patch" )
+UPSTREAM_PATCHES=( "EN-15:17/libc.patch"
+	"EN-16:03/yplib.patch" )
 
 # Crypto is needed to have an internal OpenSSL header
 # sys is needed for libalias, probably we can just extract that instead of


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-lib/
@ 2016-02-28 14:03 Alexis Ballier
  0 siblings, 0 replies; 15+ messages in thread
From: Alexis Ballier @ 2016-02-28 14:03 UTC (permalink / raw
  To: gentoo-commits

commit:     5b7de3b9b739d49bc1e77b76855e2717031d5347
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 14:02:59 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 14:03:08 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b7de3b9

sys-freebsd/freebsd-lib: fix a bit more sed usage for building under linux.

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild
index e5d7309..eb75ede 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild
@@ -214,6 +214,7 @@ src_prepare() {
 	cd "${S}"
 	if use userland_GNU; then
 		find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \;
+		sed -i -e 's/-i ""/-i""/' "${S}/csu/Makefile.inc" || die
 	fi
 }
 


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-lib/
@ 2016-02-28 16:53 Alexis Ballier
  0 siblings, 0 replies; 15+ messages in thread
From: Alexis Ballier @ 2016-02-28 16:53 UTC (permalink / raw
  To: gentoo-commits

commit:     94616038c4dcdaaf7fc9af0e803dcfd1b8899811
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 16:53:37 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 16:53:50 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94616038

sys-freebsd/freebsd-lib: add DESTDIR support to gen_libc_ldscript function so that we can make the ldscript SYSROOT relative when building a cross compiler.

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild
index eb75ede..0ce19a2 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild
@@ -405,11 +405,11 @@ gen_libc_ldscript() {
 	#   $3 = source libssp_nonshared dir
 
 	# Clear the symlink.
-	rm -f "${D}/$2/libc.so" || die
+	rm -f "${DESTDIR}/$2/libc.so" || die
 
 	# Move the library if needed
 	if [ "$1" != "$2" ] ; then
-		mv "${D}/$2/libc.so.7" "${D}/$1/" || die
+		mv "${DESTDIR}/$2/libc.so.7" "${DESTDIR}/$1/" || die
 	fi
 
 	# Generate libc.so ldscript for inclusion of libssp_nonshared.a when linking
@@ -423,7 +423,7 @@ gen_libc_ldscript() {
 
 	# iconv symbol provided by libc_nonshared.a.
 	# http://svnweb.freebsd.org/base?view=revision&amp;revision=258283
-	cat > "${D}/$2/libc.so" <<-END_LDSCRIPT
+	cat > "${DESTDIR}/$2/libc.so" <<-END_LDSCRIPT
 /* GNU ld script
    SSP (-fstack-protector) requires __stack_chk_fail_local to be local.
    GCC invokes this symbol in a non-PIC way, which results in TEXTRELs if
@@ -528,13 +528,13 @@ do_install() {
 
 	if ! is_crosscompile ; then
 		if ! multilib_is_native_abi ; then
-			gen_libc_ldscript "usr/$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)"
+			DESTDIR="${D}" gen_libc_ldscript "usr/$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)"
 		else
 			dodir "$(get_libdir)"
-			gen_libc_ldscript "$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)"
+			DESTDIR="${D}" gen_libc_ldscript "$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)"
 		fi
 	else
-		CHOST=${CTARGET} gen_libc_ldscript "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib"
+		CHOST=${CTARGET} DESTDIR="${D}/usr/${CTARGET}/" gen_libc_ldscript "usr/lib" "usr/lib" "usr/lib"
 		# We're done for the cross libc here.
 		return 0
 	fi


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-lib/
@ 2016-03-01 10:07 Alexis Ballier
  0 siblings, 0 replies; 15+ messages in thread
From: Alexis Ballier @ 2016-03-01 10:07 UTC (permalink / raw
  To: gentoo-commits

commit:     2c2968cde0bdc372b34bda6bc03abb7a6f9b3725
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  1 10:04:37 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Mar  1 10:06:53 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c2968cd

sys-freebsd/freebsd-lib: set RPCDIR to include_proper when pre-installing headers

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild
index d50c0d4..bb782f3 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild
@@ -328,6 +328,7 @@ do_bootstrap() {
 		CTARGET="${CHOST}" install_includes "/include_proper_${ABI}"
 		CFLAGS="${CFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}"
 		CXXFLAGS="${CXXFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}"
+		mymakeopts="${mymakeopts} RPCDIR=${WORKDIR}/include_proper_${ABI}/rpcsvc"
 	fi
 	bootstrap_csu
 	bootstrap_libssp_nonshared


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-lib/
@ 2016-03-01 10:07 Alexis Ballier
  0 siblings, 0 replies; 15+ messages in thread
From: Alexis Ballier @ 2016-03-01 10:07 UTC (permalink / raw
  To: gentoo-commits

commit:     feec564b833066ded6d8ce8ecd2227180ef1881f
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  1 09:11:17 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Mar  1 10:06:53 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=feec564b

sys-freebsd/freebsd-lib: discriminate GNU userland based on CBUILD:-CHOST which helps when cross-compiling.

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild
index 0ce19a2..23f5e85 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild
@@ -212,7 +212,7 @@ src_prepare() {
 	# Try to fix sed calls for GNU sed. Do it only with GNU userland and force
 	# BSD's sed on BSD.
 	cd "${S}"
-	if use userland_GNU; then
+	if [[ ${CBUILD:-${CHOST}} != *bsd* ]]; then
 		find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \;
 		sed -i -e 's/-i ""/-i""/' "${S}/csu/Makefile.inc" || die
 	fi
@@ -359,7 +359,7 @@ do_compile() {
 src_compile() {
 	# Does not work with GNU sed
 	# Force BSD's sed on BSD.
-	if use userland_BSD ; then
+	if [[ ${CBUILD:-${CHOST}} == *bsd* ]]; then
 		export ESED=/usr/bin/sed
 		unalias sed
 	fi


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-lib/
@ 2016-03-01 10:07 Alexis Ballier
  0 siblings, 0 replies; 15+ messages in thread
From: Alexis Ballier @ 2016-03-01 10:07 UTC (permalink / raw
  To: gentoo-commits

commit:     2b157dc58a4b9a571d773d37d4f329e4881c3380
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  1 09:14:56 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Mar  1 10:06:53 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b157dc5

sys-freebsd/freebsd-lib: add :0= dep on openssl

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild
index a498d66..49e8c0b 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild
@@ -35,7 +35,7 @@ EXTRACTONLY="
 "
 
 if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
-	RDEPEND="ssl? ( dev-libs/openssl )
+	RDEPEND="ssl? ( dev-libs/openssl:0= )
 		hesiod? ( net-dns/hesiod )
 		kerberos? ( app-crypt/heimdal )
 		usb? ( !dev-libs/libusb )


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-lib/
@ 2016-03-01 10:07 Alexis Ballier
  0 siblings, 0 replies; 15+ messages in thread
From: Alexis Ballier @ 2016-03-01 10:07 UTC (permalink / raw
  To: gentoo-commits

commit:     ca104ab4585b605d45771e77643a9e1c9a5f2117
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  1 09:14:00 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Mar  1 10:06:53 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca104ab4

sys-freebsd/freebsd-lib: make sys symlink SYSROOT relative

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild
index 23f5e85..a498d66 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild
@@ -197,7 +197,7 @@ src_prepare() {
 
 	if ! is_crosscompile ; then
 		if [[ ! -e "${WORKDIR}/sys" ]]; then
-			ln -s "/usr/src/sys" "${WORKDIR}/sys" || die "Couldn't make sys symlink!"
+			ln -s "${SYSROOT}/usr/src/sys" "${WORKDIR}/sys" || die "Couldn't make sys symlink!"
 		fi
 	else
 		sed -i.bak -e "s:/usr/include:/usr/${CTARGET}/usr/include:g" \


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-lib/
@ 2016-03-01 10:07 Alexis Ballier
  0 siblings, 0 replies; 15+ messages in thread
From: Alexis Ballier @ 2016-03-01 10:07 UTC (permalink / raw
  To: gentoo-commits

commit:     5ddc0c15d8941afd7654b9e96b2f803d330e928f
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  1 09:28:00 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Mar  1 10:06:53 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ddc0c15

sys-freebsd/freebsd-lib: move GNU install/sed fixes before USE=build check so that they are applied also with USE=build.

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild | 25 +++++++++++-----------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild
index 49e8c0b..d50c0d4 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild
@@ -186,6 +186,19 @@ src_prepare() {
 	sed -e 's/LDFLAGS/RAW_LDFLAGS/g' \
 		-i "${S}/csu/i386-elf/Makefile" \
 		-i "${S}/csu/ia64/Makefile" || die
+
+	if install --version 2> /dev/null | grep -q GNU; then
+		sed -i.bak -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile"
+	fi
+
+	# Try to fix sed calls for GNU sed. Do it only with GNU userland and force
+	# BSD's sed on BSD.
+	cd "${S}"
+	if [[ ${CBUILD:-${CHOST}} != *bsd* ]]; then
+		find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \;
+		sed -i -e 's/-i ""/-i""/' "${S}/csu/Makefile.inc" || die
+	fi
+
 	if use build; then
 		cd "${WORKDIR}"
 		# This patch has to be applied on ${WORKDIR}/sys, so we do it here since it
@@ -204,18 +217,6 @@ src_prepare() {
 			"${S}/libc/rpc/Makefile.inc" \
 			"${S}/libc/yp/Makefile.inc"
 	fi
-
-	if install --version 2> /dev/null | grep -q GNU; then
-		sed -i.bak -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile"
-	fi
-
-	# Try to fix sed calls for GNU sed. Do it only with GNU userland and force
-	# BSD's sed on BSD.
-	cd "${S}"
-	if [[ ${CBUILD:-${CHOST}} != *bsd* ]]; then
-		find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \;
-		sed -i -e 's/-i ""/-i""/' "${S}/csu/Makefile.inc" || die
-	fi
 }
 
 bootstrap_lib() {


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-lib/
@ 2016-05-11  6:37 Michał Górny
  0 siblings, 0 replies; 15+ messages in thread
From: Michał Górny @ 2016-05-11  6:37 UTC (permalink / raw
  To: gentoo-commits

commit:     fa7708651dcbfbaa71bae8fd6028c29fe193fe50
Author:     Yuta Satoh <nigoro.dev <AT> gmail <DOT> com>
AuthorDate: Tue May 10 21:58:50 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue May 10 21:58:50 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa770865

sys-freebsd/freebsd-lib: Fix errata, FreeBSD-EN-16:06.libc

 sys-freebsd/freebsd-lib/Manifest                                       | 1 +
 .../{freebsd-lib-10.3.ebuild => freebsd-lib-10.3-r1.ebuild}            | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 48ae374..34e1e4e 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -13,6 +13,7 @@ DIST freebsd-lib-8.2.tar.bz2 3323878 SHA256 e3590c12794fcb5ba8eb7a1f58b497587cf1
 DIST freebsd-lib-9.1.tar.bz2 3206685 SHA256 f31fa8107b4de711c548f6d0c1bb1f81d09f51bcc3b14a1e9e90bb0e7cc4a35d SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e WHIRLPOOL 581878bf9c43184b043b4293409b85901c9ed1f9bd279e965414aca41ba50950848ebda3ee10a503a028135dfd2765e95a11acd4e62a11c528e104392bbbd8d0
 DIST freebsd-lib-EN-1517-libc.patch 24159 SHA256 d9662fc730a3cd8f45763cb23ffb8500606123b91947fe3aaad250b36791bf91 SHA512 bc08438974eafe038298f9b1c01b02b85503ac909af7aa9d852929bac3620afc24d0339cbe5b2368c05879619d3ba4fb377cd2a805c261e2f4eec3ef5bdd6da6 WHIRLPOOL 0cb41d381856e6a25ae9505f68d392646e0f47cbb8b5d395fc88da36115fa876fff55cde85c62cedbd48427dc4944b5343f49a3beb5e7a9ded544ff2c89e9363
 DIST freebsd-lib-EN-1603-yplib.patch 2358 SHA256 f4151d7188cf5a925d120008a03dd9f1088fcec20bdc46cc91b3a3bebaa712c5 SHA512 0cde2e0edbdd080a44ff90806d4a349fbffa3fae9737e10d2b22b89aaf07da95202aa520e2fcd042126ca6ebdf8504de550835d022c3d53cf16a4c4cdee35b9c WHIRLPOOL 7d1706c31ea976272761ca749aeef886c6f76163dcd6f5988b6e449125b745d25a0f85bead8ec75a93784a25caf237a15a79de0b444a2dd2ddcf73308f89c64f
+DIST freebsd-lib-EN-1606-libc.patch 249 SHA256 5ad0e95c5418ebd3edb06dc3f287b3fd84476a57766ca9984ffd98108e6930e6 SHA512 6dcfd00e646da0d3d8ad231786a8e422d319d8a1755e9f1d55f555999c5ccc0fdb7dca62fc1ced8686f6c3206044e75cd197d75843b1e9e6e83bef276c01d3d9 WHIRLPOOL e8d1c9f0e070e1b30443942543bcb6b0963a9566e3ff32e4d4592a268217547019ab133f1b477b3d772a206c4a275b01b1bb9784f16c4233894a7ad4dfc71ece
 DIST freebsd-libexec-8.2.tar.bz2 289147 SHA256 10b996d1d8cd044ee2e7a877e5e6ad2bf050cce9b3bd402a5e0dea7d290b595d SHA512 abe6cf5a268675d7dcb1c214c46fef47a3fb09b31947f5d8a0b938d352295efe0249beb5007649c52187bf4c221b6ebf074d18dfe9bafd168cae09ee02ab608d WHIRLPOOL 27e854fe465eb933dd8e27c5a09b063e4d3798b54e0914c79a9120dcdc34cc5d525a0c92da7b645ff7ab2ab4f34c7f7b2783012dfa5004407acd11150062b7ad
 DIST freebsd-libexec-9.1.tar.bz2 304592 SHA256 71e6e9e41328c2148c54b81ad9b59f912a1d5f0d52e17ac07f223aa7a94b82be SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92 WHIRLPOOL d800f477ac5c9ad6dae3e0091c83e107609b5a1e3aa79e9533fcd10a8dd34ff7733ab9523eae7c292310fe94f6a529209cae6b9e8bac6b47244e59834593e74b
 DIST freebsd-src-10.2.tar.xz 124551336 SHA256 6a59ea716bae96135983ad70cd7123e3b35ec91b191a82fe282ade88a61560b1 SHA512 fba4588fdaa94fa4582a8de566a84cf4f2badc87c7b2e0745d7a31c1e349b2d5f59dbdbb16a9d43421155c1ac4bdec8db24c5d32ac5a92be687d4ed70fe35835 WHIRLPOOL e325db3c07118762021d802c4f20c7a5fd4b816f08cab6f92b408399f1b3bf8ad89728d51c354ab21478265a4539463c94aae9ae49f0ac10cd3c3f8f640dc186

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.3.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.3-r1.ebuild
similarity index 99%
rename from sys-freebsd/freebsd-lib/freebsd-lib-10.3.ebuild
rename to sys-freebsd/freebsd-lib/freebsd-lib-10.3-r1.ebuild
index d657ddb..14d49e5 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-10.3.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-10.3-r1.ebuild
@@ -10,6 +10,9 @@ DESCRIPTION="FreeBSD's base system libraries"
 SLOT="0"
 LICENSE="BSD zfs? ( CDDL )"
 
+# Security Advisory and Errata patches.
+UPSTREAM_PATCHES=( "EN-16:06/libc.patch" )
+
 # Crypto is needed to have an internal OpenSSL header
 # sys is needed for libalias, probably we can just extract that instead of
 # extracting the whole tarball


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-lib/
@ 2016-09-12 10:31 Patrice Clement
  0 siblings, 0 replies; 15+ messages in thread
From: Patrice Clement @ 2016-09-12 10:31 UTC (permalink / raw
  To: gentoo-commits

commit:     02e5e0b32f8a3a149464b0ded7c8361da83bdccd
Author:     Yuta Satoh <nigoro.dev <AT> gmail <DOT> com>
AuthorDate: Sun Sep 11 12:13:35 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Sep 12 10:31:02 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02e5e0b3

sys-freebsd/freebsd-lib: remove old.

Gentoo-Bug: https://bugs.gentoo.org/593386
Closes: https://github.com/gentoo/gentoo/pull/2299

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 sys-freebsd/freebsd-lib/freebsd-lib-9.1-r10.ebuild | 611 ---------------------
 1 file changed, 611 deletions(-)

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r10.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r10.ebuild
deleted file mode 100644
index c1701a4..00000000
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r10.ebuild
+++ /dev/null
@@ -1,611 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs eutils multibuild
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-
-# Crypto is needed to have an internal OpenSSL header
-# sys is needed for libalias, probably we can just extract that instead of
-# extracting the whole tarball
-SRC_URI="mirror://gentoo/${LIB}.tar.bz2
-		mirror://gentoo/${CONTRIB}.tar.bz2
-		mirror://gentoo/${CRYPTO}.tar.bz2
-		mirror://gentoo/${LIBEXEC}.tar.bz2
-		mirror://gentoo/${ETC}.tar.bz2
-		mirror://gentoo/${INCLUDE}.tar.bz2
-		mirror://gentoo/${USBIN}.tar.bz2
-		mirror://gentoo/${GNU}.tar.bz2
-		build? (
-			mirror://gentoo/${SYS}.tar.bz2 )
-		zfs? (
-			mirror://gentoo/${CDDL}.tar.bz2 )"
-
-if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
-	RDEPEND="ssl? ( dev-libs/openssl )
-		hesiod? ( net-dns/hesiod )
-		kerberos? ( app-crypt/heimdal )
-		usb? ( !dev-libs/libusb )
-		zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )
-		>=dev-libs/expat-2.0.1
-		!sys-libs/libutempter
-		!sys-freebsd/freebsd-headers"
-	DEPEND="${RDEPEND}
-		>=sys-devel/flex-2.5.31-r2
-		=sys-freebsd/freebsd-sources-${RV}*"
-else
-	SRC_URI="${SRC_URI}
-			mirror://gentoo/${SYS}.tar.bz2"
-fi
-
-DEPEND="${DEPEND}
-		userland_GNU? ( sys-apps/mtree )
-		=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-S="${WORKDIR}/lib"
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then
-	export CTARGET=${CATEGORY/cross-}
-fi
-
-IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware
-	build crosscompile_opts_headers-only zfs
-	userland_GNU userland_BSD multilib"
-
-pkg_setup() {
-	[ -c /dev/zero ] || \
-		die "You forgot to mount /dev; the compiled libc would break."
-
-	if ! use ssl && use kerberos; then
-		eerror "If you want kerberos support you need to enable ssl support, too."
-	fi
-
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
-	use hesiod || mymakeopts="${mymakeopts} WITHOUT_HESIOD= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6_SUPPORT= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= WITHOUT_GSSAPI= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-
-	mymakeopts="${mymakeopts} WITHOUT_BIND= WITHOUT_BIND_LIBS= WITHOUT_SENDMAIL= WITHOUT_CLANG= "
-
-	if [ "${CTARGET}" != "${CHOST}" ]; then
-		mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
-		mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})"
-	fi
-}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.0-pmc.patch"
-	"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
-	"${FILESDIR}/${PN}-6.1-csu.patch"
-	"${FILESDIR}/${PN}-9.0-liblink.patch"
-	"${FILESDIR}/${PN}-bsdxml2expat.patch"
-	"${FILESDIR}/${PN}-9.0-netware.patch"
-	"${FILESDIR}/${PN}-9.0-cve-2010-2632.patch"
-	"${FILESDIR}/${PN}-9.0-bluetooth.patch"
-	"${FILESDIR}/${PN}-9.1-.eh_frame_hdr-fix.patch"
-	)
-
-# Here we disable and remove source which we don't need or want
-# In order:
-# - ncurses stuff
-# - libexpat creates a bsdxml library which is the same as expat
-# - archiving libraries (have their own ebuild)
-# - sendmail libraries (they are installed by sendmail)
-# - SNMP library and dependency (have their own ebuilds)
-# - libstand: static library, 32bits on amd64 used for boot0, we build it from
-# boot0 instead.
-#
-# The rest are libraries we already have somewhere else because
-# they are contribution.
-# Note: libtelnet is an internal lib used by telnet and telnetd programs
-# as it's not used in freebsd-lib package itself, it's pointless building
-# it here.
-REMOVE_SUBDIRS="ncurses \
-	libexpat \
-	libz libbz2 libarchive liblzma \
-	libsm libsmdb libsmutil \
-	libbegemot libbsnmp \
-	libpam libpcap bind libwrap libmagic \
-	libcom_err libtelnet
-	libelf libedit
-	libstand
-	libgssapi"
-
-# For doing multilib over multibuild.eclass
-MULTIBUILD_VARIANTS=( $(get_all_abis) )
-
-# Are we building a cross-compiler?
-is_crosscompile() {
-	[ "${CATEGORY#*cross-}" != "${CATEGORY}" ]
-}
-
-src_prepare() {
-	sed -i.bak -e 's:-o/dev/stdout:-t:' "${S}/libc/net/Makefile.inc"
-
-	# Upstream Display Managers default to using VT7
-	# We should make FreeBSD allow this by default
-	local x=
-	for x in "${WORKDIR}"/etc/etc.*/ttys ; do
-		sed -i.bak \
-			-e '/ttyv5[[:space:]]/ a\
-# Display Managers default to VT7.\
-# If you use the xdm init script, keep ttyv6 commented out\
-# unless you force a different VT for the DM being used.' \
-			-e '/^ttyv[678][[:space:]]/ s/^/# /' "${x}" \
-			|| die "Failed to sed ${x}"
-		rm "${x}".bak
-	done
-
-	# This one is here because it also
-	# patches "${WORKDIR}/include"
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${PN}-includes.patch"
-	epatch "${FILESDIR}/${PN}-8.0-gcc45.patch"
-	epatch "${FILESDIR}/${PN}-9.0-opieincludes.patch"
-	epatch "${FILESDIR}/${PN}-9.1-aligned_alloc.patch"
-	epatch "${FILESDIR}/${PN}-9.1-rmgssapi.patch"
-
-	# Don't install the hesiod man page or header
-	rm "${WORKDIR}"/include/hesiod.h || die
-	sed -i.bak -e 's:hesiod.h::' "${WORKDIR}"/include/Makefile || die
-	sed -i.bak -e 's:hesiod.c::' -e 's:hesiod.3::' \
-	"${WORKDIR}"/lib/libc/net/Makefile.inc || die
-
-	# Fix the Makefiles of these few libraries that will overwrite our LDADD.
-	cd "${S}"
-	for dir in libradius libtacplus libcam libdevstat libfetch libgeom libmemstat libopie \
-		libsmb libprocstat libulog; do sed -i.bak -e 's:LDADD=:LDADD+=:g' "${dir}/Makefile" || \
-		die "Problem fixing \"${dir}/Makefile"
-	done
-	# Call LD with LDFLAGS, rename them to RAW_LDFLAGS
-	sed -e 's/LDFLAGS/RAW_LDFLAGS/g' \
-		-i "${S}/csu/i386-elf/Makefile" \
-		-i "${S}/csu/ia64/Makefile" || die
-	if use build; then
-		cd "${WORKDIR}"
-		# This patch has to be applied on ${WORKDIR}/sys, so we do it here since it
-		# shouldn't be a symlink to /usr/src/sys (which should be already patched)
-		epatch "${FILESDIR}"/${PN}-7.1-types.h-fix.patch
-		epatch "${FILESDIR}"/freebsd-sources-9.0-sysctluint.patch
-		return 0
-	fi
-
-	if ! is_crosscompile ; then
-		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" || die "Couldn't make sys symlink!"
-	else
-		sed -i.bak -e "s:/usr/include:/usr/${CTARGET}/usr/include:g" \
-			"${S}/libc/rpc/Makefile.inc" \
-			"${S}/libc/yp/Makefile.inc"
-	fi
-
-	if install --version 2> /dev/null | grep -q GNU; then
-		sed -i.bak -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile"
-	fi
-
-	# Try to fix sed calls for GNU sed. Do it only with GNU userland and force
-	# BSD's sed on BSD.
-	cd "${S}"
-	if use userland_GNU; then
-		find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \;
-	fi
-}
-
-get_csudir() {
-	if [ -d "${WORKDIR}/lib/csu/$1-elf" ]; then
-		echo "lib/csu/$1-elf"
-	else
-		echo "lib/csu/$1"
-	fi
-}
-
-bootstrap_csu() {
-	local csudir="$(get_csudir $(tc-arch-kernel ${CTARGET}))"
-	export RAW_LDFLAGS=$(raw-ldflags)
-	cd "${WORKDIR}/${csudir}" || die "Missing ${csudir}."
-	freebsd_src_compile
-
-	CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
-	append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
-
-	cd "${WORKDIR}/gnu/lib/csu" || die
-	freebsd_src_compile
-	cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu"
-	for i in *.So ; do
-		ln -s $i ${i%.So}S.o
-	done
-	CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu"
-	append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu"
-}
-
-# Compile libssp_nonshared.a and add it's path to LDFLAGS.
-bootstrap_libssp_nonshared() {
-	cd "${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" || die "missing libssp."
-	freebsd_src_compile
-	append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/libssp/libssp_nonshared/"
-	export LDADD="-lssp_nonshared"
-}
-
-bootstrap_libc() {
-	cd "${WORKDIR}/lib/libc" || die
-	freebsd_src_compile
-	append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libc"
-}
-
-bootstrap_libgcc() {
-	cd "${WORKDIR}/lib/libcompiler_rt" || die
-	freebsd_src_compile
-	cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libcompiler_rt" || die
-	ln -s libcompiler_rt.a libgcc.a || die
-	append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libcompiler_rt"
-
-	bootstrap_libc
-
-	cd "${WORKDIR}/gnu/lib/libgcc" || die
-	freebsd_src_compile
-	append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/libgcc"
-}
-
-bootstrap_libthr() {
-	cd "${WORKDIR}/lib/libthr" || die
-	freebsd_src_compile
-	append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libthr"
-	cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libthr" || die
-	ln -s libthr.so libpthread.so
-}
-
-# What to build for a cross-compiler.
-# We also need the csu but this has to be handled separately.
-CROSS_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil lib/librt"
-
-# What to build for non-default ABIs.
-NON_NATIVE_SUBDIRS="${CROSS_SUBDIRS} gnu/lib/csu lib/libcompiler_rt gnu/lib/libgcc lib/libmd lib/libcrypt"
-
-# Subdirs for a native build:
-NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex gnu/lib/csu gnu/lib/libgcc"
-
-# Is my $ABI native ?
-is_native_abi() {
-	is_crosscompile && return 1
-	use multilib || return 0
-	[ "${ABI}" = "${DEFAULT_ABI}" ]
-}
-
-# Do we need to bootstrap the csu and libssp_nonshared?
-need_bootstrap() {
-	is_crosscompile || use build || { ! is_native_abi && ! has_version '>=sys-freebsd/freebsd-lib-9.1-r8[multilib]' ; } || has_version "<${CATEGORY}/${P}"
-}
-
-# Get the subdirs we are building.
-get_subdirs() {
-	local ret=""
-	if is_native_abi ; then
-		# If we are building for the native ABI, build everything
-		ret="${NATIVE_SUBDIRS}"
-	elif is_crosscompile ; then
-		# With a cross-compiler we only build the very core parts.
-		ret="${CROSS_SUBDIRS}"
-		if [ "${EBUILD_PHASE}" = "install" ]; then
-			# Add the csu dir first when installing. We treat it separately for
-			# compiling.
-			ret="$(get_csudir $(tc-arch-kernel ${CTARGET})) ${ret}"
-		fi
-	else
-		# For the non-native ABIs we only build the csu parts and very core
-		# libraries for now.
-		ret="${NON_NATIVE_SUBDIRS} $(get_csudir $(tc-arch-kernel ${CHOST}))"
-	fi
-	echo "${ret}"
-}
-
-# Bootstrap the core libraries and setup the flags so that the other parts can
-# build against it.
-do_bootstrap() {
-	einfo "Bootstrapping on ${CHOST} for ${CTARGET}"
-	if ! is_crosscompile ; then
-		# Pre-install headers, but not when building a cross-compiler since we
-		# assume they have been installed in the previous pass.
-		einfo "Pre-installing includes in include_proper_${ABI}"
-		mkdir "${WORKDIR}/include_proper_${ABI}" || die
-		CTARGET="${CHOST}" install_includes "/include_proper_${ABI}"
-		CFLAGS="${CFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}"
-	fi
-	bootstrap_csu
-	bootstrap_libssp_nonshared
-	is_crosscompile && bootstrap_libc
-	is_crosscompile || is_native_abi || bootstrap_libgcc
-	is_native_abi   || bootstrap_libthr
-}
-
-# Compile it. Assume we have the toolchain setup correctly.
-do_compile() {
-	# Bootstrap if needed, otherwise assume the system headers are in
-	# /usr/include.
-	if need_bootstrap ; then
-		do_bootstrap
-	else
-		CFLAGS="${CFLAGS} -isystem /usr/include"
-	fi
-
-	export RAW_LDFLAGS=$(raw-ldflags)
-
-	# Everything is now setup, build it!
-	for i in $(get_subdirs) ; do
-		einfo "Building in ${i}... with CC=${CC} and CFLAGS=${CFLAGS}"
-		cd "${WORKDIR}/${i}/" || die "missing ${i}."
-		freebsd_src_compile || die "make ${i} failed"
-	done
-}
-
-src_compile() {
-	# Does not work with GNU sed
-	# Force BSD's sed on BSD.
-	if use userland_BSD ; then
-		export ESED=/usr/bin/sed
-		unalias sed
-	fi
-
-	cd "${WORKDIR}/include"
-	$(freebsd_get_bmake) CC="$(tc-getCC)" || die "make include failed"
-
-	use crosscompile_opts_headers-only && return 0
-
-	# Bug #270098
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	# Bug #324445
-	append-flags $(test-flags -fno-strict-overflow)
-
-	# strip flags and do not do it later, we only add safe, and in fact
-	# needed flags after all
-	strip-flags
-	export NOFLAGSTRIP=yes
-	if is_crosscompile ; then
-		export YACC='yacc -by'
-		CHOST=${CTARGET} tc-export CC LD CXX RANLIB
-		mymakeopts="${mymakeopts} NLS="
-		CFLAGS="${CFLAGS} -isystem /usr/${CTARGET}/usr/include"
-		append-ldflags "-L${WORKDIR}/${CHOST}/${WORKDIR}/lib/libc"
-	fi
-
-	if is_crosscompile ; then
-		do_compile
-	else
-		multibuild_foreach_variant freebsd_multilib_multibuild_wrapper do_compile
-	fi
-}
-
-gen_libc_ldscript() {
-	# Parameters:
-	#   $1 = target libdir
-	#   $2 = source libc dir
-	#   $3 = source libssp_nonshared dir
-
-	# Clear the symlink.
-	rm -f "${D}/$2/libc.so" || die
-
-	# Move the library if needed
-	if [ "$1" != "$2" ] ; then
-		mv "${D}/$2/libc.so.7" "${D}/$1/" || die
-	fi
-
-	# Generate libc.so ldscript for inclusion of libssp_nonshared.a when linking
-	# this is done to avoid having to touch gcc spec file as it is currently
-	# done on FreeBSD upstream, mostly because their binutils aren't able to
-	# cope with linker scripts yet.
-	# Taken from toolchain-funcs.eclass:
-	local output_format
-	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
-	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-
-	cat > "${D}/$2/libc.so" <<-END_LDSCRIPT
-/* GNU ld script
-   SSP (-fstack-protector) requires __stack_chk_fail_local to be local.
-   GCC invokes this symbol in a non-PIC way, which results in TEXTRELs if
-   this symbol was provided by a shared libc. So we link in
-   libssp_nonshared.a from here.
- */
-${output_format}
-GROUP ( /$1/libc.so.7 /$3/libssp_nonshared.a )
-END_LDSCRIPT
-}
-
-header_list=""
-
-move_header() {
-	local dirname=$(dirname ${1})
-	local filename=$(basename ${1})
-
-	if [ ! -d "${dirname}/${ABI}" ] ; then
-		mkdir "${dirname}/${ABI}" || die
-	fi
-
-	mv "${1}" "${dirname}/${ABI}/" || die
-
-	export header_list="${header_list} ${1}"
-}
-
-make_header_template() {
-	cat <<-END_HEADER
-/*
- * Wrapped header for multilib support.
- * See the real headers included below.
- */
-
-#if defined(__x86_64__)
-  @ABI_amd64_fbsd@
-#elif defined(__i386__)
-  @ABI_x86_fbsd@
-#else
-  @ABI_${DEFAULT_ABI}@
-#endif
-END_HEADER
-}
-
-wrap_header() {
-	local dirname=$(dirname ${1})
-	local filename=$(basename ${1})
-
-	if [ -n "${dirname#.}" ] ; then
-		dirname="${dirname}/${2}"
-	else
-		dirname="${2}"
-	fi
-
-	if [ -f "${dirname}/${filename}" ] ; then
-		sed -e "s:@ABI_${2}@:#include <${dirname}/${filename}>:" ${1}
-	else
-		cat ${1}
-	fi
-}
-
-wrap_header_end() {
-	sed -e "s:@ABI_.*@:#error \"Sorry, no support for your ABI.\":" ${1}
-}
-
-do_install() {
-	if is_crosscompile ; then
-		INCLUDEDIR="/usr/${CTARGET}/usr/include"
-	else
-		INCLUDEDIR="/usr/include"
-	fi
-
-	dodir ${INCLUDEDIR}
-	CTARGET="${CHOST}" \
-		install_includes ${INCLUDEDIR}
-
-	is_crosscompile && use crosscompile_opts_headers-only && return 0
-
-	for i in $(get_subdirs) ; do
-		einfo "Installing in ${i}..."
-		cd "${WORKDIR}/${i}/" || die "missing ${i}."
-		freebsd_src_install || die "Install ${i} failed"
-	done
-
-	if ! is_crosscompile ; then
-		if use multilib && [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
-			gen_libc_ldscript "usr/$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)"
-		else
-			dodir "$(get_libdir)"
-			gen_libc_ldscript "$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)"
-		fi
-	else
-		CHOST=${CTARGET} gen_libc_ldscript "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib"
-	fi
-
-	if use multilib ; then
-		cd "${D}/usr/include"
-		for i in machine/*.h fenv.h ; do
-			move_header ${i}
-		done
-		if [ "${ABI}" = "${DEFAULT_ABI}" ] ; then
-			# Supposedly the last one!
-			local uniq_headers="$(echo ${header_list} | tr ' ' '\n' | sort | uniq | tr '\n' ' ')"
-			for j in ${uniq_headers} ; do
-				make_header_template > ${j}
-				for i in $(get_all_abis) ; do
-					wrap_header ${j} ${i} > ${j}.new
-					cp ${j}.new ${j}
-					rm -f ${j}.new
-				done
-				wrap_header_end ${j} > ${j}.new
-				cp ${j}.new ${j}
-				rm -f ${j}.new
-			done
-		fi
-	fi
-}
-
-src_install() {
-	if is_crosscompile ; then
-		einfo "Installing for ${CTARGET} in ${CHOST}.."
-		# From this point we need to force: get stripped with the correct tools,
-		# get tc-arch-kernel to return the right value, etc.
-		export CHOST=${CTARGET}
-
-		mymakeopts="${mymakeopts} NO_MAN= \
-			INCLUDEDIR=/usr/${CTARGET}/usr/include \
-			SHLIBDIR=/usr/${CTARGET}/usr/lib \
-			LIBDIR=/usr/${CTARGET}/usr/lib"
-
-		dosym "usr/include" "/usr/${CTARGET}/sys-include"
-		do_install
-
-		return 0
-	else
-		export STRIP_MASK="*/usr/lib*/*crt*.o"
-		multibuild_foreach_variant freebsd_multilib_multibuild_wrapper do_install
-	fi
-
-	cd "${WORKDIR}/etc/"
-	insinto /etc
-	doins nls.alias mac.conf netconfig
-
-	# Install ttys file
-	local MACHINE="$(tc-arch-kernel)"
-	doins "etc.${MACHINE}"/*
-
-	# Generate ldscripts for core libraries that will go in /
-	gen_usr_ldscript -a alias cam geom ipsec jail kiconv \
-		kvm m md procstat sbuf thr ufs util
-
-	# Install a libusb.pc for better compat with Linux's libusb
-	if use usb ; then
-		dodir /usr/$(get_libdir)/pkgconfig
-		sed -e "s:@LIBDIR@:/usr/$(get_libdir):" "${FILESDIR}/libusb.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/libusb.pc" || die
-		sed -e "s:@LIBDIR@:/usr/$(get_libdir):" "${FILESDIR}/libusb-1.0.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/libusb-1.0.pc" || die
-	fi
-}
-
-install_includes()
-{
-	local INCLUDEDIR="$1"
-
-	# The idea is to be called from either install or unpack.
-	# During unpack it's required to install them as portage's user.
-	if [[ "${EBUILD_PHASE}" == "install" ]]; then
-		local DESTDIR="${D}"
-		BINOWN="root"
-		BINGRP="wheel"
-	else
-		local DESTDIR="${WORKDIR}"
-		[[ -z "${USER}" ]] && USER="portage"
-		BINOWN="${USER}"
-		[[ -z "${GROUPS}" ]] && GROUPS="portage"
-		BINGRP="${GROUPS}"
-	fi
-
-	# Must exist before we use it.
-	[[ -d "${DESTDIR}${INCLUDEDIR}" ]] || die "dodir or mkdir ${INCLUDEDIR} before using install_includes."
-	cd "${WORKDIR}/include"
-
-	local MACHINE="$(tc-arch-kernel)"
-
-	einfo "Installing includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
-	$(freebsd_get_bmake) installincludes \
-		MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
-		DESTDIR="${DESTDIR}" \
-		INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
-		BINGRP="${BINGRP}" || die "install_includes() failed"
-	einfo "includes installed ok."
-	EXTRA_INCLUDES="lib/librtld_db lib/libutil lib/msun gnu/lib/libregex"
-	for i in $EXTRA_INCLUDES; do
-		einfo "Installing $i includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
-		cd "${WORKDIR}/$i" || die
-		$(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \
-			MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
-			INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
-			BINGRP="${BINGRP}" || die "problem installing $i includes."
-		einfo "$i includes installed ok."
-	done
-}


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-lib/
@ 2016-12-15 12:11 Michał Górny
  0 siblings, 0 replies; 15+ messages in thread
From: Michał Górny @ 2016-12-15 12:11 UTC (permalink / raw
  To: gentoo-commits

commit:     0606009a10b335a9c8e03530cc33020dfdaffd3c
Author:     Yuta Satoh <nigoro.dev <AT> gmail <DOT> com>
AuthorDate: Wed Dec  7 10:43:46 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Dec 15 12:11:28 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0606009a

sys-freebsd/freebsd-lib: Fix SA-16:37.libc and SA-16:38.bhyve

 sys-freebsd/freebsd-lib/Manifest                                      | 2 ++
 .../{freebsd-lib-10.3-r2.ebuild => freebsd-lib-10.3-r3.ebuild}        | 4 +++-
 .../{freebsd-lib-11.0.ebuild => freebsd-lib-11.0-r1.ebuild}           | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index f4a53d4..260644c 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -12,6 +12,8 @@ DIST freebsd-include-9.1.tar.bz2 146881 SHA256 861dce3f39e6806762b102361017cbe14
 DIST freebsd-lib-8.2.tar.bz2 3323878 SHA256 e3590c12794fcb5ba8eb7a1f58b497587cf19f9200b3254c194a793da3b5bfb0 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007 WHIRLPOOL 95f98a372f44a89bc8ac3029ec065dbbfec338e6f889d057d75644bfcdfb9d27fdc0421d7e392cad5a823712b97f0857297ec3d321580254c63032c22b95792e
 DIST freebsd-lib-9.1.tar.bz2 3206685 SHA256 f31fa8107b4de711c548f6d0c1bb1f81d09f51bcc3b14a1e9e90bb0e7cc4a35d SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e WHIRLPOOL 581878bf9c43184b043b4293409b85901c9ed1f9bd279e965414aca41ba50950848ebda3ee10a503a028135dfd2765e95a11acd4e62a11c528e104392bbbd8d0
 DIST freebsd-lib-EN-1606-libc.patch 249 SHA256 5ad0e95c5418ebd3edb06dc3f287b3fd84476a57766ca9984ffd98108e6930e6 SHA512 6dcfd00e646da0d3d8ad231786a8e422d319d8a1755e9f1d55f555999c5ccc0fdb7dca62fc1ced8686f6c3206044e75cd197d75843b1e9e6e83bef276c01d3d9 WHIRLPOOL e8d1c9f0e070e1b30443942543bcb6b0963a9566e3ff32e4d4592a268217547019ab133f1b477b3d772a206c4a275b01b1bb9784f16c4233894a7ad4dfc71ece
+DIST freebsd-lib-SA-1637-libc.patch 1556 SHA256 923e4bfee62218b60ea8ea39488705073747e06d0ff57190c7c0f0b80df643ee SHA512 dcaaa328296fa39b236f5ddfbab62dd7ba58eab17f60cb0e2a3f4ab6a1b4aef750642b3cb3953c7a430297448263eddad7ca2826198577f5e5ffda4426e58955 WHIRLPOOL 5ebfe5290658a4413e9ffbaabbf750b6661a1ff0206de9ddbe4e71ab1aad77c5edb4373338186ceb781c6c472daf38ff4cc443a835e83666f1a9858a0ff8bddf
+DIST freebsd-lib-SA-1638-bhyve.patch 637 SHA256 e90962f3ad1f42c85cd251fc7af3400991acbecf262a0499ab07da53fce3c005 SHA512 4d8c45f4e2d729998a874023bf5bc8ca2904d3fd71e681180c3b4b2eabe2a34c086b806b86debcbc9ab24c6b5ab637f6ddae00fb577994359ed14edc3cac5aa4 WHIRLPOOL f30895ed4478165c914cd0a95a5e31f0e3175580ea753af39810cc9e2c6f5d0202fd771bac8f789ce52b73d88d536f95cd322e851c397f0087e66146cd412fbb
 DIST freebsd-libexec-8.2.tar.bz2 289147 SHA256 10b996d1d8cd044ee2e7a877e5e6ad2bf050cce9b3bd402a5e0dea7d290b595d SHA512 abe6cf5a268675d7dcb1c214c46fef47a3fb09b31947f5d8a0b938d352295efe0249beb5007649c52187bf4c221b6ebf074d18dfe9bafd168cae09ee02ab608d WHIRLPOOL 27e854fe465eb933dd8e27c5a09b063e4d3798b54e0914c79a9120dcdc34cc5d525a0c92da7b645ff7ab2ab4f34c7f7b2783012dfa5004407acd11150062b7ad
 DIST freebsd-libexec-9.1.tar.bz2 304592 SHA256 71e6e9e41328c2148c54b81ad9b59f912a1d5f0d52e17ac07f223aa7a94b82be SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92 WHIRLPOOL d800f477ac5c9ad6dae3e0091c83e107609b5a1e3aa79e9533fcd10a8dd34ff7733ab9523eae7c292310fe94f6a529209cae6b9e8bac6b47244e59834593e74b
 DIST freebsd-src-10.3.tar.xz 126900216 SHA256 f50763dcac88e9b7ec616b77d537bf338f470350e2c85e0cc7decfcc8372b54d SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f WHIRLPOOL bf5320bc506fb73a63d0fb324b60667a196ca2fef5d0215637a657c613f2052d76d002deb205e258f6d4e2aaea15490b26679e59a102606a34b58ab1f6b755ad

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.3-r2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.3-r3.ebuild
similarity index 99%
rename from sys-freebsd/freebsd-lib/freebsd-lib-10.3-r2.ebuild
rename to sys-freebsd/freebsd-lib/freebsd-lib-10.3-r3.ebuild
index ed4d9a8..37b330f 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-10.3-r2.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-10.3-r3.ebuild
@@ -11,7 +11,9 @@ SLOT="0"
 LICENSE="BSD zfs? ( CDDL )"
 
 # Security Advisory and Errata patches.
-UPSTREAM_PATCHES=( "EN-16:06/libc.patch" )
+UPSTREAM_PATCHES=( "EN-16:06/libc.patch"
+	"SA-16:37/libc.patch"
+	"SA-16:38/bhyve.patch" )
 
 # Crypto is needed to have an internal OpenSSL header
 # sys is needed for libalias, probably we can just extract that instead of

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-11.0.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-11.0-r1.ebuild
similarity index 99%
rename from sys-freebsd/freebsd-lib/freebsd-lib-11.0.ebuild
rename to sys-freebsd/freebsd-lib/freebsd-lib-11.0-r1.ebuild
index 5265af2..fea81cd 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-11.0.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-11.0-r1.ebuild
@@ -11,7 +11,8 @@ SLOT="0"
 LICENSE="BSD zfs? ( CDDL )"
 
 # Security Advisory and Errata patches.
-# UPSTREAM_PATCHES=()
+UPSTREAM_PATCHES=( "SA-16:37/libc.patch"
+	"SA-16:38/bhyve.patch" )
 
 # Crypto is needed to have an internal OpenSSL header
 # sys is needed for libalias, probably we can just extract that instead of


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-lib/
@ 2016-12-28  0:18 Patrice Clement
  0 siblings, 0 replies; 15+ messages in thread
From: Patrice Clement @ 2016-12-28  0:18 UTC (permalink / raw
  To: gentoo-commits

commit:     860a8dd4308a80874aa1ed323303df57eb7c2c5b
Author:     Yuta Satoh <nigoro.dev <AT> gmail <DOT> com>
AuthorDate: Sun Dec 18 10:57:48 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Dec 28 00:14:16 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=860a8dd4

sys-freebsd/freebsd-lib: fix Manifest.

Gentoo-Bug: https://bugs.gentoo.org/602994
Closes: https://github.com/gentoo/gentoo/pull/3157

 sys-freebsd/freebsd-lib/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 260644c..8c42289 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -12,7 +12,7 @@ DIST freebsd-include-9.1.tar.bz2 146881 SHA256 861dce3f39e6806762b102361017cbe14
 DIST freebsd-lib-8.2.tar.bz2 3323878 SHA256 e3590c12794fcb5ba8eb7a1f58b497587cf19f9200b3254c194a793da3b5bfb0 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007 WHIRLPOOL 95f98a372f44a89bc8ac3029ec065dbbfec338e6f889d057d75644bfcdfb9d27fdc0421d7e392cad5a823712b97f0857297ec3d321580254c63032c22b95792e
 DIST freebsd-lib-9.1.tar.bz2 3206685 SHA256 f31fa8107b4de711c548f6d0c1bb1f81d09f51bcc3b14a1e9e90bb0e7cc4a35d SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e WHIRLPOOL 581878bf9c43184b043b4293409b85901c9ed1f9bd279e965414aca41ba50950848ebda3ee10a503a028135dfd2765e95a11acd4e62a11c528e104392bbbd8d0
 DIST freebsd-lib-EN-1606-libc.patch 249 SHA256 5ad0e95c5418ebd3edb06dc3f287b3fd84476a57766ca9984ffd98108e6930e6 SHA512 6dcfd00e646da0d3d8ad231786a8e422d319d8a1755e9f1d55f555999c5ccc0fdb7dca62fc1ced8686f6c3206044e75cd197d75843b1e9e6e83bef276c01d3d9 WHIRLPOOL e8d1c9f0e070e1b30443942543bcb6b0963a9566e3ff32e4d4592a268217547019ab133f1b477b3d772a206c4a275b01b1bb9784f16c4233894a7ad4dfc71ece
-DIST freebsd-lib-SA-1637-libc.patch 1556 SHA256 923e4bfee62218b60ea8ea39488705073747e06d0ff57190c7c0f0b80df643ee SHA512 dcaaa328296fa39b236f5ddfbab62dd7ba58eab17f60cb0e2a3f4ab6a1b4aef750642b3cb3953c7a430297448263eddad7ca2826198577f5e5ffda4426e58955 WHIRLPOOL 5ebfe5290658a4413e9ffbaabbf750b6661a1ff0206de9ddbe4e71ab1aad77c5edb4373338186ceb781c6c472daf38ff4cc443a835e83666f1a9858a0ff8bddf
+DIST freebsd-lib-SA-1637-libc.patch 1567 SHA256 77923f6f7c754507db76e6ee13aed1a36b0e58691369baf8f2c9bff819787f0e SHA512 8eaea9e01a7b224138da2cec559d8e925af3ecda4bf7d29340394f57204cd2460c7418a33dcca3db445436ac2985dba42478ad5595c25b9d83305552a04965f7 WHIRLPOOL b15495b71aa72f56494e9efb55b7641224672f93442a075212269a180aac6ac705802afd90f40e192af72a975f05aa8d516355339722c741d565444cbc076a95
 DIST freebsd-lib-SA-1638-bhyve.patch 637 SHA256 e90962f3ad1f42c85cd251fc7af3400991acbecf262a0499ab07da53fce3c005 SHA512 4d8c45f4e2d729998a874023bf5bc8ca2904d3fd71e681180c3b4b2eabe2a34c086b806b86debcbc9ab24c6b5ab637f6ddae00fb577994359ed14edc3cac5aa4 WHIRLPOOL f30895ed4478165c914cd0a95a5e31f0e3175580ea753af39810cc9e2c6f5d0202fd771bac8f789ce52b73d88d536f95cd322e851c397f0087e66146cd412fbb
 DIST freebsd-libexec-8.2.tar.bz2 289147 SHA256 10b996d1d8cd044ee2e7a877e5e6ad2bf050cce9b3bd402a5e0dea7d290b595d SHA512 abe6cf5a268675d7dcb1c214c46fef47a3fb09b31947f5d8a0b938d352295efe0249beb5007649c52187bf4c221b6ebf074d18dfe9bafd168cae09ee02ab608d WHIRLPOOL 27e854fe465eb933dd8e27c5a09b063e4d3798b54e0914c79a9120dcdc34cc5d525a0c92da7b645ff7ab2ab4f34c7f7b2783012dfa5004407acd11150062b7ad
 DIST freebsd-libexec-9.1.tar.bz2 304592 SHA256 71e6e9e41328c2148c54b81ad9b59f912a1d5f0d52e17ac07f223aa7a94b82be SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92 WHIRLPOOL d800f477ac5c9ad6dae3e0091c83e107609b5a1e3aa79e9533fcd10a8dd34ff7733ab9523eae7c292310fe94f6a529209cae6b9e8bac6b47244e59834593e74b


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-lib/
@ 2018-01-07 19:39 Sergei Trofimovich
  0 siblings, 0 replies; 15+ messages in thread
From: Sergei Trofimovich @ 2018-01-07 19:39 UTC (permalink / raw
  To: gentoo-commits

commit:     11ad885f29c27e5b251715f892e3b2bd77cfc768
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  7 18:44:49 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 19:39:44 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11ad885f

sys-freebsd/freebsd-lib: Migrate CROSSCOMPILE_OPTS=headers-only -> USE=headers-only

CROSSCOMPILE_OPTS is a USE_EXPAND of a single item: headers-only.
Convert it to a global USE flag instead.

Mechanical ebuild rename done as:
    $ sed -e 's@crosscompile_opts_headers-only@headers-only@g' \
        -i $(git grep -l headers-only)

'headers-only' flag is used by crossdev to bootstrap stage1 compiler
before libc is available.

crossdev switched to USE=headers-only in =sys-devel/crossdev-20171230.

Bug: https://bugs.gentoo.org/642712
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sys-freebsd/freebsd-lib/freebsd-lib-11.1.ebuild    | 8 ++++----
 sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild  | 8 ++++----
 sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-11.1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-11.1.ebuild
index a1e2b461df4..db383d62947 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-11.1.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -72,7 +72,7 @@ if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then
 fi
 
 IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware
-	build crosscompile_opts_headers-only zfs pam xinetd
+	build headers-only zfs pam xinetd
 	userland_GNU userland_BSD"
 
 QA_DT_NEEDED="lib/libc.so.7 usr/lib32/libc.so.7"
@@ -416,7 +416,7 @@ src_compile() {
 	cd "${WORKDIR}/include"
 	$(freebsd_get_bmake) CC="$(tc-getCC)" SRCTOP="${WORKDIR}" || die "make include failed"
 
-	use crosscompile_opts_headers-only && return 0
+	use headers-only && return 0
 
 	# Bug #270098
 	append-flags $(test-flags -fno-strict-aliasing)
@@ -547,7 +547,7 @@ do_install() {
 	CTARGET="${CHOST}" \
 		install_includes ${INCLUDEDIR}
 
-	is_crosscompile && use crosscompile_opts_headers-only && return 0
+	is_crosscompile && use headers-only && return 0
 
 	# Install a libusb.pc for better compat with Linux's libusb
 	if use usb ; then

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild
index 755c53b8497..8af19aedf5f 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=2
@@ -51,7 +51,7 @@ if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then
 fi
 
 IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware
-	build bootstrap crosscompile_opts_headers-only"
+	build bootstrap headers-only"
 
 pkg_setup() {
 	[ -c /dev/zero ] || \
@@ -193,7 +193,7 @@ src_compile() {
 	cd "${WORKDIR}/include"
 	$(freebsd_get_bmake) CC="$(tc-getCC)" || die "make include failed"
 
-	use crosscompile_opts_headers-only && return 0
+	use headers-only && return 0
 
 	# Bug #270098
 	append-flags $(test-flags -fno-strict-aliasing)
@@ -275,7 +275,7 @@ src_install() {
 		doins "${S}/msun/src/math.h"
 	fi
 
-	use crosscompile_opts_headers-only && return 0
+	use headers-only && return 0
 	local mylibdir=$(get_libdir)
 
 	if [ "${CTARGET}" != "${CHOST}" ]; then

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild
index 8eee4f7d190..92881fadfbc 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -54,7 +54,7 @@ if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then
 fi
 
 IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware
-	build crosscompile_opts_headers-only zfs
+	build headers-only zfs
 	userland_GNU userland_BSD"
 
 QA_DT_NEEDED="lib/libc.so.7 usr/lib32/libc.so.7"
@@ -358,7 +358,7 @@ src_compile() {
 	cd "${WORKDIR}/include"
 	$(freebsd_get_bmake) CC="$(tc-getCC)" || die "make include failed"
 
-	use crosscompile_opts_headers-only && return 0
+	use headers-only && return 0
 
 	# Bug #270098
 	append-flags $(test-flags -fno-strict-aliasing)
@@ -485,7 +485,7 @@ do_install() {
 	CTARGET="${CHOST}" \
 		install_includes ${INCLUDEDIR}
 
-	is_crosscompile && use crosscompile_opts_headers-only && return 0
+	is_crosscompile && use headers-only && return 0
 
 	for i in $(get_subdirs) ; do
 		einfo "Installing in ${i}..."


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-lib/
@ 2018-03-01 15:09 Michał Górny
  0 siblings, 0 replies; 15+ messages in thread
From: Michał Górny @ 2018-03-01 15:09 UTC (permalink / raw
  To: gentoo-commits

commit:     a8de88dab3a6f39398762aa2e71c165e7bd9521b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  1 14:33:48 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Mar  1 15:09:39 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8de88da

sys-freebsd/freebsd-lib: Apply sys header fix only for USE=build

The 'sys' directory is not extracted with USE=-build, so apply the patch
only when there's something to patch. Not that I have any clue how
this is going to work at all with USE=-build.

 sys-freebsd/freebsd-lib/freebsd-lib-11.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-11.1-r1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-11.1-r1.ebuild
index e28f2420c1f..6e8b27343dc 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-11.1-r1.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-11.1-r1.ebuild
@@ -174,7 +174,6 @@ src_prepare() {
 	# patches "${WORKDIR}/include"
 	cd "${WORKDIR}"
 	epatch "${FILESDIR}/${PN}-includes.patch"
-	epatch "${FILESDIR}/${PN}-11.1-elf-nhdr.patch"
 
 	# Don't install the hesiod man page or header
 	rm "${WORKDIR}"/include/hesiod.h || die
@@ -221,6 +220,7 @@ src_prepare() {
 		# This patch has to be applied on ${WORKDIR}/sys, so we do it here since it
 		# shouldn't be a symlink to /usr/src/sys (which should be already patched)
 		epatch "${FILESDIR}"/freebsd-sources-9.0-sysctluint.patch
+		epatch "${FILESDIR}/${PN}-11.1-elf-nhdr.patch"
 		return 0
 	fi
 


^ permalink raw reply related	[flat|nested] 15+ messages in thread
end of thread, other threads:[~2018-03-01 15:09 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-21  9:06 [gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-lib/ Michał Górny
  -- strict thread matches above, loose matches on Subject: below --
2016-01-16 22:31 Michał Górny
2016-02-28 14:03 Alexis Ballier
2016-02-28 16:53 Alexis Ballier
2016-03-01 10:07 Alexis Ballier
2016-03-01 10:07 Alexis Ballier
2016-03-01 10:07 Alexis Ballier
2016-03-01 10:07 Alexis Ballier
2016-03-01 10:07 Alexis Ballier
2016-05-11  6:37 Michał Górny
2016-09-12 10:31 Patrice Clement
2016-12-15 12:11 Michał Górny
2016-12-28  0:18 Patrice Clement
2018-01-07 19:39 Sergei Trofimovich
2018-03-01 15:09 Michał Górny

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox