Date: Thursday, December 18, 2014 @ 22:50:27 Author: eric Revision: 227761
archrelease: copy trunk to extra-i686, extra-x86_64 Added: wget/repos/extra-i686/PKGBUILD (from rev 227760, wget/trunk/PKGBUILD) wget/repos/extra-i686/wget.install (from rev 227760, wget/trunk/wget.install) wget/repos/extra-x86_64/PKGBUILD (from rev 227760, wget/trunk/PKGBUILD) wget/repos/extra-x86_64/wget.install (from rev 227760, wget/trunk/wget.install) Deleted: wget/repos/extra-i686/PKGBUILD wget/repos/extra-i686/wget-1.16-fix-test-proxied-https-auth.patch wget/repos/extra-i686/wget.install wget/repos/extra-x86_64/PKGBUILD wget/repos/extra-x86_64/wget-1.16-fix-test-proxied-https-auth.patch wget/repos/extra-x86_64/wget.install ----------------------------------------------------------+ /PKGBUILD | 86 ++++++++++++ /wget.install | 40 +++++ extra-i686/PKGBUILD | 48 ------- extra-i686/wget-1.16-fix-test-proxied-https-auth.patch | 89 ------------- extra-i686/wget.install | 20 -- extra-x86_64/PKGBUILD | 48 ------- extra-x86_64/wget-1.16-fix-test-proxied-https-auth.patch | 89 ------------- extra-x86_64/wget.install | 20 -- 8 files changed, 126 insertions(+), 314 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2014-12-18 21:48:09 UTC (rev 227760) +++ extra-i686/PKGBUILD 2014-12-18 21:50:27 UTC (rev 227761) @@ -1,48 +0,0 @@ -# $Id$ -# Maintainer: Eric Bélanger <e...@archlinux.org> - -pkgname=wget -pkgver=1.16 -pkgrel=2 -pkgdesc="A network utility to retrieve files from the Web" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/wget/wget.html" -license=('GPL3') -depends=('openssl' 'libidn' 'libutil-linux') -checkdepends=('perl-http-daemon' 'perl-io-socket-ssl' 'python') -optdepends=('ca-certificates: HTTPS downloads') -backup=('etc/wgetrc') -install=wget.install -source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig} - wget-1.16-fix-test-proxied-https-auth.patch) -sha1sums=('08d991acc80726abe57043a278f9da469c454503' - 'SKIP' - 'a324d1910a6440552a3745c873da9e3dff7d7ec9') - -prepare() { - cd ${pkgname}-${pkgver} - patch -p1 -i "${srcdir}/wget-1.16-fix-test-proxied-https-auth.patch" - sed -i 's/--no-check-certificate/& --no-http-keep-alive/' \ - tests/Test-proxied-https-auth.px - cat >> doc/sample.wgetrc <<EOF - -# default root certs location -ca_certificate=/etc/ssl/certs/ca-certificates.crt -EOF -} - -build() { - cd ${pkgname}-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc --enable-nls --with-ssl=openssl - make -} - -check() { - cd ${pkgname}-${pkgver} - make check -} - -package() { - cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install -} Copied: wget/repos/extra-i686/PKGBUILD (from rev 227760, wget/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2014-12-18 21:50:27 UTC (rev 227761) @@ -0,0 +1,43 @@ +# $Id$ +# Maintainer: Eric Bélanger <e...@archlinux.org> + +pkgname=wget +pkgver=1.16.1 +pkgrel=1 +pkgdesc="A network utility to retrieve files from the Web" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/wget/wget.html" +license=('GPL3') +depends=('openssl' 'libidn' 'libutil-linux') +checkdepends=('perl-http-daemon' 'perl-io-socket-ssl' 'python') +optdepends=('ca-certificates: HTTPS downloads') +backup=('etc/wgetrc') +install=wget.install +source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}) +sha1sums=('21cd7eee08ab5e5a14fccde22a7aec55b5fcd6fc' + 'SKIP') + +prepare() { + cd ${pkgname}-${pkgver} + cat >> doc/sample.wgetrc <<EOF + +# default root certs location +ca_certificate=/etc/ssl/certs/ca-certificates.crt +EOF +} + +build() { + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr --sysconfdir=/etc --enable-nls --with-ssl=openssl + make +} + +check() { + cd ${pkgname}-${pkgver} + make check +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install +} Deleted: extra-i686/wget-1.16-fix-test-proxied-https-auth.patch =================================================================== --- extra-i686/wget-1.16-fix-test-proxied-https-auth.patch 2014-12-18 21:48:09 UTC (rev 227760) +++ extra-i686/wget-1.16-fix-test-proxied-https-auth.patch 2014-12-18 21:50:27 UTC (rev 227761) @@ -1,89 +0,0 @@ -From 3eff3ad69a46364475e1f4abdf9412cfa87e3d6c Mon Sep 17 00:00:00 2001 -From: Tim Rühsen <tim.rueh...@gmx.de> -Date: Tue, 28 Oct 2014 10:40:34 +0000 -Subject: synchronize client and server in Test-proxied-https-auth.px - ---- -(limited to 'tests/Test-proxied-https-auth.px') - -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" --- -cgit v0.9.0.2 Deleted: extra-i686/wget.install =================================================================== --- extra-i686/wget.install 2014-12-18 21:48:09 UTC (rev 227760) +++ extra-i686/wget.install 2014-12-18 21:50:27 UTC (rev 227761) @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(wget.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} Copied: wget/repos/extra-i686/wget.install (from rev 227760, wget/trunk/wget.install) =================================================================== --- extra-i686/wget.install (rev 0) +++ extra-i686/wget.install 2014-12-18 21:50:27 UTC (rev 227761) @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(wget.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2014-12-18 21:48:09 UTC (rev 227760) +++ extra-x86_64/PKGBUILD 2014-12-18 21:50:27 UTC (rev 227761) @@ -1,48 +0,0 @@ -# $Id$ -# Maintainer: Eric Bélanger <e...@archlinux.org> - -pkgname=wget -pkgver=1.16 -pkgrel=2 -pkgdesc="A network utility to retrieve files from the Web" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/wget/wget.html" -license=('GPL3') -depends=('openssl' 'libidn' 'libutil-linux') -checkdepends=('perl-http-daemon' 'perl-io-socket-ssl' 'python') -optdepends=('ca-certificates: HTTPS downloads') -backup=('etc/wgetrc') -install=wget.install -source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig} - wget-1.16-fix-test-proxied-https-auth.patch) -sha1sums=('08d991acc80726abe57043a278f9da469c454503' - 'SKIP' - 'a324d1910a6440552a3745c873da9e3dff7d7ec9') - -prepare() { - cd ${pkgname}-${pkgver} - patch -p1 -i "${srcdir}/wget-1.16-fix-test-proxied-https-auth.patch" - sed -i 's/--no-check-certificate/& --no-http-keep-alive/' \ - tests/Test-proxied-https-auth.px - cat >> doc/sample.wgetrc <<EOF - -# default root certs location -ca_certificate=/etc/ssl/certs/ca-certificates.crt -EOF -} - -build() { - cd ${pkgname}-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc --enable-nls --with-ssl=openssl - make -} - -check() { - cd ${pkgname}-${pkgver} - make check -} - -package() { - cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install -} Copied: wget/repos/extra-x86_64/PKGBUILD (from rev 227760, wget/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2014-12-18 21:50:27 UTC (rev 227761) @@ -0,0 +1,43 @@ +# $Id$ +# Maintainer: Eric Bélanger <e...@archlinux.org> + +pkgname=wget +pkgver=1.16.1 +pkgrel=1 +pkgdesc="A network utility to retrieve files from the Web" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/wget/wget.html" +license=('GPL3') +depends=('openssl' 'libidn' 'libutil-linux') +checkdepends=('perl-http-daemon' 'perl-io-socket-ssl' 'python') +optdepends=('ca-certificates: HTTPS downloads') +backup=('etc/wgetrc') +install=wget.install +source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}) +sha1sums=('21cd7eee08ab5e5a14fccde22a7aec55b5fcd6fc' + 'SKIP') + +prepare() { + cd ${pkgname}-${pkgver} + cat >> doc/sample.wgetrc <<EOF + +# default root certs location +ca_certificate=/etc/ssl/certs/ca-certificates.crt +EOF +} + +build() { + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr --sysconfdir=/etc --enable-nls --with-ssl=openssl + make +} + +check() { + cd ${pkgname}-${pkgver} + make check +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install +} Deleted: extra-x86_64/wget-1.16-fix-test-proxied-https-auth.patch =================================================================== --- extra-x86_64/wget-1.16-fix-test-proxied-https-auth.patch 2014-12-18 21:48:09 UTC (rev 227760) +++ extra-x86_64/wget-1.16-fix-test-proxied-https-auth.patch 2014-12-18 21:50:27 UTC (rev 227761) @@ -1,89 +0,0 @@ -From 3eff3ad69a46364475e1f4abdf9412cfa87e3d6c Mon Sep 17 00:00:00 2001 -From: Tim Rühsen <tim.rueh...@gmx.de> -Date: Tue, 28 Oct 2014 10:40:34 +0000 -Subject: synchronize client and server in Test-proxied-https-auth.px - ---- -(limited to 'tests/Test-proxied-https-auth.px') - -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" --- -cgit v0.9.0.2 Deleted: extra-x86_64/wget.install =================================================================== --- extra-x86_64/wget.install 2014-12-18 21:48:09 UTC (rev 227760) +++ extra-x86_64/wget.install 2014-12-18 21:50:27 UTC (rev 227761) @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(wget.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} Copied: wget/repos/extra-x86_64/wget.install (from rev 227760, wget/trunk/wget.install) =================================================================== --- extra-x86_64/wget.install (rev 0) +++ extra-x86_64/wget.install 2014-12-18 21:50:27 UTC (rev 227761) @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(wget.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +}