[bug#42699] [PATCH] gnu: libxfce4util: fix source URI.

[bug#42699] [PATCH] gnu: libxfce4util: fix source URI.

[Michael Rohleder]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.1: [PATCH] gnu: libxfce4util: fix source URI. --]
[-- Type: text/x-patch, Size: 1180 bytes --]

From a26c6f0e32edc3fef9136d3f2946688074a6cae8 Mon Sep 17 00:00:00 2001
From: Michael Rohleder <mike@rohleder.de>
Date: Mon, 3 Aug 2020 15:31:21 +0200
Subject: [PATCH] gnu: libxfce4util: fix source URI.

* gnu/packages/xfce.scm (libxfce4util): fix source URI.
---
 gnu/packages/xfce.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 13b33ea6fb..a02dd51b65 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -98,9 +98,9 @@
     (version "4.14.0")
     (source (origin
               (method url-fetch)
-              (uri (string-append "http://archive.xfce.org/xfce/"
-                                  (version-major+minor version)
-                                  "/src/" name "-" version ".tar.bz2"))
+              (uri (string-append "https://archive.xfce.org/src/xfce/"
+                                  name "/" (version-major+minor version)
+                                  "/" name "-" version ".tar.bz2"))
               (sha256
                (base32
                 "093338faqqsrlc8dkmzr7qv411ysxczg1wlg7s3gvhrfk6vpkb9j"))))
-- 
2.28.0


[-- Attachment #1.2: Type: text/plain, Size: 34 bytes --]


-- 
/earth: file system full.

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

bug#42699: [PATCH] gnu: libxfce4util: fix source URI.

[Oleg Pykhalov]

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

Hi,

Michael Rohleder <mike@rohleder.de> writes:

> From a26c6f0e32edc3fef9136d3f2946688074a6cae8 Mon Sep 17 00:00:00 2001
> From: Michael Rohleder <mike@rohleder.de>
> Date: Mon, 3 Aug 2020 15:31:21 +0200
> Subject: [PATCH] gnu: libxfce4util: fix source URI.
>
> * gnu/packages/xfce.scm (libxfce4util): fix source URI.
> ---
>  gnu/packages/xfce.scm | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
> index 13b33ea6fb..a02dd51b65 100644
> --- a/gnu/packages/xfce.scm
> +++ b/gnu/packages/xfce.scm
> @@ -98,9 +98,9 @@

Doesn't looks like a fix, because it doesn't look like a broken.  ;-)
--8<---------------cut here---------------start------------->8---
oleg@guixsd ~/src/guix-master$ ./pre-inst-env guix repl <<< '(use-modules (guix packages)) (origin-uri (package-source (@@ (gnu packages xfce) libxfce4util)))'
Consider installing the 'guile-readline' package for
convenient interactive line editing and input history.

Consider installing the 'guile-colorized' package
for a colorful Guile experience.

GNU Guile 3.0.4
Copyright (C) 1995-2020 Free Software Foundation, Inc.

Guile comes with ABSOLUTELY NO WARRANTY; for details type `,show w'.
This program is free software, and you are welcome to redistribute it
under certain conditions; type `,show c' for details.

Enter `,help' for help.
$1 = "http://archive.xfce.org/xfce/4.14/src/libxfce4util-4.14.0.tar.bz2"

oleg@guixsd ~$ curl -IL http://archive.xfce.org/xfce/4.14/src/libxfce4util-4.14.0.tar.bz2
HTTP/1.1 301 Moved Permanently
Server: nginx
Date: Mon, 03 Aug 2020 19:20:14 GMT
Content-Type: text/html
Content-Length: 178
Connection: keep-alive
Location: https://archive.xfce.org/xfce/4.14/src/libxfce4util-4.14.0.tar.bz2

HTTP/2 302 
server: nginx
date: Mon, 03 Aug 2020 19:20:14 GMT
content-type: text/html; charset=utf-8
cache-control: private, no-cache
link: <https://xfce.mirror.wearetriple.com/xfce/4.14/src/libxfce4util-4.14.0.tar.bz2>; rel=duplicate; pri=1; geo=nl
link: <https://archive.fr.xfce.org/xfce/4.14/src/libxfce4util-4.14.0.tar.bz2>; rel=duplicate; pri=2; geo=fr
link: <https://mirror.netcologne.de/xfce/xfce/4.14/src/libxfce4util-4.14.0.tar.bz2>; rel=duplicate; pri=3; geo=de
location: https://archive.be.xfce.org/xfce/4.14/src/libxfce4util-4.14.0.tar.bz2

HTTP/1.1 200 OK
Date: Mon, 03 Aug 2020 19:20:15 GMT
Server: Apache/2.4.10 (Debian)
X-Frame-Options: DENY
X-Content-Type-Options: nosniff
Last-Modified: Sun, 11 Aug 2019 16:00:36 GMT
ETag: "7e106-58fd982118326"
Accept-Ranges: bytes
Content-Length: 516358
Content-Type: application/x-bzip2

\f

oleg@guixsd ~/src/guix-master$ ./pre-inst-env guix repl <<< '(use-modules (guix packages)) (origin-uri (package-source (@@ (gnu packages xfce) libxfce4util)))'
Consider installing the 'guile-readline' package for
convenient interactive line editing and input history.

Consider installing the 'guile-colorized' package
for a colorful Guile experience.

GNU Guile 3.0.4
Copyright (C) 1995-2020 Free Software Foundation, Inc.

Guile comes with ABSOLUTELY NO WARRANTY; for details type `,show w'.
This program is free software, and you are welcome to redistribute it
under certain conditions; type `,show c' for details.

Enter `,help' for help.
;;; note: source file /home/oleg/src/guix-master/gnu/packages/xfce.scm
;;;       newer than compiled /home/oleg/src/guix-master/gnu/packages/xfce.go
$1 = "https://archive.xfce.org/src/xfce/libxfce4util/4.14/libxfce4util-4.14.0.tar.bz2"

oleg@guixsd ~$ curl -IL https://archive.xfce.org/src/xfce/libxfce4util/4.14/libxfce4util-4.14.0.tar.bz2
HTTP/2 302 
server: nginx
date: Mon, 03 Aug 2020 19:21:18 GMT
content-type: text/html; charset=utf-8
cache-control: private, no-cache
link: <https://archive.be.xfce.org/src/xfce/libxfce4util/4.14/libxfce4util-4.14.0.tar.bz2>; rel=duplicate; pri=1; geo=be
link: <https://archive.fr.xfce.org/src/xfce/libxfce4util/4.14/libxfce4util-4.14.0.tar.bz2>; rel=duplicate; pri=2; geo=fr
link: <https://xfce.mirror.wearetriple.com/src/xfce/libxfce4util/4.14/libxfce4util-4.14.0.tar.bz2>; rel=duplicate; pri=3; geo=nl
location: https://mirror.netcologne.de/xfce/src/xfce/libxfce4util/4.14/libxfce4util-4.14.0.tar.bz2

HTTP/2 200 
server: nginx/1.19.1
date: Mon, 03 Aug 2020 19:21:19 GMT
content-type: application/octet-stream
content-length: 516358
last-modified: Sun, 11 Aug 2019 16:00:36 GMT
etag: "5d503ba4-7e106"
accept-ranges: bytes
--8<---------------cut here---------------end--------------->8---

Also:
- <C-x v l> vc-print-log shows “Update source url”.
- other XFCE packages have hard-coded ‘name’ in source URI.
pushed to master with those changes.

Thanks,
Oleg.

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