1 |
commit: 9bf03680ff02e09c1cef7dd05f9634d459a3957f |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 2 18:48:23 2021 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 2 18:48:23 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bf03680 |
7 |
|
8 |
net-misc/wget-1.21-r1: revbump, gnulib fix for Darwin, Solaris |
9 |
|
10 |
Closes: https://bugs.gentoo.org/763123 |
11 |
Package-Manager: Portage-3.0.9, Repoman-3.0.2 |
12 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
13 |
|
14 |
.../wget/files/wget-1.21-gnulib-utime-errno.patch | 30 +++++ |
15 |
net-misc/wget/wget-1.21-r1.ebuild | 129 +++++++++++++++++++++ |
16 |
2 files changed, 159 insertions(+) |
17 |
|
18 |
diff --git a/net-misc/wget/files/wget-1.21-gnulib-utime-errno.patch b/net-misc/wget/files/wget-1.21-gnulib-utime-errno.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..546028c83df |
21 |
--- /dev/null |
22 |
+++ b/net-misc/wget/files/wget-1.21-gnulib-utime-errno.patch |
23 |
@@ -0,0 +1,30 @@ |
24 |
+From 6a76832db224ac5671599ce332717f985a2addc7 Mon Sep 17 00:00:00 2001 |
25 |
+From: Bruno Haible <bruno@×××××.org> |
26 |
+Date: Thu, 31 Dec 2020 17:16:57 +0100 |
27 |
+Subject: utime: Fix compilation error on macOS and Solaris 9 (regr. |
28 |
+ 2020-12-24). |
29 |
+ |
30 |
+Reported by Tom G. Christensen <tgc@×××××××××××.com> in |
31 |
+<https://lists.gnu.org/archive/html/bug-gnulib/2020-12/msg00295.html>. |
32 |
+ |
33 |
+* lib/utime.c: Include <errno.h>. |
34 |
+--- |
35 |
+ ChangeLog | 7 +++++++ |
36 |
+ lib/utime.c | 1 + |
37 |
+ 2 files changed, 8 insertions(+) |
38 |
+ |
39 |
+diff --git a/lib/utime.c b/lib/utime.c |
40 |
+index bf7d7c534..337217950 100644 |
41 |
+--- a/lib/utime.c |
42 |
++++ b/lib/utime.c |
43 |
+@@ -261,6 +261,7 @@ utime (const char *name, const struct utimbuf *ts) |
44 |
+ |
45 |
+ #else |
46 |
+ |
47 |
++# include <errno.h> |
48 |
+ # include <sys/stat.h> |
49 |
+ # include "filename.h" |
50 |
+ |
51 |
+-- |
52 |
+cgit v1.2.1 |
53 |
+ |
54 |
|
55 |
diff --git a/net-misc/wget/wget-1.21-r1.ebuild b/net-misc/wget/wget-1.21-r1.ebuild |
56 |
new file mode 100644 |
57 |
index 00000000000..9d919f50edb |
58 |
--- /dev/null |
59 |
+++ b/net-misc/wget/wget-1.21-r1.ebuild |
60 |
@@ -0,0 +1,129 @@ |
61 |
+# Copyright 1999-2021 Gentoo Authors |
62 |
+# Distributed under the terms of the GNU General Public License v2 |
63 |
+ |
64 |
+EAPI=7 |
65 |
+ |
66 |
+PYTHON_COMPAT=( python3_{6,7,8} ) |
67 |
+ |
68 |
+inherit flag-o-matic python-any-r1 toolchain-funcs |
69 |
+ |
70 |
+DESCRIPTION="Network utility to retrieve files from the WWW" |
71 |
+HOMEPAGE="https://www.gnu.org/software/wget/" |
72 |
+SRC_URI="mirror://gnu/wget/${P}.tar.gz" |
73 |
+ |
74 |
+LICENSE="GPL-3" |
75 |
+SLOT="0" |
76 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
77 |
+IUSE="cookie_check debug gnutls idn ipv6 libressl metalink nls ntlm pcre +ssl static test uuid zlib" |
78 |
+REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )" |
79 |
+RESTRICT="!test? ( test )" |
80 |
+ |
81 |
+# Force a newer libidn2 to avoid libunistring deps. #612498 |
82 |
+LIB_DEPEND=" |
83 |
+ cookie_check? ( net-libs/libpsl ) |
84 |
+ idn? ( >=net-dns/libidn2-0.14:=[static-libs(+)] ) |
85 |
+ metalink? ( media-libs/libmetalink ) |
86 |
+ pcre? ( dev-libs/libpcre2[static-libs(+)] ) |
87 |
+ ssl? ( |
88 |
+ gnutls? ( net-libs/gnutls:0=[static-libs(+)] ) |
89 |
+ !gnutls? ( |
90 |
+ !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) |
91 |
+ libressl? ( dev-libs/libressl:0=[static-libs(+)] ) |
92 |
+ ) |
93 |
+ ) |
94 |
+ uuid? ( sys-apps/util-linux[static-libs(+)] ) |
95 |
+ zlib? ( sys-libs/zlib[static-libs(+)] ) |
96 |
+" |
97 |
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" |
98 |
+DEPEND=" |
99 |
+ ${RDEPEND} |
100 |
+ static? ( ${LIB_DEPEND} ) |
101 |
+ test? ( |
102 |
+ ${PYTHON_DEPS} |
103 |
+ dev-lang/perl |
104 |
+ dev-perl/HTTP-Daemon |
105 |
+ dev-perl/HTTP-Message |
106 |
+ dev-perl/IO-Socket-SSL |
107 |
+ ) |
108 |
+" |
109 |
+BDEPEND=" |
110 |
+ app-arch/xz-utils |
111 |
+ virtual/pkgconfig |
112 |
+ nls? ( sys-devel/gettext ) |
113 |
+" |
114 |
+ |
115 |
+DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc ) |
116 |
+ |
117 |
+PATCHES=( |
118 |
+ "${FILESDIR}"/${P}-gnulib-utime-errno.patch # 763123, drop next release |
119 |
+) |
120 |
+ |
121 |
+pkg_setup() { |
122 |
+ use test && python-any-r1_pkg_setup |
123 |
+} |
124 |
+ |
125 |
+src_prepare() { |
126 |
+ default |
127 |
+ |
128 |
+ # revert some hack that breaks linking, bug #585924 |
129 |
+ if [[ ${CHOST} == *-darwin* ]] \ |
130 |
+ || [[ ${CHOST} == *-solaris* ]] \ |
131 |
+ || [[ ${CHOST} == *-uclibc* ]] \ |
132 |
+ || [[ ${CHOST} == *-cygwin* ]] \ |
133 |
+ ; then |
134 |
+ sed -i \ |
135 |
+ -e 's/^ LIBICONV=$/:/' \ |
136 |
+ configure || die |
137 |
+ fi |
138 |
+} |
139 |
+ |
140 |
+src_configure() { |
141 |
+ # fix compilation on Solaris, we need filio.h for FIONBIO as used in |
142 |
+ # the included gnutls -- force ioctl.h to include this header |
143 |
+ [[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1 |
144 |
+ |
145 |
+ if use static ; then |
146 |
+ append-ldflags -static |
147 |
+ tc-export PKG_CONFIG |
148 |
+ PKG_CONFIG+=" --static" |
149 |
+ fi |
150 |
+ |
151 |
+ # There is no flag that controls this. libunistring-prefix only |
152 |
+ # controls the search path (which is why we turn it off below). |
153 |
+ # Further, libunistring is only needed w/older libidn2 installs, |
154 |
+ # and since we force the latest, we can force off libunistring. #612498 |
155 |
+ local myeconfargs=( |
156 |
+ --disable-assert |
157 |
+ --disable-pcre |
158 |
+ --disable-rpath |
159 |
+ --without-included-libunistring |
160 |
+ --without-libunistring-prefix |
161 |
+ $(use_enable debug) |
162 |
+ $(use_enable idn iri) |
163 |
+ $(use_enable ipv6) |
164 |
+ $(use_enable nls) |
165 |
+ $(use_enable ntlm) |
166 |
+ $(use_enable pcre pcre2) |
167 |
+ $(use_enable ssl digest) |
168 |
+ $(use_enable ssl opie) |
169 |
+ $(use_with cookie_check libpsl) |
170 |
+ $(use_with idn libidn) |
171 |
+ $(use_with metalink) |
172 |
+ $(use_with ssl ssl $(usex gnutls gnutls openssl)) |
173 |
+ $(use_with uuid libuuid) |
174 |
+ $(use_with zlib) |
175 |
+ ) |
176 |
+ ac_cv_libunistring=no \ |
177 |
+ econf "${myeconfargs[@]}" |
178 |
+} |
179 |
+ |
180 |
+src_install() { |
181 |
+ default |
182 |
+ |
183 |
+ sed -i \ |
184 |
+ -e "s:/usr/local/etc:${EPREFIX}/etc:g" \ |
185 |
+ "${ED}"/etc/wgetrc \ |
186 |
+ "${ED}"/usr/share/man/man1/wget.1 \ |
187 |
+ "${ED}"/usr/share/info/wget.info \ |
188 |
+ || die |
189 |
+} |