diff --git a/klogd-obsolete.patch b/klogd-obsolete.patch new file mode 100644 index 0000000..1df2bfb --- /dev/null +++ b/klogd-obsolete.patch @@ -0,0 +1,30 @@ +Index: sysklogd-1.4.1/ksym_mod.c +=================================================================== +--- sysklogd-1.4.1.orig/ksym_mod.c ++++ sysklogd-1.4.1/ksym_mod.c +@@ -89,6 +89,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -105,7 +106,16 @@ struct kernel_sym + }; + + extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence)); +-extern int get_kernel_syms __P ((struct kernel_sym *__table)); ++ ++static int get_kernel_syms(struct kernel_sym *table) ++{ ++#ifdef SYS_get_kernel_syms ++ return syscall(SYS_get_kernel_syms, table); ++#else ++ errno = ENOSYS; ++ return -1; ++#endif ++} + + static inline __off64_t seek64(int fd, uintptr_t address) + { diff --git a/syslogd.changes b/syslogd.changes index 373f352..cc4c4ed 100644 --- a/syslogd.changes +++ b/syslogd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 25 14:22:13 UTC 2016 - schwab@suse.de + +- klogd-obsolete.patch: avoid use of obsolete function get_kernel_syms + ------------------------------------------------------------------- Fri May 8 13:43:30 UTC 2015 - werner@suse.de diff --git a/syslogd.spec b/syslogd.spec index 9385d2f..2e3a323 100644 --- a/syslogd.spec +++ b/syslogd.spec @@ -1,7 +1,7 @@ # # spec file for package syslogd # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -85,6 +85,7 @@ Patch25: sysklogd-1.4.1-systemd-multi.dif Patch26: sysklogd-1.4.1-systemd-sock-name.patch # PATCH-FIX-SUSE bsc#897262, CVE-2014-3634 rsyslog/syslogd: remote syslog PRI vulnerability Patch28: sysklogd-1.4.1-CVE-2014-3634.patch +Patch29: klogd-obsolete.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -175,6 +176,7 @@ Authors: %patch25 -p0 -b .sd2 %patch26 -p0 -b .sd3 %patch28 -p0 -b .cve20143634 +%patch29 -p1 %patch0 -p0 %build