Accepting request 355764 from home:Andreas_Schwab:glibc

- klogd-obsolete.patch: avoid use of obsolete function get_kernel_syms

OBS-URL: https://build.opensuse.org/request/show/355764
OBS-URL: https://build.opensuse.org/package/show/Base:System/syslogd?expand=0&rev=131
This commit is contained in:
Dirk Mueller 2016-01-27 09:47:38 +00:00 committed by Git OBS Bridge
parent 240874b621
commit 182cd5b113
3 changed files with 38 additions and 1 deletions

30
klogd-obsolete.patch Normal file
View File

@ -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 <errno.h>
#include <sys/fcntl.h>
#include <sys/stat.h>
+#include <sys/syscall.h>
#include <stdarg.h>
#include <paths.h>
#include <limits.h>
@@ -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)
{

View File

@ -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

View File

@ -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