diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2006-06-04 12:58:53 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2006-06-04 12:58:53 +0000 |
| commit | d56d79426027a1f4021729f646d9adda4f3bb60c (patch) | |
| tree | 23459848ed04fc57c51d931d3a3217d332dd0412 /gnustep-base | |
| parent | fixed double http:// in HOMEPAGE (diff) | |
| download | gentoo-2-d56d79426027a1f4021729f646d9adda4f3bb60c.tar.gz gentoo-2-d56d79426027a1f4021729f646d9adda4f3bb60c.tar.bz2 gentoo-2-d56d79426027a1f4021729f646d9adda4f3bb60c.zip | |
Adding a patch for 1.12.0 to obey HOME env variable, which allows it to get out of package.mask. Removing stray files.
(Portage version: 2.1_rc2)
Diffstat (limited to 'gnustep-base')
5 files changed, 53 insertions, 3 deletions
diff --git a/gnustep-base/gnustep-base/ChangeLog b/gnustep-base/gnustep-base/ChangeLog index c246b0b232a5..00098adf51ba 100644 --- a/gnustep-base/gnustep-base/ChangeLog +++ b/gnustep-base/gnustep-base/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for gnustep-base/gnustep-base # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/ChangeLog,v 1.30 2006/03/19 14:37:51 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/ChangeLog,v 1.31 2006/06/04 12:58:53 grobian Exp $ + + 04 Jun 2006; Fabian Groffen <grobian@gentoo.org> + -files/base-path.patch-gsstartup-0.10.2, + -files/base-user-defaults.patch-1.10.2_pre20050312, + +files/gnustep-base-1.12.0-obey_homedir.patch, gnustep-base-1.12.0.ebuild: + Adding a patch for 1.12.0 to obey HOME env variable, which allows it to get + out of package.mask. Removed some stray files. *gnustep-base-1.12.0 (19 Mar 2006) diff --git a/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.3 b/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.3 index 258b08f6c6b4..8134e95da5ea 100644 --- a/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.3 +++ b/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.3 @@ -1 +1,3 @@ MD5 48d4f1dd5d01747c54c444a76b06a87d gnustep-base-1.10.3.tar.gz 1925587 +RMD160 15b6331503f5240e234e4002616a917d0ca81ef9 gnustep-base-1.10.3.tar.gz 1925587 +SHA256 6e5aba8478104c99a168665466c0e2e7d8feaaeb83e7a9e3901a97d37d6823a3 gnustep-base-1.10.3.tar.gz 1925587 diff --git a/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.3-r1 b/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.3-r1 index 258b08f6c6b4..8134e95da5ea 100644 --- a/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.3-r1 +++ b/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.3-r1 @@ -1 +1,3 @@ MD5 48d4f1dd5d01747c54c444a76b06a87d gnustep-base-1.10.3.tar.gz 1925587 +RMD160 15b6331503f5240e234e4002616a917d0ca81ef9 gnustep-base-1.10.3.tar.gz 1925587 +SHA256 6e5aba8478104c99a168665466c0e2e7d8feaaeb83e7a9e3901a97d37d6823a3 gnustep-base-1.10.3.tar.gz 1925587 diff --git a/gnustep-base/gnustep-base/files/gnustep-base-1.12.0-obey_homedir.patch b/gnustep-base/gnustep-base/files/gnustep-base-1.12.0-obey_homedir.patch new file mode 100644 index 000000000000..481c53718e85 --- /dev/null +++ b/gnustep-base/gnustep-base/files/gnustep-base-1.12.0-obey_homedir.patch @@ -0,0 +1,39 @@ +To avoid sandbox violations, we need GNUstep to obey the environment +variables before digging around in the password database for the +homedir. +-- grobian@gentoo.org + +--- gnustep-base-1.12.0/Source/NSPathUtilities.m ++++ gnustep-base-1.12.0/Source/NSPathUtilities.m +@@ -1050,12 +1050,28 @@ + + #if !defined(__MINGW32__) + struct passwd *pw; ++ char *env_var; + + [gnustep_global_lock lock]; +- pw = getpwnam ([loginName cString]); +- if (pw != 0 && pw->pw_dir != NULL) ++ /* First try to get the homedir from the environment; it may be more ++ * up-to-date then the password backend. If this fails for some ++ * reason, retrieve the homedir from the password backend. The first ++ * step to obey the user's environment variables is at least necessary ++ * for avoiding Gentoo portage's sandbox violations when building ++ * other GNUstep applications. ++ */ ++ if((env_var = getenv("HOME")) != NULL) ++ { ++ s = [NSString stringWithCString: (const char *)env_var]; ++ } ++ else + { +- s = [NSString stringWithCString: pw->pw_dir]; ++ /* ok, homedir variable not found, do a lookup */ ++ pw = getpwnam ([loginName cString]); ++ if (pw != 0 && pw->pw_dir != NULL) ++ { ++ s = [NSString stringWithCString: pw->pw_dir]; ++ } + } + [gnustep_global_lock unlock]; + #else diff --git a/gnustep-base/gnustep-base/gnustep-base-1.12.0.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.12.0.ebuild index 540ff7c67a72..bd28e890a223 100644 --- a/gnustep-base/gnustep-base/gnustep-base-1.12.0.ebuild +++ b/gnustep-base/gnustep-base/gnustep-base-1.12.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.12.0.ebuild,v 1.1 2006/03/19 14:37:51 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.12.0.ebuild,v 1.2 2006/06/04 12:58:53 grobian Exp $ inherit gnustep @@ -48,7 +48,7 @@ pkg_setup() { src_unpack() { unpack ${A} -# EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/base-user-defaults.patch-1.10.0 + epatch "${FILESDIR}/${P}"-obey_homedir.patch } src_compile() { |