Revbump with the iso patch, hopefully fixes CD issues

Package-Manager: portage-2.1

5 files changed, 119 insertions, 8 deletions

diff --git a/sys-boot/silo/ChangeLog b/sys-boot/silo/ChangeLog
index 681d6d33147a..3f253e737560 100644
--- a/sys-boot/silo/ChangeLog
+++ b/sys-boot/silo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-boot/silo
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/silo/ChangeLog,v 1.29 2006/06/16 20:32:54 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/silo/ChangeLog,v 1.30 2006/06/19 20:43:38 gustavoz Exp $
+
+*silo-1.4.12-r1 (19 Jun 2006)
+
+  19 Jun 2006; Gustavo Zacarias <gustavoz@gentoo.org>
+  +files/silo-1.4.12-iso.patch, +silo-1.4.12-r1.ebuild:
+  Revbump with the iso patch, hopefully fixes CD issues
 
 *silo-1.4.12 (16 Jun 2006)
 
diff --git a/sys-boot/silo/Manifest b/sys-boot/silo/Manifest
index b57c17c79a7f..399d61e7d52d 100644
--- a/sys-boot/silo/Manifest
+++ b/sys-boot/silo/Manifest
@@ -5,6 +5,10 @@ AUX silo-1.4.11-timer.patch 1230 RMD160 db052973362c725e9dd2891dcaa937f4f3041c0b
 MD5 c3140abf619f875c0d65b0562ea70dfa files/silo-1.4.11-timer.patch 1230
 RMD160 db052973362c725e9dd2891dcaa937f4f3041c0b files/silo-1.4.11-timer.patch 1230
 SHA256 9fed714b1d2600442b4a555014da3a51ebcfcc1c35a2d17517b162217f8b1a6e files/silo-1.4.11-timer.patch 1230
+AUX silo-1.4.12-iso.patch 659 RMD160 04060048136985a832eeef61282245bc183b0a09 SHA1 295a8ed92b3dca642bffb55e76124e59226b7e89 SHA256 8112a2583a16dbeead038beeb551d56186f5442568905cec76fe9a71239adfbc
+MD5 b8bf6a6b869be13e02a840e7e9f9ff37 files/silo-1.4.12-iso.patch 659
+RMD160 04060048136985a832eeef61282245bc183b0a09 files/silo-1.4.12-iso.patch 659
+SHA256 8112a2583a16dbeead038beeb551d56186f5442568905cec76fe9a71239adfbc files/silo-1.4.12-iso.patch 659
 AUX silo-1.4.x-noglibc_time.patch 407 RMD160 db46932d4ad90965b4cfb43e095e7bbfefc5c030 SHA1 3172e91e0741f64cc511a1d0a47c4b724eed1ac0 SHA256 de656cc0b9bb6a1a852aebd702ee9e90fa7a9f050603b32eed2e5a2100988c5a
 MD5 22b27dc36d3080c4122445a914faaa18 files/silo-1.4.x-noglibc_time.patch 407
 RMD160 db46932d4ad90965b4cfb43e095e7bbfefc5c030 files/silo-1.4.x-noglibc_time.patch 407
@@ -15,14 +19,18 @@ EBUILD silo-1.4.11-r1.ebuild 1428 RMD160 c39abbba1119d3f900c60bd6d1e080b14ce9218
 MD5 709ccd00b77385fee83c47d6e3f2500a silo-1.4.11-r1.ebuild 1428
 RMD160 c39abbba1119d3f900c60bd6d1e080b14ce9218c silo-1.4.11-r1.ebuild 1428
 SHA256 e090e378da5dbaf97444b3b1c0e072c864e6210d258c04da4fa780066a03c04a silo-1.4.11-r1.ebuild 1428
+EBUILD silo-1.4.12-r1.ebuild 1434 RMD160 fb9c19e6f59d29e9967c6c7e07da18a56075e0e2 SHA1 6bbe402cfd8132f61b29e20e81225b815bdbe0df SHA256 2df7b6f1d1233da21281f81955122e3cae6c157b14729af1ed530481752cc6ab
+MD5 5e97dac108bc1e3d46e7adac61877c9f silo-1.4.12-r1.ebuild 1434
+RMD160 fb9c19e6f59d29e9967c6c7e07da18a56075e0e2 silo-1.4.12-r1.ebuild 1434
+SHA256 2df7b6f1d1233da21281f81955122e3cae6c157b14729af1ed530481752cc6ab silo-1.4.12-r1.ebuild 1434
 EBUILD silo-1.4.12.ebuild 1389 RMD160 280179b4089e9fc49fe95439e7ff9b6c1cd2e757 SHA1 5b0acfb5c7aa2dad035b00ac2d55145f5fbfde44 SHA256 865f262aadab5d39dd063f943749f6cec6fac0566818883f578adcd2781b527a
 MD5 7f86a0280e261549178781e443ca8e8e silo-1.4.12.ebuild 1389
 RMD160 280179b4089e9fc49fe95439e7ff9b6c1cd2e757 silo-1.4.12.ebuild 1389
 SHA256 865f262aadab5d39dd063f943749f6cec6fac0566818883f578adcd2781b527a silo-1.4.12.ebuild 1389
-MISC ChangeLog 6582 RMD160 4eaf7c3aab75bc42dd3fdd885f535beac18d7ec9 SHA1 f137f0de0aef6a544fb28f2426bbb7805e92b21d SHA256 a671855d2763194409c47ef11994e71f0b7ebd836b4fe4402ab34840b328e11a
-MD5 94a8a44752b70b4cce8557860aa59080 ChangeLog 6582
-RMD160 4eaf7c3aab75bc42dd3fdd885f535beac18d7ec9 ChangeLog 6582
-SHA256 a671855d2763194409c47ef11994e71f0b7ebd836b4fe4402ab34840b328e11a ChangeLog 6582
+MISC ChangeLog 6780 RMD160 90f7e94efb8b8aae455b30f6bdebceb6176d1c10 SHA1 db8adf1fb49e8498cf17931c2551f79e7c4b9db0 SHA256 70bcb0e36c742ef6c9b4fa385d786842eecf84e60c1da51c101268ba8d9a0873
+MD5 25c981136db6fe8577a16919d84eaea9 ChangeLog 6780
+RMD160 90f7e94efb8b8aae455b30f6bdebceb6176d1c10 ChangeLog 6780
+SHA256 70bcb0e36c742ef6c9b4fa385d786842eecf84e60c1da51c101268ba8d9a0873 ChangeLog 6780
 MISC metadata.xml 369 RMD160 beddda72c42561136a20a4c309ec82a054cf0e36 SHA1 8d7e23348f097e83cfb2f2ac95d7816c9117b6d3 SHA256 961e65932375434644d56724c87707b05aab30e3e517dc3969bde6fc2b0ca379
 MD5 64e92dc3614963db8a397f670749b6cf metadata.xml 369
 RMD160 beddda72c42561136a20a4c309ec82a054cf0e36 metadata.xml 369
@@ -33,10 +41,13 @@ SHA256 ad1b4919e652fff30896cacb80bb212f6a09700eccda0bbdc64a3961f49b901e files/di
 MD5 09d41e35fa01210f3472eeced81ca212 files/digest-silo-1.4.12 235
 RMD160 02dced186ab78cb21531abed34f853f58e7f7664 files/digest-silo-1.4.12 235
 SHA256 723c5695d932a78fa42de33c4fdfc83f966b9a74d3f5536dede307f61172ef1a files/digest-silo-1.4.12 235
+MD5 09d41e35fa01210f3472eeced81ca212 files/digest-silo-1.4.12-r1 235
+RMD160 02dced186ab78cb21531abed34f853f58e7f7664 files/digest-silo-1.4.12-r1 235
+SHA256 723c5695d932a78fa42de33c4fdfc83f966b9a74d3f5536dede307f61172ef1a files/digest-silo-1.4.12-r1 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFEkxWFKRy60XGEcJIRAr78AJ9fc3xiPNBo7B233guO/H0VnR0MlACfR7xY
-F2kKi/DvgpMz62nKbmOwIZ0=
-=YjYr
+iD8DBQFElwyTKRy60XGEcJIRAk19AKCFlLd2qFugPQMziHshPnakDxRDbgCeLQ37
+0Gy8e3etJCRK4b3rcW+wo2M=
+=Hzui
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/silo/files/digest-silo-1.4.12-r1 b/sys-boot/silo/files/digest-silo-1.4.12-r1
new file mode 100644
index 000000000000..8204879f40ac
--- /dev/null
+++ b/sys-boot/silo/files/digest-silo-1.4.12-r1
@@ -0,0 +1,3 @@
+MD5 15e77558c57cae19a790fc100783d8f3 silo-1.4.12.tar.gz 168839
+RMD160 68ec1291630c7d1e58f6d52f31529c226fa982b0 silo-1.4.12.tar.gz 168839
+SHA256 232d23a18236a71bff3c9fe0d081a7bbb5913056a4637496782401b0ed5bdf60 silo-1.4.12.tar.gz 168839
diff --git a/sys-boot/silo/files/silo-1.4.12-iso.patch b/sys-boot/silo/files/silo-1.4.12-iso.patch
new file mode 100644
index 000000000000..3dc8d7b86f65
--- /dev/null
+++ b/sys-boot/silo/files/silo-1.4.12-iso.patch
@@ -0,0 +1,35 @@
+--- first-isofs/isofs.c.~1~	2006-06-18 19:05:53.000000000 -0700
++++ first-isofs/isofs.c	2006-06-18 19:06:08.000000000 -0700
+@@ -101,6 +101,23 @@
+ 	return 0;
+ }
+ 
++static void cd_fini(void)
++{
++	switch (prom_vers) {
++	case PROM_V0:
++		romvec->pv_v0devops.v0_devclose(fd);
++		break;
++
++	case PROM_V2:
++	case PROM_V3:
++		romvec->pv_v2devops.v2_dev_close(fd);
++		break;
++
++	case PROM_P1275:
++		p1275_cmd("close", 1, fd);
++		break;
++	};
++}
+ 
+ static int cd_read_block(unsigned long long offset, int size, void *data)
+ {
+@@ -445,6 +462,8 @@
+ 	sinfo->conf_part = 1;
+ 	strcpy(sinfo->conf_file, silo_conf);
+ 
++	cd_fini();
++
+ 	prom_putchar(sinfo->id);
+ 
+ 	return dest;
diff --git a/sys-boot/silo/silo-1.4.12-r1.ebuild b/sys-boot/silo/silo-1.4.12-r1.ebuild
new file mode 100644
index 000000000000..22f13ddedd17
--- /dev/null
+++ b/sys-boot/silo/silo-1.4.12-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/silo/silo-1.4.12-r1.ebuild,v 1.1 2006/06/19 20:43:38 gustavoz Exp $
+
+inherit mount-boot flag-o-matic toolchain-funcs
+
+DESCRIPTION="SPARC/UltraSPARC Improved Loader, a boot loader for sparc"
+SRC_URI="http://www.sparc-boot.org/pub/silo/${P}.tar.gz"
+HOMEPAGE="http://www.sparc-boot.org"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="-* ~sparc"
+IUSE="hardened"
+
+PROVIDE="virtual/bootloader"
+
+DEPEND="sys-fs/e2fsprogs
+	sys-apps/sparc-utils"
+
+ABI_ALLOW="sparc32"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/silo-1.4.x-noglibc_time.patch
+	epatch ${FILESDIR}/silo-1.4.12-iso.patch
+}
+
+src_compile() {
+	filter-flags "-fstack-protector"
+
+	if use hardened
+	then
+		make ${MAKEOPTS} CC="$(tc-getCC) -fno-stack-protector -fno-pic"
+	else
+		make ${MAKEOPTS} CC="$(tc-getCC)" || die
+	fi
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc COPYING ChangeLog first-isofs/README.SILO_ISOFS docs/README*
+
+	# Fix maketilo manpage
+	rm ${D}/usr/share/man/man1/maketilo.1
+	dosym /usr/share/man/man1/tilo.1 /usr/share/man/man1/maketilo.1
+}
+
+pkg_postinst() {
+	ewarn "NOTE: If this is an upgrade to an existing SILO install,"
+	ewarn "      you will need to re-run silo as the /boot/second.b"
+	ewarn "      file has changed, else the system will fail to load"
+	ewarn "      SILO at the next boot."
+}