syslog-ng: remove obsolete patches

4 files changed, 1 insertions, 104 deletions

diff --git a/sysutils/syslog-ng/distinfo b/sysutils/syslog-ng/distinfo
index 07a4279cb93..799c6816bcf 100644
--- a/sysutils/syslog-ng/distinfo
+++ b/sysutils/syslog-ng/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.22 2022/12/15 10:09:43 wiz Exp $
+$NetBSD: distinfo,v 1.23 2022/12/16 11:56:20 wiz Exp $
 
 BLAKE2s (syslog-ng-3.38.1.tar.gz) = bfd89e26655c086a503f954116cbd2a07b437f22a1cf77e51d5be145e71e2374
 SHA512 (syslog-ng-3.38.1.tar.gz) = 3a3ef5c72d8c211ed2914791380061dcd48ea1ea95f636a1a8649dc5dee731a11e9ae000a37cbeeba624f4053b623b697e6c7f945a81153106c2365f4f09a847
 Size (syslog-ng-3.38.1.tar.gz) = 5405048 bytes
-SHA1 (patch-ac) = 1f70075860999e854629faa7f293ef51243b398d
-SHA1 (patch-configure) = d4ae0c21ac4287b765bc4411db9873be8bdb0853
-SHA1 (patch-lib_signal-handler.c) = 440a9d0df0da613817c943b8244e98e50c92bbb2
diff --git a/sysutils/syslog-ng/patches/patch-ac b/sysutils/syslog-ng/patches/patch-ac
deleted file mode 100644
index d8157c5d90f..00000000000
--- a/sysutils/syslog-ng/patches/patch-ac
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2021/09/16 12:02:12 wiz Exp $
-
-# add NetBSD support and fix some paths
-https://github.com/syslog-ng/syslog-ng/pull/3786
-
---- contrib/syslog2ng.orig	2021-09-10 11:01:49.000000000 +0000
-+++ contrib/syslog2ng
-@@ -5,7 +5,7 @@
- # Translator from syslog.conf to syslog-ng.conf
- # by Jonathan W. Marks <j-marks@uiuc.edu>
- #
--# Rev 2
-+# Rev 2.1
- 
- BEGIN {
- 	# Handle the various platforms- determine proper log device
-@@ -13,10 +13,16 @@ BEGIN {
- 	close("/bin/uname -s");
- 	if (sysname == "SunOS") {
- 		LOGDEVTYPE="sun-streams";
-+		LOGDEVPATH="/dev/log";
- 	} else if (sysname == "AIX") {
- 		LOGDEVTYPE="unix-dgram";
-+		LOGDEVPATH="/dev/log";
- 	} else if (sysname == "Linux") {
- 		LOGDEVTYPE="unix-stream";
-+		LOGDEVPATH="/dev/log";
-+	} else if (sysname == "NetBSD") {
-+		LOGDEVTYPE="unix-dgram";
-+		LOGDEVPATH="/var/run/log";
- 	} else {
- 		print "!!! Unsupported system: " sysname ".";
- 		exit 1;
-@@ -29,7 +35,7 @@ BEGIN {
- 
- 	print \
- "source local {\n" \
--"	" LOGDEVTYPE "(\"/dev/log\");\n" \
-+"	" LOGDEVTYPE "(\"" LOGDEVPATH "\");\n" \
- "	udp(ip(0.0.0.0) port(514));\n" \
- "	internal();\n" \
- "};\n";
diff --git a/sysutils/syslog-ng/patches/patch-configure b/sysutils/syslog-ng/patches/patch-configure
deleted file mode 100644
index 0d5704ff0f4..00000000000
--- a/sysutils/syslog-ng/patches/patch-configure
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-configure,v 1.5 2021/09/16 09:32:03 wiz Exp $
-
-Portability.
-https://github.com/syslog-ng/syslog-ng/pull/3786
-
---- configure.orig	2021-09-10 11:02:58.000000000 +0000
-+++ configure
-@@ -19950,7 +19950,7 @@ $as_echo "no" >&6; }
- fi
- 
- 
--          if test "x$PYLINT" == "x"; then
-+          if test "x$PYLINT" = "x"; then
-             # Extract the first word of "pylint", so it can be a program name with args.
- set dummy pylint; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-@@ -20067,7 +20067,7 @@ $as_echo_n "checking for JAVA_VERSION...
-   JAVA_HOME_CHECKER="/usr/libexec/java_home"
- 
-   if test "x$JAVAC_BIN" != "x"; then
--    if test "x$DONT_RESOLVE_JAVA_BIN_LINKS" == "x"; then
-+    if test "x$DONT_RESOLVE_JAVA_BIN_LINKS" = "x"; then
-       JAVAC_BIN=`
-   READLINK_TARGET=$JAVAC_BIN
-   cd $(dirname "$READLINK_TARGET")
-@@ -20174,7 +20174,7 @@ $as_echo_n "checking for JAVA_VERSION...
-   JAVA_HOME_CHECKER="/usr/libexec/java_home"
- 
-   if test "x$JAVAC_BIN" != "x"; then
--    if test "x$DONT_RESOLVE_JAVA_BIN_LINKS" == "x"; then
-+    if test "x$DONT_RESOLVE_JAVA_BIN_LINKS" = "x"; then
-       JAVAC_BIN=`
-   READLINK_TARGET=$JAVAC_BIN
-   cd $(dirname "$READLINK_TARGET")
diff --git a/sysutils/syslog-ng/patches/patch-lib_signal-handler.c b/sysutils/syslog-ng/patches/patch-lib_signal-handler.c
deleted file mode 100644
index 4b843b810e2..00000000000
--- a/sysutils/syslog-ng/patches/patch-lib_signal-handler.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-lib_signal-handler.c,v 1.3 2021/09/16 09:32:03 wiz Exp $
-
-sigaction() is the old, compat syscall. On NetBSD call the up to date one.
-https://github.com/syslog-ng/syslog-ng/pull/3786
-
---- lib/signal-handler.c.orig	2021-06-09 18:47:52.838429049 +0200
-+++ lib/signal-handler.c	2021-06-09 18:48:47.322106570 +0200
-@@ -84,12 +84,16 @@
- static int
- _original_sigaction(int signum, const struct sigaction *act, struct sigaction *oldact)
- {
-+#ifdef __NetBSD__
-+  __libc_sigaction14(signum, act, oldact);
-+#else
-   static int (*real_sa)(int, const struct sigaction *, struct sigaction *);
- 
-   if (real_sa == NULL)
-     real_sa = dlsym(RTLD_NEXT, "sigaction");
- 
-   return real_sa(signum, act, oldact);
-+#endif
- }
- 
- static gint