Update to 6.1_rc1 and disable stack protector.

(Portage version: 2.1_pre10)

5 files changed, 55 insertions, 3 deletions

diff --git a/sys-freebsd/boot0/ChangeLog b/sys-freebsd/boot0/ChangeLog
index 3fa828ec2c6a..8e0c6af5a12a 100644
--- a/sys-freebsd/boot0/ChangeLog
+++ b/sys-freebsd/boot0/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-freebsd/boot0
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/ChangeLog,v 1.3 2006/04/02 22:26:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/ChangeLog,v 1.4 2006/05/01 02:09:47 flameeyes Exp $
+
+*boot0-6.1_rc1 (01 May 2006)
+
+  01 May 2006; Diego Pettenò <flameeyes@gentoo.org> boot0-6.0.ebuild,
+  +boot0-6.1_rc1.ebuild:
+  Update to 6.1_rc1 and disable stack protector.
 
   02 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
   -files/boot0-gentoo.patch:
diff --git a/sys-freebsd/boot0/boot0-6.0.ebuild b/sys-freebsd/boot0/boot0-6.0.ebuild
index e78fa0409b38..6e3da2774b33 100644
--- a/sys-freebsd/boot0/boot0-6.0.ebuild
+++ b/sys-freebsd/boot0/boot0-6.0.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/boot0/boot0-6.0.ebuild,v 1.1 2006/04/01 16:43:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/boot0-6.0.ebuild,v 1.2 2006/05/01 02:09:47 flameeyes Exp $
 
 inherit bsdmk freebsd
 
@@ -18,7 +18,14 @@ DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
 
 S="${WORKDIR}/sys/boot"
 
-PATCHES="${FILESDIR}/boot0-${RV}-gentoo.patch"
+PATCHES="${FILESDIR}/boot0-6.0-gentoo.patch"
+
+src_unpack() {
+	freebsd_src_unpack
+
+	grep -Zlr -- -ffreestanding "${S}" | xargs -0 sed -i -e \
+		's:-ffreestanding:-ffreestanding -fno-stack-protector -fno-stack-protector-all:g'
+}
 
 src_install() {
 	dodir /boot/defaults
diff --git a/sys-freebsd/boot0/boot0-6.1_rc1.ebuild b/sys-freebsd/boot0/boot0-6.1_rc1.ebuild
new file mode 100644
index 000000000000..5e13546e52b1
--- /dev/null
+++ b/sys-freebsd/boot0/boot0-6.1_rc1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/boot0-6.1_rc1.ebuild,v 1.1 2006/05/01 02:09:47 flameeyes Exp $
+
+inherit bsdmk freebsd
+
+DESCRIPTION="FreeBSD's bootloader"
+SLOT="0"
+KEYWORDS="~x86-fbsd"
+
+IUSE=""
+
+SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
+
+RDEPEND=""
+DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
+	=sys-freebsd/freebsd-lib-${RV}*"
+
+S="${WORKDIR}/sys/boot"
+
+PATCHES="${FILESDIR}/boot0-6.0-gentoo.patch"
+
+src_unpack() {
+	freebsd_src_unpack
+
+	grep -Zlr -- -ffreestanding "${S}" | xargs -0 sed -i -e \
+		's:-ffreestanding:-ffreestanding -fno-stack-protector -fno-stack-protector-all:g'
+}
+
+src_install() {
+	dodir /boot/defaults
+
+	mkinstall FILESDIR=/boot || die "mkinstall failed"
+}
diff --git a/sys-freebsd/boot0/files/digest-boot0-6.0 b/sys-freebsd/boot0/files/digest-boot0-6.0
index bbd95b8a168c..8ece252ae3b5 100644
--- a/sys-freebsd/boot0/files/digest-boot0-6.0
+++ b/sys-freebsd/boot0/files/digest-boot0-6.0
@@ -1 +1,3 @@
 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
diff --git a/sys-freebsd/boot0/files/digest-boot0-6.1_rc1 b/sys-freebsd/boot0/files/digest-boot0-6.1_rc1
new file mode 100644
index 000000000000..6229226ead06
--- /dev/null
+++ b/sys-freebsd/boot0/files/digest-boot0-6.1_rc1
@@ -0,0 +1,3 @@
+MD5 6045efaa93abaa1399d751d7eae279b2 freebsd-sys-6.1_rc1.tar.bz2 17096208
+RMD160 26bbd25ed3f3b883c6e06e849a20d47a867733b4 freebsd-sys-6.1_rc1.tar.bz2 17096208
+SHA256 612c4f37658a5e355933bc8e6c1748e5624b62c1490f7640ef9d676f96e09c29 freebsd-sys-6.1_rc1.tar.bz2 17096208