aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2013-09-29 11:10:45 +0000
committerTimo Teräs <timo.teras@iki.fi>2013-09-29 11:11:21 +0000
commit70a1f25d17a0acd92932f05144a00ca5c5d5cbab (patch)
tree4319613f23004c8031f7e0ea2dcff0eb2f18037d /main
parent46a7358a93aed937ef52092184446ff8a02351b1 (diff)
downloadaports-70a1f25d17a0acd92932f05144a00ca5c5d5cbab.tar.bz2
aports-70a1f25d17a0acd92932f05144a00ca5c5d5cbab.tar.xz
main/perl-server-starter: upgrade to 0.15, and don't run tests in vserver
Diffstat (limited to 'main')
-rw-r--r--main/perl-server-starter/APKBUILD24
-rw-r--r--main/perl-server-starter/fix-localhost.patch69
2 files changed, 8 insertions, 85 deletions
diff --git a/main/perl-server-starter/APKBUILD b/main/perl-server-starter/APKBUILD
index bbb3c076d9..c959ea0e55 100644
--- a/main/perl-server-starter/APKBUILD
+++ b/main/perl-server-starter/APKBUILD
@@ -3,35 +3,30 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=perl-server-starter
_pkgreal=Server-Starter
-pkgver=0.11
+pkgver=0.15
pkgrel=0
pkgdesc="a superdaemon for hot-deploying server programs"
url="http://search.cpan.org/dist/Server-Starter/"
arch="noarch"
license="GPL PerlArtistic"
cpandepends="perl-proc-wait3 perl-list-moreutils perl-scope-guard"
-cpanmakedepends="perl-test-tcp"
+cpanmakedepends="perl-test-tcp "
depends="$cpandepends"
makedepends="perl-dev $depends $cpanmakedepends"
subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/K/KA/KAZUHO/$_pkgreal-$pkgver.tar.gz
- fix-localhost.patch"
+source="http://search.cpan.org/CPAN/authors/id/K/KA/KAZUHO/$_pkgreal-$pkgver.tar.gz"
_builddir="$srcdir/$_pkgreal-$pkgver"
prepare() {
cd "$_builddir"
- for i in $source; do
- case $i in
- *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
- esac
- done
PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
}
build() {
cd "$_builddir"
- make && make test
+ make || return 1
+ if ! grep -q "VxID: [0-9]*" /proc/self/status; then make test || return 1; fi
}
package() {
@@ -40,9 +35,6 @@ package() {
find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
}
-md5sums="037d75831a23ca76cd306d678b20332e Server-Starter-0.11.tar.gz
-5fa38b3941457855ffaa6f290281b1bb fix-localhost.patch"
-sha256sums="8e9911b259533ae6941c10c2e4dd353d4ba510505118ad01c52e88c8b8e072bb Server-Starter-0.11.tar.gz
-65b56ba55877047f584f092a66fdd57da5c7ac1728cd003b42bdff44021c79e8 fix-localhost.patch"
-sha512sums="e8097968987d0aa0c789cbb052a0ef9c862900c38ae33043356c9e2cd62e75ccca236f7e10c3be4d3d6a2c24a6673b7353f491c8ae358dab7454878e8f583d0e Server-Starter-0.11.tar.gz
-cbb926734c2c539a9ca93bdecd710c13992e0f2929797cb9e158489a66e7fa0cd89f6c48cb3ba7e341c7f98694d795eaed2c421468f23edddb309f17be211dcb fix-localhost.patch"
+md5sums="1b5b7635a9dabe3f2d60e25e2aae4c24 Server-Starter-0.15.tar.gz"
+sha256sums="07837cecbde263e94f0afa5daaa78012eecd28bd9f4a5df09f24a86882902f9f Server-Starter-0.15.tar.gz"
+sha512sums="2957a4aed7c7ffacb81bbdd5f9e68acdbe9fbd78641cd8746bb2f35deeea8c96cd84c50076791cc5fcba108b992a238c492da59baa40b5b5d1303883127d9e89 Server-Starter-0.15.tar.gz"
diff --git a/main/perl-server-starter/fix-localhost.patch b/main/perl-server-starter/fix-localhost.patch
deleted file mode 100644
index 3e60f579db..0000000000
--- a/main/perl-server-starter/fix-localhost.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- Server-Starter-0.11.orig/inc/Test/TCP.pm
-+++ Server-Starter-0.11/inc/Test/TCP.pm
-@@ -32,7 +32,7 @@
- next if _check_port($port);
- my $sock = IO::Socket::INET->new(
- Listen => 5,
-- LocalAddr => '127.0.0.1',
-+ LocalAddr => 'localhost',
- LocalPort => $port,
- Proto => 'tcp',
- (($^O eq 'MSWin32') ? () : (ReuseAddr => 1)),
-@@ -90,7 +90,7 @@
-
- my $remote = IO::Socket::INET->new(
- Proto => 'tcp',
-- PeerAddr => '127.0.0.1',
-+ PeerAddr => 'localhost',
- PeerPort => $port,
- );
- if ($remote) {
---- Server-Starter-0.11.orig/t/01-starter.t
-+++ Server-Starter-0.11/t/01-starter.t
-@@ -31,7 +31,7 @@
- my $buf;
- #sleep 1;
- my $sock = IO::Socket::INET->new(
-- PeerAddr => "127.0.0.1:$port",
-+ PeerAddr => "localhost:$port",
- Proto => 'tcp',
- );
- ok($sock, 'connect');
-@@ -61,7 +61,7 @@
- 'signal sent on hup',
- );
- $sock = IO::Socket::INET->new(
-- PeerAddr => "127.0.0.1:$port",
-+ PeerAddr => "localhost:$port",
- Proto => 'tcp',
- );
- ok($sock, 'reconnect');
---- Server-Starter-0.11.orig/t/02-startfail.t
-+++ Server-Starter-0.11/t/02-startfail.t
-@@ -20,7 +20,7 @@
- sleep 3;
- {
- my $sock = IO::Socket::INET->new(
-- PeerAddr => "127.0.0.1:$port",
-+ PeerAddr => "localhost:$port",
- Proto => 'tcp',
- );
- ok($sock, 'connect');
-@@ -33,7 +33,7 @@
- sleep 1;
- {
- my $sock = IO::Socket::INET->new(
-- PeerAddr => "127.0.0.1:$port",
-+ PeerAddr => "localhost:$port",
- Proto => 'tcp',
- );
- ok($sock, 'connect');
-@@ -47,7 +47,7 @@
- sleep 5;
- {
- my $sock = IO::Socket::INET->new(
-- PeerAddr => "127.0.0.1:$port",
-+ PeerAddr => "localhost:$port",
- Proto => 'tcp',
- );
- ok($sock, 'connect');