Fix build on fbsd and keyword it x86-fbsd

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 48 insertions, 10 deletions

diff --git a/sys-auth/consolekit/Manifest b/sys-auth/consolekit/Manifest
index 066d4c1fb070..cf7fdf65cc7a 100644
--- a/sys-auth/consolekit/Manifest
+++ b/sys-auth/consolekit/Manifest
@@ -17,13 +17,13 @@ AUX pam-foreground-compat.ck 389 RMD160 b72a66d5fde612a825fb60f0f1402a0665cc6d81
 DIST ConsoleKit-0.3.0.tar.bz2 393694 RMD160 7a1ebd2f4bfb65690e70138c9923c3fd2fcaf671 SHA1 e3b6156622cc14ebca7382a55b8ed15f2f2bad98 SHA256 cbcfbb3df2dc76855c99c1cdff04a257ec5270fa62e1d21b0d057b08d88c0fd4
 DIST ConsoleKit-0.4.1.tar.bz2 398080 RMD160 800076645134ad63d582ea9ffb3ada0113a32db1 SHA1 ab2b8643c1e696df4dc79d9ee0323bdc95aaa6a1 SHA256 f032adc6146d745034315054c5822a7a09f30e20a40d6e802221fa977354403e
 EBUILD consolekit-0.3.0-r2.ebuild 3088 RMD160 90b269faf7d6c0870f80841e22627ce7bd37d92a SHA1 d8bc4886750a2ee06db4522ded18e7594d8e2183 SHA256 944b0857f877317c2db086dc675d19654223cddbddd9be315bc87449c6bce528
-EBUILD consolekit-0.4.1.ebuild 2965 RMD160 3c1825d401541340b542f5a51e0995dca250e036 SHA1 19c7dfa44c9e77f77ca9f4b2ca77bd5801365176 SHA256 d2de5cbc053a5853033b83d7a33da6de75ea56e6fb034b1e49e7a210f0fb6ac2
-MISC ChangeLog 9725 RMD160 b9b4f6274f4c7392be6f900d502645b74222687a SHA1 309c4166420396d52c13236e51239532ef7e0c5c SHA256 f4410587abc059f3cb90c2a3ed61117a5c218f1a9c135ac19f16b9d7ce080259
+EBUILD consolekit-0.4.1.ebuild 2979 RMD160 a4707c35ca9cc52eb6fb55690d48d6d01ad4f7f4 SHA1 86cb20ea737bf007891834ee4982e237403dcf84 SHA256 b7eef208a135d58171eb4343434a0ad70619e750d634739fbf78b2a73a5aba5c
+MISC ChangeLog 9827 RMD160 4cf2853d37ec6e9311d7a1be0f9a4d63737a3d0c SHA1 0a427ef7a208007cd9f920a1f5493a8bd6d8d7f0 SHA256 77f0fa9d5cc568f441b514fca05968925b1bed4161d22f259ed6751bc17e53fa
 MISC metadata.xml 316 RMD160 0d18a4fee930a899bcd1eeff6fc7fe4de491f71b SHA1 0643d12b32e383861623f4f257f9d5b1446a90da SHA256 d026b12ac11b38e175987871769588146cf0c587a1462559cd1581ae05aaa83d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuxu5YACgkQOypDUo0oQOqDMACgtoE+gvD90muOOQpfBOXvm6+h
-B4QAnjWtRPTyVUXSnlX4E5k4GORmdMkr
-=WbIu
+iEYEARECAAYFAkvEikMACgkQvFcC4BYPU0oV0wCfUIWDifTUe03T8k9b949YNX0Z
+1N4AnjVkvxCsUyzIYDy4wK5vwNfDMbQo
+=xVng
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/polkit/ChangeLog b/sys-auth/polkit/ChangeLog
index bf8b48bcd675..f6deffc9bc28 100644
--- a/sys-auth/polkit/ChangeLog
+++ b/sys-auth/polkit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-auth/polkit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.13 2010/03/25 14:50:22 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.14 2010/04/13 15:12:52 aballier Exp $
+
+  13 Apr 2010; Alexis Ballier <aballier@gentoo.org> polkit-0.96-r1.ebuild,
+  +files/polkit-0.96-getcwd.patch:
+  Fix build on fbsd and keyword it x86-fbsd
 
   25 Mar 2010; Nirbheek Chauhan <nirbheek@gentoo.org> polkit-0.96.ebuild,
   polkit-0.96-r1.ebuild:
diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index 6aca258237e8..6719adb10e3c 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX polkit-0.96-getcwd.patch 652 RMD160 400afc6333cebf50dcdc0c5167cb6bd4dbaf8ea4 SHA1 9d2e3bfb472477ce3e58ab0259349f5acd4a00a4 SHA256 21cda125a62cf1c26f1cecbac223e9a6b00400486087be818243ee3ee4a93f7b
 DIST polkit-0.96-r1-shadow-support.patch.lzma 4970 RMD160 51c53d8be68bfdfa0b5a3eb2a4d8ddbba10c94b6 SHA1 bd4d3446aea77e3c84ad94a28f9644307921a086 SHA256 c7c323be29362816abd08463b962cd38a97c24f61d5f8b6da635e2bb329fa52a
 DIST polkit-0.96-shadow-support.patch.bz2 6138 RMD160 97ed7fc118e1f52f8182f872992eb068f5c98584 SHA1 83b53931a9cfe47a4e4b9501c0f75164dfa9ed11 SHA256 dde65f3795a2d1bef8f009a2f9bc0c3ee0130037bf012cf66b874128a76ef4e6
 DIST polkit-0.96.tar.gz 1034210 RMD160 19847f0835a3041446523066e6db58dfb60d3aae SHA1 0815b2ee2ffc2ebf2b6fc73491018a898fc73930 SHA256 3426ca917210b2a5525732559368c18f983a4c39a6a55c5dddba26071bd8054a
-EBUILD polkit-0.96-r1.ebuild 2586 RMD160 a28c2894d15762991a7a2652207ee400b9f79a0d SHA1 5001d2c686279ff6ffb5b564dcac3abc0420be66 SHA256 75d60d1edd84c06297816bd29c690110409f64b269865d3c1a894faaad4aae1b
+EBUILD polkit-0.96-r1.ebuild 2636 RMD160 1d8c61121c996d6b6ca13b263828fd531fe4ce53 SHA1 15a66abf456a2748b87fa70356a8da996b50f8ba SHA256 7964a73660910930276d30c46e222d4f33d055f420ef517c72f5607326dd2f1a
 EBUILD polkit-0.96.ebuild 2576 RMD160 be5a6657837e38def746924bfa044a9149acf5ce SHA1 152ab047d4d4a66c3c2508d14074dd3d5f589e76 SHA256 ccd6dc882714a46c1858e1ab53eabd1395aa6ddf0c9a1996bf160348ca39b7a6
-MISC ChangeLog 2217 RMD160 af2abc7efacb0516d128f07f42d42e472313b488 SHA1 23ef4b279165893274d093c7921938ade3df92b2 SHA256 df06c039a3933782943564e7e22179659ca38b21cde9f6eac13a9564f27e6b67
+MISC ChangeLog 2372 RMD160 82fc2f90af4f2ae080a855f1d2cc2a82cf88bfc3 SHA1 991203f3368da13b78bc787a4857eb24b2a5b7ec SHA256 3f4afa9c7b42670a3c2d9cc569618be005a08d4f6829a6c54a30a0a336dcf488
 MISC metadata.xml 264 RMD160 f7bfc23d1c5e228cd950c1fa06e082cadd2ee9d9 SHA1 b4cdbdd94b4b8458da59d172dc5236e9258470b6 SHA256 732b5a3d20630082ef289dbde0c57aaa9cec42c19982ce6c735a02aa89ed113b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkvEifoACgkQvFcC4BYPU0rEZgCfbbkGXKwyHxNBlCv0ovS3eiRJ
+dO4AoMaGVX20H+2jDADSVQ0l63lmSqOs
+=ces2
+-----END PGP SIGNATURE-----
diff --git a/sys-auth/polkit/files/polkit-0.96-getcwd.patch b/sys-auth/polkit/files/polkit-0.96-getcwd.patch
new file mode 100644
index 000000000000..cca8a2bd10f2
--- /dev/null
+++ b/sys-auth/polkit/files/polkit-0.96-getcwd.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/show_bug.cgi?id=309457
+https://bugs.freedesktop.org/show_bug.cgi?id=27081
+
+--- src/programs/pkexec.c.old	2010-03-15 08:49:30.000000000 +0100
++++ src/programs/pkexec.c	2010-03-15 08:54:16.000000000 +0100
+@@ -375,6 +375,7 @@
+   gchar *path;
+   struct passwd pwstruct;
+   gchar pwbuf[8192];
++  gchar cwdbuf[PATH_MAX];
+   gchar *s;
+   const gchar *environment_variables_to_save[] = {
+     "SHELL",
+@@ -438,7 +439,7 @@
+       goto out;
+     }
+ 
+-  original_cwd = g_strdup (get_current_dir_name ());
++  original_cwd = g_strdup (getcwd(cwdbuf,PATH_MAX));
+   if (original_cwd == NULL)
+     {
+       g_printerr ("Error getting cwd.\n");
diff --git a/sys-auth/polkit/polkit-0.96-r1.ebuild b/sys-auth/polkit/polkit-0.96-r1.ebuild
index 3c755083e4d5..ddbf42aa1ffb 100644
--- a/sys-auth/polkit/polkit-0.96-r1.ebuild
+++ b/sys-auth/polkit/polkit-0.96-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.96-r1.ebuild,v 1.2 2010/03/25 14:50:22 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.96-r1.ebuild,v 1.3 2010/04/13 15:12:52 aballier Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ SRC_URI="http://hal.freedesktop.org/releases/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="debug doc examples expat nls pam"
 # introspection
 
@@ -40,6 +40,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}/${P}-getcwd.patch"
 	if ! use pam; then
 		# Experimental shadow support, bug 291116
 		epatch "${WORKDIR}/${P}-r1-shadow-support.patch"