rpms/nut/devel nut-ipv6.patch,1.2,1.3 nut.spec,1.38,1.39
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Jan 23 16:34:04 UTC 2007
Author: karsten
Update of /cvs/dist/rpms/nut/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31984
Modified Files:
nut-ipv6.patch nut.spec
Log Message:
- rename fatal to fatal_with_errno in ipv6 patch
- fix filelist
nut-ipv6.patch:
clients/upsc.c | 3
clients/upsclient.c | 167 ++++++++++++++++++++++++++++++----------------------
clients/upsclient.h | 2
server/access.c | 149 ++++++++++++++++++++++++++++++++++++++--------
server/access.h | 8 +-
server/ctype.h | 2
server/upsd.c | 124 +++++++++++++++++++++++++++-----------
server/user.c | 6 -
server/user.h | 4 -
9 files changed, 326 insertions(+), 139 deletions(-)
Index: nut-ipv6.patch
===================================================================
RCS file: /cvs/dist/rpms/nut/devel/nut-ipv6.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nut-ipv6.patch 23 Jan 2007 15:26:50 -0000 1.2
+++ nut-ipv6.patch 23 Jan 2007 16:34:01 -0000 1.3
@@ -49,7 +49,7 @@
+ return(0);
+ }
+ default:
-+ fatal ("mask_cmp: Unknown address family");
++ fatal_with_errno ("mask_cmp: Unknown address family");
+ return(0);
+ }
+}
@@ -112,7 +112,7 @@
+ stmp = strchr (addr, ']');
+ if (stmp == NULL) {
+ free (tmp);
-+ fatal("Expecting \']\' in \"%s\"", addr);
++ fatal_with_errno("Expecting \']\' in \"%s\"", addr);
+ }
+
+ *stmp = '\0';
@@ -123,7 +123,7 @@
+
+ if (inet_pton (AF_INET6, addr, &s6.sin6_addr) < 1) {
+ free (tmp);
-+ fatal ("Invalid IPv6 address: \"%s\"", addr);
++ fatal_with_errno ("Invalid IPv6 address: \"%s\"", addr);
+ }
+
+ /* prefix */
@@ -131,7 +131,7 @@
+
+ if (tmp->mask < 0 || tmp->mask > 128) {
+ free (tmp);
-+ fatal ("Invalid IPv6 prefix");
++ fatal_with_errno ("Invalid IPv6 prefix");
+ }
+
+ { register unsigned char i;
@@ -155,7 +155,7 @@
+
+ if (tmp->mask < 0 || tmp->mask > 32) {
+ free (tmp);
-+ fatal ("Invalid CIDR type block: Must be > 0 && < 32");
++ fatal_with_errno ("Invalid CIDR type block: Must be > 0 && < 32");
+ }
+ tmp->mask = 0xffffffff << (32 - tmp->mask);
+ } else {
@@ -167,7 +167,7 @@
+
+ if (inet_pton (AF_INET, addr, &s4.sin_addr) < 1) {
+ free (tmp);
-+ fatal ("Invalid IPv4 address: \"%s\"", addr);
++ fatal_with_errno ("Invalid IPv4 address: \"%s\"", addr);
+ }
+
+ s4.sin_addr.s_addr &= htonl (tmp->mask);
@@ -316,14 +316,14 @@
+
+ service = malloc (sizeof (char) * 6);
+ if (service == NULL)
-+ fatal("malloc");
++ fatal_with_errno("malloc");
+
+ if (snprintf (service, 6, "%hu", (unsigned short int)net_port) < 1)
-+ fatal("snprintf");
++ fatal_with_errno("snprintf");
+
+ if (getaddrinfo (listenaddr, service, &hints, &r) != 0) {
+ free (service);
-+ fatal("getaddrinfo");
++ fatal_with_errno("getaddrinfo");
+ }
+ free (service);
+
@@ -331,16 +331,16 @@
+ listenfd = socket(r->ai_family, r->ai_socktype, r->ai_protocol);
+ if (listenfd < 0) {
+ if (r->ai_next == NULL)
-+ fatal("socket");
++ fatal_with_errno("socket");
+ continue;
+ }
+ res = setsockopt(listenfd, SOL_SOCKET, SO_REUSEADDR, (void *) &one, sizeof(one));
+ if (res != 0)
-+ fatal("setsockopt(SO_REUSEADDR)");
++ fatal_with_errno("setsockopt(SO_REUSEADDR)");
+
+ if (bind (listenfd, r->ai_addr, r->ai_addrlen) == -1) {
+ if (r->ai_next == NULL)
-+ fatal("Can't bind TCP port number %u", net_port);
++ fatal_with_errno("Can't bind TCP port number %u", net_port);
+ close (listenfd);
+ continue;
+ }
@@ -348,16 +348,16 @@
- if (fcntl(listenfd, F_SETFL, res | O_NDELAY) == -1)
- fatal_with_errno("fcntl(set)");
+ if ((res = fcntl(listenfd, F_GETFL, 0)) == -1)
-+ fatal("fcntl(get)");
++ fatal_with_errno("fcntl(get)");
- if (listen(listenfd, 16))
- fatal_with_errno("listen");
+ if (fcntl(listenfd, F_SETFL, res | O_NDELAY) == -1)
-+ fatal("fcntl(set)");
++ fatal_with_errno("fcntl(set)");
+ if (listen(listenfd, 16) == -1) {
+ if (r->ai_next == NULL)
-+ fatal("listen");
++ fatal_with_errno("listen");
+ close (listenfd);
+ continue;
+ }
Index: nut.spec
===================================================================
RCS file: /cvs/dist/rpms/nut/devel/nut.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- nut.spec 23 Jan 2007 15:26:50 -0000 1.38
+++ nut.spec 23 Jan 2007 16:34:01 -0000 1.39
@@ -11,7 +11,7 @@
Summary: Network UPS Tools
Name: nut
Version: 2.0.5
-Release: 1
+Release: 2
Group: Applications/System
License: GPL
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -132,12 +132,13 @@
install-snmp DESTDIR=%{buildroot}
install -m 755 drivers/hidups %{buildroot}%{modeldir}/
-install -m 755 drivers/dummycons %{buildroot}%{modeldir}/
+# install -m 755 drivers/dummycons %{buildroot}%{modeldir}/
install -m 755 drivers/energizerups %{buildroot}%{modeldir}/
install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/ups
install -m 755 %{SOURCE1} %{buildroot}%{initdir}/ups
+install -m 644 man/gamatronic.* %{buildroot}%{_mandir}/man8/
install -m 644 scripts/hotplug-ng/nut-usbups.rules %{buildroot}%{_sysconfdir}/udev/rules.d
# rename
@@ -146,6 +147,8 @@
mv $file %{buildroot}%{_sysconfdir}/ups/`basename $file .sample`
done
+rm -f %{buildroot}/usr/html/*
+
%if !%{devel}
rm -rf %{buildroot}%{_includedir} \
%{buildroot}%{_mandir}/man3/upscli_* \
@@ -186,7 +189,7 @@
%files
%defattr(-,root,root)
-%doc COPYING CREDITS CHANGES README docs UPGRADING INSTALL NEWS
+%doc COPYING CREDITS ChangeLog README docs UPGRADING INSTALL NEWS
%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
@@ -234,13 +237,18 @@
%{_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*
%{_mandir}/man8/bcmxcp_usb.8.gz
%{_mandir}/man8/gamatronic.8.gz
%{_mandir}/man8/tripplite_usb.8.gz
+%{_mandir}/man8/dummy-ups.8.gz
+%{_mandir}/man8/al175.8.gz
+%{_mandir}/man8/megatec.8.gz
+%{_mandir}/man8/nitram.8.gz
+%{_mandir}/man8/optiups.8.gz
+%{_mandir}/man8/powerpanel.8.gz
%files client
%defattr(-,root,root)
%attr(755,root,root) %{initdir}/ups
@@ -279,6 +287,10 @@
%{_mandir}/man8/upsset.cgi.8.gz
%changelog
+* Tue Jan 23 2007 Karsten Hopp <karsten at redhat.com> 2.0.5-2
+- rename fatal to fatal_with_errno in ipv6 patch
+- fix filelist
+
* Tue Jan 23 2007 Karsten Hopp <karsten at redhat.com> 2.0.5-1
- update to 2.0.5
More information about the fedora-cvs-commits
mailing list