From 726fc723512e297faaa73abf54093017e61d8873 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 09:20:40 +0000 Subject: auto-import changelog data from nut-0.45.0-2.src.rpm Fri Jul 06 2001 Than Ngo 0.45.0-2 - rebuild Wed Jun 13 2001 Than Ngo - update to 0.45.0 - add some patches from alane@geeksrus.net (bug #44361, #44363) Sun Apr 22 2001 Than Ngo - add all available UPS drivers (Bug #36937) Fri Apr 13 2001 Than Ngo - update to 0.44.3 (Bug #35255) --- diff --git a/.cvsignore b/.cvsignore index c3db234..79cd6a8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -nut-0.44.1.tar.gz +nut-0.45.0.tar.gz diff --git a/nut-0.45.0-conffiles.patch b/nut-0.45.0-conffiles.patch new file mode 100644 index 0000000..bc8ac00 --- /dev/null +++ b/nut-0.45.0-conffiles.patch @@ -0,0 +1,14 @@ +--- nut-0.45.0/conf/Makefile.in.or Fri Jun 1 05:23:15 2001 ++++ nut-0.45.0/conf/Makefile.in Tue Jun 12 20:29:35 2001 +@@ -12,9 +12,9 @@ + + install: + @for f in $(SECFILES) ; do \ +- $(INSTALLCMD) -m 0600 $$f $(CONFPATH)/$$f.sample; \ ++ $(INSTALLCMD) -m 0600 $$f $(CONFPATH)/$$f; \ + done + + @for f in $(PUBFILES) ; do \ +- $(INSTALLCMD) -m 0644 $$f $(CONFPATH)/$$f.sample; \ ++ $(INSTALLCMD) -m 0644 $$f $(CONFPATH)/$$f; \ + done diff --git a/nut.spec b/nut.spec index 4d6f509..510d81b 100644 --- a/nut.spec +++ b/nut.spec @@ -2,14 +2,17 @@ %define cgidir /var/www/nut-cgi-bin Summary: Network UPS Tools Name: nut -Version: 0.44.1 -Release: 5 +Version: 0.45.0 +Release: 2 Group: Applications/System Source: http://www.exploits.org/nut/release/%{name}-%{version}.tar.gz Source1: ups.init Source2: ups.sysconfig -Patch0: nut-0.44.0-buildroot.patch +Patch0: nut-0.44.3-buildroot.patch Patch1: nut-0.44.1-config.patch +Patch2: nut-0.45.0-nonblock.patch +Patch3: nut-0.45.0-conffiles.patch +Patch4: nut-0.45.0-client.patch License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires: nut-client @@ -47,12 +50,14 @@ browser. # remove chown /var/lib/state so that we don't have to build rpms as root. %patch0 -p1 -b .buildroot %patch1 -p1 -b .config - +%patch2 -p1 -b .nonblock +%patch3 -p1 -b .conf +%patch4 -p1 -b .client %build %configure \ - --with-uid=`id -u nobody` \ - --with-gid=`id -g nobody` \ + --with-user=nobody \ + --with-group=nobody \ --with-statepath=%{_localstatedir}/lib/ups \ --sysconfdir=%{_sysconfdir}/ups \ --with-cgipath=%{cgidir} @@ -91,16 +96,32 @@ rm -rf %{buildroot} %files %defattr(-,root,root) -%doc COPYING CREDITS Changes QUICKSTART README docs +%doc COPYING CREDITS CHANGES README docs %config(noreplace) %attr(644,root,root) %{_sysconfdir}/sysconfig/ups %{_bindir}/apcsmart +%{_bindir}/belkin +%{_bindir}/bestfort +%{_bindir}/bestuferrups +%{_bindir}/engetron +%{_bindir}/ipt-anzen +%{_bindir}/mge-ellipse +%{_bindir}/mgeups +%{_bindir}/mustekups +%{_bindir}/newapc +%{_bindir}/powercom +%{_bindir}/toshiba1500 +%{_bindir}/upseyeux +%{_bindir}/victronups %{_bindir}/bestups %{_bindir}/fentonups %{_bindir}/genericups %{_bindir}/optiups %{_bindir}/ups-trust425+625 -%{_bindir}/upsd +%{_bindir}/multilink +%{_bindir}/sec +%{_sbindir}/upsd %{_bindir}/upslog +%{_mandir}/man8/* %files client %defattr(-,root,root) @@ -108,21 +129,37 @@ rm -rf %{buildroot} %config(noreplace) %{_sysconfdir}/ups/hosts.conf %config(noreplace) %{_sysconfdir}/ups/multimon.conf %config(noreplace) %attr(600,root,root) %{_sysconfdir}/ups/upsd.conf +%config(noreplace) %attr(600,root,root) %{_sysconfdir}/ups/upsd.users %config(noreplace) %attr(600,root,root) %{_sysconfdir}/ups/upsmon.conf -%config(noreplace) %attr(600,root,root) %{_sysconfdir}/ups/upsset.passwd +%config(noreplace) %attr(600,root,root) %{_sysconfdir}/ups/upsset.conf +%config(noreplace) %attr(600,root,root) %{_sysconfdir}/ups/upssched.conf %dir %attr(755,nobody,nobody) %{_localstatedir}/lib/ups %{_bindir}/upsc %{_bindir}/upscmd %{_bindir}/upsct %{_bindir}/upsct2 -%{_bindir}/upsmon +%{_sbindir}/upsmon +%{_sbindir}/upssched +%{_sbindir}/upssched-cmd %files cgi %defattr(-,root,root) %{cgidir}/* - %changelog +* Fri Jul 6 2001 Than Ngo 0.45.0-2 +- rebuild + +* Wed Jun 13 2001 Than Ngo +- update to 0.45.0 +- add some patches from alane@geeksrus.net (bug #44361, #44363) + +* Sun Apr 22 2001 Than Ngo +- add all available UPS drivers (Bug #36937) + +* Fri Apr 13 2001 Than Ngo +- update to 0.44.3 (Bug #35255) + * Fri Feb 9 2001 Than Ngo - fixed typo (Bug #26535) diff --git a/sources b/sources index 3197c52..c790334 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f34b5c9c4fd55b9763bd801bf88f4ed5 nut-0.44.1.tar.gz +0b818140b1d818269dc0b70b1097b111 nut-0.45.0.tar.gz diff --git a/ups.init b/ups.init index f674614..e341292 100644 --- a/ups.init +++ b/ups.init @@ -22,33 +22,33 @@ else fi start() { - if [ "$SERVER" = "yes" ]; then - # Exit if server = yes and model = NONE (not configured) + if [ "$SERVER" = "yes" ]; then + # Exit if server = yes and model = NONE (not configured) - if [ "$MODEL" = "NONE" ]; then - exit 0 - fi + if [ "$MODEL" = "NONE" ]; then + exit 0 + fi - echo -n $"Starting $MODEL: " - daemon /usr/bin/$MODEL $OPTIONS $DEVICE - echo + echo -n $"Starting $MODEL: " + daemon /usr/bin/$MODEL $OPTIONS $DEVICE + echo - prog="upsd" - echo -n $"Starting $prog: " - daemon /usr/bin/upsd - RETVAL=$? - echo + prog="upsd" + echo -n $"Starting $prog: " + daemon /usr/sbin/upsd + RETVAL=$? + echo - echo -n $"Starting UPS monitor (master): " - daemon /usr/bin/upsmon - echo - else - echo -n $"Starting UPS monitor (slave): " - daemon /usr/bin/upsmon - echo - fi + echo -n $"Starting UPS monitor (master): " + daemon /usr/sbin/upsmon + echo + else + echo -n $"Starting UPS monitor (slave): " + daemon /usr/sbin/upsmon + echo + fi - [ "$RETVAL" = 0 ] && touch /var/lock/subsys/ups + [ "$RETVAL" = 0 ] && touch /var/lock/subsys/ups } stop() {