pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

ups-nut: Drop workaround patch that is no longer needed



Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Mon Mar 31 08:52:36 2025 -0400
Changeset:	b431b0d6e2fbe0e769209e8be4723d50f1dd7654

Modified Files:
	ups-nut/COMMIT_MSG
	ups-nut/distinfo
Removed Files:
	ups-nut/patches/patch-server_sockdebug.c

Log Message:
ups-nut: Drop workaround patch that is no longer needed

Upstream used to include libwrap, I think, and the patch defined
symbols so the build succeeded.  Now fixed upstream or really builds
fine without the patch.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b431b0d6e2fbe0e769209e8be4723d50f1dd7654

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 ups-nut/COMMIT_MSG                       |  2 ++
 ups-nut/distinfo                         |  1 -
 ups-nut/patches/patch-server_sockdebug.c | 21 ---------------------
 3 files changed, 2 insertions(+), 22 deletions(-)

diffs:
diff --git a/ups-nut/COMMIT_MSG b/ups-nut/COMMIT_MSG
index c6d8961605..544f1454bf 100644
--- a/ups-nut/COMMIT_MSG
+++ b/ups-nut/COMMIT_MSG
@@ -1,5 +1,7 @@
 sysutils/ups-nut: Update to 2.8.3
 
+Drop patches no longer needed because of upstream improvements.
+
 Release notes for NUT 2.8.4 - what's new since 2.8.3
 -------------------------------------------------------------
 
diff --git a/ups-nut/distinfo b/ups-nut/distinfo
index 759e6306f6..6e7e73fdd7 100644
--- a/ups-nut/distinfo
+++ b/ups-nut/distinfo
@@ -8,4 +8,3 @@ SHA1 (patch-conf_Makefile.in) = 8d02a0b05659cb210a77e863a28a3b9caa596dfc
 SHA1 (patch-drivers_libhid.c) = 8b4f773d9b32e4c43f7045a4a83854382b08cb5b
 SHA1 (patch-drivers_libusb0.c) = bdd6fcb145386598b4ac5474d4c866ded5f6d5fa
 SHA1 (patch-drivers_libusb1.c) = 58d8ffe9507399802ad885c2e2627641978e5438
-SHA1 (patch-server_sockdebug.c) = 788efc0a519a6a0256b80156fff415d91a359098
diff --git a/ups-nut/patches/patch-server_sockdebug.c b/ups-nut/patches/patch-server_sockdebug.c
deleted file mode 100644
index d97873157c..0000000000
--- a/ups-nut/patches/patch-server_sockdebug.c
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-server_sockdebug.c,v 1.1 2023/11/09 18:01:06 gdt Exp $
-
-Work around upstream bug of including libwrap  on a test program not written for tcp wrappers.
-
-Reported upstream by email 20231109.
-
---- server/sockdebug.c.orig	2023-09-17 14:34:05.000000000 +0000
-+++ server/sockdebug.c
-@@ -32,6 +32,12 @@
- #include "parseconf.h"
- #include "nut_stdint.h"
- 
-+#ifdef HAVE_WRAP
-+#include <tcpd.h>
-+int	allow_severity = LOG_INFO;
-+int	deny_severity = LOG_WARNING;
-+#endif	/* HAVE_WRAP */
-+
- static PCONF_CTX_t	sock_ctx;
- 
- static void sock_arg(size_t numarg, char **arg)


Home | Main Index | Thread Index | Old Index