SOURCES: sysklogd-opt.patch, sysklogd-install.patch, sysklogd-secu...
glen
glen at pld-linux.org
Thu Mar 30 01:32:56 CEST 2006
Author: glen Date: Wed Mar 29 23:32:56 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- adjust to current cvs and other patches
---- Files affected:
SOURCES:
sysklogd-opt.patch (1.1 -> 1.2) , sysklogd-install.patch (1.3 -> 1.4) , sysklogd-security.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/sysklogd-opt.patch
diff -u SOURCES/sysklogd-opt.patch:1.1 SOURCES/sysklogd-opt.patch:1.2
--- SOURCES/sysklogd-opt.patch:1.1 Thu Apr 29 03:51:33 1999
+++ SOURCES/sysklogd-opt.patch Thu Mar 30 01:32:51 2006
@@ -1,22 +1,12 @@
-diff -Nur sysklogd-1.3-30/Makefile sysklogd-1.3-30.orig/Makefile
---- sysklogd-1.3-30/Makefile Mon Oct 12 22:25:15 1998
-+++ sysklogd-1.3-30.orig/Makefile Sun Dec 13 20:46:00 1998
-@@ -3,7 +3,8 @@
+--- sysklogd-1.4.1/Makefile~ 2006-03-30 02:22:54.000000000 +0300
++++ sysklogd-1.4.1/Makefile 2006-03-30 02:24:49.000000000 +0300
+@@ -3,8 +3,7 @@
CC= gcc
#CFLAGS= -g -DSYSV -Wall
#LDFLAGS= -g
-CFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce
-+OPTIMIZE= -O3 -fomit-frame-pointer -fno-strength-reduce
-+CFLAGS= $(OPTIMIZE) -DSYSV -Wall
+-# -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
++CFLAGS= $(OPTIMIZE) -DSYSV -Wall -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
LDFLAGS= -s
# Look where your install program is.
-@@ -35,7 +36,7 @@
- # Avery tells me that there is a difference between Debian and
- # Slackware. Rather than choose sides I am leaving it up to the user.
- MAN_OWNER = root
--# MAN_OWNER = man
-+#MAN_OWNER = man
-
- # The following define establishes the name of the pid file for the
- # syslogd daemon. The library include file (paths.h) defines the
================================================================
Index: SOURCES/sysklogd-install.patch
diff -u SOURCES/sysklogd-install.patch:1.3 SOURCES/sysklogd-install.patch:1.4
--- SOURCES/sysklogd-install.patch:1.3 Mon Mar 27 20:17:38 2006
+++ SOURCES/sysklogd-install.patch Thu Mar 30 01:32:51 2006
@@ -1,27 +1,30 @@
---- sysklogd-1.3-31/Makefile Thu Apr 29 03:35:48 1999
-+++ sysklogd-1.4.1/Makefile 2006-03-27 21:14:09.000000000 +0300
-@@ -9,8 +9,8 @@
-
- # Look where your install program is.
+--- sysklogd-1.4.1/Makefile~ 2006-03-28 00:50:17.000000000 +0300
++++ sysklogd-1.4.1/Makefile 2006-03-28 00:51:59.000000000 +0300
+@@ -11,8 +11,8 @@
INSTALL = /usr/bin/install
--BINDIR = /usr/sbin
--MANDIR = /usr/man
+
+ # Destination paths, set prefix=/opt if required
+-BINDIR = $(prefix)/usr/sbin
+-MANDIR = $(prefix)/usr/share/man
+BINDIR = $(DESTDIR)/usr/sbin
-+MANDIR = $(DESTDIR)/usr/man
++MANDIR = $(DESTDIR)/usr/share/man
# There is one report that under an all ELF system there may be a need to
# explicilty link with libresolv.a. If linking syslogd fails you may wish
-@@ -116,8 +116,8 @@
+@@ -116,11 +116,11 @@
+ rm -f syslogd klogd ksym syslog_tst oops_test TAGS tsyslogd tklogd
+
+ install_exec: syslogd klogd
- ${INSTALL} -m 500 -s syslogd ${BINDIR}/syslogd
- ${INSTALL} -m 500 -s klogd ${BINDIR}/klogd
+ ${INSTALL} -m 755 syslogd ${BINDIR}/syslogd
+ ${INSTALL} -m 755 klogd ${BINDIR}/klogd
install_man:
-- ${INSTALL} -o ${MAN_OWNER} -g ${MAN_OWNER} -m 644 sysklogd.8 ${MANDIR}/man8/sysklogd.8
-- ${INSTALL} -o ${MAN_OWNER} -g ${MAN_OWNER} -m 644 syslogd.8 ${MANDIR}/man8/syslogd.8
-- ${INSTALL} -o ${MAN_OWNER} -g ${MAN_OWNER} -m 644 syslog.conf.5 ${MANDIR}/man5/syslog.conf.5
-- ${INSTALL} -o ${MAN_OWNER} -g ${MAN_OWNER} -m 644 klogd.8 ${MANDIR}/man8/klogd.8
+- ${INSTALL} -o ${MAN_USER} -g ${MAN_GROUP} -m ${MAN_PERMS} sysklogd.8 ${MANDIR}/man8/sysklogd.8
+- ${INSTALL} -o ${MAN_USER} -g ${MAN_GROUP} -m ${MAN_PERMS} syslogd.8 ${MANDIR}/man8/syslogd.8
+- ${INSTALL} -o ${MAN_USER} -g ${MAN_GROUP} -m ${MAN_PERMS} syslog.conf.5 ${MANDIR}/man5/syslog.conf.5
+- ${INSTALL} -o ${MAN_USER} -g ${MAN_GROUP} -m ${MAN_PERMS} klogd.8 ${MANDIR}/man8/klogd.8
+ ${INSTALL} -m 644 sysklogd.8 ${MANDIR}/man8/sysklogd.8
+ ${INSTALL} -m 644 syslogd.8 ${MANDIR}/man8/syslogd.8
+ ${INSTALL} -m 644 syslog.conf.5 ${MANDIR}/man5/syslog.conf.5
================================================================
Index: SOURCES/sysklogd-security.patch
diff -u SOURCES/sysklogd-security.patch:1.3 SOURCES/sysklogd-security.patch:1.4
--- SOURCES/sysklogd-security.patch:1.3 Mon Aug 1 18:10:04 2005
+++ SOURCES/sysklogd-security.patch Thu Mar 30 01:32:51 2006
@@ -12,9 +12,9 @@
.\" Sun Nov 19 23:22:21 MET: Martin Schulze: Updates
.\" Mon Aug 19 09:42:08 CDT 1996: Dr. G.W. Wettstein: Updates
+.\" Thu Feb 17 2000: Chris Wing: Unprivileged klogd feature
+ .\" Fri Mar 11 17:11:46 CET 2005: Martin Schulze: sysctl updates
.\"
- .TH KLOGD 8 "21 August, 1999" "Version 1.4" "Linux System Administration"
- .SH NAME
+ .TH KLOGD 8 "11 March 2005" "Version 1.4" "Linux System Administration"
@@ -17,7 +18,11 @@
.RB [ " \-f "
.I fname
@@ -189,12 +189,12 @@
extern int errno;
-@@ -829,7 +834,7 @@
+@@ -869,7 +869,7 @@
funix[i] = -1;
}
-- while ((ch = getopt(argc, argv, "a:dhf:l:m:np:rs:v")) != EOF)
-+ while ((ch = getopt(argc, argv, "a:dhf:l:m:np:rs:u:v")) != EOF)
+- while ((ch = getopt(argc, argv, "a:dhf:i:l:m:np:rs:v")) != EOF)
++ while ((ch = getopt(argc, argv, "a:dhf:i:l:m:np:rs:u:v")) != EOF)
switch((char)ch) {
case 'a':
if (nfunix < MAXFUNIX)
@@ -243,12 +243,12 @@
/* Main loop begins here. */
for (;;) {
-@@ -1175,7 +1211,7 @@
+@@ -1255,7 +1255,7 @@
int usage()
{
fprintf(stderr, "usage: syslogd [-drvh] [-l hostlist] [-m markinterval] [-n] [-p path]\n" \
-- " [-s domainlist] [-f conffile]\n");
-+ " [-s domainlist] [-f conffile] [-u username]\n");
+- " [-s domainlist] [-f conffile] [-i IP address]\n");
++ " [-s domainlist] [-f conffile] [-u username] [-i IP address]\n");
exit(1);
}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/sysklogd-opt.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/sysklogd-install.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/SOURCES/sysklogd-security.patch?r1=1.3&r2=1.4&f=u
More information about the pld-cvs-commit
mailing list