Hello community, here is the log from the commit of package nut checked in at Thu May 8 23:47:19 CEST 2008. -------- --- nut/nut.changes 2008-04-24 17:07:04.000000000 +0200 +++ nut/nut.changes 2008-05-06 15:40:14.000000000 +0200 @@ -1,0 +2,30 @@ +Wed Apr 30 14:28:33 CEST 2008 - sbrabec@suse.cz + +- Added hardware modaliases for solver. +- Fixed generating of NUT firewall rule (bnc#385111). +- Installed HAL FDI to disable hald-addon-hid-ups (bnc#385253). +- Split nut-classic and hut-hal variants to separate subpackages + (bnc#337059). +- Split networking drivers and web server into separate packages to + reduce dependencies (bnc#156614). +- Split shared library according to shared library policy. +- Updated README.SuSE. +- Updated to version 2.2.2-pre3 (bnc#385133): + * support for new devices: APC BACK-UPS XS LCD, Atlantis Land, + Mustek Powermust Office 650, Oneac XAU models, Powerware PW5115 + and PW9120 (USB), Nitram Elite 2005. + * Advanced Integrated Power Management (NUT HAL integration). + * Shutdown handling has been reworked. + * Support for MGE UPS SYSTEMS 3 phases units has been added. + * snmp-ups now supports MGE* Environment Sensor (ref 66 846). + * The ambient.temperature reporting has also been fixed for units + other than APC. + * the netxml-ups driver has appeared to support MGE* network + HTTP/XML cards. + * The shared library installed by default. + * powerpanel has reach a new step toward the replacement of + nitram and cpsups drivers. + * many changes, cleanup and fixes to the NUT core and various + drivers. + +------------------------------------------------------------------- Old: ---- nut-2.2.1.tar.bz2 nut-libtool.diff New: ---- nut-2.2.2-pre3.tar.bz2 nut-disable-hal-hid-ups.fdi nut-hal-dir.patch nut-hal.patch nut-intptr.patch nut-libtool.patch nut-parallel-build.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nut.spec ++++++ ++++ 654 lines (skipped) ++++ between nut/nut.spec ++++ and nut/nut.spec ++++++ nut-hal-dir.patch ++++++ --- m4/nut_check_libhal.m4 +++ m4/nut_check_libhal.m4 @@ -63,7 +63,7 @@ dnl As per HAL spec, §5 Callouts and §2 Device Information Files dnl - addon install path: $libdir/hal AC_MSG_CHECKING(for libhal Callouts path) - if (test -d "/usr/lib/hal") + if (test -d "${libdir}/hal") then # For Debian HAL_CALLOUTS_PATH="${libdir}/hal" ++++++ nut-hal.patch ++++++ --- scripts/hal/ups-nut-device.fdi +++ scripts/hal/ups-nut-device.fdi @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- --> <deviceinfo version="0.2"> <device> - <match key="info.bus" string="usb_device"> + <match key="info.subsystem" string="usb_device"> <!-- MGE UPS SYSTEMS --> <match key="usb_device.vendor_id" int="0x0463"> ++++++ nut-intptr.patch ++++++ main-hal.c: In function 'dbus_filter_function': main-hal.c:553: warning: passing argument 4 of 'dbus_send_reply' makes pointer from integer without a cast main-hal.c:559: warning: passing argument 4 of 'dbus_send_reply' makes pointer from integer without a cast ================================================================================ --- drivers/main-hal.c +++ drivers/main-hal.c @@ -550,13 +550,13 @@ if (b_enable==TRUE) { if (upsh.instcmd("beeper.enable", NULL) != STAT_INSTCMD_HANDLED) { - dbus_send_reply(connection, message, DBUS_TYPE_INT32, -1); + dbus_send_reply(connection, message, DBUS_TYPE_INT32, (void *)(-1)); return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } } else { if (upsh.instcmd("beeper.disable", NULL) != STAT_INSTCMD_HANDLED) { - dbus_send_reply(connection, message, DBUS_TYPE_INT32, -1); + dbus_send_reply(connection, message, DBUS_TYPE_INT32, (void *)(-1)); return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } } ++++++ nut-libtool.patch ++++++ --- clients/Makefile.am +++ clients/Makefile.am @@ -35,7 +35,7 @@ upsmon_SOURCES = upsmon.c upsmon.h upsclient.h upssched_SOURCES = upssched.c upssched.h -upssched_LDADD = ../common/libcommon.a $(NETLIBS) ../common/parseconf.o +upssched_LDADD = ../common/libcommon.a ../common/libparseconf.la $(NETLIBS) upsimage_cgi_SOURCES = upsimage.c upsclient.h upsimagearg.h cgilib.c cgilib.h upsimage_cgi_LDADD = $(LDADD) $(LIBGD_LDFLAGS) @@ -46,17 +46,5 @@ # not LDADD. libupsclient_la_SOURCES = upsclient.c upsclient.h -libupsclient_la_LIBADD = ../common/parseconf.lo +libupsclient_la_LIBADD = ../common/libparseconf.la libupsclient_la_LDFLAGS = -version-info 1:0:0 - -# rules for cross-directory targets -../common/libcommon.a: FORCE - (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) libcommon.a) - -../common/parseconf.o: - (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) parseconf.o) - -../common/parseconf.lo: - (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) parseconf.lo) - -FORCE: --- common/Makefile.am +++ common/Makefile.am @@ -3,17 +3,8 @@ AM_CFLAGS = -I$(top_srcdir)/include noinst_LIBRARIES = libcommon.a -libcommon_a_SOURCES = common.c ../include/nut_version.h -libcommon_a_LIBADD = $(LIBOBJS) $(ALLOCA) +libcommon_a_SOURCES = common.c state.c upsconf.c ../include/nut_version.h +libcommon_a_LIBADD = libparseconf.la -all: libcommon.a upsconf.o parseconf.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, -EXTRA_LIBRARIES = libdummy.a -libdummy_a_SOURCES = parseconf.c state.c upsconf.c - -../include/nut_version.h: FORCE - (cd ../include/ && $(MAKE) $(AM_MAKEFLAGS) nut_version.h) - -FORCE: +noinst_LTLIBRARIES = libparseconf.la +libparseconf_la_SOURCES = parseconf.c --- drivers/Makefile.am +++ drivers/Makefile.am @@ -2,9 +2,8 @@ # by default, link programs in this directory with libcommon.a #FIXME: SERLIBS is only useful for LDADD_DRIVERS_SERIAL not for LDADD_COMMON -LDADD_COMMON = ../common/libcommon.a -LDADD_DRIVERS = $(LDADD_COMMON) ../common/upsconf.o \ - ../common/parseconf.o ../common/state.o main.o dstate.o +LDADD_COMMON = ../common/libcommon.a ../common/libparseconf.la +LDADD_DRIVERS = $(LDADD_COMMON) main.o dstate.o LDADD_HAL_DRIVERS = $(LDADD_COMMON) libnuthalmain.a LDADD_DRIVERS_SERIAL = $(LDADD_DRIVERS) $(SERLIBS) serial.o @@ -86,7 +85,7 @@ # upsdrvctl: the all-singing all-dancing driver control program upsdrvctl_SOURCES = upsdrvctl.c -upsdrvctl_LDADD = $(LDADD_COMMON) ../common/upsconf.o ../common/parseconf.o +upsdrvctl_LDADD = $(LDADD_COMMON) # serial drivers: all of them use standard LDADD and CFLAGS al175_SOURCES = al175.c @@ -226,18 +225,3 @@ libnuthalmain_a_SOURCES = main-hal.c dstate-hal.c MOSTLYCLEANFILES = libnuthalmain.a - -# rules for cross-directory targets -../common/libcommon.a: FORCE - (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) libcommon.a) - -../common/upsconf.o: - (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) upsconf.o) - -../common/parseconf.o: - (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) parseconf.o) - -../common/state.o: - (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) state.o) - -FORCE: --- server/Makefile.am +++ server/Makefile.am @@ -7,8 +7,7 @@ if WITH_SSL AM_CFLAGS += $(LIBSSL_CFLAGS) endif -LDADD = ../common/libcommon.a ../common/state.o ../common/upsconf.o \ - ../common/parseconf.o $(NETLIBS) +LDADD = ../common/libcommon.a ../common/libparseconf.la $(NETLIBS) if WITH_SSL LDADD += $(LIBSSL_LDFLAGS) endif @@ -22,19 +21,4 @@ netlist.h netmisc.h netset.h netuser.h ssl.h sstate.h stype.h upsd.h \ upstype.h user-data.h user.h -sockdebug_SOURCES = sockdebug.c - -# rules for cross-directory targets -../common/libcommon.a: FORCE - (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) libcommon.a) - -../common/upsconf.o: - (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) upsconf.o) - -../common/parseconf.o: - (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) parseconf.o) - -../common/state.o: - (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) state.o) - -FORCE: +sockdebug_SOURCES = sockdebug.c ++++++ nut-parallel-build.patch ++++++ Date: Wed, 30 Apr 2008 19:24:27 +0200 From: "Arnaud Quette" <aquette.dev@gmail.com> To: "Stanislav Brabec" <sbrabec@suse.cz> Subject: Re: openSUSE 11.0 - NUT Cc: "Arjen de Korte" <arjen@de-korte.org>, NUT-developers <nut-upsdev@lists.alioth.debian.org> In-Reply-To: <ec33acbd0804300953s35ba9c05w579b134d37d49a94@mail.gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline References: <48182EB2.7070206@de-korte.org> <1209546455.3949.153.camel@hammer.suse.cz> <ec33acbd0804300605r3c475f9ei8529d5c6bee9155@mail.gmail.com> <1209562423.3949.199.camel@hammer.suse.cz> <1209565291.3949.206.camel@hammer.suse.cz> <ec33acbd0804300953s35ba9c05w579b134d37d49a94@mail.gmail.com> X-Virus-Scanned: by amavisd-new at suse.cz X-Spam-Status: No, hits=-2.6 tagged_above=-20.0 required=5.0 tests=BAYES_00 X-Spam-Level: X-Evolution-Source: imap://sbrabec@imap.suse.cz/ Content-Transfer-Encoding: 8bit before going on week end, just a small one line patch to test for the // build 2008/4/30 Arnaud Quette <aquette.dev@gmail.com>:
...
I found another problem - nut-2.2.2-pre3 is not parallel build ready and parallel build fails in ~80% of cases. It seems that dependencies are not complete.
Build on one processor works. ...
I've seen another mail from a SuSE guy, and fwded by Arjen, about libtool and possibly dependencies. I gotta check it. if you have a patch underhand, just forward it. I can wait just a bit more of the final 2.2.2, but not that much since it's already more than late.
--- clients/Makefile.am (révision 1455) +++ clients/Makefile.am (copie de travail) @@ -1,7 +1,7 @@ # Network UPS Tools: clients # by default, link programs in this directory with libcommon.a -LDADD = ../common/libcommon.a -lupsclient $(NETLIBS) +LDADD = ../common/libcommon.a libupsclient.la $(NETLIBS) if WITH_SSL LDADD += $(LIBSSL_LDFLAGS) endif I've tested it with "make -j2", and 2 config set (--disable-shared for full static, and --enable-static for linking clients on the shared lib while still shipping the static lib) and everything seems fine. Can you confirm on your side? thanks, Arnaud -- Linux / Unix Expert R&D - MGE Office Protection Systems - http://www.mgeops.com Network UPS Tools (NUT) Project Leader - http://www.networkupstools.org/ Debian Developer - http://people.debian.org/~aquette/ Free Software Developer - http://arnaud.quette.free.fr/ ++++++ README.SUSE ++++++ --- nut/README.SUSE 2007-10-22 17:55:21.000000000 +0200 +++ nut/README.SUSE 2008-05-06 15:32:10.000000000 +0200 @@ -1,3 +1,35 @@ +COnfiguration and use of NUT in SuSE + +You have two basic ways to install nut: + +- nut-hal - HAL addon, which will provide handling of USB UPS devices + via the standard HAL power management, allowing to reuse power + management tools of desktop systems. + It needs no configuration and no special setup. On the other hand, + it supports only locally attached USB UPS. + +- nut-classic - Uses dedicated UPS daemon, which works with all types of + connection, features UPS monitoring and network UPS management. + It is not integraded with desktop power management nad you need + dedicated tool for monitoring your UPSes. + +And two additional packages: + +- nut-drivers-net - two additional drivers for network communication of + UPS daemons. You will need for advanced configuration (e. g. if you + want to manage shutdown of more computers sharing the same UPS). + +- nut-cgi provides support for monitoring UPS web pages using apache web + browser. + +nut-hal Configuration + +If your device is an USB UPS attached locally, nut-hal needs no +configuration. Otherwise you need to use nut-classic. + + +nut-classic Configuration + NUT is preconfigured to use a local or remote UPS as far as possible. But it still requires a minimal manual configuration before the first use. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org