diff --git a/nut-libtool.diff b/nut-libtool.diff new file mode 100644 index 0000000..aa917de --- /dev/null +++ b/nut-libtool.diff @@ -0,0 +1,47 @@ +--- clients/Makefile.am ++++ clients/Makefile.am +@@ -42,10 +42,7 @@ libupsclient_la_LDFLAGS = -version-info + ../common/libcommon.a: FORCE + (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) libcommon.a) + +-../common/parseconf.o: +- (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) parseconf.o) +- +-../common/parseconf.lo: ++../common/parseconf.lo ../common/parseconf.o: + (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) parseconf.lo) + + FORCE: +--- common/Makefile.am ++++ common/Makefile.am +@@ -6,7 +6,7 @@ noinst_LIBRARIES = libcommon.a + libcommon_a_SOURCES = common.c ../include/nut_version.h + libcommon_a_LIBADD = $(LIBOBJS) $(ALLOCA) + +-all: libcommon.a upsconf.o parseconf.o state.o parseconf.lo ++all: upsconf.o state.o parseconf.lo + + # Define a dummy library so that Automake builds rules for the + # corresponding object files. This library is not actually built, +--- drivers/Makefile.am ++++ drivers/Makefile.am +@@ -201,7 +201,7 @@ MOSTLYCLEANFILES = libnuthalmain.a + (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) upsconf.o) + + ../common/parseconf.o: +- (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) parseconf.o) ++ (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) parseconf.lo) + + ../common/state.o: + (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) state.o) +--- server/Makefile.am ++++ server/Makefile.am +@@ -23,7 +23,7 @@ sockdebug_SOURCES = sockdebug.c + (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) upsconf.o) + + ../common/parseconf.o: +- (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) parseconf.o) ++ (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) parseconf.lo) + + ../common/state.o: + (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) state.o) diff --git a/nut.changes b/nut.changes index 4a9472e..f457597 100644 --- a/nut.changes +++ b/nut.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 14 16:28:56 CEST 2008 - schwab@suse.de + +- Work around misuse of libtool. + ------------------------------------------------------------------- Thu Oct 25 18:35:53 CEST 2007 - sbrabec@suse.cz diff --git a/nut.spec b/nut.spec index 87066fc..5e419a1 100644 --- a/nut.spec +++ b/nut.spec @@ -1,14 +1,14 @@ # # spec file for package nut (Version 2.2.0) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild + Name: nut BuildRequires: apache2-devel dbus-1-devel gd-devel hal-devel libopenssl-devel libusb-devel net-snmp-devel openssl-devel pkg-config tcpd-devel @@ -22,7 +22,7 @@ Conflicts: apcupsd AutoReqProv: on Summary: UPS Monitoring Software Version: 2.2.0 -Release: 33 +Release: 92 Url: http://www.networkupstools.org/ Source: %{name}-%{version}.tar.bz2 Source1: upsd.init @@ -36,6 +36,7 @@ Patch4: nut-powersave.patch Patch5: nut-pkgconfig.patch Patch6: nut-udev.patch Patch7: nut-hidparser.diff +Patch8: nut-libtool.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq /bin/chown /bin/chmod %{_bindir}/fgrep %{_bindir}/grep %{_bindir}/sed %{_bindir}/head %{_bindir}/md5sum %define apache_serverroot %(%{_sbindir}/apxs2 -q datadir 2>/dev/null || %{_sbindir}/apxs -q PREFIX) @@ -88,8 +89,8 @@ Authors: Arjen de Korte Fabio Di Niro -%{_datadir}/doc/packages/nut/README. %package devel +License: GPL v2 or later Summary: UPS Monitoring Software Group: Hardware/UPS Requires: %{name} = %{version} @@ -135,7 +136,6 @@ Authors: Arjen de Korte Fabio Di Niro -%{_datadir}/doc/packages/nut/README. %prep %setup -q cp -a %{S:1} %{S:2} %{S:3} %{S:4} %{S:5} . @@ -148,6 +148,7 @@ mv upsd-early-powerdown.init upsd-early-powerdown %patch6 %endif %patch7 -p2 +%patch8 sed -i "s/@UPSD_USER@/%{USER}/g" upsd.init conf/upsmon.conf.sample %build @@ -288,15 +289,18 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.*a %{_libdir}/pkgconfig/*.pc %doc %{_mandir}/man3/*.* + %changelog -* Thu Oct 25 2007 - sbrabec@suse.cz +* Mon Apr 14 2008 schwab@suse.de +- Work around misuse of libtool. +* Thu Oct 25 2007 sbrabec@suse.cz - Fixed use of uninitialized memory (#331749#c13). -* Tue Oct 23 2007 - sbrabec@suse.cz +* Tue Oct 23 2007 sbrabec@suse.cz - Renamed web pages to prevent conflicts. -* Mon Oct 22 2007 - sbrabec@suse.cz +* Mon Oct 22 2007 sbrabec@suse.cz - Fixed udev USB rules for current kernels (#331749). - Added SuSEfirewall2 rule and fixed documentation (#335466). -* Tue Aug 07 2007 - sbrabec@suse.cz +* Tue Aug 07 2007 sbrabec@suse.cz - Updated to version 2.2.0: * New build infrastructure, with shared library. * Support for HAL and Plug and Play. @@ -306,15 +310,15 @@ rm -rf $RPM_BUILD_ROOT * Client commands now defaults to localhost. * Driver improvements. * Documentation improvements. -* Wed May 16 2007 - olh@suse.de +* Wed May 16 2007 olh@suse.de - Buildrequires libusb -> libusb-devel -* Tue Feb 20 2007 - mvaner@suse.cz +* Tue Feb 20 2007 mvaner@suse.cz - Comparison with string literal (bug #232417) - setcmd-literal.patch -* Mon Sep 18 2006 - anosek@suse.cz +* Mon Sep 18 2006 anosek@suse.cz - fixed compiler warning: array subscript out of range [#204417] (overflow.patch) -* Fri Sep 01 2006 - anosek@suse.cz +* Fri Sep 01 2006 anosek@suse.cz - updated to 2.0.4 * A bug has been fixed in NUT core to support resuming from suspend-to-disk. This should also fix other similar issues, @@ -338,200 +342,200 @@ rm -rf $RPM_BUILD_ROOT and support new cables for solis 3 - dropped obsolete patch (nut-2.0.4-memset.patch) - fixed subscript out of range [#185610] (overflow.patch) -* Fri Jun 23 2006 - sbrabec@suse.cz +* Fri Jun 23 2006 sbrabec@suse.cz - Typo fix in the init script. -* Thu Apr 27 2006 - sbrabec@suse.cz +* Thu Apr 27 2006 sbrabec@suse.cz - Work correctly, if port is a symlink (168611#c6). -* Tue Apr 25 2006 - sbrabec@suse.cz +* Tue Apr 25 2006 sbrabec@suse.cz - Fixed init script to behave correctly for port = auto (#168611). -* Fri Mar 24 2006 - sbrabec@suse.cz +* Fri Mar 24 2006 sbrabec@suse.cz - Typo fixes. -* Tue Mar 21 2006 - sbrabec@suse.cz +* Tue Mar 21 2006 sbrabec@suse.cz - Added D-BUS policy file (#159668). -* Mon Mar 20 2006 - sbrabec@suse.cz +* Mon Mar 20 2006 sbrabec@suse.cz - Support for UPS powerdown using HALT_POWERDOWN_INSERT. - Added upsd-early-powerdown template and improved README.SUSE. - Remove obsolete /etc/sysconfig/smartups in %%post. -* Fri Mar 17 2006 - sbrabec@suse.cz +* Fri Mar 17 2006 sbrabec@suse.cz - README.SUSE fixes (Marius Tomaschewski). - Init script fix. - Install all driver manual pages. - Use new powersave-notify path. -* Wed Mar 15 2006 - sbrabec@suse.cz +* Wed Mar 15 2006 sbrabec@suse.cz - Build all available drivers. -* Tue Mar 14 2006 - sbrabec@suse.cz +* Tue Mar 14 2006 sbrabec@suse.cz - Improved README.SUSE and predefined configuration. - Checks and fixes in the init script. - Improved notify flags, integrate with powersave. (Some fixes provided by Marius Tomaschewski.) -* Fri Mar 10 2006 - sbrabec@suse.cz +* Fri Mar 10 2006 sbrabec@suse.cz - Fixed memset error in upsrw.c. - Fixed upsmon typo in the init script. - Preconfigure upsd with one local UPS as default. -* Thu Mar 09 2006 - sbrabec@suse.cz +* Thu Mar 09 2006 sbrabec@suse.cz - Updated to version 2.0.3. - Removed SuSEconfig, wrote new init script (#27721, #141948, #156614). -* Mon Feb 20 2006 - mmarek@suse.cz +* Mon Feb 20 2006 mmarek@suse.cz - fix array index out of range [#133610] (overflow.patch) -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Thu Jan 12 2006 - sbrabec@suse.cz +* Thu Jan 12 2006 sbrabec@suse.cz - Updated to version 2.0.3-pre2. -* Wed Nov 02 2005 - dmueller@suse.de +* Thu Nov 03 2005 dmueller@suse.de - don't build as root -* Mon Aug 01 2005 - sbrabec@suse.cz +* Mon Aug 01 2005 sbrabec@suse.cz - Updated to version 2.0.2. -* Fri Jan 21 2005 - sbrabec@suse.cz +* Fri Jan 21 2005 sbrabec@suse.cz - Updated to version 2.0.1-pre4. -* Mon Aug 23 2004 - sbrabec@suse.cz +* Mon Aug 23 2004 sbrabec@suse.cz - Updated to version 2.0.0. -* Mon Apr 19 2004 - ro@suse.de +* Mon Apr 19 2004 ro@suse.de - build with apache2 -* Wed Apr 14 2004 - aj@suse.de +* Wed Apr 14 2004 aj@suse.de - build without kernel-source. -* Tue Mar 23 2004 - sbrabec@suse.cz +* Tue Mar 23 2004 sbrabec@suse.cz - Force-define HID_MAX_USAGES (kernel 2.6.4 include file bug, should be fixed in later kernels). -* Mon Feb 09 2004 - sbrabec@suse.cz +* Mon Feb 09 2004 sbrabec@suse.cz - Updated to version 1.4.1. -* Thu Oct 02 2003 - stark@suse.de +* Thu Oct 02 2003 stark@suse.de - adapted pre-configuration and startscript to reflect changes in 1.4.0 - changed file-permissions -* Mon Sep 29 2003 - stark@suse.de +* Mon Sep 29 2003 stark@suse.de - update to 1.4.0 -* Tue Aug 19 2003 - mmj@suse.de +* Tue Aug 19 2003 mmj@suse.de - Add sysconfig metadata [#28939] -* Thu Jun 26 2003 - stark@suse.de +* Thu Jun 26 2003 stark@suse.de - update to 1.2.2 - removed config-check in init-script -* Fri Jun 20 2003 - ro@suse.de +* Sat Jun 21 2003 ro@suse.de - added directories to filelist -* Tue May 13 2003 - mmj@suse.de +* Tue May 13 2003 mmj@suse.de - use %%defattr -* Thu Feb 20 2003 - mmj@suse.de +* Thu Feb 20 2003 mmj@suse.de - Add sysconfig metadata [#22688] -* Tue Aug 06 2002 - olh@suse.de +* Tue Aug 06 2002 olh@suse.de - use X-UnitedLinux-Should-Start -* Mon Aug 05 2002 - olh@suse.de +* Mon Aug 05 2002 olh@suse.de - Required-start: setserial, add Prereq -* Fri Aug 02 2002 - ro@suse.de +* Fri Aug 02 2002 ro@suse.de - adapt server-root -* Sat Jul 27 2002 - kukuk@suse.de +* Sat Jul 27 2002 kukuk@suse.de - fix SuSEconfig.nut: - don't include rc.config [Bug #17267] - use correct path to sysconfig directory -* Fri Jul 26 2002 - adrian@suse.de +* Sat Jul 27 2002 adrian@suse.de - fix neededforbuild -* Tue May 28 2002 - stark@suse.de +* Tue May 28 2002 stark@suse.de - update to 0.50.0 - changed init-script to use upsdrvctl (make it possible to change config-files manually without changing /etc/sysconfig/smartups) -* Tue Apr 09 2002 - stark@suse.de +* Tue Apr 09 2002 stark@suse.de - update to 0.45.5 - fixed SuSEconfig.nut to sysconfig scheme -* Fri Feb 01 2002 - ro@suse.de +* Fri Feb 01 2002 ro@suse.de - changed neededforbuild to -* Sat Jan 12 2002 - stark@suse.de +* Sat Jan 12 2002 stark@suse.de - little ifarch fix again :-( -* Fri Jan 11 2002 - stark@suse.de +* Fri Jan 11 2002 stark@suse.de - changed rc.config.d leftover in rcups - build hidups on all archs excluding s390 (finally) -* Tue Jan 08 2002 - stark@suse.de +* Tue Jan 08 2002 stark@suse.de - build hidups only on i386 -* Thu Jan 03 2002 - stark@suse.de +* Thu Jan 03 2002 stark@suse.de - build hidups driver for EXPERIMENTAL USB usage -* Wed Dec 12 2001 - stark@suse.de +* Wed Dec 12 2001 stark@suse.de - updated to 0.45.3 - removed START_SMARTUPS - renamed package to nut - b2zipped sources - moved rc.config.d/smartups.rc.config -> sysconfig/smartups -* Mon Oct 22 2001 - stark@suse.de +* Mon Oct 22 2001 stark@suse.de - fixed init-script to POWERDOWN correctly (#11909) - added rc.config variable UPSLOG_INTERVAL -* Tue Sep 18 2001 - stark@suse.de +* Tue Sep 18 2001 stark@suse.de - changed STATEPATH to /var/lib/ups according to FHS (#8678) -* Fri Sep 07 2001 - stark@suse.de +* Fri Sep 07 2001 stark@suse.de - added Conflicts: apcupsd (/usr/local/httpd/cgi-bin/multimon.cgi is in both packages) -* Mon Sep 03 2001 - stark@suse.de +* Mon Sep 03 2001 stark@suse.de - added a patch to be able to write the POWERDOWNFLAG to only-root-writable directories -* Mon Aug 13 2001 - stark@suse.de +* Mon Aug 13 2001 stark@suse.de - update to 0.45.1 -* Mon Jun 18 2001 - stark@suse.de +* Mon Jun 18 2001 stark@suse.de - update to 0.45.0 -* Fri Apr 27 2001 - stark@suse.de +* Fri Apr 27 2001 stark@suse.de - minor changes in init-script to avoid premature aborts -* Thu Apr 19 2001 - stark@suse.de +* Thu Apr 19 2001 stark@suse.de - minor changes on %%config-files and %%clean - changed upsd-exec-group to uucp - added libjpeg freetype2 freetype2-devel xf86 to neededforbuild -* Tue Apr 17 2001 - stark@suse.de +* Tue Apr 17 2001 stark@suse.de - init-script cleanup: try-restart and exitcodes -* Fri Mar 23 2001 - stark@suse.de +* Fri Mar 23 2001 stark@suse.de - update to 0.44.3 -* Fri Mar 16 2001 - stark@suse.de +* Fri Mar 16 2001 stark@suse.de - minor changes in init-script and documentation -* Thu Jan 04 2001 - stark@suse.de +* Thu Jan 04 2001 stark@suse.de - update to 0.44.2 -* Thu Dec 14 2000 - stark@suse.de +* Thu Dec 14 2000 stark@suse.de - fixed case in rc-script - move SuSE scripts and configs out of the diff - minor changes in config for insserv (use macros) -* Mon Nov 27 2000 - stark@suse.de +* Mon Nov 27 2000 stark@suse.de - moved /sbin/init.d -> /etc/init.d -* Fri Nov 24 2000 - stark@suse.de +* Fri Nov 24 2000 stark@suse.de - init script more LSB compliant -* Wed Nov 22 2000 - stark@suse.de +* Wed Nov 22 2000 stark@suse.de - improved runlevel position - spec now uses %%{_tmppath} -* Tue Nov 21 2000 - stark@suse.de +* Tue Nov 21 2000 stark@suse.de - removed runlevel-links from spec-file and moved to insserv - added init information to rc-script -* Mon Nov 20 2000 - stark@suse.de +* Mon Nov 20 2000 stark@suse.de - minor changes in rc-script (status) -* Wed Nov 15 2000 - ro@suse.de +* Wed Nov 15 2000 ro@suse.de - fixed neededforbuild gdlib -> gd gd-devel -* Thu Nov 09 2000 - ro@suse.de +* Thu Nov 09 2000 ro@suse.de - neededforbuild gd -> perl-GD -* Wed Nov 08 2000 - stark@suse.de +* Wed Nov 08 2000 stark@suse.de - adapted rc-script to use rc.status -* Thu Oct 05 2000 - stark@suse.de +* Thu Oct 05 2000 stark@suse.de - fixed typo in SuSEconfig.smartups -* Mon Sep 18 2000 - stark@suse.de +* Mon Sep 18 2000 stark@suse.de - update to 0.44.1 - new spec-file (with buildroot etc.) - fixed rc-script for server/client - added SuSEconfig.smartups -* Thu Sep 14 2000 - stark@suse.de +* Thu Sep 14 2000 stark@suse.de - fixed rc-script (added . /etc/rc.config) -* Tue Jul 11 2000 - lemsi@suse.de +* Tue Jul 11 2000 lemsi@suse.de - bugfix in ups start-script - changed /etc/rc.config to /etc/rc.config.d/smartups.rc.config -* Mon Feb 28 2000 - kukuk@suse.de +* Mon Feb 28 2000 kukuk@suse.de - Move most variables from rc.config -> rc.config.d -* Thu Feb 24 2000 - lemsi@suse.de +* Thu Feb 24 2000 lemsi@suse.de - new version - the orginal source is renamed, new name is nut-0.XX.X.tar.gz - added 2 new variables in rc.config; GENERICUPS_MODEL; SMARTUPS_MASTER - model check in rcups for genericups - starting all 4 deamons in rcups - new binary-installpath /usr/sbin -* Wed Nov 10 1999 - ro@suse.de +* Wed Nov 10 1999 ro@suse.de - fixed postinstall: (its post and not pre) -* Tue Oct 26 1999 - lemsi@suse.de +* Tue Oct 26 1999 lemsi@suse.de - added 2 new variables in rc.config; SMARTUPS_DEVICE; SMARTUPS_MODEL - modified rcups and smartups.spec - sending mail after instalation -* Fri Oct 15 1999 - ro@suse.de +* Fri Oct 15 1999 ro@suse.de - added libpng to neededforbuild (now needed for libgd) -* Fri Oct 15 1999 - ro@suse.de +* Fri Oct 15 1999 ro@suse.de - fixed patch arg -* Thu Oct 14 1999 - ray@suse.de +* Thu Oct 14 1999 ray@suse.de - new package