Fri Sep 13 10:15:40 2013 UTC ()
Update sysutils/swapd to 1.0.3nb2

* bump revision to force rebuild after libstatgrab update
* add patch for new libstatgrab API


(sno)
diff -r1.16 -r1.17 pkgsrc/sysutils/swapd/Makefile
diff -r1.6 -r1.7 pkgsrc/sysutils/swapd/distinfo
diff -r0 -r1.3 pkgsrc/sysutils/swapd/patches/patch-aa
cvs diff -r1.16 -r1.17 pkgsrc/sysutils/swapd/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/swapd/Makefile 2012/10/23 19:51:25 1.16
+++ pkgsrc/sysutils/swapd/Makefile 2013/09/13 10:15:40 1.17
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.16 2012/10/23 19:51:25 asau Exp $ 1# $NetBSD: Makefile,v 1.17 2013/09/13 10:15:40 sno Exp $
2# 2#
3 3
4DISTNAME= swapd-1.0.3 4DISTNAME= swapd-1.0.3
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= sysutils 6CATEGORIES= sysutils
7MASTER_SITES= http://www.rkeene.org/files/oss/swapd/source/ 7MASTER_SITES= http://www.rkeene.org/files/oss/swapd/source/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.rkeene.org/oss/swapd/ 10HOMEPAGE= http://www.rkeene.org/oss/swapd/
11COMMENT= Swap daemon for POSIX-compliant operating systems 11COMMENT= Swap daemon for POSIX-compliant operating systems
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14ONLY_FOR_PLATFORM= NetBSD-*-* SunOS-*-* Linux-*-* 14ONLY_FOR_PLATFORM= NetBSD-*-* SunOS-*-* Linux-*-*
15 15
16USE_TOOLS+= gmake 16USE_TOOLS+= gmake
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18 18
cvs diff -r1.6 -r1.7 pkgsrc/sysutils/swapd/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/swapd/distinfo 2009/05/16 08:10:03 1.6
+++ pkgsrc/sysutils/swapd/distinfo 2013/09/13 10:15:40 1.7
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.6 2009/05/16 08:10:03 obache Exp $ 1$NetBSD: distinfo,v 1.7 2013/09/13 10:15:40 sno Exp $
2 2
3SHA1 (swapd-1.0.3.tar.gz) = d2f567767ded2382c24505565e8aea1b8d88a746 3SHA1 (swapd-1.0.3.tar.gz) = d2f567767ded2382c24505565e8aea1b8d88a746
4RMD160 (swapd-1.0.3.tar.gz) = a7a30f3c8e8ce5407df04ce5a5a1a3cfaf15a266 4RMD160 (swapd-1.0.3.tar.gz) = a7a30f3c8e8ce5407df04ce5a5a1a3cfaf15a266
5Size (swapd-1.0.3.tar.gz) = 90981 bytes 5Size (swapd-1.0.3.tar.gz) = 90981 bytes
 6SHA1 (patch-aa) = 7a024306380ce09552996bd27cbb117e6bd1619f
6SHA1 (patch-ab) = 93e9315281390a9029df62df6fd885605c55da43 7SHA1 (patch-ab) = 93e9315281390a9029df62df6fd885605c55da43
File Added: pkgsrc/sysutils/swapd/patches/patch-aa
$NetBSD: patch-aa,v 1.3 2013/09/13 10:15:40 sno Exp $

* sg_init(continue)
* libstatgrab 0.90 expects OUT arg for amount of stats returned

--- swapd.c.orig	2005-02-19 04:32:30.000000000 +0000
+++ swapd.c
@@ -87,7 +87,7 @@ int daemonize(void) {
 int swapd_init_stats(void) {
 #ifdef HAVE_LIBSTATGRAB
 	/* Initialize the libstatgrab interface. */
-	if (sg_init() != 0) {
+	if (sg_init(0) != 0) {
 		/* Failure. */
 		PRINTERR("Unable to initialize statistics interface (libstatgrab).");
 		return(0);
@@ -104,13 +104,14 @@ int64_t swapd_get_free_mem(void) {
 #ifdef HAVE_LIBSTATGRAB
 	sg_mem_stats *meminfo = NULL;
 	sg_swap_stats *swapinfo = NULL;
+	size_t entries = 0;
 
-	meminfo = sg_get_mem_stats();
+	meminfo = sg_get_mem_stats(&entries);
 	if (meminfo == NULL) {
 		return(-1);
 	}
 
-	swapinfo = sg_get_swap_stats();
+	swapinfo = sg_get_swap_stats(&entries);
 	if (swapinfo == NULL) {
 		free(meminfo);
 		return(-1);