diff options
author | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2003-06-12 01:31:42 +0000 |
---|---|---|
committer | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2003-06-12 01:31:42 +0000 |
commit | 25bcc4e68984277d8dec17afbed3b7098bd00373 (patch) | |
tree | 2137dc5b84b3bc63f6c96154aab28d51042d614c /misc/upclient | |
parent | * Update to 1.1.19 (Now with graphing support!) (diff) |
Update to 5.0.b8
PR: 53230
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=82826
Diffstat (limited to 'misc/upclient')
-rw-r--r-- | misc/upclient/Makefile | 10 | ||||
-rw-r--r-- | misc/upclient/distinfo | 2 | ||||
-rw-r--r-- | misc/upclient/files/patch-aa | 9 | ||||
-rw-r--r-- | misc/upclient/files/patch-clientchk | 13 | ||||
-rw-r--r-- | misc/upclient/files/patch-stats-bsd.c | 46 | ||||
-rw-r--r-- | misc/upclient/files/patch-transmit.c | 12 |
6 files changed, 20 insertions, 72 deletions
diff --git a/misc/upclient/Makefile b/misc/upclient/Makefile index e22f716c430c..e467435628f9 100644 --- a/misc/upclient/Makefile +++ b/misc/upclient/Makefile @@ -6,7 +6,7 @@ # PORTNAME= upclient -PORTVERSION= 5.0.b7 +PORTVERSION= 5.0.b8 CATEGORIES= misc MASTER_SITES= http://uptimes.wonko.com/files/ DISTNAME= ${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E} @@ -37,14 +37,6 @@ DOC_FILES+= HISTORY-BETA .include <bsd.port.pre.mk> -# Post-extract -# - -post-extract: rename-doc - -rename-doc: - @${MV} ${WRKSRC}/doc/"Uptimes Protocol 5" ${WRKSRC}/doc/UptimesProtocol5 - # Post-patch # diff --git a/misc/upclient/distinfo b/misc/upclient/distinfo index c15daab811d0..12dc4bf6f43d 100644 --- a/misc/upclient/distinfo +++ b/misc/upclient/distinfo @@ -1 +1 @@ -MD5 (upclient-5.0b7.tar.gz) = ad56ed3309ce2fadae1f2c0339a4bc80 +MD5 (upclient-5.0b8.tar.gz) = 5d2ac85193fdb898dd16a694b05ac4d0 diff --git a/misc/upclient/files/patch-aa b/misc/upclient/files/patch-aa index b4c8f6944897..cfd98dfedd47 100644 --- a/misc/upclient/files/patch-aa +++ b/misc/upclient/files/patch-aa @@ -1,14 +1,5 @@ --- src/Makefile.orig Wed Dec 18 01:01:16 2002 +++ src/Makefile Mon Feb 3 20:18:03 2003 -@@ -34,7 +34,7 @@ - # - PROGRAMNAME = UpClient - # UPCLIENT_VERSION = "5.0b7" -- UPCLIENT_VERSION = `grep '\#define UPCLIENT_VERSION ' version.h | sed -e 's@\#define UPCLIENT_VERSION @@g' | tr -d '"'` -+ UPCLIENT_VERSION = `sed -n 's/"//g;/\#define UPCLIENT_VERSION /s///p' version.h` - ######################################################################### - - @@ -46,7 +46,7 @@ OPTIMIZATION_CFLAGS=-O3 diff --git a/misc/upclient/files/patch-clientchk b/misc/upclient/files/patch-clientchk index b645c63e820f..4f1a755f424e 100644 --- a/misc/upclient/files/patch-clientchk +++ b/misc/upclient/files/patch-clientchk @@ -1,5 +1,5 @@ ---- scripts/clientchk.orig Thu Oct 24 18:48:35 2002 -+++ scripts/clientchk Wed Dec 18 02:41:57 2002 +--- scripts/clientchk.orig Tue May 27 09:03:42 2003 ++++ scripts/clientchk Wed Jun 11 23:42:17 2003 @@ -31,7 +31,7 @@ # variables: @@ -9,12 +9,3 @@ # clientpid: This is the path to the client PID file. clientpid="/var/run/upclient.pid" -@@ -43,7 +43,7 @@ - - # chdirectroy: If we need to change directory before running the client, - # enter it here. --chdirectory="" -+chdirectory="/" - - # You can leave deletefiles or chdirector empty if you don't need them. - # However, you NEED client and clientpid. diff --git a/misc/upclient/files/patch-stats-bsd.c b/misc/upclient/files/patch-stats-bsd.c index deb664280f60..fa20ce2a8e68 100644 --- a/misc/upclient/files/patch-stats-bsd.c +++ b/misc/upclient/files/patch-stats-bsd.c @@ -1,15 +1,15 @@ ---- src/stats-bsd.c.orig Wed Dec 18 01:01:17 2002 -+++ src/stats-bsd.c Mon Feb 3 20:20:12 2003 -@@ -64,6 +64,8 @@ +--- src/stats-bsd.c.orig Tue May 27 09:03:43 2003 ++++ src/stats-bsd.c Wed Jun 11 23:48:40 2003 +@@ -73,6 +73,8 @@ #include "locale.h" /* gettext */ +void logcalc(char *, char *); + /** - * @desc Verbose level 2 logging of calulations + * @desc Verbose level 3 logging of calulations */ -@@ -81,12 +83,13 @@ +@@ -90,12 +92,13 @@ void initCPU(char *cpu) { @@ -26,23 +26,7 @@ initialized = 1; mib[0] = CTL_HW; -@@ -98,7 +101,6 @@ - - if (sysctl(mib, 2, buf, &size, NULL, 0) == -1) { - uplog(LOG_WARNING, "sysctl: hw.model"); -- /* warn("sysctl: hw.model"); */ - } - strlcpy(cpu, buf, CPU_SIZE); - logcalc(_("CPU"), cpu); -@@ -154,7 +156,6 @@ - err(1, "sysctl: kern.boottime"); - } - boottimesecs = boottime.tv_sec; -- /* logcalc(_("boot time"), boottimesecs); */ - #if defined DEBUG - uplog(LOG_DEBUG, "initBoottime() initialized %d", boottimesecs); - #endif /* DEBUG */ -@@ -173,19 +174,18 @@ +@@ -180,19 +183,18 @@ _("%s %s not implemented for this operating system %s"), _("WARNING:"), _("Load-average"), strerror(errno)); cfg_SendUsage = 0; @@ -67,7 +51,7 @@ } #if !defined __MACH__ /* Mach kernel stuff is in stats-mach.c */ -@@ -259,6 +259,10 @@ +@@ -266,6 +268,10 @@ /* store values for next calculation interval */ for (state = 0; state < CPUSTATES; state++) stime[state] = ctime[state]; @@ -78,7 +62,7 @@ } } else { -@@ -269,17 +273,13 @@ +@@ -276,17 +282,13 @@ cfg_SendUsage = 0; cfg_SendIdle = 0; } @@ -97,7 +81,7 @@ boottimesecs = initBoottime(); -@@ -294,7 +294,7 @@ +@@ -301,7 +303,7 @@ #endif /* DEBUG */ } else { @@ -106,7 +90,7 @@ "getUptime() boottime.tv_sec"); } } -@@ -307,19 +307,18 @@ +@@ -314,21 +316,20 @@ double *IdlePercent, char *osname, char *osversion, char *cpu, double *loadavg) { @@ -123,12 +107,14 @@ if (cfg_sendcpu) - initCPU(&*cpu); -- -- /* if (cfg_sendloadavg) */ -- getLoadavg(&*loadavg); + initCPU(cpu); -+ if (cfg_sendloadavg) + /* WARNING: loadavg is not implemented on Wonko server! */ + /* cfg_SendUsage is implemented instead. (i.e. only CPU usage % a la `top`) */ +- /* if (cfg_sendloadavg) */ +- getLoadavg(&*loadavg); +- ++ if (cfg_sendloadavg) + getLoadavg(loadavg); } #endif /* PLATFORM_BSD */ diff --git a/misc/upclient/files/patch-transmit.c b/misc/upclient/files/patch-transmit.c deleted file mode 100644 index 1d5cdf7cc586..000000000000 --- a/misc/upclient/files/patch-transmit.c +++ /dev/null @@ -1,12 +0,0 @@ ---- src/transmit.c.orig Sat Nov 30 03:27:16 2002 -+++ src/transmit.c Wed Dec 18 03:30:45 2002 -@@ -45,8 +45,8 @@ - #endif /* !PLATFORM_WINNT */ - - #if !defined PLATFORM_WINNT && !defined PLATFORM_BEOS --# include <arpa/inet.h> /* htons(), in_addr_t */ - # include <netinet/in.h> -+# include <arpa/inet.h> /* htons(), in_addr_t */ - #endif - /* Some Linux with old system headers might need this */ - /* #if defined PLATFORM_LINUX |