commit: 89d99e98b804cbbe7a3a90cf7753aaf4cc72452d Author: Nicholas Meyer <nickaristocrates <AT> gmail <DOT> com> AuthorDate: Sun Nov 1 11:00:15 2020 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Tue Nov 3 06:59:56 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89d99e98
app-crypt/pius: add patches that include git headers Signed-off-by: Nicholas Meyer <nickaristocrates <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/18104 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> ...po.diff => pius-3.0.0-Fix-typo-in-readme-135.patch} | 12 ++++++++++++ ...0_fix_typos.diff => pius-3.0.0-Fix-typos-132.patch} | 12 ++++++++++++ ...> pius-3.0.0-Minor-fixes-for-pius-report-137.patch} | 15 +++++++++++++++ ...ius-3.0.0-pius-keyring-mgr-Fix-constants-134.patch} | 18 ++++++++++++++++++ app-crypt/pius/pius-3.0.0-r1.ebuild | 8 ++++---- 5 files changed, 61 insertions(+), 4 deletions(-) diff --git a/app-crypt/pius/files/pius-3.0.0_fix_readme_typo.diff b/app-crypt/pius/files/pius-3.0.0-Fix-typo-in-readme-135.patch similarity index 61% rename from app-crypt/pius/files/pius-3.0.0_fix_readme_typo.diff rename to app-crypt/pius/files/pius-3.0.0-Fix-typo-in-readme-135.patch index c51880aed3b..bc67e97950b 100644 --- a/app-crypt/pius/files/pius-3.0.0_fix_readme_typo.diff +++ b/app-crypt/pius/files/pius-3.0.0-Fix-typo-in-readme-135.patch @@ -1,3 +1,12 @@ +From 5f24833c50ac6d831c03309e9bbb6b62224ac0ac Mon Sep 17 00:00:00 2001 +From: Ross Smith II <[email protected]> +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 @@ -11,3 +20,6 @@ index 3ead858..4cb98ce 100644 ## Config File +-- +2.29.2 + diff --git a/app-crypt/pius/files/pius-3.0.0_fix_typos.diff b/app-crypt/pius/files/pius-3.0.0-Fix-typos-132.patch similarity index 79% rename from app-crypt/pius/files/pius-3.0.0_fix_typos.diff rename to app-crypt/pius/files/pius-3.0.0-Fix-typos-132.patch index 1620d02b8e0..ed03995d34c 100644 --- a/app-crypt/pius/files/pius-3.0.0_fix_typos.diff +++ b/app-crypt/pius/files/pius-3.0.0-Fix-typos-132.patch @@ -1,3 +1,12 @@ +From 6a92664fe0cfacffb03e6f3312c1c5fb4d785297 Mon Sep 17 00:00:00 2001 +From: Maxim Baz <[email protected]> +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 @@ -29,3 +38,6 @@ index 7cf09b5..cc2333b 100755 options.mail = ans print() +-- +2.29.2 + diff --git a/app-crypt/pius/files/pius-3.0.0_fix_pius_report.diff b/app-crypt/pius/files/pius-3.0.0-Minor-fixes-for-pius-report-137.patch similarity index 85% rename from app-crypt/pius/files/pius-3.0.0_fix_pius_report.diff rename to app-crypt/pius/files/pius-3.0.0-Minor-fixes-for-pius-report-137.patch index 40bb969aab7..c77f26649ce 100644 --- a/app-crypt/pius/files/pius-3.0.0_fix_pius_report.diff +++ b/app-crypt/pius/files/pius-3.0.0-Minor-fixes-for-pius-report-137.patch @@ -1,3 +1,15 @@ +From 19b61c3b0dc31ee60341b3ca708f8e459e44ce3f Mon Sep 17 00:00:00 2001 +From: Phil Dibowitz <[email protected]> +Date: Mon, 23 Mar 2020 08:57:09 -0700 +Subject: [PATCH] Minor fixes for pius-report (#137) + +Signed-off-by: Phil Dibowitz <[email protected]> +--- + 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 @@ -61,3 +73,6 @@ index 47f57b5..744da35 100755 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_fix_keyring_mgr_constants.diff b/app-crypt/pius/files/pius-3.0.0-pius-keyring-mgr-Fix-constants-134.patch similarity index 76% rename from app-crypt/pius/files/pius-3.0.0_fix_keyring_mgr_constants.diff rename to app-crypt/pius/files/pius-3.0.0-pius-keyring-mgr-Fix-constants-134.patch index 9871a51e6ed..20c43fcbdca 100644 --- a/app-crypt/pius/files/pius-3.0.0_fix_keyring_mgr_constants.diff +++ b/app-crypt/pius/files/pius-3.0.0-pius-keyring-mgr-Fix-constants-134.patch @@ -1,3 +1,18 @@ +From f54adce7ba47ad8882441aec3b0583ee788ea8e1 Mon Sep 17 00:00:00 2001 +From: Phil Dibowitz <[email protected]> +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 <[email protected]> +--- + 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 @@ -38,3 +53,6 @@ index 1daddeb..fb0b46a 100755 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 index 91fa4e0e911..b370b365182 100644 --- a/app-crypt/pius/pius-3.0.0-r1.ebuild +++ b/app-crypt/pius/pius-3.0.0-r1.ebuild @@ -23,10 +23,10 @@ RDEPEND="${DEPEND} dev-lang/perl" PATCHES=( - "${FILESDIR}/${P}_fix_typos.diff" - "${FILESDIR}/${P}_fix_keyring_mgr_constants.diff" - "${FILESDIR}/${P}_fix_readme_typo.diff" - "${FILESDIR}/${P}_fix_pius_report.diff" + "${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() {
