kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
pkgsrc/sysutils/gkrellm/patches/patch-ar

50 lines
1.8 KiB
Text
Raw Normal View History

Add DragonFly support.
2006-03-19 23:10:38 +01:00
$NetBSD: patch-ar,v 1.3 2006/03/19 22:10:38 joerg Exp $
Fix LP64 issues with gkrellm and gkrellm-server.
2005-03-30 17:26:43 +02:00
Add DragonFly support.
2006-03-19 23:10:38 +01:00
--- server/monitor.c.orig 2005-05-24 04:29:32.000000000 +0000
Fix LP64 issues with gkrellm and gkrellm-server.
2005-03-30 17:26:43 +02:00
+++ server/monitor.c
Add DragonFly support.
2006-03-19 23:10:38 +01:00
@@ -21,7 +21,7 @@
#include "gkrellmd.h"
#include "gkrellmd-private.h"
-
+#include <inttypes.h>
GList *gkrellmd_monitor_list;
Update gkrellm to version 2.2.7. pkgsrc changes: - use REQD_DIRS where appropriate - add a patch to allow gkrellm to read everything off sysctl() and thus don't install it setgid kem on NetBSD 3.99.1+ - use options framework to choose between OpenSSL and gnutls - minor nits gkrellm changes: 2.2.7 - Tue May 24, 2005 ------------------------ * gkrellmd can send a network interface connect time to be displayed on client timer button panels by configuring a net-timer in gkrellmd.conf. * Don't add virtual disk (/dev/mdX) stats to composite disk. * Bugfixes: o server/main.c inet6 compile error on machines with old libc. o Philipp Hartmann patch: add gnutls multithread initialization to mail.c o While mixing draw_decal_text and decal_scroll_text calls on transparent panels the text layer pixmap was not cleanup up properly. * Translation updates 2.2.6 - Fri May 13, 2005 ------------------------ * Stanislav Likavcan patch: add monitoring of ibm acpi sensors to linux.c. * UI improvement in fs.c and mail.c config button sensitivities and labels. * Bugfixes: o Test for not force creating user mailbox did not consider a configured mail fetch. o gkrellmd server mail check was missing the gkrellmd_need_serve() call and server/mail.c mailbox code needed syncing with src/mail.c. o gkrellmd glib 1.2 g_file_test compatibility was broken. o gkrellmd debug-level option was missing. o Darwin Makefile: add HAVE_GETADDRINFO=1 o Don Bostrom patch: when remote mail checking, handle select() EINTR. o Charles Bailey patches: 1) darwin.c and Makefile tweaks for building on OS X 10.3.8. 2) darwin.c prevent left bit sign extension when shifting memory monitor data. o Don't read disabled sensors in the sensors thread. * Translation updates
2005-09-08 15:19:56 +02:00
@@ -555,14 +555,14 @@ serve_disk_data(GkrellmdMonitor *mon, gb
Fix LP64 issues with gkrellm and gkrellm-server.
2005-03-30 17:26:43 +02:00
if (!disk->subdisk_parent)
Update gkrellm to version 2.2.7. pkgsrc changes: - use REQD_DIRS where appropriate - add a patch to allow gkrellm to read everything off sysctl() and thus don't install it setgid kem on NetBSD 3.99.1+ - use options framework to choose between OpenSSL and gnutls - minor nits gkrellm changes: 2.2.7 - Tue May 24, 2005 ------------------------ * gkrellmd can send a network interface connect time to be displayed on client timer button panels by configuring a net-timer in gkrellmd.conf. * Don't add virtual disk (/dev/mdX) stats to composite disk. * Bugfixes: o server/main.c inet6 compile error on machines with old libc. o Philipp Hartmann patch: add gnutls multithread initialization to mail.c o While mixing draw_decal_text and decal_scroll_text calls on transparent panels the text layer pixmap was not cleanup up properly. * Translation updates 2.2.6 - Fri May 13, 2005 ------------------------ * Stanislav Likavcan patch: add monitoring of ibm acpi sensors to linux.c. * UI improvement in fs.c and mail.c config button sensitivities and labels. * Bugfixes: o Test for not force creating user mailbox did not consider a configured mail fetch. o gkrellmd server mail check was missing the gkrellmd_need_serve() call and server/mail.c mailbox code needed syncing with src/mail.c. o gkrellmd glib 1.2 g_file_test compatibility was broken. o gkrellmd debug-level option was missing. o Darwin Makefile: add HAVE_GETADDRINFO=1 o Don Bostrom patch: when remote mail checking, handle select() EINTR. o Charles Bailey patches: 1) darwin.c and Makefile tweaks for building on OS X 10.3.8. 2) darwin.c prevent left bit sign extension when shifting memory monitor data. o Don't read disabled sensors in the sensors thread. * Translation updates
2005-09-08 15:19:56 +02:00
{
if (gkrellmd_check_client_version(mon, 2, 2, 7) && disk->virtual)
- snprintf(buf, sizeof(buf), "%s virtual %llu %llu\n",
+ snprintf(buf, sizeof(buf), "%s virtual %" PRIu64 " %" PRIu64 "\n",
disk->name, disk->rb, disk->wb);
else
- snprintf(buf, sizeof(buf), "%s %llu %llu\n",
+ snprintf(buf, sizeof(buf), "%s %" PRIu64 " %" PRIu64 "\n",
disk->name, disk->rb, disk->wb);
}
Fix LP64 issues with gkrellm and gkrellm-server.
2005-03-30 17:26:43 +02:00
else if (mon->privat->client->feature_subdisk)
- snprintf(buf, sizeof(buf), "%s %s %llu %llu\n",
+ snprintf(buf, sizeof(buf), "%s %s %" PRIu64 " %" PRIu64 "\n",
disk->name, disk->subdisk_parent, disk->rb, disk->wb);
else
continue;
Update gkrellm to version 2.2.7. pkgsrc changes: - use REQD_DIRS where appropriate - add a patch to allow gkrellm to read everything off sysctl() and thus don't install it setgid kem on NetBSD 3.99.1+ - use options framework to choose between OpenSSL and gnutls - minor nits gkrellm changes: 2.2.7 - Tue May 24, 2005 ------------------------ * gkrellmd can send a network interface connect time to be displayed on client timer button panels by configuring a net-timer in gkrellmd.conf. * Don't add virtual disk (/dev/mdX) stats to composite disk. * Bugfixes: o server/main.c inet6 compile error on machines with old libc. o Philipp Hartmann patch: add gnutls multithread initialization to mail.c o While mixing draw_decal_text and decal_scroll_text calls on transparent panels the text layer pixmap was not cleanup up properly. * Translation updates 2.2.6 - Fri May 13, 2005 ------------------------ * Stanislav Likavcan patch: add monitoring of ibm acpi sensors to linux.c. * UI improvement in fs.c and mail.c config button sensitivities and labels. * Bugfixes: o Test for not force creating user mailbox did not consider a configured mail fetch. o gkrellmd server mail check was missing the gkrellmd_need_serve() call and server/mail.c mailbox code needed syncing with src/mail.c. o gkrellmd glib 1.2 g_file_test compatibility was broken. o gkrellmd debug-level option was missing. o Darwin Makefile: add HAVE_GETADDRINFO=1 o Don Bostrom patch: when remote mail checking, handle select() EINTR. o Charles Bailey patches: 1) darwin.c and Makefile tweaks for building on OS X 10.3.8. 2) darwin.c prevent left bit sign extension when shifting memory monitor data. o Don't read disabled sensors in the sensors thread. * Translation updates
2005-09-08 15:19:56 +02:00
@@ -1233,7 +1233,7 @@ serve_mem_data(GkrellmdMonitor *mon, gbo
Fix LP64 issues with gkrellm and gkrellm-server.
2005-03-30 17:26:43 +02:00
if (mem.mem_changed || first_serve)
{
gkrellmd_set_serve_name(mon, "mem");
- snprintf(buf, sizeof(buf), "%llu %llu %llu %llu %llu %llu\n",
+ snprintf(buf, sizeof(buf), "%" PRIu64 " %" PRIu64 " %" PRIu64 " %" PRIu64 " %" PRIu64 " %" PRIu64 "\n",
mem.total, mem.used, mem.free,
mem.shared, mem.buffers, mem.cached);
gkrellmd_serve_data(mon, buf);
Update gkrellm to version 2.2.7. pkgsrc changes: - use REQD_DIRS where appropriate - add a patch to allow gkrellm to read everything off sysctl() and thus don't install it setgid kem on NetBSD 3.99.1+ - use options framework to choose between OpenSSL and gnutls - minor nits gkrellm changes: 2.2.7 - Tue May 24, 2005 ------------------------ * gkrellmd can send a network interface connect time to be displayed on client timer button panels by configuring a net-timer in gkrellmd.conf. * Don't add virtual disk (/dev/mdX) stats to composite disk. * Bugfixes: o server/main.c inet6 compile error on machines with old libc. o Philipp Hartmann patch: add gnutls multithread initialization to mail.c o While mixing draw_decal_text and decal_scroll_text calls on transparent panels the text layer pixmap was not cleanup up properly. * Translation updates 2.2.6 - Fri May 13, 2005 ------------------------ * Stanislav Likavcan patch: add monitoring of ibm acpi sensors to linux.c. * UI improvement in fs.c and mail.c config button sensitivities and labels. * Bugfixes: o Test for not force creating user mailbox did not consider a configured mail fetch. o gkrellmd server mail check was missing the gkrellmd_need_serve() call and server/mail.c mailbox code needed syncing with src/mail.c. o gkrellmd glib 1.2 g_file_test compatibility was broken. o gkrellmd debug-level option was missing. o Darwin Makefile: add HAVE_GETADDRINFO=1 o Don Bostrom patch: when remote mail checking, handle select() EINTR. o Charles Bailey patches: 1) darwin.c and Makefile tweaks for building on OS X 10.3.8. 2) darwin.c prevent left bit sign extension when shifting memory monitor data. o Don't read disabled sensors in the sensors thread. * Translation updates
2005-09-08 15:19:56 +02:00
@@ -1242,7 +1242,7 @@ serve_mem_data(GkrellmdMonitor *mon, gbo
Fix LP64 issues with gkrellm and gkrellm-server.
2005-03-30 17:26:43 +02:00
if (mem.swap_changed || first_serve)
{
gkrellmd_set_serve_name(mon, "swap");
- snprintf(buf, sizeof(buf), "%llu %llu %lu %lu\n",
+ snprintf(buf, sizeof(buf), "%" PRIu64 " %" PRIu64 " %lu %lu\n",
mem.swap_total, mem.swap_used,
mem.swap_in, mem.swap_out);
gkrellmd_serve_data(mon, buf);
Reference in a new issue Copy permalink