* [PATCH][core-updates] gnu: gnupg, libgpg-error updates rebased
@ 2016-08-18 15:33 ng0
2016-08-18 18:34 ` ng0
0 siblings, 1 reply; 9+ messages in thread
From: ng0 @ 2016-08-18 15:33 UTC (permalink / raw)
To: guix-devel
[-- Attachment #1: Type: text/plain, Size: 53 bytes --]
These patches are applied directly on core-updates.
[-- Attachment #2: 0001-gnu-libgpg-error-Update-to-1.24.patch --]
[-- Type: text/x-patch, Size: 1436 bytes --]
From b63701cacb87653f6b128aac0046fa3000f8baed Mon Sep 17 00:00:00 2001
From: ng0 <ng0@we.make.ritual.n0.is>
Date: Thu, 18 Aug 2016 13:38:20 +0000
Subject: [PATCH 1/2] gnu: libgpg-error: Update to 1.24.
* gnu/packages/gnupg.scm (libgpg-error): Update to 1.24.
---
gnu/packages/gnupg.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 69adf97..989496f 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -6,7 +6,7 @@
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
-;;; Copyright © 2016 Nils Gillmann <ng0@libertad.pw>
+;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -50,7 +50,7 @@
(define-public libgpg-error
(package
(name "libgpg-error")
- (version "1.22")
+ (version "1.24")
(source
(origin
(method url-fetch)
@@ -58,7 +58,7 @@
version ".tar.bz2"))
(sha256
(base32
- "0ywxwswizmkyciy480kzczxn6nhbgzf3z8my4nk43nvv67k4x87j"))))
+ "0h75sf1ngr750c3fjfn4583q7wz40qm63jhg8vjfdrbx936f2s4j"))))
(build-system gnu-build-system)
(home-page "https://gnupg.org")
(synopsis "Library of error values for GnuPG components")
--
2.9.3
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-gnupg-Update-to-2.1.14.patch --]
[-- Type: text/x-patch, Size: 1704 bytes --]
From a929ccb1ad245c791d0ddd18b77650d0967d615b Mon Sep 17 00:00:00 2001
From: ng0 <ng0@we.make.ritual.n0.is>
Date: Thu, 18 Aug 2016 15:25:07 +0000
Subject: [PATCH 2/2] gnu: gnupg: Update to 2.1.14.
* gnu/packages/gnupg.scm (gnupg): Update to 2.1.14.
Co-authored by: Leo Famulari <leo@famulari.name>
---
gnu/packages/gnupg.scm | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 989496f..4edc282 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -209,14 +209,14 @@ compatible to GNU Pth.")
(define-public gnupg
(package
(name "gnupg")
- (version "2.1.13")
+ (version "2.1.14")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnupg/gnupg/gnupg-" version
".tar.bz2"))
(sha256
(base32
- "0xcn46vcb5x5qx0bc803vpzhzhnn6wfhp7x71w9n1ahx4ak877ag"))))
+ "0hmsiscpdpdqd8kcjpzkz2gzcc3cnrvswk9p1jzi4sivd7lxwl4l"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
@@ -242,7 +242,12 @@ compatible to GNU Pth.")
(lambda _
(substitute* "tests/openpgp/defs.inc"
(("/bin/pwd") (which "pwd")))
- #t)))))
+ #t))
+ (add-after 'build 'patch-scheme-tests
+ (lambda _
+ (substitute* (find-files "tests" ".\\.scm$")
+ (("/usr/bin/env gpgscm")
+ (string-append (getcwd) "/tests/gpgscm/gpgscm"))))))))
(home-page "https://gnupg.org/")
(synopsis "GNU Privacy Guard")
(description
--
2.9.3
[-- Attachment #4: Type: text/plain, Size: 71 bytes --]
--
ng0
For non-prism friendly talk find me on http://www.psyced.org
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH][core-updates] gnu: gnupg, libgpg-error updates rebased
2016-08-18 15:33 [PATCH][core-updates] gnu: gnupg, libgpg-error updates rebased ng0
@ 2016-08-18 18:34 ` ng0
2016-08-18 18:54 ` Leo Famulari
0 siblings, 1 reply; 9+ messages in thread
From: ng0 @ 2016-08-18 18:34 UTC (permalink / raw)
To: guix-devel
GnuPG 2.1.15 has just been released, but please apply this patch, I'll
have 2.1.15 ready later and send a separate patch of it based on this one.
ng0 <ng0@we.make.ritual.n0.is> writes:
> These patches are applied directly on core-updates.
>
> From b63701cacb87653f6b128aac0046fa3000f8baed Mon Sep 17 00:00:00 2001
> From: ng0 <ng0@we.make.ritual.n0.is>
> Date: Thu, 18 Aug 2016 13:38:20 +0000
> Subject: [PATCH 1/2] gnu: libgpg-error: Update to 1.24.
>
> * gnu/packages/gnupg.scm (libgpg-error): Update to 1.24.
> ---
> gnu/packages/gnupg.scm | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
> index 69adf97..989496f 100644
> --- a/gnu/packages/gnupg.scm
> +++ b/gnu/packages/gnupg.scm
> @@ -6,7 +6,7 @@
> ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
> ;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
> ;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
> -;;; Copyright © 2016 Nils Gillmann <ng0@libertad.pw>
> +;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -50,7 +50,7 @@
> (define-public libgpg-error
> (package
> (name "libgpg-error")
> - (version "1.22")
> + (version "1.24")
> (source
> (origin
> (method url-fetch)
> @@ -58,7 +58,7 @@
> version ".tar.bz2"))
> (sha256
> (base32
> - "0ywxwswizmkyciy480kzczxn6nhbgzf3z8my4nk43nvv67k4x87j"))))
> + "0h75sf1ngr750c3fjfn4583q7wz40qm63jhg8vjfdrbx936f2s4j"))))
> (build-system gnu-build-system)
> (home-page "https://gnupg.org")
> (synopsis "Library of error values for GnuPG components")
> --
> 2.9.3
>
> From a929ccb1ad245c791d0ddd18b77650d0967d615b Mon Sep 17 00:00:00 2001
> From: ng0 <ng0@we.make.ritual.n0.is>
> Date: Thu, 18 Aug 2016 15:25:07 +0000
> Subject: [PATCH 2/2] gnu: gnupg: Update to 2.1.14.
>
> * gnu/packages/gnupg.scm (gnupg): Update to 2.1.14.
>
> Co-authored by: Leo Famulari <leo@famulari.name>
> ---
> gnu/packages/gnupg.scm | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
> index 989496f..4edc282 100644
> --- a/gnu/packages/gnupg.scm
> +++ b/gnu/packages/gnupg.scm
> @@ -209,14 +209,14 @@ compatible to GNU Pth.")
> (define-public gnupg
> (package
> (name "gnupg")
> - (version "2.1.13")
> + (version "2.1.14")
> (source (origin
> (method url-fetch)
> (uri (string-append "mirror://gnupg/gnupg/gnupg-" version
> ".tar.bz2"))
> (sha256
> (base32
> - "0xcn46vcb5x5qx0bc803vpzhzhnn6wfhp7x71w9n1ahx4ak877ag"))))
> + "0hmsiscpdpdqd8kcjpzkz2gzcc3cnrvswk9p1jzi4sivd7lxwl4l"))))
> (build-system gnu-build-system)
> (native-inputs
> `(("pkg-config" ,pkg-config)))
> @@ -242,7 +242,12 @@ compatible to GNU Pth.")
> (lambda _
> (substitute* "tests/openpgp/defs.inc"
> (("/bin/pwd") (which "pwd")))
> - #t)))))
> + #t))
> + (add-after 'build 'patch-scheme-tests
> + (lambda _
> + (substitute* (find-files "tests" ".\\.scm$")
> + (("/usr/bin/env gpgscm")
> + (string-append (getcwd) "/tests/gpgscm/gpgscm"))))))))
> (home-page "https://gnupg.org/")
> (synopsis "GNU Privacy Guard")
> (description
> --
> 2.9.3
>
>
>
> --
> ng0
> For non-prism friendly talk find me on http://www.psyced.org
--
ng0
For non-prism friendly talk find me on http://www.psyced.org
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH][core-updates] gnu: gnupg, libgpg-error updates rebased
2016-08-18 18:34 ` ng0
@ 2016-08-18 18:54 ` Leo Famulari
2016-08-18 19:27 ` ng0
0 siblings, 1 reply; 9+ messages in thread
From: Leo Famulari @ 2016-08-18 18:54 UTC (permalink / raw)
To: ng0; +Cc: guix-devel
On Thu, Aug 18, 2016 at 06:34:24PM +0000, ng0 wrote:
> GnuPG 2.1.15 has just been released, but please apply this patch, I'll
> have 2.1.15 ready later and send a separate patch of it based on this one.
I applied your update patch for libgpg-error, but I rewrote the gnupg
update patch from scratch.
So, no need for a "gnupg: Update to 2.1.15" patch. It's already done.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH][core-updates] gnu: gnupg, libgpg-error updates rebased
2016-08-18 18:54 ` Leo Famulari
@ 2016-08-18 19:27 ` ng0
2016-08-19 4:55 ` Leo Famulari
0 siblings, 1 reply; 9+ messages in thread
From: ng0 @ 2016-08-18 19:27 UTC (permalink / raw)
To: Leo Famulari; +Cc: guix-devel
Leo Famulari <leo@famulari.name> writes:
> On Thu, Aug 18, 2016 at 06:34:24PM +0000, ng0 wrote:
>> GnuPG 2.1.15 has just been released, but please apply this patch, I'll
>> have 2.1.15 ready later and send a separate patch of it based on this one.
>
> I applied your update patch for libgpg-error, but I rewrote the gnupg
> update patch from scratch.
>
> So, no need for a "gnupg: Update to 2.1.15" patch. It's already done.
I'm not so sure. My build of it failed when the tests happened, which is
why my patch included a fix for that:
https://lists.gnu.org/archive/html/guix-devel/2016-08/msg01276.html
It sets $HOME, so that the tests of gnupg-2.1.15 can succeed.
--
ng0
For non-prism friendly talk find me on http://www.psyced.org
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH][core-updates] gnu: gnupg, libgpg-error updates rebased
2016-08-18 19:27 ` ng0
@ 2016-08-19 4:55 ` Leo Famulari
2016-08-19 7:00 ` ng0
0 siblings, 1 reply; 9+ messages in thread
From: Leo Famulari @ 2016-08-19 4:55 UTC (permalink / raw)
To: ng0; +Cc: guix-devel
On Thu, Aug 18, 2016 at 07:27:14PM +0000, ng0 wrote:
> Leo Famulari <leo@famulari.name> writes:
>
> > On Thu, Aug 18, 2016 at 06:34:24PM +0000, ng0 wrote:
> >> GnuPG 2.1.15 has just been released, but please apply this patch, I'll
> >> have 2.1.15 ready later and send a separate patch of it based on this one.
> >
> > I applied your update patch for libgpg-error, but I rewrote the gnupg
> > update patch from scratch.
> >
> > So, no need for a "gnupg: Update to 2.1.15" patch. It's already done.
>
> I'm not so sure. My build of it failed when the tests happened, which is
> why my patch included a fix for that:
> https://lists.gnu.org/archive/html/guix-devel/2016-08/msg01276.html
Ah, you're right. Can you send a patch for core-updates?
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH][core-updates] gnu: gnupg, libgpg-error updates rebased
2016-08-19 4:55 ` Leo Famulari
@ 2016-08-19 7:00 ` ng0
2016-08-20 8:41 ` ng0
0 siblings, 1 reply; 9+ messages in thread
From: ng0 @ 2016-08-19 7:00 UTC (permalink / raw)
To: Leo Famulari; +Cc: guix-devel
Leo Famulari <leo@famulari.name> writes:
> On Thu, Aug 18, 2016 at 07:27:14PM +0000, ng0 wrote:
>> Leo Famulari <leo@famulari.name> writes:
>>
>> > On Thu, Aug 18, 2016 at 06:34:24PM +0000, ng0 wrote:
>> >> GnuPG 2.1.15 has just been released, but please apply this patch, I'll
>> >> have 2.1.15 ready later and send a separate patch of it based on this one.
>> >
>> > I applied your update patch for libgpg-error, but I rewrote the gnupg
>> > update patch from scratch.
>> >
>> > So, no need for a "gnupg: Update to 2.1.15" patch. It's already done.
>>
>> I'm not so sure. My build of it failed when the tests happened, which is
>> why my patch included a fix for that:
>> https://lists.gnu.org/archive/html/guix-devel/2016-08/msg01276.html
>
> Ah, you're right. Can you send a patch for core-updates?
http://lists.gnu.org/archive/html/guix-devel/2016-08/msg01276.html
includes this already.
--
ng0
For non-prism friendly talk find me on http://www.psyced.org
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH][core-updates] gnu: gnupg, libgpg-error updates rebased
2016-08-19 7:00 ` ng0
@ 2016-08-20 8:41 ` ng0
2016-08-20 9:27 ` ng0
0 siblings, 1 reply; 9+ messages in thread
From: ng0 @ 2016-08-20 8:41 UTC (permalink / raw)
To: Leo Famulari; +Cc: guix-devel
[-- Attachment #1: Type: text/plain, Size: 1157 bytes --]
ng0 <ng0@we.make.ritual.n0.is> writes:
> Leo Famulari <leo@famulari.name> writes:
>
>> On Thu, Aug 18, 2016 at 07:27:14PM +0000, ng0 wrote:
>>> Leo Famulari <leo@famulari.name> writes:
>>>
>>> > On Thu, Aug 18, 2016 at 06:34:24PM +0000, ng0 wrote:
>>> >> GnuPG 2.1.15 has just been released, but please apply this patch, I'll
>>> >> have 2.1.15 ready later and send a separate patch of it based on this one.
>>> >
>>> > I applied your update patch for libgpg-error, but I rewrote the gnupg
>>> > update patch from scratch.
>>> >
>>> > So, no need for a "gnupg: Update to 2.1.15" patch. It's already done.
>>>
>>> I'm not so sure. My build of it failed when the tests happened, which is
>>> why my patch included a fix for that:
>>> https://lists.gnu.org/archive/html/guix-devel/2016-08/msg01276.html
>>
>> Ah, you're right. Can you send a patch for core-updates?
>
> http://lists.gnu.org/archive/html/guix-devel/2016-08/msg01276.html
> includes this already.
Disregard the previous message, this one applies on top of your changes
on core-updates. It has not been run, I'm starting the build now, but it
is the same as the original gnupg update I had.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-gnupg-Fix-test-failures.patch --]
[-- Type: text/x-patch, Size: 1177 bytes --]
From 3aec89f0444bd1e75f8dfa945e586a79790d254d Mon Sep 17 00:00:00 2001
From: ng0 <ng0@we.make.ritual.n0.is>
Date: Sat, 20 Aug 2016 08:37:22 +0000
Subject: [PATCH] gnu: gnupg: Fix test failures.
* gnu/packages/gnupg.scm (gnupg)[arguments]: Set $HOME before 'check.
---
gnu/packages/gnupg.scm | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 27db5c3..52a9fc5 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -247,7 +247,13 @@ compatible to GNU Pth.")
(lambda _
(substitute* (find-files "tests" ".\\.scm$")
(("/usr/bin/env gpgscm")
- (string-append (getcwd) "/tests/gpgscm/gpgscm"))))))))
+ (string-append (getcwd) "/tests/gpgscm/gpgscm")))))
+ (add-before 'check 'set-home
+ ;; Some tests require write access to $HOME, otherwise leading to
+ ;; 'failed to create directory /homeless-shelter/.asy' error.
+ (lambda _
+ (setenv "HOME" "/tmp")
+ #t)))))
(home-page "https://gnupg.org/")
(synopsis "GNU Privacy Guard")
(description
--
2.9.3
[-- Attachment #3: Type: text/plain, Size: 70 bytes --]
--
ng0
For non-prism friendly talk find me on http://www.psyced.org
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH][core-updates] gnu: gnupg, libgpg-error updates rebased
2016-08-20 8:41 ` ng0
@ 2016-08-20 9:27 ` ng0
2016-08-21 22:09 ` Leo Famulari
0 siblings, 1 reply; 9+ messages in thread
From: ng0 @ 2016-08-20 9:27 UTC (permalink / raw)
To: guix-devel
ng0 <ng0@we.make.ritual.n0.is> writes:
> ng0 <ng0@we.make.ritual.n0.is> writes:
>
>> Leo Famulari <leo@famulari.name> writes:
>>
>>> On Thu, Aug 18, 2016 at 07:27:14PM +0000, ng0 wrote:
>>>> Leo Famulari <leo@famulari.name> writes:
>>>>
>>>> > On Thu, Aug 18, 2016 at 06:34:24PM +0000, ng0 wrote:
>>>> >> GnuPG 2.1.15 has just been released, but please apply this patch, I'll
>>>> >> have 2.1.15 ready later and send a separate patch of it based on this one.
>>>> >
>>>> > I applied your update patch for libgpg-error, but I rewrote the gnupg
>>>> > update patch from scratch.
>>>> >
>>>> > So, no need for a "gnupg: Update to 2.1.15" patch. It's already done.
>>>>
>>>> I'm not so sure. My build of it failed when the tests happened, which is
>>>> why my patch included a fix for that:
>>>> https://lists.gnu.org/archive/html/guix-devel/2016-08/msg01276.html
>>>
>>> Ah, you're right. Can you send a patch for core-updates?
>>
>> http://lists.gnu.org/archive/html/guix-devel/2016-08/msg01276.html
>> includes this already.
>
> Disregard the previous message, this one applies on top of your changes
> on core-updates. It has not been run, I'm starting the build now, but it
> is the same as the original gnupg update I had.
It has been run, build succeeds.
> From 3aec89f0444bd1e75f8dfa945e586a79790d254d Mon Sep 17 00:00:00 2001
> From: ng0 <ng0@we.make.ritual.n0.is>
> Date: Sat, 20 Aug 2016 08:37:22 +0000
> Subject: [PATCH] gnu: gnupg: Fix test failures.
>
> * gnu/packages/gnupg.scm (gnupg)[arguments]: Set $HOME before 'check.
> ---
> gnu/packages/gnupg.scm | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
> index 27db5c3..52a9fc5 100644
> --- a/gnu/packages/gnupg.scm
> +++ b/gnu/packages/gnupg.scm
> @@ -247,7 +247,13 @@ compatible to GNU Pth.")
> (lambda _
> (substitute* (find-files "tests" ".\\.scm$")
> (("/usr/bin/env gpgscm")
> - (string-append (getcwd) "/tests/gpgscm/gpgscm"))))))))
> + (string-append (getcwd) "/tests/gpgscm/gpgscm")))))
> + (add-before 'check 'set-home
> + ;; Some tests require write access to $HOME, otherwise leading to
> + ;; 'failed to create directory /homeless-shelter/.asy' error.
> + (lambda _
> + (setenv "HOME" "/tmp")
> + #t)))))
> (home-page "https://gnupg.org/")
> (synopsis "GNU Privacy Guard")
> (description
> --
> 2.9.3
>
>
--
ng0
For non-prism friendly talk find me on http://www.psyced.org
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH][core-updates] gnu: gnupg, libgpg-error updates rebased
2016-08-20 9:27 ` ng0
@ 2016-08-21 22:09 ` Leo Famulari
0 siblings, 0 replies; 9+ messages in thread
From: Leo Famulari @ 2016-08-21 22:09 UTC (permalink / raw)
To: ng0; +Cc: guix-devel
On Sat, Aug 20, 2016 at 09:27:25AM +0000, ng0 wrote:
> > From 3aec89f0444bd1e75f8dfa945e586a79790d254d Mon Sep 17 00:00:00 2001
> > From: ng0 <ng0@we.make.ritual.n0.is>
> > Date: Sat, 20 Aug 2016 08:37:22 +0000
> > Subject: [PATCH] gnu: gnupg: Fix test failures.
> >
> > * gnu/packages/gnupg.scm (gnupg)[arguments]: Set $HOME before 'check.
Thank you for catching this! Pushed as dd582f4ae5.
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2016-08-21 22:09 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-18 15:33 [PATCH][core-updates] gnu: gnupg, libgpg-error updates rebased ng0
2016-08-18 18:34 ` ng0
2016-08-18 18:54 ` Leo Famulari
2016-08-18 19:27 ` ng0
2016-08-19 4:55 ` Leo Famulari
2016-08-19 7:00 ` ng0
2016-08-20 8:41 ` ng0
2016-08-20 9:27 ` ng0
2016-08-21 22:09 ` Leo Famulari
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).