Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Julien ROZO (fd6f80e53f8f4a1735d404c97701cd80feca1697)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Julien ROZO <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Julien ROZO (fd6f80e53f8f4a1735d404c97701cd80feca1697)
  • Date: Thu, 11 Aug 2011 03:59:01 -0500

GIT changes to master grimoire by Julien ROZO <julien AT rozo.org>:

utils/sysklogd/DETAILS | 6 -
utils/sysklogd/HISTORY | 7 +
utils/sysklogd/PRE_BUILD | 7 -
utils/sysklogd/sysklogd-1.4.1-kernel_header.patch | 100
----------------------
4 files changed, 14 insertions(+), 106 deletions(-)

New commits:
commit 238eb25a69259b20a0166f7e0447f911878e7136
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

sysklogd: updated version to 1.5.0, PATCHLEVEL=0
removed obsolete 1.4.1 patch
compilation uses sorcery configured CFLAGS and LDFLAGS

diff --git a/utils/sysklogd/DETAILS b/utils/sysklogd/DETAILS
index e114a60..a5ad152 100755
--- a/utils/sysklogd/DETAILS
+++ b/utils/sysklogd/DETAILS
@@ -1,10 +1,10 @@
SPELL=sysklogd
- VERSION=1.4.1
- PATCHLEVEL=1
+ VERSION=1.5
+ PATCHLEVEL=0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.ibiblio.org/pub/Linux/system/daemons/$SOURCE
-
SOURCE_HASH=sha512:01924f9b9c72e3a0ee1a530eb8bd39779ca52dfabb62725085c6d3d71898777e6a47dae1c104ad6d376064c66b9dada9e3ba27e98ba92915a0875e789d8b2c8b
+
SOURCE_HASH=sha512:19ef104c03a8c87ea30c811fe54bb30e7c73a2834a83c8720841f0d553d41508dbf052d4e3dd9ea929eedff31e9fbb79f8c05546f48005b74f01ebf2a57e48f7
WEB_SITE=http://www.ibiblio.org/pub/Linux/system/daemons
ENTERED=20010922
LICENSE[0]=GPL
diff --git a/utils/sysklogd/HISTORY b/utils/sysklogd/HISTORY
index dd40a2d..6e14c73 100644
--- a/utils/sysklogd/HISTORY
+++ b/utils/sysklogd/HISTORY
@@ -1,3 +1,10 @@
+2011-08-08 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 1.5, PATCHLEVEL=0
+ * PRE_BUILD: added sedit rules to use sorcery configured CFLAGS and
+ LDFLAGS, adapted sedit rules for BINDIR and MANDIR to the new
version,
+ removed old version patch
+ * sysklogd-1.4.1-kernel_header.patch: removed, obsolete
+
2008-08-05 Jeremy Blosser <jblosser-smgl AT firinn.org>
* BUILD: Moved most to PRE_BUILD.
* PRE_BUILD: Added, with support for large log files option.
diff --git a/utils/sysklogd/PRE_BUILD b/utils/sysklogd/PRE_BUILD
index 9c9857f..8a39c54 100755
--- a/utils/sysklogd/PRE_BUILD
+++ b/utils/sysklogd/PRE_BUILD
@@ -2,9 +2,10 @@ default_pre_build &&

cd "${SOURCE_DIRECTORY}" &&

-patch -p1 < $SCRIPT_DIRECTORY/sysklogd-1.4.1-kernel_header.patch
&&
-sedit "s:BINDIR = /usr/sbin:BINDIR=$INSTALL_ROOT/sbin:" Makefile
&&
-sedit "s:MANDIR = /usr/man:MANDIR=$INSTALL_ROOT/usr/share/man:" Makefile
&&
+sedit "s:-O3:${CFLAGS} -D_GNU_SOURCE:" Makefile &&
+sedit "s:LDFLAGS= -s:LDFLAGS= ${LDFLAGS}:" Makefile &&
+sedit "s:BINDIR = \$(prefix)/usr/sbin:BINDIR=$INSTALL_ROOT/sbin:" Makefile
&&
+sedit "s:MANDIR = \$(prefix):MANDIR = $INSTALL_ROOT:" Makefile &&

if [ "${LARGE_FILES}" == "y" ]; then
sedit "s:SYSLOGD_FLAGS=:SYSLOGD_FLAGS= -D_FILE_OFFSET_BITS=64
-D_LARGEFILE_SOURCE:" Makefile
diff --git a/utils/sysklogd/sysklogd-1.4.1-kernel_header.patch
b/utils/sysklogd/sysklogd-1.4.1-kernel_header.patch
deleted file mode 100644
index a30a202..0000000
--- a/utils/sysklogd/sysklogd-1.4.1-kernel_header.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-Submitted by: DJ Lucas (dj_at_lucasit_dot_com)
-Date: 2003-08-17
-Initial Package Version: 1.4.1
-Origin: Linux Standard Base Project
-Description: This patch fixes a dependacy on kernel includes.
- Specifically, it removes the need to have kernel/module.h around. It
- is usable when building a linux-2.6 based system to get around
- compile problems. Source link:
- http://freestandards.org/pipermail/lsb-impl/2002-October/000466.html
-
-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
-+};
-+



  • [SM-Commit] GIT changes to master grimoire by Julien ROZO (fd6f80e53f8f4a1735d404c97701cd80feca1697), Julien ROZO, 08/11/2011

Archive powered by MHonArc 2.6.24.

Top of Page