main/smokeping: security upgrade to 2.6.9 (CVE-2012-0790)

fixes #1711

5 files changed, 5 insertions, 78 deletions

diff --git a/main/smokeping/0001-fix-sysconfdir-in-etc.patch b/main/smokeping/0001-fix-sysconfdir-in-etc.patch
deleted file mode 100644
index b449a2c00..000000000
--- a/main/smokeping/0001-fix-sysconfdir-in-etc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Patch from: Jeff Bilyk <jbilyk@alpinelinux.org>
-
---- smokeping-2.6.1/etc/Makefile.in
-+++ smokeping-2.6.1/etc/Makefile.in.new
-@@ -207,7 +207,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- EXTRA_DIST = basepage.html.dist config.dist smokemail.dist smokeping_secrets.dist tmail.dist 
--etcdir = $(DESTDIR)$(sysconfdir)
-+etcdir = $(sysconfdir)
- etc_DATA = $(EXTRA_DIST)
- all: all-am
- 
diff --git a/main/smokeping/0002-fix-sysconfdir-in-doc.patch b/main/smokeping/0002-fix-sysconfdir-in-doc.patch
deleted file mode 100644
index 7d6246a9c..000000000
--- a/main/smokeping/0002-fix-sysconfdir-in-doc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Patch from: Jeff Bilyk <jbilyk@alpinelinux.org>
-
---- smokeping-2.6.1/doc/Makefile.in
-+++ smokeping-2.6.1/doc/Makefile.in.new
-@@ -239,16 +239,16 @@
- MAKEPOD = PERL5LIB=$(PERL5LIB) $(PERL) -I$(DESTDIR)$(prefix)/thirdparty/lib/perl5 -I../lib -mSmokeping -e 'Smokeping::main()' -- --makepod
- GENEX = PERL5LIB=$(PERL5LIB) $(PERL) -I$(DESTDIR)$(prefix)/thirdparty/lib/perl5  -I../lib -mSmokeping -e 'Smokeping::main()' -- --gen-examples
- CLEANFILES = *.[1357] smokeping_examples.pod smokeping_config.pod examples/*
--iman1dir = $(DESTDIR)$(mandir)/man1
-+iman1dir = $(mandir)/man1
- iman1_DATA = $(MAN1)
--iman3dir = $(DESTDIR)$(mandir)/man3
-+iman3dir = $(mandir)/man3
- iman3_DATA = $(MAN3)
--iman5dir = $(DESTDIR)$(mandir)/man5
-+iman5dir = $(mandir)/man5
- iman5_DATA = $(MAN5)
--iman7dir = $(DESTDIR)$(mandir)/man7
-+iman7dir = $(mandir)/man7
- iman7_DATA = $(MAN7)
- EXAMPLES := $(wildcard examples/config.*)
--etcdir = $(DESTDIR)$(sysconfdir)/examples
-+etcdir = $(sysconfdir)/examples
- etc_DATA = $(EXAMPLES)
- all: all-am
- 
diff --git a/main/smokeping/0003-fix-sysconfdir-in-lib.patch b/main/smokeping/0003-fix-sysconfdir-in-lib.patch
deleted file mode 100644
index 37d30a26c..000000000
--- a/main/smokeping/0003-fix-sysconfdir-in-lib.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Patch from: Jeff Bilyk <jbilyk@alpinelinux.org>
-
---- smokeping-2.6.1/lib/Makefile.in
-+++ smokeping-2.6.1/lib/Makefile.in.new
-@@ -216,7 +216,7 @@
- PROBE := $(wildcard Smokeping/probes/*.pm)
- MATCH := $(wildcard Smokeping/matchers/*.pm)
- EXTRA_DIST = $(PM) $(SP) $(SORT) $(PROBE) $(MATCH)
--perllibdir = $(DESTDIR)$(prefix)/lib
-+perllibdir = $(prefix)/lib
- nobase_perllib_DATA = $(EXTRA_DIST)
- all: all-am
- 
diff --git a/main/smokeping/0004-fix-sysconfdir-in-htdocs.patch b/main/smokeping/0004-fix-sysconfdir-in-htdocs.patch
deleted file mode 100644
index 2e247b4d0..000000000
--- a/main/smokeping/0004-fix-sysconfdir-in-htdocs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Patch from: Jeff Bilyk <jbilyk@alpinelinux.org>
-
---- smokeping-2.6.1/htdocs/Makefile.in
-+++ smokeping-2.6.1/htdocs/Makefile.in.new
-@@ -214,7 +214,7 @@
-      cropper/cropper.uncompressed.js cropper/cropper.js
- 
- EXTRA_DIST = $(JS)
--jsdir = $(DESTDIR)$(HTDOCSDIR)
-+jsdir = $(HTDOCSDIR)
- nobase_js_DATA = $(JS)
- all: all-am
- 
diff --git a/main/smokeping/APKBUILD b/main/smokeping/APKBUILD
index 22c465a39..d9bad8f7d 100644
--- a/main/smokeping/APKBUILD
+++ b/main/smokeping/APKBUILD
@@ -1,19 +1,15 @@
 # Contributor: Jeff Bilyk <jbilyk@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=smokeping
-pkgver=2.6.1
-pkgrel=6
+pkgver=2.6.9
+pkgrel=0
 pkgdesc="Smokeping network latency monitoring"
 pkgusers="smokeping"
 pkggroups="smokeping"
 install="$pkgname.pre-install"
 url="http://oss.oetiker.ch/smokeping/"
 source="http://oss.oetiker.ch/smokeping/pub/smokeping-$pkgver.tar.gz
-	smokeping.initd
-	0001-fix-sysconfdir-in-etc.patch
-	0002-fix-sysconfdir-in-doc.patch
-	0003-fix-sysconfdir-in-lib.patch
-	0004-fix-sysconfdir-in-htdocs.patch"
+	smokeping.initd"
 depends="perl fping rrdtool perl-rrd
 	perl-uri
 	perl-digest-hmac
@@ -128,9 +124,5 @@ package() {
 		"$pkgdir"/var/run/smokeping
 }
 
-md5sums="f4a5437b71e02f982f08bf318bb9857d  smokeping-2.6.1.tar.gz
-a63b42b8165f9c728706ac112658548b  smokeping.initd
-b3f3c968c582adb9e4e0fdcc9c7163e9  0001-fix-sysconfdir-in-etc.patch
-2bdafaade171bfb2241d1e6450fb094a  0002-fix-sysconfdir-in-doc.patch
-1942e4eceecb80b4bbe4cfc95e3e642f  0003-fix-sysconfdir-in-lib.patch
-974909d772ed67cbba45f20c14c2bb49  0004-fix-sysconfdir-in-htdocs.patch"
+md5sums="0c2361b734866dd37facf2af3f8f7144  smokeping-2.6.9.tar.gz
+a63b42b8165f9c728706ac112658548b  smokeping.initd"