[gentoo-commits] proj/portage:prefix commit in: pym/portage/

[gentoo-commits] proj/portage:prefix commit in: pym/portage/

[Fabian Groffen]

commit:     1d0a2f6f5415e45c7de297927b175d5f58b94e24
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  9 20:39:21 2011 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Dec  9 20:39:21 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=1d0a2f6f

const.py: rely on EPREFIX from const_autotool.py

---
 pym/portage/const.py |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/pym/portage/const.py b/pym/portage/const.py
index 336c005..83d6696 100644
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@ -191,7 +191,9 @@ MANIFEST2_IDENTIFIERS    = ("AUX", "MISC", "DIST", "EBUILD")
 # a config instance (since it's possible to contruct a config instance with
 # a different EPREFIX). Therefore, the EPREFIX constant should *NOT* be used
 # in the definition of any other contstants within this file.
-EPREFIX=""
+# PREFIX LOCAL: rely on EPREFIX from autotools
+#EPREFIX=""
+# END PREFIX LOCAL
 
 # pick up EPREFIX from the environment if set
 if "__PORTAGE_TEST_EPREFIX" in os.environ:

[gentoo-commits] proj/portage:prefix commit in: pym/portage/

[Fabian Groffen]

commit:     97ad87a656c26e93f3d4d51776dfb9e7533c7d25
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 12:06:09 2011 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Dec 10 12:06:09 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=97ad87a6

remove conflict marker

---
 pym/portage/dispatch_conf.py |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/pym/portage/dispatch_conf.py b/pym/portage/dispatch_conf.py
index 11a6a7d..88ed222 100644
--- a/pym/portage/dispatch_conf.py
+++ b/pym/portage/dispatch_conf.py
@@ -42,7 +42,6 @@ def diffstatusoutput_len(cmd):
 def read_config(mandatory_opts):
     eprefix = EPREFIX
     config_path = os.path.join(eprefix or os.sep, "etc/dispatch-conf.conf")
->>>>>>> overlays-gentoo-org/master
     loader = KeyValuePairFileLoader(config_path, None)
     opts, errors = loader.load()
     if not opts:

[gentoo-commits] proj/portage:prefix commit in: pym/portage/

[Fabian Groffen]

commit:     474d90ae979a40248362d5c4781b141f11acaac0
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 12:12:17 2011 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Dec 10 12:12:17 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=474d90ae

_get_global: fix up late night screwup

---
 pym/portage/data.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pym/portage/data.py b/pym/portage/data.py
index 196e5dc..e25b545 100644
--- a/pym/portage/data.py
+++ b/pym/portage/data.py
@@ -155,10 +155,10 @@ def _get_global(k):
 		v = env.get('PORTAGE_GRPNAME', PORTAGE_GROUPNAME)
 		# END PREFIX LOCAL
 	elif k == '_portage_uname':
+		env = getattr(portage, 'settings', os.environ)
 		# PREFIX LOCAL: use var iso hardwired 'portage'
-		env = getattr(portage, 'settings', PORTAGE_USERNAME)
+		v = env.get('PORTAGE_USERNAME', PORTAGE_USERNAME)
 		# END PREFIX LOCAL
-		v = env.get('PORTAGE_USERNAME', 'portage')
 	else:
 		raise AssertionError('unknown name: %s' % k)
 

[gentoo-commits] proj/portage:prefix commit in: pym/portage/

[Fabian Groffen]

commit:     c9d5e1d1ce3dcc1d9411837356c305080aa3dde4
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 12:40:16 2011 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Dec 10 12:40:16 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=c9d5e1d1

remove unused import

---
 pym/portage/data.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/pym/portage/data.py b/pym/portage/data.py
index e25b545..f2f541f 100644
--- a/pym/portage/data.py
+++ b/pym/portage/data.py
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 import os, pwd, grp, platform
-from portage.const import PORTAGE_GROUPNAME, PORTAGE_USERNAME, rootuid, EPREFIX
+from portage.const import PORTAGE_GROUPNAME, PORTAGE_USERNAME, EPREFIX
 
 import portage
 portage.proxy.lazyimport.lazyimport(globals(),

[gentoo-commits] proj/portage:prefix commit in: pym/portage/

[Fabian Groffen]

commit:     1fd41e665b7c1c404eaf67d981e701d90817f784
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 14 15:27:58 2011 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Dec 14 15:27:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=1fd41e66

Resolve conflict.

Long ago, VCSs would warn when you would want to commit conflict
markers.

---
 pym/portage/data.py |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/pym/portage/data.py b/pym/portage/data.py
index 5651e7d..b2aac06 100644
--- a/pym/portage/data.py
+++ b/pym/portage/data.py
@@ -90,10 +90,6 @@ def _get_global(k):
 			secpass = 2
 		#Discover the uid and gid of the portage user/group
 		try:
-<<<<<<< HEAD
-=======
-			portage_uid = pwd.getpwnam(_get_global('_portage_username')).pw_uid
->>>>>>> overlays-gentoo-org/master
 			portage_gid = grp.getgrnam(_get_global('_portage_grpname')).gr_gid
 		except KeyError:
 			# PREFIX LOCAL: some sysadmins are insane, bug #344307
@@ -103,7 +99,7 @@ def _get_global(k):
 				portage_gid = None
 			# END PREFIX LOCAL
 		try:
-			portage_uid = pwd.getpwnam(_get_global('_portage_uname')).pw_uid
+			portage_uid = pwd.getpwnam(_get_global('_portage_username')).pw_uid
 			if secpass < 1 and portage_gid in os.getgroups():
 				secpass = 1
 		except KeyError:

[gentoo-commits] proj/portage:prefix commit in: pym/portage/

[Fabian Groffen]

commit:     164603cf0724d973b22a08fc04c9c4f3ad94f89a
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 18 07:58:30 2012 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jan 18 07:58:30 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=164603cf

_get_global: substitute with existing variable, bug #398805

---
 pym/portage/data.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/pym/portage/data.py b/pym/portage/data.py
index a136093..be0c853 100644
--- a/pym/portage/data.py
+++ b/pym/portage/data.py
@@ -197,7 +197,7 @@ def _get_global(k):
 		if v is None:
 			# PREFIX LOCAL: use var iso hardwired 'portage'
 			if k == '_portage_grpname':
-				v = PORTAGE_GRPNAME
+				v = PORTAGE_GROUPNAME
 			else:
 				v = PORTAGE_USERNAME
 			# END PREFIX LOCAL

[gentoo-commits] proj/portage:prefix commit in: pym/portage/

[Fabian Groffen]

commit:     86fd28940bd83d1f59622adc90cf79712b061952
Author:     Lucian Poston <lucianposton <AT> gmail <DOT> com>
AuthorDate: Thu Mar  1 20:31:12 2012 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Mar  1 20:31:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=86fd2894

_get_global: reference correct variable

---
 pym/portage/data.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/pym/portage/data.py b/pym/portage/data.py
index be0c853..23734f4 100644
--- a/pym/portage/data.py
+++ b/pym/portage/data.py
@@ -115,7 +115,7 @@ def _get_global(k):
 			portage_gid = 0
 			# PREFIX LOCAL: we need to fix this one day to distinguish prefix vs non-prefix
 			writemsg(colorize("BAD",
-				_("portage: '%s' user or '%s' group missing." % (_get_global('_portage_uname'), _get_global('_portage_grpname')))) + "\n", noiselevel=-1)
+				_("portage: '%s' user or '%s' group missing." % (_get_global('_portage_username'), _get_global('_portage_grpname')))) + "\n", noiselevel=-1)
 			writemsg(colorize("BAD",
 				_("         In Prefix Portage this is quite dramatic")) + "\n", noiselevel=-1)
 			writemsg(colorize("BAD",

[gentoo-commits] proj/portage:prefix commit in: pym/portage/

[Fabian Groffen]

commit:     dca1caedb18ee91a68d763961c339619f065ad1d
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 30 10:57:39 2012 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Sep 30 10:57:39 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=dca1caed

MACOSSANDBOX_PROFILE: improve performance/functionality on Lion

Lion now logs by default all denied access calls, which slows down
considerably.  Next allow access to /dev/tty and /dev/dtracehelper which
seem useful in general.

Patch by Michael Weisner, bug #430640

---
 pym/portage/const.py |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/pym/portage/const.py b/pym/portage/const.py
index 8aab65f..a460b7e 100644
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@ -79,11 +79,13 @@ MACOSSANDBOX_PROFILE     = '''(version 1)
 
 (allow default)
 
-(deny file-write*)
+(deny file-write* (with no-log))
 
 (allow file-read* file-write*
   (literal
     #"@@WRITEABLE_PREFIX@@"
+    #"/dev/tty"
+    #"/dev/dtracehelper"
   )
 
   (regex

[gentoo-commits] proj/portage:prefix commit in: pym/portage/

[Fabian Groffen]

commit:     aea22906ecef2c179ae7f7d5384e2f785241b77d
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 30 11:02:21 2012 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Sep 30 11:02:21 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=aea22906

SUPPORTED_FEATURES: remove macossandbox cruft

remove some cruft left over from previous macossandbox
patches in const.py

Patch by Michael Weisner, bug #430640

---
 pym/portage/const.py |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/pym/portage/const.py b/pym/portage/const.py
index a460b7e..74cda03 100644
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@ -133,7 +133,6 @@ SUPPORTED_FEATURES       = frozenset([
                            "downgrade-backup", "ebuild-locks", "fakeroot",
                            "fail-clean", "force-mirror", "force-prefix", "getbinpkg",
                            "installsources", "keeptemp", "keepwork", "fixlafiles", "lmirror",
-                            "macossandbox", "macosprefixsandbox", "macosusersandbox",
                            "metadata-transfer", "mirror", "multilib-strict", "news",
                            "noauto", "noclean", "nodoc", "noinfo", "noman",
                            "nostrip", "notitles", "parallel-fetch", "parallel-install",

[gentoo-commits] proj/portage:prefix commit in: pym/portage/

[Fabian Groffen]

commit:     d5dbe1cd6dd79ee57966d216a531a67256b34d67
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  2 11:57:33 2012 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Oct  2 11:57:33 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d5dbe1cd

MACOSSANDBOX_PROFILE: drop (with no-log)

Earlier implementations of seatbelt don't understand the no-log
attribute, and hence abort.  (Found on Leopard (10.5).)  Since we should
only log when there is something wrong, always logging should be no
performance penalty at all.

---
 pym/portage/const.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/pym/portage/const.py b/pym/portage/const.py
index 74cda03..af040ed 100644
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@ -79,7 +79,7 @@ MACOSSANDBOX_PROFILE     = '''(version 1)
 
 (allow default)
 
-(deny file-write* (with no-log))
+(deny file-write*)
 
 (allow file-read* file-write*
   (literal

[gentoo-commits] proj/portage:prefix commit in: pym/portage/

[Fabian Groffen]

commit:     a012bee270aa28957a701b20eb8b7f5092548aaf
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 27 21:51:10 2013 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jan 27 21:51:10 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a012bee2

from __future__ imports must occur at the beginning of the file

---
 pym/portage/const.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/pym/portage/const.py b/pym/portage/const.py
index 057f9e2..84c6865 100644
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@ -2,11 +2,12 @@
 # Copyright 1998-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+from __future__ import unicode_literals
+
 # ===========================================================================
 # autotool supplied constants.
 # ===========================================================================
 from portage.const_autotool import *
-from __future__ import unicode_literals
 
 import os
 

[gentoo-commits] proj/portage:prefix commit in: pym/portage/

[Fabian Groffen]

commit:     6b13996ffd2f9aee9bf924a304a4a4073ad84421
Author:     Michael Weiser <michael.weiser <AT> gmx <DOT> de>
AuthorDate: Fri Dec  8 10:00:47 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Dec 12 08:12:36 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=6b13996f

Fix macOS 10.13 seatbelt sandbox suid bit setting

macOS 10.13 changed the defaults for what is allowed in a seatbelt
sandbox, denying setting suid and sgid bits on files. See
https://trac.macports.org/ticket/54963 for additional information.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 pym/portage/const.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pym/portage/const.py b/pym/portage/const.py
index 172c5b189..bdb287379 100644
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@ -83,7 +83,7 @@ MACOSSANDBOX_BINARY      = "/usr/bin/sandbox-exec"
 MACOSSANDBOX_PROFILE     = '''(version 1)
 (allow default)
 (deny file-write*)
-(allow file-write*
+(allow file-write* file-write-setugid
 @@MACOSSANDBOX_PATHS@@)
 (allow file-write-data
 @@MACOSSANDBOX_PATHS_CONTENT_ONLY@@)'''

[gentoo-commits] proj/portage:prefix commit in: pym/portage/

[Fabian Groffen]

commit:     38cc817c5cecee61407ce78165c7eaebc1634664
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri May 18 19:40:30 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri May 18 19:40:30 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=38cc817c

versions: change inter-revisions not to require a leading 0

There is need by some for being able to version ebuilds shadowed from
the main tree, so we drop the special flagging from this feature to make
it more general consumptive.

 pym/portage/versions.py | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/pym/portage/versions.py b/pym/portage/versions.py
index 7f75d1cc9..0b1d50e7c 100644
--- a/pym/portage/versions.py
+++ b/pym/portage/versions.py
@@ -51,8 +51,8 @@ _pkg = {
 }
 
 _v = r'(\d+)((\.\d+)*)([a-z]?)((_(pre|p|beta|alpha|rc)\d*)*)'
-# PREFIX_LOCAL hack: -r(\d+) -> -r(\d+|0\d+\.\d+) (see below)
-_rev = r'(\d+|0\d+\.\d+)'
+# PREFIX_LOCAL hack: -r(\d+) -> -r(\d+|\d+\.\d+) (see below)
+_rev = r'(\d+|\d+\.\d+)'
 # END_PREFIX_LOCAL
 _vr = _v + '(-r(' + _rev + '))?'
 
@@ -254,16 +254,22 @@ def vercmp(ver1, ver2, silent=1):
 
 	# PREFIX_LOCAL
 	# The suffix part is equal too, so finally check the revision
-	# Prefix hack: a revision starting with 0 is an 'inter-revision',
-	# which means that it is possible to create revisions on revisions.
-	# An example is -r01.1 which is the first revision of -r1.  Note
-	# that a period (.) is used to separate the real revision and the
-	# secondary revision number.  This trick is in use to allow revision
-	# bumps in ebuilds synced from the main tree for Prefix changes,
-	# while still staying in the main tree versioning scheme.
+	# Prefix hack: historically a revision starting with 0 was an
+	# 'inter-revision', which means that it is possible to create
+	# revisions on revisions.  An example is -r01.1 which is the
+	# first revision of -r1.  Note that a period (.) is used to
+	# separate the real revision and the secondary revision number.
+	# In the current state, the leading 0 is no longer used, and
+	# versions just can have a dot, which means the version is an
+	# inter-revision.
+	# This trick is in use to allow revision bumps in ebuilds synced
+	# from the main tree for Prefix changes, while still staying in
+	# the main tree versioning scheme.  As such it can be used in
+	# any other overlay where ebuilds from the another tree are
+	# shadowed.
 	if match1.group(9):
-		if match1.group(9)[0] == '0' and '.' in match1.group(9):
-			t = match1.group(9)[1:].split(".")
+		if '.' in match1.group(9):
+			t = match1.group(9).split(".")
 			r1 = int(t[0])
 			r3 = int(t[1])
 		else:
@@ -273,8 +279,8 @@ def vercmp(ver1, ver2, silent=1):
 		r1 = 0
 		r3 = 0
 	if match2.group(9):
-		if match2.group(9)[0] == '0' and '.' in match2.group(9):
-			t = match2.group(9)[1:].split(".")
+		if '.' in match2.group(9):
+			t = match2.group(9).split(".")
 			r2 = int(t[0])
 			r4 = int(t[1])
 		else: