Stable for HPPA too.

Package-Manager: portage-2.2.0_alpha10/cvs/Linux i686

5 files changed, 11 insertions, 73 deletions

diff --git a/sys-boot/palo/ChangeLog b/sys-boot/palo/ChangeLog
index 6aeefc785d14..7e3cbe4e7ead 100644
--- a/sys-boot/palo/ChangeLog
+++ b/sys-boot/palo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-boot/palo
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/palo/ChangeLog,v 1.27 2010/10/02 17:51:13 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/palo/ChangeLog,v 1.28 2011/01/03 11:51:15 jer Exp $
+
+  03 Jan 2011; Jeroen Roovers <jer@gentoo.org> -palo-1.17.ebuild,
+  -files/palo-1.17-fortify-source.patch, palo-1.18.ebuild:
+  Stable for HPPA too.
 
 *palo-1.18 (02 Oct 2010)
 
diff --git a/sys-boot/palo/Manifest b/sys-boot/palo/Manifest
index d53f4efab8e5..5f065857e9d2 100644
--- a/sys-boot/palo/Manifest
+++ b/sys-boot/palo/Manifest
@@ -1,10 +1,7 @@
 AUX palo-1.16_p1-build.patch 1045 RMD160 9ceec2a8b8adc2677653f8cd1c0b72cae3f04062 SHA1 bf479b78b9f5ac76e81a6aa712929ca7aa52721b SHA256 6b236237ba2fe3a10bb9f8463b87df69a61a75d546b519151304eb3415bd3598
-AUX palo-1.17-fortify-source.patch 474 RMD160 26278524eb56b15d82f3104234e53258ee0cf26f SHA1 1beaf13281151c83180fbec58dc3e971dbccbf46 SHA256 5a071e673ce5df48aeb124973acdaefef25390d0f15bf2f4de82d4d41af4f61b
 AUX palo-remove-HOME-TERM.patch 3605 RMD160 1837ffee8e2268e91d0e7473cfe9d6179727a436 SHA1 b203fdce28f6bcf6bcc8a7739531788a36d8f6d3 SHA256 4e490602078102ed475535be892ab3f3ef535c3f133bb10b926a9ea029acfe8d
 AUX palo.conf 207 RMD160 648432e3819a34cc2034722d8db1438bd5244f24 SHA1 70359b6c8925520a6749b8be3fa3f30d0ae4e5cd SHA256 191d665eee73ff654763d6c4399cb46d86fe24b00140ba1eea0601b339ebb92a
-DIST palo_1.17.tar.gz 106434 RMD160 5deb8a5b128dc267889c70f87caff293035ba70b SHA1 894a73fd67fcd9c5bcef7e8f2886ad5a36db8837 SHA256 1ec82934714637ba66393f995f2462e41e427b9fb80f6a6e40b61cd2fb804a30
 DIST palo_1.18.tar.gz 107181 RMD160 64ecee0235f51d6bde96816ae482da0db896897e SHA1 3b47f4abadbec4235e3e63ac80a802f44a2c202f SHA256 2b75c5ed02c821c36419201c913f63979a0a5ea2abeee5bd8f7de4e8f9fc2a74
-EBUILD palo-1.17.ebuild 1102 RMD160 3f718dac7bc4abde6eeec36b1cc8c7e1fe605432 SHA1 474e530d20e6851d39ead31a2ff554f1e1d4b867 SHA256 54e25dfe036bad2e7df9c084a7ce0a2badd3af80ed440045942eaca98bb9610d
-EBUILD palo-1.18.ebuild 1030 RMD160 e73b6c287365e7630c4781abc109ca9454870300 SHA1 2f8c7486fb85670562b99b5a32c4ae64ebe66a51 SHA256 0f563ac05b3693e09dc01141b508d5f45ea0529c0d6780d87ccbc613dd456b39
-MISC ChangeLog 4877 RMD160 3ebdbbffb05a9a3c7b74181c7bfe47603cfb8470 SHA1 5fdbc94bb39f668c36b5e753313efaf01c56d29b SHA256 74cb081fe053b49e02a44b8851369e08af89dedf4467d6a846b410248e1bbfb1
+EBUILD palo-1.18.ebuild 1029 RMD160 5bf2fb999214ee511b5914e70c806ec29034b927 SHA1 b961e4d22eea4b243d6618a2e915e606cd0bb802 SHA256 3a49075a550a248445a5ee20df757d81d6412984e231c1adc9566761c50e6e6b
+MISC ChangeLog 5026 RMD160 75b060ee033a1cc7addb63be24bfe1332993b445 SHA1 b728e19f42a780fe016077ab0e6e4f0ef99f138b SHA256 22ffb9eb09c7a89184aa882b14d3c3535a458c5b266daa7d7ad284f9c6b62aa6
 MISC metadata.xml 218 RMD160 7ebffdd97a99332a813fc08c76d8778cbaf6fbb1 SHA1 bf9a67f41e2a502fdd350ad6dc013c6a8610bd3d SHA256 d1a75fab2f73415e8705e229079747d610911988eefba166afeba4a965edeaad
diff --git a/sys-boot/palo/files/palo-1.17-fortify-source.patch b/sys-boot/palo/files/palo-1.17-fortify-source.patch
deleted file mode 100644
index 6a6adcdafdca..000000000000
--- a/sys-boot/palo/files/palo-1.17-fortify-source.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-  * palo/palo.c: Supply a mode to open() to go with the O_CREAT flag.
-
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=506083
-
---- a/palo/palo.c
-+++ b/palo/palo.c
-@@ -479,7 +479,7 @@
- 	    error(14, "bootloader");
- 
- 	sprintf(badblockfilename, "/tmp/paloblk-%d", getpid());
--	if ((fd = open(badblockfilename, O_RDWR | O_CREAT | O_TRUNC)) < 0) {
-+	if ((fd = open(badblockfilename, O_RDWR | O_CREAT | O_TRUNC, 0644)) < 0) {
- 	    perror(badblockfilename);
- 	    exit(1);
- 	}
diff --git a/sys-boot/palo/palo-1.17.ebuild b/sys-boot/palo/palo-1.17.ebuild
deleted file mode 100644
index 27e9328338fa..000000000000
--- a/sys-boot/palo/palo-1.17.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/palo/palo-1.17.ebuild,v 1.3 2010/07/13 01:56:26 jer Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="PALO : PArisc Linux Loader"
-HOMEPAGE="http://parisc-linux.org/ http://packages.qa.debian.org/p/palo.html"
-SRC_URI="mirror://debian/pool/main/p/${PN}/${P/-/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* hppa"
-IUSE=""
-
-DEPEND=""
-PROVIDE="virtual/bootloader"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch \
-		"${FILESDIR}"/${PN}-remove-HOME-TERM.patch \
-		"${FILESDIR}"/${PN}-1.16_p1-build.patch \
-		"${FILESDIR}"/${PN}-1.17-fortify-source.patch
-}
-
-src_compile() {
-	tc-export CC
-	emake -C palo || die "make palo failed"
-	emake -C ipl || die "make ipl failed"
-	emake MACHINE=parisc iplboot || die "make iplboot failed"
-}
-
-src_install() {
-	into /
-	dosbin palo/palo || die
-
-	doman palo.8
-	dohtml README.html
-	dodoc README palo.conf
-
-	insinto /etc
-	doins "${FILESDIR}"/palo.conf || die
-
-	insinto /usr/share/palo
-	doins iplboot || die
-}
diff --git a/sys-boot/palo/palo-1.18.ebuild b/sys-boot/palo/palo-1.18.ebuild
index 72a587806c7d..f9e75817aea9 100644
--- a/sys-boot/palo/palo-1.18.ebuild
+++ b/sys-boot/palo/palo-1.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/palo/palo-1.18.ebuild,v 1.1 2010/10/02 17:51:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/palo/palo-1.18.ebuild,v 1.2 2011/01/03 11:51:15 jer Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/p/${PN}/${P/-/_}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~hppa"
+KEYWORDS="-* hppa"
 IUSE=""
 
 PROVIDE="virtual/bootloader"