From 2e7c32a306f8e3d6357ad3e690ce73c45c562c8e Mon Sep 17 00:00:00 2001 From: lukem Date: Wed, 3 Jul 2002 11:57:11 +0000 Subject: update to nut 0.50.0. notable changes: - change from tcp/ip port 3305 to the IANA assigned 3493 - all old-style drivers have been deprecated: aeg bestfort bestuferrups engetron ipt-anzen mgeups multilink mustekups optiups sms toshiba1500 ups-trust425+625 upseyeux - newvictron renamed to victronups - newpowercom renamed to powercom, replacing previous powercom and ups-trust425+625 as well --- sysutils/ups-nut-cgi/DESCR | 2 +- sysutils/ups-nut-cgi/Makefile | 7 ++--- sysutils/ups-nut-cgi/distinfo | 12 ++++---- sysutils/ups-nut-cgi/patches/patch-aa | 13 +++----- sysutils/ups-nut-cgi/patches/patch-ad | 20 ++++++------ sysutils/ups-nut-cgi/patches/patch-ae | 40 ++++++++++++------------ sysutils/ups-nut/MESSAGE | 6 +++- sysutils/ups-nut/Makefile | 19 ++++++------ sysutils/ups-nut/PLIST | 58 ++++++++++++++++++----------------- sysutils/ups-nut/distinfo | 9 +++--- sysutils/ups-nut/patches/patch-aa | 11 ++++--- sysutils/ups-nut/patches/patch-ac | 18 +++++++++++ 12 files changed, 119 insertions(+), 96 deletions(-) create mode 100644 sysutils/ups-nut/patches/patch-ac (limited to 'sysutils') diff --git a/sysutils/ups-nut-cgi/DESCR b/sysutils/ups-nut-cgi/DESCR index 5a76a0c57b7..167a3054f47 100644 --- a/sysutils/ups-nut-cgi/DESCR +++ b/sysutils/ups-nut-cgi/DESCR @@ -1 +1 @@ -ups-nut-cgi provides CGI scripts to monitor UPS status via WEB browser. +ups-nut-cgi provides CGI scripts to monitor UPS status via a web browser. diff --git a/sysutils/ups-nut-cgi/Makefile b/sysutils/ups-nut-cgi/Makefile index beb249cda1a..76045f6aee5 100644 --- a/sysutils/ups-nut-cgi/Makefile +++ b/sysutils/ups-nut-cgi/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.16 2002/05/13 15:15:23 lukem Exp $ +# $NetBSD: Makefile,v 1.17 2002/07/03 11:57:14 lukem Exp $ -DISTNAME= nut-0.45.5 -PKGNAME= ups-nut-cgi-0.45.5 -PKGREVISION= 1 +DISTNAME= nut-0.50.0 +PKGNAME= ups-nut-cgi-0.50.0 CATEGORIES= sysutils MASTER_SITES= http://www.exploits.org/nut/release/ diff --git a/sysutils/ups-nut-cgi/distinfo b/sysutils/ups-nut-cgi/distinfo index 0b136e964e5..4767e05580a 100644 --- a/sysutils/ups-nut-cgi/distinfo +++ b/sysutils/ups-nut-cgi/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.8 2002/05/13 15:15:24 lukem Exp $ +$NetBSD: distinfo,v 1.9 2002/07/03 11:57:14 lukem Exp $ -SHA1 (nut-0.45.5.tar.gz) = 5cb08e27fb7e528a453d164d401410d341bf3bb3 -Size (nut-0.45.5.tar.gz) = 386936 bytes -SHA1 (patch-aa) = 6057ca39afdfc4e49380c8f4d35f2371df9fe549 +SHA1 (nut-0.50.0.tar.gz) = b8826f2e7301e5c753ac946574a53d651faf69c3 +Size (nut-0.50.0.tar.gz) = 382755 bytes +SHA1 (patch-aa) = cd7b96973d696c1a1f1051fc30c516e158c89ec5 SHA1 (patch-ab) = dfc1663368b670b84b1545c388bcd5f8703c08e3 SHA1 (patch-ac) = ded33bbc4c78b2b7c53230c0d4ab3c663104582f -SHA1 (patch-ad) = 7c705b7d1d70962f3f39f399753f585d439032fb -SHA1 (patch-ae) = 39ea3f3a4234790837ccf6e5799c39b6ba390975 +SHA1 (patch-ad) = 3620c734b396a2de657b6dceb7d5ba3cc821250b +SHA1 (patch-ae) = 6cff43dc5ed449a8f3c9b1e4864a47336b69fb30 diff --git a/sysutils/ups-nut-cgi/patches/patch-aa b/sysutils/ups-nut-cgi/patches/patch-aa index ff6b6033e2c..d2e8e5fa0fd 100644 --- a/sysutils/ups-nut-cgi/patches/patch-aa +++ b/sysutils/ups-nut-cgi/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.4 2002/05/13 15:15:24 lukem Exp $ +$NetBSD: patch-aa,v 1.5 2002/07/03 11:57:14 lukem Exp $ ---- Makefile.in.orig Fri Mar 8 23:21:11 2002 +--- Makefile.in.orig Wed Apr 17 00:00:49 2002 +++ Makefile.in -@@ -9,9 +9,10 @@ +@@ -9,7 +9,7 @@ MODELPATH = $(INSTALLROOT)@MODELPATH@ INSTALLDIRS = $(CONFPATH) $(MODELPATH) $(BASEPATH)/@bindir@ $(BASEPATH)/@sbindir@ STATEPATH = $(INSTALLROOT)@STATEPATH@ @@ -10,11 +10,8 @@ $NetBSD: patch-aa,v 1.4 2002/05/13 15:15:24 lukem Exp $ +SUBDIRS = common CFLAGS = -I../include @CFLAGS@ -+ # these are here so they can be overridden during a make install - RUNUID=@RUN_AS_USER@ - RUNGID=@RUN_AS_GROUP@ -@@ -64,7 +65,7 @@ +@@ -65,7 +65,7 @@ install-dirs: install-man: @cd man; $(MAKE) install; cd ..; @@ -23,7 +20,7 @@ $NetBSD: patch-aa,v 1.4 2002/05/13 15:15:24 lukem Exp $ @cd clients; $(MAKE) cgi; cd ..; install-cgi: install-dirs -@@ -72,7 +73,6 @@ +@@ -73,7 +73,6 @@ install-cgi: install-dirs ./install-sh -d $(CGIPATH) || exit 1; \ fi \ diff --git a/sysutils/ups-nut-cgi/patches/patch-ad b/sysutils/ups-nut-cgi/patches/patch-ad index 5d15ecc59e6..a23d45a27b8 100644 --- a/sysutils/ups-nut-cgi/patches/patch-ad +++ b/sysutils/ups-nut-cgi/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.5 2002/05/13 15:15:24 lukem Exp $ +$NetBSD: patch-ad,v 1.6 2002/07/03 11:57:14 lukem Exp $ ---- configure.in.orig Tue Feb 26 05:46:25 2002 +--- configure.in.orig Tue Apr 16 23:34:38 2002 +++ configure.in -@@ -16,6 +16,7 @@ +@@ -18,6 +18,7 @@ dnl | default values for things later on STATEPATH="/var/state/ups" MODELPATH="$prefix/bin" CGIPATH="$prefix/cgi-bin" @@ -10,7 +10,7 @@ $NetBSD: patch-ad,v 1.5 2002/05/13 15:15:24 lukem Exp $ RUN_AS_USER="nobody" RUN_AS_GROUP="nogroup" PIDPATH="/var/run" -@@ -120,9 +121,43 @@ +@@ -118,9 +119,43 @@ if ( test x"$ac_cv_func_connect" = x"no" ], [], []) fi @@ -54,7 +54,7 @@ $NetBSD: patch-ad,v 1.5 2002/05/13 15:15:24 lukem Exp $ dnl Include in case GD was compiled with Xpm support AC_CHECK_LIB(X11, XBell, -@@ -131,13 +166,16 @@ +@@ -129,13 +164,16 @@ AC_CHECK_LIB(X11, XBell, echo "Retrying with -L /usr/X11R6/lib" unset ac_cv_lib_X11_XBell AC_CHECK_LIB(X11, XBell, @@ -73,7 +73,7 @@ $NetBSD: patch-ad,v 1.5 2002/05/13 15:15:24 lukem Exp $ dnl Skip this chunk if there's no LIBX to use if test "$LIBX" != "" -@@ -145,69 +183,34 @@ +@@ -143,69 +181,35 @@ then dnl Include in case GD was compiled with Xpm support AC_CHECK_LIB(Xpm, XpmReadFileToXpmImage, @@ -120,7 +120,7 @@ $NetBSD: patch-ad,v 1.5 2002/05/13 15:15:24 lukem Exp $ -[-lm -lpng -lz], +[$GRAPHICS_LIBS -lm -lpng -lz], ) -- + -dnl Don't run the ttf/xpm tests against gd unless -dnl we actually have something to test! -dnl @@ -154,13 +154,13 @@ $NetBSD: patch-ad,v 1.5 2002/05/13 15:15:24 lukem Exp $ +GRAPHICS_LIBS="$LIBGD" +CFLAGS="$CFLAGS_save $GRAPHICS_LIBS" - AC_CHECK_HEADERS(gd.h gd/gd.h sys/modem.h stdarg.h varargs.h sys/shm.h err.h) + AC_CHECK_HEADERS(gd.h gd/gd.h sys/modem.h stdarg.h varargs.h sys/shm.h) +CFLAGS=$CFLAGS_save +CPPFLAGS=$CPPFLAGS_save AC_HEADER_TIME AC_CHECK_HEADERS(sys/time.h) -@@ -220,7 +223,7 @@ +@@ -218,7 +222,7 @@ if test -n "$LD_LIBRARY_PATH"; then for lib in `echo $LD_LIBRARY_PATH | $AWK -F: '{ for (i = NF; i > 0; --i) print $i }' | sort | uniq`; do if test -f ${lib}/libpng.so; then AC_CHECK_LIB(png, png_info_init, @@ -169,7 +169,7 @@ $NetBSD: patch-ad,v 1.5 2002/05/13 15:15:24 lukem Exp $ ], [], [-lm -R${lib}],) -@@ -524,7 +527,8 @@ +@@ -550,7 +554,8 @@ AC_SUBST(DRIVER_INSTALL_TARGET) AC_SUBST(LIBOBJ) AC_SUBST(BUILDOBJ) AC_SUBST(NETLIBS) diff --git a/sysutils/ups-nut-cgi/patches/patch-ae b/sysutils/ups-nut-cgi/patches/patch-ae index f50fae45b14..52f204c5515 100644 --- a/sysutils/ups-nut-cgi/patches/patch-ae +++ b/sysutils/ups-nut-cgi/patches/patch-ae @@ -1,38 +1,38 @@ -$NetBSD: patch-ae,v 1.1 2001/11/19 03:47:42 lukem Exp $ +$NetBSD: patch-ae,v 1.2 2002/07/03 11:57:14 lukem Exp $ ---- clients/upsstats.c.orig Wed Aug 29 22:36:41 2001 +--- clients/upsstats.c.orig Thu Mar 21 17:01:16 2002 +++ clients/upsstats.c -@@ -73,6 +73,7 @@ +@@ -74,6 +74,7 @@ int main() double tempf; char model[64], status[64], battpct[64], utility[64], loadpct[64], upstemp[64], acfreq[64], *stat, *ptr; + char runtime[64]; int i; - strcpy (monhost, MONHOST); /* default host */ -@@ -149,6 +150,7 @@ - - printf ("\n"); + extractcgiargs(); +@@ -162,6 +163,7 @@ int main() + printf("\n"); + printf("\n"); +#if 0 - printf ("
\n");
+ 	printf("
\n");
  
  	/* TODO: handle self tests */
-@@ -156,6 +158,7 @@
- /*	printf ("Last UPS Self Test: Not Available\n"); */
- /*	printf ("    Last Test Date: Not Available\n"); */
- 	printf ("
\n");
+@@ -169,6 +171,7 @@ int main() 
+ /*	printf("Last UPS Self Test: Not Available\n"); */
+ /*	printf("    Last Test Date: Not Available\n"); */
+ 	printf("
\n"); +#endif - printf ("
\n");
+ 	printf("
\n");
  
-@@ -173,6 +176,9 @@
+@@ -186,6 +189,9 @@ int main() 
  
- 	if (getupsvar (monhost, "acfreq", acfreq, sizeof(acfreq)) > 0)
- 		printf (" Output Freq: %s Hz\n", acfreq);
+ 	if (getupsvar(monhost, "acfreq", acfreq, sizeof(acfreq)) > 0)
+ 		printf(" Output Freq: %s Hz\n", acfreq);
 +
-+	if (getupsvar (monhost, "runtime", runtime, sizeof(runtime)) > 0)
-+		printf ("     Runtime: %s\n", runtime);
++	if (getupsvar(monhost, "runtime", runtime, sizeof(runtime)) > 0)
++		printf("     Runtime: %s\n", runtime);
  
- 	printf ("
\n");
- 	printf ("
Network UPS Tools upsstats %s
\n", UPS_VERSION);
+ 	printf("

\n"); + printf("

Network UPS Tools upsstats %s
\n", UPS_VERSION); diff --git a/sysutils/ups-nut/MESSAGE b/sysutils/ups-nut/MESSAGE index 6fadded5ed6..0f0df12dbcb 100644 --- a/sysutils/ups-nut/MESSAGE +++ b/sysutils/ups-nut/MESSAGE @@ -1,9 +1,13 @@ ====================================================================== -$NetBSD: MESSAGE,v 1.1 2002/05/13 14:40:51 lukem Exp $ +$NetBSD: MESSAGE,v 1.2 2002/07/03 11:57:11 lukem Exp $ ${NUT_CONFDIR}/upsd.users has a new format from version 0.45.5. You will need to update this before restarting upsd(8). Refer to ${NUT_EGDIR}/upsd.users.sample and upsd.users(5) for more information. + The network port used by nut changed in version 0.50.0, + to the IANA assigned 3493, from 3305 in previous versions. + You will need to update all clients. + ====================================================================== diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile index 720faad7b5b..a40c14f32d8 100644 --- a/sysutils/ups-nut/Makefile +++ b/sysutils/ups-nut/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.20 2002/05/22 18:02:32 fredb Exp $ +# $NetBSD: Makefile,v 1.21 2002/07/03 11:57:12 lukem Exp $ # -DISTNAME= nut-0.45.5 -PKGNAME= ups-nut-0.45.5 -PKGREVISION= 1 +DISTNAME= nut-0.50.0 +PKGNAME= ups-nut-0.50.0 CATEGORIES= sysutils MASTER_SITES= http://www.exploits.org/nut/release/ @@ -74,12 +73,14 @@ post-install: ${INSTALL_SCRIPT} ${WRKDIR}/$${script} \ ${PREFIX}/etc/rc.d/$${script}; \ done - ${INSTALL_DATA_DIR} ${NUT_DOCDIR} ${NUT_DOCDIR}/cables - ${INSTALL_DATA} ${WRKSRC}/docs/cables/*.txt ${NUT_DOCDIR}/cables - ${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${NUT_DOCDIR} - ${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${NUT_DOCDIR} - ${INSTALL_DATA} ${WRKSRC}/docs/Changes.trust ${NUT_DOCDIR} + ${INSTALL_DATA_DIR} ${NUT_DOCDIR} + ${INSTALL_DATA_DIR} ${NUT_DOCDIR}/cables ${NUT_DOCDIR}/drivers ${INSTALL_DATA} ${WRKSRC}/README ${NUT_DOCDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${NUT_DOCDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/driver.list ${NUT_DOCDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${NUT_DOCDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/cables/*.txt ${NUT_DOCDIR}/cables + ${INSTALL_DATA} ${WRKSRC}/docs/drivers/*.txt ${NUT_DOCDIR}/drivers .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/ups-nut/PLIST b/sysutils/ups-nut/PLIST index df23923ae28..a2144ec3f2e 100644 --- a/sysutils/ups-nut/PLIST +++ b/sysutils/ups-nut/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2002/05/13 14:40:51 lukem Exp $ +@comment $NetBSD: PLIST,v 1.9 2002/07/03 11:57:12 lukem Exp $ bin/upsc bin/upscmd bin/upsct @@ -16,12 +16,20 @@ man/man5/upsmon.conf.5 man/man5/upssched.conf.5 man/man8/apcsmart.8 man/man8/belkin.8 +man/man8/bestferrups801-807.8 man/man8/bestups.8 +man/man8/cyberpower.8 +man/man8/everups.8 man/man8/fentonups.8 +man/man8/genericups.8 +man/man8/hp.8 +man/man8/masterguard.8 +man/man8/mge-ellipse.8 man/man8/newapc.8 -man/man8/newvictron.8 man/man8/nutupsdrv.8 man/man8/powercom.8 +man/man8/sec.8 +man/man8/tripplite.8 man/man8/upsc.8 man/man8/upscmd.8 man/man8/upsct.8 @@ -31,73 +39,66 @@ man/man8/upsdrvctl.8 man/man8/upslog.8 man/man8/upsmon.8 man/man8/upssched.8 -sbin/ups-drivers/aeg +man/man8/victronups.8 sbin/ups-drivers/apcsmart sbin/ups-drivers/belkin sbin/ups-drivers/bestferrups801-807 -sbin/ups-drivers/bestfort -sbin/ups-drivers/bestuferrups sbin/ups-drivers/bestups sbin/ups-drivers/cyberpower -sbin/ups-drivers/engetron sbin/ups-drivers/everups sbin/ups-drivers/fentonups sbin/ups-drivers/genericups sbin/ups-drivers/hp -sbin/ups-drivers/ipt-anzen sbin/ups-drivers/masterguard sbin/ups-drivers/mge-ellipse -sbin/ups-drivers/mgeups -sbin/ups-drivers/multilink -sbin/ups-drivers/mustekups +sbin/ups-drivers/mge-utalk sbin/ups-drivers/newapc -sbin/ups-drivers/newpowercom -sbin/ups-drivers/newvictron -sbin/ups-drivers/optiups sbin/ups-drivers/powercom +sbin/ups-drivers/powerware sbin/ups-drivers/sec -sbin/ups-drivers/sms -sbin/ups-drivers/toshiba1500 sbin/ups-drivers/tripplite -sbin/ups-drivers/ups-trust425+625 -sbin/ups-drivers/upseyeux sbin/ups-drivers/victronups sbin/upsd sbin/upsdrvctl sbin/upsmon sbin/upssched -share/doc/nut/Changes.trust share/doc/nut/FAQ share/doc/nut/README share/doc/nut/access.txt -share/doc/nut/belkin.txt -share/doc/nut/bestferrups801-807.txt share/doc/nut/big-servers.txt +share/doc/nut/cables/apc.txt +share/doc/nut/cables/ge-imv-victron.txt +share/doc/nut/cables/imv.txt +share/doc/nut/cables/mgeups.txt share/doc/nut/cables/powerware.txt share/doc/nut/cables/repotec.txt share/doc/nut/cables/sms.txt -share/doc/nut/cables/victron.txt share/doc/nut/chroot.txt share/doc/nut/commands.txt share/doc/nut/config-files.txt share/doc/nut/configure.txt share/doc/nut/data-room.txt share/doc/nut/design.txt +share/doc/nut/developers.txt share/doc/nut/driver-control.txt -share/doc/nut/dummycons.txt -share/doc/nut/dummyups.txt -share/doc/nut/generic-ups.txt -share/doc/nut/mge-ellipse.txt +share/doc/nut/driver.list +share/doc/nut/drivers/belkin.txt +share/doc/nut/drivers/bestferrups801-807.txt +share/doc/nut/drivers/dummycons.txt +share/doc/nut/drivers/dummyups.txt +share/doc/nut/drivers/generic-ups.txt +share/doc/nut/drivers/mge-ellipse.txt +share/doc/nut/drivers/mge-utalk.txt +share/doc/nut/drivers/multilink.txt +share/doc/nut/drivers/powercom.txt +share/doc/nut/drivers/snmp-ups.txt share/doc/nut/model-arguments.txt -share/doc/nut/multilink.txt share/doc/nut/new-modules.txt share/doc/nut/pager.txt -share/doc/nut/powercom.txt share/doc/nut/protocol.txt share/doc/nut/shutdown.txt share/doc/nut/tips.txt share/doc/nut/todo.txt -share/doc/nut/ups-trust425+625.txt share/doc/nut/upssched.txt share/examples/nut/hosts.conf.sample share/examples/nut/multimon.conf.sample @@ -108,6 +109,7 @@ share/examples/nut/upsmon.conf.sample share/examples/nut/upssched.conf.sample share/examples/nut/upsset.conf.sample @dirrm share/examples/nut +@dirrm share/doc/nut/drivers @dirrm share/doc/nut/cables @dirrm share/doc/nut @dirrm sbin/ups-drivers diff --git a/sysutils/ups-nut/distinfo b/sysutils/ups-nut/distinfo index e80f4b745ba..3768fccf2ec 100644 --- a/sysutils/ups-nut/distinfo +++ b/sysutils/ups-nut/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.12 2002/05/24 16:32:52 fredb Exp $ +$NetBSD: distinfo,v 1.13 2002/07/03 11:57:12 lukem Exp $ -SHA1 (nut-0.45.5.tar.gz) = 5cb08e27fb7e528a453d164d401410d341bf3bb3 -Size (nut-0.45.5.tar.gz) = 386936 bytes -SHA1 (patch-aa) = 74fcdb7d75dcc7a53b0591bd22ff5c6bbeb572ff +SHA1 (nut-0.50.0.tar.gz) = b8826f2e7301e5c753ac946574a53d651faf69c3 +Size (nut-0.50.0.tar.gz) = 382755 bytes +SHA1 (patch-aa) = 4d16a24725a0ff645c430ba43ef8c52856491a73 SHA1 (patch-ab) = fac1a47430a2c2d692ecede2ac6ed78c60a82566 +SHA1 (patch-ac) = 60b2ac079232ab4af1b41928760601f0a09b9ae1 SHA1 (patch-ad) = 1132a678cc53882cc92764ed17bbd4cf4152c58d SHA1 (patch-ag) = b6ae992f9b92d68683ac6adb7378d11158cc1fdc diff --git a/sysutils/ups-nut/patches/patch-aa b/sysutils/ups-nut/patches/patch-aa index ff702417bf6..b06f339e18c 100644 --- a/sysutils/ups-nut/patches/patch-aa +++ b/sysutils/ups-nut/patches/patch-aa @@ -1,15 +1,16 @@ -$NetBSD: patch-aa,v 1.5 2002/05/24 16:32:52 fredb Exp $ +$NetBSD: patch-aa,v 1.6 2002/07/03 11:57:13 lukem Exp $ ---- models/upscommon.c.orig Fri Mar 15 00:59:57 2002 +--- models/upscommon.c.orig Fri May 17 15:27:55 2002 +++ models/upscommon.c -@@ -716,6 +716,10 @@ - return; - } +@@ -688,6 +688,11 @@ void info_ready(void) + { + int ret; +#ifdef HAVE_MMAP + /* sync external file representation before operating on the file */ + msync(shared_info, info_size, MS_INVALIDATE); +#endif ++ ret = rename(initfn, statefn); if (ret != 0) diff --git a/sysutils/ups-nut/patches/patch-ac b/sysutils/ups-nut/patches/patch-ac new file mode 100644 index 00000000000..16286d5f35a --- /dev/null +++ b/sysutils/ups-nut/patches/patch-ac @@ -0,0 +1,18 @@ +$NetBSD: patch-ac,v 1.4 2002/07/03 11:57:13 lukem Exp $ + +--- clients/upslog.c.orig Fri May 17 08:26:22 2002 ++++ clients/upslog.c +@@ -180,6 +180,13 @@ void print_status(void) + continue; + } + ++ /* if a %%, append % and start over */ ++ if (logformat[i+1] == '%') { ++ snprintfcat(logbuffer, sizeof(logbuffer), "%%"); ++ i++; ++ continue; ++ } ++ + /* it must start with a % now - %[ ]%*/ + + cmd = xstrdup(&logformat[i+1]); -- cgit v1.2.3