This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via d25b7c32bd420267d2604dfa34e6e3bfa7de9ed7 (commit) via 9eb6ff30db048dfeff384b53acc18e58b6363788 (commit) via 3fe41c0159c9ad1474f4a174212b97f95972bf82 (commit) from dd58c50c3e55749903369c2b3258de7cc307c8ce (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit d25b7c32bd420267d2604dfa34e6e3bfa7de9ed7 Merge: dd58c50 9eb6ff3 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon May 12 13:49:12 2014 +0200

Merge remote-tracking branch 'glotzi/nut-update' into next

commit 9eb6ff30db048dfeff384b53acc18e58b6363788 Author: Dirk Wagner dirk.wagner@ipfire.org Date: Thu May 8 21:22:22 2014 +0200

nut addon: increased package version.

commit 3fe41c0159c9ad1474f4a174212b97f95972bf82 Author: Dirk Wagner dirk.wagner@ipfire.org Date: Wed May 7 21:37:51 2014 +0200

nut addon: Update to 2.7.2

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/packages/nut | 31 ++++++++++++++++++++++++------- lfs/nut | 6 +++--- src/initscripts/init.d/nut | 2 +- 3 files changed, 28 insertions(+), 11 deletions(-)

Difference in files: diff --git a/config/rootfiles/packages/nut b/config/rootfiles/packages/nut index 53935f0..4e6167e 100644 --- a/config/rootfiles/packages/nut +++ b/config/rootfiles/packages/nut @@ -6,8 +6,10 @@ etc/nut/upsd.users.sample etc/nut/upsmon.conf.sample etc/nut/upssched.conf.sample etc/udev/rules.d/52-nut-usbups.rules +usr/bin/al175 usr/bin/apcsmart usr/bin/apcsmart-old +usr/bin/apcupsd-ups usr/bin/bcmxcp usr/bin/bcmxcp_usb usr/bin/belkin @@ -34,14 +36,18 @@ usr/bin/metasys usr/bin/mge-shut usr/bin/mge-utalk usr/bin/microdowell -usr/bin/newmge-shut usr/bin/nut-scanner +usr/bin/nutdrv_atcl_usb +usr/bin/nutdrv_qx +usr/bin/oldmge-shut usr/bin/oneac usr/bin/optiups usr/bin/powercom usr/bin/powerpanel usr/bin/rhino usr/bin/richcomm_usb +usr/bin/riello_ser +usr/bin/riello_usb usr/bin/safenet usr/bin/skel usr/bin/snmp-ups @@ -52,14 +58,16 @@ usr/bin/tripplitesu usr/bin/upsc usr/bin/upscmd usr/bin/upscode2 -usr/bin/upsdrvctl usr/bin/upslog usr/bin/upsrw usr/bin/upssched-cmd usr/bin/usbhid-ups usr/bin/victronups -#usr/cgi-bin -#usr/html +#usr/lib/libnutclient.a +#usr/lib/libnutclient.la +usr/lib/libnutclient.so +usr/lib/libnutclient.so.0 +usr/lib/libnutclient.so.0.0.0 #usr/lib/libnutscan.a #usr/lib/libnutscan.la usr/lib/libnutscan.so @@ -68,9 +76,10 @@ usr/lib/libnutscan.so.1.0.0 #usr/lib/libupsclient.a #usr/lib/libupsclient.la usr/lib/libupsclient.so -usr/lib/libupsclient.so.1 -usr/lib/libupsclient.so.1.1.0 +usr/lib/libupsclient.so.4 +usr/lib/libupsclient.so.4.0.0 usr/sbin/upsd +usr/sbin/upsdrvctl usr/sbin/upsmon usr/sbin/upssched usr/share/cmdvartab @@ -81,8 +90,10 @@ usr/share/driver.list #usr/share/man/man5/upsd.users.5 #usr/share/man/man5/upsmon.conf.5 #usr/share/man/man5/upssched.conf.5 +#usr/share/man/man8/al175.8 #usr/share/man/man8/apcsmart-old.8 #usr/share/man/man8/apcsmart.8 +#usr/share/man/man8/apcupsd-ups.8 #usr/share/man/man8/bcmxcp.8 #usr/share/man/man8/bcmxcp_usb.8 #usr/share/man/man8/belkin.8 @@ -91,7 +102,8 @@ usr/share/driver.list #usr/share/man/man8/bestfortress.8 #usr/share/man/man8/bestuferrups.8 #usr/share/man/man8/bestups.8 -#usr/share/man/man8/blazer.8 +#usr/share/man/man8/blazer_ser.8 +#usr/share/man/man8/blazer_usb.8 #usr/share/man/man8/clone.8 #usr/share/man/man8/dummy-ups.8 #usr/share/man/man8/etapro.8 @@ -107,7 +119,10 @@ usr/share/driver.list #usr/share/man/man8/mge-shut.8 #usr/share/man/man8/mge-utalk.8 #usr/share/man/man8/microdowell.8 +#usr/share/man/man8/nut-recorder.8 #usr/share/man/man8/nut-scanner.8 +#usr/share/man/man8/nutdrv_atcl_usb.8 +#usr/share/man/man8/nutdrv_qx.8 #usr/share/man/man8/nutupsdrv.8 #usr/share/man/man8/oneac.8 #usr/share/man/man8/optiups.8 @@ -115,6 +130,8 @@ usr/share/driver.list #usr/share/man/man8/powerpanel.8 #usr/share/man/man8/rhino.8 #usr/share/man/man8/richcomm_usb.8 +#usr/share/man/man8/riello_ser.8 +#usr/share/man/man8/riello_usb.8 #usr/share/man/man8/safenet.8 #usr/share/man/man8/snmp-ups.8 #usr/share/man/man8/solis.8 diff --git a/lfs/nut b/lfs/nut index 0a5f847..c64c5a2 100644 --- a/lfs/nut +++ b/lfs/nut @@ -24,7 +24,7 @@

include Config

-VER = 2.6.3 +VER = 2.7.2

THISAPP = nut-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nut -PAK_VER = 4 +PAK_VER = 5

DEPS = ""

@@ -44,7 +44,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 8db00c21f8bc03add6e14d15f634ec6a +$(DL_FILE)_MD5 = c3568b42e058cfc385b46d25140dced4

install : $(TARGET)

diff --git a/src/initscripts/init.d/nut b/src/initscripts/init.d/nut index 8aba4ff..9b4623e 100644 --- a/src/initscripts/init.d/nut +++ b/src/initscripts/init.d/nut @@ -35,7 +35,7 @@ if [ "x$MODE" = "xnone" ] ; then fi

upsd=/usr/sbin/upsd -upsdrvctl=/usr/bin/upsdrvctl +upsdrvctl=/usr/sbin/upsdrvctl upsmon=/usr/sbin/upsmon log=">/dev/null 2>/dev/null"

hooks/post-receive -- IPFire 2.x development tree