rpms/nut/FC-3 nut-2.0.1-bad.patch, NONE, 1.1 nut-2.0.2-buffer.patch, NONE, 1.1 nut-2.0.2-warning.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 nut.spec, 1.16, 1.17 sources, 1.9, 1.10

Tue Oct 4 10:30:07 UTC 2005

Author: than

Update of /cvs/dist/rpms/nut/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv25164

Modified Files:
	.cvsignore nut.spec sources 
Added Files:
	nut-2.0.1-bad.patch nut-2.0.2-buffer.patch 
	nut-2.0.2-warning.patch 
Log Message:
update to 2.0.2


nut-2.0.1-bad.patch:
 cpsups.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE nut-2.0.1-bad.patch ---
--- nut-2.0.1/drivers/cpsups.c.orig	2005-03-10 18:18:37.417101653 +0100
+++ nut-2.0.1/drivers/cpsups.c	2005-03-10 18:18:04.258008857 +0100
@@ -133,9 +133,6 @@
 /*	These are used to hold status of UPS.
  *	val1 = online/onbattery status
  */
- 	char temp1=values[6][0];
-	char *tmp1=&temp1;
-
 	while ((pollstatusmap[i].end != 0))
 	{
 		pos = &buf[pollstatusmap[i].begin];
@@ -144,6 +141,9 @@
 		i++;
 	}
 
+	char temp1=values[6][0];
+	char *tmp1=&temp1;
+
 	if ((*tmp1 & CPS_STAT_OL) && !(*tmp1 & CPS_STAT_OB)) 
 		status_set("OL");
 

nut-2.0.2-buffer.patch:
 bestfcom.c  |    2 +-
 tripplite.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE nut-2.0.2-buffer.patch ---
--- nut-2.0.2/drivers/bestfcom.c.tn	2005-07-20 14:56:00.000000000 +0200
+++ nut-2.0.2/drivers/bestfcom.c	2005-07-20 14:56:51.000000000 +0200
@@ -527,7 +527,7 @@
 
 	ser_get_line(upsfd, rstring, sizeof(rstring), '>', "", 3, 0);
 
-	rstring[sizeof(rstring)] = '\0';
+	rstring[sizeof(rstring) -1] = '\0';
 	upsdebugx(2, "id response: %s", rstring);
 
 	/* Better way to identify this unit is using "d 15\r", which results in
--- nut-2.0.2/drivers/tripplite.c.tn	2005-07-20 14:54:18.000000000 +0200
+++ nut-2.0.2/drivers/tripplite.c	2005-07-20 14:55:46.000000000 +0200
@@ -143,7 +143,7 @@
 
 static int hex2d(char *start, unsigned int len)
 {
-	char buf[32];
+	char buf[33];
 	buf[32] = '\0';
 
 	strncpy(buf, start, (len < (sizeof buf) ? len : (sizeof buf - 1)));

nut-2.0.2-warning.patch:
 hidups.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

--- NEW FILE nut-2.0.2-warning.patch ---
--- nut-2.0.2/drivers/hidups.c.orig	2005-10-04 11:00:48.000000000 +0200
+++ nut-2.0.2/drivers/hidups.c	2005-10-04 11:37:57.000000000 +0200
@@ -108,15 +108,16 @@
 
 	/* XXX: deal with bogosity by throwing it out */
 	if (ev->value > 3000000) {
-		upslogx(LOG_INFO, "Ignoring bogus event 0x%x (%d)",
-			ev->hid, ev->value);
+		/* upslogx(LOG_INFO, "Ignoring bogus event 0x%x (%d)",
+			ev->hid, ev->value); */
 		return;
 	}
 
 	/* x86 page == ups-specific, ignore these for now */
 	if ((ev->hid & 0x860000) == 0x860000) {
-		upslogx(LOG_INFO, "Ignoring x86 page event 0x%x (%d)",
-			ev->hid, ev->value);
+
+		/* upslogx(LOG_INFO, "Ignoring x86 page event 0x%x (%d)",
+			ev->hid, ev->value); */
 		return;
 	}
 
@@ -176,8 +177,9 @@
 			break;
 
 		default:
-			upslogx(LOG_INFO, "Unhandled event: 0x%x (%d)",
-				ev->hid, ev->value);
+			/* upslogx(LOG_INFO, "Unhandled event: 0x%x (%d)",
+				ev->hid, ev->value); */
+			break;
 	}
 
 	/* deal with any status changes */


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/nut/FC-3/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	9 Sep 2004 09:22:49 -0000	1.9
+++ .cvsignore	4 Oct 2005 10:30:04 -0000	1.10
@@ -1 +1,2 @@
 nut-2.0.0.tar.gz
+nut-2.0.2.tar.gz


Index: nut.spec
===================================================================
RCS file: /cvs/dist/rpms/nut/FC-3/nut.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- nut.spec	5 Oct 2004 15:09:23 -0000	1.16
+++ nut.spec	4 Oct 2005 10:30:04 -0000	1.17
@@ -3,25 +3,29 @@
 
 %define initdir /etc/rc.d/init.d
 %define cgidir  /var/www/nut-cgi-bin
+%define piddir  /var/run/nut
 %define modeldir /sbin
 
 %define devel 0
 
 Summary: Network UPS Tools
 Name: nut
-Version: 2.0.0
-Release: 5
+Version: 2.0.2
+Release: 0.fc3.1
 Group: Applications/System
 License: GPL
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Url: http://us2.networkupstools.org/
-Source: http://us2.networkupstools.org/source/2.0/%{name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Url: http://wwww.networkupstools.org/
+Source: http://www.networkupstools.org/source/2.0/%{name}-%{version}.tar.gz
 Source1: ups.init
 Source2: ups.sysconfig
 
 Patch0: nut-1.4.0-buildroot.patch
 Patch1: nut-0.45.0-conffiles.patch
 Patch2: nut-0.45.4-conf.patch
+Patch3: nut-2.0.1-bad.patch
+Patch4: nut-2.0.2-buffer.patch
+Patch5: nut-2.0.2-warning.patch
 
 Requires: nut-client
 
@@ -37,7 +41,10 @@
 BuildPrereq: elfutils-devel
 BuildPrereq: XFree86-devel
 BuildPrereq: libjpeg-devel
+
+%ifnarch s390 s390x
 BuildPrereq: libusb-devel
+%endif
 
 ExcludeArch: s390 s390x
 
@@ -82,12 +89,20 @@
 %patch0 -p1 -b .buildroot
 %patch1 -p1 -b .conf
 %patch2 -p1 -b .conf1
+%patch3 -p1 -b .bad
+%patch4 -p1 -b .buffer
+%patch5 -p1 -b .warnings
+
+iconv -f iso-8859-1 -t utf-8 < man/newhidups.8 > man/newhidups.8_
+mv man/newhidups.8_ man/newhidups.8
 
 %build
 %configure \
     --with-user=%{name} \
     --with-group=uucp \
-    --with-statepath=%{_localstatedir}/lib/ups \
+    --with-statepath=%{piddir} \
+    --with-pidpath=%{piddir} \
+    --with-altpidpath=%{piddir} \
     --sysconfdir=%{_sysconfdir}/ups \
     --with-cgipath=%{cgidir} \
     --with-drvpath=%{modeldir} \
@@ -104,6 +119,7 @@
 
 mkdir -p %{buildroot}%{modeldir} \
          %{buildroot}%{_sysconfdir}/sysconfig \
+         %{buildroot}%{piddir} \
          %{buildroot}%{_localstatedir}/lib/ups \
          %{buildroot}%{initdir}
 
@@ -167,8 +183,8 @@
 %files
 %defattr(-,root,root)
 %doc COPYING CREDITS CHANGES README docs UPGRADING
-%config(noreplace) %attr(644,root,root) %{_sysconfdir}/ups/ups.conf
-%config(noreplace) %attr(644,root,root) %{_sysconfdir}/ups/upsd.conf
+%config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/ups.conf
+%config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/upsd.conf
 %config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/upsd.users
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/sysconfig/ups
 %{modeldir}/*
@@ -205,19 +221,26 @@
 %{_mandir}/man8/energizerups.8.gz
 %{_mandir}/man8/safenet.8.gz
 %{_mandir}/man8/belkinunv.8.gz
-%{_mandir}/man8/cyberpower1100.8.gz
 %{_mandir}/man8/hidups.8.gz
 %{_mandir}/man8/ippon.8.gz
 %{_mandir}/man8/newhidups.8.gz
 %{_mandir}/man8/snmp-ups.8.gz
-
+%{_mandir}/man8/bestfcom.8.gz
+%{_mandir}/man8/cpsups.8.gz
+%{_mandir}/man8/metasys.8.gz
+%{_mandir}/man8/mustek.8.gz
+%{_mandir}/man8/powermust.8.gz
+%{_mandir}/man8/bcmxcp.8*
+%{_mandir}/man8/solis.8*
+%{_mandir}/man8/upscode2.8*
 %files client
 %defattr(-,root,root)
 %attr(755,root,root) %{initdir}/ups
 %dir %{_sysconfdir}/ups
-%config(noreplace) %attr(400,nut,nut) %{_sysconfdir}/ups/upsmon.conf
-%config(noreplace) %attr(400,nut,nut) %{_sysconfdir}/ups/upssched.conf
+%config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/upsmon.conf
+%config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/upssched.conf
 %dir %attr(750,nut,nut) %{_localstatedir}/lib/ups
+%dir %attr(750,nut,nut) %{piddir}
 %{_bindir}/upsc
 %{_bindir}/upscmd
 %{_bindir}/upsrw
@@ -248,6 +271,9 @@
 %{_mandir}/man8/upsset.cgi.8.gz
 
 %changelog
+* Tue Oct 04 2005 Than Ngo <than at redhat.com> 2.0.2-0.fc3.1
+- update to 2.0.2
+
 * Tue Oct 05 2004 Than Ngo <than at redhat.com> 2.0.0-5
 - more buildrequires
 - don't build on s390/s390x


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/nut/FC-3/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	9 Sep 2004 09:22:49 -0000	1.9
+++ sources	4 Oct 2005 10:30:04 -0000	1.10
@@ -1 +1 @@
-84649ad95809737b5ffc19efdd9e9952  nut-2.0.0.tar.gz
+6560df8d0a42f0f585d34ed1ae8c6f67  nut-2.0.2.tar.gz


