New patch for ssp support, based on OpenBSD code, too. This version has now the patch by default. Please re-compile gcc if you want to have ssp support, tho.

Package-Manager: portage-2.1_pre10

3 files changed, 18 insertions, 260 deletions

diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 3ff107aba318..5b5e97ed8011 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -17,10 +17,10 @@ AUX freebsd-lib-6.0-pmc.patch 338 RMD160 bb284cc2f9eafd3f65090087af215c3da679fef
 MD5 d2f9a1d35ae1aba75cc56b4ee3e12b68 files/freebsd-lib-6.0-pmc.patch 338
 RMD160 bb284cc2f9eafd3f65090087af215c3da679fefa files/freebsd-lib-6.0-pmc.patch 338
 SHA256 36ca464f0aa1ed8784c8f1edc4a3580704c9a7813963684305250d806000075f files/freebsd-lib-6.0-pmc.patch 338
-AUX freebsd-lib-6.0-ssp.patch 1582 RMD160 2d6e4a6aa6e784ce38a29084fedb0dd1c5f2245f SHA1 d59babbf5446af72fd9fc6fd946b3b4c3fafce54 SHA256 6785edac7f8c5667c21e6a017962553f026f7e05a31f0ae3617b13b6e400795a size 1582
-MD5 72a0b623ceb64c2770453252ce8f81d3 files/freebsd-lib-6.0-ssp.patch 1582
-RMD160 2d6e4a6aa6e784ce38a29084fedb0dd1c5f2245f files/freebsd-lib-6.0-ssp.patch 1582
-SHA256 6785edac7f8c5667c21e6a017962553f026f7e05a31f0ae3617b13b6e400795a files/freebsd-lib-6.0-ssp.patch 1582
+AUX freebsd-lib-6.0-ssp.patch 4343 RMD160 2ae7e8ba8d2dd691a943049bc03703af02c97a5c SHA1 bbfd416550a10a42bc48f4daf4b3feb0457ec37a SHA256 74fe62e37428faaf4ebe4a6e3735c7cc900b1faeb2bf7a3016db23483a9606ab size 4343
+MD5 ac618b629d4eaae493fc561717d146d5 files/freebsd-lib-6.0-ssp.patch 4343
+RMD160 2ae7e8ba8d2dd691a943049bc03703af02c97a5c files/freebsd-lib-6.0-ssp.patch 4343
+SHA256 74fe62e37428faaf4ebe4a6e3735c7cc900b1faeb2bf7a3016db23483a9606ab files/freebsd-lib-6.0-ssp.patch 4343
 AUX freebsd-lib-bsdxml.patch 339 RMD160 27b501cda2ac76230a72dfc3ee6593cb50f8d4b0 SHA1 3b456d272de5d0c56bc650fe60f38524857f8b31 SHA256 c1ac47d6c7176475f0f4b86bb17288a980b44a799fb6f4e7b1920f69e0447dc9 size 339
 MD5 0fa8fbe7549748636959ef4bc4ea9660 files/freebsd-lib-bsdxml.patch 339
 RMD160 27b501cda2ac76230a72dfc3ee6593cb50f8d4b0 files/freebsd-lib-bsdxml.patch 339
@@ -37,25 +37,25 @@ DIST freebsd-lib-6.0.tar.bz2 2613087 RMD160 30bf04438a00408284f135c2670106141cae
 DIST freebsd-libexec-6.0.tar.bz2 277631 RMD160 5121414524c9dfceab1f5ad8b8bc91c65141db82 SHA256 2eddc867d69afa6c5d0a2f3ce18d4570688b5fa49924adb478dc7d548ba8197e size 277631
 DIST freebsd-sys-6.0.tar.bz2 16069887 RMD160 02b446bb5a3dde2f91ecba2617a887e817d038a9 SHA256 416fc69ab15d28686d461ca115964091409abc9e5855260d89e2370cad77ad70 size 16069887
 DIST freebsd-usbin-6.0.tar.bz2 2635411 RMD160 9a8f5cdc041df1ad2b388c432a1829b5c8adc51d SHA256 46ac3c581fd20d9980bcf2d80aba7c2f874ad3e29058939bee0c6f1a4af8ff64 size 2635411
-EBUILD freebsd-lib-6.0-r2.ebuild 6551 RMD160 ff76aa99bf4b051bb6b11c4587742809ed5c35a0 SHA1 76171e5a637171eb31282c4c8399ad8b769c5c7e SHA256 deaa1efea7f9e9215a7c78912345835a0ce024c48cf5bf9ec387a53e405bd675 size 6551
-MD5 ac7c820dd6026823f491675944556350 freebsd-lib-6.0-r2.ebuild 6551
-RMD160 ff76aa99bf4b051bb6b11c4587742809ed5c35a0 freebsd-lib-6.0-r2.ebuild 6551
-SHA256 deaa1efea7f9e9215a7c78912345835a0ce024c48cf5bf9ec387a53e405bd675 freebsd-lib-6.0-r2.ebuild 6551
-MISC ChangeLog 7214 RMD160 6378e1c153cbf55bb9f86aac8fd2ad8bd2356b9f SHA1 c10b61ff374435944ac4059ced69f40beb461f09 SHA256 8597edbf225047ffc4b49ba6f39588d7d1561129ef0cfefd544eefc728987965 size 7214
-MD5 7d21c2cb3ffb034a70aff34dd35147ab ChangeLog 7214
-RMD160 6378e1c153cbf55bb9f86aac8fd2ad8bd2356b9f ChangeLog 7214
-SHA256 8597edbf225047ffc4b49ba6f39588d7d1561129ef0cfefd544eefc728987965 ChangeLog 7214
+EBUILD freebsd-lib-6.0-r3.ebuild 6540 RMD160 b5aba6b58d97cb6f6dd725bbc2a12f3539eac78e SHA1 f6d44373b904023fa915be186829a80024b67c5b SHA256 d1007fb5b26aefbd85e08374ab32324643e734b704da97ad8461c59f327fdeb5 size 6540
+MD5 1bde4db8e821cdb167f10b4514a0dbe2 freebsd-lib-6.0-r3.ebuild 6540
+RMD160 b5aba6b58d97cb6f6dd725bbc2a12f3539eac78e freebsd-lib-6.0-r3.ebuild 6540
+SHA256 d1007fb5b26aefbd85e08374ab32324643e734b704da97ad8461c59f327fdeb5 freebsd-lib-6.0-r3.ebuild 6540
+MISC ChangeLog 7560 RMD160 c5dea2e92f2db0ba8e09c3e37f36c92aba2020f5 SHA1 e76f4f4aadd9498ca3cf03db9e25a394d2adf4da SHA256 fa68920f26f42284e21d78eabedf78bdf2668e7109aa23fc4cfc2b5c3f97af9a size 7560
+MD5 ef5f9ecf51957485248c68499dba4fa5 ChangeLog 7560
+RMD160 c5dea2e92f2db0ba8e09c3e37f36c92aba2020f5 ChangeLog 7560
+SHA256 fa68920f26f42284e21d78eabedf78bdf2668e7109aa23fc4cfc2b5c3f97af9a ChangeLog 7560
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata.xml 156
-MD5 c15a1a49762c0863cbfa4bd5be03f174 files/digest-freebsd-lib-6.0-r2 2072
-RMD160 6c9ffd60849a62554acd27568cc21f1b76692ca3 files/digest-freebsd-lib-6.0-r2 2072
-SHA256 f0deccdb9489aa7f2a1dcad0b619427916876a3a58d1b020d754852396c59766 files/digest-freebsd-lib-6.0-r2 2072
+MD5 c15a1a49762c0863cbfa4bd5be03f174 files/digest-freebsd-lib-6.0-r3 2072
+RMD160 6c9ffd60849a62554acd27568cc21f1b76692ca3 files/digest-freebsd-lib-6.0-r3 2072
+SHA256 f0deccdb9489aa7f2a1dcad0b619427916876a3a58d1b020d754852396c59766 files/digest-freebsd-lib-6.0-r3 2072
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEVC7CAiZjviIA2XgRAr1xAJ9IwiNnxfS56Ln0AUz/8DgDUGrjDACdFJph
-xjCWQBpD7Un/xGT+Hq77Ejc=
-=CM2g
+iD8DBQFEVH/QAiZjviIA2XgRAjsdAJ47BLjZGoWur72UXF22yngCqZUEvgCfarQL
+OYkDcBY0JpH3XLr8yrg6iRk=
+=dseq
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-lib/files/digest-freebsd-lib-6.0-r2 b/sys-freebsd/freebsd-lib/files/digest-freebsd-lib-6.0-r2
deleted file mode 100644
index dfc73a573b49..000000000000
--- a/sys-freebsd/freebsd-lib/files/digest-freebsd-lib-6.0-r2
+++ /dev/null
@@ -1,24 +0,0 @@
-MD5 b5b626909c9707d0bab0c54b50e132b9 freebsd-contrib-6.0.tar.bz2 34972594
-RMD160 3f045dd7d1ddbcf20da670051459f0a2fc508a8b freebsd-contrib-6.0.tar.bz2 34972594
-SHA256 9c76affcddb3a8257d3b612dd7cc8ff43bc7417e47e215c01909a81c79e9d443 freebsd-contrib-6.0.tar.bz2 34972594
-MD5 3f5ace196589dee4044fd717abf4b57c freebsd-crypto-6.0.tar.bz2 3978650
-RMD160 361efbba1f651925a7cc2284665b044bc232f181 freebsd-crypto-6.0.tar.bz2 3978650
-SHA256 e86223d40ef2747de98f575f3875a6ce8a5e913baa850a5ef547ffef00ace480 freebsd-crypto-6.0.tar.bz2 3978650
-MD5 7c2af3af5be2f46372f9cc0efaeda4c7 freebsd-etc-6.0.tar.bz2 178941
-RMD160 48d0eb51f291e5d706ef076151964b88a9fc1796 freebsd-etc-6.0.tar.bz2 178941
-SHA256 c4bd9401dad72bd869b89aa12a61339a30746caadb741bb0d094f522ee117616 freebsd-etc-6.0.tar.bz2 178941
-MD5 0a5937660818157a2a0bf09fe705f24c freebsd-include-6.0.tar.bz2 127219
-RMD160 683fe6cf84961d0019c742f4e1fc0e4bfb18b60c freebsd-include-6.0.tar.bz2 127219
-SHA256 9da34ffd474e023fe7dd203cb035d97726eb8e7bea7e9566249e62da4039be8b freebsd-include-6.0.tar.bz2 127219
-MD5 3888da5da1cb329a65a3ac9d316f99ea freebsd-lib-6.0.tar.bz2 2613087
-RMD160 30bf04438a00408284f135c2670106141cae4873 freebsd-lib-6.0.tar.bz2 2613087
-SHA256 dab1140d52597f37d768d2210a49cb29db5404a7df35306462e3642074426a53 freebsd-lib-6.0.tar.bz2 2613087
-MD5 44996c2edac20108da43add45b599d94 freebsd-libexec-6.0.tar.bz2 277631
-RMD160 5121414524c9dfceab1f5ad8b8bc91c65141db82 freebsd-libexec-6.0.tar.bz2 277631
-SHA256 2eddc867d69afa6c5d0a2f3ce18d4570688b5fa49924adb478dc7d548ba8197e freebsd-libexec-6.0.tar.bz2 277631
-MD5 fa4633806f9ecd13eba57e45e5b6031f freebsd-sys-6.0.tar.bz2 16069887
-RMD160 02b446bb5a3dde2f91ecba2617a887e817d038a9 freebsd-sys-6.0.tar.bz2 16069887
-SHA256 416fc69ab15d28686d461ca115964091409abc9e5855260d89e2370cad77ad70 freebsd-sys-6.0.tar.bz2 16069887
-MD5 df8c3764da190437a1d47c6ff1872520 freebsd-usbin-6.0.tar.bz2 2635411
-RMD160 9a8f5cdc041df1ad2b388c432a1829b5c8adc51d freebsd-usbin-6.0.tar.bz2 2635411
-SHA256 46ac3c581fd20d9980bcf2d80aba7c2f874ad3e29058939bee0c6f1a4af8ff64 freebsd-usbin-6.0.tar.bz2 2635411
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-6.0-r2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-6.0-r2.ebuild
deleted file mode 100644
index 518ff3e1e27b..000000000000
--- a/sys-freebsd/freebsd-lib/freebsd-lib-6.0-r2.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-6.0-r2.ebuild,v 1.5 2006/04/30 03:27:40 flameeyes Exp $
-
-inherit bsdmk freebsd flag-o-matic toolchain-funcs
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="6.0"
-KEYWORDS="~x86-fbsd"
-
-IUSE="atm bluetooth ssl ipv6 kerberos nis gpib"
-
-# 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
-		nis? ( mirror://gentoo/${USBIN}.tar.bz2 )
-		!kernel_FreeBSD? (
-			mirror://gentoo/${SYS}.tar.bz2 )"
-
-RDEPEND="ssl? ( dev-libs/openssl )
-	kerberos? ( virtual/krb5 )
-	!sys-freebsd/freebsd-headers"
-DEPEND="${RDEPEND}
-	>=sys-devel/flex-2.5.31-r2
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-sources-${RV}*"
-
-if [[ ${CATEGORY/cross-} == {CATEGORY} ]]; then
-	PROVIDE="virtual/libc
-		virtual/os-headers"
-fi
-
-S="${WORKDIR}/lib"
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} && ${CATEGORY/cross-} != ${CATEGORY} ]]; then
-	export CTARGET=${CATEGORY/cross-}
-fi
-
-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} NO_ATM= "
-	use bluetooth || mymakeopts="${mymakeopts} NO_BLUETOOTH= "
-	use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= "
-	use ipv6 || mymakeopts="${mymakeopts} NO_INET6= "
-	use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= "
-	use nis || mymakeopts="${mymakeopts} NO_NIS= "
-	use gpib || mymakeopts="${mymakeopts} NO_GPIB= "
-
-	mymakeopts="${mymakeopts} NO_OPENSSH= NO_BIND= NO_SENDMAIL= "
-
-	replace-flags "-O?" -"O1"
-
-	if [[ ${CTARGET} != ${CHOST} ]]; then
-		mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
-		mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})"
-	fi
-
-	einfo "Using mymakeopts: ${mymakeopts}"
-}
-
-PATCHES="${FILESDIR}/${PN}-bsdxml.patch
-	${FILESDIR}/${PN}-fixmp.patch
-	${FILESDIR}/${PN}-${RV}-pmc.patch
-	${FILESDIR}/${PN}-${RV}-gccfloat.patch
-	${FILESDIR}/${PN}-${RV}-flex-2.5.31.patch
-	${FILESDIR}/${PN}-${RV}-binutils-asm.patch"
-
-# Here we disable and remove source which we don't need or want
-# In order:
-# - ncurses stuff
-# - archiving libraries (have their own ebuild)
-# - sendmail libraries (they are installed by sendmail)
-# - SNMP library and dependency (have their own ebuilds)
-#
-# 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="libncurses libform libmenu libpanel \
-	libz libbz2 libarchive \
-	libsm libsmdb libsmutil \
-	libbegemot libbsnmp \
-	libsmb libpam libpcap bind libwrap libmagic \
-	libcom_err libtelnet"
-
-src_unpack() {
-	freebsd_src_unpack
-
-	if [[ ${CTARGET} == ${CHOST} ]]; then
-		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-	else
-		sed -i -e 's:/usr/include:/usr/'${CTARGET}'/usr/include:g' \
-			"${S}/libc/"{yp,rpc}"/Makefile.inc"
-	fi
-
-	[[ -n $(install --version 2> /dev/null | grep GNU) ]] && \
-		sed -i -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile"
-
-	sed -i -e 's:-o/dev/stdout:-t:' ${S}/libc/net/Makefile.inc
-	use ssp && epatch "${FILESDIR}/${PN}-${RV}-ssp.patch"
-}
-
-src_compile() {
-	cd "${WORKDIR}/include"
-	$(freebsd_get_bmake) CC=$(tc-getCC) || die "make include failed"
-
-	use _E_CROSS_HEADERS_ONLY && return 0
-
-	if [[ ${CTARGET} != ${CHOST} ]]; then
-		export YACC='yacc -by'
-		CHOST=${CTARGET} tc-export CC LD CXX
-
-		local machine
-		machine=$(tc-arch-kernel ${CTARGET})
-
-		local csudir
-		if [[ -d "${S}/csu/${machine}-elf" ]]; then
-			csudir="${S}/csu/${machine}-elf"
-		else
-			csudir="${S}/csu/${machine}"
-		fi
-		cd "${csudir}"
-		$(freebsd_get_bmake) ${mymakeopts} || die "make csu failed"
-
-		append-flags "-isystem /usr/${CTARGET}/usr/include"
-		append-flags "-B ${csudir}"
-		append-ldflags "-B ${csudir}"
-		cd "${S}/libc"
-		$(freebsd_get_bmake) ${mymakeopts} || die "make libc failed"
-
-		append-flags "-isystem ${WORKDIR}/lib/msun/${machine/i386/i387}"
-		cd "${S}/msun"
-		$(freebsd_get_bmake) ${mymakeopts} || die "make libc failed"
-	else
-		append-flags -fno-stack-protector # Don't use ssp until properly fixed
-		cd "${S}"
-		freebsd_src_compile
-	fi
-}
-
-src_install() {
-	cd "${WORKDIR}/include"
-
-	[[ ${CTARGET} == ${CHOST} ]] \
-		&& INCLUDEDIR="/usr/include" \
-		|| INCLUDEDIR="/usr/${CTARGET}/usr/include"
-
-	einfo "Installing for ${CTARGET} in ${CHOST}.."
-
-	dodir "${INCLUDEDIR}"
-	$(freebsd_get_bmake) installincludes \
-		MACHINE=$(tc-arch-kernel) \
-		DESTDIR="${D}" INCLUDEDIR="${INCLUDEDIR}" || die "Install failed"
-
-	# Install math.h when crosscompiling, at this point
-	if [[ ${CHOST} != ${CTARGET} ]]; then
-		insinto "/usr/${CTARGET}/usr/include"
-		doins "${S}/msun/src/math.h"
-	fi
-
-	use _E_CROSS_HEADERS_ONLY && return 0
-
-	if [[ ${CTARGET} != ${CHOST} ]]; then
-		local csudir
-		if [[ -d "${S}/csu/$(tc-arch-kernel ${CTARGET})-elf" ]]; then
-			csudir="${S}/csu/$(tc-arch-kernel ${CTARGET})-elf"
-		else
-			csudir="${S}/csu/$(tc-arch-kernel ${CTARGET})"
-		fi
-		cd "${csudir}"
-		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install \
-			FILESDIR="/usr/${CTARGET}/usr/lib" || die "Install csu failed"
-
-		cd "${S}/libc"
-		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
-			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install failed"
-
-		cd "${S}/msun"
-		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
-			INCLUDEDIR="/usr/${CTARGET}/usr/include" \
-			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install failed"
-
-		dosym "usr/include" "/usr/${CTARGET}/sys-include"
-	else
-		cd "${S}"
-		mkinstall || die "Install failed"
-	fi
-
-	# Don't install the rest of the configuration files if crosscompiling
-	[[ ${CTARGET} != ${CHOST} ]] && return 0
-
-	# install libstand files
-	dodir /usr/include/libstand
-	insinto /usr/include/libstand
-	doins ${S}/libstand/*.h
-
-	cd ${WORKDIR}/etc/
-	insinto /etc
-	doins auth.conf nls.alias mac.conf netconfig
-
-	# Install ttys file
-	doins "etc.$(tc-arch-kernel)"/*
-}
-