diff options
| author | Brad Davis <brd@FreeBSD.org> | 2016-08-08 15:50:17 +0000 |
|---|---|---|
| committer | Brad Davis <brd@FreeBSD.org> | 2016-08-08 15:50:17 +0000 |
| commit | b9302029ab43909aab5e328f300831223fcc14c8 (patch) | |
| tree | 56b969432338a5397b7d88e8bd50dbbe2aaaf244 /net-mgmt | |
| parent | Document collectd security advisory. (diff) | |
Update net-mgmt/collectd5 to 5.5.2
PR: 211613
Submitted by: brd
Approved by: ports-secteam (feld)
Security: 6da45e38-5b55-11e6-8859-000c292ee6b8
Notes
Notes:
svn path=/head/; revision=419862
Diffstat (limited to 'net-mgmt')
| -rw-r--r-- | net-mgmt/collectd5/Makefile | 3 | ||||
| -rw-r--r-- | net-mgmt/collectd5/distinfo | 5 | ||||
| -rw-r--r-- | net-mgmt/collectd5/files/patch-src_zfs__arc.c | 13 | ||||
| -rw-r--r-- | net-mgmt/collectd5/files/patch-version-gen.sh | 6 |
4 files changed, 13 insertions, 14 deletions
diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile index 993404f5641f..29b4d2146ce1 100644 --- a/net-mgmt/collectd5/Makefile +++ b/net-mgmt/collectd5/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= collectd -PORTVERSION= 5.5.1 -PORTREVISION= 4 +PORTVERSION= 5.5.2 CATEGORIES= net-mgmt MASTER_SITES= https://collectd.org/files/ \ http://collectd.org/files/ diff --git a/net-mgmt/collectd5/distinfo b/net-mgmt/collectd5/distinfo index 60b79889a2e7..f2b606a650e0 100644 --- a/net-mgmt/collectd5/distinfo +++ b/net-mgmt/collectd5/distinfo @@ -1,2 +1,3 @@ -SHA256 (collectd-5.5.1.tar.bz2) = f9c5d526e1f0429a7db1ccd90bdf9e23923a2fd43b7285cfda8f0341e5c0bc3f -SIZE (collectd-5.5.1.tar.bz2) = 1797852 +TIMESTAMP = 1469564676 +SHA256 (collectd-5.5.2.tar.bz2) = 017f3a4062187e594d8ab6af685655fb82a8a942dc574668e68242bdb8ba820f +SIZE (collectd-5.5.2.tar.bz2) = 1800476 diff --git a/net-mgmt/collectd5/files/patch-src_zfs__arc.c b/net-mgmt/collectd5/files/patch-src_zfs__arc.c index 9171e2327d40..3a60eeadf935 100644 --- a/net-mgmt/collectd5/files/patch-src_zfs__arc.c +++ b/net-mgmt/collectd5/files/patch-src_zfs__arc.c @@ -1,14 +1,13 @@ ---- src/zfs_arc.c.orig 2016-01-22 09:51:17 UTC +--- src/zfs_arc.c.orig 2016-07-26 05:57:19 UTC +++ src/zfs_arc.c -@@ -270,8 +270,11 @@ static int za_read (void) +@@ -270,10 +270,6 @@ static int za_read (void) za_read_derive (ksp, "deleted", "cache_operation", "deleted"); #if __FreeBSD__ za_read_derive (ksp, "allocated","cache_operation", "allocated"); -+#if defined(__FreeBSD_version) && (__FreeBSD_version < 1002501) -+ /* stolen removed from sysctl kstat.zfs.misc.arcstats on FreeBSD 10.2+ */ - za_read_derive (ksp, "stolen", "cache_operation", "stolen"); +-#if defined(__FreeBSD_version) && (__FreeBSD_version < 1002501) +- /* stolen removed from sysctl kstat.zfs.misc.arcstats on FreeBSD 10.2+ */ +- za_read_derive (ksp, "stolen", "cache_operation", "stolen"); +-#endif #endif -+#endif /* Issue indicators */ - za_read_derive (ksp, "mutex_miss", "mutex_operations", "miss"); diff --git a/net-mgmt/collectd5/files/patch-version-gen.sh b/net-mgmt/collectd5/files/patch-version-gen.sh index 67a0e0a67285..f99a0fe5432f 100644 --- a/net-mgmt/collectd5/files/patch-version-gen.sh +++ b/net-mgmt/collectd5/files/patch-version-gen.sh @@ -1,9 +1,9 @@ ---- version-gen.sh.orig 2016-01-22 09:51:17 UTC +--- version-gen.sh.orig 2016-08-05 21:19:57 UTC +++ version-gen.sh @@ -1,13 +1,3 @@ #!/bin/sh --DEFAULT_VERSION="5.5.1.git" +-DEFAULT_VERSION="5.5.2.git" - -VERSION="`git describe 2> /dev/null | grep collectd | sed -e 's/^collectd-//'`" - @@ -14,4 +14,4 @@ -VERSION="`echo \"$VERSION\" | sed -e 's/-/./g'`" - -printf "%s" "$VERSION" -+echo -n "5.5.1.git" ++echo -n '5.5.2.git' |