From: Andreas Enge <andreas@enge.fr>
To: Kaelyn <kaelyn.alexi@protonmail.com>
Cc: guix-devel <guix-devel@gnu.org>,
Maxim Cournoyer <maxim.cournoyer@gmail.com>,
Simon Tournier <zimon.toutoune@gmail.com>
Subject: Re: wget on i686 in core-updates
Date: Sat, 15 Apr 2023 23:00:29 +0200 [thread overview]
Message-ID: <ZDsQbYnPL+kUZjcN@jurong> (raw)
In-Reply-To: <rZnCjLJBc92SA83jDXXvyXHsUTv9RcZOZVK3PbNPZJ0XIJ-i_kAQlktJEbXgOnTTvqqC5P5HRuwdU3_x4KsJ2HSTH1V3tttWMnfZ9xteD7g=@protonmail.com>
[-- Attachment #1: Type: text/plain, Size: 579 bytes --]
Hello,
Am Sat, Apr 15, 2023 at 06:25:52PM +0000 schrieb Kaelyn:
> I tried to update the package definition to be able to build from git but it became a much bigger rabbit hole than I have the energy for at the moment. I also tried to cherry-pick the commit from the merge request without luck.
I just downloaded the commit, which is in uniform diff format and can serve
as a patch to be applied to the tarball. The result is attached, but it
does not work: The tests fail as before with the "file not found" messages.
But thanks for digging through the wget issues!
Andreas
[-- Attachment #2: 0001-gnu-wget-Add-patch-needed-for-i686.patch --]
[-- Type: text/plain, Size: 11436 bytes --]
From 0991a0daf74c0a3754618f99b7a7cb812debfa1a Mon Sep 17 00:00:00 2001
From: Andreas Enge <andreas@enge.fr>
Date: Sat, 15 Apr 2023 22:52:39 +0200
Subject: [PATCH] gnu: wget: Add patch needed for i686.
* gnu/packages/patches/wget-hsts-portability.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register patch.
* gnu/packages/wget.scm (wget)[origin]: Apply patch.
---
gnu/local.mk | 1 +
.../patches/wget-hsts-portability.patch | 223 ++++++++++++++++++
gnu/packages/wget.scm | 4 +-
3 files changed, 227 insertions(+), 1 deletion(-)
create mode 100644 gnu/packages/patches/wget-hsts-portability.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 73756a8c49..8dd0c45cea 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2021,6 +2021,7 @@ dist_patch_DATA = \
%D%/packages/patches/webrtc-audio-processing-big-endian.patch \
%D%/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch \
%D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \
+ %D%/packages/patches/wget-hsts-portability.patch \
%D%/packages/patches/wmctrl-64-fix.patch \
%D%/packages/patches/wmfire-update-for-new-gdk-versions.patch \
%D%/packages/patches/wordnet-CVE-2008-2149.patch \
diff --git a/gnu/packages/patches/wget-hsts-portability.patch b/gnu/packages/patches/wget-hsts-portability.patch
new file mode 100644
index 0000000000..62dabd7fae
--- /dev/null
+++ b/gnu/packages/patches/wget-hsts-portability.patch
@@ -0,0 +1,223 @@
+From 9a3479a23c15cd7234a54296ae50c48f29c427ec Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
+Date: Sun, 20 Mar 2022 12:18:20 +0100
+Subject: [PATCH] Fix HSTS portability by using int64_t instead of time_t.
+
+* src/hsts.c: Use int64_t instead of time_t.
+* src/http.c: Use int64_t for parsing Strict-Transport-Security.
+---
+ src/hsts.c | 41 ++++++++++++++++++++---------------------
+ src/hsts.h | 2 +-
+ src/http.c | 24 ++++++++++++------------
+ 3 files changed, 33 insertions(+), 34 deletions(-)
+
+diff --git a/src/hsts.c b/src/hsts.c
+index 0a014401..72c5e936 100644
+--- a/src/hsts.c
++++ b/src/hsts.c
+@@ -61,8 +61,8 @@ struct hsts_kh {
+ };
+
+ struct hsts_kh_info {
+- time_t created;
+- time_t max_age;
++ int64_t created;
++ int64_t max_age;
+ bool include_subdomains;
+ };
+
+@@ -166,7 +166,7 @@ end:
+ static bool
+ hsts_new_entry_internal (hsts_store_t store,
+ const char *host, int port,
+- time_t created, time_t max_age,
++ int64_t created, int64_t max_age,
+ bool include_subdomains,
+ bool check_validity,
+ bool check_expired,
+@@ -216,21 +216,21 @@ bail:
+ static bool
+ hsts_add_entry (hsts_store_t store,
+ const char *host, int port,
+- time_t max_age, bool include_subdomains)
++ int64_t max_age, bool include_subdomains)
+ {
+- time_t t = time (NULL);
++ int64_t t = (int64_t) time (NULL);
+
+ /* It might happen time() returned -1 */
+- return (t == (time_t)(-1) ?
++ return (t == -1) ?
+ false :
+- hsts_new_entry_internal (store, host, port, t, max_age, include_subdomains, false, true, false));
++ hsts_new_entry_internal (store, host, port, t, max_age, include_subdomains, false, true, false);
+ }
+
+ /* Creates a new entry, unless an identical one already exists. */
+ static bool
+ hsts_new_entry (hsts_store_t store,
+ const char *host, int port,
+- time_t created, time_t max_age,
++ int64_t created, int64_t max_age,
+ bool include_subdomains)
+ {
+ return hsts_new_entry_internal (store, host, port, created, max_age, include_subdomains, true, true, true);
+@@ -245,7 +245,7 @@ hsts_remove_entry (hsts_store_t store, struct hsts_kh *kh)
+ static bool
+ hsts_store_merge (hsts_store_t store,
+ const char *host, int port,
+- time_t created, time_t max_age,
++ int64_t created, int64_t max_age,
+ bool include_subdomains)
+ {
+ enum hsts_kh_match match_type = NO_MATCH;
+@@ -276,11 +276,11 @@ hsts_read_database (hsts_store_t store, FILE *fp, bool merge_with_existing_entri
+ size_t len = 0;
+ int items_read;
+ bool result = false;
+- bool (*func)(hsts_store_t, const char *, int, time_t, time_t, bool);
++ bool (*func)(hsts_store_t, const char *, int, int64_t, int64_t, bool);
+
+ char host[256];
+ int port;
+- time_t created, max_age;
++ int64_t created, max_age;
+ int include_subdomains;
+
+ func = (merge_with_existing_entries ? hsts_store_merge : hsts_new_entry);
+@@ -326,10 +326,9 @@ hsts_store_dump (hsts_store_t store, FILE *fp)
+ struct hsts_kh *kh = (struct hsts_kh *) it.key;
+ struct hsts_kh_info *khi = (struct hsts_kh_info *) it.value;
+
+- if (fprintf (fp, "%s\t%d\t%d\t%lu\t%lu\n",
++ if (fprintf (fp, "%s\t%d\t%d\t%" PRId64 "\t%" PRId64 "\n",
+ kh->host, kh->explicit_port, khi->include_subdomains,
+- (unsigned long) khi->created,
+- (unsigned long) khi->max_age) < 0)
++ khi->created, khi->max_age) < 0)
+ {
+ logprintf (LOG_ALWAYS, "Could not write the HSTS database correctly.\n");
+ break;
+@@ -439,7 +438,7 @@ hsts_match (hsts_store_t store, struct url *u)
+ bool
+ hsts_store_entry (hsts_store_t store,
+ enum url_scheme scheme, const char *host, int port,
+- time_t max_age, bool include_subdomains)
++ int64_t max_age, bool include_subdomains)
+ {
+ bool result = false;
+ enum hsts_kh_match match = NO_MATCH;
+@@ -464,9 +463,9 @@ hsts_store_entry (hsts_store_t store,
+ * 'created' field too. The RFC also states that we have to
+ * update the entry each time we see HSTS header.
+ * See also Section 11.2. */
+- time_t t = time (NULL);
++ int64_t t = (int64_t) time (NULL);
+
+- if (t != (time_t)(-1) && t != entry->created)
++ if (t != -1 && t != entry->created)
+ {
+ entry->created = t;
+ entry->max_age = max_age;
+@@ -792,7 +791,7 @@ test_hsts_read_database (void)
+ hsts_store_t table;
+ char *file = NULL;
+ FILE *fp = NULL;
+- time_t created = time(NULL) - 10;
++ int64_t created = time(NULL) - 10;
+
+ if (opt.homedir)
+ {
+@@ -801,9 +800,9 @@ test_hsts_read_database (void)
+ if (fp)
+ {
+ fputs ("# dummy comment\n", fp);
+- fprintf (fp, "foo.example.com\t0\t1\t%lu\t123\n",(unsigned long) created);
+- fprintf (fp, "bar.example.com\t0\t0\t%lu\t456\n", (unsigned long) created);
+- fprintf (fp, "test.example.com\t8080\t0\t%lu\t789\n", (unsigned long) created);
++ fprintf (fp, "foo.example.com\t0\t1\t%" PRId64 "\t123\n", created);
++ fprintf (fp, "bar.example.com\t0\t0\t%" PRId64 "\t456\n", created);
++ fprintf (fp, "test.example.com\t8080\t0\t%" PRId64 "\t789\n", created);
+ fclose (fp);
+
+ table = hsts_store_open (file);
+diff --git a/src/hsts.h b/src/hsts.h
+index 6ecd5060..be048944 100644
+--- a/src/hsts.h
++++ b/src/hsts.h
+@@ -46,7 +46,7 @@ bool hsts_store_has_changed (hsts_store_t);
+
+ bool hsts_store_entry (hsts_store_t,
+ enum url_scheme, const char *, int,
+- time_t, bool);
++ int64_t, bool);
+ bool hsts_match (hsts_store_t, struct url *);
+
+ #endif /* HAVE_HSTS */
+diff --git a/src/http.c b/src/http.c
+index f61c99a7..87b51b00 100644
+--- a/src/http.c
++++ b/src/http.c
+@@ -1300,7 +1300,7 @@ parse_content_disposition (const char *hdr, char **filename)
+
+ #ifdef HAVE_HSTS
+ static bool
+-parse_strict_transport_security (const char *header, time_t *max_age, bool *include_subdomains)
++parse_strict_transport_security (const char *header, int64_t *max_age, bool *include_subdomains)
+ {
+ param_token name, value;
+ const char *c_max_age = NULL;
+@@ -1330,7 +1330,7 @@ parse_strict_transport_security (const char *header, time_t *max_age, bool *incl
+ * Also, time_t is normally defined as a long, so this should not break.
+ */
+ if (max_age)
+- *max_age = (time_t) strtol (c_max_age, NULL, 10);
++ *max_age = (int64_t) strtoll (c_max_age, NULL, 10);
+ if (include_subdomains)
+ *include_subdomains = is;
+
+@@ -3184,9 +3184,6 @@ gethttp (const struct url *u, struct url *original_url, struct http_stat *hs,
+ #else
+ extern hsts_store_t hsts_store;
+ #endif
+- const char *hsts_params;
+- time_t max_age;
+- bool include_subdomains;
+ #endif
+
+ int sock = -1;
+@@ -3674,21 +3671,24 @@ gethttp (const struct url *u, struct url *original_url, struct http_stat *hs,
+ #ifdef HAVE_HSTS
+ if (opt.hsts && hsts_store)
+ {
+- hsts_params = resp_header_strdup (resp, "Strict-Transport-Security");
++ int64_t max_age;
++ const char *hsts_params = resp_header_strdup (resp, "Strict-Transport-Security");
++ bool include_subdomains;
++
+ if (parse_strict_transport_security (hsts_params, &max_age, &include_subdomains))
+ {
+ /* process strict transport security */
+ if (hsts_store_entry (hsts_store, u->scheme, u->host, u->port, max_age, include_subdomains))
+- DEBUGP(("Added new HSTS host: %s:%u (max-age: %lu, includeSubdomains: %s)\n",
++ DEBUGP(("Added new HSTS host: %s:%" PRIu32 " (max-age: %" PRId64 ", includeSubdomains: %s)\n",
+ u->host,
+- (unsigned) u->port,
+- (unsigned long) max_age,
++ (uint32_t) u->port,
++ max_age,
+ (include_subdomains ? "true" : "false")));
+ else
+- DEBUGP(("Updated HSTS host: %s:%u (max-age: %lu, includeSubdomains: %s)\n",
++ DEBUGP(("Updated HSTS host: %s:%" PRIu32 " (max-age: %" PRId64 ", includeSubdomains: %s)\n",
+ u->host,
+- (unsigned) u->port,
+- (unsigned long) max_age,
++ (uint32_t) u->port,
++ max_age,
+ (include_subdomains ? "true" : "false")));
+ }
+ xfree (hsts_params);
+--
+GitLab
+
diff --git a/gnu/packages/wget.scm b/gnu/packages/wget.scm
index 083cf27212..6774fd477f 100644
--- a/gnu/packages/wget.scm
+++ b/gnu/packages/wget.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2021 Michael Rohleder <mike@rohleder.de>
+;;; Copyright © 2023 Andreas Enge <andreas@enge.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -54,7 +55,8 @@ (define-public wget
version ".tar.lz"))
(sha256
(base32
- "19afmyr1i3zwdwr8wkyz8q6z5764ik3dm87as194g78l8xggplnv"))))
+ "19afmyr1i3zwdwr8wkyz8q6z5764ik3dm87as194g78l8xggplnv"))
+ (patches (search-patches "wget-hsts-portability.patch"))))
(build-system gnu-build-system)
(inputs
(list gnutls libidn2 libpsl))
--
2.39.2
next prev parent reply other threads:[~2023-04-15 21:00 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-12 16:11 i686 core-updates failure Kaelyn
2023-04-12 21:05 ` Josselin Poiret
2023-04-12 21:31 ` Andreas Enge
2023-04-13 4:37 ` Kaelyn
2023-04-13 16:25 ` Andreas Enge
2023-04-14 8:28 ` Andreas Enge
2023-04-14 20:05 ` Kaelyn
2023-04-15 11:20 ` python-pytest on core-updates (was: i686 core-updates failure.) Andreas Enge
2023-04-15 11:32 ` python-pytest on core-updates Andreas Enge
2023-04-15 14:08 ` [PATCH core-updates] gnu: python-pytest: Fix failing test_raising_repr Josselin Poiret
2023-04-15 16:14 ` Kaelyn
2023-04-15 19:59 ` Andreas Enge
2023-04-15 20:47 ` Andreas Enge
2023-04-15 20:49 ` python-pytest on core-updates (was: i686 core-updates failure.) Andreas Enge
2023-04-13 9:18 ` i686 core-updates failure Simon Tournier
2023-04-13 13:23 ` jgart
2023-04-13 13:43 ` Andreas Enge
2023-04-14 15:12 ` Csepp
2023-04-14 16:58 ` Simon Tournier
2023-04-14 17:30 ` Felix Lechner via Development of GNU Guix and the GNU System distribution.
2023-04-13 15:31 ` Simon Tournier
2023-04-13 16:21 ` Simon Tournier
2023-04-13 15:47 ` Ricardo Wurmus
2023-04-13 16:15 ` Greg Hogan
2023-04-13 16:39 ` Simon Tournier
2023-04-13 16:47 ` Ricardo Wurmus
2023-04-13 20:02 ` Lars-Dominik Braun
2023-04-13 20:15 ` Simon Tournier
2023-04-13 20:45 ` Andreas Enge
2023-04-13 20:57 ` Simon Tournier
2023-04-14 8:25 ` Andreas Enge
2023-04-14 9:45 ` Simon Tournier
2023-04-14 18:16 ` Andreas Enge
2023-04-14 18:40 ` Lars-Dominik Braun
2023-04-15 9:48 ` ghc in core-updates on i686 Andreas Enge
2023-04-14 10:49 ` i686 core-updates failure Lars-Dominik Braun
2023-04-14 17:00 ` Simon Tournier
2023-04-13 20:33 ` wget (was Re: i686 core-updates failure.) Simon Tournier
2023-04-13 20:37 ` Andreas Enge
2023-04-13 20:43 ` Simon Tournier
2023-04-13 20:49 ` wget Andreas Enge
2023-04-15 0:51 ` wget (was Re: i686 core-updates failure.) Maxim Cournoyer
2023-04-15 10:43 ` Andreas Enge
2023-04-15 16:37 ` Kaelyn
2023-04-15 18:25 ` Kaelyn
2023-04-15 21:00 ` Andreas Enge [this message]
2023-04-16 17:06 ` Andreas Enge
2023-04-16 17:49 ` Kaelyn
-- strict thread matches above, loose matches on Subject: below --
2023-04-16 11:09 Core-updates after the staging merge Andreas Enge
2023-04-16 14:00 ` wget on i686 in core-updates Andreas Enge
2023-04-16 18:57 ` Andreas Enge
2023-04-17 8:06 ` Andreas Enge
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZDsQbYnPL+kUZjcN@jurong \
--to=andreas@enge.fr \
--cc=guix-devel@gnu.org \
--cc=kaelyn.alexi@protonmail.com \
--cc=maxim.cournoyer@gmail.com \
--cc=zimon.toutoune@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).