diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-12-20 16:14:30 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-12-20 16:14:30 +0000 |
| commit | f4205bad5c88467853246732e8b349c5585bf64e (patch) | |
| tree | ed7e0bc4aafeaaf980da9905264570695392ca20 /net-misc | |
| parent | Stable for AMD64, wrt bug #395317 (diff) | |
| download | historical-f4205bad5c88467853246732e8b349c5585bf64e.tar.gz historical-f4205bad5c88467853246732e8b349c5585bf64e.tar.bz2 historical-f4205bad5c88467853246732e8b349c5585bf64e.zip | |
Set LIBSSL when using pkg-config as the NTLM check uses it #395349 by Vladimir Berezhnoy.
Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/wget/ChangeLog | 7 | ||||
| -rw-r--r-- | net-misc/wget/Manifest | 10 | ||||
| -rw-r--r-- | net-misc/wget/files/wget-1.13.4-openssl-pkg-config.patch | 3 |
3 files changed, 13 insertions, 7 deletions
diff --git a/net-misc/wget/ChangeLog b/net-misc/wget/ChangeLog index e457ff888b75..b8220b221b63 100644 --- a/net-misc/wget/ChangeLog +++ b/net-misc/wget/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/wget # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.150 2011/12/01 16:53:04 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.151 2011/12/20 16:14:30 vapier Exp $ + + 20 Dec 2011; Mike Frysinger <vapier@gentoo.org> + files/wget-1.13.4-openssl-pkg-config.patch: + Set LIBSSL when using pkg-config as the NTLM check uses it #395349 by + Vladimir Berezhnoy. 01 Dec 2011; Mike Frysinger <vapier@gentoo.org> wget-1.13.4-r1.ebuild: Fix the static-libs logic the right way #392713 by Piotr Karbowski. diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest index d1c32635a1a1..370f138107f6 100644 --- a/net-misc/wget/Manifest +++ b/net-misc/wget/Manifest @@ -7,7 +7,7 @@ AUX wget-1.12-linking.patch 9511 RMD160 8c7a27ec67d9c4ed9eb79c525bf1bff64bfaee95 AUX wget-1.12-sae.patch 8241 RMD160 5bc6e50c821933259f39f585d2973601d1834f4e SHA1 96f4ebc7a37f06c2df2eb6b1ea66564675452415 SHA256 daf58f2505413c35e0c3aaa80b9f230a8621b13c12ed96f01e65ca5168692dc5 AUX wget-1.12-sni.patch 3668 RMD160 f0588c2a107be5b07883404289cea92e5e200bb0 SHA1 d4d6e55880e4a975a8517cb6b5224c73b8ba1221 SHA256 6178e1d56f5d86e6915d22247e07d23946cfceea76a9a393dc5e45fb51a50a43 AUX wget-1.13-static-link-libz.patch 897 RMD160 e6d2f965185dd6d412b72f4cee61dbd7fa1876bf SHA1 d8cedeab70939c202020d1a890a2c95e05a59cf0 SHA256 ab054e459334f64709e5d2cbf3e7c3251ab4c98a68ceea91c3f56d51e2098251 -AUX wget-1.13.4-openssl-pkg-config.patch 707 RMD160 bd0f777c9999168fb2a665ffd54560c30ba3cb0f SHA1 c4c33e0f0de723d44e15cb1732f22e0c71bfe0bb SHA256 daba11c918a8932224135724d1d936dba1c40cf4deb2bca142c16e0d2bd5eaf6 +AUX wget-1.13.4-openssl-pkg-config.patch 765 RMD160 c62a9ae6c3962b00ea2f020796c1434683dbb13b SHA1 a233dbd00a90c3e441393d0010b8b031540d6a1d SHA256 c592ee602f88c1eac2d88decc8862cd0f435193ad9cd8059f810dd0b661690f4 AUX wgetrc-ipv6 54 RMD160 62ef29e13163463d42934b2ee970e235e64249dc SHA1 35a259c6817cccd04f23c56c9fd5b915f5f0fa00 SHA256 21bae947f1f94b09d2bf50704e1a69d7e90ee59898fd512c146d24e408d1a518 DIST wget-1.12.tar.bz2 1609032 RMD160 52fca690ea2b4e763a655aff36495059612fc65d SHA1 1a059b3736ef908b68acac91670f9df576d1a061 SHA256 c823d938e2f849305a101c0860229b123d7564c26470fdac9118d85e3c7dba9a DIST wget-1.13.3.tar.xz 1448908 RMD160 27884a72edbe55bc39a2a99c6517250253074419 SHA1 99e095825da4de51bd62eb479774c24366d59509 SHA256 8d8346caec575a0d4953b5a16dcdf37fedcb739f4d5db85307749996375489ba @@ -16,12 +16,12 @@ EBUILD wget-1.12-r3.ebuild 2250 RMD160 904891d523522814845046e62508812d564ee1d2 EBUILD wget-1.13.3-r2.ebuild 2036 RMD160 6258a59ff189ff76bcfcd3ef667dd3a542f70fda SHA1 4953e0748402970ac3e24310377fa4d3deff1f11 SHA256 bd7d22e725ea822f7794a2caf49a654e6f04c5e0f5914b2fec5b0112ac7e66a7 EBUILD wget-1.13.4-r1.ebuild 2454 RMD160 9b0e56c6eb880cad8f613e2c56872159f80af661 SHA1 724e5385ce76f626d399060ab0a0e963a9243c30 SHA256 ed22c8b4c5121e6468d77be5abb5b80454dc1430873b85ba99e08c86cd29050a EBUILD wget-1.13.4.ebuild 1970 RMD160 268b6fc0fddd123172feada22d0fff95ee7c7466 SHA1 7a4e95248e22154a1c931876c37c8ee89eb11911 SHA256 b0c3b67116fbab7bbf1ad4d9fc397481a2fe585f54bc67650e0b3f30b2d0d927 -MISC ChangeLog 22738 RMD160 746dec4e69f8f100f57cce4dca0fbebeb7a293f7 SHA1 4ee5b17b650e2961db26b19c0d3525cadc7e62f3 SHA256 af24880627e3cbd783ed16c7fb1afc35210e47a71cdd1f09981045ef11242fba +MISC ChangeLog 22929 RMD160 fe9bd6aa3d015745eb8ea227c45c62091114fcc9 SHA1 11f5f273130b76f4d3e035d142e04d15ff4641e6 SHA256 e1637a6c7785216af12580ce484bada738ad686531c00538fd4c3b61923605e2 MISC metadata.xml 258 RMD160 67393c1bb85136bfc1cd8e1145f3e5e0efa32828 SHA1 8d60f18c79ce849b2e3b31d33cb04ef8a0d70546 SHA256 63f6de85aadabff6f0250403fd8c60a6782e62b0d953dbdae71daf62ea717716 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk7XsPgACgkQaC/OocHi7Jaa8AD+OdXum0/uOrzhSF/9lCa0nrPd -iNWT5LZiDR3vxlnmoYUA/1SCAJpcBmDEYjFu3+5E3cB5wNiUoQVUdCCEEA538tUv -=c9ew +iF4EAREIAAYFAk7wtG8ACgkQaC/OocHi7JZX+QD/cgjCUXx9oWeh6RhEoyW4a+rw +96ufzweuK/yKpVztc6ABAJaleEMpvtmCEMt9HjGy6Zs+3GAAtaOAD2jjw+cXrxDs +=6LAw -----END PGP SIGNATURE----- diff --git a/net-misc/wget/files/wget-1.13.4-openssl-pkg-config.patch b/net-misc/wget/files/wget-1.13.4-openssl-pkg-config.patch index c052b4a189e3..97037cee724a 100644 --- a/net-misc/wget/files/wget-1.13.4-openssl-pkg-config.patch +++ b/net-misc/wget/files/wget-1.13.4-openssl-pkg-config.patch @@ -2,7 +2,7 @@ detect openssl via pkg-config if it's available --- a/configure.ac +++ b/configure.ac -@@ -234,7 +234,16 @@ dnl +@@ -234,7 +234,17 @@ dnl dnl Checks for libraries. dnl @@ -14,6 +14,7 @@ detect openssl via pkg-config if it's available + AC_LIBOBJ([openssl]) + LIBS="$OPENSSL_LIBS $LIBS" + CFLAGS="$OPENSSL_CFLAGS -DHAVE_LIBSSL $CFLAGS" ++ LIBSSL=" " # ntlm check below wants this #395349 + ], [ + dnl some versions of openssl use zlib compression |