summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authormacallan <macallan>2008-12-19 21:25:28 +0000
committermacallan <macallan>2008-12-19 21:25:28 +0000
commitcdb97e891575f470da84f1f95d68ee4dda90b6b4 (patch)
tree67a291ab17d93762b38579b439359e8c731c3c54 /sysutils
parent8a06464e6ba8cb8fb4e3015b852aba591b054b3b (diff)
downloadpkgsrc-cdb97e891575f470da84f1f95d68ee4dda90b6b4.tar.gz
fix previous, this time also update checksums
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/gkrellm/distinfo4
-rw-r--r--sysutils/gkrellm/patches/patch-aa15
2 files changed, 9 insertions, 10 deletions
diff --git a/sysutils/gkrellm/distinfo b/sysutils/gkrellm/distinfo
index 0528e5c7198..8508f1193cf 100644
--- a/sysutils/gkrellm/distinfo
+++ b/sysutils/gkrellm/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.38 2007/05/03 20:21:27 cube Exp $
+$NetBSD: distinfo,v 1.39 2008/12/19 21:25:28 macallan Exp $
SHA1 (gkrellm-2.2.10.tar.bz2) = 329d0ba5600998f21b75491937c3c2924ab6ed40
RMD160 (gkrellm-2.2.10.tar.bz2) = 6694838015716c09291887ae598daceb4f4b440f
Size (gkrellm-2.2.10.tar.bz2) = 718894 bytes
-SHA1 (patch-aa) = bc07107ed828a5a86012cae39316c1d35d2d7a4d
+SHA1 (patch-aa) = 1cf9b98520b37aa75c6c5b9d0398e8d92204a12e
SHA1 (patch-ab) = e900c811ddea106efee5cbfc04d0cf14cc6e6451
SHA1 (patch-ac) = 8890d5a5e8eaf21508a1bf91de788183fd6f7a75
SHA1 (patch-ad) = 2a12402c941a5a197aa58e711e254ae2c91dfb10
diff --git a/sysutils/gkrellm/patches/patch-aa b/sysutils/gkrellm/patches/patch-aa
index 2263c8bb24b..e6385267616 100644
--- a/sysutils/gkrellm/patches/patch-aa
+++ b/sysutils/gkrellm/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.17 2008/12/19 20:20:22 macallan Exp $
+$NetBSD: patch-aa,v 1.18 2008/12/19 21:25:28 macallan Exp $
--- src/sysdeps/bsd-common.c.orig 2006-03-29 17:23:37.000000000 -0500
+++ src/sysdeps/bsd-common.c
@@ -11,17 +11,16 @@ $NetBSD: patch-aa,v 1.17 2008/12/19 20:20:22 macallan Exp $
!(defined(__OpenBSD__) && OpenBSD < 200006) && \
!defined(__APPLE__)
#define HAVE_GETIFADDRS 1
-@@ -52,8 +52,11 @@ gkrellm_sys_net_read_data(void)
+@@ -52,6 +52,8 @@ gkrellm_sys_net_read_data(void)
if (ifa->ifa_addr->sa_family != AF_LINK)
continue;
ifd = (struct if_data *)ifa->ifa_data;
+ if (ifd == NULL)
+ continue;
-+
gkrellm_net_assign_data(ifa->ifa_name,
- ifd->ifi_ibytes, ifd->ifi_obytes);
- }
-@@ -255,7 +258,11 @@ void
+ ifd->ifi_ibytes, ifd->ifi_obytes);
+ }
+@@ -255,7 +257,11 @@ void
gkrellm_sys_fs_get_mounts_list(void)
{
gchar *s, *dev, *dir, *type;
@@ -33,7 +32,7 @@ $NetBSD: patch-aa,v 1.17 2008/12/19 20:20:22 macallan Exp $
gint mntsize, i;
if ((mntsize = getmntinfo(&mntbuf, MNT_NOWAIT)) == 0)
-@@ -281,12 +288,24 @@ gkrellm_sys_fs_get_mounts_list(void)
+@@ -281,12 +287,24 @@ gkrellm_sys_fs_get_mounts_list(void)
void
gkrellm_sys_fs_get_fsusage(gpointer fs, gchar *dir)
{
@@ -58,7 +57,7 @@ $NetBSD: patch-aa,v 1.17 2008/12/19 20:20:22 macallan Exp $
else
gkrellm_fs_assign_fsusage_data(fs, 0, 0, 0, 0);
}
-@@ -345,7 +364,7 @@ gkrellm_sys_fs_init(void)
+@@ -345,7 +363,7 @@ gkrellm_sys_fs_init(void)
}
#endif