summaryrefslogtreecommitdiff
path: root/package/nut
diff options
context:
space:
mode:
Diffstat (limited to 'package/nut')
-rw-r--r--package/nut/Makefile47
-rw-r--r--package/nut/files/nut.postinst2
-rw-r--r--package/nut/files/upsd.init1
-rw-r--r--package/nut/patches/patch-include_nut_version_h8
-rw-r--r--package/nut/patches/patch-ltmain_sh11
-rw-r--r--package/nut/patches/patch-server_Makefile_in23
6 files changed, 28 insertions, 64 deletions
diff --git a/package/nut/Makefile b/package/nut/Makefile
index 5cf4406f6..c77daf708 100644
--- a/package/nut/Makefile
+++ b/package/nut/Makefile
@@ -1,31 +1,36 @@
# This file is part of the OpenADK project. OpenADK is copyrighted
# material, please see the LICENCE file in the top-level directory.
-include ${TOPDIR}/rules.mk
+include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= nut
-PKG_VERSION:= 2.4.1
+PKG_VERSION:= 2.8.1
PKG_RELEASE:= 1
-PKG_MD5SUM:= 609ebaf2123fc7171d25a6c742dd7d66
-PKG_DESCR:= Network UPS Tools
+PKG_HASH:= 7da48ee23b1f0d8d72560bb0af84f5c5ae4dbe35452b84cb49840132e47f099c
+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.8/
-PKG_FLAVOURS_NUT:= WITH_SSL WITH_SNMP WITH_USB
-PKGFD_WITH_SNMP:= enable SNMP support
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+
+PKG_FLAVOURS_NUT:= WITH_SNMP WITH_USB
+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
-PKGFS_WITH_SSL:= libopenssl
-PKGFB_WITH_SSL:= openssl
+PKGFD_WITH_USB:= enable usb support
+PKGFS_WITH_USB:= libusb libusb-compat
+PKGFB_WITH_USB:= libusb libusb-compat
+
+PKG_CHOICES_NUT:= WITH_LIBRESSL WITHOUT_SSL
+PKGCD_WITH_LIBRESSL:= use libressl for crypto
+PKGCB_WITH_LIBRESSL:= libressl
+PKGCS_WITH_LIBRESSL:= libressl ca-certificates
+PKGCD_WITHOUT_SSL:= use no ssl
-include ${TOPDIR}/mk/package.mk
+include ${ADK_TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,NUT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,NUT,nut,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
define DRIVER_template
@@ -79,7 +84,7 @@ CONFIGURE_ARGS+= --with-linux-hiddev=${LINUX_DIR}/include/linux/hiddev.h \
--with-group=0 \
--with-user=0
-ifneq (${ADK_PACKAGE_NUT_WITH_SSL},)
+ifeq (${ADK_PACKAGE_NUT_WITH_LIBRESSL},y)
CONFIGURE_ARGS+= --with-ssl
CONFIGURE_ENV+= CPPFLAGS="${TARGET_CPPFLAGS} ${TARGET_LDFLAGS}"
MAKE_FLAGS+= SSL_CFLAGS="${TARGET_CPPFLAGS}" SSL_LDFLAGS="${TARGET_LDFLAGS} -lssl -lcrypto"
@@ -91,16 +96,16 @@ ifneq (${ADK_PACKAGE_NUT_WITH_SNMP},)
CONFIGURE_ARGS+= --with-snmp
endif
-post-install:
+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/
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/nut/files/nut.postinst b/package/nut/files/nut.postinst
index cd5faf1af..c6e21169a 100644
--- a/package/nut/files/nut.postinst
+++ b/package/nut/files/nut.postinst
@@ -1,4 +1,4 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf upsd upsd NO
+add_rcconf upsd NO
diff --git a/package/nut/files/upsd.init b/package/nut/files/upsd.init
index 159a2fc00..0d451d1ad 100644
--- a/package/nut/files/upsd.init
+++ b/package/nut/files/upsd.init
@@ -7,6 +7,7 @@ case $1 in
autostop) ;;
autostart)
test x"${upsd:-NO}" = x"NO" && exit 0
+ test x"$upsd" = x"DAEMON" && test -x /bin/mksh && exec mksh -T- $0 start
exec sh $0 start
;;
start)
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"; \
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-07 19:15:31 +0000