[packages/sysklogd] - fix patch fuzz and outdated rpm macros

[baggins]

commit 1fe234aab9bead45151de541c0094f012c022eed
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Aug 22 23:43:03 2026 +0200

    - fix patch fuzz and outdated rpm macros

 sysklogd-bind.patch     | 2 +-
 sysklogd-ksyms.patch    | 3 +--
 sysklogd-security.patch | 8 ++++----
 sysklogd-sparc.patch    | 2 +-
 sysklogd.spec           | 6 +++---
 5 files changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/sysklogd.spec b/sysklogd.spec
index cca1685..66be6d1 100644
--- a/sysklogd.spec
+++ b/sysklogd.spec
@@ -38,8 +38,8 @@ BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_exec_prefix	/
-%define 	_bindir		/usr/sbin
-%define 	_sbindir	/sbin
+%define		_bindir		/usr/sbin
+%define		_sbindir	/sbin
 
 %description
 This is the Linux system and kernel logging program. It is run as a
@@ -103,7 +103,7 @@ Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
 Requires(pre):	/usr/sbin/usermod
 Requires(post,preun,postun):	systemd-units >= 38
-Requires(triggerpostun):	sed >= 4.0
+Requires(postun):	sed >= 4.0
 # for vservers we don't need klogd and syslog works without klogd
 # (just it doesn't log kernel buffer into syslog)
 # Requires:	klogd
diff --git a/sysklogd-bind.patch b/sysklogd-bind.patch
index deb5a07..279860c 100644
--- a/sysklogd-bind.patch
+++ b/sysklogd-bind.patch
@@ -74,8 +74,8 @@ diff -ur sysklogd-1.4.1.orig/syslogd.c sysklogd-1.4.1/syslogd.c
  }
  
 @@ -1217,15 +1227,22 @@
- 	int fd, on = 1;
  	struct sockaddr_in sin;
+ 	int sockflags;
  
 +	memset(&sin, 0, sizeof(sin));
 +	sin.sin_family = AF_INET;
diff --git a/sysklogd-ksyms.patch b/sysklogd-ksyms.patch
index f860270..6bd1bbe 100644
--- a/sysklogd-ksyms.patch
+++ b/sysklogd-ksyms.patch
@@ -38,5 +38,4 @@ diff -urN sysklogd-1.3-31/klogd.c sysklogd-1.3-31.new/klogd.c
 +		}
  	}
  
-         /* The main loop. */
-
+ 	/* Drop privileges if a user name was specified on the command line */
diff --git a/sysklogd-security.patch b/sysklogd-security.patch
index 6e656cb..428cc91 100644
--- a/sysklogd-security.patch
+++ b/sysklogd-security.patch
@@ -48,7 +48,7 @@ diff -Nur sysklogd-1.4.1.orig/klogd.c sysklogd-1.4.1/klogd.c
 --- sysklogd-1.4.1.orig/klogd.c	Sun Mar 11 20:40:10 2001
 +++ sysklogd-1.4.1/klogd.c	Fri Mar 16 14:38:52 2001
 @@ -275,6 +275,10 @@
- #define ksyslog klogctl
+ #define _PATH_KLOG  "/proc/kmsg"
  #endif
  
 +/* Support for running as an unprivileged user */
@@ -122,7 +122,7 @@ diff -Nur sysklogd-1.4.1.orig/klogd.c sysklogd-1.4.1/klogd.c
 +		setuid(server_uid);
  	}
  
-         /* The main loop. */
+ #ifndef TESTING
 diff -Nur sysklogd-1.4.1.orig/sysklogd.8 sysklogd-1.4.1/sysklogd.8
 --- sysklogd-1.4.1.orig/sysklogd.8	Sun Mar 11 20:35:51 2001
 +++ sysklogd-1.4.1/sysklogd.8	Fri Mar 16 14:40:16 2001
@@ -134,8 +134,8 @@ diff -Nur sysklogd-1.4.1.orig/sysklogd.8 sysklogd-1.4.1/sysklogd.8
 +.IB username
 +]
  .RB [ " \-v " ]
- .LP
  .SH DESCRIPTION
+ .B Sysklogd
 @@ -149,6 +152,22 @@
  is specified and the host logging resolves to satu.infodrom.north.de
  no domain would be cut, you will have to specify two domains like:
@@ -179,7 +179,7 @@ diff -Nur sysklogd-1.4.1.orig/syslogd.c sysklogd-1.4.1/syslogd.c
  				   intermediate host. */
 +char	*server_user = NULL;	/* user name to run server as, instead of root */
  
- extern	int errno;
+ char	*bind_addr = NULL;	/* bind UDP port to this interface only */
  
 @@ -869,7 +869,7 @@
  		funix[i]  = -1;
diff --git a/sysklogd-sparc.patch b/sysklogd-sparc.patch
index 1d8ee88..81bfcba 100644
--- a/sysklogd-sparc.patch
+++ b/sysklogd-sparc.patch
@@ -7,7 +7,7 @@
 +#include <ctype.h>
  #include "klogd.h"
  #include "ksyms.h"
- 
+ #include "module.h"
 @@ -668,6 +669,84 @@ extern char * ExpandKadds(line, el)
  	if ( (num_syms == 0) ||
  	     (kp = strstr(line, "[<")) == (char *) 0 )
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/sysklogd.git/commitdiff/1fe234aab9bead45151de541c0094f012c022eed