[bug#33434] [PATCH] gnu: font-ubuntu: Update url.

[bug#33434] [PATCH] gnu: font-ubuntu: Update url.

[Jan Nieuwenhuizen]

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

I found the previous URL to no longer work.  I would like to find a
cleaner url.  WDYT?

Greetings,
janneke


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-font-ubuntu-Update-url.patch --]
[-- Type: text/x-patch, Size: 1535 bytes --]

From 6d9037aa1ea239812f74b5af3a716341d3b25fa9 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Mon, 19 Nov 2018 18:57:27 +0100
Subject: [PATCH] gnu: font-ubuntu: Update url.

* gnu/packages/fonts.scm (font-ubuntu): Use new url, update hash.
---
 gnu/packages/fonts.scm | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 1195695d7..5f1a7585d 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -100,12 +100,15 @@ in print.  With attention to detail for high resolution rendering.")
     (version "0.83")
     (source (origin
               (method url-fetch)
-              (uri (string-append
-                    "http://font.ubuntu.com/download/ubuntu-font-family-"
-                    version ".zip"))
+              (uri (string-append "https://launchpad.net/"
+                                  "ubuntu/+archive/primary/+sourcefiles/"
+                                  "ubuntu-font-family-sources/"
+                                  "0.83-0ubuntu1/"
+                                  "ubuntu-font-family-sources_0.83"
+                                  ".orig.tar.gz"))
               (sha256
                (base32
-                "0hjvq2x758dx0sfwqhzflns0ns035qm7h6ygskbx1svzg517sva5"))))
+                "02l31f5lip12csps7xvz77s32gac3siw694xrrw85y1blc7dz5hs"))))
     (build-system font-build-system)
     (home-page "http://font.ubuntu.com/")
     (synopsis "The Ubuntu Font Family")
-- 
2.18.0

[bug#33434] [PATCH] gnu: font-ubuntu: Update url.

[Jan Nieuwenhuizen]

Jan Nieuwenhuizen writes:

> I found the previous URL to no longer work.  I would like to find a
> cleaner url.  WDYT?

Oh, this is meant for core-updates.

[bug#33434] [PATCH] gnu: font-ubuntu: Update url.

[Leo Famulari]

On Mon, Nov 19, 2018 at 07:04:26PM +0100, Jan Nieuwenhuizen wrote:
> I found the previous URL to no longer work.  I would like to find a
> cleaner url.  WDYT?
> -              (uri (string-append
> -                    "http://font.ubuntu.com/download/ubuntu-font-family-"
> -                    version ".zip"))
> +              (uri (string-append "https://launchpad.net/"
> +                                  "ubuntu/+archive/primary/+sourcefiles/"
> +                                  "ubuntu-font-family-sources/"
> +                                  "0.83-0ubuntu1/"
> +                                  "ubuntu-font-family-sources_0.83"
> +                                  ".orig.tar.gz"))

I found the correct zip file in the download section of this page:

https://design.ubuntu.com/font/

Specifically:

https://assets.ubuntu.com/v1/fad7939b-ubuntu-font-family-0.83.zip

What did you mean about the change being for core-updates?

[bug#33434] [PATCH] gnu: font-ubuntu: Update url.

[Jan Nieuwenhuizen]

Leo Famulari writes:

> On Mon, Nov 19, 2018 at 07:04:26PM +0100, Jan Nieuwenhuizen wrote:
>> I found the previous URL to no longer work.  I would like to find a
>> cleaner url.  WDYT?
>> -              (uri (string-append
>> -                    "http://font.ubuntu.com/download/ubuntu-font-family-"
>> -                    version ".zip"))
>> +              (uri (string-append "https://launchpad.net/"
>> +                                  "ubuntu/+archive/primary/+sourcefiles/"
>> +                                  "ubuntu-font-family-sources/"
>> +                                  "0.83-0ubuntu1/"
>> +                                  "ubuntu-font-family-sources_0.83"
>> +                                  ".orig.tar.gz"))
>
> I found the correct zip file in the download section of this page:
>
> https://design.ubuntu.com/font/
>
> Specifically:
>
> https://assets.ubuntu.com/v1/fad7939b-ubuntu-font-family-0.83.zip

I tried that, and it doesn't work for me.  Specifically, I get

--8<---------------cut here---------------start------------->8---
21:47:31 janneke@dundal:~/src/guix-janneke 
$ guix download https://assets.ubuntu.com/v1/fad7939b-ubuntu-font-family-0.83.zip
Starting download of /tmp/guix-file.OMwFpM
From https://assets.ubuntu.com/v1/fad7939b-ubuntu-font-family-0.83.zip...
Bad qstring header component: 113 juju-prod45-ubuntu-assets-machine-10 (squid/3.3.8) This cache hit is still fresh and more than 1 day old

failed to download "/tmp/guix-file.OMwFpM" from "https://assets.ubuntu.com/v1/fad7939b-ubuntu-font-family-0.83.zip"
guix download: error: https://assets.ubuntu.com/v1/fad7939b-ubuntu-font-family-0.83.zip: download failed
--8<---------------cut here---------------end--------------->8---

Does it work for you?

> What did you mean about the change being for core-updates?

I'm responding to Ludo's request to configure our systems on
core-updates.  I needed this patch to be able to do so, and created it
on core-updates.

janneke

[bug#33434] [PATCH] gnu: font-ubuntu: Update url.

[Leo Famulari]

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

On Mon, Nov 19, 2018 at 09:50:11PM +0100, Jan Nieuwenhuizen wrote:
> I tried that, and it doesn't work for me.  Specifically, I get
> 
> --8<---------------cut here---------------start------------->8---
> 21:47:31 janneke@dundal:~/src/guix-janneke 
> $ guix download https://assets.ubuntu.com/v1/fad7939b-ubuntu-font-family-0.83.zip
> Starting download of /tmp/guix-file.OMwFpM
> From https://assets.ubuntu.com/v1/fad7939b-ubuntu-font-family-0.83.zip...
> Bad qstring header component: 113 juju-prod45-ubuntu-assets-machine-10 (squid/3.3.8) This cache hit is still fresh and more than 1 day old
> 
> failed to download "/tmp/guix-file.OMwFpM" from "https://assets.ubuntu.com/v1/fad7939b-ubuntu-font-family-0.83.zip"
> guix download: error: https://assets.ubuntu.com/v1/fad7939b-ubuntu-font-family-0.83.zip: download failed
> --8<---------------cut here---------------end--------------->8---
> 
> Does it work for you?

You're right, it works with Firefox and curl but not with Guix. I wonder
what is different about our request? Either way, you could use the
launchpad source, or add the original source to archive.org as fetch it
from there (we have a few packages like this).

Here is a verbose `curl`:

------
$ curl -vvv -LO https://assets.ubuntu.com/v1/fad7939b-ubuntu-font-family-0.83.zip 
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0*   Trying 162.213.33.102...
* TCP_NODELAY set
* Connected to assets.ubuntu.com (162.213.33.102) port 443 (#0)
* found 149 certificates in /home/leo/.guix-profile/etc/ssl/certs/ca-certificates.crt
* ALPN, offering h2
* ALPN, offering http/1.1
* SSL connection using TLS1.2 / DHE_RSA_AES_128_GCM_SHA256
* 	 server certificate verification OK
* 	 server certificate status verification SKIPPED
* 	 common name: assets.ubuntu.com (matched)
* 	 server certificate expiration date OK
* 	 server certificate activation date OK
* 	 certificate public key: RSA
* 	 certificate version: #3
* 	 subject: C=GB,L=London,O=Canonical Group Ltd,OU=IS,CN=assets.ubuntu.com
* 	 start date: Fri, 19 Jan 2018 00:00:00 GMT
* 	 expire date: Wed, 23 Jan 2019 12:00:00 GMT
* 	 issuer: C=US,O=DigiCert Inc,CN=DigiCert SHA2 Secure Server CA
* 	 compression: NULL
* ALPN, server did not agree to a protocol
> GET /v1/fad7939b-ubuntu-font-family-0.83.zip HTTP/1.1
> Host: assets.ubuntu.com
> User-Agent: curl/7.62.0
> Accept: */*
> 
< HTTP/1.1 200 OK
< Date: Wed, 14 Nov 2018 19:23:56 GMT
< Server: gunicorn/17.5
< Last-Modified: Thu, 22 Jun 2017 17:04:20 GMT
< Content-Type: application/zip
< Allow: GET, PUT, DELETE, HEAD, OPTIONS
< Content-Disposition: filename=ubuntu-font-family-0.83.zip
< Cache-Control: max-age=31556926
< Age: 452735
< Warning: 113 juju-prod45-ubuntu-assets-machine-10 (squid/3.3.8) This cache hit is still fresh and more than 1 day old
< X-Cache: HIT from juju-prod45-ubuntu-assets-machine-10
< X-Cache-Lookup: HIT from juju-prod45-ubuntu-assets-machine-10:80
< Transfer-Encoding: chunked
< Via: 1.1 juju-prod45-ubuntu-assets-machine-10 (squid/3.3.8)
< Connection: keep-alive
< 
{ [3572 bytes data]
100 2043k    0 2043k    0     0  1382k      0 --:--:--  0:00:01 --:--:-- 1382k
* Connection #0 to host assets.ubuntu.com left intact
------

> I'm responding to Ludo's request to configure our systems on
> core-updates.  I needed this patch to be able to do so, and created it
> on core-updates.

Oh, great! Please proceed as you see fit :)

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

[bug#33434] [PATCH] gnu: font-ubuntu: Update url.

[Efraim Flashner]

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

On Mon, Nov 19, 2018 at 07:04:26PM +0100, Jan Nieuwenhuizen wrote:
> I found the previous URL to no longer work.  I would like to find a
> cleaner url.  WDYT?
> 
> Greetings,
> janneke
> 

If Ubuntu's archives are like Debian's then when there's a new version
the 0.83.orig tarball will disapear from thier mirrors. For this reason
I've been prefering Debian's gitlab instance and git-download to make
sure the source tarballs don't disapear.

https://salsa.debian.org/fonts-team/fonts-ubuntu
tag: upstream/0.83

According to the debian/watch file, the source code is at
https://assets.ubuntu.com/v1/4cd05122-ubuntu-font-family-sources_0.83.orig.tar.gz

> From 6d9037aa1ea239812f74b5af3a716341d3b25fa9 Mon Sep 17 00:00:00 2001
> From: Jan Nieuwenhuizen <janneke@gnu.org>
> Date: Mon, 19 Nov 2018 18:57:27 +0100
> Subject: [PATCH] gnu: font-ubuntu: Update url.
> 
> * gnu/packages/fonts.scm (font-ubuntu): Use new url, update hash.
> ---
>  gnu/packages/fonts.scm | 11 +++++++----
>  1 file changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
> index 1195695d7..5f1a7585d 100644
> --- a/gnu/packages/fonts.scm
> +++ b/gnu/packages/fonts.scm
> @@ -100,12 +100,15 @@ in print.  With attention to detail for high resolution rendering.")
>      (version "0.83")
>      (source (origin
>                (method url-fetch)
> -              (uri (string-append
> -                    "http://font.ubuntu.com/download/ubuntu-font-family-"
> -                    version ".zip"))
> +              (uri (string-append "https://launchpad.net/"
> +                                  "ubuntu/+archive/primary/+sourcefiles/"
> +                                  "ubuntu-font-family-sources/"
> +                                  "0.83-0ubuntu1/"
> +                                  "ubuntu-font-family-sources_0.83"
> +                                  ".orig.tar.gz"))
>                (sha256
>                 (base32
> -                "0hjvq2x758dx0sfwqhzflns0ns035qm7h6ygskbx1svzg517sva5"))))
> +                "02l31f5lip12csps7xvz77s32gac3siw694xrrw85y1blc7dz5hs"))))
>      (build-system font-build-system)
>      (home-page "http://font.ubuntu.com/")
>      (synopsis "The Ubuntu Font Family")
> -- 
> 2.18.0
> 


-- 
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#33434] [PATCH] gnu: font-ubuntu: Update url.

[Jan Nieuwenhuizen]

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

Efraim Flashner writes:

> On Mon, Nov 19, 2018 at 07:04:26PM +0100, Jan Nieuwenhuizen wrote:

> If Ubuntu's archives are like Debian's then when there's a new version
> the 0.83.orig tarball will disapear from thier mirrors. For this reason
> I've been prefering Debian's gitlab instance and git-download to make
> sure the source tarballs don't disapear.
>
> https://salsa.debian.org/fonts-team/fonts-ubuntu
> tag: upstream/0.83
>
> According to the debian/watch file, the source code is at
> https://assets.ubuntu.com/v1/4cd05122-ubuntu-font-family-sources_0.83.orig.tar.gz

Thanks!  I have updated the patch to use the git source url.

I'll commit this to core-updates tomorrow.

Greetings,
janneke


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-font-ubuntu-Update-url.patch --]
[-- Type: text/x-patch, Size: 1457 bytes --]

From 253bcc8bb85b1c7706d7a1e1d97da067b94bc997 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Mon, 19 Nov 2018 18:57:27 +0100
Subject: [PATCH] gnu: font-ubuntu: Update url.

* gnu/packages/fonts.scm (font-ubuntu): Use new url, update hash.
---
 gnu/packages/fonts.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 1195695d7..f9f842820 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -99,13 +99,14 @@ in print.  With attention to detail for high resolution rendering.")
     (name "font-ubuntu")
     (version "0.83")
     (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "http://font.ubuntu.com/download/ubuntu-font-family-"
-                    version ".zip"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://salsa.debian.org/fonts-team/fonts-ubuntu")
+                    (commit (string-append "upstream/" version))))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "0hjvq2x758dx0sfwqhzflns0ns035qm7h6ygskbx1svzg517sva5"))))
+                "1d2xrjpxy70f3nsgqiggwv6pj06qglf5vj2847pqx60w3ygi903g"))))
     (build-system font-build-system)
     (home-page "http://font.ubuntu.com/")
     (synopsis "The Ubuntu Font Family")
-- 
2.18.0


[-- Attachment #3: Type: text/plain, Size: 152 bytes --]


-- 
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com

bug#33434: [PATCH] gnu: font-ubuntu: Update url.

[Jan Nieuwenhuizen]

Jan Nieuwenhuizen writes:

> I'll commit this to core-updates tomorrow.

After a short discussion on IRC, pushed to master as

96cae1b48c12b7b5b4a68d86ac9d714cab2d9881

Thanks!
janneke