Fix sandbox violations with USE doc, bug #370013, upstream #651922.

Package-Manager: portage-2.1.9.50/cvs/Linux x86_64

4 files changed, 71 insertions, 8 deletions

diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog
index f09ca11c7d70..d79467630348 100644
--- a/gnome-extra/libgda/ChangeLog
+++ b/gnome-extra/libgda/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/libgda
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.167 2011/06/06 14:36:43 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.168 2011/06/07 08:17:07 pacho Exp $
+
+  07 Jun 2011; Pacho Ramos <pacho@gentoo.org> libgda-4.2.8.ebuild,
+  +files/libgda-4.2.8-sandbox-fix.patch:
+  Fix sandbox violations with USE doc, bug #370013, upstream #651922.
 
   06 Jun 2011; Christoph Mende <angelos@gentoo.org> libgda-4.2.8.ebuild,
   +files/libgda-4.2.8-ldap.patch:
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index db411aacdbef..adc56da98c63 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -1,10 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX libgda-4.2.0-missing-include-in-keyword_hash-generator.patch 897 RMD160 2a879a730831b7d6c05bf3a48df542cbf025adc4 SHA1 d76018f2b545290174cce55be7c4561edf7772bc SHA256 7cc133de8931b1dc86a08ee7a620e8b9218071723549734ea2290440318a7b8f
 AUX libgda-4.2.2-fix-build-order.patch 738 RMD160 b17874c3aab6b50b342e612e24bc706f4b6a077d SHA1 f72ecb1dd74a776decfb8fc6c7de1b0ceec90d43 SHA256 d8a293598d8277b766f5971066b27aeab45e2ead491b2250b5d700577c44a0e1
 AUX libgda-4.2.5-missing-m4.patch 359 RMD160 495d1eb184ffeb1d529a385291b61b41fccff445 SHA1 55c70bfdbaf9411a10ddf6f63b71f6e12b315703 SHA256 ed03d29bdb6454d6a54bd21cb1844ecd294e2d58593ec58496deb09953176b2f
 AUX libgda-4.2.8-ldap.patch 900 RMD160 aa2bb0c3972cbc06408b3905cea97ecde7b4d3c8 SHA1 c343c8f054706738691a3691b1db601b3d7df20a SHA256 fe2ca3407626b87b9daca3f20293ba91de7faeb099312ee0a1b627561f19f07f
+AUX libgda-4.2.8-sandbox-fix.patch 1884 RMD160 8f22b90ed93c634a01f9d2e3883ab346181c5131 SHA1 885cb7fc5d4cd899df1d9d28a9f70496f11b2120 SHA256 9eb945c021309a2ebd1d1f5f92c44a787b9e60519929f0c954e814a134e9ae0a
 DIST libgda-3.0.4.tar.bz2 2908854 RMD160 6efbf5a0f40277124dcc5464168677cc97be40e3 SHA1 50ba121e05ab1fbe95b66e8df4f54a0c6a30ef23 SHA256 3f9d75e9bc50610bf6033863b79265c7c9c702323b918caf90eb3923f971da48
 DIST libgda-4.2.2.tar.bz2 14091997 RMD160 2604f68f25ee1a44b9b44897a6d06a7d2ede63c1 SHA1 124c00c977b0cfd4a615c925ec79ee0ff97e107f SHA256 7d0bfca2eda3158fb44ff05890aabd79e6e4b357a03574eacf380dc03bcb9d87
 DIST libgda-4.2.7.tar.bz2 12636540 RMD160 ab3587f3ed2d049cd1e7bd1f051188e7f2405470 SHA1 8c2b1a744ba50008fa230be0f0abebdb8ea9b0b9 SHA256 0c95d2ae4563bbb024c9179a20e95a4b544a7d4fc687ca79ac6b33c5adc113d5
@@ -12,13 +13,13 @@ DIST libgda-4.2.8.tar.bz2 13130319 RMD160 ae4d1264b68122b3670c7bfbb7bc9b80fee9ae
 EBUILD libgda-3.0.4.ebuild 1995 RMD160 e8c0f30a4cc85d69c98ac3162a61c4cdb70cb039 SHA1 5aa1b85875f7aa3b64f7af9c6eaec3dbb00f4653 SHA256 daddd4b35901c0848fcd1f7c7f63193c44e1d9935701f0d49ce71aecc448832b
 EBUILD libgda-4.2.2.ebuild 3523 RMD160 3c2d6d860bce908a4899a1e4650423d767757cad SHA1 a029fdb96de02751d8a6751ca542deb90925c835 SHA256 4f0926ae46da5228ab8f6d389c7988acab75ca186fdb887898b202d8d6482bd9
 EBUILD libgda-4.2.7.ebuild 3673 RMD160 13189551efe8edf9338506a5bc6e3021055954dc SHA1 3e455d0345232a7781a0ff80e552d8f67ac41e10 SHA256 ceeb342355f59f7ef04088d1ab30e0e51fab76983fad85d68f3ab9841ce47bbf
-EBUILD libgda-4.2.8.ebuild 3833 RMD160 367a3972ce822ffb4bb88fb7bd311fce6483148b SHA1 d450aa3ddd83fa5a332d86664dc1010eca42fc60 SHA256 866adfdd2da33f3b9f514f930fc5d9744dfed774762fb3c0d8a31751f51b81c9
-MISC ChangeLog 25295 RMD160 899b2c990d6cbe82f9157e9a704859fd83b52613 SHA1 08e4aa51a485ecaa3a41dda41f68cd79f9c4f6c4 SHA256 199d4a96ff42728ff32d31f210d40bf2992d6bfee2b419511ba557d48aec8c7a
+EBUILD libgda-4.2.8.ebuild 3947 RMD160 ef3ac195ae3a55c828c94dae48313eaa9c77d961 SHA1 20b81aadae9f746547c5156dfd7c63d32996a63d SHA256 663f46fe89fd8ef9b3737b297b5e2373fed54929c7eb8bde0cfc2511530fca0d
+MISC ChangeLog 25472 RMD160 e3360a6d5c66b297955c092365852aa9f478def4 SHA1 f7ee9a28ba4482a98ea1d4bf7882fbd53498eb64 SHA256 80b8a73165840369a793e34036439fb31e06c74f2ff5abf0f7eae0361d1d83f7
 MISC metadata.xml 662 RMD160 b1ccb1efcefacfebab6e65d48e8bcd9cb5fa26b2 SHA1 d2faa83fd89fb86dbadfb846dd163633871a00b9 SHA256 ec5b2e3142cec4f76603d13d30843a887294646f285c278fc9e1258dae8e78e0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk3s5gEACgkQmWq1bYTyC0MH6QD/TbWtZd2ON0Xw2x91dlRIV1qk
-3mm655pPaRlqmQUNIYUA/0TuNdH1WDC9ZTxQioqavs61RzB+ZG/jB/0bABMjFh9m
-=iCw3
+iEYEARECAAYFAk3t3okACgkQCaWpQKGI+9SgvgCZAa+3bxOHtxiaYfKuqUa16ohO
+QicAnAxLWuEDHc52Xw5l6NCz6sOmZtH4
+=462w
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/libgda/files/libgda-4.2.8-sandbox-fix.patch b/gnome-extra/libgda/files/libgda-4.2.8-sandbox-fix.patch
new file mode 100644
index 000000000000..8d24430972d5
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-4.2.8-sandbox-fix.patch
@@ -0,0 +1,55 @@
+From 9c1a1809650321c3d752a143f87089d325c49237 Mon Sep 17 00:00:00 2001
+From: Vivien Malerba <malerba@gnome-db.org>
+Date: Mon, 06 Jun 2011 18:42:19 +0000
+Subject: Correction for bug #651922 - libgda-4.2.8 wants to write on /etc/libgda-4.0/config during compilation with --enable-gtk-doc
+
+---
+diff --git a/libgda/gda-config.c b/libgda/gda-config.c
+index e1b65c0..e0a51c7 100644
+--- a/libgda/gda-config.c
++++ b/libgda/gda-config.c
+@@ -20,6 +20,7 @@
+  * Boston, MA 02111-1307, USA.
+  */
+ 
++#include <unistd.h>
+ #include <stdio.h>
+ #include <gmodule.h>
+ #include <libgda/gda-config.h>
+@@ -630,12 +631,34 @@ gda_config_constructor (GType type,
+ 										    LIBGDA_ABI_NAME, "config", NULL);
+ 		unique_instance->priv->system_config_allowed = FALSE;
+ 		if (unique_instance->priv->system_file) {
++#ifdef G_OS_WIN32
++
+ 			FILE *file;
+                         file = fopen (unique_instance->priv->system_file, "a");  /* Flawfinder: ignore */
+                         if (file) {
+                                 unique_instance->priv->system_config_allowed = TRUE;
+                                 fclose (file);
+                         }
++#else
++			struct stat stbuf;
++			if (stat (unique_instance->priv->system_file, &stbuf) == 0) {
++				/* use effective user and group IDs */
++				uid_t euid;
++				gid_t egid;
++				euid = geteuid ();
++				egid = getegid ();
++				if (euid == stbuf.st_uid) {
++					if ((stbuf.st_mode & S_IWUSR) && (stbuf.st_mode & S_IRUSR))
++						unique_instance->priv->system_config_allowed = TRUE;
++				}
++				else if (egid == stbuf.st_gid) {
++					if ((stbuf.st_mode & S_IWGRP) && (stbuf.st_mode & S_IRGRP))
++						unique_instance->priv->system_config_allowed = TRUE;
++				}
++				else if ((stbuf.st_mode & S_IWOTH) && (stbuf.st_mode & S_IROTH))
++					unique_instance->priv->system_config_allowed = TRUE;
++			}
++#endif
+ 		}
+ 
+ 		/* Setup file monitoring */
+--
+cgit v0.9
diff --git a/gnome-extra/libgda/libgda-4.2.8.ebuild b/gnome-extra/libgda/libgda-4.2.8.ebuild
index 93d5e61721e5..68e206675e6b 100644
--- a/gnome-extra/libgda/libgda-4.2.8.ebuild
+++ b/gnome-extra/libgda/libgda-4.2.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-4.2.8.ebuild,v 1.2 2011/06/06 14:36:43 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-4.2.8.ebuild,v 1.3 2011/06/07 08:17:07 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -121,6 +121,9 @@ src_prepare() {
 	# Fix compilation without ldap, bug #370233, upstream #651713
 	epatch "${FILESDIR}/${P}-ldap.patch"
 
+	# Fix sandbox violations with USE doc, bug #370013, upstream #651922
+	epatch "${FILESDIR}/${P}-sandbox-fix.patch"
+
 	intltoolize --force --copy --automake || die
 	eautoreconf
 }