Bump sources to include compile fixes for Interix and OpenBSD

Package-Manager: portage-2.2.01.18706-prefix/cvs/Darwin powerpc

4 files changed, 20 insertions, 85 deletions

diff --git a/sys-apps/baselayout-prefix/ChangeLog b/sys-apps/baselayout-prefix/ChangeLog
index 0d53c15058e3..e600608e277d 100644
--- a/sys-apps/baselayout-prefix/ChangeLog
+++ b/sys-apps/baselayout-prefix/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/baselayout-prefix
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/ChangeLog,v 1.11 2011/05/01 19:32:40 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/ChangeLog,v 1.12 2011/06/05 19:04:21 grobian Exp $
+
+  05 Jun 2011; Fabian Groffen <grobian@gentoo.org>
+  baselayout-prefix-1.12.14.ebuild, -files/baselayout-1.12.14-interix.patch:
+  Bump sources to include compile fixes for Interix and OpenBSD
 
   01 May 2011; Fabian Groffen <grobian@gentoo.org>
   baselayout-prefix-1.12.14.ebuild:
diff --git a/sys-apps/baselayout-prefix/Manifest b/sys-apps/baselayout-prefix/Manifest
index 9c073891780e..0d39ec056758 100644
--- a/sys-apps/baselayout-prefix/Manifest
+++ b/sys-apps/baselayout-prefix/Manifest
@@ -1,4 +1,6 @@
-AUX baselayout-1.12.14-interix.patch 2264 RMD160 ca5b011cd44a9aba70fdf942919897b10d2ea805 SHA1 58a910ee0384c9be7952f1c6f7fc55ce664e408b SHA256 bc88b8ca2ae1e1ec64d47cf71ee54e91a40d198118af08d8e49387bda0da2717
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX baselayout-1.12.5-aix.patch 2462 RMD160 63ef5b25f51ac773ae77fb4afc01b53221c144ae SHA1 01c299e2761247675192fe04619b11ebe02ddff3 SHA256 78e193dd8d68e2fc7ca32bca1059a20943231197bff3db07b8ef3ea3659d5f6b
 AUX baselayout-1.12.5-darwin-kvm.patch 431 RMD160 66200390deb12673cb11370b3d8bbf20551eba5e SHA1 679c7d152c3858800bf0e319134bce615d47e6be SHA256 2a6513beeffdb62af9cca8eafd3fa4ca3b2ab892fbe771a79ce0593be64f849f
 AUX baselayout-1.12.5-gnulib.patch 2110 RMD160 87007dc493c8a0489c08c96de9497d36da31fd31 SHA1 7d77ea55d3bb8da7d05a1d7970c38def4b9dfc4e SHA256 377ca60f1439e88de65972b6bed89f65441063c26afecae06d83eaf5de74645b
@@ -18,11 +20,18 @@ AUX baselayout-1.12.5-strsep.patch 778 RMD160 8447c3a7908bfbd3c3385e2b521f6c042d
 AUX baselayout-1.12.5-termios_h.patch 893 RMD160 398140de16da1b2fb874ef00f1caaa6c828372f4 SHA1 b3debc214fe8edbf734611990901018e32ea289b SHA256 60b4251ebce7488b415686178a0eae207adf18240f80523dbc0b4bc70a53ae99
 DIST baselayout-1.12.5-gnulib-2.tar.bz2 118355 RMD160 b8ffd7fb21f709e82e268358cff229cdde81df97 SHA1 23b06d800c0381e9dc124b270b53ace665730288 SHA256 ca279cbca8a0b39aa247e5ce56eadc3e2dba557cf5765be7a1971ffe12953900
 DIST baselayout-1.12.5.tar.bz2 220693 RMD160 85f03fe3b0ff0521ec4226a1b6788575052923b7 SHA1 39ef351ceec1238cbf27d7b9671f244ccf5cca33 SHA256 4ab5512f35c547549b0406221ed92c71a5a86a11044f1d9f0d87f7ec44d39817
-DIST baselayout-prefix-1.12.14.1707.tar.bz2 461385 RMD160 a86e54fa0f461c20abbc9ee4eb5079ff223fb281 SHA1 14ff664eef0574e643138a33506d2663742502a7 SHA256 4989fa2c1a47420ab9fcb7c941f87a89374241dc7a05c29818cae7e503692db6
+DIST baselayout-prefix-1.12.14.1709.tar.bz2 461562 RMD160 d11ff408a30941a33809537e7dc43810362b77fa SHA1 9a492e3e31efe47799b58a0f78139bb5b07ce82d SHA256 ca1eec028b7ec72f1e3196f71eafd564062d9b677569698fe41ac5f817c9379e
 DIST baselayout-prefix-1.12.5.1701.tar.bz2 412843 RMD160 ccad4b88bfc00f84fe0837c82e5e21d121f1f106 SHA1 99261aeae6a286be1584bec912052d79860aaf98 SHA256 452ee800e37c65d9c44e77130f0ea9f082e05df2f9a673523fe2e03170fa3099
-EBUILD baselayout-prefix-1.12.14.ebuild 5269 RMD160 e8ac78558f4b324a7814a7abe862757f76563afa SHA1 cb4142330e9a774effa8806f2d3a2c041e6b72af SHA256 3866054014f394d8ecdd5e13134743a34bef090bcee7ea6152f8849699c241d7
+EBUILD baselayout-prefix-1.12.14.ebuild 5215 RMD160 e068eaeffc0ec67811fd736e8d35ab40e5f0c676 SHA1 7177c85172a56eeabf822a25fa9e87c48a3808e0 SHA256 1ee1cad6ff9c7f91ef0465cdf236baeb447ce927935075d4e4e32cd7cc389350
 EBUILD baselayout-prefix-1.12.5-r10.ebuild 6789 RMD160 a27f52b56de5989e7539bdd59bb7739625b91e33 SHA1 85ef33d7aa018ca6811bff9269ea45cdc78a7b54 SHA256 e2f61467f809fbfb6394399d052c82d9196c5a7b515381cc2aaa2a7c6869eb35
 EBUILD baselayout-prefix-1.12.5-r11.ebuild 5267 RMD160 f44b2cf0f0d78be8c3f158d1b55313891212a43b SHA1 3a315e42751270a6fccd8be98751482dc5393e3b SHA256 faf1805a5d50a715ec070ea386c334b3ec2018a27ee24783612d85a225dca1b0
 EBUILD baselayout-prefix-1.12.5-r9.ebuild 6090 RMD160 5d2efafb4b0c98ce481ec337b22fbcd904dbefb4 SHA1 3e33dd1b8b431993218fb47fa2d3435c2113db06 SHA256 a4a125e509269b58323b275a6eb29056a9a95ac6502f02a2104529f4e4fbc4e1
-MISC ChangeLog 7126 RMD160 e819adae5ac343e08e0e5d648410ebeae9ff26b7 SHA1 611acd86060e2be9a973678d945e26848323cc65 SHA256 471bb9d8c7be97cecad553b9789f8125ba196bd91e3445c9776d7a08d87262ef
+MISC ChangeLog 7319 RMD160 d1942c96e8d2f38a5cb854ced300d548b3d736e4 SHA1 e76155185a8acdd79fbc5c0d787bea185c410011 SHA256 03cbebae3c7c462beba6cb426c3c183bd1e87f409b337dc21e4b5f93b082727a
 MISC metadata.xml 318 RMD160 d64b41bf7b5d0a12823b249c08ded6bbd5a7cbf5 SHA1 3598e969bff5d6802f19a3ed63017ec66383e58f SHA256 752beeb1c1ed6af782e2a2d9576720a8903af33d6b724426dbee987bc88fe6f7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (Darwin)
+
+iEYEARECAAYFAk3r0xoACgkQX3X2B8XHTolPLQCeN2eB1iXOnY48HS5eGBCh8Dgy
+k1EAoJDowSpR5laoIaLabJWMmCSkBB4w
+=H0vK
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-1.12.14.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-1.12.14.ebuild
index 6ebab8751081..8cd848117223 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-1.12.14.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-1.12.14.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/baselayout-prefix-1.12.14.ebuild,v 1.3 2011/05/09 07:41:54 mduft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/baselayout-prefix-1.12.14.ebuild,v 1.4 2011/06/05 19:04:21 grobian Exp $
 
 EAPI=3
 
 inherit eutils toolchain-funcs multilib prefix flag-o-matic autotools
 
 # last part in e.g. 1.12.14.1704
-PVER=1707
+PVER=1709
 
 DESCRIPTION="Baselayout for Gentoo Prefix installs"
 HOMEPAGE="http://prefix.gentoo.org/"
@@ -40,8 +40,6 @@ src_prepare() {
 	# The consoletype application in this form will only work on Linux
 	[[ ${CHOST} == *-linux-* ]] || epatch "${FILESDIR}"/baselayout-1.12.5-prefix-no-consoletype.patch
 
-	epatch "${FILESDIR}"/baselayout-1.12.14-interix.patch
-
 	cd "${S}"
 	eprefixify \
 		etc/env.d/00basic \
diff --git a/sys-apps/baselayout-prefix/files/baselayout-1.12.14-interix.patch b/sys-apps/baselayout-prefix/files/baselayout-1.12.14-interix.patch
deleted file mode 100644
index 60e11150e6d0..000000000000
--- a/sys-apps/baselayout-prefix/files/baselayout-1.12.14-interix.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -ru baselayout-prefix-1.12.14.1707.orig/src/headers.h baselayout-prefix-1.12.14.1707/src/headers.h
---- baselayout-prefix-1.12.14.1707.orig/src/headers.h	2011-05-02 15:10:43 +0200
-+++ baselayout-prefix-1.12.14.1707/src/headers.h	2011-05-02 14:34:30 +0200
-@@ -8,7 +8,9 @@
-  */
- 
- /* Common includes */
--#define HAVE_TIOCNOTTY
-+#ifndef OSInterix
-+# define HAVE_TIOCNOTTY
-+#endif
- #define HAVE_SETSID
- 
- /* OS-specific includes */
-diff -ru baselayout-prefix-1.12.14.1707.orig/src/start-stop-daemon.c baselayout-prefix-1.12.14.1707/src/start-stop-daemon.c
---- baselayout-prefix-1.12.14.1707.orig/src/start-stop-daemon.c	2011-05-02 15:10:43 +0200
-+++ baselayout-prefix-1.12.14.1707/src/start-stop-daemon.c	2011-05-02 15:10:23 +0200
-@@ -60,6 +60,8 @@
- #  define OSDarwin
- #elif defined(_AIX)
- #  define OSaix
-+#elif defined(__INTERIX)
-+#  define OSInterix
- #else
- #  error Unknown architecture - cannot build start-stop-daemon
- #endif
-@@ -93,7 +95,7 @@
- #include <sys/pstat.h>
- #endif
- 
--#if defined(OSaix)
-+#if defined(OSaix) || defined(OSInterix)
- #include <sys/procfs.h>
- #endif
- #if defined(OSsunos)
-@@ -808,7 +810,7 @@
- /* WTA: this  needs to be an autoconf check for /proc/pid existance.
-  */
- 
--#if defined(OSLinux) || defined (OSsunos) || defined(OSfreebsd) || defined(OSaix) || defined(OSsunos)
-+#if defined(OSLinux) || defined (OSsunos) || defined(OSfreebsd) || defined(OSaix) || defined(OSsunos) || defined(OSInterix)
- static void
- do_procinit(void)
- {
-@@ -1076,7 +1078,7 @@
- }
- #endif /* OShpux */
- 
--#if defined(OSaix) || defined(OSsunos)
-+#if defined(OSaix) || defined(OSsunos) || defined(OSInterix)
- /* max possible pid (signed long) in theory:
-  * 32bit: 2147483647 (10 digits)
-  * 64bit: 9223372036854775807 (19 digits)
-@@ -1112,7 +1114,11 @@
- {
- 	char buf[40];
- 	FILE *f;
-+    #ifdef OSInterix
-+    psinfo_t psi;
-+    #else
- 	struct psinfo psi;
-+    #endif
- 	int r;
- 
- 	sprintf(buf, "/proc/%ld/psinfo", pid);
-@@ -1466,8 +1472,10 @@
- 	if (changeuser != NULL) {
- 		if (setgid(runas_gid))
- 			fatal("Unable to set gid to %d", runas_gid);
-+#ifndef OSInterix
- 		if (initgroups(changeuser, runas_gid))
- 			fatal("Unable to set initgroups() with gid %d", runas_gid);
-+#endif
- 		if (setuid(runas_uid))
- 			fatal("Unable to set uid to %s", changeuser);
- 	}