diff --git a/package/base/sysklogd/module_h_fix_26headers.patch b/package/base/sysklogd/module_h_fix_26headers.patch deleted file mode 100644 index 4a5f9d375..000000000 --- a/package/base/sysklogd/module_h_fix_26headers.patch +++ /dev/null @@ -1,97 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/sysklogd/module_h_fix_26headers.patch -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -diff -Naur sysklogd-1.4.1-orig/ksym_mod.c sysklogd-1.4.1/ksym_mod.c ---- sysklogd-1.4.1-orig/ksym_mod.c 2000-09-12 21:15:28.000000000 +0000 -+++ sysklogd-1.4.1/ksym_mod.c 2003-08-17 19:14:38.000000000 +0000 -@@ -93,7 +93,7 @@ - #include - #include - #else /* __GLIBC__ */ --#include -+#include "module.h" - extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence)); - extern int get_kernel_syms __P ((struct kernel_sym *__table)); - #endif /* __GLIBC__ */ -diff -Naur sysklogd-1.4.1-orig/module.h sysklogd-1.4.1/module.h ---- sysklogd-1.4.1-orig/module.h 1970-01-01 00:00:00.000000000 +0000 -+++ sysklogd-1.4.1/module.h 2003-08-17 19:14:38.000000000 +0000 -@@ -0,0 +1,62 @@ -+/* this file eliminates the need to include */ -+/* Module definitions for klogd's module support */ -+struct kernel_sym -+{ -+ unsigned long value; -+ char name[60]; -+}; -+ -+struct module_symbol -+{ -+ unsigned long value; -+ const char *name; -+}; -+ -+struct module_ref -+{ -+ struct module *dep; /* "parent" pointer */ -+ struct module *ref; /* "child" pointer */ -+ struct module_ref *next_ref; -+}; -+ -+struct module_info -+{ -+ unsigned long addr; -+ unsigned long size; -+ unsigned long flags; -+ long usecount; -+}; -+ -+ -+typedef struct { volatile int counter; } atomic_t; -+ -+struct module -+{ -+ unsigned long size_of_struct; /* == sizeof(module) */ -+ struct module *next; -+ const char *name; -+ unsigned long size; -+ -+ union -+ { -+ atomic_t usecount; -+ long pad; -+ } uc; /* Needs to keep its size - so says rth */ -+ -+ unsigned long flags; /* AUTOCLEAN et al */ -+ -+ unsigned nsyms; -+ unsigned ndeps; -+ -+ struct module_symbol *syms; -+ struct module_ref *deps; -+ struct module_ref *refs; -+ int (*init)(void); -+ void (*cleanup)(void); -+ const struct exception_table_entry *ex_table_start; -+ const struct exception_table_entry *ex_table_end; -+#ifdef __alpha__ -+ unsigned long gp; -+#endif -+}; -+ diff --git a/package/base/sysklogd/sigterm_race.patch b/package/base/sysklogd/sigterm_race.patch deleted file mode 100644 index 673b3696b..000000000 --- a/package/base/sysklogd/sigterm_race.patch +++ /dev/null @@ -1,42 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/sysklogd/sigterm_race.patch -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./syslogd.c.orig 2004-12-24 02:26:01.673668736 +0100 -+++ ./syslogd.c 2004-12-24 02:26:55.203530960 +0100 -@@ -890,11 +890,11 @@ - dprintf("Checking pidfile.\n"); - if (!check_pid(PidFile)) - { -+ void *old_sigterm_hdl = signal (SIGTERM, doexit); - if (fork()) { - /* - * Parent process - */ -- signal (SIGTERM, doexit); - sleep(300); - /* - * Not reached unless something major went wrong. 5 -@@ -906,6 +906,7 @@ - */ - exit(1); - } -+ signal (SIGTERM, old_sigterm_hdl); - num_fds = getdtablesize(); - for (i= 0; i < num_fds; i++) - (void) close(i); diff --git a/package/base/sysklogd/sysklogd.desc b/package/base/sysklogd/sysklogd.desc index e7a3dad70..bd1cc7999 100644 --- a/package/base/sysklogd/sysklogd.desc +++ b/package/base/sysklogd/sysklogd.desc @@ -36,8 +36,8 @@ [L] GPL [S] Stable -[V] 1.4.1 +[V] 1.5 [P] X --?--5---9 222.100 -[D] 1947466883 sysklogd-1.4.1.tar.gz ftp://metalab.unc.edu/pub/Linux/system/daemons/ +[D] 2340911661 sysklogd-1.5.tar.gz ftp://metalab.unc.edu/pub/Linux/system/daemons/