From 08377c86e68d7f9d3caae34d5ea3127463ff9bd31d6a94ed96e6180a4893097e Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Thu, 9 Aug 2007 20:32:10 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/syslogd?expand=0&rev=6

---
 sysklogd-1.4.1-ksym.patch | 23 ++++++++++++++++++-----
 syslogd.changes           |  5 +++++
 syslogd.spec              | 12 +++++++-----
 3 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/sysklogd-1.4.1-ksym.patch b/sysklogd-1.4.1-ksym.patch
index 5fec9b5..0d36c6c 100644
--- a/sysklogd-1.4.1-ksym.patch
+++ b/sysklogd-1.4.1-ksym.patch
@@ -1,10 +1,23 @@
---- ksym_mod.c
-+++ ksym_mod.c
-@@ -91,6 +91,7 @@
+---
+ ksym_mod.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/ksym_mod.c
++++ b/ksym_mod.c
+@@ -91,7 +91,6 @@
  #include <sys/stat.h>
  #include <stdarg.h>
  #include <paths.h>
-+#include <linux/bitops.h>
- #include <asm/atomic.h>
+-#include <asm/atomic.h>
  #include <limits.h>
  /* #include <linux/version.h> */
+ 
+@@ -129,6 +128,8 @@ err:
+ 
+ #define getsyms get_kernel_syms
+ 
++typedef struct { volatile int counter; } atomic_t;
++
+ struct module
+ {
+         size_t size_of_struct;   /* == sizeof(module) */
diff --git a/syslogd.changes b/syslogd.changes
index 03a2bf8..503297f 100644
--- a/syslogd.changes
+++ b/syslogd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Aug  9 17:19:05 CEST 2007 - olh@suse.de
+
+- remove inclusion of asm/bitops.h
+
 -------------------------------------------------------------------
 Mon Jun 18 13:43:58 CEST 2007 - coolo@suse.de
 
diff --git a/syslogd.spec b/syslogd.spec
index 16d679d..c54d262 100644
--- a/syslogd.spec
+++ b/syslogd.spec
@@ -13,13 +13,13 @@
 Name:           syslogd
 %define omc_prefix /usr/share/omc
 %define omc_svcdir %{omc_prefix}/svcinfo.d
-License:        GNU General Public License (GPL)
+License:        GPL v2 or later
 Group:          System/Daemons
 PreReq:         klogd
 Provides:       syslog
 Autoreqprov:    on
 Version:        1.4.1
-Release:        614
+Release:        623
 Summary:        The Syslog daemon
 Source:         sysklogd-1.4.1.tar.bz2
 Source1:        logrotate.syslog
@@ -106,14 +106,14 @@ Authors:
 %patch14 -p0 -b .shprio
 %patch15 -p1 -b .presperc
 %patch16 -p1 -b .utf8
-%patch17 -p0 -b .ksym
+%patch17 -p1 -b .ksym
 %patch18 -p1 -b .sleep
 %patch0  -p0
+
+%build
 %ifarch s390 s390x
 mv sample-s390.conf sample.conf
 %endif
-
-%build
     # honor the increased LOG_BUF_LEN in kernel/printk.c
     make LOG_BUFFER_SIZE=-DLOG_BUFFER_SIZE=131072
 
@@ -222,6 +222,8 @@ fi
 %{omc_svcdir}/syslog.xml
 
 %changelog
+* Thu Aug 09 2007 - olh@suse.de
+- remove inclusion of asm/bitops.h
 * Mon Jun 18 2007 - coolo@suse.de
 - don't sleep during boot - and rather sync the logfile
 * Mon May 14 2007 - mt@suse.de