commit nut for openSUSE:Factory
Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at 2020-05-15 23:51:49 Comparing /work/SRC/openSUSE:Factory/nut (Old) and /work/SRC/openSUSE:Factory/.nut.new.2738 (New) Package is "nut" Fri May 15 23:51:49 2020 rev:67 rq:805684 version:2.7.4 Changes: --- /work/SRC/openSUSE:Factory/nut/nut.changes 2020-02-26 15:06:01.377308085 +0100 +++ /work/SRC/openSUSE:Factory/.nut.new.2738/nut.changes2020-05-15 23:51:49.533487366 +0200 @@ -1,0 +2,6 @@ +Wed May 6 10:45:51 UTC 2020 - pgaj...@suse.com + +- use /usr/lib instead of %{_libexecdir} for systemd and udev + rules, %{_libexecdir} is dedicated for internal binaries + +--- Other differences: -- ++ nut.spec ++ --- /var/tmp/diff_new_pack.GQHXTs/_old 2020-05-15 23:51:50.293488830 +0200 +++ /var/tmp/diff_new_pack.GQHXTs/_new 2020-05-15 23:51:50.293488830 +0200 @@ -203,7 +203,7 @@ --with-drvpath=%{MODELPATH} \ --with-user=%{NUT_USER} \ --with-group=%{NUT_GROUP} \ - --with-udev-dir=%{_libexecdir}/udev \ + --with-udev-dir=%{_udevrulesdir}/.. \ --enable-option-checking=fatal # does not create reproducible output with parallelism @@ -224,8 +224,8 @@ mkdir -p %{buildroot}%{STATEPATH} rename .sample "" %{buildroot}%{_sysconfdir}/ups/*.sample -install -d %{buildroot}%{_libexecdir}/systemd/system-sleep -install nut.system-sleep %{buildroot}%{_libexecdir}/systemd/system-sleep/%{name}.sh +install -d %{buildroot}/usr/lib/systemd/system-sleep +install nut.system-sleep %{buildroot}/usr/lib/systemd/system-sleep/%{name}.sh # Rename web pages to not conflict with apache2-example-pages or user home page: mkdir %{buildroot}%{HTMLPATH}/nut %{buildroot}%{CGIPATH}/nut @@ -307,7 +307,7 @@ %attr(700,%{NUT_USER},%{NUT_GROUP}) %{STATEPATH} %{_unitdir}/*.service %{systemdsystemdutildir}/system-shutdown/* -%{_libexecdir}/systemd/system-sleep/%{name}.sh +/usr/lib/systemd/system-sleep/%{name}.sh %{bashcompletionsdir}/* %files drivers-net
commit nut for openSUSE:Factory
Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at 2020-02-26 15:05:48 Comparing /work/SRC/openSUSE:Factory/nut (Old) and /work/SRC/openSUSE:Factory/.nut.new.26092 (New) Package is "nut" Wed Feb 26 15:05:48 2020 rev:66 rq:779298 version:2.7.4 Changes: --- /work/SRC/openSUSE:Factory/nut/nut.changes 2019-07-24 20:50:52.338448738 +0200 +++ /work/SRC/openSUSE:Factory/.nut.new.26092/nut.changes 2020-02-26 15:06:01.377308085 +0100 @@ -1,0 +2,6 @@ +Tue Feb 25 20:40:40 CET 2020 - sbra...@suse.com + +- Remove obsolete chown from %post. We no more support upgrade from + SUSE Linux 9 (bsc#1157325). + +--- Other differences: -- ++ nut.spec ++ --- /var/tmp/diff_new_pack.YgvObQ/_old 2020-02-26 15:06:02.573310471 +0100 +++ /var/tmp/diff_new_pack.YgvObQ/_new 2020-02-26 15:06:02.577310480 +0100 @@ -1,7 +1,7 @@ # # spec file for package nut # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -39,7 +39,7 @@ Summary:Network UPS Tools Core (Uninterruptible Power Supply Monitoring) License:GPL-2.0-or-later Group: Hardware/UPS -Url:http://www.networkupstools.org/ +URL:http://www.networkupstools.org/ Source: http://www.networkupstools.org/source/2.7/%{name}-%{version}.tar.gz Source2:README.SUSE Source6:nut.system-sleep @@ -245,8 +245,6 @@ %service_add_pre nut-driver.service nut-server.service nut-monitor.service %post -# Be sure that all files are owned by a dedicated user. -chown -R %{NUT_USER}:%{NUT_GROUP} %{STATEPATH} # Generate initial passwords. if grep -q "password = @UPSD_INITIAL_MASTER_PASSWORD@" %{CONFPATH}/upsmon.conf %{CONFPATH}/upsd.users; then UPSD_INITIAL_MASTER_PASSWORD=$(head -c 20 /dev/urandom | md5sum | head -c 10) @@ -256,9 +254,6 @@ UPSD_INITIAL_SLAVE_PASSWORD=$(head -c 20 /dev/urandom | md5sum | head -c 10) sed -i s/@UPSD_INITIAL_SLAVE_PASSWORD@/$UPSD_INITIAL_SLAVE_PASSWORD/ %{CONFPATH}/upsd.users fi -# Be sure that all files are owned by a dedicated user. -chown %{NUT_USER}:root %{CONFPATH}/upsd.conf %{CONFPATH}/upsmon.conf %{CONFPATH}/upsd.users -chmod 600 %{CONFPATH}/upsd.conf %{CONFPATH}/upsmon.conf %{CONFPATH}/upsd.users # Migrate Suspend to Disc to the new convention (bnc#449861 and later bnc#871406): # It was never on by default, but documentation up to 11.0 recommends # "shutdown -z +0" for suspend to disc. It was discontinued before 11.0.
commit nut for openSUSE:Factory
Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at 2019-07-24 20:50:51 Comparing /work/SRC/openSUSE:Factory/nut (Old) and /work/SRC/openSUSE:Factory/.nut.new.4126 (New) Package is "nut" Wed Jul 24 20:50:51 2019 rev:65 rq:718293 version:2.7.4 Changes: --- /work/SRC/openSUSE:Factory/nut/nut.changes 2018-11-28 11:14:13.154829745 +0100 +++ /work/SRC/openSUSE:Factory/.nut.new.4126/nut.changes2019-07-24 20:50:52.338448738 +0200 @@ -1,0 +2,12 @@ +Wed Jul 24 14:16:00 UTC 2019 - Tomáš Chvátal + +- Add patch to fix build on TW: + * nutscanner-ftbfs.patch + +--- +Wed Jul 24 13:25:06 UTC 2019 - matthias.gerst...@suse.com + +- removal of SuSEfirewall2 service, since SuSEfirewall2 has been replaced by + firewalld, see [1]. + +--- Old: nut.firewall.in New: nutscanner-ftbfs.patch Other differences: -- ++ nut.spec ++ --- /var/tmp/diff_new_pack.lFA9fs/_old 2019-07-24 20:50:54.402448423 +0200 +++ /var/tmp/diff_new_pack.lFA9fs/_new 2019-07-24 20:50:54.446448417 +0200 @@ -1,7 +1,7 @@ # # spec file for package nut # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -42,7 +42,6 @@ Url:http://www.networkupstools.org/ Source: http://www.networkupstools.org/source/2.7/%{name}-%{version}.tar.gz Source2:README.SUSE -Source5:nut.firewall.in Source6:nut.system-sleep Source7:nut.sleep Source8: http://www.networkupstools.org/source/2.7/%{name}-%{version}.tar.gz.sig @@ -60,6 +59,7 @@ Patch11:openssl-1_1.patch Patch12:nut-upssched.patch Patch13:reproducible.patch +Patch14:nutscanner-ftbfs.patch BuildRequires: apache2-devel BuildRequires: asciidoc BuildRequires: avahi-devel @@ -167,7 +167,7 @@ %prep %setup -q -cp -a %{SOURCE2} %{SOURCE5} %{SOURCE6} %{SOURCE7} . +cp -a %{SOURCE2} %{SOURCE6} %{SOURCE7} . %patch0 %patch3 %patch7 -p1 @@ -177,6 +177,7 @@ %patch11 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 sed -i s/@now@/`date -r ChangeLog +%%Y-%%m-%%d`/g docs/docinfo.xml.in sed -i s:%{_prefix}/local/ups/bin:/bin: conf/upssched.conf.sample.in @@ -207,11 +208,6 @@ # does not create reproducible output with parallelism make -j1 -PORT=$(sed -n 's/#define PORT //p' config.log) -if test "$PORT" = 3493 ; then -PORT=nut -fi -sed s/@PORT@/$PORT/ nut.firewall %install %make_install @@ -227,8 +223,6 @@ install -m 644 scripts/logrotate/nutlogd %{buildroot}%{_sysconfdir}/logrotate.d/nut mkdir -p %{buildroot}%{STATEPATH} rename .sample "" %{buildroot}%{_sysconfdir}/ups/*.sample -mkdir -p %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services -cp nut.firewall %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/nut install -d %{buildroot}%{_libexecdir}/systemd/system-sleep install nut.system-sleep %{buildroot}%{_libexecdir}/systemd/system-sleep/%{name}.sh @@ -301,7 +295,6 @@ %exclude %{_mandir}/man8/snmp-ups*.* %dir %{_libexecdir}/ups %{_sbindir}/* -%config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/nut %{_udevrulesdir}/*.rules %config(noreplace) %{CONFPATH}/hosts.conf %config(noreplace) %attr(600,%{NUT_USER},root) %{CONFPATH}/upsd.conf ++ nutscanner-ftbfs.patch ++ commit 5d98d5536699222bc93c58c1e6f6df43dc9bfcff Author: Arnaud Quette Date: Thu Mar 10 14:41:40 2016 +0100 Fix nut-scanner compilation in some environments Following the commits 5187dab (common: add some string-related functions) and e767df5 (common: consolidate some string-related functions), the build rules of nut-scanner were not updated to also use str.c. Since the libcommon.la dependency was still there, some environments managed to build cleanly, while other are failing. Update build dependencies to fix this situation diff --git a/tools/nut-scanner/Makefile.am b/tools/nut-scanner/Makefile.am index 558cb23b..db85c682 100644 --- a/tools/nut-scanner/Makefile.am +++ b/tools/nut-scanner/Makefile.am @@ -14,14 +14,14 @@ libnutscan_la_SOURCES = scan_nut.c scan_ipmi.c \ scan_avahi.c scan_eaton_serial.c nutscan-serial.c \ ../../drivers/serial.c \ ../../drivers/bcmxcp_ser.c \ - ../../common/common.c + ../../common/common.c ../../common/str.c libnutscan_la_LIBADD = $(NETLIBS)
commit nut for openSUSE:Factory
Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at 2018-11-28 11:13:29 Comparing /work/SRC/openSUSE:Factory/nut (Old) and /work/SRC/openSUSE:Factory/.nut.new.19453 (New) Package is "nut" Wed Nov 28 11:13:29 2018 rev:64 rq:652114 version:2.7.4 Changes: --- /work/SRC/openSUSE:Factory/nut/nut.changes 2018-08-13 09:54:52.878897762 +0200 +++ /work/SRC/openSUSE:Factory/.nut.new.19453/nut.changes 2018-11-28 11:14:13.154829745 +0100 @@ -1,0 +2,23 @@ +Tue Nov 27 09:19:23 UTC 2018 - Tomáš Chvátal + +- Give up on packaging the tex docu as it fails to build with + latest texlive + +--- +Tue Nov 13 09:36:13 UTC 2018 - Tomáš Chvátal + +- Add missing tex dependencies so we can generate the pdf with + newer releases of texlive + +--- +Tue Nov 13 09:24:40 UTC 2018 - Tomáš Chvátal + +- Drop patch docs-destination-dir.patch which is quite pointless + +--- +Sun Oct 7 18:53:54 UTC 2018 - suse+bu...@de-korte.org + +- Remove invalid option 'destination-dir' when generating PDF + files (docs-destination-dir.patch) + +--- Other differences: -- ++ nut.spec ++ --- /var/tmp/diff_new_pack.dczeHF/_old 2018-11-28 11:14:15.318826716 +0100 +++ /var/tmp/diff_new_pack.dczeHF/_new 2018-11-28 11:14:15.318826716 +0100 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -37,7 +37,7 @@ Version:2.7.4 Release:0 Summary:Network UPS Tools Core (Uninterruptible Power Supply Monitoring) -License:GPL-2.0+ +License:GPL-2.0-or-later Group: Hardware/UPS Url:http://www.networkupstools.org/ Source: http://www.networkupstools.org/source/2.7/%{name}-%{version}.tar.gz @@ -63,12 +63,11 @@ BuildRequires: apache2-devel BuildRequires: asciidoc BuildRequires: avahi-devel -BuildRequires: dblatex BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libcppunit-devel BuildRequires: libtool -%if 0%{?suse_version} >= 1330 +%if 0%{?suse_version} >= 1500 BuildRequires: libnsl-devel %endif BuildRequires: libusb-devel @@ -85,7 +84,6 @@ BuildRequires: pkgconfig(neon) BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(udev) -BuildRequires: tex(upquote.sty) Requires: logrotate Requires: usbutils Requires(post): udev @@ -97,12 +95,19 @@ Provides: nut-classic = %{version} Obsoletes: nut-classic < %{version} Obsoletes: nut-hal < %{version} +# Obsolete all the docu stuff with now disabled tex dependency +Obsoletes: %{name}-devel-doc-html +Obsoletes: %{name}-devel-doc-pdf +Obsoletes: %{name}-doc-asciidoc +Obsoletes: %{name}-doc-html +Obsoletes: %{name}-doc-images +Obsoletes: %{name}-doc-pdf %{?systemd_requires} BuildRequires: pkgconfig(bash-completion) %ifarch %{ix86} x86_64 ia64 BuildRequires: pkgconfig(libfreeipmi) %endif -%if 0%{?suse_version} >= 1330 +%if 0%{?suse_version} >= 1500 Requires(pre): user(upsd) %endif @@ -160,91 +165,6 @@ Network UPS Tools is a collection of programs which provide a common interface for monitoring and administering UPS hardware. -%package doc-images -Summary:Network UPS Tools - Images for Documentation -Group: Documentation/Other -Requires: %{name}-doc-images = %{version} -Recommends: %{name} = %{version} -Enhances: %{name} -BuildArch: noarch - -%description doc-images -Images for the documentation. It is a supplementary package for some NUT -documentation packages. - -Network UPS Tools is a collection of programs which provide a common -interface for monitoring and administering UPS hardware. - -%package doc-asciidoc -Summary:Network UPS Tools - Documentation in AsciiDoc Format -Group: Documentation/Other -Requires: %{name}-doc-images = %{version} -Recommends: %{name} = %{version} -Enhances: %{name} -BuildArch: noarch - -%description doc-asciidoc -NUT manuals in AsciiDoc format (human readable source). - -Network UPS Tools is a collection of programs which provide a common -interface for monitoring and administering UPS hardware. - -%package doc-pdf -Summary:Network UPS Tools - Documentation in PDF -Group: Documentation/Other -Recommends: %{name} = %{version}
commit nut for openSUSE:Factory
Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at 2018-08-13 09:54:40 Comparing /work/SRC/openSUSE:Factory/nut (Old) and /work/SRC/openSUSE:Factory/.nut.new (New) Package is "nut" Mon Aug 13 09:54:40 2018 rev:63 rq:628814 version:2.7.4 Changes: --- /work/SRC/openSUSE:Factory/nut/nut.changes 2018-01-31 19:51:55.465385857 +0100 +++ /work/SRC/openSUSE:Factory/.nut.new/nut.changes 2018-08-13 09:54:52.878897762 +0200 @@ -1,0 +2,6 @@ +Wed Aug 1 13:35:20 UTC 2018 - bwiedem...@suse.com + +- Add reproducible.patch to sort input file list + to make package build reproducible (boo#1041090) + +--- New: reproducible.patch Other differences: -- ++ nut.spec ++ --- /var/tmp/diff_new_pack.xd3411/_old 2018-08-13 09:54:57.730907589 +0200 +++ /var/tmp/diff_new_pack.xd3411/_new 2018-08-13 09:54:57.734907597 +0200 @@ -59,6 +59,7 @@ Patch10:use-pkg-config-gdlib.diff Patch11:openssl-1_1.patch Patch12:nut-upssched.patch +Patch13:reproducible.patch BuildRequires: apache2-devel BuildRequires: asciidoc BuildRequires: avahi-devel @@ -255,6 +256,7 @@ %patch10 -p1 %patch11 -p1 %patch12 -p1 +%patch13 -p1 sed -i s/@now@/`date -r ChangeLog +%%Y-%%m-%%d`/g docs/docinfo.xml.in sed -i s:%{_prefix}/local/ups/bin:/bin: conf/upssched.conf.sample.in @@ -283,11 +285,13 @@ --with-udev-dir=%{_libexecdir}/udev \ --enable-option-checking=fatal -# There is a bug in doc build that makes impossible to build in parallel +# There is a bug in build that makes impossible to build in parallel cd docs make -j1 cd .. -make %{?_smp_mflags} +# does not create reproducible output with parallelism +# possibly similar problem as https://bugzilla.sudo.ws/show_bug.cgi?id=842 +make -j1 PORT=$(sed -n 's/#define PORT //p' config.log) if test "$PORT" = 3493 ; then PORT=nut ++ reproducible.patch ++ PATCH-FIX-UPSTREAM https://github.com/networkupstools/nut/pull/528 >From d1372910ccc449edb5f447b04a5fd50c5423b314 Mon Sep 17 00:00:00 2001 From: "Bernhard M. Wiedemann" Date: Tue, 20 Feb 2018 13:40:18 +0100 Subject: [PATCH] Sort input file list so that nut builds in a reproducible way in spite of indeterministic filesystem readdir order and http://bugs.python.org/issue30461 See https://reproducible-builds.org/ for why this is good. --- tools/nut-snmpinfo.py | 2 +- tools/nut-usbinfo.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/nut-snmpinfo.py b/tools/nut-snmpinfo.py index 32d17784e..0649ef5a3 100755 --- a/tools/nut-snmpinfo.py +++ b/tools/nut-snmpinfo.py @@ -80,7 +80,7 @@ def expand_define(filename,constant): output_file.write( "/* SNMP IDs device table */\n" ) output_file.write( "static snmp_device_id_t snmp_device_table[] = {\n" ) -for filename in glob.glob('../drivers/*-mib.c'): +for filename in sorted(glob.glob('../drivers/*-mib.c')): list_of_line = open(filename,'r').read().split(';') for line in list_of_line: if "mib2nut_info_t" in line: diff --git a/tools/nut-usbinfo.pl b/tools/nut-usbinfo.pl index 2c0dd055b..a8638769b 100755 --- a/tools/nut-usbinfo.pl +++ b/tools/nut-usbinfo.pl @@ -76,7 +76,7 @@ # MAIN # -find(\&find_usbdevs,$scanPath); +find({wanted=>\&find_usbdevs, preprocess=>sub{sort @_}}, $scanPath); &gen_usb_files; # SUB METHOD #
commit nut for openSUSE:Factory
Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at 2018-01-31 19:51:51 Comparing /work/SRC/openSUSE:Factory/nut (Old) and /work/SRC/openSUSE:Factory/.nut.new (New) Package is "nut" Wed Jan 31 19:51:51 2018 rev:62 rq:571097 version:2.7.4 Changes: --- /work/SRC/openSUSE:Factory/nut/nut.changes 2017-12-02 13:12:41.669949590 +0100 +++ /work/SRC/openSUSE:Factory/.nut.new/nut.changes 2018-01-31 19:51:55.465385857 +0100 @@ -1,0 +2,7 @@ +Sun Jan 21 20:17:50 UTC 2018 - suse+bu...@de-korte.org + +- Fix clash between Group and %define GROUP by renaming the latter + to NUT_GROUP (and USER to NUT_USER) +- Replace duplicate man files by soft links + +--- Other differences: -- ++ nut.spec ++ --- /var/tmp/diff_new_pack.UdqyIZ/_old 2018-01-31 19:51:56.957316479 +0100 +++ /var/tmp/diff_new_pack.UdqyIZ/_new 2018-01-31 19:51:56.961316293 +0100 @@ -1,7 +1,7 @@ # # spec file for package nut # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,8 +22,8 @@ %define MODELPATH %{_libexecdir}/ups/driver %define STATEPATH %{_localstatedir}/lib/ups %define CONFPATH %{_sysconfdir}/ups -%define USER upsd -%define GROUP daemon +%define NUT_USER upsd +%define NUT_GROUP daemon %define LBRACE ( %define RBRACE ) %define QUOTE " @@ -63,6 +63,7 @@ BuildRequires: asciidoc BuildRequires: avahi-devel BuildRequires: dblatex +BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libcppunit-devel BuildRequires: libtool @@ -277,8 +278,8 @@ --with-cgipath=%{CGIPATH} \ --with-statepath=%{STATEPATH} \ --with-drvpath=%{MODELPATH} \ - --with-user=%{USER} \ - --with-group=%{GROUP} \ + --with-user=%{NUT_USER} \ + --with-group=%{NUT_GROUP} \ --with-udev-dir=%{_libexecdir}/udev \ --enable-option-checking=fatal @@ -330,15 +331,18 @@ # Not needed for packaged contents: rm %{buildroot}%{_docdir}/%{name}/packager-guide.* +# Create symlinks for man pages +%fdupes -s %{buildroot}%{_mandir} + %pre %if 0%{?suse_version} < 1330 -getent passwd %{USER} >/dev/null || useradd -r -g %{GROUP} -s /bin/false -c "UPS daemon" -d /sbin %{USER} 2>/dev/null +getent passwd %{NUT_USER} >/dev/null || useradd -r -g %{NUT_GROUP} -s /bin/false -c "UPS daemon" -d /sbin %{NUT_USER} 2>/dev/null %endif %service_add_pre nut-driver.service nut-server.service nut-monitor.service %post # Be sure that all files are owned by a dedicated user. -chown -R %{USER}:%{GROUP} %{STATEPATH} +chown -R %{NUT_USER}:%{NUT_GROUP} %{STATEPATH} # Generate initial passwords. if grep -q "password = @UPSD_INITIAL_MASTER_PASSWORD@" %{CONFPATH}/upsmon.conf %{CONFPATH}/upsd.users; then UPSD_INITIAL_MASTER_PASSWORD=$(head -c 20 /dev/urandom | md5sum | head -c 10) @@ -349,7 +353,7 @@ sed -i s/@UPSD_INITIAL_SLAVE_PASSWORD@/$UPSD_INITIAL_SLAVE_PASSWORD/ %{CONFPATH}/upsd.users fi # Be sure that all files are owned by a dedicated user. -/bin/chown %{USER}:root %{CONFPATH}/upsd.conf %{CONFPATH}/upsmon.conf %{CONFPATH}/upsd.users +/bin/chown %{NUT_USER}:root %{CONFPATH}/upsd.conf %{CONFPATH}/upsmon.conf %{CONFPATH}/upsd.users /bin/chmod 600 %{CONFPATH}/upsd.conf %{CONFPATH}/upsmon.conf %{CONFPATH}/upsd.users # Migrate Suspend to Disc to the new convention (bnc#449861 and later bnc#871406): # It was never on by default, but documentation up to 11.0 recommends @@ -390,9 +394,9 @@ %config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/nut %{_udevrulesdir}/*.rules %config(noreplace) %{CONFPATH}/hosts.conf -%config(noreplace) %attr(600,%{USER},root) %{CONFPATH}/upsd.conf -%config(noreplace) %attr(600,%{USER},root) %{CONFPATH}/upsd.users -%config(noreplace) %attr(600,%{USER},root) %{CONFPATH}/upsmon.conf +%config(noreplace) %attr(600,%{NUT_USER},root) %{CONFPATH}/upsd.conf +%config(noreplace) %attr(600,%{NUT_USER},root) %{CONFPATH}/upsd.users +%config(noreplace) %attr(600,%{NUT_USER},root) %{CONFPATH}/upsmon.conf %dir %{CONFPATH} %config(noreplace) %{CONFPATH}/nut.conf %config(noreplace) %{CONFPATH}/ups.conf @@ -402,7 +406,7 @@ %{MODELPATH}/* %exclude %{MODELPATH}/snmp-ups %exclude %{MODELPATH}/netxml-ups -%attr(700,%{USER},%{GROUP}) %{STATEPATH} +%attr(700,%{NUT_USER},%{NUT_GROUP}) %{STATEPATH} %{_unitdir}/*.service %{systemdsystemdutildir}/system-shutdown/* %{_libexecdir}/systemd/system-sleep/%{name}.sh
commit nut for openSUSE:Factory
Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at 2017-12-02 13:12:31 Comparing /work/SRC/openSUSE:Factory/nut (Old) and /work/SRC/openSUSE:Factory/.nut.new (New) Package is "nut" Sat Dec 2 13:12:31 2017 rev:61 rq:547154 version:2.7.4 Changes: --- /work/SRC/openSUSE:Factory/nut/nut.changes 2017-10-19 19:32:57.430573289 +0200 +++ /work/SRC/openSUSE:Factory/.nut.new/nut.changes 2017-12-02 13:12:41.669949590 +0100 @@ -1,0 +2,16 @@ +Fri Dec 1 14:59:25 UTC 2017 - suse+bu...@de-korte.org + +- Add support for OpenSSL 1.1.0 library, allow TLSv1 and higher + (not just TLSv1) and report TLS version used in debug mode level + 3 and higher (boo#1069988, openssl-1_1.patch) +- Fix missing pointer dereference in upssched (nut-upssched.patch) +- Support for allowfrom parameter was removed in version 2.4.0 + (nut-preconfig.patch) + +--- +Thu Nov 30 18:01:31 CET 2017 - sbra...@suse.com + +- No more conflict with apcupsd (boo#1070373). +- Remove smartups references. It is dropped since 2001. + +--- New: nut-upssched.patch openssl-1_1.patch Other differences: -- ++ nut.spec ++ --- /var/tmp/diff_new_pack.N2fJ9f/_old 2017-12-02 13:12:42.693912296 +0100 +++ /var/tmp/diff_new_pack.N2fJ9f/_new 2017-12-02 13:12:42.693912296 +0100 @@ -57,6 +57,8 @@ Patch9: nut-doc-cables.patch # PATCH-FIX-UPSTREAM use-pkg-config-gdlib.diff alarr...@suse.com -- Use pkg-config to obtain CFLAGS and LDFLAGS to use when building with gd Patch10:use-pkg-config-gdlib.diff +Patch11:openssl-1_1.patch +Patch12:nut-upssched.patch BuildRequires: apache2-devel BuildRequires: asciidoc BuildRequires: avahi-devel @@ -74,7 +76,6 @@ BuildRequires: pkgconfig BuildRequires: source-highlight BuildRequires: tcpd-devel -BuildRequires: tex(upquote.sty) BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gdlib) BuildRequires: pkgconfig(libpowerman) @@ -82,6 +83,7 @@ BuildRequires: pkgconfig(neon) BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(udev) +BuildRequires: tex(upquote.sty) Requires: logrotate Requires: usbutils Requires(post): udev @@ -89,9 +91,6 @@ Enhances: %{USBHIDDRIVERS} # Package provides the only avalailable driver for other USB UPSes: Supplements:%{USBNONHIDDRIVERS} -Conflicts: apcupsd -Provides: smartups = %{version} -Obsoletes: smartups < %{version} # for update from openSUSE <= 11.3, SLE <= 11 Provides: nut-classic = %{version} Obsoletes: nut-classic < %{version} @@ -253,6 +252,8 @@ %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 +%patch12 -p1 sed -i s/@now@/`date -r ChangeLog +%%Y-%%m-%%d`/g docs/docinfo.xml.in sed -i s:%{_prefix}/local/ups/bin:/bin: conf/upssched.conf.sample.in ++ nut-preconfig.patch ++ --- /var/tmp/diff_new_pack.N2fJ9f/_old 2017-12-02 13:12:42.749910256 +0100 +++ /var/tmp/diff_new_pack.N2fJ9f/_new 2017-12-02 13:12:42.753910110 +0100 @@ -19,19 +19,17 @@ + desc = "Local UPS" --- conf/upsd.users.sample +++ conf/upsd.users.sample -@@ -62,3 +62,13 @@ +@@ -62,3 +62,11 @@ # The matching MONITOR line in your upsmon.conf would look like this: # # MONITOR myups@localhost 1 upsmon pass master(or slave) + +[upsmaster] + password = @UPSD_INITIAL_MASTER_PASSWORD@ -+ allowfrom = localhost + upsmon master + +[upsslave] + password = @UPSD_INITIAL_SLAVE_PASSWORD@ -+ allowfrom = localhost + upsmon slave --- conf/upsmon.conf.sample.in +++ conf/upsmon.conf.sample.in ++ nut-upssched.patch ++ diff --git a/clients/upssched.c b/clients/upssched.c index 97b3ed42..3fdf118e 100644 --- a/clients/upssched.c +++ b/clients/upssched.c @@ -794,7 +794,7 @@ static void parse_at(const char *ntype, const char *un, const char *cmd, } if (!strcmp(cmd, "EXECUTE")) { - if (ca1 == '\0') { + if (*ca1 == '\0') { upslogx(LOG_ERR, "Empty EXECUTE command argument"); return; } ++ openssl-1_1.patch ++ diff --git a/clients/upsclient.c b/clients/upsclient.c index b90587b0..b7dd8f42 100644 --- a/clients/upsclient.c +++ b/clients/upsclient.c @@ -299,11 +299,6 @@ int upscli_init(int certverify, const char *certpath, { #ifdef WITH_OPENSSL int ret, ssl_mode = SSL_VERIFY_NONE; -#if OPENSSL_VERSION_NUMBER >= 0x1000L - const SSL_METHOD*ssl_method; -#else - SSL_METHOD *ssl_method; -#endif #elif defined(WITH_NSS) /* WITH_OPENSSL */ SECStatus
commit nut for openSUSE:Factory
Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at 2017-10-19 19:32:55 Comparing /work/SRC/openSUSE:Factory/nut (Old) and /work/SRC/openSUSE:Factory/.nut.new (New) Package is "nut" Thu Oct 19 19:32:55 2017 rev:60 rq:534893 version:2.7.4 Changes: --- /work/SRC/openSUSE:Factory/nut/nut.changes 2017-10-06 11:03:54.801142504 +0200 +++ /work/SRC/openSUSE:Factory/.nut.new/nut.changes 2017-10-19 19:32:57.430573289 +0200 @@ -1,0 +2,15 @@ +Tue Oct 17 19:18:03 UTC 2017 - dims...@opensuse.org + +- BuildRequire tex(upquote.sty): Generally seen, this dependency + is inaccurate, as our sources do not reference upquote.sty, but + asciidoc does. Adding the dep there though makes asciidoc too + expensive, and recommends are not interpreted when building the + buildroot (boo#1063897). + +--- +Tue Oct 17 12:42:32 UTC 2017 - dims...@opensuse.org + +- Buildrequire libnsl-devel for suse_version >= 1330: libnsl was + split out of glibc and needs to be explcitly required if needed. + +--- Other differences: -- ++ nut.spec ++ --- /var/tmp/diff_new_pack.Thc71N/_old 2017-10-19 19:32:58.074543159 +0200 +++ /var/tmp/diff_new_pack.Thc71N/_new 2017-10-19 19:32:58.074543159 +0200 @@ -64,6 +64,9 @@ BuildRequires: gcc-c++ BuildRequires: libcppunit-devel BuildRequires: libtool +%if 0%{?suse_version} >= 1330 +BuildRequires: libnsl-devel +%endif BuildRequires: libusb-devel BuildRequires: libxml2-tools BuildRequires: libxslt-tools @@ -71,6 +74,7 @@ BuildRequires: pkgconfig BuildRequires: source-highlight BuildRequires: tcpd-devel +BuildRequires: tex(upquote.sty) BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gdlib) BuildRequires: pkgconfig(libpowerman)
commit nut for openSUSE:Factory
Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at 2017-10-06 11:03:50 Comparing /work/SRC/openSUSE:Factory/nut (Old) and /work/SRC/openSUSE:Factory/.nut.new (New) Package is "nut" Fri Oct 6 11:03:50 2017 rev:59 rq:531564 version:2.7.4 Changes: --- /work/SRC/openSUSE:Factory/nut/nut.changes 2017-09-28 12:35:18.272236287 +0200 +++ /work/SRC/openSUSE:Factory/.nut.new/nut.changes 2017-10-06 11:03:54.801142504 +0200 @@ -1,0 +2,7 @@ +Mon Oct 2 08:25:15 UTC 2017 - tchva...@suse.com + +- Fix rpm groups +- Reduce the supported distros by keeping sle12+ only +- Convert to pkgconfig style dependencies + +--- Old: upsd-early-powerdown.init upsd.init Other differences: -- ++ nut.spec ++ --- /var/tmp/diff_new_pack.l0Md0K/_old 2017-10-06 11:03:55.872980404 +0200 +++ /var/tmp/diff_new_pack.l0Md0K/_new 2017-10-06 11:03:55.876979800 +0200 @@ -31,29 +31,8 @@ # Collect all devices listed in ups-nut-device.fdi: %define USBHIDDRIVERS%(zcat %{SOURCE0} | tr a-z A-Z | grep -a -A1 USBHID-UPS | sed -n 's/.*ATTR{IDVENDOR}==%{QUOTE}%{BACKSLASH}%{LBRACE}[^%{QUOTE}]*%{BACKSLASH}%{RBRACE}%{QUOTE}, ATTR{IDPRODUCT}==%{QUOTE}%{BACKSLASH}%{LBRACE}[^%{QUOTE}]*%{BACKSLASH}%{RBRACE}%{QUOTE}, MODE=.*/modalias%{LBRACE}usb:v%{BACKSLASH}1p%{BACKSLASH}2d*dc*dsc*dp*ic*isc*ip*%{RBRACE}/p' | tr '%{BACKSLASH}n' ' ') %define USBNONHIDDRIVERS %(zcat %{SOURCE0} | tr a-z A-Z | grep -a -A1 _USB | sed -n 's/.*ATTR{IDVENDOR}==%{QUOTE}%{BACKSLASH}%{LBRACE}[^%{QUOTE}]*%{BACKSLASH}%{RBRACE}%{QUOTE}, ATTR{IDPRODUCT}==%{QUOTE}%{BACKSLASH}%{LBRACE}[^%{QUOTE}]*%{BACKSLASH}%{RBRACE}%{QUOTE}, MODE=.*/modalias%{LBRACE}usb:v%{BACKSLASH}1p%{BACKSLASH}2d*dc*dsc*dp*ic*isc*ip*%{RBRACE}/p' | tr '%{BACKSLASH}n' ' ') -%if 0%{?suse_version} > 1210 %define systemdsystemdutildir %(pkg-config --variable=systemdutildir systemd) -%define with_systemd 1 -%systemd_requires -%else -%define _libexecdir %{_prefix}/lib -%define _udevrulesdir %{_sysconfdir}/udev/rules.d/ -%define with_systemd 0 -%endif -# SLE <= 12 lacks needed packages -%if 0%{?sle_version} == 0 -%if 0%{?suse_version} < 1200 -%define with_doc 0 -%else -%define with_doc 1 -%endif -%else -%if 0%{?sle_version} < 13 -%define with_doc 0 -%else -%define with_doc 1 -%endif -%endif +%define bashcompletionsdir %(pkg-config bash-completion --variable=completionsdir) Name: nut Version:2.7.4 Release:0 @@ -62,9 +41,7 @@ Group: Hardware/UPS Url:http://www.networkupstools.org/ Source: http://www.networkupstools.org/source/2.7/%{name}-%{version}.tar.gz -Source1:upsd.init Source2:README.SUSE -Source3:upsd-early-powerdown.init Source5:nut.firewall.in Source6:nut.system-sleep Source7:nut.sleep @@ -81,25 +58,26 @@ # PATCH-FIX-UPSTREAM use-pkg-config-gdlib.diff alarr...@suse.com -- Use pkg-config to obtain CFLAGS and LDFLAGS to use when building with gd Patch10:use-pkg-config-gdlib.diff BuildRequires: apache2-devel +BuildRequires: asciidoc BuildRequires: avahi-devel -BuildRequires: dbus-1-glib-devel +BuildRequires: dblatex BuildRequires: gcc-c++ -BuildRequires: gd-devel BuildRequires: libcppunit-devel -BuildRequires: libneon-devel -BuildRequires: libopenssl-devel BuildRequires: libtool BuildRequires: libusb-devel +BuildRequires: libxml2-tools +BuildRequires: libxslt-tools BuildRequires: net-snmp-devel -BuildRequires: pkg-config +BuildRequires: pkgconfig +BuildRequires: source-highlight BuildRequires: tcpd-devel -%if 0%{?suse_version} >= 1200 -%if 0%{?suse_version} >= 1330 -BuildRequires: bash-completion-devel -%else -BuildRequires: bash-completion -%endif -%endif +BuildRequires: pkgconfig(dbus-glib-1) +BuildRequires: pkgconfig(gdlib) +BuildRequires: pkgconfig(libpowerman) +BuildRequires: pkgconfig(libsystemd) +BuildRequires: pkgconfig(neon) +BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(udev) Requires: logrotate Requires: usbutils Requires(post): udev @@ -114,34 +92,14 @@ Provides: nut-classic = %{version} Obsoletes: nut-classic < %{version} Obsoletes: nut-hal < %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} > 1230 -BuildRequires: powerman-devel -BuildRequires: systemd-devel -BuildRequires: udev -%ifarch %ix86 x86_64 ia64 -BuildRequires: freeipmi-devel +%{?systemd_requires} +BuildRequires: pkgconfig(bash-completion) +%ifarch %{ix86} x86_64 ia64 +BuildRequires: pkgconfig(libfreeipmi) %endif -%else -Requires(pre): %insserv_prereq -BuildRequires: pm-utils -Requires:
commit nut for openSUSE:Factory
Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at 2017-09-28 12:34:54 Comparing /work/SRC/openSUSE:Factory/nut (Old) and /work/SRC/openSUSE:Factory/.nut.new (New) Package is "nut" Thu Sep 28 12:34:54 2017 rev:58 rq:528832 version:2.7.4 Changes: --- /work/SRC/openSUSE:Factory/nut/nut.changes 2017-08-18 15:07:00.312173250 +0200 +++ /work/SRC/openSUSE:Factory/.nut.new/nut.changes 2017-09-28 12:35:18.272236287 +0200 @@ -1,0 +2,7 @@ +Tue Sep 26 09:13:30 UTC 2017 - tchva...@suse.com + +- Drop the aspell dependency, it is only used for verification + of the mans and it is more for devs to do than during the build + wrt fate#323578 + +--- Other differences: -- ++ nut.spec ++ --- /var/tmp/diff_new_pack.nJ8QaW/_old 2017-09-28 12:35:19.212104127 +0200 +++ /var/tmp/diff_new_pack.nJ8QaW/_new 2017-09-28 12:35:19.212104127 +0200 @@ -132,7 +132,6 @@ %endif %if %with_doc BuildRequires: asciidoc -BuildRequires: aspell BuildRequires: dblatex BuildRequires: libxml2-tools BuildRequires: libxslt-tools
commit nut for openSUSE:Factory
Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at 2017-08-18 15:06:56 Comparing /work/SRC/openSUSE:Factory/nut (Old) and /work/SRC/openSUSE:Factory/.nut.new (New) Package is "nut" Fri Aug 18 15:06:56 2017 rev:57 rq:517542 version:2.7.4 Changes: --- /work/SRC/openSUSE:Factory/nut/nut.changes 2017-08-12 20:28:53.561814988 +0200 +++ /work/SRC/openSUSE:Factory/.nut.new/nut.changes 2017-08-18 15:07:00.312173250 +0200 @@ -1,0 +2,8 @@ +Fri Aug 18 08:21:49 UTC 2017 - alarr...@suse.com + +- Add use-pkg-config-gdlib.diff to fix a build failure due to the + configure scripts using gdlib-config (which is deprecated) to + obtain the CFLAGS/LDFLAGS/LIBS to use when building with gd. With + the patch, nut now uses pkg-config which returns the right values + +--- New: use-pkg-config-gdlib.diff Other differences: -- ++ nut.spec ++ --- /var/tmp/diff_new_pack.fvwUA5/_old 2017-08-18 15:07:01.484008211 +0200 +++ /var/tmp/diff_new_pack.fvwUA5/_new 2017-08-18 15:07:01.488007648 +0200 @@ -78,6 +78,8 @@ Patch8: nut-doc-fixed-date.patch # PATCH-FIX-UPSTREAM nut-doc-cables.patch sbra...@suse.cz -- Build HTML documentation of cables. Patch9: nut-doc-cables.patch +# PATCH-FIX-UPSTREAM use-pkg-config-gdlib.diff alarr...@suse.com -- Use pkg-config to obtain CFLAGS and LDFLAGS to use when building with gd +Patch10:use-pkg-config-gdlib.diff BuildRequires: apache2-devel BuildRequires: avahi-devel BuildRequires: dbus-1-glib-devel @@ -304,6 +306,7 @@ %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 sed -i s/@now@/`date -r ChangeLog +%%Y-%%m-%%d`/g docs/docinfo.xml.in sed -i "s/@UPSD_USER@/%{USER}/g" upsd.init ++ use-pkg-config-gdlib.diff ++ Index: nut-2.7.4/m4/nut_check_libgd.m4 === --- nut-2.7.4.orig/m4/nut_check_libgd.m4 +++ nut-2.7.4/m4/nut_check_libgd.m4 @@ -34,9 +34,9 @@ if test -z "${nut_have_libgd_seen}"; the AC_MSG_WARN([[If gd detection fails, upgrade gd or use --with-gd-includes and --with-gd-libs]]) ;; *) - CFLAGS="`gdlib-config --includes 2>/dev/null`" - LDFLAGS="`gdlib-config --ldflags 2>/dev/null`" - LIBS="`gdlib-config --libs 2>/dev/null`" + CFLAGS="`pkg-config gdlib --cflags 2>/dev/null`" + LDFLAGS="`pkg-config gdlib --libs 2>/dev/null`" + LIBS="" ;; esac
commit nut for openSUSE:Factory
Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at 2017-08-12 20:28:52 Comparing /work/SRC/openSUSE:Factory/nut (Old) and /work/SRC/openSUSE:Factory/.nut.new (New) Package is "nut" Sat Aug 12 20:28:52 2017 rev:56 rq:516209 version:2.7.4 Changes: --- /work/SRC/openSUSE:Factory/nut/nut.changes 2017-05-20 10:13:44.407231715 +0200 +++ /work/SRC/openSUSE:Factory/.nut.new/nut.changes 2017-08-12 20:28:53.561814988 +0200 @@ -32 +32 @@ - * nut-server.service: Restore systemd relationship (drop + * nut-server.service: Restore systemd relationship (boo#907387, drop Other differences: --
commit nut for openSUSE:Factory
Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at 2017-05-20 10:13:41 Comparing /work/SRC/openSUSE:Factory/nut (Old) and /work/SRC/openSUSE:Factory/.nut.new (New) Package is "nut" Sat May 20 10:13:41 2017 rev:55 rq:496334 version:2.7.4 Changes: --- /work/SRC/openSUSE:Factory/nut/nut.changes 2017-05-16 14:38:19.672685500 +0200 +++ /work/SRC/openSUSE:Factory/.nut.new/nut.changes 2017-05-20 10:13:44.407231715 +0200 @@ -1,0 +2,7 @@ +Tue May 9 09:06:52 UTC 2017 - jeng...@inai.de + +- Fix RPM groups and the HTML description +- Do not suppress errors from useradd +- Remove --with-pic that's only for static libs + +--- Other differences: -- ++ nut.spec ++ --- /var/tmp/diff_new_pack.pqpmjJ/_old 2017-05-20 10:13:45.207118698 +0200 +++ /var/tmp/diff_new_pack.pqpmjJ/_new 2017-05-20 10:13:45.207118698 +0200 @@ -198,7 +198,7 @@ %package doc-images Summary:Network UPS Tools - Images for Documentation -Group: Hardware/UPS +Group: Documentation/Other Recommends: %{name} = %{version} Enhances: %{name} Requires: %{name}-doc-images = %{version} @@ -215,7 +215,7 @@ %package doc-asciidoc Summary:Network UPS Tools - Documentation in AsciiDoc Format -Group: Hardware/UPS +Group: Documentation/Other Recommends: %{name} = %{version} Enhances: %{name} Requires: %{name}-doc-images = %{version} @@ -232,7 +232,7 @@ %if %with_doc %package doc-pdf Summary:Network UPS Tools - Documentation in PDF -Group: Hardware/UPS +Group: Documentation/PDF Recommends: %{name} = %{version} Enhances: %{name} %if 0%{?suse_version} > 1200 @@ -246,8 +246,8 @@ interface for monitoring and administering UPS hardware. %package doc-html -Summary:Network UPS Tools - Documentation in PDF -Group: Hardware/UPS +Summary:Network UPS Tools - Documentation in HTML +Group: Documentation/HTML Recommends: %{name} = %{version} Enhances: %{name} Requires: %{name}-doc-images = %{version} @@ -256,14 +256,14 @@ %endif %description doc-html -User manual in PDF format. +User manual in HTML format. Network UPS Tools is a collection of programs which provide a common interface for monitoring and administering UPS hardware. %package devel-doc-pdf Summary:Network UPS Tools - Documentation in PDF -Group: Hardware/UPS +Group: Documentation/PDF Recommends: %{name} = %{version} Enhances: %{name} %if 0%{?suse_version} > 1200 @@ -277,8 +277,8 @@ interface for monitoring and administering UPS hardware. %package devel-doc-html -Summary:Network UPS Tools - Documentation in PDF -Group: Hardware/UPS +Summary:Network UPS Tools - Documentation in HTML +Group: Documentation/HTML Recommends: %{name} = %{version} Enhances: %{name} Requires: %{name}-doc-images = %{version} @@ -314,7 +314,6 @@ # documentation fails to build -> disable %configure \ --disable-static \ - --with-pic \ --sysconfdir=%{CONFPATH} \ --datadir=%{_datadir}/nut \ --with-all \ @@ -412,7 +411,7 @@ %pre %if %suse_version < 1330 -useradd -r -g %{GROUP} -s /bin/false -c "UPS daemon" -d /sbin %{USER} 2>/dev/null || : +getent passwd %{USER} >/dev/null || useradd -r -g %{GROUP} -s /bin/false -c "UPS daemon" -d /sbin %{USER} 2>/dev/null %endif %if 0%{with_systemd} %service_add_pre nut-driver.service nut-server.service nut-monitor.service @@ -431,8 +430,8 @@ sed -i s/@UPSD_INITIAL_SLAVE_PASSWORD@/$UPSD_INITIAL_SLAVE_PASSWORD/ %{CONFPATH}/upsd.users fi # Be sure that all files are owned by a dedicated user. -bin/chown %{USER}:root %{CONFPATH}/upsd.conf %{CONFPATH}/upsmon.conf %{CONFPATH}/upsd.users -bin/chmod 600 %{CONFPATH}/upsd.conf %{CONFPATH}/upsmon.conf %{CONFPATH}/upsd.users +/bin/chown %{USER}:root %{CONFPATH}/upsd.conf %{CONFPATH}/upsmon.conf %{CONFPATH}/upsd.users +/bin/chmod 600 %{CONFPATH}/upsd.conf %{CONFPATH}/upsmon.conf %{CONFPATH}/upsd.users # Install or remove HALT_POWERDOWN_INSERT # It was last installed in 1310, but it is obsolete since dropping sysvinit support. %if 0%{?suse_version} < 1310
commit nut for openSUSE:Factory
Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at 2017-05-16 14:38:15 Comparing /work/SRC/openSUSE:Factory/nut (Old) and /work/SRC/openSUSE:Factory/.nut.new (New) Package is "nut" Tue May 16 14:38:15 2017 rev:54 rq:493054 version:2.7.4 Changes: --- /work/SRC/openSUSE:Factory/nut/nut.changes 2016-02-03 10:19:35.0 +0100 +++ /work/SRC/openSUSE:Factory/.nut.new/nut.changes 2017-05-16 14:38:19.672685500 +0200 @@ -1,0 +2,34 @@ +Wed Apr 19 15:28:14 CEST 2017 - sbra...@suse.com + +- Update to version 2.7.4: + For more see NEWS and UPGRADING in /usr/share/doc/packages/nut. + * New class of device supported: ATS - Automatic Transfer Switch + * NUT command and variable naming scheme changes. + * support for new devices: AEG PROTECT B / NAS APC ATS AP7724 +(should be supported) Asium P700 Eaton ATS Eaton 5E 1100iUSB +Eaton E Series DX UPS 1-20 kVA Eaton Powerware 9125-5000g +Electrys UPS 2500 Fideltronic INIGO Viper 1200 Legrand Keor +Multiplug LYONN CTB-800V Micropower LCD 1000 NHS Laser Senoidal +5000VA Sweex model P220 TS Shara Various APCUPSD-controlled APC +devices + * snmp-ups improvements. + * Eaton: improvements and fixes of 3ph SNMP, ePDU (G2 and G3) and +XML/PDC. + * Further fixes and improvements of bcmxcp_usb, dummy-ups, +libnutclient, nutdrv_atcl_usb, nutdrv_qx, nut-ipmipsu, solis, +tripplitesu, usbhid-ups. + * nut-scanner: Don't depend on development libraries +(boo#963505). + * Improved SSL support through Mozilla NSS, Augeas support. + * Fixed UPower device matching in recent kernels. + * nut-server.service: Restore systemd relationship (drop +0001-Restore-systemd-relationship-with-nut-driver-service.patch). + * Network protocol information change. +- Drop dummy init scripts. They are not needed any more + (nut-monitor, nut-server, nut-driver, boo#801542#c2). +- Build and package documentation + (nut-doc-fixed-date.patch, nut-doc-cables.patch). +- Fix dependencies. +- Fix bash-completion path. + +--- @@ -39,0 +74 @@ + * Fix service files paths (boo#907387). Old: 0001-Restore-systemd-relationship-with-nut-driver-service.patch nut-2.7.3.tar.gz nut-2.7.3.tar.gz.sig nut-driver nut-monitor nut-server New: nut-2.7.4.tar.gz nut-2.7.4.tar.gz.sig nut-doc-cables.patch nut-doc-fixed-date.patch Other differences: -- ++ nut.spec ++ --- /var/tmp/diff_new_pack.zTnidQ/_old 2017-05-16 14:38:20.588556822 +0200 +++ /var/tmp/diff_new_pack.zTnidQ/_new 2017-05-16 14:38:20.592556260 +0200 @@ -1,7 +1,7 @@ # # spec file for package nut # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -40,8 +40,22 @@ %define _udevrulesdir %{_sysconfdir}/udev/rules.d/ %define with_systemd 0 %endif +# SLE <= 12 lacks needed packages +%if 0%{?sle_version} == 0 +%if 0%{?suse_version} < 1200 +%define with_doc 0 +%else +%define with_doc 1 +%endif +%else +%if 0%{?sle_version} < 13 +%define with_doc 0 +%else +%define with_doc 1 +%endif +%endif Name: nut -Version:2.7.3 +Version:2.7.4 Release:0 Summary:Network UPS Tools Core (Uninterruptible Power Supply Monitoring) License:GPL-2.0+ @@ -56,16 +70,14 @@ Source7:nut.sleep Source8: http://www.networkupstools.org/source/2.7/%{name}-%{version}.tar.gz.sig Source9:%{name}.keyring -Source10: nut-driver -Source11: nut-server -Source12: nut-monitor Patch0: nut-preconfig.patch Patch3: nut-notifyflag.patch # PATCH-FIX-UPSTREAM nut-systemd-dirs.patch sbra...@suse.cz -- Fix systemd targets. Patch7: nut-systemd-dirs.patch -# PATCH-FIX-UPSTREAM: nut-server vs nut-drivers relation -# https://github.com/networkupstools/nut/commit/c98fab9f5dec993aa9f5e0a3e79de53ae9ecd32b -Patch8: 0001-Restore-systemd-relationship-with-nut-driver-service.patch +# PATCH-FEATURE-OPENSUSE nut-doc-fixed-date.patch sbra...@suse.cz -- Make doc builds reproducible. +Patch8: nut-doc-fixed-date.patch +# PATCH-FIX-UPSTREAM nut-doc-cables.patch sbra...@suse.cz -- Build HTML documentation of cables. +Patch9: nut-doc-cables.patch BuildRequires: apache2-devel BuildRequires: avahi-devel BuildRequires: dbus-1-glib-devel @@ -79,6 +91,13 @@ BuildRequires: net-snmp-devel BuildRequires: pkg-config BuildRequires: tcpd-devel +%if 0%{?suse_version} >= 1200 +%if 0%{?suse_version} >= 1330 +B
commit nut for openSUSE:Factory
Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at 2016-02-03 10:19:34 Comparing /work/SRC/openSUSE:Factory/nut (Old) and /work/SRC/openSUSE:Factory/.nut.new (New) Package is "nut" Changes: --- /work/SRC/openSUSE:Factory/nut/nut.changes 2015-06-01 09:53:38.0 +0200 +++ /work/SRC/openSUSE:Factory/.nut.new/nut.changes 2016-02-03 10:19:35.0 +0100 @@ -1,0 +2,9 @@ +Tue Jan 19 09:33:47 UTC 2016 - tchva...@suse.com + +- Cleanup a bit with spec-cleaner +- Install init or systemd files not both at once +- Remove patches used only on sle10: + * nut-powersave.patch + * nut-udev.patch + +--- Old: nut-powersave.patch nut-udev.patch Other differences: -- ++ nut.spec ++ 621 lines (skipped) between /work/SRC/openSUSE:Factory/nut/nut.spec and /work/SRC/openSUSE:Factory/.nut.new/nut.spec
commit nut for openSUSE:Factory
Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at 2015-06-01 09:53:37 Comparing /work/SRC/openSUSE:Factory/nut (Old) and /work/SRC/openSUSE:Factory/.nut.new (New) Package is "nut" Changes: --- /work/SRC/openSUSE:Factory/nut/nut.changes 2014-11-12 00:22:15.0 +0100 +++ /work/SRC/openSUSE:Factory/.nut.new/nut.changes 2015-06-01 09:53:38.0 +0200 @@ -1,0 +2,17 @@ +Mon May 18 10:11:40 UTC 2015 - mvysko...@opensuse.org + +- fix https://github.com/networkupstools/nut/issues/200 + * 0001-Restore-systemd-relationship-with-nut-driver-service.patch + +--- +Fri May 15 15:10:48 UTC 2015 - mvysko...@opensuse.org + +- update to 2.7.3 (bugfixes and new devices support) + see NEWS and UPGRADING in /usr/share/doc/packages/nut +- refreshed patches: + * nut-notifyflag.patch: rename of upsmon.conf.sample.in + * nut-preconfig.patch: rename of upsmon.conf.sample.in + * nut-systemd-dirs.patch: refresh to 2.7.3 +- changed keyring to new key 55CA5976 (Arnaud Quette ) + +--- Old: nut-2.7.2.tar.gz nut-2.7.2.tar.gz.sig New: 0001-Restore-systemd-relationship-with-nut-driver-service.patch nut-2.7.3.tar.gz nut-2.7.3.tar.gz.sig Other differences: -- ++ nut.spec ++ --- /var/tmp/diff_new_pack.vfktHd/_old 2015-06-01 09:53:39.0 +0200 +++ /var/tmp/diff_new_pack.vfktHd/_new 2015-06-01 09:53:39.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package nut # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -59,7 +59,7 @@ Summary:Network UPS Tools Core (Uninterruptible Power Supply Monitoring) License:GPL-2.0+ Group: Hardware/UPS -Version:2.7.2 +Version:2.7.3 Release:0 Url:http://www.networkupstools.org/ Source: http://www.networkupstools.org/source/2.7/%{name}-%{version}.tar.gz @@ -80,6 +80,9 @@ Patch6: nut-udev.patch # PATCH-FIX-UPSTREAM nut-systemd-dirs.patch sbra...@suse.cz -- Fix systemd targets. Patch7: nut-systemd-dirs.patch +# PATCH-FIX-UPSTREAM: nut-server vs nut-drivers relation +# https://github.com/networkupstools/nut/commit/c98fab9f5dec993aa9f5e0a3e79de53ae9ecd32b +Patch8: 0001-Restore-systemd-relationship-with-nut-driver-service.patch Provides: smartups = %version Obsoletes: smartups < %version Conflicts: apcupsd @@ -212,14 +215,13 @@ %if %suse_version < 1030 %patch6 -R %endif -sed -i "s/@UPSD_USER@/%{USER}/g" upsd.init conf/upsmon.conf.sample +sed -i "s/@UPSD_USER@/%{USER}/g" upsd.init %if %suse_version < 1030 sed -i 's:/usr/lib/pm-utils/functions:/etc/pm/functions:' nut.sleep %endif %patch7 -p1 +%patch8 -p1 sed -i s:/usr/local/ups/bin:/bin: conf/upssched.conf.sample.in -[ -f docs/nut-qa.txt ] -dos2unix docs/nut-qa.txt %build autoreconf -f -i ++ 0001-Restore-systemd-relationship-with-nut-driver-service.patch ++ >From c98fab9f5dec993aa9f5e0a3e79de53ae9ecd32b Mon Sep 17 00:00:00 2001 From: Arnaud Quette Date: Thu, 7 May 2015 15:43:17 +0200 Subject: [PATCH 1/2] Restore systemd relationship with nut-driver service The Requires directive from nut-server to nut-driver was previously removed, since it was preventing upsd from starting whenever one or more drivers, among several, was failing to start. Use the Wants directive, a weaker version of Requires, which will start upsd even if the nut-driver unit fails to start. closes https://github.com/networkupstools/nut/issues/200 --- scripts/systemd/nut-server.service.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/systemd/nut-server.service.in b/scripts/systemd/nut-server.service.in index dada977..fe20145 100644 --- a/scripts/systemd/nut-server.service.in +++ b/scripts/systemd/nut-server.service.in @@ -4,7 +4,7 @@ After=local-fs.target network.target nut-driver.service # We don't Require drivers to be successfully started! This would be # a change of behavior compared to init SysV, and could prevent from # accessing successfully started, at least to audit a system. -#Requires=nut-driver.service +Wants=nut-driver.service Before=nut-monitor.service [Service] -- 2.1.4 ++ nut-2.7.2.tar.gz -> nut-2.7.3.tar.gz ++ 35398 lines of diff (skipped) ++ nut-notifyflag.patch ++ --- /var/tmp/diff_new_pack.vfktHd/_old 2015-06-01 09:53:40.0 +0200 +++ /var/tmp/diff_new_pa
commit nut for openSUSE:Factory
Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at 2014-11-12 00:21:50 Comparing /work/SRC/openSUSE:Factory/nut (Old) and /work/SRC/openSUSE:Factory/.nut.new (New) Package is "nut" Changes: --- /work/SRC/openSUSE:Factory/nut/nut.changes 2014-06-16 21:29:17.0 +0200 +++ /work/SRC/openSUSE:Factory/.nut.new/nut.changes 2014-11-12 00:22:15.0 +0100 @@ -1,0 +2,47 @@ +Sun Nov 09 19:50:00 UTC 2014 - Led + +- fix bashisms in post script + +--- +Thu Oct 30 07:22:38 UTC 2014 - mvysko...@opensuse.org + +- Update to version 2.7.2: + For more see NEWS and UPGRADING in /usr/share/doc/packages/nut. + * upsdrvctl is now installed to $prefix/sbin rather than +$driverexec. This usually means moving from /bin to /sbin, apart +from few exceptions. + * FreeDesktop Hardware Abstraction Layer (HAL) support was removed. + * This is a good time to point out that for stricter packaging +systems, it may be beneficial to add "--enable-option-checking=fatal" +to the ./configure command line, in order to quickly pick up any +other removed option flags. + Other changes: + * libupsclient had undefined references related to functions of +libcommon.This issue was reported on Debian (bug #731156) and +is now fixed + * support for new devices: ++ CABAC UPS-1700DV2 ++ Eaton Powerware 3105 ++ Emerson Network Power Liebert PSI 1440 ++ MicroDowell B.Box LP 500 ++ Numeric Digital 800 plus ++ OptiUPS VS 575C ++ Tripp Lite SU10KRT3/1X + * nutdrv_atcl_usb: new driver for 'ATCL FOR UPS' + * al175: re-introduced this driver (actually, it was in 2.7.1) + * upsdrvctl now provides retry options for upsdrvctl and driver(s) + * snmp-ups: add support for XPPC-MIB and Tripp Lite SU10KRT3/1X. +Also fix erroneous status in HP/Compaq SNMP MIB (with the most +recent HP firmware (1.76) ; +improved various MIBs (APC, HP/Compaq, ...) + * nutdrv_qx: add new 'fallback' Q1 subdriver, with minimal +'Q1' support. General improvements on all subdrivers. + * mge-shut: partially revert PnP/RTS change, for initializing +the communication with the UPS. Note that nut-scanner similar +function was not modified however. +- dropped nut-hal.patch +- use _smp_mflags macro for make +- build with --enable-option-checking=fatal and remove obsoleted --with-hal + and --with-linux-hiddev configure options + +--- Old: nut-2.7.1.tar.gz nut-2.7.1.tar.gz.sig nut-hal.patch New: nut-2.7.2.tar.gz nut-2.7.2.tar.gz.sig Other differences: -- ++ nut.spec ++ --- /var/tmp/diff_new_pack.JXAVI3/_old 2014-11-12 00:22:17.0 +0100 +++ /var/tmp/diff_new_pack.JXAVI3/_new 2014-11-12 00:22:17.0 +0100 @@ -59,7 +59,7 @@ Summary:Network UPS Tools Core (Uninterruptible Power Supply Monitoring) License:GPL-2.0+ Group: Hardware/UPS -Version:2.7.1 +Version:2.7.2 Release:0 Url:http://www.networkupstools.org/ Source: http://www.networkupstools.org/source/2.7/%{name}-%{version}.tar.gz @@ -75,8 +75,6 @@ Source11: nut-server Source12: nut-monitor Patch: nut-preconfig.patch -# PATCH-FIX-OPENSUSE nut-hal.patch sbra...@suse.cz -- Fix hal callouts path. -Patch1: nut-hal.patch Patch3: nut-notifyflag.patch Patch4: nut-powersave.patch Patch6: nut-udev.patch @@ -207,7 +205,6 @@ cp -a %{S:1} %{S:2} %{S:3} %{S:5} %{S:6} %{S:7} %{S:10} %{S:11} %{S:12} . mv upsd-early-powerdown.init upsd-early-powerdown %patch -%patch1 -p1 %patch3 %if %suse_version < 1110 %patch4 @@ -231,7 +228,6 @@ --datadir=%{_datadir}/nut\ --with-all\ --with-dev\ - --without-hal\ %if 0%{?suse_version} <= 1230 --without-ipmi\ %endif @@ -241,15 +237,16 @@ %if %suse_version <= 1110 --without-powerman\ %endif - --with-linux-hiddev=%{_includedir}/linux/hiddev.h\ --with-htmlpath=%{HTMLPATH}\ --with-cgipath=%{CGIPATH}\ --with-statepath=%{STATEPATH}\ --with-drvpath=%{MODELPATH}\ --with-user=%{USER}\ --with-group=%{GROUP} \ - --with-udev-dir=/etc/udev -make %{?jobs:-j%jobs} + --with-udev-dir=/etc/udev \ +--enable-option-checking=fatal + +make %{_smp_mflags} PORT=$(sed -n 's/#define PORT //p' config.log) if test "$PORT" = 3493 ; then PORT=nut @@ -312,9 +309,9 @@ bin/chown -R %{USER}:%{GROUP} %{STATEPATH} %{fillup_and_insserv -f -n upsd} # Generate initial passwords. -if usr/bin/fgrep -q "password = @UPSD_INITIAL_MASTER_
commit nut for openSUSE:Factory
Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at 2014-06-16 21:29:15 Comparing /work/SRC/openSUSE:Factory/nut (Old) and /work/SRC/openSUSE:Factory/.nut.new (New) Package is "nut" Changes: --- /work/SRC/openSUSE:Factory/nut/nut.changes 2014-04-04 16:39:31.0 +0200 +++ /work/SRC/openSUSE:Factory/.nut.new/nut.changes 2014-06-16 21:29:17.0 +0200 @@ -1,0 +2,5 @@ +Fri Jun 13 18:52:58 CEST 2014 - sbra...@suse.cz + +- Fix Summary. + +--- Other differences: -- ++ nut.spec ++ --- /var/tmp/diff_new_pack.akuPyt/_old 2014-06-16 21:29:18.0 +0200 +++ /var/tmp/diff_new_pack.akuPyt/_new 2014-06-16 21:29:18.0 +0200 @@ -56,7 +56,7 @@ %if 0%{?suse_version} > 1220 BuildRequires: gpg-offline %endif -Summary:Network UPS Tools Core (Unbreakable Power Supply Monitoring) +Summary:Network UPS Tools Core (Uninterruptible Power Supply Monitoring) License:GPL-2.0+ Group: Hardware/UPS Version:2.7.1 @@ -154,7 +154,7 @@ /usr/share/doc/packages/nut. %package -n libupsclient1 -Summary:Network UPS Tools Library (Unbreakable Power Supply Monitoring) +Summary:Network UPS Tools Library (Uninterruptible Power Supply Monitoring) Group: System/Libraries %description -n libupsclient1 @@ -187,7 +187,7 @@ /usr/share/doc/packages/nut. %package devel -Summary:Network UPS Tools (Unbreakable Power Supply Monitoring) +Summary:Network UPS Tools (Uninterruptible Power Supply Monitoring) Group: Development/Libraries/C and C++ Requires: %{name} = %{version} Requires: openssl-devel -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nut for openSUSE:Factory
Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at 2014-04-04 16:39:30 Comparing /work/SRC/openSUSE:Factory/nut (Old) and /work/SRC/openSUSE:Factory/.nut.new (New) Package is "nut" Changes: --- /work/SRC/openSUSE:Factory/nut/nut.changes 2014-02-18 16:18:58.0 +0100 +++ /work/SRC/openSUSE:Factory/.nut.new/nut.changes 2014-04-04 16:39:31.0 +0200 @@ -1,0 +2,15 @@ +Thu Apr 3 16:19:56 CEST 2014 - sbra...@suse.cz + +- Replace powersave support by systemd (bnc#871406). + +--- +Thu Mar 27 11:20:30 CET 2014 - r...@suse.de + +- explicitly require udev to fix buildenvironment issues + +--- +Fri Feb 14 20:15:04 CET 2014 - sbra...@suse.cz + +- Replace pm-utils support by systemd (FATE#316824). + +--- New: nut.system-sleep Other differences: -- ++ nut.spec ++ --- /var/tmp/diff_new_pack.BvXXef/_old 2014-04-04 16:39:31.0 +0200 +++ /var/tmp/diff_new_pack.BvXXef/_new 2014-04-04 16:39:31.0 +0200 @@ -31,10 +31,14 @@ BuildRequires: openssl-devel BuildRequires: pkg-config BuildRequires: tcpd-devel -# for directory ownership: -BuildRequires: pm-utils # To fix end-of-line encoding: BuildRequires: dos2unix +%if 0%{?suse_version} < 1310 +# for directory ownership: +BuildRequires: pm-utils +%else +BuildRequires: udev +%endif %if 0%{?suse_version} > 1230 %ifarch %{ix86} x86_64 ia64 alpha BuildRequires: freeipmi-devel @@ -63,6 +67,7 @@ Source2:README.SUSE Source3:upsd-early-powerdown.init Source5:nut.firewall.in +Source6:nut.system-sleep Source7:nut.sleep Source8: http://www.networkupstools.org/source/2.7/%{name}-%{version}.tar.gz.sig Source9:%{name}.keyring @@ -87,7 +92,6 @@ Requires: %{_bindir}/pgrep Requires: %{_bindir}/pkill Requires: %{_bindir}/readlink -Requires: powersave Requires: usbutils Requires(post): udev # for update from openSUSE <= 11.3, SLE <= 11 @@ -118,6 +122,9 @@ %define systemdsystemdutildir %(pkg-config --variable=systemdutildir systemd) %systemd_requires %endif +%if %suse_version < 1310 +Requires: powersave +%endif %description Core package of Network UPS Tools. @@ -197,7 +204,7 @@ %gpg_verify %{S:8} %endif %setup -q -cp -a %{S:1} %{S:2} %{S:3} %{S:5} %{S:7} %{S:10} %{S:11} %{S:12} . +cp -a %{S:1} %{S:2} %{S:3} %{S:5} %{S:6} %{S:7} %{S:10} %{S:11} %{S:12} . mv upsd-early-powerdown.init upsd-early-powerdown %patch %patch1 -p1 @@ -269,13 +276,18 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services cp nut.firewall $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/nut %endif +%if 0%{?suse_version} < 1310 %if %suse_version >= 1030 mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/pm-utils/sleep.d install nut.sleep $RPM_BUILD_ROOT%{_prefix}/lib/pm-utils/sleep.d/99nut %else -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pm/sleep.d +install -d $RPM_BUILD_ROOT%{_sysconfdir}/pm/sleep.d install nut.sleep $RPM_BUILD_ROOT%{_sysconfdir}/pm/sleep.d/99nut %endif +%else +install -d $RPM_BUILD_ROOT/usr/lib/systemd/system-sleep +install nut.system-sleep $RPM_BUILD_ROOT/usr/lib/systemd/system-sleep/%{name}.sh +%endif mkdir $RPM_BUILD_ROOT/bin mv $RPM_BUILD_ROOT%{_bindir}/upssched-cmd $RPM_BUILD_ROOT/bin/upssched-cmd # Rename web pages to not conflict with apache2-example-pages or user home page: @@ -311,7 +323,9 @@ # Be sure that all files are owned by a dedicated user. bin/chown %{USER}:root %{CONFPATH}/upsd.conf %{CONFPATH}/upsmon.conf %{CONFPATH}/upsd.users bin/chmod 600 %{CONFPATH}/upsd.conf %{CONFPATH}/upsmon.conf %{CONFPATH}/upsd.users -# Install HALT_POWERDOWN_INSERT +# Install or remove HALT_POWERDOWN_INSERT +# It was last installed in 1310, but it is obsolete since dropping sysvinit support. +%if 0%{?suse_version} < 1310 if usr/bin/grep -q '^HALT_POWERDOWN_INSERT="\(%{_sysconfdir}/init\.d/upsd try-powerdown\|\)"' etc/sysconfig/shutdown ; then usr/bin/sed -i 's:^\(HALT_POWERDOWN_INSERT="\).*"[[:space:]]*:\1%{_sysconfdir}/init.d/upsd try-powerdown":' etc/sysconfig/shutdown else @@ -324,12 +338,29 @@ echo >&2 "HALT_POWERDOWN_INSERT=\"/usr/bin/powersave -U\"" fi fi -# Migrate Suspend to Disc to the new convention (bnc#449861): +%else +# Unconditional removal of HALT_POWERDOWN_INSERT in new SUSE versions. (last installed in 1310) +if usr/bin/grep -q '^HALT_POWERDOWN_INSERT="\(%{_sysconfdir}/init\.d/upsd try-powerdown\|/usr/bin/powersave -U\)"' etc/sysconfig/shutdown ; then + usr/bin/sed -i 's:
commit nut for openSUSE:Factory
Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at 2014-02-18 16:18:56 Comparing /work/SRC/openSUSE:Factory/nut (Old) and /work/SRC/openSUSE:Factory/.nut.new (New) Package is "nut" Changes: --- /work/SRC/openSUSE:Factory/nut/nut.changes 2012-12-05 14:01:19.0 +0100 +++ /work/SRC/openSUSE:Factory/.nut.new/nut.changes 2014-02-18 16:18:58.0 +0100 @@ -1,0 +2,66 @@ +Tue Nov 26 20:48:34 CET 2013 - sbra...@suse.cz + +- Update to version 2.7.1: + For more see NEWS and UPGRADING in /usr/share/doc/packages/nut. + Potentially incompatible changes: + * First release after the transition from Subversion to Git. + * The linkman:apcsmart[8] driver has been replaced by a new +implementation. There is a new parameter, 'ttymode'. In case +of issues with this new version, users can revert to +apcsmart-old. + * The linkman:nutdrv_qx[8] driver will eventually supersede +blazer_ser and blazer_usb. Options are not exactly the same, +but are documented in the nutdrv_qx man page. + * Mozilla NSS support has been added. + * linkman:upsrw[8] now prints out the maximum size of +variables. + Other changes: + * Added a new driver, nutdrv_qx, for Megatec/Qx devices. This +driver will eventually replace the blazer_ser and blazer_usb +drivers. In particular, it adds support for Voltronic Power +devices. + * Increased USB_TIMEOUT to standards-compliant 5.000 seconds in +most drivers. This should reduce the number of timeouts on +low-speed USB 1.1 devices. + * Added many devices to the HCL. Of particular note are many +Tripp Lite USB HID PDC models which were tested against NUT by +Tripp Lite. + * Reworked some visual elements of the HCL. + * Also increased timeouts and added redundant commands to improve +reliability of mge-utalk driver. + * Added the apcupsd-ups driver to interoperate with apcupsd +installations. + * Added documentation on creating subdrivers for snmp-ups and +nutdrv_qx. + * Added new drivers for the Riello UPS product line +(riello_ser/riello_usb). + * Many improvements to the BCM/XCP. + * Added a few variables to the Powercom HID mappings. + * Updated the apcsmart driver, and renamed the previous driver to +apcsmart-old. + * Fixed the battery percentage calculation in the bestfcom +driver. + * libnutclient has been added as a C++ alternative to +libupsclient. + * Fix shutdown of Eaton HID, using usbhid-ups and mge-shut + * usbhid-ups: final fix for APC Back UPS ES. + * nut-scanner: fix crash + * IPMI support can handle more different versions of FreeIPMI + * Support power supplies scan over the network nut-scanner can +now scan for power supplies with IPMI over LAN. This is +currently limited to IPMI 1.5 only + * Improve systemd integration + * snmp-ups: Fixed a crash on outlet management, and added +delta_ups MIB support. Also fixed mappings for +upsBypassVoltage, upsBypassCurrent, and upsBypassPower in +three-phase IETF MIB. +- Enable FreeIPMI. + +--- +Tue Jan 29 21:14:30 CET 2013 - sbra...@suse.cz + +- Turn systemd integration on (nut-systemd-dirs.patch). +- Fix README.SUSE. +- nut-preconfig.patch: Fix UID recommendation. + +--- Old: nut-2.6.5.tar.gz nut-2.6.5.tar.gz.sig New: nut-2.7.1.tar.gz nut-2.7.1.tar.gz.sig nut-driver nut-monitor nut-server nut-systemd-dirs.patch Other differences: -- ++ nut.spec ++ --- /var/tmp/diff_new_pack.XNDgJ0/_old 2014-02-18 16:18:58.0 +0100 +++ /var/tmp/diff_new_pack.XNDgJ0/_new 2014-02-18 16:18:58.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package nut # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,8 +20,9 @@ BuildRequires: apache2-devel BuildRequires: avahi-devel BuildRequires: dbus-1-glib-devel +BuildRequires: gcc-c++ BuildRequires: gd-devel -BuildRequires: gpg-offline +BuildRequires: libcppunit-devel BuildRequires: libneon-devel BuildRequires: libopenssl-devel BuildRequires: libtool @@ -34,36 +35,48 @@ BuildRequires: pm-utils # To fix end-of-line encoding: BuildRequires: dos2unix -# For FreeIPMI support -%if 0%{?ENABLE_IPMI} +%if 0%{?suse_version} > 1230 +%ifarch %{ix86} x86_64 ia64 alpha BuildRequires: freeipmi-devel %endif -%if %suse_version > 1110 +%endif +%if 0%{?suse_version} >
commit nut for openSUSE:Factory
Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at 2012-12-05 14:01:10 Comparing /work/SRC/openSUSE:Factory/nut (Old) and /work/SRC/openSUSE:Factory/.nut.new (New) Package is "nut", Maintainer is "sbra...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/nut/nut.changes 2012-11-18 20:26:04.0 +0100 +++ /work/SRC/openSUSE:Factory/.nut.new/nut.changes 2012-12-05 14:01:19.0 +0100 @@ -1,0 +2,5 @@ +Mon Nov 19 21:22:52 CET 2012 - sbra...@suse.cz + +- Verify GPG signature. + +--- New: nut-2.6.5.tar.gz.sig nut.keyring Other differences: -- ++ nut.spec ++ --- /var/tmp/diff_new_pack.SCcIJH/_old 2012-12-05 14:01:20.0 +0100 +++ /var/tmp/diff_new_pack.SCcIJH/_new 2012-12-05 14:01:20.0 +0100 @@ -21,6 +21,7 @@ BuildRequires: avahi-devel BuildRequires: dbus-1-glib-devel BuildRequires: gd-devel +BuildRequires: gpg-offline BuildRequires: libneon-devel BuildRequires: libopenssl-devel BuildRequires: libtool @@ -55,6 +56,8 @@ Source3:upsd-early-powerdown.init Source5:nut.firewall.in Source7:nut.sleep +Source8: http://www.networkupstools.org/source/2.6/%{name}-%{version}.tar.gz.sig +Source9:%{name}.keyring Patch: nut-preconfig.patch # PATCH-FIX-OPENSUSE nut-hal.patch sbra...@suse.cz -- Fix hal callouts path. Patch1: nut-hal.patch @@ -172,6 +175,7 @@ /usr/share/doc/packages/nut. %prep +%gpg_verify %{S:8} %setup -q cp -a %{S:1} %{S:2} %{S:3} %{S:5} %{S:7} . mv upsd-early-powerdown.init upsd-early-powerdown ++ nut.keyring ++ pub 1024D/204DDF1B 2002-07-15 uid Arnaud Quette uid Arnaud Quette uid Arnaud Quette uid Arnaud Quette uid Arnaud Quette uid Arnaud Quette sub 1024g/D8B1B6B4 2002-07-15 -BEGIN PGP PUBLIC KEY BLOCK- Version: GnuPG v2.0.19 (GNU/Linux) mQGiBD0y56QRBACYMNr6RbAfj3T7ZoAyUWjofb/n5HalrHo7utL8V5qpbF0U95dJ 5KNXMzkSe79qviz5O8Np4UJdyzjbb1JSKdSiH56a08E/siJkwJ3c9b4eWCHB7Rq3 2nWWyeF2um/Sk9OqFPDp/3YPJIGxAYCNXMJWYDjVSRmyTkyt7q0cY+uZmwCgxxwv r8LoVOXfRfSeG41wp/3tIeMD/iuUmvpr9yRWKDlbAuhLEFRhzzcmWFezIUN8a1fW BmKxnbEcUkdOyrQMypXURWEnr2tYPOoGyq670xrwoWMCS7DhfQnUeFV0IANOvUZA SOCY8EsiiD3r05LjGEudbnvP2Ol0G5G46IEC2gwNsQlvFZhf+lGG2obFGnIFTi2o RhmxBACPemrbn3DoiPKwTpxoLsg5+s75InMDsPVe15TfxrDrXotsoT7rya5wjAIu aCqPlwI/RLweii1EZLFuBS9T1VO4k3uFXn8Ud9RuqhZnL45Ghw5dDPNnB8zTgqBP h9H1zNl+zPgN0DEZUTg9HZWfVFEfdEu/U6cr48tGk8gWefOB9rQiQXJuYXVkIFF1 ZXR0ZSA8YXF1ZXR0ZUBkZWJpYW4ub3JnPohhBBMRAgAhAhsDBgsJCAcDAgMVAgMD FgIBAh4BAheABQJGPMmfAhkBAAoJENtkFMogTd8bn18An2c/08D9uGribUlxWT8p dOkQnHubAJ0aG1k6KKuU61GWfJCB2QsMJkJBmLQlQXJuYXVkIFF1ZXR0ZSA8YXF1 ZXR0ZS5kZXZAZ21haWwuY29tPoheBBMRAgAeBQJDLqFpAhsDBgsJCAcDAgMVAgMD FgIBAh4BAheAAAoJENtkFMogTd8b4CwAmwfNvW7CypwmT6EDNmZDqxZcQtBxAKCO bSVfhTyNY0Otdh69B7T7cfFV2bQlQXJuYXVkIFF1ZXR0ZSA8YXJuYXVkLnF1ZXR0 ZUBmcmVlLmZyPohfBBMRAgAXBQI9MuelBQsHCgMEAxUDAgMWAgECF4AAEgkQ22QU yiBN3xsHZUdQRwABAVweAKCXt8Jwxss7+lS+f4K+VPlQoO+HogCgwtJKRgNvkv5D 1PdJhVf3CLZfaki0KEFybmF1ZCBRdWV0dGUgPGFybmF1ZC5xdWV0dGVAZGViaWFu Lm9yZz6IZgQTEQIAHgUCP1ThlAIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAASCRDb ZBTKIE3fGwdlR1BHAAEBsGwAnj7Q9Afc+gvlA3q5mUHdr6cFNLIWAJ96AQM1uri8 H3HAKgeHeEcpybF3DbQoQXJuYXVkIFF1ZXR0ZSA8YXJuYXVkLnF1ZXR0ZUBtZ2V1 cHMuY29tPohfBBMRAgAXBQI9ND4vBQsHCgMEAxUDAgMWAgECF4AAEgkQ22QUyiBN 3xsHZUdQRwABAVxfAJ0WFHDXpKrMiYqMRqYC9sJy7v/WLgCbB1Z8qUAnNd4WZJmo HUVMKTbJr420JkFybmF1ZCBRdWV0dGUgPEFybmF1ZFF1ZXR0ZUBFYXRvbi5jb20+ iGAEExECACAFAkjSDDACGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRDbZBTK IE3fG5fkAJwM0cd1Y67AjSQvIVv+Gq/CWrWx4wCePOsnHiyMhYN7OlWNV9HRtVm7 1Iq5AQ0EPTLnwhAEAKEe3dQVxVL/ekOXdYODJhNER4iJJD6mBlImCHHsFxY1OVLK K9R2n06QdgcLHSBgsSanujED2OeFl7gYcwxoXEqVdDTUQrbGIXAyu3KV+aPZFETv 9L5FHWIglP2UDEIpfu1LfM+h+mwcDnKEBHxOgtrTbdypCzNd+PFxb/8c51n7AAMF A/4h+KQER+lzk3vqtKDlod0hIVdgh1IkvlGwKw6MCgTQi3QDoq74DrICWLTl6Nqz cfnLsfokDAxflfrtU8sasJy7ych9Iv0MFbYubs0pzywYr9sKOxJKTO9JVWrFvGCG Cjo/ek73zKISZUHKgv7jungAv0er2pTsMdE66+eEFRhK9IhOBBgRAgAGBQI9MufC ABIJENtkFMogTd8bB2VHUEcAAQG6NQCcDXQDPuv6+LysxTssJmCylZRLyaoAoMaI YhUziTcacpO24e94Nt71AxEB =4Dhx -END PGP PUBLIC KEY BLOCK- -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nut for openSUSE:Factory
Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at 2012-11-18 20:26:02 Comparing /work/SRC/openSUSE:Factory/nut (Old) and /work/SRC/openSUSE:Factory/.nut.new (New) Package is "nut", Maintainer is "sbra...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/nut/nut.changes 2012-09-05 09:46:15.0 +0200 +++ /work/SRC/openSUSE:Factory/.nut.new/nut.changes 2012-11-18 20:26:04.0 +0100 @@ -1,0 +2,7 @@ +Sat Nov 17 09:54:35 UTC 2012 - a...@suse.de + +- Fix useradd invocation: -o is useless without -u and newer + versions of pwdutils/shadowutils fail on this now. +- Fix provides/obsoletes + +--- Other differences: -- ++ nut.spec ++ --- /var/tmp/diff_new_pack.0XTfH1/_old 2012-11-18 20:26:06.0 +0100 +++ /var/tmp/diff_new_pack.0XTfH1/_new 2012-11-18 20:26:06.0 +0100 @@ -75,9 +75,9 @@ Requires: usbutils Requires(post): udev # for update from openSUSE <= 11.3, SLE <= 11 -Provides: nut-classic <= %{version} -Obsoletes: nut-classic <= %{version} -Obsoletes: nut-hal <= %{version} +Provides: nut-classic = %{version} +Obsoletes: nut-classic < %{version} +Obsoletes: nut-hal < %{version} %define apache_serverroot %(%{_sbindir}/apxs2 -q datadir 2>/dev/null || %{_sbindir}/apxs -q PREFIX) %define CGIPATH%{apache_serverroot}/cgi-bin %define HTMLPATH %{apache_serverroot}/htdocs @@ -259,7 +259,7 @@ install -m0644 scripts/misc/nut.bash_completion $RPM_BUILD_ROOT/etc/bash_completion.d/ %pre -usr/sbin/useradd -r -o -g %{GROUP} -s /bin/false \ +usr/sbin/useradd -r -g %{GROUP} -s /bin/false \ -c "UPS daemon" -d /sbin %{USER} 2>/dev/null || : %post -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nut for openSUSE:Factory
Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at 2012-09-05 09:45:48 Comparing /work/SRC/openSUSE:Factory/nut (Old) and /work/SRC/openSUSE:Factory/.nut.new (New) Package is "nut", Maintainer is "sbra...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/nut/nut.changes 2012-08-22 12:14:35.0 +0200 +++ /work/SRC/openSUSE:Factory/.nut.new/nut.changes 2012-09-05 09:46:15.0 +0200 @@ -1,0 +2,57 @@ +Tue Sep 4 12:06:57 CEST 2012 - sbra...@suse.cz + +- Update to version 2.6.5: + * Fix regression in upssched. + * Support for new devices: Eaton ePDU Switched, Online Zinto A, +REDi Blazer 400VA / 600VA / 800VA, UNITEK Alpha650ipF and +Alpha650ipE, AEG Power Solutions PROTECT HOME, more APC SNMP +cards, ATEK Defensor range, all Borri models, all COVER ENERGY +SA, CyberPower OR700LCDRM1U, PR6000LCDRTXL5U and CP1000PFCLCD, +Dell UPS Network Management Card, Dynamix 1000VA USB, Eaton +Management Card Contact (ref 66104), EVER POWERLINE RT / 11 / +31 and DUO II Pro, GE Digital Energy GT Series 1000-3000 VA, +Gtec models, all recent HP serial / USB UPS (G2, G3 and R/T +models) and HP UPS Management Module, Ippon INNOVA RT, KOLFF +BLACK NOVA, Lexis X-power Tigra 1kVA, Microline C-Lion Innova, +Online Yunto YQ450, PowerShield Defender 1200VA, PowerWalker +Online VFI LCD, Line-Interactive VI LCD and Line-Interactive +VI, Riello Netman Plus 102 SNMP Card, Tripp-Lite OMNISMART500. + * mge-shut driver has been replaced by a new implementation. + * Support for integration with VMware ESXI 5.0. + * IPMI support. + * snmp-ups: high precision values for APC, more variables. + * The NUT variables and commands namespace has been fixed and +completed. + * Support of ranges of values for writable variables added. + * Static source code analysis fixes by RedHat using Coverity. + * Add new "LIST CLIENTS" and "NETVER" commands to NUT network +protocol. + * bcmxcp has improved support for battery status, and better +supports PW9120 units. + * bestfortress has improved Best Fortress LI675VA support. + * blazer_ser and blazer_usb now try to automatically estimate high +and low voltages; support for online Innova UPS (T, RT and 3/1 +T); Best UPS support has been improved. + * bestups fixes, but will soon be deprecated. + * newmge-shut has been heavilly improved. + * oneac 0.80 improves support for all families of Oneac. + * usbhid-ups: for Eaton devices, ups.start.auto is now +automatically adjusted for shutdown.{return,stayoff}; Liebert +firmwares with incorrect exponents have also been addressed. + * snmp-ups now provides support for UPS shutdown. Composite +commands are also supported now; Eaton/MGE MIB has been cleaned +and completed; 3-phases support has been added to Socomec +Netvision MIB; HP/Compaq MIB has been completed. + * nut-scanner now also has libupsclient has a weak runtime +dependency. + * Provide an Uncomplicated Firewall (UFW) profile. + * Riello protocols have been officially published in NUT +protocols library. + * Duplicate instances of upsd / upsmon are now detected. + * upslog now comes with logrotate configuration. + * more devices embed NUT for power protection, now including +Thecus NAS range. + * PyNUT.py has been updated to version 1.2.2. + * Bugfixes, cleanup and improvements. + +--- @@ -12 +69 @@ - * Cupport for new devices: Cyber Power Systems with SNMP RMCARD + * Support for new devices: Cyber Power Systems with SNMP RMCARD Old: nut-2.6.3.tar.gz nut-CVE-2012-2944.patch New: nut-2.6.5.tar.gz Other differences: -- ++ nut.spec ++ --- /var/tmp/diff_new_pack.BRtIya/_old 2012-09-05 09:46:17.0 +0200 +++ /var/tmp/diff_new_pack.BRtIya/_new 2012-09-05 09:46:17.0 +0200 @@ -46,7 +46,7 @@ Summary:Network UPS Tools Core (Unbreakable Power Supply Monitoring) License:GPL-2.0+ Group: Hardware/UPS -Version:2.6.3 +Version:2.6.5 Release:0 Url:http://www.networkupstools.org/ Source: http://www.networkupstools.org/source/2.6/%{name}-%{version}.tar.gz @@ -61,8 +61,6 @@ Patch3: nut-notifyflag.patch Patch4: nut-powersave.patch Patch6: nut-udev.patch -# PATCH-FIX-SECURITY nut-CVE-2012-2944.patch bnc764699 CVE-2012-2944 sbra...@suse.cz -- Fix random data crash. -Patch7: nut-CVE-2012-2944.patch Provides: smartups = %version Obsoletes: smartups < %version Conflicts: apcupsd @@ -191,8 +189,6 @@ sed -i 's:/usr/lib/pm-utils/functions:/etc/pm/functions:' nu
commit nut for openSUSE:Factory
Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at 2012-08-22 12:14:28 Comparing /work/SRC/openSUSE:Factory/nut (Old) and /work/SRC/openSUSE:Factory/.nut.new (New) Package is "nut", Maintainer is "sbra...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/nut/nut.changes 2012-06-01 07:22:02.0 +0200 +++ /work/SRC/openSUSE:Factory/.nut.new/nut.changes 2012-08-22 12:14:35.0 +0200 @@ -1,0 +2,5 @@ +Thu May 31 17:36:17 CEST 2012 - sbra...@suse.cz + +- Fix random network data crash (bnc#764699, CVE-2012-2944). + +--- New: nut-CVE-2012-2944.patch Other differences: -- ++ nut.spec ++ --- /var/tmp/diff_new_pack.3mrqRX/_old 2012-08-22 12:14:39.0 +0200 +++ /var/tmp/diff_new_pack.3mrqRX/_new 2012-08-22 12:14:39.0 +0200 @@ -61,6 +61,8 @@ Patch3: nut-notifyflag.patch Patch4: nut-powersave.patch Patch6: nut-udev.patch +# PATCH-FIX-SECURITY nut-CVE-2012-2944.patch bnc764699 CVE-2012-2944 sbra...@suse.cz -- Fix random data crash. +Patch7: nut-CVE-2012-2944.patch Provides: smartups = %version Obsoletes: smartups < %version Conflicts: apcupsd @@ -189,6 +191,7 @@ sed -i 's:/usr/lib/pm-utils/functions:/etc/pm/functions:' nut.sleep %endif sed -i s:/usr/local/ups/bin:/bin: conf/upssched.conf.sample.in +%patch7 -p2 [ -f docs/nut-qa.txt ] dos2unix docs/nut-qa.txt ++ nut-CVE-2012-2944.patch ++ Timestamp: 05/29/12 18:19:38 Author: aquette Message: Fix CVE-2012-2944: upsd can be remotely crashed NUT server (upsd), from versions 2.4.0 to 2.6.3, are exposed to crashes when receiving random data from the network. This issue is related to the way NUT parses characters, especially from the network. Non printable characters were missed from strings operation (such as strlen), but still copied to the buffer, causing an overflow. Thus, fix NUT parser, to only allow the subset Ascii charset from Space to ~ (Reported by Sebastian Pohle, Alioth bug #313636, CVE-2012-2944) Index: /trunk/common/parseconf.c === --- /trunk/common/parseconf.c (revision 3487) +++ /trunk/common/parseconf.c (revision 3633) @@ -171,4 +171,11 @@ wbuflen = strlen(ctx->wordbuf); + + /* CVE-2012-2944: only allow the subset Ascii charset from Space to ~ */ + if ((ctx->ch < 0x20) || (ctx->ch > 0x7f)) { + fprintf(stderr, "addchar: discarding invalid character (0x%02x)!\n", + ctx->ch); + return; + } if (ctx->wordlen_limit != 0) { -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nut for openSUSE:Factory
Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at 2012-06-01 07:21:57 Comparing /work/SRC/openSUSE:Factory/nut (Old) and /work/SRC/openSUSE:Factory/.nut.new (New) Package is "nut", Maintainer is "sbra...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/nut/nut.changes 2011-11-21 15:48:30.0 +0100 +++ /work/SRC/openSUSE:Factory/.nut.new/nut.changes 2012-06-01 07:22:02.0 +0200 @@ -1,0 +2,18 @@ +Wed May 30 20:19:10 CEST 2012 - sbra...@suse.cz + +- Upgrade to version 2.6.3: + * nut-scanner is now improved and more portable. + * pkg-config support + * Cupport for new devices: Cyber Power Systems with SNMP RMCARD +(100, 201, 202 and 301); Dynamix 650VA USB; LDLC UPS-1200D; +Tecnoware UPS ERA LCD 0.65; Powercom BNT-xxxAP (USB ID +0d9f:0004); Various USB devices using UPSilon 2000 software. + * bcmxcp_usb now handles disconnection and reconnection. + * blazer_usb enables again inclusion of buggy IDs. + * upsd doesn't anymore fail where either IPv4 or IPv6 is +disabled, and no explicit LISTEN directive has been specified. + * Avahi support is now automatically enabled, upon detection. + * jNut (NUT Java interface) adds device discovery support. + * Many bugfixes, cleanup and improvements. + +--- Old: nut-2.6.2.tar.bz2 nut-usb-ups-ids.patch New: nut-2.6.3.tar.gz Other differences: -- ++ nut.spec ++ --- /var/tmp/diff_new_pack.qM7AXp/_old 2012-06-01 07:22:04.0 +0200 +++ /var/tmp/diff_new_pack.qM7AXp/_new 2012-06-01 07:22:04.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package nut # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,9 +16,19 @@ # - Name: nut -BuildRequires: apache2-devel dbus-1-glib-devel gd-devel libneon-devel libopenssl-devel libtool libusb-devel net-snmp-devel openssl-devel pkg-config tcpd-devel +BuildRequires: apache2-devel +BuildRequires: avahi-devel +BuildRequires: dbus-1-glib-devel +BuildRequires: gd-devel +BuildRequires: libneon-devel +BuildRequires: libopenssl-devel +BuildRequires: libtool +BuildRequires: libusb-devel +BuildRequires: net-snmp-devel +BuildRequires: openssl-devel +BuildRequires: pkg-config +BuildRequires: tcpd-devel # for directory ownership: BuildRequires: pm-utils # To fix end-of-line encoding: @@ -30,15 +40,16 @@ %if %suse_version > 1110 BuildRequires: powerman-devel # For doc build: -BuildRequires: asciidoc dblatex +BuildRequires: asciidoc +BuildRequires: dblatex %endif +Summary:Network UPS Tools Core (Unbreakable Power Supply Monitoring) License:GPL-2.0+ Group: Hardware/UPS -Summary:Network UPS Tools Core (Unbreakable Power Supply Monitoring) -Version:2.6.2 -Release:1 +Version:2.6.3 +Release:0 Url:http://www.networkupstools.org/ -Source: http://www.networkupstools.org/source/2.6/%{name}-%{version}.tar.bz2 +Source: http://www.networkupstools.org/source/2.6/%{name}-%{version}.tar.gz Source1:upsd.init Source2:README.SUSE Source3:upsd-early-powerdown.init @@ -50,14 +61,18 @@ Patch3: nut-notifyflag.patch Patch4: nut-powersave.patch Patch6: nut-udev.patch -# PATCH-FIX-UPSTREAM nut-usb-ups-ids.patch bnc719292 sbra...@suse.cz -- Add missing USB ids. http://lists.alioth.debian.org/pipermail/nut-upsdev/2011-November/005642.html -Patch7: nut-usb-ups-ids.patch Provides: smartups = %version Obsoletes: smartups < %version Conflicts: apcupsd BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: pwdutils /bin/chown %insserv_prereq pwdutils /bin/chown /bin/chmod %{_bindir}/fgrep %{_bindir}/grep %{_bindir}/sed %{_bindir}/head %{_bindir}/md5sum -Requires: powersave %{_bindir}/pgrep %{_bindir}/pkill %{_bindir}/grep %{_bindir}/fgrep usbutils %{_bindir}/readlink +Requires: %{_bindir}/fgrep +Requires: %{_bindir}/grep +Requires: %{_bindir}/pgrep +Requires: %{_bindir}/pkill +Requires: %{_bindir}/readlink +Requires: powersave +Requires: usbutils Requires(post): udev # for update from openSUSE <= 11.3, SLE <= 11 Provides: nut-classic <= %{version} @@ -76,8 +91,8 @@ %define QUOTE " %define BACKSLASH \\ # Collect all devices listed in ups-nut-device.fdi: -%define USBHIDDRIVERS%(bunzip2 <%{S:0} | tr a-z A-Z |
commit nut for openSUSE:Factory
Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at 2011-12-06 18:32:54 Comparing /work/SRC/openSUSE:Factory/nut (Old) and /work/SRC/openSUSE:Factory/.nut.new (New) Package is "nut", Maintainer is "sbra...@suse.com" Changes: Other differences: -- ++ nut.spec ++ --- /var/tmp/diff_new_pack.cxQc8e/_old 2011-12-06 18:53:54.0 +0100 +++ /var/tmp/diff_new_pack.cxQc8e/_new 2011-12-06 18:53:54.0 +0100 @@ -32,7 +32,7 @@ # For doc build: BuildRequires: asciidoc dblatex %endif -License:GPLv2+ +License:GPL-2.0+ Group: Hardware/UPS Summary:Network UPS Tools Core (Unbreakable Power Supply Monitoring) Version:2.6.2 @@ -93,7 +93,7 @@ /usr/share/doc/packages/nut. %package drivers-net -License:GPLv2+ +License:GPL-2.0+ Summary:Network UPS Tools - Extra Networking Drivers (for Network Monitoring) Group: Hardware/UPS Requires: %{name} = %{version} @@ -112,7 +112,7 @@ /usr/share/doc/packages/nut. %package -n libupsclient1 -License:GPLv2+ +License:GPL-2.0+ Summary:Network UPS Tools Library (Unbreakable Power Supply Monitoring) Group: System/Libraries @@ -126,7 +126,7 @@ /usr/share/doc/packages/nut. %package cgi -License:GPLv2+ +License:GPL-2.0+ Summary:Network UPS Tools Web Server Support (UPS Status Pages) Group: Hardware/UPS Requires: %{name} = %{version} @@ -147,7 +147,7 @@ /usr/share/doc/packages/nut. %package devel -License:GPLv2+ +License:GPL-2.0+ Summary:Network UPS Tools (Unbreakable Power Supply Monitoring) Group: Development/Libraries/C and C++ Requires: %{name} = %{version} openssl-devel -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nut for openSUSE:Factory
Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at 2011-11-21 15:48:16 Comparing /work/SRC/openSUSE:Factory/nut (Old) and /work/SRC/openSUSE:Factory/.nut.new (New) Package is "nut", Maintainer is "sbra...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/nut/nut.changes 2011-11-07 14:23:22.0 +0100 +++ /work/SRC/openSUSE:Factory/.nut.new/nut.changes 2011-11-21 15:48:30.0 +0100 @@ -1,0 +2,5 @@ +Sun Nov 20 06:26:37 UTC 2011 - co...@suse.com + +- add libtool as buildrequire to avoid implicit dependency + +--- Other differences: -- ++ nut.spec ++ --- /var/tmp/diff_new_pack.UDkUGF/_old 2011-11-21 15:48:34.0 +0100 +++ /var/tmp/diff_new_pack.UDkUGF/_new 2011-11-21 15:48:34.0 +0100 @@ -18,7 +18,7 @@ Name: nut -BuildRequires: apache2-devel dbus-1-glib-devel gd-devel libneon-devel libopenssl-devel libusb-devel net-snmp-devel openssl-devel pkg-config tcpd-devel +BuildRequires: apache2-devel dbus-1-glib-devel gd-devel libneon-devel libopenssl-devel libtool libusb-devel net-snmp-devel openssl-devel pkg-config tcpd-devel # for directory ownership: BuildRequires: pm-utils # To fix end-of-line encoding: -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nut for openSUSE:Factory
Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at 2011-11-07 14:23:20 Comparing /work/SRC/openSUSE:Factory/nut (Old) and /work/SRC/openSUSE:Factory/.nut.new (New) Package is "nut", Maintainer is "sbra...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/nut/nut.changes 2011-11-02 12:09:21.0 +0100 +++ /work/SRC/openSUSE:Factory/.nut.new/nut.changes 2011-11-07 14:23:22.0 +0100 @@ -1,0 +2,5 @@ +Wed Nov 2 18:45:31 CET 2011 - sbra...@suse.cz + +- Patch real source files to get missing devices (bnc#719292#c7). + +--- Other differences: -- ++ nut-usb-ups-ids.patch ++ --- /var/tmp/diff_new_pack.P75dPq/_old 2011-11-07 14:23:23.0 +0100 +++ /var/tmp/diff_new_pack.P75dPq/_new 2011-11-07 14:23:23.0 +0100 @@ -1,36 +1,31 @@ -Index: nut-2.6.2/scripts/udev/nut-usbups.rules.in +Index: nut-2.6.2/drivers/blazer_usb.c === nut-2.6.2.orig/scripts/udev/nut-usbups.rules.in -+++ nut-2.6.2/scripts/udev/nut-usbups.rules.in -@@ -54,6 +54,8 @@ ATTR{idVendor}=="050d", ATTR{idProduct}= - ATTR{idVendor}=="050d", ATTR{idProduct}=="0980", MODE="664", GROUP="@RUN_AS_GROUP@" - # F6C1100-UNV, F6C1200-UNV - usbhid-ups - ATTR{idVendor}=="050d", ATTR{idProduct}=="1100", MODE="664", GROUP="@RUN_AS_GROUP@" -+# Belkin F6C1200-UNV -+ATTR{idVendor}=="0665", ATTR{idProduct}=="5161", MODE="664", GROUP="@RUN_AS_GROUP@" +--- nut-2.6.2.orig/drivers/blazer_usb.c nut-2.6.2/drivers/blazer_usb.c +@@ -305,8 +305,8 @@ static void *phoenix_subdriver(void) - # APC - # various models - usbhid-ups -@@ -84,9 +86,9 @@ ATTR{idVendor}=="06da", ATTR{idProduct}= - ATTR{idVendor}=="075d", ATTR{idProduct}=="0300", MODE="664", GROUP="@RUN_AS_GROUP@" - - # Cyber Power Systems --# 900AVR/BC900D, CP1200AVR/BC1200D - usbhid-ups -+# 900AVR/BC900D - usbhid-ups - ATTR{idVendor}=="0764", ATTR{idProduct}=="0005", MODE="664", GROUP="@RUN_AS_GROUP@" --# Dynex DX-800U? - usbhid-ups -+# CP1200AVR/BC1200D, Dynex DX-800U? - usbhid-ups - ATTR{idVendor}=="0764", ATTR{idProduct}=="0501", MODE="664", GROUP="@RUN_AS_GROUP@" - # OR2200LCDRM2U - usbhid-ups - ATTR{idVendor}=="0764", ATTR{idProduct}=="0601", MODE="664", GROUP="@RUN_AS_GROUP@" -@@ -177,4 +179,10 @@ ATTR{idVendor}=="10af", ATTR{idProduct}= - # GE EP series - blazer_usb - ATTR{idVendor}=="14f0", ATTR{idProduct}=="00c9", MODE="664", GROUP="@RUN_AS_GROUP@" + static usb_device_id_t blazer_usb_id[] = { + { USB_DEVICE(0x05b8, 0x), &cypress_subdriver }, /* Agiler UPS */ +- {0x0001, 0x, &krauler_subdriver }, /* Krauler UP-M500VA */ +- {0x, 0x, &krauler_subdriver }, /* Ablerex 625L USB */ ++ { USB_DEVICE(0x0001, 0x), &krauler_subdriver }, /* Krauler UP-M500VA */ ++ { USB_DEVICE(0x, 0x), &krauler_subdriver }, /* Ablerex 625L USB */ + { USB_DEVICE(0x0665, 0x5161), &cypress_subdriver }, /* Belkin F6C1200-UNV */ + { USB_DEVICE(0x06da, 0x0003), &ippon_subdriver }, /* Mustek Powermust */ + { USB_DEVICE(0x0f03, 0x0001), &cypress_subdriver }, /* Unitek Alpha 1200Sx */ +Index: nut-2.6.2/drivers/cps-hid.c +=== +--- nut-2.6.2.orig/drivers/cps-hid.c nut-2.6.2/drivers/cps-hid.c +@@ -48,9 +48,9 @@ static void *cps_battery_scale(void) -+# Krauler UP-M500VA - blazer_usb -+ATTR{idVendor}=="0001", ATTR{idProduct}=="", MODE="664", GROUP="@RUN_AS_GROUP@" -+ -+# Ablerex 625L USB -+ATTR{idVendor}=="", ATTR{idProduct}=="", MODE="664", GROUP="@RUN_AS_GROUP@" -+ - LABEL="nut-usbups_rules_end" + /* USB IDs device table */ + static usb_device_id_t cps_usb_device_table[] = { +- /* 900AVR/BC900D, CP1200AVR/BC1200D */ ++ /* 900AVR/BC900D */ + { USB_DEVICE(CPS_VENDORID, 0x0005), NULL }, +- /* Dynex DX-800U? */ ++ /* CP1200AVR/BC1200D, Dynex DX-800U? */ + { USB_DEVICE(CPS_VENDORID, 0x0501), &cps_battery_scale }, + /* OR2200LCDRM2U */ + { USB_DEVICE(CPS_VENDORID, 0x0601), NULL }, -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nut for openSUSE:Factory
Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at 2011-11-02 12:09:19 Comparing /work/SRC/openSUSE:Factory/nut (Old) and /work/SRC/openSUSE:Factory/.nut.new (New) Package is "nut", Maintainer is "sbra...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/nut/nut.changes 2011-09-23 02:14:55.0 +0200 +++ /work/SRC/openSUSE:Factory/.nut.new/nut.changes 2011-11-02 12:09:21.0 +0100 @@ -1,0 +2,27 @@ +Tue Nov 1 20:56:52 CET 2011 - sbra...@suse.cz + +- Added missing USB devices (bnc#719292). +- Build without IPMI (openSUSE 12.1 does not contain freeipmi). +- Build without powerman for older products. +- Trigger udev to apply newly installed rules (bnc#727396). + +--- +Wed Sep 21 19:00:42 CEST 2011 - sbra...@suse.cz + +- Build without IPMI for older products. + +--- +Mon Sep 19 19:09:52 UTC 2011 - j...@suse.com + +- Upgrade to version 2.6.2 (requested by christoph.wal...@countr.de) + * NUT can now monitor power supply units (PSU) in servers + * NUT now provides 'nut-scanner', to discover supported devices + * NUT now provides a Java interface called 'jNut'. + * support for: Eaton 3S ; Cyber Power Systems CP1000AVRLCD ; +various APC models equiped with APC AP9618 management card, including APC +Smart-UPS RT XL ; Orvaldi 750 / 900SP ; POWEREX VI 1000 LED ; PowerWalker +VI 850 LCD ; SVEN Power Pro+ series (USB ID :). + * Avahi support has been added + * many updates and fixes. + +--- Old: nut-2.6.1.tar.bz2 New: nut-2.6.2.tar.bz2 nut-usb-ups-ids.patch Other differences: -- ++ nut.spec ++ --- /var/tmp/diff_new_pack.qimF4a/_old 2011-11-02 12:09:22.0 +0100 +++ /var/tmp/diff_new_pack.qimF4a/_new 2011-11-02 12:09:22.0 +0100 @@ -18,20 +18,27 @@ Name: nut -BuildRequires: apache2-devel dbus-1-glib-devel gd-devel libneon-devel libopenssl-devel libusb-devel net-snmp-devel openssl-devel pkg-config powerman-devel tcpd-devel +BuildRequires: apache2-devel dbus-1-glib-devel gd-devel libneon-devel libopenssl-devel libusb-devel net-snmp-devel openssl-devel pkg-config tcpd-devel # for directory ownership: BuildRequires: pm-utils # To fix end-of-line encoding: BuildRequires: dos2unix +# For FreeIPMI support +%if 0%{?ENABLE_IPMI} +BuildRequires: freeipmi-devel +%endif +%if %suse_version > 1110 +BuildRequires: powerman-devel # For doc build: BuildRequires: asciidoc dblatex +%endif License:GPLv2+ Group: Hardware/UPS Summary:Network UPS Tools Core (Unbreakable Power Supply Monitoring) -Version:2.6.1 +Version:2.6.2 Release:1 Url:http://www.networkupstools.org/ -Source: %{name}-%{version}.tar.bz2 +Source: http://www.networkupstools.org/source/2.6/%{name}-%{version}.tar.bz2 Source1:upsd.init Source2:README.SUSE Source3:upsd-early-powerdown.init @@ -43,12 +50,15 @@ Patch3: nut-notifyflag.patch Patch4: nut-powersave.patch Patch6: nut-udev.patch +# PATCH-FIX-UPSTREAM nut-usb-ups-ids.patch bnc719292 sbra...@suse.cz -- Add missing USB ids. http://lists.alioth.debian.org/pipermail/nut-upsdev/2011-November/005642.html +Patch7: nut-usb-ups-ids.patch Provides: smartups = %version Obsoletes: smartups < %version Conflicts: apcupsd BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: pwdutils /bin/chown %insserv_prereq pwdutils /bin/chown /bin/chmod %{_bindir}/fgrep %{_bindir}/grep %{_bindir}/sed %{_bindir}/head %{_bindir}/md5sum Requires: powersave %{_bindir}/pgrep %{_bindir}/pkill %{_bindir}/grep %{_bindir}/fgrep usbutils %{_bindir}/readlink +Requires(post): udev # for update from openSUSE <= 11.3, SLE <= 11 Provides: nut-classic <= %{version} Obsoletes: nut-classic <= %{version} @@ -162,6 +172,7 @@ %if %suse_version < 1030 %patch6 -R %endif +%patch7 -p1 sed -i "s/@UPSD_USER@/%{USER}/g" upsd.init conf/upsmon.conf.sample %if %suse_version < 1030 sed -i 's:/usr/lib/pm-utils/functions:/etc/pm/functions:' nut.sleep @@ -179,6 +190,12 @@ --with-all\ --with-dev\ --without-hal\ +%if ! 0%{?ENABLE_IPMI} + --without-ipmi\ +%endif +%if %suse_version <= 1110 + --without-powerman\ +%endif --with-linux-hiddev=%{_includedir}/linux/hiddev.h\ --with-htmlpath=%{HTMLPATH}\ --with-cgipath=%{CGIPATH}\ @@ -272,6 +289,8 @@ # values are copied to not replaced config files. # %{_sysconfdir}/sysconfi
commit nut for openSUSE:Factory
Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at Mon Jun 20 14:13:22 CEST 2011. --- nut/nut.changes 2011-02-09 15:22:57.0 +0100 +++ nut/nut.changes 2011-06-17 15:39:57.0 +0200 @@ -1,0 +2,26 @@ +Thu Jun 16 18:47:47 CEST 2011 - sbra...@suse.cz + +- Upgrade to version 2.6.1 (bnc#698152): + * NUT now propose a variable to expose UPS efficiency. + * Various recent USB regressions have been definitely fixed. + * NUT now propose a variable to expose UPS efficiency. + * Support for new devices: Eaton Ellipse ECO, Powerware 9140, +Eaton 5 PX, and ambient sensor on Eaton ePDU managed, GE EP +series, Inform Sinus SS 210, IPAR Mini Energy ME 800, Mustek +Yukai PowerMust 1000 USB, Numeric 3000 SW, SVEN Power Pro+ +series (recent models), Vivaldi EA200 LED. + * Improved Liebert ESP II support, PowerCom BNT 1500A and +BNT-other, blazer + * apcsmart has more improved UPS poweroff support and options. + * usbhid-ups has completed a bit supported variables for APC and +Eaton/MGE. + * Documentation updates. +- Drop nut-hal and merge nut-classic back to nut (bnc#697028). + +--- +Tue Jun 14 20:10:53 CEST 2011 - sbra...@suse.cz + +- Fixed command order during hibernate to prevent UPS communication + locks and failures (bnc#660236). + +--- calling whatdependson for head-i586 Old: nut-2.6.0.tar.bz2 nut-disable-hal-hid-ups.fdi New: nut-2.6.1.tar.bz2 Other differences: -- ++ nut.spec ++ --- /var/tmp/diff_new_pack.svIMvp/_old 2011-06-20 14:07:22.0 +0200 +++ /var/tmp/diff_new_pack.svIMvp/_new 2011-06-20 14:07:22.0 +0200 @@ -18,23 +18,24 @@ Name: nut -BuildRequires: apache2-devel dbus-1-devel gd-devel hal-devel libneon-devel libopenssl-devel libusb-devel net-snmp-devel openssl-devel pkg-config powerman-devel tcpd-devel +BuildRequires: apache2-devel dbus-1-glib-devel gd-devel libneon-devel libopenssl-devel libusb-devel net-snmp-devel openssl-devel pkg-config powerman-devel tcpd-devel # for directory ownership: BuildRequires: pm-utils # To fix end-of-line encoding: BuildRequires: dos2unix +# For doc build: +BuildRequires: asciidoc dblatex License:GPLv2+ Group: Hardware/UPS Summary:Network UPS Tools Core (Unbreakable Power Supply Monitoring) -Version:2.6.0 -Release:6 +Version:2.6.1 +Release:1 Url:http://www.networkupstools.org/ Source: %{name}-%{version}.tar.bz2 Source1:upsd.init Source2:README.SUSE Source3:upsd-early-powerdown.init Source5:nut.firewall.in -Source6:nut-disable-hal-hid-ups.fdi Source7:nut.sleep Patch: nut-preconfig.patch # PATCH-FIX-OPENSUSE nut-hal.patch sbra...@suse.cz -- Fix hal callouts path. @@ -46,8 +47,12 @@ Obsoletes: smartups < %version Conflicts: apcupsd BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: pwdutils /bin/chown -Requires: nut-package = %{version} +PreReq: pwdutils /bin/chown %insserv_prereq pwdutils /bin/chown /bin/chmod %{_bindir}/fgrep %{_bindir}/grep %{_bindir}/sed %{_bindir}/head %{_bindir}/md5sum +Requires: powersave %{_bindir}/pgrep %{_bindir}/pkill %{_bindir}/grep %{_bindir}/fgrep usbutils %{_bindir}/readlink +# for update from openSUSE <= 11.3, SLE <= 11 +Provides: nut-classic <= %{version} +Obsoletes: nut-classic <= %{version} +Obsoletes: nut-hal <= %{version} %define apache_serverroot %(%{_sbindir}/apxs2 -q datadir 2>/dev/null || %{_sbindir}/apxs -q PREFIX) %define CGIPATH%{apache_serverroot}/cgi-bin %define HTMLPATH %{apache_serverroot}/htdocs @@ -81,14 +86,14 @@ License:GPLv2+ Summary:Network UPS Tools - Extra Networking Drivers (for Network Monitoring) Group: Hardware/UPS -Requires: %{name}-classic = %{version} -Enhances: %{name}-classic +Requires: %{name} = %{version} +Enhances: %{name} # for update from openSUSE <= 10.3, SLE <= 10 Provides: nut:%{MODELPATH}/snmp-ups %description drivers-net Networking drivers for the Network UPS Tools. You will need them -altogether with nut-classic to provide UPS networking support. +together with nut to provide UPS networking support. Network UPS Tools is a collection of programs which provide a common interface for monitoring and administering UPS hardware. @@ -110,85 +115,13 @@ Detailed information about supported hardware can be found in /usr/share/doc/packages/nut. -%package classic -License:GPLv2+ -Summary:Network UPS Tools Classic Package (Monitoring Server) -Group: Hardware/UPS -Requires: %{name}
commit nut for openSUSE:Factory
Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at Wed Apr 20 14:02:11 CEST 2011. --- nut/nut.changes 2011-02-08 11:17:24.0 +0100 +++ /mounts/work_src_done/STABLE/nut/nut.changes2011-02-09 15:22:57.0 +0100 @@ -1,0 +2,6 @@ +Wed Feb 9 15:21:54 CET 2011 - sbra...@suse.cz + +- Do not force move hal addons - fix configure check instead - + different SUSE versions need different path. + +--- calling whatdependson for head-i586 New: nut-hal.patch Other differences: -- ++ nut.spec ++ --- /var/tmp/diff_new_pack.TI1idJ/_old 2011-04-20 14:01:10.0 +0200 +++ /var/tmp/diff_new_pack.TI1idJ/_new 2011-04-20 14:01:10.0 +0200 @@ -27,7 +27,7 @@ Group: Hardware/UPS Summary:Network UPS Tools Core (Unbreakable Power Supply Monitoring) Version:2.6.0 -Release:1 +Release:6 Url:http://www.networkupstools.org/ Source: %{name}-%{version}.tar.bz2 Source1:upsd.init @@ -37,6 +37,8 @@ Source6:nut-disable-hal-hid-ups.fdi Source7:nut.sleep Patch: nut-preconfig.patch +# PATCH-FIX-OPENSUSE nut-hal.patch sbra...@suse.cz -- Fix hal callouts path. +Patch1: nut-hal.patch Patch3: nut-notifyflag.patch Patch4: nut-powersave.patch Patch6: nut-udev.patch @@ -220,6 +222,7 @@ cp -a %{S:6} 20-nut-disable-hal-hid-ups.fdi mv upsd-early-powerdown.init upsd-early-powerdown %patch +%patch1 -p1 %patch3 %if %suse_version < 1110 %patch4 @@ -295,9 +298,6 @@ mkdir -p $RPM_BUILD_ROOT/etc/bash_completion.d install -m0644 scripts/misc/nut.bash_completion $RPM_BUILD_ROOT/etc/bash_completion.d/ -mkdir -p $RPM_BUILD_ROOT/%{_prefix}/lib/hal -mv $RPM_BUILD_ROOT/%{_prefix}/lib64/hal/hald-addon-* $RPM_BUILD_ROOT/%{_prefix}/lib/hal || true - %pre usr/sbin/useradd -r -o -g %{GROUP} -s /bin/false \ -c "UPS daemon" -d /sbin %{USER} 2>/dev/null || : @@ -445,7 +445,11 @@ %files hal %defattr(-,root,root) %{_datadir}/hal/fdi/information/20thirdparty/20-ups-nut-device.fdi +%if %suse_version < 1120 +%{_libdir}/hal/* +%else %{_prefix}/lib/hal/* +%endif %files devel %defattr(-,root,root) ++ nut-hal.patch ++ Index: nut-2.6.0/m4/nut_config_libhal.m4 === --- nut-2.6.0.orig/m4/nut_config_libhal.m4 +++ nut-2.6.0/m4/nut_config_libhal.m4 @@ -71,7 +71,11 @@ if test -z "${nut_have_config_libhal_see dnl As per HAL spec, §5 Callouts addon install path: $libdir/hal HAL_CALLOUTS_PATH="`pkg-config --silence-errors --variable=libexecdir hal 2>/dev/null`" if test "$?" != "0" -o -z "${HAL_CALLOUTS_PATH}"; then - HAL_CALLOUTS_PATH="${libdir}/hal" + if test -d "${prefix}/lib/hal"; then + HAL_CALLOUTS_PATH="${prefix}/lib/hal" + else + HAL_CALLOUTS_PATH="${libdir}/hal" + fi fi ]) AC_MSG_RESULT(${HAL_CALLOUTS_PATH}) Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org