diff options
| -rw-r--r-- | main/smokeping/APKBUILD | 26 | ||||
| -rw-r--r-- | main/smokeping/smokeping-perl-5.18.patch | 15 | ||||
| -rw-r--r-- | main/smokeping/xss-fix-from-Steven-Chamberlain.patch | 28 |
3 files changed, 9 insertions, 60 deletions
diff --git a/main/smokeping/APKBUILD b/main/smokeping/APKBUILD index ac0b50c332..3aa4c090bf 100644 --- a/main/smokeping/APKBUILD +++ b/main/smokeping/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Jeff Bilyk <jbilyk@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=smokeping -pkgver=2.6.9 -pkgrel=1 +pkgver=2.6.10 +pkgrel=0 pkgdesc="Smokeping network latency monitoring" pkgusers="smokeping" pkggroups="smokeping" @@ -10,9 +10,8 @@ install="$pkgname.pre-install" url="http://oss.oetiker.ch/smokeping/" source="http://oss.oetiker.ch/smokeping/pub/smokeping-$pkgver.tar.gz smokeping.initd - smokeping-perl-5.18.patch musl-lc_numeric-utf8.patch - xss-fix-from-Steven-Chamberlain.patch" + " depends="perl fping rrdtool perl-rrd perl-uri perl-digest-hmac @@ -32,7 +31,6 @@ _vendorlib=/usr/share/perl5/vendor_perl prepare() { cd "$_builddir" - update_config_sub || return 1 for i in $source; do case $i in @@ -131,18 +129,12 @@ package() { "$pkgdir"/var/run/smokeping } -md5sums="0c2361b734866dd37facf2af3f8f7144 smokeping-2.6.9.tar.gz +md5sums="139f0c456088c3527a55d51898885fe4 smokeping-2.6.10.tar.gz a63b42b8165f9c728706ac112658548b smokeping.initd -d6aaecc3110968671248b7bebbdb087b smokeping-perl-5.18.patch -5b0bac1be9c63c1f36ff7c2979af4317 musl-lc_numeric-utf8.patch -cee64c8fe5d813534dfb29c2cd3a1324 xss-fix-from-Steven-Chamberlain.patch" -sha256sums="cd551d4384d8b19879d128ea0566bd680c19bb4ad8664a3c5a304604746f8863 smokeping-2.6.9.tar.gz +5b0bac1be9c63c1f36ff7c2979af4317 musl-lc_numeric-utf8.patch" +sha256sums="0121672951f47bd45575898c3e4d767e22cc692dd272d723b422515fd3cc641c smokeping-2.6.10.tar.gz 1b83d2e35e922e71bb3c91deee7c247cfbaebe47022451aabde87b790c5a61ca smokeping.initd -961bcb8979de2ff508c988d79f8b54bb936fc29ed8bf28c6377458c12a1e3f2f smokeping-perl-5.18.patch -5cb6dd9ce63446b5cfc3f1bba9e39fb91a6d18c512e5a7e153bb6007660466dd musl-lc_numeric-utf8.patch -f7750494a81e56dac2d8c7bc996eb63ac590168fff92d237e883807c036f07ac xss-fix-from-Steven-Chamberlain.patch" -sha512sums="ab3cec15fd9f90510f902da7ce5bac5915558cac198cc88f0ce193a53a0158c9055e28c8c6671cc6653ac42ab51346e1eb19e537f1ab5c234fd498c6b777499d smokeping-2.6.9.tar.gz +5cb6dd9ce63446b5cfc3f1bba9e39fb91a6d18c512e5a7e153bb6007660466dd musl-lc_numeric-utf8.patch" +sha512sums="e91ac80ceafccb945ec48cc80020b8cbf2afe29b5f422dc5aaf7c52387eafc498180c293cf82dccc4fdec88ec56f80fb1bd08ebcb2ae9aea563475a069b91f13 smokeping-2.6.10.tar.gz b1d6f769b870a14856f4e4f6e699d6a9eb7744d9c447e5cd799cf21dd1eb83807aaa270029e15a49c709e8a9160c395d264bcc1d3281233160e2a907e61473ad smokeping.initd -8b415778970ca9093fb8847cb391aea2546041512496e2f74e755358f2d6dd0a9e6e332c8a9c90a09da5f3eeeb4aabd3f1e188c1d63e324a17ee06f20e259ca2 smokeping-perl-5.18.patch -e6bc389d8edbc000f5ad65848308197b3eb1ddb24bfa9df9c05fa027103952484383b7e021bea86795dceccdcf3f3d51a24c22cae3a68dc5afa30a72b2dbf803 musl-lc_numeric-utf8.patch -ab13cbf69a8b7d9cce7684eaf6a61ff5d827bcd4abc04cec7df47a97ab4d73eac5034addcb8e061ced246a2dcff69d04a9114b89e6c20014e2f3eb6c8fff0c11 xss-fix-from-Steven-Chamberlain.patch" +e6bc389d8edbc000f5ad65848308197b3eb1ddb24bfa9df9c05fa027103952484383b7e021bea86795dceccdcf3f3d51a24c22cae3a68dc5afa30a72b2dbf803 musl-lc_numeric-utf8.patch" diff --git a/main/smokeping/smokeping-perl-5.18.patch b/main/smokeping/smokeping-perl-5.18.patch deleted file mode 100644 index 9b66b9ff6e..0000000000 --- a/main/smokeping/smokeping-perl-5.18.patch +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-lib_Smokeping.pm,v 1.1 2013/06/16 21:38:51 wiz Exp $ - -Fix pod2man error with perl-5.18 -- it does not like slash. - ---- ./lib/Smokeping.pm.orig 2012-01-11 08:48:43.000000000 +0000 -+++ ./lib/Smokeping.pm -@@ -2609,7 +2609,7 @@ DOC - The base directory where SmokePing keeps the files related to the DYNAMIC function. - This directory must be writeable by the WWW server. It is also used for temporary - storage of slave polling results by the master in --L<the master/slave mode|smokeping_master_slave>. -+L<the master-slave mode|smokeping_master_slave>. - - If this variable is not specified, the value of C<datadir> will be used instead. - DOC diff --git a/main/smokeping/xss-fix-from-Steven-Chamberlain.patch b/main/smokeping/xss-fix-from-Steven-Chamberlain.patch deleted file mode 100644 index ba1e25f461..0000000000 --- a/main/smokeping/xss-fix-from-Steven-Chamberlain.patch +++ /dev/null @@ -1,28 +0,0 @@ -From bad9f9c28f0939b269f90072aa4cf41f20f15563 Mon Sep 17 00:00:00 2001 -From: Tobias Oetiker <tobi@oetiker.ch> -Date: Sun, 17 Mar 2013 13:11:10 +0100 -Subject: [PATCH] xss fix from Steven Chamberlain - ---- - lib/Smokeping.pm | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/lib/Smokeping.pm b/lib/Smokeping.pm -index cec130a..080b538 100644 ---- a/lib/Smokeping.pm -+++ b/lib/Smokeping.pm -@@ -1028,8 +1028,9 @@ sub smokecol ($) { - - sub parse_datetime($){ - my $in = shift; -- for ($in){ -- /^(\d+)$/ && do { my $value = $1; $value = time if $value > 2**32; return $value}; -+ for ($in){ -+ $in =~ s/$xssBadRx/_/g; -+ /^(\d+)$/ && do { my $value = $1; $value = time if $value > 2**32; return $value}; - /^\s*(\d{4})-(\d{1,2})-(\d{1,2})(?:\s+(\d{1,2}):(\d{2})(?::(\d{2}))?)?\s*$/ && - return POSIX::mktime($6||0,$5||0,$4||0,$3,$2-1,$1-1900,0,0,-1); - /^now$/ && return time; --- -1.8.1.5 - |