update to latest upstream

4 files changed, 11 insertions, 53 deletions

diff --git a/package/nut/Makefile b/package/nut/Makefile
index b4918d9e4..e5189deb6 100644
--- a/package/nut/Makefile
+++ b/package/nut/Makefile
@@ -4,24 +4,24 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		nut
-PKG_VERSION:=		2.4.1
+PKG_VERSION:=		2.7.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		609ebaf2123fc7171d25a6c742dd7d66
+PKG_MD5SUM:=		c3568b42e058cfc385b46d25140dced4
 PKG_DESCR:=		network ups tools
 PKG_SECTION:=		net/misc
 PKG_URL:=		http://www.networkupstools.org/
-PKG_SITES:=		http://www.networkupstools.org/source/2.4/
+PKG_SITES:=		http://www.networkupstools.org/source/2.7/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 PKG_FLAVOURS_NUT:=	WITH_SSL WITH_SNMP WITH_USB
-PKGFD_WITH_SNMP:=	enable SNMP support
+PKGFD_WITH_SNMP:=	enable snmp support
 PKGFS_WITH_SNMP:=	libnetsnmp
 PKGFB_WITH_SNMP:=	net-snmp
-PKGFD_WITH_USB:=	enable USB support
-PKGFS_WITH_USB:=	libusb
-PKGFB_WITH_USB:=	libusb
-PKGFD_WITH_SSL:=	enable SSL support
+PKGFD_WITH_USB:=	enable usb support
+PKGFS_WITH_USB:=	libusb libusb-compat
+PKGFB_WITH_USB:=	libusb libusb-compat
+PKGFD_WITH_SSL:=	enable ssl support
 PKGFS_WITH_SSL:=	libopenssl
 PKGFB_WITH_SSL:=	openssl
 
@@ -96,12 +96,12 @@ endif
 nut-install:
 	${INSTALL_DIR} ${IDIR_NUT}/usr/{s,}bin ${IDIR_NUT}/etc
 	${INSTALL_DIR} ${IDIR_NUT}/usr/lib
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/ups{d,mon,sched} \
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/ups{d,mon,sched,drvctl} \
 		${IDIR_NUT}/usr/sbin/
-	${CP} ${WRKINST}/usr/lib/lib*.so* ${IDIR_NUT}/usr/lib
+	${CP} ${WRKINST}/usr/lib/lib{nut,ups}client.so* ${IDIR_NUT}/usr/lib
 	${INSTALL_BIN} ${WRKINST}/usr/bin/{${INSTALL_DRIVERS}} \
 		${IDIR_NUT}/usr/bin/
-	${INSTALL_BIN} ${WRKINST}/usr/bin/ups{c,cmd,drvctl,log,rw} \
+	${INSTALL_BIN} ${WRKINST}/usr/bin/ups{c,cmd,log,rw} \
 		${IDIR_NUT}/usr/bin/
 	${INSTALL_DATA} ./files/ups{d,}.conf ${IDIR_NUT}/etc/
 
diff --git a/package/nut/patches/patch-include_nut_version_h b/package/nut/patches/patch-include_nut_version_h
deleted file mode 100644
index 2bc8039a4..000000000
--- a/package/nut/patches/patch-include_nut_version_h
+++ /dev/null
@@ -1,8 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- nut-2.4.1.orig/include/nut_version.h	2009-02-17 10:25:13.000000000 +0100
-+++ nut-2.4.1/include/nut_version.h	2009-05-31 05:57:24.000000000 +0200
-@@ -1,3 +1,3 @@
- /* Autogenerated file. Do not change. */
- /* This file was generated by "make". */
--#define NUT_VERSION_MACRO "2.4.1-1790"
-+#define NUT_VERSION_MACRO "2.4.1"
diff --git a/package/nut/patches/patch-ltmain_sh b/package/nut/patches/patch-ltmain_sh
deleted file mode 100644
index 806117687..000000000
--- a/package/nut/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- nut-2.4.1.orig/ltmain.sh	2009-02-17 10:23:41.000000000 +0100
-+++ nut-2.4.1/ltmain.sh	2011-01-16 01:03:10.000000000 +0100
-@@ -4238,7 +4238,7 @@ func_mode_link ()
-       # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-       # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"
diff --git a/package/nut/patches/patch-server_Makefile_in b/package/nut/patches/patch-server_Makefile_in
deleted file mode 100644
index dc5e1f92e..000000000
--- a/package/nut/patches/patch-server_Makefile_in
+++ /dev/null
@@ -1,23 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- nut-2.4.1.orig/server/Makefile.in	2009-02-17 10:24:10.000000000 +0100
-+++ nut-2.4.1/server/Makefile.in	2009-05-31 06:03:38.000000000 +0200
-@@ -270,7 +270,7 @@ upsd_SOURCES = upsd.c user.c conf.c ssl.
-  upstype.h user-data.h user.h
- 
- sockdebug_SOURCES = sockdebug.c
--all: all-am
-+all:
- 
- .SUFFIXES:
- .SUFFIXES: .c .lo .o .obj
-@@ -460,7 +460,9 @@ distdir: $(DISTFILES)
- 	done
- check-am: all-am
- check: check-am
--all-am: Makefile $(PROGRAMS)
-+all-am: $(PROGRAMS)
-+	@echo  foo
-+
- installdirs:
- 	for dir in "$(DESTDIR)$(sbindir)"; do \
- 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \