[arch-commits] CVS update of extra/daemons/sysklogd (crunch_list.patch headers26.patch)
Eric Belanger
eric at archlinux.org
Thu Nov 15 01:48:11 UTC 2007
Date: Wednesday, November 14, 2007 @ 20:48:11
Author: eric
Path: /home/cvs-extra/extra/daemons/sysklogd
Removed: crunch_list.patch (1.1) headers26.patch (1.1)
upgpkg: sysklogd 1.5-1
removed old patches
-------------------+
crunch_list.patch | 87 --------------------------------------------------
headers26.patch | 90 ----------------------------------------------------
2 files changed, 177 deletions(-)
Index: extra/daemons/sysklogd/crunch_list.patch
diff -u extra/daemons/sysklogd/crunch_list.patch:1.1 extra/daemons/sysklogd/crunch_list.patch:removed
--- extra/daemons/sysklogd/crunch_list.patch:1.1 Wed May 5 18:05:28 2004
+++ extra/daemons/sysklogd/crunch_list.patch Wed Nov 14 20:48:11 2007
@@ -1,87 +0,0 @@
-diff -ur sysklogd-1.4.1.orig/syslogd.c sysklogd-1.4.1/syslogd.c
---- sysklogd-1.4.1.orig/syslogd.c Sun Mar 11 19:40:10 2001
-+++ sysklogd-1.4.1/syslogd.c Sun Apr 18 01:42:21 2004
-@@ -1254,30 +1254,26 @@
- crunch_list(list)
- char *list;
- {
-- int count, i;
-+ int i, m, n;
- char *p, *q;
- char **result = NULL;
-
- p = list;
-
- /* strip off trailing delimiters */
-- while (p[strlen(p)-1] == LIST_DELIMITER) {
-- count--;
-+ while (*p && p[strlen(p)-1] == LIST_DELIMITER)
- p[strlen(p)-1] = '\0';
-- }
- /* cut off leading delimiters */
-- while (p[0] == LIST_DELIMITER) {
-- count--;
-+ while (p[0] == LIST_DELIMITER)
- p++;
-- }
-
-- /* count delimiters to calculate elements */
-- for (count=i=0; p[i]; i++)
-- if (p[i] == LIST_DELIMITER) count++;
-+ /* count delimiters to calculate the number of elements */
-+ for (n = i = 0; p[i]; i++)
-+ if (p[i] == LIST_DELIMITER) n++;
-
-- if ((result = (char **)malloc(sizeof(char *) * count+2)) == NULL) {
-+ if ((result = (char **)malloc(sizeof(char *) * (n + 2))) == NULL) {
- printf ("Sorry, can't get enough memory, exiting.\n");
-- exit(0);
-+ exit(1);
- }
-
- /*
-@@ -1285,30 +1281,28 @@
- * characters are different from any delimiters,
- * so we don't have to care about this.
- */
-- count = 0;
-- while ((q=strchr(p, LIST_DELIMITER))) {
-- result[count] = (char *) malloc((q - p + 1) * sizeof(char));
-- if (result[count] == NULL) {
-+ m = 0;
-+ while ((q = strchr(p, LIST_DELIMITER)) && m < n) {
-+ result[m] = (char *) malloc((q - p + 1) * sizeof(char));
-+ if (result[m] == NULL) {
- printf ("Sorry, can't get enough memory, exiting.\n");
-- exit(0);
-+ exit(1);
- }
-- strncpy(result[count], p, q - p);
-- result[count][q - p] = '\0';
-+ memcpy(result[m], p, q - p);
-+ result[m][q - p] = '\0';
- p = q; p++;
-- count++;
-+ m++;
- }
-- if ((result[count] = \
-- (char *)malloc(sizeof(char) * strlen(p) + 1)) == NULL) {
-+ if ((result[m] = strdup(p)) == NULL) {
- printf ("Sorry, can't get enough memory, exiting.\n");
-- exit(0);
-+ exit(1);
- }
-- strcpy(result[count],p);
-- result[++count] = NULL;
-+ result[++m] = NULL;
-
- #if 0
-- count=0;
-- while (result[count])
-- dprintf ("#%d: %s\n", count, StripDomains[count++]);
-+ m = 0;
-+ while (result[m])
-+ dprintf ("#%d: %s\n", m, result[m++]);
- #endif
- return result;
- }
Index: extra/daemons/sysklogd/headers26.patch
diff -u extra/daemons/sysklogd/headers26.patch:1.1 extra/daemons/sysklogd/headers26.patch:removed
--- extra/daemons/sysklogd/headers26.patch:1.1 Thu May 6 12:29:57 2004
+++ extra/daemons/sysklogd/headers26.patch Wed Nov 14 20:48:11 2007
@@ -1,90 +0,0 @@
-diff -Naur sysklogd-1.4.1-orig/Makefile sysklogd-1.4.1/Makefile
---- sysklogd-1.4.1-orig/Makefile 1998-10-12 20:25:15.000000000 +0000
-+++ sysklogd-1.4.1/Makefile 2003-08-17 19:14:38.000000000 +0000
-@@ -3,7 +3,7 @@
- CC= gcc
- #CFLAGS= -g -DSYSV -Wall
- #LDFLAGS= -g
--CFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce
-+CFLAGS= $(RPM_OPT_FLAGS) -DSYSV -D_GNU_SOURCE -Wall
- LDFLAGS= -s
-
- # Look where your install program is.
-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 <linux/time.h>
- #include <linux/module.h>
- #else /* __GLIBC__ */
--#include <linux/module.h>
-+#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 <kernel/module.h> */
-+/* 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
-+};
-+
More information about the arch-commits
mailing list