diff options
| author | root <root@rshg047.dnsready.net> | 2011-05-10 22:33:36 +0000 |
|---|---|---|
| committer | root <root@rshg047.dnsready.net> | 2011-05-10 22:33:36 +0000 |
| commit | 01b47af6474ac094ec199c7d75208874f8842d87 (patch) | |
| tree | 44a048d09e5233a98d35c660e67be2a818832a56 /core/wget/PKGBUILD | |
| parent | bbb460f85242e6ac03f47b74b9d0be66ff089ac4 (diff) | |
Tue May 10 22:33:36 UTC 2011
Diffstat (limited to 'core/wget/PKGBUILD')
| -rw-r--r-- | core/wget/PKGBUILD | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/core/wget/PKGBUILD b/core/wget/PKGBUILD index ca9407c22..6712f4491 100644 --- a/core/wget/PKGBUILD +++ b/core/wget/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 110655 2011-02-21 09:03:23Z allan $ +# $Id: PKGBUILD 122950 2011-05-07 12:59:07Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=wget pkgver=1.12 -pkgrel=5 +pkgrel=7 pkgdesc="A network utility to retrieve files from the Web" arch=('i686' 'x86_64') url="http://www.gnu.org/software/wget/wget.html" @@ -15,15 +15,25 @@ optdepends=('ca-certificates: HTTPS downloads') backup=('etc/wgetrc') install=wget.install source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz - wget-1.12-CVE-2010-2252.patch) + wget-1.12-CVE-2010-2252.patch + wget-1.12-subjectAltName.patch) md5sums=('141461b9c04e454dc8933c9d1f2abf83' - '2c8bc23eff98fd4efc3f96394fc8e61e') + '2c8bc23eff98fd4efc3f96394fc8e61e' + 'bd589403b7bb4967a6f41b0f43b1c8aa') build() { cd "${srcdir}/${pkgname}-${pkgver}" - + # Fix arbitrary file overwrite via 3xx redirect (CVE-2010-2252) - patch -Np1 -i ../wget-1.12-CVE-2010-2252.patch + patch -Np1 -i $srcdir/wget-1.12-CVE-2010-2252.patch + + # https://savannah.gnu.org/bugs/index.php?20421 + patch -Np0 -i $srcdir/wget-1.12-subjectAltName.patch + + # Note : We do not build with --enable-nls, because there is a bug in wget causing + # international domain names to be not properly converted to punycode if + # the current locale is a UTF-8 one + # See : http://lists.gnu.org/archive/html/bug-wget/2011-02/msg00026.html ./configure -with-ssl --prefix=/usr --sysconfdir=/etc make @@ -32,11 +42,14 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - + cat >> "$pkgdir/etc/wgetrc" <<EOF # default root certs location ca_certificate=/etc/ssl/certs/ca-certificates.crt EOF + # remove IRI option from wgetrc as it does not work (see above) + sed -i '118,120d' $pkgdir/etc/wgetrc + } |