Date: Thu, 12 Jun 2003 00:14:27 +0200 From: Cyrille Lefevre <cyrille.lefevre@laposte.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Pawel Malachowski <pawmal@unia.3lo.lublin.pl> Subject: ports/53230: Maintainer-update: misc/upclient (5.0.b8 - security fix) Message-ID: <20030611221427.GA92988@gits.dyndns.org> Resent-Message-ID: <200306112220.h5BMKGEi015443@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 53230 >Category: ports >Synopsis: Maintainer-update: misc/upclient (5.0.b8 - security fix) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Jun 11 15:20:15 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Cyrille Lefevre >Release: FreeBSD 5.1-BETA i386 >Organization: ACME >Environment: System: FreeBSD gits 5.1-BETA FreeBSD 5.1-BETA #1: Sat May 31 04:26:14 CEST 2003 root@gits:/disk3/freebsd/current/obj/disk3/freebsd/current/src/sys/CUSTOM i386 >Description: upgrade to 5.0.b8 (includes security fixes) Makefile PORTVERSION updated post-patch deleted distinfo updated files/patch-aa updated files/patch-clientchk updated files/patch-stats-bsd.c updated files/patch-transmit.c deleted >How-To-Repeat: n/a >Fix: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/misc/upclient/Makefile,v retrieving revision 1.21 diff -u -r1.21 Makefile --- Makefile 21 Feb 2003 12:48:18 -0000 1.21 +++ Makefile 11 Jun 2003 21:34:39 -0000 @@ -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} @@ -36,14 +36,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 # Index: distinfo =================================================================== RCS file: /home/ncvs/ports/misc/upclient/distinfo,v retrieving revision 1.7 diff -u -r1.7 distinfo --- distinfo 14 Feb 2003 00:16:51 -0000 1.7 +++ distinfo 11 Jun 2003 21:28:04 -0000 @@ -1 +1 @@ -MD5 (upclient-5.0b7.tar.gz) = ad56ed3309ce2fadae1f2c0339a4bc80 +MD5 (upclient-5.0b8.tar.gz) = 5d2ac85193fdb898dd16a694b05ac4d0 Index: files/patch-aa =================================================================== RCS file: /home/ncvs/ports/misc/upclient/files/patch-aa,v retrieving revision 1.6 diff -u -r1.6 patch-aa --- files/patch-aa 14 Feb 2003 00:16:51 -0000 1.6 +++ files/patch-aa 11 Jun 2003 21:36:49 -0000 @@ -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 Index: files/patch-clientchk =================================================================== RCS file: /home/ncvs/ports/misc/upclient/files/patch-clientchk,v retrieving revision 1.1 diff -u -r1.1 patch-clientchk --- files/patch-clientchk 3 Jan 2003 06:35:32 -0000 1.1 +++ files/patch-clientchk 11 Jun 2003 21:43:57 -0000 @@ -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. Index: files/patch-stats-bsd.c =================================================================== RCS file: /home/ncvs/ports/misc/upclient/files/patch-stats-bsd.c,v retrieving revision 1.5 diff -u -r1.5 patch-stats-bsd.c --- files/patch-stats-bsd.c 14 Feb 2003 00:16:51 -0000 1.5 +++ files/patch-stats-bsd.c 11 Jun 2003 21:49:23 -0000 @@ -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 */ >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030611221427.GA92988>