mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-23 07:21:14 +02:00
bump(net-misc/wget): sync with upstream
This commit is contained in:
Michael Marineau
parent
700434a560
commit
d11c5aa3b4
14
sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/wget-1.16
vendored
Normal file
14
sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/wget-1.16
vendored
Normal file
@ -0,0 +1,14 @@
|
||||
DEFINED_PHASES=configure install prepare
|
||||
DEPEND=!static? ( idn? ( net-dns/libidn ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0 ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) ) app-arch/xz-utils virtual/pkgconfig static? ( idn? ( net-dns/libidn[static-libs(+)] ) pcre? ( dev-libs/libpcre[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls[static-libs(+)] ) !gnutls? ( dev-libs/openssl:0[static-libs(+)] ) ) uuid? ( sys-apps/util-linux[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) ) nls? ( sys-devel/gettext ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
|
||||
DESCRIPTION=Network utility to retrieve files from the WWW
|
||||
EAPI=4
|
||||
HOMEPAGE=http://www.gnu.org/software/wget/
|
||||
IUSE=debug gnutls idn ipv6 nls ntlm pcre +ssl static uuid zlib
|
||||
KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
|
||||
LICENSE=GPL-3
|
||||
RDEPEND=!static? ( idn? ( net-dns/libidn ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0 ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) )
|
||||
REQUIRED_USE=ntlm? ( !gnutls ssl ) gnutls? ( ssl )
|
||||
SLOT=0
|
||||
SRC_URI=mirror://gnu/wget/wget-1.16.tar.xz
|
||||
_eclasses_=autotools ebea507d219855923e3438c953cf4ab8 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 75e24bac8423c515dd9c5717f08feb83 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
|
||||
_md5_=e7f43a930bc429ef48b6a8749fd86d6c
|
||||
@ -1,6 +1,36 @@
|
||||
# ChangeLog for net-misc/wget
|
||||
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.183 2014/05/16 10:59:20 polynomial-c Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.191 2014/10/30 19:03:07 maekke Exp $
|
||||
|
||||
30 Oct 2014; Markus Meier <maekke@gentoo.org> wget-1.16.ebuild:
|
||||
arm stable, bug #527056
|
||||
|
||||
29 Oct 2014; Mike Frysinger <vapier@gentoo.org>
|
||||
+files/wget-1.16-fix-proxy-test-race.patch,
|
||||
+files/wget-1.16-openssl-no-ssl3.patch, wget-1.16.ebuild:
|
||||
Add some build/test fixes from upstream.
|
||||
|
||||
29 Oct 2014; Tobias Klausmann <klausman@gentoo.org> wget-1.16.ebuild:
|
||||
Stable on alpha, bug 527056
|
||||
|
||||
29 Oct 2014; Agostino Sarubbo <ago@gentoo.org> wget-1.16.ebuild:
|
||||
Stable for sparc, wrt bug #527056
|
||||
|
||||
28 Oct 2014; Jeroen Roovers <jer@gentoo.org> wget-1.16.ebuild:
|
||||
Stable for HPPA (bug #527056).
|
||||
|
||||
28 Oct 2014; Agostino Sarubbo <ago@gentoo.org> wget-1.16.ebuild:
|
||||
Stable for x86, wrt bug #527056
|
||||
|
||||
28 Oct 2014; Agostino Sarubbo <ago@gentoo.org> wget-1.16.ebuild:
|
||||
Stable for amd64, wrt bug #527056
|
||||
|
||||
*wget-1.16 (27 Oct 2014)
|
||||
|
||||
27 Oct 2014; Mike Frysinger <vapier@gentoo.org>
|
||||
+files/wget-1.16-openssl-header.patch, +files/wget-1.16-pkg-config.patch,
|
||||
+files/wget-1.16-tests-skip.patch, +wget-1.16.ebuild:
|
||||
Version bump.
|
||||
|
||||
*wget-1.15-r1 (16 May 2014)
|
||||
|
||||
|
||||
@ -8,27 +8,24 @@ AUX wget-1.14-texi2pod.patch 969 SHA256 b494c2a97b0c993621a38f63f3053854bba00c8e
|
||||
AUX wget-1.14-wgetrc.patch 1284 SHA256 c0ca848e78ebe3d5ceb8f41d1271bb7f92c4d8edb98063af86a2b6279a2d0b2d SHA512 ce9623cb8da5fb0b1bc44a399c1f4c5af2e967d85032c3a0ec05e341c9dcebf45c223615fb320acf62b24b63561e91c1018bd615d2b7169b9835bffe211c7c32 WHIRLPOOL 1cac60e1f29e40e3ebe01bb7b424c5431dd4451f7447ff50066698e21aea52e7f56249bc85f59eb01a89414f7e0bc4f8b460f5aa4da728cb8622c62d77c619ad
|
||||
AUX wget-1.15-pkg-config.patch 5901 SHA256 37b33b6123e8472e4359cb1e595e7236efe532dac2668ed4258a798f269e512e SHA512 1a566e1bf4af4b32252accbcd982325ee9df8e892b2e213f33db3c10a2e4b925d9c444d09532711f009db09dc3398709bb920db8dbf91e7fc4f9b5fe321475df WHIRLPOOL 3359f8333cd76e47a4d2c39f2fd40b0d3453e14f7abe003516d27147662617deee3064b88d0a496e7927551ed3bf61d2dde99adeff978618cd12551624b66dfd
|
||||
AUX wget-1.15-test_fix.patch 847 SHA256 29cce71f521834a09977340f75454b8831ff6309f165041aa93da161fe0761a2 SHA512 cc97a1d57ab17c2e34961c7c4f3b2fee906e6027366987233ced310acacf7d8a96cadbe13a09a7fa31bf7040e18a046435dc1edc558cf8481c59d1016ad4f07c WHIRLPOOL ecfd898ddca8e01c877c5c7f33895867c0bc1b5c636ff26474c63639b001bbe31c1ecf23c386a80f43cb84f1bfd9ad9c2198e22bb9099e190182e3b9a90112bd
|
||||
AUX wget-1.16-fix-proxy-test-race.patch 2752 SHA256 30e5d502abaf22a274f967fd0d6dbf6defdc076228c4eb3bca8e0c7a07110c52 SHA512 ab1271b06c010b4acfe628a216d0522b1ee1d7685743a53e5916e133d309fa8d998e1d13f97371b21f5518000d30157368ff9634f4f66f9a7b17dda100bb996b WHIRLPOOL 657baf843e059ee4e6f547e2df399934cd11447712520fc63bae4e023a87cc8f4b8a50803633c623e260195df9d2e544b87092d3c9cbe0ba1977bc01ad895e4b
|
||||
AUX wget-1.16-openssl-header.patch 823 SHA256 10101a30356f926b5d6c66d85aae523dc645e3d00ca8bb886327de8479cee61e SHA512 7e4f78302910e2a11502f613907e27d02aced887e91c236159dc9099acebba61d968f17013ff35ebaf0fc13d38ddcac23b776d9541b12a661ca3f6d24b81ce3e WHIRLPOOL 6abfc87d3b3e43c7b6509db554f1630677f0672106d20f7764b29729e6f48a7798a038c3973294874efb332ff365a45c05812184839104b532667a1bb481a83a
|
||||
AUX wget-1.16-openssl-no-ssl3.patch 875 SHA256 ae0e4665d133137db574f5ab3e154a556dac0654340b3aa48f8c4b9d1aebd019 SHA512 816cfe0b489d30311fe8b617d108b06505821d37061aff983a3bf9c58b1908e97710610af575bb2248709a9ee376683cc1bb067ddeff09acc4cd33b658a4ced2 WHIRLPOOL b522ee53918994028b3a758ac3d0c777e8116036d208fa4d5582ffcde5fe67abcef1b0cda38bbc1cf4c44776d3ccc0c1a4d894a1eba36407de7725b18d9452d0
|
||||
AUX wget-1.16-pkg-config.patch 6482 SHA256 8153f47feaf71f118fd5f86ca9baa829e2e314b81ad3d1da74d98226cbb92ce0 SHA512 a3d47a68d1eee0c1cd738c11bbc3952eaccb2f6a264d2fc781cf9e73bce6fe4926dc140bcdfa351dcecfbd5653d89826b657d3c623e96390e78b797c92dc9b09 WHIRLPOOL 930f2129d03d12626d8337472c9fea27a85622204dc2105327cfe5c7d385e5b086fcc4bacdcb435b364b6a25e2a8a524e9cd5c6d725af426b5bae2188183d8d2
|
||||
AUX wget-1.16-tests-skip.patch 730 SHA256 07e2198e97afdb770ac19b196698cda1209d85c929a1100d0e9e1c5975cf1a2b SHA512 e227c1f153750b190de868671b28bee38e9b3029658da5622514a56633462189117b96c1c3d829e97e88b1d3dff8c6bdec4a309f72c6741d3503983051798453 WHIRLPOOL 675dab675ba8bb8064b6674457ffac40c0f530c3f5dce229fa7f095643ad2e05665de6c4c1813cb1f90610af8a7aba884304c7f24e7087563060d42e6a2bd6ad
|
||||
DIST wget-1.14.tar.xz 1584060 SHA256 1761d7f7c6a2ad6c8d494d239c53f0c17126efb6449ada16dee3a66d87a4147b SHA512 b01351b3e086c713c0f64af34d87e013d2edb69b76fa84699b3afa4975622993053c4e367f965218c8a3326a85b734f3ee8bcce8ba0c72a89bb2208f3b1759ef WHIRLPOOL 8071b49a28ac03c832d965bfb9c00e4f28f59098c896c40c73081e56ec0091fbe8290b115e3eaa85b81c90006a39e3efba811f30dea5d33b726fc62d2b307824
|
||||
DIST wget-1.15.tar.xz 1679908 SHA256 d18a5f4354c9854b1f1b9897353443bceed8e19a391d36d4dbebe85cc9d480fb SHA512 1cb49e083500cb2753f023d9b4594b61d6e909994ea327ed9b861424df77df3ffbe7c431af9ee73de0eda083b3bb28cf22a53c2b3a3b781754fce39f4c13fae4 WHIRLPOOL 5d649f7fba4ad4f1482a75c960f845cef22db1711178bd22ed29a6fd1242f483e53ca2501e62b59bad23fbbf554ddff1f74fc2e79bd4ecaeefd7e28795c743f4
|
||||
DIST wget-1.16.tar.xz 1697308 SHA256 9261dd090a17687b6dc0682a257e90a926def15624b650e8f799af57e5c8b0e7 SHA512 20f1247a344cac8f9120a506a4ca1fff84e5f3f5abb8492f67c22d213cb41cbfa24d5a68b91512a6ca42765d319bea8785adff8fad58d854f8f563c6593b4298 WHIRLPOOL a1094b27f77547baf7dac6f1a6ded691b3a043caff948e8fd84555a730d6a02ae157f4d72144f3c1672439166da28a4cca26f9c4f7ec4473603899545cc956b4
|
||||
EBUILD wget-1.14-r1.ebuild 2790 SHA256 4638bccfe9a760c0974889f79b1230436083b4312f1f6c6cd9e84dfd78983faa SHA512 44cca80deed49c8cde34eb7931c1b718cd7602152d7c2cadd47d49b03f763588cb37706b1c50f7828a2f06b7923fbca10c5a4610fa2c6f3efbc91d820c74d472 WHIRLPOOL 75c4271faa98106a1f6bfa0e8294e0527e9d6c2caf50ca7cd0dae2b8584222f12b39322b7b3f8c2cd70b5eb9c5fcb30fa6787a857aef3c451471be2d88959950
|
||||
EBUILD wget-1.14.ebuild 2636 SHA256 3603addd5ca6d21501997584a2fc185bc6314b843c6c3296166f082938bd74aa SHA512 4fabe38bb5c10638fd77ca47544ef24c44783146f97a7ca98e893e78cee408c8652414e7fc49d1d618ff0b72c83bc3b851fd2f61fd05cb06dc0b02c7d8e4da97 WHIRLPOOL b3423bebb6c567b35916b6979be10b7986a30003ce1944ffe0ecdd0ed4740c200af81e08cb4b0cc10e88be085e02e07dc220325cb34d72145f008eff4d061a05
|
||||
EBUILD wget-1.15-r1.ebuild 2500 SHA256 01e6f1ebe23cb13854441fdc0e78257b370ab1bb5934a2622257cf836a2ab726 SHA512 230277d6e90429d17284fcd33938c99e41bebdc8d3ee44707c0deb367f0ebf8bfb1ac6678a79e9907ac48db8db784554f39726a65840b0e1c54b7c10b0f53d04 WHIRLPOOL 713ce78ed2b89aec130a8d063ff5f2406ba8a527941ac72da75128d75ff62790765fe4a2ea1a5bbca03e6738d9ce7d265d2fd3a5d78b36abf7e0131751d297d7
|
||||
MISC ChangeLog 27683 SHA256 511af6f112093215a141b361027e700f08e73d679a7ad832003b8f554c84da88 SHA512 13269f991cbcbc84bd91b438cbff3e945767ebecb8dbdef8b40adaec19cea1943a906db36e010fb76d8886b094ebbc962fe0fe13bca5cced8b0edb796e1ec9a1 WHIRLPOOL 84675445e45cd4735be546696606ef5cab6532ad9cbde04c67c0cb2397f99209283ba31250c0c488045acf4f42427b71064b9ed754d352df557f0a8ca1956429
|
||||
EBUILD wget-1.16.ebuild 2647 SHA256 0a48f80ae465c3ba8b4fc97cdc7f244a88db54ff542b77de2f2bb01c24754b4a SHA512 c86ec389b60f98d57fd2bb375957ba9db31d96bf6aae8197b22b58f77821ca009844be367b39dfe3f9739bfeeb54cf61ba1922c986e19275d295608e934ba575 WHIRLPOOL ad269903c8faa21ae7eeb9b80bce18b6d80ac1529fbe304122f1b25f51cd302e714cb495afa26649492227f5e2fad5573398a0506937c086c5ca1e9b0152a7d1
|
||||
MISC ChangeLog 28707 SHA256 7996aeda34fdc43eee775dc64c6596c0fedb87d654a0e2a5116b09a94608e033 SHA512 39a7d785dbcec8a5989e1fbb62887c2d88b8e06d9a30cb9e18ef5a725a23fe3508ab34d187a28d684d94fbc4de8ed5595e25e39fc556d4e98f8a6339376faea8 WHIRLPOOL ea89cc11fa6e2805d02eb5e10743dc63555e17a0b4667f09d8a498c91e288f276e9730c83aa8e3de76dba734677a36b80e267a0200b478114097282e11437429
|
||||
MISC metadata.xml 480 SHA256 623ea871cdd741de1f7b1bdde73f38d222d489ed7496694a3b8f2fff7d49cf44 SHA512 4dae8e65a95c5f03e0434fce20012581fb75e33310598ef6b099b11ad611dfdbc5043b0223b1cd791500b1d4dcd19c52ab94142587508b2ed362b11cc7acddb1 WHIRLPOOL 189bc2a775087a96010a7426b562cf55e9426bad2da13e085d14dcf713631466ee4fe9c3dffe1ee578482d7d5bf0e4cac2510af431a4ef1ec21626770fe284b3
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.22 (GNU/Linux)
|
||||
Version: GnuPG v2
|
||||
|
||||
iQIcBAEBCAAGBQJTde+JAAoJEPiazRVxLXTFQmcP/2pq2ZOudCdJ40s2dZooaAKa
|
||||
NMup4eaKSLui2v2TdTwF2pDdwXVqZwVO9iSiNxNvBl01yvtLHB5NjtToCYJ3PuvP
|
||||
+J8HL0uAZ2lhg8Fcdk3cq79swIhrc6aTsZu3TKsg+TTYJ/vSLpwOkoyfZQh76HCo
|
||||
46FJFdDfFh42WXQtiAuNPVCIqD2Sjkjpku99pVAPBBN0yH+ZuqvWFhGHlLJ/T8UB
|
||||
TtjJsPKDNi+k53jIrtFOPs29WRJLK5c4kjUU9vQ/WgAL00a9ZNye7ep92kHnYNVK
|
||||
fbLRyAiHBIwit9KHg+HXq7Gov1VYRJFDS5yGx/J9APlT7Xixa26PBoCVBjojHaio
|
||||
Fgu4MPgZ0hsgS+22P7xU1vE+gsMhPr+uKBs3i0uLOszIfySKjoYHmmABmRCNBEEP
|
||||
uM60fDPcQaxQVk3JPX96eNjfpktNU7XXOIian8hz5+oQoRDEGRbkQ7zxHNruerAs
|
||||
nnW+pau27RO1Q2C2/REOoOFKs0szJPb58MHsSaWN3CUaxgjfsBHyE+O+R5WVISDC
|
||||
MqyOFgszuaXkcUm/QmVVY9aWv+sYx9NMMM10ks5PBcd+qpVJCrYkzEoL17QGr6Si
|
||||
htCaqWSdsowvm8UNDM0m1baoB/KRROV/VHad7Pvg2zKltyIKJxKxiYl9UZnuotqr
|
||||
af3zqSr9NwGysA4PCcdi
|
||||
=O68I
|
||||
iEYEAREIAAYFAlRSi2wACgkQkKaRLQcq0GI3xQCfVNaLlrz5agevrNgL59EsjY1O
|
||||
ltEAoKWkyAOE4Ep76PAudzCadUY4F0Xy
|
||||
=c1xa
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
@ -0,0 +1,96 @@
|
||||
From 3eff3ad69a46364475e1f4abdf9412cfa87e3d6c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
|
||||
Date: Tue, 28 Oct 2014 11:40:34 +0100
|
||||
Subject: [PATCH] synchronize client and server in Test-proxied-https-auth.px
|
||||
|
||||
---
|
||||
tests/ChangeLog | 4 ++++
|
||||
tests/Test-proxied-https-auth.px | 36 +++++++++++++++++++++++++-----------
|
||||
2 files changed, 29 insertions(+), 11 deletions(-)
|
||||
|
||||
2014-10-28 Tim Ruehsen <tim.ruehsen@gmx.de>
|
||||
|
||||
* tests/Test-proxied-https-auth.px: synchronize client and server
|
||||
|
||||
diff --git a/tests/Test-proxied-https-auth.px b/tests/Test-proxied-https-auth.px
|
||||
index cc987ff..272003f 100755
|
||||
--- a/tests/Test-proxied-https-auth.px
|
||||
+++ b/tests/Test-proxied-https-auth.px
|
||||
@@ -49,12 +49,15 @@ sub get_request {
|
||||
}
|
||||
|
||||
sub do_server {
|
||||
+ my ($synch_callback) = @_;
|
||||
my $alrm = alarm 10;
|
||||
-
|
||||
my $s = $SOCKET;
|
||||
my $conn;
|
||||
my $rqst;
|
||||
my $rspn;
|
||||
+
|
||||
+ $synch_callback->();
|
||||
+
|
||||
for my $expect_inner_auth (0, 1) {
|
||||
$conn = $s->accept;
|
||||
$rqst = $conn->get_request;
|
||||
@@ -90,7 +93,7 @@ sub do_server {
|
||||
Connection => 'close'
|
||||
]);
|
||||
$rspn->protocol('HTTP/1.0');
|
||||
- print $rspn->as_string;
|
||||
+ print STDERR $rspn->as_string;
|
||||
print $conn $rspn->as_string;
|
||||
} else {
|
||||
die "No proxied auth\n" unless $rqst->header('Authorization');
|
||||
@@ -100,9 +103,9 @@ sub do_server {
|
||||
'Connection' => 'close',
|
||||
], "foobarbaz\n");
|
||||
$rspn->protocol('HTTP/1.0');
|
||||
- print "=====\n";
|
||||
- print $rspn->as_string;
|
||||
- print "\n=====\n";
|
||||
+ print STDERR "=====\n";
|
||||
+ print STDERR $rspn->as_string;
|
||||
+ print STDERR "\n=====\n";
|
||||
print $conn $rspn->as_string;
|
||||
}
|
||||
$conn->close;
|
||||
@@ -113,18 +116,29 @@ sub do_server {
|
||||
}
|
||||
|
||||
sub fork_server {
|
||||
- my $pid = fork;
|
||||
- die "Couldn't fork" if ($pid < 0);
|
||||
- return $pid if $pid;
|
||||
+ pipe(FROM_CHILD, TO_PARENT) or die "Cannot create pipe!";
|
||||
+ select((select(TO_PARENT), $| = 1)[0]);
|
||||
+
|
||||
+ my $pid = fork();
|
||||
+ if ($pid < 0) {
|
||||
+ die "Cannot fork";
|
||||
+ } elsif ($pid == 0) {
|
||||
+ # child
|
||||
+ close FROM_CHILD;
|
||||
+ do_server(sub { print TO_PARENT "SYNC\n"; close TO_PARENT });
|
||||
+ } else {
|
||||
+ # parent
|
||||
+ close TO_PARENT;
|
||||
+ chomp(my $line = <FROM_CHILD>);
|
||||
+ close FROM_CHILD;
|
||||
+ }
|
||||
|
||||
- &do_server;
|
||||
- exit;
|
||||
+ return $pid;
|
||||
}
|
||||
|
||||
system ('rm -f needs-auth.txt');
|
||||
my $pid = &fork_server;
|
||||
|
||||
-sleep 1;
|
||||
my $cmdline = $WgetTest::WGETPATH . " --user=fiddle-dee-dee"
|
||||
. " --password=Dodgson -e https_proxy=localhost:{{port}}"
|
||||
. " --no-check-certificate"
|
||||
--
|
||||
2.1.2
|
||||
|
||||
31
sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.16-openssl-header.patch
vendored
Normal file
31
sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.16-openssl-header.patch
vendored
Normal file
@ -0,0 +1,31 @@
|
||||
From 1b5928e14fe5f40b2c8396fc622317790c9a368f Mon Sep 17 00:00:00 2001
|
||||
From: Mike Frysinger <vapier@gentoo.org>
|
||||
Date: Mon, 27 Oct 2014 14:39:41 -0400
|
||||
Subject: [PATCH] openssl: fix implicit decl warning
|
||||
|
||||
Include the right header to fix:
|
||||
|
||||
openssl.c: In function 'ssl_init':
|
||||
openssl.c:195:3: warning: implicit declaration of function
|
||||
'ENGINE_load_builtin_engines' [-Wimplicit-function-declaration]
|
||||
ENGINE_load_builtin_engines();
|
||||
^
|
||||
---
|
||||
src/openssl.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/openssl.c b/src/openssl.c
|
||||
index e24954a..2a3e0d6 100644
|
||||
--- a/src/openssl.c
|
||||
+++ b/src/openssl.c
|
||||
@@ -42,6 +42,7 @@ as that of the covered work. */
|
||||
#include <openssl/rand.h>
|
||||
#if OPENSSL_VERSION_NUMBER >= 0x00907000
|
||||
#include <openssl/conf.h>
|
||||
+#include <openssl/engine.h>
|
||||
#endif
|
||||
|
||||
#include "utils.h"
|
||||
--
|
||||
2.1.2
|
||||
|
||||
34
sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.16-openssl-no-ssl3.patch
vendored
Normal file
34
sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.16-openssl-no-ssl3.patch
vendored
Normal file
@ -0,0 +1,34 @@
|
||||
From c81e3df2bc4d06835791427d888d4ae04a2384bc Mon Sep 17 00:00:00 2001
|
||||
From: Peter Meiser <meiser@gmx-topmail.de>
|
||||
Date: Wed, 29 Oct 2014 19:26:28 +0100
|
||||
Subject: [PATCH] Add guard for OpenSSL without SSLv3
|
||||
|
||||
---
|
||||
src/ChangeLog | 5 +++++
|
||||
src/openssl.c | 2 ++
|
||||
2 files changed, 7 insertions(+)
|
||||
|
||||
2014-10-29 Peter Meiser <meiser@gmx-topmail.de> (tiny change)
|
||||
|
||||
* openssl.c (ssl_init) [! OPENSSL_NO_SSL3]: Add guard for OpenSSL
|
||||
without SSLv3.
|
||||
|
||||
diff --git a/src/openssl.c b/src/openssl.c
|
||||
index e24954a..6f11650 100644
|
||||
--- a/src/openssl.c
|
||||
+++ b/src/openssl.c
|
||||
@@ -208,9 +208,11 @@ ssl_init (void)
|
||||
meth = SSLv2_client_method ();
|
||||
break;
|
||||
#endif
|
||||
+#ifndef OPENSSL_NO_SSL3
|
||||
case secure_protocol_sslv3:
|
||||
meth = SSLv3_client_method ();
|
||||
break;
|
||||
+#endif
|
||||
case secure_protocol_auto:
|
||||
case secure_protocol_pfs:
|
||||
case secure_protocol_tlsv1:
|
||||
--
|
||||
2.1.2
|
||||
|
||||
200
sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.16-pkg-config.patch
vendored
Normal file
200
sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.16-pkg-config.patch
vendored
Normal file
@ -0,0 +1,200 @@
|
||||
From 5730efa0804468d342cb82d1ac9d5fc794ff572d Mon Sep 17 00:00:00 2001
|
||||
From: Mike Frysinger <vapier@gentoo.org>
|
||||
Date: Fri, 16 May 2014 11:29:53 +0200
|
||||
Subject: [PATCH] detect openssl/pcre/libuuid/zlib via pkg-config if it's
|
||||
available
|
||||
|
||||
Newer versions of these packages ship with pkg-config files, so if we can
|
||||
detect it via those, do so. If that fails, fall back to the old methods.
|
||||
|
||||
Forward-ported to 1.15 release from b97942cd6b496501b396ea3bc2710010f4591542
|
||||
(Mon, 21 May 2012 18:39:59 -0400)
|
||||
|
||||
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
||||
---
|
||||
configure.ac | 107 ++++++++++++++++++++++++++++++++++++++++++-----------------
|
||||
1 file changed, 77 insertions(+), 30 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index c5437bf..e0e2b25 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -68,6 +68,9 @@ AC_ARG_WITH(ssl,
|
||||
AC_ARG_WITH(zlib,
|
||||
[[ --without-zlib disable zlib ]])
|
||||
|
||||
+AC_ARG_ENABLE(pcre, AC_HELP_STRING([--disable-pcre],
|
||||
+ [Disable PCRE style regular expressions]))
|
||||
+
|
||||
AC_ARG_ENABLE(opie,
|
||||
[ --disable-opie disable support for opie or s/key FTP login],
|
||||
ENABLE_OPIE=$enableval, ENABLE_OPIE=yes)
|
||||
@@ -237,12 +240,28 @@ dnl
|
||||
dnl Checks for libraries.
|
||||
dnl
|
||||
|
||||
+PKG_PROG_PKG_CONFIG
|
||||
+
|
||||
AS_IF([test x"$with_zlib" != xno], [
|
||||
with_zlib=yes
|
||||
- AC_CHECK_LIB(z, compress)
|
||||
+ PKG_CHECK_MODULES([ZLIB], zlib, [
|
||||
+ LIBS="$ZLIB_LIBS $LIBS"
|
||||
+ CFLAGS="$ZLIB_CFLAGS $CFLAGS"
|
||||
+ AC_DEFINE([HAVE_LIBZ], [1], [Define if using zlib.])
|
||||
+ ], [
|
||||
+ AC_CHECK_LIB(z, compress)
|
||||
+ ])
|
||||
])
|
||||
|
||||
AS_IF([test x"$with_ssl" = xopenssl], [
|
||||
+ PKG_CHECK_MODULES([OPENSSL], [openssl], [
|
||||
+ AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
|
||||
+ AC_LIBOBJ([openssl])
|
||||
+ LIBS="$OPENSSL_LIBS $LIBS"
|
||||
+ CFLAGS="$OPENSSL_CFLAGS -DHAVE_LIBSSL $CFLAGS"
|
||||
+ LIBSSL=" " # ntlm check below wants this
|
||||
+ AC_DEFINE([HAVE_LIBSSL], [1], [Define if using openssl.])
|
||||
+ ], [
|
||||
dnl As of this writing (OpenSSL 0.9.6), the libcrypto shared library
|
||||
dnl doesn't record its dependency on libdl, so we need to make sure
|
||||
dnl -ldl ends up in LIBS on systems that have it. Most OSes use
|
||||
@@ -276,9 +295,9 @@ AS_IF([test x"$with_ssl" = xopenssl], [
|
||||
;;
|
||||
esac
|
||||
|
||||
- AS_IF([test x$ssl_found != xyes], [
|
||||
- dnl Now actually check for -lssl if it wasn't already found
|
||||
- AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [
|
||||
+ AS_IF([test x$ssl_found != xyes], [
|
||||
+ dnl Now actually check for -lssl if it wasn't already found
|
||||
+ AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [
|
||||
#include <openssl/ssl.h>
|
||||
#include <openssl/x509.h>
|
||||
#include <openssl/err.h>
|
||||
@@ -286,17 +305,18 @@ AS_IF([test x"$with_ssl" = xopenssl], [
|
||||
#include <openssl/des.h>
|
||||
#include <openssl/md4.h>
|
||||
#include <openssl/md5.h>
|
||||
- ], [SSL_library_init ()])
|
||||
- if test x"$LIBSSL" != x
|
||||
- then
|
||||
- ssl_found=yes
|
||||
- AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
|
||||
- AC_LIBOBJ([openssl])
|
||||
- LIBS="$LIBSSL $LIBS"
|
||||
- elif test x"$with_ssl" != x
|
||||
- then
|
||||
- AC_MSG_ERROR([--with-ssl=openssl was given, but SSL is not available.])
|
||||
- fi
|
||||
+ ], [SSL_library_init ()])
|
||||
+ if test x"$LIBSSL" != x
|
||||
+ then
|
||||
+ ssl_found=yes
|
||||
+ AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
|
||||
+ AC_LIBOBJ([openssl])
|
||||
+ LIBS="$LIBSSL $LIBS"
|
||||
+ elif test x"$with_ssl" != x
|
||||
+ then
|
||||
+ AC_MSG_ERROR([--with-ssl=openssl was given, but SSL is not available.])
|
||||
+ fi
|
||||
+ ])
|
||||
])
|
||||
|
||||
], [
|
||||
@@ -305,6 +325,14 @@ AS_IF([test x"$with_ssl" = xopenssl], [
|
||||
dnl default is -lgnutls
|
||||
with_ssl=gnutls
|
||||
|
||||
+ PKG_CHECK_MODULES([GNUTLS], [gnutls], [
|
||||
+ AC_MSG_NOTICE([compiling in support for SSL via GnuTLS])
|
||||
+ AC_LIBOBJ([gnutls])
|
||||
+ LIBS="$GNUTLS_LIBS $LIBS"
|
||||
+ CFLAGS="$GNUTLS_CFLAGS -DHAVE_LIBGNUTLS $CFLAGS"
|
||||
+ AC_DEFINE([HAVE_LIBGNUTLS], [1], [Define if using gnutls.])
|
||||
+ ], [
|
||||
+
|
||||
dnl Now actually check for -lgnutls
|
||||
AC_LIB_HAVE_LINKFLAGS([gnutls], [], [
|
||||
#include <gnutls/gnutls.h>
|
||||
@@ -319,6 +347,8 @@ AS_IF([test x"$with_ssl" = xopenssl], [
|
||||
AC_MSG_ERROR([--with-ssl=gnutls was given, but GNUTLS is not available.])
|
||||
fi
|
||||
|
||||
+ ])
|
||||
+
|
||||
AC_CHECK_FUNCS(gnutls_priority_set_direct)
|
||||
]) # endif: --with-ssl != no?
|
||||
]) # endif: --with-ssl == openssl?
|
||||
@@ -542,32 +542,51 @@ fi
|
||||
dnl
|
||||
dnl Check for UUID
|
||||
dnl
|
||||
-AC_CHECK_HEADER(uuid.h,
|
||||
- AC_CHECK_FUNC(uuid, uuid_create,
|
||||
- [AC_DEFINE([HAVE_UUID_CREATE], 1,
|
||||
- [Define if uuid_create is available.])
|
||||
- ])
|
||||
-)
|
||||
|
||||
-AC_CHECK_HEADER(uuid/uuid.h,
|
||||
- AC_CHECK_LIB(uuid, uuid_generate,
|
||||
- [LIBS="${LIBS} -luuid"
|
||||
- AC_DEFINE([HAVE_LIBUUID], 1,
|
||||
- [Define if libuuid is available.])
|
||||
- ])
|
||||
-)
|
||||
+AC_ARG_WITH(libuuid, AC_HELP_STRING([--without-libuuid],
|
||||
+ [Generate UUIDs for WARC files via libuuid]))
|
||||
+AS_IF([test "X$with_libuuid" != "Xno"],[
|
||||
+ PKG_CHECK_MODULES([UUID], uuid, [
|
||||
+ LIBS="$UUID_LIBS $LIBS"
|
||||
+ CFLAGS="$UUID_CFLAGS $CFLAGS"
|
||||
+ AC_DEFINE([HAVE_LIBUUID], [1], [Define if using libuuid.])
|
||||
+ ], [
|
||||
+ AC_CHECK_HEADER(uuid.h,
|
||||
+ AC_CHECK_FUNC(uuid, uuid_create,
|
||||
+ [AC_DEFINE([HAVE_UUID_CREATE], 1,
|
||||
+ [Define if uuid_create is available.])
|
||||
+ ])
|
||||
+ )
|
||||
+
|
||||
+ AC_CHECK_HEADER(uuid/uuid.h,
|
||||
+ AC_CHECK_LIB(uuid, uuid_generate,
|
||||
+ [LIBS="${LIBS} -luuid"
|
||||
+ AC_DEFINE([HAVE_LIBUUID], 1,
|
||||
+ [Define if libuuid is available.])
|
||||
+ ])
|
||||
+ )
|
||||
+ ])
|
||||
+])
|
||||
|
||||
dnl
|
||||
dnl Check for PCRE
|
||||
dnl
|
||||
|
||||
-AC_CHECK_HEADER(pcre.h,
|
||||
- AC_CHECK_LIB(pcre, pcre_compile,
|
||||
- [LIBS="${LIBS} -lpcre"
|
||||
- AC_DEFINE([HAVE_LIBPCRE], 1,
|
||||
- [Define if libpcre is available.])
|
||||
- ])
|
||||
-)
|
||||
+AS_IF([test "X$enable_pcre" != "Xno"],[
|
||||
+ PKG_CHECK_MODULES([PCRE], libpcre, [
|
||||
+ LIBS="$PCRE_LIBS $LIBS"
|
||||
+ CFLAGS="$PCRE_CFLAGS $CFLAGS"
|
||||
+ AC_DEFINE([HAVE_LIBPCRE], [1], [Define if using libpcre.])
|
||||
+ ], [
|
||||
+ AC_CHECK_HEADER(pcre.h,
|
||||
+ AC_CHECK_LIB(pcre, pcre_compile,
|
||||
+ [LIBS="${LIBS} -lpcre"
|
||||
+ AC_DEFINE([HAVE_LIBPCRE], 1,
|
||||
+ [Define if libpcre is available.])
|
||||
+ ])
|
||||
+ )
|
||||
+ ])
|
||||
+])
|
||||
|
||||
|
||||
dnl Needed by src/Makefile.am
|
||||
27
sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.16-tests-skip.patch
vendored
Normal file
27
sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.16-tests-skip.patch
vendored
Normal file
@ -0,0 +1,27 @@
|
||||
From 9a85d61a39f9afd0f60e9e5fc59e7ade553c0541 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Frysinger <vapier@gentoo.org>
|
||||
Date: Mon, 27 Oct 2014 14:52:01 -0400
|
||||
Subject: [PATCH] tests: fix skip exit code
|
||||
|
||||
The test harness looks for exit code 77 to mark tests as skipped, not
|
||||
exit 2. Switch over so we get SKIP instead of FAIL.
|
||||
---
|
||||
tests/WgetFeature.pm | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/WgetFeature.pm b/tests/WgetFeature.pm
|
||||
index 0762314..118e79c 100644
|
||||
--- a/tests/WgetFeature.pm
|
||||
+++ b/tests/WgetFeature.pm
|
||||
@@ -22,7 +22,7 @@ sub import
|
||||
|
||||
unless ($have_features{$feature}) {
|
||||
print $skip_messages{$feature}, "\n";
|
||||
- exit 2; # skip
|
||||
+ exit 77; # skip
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
2.1.2
|
||||
|
||||
81
sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.16.ebuild
vendored
Normal file
81
sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.16.ebuild
vendored
Normal file
@ -0,0 +1,81 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.16.ebuild,v 1.8 2014/10/30 19:03:07 maekke Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
inherit flag-o-matic toolchain-funcs autotools
|
||||
|
||||
DESCRIPTION="Network utility to retrieve files from the WWW"
|
||||
HOMEPAGE="http://www.gnu.org/software/wget/"
|
||||
SRC_URI="mirror://gnu/wget/${P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="debug gnutls idn ipv6 nls ntlm pcre +ssl static uuid zlib"
|
||||
|
||||
LIB_DEPEND="idn? ( net-dns/libidn[static-libs(+)] )
|
||||
pcre? ( dev-libs/libpcre[static-libs(+)] )
|
||||
ssl? (
|
||||
gnutls? ( net-libs/gnutls[static-libs(+)] )
|
||||
!gnutls? ( dev-libs/openssl:0[static-libs(+)] )
|
||||
)
|
||||
uuid? ( sys-apps/util-linux[static-libs(+)] )
|
||||
zlib? ( sys-libs/zlib[static-libs(+)] )"
|
||||
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
|
||||
DEPEND="${RDEPEND}
|
||||
app-arch/xz-utils
|
||||
virtual/pkgconfig
|
||||
static? ( ${LIB_DEPEND} )
|
||||
nls? ( sys-devel/gettext )"
|
||||
|
||||
REQUIRED_USE="ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
|
||||
|
||||
DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${PN}-1.16-pkg-config.patch
|
||||
epatch "${FILESDIR}"/${PN}-1.16-openssl-header.patch
|
||||
epatch "${FILESDIR}"/${PN}-1.16-tests-skip.patch
|
||||
epatch "${FILESDIR}"/${P}-openssl-no-ssl3.patch
|
||||
epatch "${FILESDIR}"/${P}-fix-proxy-test-race.patch
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# openssl-0.9.8 now builds with -pthread on the BSD's
|
||||
use elibc_FreeBSD && use ssl && append-ldflags -pthread
|
||||
# fix compilation on Solaris, we need filio.h for FIONBIO as used in
|
||||
# the included gnutls -- force ioctl.h to include this header
|
||||
[[ ${CHOST} == *-solaris* ]] && append-flags -DBSD_COMP=1
|
||||
|
||||
if use static ; then
|
||||
append-ldflags -static
|
||||
tc-export PKG_CONFIG
|
||||
PKG_CONFIG+=" --static"
|
||||
fi
|
||||
econf \
|
||||
--disable-rpath \
|
||||
$(use_with ssl ssl $(usex gnutls gnutls openssl)) \
|
||||
$(use_enable ssl opie) \
|
||||
$(use_enable ssl digest) \
|
||||
$(use_enable idn iri) \
|
||||
$(use_enable ipv6) \
|
||||
$(use_enable nls) \
|
||||
$(use_enable ntlm) \
|
||||
$(use_enable pcre) \
|
||||
$(use_enable debug) \
|
||||
$(use_with uuid libuuid) \
|
||||
$(use_with zlib)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
sed -i \
|
||||
-e "s:/usr/local/etc:${EPREFIX}/etc:g" \
|
||||
"${ED}"/etc/wgetrc \
|
||||
"${ED}"/usr/share/man/man1/wget.1 \
|
||||
"${ED}"/usr/share/info/wget.info
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user