[gentoo-commits] proj/portage:master commit in: lib/portage/sync/

[gentoo-commits] proj/portage:master commit in: lib/portage/sync/

[Zac Medico]

commit:     bcedb21fea9c6b2ba67f3bc49cf1093260f9138d
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 25 19:48:09 2019 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Jun 25 20:06:07 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=bcedb21f

SyncBase: fix keyserver None message (bug 688648)

Fixes: 244a4021ce58 ("repos.conf: add sync-openpgp-keyserver option (bug 680908)")
Bug: https://bugs.gentoo.org/688648
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 lib/portage/sync/syncbase.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/portage/sync/syncbase.py b/lib/portage/sync/syncbase.py
index ae9ec938e..d15bb6d14 100644
--- a/lib/portage/sync/syncbase.py
+++ b/lib/portage/sync/syncbase.py
@@ -252,7 +252,8 @@ class SyncBase(object):
 		@type openpgp_env: gemato.openpgp.OpenPGPEnvironment
 		"""
 		out = portage.output.EOutput(quiet=('--quiet' in self.options['emerge_config'].opts))
-		out.ebegin('Refreshing keys from keyserver {s}'.format(s=self.repo.sync_openpgp_keyserver))
+		out.ebegin('Refreshing keys from keyserver{}'.format(
+			('' if self.repo.sync_openpgp_keyserver is None else ' ' + self.repo.sync_openpgp_keyserver)))
 		retry_decorator = self._key_refresh_retry_decorator()
 		if retry_decorator is None:
 			openpgp_env.refresh_keys(keyserver=self.repo.sync_openpgp_keyserver)

[gentoo-commits] proj/portage:master commit in: lib/portage/sync/

[Michał Górny]

commit:     b1ab50f40c32959c0341dcdb37e6d4a99a25c712
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  5 05:09:06 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jul  5 05:39:20 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=b1ab50f4

sync: Split key refresh into explicit WKD/keyserver phases

Split key refresh into two parts: first try to refresh the key via WKD,
then via keyservers, rather than using the combined function that is
less explicit.  This ensures that users are correctly informed whether
keyservers are actually used, and therefore whether they may be subject
to SKS poisoning attacks.  Furthermore, it skips WKD from retry loop.

Reviewed-by: Zac Medico <zmedico <AT> gentoo.org>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 lib/portage/sync/syncbase.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/portage/sync/syncbase.py b/lib/portage/sync/syncbase.py
index d15bb6d14..46644d68e 100644
--- a/lib/portage/sync/syncbase.py
+++ b/lib/portage/sync/syncbase.py
@@ -252,11 +252,17 @@ class SyncBase(object):
 		@type openpgp_env: gemato.openpgp.OpenPGPEnvironment
 		"""
 		out = portage.output.EOutput(quiet=('--quiet' in self.options['emerge_config'].opts))
+		out.ebegin('Refreshing keys via WKD')
+		if openpgp_env.refresh_keys_wkd():
+			out.eend(0)
+			return
+		out.eend(1)
+
 		out.ebegin('Refreshing keys from keyserver{}'.format(
 			('' if self.repo.sync_openpgp_keyserver is None else ' ' + self.repo.sync_openpgp_keyserver)))
 		retry_decorator = self._key_refresh_retry_decorator()
 		if retry_decorator is None:
-			openpgp_env.refresh_keys(keyserver=self.repo.sync_openpgp_keyserver)
+			openpgp_env.refresh_keys_keyserver(keyserver=self.repo.sync_openpgp_keyserver)
 		else:
 			def noisy_refresh_keys():
 				"""
@@ -264,7 +270,7 @@ class SyncBase(object):
 				errors, display errors as soon as they occur.
 				"""
 				try:
-					openpgp_env.refresh_keys(keyserver=self.repo.sync_openpgp_keyserver)
+					openpgp_env.refresh_keys_keyserver(keyserver=self.repo.sync_openpgp_keyserver)
 				except Exception as e:
 					writemsg_level("%s\n" % (e,),
 						level=logging.ERROR, noiselevel=-1)

[gentoo-commits] proj/portage:master commit in: lib/portage/sync/

[Zac Medico]

commit:     d65e759fc26ea0301ba2020e0993d431e9354e7b
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 20 22:03:46 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Jul 20 22:05:28 2020 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=d65e759f

syncbase: Add back missing functools import

Fixes: 788c0e8bb07b ("Remove from __future__ import unicode_literals")
Bug: https://bugs.gentoo.org/733370
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 lib/portage/sync/syncbase.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/portage/sync/syncbase.py b/lib/portage/sync/syncbase.py
index 8ad0b5ae7..b294ef5a6 100644
--- a/lib/portage/sync/syncbase.py
+++ b/lib/portage/sync/syncbase.py
@@ -6,6 +6,7 @@ Base class for performing sync operations.
 This class contains common initialization code and functions.
 '''
 
+import functools
 import logging
 import os
 

[gentoo-commits] proj/portage:master commit in: lib/portage/sync/

[Sam James]

commit:     eb3a3878e36e32ed0f8385b7ff8e978fbbe1aff3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 19 13:51:45 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 19 14:49:34 2023 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=eb3a3878

sync: handle https_proxy too

Pass down https_proxy into gemato.

If http_proxy isn't set, but https_proxy is, then let's fall back to it to help
users out. gnupg itself doesn't use https_proxy but users may have only https_proxy
set rather than http_proxy and https_proxy.

We've had cases reported where users only have https_proxy and not http_proxy set,
so include this to help them out too.

Bug: https://bugs.gentoo.org/691434
Bug: https://bugs.gentoo.org/835927
Bug: https://bugs.gentoo.org/911629
Signed-off-by: Sam James <sam <AT> gentoo.org>

 lib/portage/sync/syncbase.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/portage/sync/syncbase.py b/lib/portage/sync/syncbase.py
index b7228a38a6..9c25a0299b 100644
--- a/lib/portage/sync/syncbase.py
+++ b/lib/portage/sync/syncbase.py
@@ -333,6 +333,8 @@ class SyncBase:
             # Override global proxy setting with one provided in emerge configuration
             if "http_proxy" in self.spawn_kwargs["env"]:
                 proxy = self.spawn_kwargs["env"]["http_proxy"]
+            elif "https_proxy" in self.spawn_kwargs["env"]:
+                proxy = self.spawn_kwargs["env"]["https_proxy"]
             else:
                 proxy = None
 

[gentoo-commits] proj/portage:master commit in: lib/portage/sync/

[Zac Medico]

commit:     cebe9363cc348cea8d997afc638abf38ca79ed47
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 24 16:39:29 2023 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Oct 24 16:41:15 2023 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=cebe9363

SyncManager: multiprocessing spawn compat

Tested via lib/portage/tests/ebuild/test_fetch.py with
bin/emerge patched to call:

multiprocessing.set_start_method("spawn", force=True)

Bug: https://bugs.gentoo.org/916231
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 lib/portage/sync/controller.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/portage/sync/controller.py b/lib/portage/sync/controller.py
index 1cfbb24ba0..da593e1a85 100644
--- a/lib/portage/sync/controller.py
+++ b/lib/portage/sync/controller.py
@@ -89,13 +89,20 @@ class SyncManager:
         # files have sane permissions.
         os.umask(0o22)
 
-        self.module_controller = portage.sync.module_controller
-        self.module_names = self.module_controller.module_names
         self.hooks = {}
         for _dir in ["repo.postsync.d", "postsync.d"]:
             hooks = get_hooks_from_dir(_dir, prefix=self.settings["PORTAGE_CONFIGROOT"])
             self.hooks[_dir] = hooks
 
+    @property
+    def module_controller(self):
+        # Not stored as local attribute because it's not picklable.
+        return portage.sync.module_controller
+
+    @property
+    def module_names(self):
+        return self.module_controller.module_names
+
     def __getattr__(self, name):
         if name == "async":
             warnings.warn(