| 1 |
commit: 14d116caf2351fae887e51bb16860b1ac4d66670 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 8 08:20:57 2021 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 8 08:20:57 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14d116ca |
| 7 |
|
| 8 |
net-misc/wget: Bump to version 1.21.2 |
| 9 |
|
| 10 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 11 |
|
| 12 |
net-misc/wget/Manifest | 2 +- |
| 13 |
.../wget/files/wget-1.20.3-gcc10-fno-common.patch | 32 ---------------------- |
| 14 |
.../{wget-1.20.3-r3.ebuild => wget-1.21.2.ebuild} | 12 +++++--- |
| 15 |
3 files changed, 9 insertions(+), 37 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest |
| 18 |
index e8fccc9a3bc..4f427713655 100644 |
| 19 |
--- a/net-misc/wget/Manifest |
| 20 |
+++ b/net-misc/wget/Manifest |
| 21 |
@@ -1,2 +1,2 @@ |
| 22 |
-DIST wget-1.20.3.tar.gz 4489249 BLAKE2B 89fa7997a02be6fb1a869d1bf359ce4e43b41f8069d1520e6d0b48739b9b6030b1dec7b7e8cbe833ea1070b30f551b1a9d72c6f4a43bb58df20b680b42a68805 SHA512 e8b82b40e270296228094a78d47f81580bdbdea9e6b93fd61b37dccb39430aeb9bda5397dc53a31c952a61629383c7e2a8c8abf414c8a4dd369af6ecf2717e6c |
| 23 |
DIST wget-1.21.1.tar.gz 4884887 BLAKE2B 28a3044f33df1d24e13900e8018a38cabae21fb41dd2e089bdbfd759b4adee3771ab558b84f5a8b6f546bc84a3387c973903f9fe06562093d3566e22d1528587 SHA512 784efbf9fe43a1671109e32a9c36237eb2d5c19cf756bf6f6e65517fb21464d3d94b1d6f491852d23b3ddff63e38fe6b60df9125c91b139993af59875e3a0712 |
| 24 |
+DIST wget-1.21.2.tar.gz 5004576 BLAKE2B e11c3a2b89ab26834dc4cbb445bcc6122d3a6b2a5b9c6de1ce9e8f062281f9e5aa1f80ca37a44791ba5aaf6a447015a26afef2199cdb75f1931d5e1ffb1f406b SHA512 3e35f92604486ca459f26df97d392579f1d83a9254519e8ce249b410bacf70dddf716d6caa3b29fd4865163f60410b2b8ad1ca1f7bb3dbb2456386b7647b988d |
| 25 |
|
| 26 |
diff --git a/net-misc/wget/files/wget-1.20.3-gcc10-fno-common.patch b/net-misc/wget/files/wget-1.20.3-gcc10-fno-common.patch |
| 27 |
deleted file mode 100644 |
| 28 |
index 3b99f4071af..00000000000 |
| 29 |
--- a/net-misc/wget/files/wget-1.20.3-gcc10-fno-common.patch |
| 30 |
+++ /dev/null |
| 31 |
@@ -1,32 +0,0 @@ |
| 32 |
-From 04b7369490344d014b05dee5d48ca78cd04733ce Mon Sep 17 00:00:00 2001 |
| 33 |
-From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@×××.de> |
| 34 |
-Date: Sat, 22 Feb 2020 13:40:50 +0100 |
| 35 |
-Subject: [PATCH] * tests/unit-tests.c: Fix 'multiple definition of...' with |
| 36 |
- gcc 10 |
| 37 |
- |
| 38 |
---- |
| 39 |
- tests/unit-tests.c | 4 ++-- |
| 40 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
| 41 |
- |
| 42 |
-diff --git a/tests/unit-tests.c b/tests/unit-tests.c |
| 43 |
-index 5fae8a219..f66e5e664 100644 |
| 44 |
---- a/tests/unit-tests.c |
| 45 |
-+++ b/tests/unit-tests.c |
| 46 |
-@@ -37,7 +37,7 @@ as that of the covered work. */ |
| 47 |
- |
| 48 |
- #include "unit-tests.h" |
| 49 |
- |
| 50 |
--const char *program_argstring = "TEST"; |
| 51 |
-+extern const char *program_argstring; |
| 52 |
- |
| 53 |
- static int tests_run; |
| 54 |
- |
| 55 |
-@@ -69,7 +69,7 @@ all_tests(void) |
| 56 |
- return NULL; |
| 57 |
- } |
| 58 |
- |
| 59 |
--const char *program_name; /* Needed by lib/error.c. */ |
| 60 |
-+extern const char *program_name; /* Needed by lib/error.c. */ |
| 61 |
- |
| 62 |
- int |
| 63 |
- main (int argc _GL_UNUSED, const char *argv[]) |
| 64 |
|
| 65 |
diff --git a/net-misc/wget/wget-1.20.3-r3.ebuild b/net-misc/wget/wget-1.21.2.ebuild |
| 66 |
similarity index 86% |
| 67 |
rename from net-misc/wget/wget-1.20.3-r3.ebuild |
| 68 |
rename to net-misc/wget/wget-1.21.2.ebuild |
| 69 |
index 28c0a2fa04d..5dee2e984f6 100644 |
| 70 |
--- a/net-misc/wget/wget-1.20.3-r3.ebuild |
| 71 |
+++ b/net-misc/wget/wget-1.21.2.ebuild |
| 72 |
@@ -3,7 +3,7 @@ |
| 73 |
|
| 74 |
EAPI=7 |
| 75 |
|
| 76 |
-PYTHON_COMPAT=( python3_{7,8} ) |
| 77 |
+PYTHON_COMPAT=( python3_{7..9} ) |
| 78 |
|
| 79 |
inherit flag-o-matic python-any-r1 toolchain-funcs |
| 80 |
|
| 81 |
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/wget/${P}.tar.gz" |
| 82 |
|
| 83 |
LICENSE="GPL-3" |
| 84 |
SLOT="0" |
| 85 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 86 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 87 |
IUSE="cookie_check debug gnutls idn ipv6 metalink nls ntlm pcre +ssl static test uuid zlib" |
| 88 |
REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )" |
| 89 |
RESTRICT="!test? ( test )" |
| 90 |
@@ -51,8 +51,6 @@ BDEPEND=" |
| 91 |
|
| 92 |
DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc ) |
| 93 |
|
| 94 |
-PATCHES=( "${FILESDIR}"/${P}-gcc10-fno-common.patch ) |
| 95 |
- |
| 96 |
pkg_setup() { |
| 97 |
use test && python-any-r1_pkg_setup |
| 98 |
} |
| 99 |
@@ -77,6 +75,12 @@ src_configure() { |
| 100 |
# the included gnutls -- force ioctl.h to include this header |
| 101 |
[[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1 |
| 102 |
|
| 103 |
+ if [[ ${CHOST} == *-darwin* ]] ; then |
| 104 |
+ # https://lists.gnu.org/archive/html/bug-findutils/2021-01/msg00050.html |
| 105 |
+ # https://lists.gnu.org/archive/html/bug-findutils/2021-01/msg00051.html |
| 106 |
+ append-cppflags '-D__nonnull\(X\)=' |
| 107 |
+ fi |
| 108 |
+ |
| 109 |
if use static ; then |
| 110 |
append-ldflags -static |
| 111 |
tc-export PKG_CONFIG |
Archives