From patchwork Wed May 9 04:05:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 1761 Return-Path: Received: from mail01.ipfire.org (mail01.ipfire.org [IPv6:2001:470:7183:25::1]) by web02.i.ipfire.org (Postfix) with ESMTP id B9A7F60ACF for ; Tue, 8 May 2018 20:05:37 +0200 (CEST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 274DF10F62FF; Tue, 8 May 2018 19:05:37 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1525802737; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references:list-id: list-unsubscribe:list-subscribe:list-post; bh=Alvp3kdXu5REkQ6SnloXT6HH43kr+2w/g6gp+J1OKdw=; b=KMavkLHty6f2GyLw0oVO7VaN/fclkFHawn5Lo39jY/F3ef0OnREGIo2eVprT3wc7PS0H+D 9WnL7+eX+4UXMfS16jFcRWGDtIp0rKAS0861VPKx1OzLhoIu612bSvn8jmQgRebq/i4qgF Ts13fiecfOXscWZOi7wNUWTHIRyXeMNtbmE7BV9wY9x12Y1ZcNq05RWrrsRjlEtCiYZ0zP UNTZ/tysByQJ+eIEKzyC+XzdYGcCnb/QewJlldZl5ce/DF/7p6VCzZvxjA1VC5GPHndL/Y LUygI5Pe6StCZY87GYZ1XkSeNpNlZJcuDZ0Nu6u/OHXqwhlSZihC7hA6CrJv8w== Authentication-Results: mail01.i.ipfire.org; auth=pass smtp.auth=mfischer smtp.mailfrom=matthias.fischer@ipfire.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1525802734; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=Alvp3kdXu5REkQ6SnloXT6HH43kr+2w/g6gp+J1OKdw=; b=oTi7QNth5kAFvt8TELW3jR5wYh5ywv93TU5CdKg4Qg2os1tUUt1Gr7/5vu4X+5IAZwnk1h 77xVXe3e6FllvSbh21nA+pbM/o6+u6eoUvranssPkQ2aksni87qqIOf51Dhmp4afFDOd40 IPnjfrG4fjt3pVGFn5rC4XzbVF1tbuxah0wQMJ9rPImKM5kai7YXU3ypeuYQlxUIZav5/J KooV1Is9Jsp3HsxPLMon+v7TCS8ItXjtvHq3vJ3iIamb1tzQEu913MMICk+og7iJq/oljz fvclebf7GF6WLXrYAkuSde0os8PjpZyiTFpIEeSXbqNm+KckZN4ynBZv+YqoBQ== Received: from Devel.localdomain (p5B0A1994.dip0.t-ipconnect.de [91.10.25.148]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id D0F2A1008055 for ; Tue, 8 May 2018 19:05:33 +0100 (BST) From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH] wget 1.19.5: latest patches (01-03) Date: Tue, 8 May 2018 20:05:29 +0200 Message-Id: <20180508180529.32260-1-matthias.fischer@ipfire.org> X-Mailer: git-send-email 2.17.0 X-Spamd-Result: default: False [-2.10 / 11.00]; ASN(0.00)[asn:3320, ipnet:91.0.0.0/10, country:DE]; DKIM_SIGNED(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%]; ARC_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_CONTAINS_FROM(1.00)[]; RCVD_COUNT_ZERO(0.00)[0]; RCPT_COUNT_ONE(0.00)[1]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[] X-Spam-Status: No, score=-2.10 X-Rspamd-Server: mail01.i.ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" For details see: http://git.savannah.gnu.org/cgit/wget.git Best, Matthias Signed-off-by: Matthias Fischer --- lfs/wget | 4 +++ ...1-src_hosts_c_remove_void_assignment.patch | 13 +++++++++ .../02-src_version_h_add_header_guard.patch | 20 +++++++++++++ .../wget/03-src_hsts_h_fix_header_guard.patch | 29 +++++++++++++++++++ 4 files changed, 66 insertions(+) create mode 100644 src/patches/wget/01-src_hosts_c_remove_void_assignment.patch create mode 100644 src/patches/wget/02-src_version_h_add_header_guard.patch create mode 100644 src/patches/wget/03-src_hsts_h_fix_header_guard.patch diff --git a/lfs/wget b/lfs/wget index 39f59ba80..f753bef1a 100644 --- a/lfs/wget +++ b/lfs/wget @@ -71,6 +71,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/wget/01-src_hosts_c_remove_void_assignment.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/wget/02-src_version_h_add_header_guard.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/wget/03-src_hsts_h_fix_header_guard.patch + cd $(DIR_APP) && ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/src/patches/wget/01-src_hosts_c_remove_void_assignment.patch b/src/patches/wget/01-src_hosts_c_remove_void_assignment.patch new file mode 100644 index 000000000..ba488571c --- /dev/null +++ b/src/patches/wget/01-src_hosts_c_remove_void_assignment.patch @@ -0,0 +1,13 @@ +diff --git a/src/host.c b/src/host.c +index 4597f46..b42cd6e 100644 +--- a/src/host.c ++++ b/src/host.c +@@ -732,7 +732,7 @@ wait_ares (ares_channel channel) + ares_process (channel, &read_fds, &write_fds); + } + if (timer) +- timer = ptimer_destroy (timer); ++ ptimer_destroy (timer); + } + + static void diff --git a/src/patches/wget/02-src_version_h_add_header_guard.patch b/src/patches/wget/02-src_version_h_add_header_guard.patch new file mode 100644 index 000000000..5fd75b975 --- /dev/null +++ b/src/patches/wget/02-src_version_h_add_header_guard.patch @@ -0,0 +1,20 @@ +diff --git a/src/version.h b/src/version.h +index aeae086..ee40bb1 100644 +--- a/src/version.h ++++ b/src/version.h +@@ -27,6 +27,9 @@ Corresponding Source for a non-source form of such a combination + shall include the source code for the parts of OpenSSL used as well + as that of the covered work. */ + ++#ifndef WGET_VERSION_H ++#define WGET_VERSION_H ++ + /* Extern declarations for strings in version.c */ + extern const char *version_string; + extern const char *compilation_string; +@@ -34,3 +37,5 @@ extern const char *link_string; + + /* Extern declaration for string in build_info.c */ + extern const char *compiled_features[]; ++ ++#endif /* WGET_VERSION_H */ diff --git a/src/patches/wget/03-src_hsts_h_fix_header_guard.patch b/src/patches/wget/03-src_hsts_h_fix_header_guard.patch new file mode 100644 index 000000000..786d28851 --- /dev/null +++ b/src/patches/wget/03-src_hsts_h_fix_header_guard.patch @@ -0,0 +1,29 @@ +diff --git a/src/hsts.h b/src/hsts.h +index 257f0b0..0065d9f 100644 +--- a/src/hsts.h ++++ b/src/hsts.h +@@ -26,13 +26,13 @@ grants you additional permission to convey the resulting work. + Corresponding Source for a non-source form of such a combination + shall include the source code for the parts of OpenSSL used as well + as that of the covered work. */ +-#include "wget.h" + +-#ifdef HAVE_HSTS ++#ifndef WGET_HSTS_H ++#define WGET_HSTS_H + +-#ifndef HSTS_H +-#define HSTS_H ++#ifdef HAVE_HSTS + ++#include "wget.h" + #include "url.h" + + typedef struct hsts_store *hsts_store_t; +@@ -48,5 +48,5 @@ bool hsts_store_entry (hsts_store_t, + time_t, bool); + bool hsts_match (hsts_store_t, struct url *); + +-#endif /* HSTS_H */ + #endif /* HAVE_HSTS */ ++#endif /* WGET_HSTS_H */