Patch that fixes bug #139431 noticed with binutils-2.17, also fixes symlink creation.

(Portage version: 2.1.1_pre2-r4)

6 files changed, 115 insertions, 5 deletions

diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog
index fc8e3a92ae58..2b47083f1158 100644
--- a/sys-freebsd/freebsd-sources/ChangeLog
+++ b/sys-freebsd/freebsd-sources/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-freebsd/freebsd-sources
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.15 2006/06/12 09:52:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.16 2006/07/08 17:15:02 the_paya Exp $
+
+*freebsd-sources-6.1-r3 (08 Jul 2006)
+
+  08 Jul 2006; Javier Villavicencio <the_paya@gentoo.org>
+  +files/freebsd-sources-6.1-intrcnt.patch, freebsd-sources-6.1-r1.ebuild,
+  freebsd-sources-6.1-r2.ebuild, +freebsd-sources-6.1-r3.ebuild:
+  New patch for a bug noticed with new binutils, fixes bug #139431. Also fixes
+  symlink creation.
 
 *freebsd-sources-6.1-r2 (12 Jun 2006)
 
diff --git a/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1-r3 b/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1-r3
new file mode 100644
index 000000000000..ed81a3f45c74
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1-r3
@@ -0,0 +1,3 @@
+MD5 8893a0a0ddfa8959f71e8ee561a11333 freebsd-sys-6.1.tar.bz2 17361671
+RMD160 eb19f6a345c665542df694a4f9170d227beaf3b6 freebsd-sys-6.1.tar.bz2 17361671
+SHA256 d2ecd79b83ba06c12e358adfccc7e057e15fb7c5be76d92c537b99cbe1d84f0f freebsd-sys-6.1.tar.bz2 17361671
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-intrcnt.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-intrcnt.patch
new file mode 100644
index 000000000000..c6f0588edc1d
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-intrcnt.patch
@@ -0,0 +1,22 @@
+--- sys/i386/include/intr_machdep.h.orig	2006-07-08 12:27:19 -0300
++++ sys/i386/include/intr_machdep.h	2006-07-08 12:26:49 -0300
+@@ -55,7 +55,7 @@
+  * - 1 counter for each CPU for lapic timer.
+  * - 7 counters for each CPU for IPI counters for SMP.
+  */
+-#ifdef SMP
++#ifndef SMP
+ #define	INTRCNT_COUNT	(1 + NUM_IO_INTS * 2 + 1)
+ #else
+ #define	INTRCNT_COUNT	(1 + NUM_IO_INTS * 2 + (1 + 7) * MAXCPU)
+--- sys/amd64/include/intr_machdep.h.orig	2006-07-08 12:27:56 -0300
++++ sys/amd64/include/intr_machdep.h	2006-07-08 12:27:34 -0300
+@@ -55,7 +55,7 @@
+  * - 1 counter for each CPU for lapic timer.
+  * - 7 counters for each CPU for IPI counters for SMP.
+  */
+-#ifdef SMP
++#ifndef SMP
+ #define	INTRCNT_COUNT	(1 + NUM_IO_INTS * 2 + 1)
+ #else
+ #define	INTRCNT_COUNT	(1 + NUM_IO_INTS * 2 + (1 + 7) * MAXCPU)
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r1.ebuild
index cc15a4715384..7dc9500dcbff 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r1.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r1.ebuild,v 1.2 2006/06/12 09:52:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r1.ebuild,v 1.3 2006/07/08 17:15:02 the_paya Exp $
 
 inherit bsdmk freebsd
 
@@ -55,7 +55,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ ! -L $"{ROOT}/usr/src/sys" ]]; then
+	if [[ ! -L "${ROOT}/usr/src/sys" ]]; then
 		einfo "/usr/src/sys symlink doesn't exist; creating..."
 		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
 			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r2.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r2.ebuild
index 238020996ea7..451405194780 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r2.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r2.ebuild,v 1.1 2006/06/12 09:52:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r2.ebuild,v 1.2 2006/07/08 17:15:02 the_paya Exp $
 
 inherit bsdmk freebsd flag-o-matic
 
@@ -56,7 +56,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ ! -L $"{ROOT}/usr/src/sys" ]]; then
+	if [[ ! -L "${ROOT}/usr/src/sys" ]]; then
 		einfo "/usr/src/sys symlink doesn't exist; creating..."
 		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
 			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r3.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r3.ebuild
new file mode 100644
index 000000000000..1e8af70b36cb
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r3.ebuild,v 1.1 2006/07/08 17:15:02 the_paya Exp $
+
+inherit bsdmk freebsd flag-o-matic
+
+DESCRIPTION="FreeBSD kernel sources"
+SLOT="${PVR}"
+KEYWORDS="~x86-fbsd"
+
+IUSE="symlink"
+
+SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
+
+RDEPEND=">=sys-freebsd/freebsd-mk-defs-6.0-r1"
+DEPEND=""
+
+RESTRICT="strip binchecks"
+
+S="${WORKDIR}/sys"
+
+MY_PVR="${PVR}"
+
+[[ ${MY_PVR} == "${RV}" ]] && MY_PVR="${MY_PVR}-r0"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# This replaces the gentoover patch, it doesn't need reapply every time.
+	sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \
+		-e 's:^BRANCH=.*:BRANCH="Gentoo":' \
+		-e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \
+		"${S}/conf/newvers.sh"
+
+	epatch "${FILESDIR}/${PN}-gentoo.patch"
+	epatch "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
+	epatch "${FILESDIR}/${PN}-6.0-asm.patch"
+	epatch "${FILESDIR}/${PN}-6.0-werror.patch"
+	epatch "${FILESDIR}/${PN}-6.1-gcc41.patch"
+	epatch "${FILESDIR}/${PN}-6.1-intrcnt.patch"
+
+	epatch "${FILESDIR}/SA-06-16-smbfs.patch"
+
+	# Disable SSP for the kernel
+	grep -Zlr -- -ffreestanding "${S}" | xargs -0 sed -i -e \
+		"s:-ffreestanding:-ffreestanding $(test-flags -fno-stack-protector -fno-stack-protector-all):g"
+}
+
+src_compile() {
+	einfo "Nothing to compile.."
+}
+
+src_install() {
+	insinto "/usr/src/sys-${MY_PVR}"
+	doins -r "${S}/"*
+}
+
+pkg_postinst() {
+	if [[ ! -L "${ROOT}/usr/src/sys" ]]; then
+		einfo "/usr/src/sys symlink doesn't exist; creating symlink to sys-${MY_PVR}..."
+		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
+			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
+		# just in case...
+		[[ -L ""${ROOT}/usr/src/sys-${RV}"" ]] && rm "${ROOT}/usr/src/sys-${RV}"
+		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
+			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
+	elif use symlink; then
+		einfo "Updating /usr/src/sys symlink to sys-${MY_PVR}..."
+		rm "${ROOT}/usr/src/sys" "${ROOT}/usr/src/sys-${RV}" || \
+			eerror "Couldn't remove previous symlinks, please fix manually."
+		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
+			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
+		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
+			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
+	fi
+}