[PATCH] gnu: font-ubuntu: Update url.

  • Done
  • quality assurance status badge
Details
3 participants
  • Efraim Flashner
  • Jan Nieuwenhuizen
  • Leo Famulari
Owner
unassigned
Submitted by
Jan Nieuwenhuizen
Severity
normal
J
J
Jan Nieuwenhuizen wrote on 19 Nov 2018 19:04
(address . guix-patches@gnu.org)
87sgzxeyfp.fsf@gnu.org
I found the previous URL to no longer work. I would like to find a
cleaner url. WDYT?

Greetings,
janneke
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(-)

Toggle diff (26 lines)
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
J
J
Jan Nieuwenhuizen wrote on 19 Nov 2018 19:07
(address . 33434@debbugs.gnu.org)
87o9aleyan.fsf@gnu.org
Jan Nieuwenhuizen writes:

Toggle quote (3 lines)
> 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.
L
L
Leo Famulari wrote on 19 Nov 2018 21:41
(name . Jan Nieuwenhuizen)(address . janneke@gnu.org)(address . 33434@debbugs.gnu.org)
20181119204159.GA8840@jasmine.lan
On Mon, Nov 19, 2018 at 07:04:26PM +0100, Jan Nieuwenhuizen wrote:
Toggle quote (12 lines)
> 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:


Specifically:


What did you mean about the change being for core-updates?
J
J
Jan Nieuwenhuizen wrote on 19 Nov 2018 21:50
(name . Leo Famulari)(address . leo@famulari.name)(address . 33434@debbugs.gnu.org)
87efbgn664.fsf@gnu.org
Leo Famulari writes:

Toggle quote (21 lines)
> 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

Toggle snippet (10 lines)
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

Does it work for you?

Toggle quote (2 lines)
> 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
L
L
Leo Famulari wrote on 20 Nov 2018 02:11
(name . Jan Nieuwenhuizen)(address . janneke@gnu.org)(address . 33434@debbugs.gnu.org)
20181120011115.GA17422@jasmine.lan
On Mon, Nov 19, 2018 at 09:50:11PM +0100, Jan Nieuwenhuizen wrote:
Toggle quote (15 lines)
> 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`:

------
% 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
Toggle quote (5 lines)
> 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
------

Toggle quote (4 lines)
> 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 :)
-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAlvzXzAACgkQJkb6MLrK
fwhIbhAAxTUrlS/gyUikmtjYigxOgghU9Mjw+O2H9Z6wT9xwagDDIouV6dCu4cjN
1YjanEpuUXCGexJnVM1bU1SGav0PMDdUAQebOXVnv7w4lWkOcnGmCG9JqjTehAwq
aFPR1g0W9nSclRUyvyMiouUuQRZIxQuGkxYyTSuGO2CuISTwPNIstsSOsSNtEonV
uhGB3Cepr3X5vXRJfFOBgYMO81bmiwU5LgDnnj5JZwszdQeT1byETkDtsvwA449r
jt9VOOgni/8YkEGOetULWd73X9yWyUJzTYQ/NjE2FyRGeLbwCooSGVyeXf3IjmM5
hxj83YULXsjTU6z9qWhaHt8idpVsGZQwA0+Fc3tjVJlwKQt2Dg4JUo4+YkvicRuA
hrfFmS4J/VyeaG2vAddYWhz2GpH2jWKQxh8x4rnJ6hJPRlasxYphj9Gwn7L2l0PZ
PslI4DY8EUxeYa2tRnuuW4shhtLI25EuLAdksEf5wRsZsjugLRZXd8mof3SjmPZW
Z0vFWHykd/gXi8g1grYRXQNlwxgqpDT8LtXAqGdTSPQklNJYo/35REcrmEcMi3Iq
YCYPCHbejybLxrrHMDNwis+uuw5F9D1wDbwO+2OinsWzrIgCc37z3isVtNJpH1V+
+aObk0yQKG0G67g5LsOkyeZi5o8JpV8nHkQ7mJg8qjljcPUTlhE=
=8Ddc
-----END PGP SIGNATURE-----


E
E
Efraim Flashner wrote on 20 Nov 2018 11:08
(name . Jan Nieuwenhuizen)(address . janneke@gnu.org)(address . 33434@debbugs.gnu.org)
20181120100832.GC28778@macbook41
On Mon, Nov 19, 2018 at 07:04:26PM +0100, Jan Nieuwenhuizen wrote:
Toggle quote (7 lines)
> 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.

tag: upstream/0.83

According to the debian/watch file, the source code is at

Toggle quote (39 lines)
> 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
-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAlvz3RoACgkQQarn3Mo9
g1H7Kw//TVf8E3h4mt8l4yLCPuAqvjrXOGk6+NC6RzJtPRQWU2akhp1UO7Inzynn
XHMfGQ+sGVJr9yvn5fxmaxzpWDFuo79kwOJPtvq2TSW3yR8czUrs2UL9/FGnCWJQ
8kLrc5Y7rppvsMP4WqQe1nX1ZN/FBhOYom7KZtPBwJEUhuHGhq5USQATiGdN6+Bu
9Gxa0gjbpzPKxRNRWYDeWfnpgKngMvje/jVK4cOBRQeJ+RZ3zV1ESGggAkNcOiU+
9SuW7bPn90lmQmIu+b6GFMP+M3tmhMKRcd3ts5Q+cZikI0Ka/5A59jI10jFdgc7C
aBziMLU32JhqAQmAgSfGJP7aUZ6KeqzMhyviizRCTcsMHFB1SZA9DYazii3Ieq7/
Q/kTO0Op1VI9P5jSiNTF/8+XqwWjN2vTiNo6+yYnixuKawML62uXRoKla3T7zfi1
4mtENJ+gKRGNMh7XnlpxKd1PpgPae4O/025E84RsyjB47QCEnNtlrYtDPVuF+ISb
byZ4DUtrCcn8VMhTAmrtX8lLgaNUCexKbmgJlNEG/N8VhP1e0LqhT9ZQjdI358rl
nw6Xh8el+hib8dQfDULRBUwFd9GpRoWMGJrIHM3T4CLqxv2RfhABCOk5sW1pw5MT
5nLRrcjhi4ywuW06U4XwVEXIl25zoonlyyrWob/4YM8BVLwHj/c=
=Ox8E
-----END PGP SIGNATURE-----


J
J
Jan Nieuwenhuizen wrote on 20 Nov 2018 20:57
(name . Efraim Flashner)(address . efraim@flashner.co.il)(address . 33434@debbugs.gnu.org)
875zwro72b.fsf@gnu.org
Efraim Flashner writes:

Toggle quote (13 lines)
> 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
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(-)

Toggle diff (26 lines)
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
--
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com| Avatar® http://AvatarAcademy.com
J
J
Jan Nieuwenhuizen wrote on 21 Nov 2018 14:07
(name . Efraim Flashner)(address . efraim@flashner.co.il)(address . 33434-done@debbugs.gnu.org)
87y39mpoiz.fsf@gnu.org
Jan Nieuwenhuizen writes:

Toggle quote (2 lines)
> I'll commit this to core-updates tomorrow.

After a short discussion on IRC, pushed to master as

96cae1b48c12b7b5b4a68d86ac9d714cab2d9881

Thanks!
janneke
Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 33434@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 33434
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch