[Pkg-privacy-commits] [parcimonie] 07/10: Drop all patches: applied upstream.
Intrigeri
intrigeri at moszumanska.debian.org
Tue Jun 27 17:12:32 UTC 2017
This is an automated email from the git hooks/post-receive script.
intrigeri pushed a commit to branch master
in repository parcimonie.
commit 4375d6c770502796ba27ec32c9d3ffe148d44358
Author: intrigeri <intrigeri at boum.org>
Date: Tue Jun 27 17:03:09 2017 +0000
Drop all patches: applied upstream.
---
...PG-homedir-in-a-few-places-that-did-not-s.patch | 54 ----------------------
debian/patches/series | 1 -
2 files changed, 55 deletions(-)
diff --git a/debian/patches/Honor-custom-GnuPG-homedir-in-a-few-places-that-did-not-s.patch b/debian/patches/Honor-custom-GnuPG-homedir-in-a-few-places-that-did-not-s.patch
deleted file mode 100644
index 1b23768..0000000
--- a/debian/patches/Honor-custom-GnuPG-homedir-in-a-few-places-that-did-not-s.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From: intrigeri <intrigeri at boum.org>
-Date: Sun, 11 Sep 2016 11:23:30 +0000
-Subject: Honor custom GnuPG homedir in a few places that did not so far.
-
-This resulted for example in the test suite trying to start a dirmngr
-using ~/.gnupg/, while we had instructed it to use a custom GnuPG
-homedir; as a result, tests were failing for wrong reasons.
----
- lib/App/Parcimonie.pm | 8 +++++++-
- lib/App/Parcimonie/GnuPG/Interface.pm | 10 ++++++++--
- 2 files changed, 15 insertions(+), 3 deletions(-)
-
-diff --git a/lib/App/Parcimonie.pm b/lib/App/Parcimonie.pm
-index 71d373f..0bbcbba 100644
---- a/lib/App/Parcimonie.pm
-+++ b/lib/App/Parcimonie.pm
-@@ -174,7 +174,13 @@ sub checkGpgHasDefinedKeyserver {
- my $gnupg2 = $arg_ref->{gnupg2};
-
- if ($gnupg2) {
-- my @output = capturex(qw{gpg-connect-agent --dirmngr keyserver /bye});
-+ my @homedir_args = defined $gnupg_homedir
-+ ? ('--homedir', $gnupg_homedir)
-+ : ();
-+ my @output = capturex(
-+ 'gpg-connect-agent', @homedir_args,
-+ qw{--dirmngr keyserver /bye}
-+ );
- my $res = pop @output;
- $res eq "OK\n" || croak "Agent replied: $res";
- if (@output) {
-diff --git a/lib/App/Parcimonie/GnuPG/Interface.pm b/lib/App/Parcimonie/GnuPG/Interface.pm
-index 13bb6dc..8c53a6b 100644
---- a/lib/App/Parcimonie/GnuPG/Interface.pm
-+++ b/lib/App/Parcimonie/GnuPG/Interface.pm
-@@ -38,10 +38,16 @@ after 'BUILD' => sub {
- my $self = shift;
- if ($self->gnupg2) {
- unless ($self->already_torified) {
-- system(q{echo 'use-tor:0:1' | gpgconf --change-options dirmngr});
-+ my $gnupg_homedir = defined $self->options->homedir()
-+ ? $self->options->homedir()
-+ : '';
-+ system(
-+ q{echo 'use-tor:0:1' | } .
-+ "GNUPGHOME='$gnupg_homedir' gpgconf --change-options dirmngr"
-+ );
- # Passing --runtime to the previous command does not work,
- # so we have to:
-- systemx(qw{gpgconf --reload dirmngr});
-+ system("GNUPGHOME='$gnupg_homedir' gpgconf --reload dirmngr");
- }
- $self->call('gpg2');
- }
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 64c9c5f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-Honor-custom-GnuPG-homedir-in-a-few-places-that-did-not-s.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/parcimonie.git
More information about the Pkg-privacy-commits
mailing list