unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
* [PATCH] gnu: libgcrypt update to 1.7.1
@ 2016-06-15 19:53 ng0
  2016-06-16 15:40 ` Leo Famulari
  0 siblings, 1 reply; 8+ messages in thread
From: ng0 @ 2016-06-15 19:53 UTC (permalink / raw)
  To: guix-devel


[-- Attachment #1.1: Type: text/plain, Size: 1648 bytes --]

output of test: https://ptpb.pw/k6oU

From 422b2a632b94be9ea57130d7d231d95912dac253 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@we.make.ritual.n0.is>
Date: Wed, 15 Jun 2016 19:41:52 +0000
Subject: [PATCH] gnu: libgcrypt: Update to 1.7.1.

* gnu/packages/gnupg.scm (libgcrypt):  Update to 1.7.1
---
 gnu/packages/gnupg.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index c5055b6..eb2dc80 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -6,6 +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 ng0 <ng0@we.make.ritual.n0.is>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -73,14 +74,14 @@ Daemon and possibly more in the future.")
 (define-public libgcrypt
   (package
     (name "libgcrypt")
-    (version "1.6.5")
+    (version "1.7.1")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnupg/libgcrypt/libgcrypt-"
                                  version ".tar.bz2"))
              (sha256
               (base32
-               "0959mwfzsxhallxdqlw359xg180ll2skxwyy35qawmfl89cbr7pl"))))
+               "15bsdpihb8xvr2a6sh0ikzw9wdw3gdi4pl1vpr6wc48npzy9q3a5"))))
     (build-system gnu-build-system)
     (propagated-inputs
      `(("libgpg-error-host" ,libgpg-error)))
--
2.8.4


--
♥Ⓐ ng0
For non-prism friendly talk find me on
psyced.org / loupsycedyglgamf.onion

[-- Attachment #1.2: 0001-gnu-libgcrypt-Update-to-1.7.1.patch --]
[-- Type: text/x-diff, Size: 1514 bytes --]

From 422b2a632b94be9ea57130d7d231d95912dac253 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@we.make.ritual.n0.is>
Date: Wed, 15 Jun 2016 19:41:52 +0000
Subject: [PATCH] gnu: libgcrypt: Update to 1.7.1.

* gnu/packages/gnupg.scm (libgcrypt):  Update to 1.7.1
---
 gnu/packages/gnupg.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index c5055b6..eb2dc80 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -6,6 +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 ng0 <ng0@we.make.ritual.n0.is>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -73,14 +74,14 @@ Daemon and possibly more in the future.")
 (define-public libgcrypt
   (package
     (name "libgcrypt")
-    (version "1.6.5")
+    (version "1.7.1")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnupg/libgcrypt/libgcrypt-"
                                  version ".tar.bz2"))
              (sha256
               (base32
-               "0959mwfzsxhallxdqlw359xg180ll2skxwyy35qawmfl89cbr7pl"))))
+               "15bsdpihb8xvr2a6sh0ikzw9wdw3gdi4pl1vpr6wc48npzy9q3a5"))))
     (build-system gnu-build-system)
     (propagated-inputs
      `(("libgpg-error-host" ,libgpg-error)))
-- 
2.8.4


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH] gnu: libgcrypt update to 1.7.1
  2016-06-15 19:53 [PATCH] gnu: libgcrypt update to 1.7.1 ng0
@ 2016-06-16 15:40 ` Leo Famulari
  2016-06-16 16:28   ` Efraim Flashner
  0 siblings, 1 reply; 8+ messages in thread
From: Leo Famulari @ 2016-06-16 15:40 UTC (permalink / raw)
  To: guix-devel

On Wed, Jun 15, 2016 at 07:53:28PM +0000, ng0 wrote:
> * gnu/packages/gnupg.scm (libgcrypt):  Update to 1.7.1

This looks good to me. What branch should it go on?

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] gnu: libgcrypt update to 1.7.1
  2016-06-16 15:40 ` Leo Famulari
@ 2016-06-16 16:28   ` Efraim Flashner
  2016-06-17 15:02     ` Ludovic Courtès
  0 siblings, 1 reply; 8+ messages in thread
From: Efraim Flashner @ 2016-06-16 16:28 UTC (permalink / raw)
  To: Leo Famulari; +Cc: guix-devel

[-- Attachment #1: Type: text/plain, Size: 499 bytes --]

On Thu, Jun 16, 2016 at 11:40:47AM -0400, Leo Famulari wrote:
> On Wed, Jun 15, 2016 at 07:53:28PM +0000, ng0 wrote:
> > * gnu/packages/gnupg.scm (libgcrypt):  Update to 1.7.1
> 
> This looks good to me. What branch should it go on?
> 

either core-updates or core-updates-next

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] gnu: libgcrypt update to 1.7.1
  2016-06-16 16:28   ` Efraim Flashner
@ 2016-06-17 15:02     ` Ludovic Courtès
  2016-06-17 17:43       ` Leo Famulari
  0 siblings, 1 reply; 8+ messages in thread
From: Ludovic Courtès @ 2016-06-17 15:02 UTC (permalink / raw)
  To: Efraim Flashner; +Cc: guix-devel

Efraim Flashner <efraim@flashner.co.il> skribis:

> On Thu, Jun 16, 2016 at 11:40:47AM -0400, Leo Famulari wrote:
>> On Wed, Jun 15, 2016 at 07:53:28PM +0000, ng0 wrote:
>> > * gnu/packages/gnupg.scm (libgcrypt):  Update to 1.7.1
>> 
>> This looks good to me. What branch should it go on?
>> 
>
> either core-updates or core-updates-next

The latter please.  :-)

Ludo’.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] gnu: libgcrypt update to 1.7.1
  2016-06-17 15:02     ` Ludovic Courtès
@ 2016-06-17 17:43       ` Leo Famulari
  2016-06-17 18:59         ` ng0
  0 siblings, 1 reply; 8+ messages in thread
From: Leo Famulari @ 2016-06-17 17:43 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: guix-devel

On Fri, Jun 17, 2016 at 05:02:44PM +0200, Ludovic Courtès wrote:
> Efraim Flashner <efraim@flashner.co.il> skribis:
> 
> > On Thu, Jun 16, 2016 at 11:40:47AM -0400, Leo Famulari wrote:
> >> On Wed, Jun 15, 2016 at 07:53:28PM +0000, ng0 wrote:
> >> > * gnu/packages/gnupg.scm (libgcrypt):  Update to 1.7.1
> >> 
> >> This looks good to me. What branch should it go on?
> >> 
> >
> > either core-updates or core-updates-next
> 
> The latter please.  :-)

Okay, in that case, can you rebase it on core-updates, ng0? Otherwise is
won't apply cleanly due to trying to upgrade from 1.6.5 instad of 1.7.0.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] gnu: libgcrypt update to 1.7.1
  2016-06-17 17:43       ` Leo Famulari
@ 2016-06-17 18:59         ` ng0
  2016-06-17 19:28           ` Leo Famulari
  0 siblings, 1 reply; 8+ messages in thread
From: ng0 @ 2016-06-17 18:59 UTC (permalink / raw)
  To: guix-devel

[-- Attachment #1: Type: text/plain, Size: 1120 bytes --]

On 2016-06-17(01:43:02-0400), Leo Famulari wrote:
> On Fri, Jun 17, 2016 at 05:02:44PM +0200, Ludovic Courtès wrote:
> > Efraim Flashner <efraim@flashner.co.il> skribis:
> >
> > > On Thu, Jun 16, 2016 at 11:40:47AM -0400, Leo Famulari wrote:
> > >> On Wed, Jun 15, 2016 at 07:53:28PM +0000, ng0 wrote:
> > >> > * gnu/packages/gnupg.scm (libgcrypt):  Update to 1.7.1
> > >>
> > >> This looks good to me. What branch should it go on?
> > >>
> > >
> > > either core-updates or core-updates-next
> >
> > The latter please.  :-)
>
> Okay, in that case, can you rebase it on core-updates, ng0? Otherwise is
> won't apply cleanly due to trying to upgrade from 1.6.5 instad of 1.7.0.
>

This should be relatively easy when I have the gnupg branch still around,
otherwise I'll recreate it.

With the wording familiar to me yet sometimes not good to comprehend even
when I hear and parse it correctly when talking:
I should rebase the commit on the branch
`core-updates` which currently is at version 1.6.5?

--
♥Ⓐ ng0
For non-prism friendly talk find me on
psyced.org / loupsycedyglgamf.onion

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] gnu: libgcrypt update to 1.7.1
  2016-06-17 18:59         ` ng0
@ 2016-06-17 19:28           ` Leo Famulari
  2016-06-17 22:44             ` ng0
  0 siblings, 1 reply; 8+ messages in thread
From: Leo Famulari @ 2016-06-17 19:28 UTC (permalink / raw)
  To: guix-devel

On Fri, Jun 17, 2016 at 06:59:23PM +0000, ng0 wrote:
> On 2016-06-17(01:43:02-0400), Leo Famulari wrote:
> > On Fri, Jun 17, 2016 at 05:02:44PM +0200, Ludovic Courtès wrote:
> > > Efraim Flashner <efraim@flashner.co.il> skribis:
> > >
> > > > On Thu, Jun 16, 2016 at 11:40:47AM -0400, Leo Famulari wrote:
> > > >> On Wed, Jun 15, 2016 at 07:53:28PM +0000, ng0 wrote:
> > > >> > * gnu/packages/gnupg.scm (libgcrypt):  Update to 1.7.1
> > > >>
> > > >> This looks good to me. What branch should it go on?
> > > >>
> > > >
> > > > either core-updates or core-updates-next
> > >
> > > The latter please.  :-)
> >
> > Okay, in that case, can you rebase it on core-updates, ng0? Otherwise is
> > won't apply cleanly due to trying to upgrade from 1.6.5 instad of 1.7.0.
> >
> 
> This should be relatively easy when I have the gnupg branch still around,
> otherwise I'll recreate it.
> 
> With the wording familiar to me yet sometimes not good to comprehend even
> when I hear and parse it correctly when talking:
> I should rebase the commit on the branch
> `core-updates` which currently is at version 1.6.5?

I think your copy of core-updates needs to be updated. I pushed your
patch "gnu: libgcrypt: Update to 1.7.0" as 81068f178 to it in April ;)

All you need to do is get the latest core-updates, and then re-do this
patch on that branch, so that it updates from 1.7.0 instead of 1.6.5.
You don't need to do anything with gnupg.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] gnu: libgcrypt update to 1.7.1
  2016-06-17 19:28           ` Leo Famulari
@ 2016-06-17 22:44             ` ng0
  0 siblings, 0 replies; 8+ messages in thread
From: ng0 @ 2016-06-17 22:44 UTC (permalink / raw)
  To: guix-devel


[-- Attachment #1.1: Type: text/plain, Size: 3221 bytes --]

On 2016-06-17(03:28:36-0400), Leo Famulari wrote:
> On Fri, Jun 17, 2016 at 06:59:23PM +0000, ng0 wrote:
> > On 2016-06-17(01:43:02-0400), Leo Famulari wrote:
> > > On Fri, Jun 17, 2016 at 05:02:44PM +0200, Ludovic Courtès wrote:
> > > > Efraim Flashner <efraim@flashner.co.il> skribis:
> > > >
> > > > > On Thu, Jun 16, 2016 at 11:40:47AM -0400, Leo Famulari wrote:
> > > > >> On Wed, Jun 15, 2016 at 07:53:28PM +0000, ng0 wrote:
> > > > >> > * gnu/packages/gnupg.scm (libgcrypt):  Update to 1.7.1
> > > > >>
> > > > >> This looks good to me. What branch should it go on?
> > > > >>
> > > > >
> > > > > either core-updates or core-updates-next
> > > >
> > > > The latter please.  :-)
> > >
> > > Okay, in that case, can you rebase it on core-updates, ng0? Otherwise is
> > > won't apply cleanly due to trying to upgrade from 1.6.5 instad of 1.7.0.
> > >
> >
> > This should be relatively easy when I have the gnupg branch still around,
> > otherwise I'll recreate it.
> >
> > With the wording familiar to me yet sometimes not good to comprehend even
> > when I hear and parse it correctly when talking:
> > I should rebase the commit on the branch
> > `core-updates` which currently is at version 1.6.5?
>
> I think your copy of core-updates needs to be updated. I pushed your
> patch "gnu: libgcrypt: Update to 1.7.0" as 81068f178 to it in April ;)
>
> All you need to do is get the latest core-updates, and then re-do this
> patch on that branch, so that it updates from 1.7.0 instead of 1.6.5.
> You don't need to do anything with gnupg.

That was the name of the branch where I worked on gnupg.scm, that's why.

inlined and appened the rebase on core-updates (I left out the header as
this was already added with the gnupg update):

From 372943f91376905ebefe47372cdf55e1c14bc165 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@we.make.ritual.n0.is>
Date: Fri, 17 Jun 2016 22:35:18 +0000
Subject: [PATCH] gnu: libgcrypt: Update to 1.7.1.

* gnu/packages/gnupg.scm (libgcrypt): Update to 1.7.1.
---
 gnu/packages/gnupg.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 2ef2410..f2b53c2 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -74,14 +74,14 @@ Daemon and possibly more in the future.")
 (define-public libgcrypt
   (package
     (name "libgcrypt")
-    (version "1.7.0")
+    (version "1.7.1")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnupg/libgcrypt/libgcrypt-"
                                  version ".tar.bz2"))
              (sha256
               (base32
-               "14pspxwrqcgfklw3dgmywbxqwdzcym7fznfrqh9rk4vl8jkpxrmh"))))
+               "15bsdpihb8xvr2a6sh0ikzw9wdw3gdi4pl1vpr6wc48npzy9q3a5"))))
     (build-system gnu-build-system)
     (propagated-inputs
      `(("libgpg-error-host" ,libgpg-error)))
--
2.8.4



It's the very same, so I did not check it, build functionality shold be
exactly the same as in master, given that the last commit is a merge of
master.


--
♥Ⓐ ng0
For non-prism friendly talk find me on
psyced.org / loupsycedyglgamf.onion

[-- Attachment #1.2: 0001-gnu-libgcrypt-Update-to-1.7.1.patch --]
[-- Type: text/x-diff, Size: 1186 bytes --]

From 372943f91376905ebefe47372cdf55e1c14bc165 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@we.make.ritual.n0.is>
Date: Fri, 17 Jun 2016 22:35:18 +0000
Subject: [PATCH] gnu: libgcrypt: Update to 1.7.1.

* gnu/packages/gnupg.scm (libgcrypt): Update to 1.7.1.
---
 gnu/packages/gnupg.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 2ef2410..f2b53c2 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -74,14 +74,14 @@ Daemon and possibly more in the future.")
 (define-public libgcrypt
   (package
     (name "libgcrypt")
-    (version "1.7.0")
+    (version "1.7.1")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnupg/libgcrypt/libgcrypt-"
                                  version ".tar.bz2"))
              (sha256
               (base32
-               "14pspxwrqcgfklw3dgmywbxqwdzcym7fznfrqh9rk4vl8jkpxrmh"))))
+               "15bsdpihb8xvr2a6sh0ikzw9wdw3gdi4pl1vpr6wc48npzy9q3a5"))))
     (build-system gnu-build-system)
     (propagated-inputs
      `(("libgpg-error-host" ,libgpg-error)))
-- 
2.8.4


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2016-06-17 22:45 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-15 19:53 [PATCH] gnu: libgcrypt update to 1.7.1 ng0
2016-06-16 15:40 ` Leo Famulari
2016-06-16 16:28   ` Efraim Flashner
2016-06-17 15:02     ` Ludovic Courtès
2016-06-17 17:43       ` Leo Famulari
2016-06-17 18:59         ` ng0
2016-06-17 19:28           ` Leo Famulari
2016-06-17 22:44             ` ng0

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).