From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- app-crypt/pius/Manifest | 6 +- .../files/pius-3.0.0-Fix-typo-in-readme-135.patch | 25 +++++++ .../pius/files/pius-3.0.0-Fix-typos-132.patch | 43 ++++++++++++ ...ius-3.0.0-Minor-fixes-for-pius-report-137.patch | 78 ++++++++++++++++++++++ ...-3.0.0-pius-keyring-mgr-Fix-constants-134.patch | 58 ++++++++++++++++ app-crypt/pius/pius-3.0.0-r1.ebuild | 34 ++++++++++ app-crypt/pius/pius-3.0.0.ebuild | 27 -------- 7 files changed, 243 insertions(+), 28 deletions(-) create mode 100644 app-crypt/pius/files/pius-3.0.0-Fix-typo-in-readme-135.patch create mode 100644 app-crypt/pius/files/pius-3.0.0-Fix-typos-132.patch create mode 100644 app-crypt/pius/files/pius-3.0.0-Minor-fixes-for-pius-report-137.patch create mode 100644 app-crypt/pius/files/pius-3.0.0-pius-keyring-mgr-Fix-constants-134.patch create mode 100644 app-crypt/pius/pius-3.0.0-r1.ebuild delete mode 100644 app-crypt/pius/pius-3.0.0.ebuild (limited to 'app-crypt/pius') diff --git a/app-crypt/pius/Manifest b/app-crypt/pius/Manifest index 89c0e55ada19..485167bed922 100644 --- a/app-crypt/pius/Manifest +++ b/app-crypt/pius/Manifest @@ -1,3 +1,7 @@ +AUX pius-3.0.0-Fix-typo-in-readme-135.patch 710 BLAKE2B 951a06c334e55d738fbb966d8f503879bad65c998db53ea28fb125f2b493ae36fb079bb575ffe8e67107c661c6fc0b39454d488b38d194e473cf1629189017ac SHA512 94f7683eb6834931f2aff1c6f2a7b7f19355c41709b5e408731f87e43af82f07d36fab1c5d0bb5b999496189d852c9c793ce75d2b0bef18bd88ce237f8824ef4 +AUX pius-3.0.0-Fix-typos-132.patch 1277 BLAKE2B 8c35c09224472a7a1b1c4deabe0df91681e932ca43a321a221ea2d9c68c233b198061ca2749c97419d6a7da92a732d26bc91fd547cf64e11821c6c741aebd276 SHA512 8fee32a40f2211892c9f2e642aceb98aeeffae3f323cb98c155192fa81c99ca43402636eb14eb5b07afe5ec0c6bf23b0f13d53699281d4b1283f69f992b9ca39 +AUX pius-3.0.0-Minor-fixes-for-pius-report-137.patch 2744 BLAKE2B bf738bdf20e33d547ba149f25eaeef01c24471c4f5472dbece4ad5e72446ede919cac5351096f8796f3d67f13a0258dab45b4648e2bdba2a0e33dac1a844078d SHA512 4978309350025e818e8950dde21509b3a2feba5dd650720ca83b00e23cff93926c3f35eab028a15ef69750c619fcb23d62ef910e89e57a4f8072923316d4146f +AUX pius-3.0.0-pius-keyring-mgr-Fix-constants-134.patch 1909 BLAKE2B 60440079520ff12664c89fa42a0ee4cdf9fa5f9a69fa6293f5eaf3fd9a438a669aa50b84ac78701f6ae91c67486588c5403ac89bc08b32697c1550b513ebfe08 SHA512 faf77cf23cb1e2e7b214e70dc955e8683f08195175228e299955bcf4eae07c5fd147959a0f526be42960df2607deed9ac3f15e4abac0484d415fe2acaf4b3ef7 DIST pius-3.0.0.tar.bz2 46643 BLAKE2B 18abe6a93bd719adf50fa4bcbf5128845d732b598d611e716a536f78f4930e6e63e7f60d7444775fbc32072935c13b1828377a9e843114255a4101f4e3199f98 SHA512 0c906574ac703f45e3318ae3e7994fe6580fd172849b2956d9084033d6fbfd69fec942b95bc2edadadc223fa0685ff0b9799ad03570b712b9cdb09d69491cc91 -EBUILD pius-3.0.0.ebuild 655 BLAKE2B 5b122560970340facc2c025cd8fc591d3c3def90aacec82d3eaa392e2af4e0891be3eb17389f00d9368e0e8ac5f9f0f2d1cddf0c3df19c056230dbdb7f9afcac SHA512 b709be3e97e9cf34062199d6d741e6d78b9831f4957f30687acfadd6a0ee1513883a9d943b40ca193051123da797809984c368eb7540ab50196fa231ea323ad7 +EBUILD pius-3.0.0-r1.ebuild 881 BLAKE2B 49da67451d2eecccb913bbffe6d400e6b574d7e16837a17e2e776d0edca819afdca3a183253f6b7bac81ec335596f6aca0b00b4ceae0810e871ae9618ae24d0a SHA512 13582927c814841cda11292df244aef949344a1d200d1293fb796aa590a186c5b9c0047ccac3d5b33f9005ded41cd0a9106f094aa5ed8d01260c1e8d3a4a9612 MISC metadata.xml 822 BLAKE2B 5dc5796afbb5b5e3f070db3884adc17d0e6e73c568bd747d1ae5585416219305a48d3a7d53bd3f30761262b232e737e1f6633c7ba1dc0834cd95b3fe50b903cc SHA512 49833d454ceb01c9af3010643ba78da1c49152e2502a522fadcc13ce83e9e26f2bf24cc6b06c88cee42f1ee15ab5a18e8d3bf50b3e18b0bde7d1d64fa2211fcc diff --git a/app-crypt/pius/files/pius-3.0.0-Fix-typo-in-readme-135.patch b/app-crypt/pius/files/pius-3.0.0-Fix-typo-in-readme-135.patch new file mode 100644 index 000000000000..bc67e97950b2 --- /dev/null +++ b/app-crypt/pius/files/pius-3.0.0-Fix-typo-in-readme-135.patch @@ -0,0 +1,25 @@ +From 5f24833c50ac6d831c03309e9bbb6b62224ac0ac Mon Sep 17 00:00:00 2001 +From: Ross Smith II +Date: Mon, 9 Mar 2020 16:45:29 -0700 +Subject: [PATCH] Fix typo in readme (#135) + +--- + README.md | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/README.md b/README.md +index 3ead858..4cb98ce 100644 +--- a/README.md ++++ b/README.md +@@ -91,7 +91,7 @@ docs](https://support.google.com/accounts/answer/185833?hl=en). + ## Other Platforms + + On non-UNIX platforms such as MacOS and Windows, the default gpg path will +-likley be incorrect, so you'll want to use `-b` to specify the path. ++likely be incorrect, so you'll want to use `-b` to specify the path. + + + ## Config File +-- +2.29.2 + diff --git a/app-crypt/pius/files/pius-3.0.0-Fix-typos-132.patch b/app-crypt/pius/files/pius-3.0.0-Fix-typos-132.patch new file mode 100644 index 000000000000..ed03995d34c2 --- /dev/null +++ b/app-crypt/pius/files/pius-3.0.0-Fix-typos-132.patch @@ -0,0 +1,43 @@ +From 6a92664fe0cfacffb03e6f3312c1c5fb4d785297 Mon Sep 17 00:00:00 2001 +From: Maxim Baz +Date: Sat, 5 Oct 2019 23:52:17 +0200 +Subject: [PATCH] Fix typos (#132) + +--- + pius | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/pius b/pius +index 7cf09b5..cc2333b 100755 +--- a/pius ++++ b/pius +@@ -25,7 +25,7 @@ from optparse import OptionParser + + from libpius import mailer as pmailer + from libpius import signer as psigner +-from libpius.util import PiusUtil, MyOption ++from libpius.util import PiusUtil, MyOption, check_email + from libpius.constants import ( + DEFAULT_GPG_PATH, + DEFAULT_KEYRING, +@@ -61,7 +61,7 @@ def check_options(parser, options, args): + + if options.debug == True: + print("Setting debug") +- util.DEBUG_ON = True ++ PiusUtil.DEBUG_ON = True + + if not os.path.exists(options.gpg_path): + parser.error("GnuPG binary not found at %s." % options.gpg_path) +@@ -288,7 +288,7 @@ def main(): + ) + if ans in ("y", "Y", "yes", "YES", "Yes"): + ans = input("What email address should we send from? ") +- util.check_email(parser, "-m", ans) ++ check_email(parser, "-m", ans) + options.mail = ans + print() + +-- +2.29.2 + diff --git a/app-crypt/pius/files/pius-3.0.0-Minor-fixes-for-pius-report-137.patch b/app-crypt/pius/files/pius-3.0.0-Minor-fixes-for-pius-report-137.patch new file mode 100644 index 000000000000..c77f26649ce6 --- /dev/null +++ b/app-crypt/pius/files/pius-3.0.0-Minor-fixes-for-pius-report-137.patch @@ -0,0 +1,78 @@ +From 19b61c3b0dc31ee60341b3ca708f8e459e44ce3f Mon Sep 17 00:00:00 2001 +From: Phil Dibowitz +Date: Mon, 23 Mar 2020 08:57:09 -0700 +Subject: [PATCH] Minor fixes for pius-report (#137) + +Signed-off-by: Phil Dibowitz +--- + libpius/mailer.py | 2 +- + pius-keyring-mgr | 4 +++- + pius-report | 5 +++-- + 3 files changed, 7 insertions(+), 4 deletions(-) + +diff --git a/libpius/mailer.py b/libpius/mailer.py +index ba6b50a..f5b097f 100644 +--- a/libpius/mailer.py ++++ b/libpius/mailer.py +@@ -403,7 +403,7 @@ class PiusMailer: + # BCC the user... + env_to = [msg["To"], self.mail] + +- smtp.sendmail(self.mail, env_to, msg.as_string()) ++ smtp.sendmail(self.mail, env_to, msg.as_string().encode('utf-8')) + smtp.quit() + except smtplib.SMTPException as emsg: + raise MailSendError(emsg) +diff --git a/pius-keyring-mgr b/pius-keyring-mgr +index fb0b46a..ec3528a 100755 +--- a/pius-keyring-mgr ++++ b/pius-keyring-mgr +@@ -1,4 +1,5 @@ + #!/usr/bin/env python3 ++ + """A utility to create and manage party keyrings.""" + + # vim:tw=80:ai:tabstop=4:expandtab:shiftwidth=4 +@@ -446,7 +447,7 @@ class KeyringBuilder: + # stolen from pius + def get_all_keyids(self, sort_keyring): + """Given a keyring, get all the KeyIDs from it.""" +- util.debug("extracting all keyids from keyring") ++ util.debug("extracting all keyids from keyring, sort: %s" % sort_keyring) + extra_opts = GPG_QUIET_OPTS + self.AUTO_OPTS + ["--fixed-list-mode"] + cmd = self.basecmd + extra_opts + ["--fingerprint"] + util.logcmd(cmd) +@@ -776,6 +777,7 @@ before distributing they keyring. + prune.add_option( + "--no-sort-keyring", + dest="sort_keyring", ++ default=True, + action="store_false", + help="Do not sort the keyring by name.", + ) +diff --git a/pius-report b/pius-report +index 47f57b5..744da35 100755 +--- a/pius-report ++++ b/pius-report +@@ -15,7 +15,8 @@ from optparse import OptionParser + from libpius import mailer as pmailer + from libpius import signer as psigner + from libpius.util import PiusUtil, MyOption +-from libpius.constants import DEFAULT_GPG_PATH, UID_RE, GPG_MIN_OPTS ++from libpius.constants import DEFAULT_GPG_PATH, UID_RE, GPG_MIN_OPTS, \ ++ GPG_BASE_OPTS + from libpius.exceptions import MailSendError + from libpius.state import SignState + +@@ -401,7 +402,7 @@ Generated by PIUS Report BETA (http://www.phildev.net/pius/). + + def refresh_keys(gpg, keys): + cmd = [gpg] + GPG_MIN_OPTS + ["--refresh-keys"] + keys +- PiusPiusUtil.logcmd(cmd) ++ PiusUtil.logcmd(cmd) + gpg = subprocess.Popen(cmd, stdout=subprocess.PIPE, close_fds=True) + gpg.wait() + +-- +2.29.2 + diff --git a/app-crypt/pius/files/pius-3.0.0-pius-keyring-mgr-Fix-constants-134.patch b/app-crypt/pius/files/pius-3.0.0-pius-keyring-mgr-Fix-constants-134.patch new file mode 100644 index 000000000000..20c43fcbdca4 --- /dev/null +++ b/app-crypt/pius/files/pius-3.0.0-pius-keyring-mgr-Fix-constants-134.patch @@ -0,0 +1,58 @@ +From f54adce7ba47ad8882441aec3b0583ee788ea8e1 Mon Sep 17 00:00:00 2001 +From: Phil Dibowitz +Date: Tue, 4 Feb 2020 09:33:40 -0800 +Subject: [PATCH] [pius-keyring-mgr] Fix constants (#134) + +The refactor of the code meant these constants are now in the +constants module, not in self. + +Fixes #133 + +Signed-off-by: Phil Dibowitz +--- + pius-keyring-mgr | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/pius-keyring-mgr b/pius-keyring-mgr +index 1daddeb..fb0b46a 100755 +--- a/pius-keyring-mgr ++++ b/pius-keyring-mgr +@@ -28,6 +28,8 @@ from libpius.constants import ( + GPG_BASE_OPTS, + GPG_QUIET_OPTS, + GPG_FD_OPTS, ++ FP_RE, ++ FIXFP_RE, + ) + + BADKEYS_RE = re.compile(r"00000000|12345678|no pgp key") +@@ -143,10 +145,10 @@ class PiusParser: + def parse_flatfile(self, filename): + with open(filename, "r") as fd: + contents = fd.read() +- matches = self.FP_RE.findall(contents) ++ matches = FP_RE.findall(contents) + keys = [] + for match in matches: +- flatfp = self.FIXFP_RE.sub("", match) ++ flatfp = FIXFP_RE.sub("", match) + keyid = flatfp[-8:] + keys.append( + { +@@ -199,11 +201,11 @@ class PiusParser: + tmp["key"] = match + keys.append(tmp) + continue +- matches = self.FP_RE.findall(decoded) ++ matches = FP_RE.findall(decoded) + if matches: + for match in matches: + num_fps = num_fps + 1 +- fp = self.FIXFP_RE.sub("", match) ++ fp = FIXFP_RE.sub("", match) + keyid = keyid_from_fp(fp) + tmp = data.copy() + tmp.update({"fingerprint": fp, "keyid": keyid}) +-- +2.29.2 + diff --git a/app-crypt/pius/pius-3.0.0-r1.ebuild b/app-crypt/pius/pius-3.0.0-r1.ebuild new file mode 100644 index 000000000000..b370b3651829 --- /dev/null +++ b/app-crypt/pius/pius-3.0.0-r1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=no +PYTHON_COMPAT=( python3_{7..9} ) + +inherit distutils-r1 + +DESCRIPTION="A tool for signing and email all UIDs on a set of PGP keys" +HOMEPAGE="https://www.phildev.net/pius/ https://github.com/jaymzh/pius" +SRC_URI="https://github.com/jaymzh/pius/releases/download/v${PV}/pius-${PV}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND=">=app-crypt/gnupg-2.0.0" +RDEPEND="${DEPEND} + dev-lang/perl" + +PATCHES=( + "${FILESDIR}/${P}-Fix-typos-132.patch" + "${FILESDIR}/${P}-pius-keyring-mgr-Fix-constants-134.patch" + "${FILESDIR}/${P}-Fix-typo-in-readme-135.patch" + "${FILESDIR}/${P}-Minor-fixes-for-pius-report-137.patch" +) + +python_test() { + ${EPYTHON} -m unittest discover -s test/* -v || die +} diff --git a/app-crypt/pius/pius-3.0.0.ebuild b/app-crypt/pius/pius-3.0.0.ebuild deleted file mode 100644 index f7f3745afd4d..000000000000 --- a/app-crypt/pius/pius-3.0.0.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{7,8} ) - -inherit distutils-r1 - -DESCRIPTION="A tool for signing and email all UIDs on a set of PGP keys" -HOMEPAGE="https://www.phildev.net/pius/ https://github.com/jaymzh/pius" -SRC_URI="https://github.com/jaymzh/pius/releases/download/v${PV}/pius-${PV}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND=">=app-crypt/gnupg-2.0.0" -RDEPEND="${DEPEND} - dev-lang/perl" - -python_test() { - ${EPYTHON} -m unittest discover -s test/* -v || die -} -- cgit v1.2.3