Re: [gentoo-dev] I'm looking for a Mentor
On 12/18/20 7:19 PM, Alec Warner wrote: > TL;DR, I think infra needs more people who can commit to ::gentoo and > thus, I am looking for an ebuild dev mentor. I myself had commit > access in the before times (probably 2010 - 2012) but have been mostly > ignoring ebuild development since then to focus on infra and the > Foundation. However infra is using more and more software that is > maintainer-needed and so we probably need to change our focus to > giving back more to the main tree. > > -A > You can start your training by filing Github PRs, as contributions to maintainer-needed packages are mostly dealt with in there. ;) -- juippis
Re: [gentoo-dev] [PATCH v2] glep-0063: Add section about the Gentoo keyserver
On Fri, Dec 18, 2020 at 2:45 AM Ulrich Mueller wrote: > > > On Thu, 17 Dec 2020, Mike Gilbert wrote: > > > Doesn't the same restriction apply to relicensing it? > > No, because the CC licenses have an explicit provision that allows it > when distributing a modified work (which they call an "Adaptation", > defined in section 1a). > > For example, CC-BY-SA-3.0 says in section 4b: > >You may Distribute or Publicly Perform an Adaptation only under the >terms of: (i) this License; (ii) a later version of this License with >the same License Elements as this License; (iii) a Creative Commons >jurisdiction license (either this or a later license version) that >contains the same License Elements as this License (e.g., >Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible >License. [...] > > Item (ii) is what gives us the right to distribute under CC-BY-SA-4.0. Thank you for taking the time to explain this.
[gentoo-portage-dev] [PATCH 2/2] env_update: use "with statement" on atomic_ofstream
Signed-off-by: Florian Schmaus
---
lib/portage/util/env_update.py | 30 --
1 file changed, 12 insertions(+), 18 deletions(-)
diff --git a/lib/portage/util/env_update.py b/lib/portage/util/env_update.py
index dec086cf8c5b..5588931a84e7 100644
--- a/lib/portage/util/env_update.py
+++ b/lib/portage/util/env_update.py
@@ -342,18 +342,17 @@ def _env_update(makelinks, target_root, prev_mtimes,
contents, env,
#create /etc/profile.env for bash support
profile_env_path = os.path.join(eroot, "etc", "profile.env")
- outfile = atomic_ofstream(profile_env_path)
- outfile.write(penvnotice)
-
- env_keys = [x for x in env if x != "LDPATH"]
- env_keys.sort()
- for k in env_keys:
- v = env[k]
- if v.startswith('$') and not v.startswith('${'):
- outfile.write("export %s=$'%s'\n" % (k, v[1:]))
- else:
- outfile.write("export %s='%s'\n" % (k, v))
- outfile.close()
+ with atomic_ofstream(profile_env_path) as outfile:
+ outfile.write(penvnotice)
+
+ env_keys = [x for x in env if x != "LDPATH"]
+ env_keys.sort()
+ for k in env_keys:
+ v = env[k]
+ if v.startswith('$') and not v.startswith('${'):
+ outfile.write("export %s=$'%s'\n" % (k, v[1:]))
+ else:
+ outfile.write("export %s='%s'\n" % (k, v))
# Create the systemd user environment configuration file
# /etc/environment.d/10-gentoo-env.conf with the
@@ -363,8 +362,7 @@ def _env_update(makelinks, target_root, prev_mtimes,
contents, env,
systemd_gentoo_env_path = os.path.join(systemd_environment_dir,
"10-gentoo-env.conf")
- systemd_gentoo_env = atomic_ofstream(systemd_gentoo_env_path)
- try:
+ with atomic_ofstream(systemd_gentoo_env_path) as systemd_gentoo_env:
senvnotice = notice + "\n\n"
systemd_gentoo_env.write(senvnotice)
@@ -384,10 +382,6 @@ def _env_update(makelinks, target_root, prev_mtimes,
contents, env,
line = f"{env_key}={env_key_value}\n"
systemd_gentoo_env.write(line)
- except:
- systemd_gentoo_env.abort()
- raise
- systemd_gentoo_env.close()
#create /etc/csh.env for (t)csh support
outfile = atomic_ofstream(os.path.join(eroot, "etc", "csh.env"))
--
2.26.2
[gentoo-portage-dev] [PATCH 1/2] Make atomic_ofstream a Context Manager
This allows using a "with statement" together with instances of atomic_ofstream. Allowing for more readable, less error prone and shorter code. Signed-off-by: Florian Schmaus --- lib/portage/util/__init__.py | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/portage/util/__init__.py b/lib/portage/util/__init__.py index 0412b2b5911f..bedcbcfe6fcc 100644 --- a/lib/portage/util/__init__.py +++ b/lib/portage/util/__init__.py @@ -11,6 +11,7 @@ __all__ = ['apply_permissions', 'apply_recursive_permissions', 'stack_dicts', 'stack_lists', 'unique_array', 'unique_everseen', 'varexpand', 'write_atomic', 'writedict', 'writemsg', 'writemsg_level', 'writemsg_stdout'] +from contextlib import AbstractContextManager from copy import deepcopy import errno import io @@ -1246,7 +1247,7 @@ def apply_secpass_permissions(filename, uid=-1, gid=-1, mode=-1, mask=-1, stat_cached=stat_cached, follow_links=follow_links) return all_applied -class atomic_ofstream(ObjectProxy): +class atomic_ofstream(AbstractContextManager, ObjectProxy): """Write a file atomically via os.rename(). Atomic replacement prevents interprocess interference and prevents corruption of the target file when the write is interrupted (for example, when an 'out of space' @@ -1287,6 +1288,13 @@ class atomic_ofstream(ObjectProxy): encoding=_encodings['fs'], errors='strict'), mode=mode, **kargs)) + def __exit__(self, exc_type, exc_val, exc_tb): + if exc_type is not None: + self.abort() + else: + self.close() + return None + def _get_target(self): return object.__getattribute__(self, '_file') -- 2.26.2
[gentoo-dev] I'm looking for a Mentor
TL;DR, I think infra needs more people who can commit to ::gentoo and thus, I am looking for an ebuild dev mentor. I myself had commit access in the before times (probably 2010 - 2012) but have been mostly ignoring ebuild development since then to focus on infra and the Foundation. However infra is using more and more software that is maintainer-needed and so we probably need to change our focus to giving back more to the main tree. -A
Re: [gentoo-dev] [PATCH v3] glep-0063: Add section about the Gentoo keyserver
On Fri, 2020-12-18 at 10:56 -0500, Mike Gilbert wrote: > Signed-off-by: Mike Gilbert > --- > > v3: Fixed typo. > Added link to keys.gentoo.org. > Moved SKS upload advice to Recommendations section. > Added Gentoo keyserver advice to Bare minimum requirements > section. > > glep-0063.rst | 32 > 1 file changed, 24 insertions(+), 8 deletions(-) > > diff --git a/glep-0063.rst b/glep-0063.rst > index 82541bd..6997044 100644 > --- a/glep-0063.rst > +++ b/glep-0063.rst > @@ -7,10 +7,10 @@ Author: Robin H. Johnson , > Michał Górny > Type: Standards Track > Status: Final > -Version: 2.1 > +Version: 2.2 > Created: 2013-02-18 > -Last-Modified: 2019-11-07 > -Post-History: 2013-11-10, 2018-07-03, 2018-07-21, 2019-02-24 > +Last-Modified: 2020-12-17 > +Post-History: 2013-11-10, 2018-07-03, 2018-07-21, 2019-02-24, 2020- > 12-17 > Content-Type: text/x-rst > --- > > @@ -28,6 +28,9 @@ OpenPGP key management policies for the Gentoo > Linux distribution. > Changes > === > > +v2.2 > + Added information about the Gentoo keyserver. > + > v2.1 > A requirement for an encryption key has been added, in order to > extend > the GLEP beyond commit signing and into use of OpenPGP for dev-to- > dev > @@ -114,7 +117,7 @@ Keys that do not conform to them can not be used > to commit. > > 6. UID using your ``@gentoo.org`` e-mail included in the key. > > -7. Upload your key to the SKS keyserver rotation before usage! > +7. Keys must be uploaded to the Gentoo keyserver. > > Recommendations > --- > @@ -135,8 +138,13 @@ their primary key). > > 5. Encrypted backup of your secret keys. > > +6. Upload to SKS or another public keyserver pool. > + > +Gentoo Infrastructure > += > + > Gentoo LDAP > -=== > +--- > > All Gentoo developers must list the complete fingerprint for their > primary > keys in the "``gpgfingerprint``" LDAP field. It must be exactly 40 > hex digits, > @@ -147,6 +155,14 @@ of the fingerprint field. In any place that > presently displays > the "``gpgkey``" field, the last 16 hex digits of the fingerprint > should > be displayed instead. > > +Gentoo Keyserver > + > + > +Gentoo infrastructure uses a keyserver that is isolated from the SKS > pool. > +This keyserver is restricted to accepting uploads from authorized > Gentoo hosts. > +Instructions for uploading keys to this server may be found at > +https://keys.gentoo.org/. > + > Backwards Compatibility > === > > @@ -212,6 +228,6 @@ Copyright > Copyright (c) 2013-2019 by Robin Hugh Johnson, Andreas K. Hüttel, > Marissa Fischer, Michał Górny. > > -This work is licensed under the Creative Commons Attribution- > ShareAlike 3.0 > -Unported License. To view a copy of this license, visit > -https://creativecommons.org/licenses/by-sa/3.0/. > +This work is licensed under the Creative Commons Attribution- > ShareAlike 4.0 > +International License. To view a copy of this license, visit > +https://creativecommons.org/licenses/by-sa/4.0/. LGTM. Thanks! -- Best regards, Michał Górny
[gentoo-dev] [PATCH v3] glep-0063: Add section about the Gentoo keyserver
Signed-off-by: Mike Gilbert --- v3: Fixed typo. Added link to keys.gentoo.org. Moved SKS upload advice to Recommendations section. Added Gentoo keyserver advice to Bare minimum requirements section. glep-0063.rst | 32 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/glep-0063.rst b/glep-0063.rst index 82541bd..6997044 100644 --- a/glep-0063.rst +++ b/glep-0063.rst @@ -7,10 +7,10 @@ Author: Robin H. Johnson , Michał Górny Type: Standards Track Status: Final -Version: 2.1 +Version: 2.2 Created: 2013-02-18 -Last-Modified: 2019-11-07 -Post-History: 2013-11-10, 2018-07-03, 2018-07-21, 2019-02-24 +Last-Modified: 2020-12-17 +Post-History: 2013-11-10, 2018-07-03, 2018-07-21, 2019-02-24, 2020-12-17 Content-Type: text/x-rst --- @@ -28,6 +28,9 @@ OpenPGP key management policies for the Gentoo Linux distribution. Changes === +v2.2 + Added information about the Gentoo keyserver. + v2.1 A requirement for an encryption key has been added, in order to extend the GLEP beyond commit signing and into use of OpenPGP for dev-to-dev @@ -114,7 +117,7 @@ Keys that do not conform to them can not be used to commit. 6. UID using your ``@gentoo.org`` e-mail included in the key. -7. Upload your key to the SKS keyserver rotation before usage! +7. Keys must be uploaded to the Gentoo keyserver. Recommendations --- @@ -135,8 +138,13 @@ their primary key). 5. Encrypted backup of your secret keys. +6. Upload to SKS or another public keyserver pool. + +Gentoo Infrastructure += + Gentoo LDAP -=== +--- All Gentoo developers must list the complete fingerprint for their primary keys in the "``gpgfingerprint``" LDAP field. It must be exactly 40 hex digits, @@ -147,6 +155,14 @@ of the fingerprint field. In any place that presently displays the "``gpgkey``" field, the last 16 hex digits of the fingerprint should be displayed instead. +Gentoo Keyserver + + +Gentoo infrastructure uses a keyserver that is isolated from the SKS pool. +This keyserver is restricted to accepting uploads from authorized Gentoo hosts. +Instructions for uploading keys to this server may be found at +https://keys.gentoo.org/. + Backwards Compatibility === @@ -212,6 +228,6 @@ Copyright Copyright (c) 2013-2019 by Robin Hugh Johnson, Andreas K. Hüttel, Marissa Fischer, Michał Górny. -This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 -Unported License. To view a copy of this license, visit -https://creativecommons.org/licenses/by-sa/3.0/. +This work is licensed under the Creative Commons Attribution-ShareAlike 4.0 +International License. To view a copy of this license, visit +https://creativecommons.org/licenses/by-sa/4.0/. -- 2.30.0.rc0
[gentoo-dev] Last rites: net-mail/vacation
# Michał Górny (2020-12-18) # Unmaintained. Last bumped in 2008. Last upstream (beta) in 2014. # The current Gentoo version fails to install. # Removal in 30 days. Bug #701044. net-mail/vacation -- Best regards, Michał Górny
[gentoo-dev] Last rites: net-ftp/tlswrap
# Michał Górny (2020-12-18) # Unmaintained. Homepage gone. Last bumped in 2008. Carries multiple # patches. Fails to build again. # Removal in 30 days. Bug #675364. net-ftp/tlswrap -- Best regards, Michał Górny
[gentoo-dev] Last rites: app-text/ots
# Michał Górny (2020-12-18) # Upstream gone. Last bumped in 2007. Fails to build, again. # Removal in 30 days. Bug #648964. app-text/ots -- Best regards, Michał Górny
[gentoo-dev] Last rites: net-misc/dhcpd-pools
# Michał Górny (2020-12-18) # Unmaintained. The current Gentoo version fails to build, it needs # a version bump. # Removal in 30 days. Bug #669452. net-misc/dhcpd-pools -- Best regards, Michał Górny
[gentoo-dev] Last rites: dev-db/aerospike-server-community
# Michał Górny (2020-12-18) # Unmaintained. Last bumped in 2018. Vulnerable. No revdeps. # Removal in 30 days. Bug #736050. dev-db/aerospike-server-community -- Best regards, Michał Górny
[gentoo-dev] Last rites: app-text/peg-markdown
# Michał Górny (2020-12-18) # Abandoned upstream, circa 2013. Vulnerable. No revdeps. # Removal in 30 days. Bug #744217. app-text/peg-markdown -- Best regards, Michał Górny
[gentoo-dev] Last rites: dev-libs/ustr
# Michał Górny (2020-12-18) # Abandoned in 2008. No reverse dependencies left. # Removal in 30 days. Bug #652192. dev-libs/ustr -- Best regards, Michał Górny
