jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-28 13:46:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

use wget 1.18, as 1.19 fails to compile for some reason

Browse Source
This commit is contained in:
Calin Crisan 2017-02-19 12:26:07 +02:00
parent 2287f0cd0c
commit c1c1e0bfb9
5 changed files with 136 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
package/wget/0001-Fix-include-define-clash-with-gnulib-s-unlink-module.patch
View File

@ -1,71 +0,0 @@
From 31ac36e170f4777655451fce10a2fa5b2b27ecd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
Date: Sat, 4 Feb 2017 18:02:54 +0100
Subject: [PATCH] Fix include/define clash with gnulib's unlink module
* src/options.h: Rename options.unlink to options.unlink_requested
* src/init.c: Replace options unlink member by unlink_requested
* src/http.c: Likewise
* src/ftp.c: Likewise
---
src/ftp.c | 2 +-
src/http.c | 2 +-
src/init.c | 2 +-
src/options.h | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/ftp.c b/src/ftp.c
index fe09817..2f2866c 100644
--- a/src/ftp.c
+++ b/src/ftp.c
@@ -1463,7 +1463,7 @@ Error in server response, closing control connection.\n"));
else if (opt.noclobber || opt.always_rest || opt.timestamping || opt.dirstruct
|| opt.output_document || count > 0)
{
- if (opt.unlink && file_exists_p (con->target))
+ if (opt.unlink_requested && file_exists_p (con->target))
{
if (unlink (con->target) < 0)
{
diff --git a/src/http.c b/src/http.c
index bd1f115..3c3c8b2 100644
--- a/src/http.c
+++ b/src/http.c
@@ -2486,7 +2486,7 @@ open_output_stream (struct http_stat *hs, int count, FILE **fp)
}
else if (ALLOW_CLOBBER || count > 0)
{
- if (opt.unlink && file_exists_p (hs->local_file))
+ if (opt.unlink_requested && file_exists_p (hs->local_file))
{
if (unlink (hs->local_file) < 0)
{
diff --git a/src/init.c b/src/init.c
index 271bc77..623ef9d 100644
--- a/src/init.c
+++ b/src/init.c
@@ -321,7 +321,7 @@ static const struct {
{ "timestamping", &opt.timestamping, cmd_boolean },
{ "tries", &opt.ntry, cmd_number_inf },
{ "trustservernames", &opt.trustservernames, cmd_boolean },
- { "unlink", &opt.unlink, cmd_boolean },
+ { "unlink", &opt.unlink_requested, cmd_boolean },
{ "useaskpass" , &opt.use_askpass, cmd_use_askpass },
{ "useproxy", &opt.use_proxy, cmd_boolean },
{ "user", &opt.user, cmd_string },
diff --git a/src/options.h b/src/options.h
index d713acc..8a818ca 100644
--- a/src/options.h
+++ b/src/options.h
@@ -61,7 +61,7 @@ struct options
bool add_hostdir; /* Do we add hostname directory? */
bool protocol_directories; /* Whether to prepend "http"/"ftp" to dirs. */
bool noclobber; /* Disables clobbering of existing data. */
- bool unlink; /* remove file before clobbering */
+ bool unlink_requested; /* remove file before clobbering */
char *dir_prefix; /* The top of directory tree */
char *lfilename; /* Log filename */
char *input_filename; /* Input filename */
--
2.6.2

134
package/wget/0001-utils-rename-base64_-encode-decode.patch Normal file
View File

@ -0,0 +1,134 @@
From 9e68787576fec304da23af26dca963a4cdea7765 Mon Sep 17 00:00:00 2001
From: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
Date: Tue, 8 Nov 2016 23:42:53 +0530
Subject: [PATCH] utils: rename base64_{encode,decode}
When statically linking with gnutls, we get definition clash error for
base64_encode which is also defined by gnutls.
/home/rahul.bedarkar/buildroot/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgnutls.a(base64.o): In function `base64_encode':
base64.c:(.text+0x148): multiple definition of `base64_encode'
utils.o:utils.c:(.text+0x4378): first defined here
collect2: error: ld returned 1 exit status
To prevent definition clash, rename base64_{encode,decode}
Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
---
src/http-ntlm.c | 6 +++---
src/http.c | 4 ++--
src/utils.c | 8 ++++----
src/utils.h | 4 ++--
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/http-ntlm.c b/src/http-ntlm.c
index 56c40ae..87f5a37 100644
--- a/src/http-ntlm.c
+++ b/src/http-ntlm.c
@@ -122,7 +122,7 @@ ntlm_input (struct ntlmdata *ntlm, const char *header)
DEBUGP (("Received a type-2 NTLM message.\n"));
- size = base64_decode (header, buffer);
+ size = wget_base64_decode (header, buffer);
if (size < 0)
return false; /* malformed base64 from server */
@@ -411,7 +411,7 @@ ntlm_output (struct ntlmdata *ntlm, const char *user, const char *passwd,
size = 32 + hostlen + domlen;
base64 = (char *) alloca (BASE64_LENGTH (size) + 1);
- base64_encode (ntlmbuf, size, base64);
+ wget_base64_encode (ntlmbuf, size, base64);
output = concat_strings ("NTLM ", base64, (char *) 0);
break;
@@ -584,7 +584,7 @@ ntlm_output (struct ntlmdata *ntlm, const char *user, const char *passwd,
/* convert the binary blob into base64 */
base64 = (char *) alloca (BASE64_LENGTH (size) + 1);
- base64_encode (ntlmbuf, size, base64);
+ wget_base64_encode (ntlmbuf, size, base64);
output = concat_strings ("NTLM ", base64, (char *) 0);
diff --git a/src/http.c b/src/http.c
index 7e60a07..368d30d 100644
--- a/src/http.c
+++ b/src/http.c
@@ -2818,7 +2818,7 @@ metalink_from_http (const struct response *resp, const struct http_stat *hs,
char *bin_hash = alloca (dig_hash_str_len * 3 / 4 + 1);
size_t hash_bin_len;
- hash_bin_len = base64_decode (dig_hash, bin_hash);
+ hash_bin_len = wget_base64_decode (dig_hash, bin_hash);
/* One slot for me, one for zero-termination. */
mfile->checksums =
@@ -4546,7 +4546,7 @@ basic_authentication_encode (const char *user, const char *passwd)
sprintf (t1, "%s:%s", user, passwd);
t2 = (char *)alloca (BASE64_LENGTH (len1) + 1);
- base64_encode (t1, len1, t2);
+ wget_base64_encode (t1, len1, t2);
return concat_strings ("Basic ", t2, (char *) 0);
}
diff --git a/src/utils.c b/src/utils.c
index b07da9f..355f0ce 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -2140,7 +2140,7 @@ xsleep (double seconds)
base64 data. */
size_t
-base64_encode (const void *data, size_t length, char *dest)
+wget_base64_encode (const void *data, size_t length, char *dest)
{
/* Conversion table. */
static const char tbl[64] = {
@@ -2208,7 +2208,7 @@ base64_encode (const void *data, size_t length, char *dest)
This function originates from Free Recode. */
ssize_t
-base64_decode (const char *base64, void *dest)
+wget_base64_decode (const char *base64, void *dest)
{
/* Table of base64 values for first 128 characters. Note that this
assumes ASCII (but so does Wget in other places). */
@@ -2588,7 +2588,7 @@ wg_pubkey_pem_to_der (const char *pem, unsigned char **der, size_t *der_len)
base64data = xmalloc (BASE64_LENGTH(stripped_pem_count));
- size = base64_decode (stripped_pem, base64data);
+ size = wget_base64_decode (stripped_pem, base64data);
if (size < 0) {
xfree (base64data); /* malformed base64 from server */
@@ -2651,7 +2651,7 @@ wg_pin_peer_pubkey (const char *pinnedpubkey, const char *pubkey, size_t pubkeyl
end_pos[0] = '\0';
/* decode base64 pinnedpubkey, 8 is length of "sha256//" */
- decoded_hash_length = base64_decode (begin_pos + 8, expectedsha256sumdigest);
+ decoded_hash_length = wget_base64_decode (begin_pos + 8, expectedsha256sumdigest);
/* if valid base64, compare sha256 digests directly */
if (SHA256_DIGEST_SIZE == decoded_hash_length &&
!memcmp (sha256sumdigest, expectedsha256sumdigest, SHA256_DIGEST_SIZE)) {
diff --git a/src/utils.h b/src/utils.h
index f224b73..aaac730 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -140,8 +140,8 @@ void xsleep (double);
/* How many bytes it will take to store LEN bytes in base64. */
#define BASE64_LENGTH(len) (4 * (((len) + 2) / 3))
-size_t base64_encode (const void *, size_t, char *);
-ssize_t base64_decode (const char *, void *);
+size_t wget_base64_encode (const void *, size_t, char *);
+ssize_t wget_base64_decode (const char *, void *);
#ifdef HAVE_LIBPCRE
void *compile_pcre_regex (const char *);
--
2.6.2

35
package/wget/0002-Remove-skipping-libunistring-with-disable-iri.patch
View File

@ -1,35 +0,0 @@
From 990f3d67d340d226bbd4187f5d310a4d2bf2bfe4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
Date: Mon, 6 Feb 2017 11:25:48 +0100
Subject: [PATCH] Remove skipping libunistring with --disable-iri
* configure.ac: Remove checking for IRI=no
On certain systems, gnulib falls back to libunistring
for mbtowc() and wcwidth() (used in src/progress.c).
Reported-by: Zhiming Wang
Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
---
configure.ac | 5 -----
1 file changed, 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index 8786e00..686f040 100644
--- a/configure.ac
+++ b/configure.ac
@@ -663,11 +663,6 @@ if test "X$iri" != "Xno"; then
# ])
])
fi
-if test "X$iri" = "Xno"; then
- # we don't need libunistring - clear settings from gnulib module
- LIBUNISTRING=""
- LTLIBUNISTRING=""
-fi
dnl
dnl Check for UUID
--
2.6.2

2
package/wget/wget.hash
View File

@ -1,2 +1,2 @@
# Locally calculated after checking pgp signature
sha256 0f1157bbf4daae19f3e1ddb70c6ccb2067feb834a6aa23c9d9daa7f048606384 wget-1.19.tar.xz
sha256 b5b55b75726c04c06fe253daec9329a6f1a3c0c1878e3ea76ebfebc139ea9cc1 wget-1.18.tar.xz

5
package/wget/wget.mk
View File

@ -4,16 +4,13 @@
#
################################################################################
WGET_VERSION = 1.19
WGET_VERSION = 1.18
WGET_SOURCE = wget-$(WGET_VERSION).tar.xz
WGET_SITE = $(BR2_GNU_MIRROR)/wget
WGET_DEPENDENCIES = host-pkgconf
WGET_LICENSE = GPLv3+
WGET_LICENSE_FILES = COPYING
# For 0002-Remove-skipping-libunistring-with-disable-iri.patch
WGET_AUTORECONF = YES
# Prefer full-blown wget over busybox
ifeq ($(BR2_PACKAGE_BUSYBOX),y)
WGET_DEPENDENCIES += busybox