aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonardo Arena <rnalrd@alpinelinux.org>2016-08-08 06:38:13 +0000
committerLeonardo Arena <rnalrd@alpinelinux.org>2016-08-08 06:48:22 +0000
commit098260b04946c063be77108d7a498046a254403a (patch)
treeba27d91677fb080bde2940ae0ccda864f1aa9615
parent9d0f5e1e02079c44a9c58169c8b78c743edaf7b8 (diff)
downloadaports-098260b04946c063be77108d7a498046a254403a.tar.gz
aports-098260b04946c063be77108d7a498046a254403a.tar.bz2
aports-098260b04946c063be77108d7a498046a254403a.tar.xz
main/collectd: security upgrade to 5.5.2 (CVE-2016-6254). Fixes #5990
(cherry picked from commit ac94d4b9a3edac9db7aa1481b4866cb39d032843)
-rw-r--r--main/collectd/APKBUILD19
-rw-r--r--main/collectd/parallel-build.patch11
2 files changed, 10 insertions, 20 deletions
diff --git a/main/collectd/APKBUILD b/main/collectd/APKBUILD
index fb1fafcb03..94a26326c1 100644
--- a/main/collectd/APKBUILD
+++ b/main/collectd/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Ɓukasz Jendrysik <scadu@yandex.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=collectd
-pkgver=5.5.0
-pkgrel=1
+pkgver=5.5.2
+pkgrel=0
pkgdesc="The system statistics collection daemon"
url="http://collectd.org"
arch="all"
@@ -22,11 +22,15 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-perl $pkgname-snmp
$pkgname-ascent $pkgname-virt $pkgname-redis"
source="http://collectd.org/files/collectd-$pkgver.tar.bz2
- parallel-build.patch
gnu_source.patch
collectd.initd"
_builddir="$srcdir"/$pkgname-$pkgver
+
+# security fixes:
+# 5.5.2-r0:
+# - CVE-2016-6254
+
prepare() {
cd "$_builddir"
update_config_sub || return 1
@@ -104,15 +108,12 @@ ascent() { _plugin ascent; }
redis() { _plugin redis; }
virt() { _plugin virt; provides="$pkgname-libvirt"; }
-md5sums="c39305ef5514b44238b0d31f77e29e6a collectd-5.5.0.tar.bz2
-c41b8ab5bb9f1e461277a1b89e16bc52 parallel-build.patch
+md5sums="40b83343f72089e0330f53965f1140bd collectd-5.5.2.tar.bz2
4c0b185623baebc4f4b71b3b47383b3a gnu_source.patch
8015a61e7cda7abdf60e63eeff2923d2 collectd.initd"
-sha256sums="847684cf5c10de1dc34145078af3fcf6e0d168ba98c14f1343b1062a4b569e88 collectd-5.5.0.tar.bz2
-d009e687704a139682a59e3389265ff4de52207b57937a3006fd1762fd0c1227 parallel-build.patch
+sha256sums="017f3a4062187e594d8ab6af685655fb82a8a942dc574668e68242bdb8ba820f collectd-5.5.2.tar.bz2
5f177512b28b5955231457a8c4468e28dfb667986affebd30c1cba01980e6bff gnu_source.patch
7d7b20cb0c804d56d4e7ffe60b975b82c194898160674be2de49d1489589f6a3 collectd.initd"
-sha512sums="d2c2840f681c10345e02ad8df0f7c581dcb45bee276589fcd96b3dadd281a79ebb3b9a34a186242ef41285dde7fc505432376138ff4f72c4f60f1b840e640017 collectd-5.5.0.tar.bz2
-dd9c49a57cf35cfbaebf089aa4a3e7c5bcf6c29c2fd0391f5eb28f8a0f1c18a9341fe94453e50a57cdab7c0bbe603d29b6e6f7a27877de088cc20bf204f6d1d3 parallel-build.patch
+sha512sums="9d311db4f3677b95e3a47c03af01bdf1127957f6fccb6c601455632d0ea3b39e3f4cd9a6f8f510083e208714bbb0da2e04aaa574a90b0ad6fe984506675475b3 collectd-5.5.2.tar.bz2
34b65fc2c21980e047e3d803a8293e8b523ad06e725113065787f1ce3ea81c5ce3e907845b03192770972ece3d8b79dc884c9e7782d428416ee418bc0658daae gnu_source.patch
296b9f58df7b0da5b2fbf8c6e77cbd08c6673da28e98e67a34cb52dffc26c45d54a95f0bc51a16729d1844752636419fae98a4d3fd744b736568dfc23fab4296 collectd.initd"
diff --git a/main/collectd/parallel-build.patch b/main/collectd/parallel-build.patch
deleted file mode 100644
index 5dcbbc3612..0000000000
--- a/main/collectd/parallel-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/daemon/Makefile.am.orig
-+++ ./src/daemon/Makefile.am
-@@ -49,7 +49,7 @@
- collectd_CFLAGS = $(AM_CFLAGS)
- collectd_LDFLAGS = -export-dynamic
- collectd_LDADD = libavltree.la libcommon.la libheap.la -lm
--collectd_DEPENDENCIES =
-+collectd_DEPENDENCIES = libavltree.la libcommon.la libheap.la
-
- # Link to these libraries..
- if BUILD_WITH_LIBRT