[bug#41533] [PATCH 0/10] Misc updates

[bug#41533] [PATCH 0/10] Misc updates

[Vincent Legoll]

Here is the update series to celebrate our come back to repology.

They are only build-tested, though.

All should have few dependents, and even ffmpeg could go to master.

-- 
Vincent Legoll

[bug#41533] [PATCH 01/10] gnu: ansible: Update to 2.9.9.

[Vincent Legoll]

* gnu/packages/admin.scm (ansible): Update to 2.9.9.
---
 gnu/packages/admin.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 7ec68d1d64..08131a8dd0 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -2025,13 +2025,13 @@ of supported upstream metrics systems simultaneously.")
 (define-public ansible
   (package
     (name "ansible")
-    (version "2.9.6")
+    (version "2.9.9")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "ansible" version))
        (sha256
-        (base32 "1jfbp1i3nl4yvqwd5ssy43dz3pq2x03mn875vb8r56gqh43kmksr"))))
+        (base32 "1l99vwkl48iwr8ffd1ihqia995mz8h8hwk4akm4w0cgiifp88gg8"))))
     (build-system python-build-system)
     (native-inputs
      `(("python-bcrypt" ,python-bcrypt)
-- 
2.26.2

[bug#41533] [PATCH 02/10] gnu: ffmpeg: Update to 4.2.3.

[Vincent Legoll]

* gnu/packages/video.scm (ffmpeg): Update to 4.2.3.
---
 gnu/packages/video.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 6529ae6507..e541016010 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -930,7 +930,7 @@ operate properly.")
 (define-public ffmpeg
   (package
     (name "ffmpeg")
-    (version "4.2.2")
+    (version "4.2.3")
     (source (origin
              (method url-fetch)
              (uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
@@ -939,7 +939,7 @@ operate properly.")
              (patches (search-patches "ffmpeg-prefer-dav1d.patch"))
              (sha256
               (base32
-               "176jn1lcdf0gk7sa5l2mv0faqp5dsqdhx1gqcrgymqhfmdal4xfb"))))
+               "0cddkb5sma9dzy8i59sfls19rhjlq40zn9mh3x666dqkxl5ckxlx"))))
     (build-system gnu-build-system)
     (inputs
      `(("dav1d" ,dav1d)
-- 
2.26.2

[bug#41533] [PATCH 03/10] gnu: unbound: Update to 1.10.1.

[Vincent Legoll]

* gnu/packages/dns.scm (unbound): Update to 1.10.1.
---
 gnu/packages/dns.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index d0c03ff2d5..8b21c79385 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -391,14 +391,14 @@ to result in system-wide compromise.")
 (define-public unbound
   (package
     (name "unbound")
-    (version "1.10.0")
+    (version "1.10.1")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://www.unbound.net/downloads/unbound-"
                            version ".tar.gz"))
        (sha256
-        (base32 "0mg9divpysr42sp0m693a70693dp8025v6c9dv1yabr4g1jlhbqm"))))
+        (base32 "0dnmh9jjh2v274f0hl31bgv40pl77mmfgky8bkqr5kvi3b17fdmp"))))
     (build-system gnu-build-system)
     (outputs '("out" "python"))
     (native-inputs
-- 
2.26.2

[bug#41533] [PATCH 04/10] gnu: haproxy: Update to 2.1.4.

[Vincent Legoll]

* gnu/packages/networking.scm (haproxy): Update to 2.1.4.
---
 gnu/packages/networking.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index f106d2bf72..aa31cb729e 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -3099,7 +3099,7 @@ cables.")
 (define-public haproxy
   (package
     (name "haproxy")
-    (version "2.1.3")
+    (version "2.1.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://www.haproxy.org/download/"
@@ -3107,7 +3107,7 @@ cables.")
                                   "/src/haproxy-" version ".tar.gz"))
               (sha256
                (base32
-                "0n8bw3d6gikr8c56ycrvksp1sl0b4yfzp19867cxkl3l0daqwrxv"))))
+                "1kcizs5r538chhpwqykdngxyqfi98i03akfjnii721npjvv0y0si"))))
     (build-system gnu-build-system)
     (arguments
      `(#:make-flags
-- 
2.26.2

[bug#41533] [PATCH 05/10] gnu: gitolite: Update to 3.6.11.

[Vincent Legoll]

* gnu/packages/version-control.scm (gitolite): Update to 3.6.11.
---
 gnu/packages/version-control.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 09ffd8f271..4f3968286d 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -1307,7 +1307,7 @@ also walk each side of a merge and test those changes individually.")
 (define-public gitolite
   (package
     (name "gitolite")
-    (version "3.6.7")
+    (version "3.6.11")
     (source
      (origin
        (method git-fetch)
@@ -1316,7 +1316,7 @@ also walk each side of a merge and test those changes individually.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0rmyzr66lxh2ildf3h1nh3hh2ndwk21rjdin50r5vhwbdd7jg8vb"))))
+        (base32 "1rkj7gknwjlc5ij9w39zf5mr647bm45la57yjczydmvrb8c56yrh"))))
     (build-system gnu-build-system)
     (arguments
      '(#:tests? #f ; no tests
-- 
2.26.2

[bug#41533] [PATCH 06/10] gnu: nagios: Update to 4.4.6.

[Vincent Legoll]

* gnu/packages/monitoring.scm (nagios): Update to 4.4.6.
---
 gnu/packages/monitoring.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm
index d88bbc3aa3..f6a1153548 100644
--- a/gnu/packages/monitoring.scm
+++ b/gnu/packages/monitoring.scm
@@ -62,7 +62,7 @@
 (define-public nagios
   (package
     (name "nagios")
-    (version "4.3.4")
+    (version "4.4.6")
     ;; XXX: Nagios 4.2.x and later bundle a copy of AngularJS.
     (source (origin
               (method url-fetch)
@@ -71,7 +71,7 @@
                     version "/nagios-" version ".tar.gz"))
               (sha256
                (base32
-                "1wa4m952sb23dqi5w759adimsp21bkhp598rpq9dnhz3v497h2y9"))
+                "1x5hb97zbvkm73q53ydp1gwj8nnznm72q9c4rm6ny7phr995l3db"))
               (modules '((guix build utils)))
               (snippet
                ;; Ensure reproducibility.
-- 
2.26.2

[bug#41533] [PATCH 07/10] gnu: mupdf: Update to 1.17.0.

[Vincent Legoll]

* gnu/packages/pdf.scm (mupdf): Update to 1.17.0.
---
 gnu/packages/pdf.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 7906fd28da..228065ae5b 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -685,7 +685,7 @@ extracting content or merging files.")
 (define-public mupdf
   (package
     (name "mupdf")
-    (version "1.16.1")
+    (version "1.17.0")
     (source
       (origin
         (method url-fetch)
@@ -693,7 +693,7 @@ extracting content or merging files.")
                             name "-" version "-source.tar.xz"))
         (sha256
          (base32
-          "1npmy92lkj41nnc14b4fpq7z62pminy94zsdbrczj22jpn283rvg"))
+          "11k0phq49jvxz9l7l9ca1xwsc5h77dpav7dmasdqv8nrjcjzndf9"))
         (modules '((guix build utils)))
         (snippet
          ;; We keep lcms2 since it is different than our lcms.
-- 
2.26.2

[bug#41533] [PATCH 08/10] gnu: xerces-c: Update to 3.2.3.

[Vincent Legoll]

* gnu/packages/xml.scm (xerces-c): Update to 3.2.3.
---
 gnu/packages/xml.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index d9efd5264b..90181a1773 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -1286,14 +1286,14 @@ spreadsheet.")
 (define-public xerces-c
   (package
     (name "xerces-c")
-    (version "3.1.4")
+    (version "3.2.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://apache/xerces/c/3/sources/"
                                   "xerces-c-" version ".tar.xz"))
               (sha256
                (base32
-                "0hb29c0smqlpxj0zdm09s983z5jx37szlliccnvgh0qq91wwqwwr"))))
+                "0jf1khvlssg31vkxbc25dxjxcxm56xb8nywj1sypj6hxzjlrkz0j"))))
     (build-system gnu-build-system)
     (arguments
      (let ((system (or (%current-target-system)
-- 
2.26.2

[bug#41533] [PATCH 09/10] gnu: java-xerces: Update to 2.12.1.

[Vincent Legoll]

* gnu/packages/java.scm (java-xerces): Update to 2.12.1.
---
 gnu/packages/java.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index a4659240fc..b12c3ca95c 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -10523,14 +10523,14 @@ classes prior to Java SE 8.")
 (define-public java-xerces
   (package
     (name "java-xerces")
-    (version "2.11.0")
+    (version "2.12.1")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://apache/xerces/j/source/"
                            "Xerces-J-src." version ".tar.gz"))
        (sha256
-        (base32 "1006igwy2lqrmjvdk64v8dg6qbk9c29pm8xxx7r87n0vnpvmx6pm"))
+        (base32 "0494kq36gw3nah19ifb720vwxbpg4ww0k6m3zq6wyanw6a083p6s"))
        (patches (search-patches
                  "java-xerces-xjavac_taskdef.patch"
                  "java-xerces-build_dont_unzip.patch"
-- 
2.26.2

[bug#41533] [PATCH 10/10] gnu: netpbm: Update to 10.90.2.

[Vincent Legoll]

* gnu/packages/netpbm.scm (netpbm): Update to 10.90.2.
---
 gnu/packages/netpbm.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/netpbm.scm b/gnu/packages/netpbm.scm
index 96025661ca..fa65ae25ff 100644
--- a/gnu/packages/netpbm.scm
+++ b/gnu/packages/netpbm.scm
@@ -37,7 +37,7 @@
 (define-public netpbm
   (package
    (name "netpbm")
-   (version "10.78.3")
+   (version "10.90.2")
    (source (origin
             (method svn-fetch)
             ;; At the time of first packaging, the "super-stable" and
-- 
2.26.2

[bug#41533] Acknowledgement ([PATCH 0/10] Misc updates)

[Vincent Legoll]

There's something strange (to me) happening with the netpbm update,
probably related to svn-fetch.

The hash did not change for the version update.

I tried to search guix doc for an explanation, but my (quick) try did
not found anything.

-- 
Vincent Legoll

[bug#41533] Acknowledgement ([PATCH 0/10] Misc updates)

[Tobias Geerinckx-Rice via Guix-patches via]

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

Vincent,

Thanks!  According to this comment in the netpbm package, 
‘advanced’ was not the prime choice:

  ;; At the time of first packaging, the "super-stable" and
  ;; "stable" versions did not compile with newer libpng;
  ;; we needed the "advanced" version.
  ;; The currently highest stable version is 10.47.53,
  ;; the currently highest advanced version is 10.69.4,
  ;; svn release 2397.

Stable has moved up quite a bit, to 10.86.13.  Could you try 
building it first?

Vincent Legoll 写道：
> There's something strange (to me) happening with the netpbm 
> update,
> probably related to svn-fetch.
>
> The hash did not change for the version update.

You're still asking Guix to fetch and build the old revision, 
since you only changed the VERSION field.  The source isn't 
affected by that variable:

  (uri (svn-reference
         (url "http://svn.code.sf.net/p/netpbm/code/advanced")
         (revision 2965)))

You can find the corresponding SVN revision on the release page[0] 
or:

  ;; To determine the correct release: "svn log version.mk".

Kind regards,

T G-R

[0]: https://sourceforge.net/p/netpbm/code/HEAD/tree/

PS: I updated haproxy on master already.

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

[bug#41533] Acknowledgement ([PATCH 0/10] Misc updates)

[Vincent Legoll]

Hello Tobias,

On 26/05/2020 00:45, Tobias Geerinckx-Rice wrote:
> Vincent,
> 
> Thanks!  According to this comment in the netpbm package, ‘advanced’ was 
> not the prime choice:
> 
>   ;; At the time of first packaging, the "super-stable" and
>   ;; "stable" versions did not compile with newer libpng;
>   ;; we needed the "advanced" version.
>   ;; The currently highest stable version is 10.47.53,
>   ;; the currently highest advanced version is 10.69.4,
>   ;; svn release 2397.

D'oh, I think I had my eyes closed when doing this last one...

> Stable has moved up quite a bit, to 10.86.13.  Could you try building it 
> first?

I tried but it does not build as-is, there's a problem with a patch not
applying any more. I'll have a look tomorrow, now is time for some zzz.

> PS: I updated haproxy on master already.

Grrr, I think I git pulled just before you pushed...

Hopefully the remaining ones are still useful.

Thanks for the eye-opener

-- 
Vincent Legoll

[bug#41533] [PATCH 07/10] gnu: mupdf: Update to 1.17.0.

[Efraim Flashner]

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

On Mon, May 25, 2020 at 11:57:57PM +0200, Vincent Legoll wrote:
> * gnu/packages/pdf.scm (mupdf): Update to 1.17.0.
> ---
>  gnu/packages/pdf.scm | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
> index 7906fd28da..228065ae5b 100644
> --- a/gnu/packages/pdf.scm
> +++ b/gnu/packages/pdf.scm
> @@ -685,7 +685,7 @@ extracting content or merging files.")
>  (define-public mupdf
>    (package
>      (name "mupdf")
> -    (version "1.16.1")
> +    (version "1.17.0")
>      (source
>        (origin
>          (method url-fetch)
> @@ -693,7 +693,7 @@ extracting content or merging files.")
>                              name "-" version "-source.tar.xz"))
>          (sha256
>           (base32
> -          "1npmy92lkj41nnc14b4fpq7z62pminy94zsdbrczj22jpn283rvg"))
> +          "11k0phq49jvxz9l7l9ca1xwsc5h77dpav7dmasdqv8nrjcjzndf9"))
>          (modules '((guix build utils)))
>          (snippet
>           ;; We keep lcms2 since it is different than our lcms.
> -- 
> 2.26.2
> 

When I tried updating this one it broke zathura-pdf-mupdf

-- 
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: 833 bytes --]

[bug#41533] [PATCH 02/10] gnu: ffmpeg: Update to 4.2.3.

[Leo Famulari]

On Mon, May 25, 2020 at 11:57:52PM +0200, Vincent Legoll wrote:
> * gnu/packages/video.scm (ffmpeg): Update to 4.2.3.

Thanks, pushed as a933ee559127561a0d628a5f9c6ede9ba1ab2ebb

[bug#41533] [PATCH 0/10] Misc updates

[Leo Famulari]

On Mon, May 25, 2020 at 11:56:25PM +0200, Vincent Legoll wrote:
> Here is the update series to celebrate our come back to repology.
> 
> They are only build-tested, though.
> 
> All should have few dependents, and even ffmpeg could go to master.

I pushed the FFmpeg update.

In general, it's hard to decide what to do with this bug ticket, since
some of the patches can't be pushed to master. Should we close it? Leave
it open? I think the best move is to split the patches into their own
bug ticket.

[bug#41533] [PATCH 0/10] Misc updates

[Vincent Legoll]

On 26/05/2020 19:56, Leo Famulari wrote:
> In general, it's hard to decide what to do with this bug ticket, since
> some of the patches can't be pushed to master. Should we close it? Leave
> it open? I think the best move is to split the patches into their own
> bug ticket.

All the patches are independent, I just did them all in a series to
minimize the email churn.

I was thinking committer(s) would cherry-pick the ready ones (all but
haproxy (already done by Tobias), netpbm & mupdf).

Just tell me what you prefer.

-- 
Vincent Legoll

[bug#41533] Acknowledgement ([PATCH 0/10] Misc updates)

[Tobias Geerinckx-Rice via Guix-patches via]

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

Vincent,

Vincent Legoll 写道：
> Hopefully the remaining ones are still useful.

Yup!  Took about a day to rebuild all ffmpeg dependents by which 
time it had alread been merged.  I've pushed the 6 other 
straightforward-looking ones to master.

Don't hesitate do submit these as separate bugs next time, but 
there's nothing wrong with this format so long as you keep track 
of which packages have(n't) been merged.

Kind regards,

T G-R

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

[bug#41533] Acknowledgement ([PATCH 0/10] Misc updates)

[Vincent Legoll]

Hello Tobias,

On 27/05/2020 04:02, Tobias Geerinckx-Rice wrote:
> Vincent Legoll 写道：
>> Hopefully the remaining ones are still useful.
> 
> Yup!  Took about a day to rebuild all ffmpeg dependents by which 
> time it had alread been merged.

:-)

> I've pushed the 6 other straightforward-looking ones to master.

Thanks, if I keep doing such independent series, I'll order them by
growing number of dependents, hoping it'll help a bit...

> Don't hesitate do submit these as separate bugs next time, but there's 
> nothing wrong with this format so long as you keep track of which 
> packages have(n't) been merged.

OK, I think I'll go to separate issues next time, as it's not a lot more
work, and should avoid having to track the series status.

But that was only a quick'n'dirty return to package updates, I have a
guix-installer.sh to take care of...

-- 
Vincent Legoll

[bug#41533] Acknowledgement ([PATCH 0/10] Misc updates)

[Leo Famulari]

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

On Wed, May 27, 2020 at 04:02:34AM +0200, Tobias Geerinckx-Rice via Guix-patches via wrote:
> Yup!  Took about a day to rebuild all ffmpeg dependents by which time it had
> alread been merged.  I've pushed the 6 other straightforward-looking ones to
> master.

Sorry, I didn't realize you were doing that! I find that FFmpeg updates
work reliably so I usually just test VLC and MPV before pushing.

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

[bug#41533] Acknowledgement ([PATCH 0/10] Misc updates)

[Tobias Geerinckx-Rice via Guix-patches via]

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

Leo,

Leo Famulari 写道：
> Sorry, I didn't realize you were doing that!

No worries!  I didn't announce it anywhere.  Just made sense to 
rebuild [the dependents of] the whole series.

> I find that FFmpeg updates work reliably so I usually just test 
> VLC
> and MPV before pushing.

Thanks for the tip.

Kind regards,

T G-R

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

bug#41533: Acknowledgement ([PATCH 0/10] Misc updates)

[Vincent Legoll]

Let's close this issue, as I won't be working on mupdf or netpbm any 
time soon, they're still on the TODO, but are a bit buried.

And I would use separate issues anyways if resuming work on them.

-- 
Vincent Legoll