From 82f36e0c781d28ba8d6c48413a0c0582e7cc0ee8 Mon Sep 17 00:00:00 2001 From: Paul Doran Date: Mon, 18 Dec 2023 19:28:17 +0200 Subject: [PATCH] nut: update to 2.8.1 Signed-off-by: Paul Doran [remove upstream patch included in 2.8.1] --- net/nut/Makefile | 6 ++--- ...upsclient.h-ensure-time_t-is-defined.patch | 27 ------------------- 2 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 net/nut/patches/001-clients-upsclient.h-ensure-time_t-is-defined.patch diff --git a/net/nut/Makefile b/net/nut/Makefile index d40eca8f2b..a1834cc928 100644 --- a/net/nut/Makefile +++ b/net/nut/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nut -PKG_VERSION:=2.8.0 -PKG_RELEASE:=3 +PKG_VERSION:=2.8.1 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.networkupstools.org/source/2.8/ -PKG_HASH:=c3e5a708da797b7c70b653d37b1206a000fcb503b85519fe4cdf6353f792bfe5 +PKG_HASH:=7da48ee23b1f0d8d72560bb0af84f5c5ae4dbe35452b84cb49840132e47f099c PKG_LICENSE:=GPL-2.0-or-later GPL-3.0-or-later GPL-1.0-or-later Artistic-1.0-Perl PKG_LICENSE_FILES:=LICENSE-GPL2 LICENSE-GPL3 COPYING PKG_FIXUP:=autoreconf diff --git a/net/nut/patches/001-clients-upsclient.h-ensure-time_t-is-defined.patch b/net/nut/patches/001-clients-upsclient.h-ensure-time_t-is-defined.patch deleted file mode 100644 index bdc199006e..0000000000 --- a/net/nut/patches/001-clients-upsclient.h-ensure-time_t-is-defined.patch +++ /dev/null @@ -1,27 +0,0 @@ -From cafd77993ec5e16634b774b65bf6da9b34a21fc5 Mon Sep 17 00:00:00 2001 -From: Jim Klimov -Date: Wed, 31 Aug 2022 11:24:19 +0200 -Subject: [PATCH] clients/upsclient.h: ensure time_t is defined - - ---- a/clients/upsclient.h -+++ b/clients/upsclient.h -@@ -41,6 +41,18 @@ - #include - #endif - -+/* Not including NUT timehead.h because this is part of end-user API */ -+#ifdef TIME_WITH_SYS_TIME -+# include -+# include -+#else -+# ifdef HAVE_SYS_TIME_H -+# include -+# else -+# include -+# endif -+#endif -+ - #ifdef __cplusplus - /* *INDENT-OFF* */ - extern "C" {