diff options
| author |   Tim Yamin <plasmaroo@gentoo.org> | 2004-06-21 22:24:22 +0000 |
|---|---|---|
| committer | Tim Yamin <plasmaroo@gentoo.org> | 2004-06-21 22:24:22 +0000 |
| commit | 3f8e451e30709a52b4cb305444fa5b3145a6a390 (patch) | |
| tree | 8f8edb9c5da0587bc9dad9084947655fc6c44e6d /app-admin/sysklogd | |
| parent | updated named.ca (bug #53848) (Manifest recommit) (diff) | |
| download | gentoo-2-3f8e451e30709a52b4cb305444fa5b3145a6a390.tar.gz gentoo-2-3f8e451e30709a52b4cb305444fa5b3145a6a390.tar.bz2 gentoo-2-3f8e451e30709a52b4cb305444fa5b3145a6a390.zip | |
Updated the 2.6 headers patch to check that the <linux/list.h> header is not redefined twice in versions where it is global. Closes bug #54532.
Diffstat (limited to 'app-admin/sysklogd')
| -rw-r--r-- | app-admin/sysklogd/ChangeLog | 6 | ||||
| -rw-r--r-- | app-admin/sysklogd/files/sysklogd-1.4.1-2.6.headers.patch | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/app-admin/sysklogd/ChangeLog b/app-admin/sysklogd/ChangeLog index 90f7fe9fba24..4acb2af928dd 100644 --- a/app-admin/sysklogd/ChangeLog +++ b/app-admin/sysklogd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/sysklogd # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/ChangeLog,v 1.30 2004/05/04 13:48:19 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/ChangeLog,v 1.31 2004/06/21 22:24:22 plasmaroo Exp $ + + 21 Jun 2004; <plasmaroo@gentoo.org> files/sysklogd-1.4.1-2.6.headers.patch: + Updated the 2.6 headers patch to check that the <linux/list.h> header is not + redefined twice in versions where it is global. Closes bug #54532. 04 May 2004; Bryan Østergaard <kloeri@gentoo.org> sysklogd-1.4.1-r10.ebuild: Stable on alpha. diff --git a/app-admin/sysklogd/files/sysklogd-1.4.1-2.6.headers.patch b/app-admin/sysklogd/files/sysklogd-1.4.1-2.6.headers.patch index 6352c7ae9b7e..251f9b1015c1 100644 --- a/app-admin/sysklogd/files/sysklogd-1.4.1-2.6.headers.patch +++ b/app-admin/sysklogd/files/sysklogd-1.4.1-2.6.headers.patch @@ -11,7 +11,7 @@ Purpose: klogd (from sysklogd-1.4.1) uses an antiquated method of --- sysklogd-1.4.1/ksym_mod.c 2000-09-12 22:15:28.000000000 +0100 +++ sysklogd-1.4.1-plasmaroo/ksym_mod.c 2004-01-19 20:15:16.000000000 +0000 -@@ -80,9 +80,31 @@ +@@ -80,9 +80,33 @@ * Changed llseek() to lseek64() in order to skip a libc warning. */ @@ -33,8 +33,10 @@ Purpose: klogd (from sysklogd-1.4.1) uses an antiquated method of + #undef __KERNEL_STRICT_NAMES + #include <linux/types.h> + -+ #undef _LINUX_LIST_H -+ #include <linux/list.h> ++ #ifndef LIST_POISON1 ++ #undef _LINUX_LIST_H ++ #include <linux/list.h> ++ #endif + #include <asm/semaphore.h> + #undef __KERNEL__ + #include "module.h" |