r926 - in trunk: glibc hlfs lfs-bootscripts linux linux-libc-headers

archaic at linuxfromscratch.org archaic at linuxfromscratch.org
Sun Apr 24 16:38:25 PDT 2005


Author: archaic
Date: 2005-04-24 17:38:24 -0600 (Sun, 24 Apr 2005)
New Revision: 926

Added:
   trunk/hlfs/coreutils-5.2.1-uname-3.patch
Removed:
   trunk/glibc/glibc-2.3.5-arc4random-1.patch
   trunk/hlfs/blfs-bootscripts-20050313-hlfs-1.patch
   trunk/hlfs/glibc-2.3.5-arc4random-1.patch
   trunk/hlfs/glibc-2.3.5-ssp_arc4random-1.patch
   trunk/hlfs/lfs-bootscripts-3.1.0-hlfs-3.patch
   trunk/lfs-bootscripts/lfs-bootscripts-3.1.0-hlfs-3.patch
   trunk/linux-libc-headers/linux-libc-headers-2.6.11.2-pseudo_random-1.patch
   trunk/linux-libc-headers/linux-libc-headers-2.6.11.2-unistd_x86_PIC-1.patch
   trunk/linux/linux-2.6.11.7-pseudo_random-1.patch
Log:
Shuffling around of some hlfs patches.

Deleted: trunk/glibc/glibc-2.3.5-arc4random-1.patch
===================================================================
--- trunk/glibc/glibc-2.3.5-arc4random-1.patch	2005-04-24 20:05:32 UTC (rev 925)
+++ trunk/glibc/glibc-2.3.5-arc4random-1.patch	2005-04-24 23:38:24 UTC (rev 926)
@@ -1 +0,0 @@
-link ../hlfs/glibc-2.3.5-arc4random-1.patch
\ No newline at end of file

Deleted: trunk/hlfs/blfs-bootscripts-20050313-hlfs-1.patch
===================================================================
--- trunk/hlfs/blfs-bootscripts-20050313-hlfs-1.patch	2005-04-24 20:05:32 UTC (rev 925)
+++ trunk/hlfs/blfs-bootscripts-20050313-hlfs-1.patch	2005-04-24 23:38:24 UTC (rev 926)
@@ -1,145 +0,0 @@
-Submitted By: Robert Connolly <robert at linuxfromscratch dot org> (ashes)
-Date: 2005-01-21
-Initial Package Version: 20041227
-Upstream Status: Not submitted.
-Origin: Based on blfs-bootscripts templates.
-Description: This patch adds bootscripts for frandom, openntpd, and rdate.
-
-diff -Naur blfs-bootscripts-20041227.orig/Makefile blfs-bootscripts-20041227/Makefile
---- blfs-bootscripts-20041227.orig/Makefile	2005-01-21 04:56:12.053356143 +0000
-+++ blfs-bootscripts-20041227/Makefile	2005-01-21 05:03:56.656439984 +0000
-@@ -274,6 +274,16 @@
- 	ln -sf  ../init.d/openldap ${EXTDIR}/rc.d/rc5.d/S25openldap
- 	ln -sf  ../init.d/openldap ${EXTDIR}/rc.d/rc6.d/K46openldap
- 
-+install-openntpd: create-dirs
-+	install -m ${MODE} blfs/init.d/openntpd  ${EXTDIR}/rc.d/init.d/openntpd
-+	ln -sf  ../init.d/openntpd ${EXTDIR}/rc.d/rc0.d/K46openntpd
-+	ln -sf  ../init.d/openntpd ${EXTDIR}/rc.d/rc1.d/K46openntpd
-+	ln -sf  ../init.d/openntpd ${EXTDIR}/rc.d/rc2.d/K46openntpd
-+	ln -sf  ../init.d/openntpd ${EXTDIR}/rc.d/rc3.d/S26openntpd
-+	ln -sf  ../init.d/openntpd ${EXTDIR}/rc.d/rc4.d/S26openntpd
-+	ln -sf  ../init.d/openntpd ${EXTDIR}/rc.d/rc5.d/S26openntpd
-+	ln -sf  ../init.d/openntpd ${EXTDIR}/rc.d/rc6.d/K46openntpd
-+
- install-portmap: create-dirs
- 	install -m ${MODE} blfs/init.d/portmap    ${EXTDIR}/rc.d/init.d/
- 	ln -sf  ../init.d/portmap ${EXTDIR}/rc.d/rc0.d/K49portmap
-@@ -324,6 +334,12 @@
- 	ln -sf  ../init.d/random ${EXTDIR}/rc.d/rc5.d/S25random
- 	ln -sf  ../init.d/random ${EXTDIR}/rc.d/rc6.d/K45random
- 
-+install-rdate: create-dirs
-+	install -m ${MODE} blfs/init.d/rdate     ${EXTDIR}/rc.d/init.d/
-+	ln -sf  ../init.d/rdate ${EXTDIR}/rc.d/rc3.d/S25rdate
-+	ln -sf  ../init.d/rdate ${EXTDIR}/rc.d/rc4.d/S25rdate
-+	ln -sf  ../init.d/rdate ${EXTDIR}/rc.d/rc5.d/S25rdate
-+
- install-rsyncd: create-dirs
- 	install -m ${MODE} blfs/init.d/rsyncd     ${EXTDIR}/rc.d/init.d/
- 	ln -sf  ../init.d/rsyncd ${EXTDIR}/rc.d/rc0.d/K30rsyncd
-diff -Naur blfs-bootscripts-20041227.orig/blfs/init.d/openntpd blfs-bootscripts-20041227/blfs/init.d/openntpd
---- blfs-bootscripts-20041227.orig/blfs/init.d/openntpd	1970-01-01 00:00:00.000000000 +0000
-+++ blfs-bootscripts-20041227/blfs/init.d/openntpd	2005-01-21 04:57:14.052856075 +0000
-@@ -0,0 +1,37 @@
-+#!/bin/sh
-+# Begin $rc_base/init.d/openntp
-+
-+#$LastChangedBy: robert $
-+#$Date: 2005-01-18 $
-+
-+. /etc/sysconfig/rc
-+. $rc_functions
-+
-+case "$1" in
-+	start)
-+		echo "Starting OpenNTPD..."
-+		loadproc /usr/sbin/ntpd -s
-+		;;
-+
-+	stop)
-+		echo "Stopping OpenNTPD..."
-+		killproc /usr/sbin/ntpd
-+		;;
-+
-+	restart)
-+		$0 stop
-+		sleep 1
-+		$0 start
-+		;;
-+
-+	status)
-+		statusproc /usr/sbin/ntpd
-+		;;
-+
-+	*)
-+		echo "Usage: $0 {start|stop|restart|status}"
-+		exit 1
-+		;;
-+esac
-+
-+# End $rc_base/init.d/openntp
-diff -Naur blfs-bootscripts-20041227.orig/blfs/init.d/random blfs-bootscripts-20041227/blfs/init.d/random
---- blfs-bootscripts-20041227.orig/blfs/init.d/random	2005-01-21 04:56:12.040359811 +0000
-+++ blfs-bootscripts-20041227/blfs/init.d/random	2005-01-21 04:57:14.054855511 +0000
-@@ -5,8 +5,8 @@
- # Rewritten by Gerard Beekmans  - gerard at linuxfromscratch.org
- # Random script elements by Larry Lawrence
- 
--#$LastChangedBy: dj $
--#$Date: 2004-10-02 11:57:32 -0600 (Sat, 02 Oct 2004) $
-+#$LastChangedBy: robert $
-+#$Date: 2005-01-18 $
- 
- . /etc/sysconfig/rc
- . $rc_functions
-@@ -17,6 +17,11 @@
- 		if [ -f /var/tmp/random-seed ]; then
- 			/bin/cat /var/tmp/random-seed >/dev/urandom
- 		fi
-+		if [ -c /dev/frandom ]; then
-+			/bin/dd if=/dev/frandom of=/dev/null \
-+				count=1 &>/dev/null
-+		fi
-+		/bin/install -m0600 -o0 /dev/null /var/tmp/random-seed
- 		/bin/dd if=/dev/urandom of=/var/tmp/random-seed \
- 			count=1 &>/dev/null
- 		evaluate_retval
-@@ -24,6 +29,7 @@
-                 
- 	stop)
- 		echo "Saving random seed..."
-+		/bin/install -m0600 -o0 /dev/null /var/tmp/random-seed
- 		/bin/dd if=/dev/urandom of=/var/tmp/random-seed \
- 			count=1 &>/dev/null
- 		evaluate_retval
-diff -Naur blfs-bootscripts-20041227.orig/blfs/init.d/rdate blfs-bootscripts-20041227/blfs/init.d/rdate
---- blfs-bootscripts-20041227.orig/blfs/init.d/rdate	1970-01-01 00:00:00.000000000 +0000
-+++ blfs-bootscripts-20041227/blfs/init.d/rdate	2005-01-21 05:59:11.107812484 +0000
-@@ -0,0 +1,26 @@
-+#!/bin/sh
-+# Begin $rc_base/init.d/rdate
-+
-+#$LastChangedBy: robert $
-+#$Date: 2005-01-21 $
-+
-+. /etc/sysconfig/rc
-+. $rc_functions
-+
-+case "$1" in
-+	start)
-+		echo "Running rdate..."
-+		if [ -f /etc/rdate.conf ]; then
-+		. /etc/rdate.conf
-+		loadproc /usr/bin/rdate ${RDATEOPTIONS} ${RDATESERVERS}
-+		else
-+		echo "/etc/rdate.conf is missing. No servers are configured."
-+		fi
-+		;;
-+	*)
-+		echo "Usage: $0 start"
-+		exit 1
-+		;;
-+esac
-+
-+# End $rc_base/init.d/rdate

Added: trunk/hlfs/coreutils-5.2.1-uname-3.patch
===================================================================
--- trunk/hlfs/coreutils-5.2.1-uname-3.patch	2005-04-24 20:05:32 UTC (rev 925)
+++ trunk/hlfs/coreutils-5.2.1-uname-3.patch	2005-04-24 23:38:24 UTC (rev 926)
@@ -0,0 +1 @@
+link ../coreutils/coreutils-5.2.1-uname-3.patch
\ No newline at end of file


Property changes on: trunk/hlfs/coreutils-5.2.1-uname-3.patch
___________________________________________________________________
Name: svn:special
   + *

Deleted: trunk/hlfs/glibc-2.3.5-arc4random-1.patch
===================================================================
--- trunk/hlfs/glibc-2.3.5-arc4random-1.patch	2005-04-24 20:05:32 UTC (rev 925)
+++ trunk/hlfs/glibc-2.3.5-arc4random-1.patch	2005-04-24 23:38:24 UTC (rev 926)
@@ -1,556 +0,0 @@
-Submitted By: Robert Connolly <robert at linuxfromscratch dot org> (ashes)
-Date: 2005-02-15
-Initial Package Version: 2.3.4
-Upstream Status: Not submitted
-Origin: http://www.openbsd.org/cgi-bin/cvsweb/src/lib/libc/crypt/arc4random.c
-Description: This patch adds the arc4random() and arc4randomII() functions
-to Glibc, and hooks so mktemp(3) can use arc4randomII().
-
-Also see:
-http://www.linuxfromscratch.org/hlfs/
-http://www.linuxfromscratch.org/hints/downloads/files/entropy.txt
-
-diff -Naur glibc-2.3.4.orig/manual/arc4random.3 glibc-2.3.4/manual/arc4random.3
---- glibc-2.3.4.orig/manual/arc4random.3	1970-01-01 00:00:00.000000000 +0000
-+++ glibc-2.3.4/manual/arc4random.3	2005-02-16 04:24:13.053024632 +0000
-@@ -0,0 +1,74 @@
-+.TH ARC4RANDOM 3 "February 11, 2005"
-+.SH NAME
-+arc4random - arc4 random number generator
-+.SH SYNOPSIS 
-+.nf
-+.B #include <stdlib.h>
-+.sp
-+.I u_int32_t
-+.B arc4random(void);
-+.sp
-+.I u_int32_t
-+.B arc4randomII(void);
-+.fi
-+.SH DESCRIPTION 
-+The \fBarc4random()\fP function generates a pseudo-random number using the
-+ARC4 cipher key stream generator. ARCFOUR uses 8*8 8 bit S-Boxes, and can
-+be in about (2**1700) states.
-+
-+The \fBarc4random()\fP function is seeded automatically from /dev/urandom,
-+or from sysctl \fBurandom\fP if /dev/urandom is not accessible (chroot), or from
-+sysctl random.uuid if sysctl \fBurandom\fP is not accessible. \fBgettimeofday(2)\fP
-+is always included when initializing the state of \fBarc4random()\fP, this makes
-+it impossible to generate the same random sequence twice. \fBarc4random()\fP
-+is intended to be safe to use with encryption software to provide entropy.
-+
-+The \fBarc4randomII()\fP function is identical to \fBarc4random()\fP except
-+that \fBarc4randomII()\fP is seeded automatically from /dev/erandom, and
-+sysctl erandom. \fBarc4randomII()\fP is NOT intended for cryptography, but is
-+ideal for \fBmktemp(3)\fP, and other functions with a short lifespan.
-+\fBarc4randomII()\fP and erandom do not consume any kernel entropy.
-+
-+Sysctl urandom, and erandom require a modified kernel. See:
-+http://www.linuxfromscratch.org/hlfs/
-+
-+.SH EXAMPLES
-+.TP 
-+Return a random number between 0 and 100.
-+.sp
-+arc4random() % 100;
-+.TP
-+Return any random number.
-+.sp
-+arc4random();
-+.TP
-+.nf
-+Sample program; this will display a number between 0 and 65536.
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+
-+int main(void) {
-+    int random_number;
-+    random_number = arc4random() % 65536;
-+    printf("%d\n", random_number);
-+    return 0;
-+}
-+.fi
-+.SH "SEE ALSO"
-+.BR random (3),
-+.BR gettimeofday (2),
-+.BR mktemp (3)
-+
-+.SH HISTORY
-+An algorithm called RC4 was designed by RSA Data Security, Inc.  It was
-+considered a trade secret, but not trademarked.  Because it was a trade
-+secret, it obviously could not be patented.  A clone of this was posted
-+anonymously to USENET and confirmed to be equivalent by several sources
-+who had access to the original cipher.  Because of the trade secret situation,
-+RSA Data Security, Inc. can do nothing about the release of the
-+ARC4 algorithm.  Since RC4 used to be a trade secret, the cipher is now
-+referred to as ARC4 (Another RC4).
-+
-+These functions first appeared in OpenBSD 2.1.
-+
-diff -Naur glibc-2.3.4.orig/stdlib/Makefile glibc-2.3.4/stdlib/Makefile
---- glibc-2.3.4.orig/stdlib/Makefile	2004-02-23 23:28:27.000000000 +0000
-+++ glibc-2.3.4/stdlib/Makefile	2005-02-16 04:24:13.072021744 +0000
-@@ -27,7 +27,7 @@
- 
- routines	:=							      \
- 	atof atoi atol atoll						      \
--	abort								      \
-+	abort arc4random arc4randomII					      \
- 	bsearch qsort msort						      \
- 	getenv putenv setenv secure-getenv				      \
- 	exit on_exit atexit cxa_atexit cxa_finalize old_atexit		      \
-diff -Naur glibc-2.3.4.orig/stdlib/arc4random.c glibc-2.3.4/stdlib/arc4random.c
---- glibc-2.3.4.orig/stdlib/arc4random.c	1970-01-01 00:00:00.000000000 +0000
-+++ glibc-2.3.4/stdlib/arc4random.c	2005-02-16 04:24:13.075021288 +0000
-@@ -0,0 +1,205 @@
-+/*
-+ * Arc4 random number generator for OpenBSD.
-+ * Copyright 1996 David Mazieres <dm at lcs.mit.edu>.
-+ *
-+ * Modification and redistribution in source and binary forms is
-+ * permitted provided that due credit is given to the author and the
-+ * OpenBSD project by leaving this copyright notice intact.
-+ */
-+
-+/*
-+ * This code is derived from section 17.1 of Applied Cryptography,
-+ * second edition, which describes a stream cipher allegedly
-+ * compatible with RSA Labs "RC4" cipher (the actual description of
-+ * which is a trade secret).  The same algorithm is used as a stream
-+ * cipher called "arcfour" in Tatu Ylonen's ssh package.
-+ *
-+ * Here the stream cipher has been modified always to include the time
-+ * when initializing the state.  That makes it impossible to
-+ * regenerate the same random sequence twice, so this can't be used
-+ * for encryption, but will generate good random numbers.
-+ *
-+ * RC4 is a registered trademark of RSA Laboratories.
-+ */
-+
-+/*
-+ * Modified by Robert Connolly from OpenBSD lib/libc/crypt/arc4random.c v1.11.
-+ * This is arc4random(3) using urandom.
-+ */
-+
-+#include <fcntl.h>
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <sys/types.h>
-+#include <sys/param.h>
-+#include <sys/time.h>
-+#include <sys/sysctl.h>
-+
-+#ifdef __GNUC__
-+#define inline __inline
-+#else				/* !__GNUC__ */
-+#define inline
-+#endif				/* !__GNUC__ */
-+
-+struct arc4_stream {
-+	u_int8_t i;
-+	u_int8_t j;
-+	u_int8_t s[256];
-+};
-+
-+static int rs_initialized;
-+static struct arc4_stream rs;
-+static pid_t arc4_stir_pid;
-+
-+static inline u_int8_t arc4_getbyte(struct arc4_stream *);
-+
-+static inline void
-+arc4_init(struct arc4_stream *as)
-+{
-+	int     n;
-+
-+	for (n = 0; n < 256; n++)
-+		as->s[n] = n;
-+	as->i = 0;
-+	as->j = 0;
-+}
-+
-+static inline void
-+arc4_addrandom(struct arc4_stream *as, u_char *dat, int datlen)
-+{
-+	int     n;
-+	u_int8_t si;
-+
-+	as->i--;
-+	for (n = 0; n < 256; n++) {
-+		as->i = (as->i + 1);
-+		si = as->s[as->i];
-+		as->j = (as->j + si + dat[n % datlen]);
-+		as->s[as->i] = as->s[as->j];
-+		as->s[as->j] = si;
-+	}
-+	as->j = as->i;
-+}
-+
-+static void
-+arc4_stir(struct arc4_stream *as)
-+{
-+	int     n, fd;
-+	struct {
-+		struct timeval tv;
-+		u_int rnd[(128 - sizeof(struct timeval)) / sizeof(u_int)];
-+	}       rdat;
-+
-+	gettimeofday(&rdat.tv, NULL);
-+
-+	/* /dev/urandom is a multithread interface, sysctl is not. */
-+	/* Try to use /dev/urandom before sysctl. */
-+	fd = open("/dev/urandom", O_RDONLY);
-+	if (fd != -1) {
-+		read(fd, rdat.rnd, sizeof(rdat.rnd));
-+		close(fd);
-+	}
-+
-+#if defined(SYSCTL_URANDOM)
-+	else {
-+		/* /dev/urandom failed? Maybe we're in a chroot. */
-+		int mib[]={CTL_KERN, KERN_RANDOM, RANDOM_URANDOM};
-+		u_int i;
-+		size_t len;
-+
-+		for (i = 0; i < sizeof(rdat.rnd) / sizeof(u_int); i ++) {
-+			len = sizeof(u_int);
-+			if (sysctl(mib, 3, &rdat.rnd[i], &len, NULL, 0) == -1)
-+				break;
-+		}
-+	  if (i < sizeof(rdat.rnd) / 4) {
-+	  /* Sysctl urandom failed? Maybe we're running a vanilla kernel. */
-+		mib[2] = RANDOM_UUID;
-+		for (i = 0; i < sizeof(rdat.rnd) / sizeof(u_int); i ++) {
-+			len = sizeof(u_int);
-+			if (sysctl(mib, 3, &rdat.rnd[i], &len, NULL, 0) == -1)
-+				break;
-+		}
-+	  }
-+	}
-+#endif
-+
-+	arc4_stir_pid = getpid();
-+	/*
-+	 * Time to give up. If no entropy could be found then we will just
-+	 * use gettimeofday.
-+	 */
-+	arc4_addrandom(as, (void *)&rdat, sizeof(rdat));
-+
-+	/*
-+	 * Discard early keystream, as per recommendations in:
-+	 * http://www.wisdom.weizmann.ac.il/~itsik/RC4/Papers/Rc4_ksa.ps
-+	 * We discard 256 words. A long word is 4 bytes.
-+	 */
-+	for (n = 0; n < 256 * 4; n ++)
-+		arc4_getbyte(as);
-+}
-+
-+static inline u_int8_t
-+arc4_getbyte(struct arc4_stream *as)
-+{
-+	u_int8_t si, sj;
-+
-+	as->i = (as->i + 1);
-+	si = as->s[as->i];
-+	as->j = (as->j + si);
-+	sj = as->s[as->j];
-+	as->s[as->i] = sj;
-+	as->s[as->j] = si;
-+	return (as->s[(si + sj) & 0xff]);
-+}
-+
-+static inline u_int32_t
-+arc4_getword(struct arc4_stream *as)
-+{
-+	u_int32_t val;
-+	val = arc4_getbyte(as) << 24;
-+	val |= arc4_getbyte(as) << 16;
-+	val |= arc4_getbyte(as) << 8;
-+	val |= arc4_getbyte(as);
-+	return val;
-+}
-+
-+void
-+arc4random_stir(void)
-+{
-+	if (!rs_initialized) {
-+		arc4_init(&rs);
-+		rs_initialized = 1;
-+	}
-+	arc4_stir(&rs);
-+}
-+
-+void
-+arc4random_addrandom(u_char *dat, int datlen)
-+{
-+	if (!rs_initialized)
-+		arc4random_stir();
-+	arc4_addrandom(&rs, dat, datlen);
-+}
-+
-+u_int32_t
-+arc4random(void)
-+{
-+	if (!rs_initialized || arc4_stir_pid != getpid())
-+		arc4random_stir();
-+	return arc4_getword(&rs);
-+}
-+
-+#if 0
-+/*-------- Test code --------*/
-+#include <stdlib.h>
-+#include <stdio.h>
-+
-+int main(void) {
-+	int random_number;
-+	random_number = arc4random() % 65536;
-+	printf("A random number between 0 and 65536 is %d\n", random_number);
-+	return 0;
-+}
-+#endif
-diff -Naur glibc-2.3.4.orig/stdlib/arc4randomII.c glibc-2.3.4/stdlib/arc4randomII.c
---- glibc-2.3.4.orig/stdlib/arc4randomII.c	1970-01-01 00:00:00.000000000 +0000
-+++ glibc-2.3.4/stdlib/arc4randomII.c	2005-02-16 04:24:13.077020984 +0000
-@@ -0,0 +1,196 @@
-+/*
-+ * Arc4 random number generator for OpenBSD.
-+ * Copyright 1996 David Mazieres <dm at lcs.mit.edu>.
-+ *
-+ * Modification and redistribution in source and binary forms is
-+ * permitted provided that due credit is given to the author and the
-+ * OpenBSD project by leaving this copyright notice intact.
-+ */
-+
-+/*
-+ * This code is derived from section 17.1 of Applied Cryptography,
-+ * second edition, which describes a stream cipher allegedly
-+ * compatible with RSA Labs "RC4" cipher (the actual description of
-+ * which is a trade secret).  The same algorithm is used as a stream
-+ * cipher called "arcfour" in Tatu Ylonen's ssh package.
-+ *
-+ * Here the stream cipher has been modified always to include the time
-+ * when initializing the state.  That makes it impossible to
-+ * regenerate the same random sequence twice, so this can't be used
-+ * for encryption, but will generate good random numbers.
-+ *
-+ * RC4 is a registered trademark of RSA Laboratories.
-+ */
-+
-+/*
-+ * Modified by Robert Connolly from OpenBSD lib/libc/crypt/arc4random.c v1.11.
-+ * This is arc4randomII(3) using erandom.
-+ */
-+
-+#include <fcntl.h>
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <sys/types.h>
-+#include <sys/param.h>
-+#include <sys/time.h>
-+#include <sys/sysctl.h>
-+
-+#ifdef __GNUC__
-+#define inline __inline
-+#else				/* !__GNUC__ */
-+#define inline
-+#endif				/* !__GNUC__ */
-+
-+struct arc4_streamII {
-+	u_int8_t i;
-+	u_int8_t j;
-+	u_int8_t s[256];
-+};
-+
-+static int rs_initializedII;
-+static struct arc4_streamII rs;
-+static pid_t arc4_stir_pidII;
-+
-+static inline u_int8_t arc4_getbyteII(struct arc4_streamII *);
-+
-+static inline void
-+arc4_initII(struct arc4_streamII *as)
-+{
-+	int     n;
-+
-+	for (n = 0; n < 256; n++)
-+		as->s[n] = n;
-+	as->i = 0;
-+	as->j = 0;
-+}
-+
-+static inline void
-+arc4_addrandomII(struct arc4_streamII *as, u_char *dat, int datlen)
-+{
-+	int     n;
-+	u_int8_t si;
-+
-+	as->i--;
-+	for (n = 0; n < 256; n++) {
-+		as->i = (as->i + 1);
-+		si = as->s[as->i];
-+		as->j = (as->j + si + dat[n % datlen]);
-+		as->s[as->i] = as->s[as->j];
-+		as->s[as->j] = si;
-+	}
-+	as->j = as->i;
-+}
-+
-+static void
-+arc4_stirII(struct arc4_streamII *as)
-+{
-+	int     n, fd;
-+	struct {
-+		struct timeval tv;
-+		u_int rnd[(128 - sizeof(struct timeval)) / sizeof(u_int)];
-+	}       rdat;
-+
-+	gettimeofday(&rdat.tv, NULL);
-+
-+	/* /dev/urandom is a multithread interface, sysctl is not. */
-+	/* Try to use /dev/urandom before sysctl. */
-+	fd = open("/dev/erandom", O_RDONLY);
-+	if (fd != -1) {
-+		read(fd, rdat.rnd, sizeof(rdat.rnd));
-+		close(fd);
-+	}
-+
-+#if defined(SYSCTL_ERANDOM)
-+	else {
-+		/* /dev/urandom failed? Maybe we're in a chroot. */
-+		int mib[]={CTL_KERN, KERN_RANDOM, RANDOM_ERANDOM};
-+		u_int i;
-+		size_t len;
-+
-+		for (i = 0; i < sizeof(rdat.rnd) / sizeof(u_int); i++) {
-+			len = sizeof(u_int);
-+			if (sysctl(mib, 3, &rdat.rnd[i], &len, NULL, 0) == -1)
-+				break;
-+		}
-+	}
-+#endif
-+
-+	arc4_stir_pidII = getpid();
-+	/*
-+	 * Time to give up. If no entropy could be found then we will just
-+	 * use gettimeofday.
-+	 */
-+	arc4_addrandomII(as, (void *)&rdat, sizeof(rdat));
-+
-+	/*
-+	 * Discard early keystream, as per recommendations in:
-+	 * http://www.wisdom.weizmann.ac.il/~itsik/RC4/Papers/Rc4_ksa.ps
-+	 * We discard 256 words. A long word is 4 bytes.
-+	 */
-+	for (n = 0; n < 256 * 4; n ++)
-+		arc4_getbyteII(as);
-+}
-+
-+static inline u_int8_t
-+arc4_getbyteII(struct arc4_streamII *as)
-+{
-+	u_int8_t si, sj;
-+
-+	as->i = (as->i + 1);
-+	si = as->s[as->i];
-+	as->j = (as->j + si);
-+	sj = as->s[as->j];
-+	as->s[as->i] = sj;
-+	as->s[as->j] = si;
-+	return (as->s[(si + sj) & 0xff]);
-+}
-+
-+static inline u_int32_t
-+arc4_getwordII(struct arc4_streamII *as)
-+{
-+	u_int32_t val;
-+	val = arc4_getbyteII(as) << 24;
-+	val |= arc4_getbyteII(as) << 16;
-+	val |= arc4_getbyteII(as) << 8;
-+	val |= arc4_getbyteII(as);
-+	return val;
-+}
-+
-+void
-+arc4random_stirII(void)
-+{
-+	if (!rs_initializedII) {
-+		arc4_initII(&rs);
-+		rs_initializedII = 1;
-+	}
-+	arc4_stirII(&rs);
-+}
-+
-+void
-+arc4random_addrandomII(u_char *dat, int datlen)
-+{
-+	if (!rs_initializedII)
-+		arc4random_stirII();
-+	arc4_addrandomII(&rs, dat, datlen);
-+}
-+
-+u_int32_t
-+arc4randomII(void)
-+{
-+	if (!rs_initializedII || arc4_stir_pidII != getpid())
-+		arc4random_stirII();
-+	return arc4_getwordII(&rs);
-+}
-+
-+#if 0
-+/*-------- Test code --------*/
-+#include <stdlib.h>
-+#include <stdio.h>
-+
-+int main(void) {
-+	int random_number;
-+	random_number = arc4randomII() % 65536;
-+	printf("A random number between 0 and 65536 is %d\n", random_number);
-+	return 0;
-+}
-+#endif
-diff -Naur glibc-2.3.4.orig/stdlib/stdlib.h glibc-2.3.4/stdlib/stdlib.h
---- glibc-2.3.4.orig/stdlib/stdlib.h	2004-12-01 19:54:34.000000000 +0000
-+++ glibc-2.3.4/stdlib/stdlib.h	2005-02-16 04:28:19.434568944 +0000
-@@ -572,6 +572,14 @@
- extern int lcong48_r (unsigned short int __param[7],
- 		      struct drand48_data *__buffer)
-      __THROW __nonnull ((1, 2));
-+
-+u_int32_t arc4random(void);
-+void arc4random_stir(void);
-+void arc4random_addrandom(unsigned char *, int);
-+u_int32_t arc4randomII(void);
-+void arc4random_stirII(void);
-+void arc4random_addrandomII(unsigned char *, int);
-+
- # endif	/* Use misc.  */
- #endif	/* Use SVID or X/Open.  */
- 
-diff -Naur glibc-2.3.4.orig/sysdeps/posix/tempname.c glibc-2.3.4/sysdeps/posix/tempname.c
---- glibc-2.3.4.orig/sysdeps/posix/tempname.c	2001-11-27 03:35:06.000000000 +0000
-+++ glibc-2.3.4/sysdeps/posix/tempname.c	2005-02-16 04:24:13.083020072 +0000
-@@ -258,6 +258,10 @@
-   /* This is where the Xs start.  */
-   XXXXXX = &tmpl[len - 6];
- 
-+/* Get real random data. */
-+#if defined(HAVE_ARC4RANDOM)
-+  random_time_bits = arc4randomII();
-+#else
-   /* Get some more or less random data.  */
- #ifdef RANDOM_BITS
-   RANDOM_BITS (random_time_bits);
-@@ -272,7 +276,12 @@
-   random_time_bits = time (NULL);
- # endif
- #endif
-+#endif
-+#if defined(HAVE_ARC4RANDOM)
-+  value += random_time_bits ^ arc4randomII();
-+#else
-   value += random_time_bits ^ __getpid ();
-+#endif
- 
-   for (count = 0; count < attempts; value += 7777, ++count)
-     {

Deleted: trunk/hlfs/glibc-2.3.5-ssp_arc4random-1.patch
===================================================================
--- trunk/hlfs/glibc-2.3.5-ssp_arc4random-1.patch	2005-04-24 20:05:32 UTC (rev 925)
+++ trunk/hlfs/glibc-2.3.5-ssp_arc4random-1.patch	2005-04-24 23:38:24 UTC (rev 926)
@@ -1,192 +0,0 @@
-Submitted By: Robert Connolly <robert at linuxfromscratch dot org> (ashes)
-Date: 2005-02-12
-Initial Package Version: 2.3.4
-Upstream Status: Not submitted
-Origin: http://www.research.ibm.com/trl/projects/security/ssp/
-http://www.openbsd.org/cgi-bin/cvsweb/src/lib/libc/sys/stack_protector.c
-http://uclibc.org/cgi-bin/viewcvs.cgi/trunk/uClibc/libc/sysdeps/linux/common/ssp.c
-Description: Stack Smashing Protector - This patch adds SSP functions to Glibc.
-
-This patch depends on the Glibc arc4random patch.
-
-Also see:
-http://www.linuxfromscratch.org/hlfs/
-http://www.linuxfromscratch.org/hints/downloads/files/ssp.txt
-
-diff -Naur glibc-2.3.4.orig/sysdeps/generic/libc-start.c glibc-2.3.4/sysdeps/generic/libc-start.c
---- glibc-2.3.4.orig/sysdeps/generic/libc-start.c	2004-03-31 01:46:43.000000000 +0000
-+++ glibc-2.3.4/sysdeps/generic/libc-start.c	2005-02-12 17:26:49.470416840 +0000
-@@ -188,6 +188,9 @@
-     GLRO(dl_debug_printf) ("\ntransferring control: %s\n\n", argv[0]);
- #endif
- 
-+  void __guard_setup(void) __attribute__ ((constructor));
-+  __guard_setup ();
-+
- #ifdef HAVE_CLEANUP_JMP_BUF
-   /* Memory for the cancellation buffer.  */
-   struct pthread_unwind_buf unwind_buf;
-diff -Naur glibc-2.3.4.orig/sysdeps/unix/sysv/linux/Dist glibc-2.3.4/sysdeps/unix/sysv/linux/Dist
---- glibc-2.3.4.orig/sysdeps/unix/sysv/linux/Dist	2004-06-30 07:58:38.000000000 +0000
-+++ glibc-2.3.4/sysdeps/unix/sysv/linux/Dist	2005-02-12 17:26:49.473416384 +0000
-@@ -1,3 +1,4 @@
-+stack_protector.c
- bits/initspin.h
- cmsg_nxthdr.c
- dl-brk.c
-diff -Naur glibc-2.3.4.orig/sysdeps/unix/sysv/linux/Makefile glibc-2.3.4/sysdeps/unix/sysv/linux/Makefile
---- glibc-2.3.4.orig/sysdeps/unix/sysv/linux/Makefile	2004-10-04 23:29:06.000000000 +0000
-+++ glibc-2.3.4/sysdeps/unix/sysv/linux/Makefile	2005-02-12 17:26:49.476415928 +0000
-@@ -1,5 +1,5 @@
- ifeq ($(subdir),csu)
--sysdep_routines += errno-loc
-+sysdep_routines += errno-loc stack_protector
- endif
- 
- ifeq ($(subdir),assert)
-diff -Naur glibc-2.3.4.orig/sysdeps/unix/sysv/linux/Versions glibc-2.3.4/sysdeps/unix/sysv/linux/Versions
---- glibc-2.3.4.orig/sysdeps/unix/sysv/linux/Versions	2004-10-22 19:57:45.000000000 +0000
-+++ glibc-2.3.4/sysdeps/unix/sysv/linux/Versions	2005-02-12 17:26:49.479415472 +0000
-@@ -108,6 +108,7 @@
-   GLIBC_2.3.2 {
-     # New kernel interfaces.
-     epoll_create; epoll_ctl; epoll_wait;
-+    __guard; __guard_setup; __stack_smash_handler;
-   }
-   GLIBC_2.3.3 {
-     gnu_dev_major; gnu_dev_minor; gnu_dev_makedev;
-diff -Naur glibc-2.3.4.orig/sysdeps/unix/sysv/linux/stack_protector.c glibc-2.3.4/sysdeps/unix/sysv/linux/stack_protector.c
---- glibc-2.3.4.orig/sysdeps/unix/sysv/linux/stack_protector.c	1970-01-01 00:00:00.000000000 +0000
-+++ glibc-2.3.4/sysdeps/unix/sysv/linux/stack_protector.c	2005-02-12 18:00:25.757512648 +0000
-@@ -0,0 +1,131 @@
-+/*	$hlfs: stack_protector.c,v 1.6 2005/02/11 robert Exp $	*/
-+
-+/*
-+ * Copyright (c) 2002 Hiroaki Etoh, Federico G. Schwindt, and Miodrag Vallat.
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-+ * DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT,
-+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+ * POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ */
-+
-+/* One of these things is not like the other... */
-+
-+/*
-+ * Distributed under the terms of the GNU General Public License v2
-+ * $Header: $
-+ *
-+ * This is a modified version of Hiroaki Etoh's stack smashing routines
-+ * implemented for glibc.
-+ *
-+ * The following people have contributed input to this code.
-+ * Ned Ludd - <solar[@]gentoo.org>
-+ * Alexander Gabert - <pappy[@]gentoo.org>
-+ * The PaX Team - <pageexec[@]freemail.hu>
-+ * Peter S. Mazinger - <ps.m[@]gmx.net>
-+ * Yoann Vandoorselaere - <yoann[@]prelude-ids.org>
-+ * Robert Connolly - <robert[@]linuxfromscratch.org>
-+ * Cory Visi <cory at visi.name>
-+ *
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#include <stdlib.h> /* For arc4random() */
-+#include <fcntl.h>
-+#include <unistd.h>
-+#include <signal.h>
-+#include <syslog.h>
-+
-+#include <sys/types.h>
-+#include <sys/un.h>
-+#include <sys/time.h>
-+
-+#ifdef __PROPOLICE_BLOCK_SEGV__
-+#define SSP_SIGTYPE SIGSEGV
-+#elif __PROPOLICE_BLOCK_KILL__
-+#define SSP_SIGTYPE SIGKILL
-+#else
-+#define SSP_SIGTYPE SIGABRT
-+#endif
-+
-+unsigned long __guard = 0UL;
-+
-+void __guard_setup(void) __attribute__ ((constructor));
-+void __guard_setup(void)
-+{
-+	int	i=0, fd=0;
-+	size_t	size;
-+	struct	timeval tv;
-+
-+	if (__guard != 0UL)
-+		return;
-+
-+	__guard = 0xFF0A0D00UL;
-+	/* Always start with the time. */
-+	gettimeofday(&tv, NULL);
-+	__guard ^= tv.tv_usec ^ tv.tv_sec;
-+
-+#if defined(HAVE_ARC4RANDOM) /* From <stdlib.h> */
-+	for (i = 0; i < sizeof(__guard) / 4; i ++) {
-+		size = sizeof(unsigned long);
-+		if ((__guard = (int)(arc4randomII())) == (-1))
-+			break;
-+	}
-+#else
-+	if (i < sizeof(__guard) / 4) {
-+	fd = open("/dev/urandom", O_RDONLY);
-+		if (fd != (-1)) {
-+			size = read(fd, (char *) &__guard, sizeof(__guard));
-+			close(fd);
-+			if (size == sizeof(__guard))
-+				return;
-+		}
-+	}
-+#endif
-+}
-+
-+void __stack_smash_handler(char func[], int damaged __attribute__ ((unused)));
-+void __stack_smash_handler(char func[], int damaged)
-+{
-+	extern char *__progname;
-+	const char message[] = ": stack smashing attack in function ";
-+	struct sigaction sa;
-+	sigset_t mask;
-+
-+	sigfillset(&mask);
-+
-+	sigdelset(&mask, SSP_SIGTYPE);	/* Block all signal handlers */
-+	sigprocmask(SIG_BLOCK, &mask, NULL);	/* except SIGABRT */
-+
-+	/* print error message to stderr and syslog */
-+	fprintf(stderr, "%s%s%s()\n", __progname, message, func);
-+	syslog(LOG_INFO, "%s%s%s()", __progname, message, func);
-+
-+	/* Make the default handler is associated with the signal handler */
-+	memset(&sa, 0, sizeof(struct sigaction));
-+	sigfillset(&sa.sa_mask);	/* Block all signals */
-+	sa.sa_flags = 0;
-+	sa.sa_handler = SIG_DFL;
-+	sigaction(SSP_SIGTYPE, &sa, NULL);
-+	(void) kill(getpid(), SSP_SIGTYPE);
-+	_exit(127);
-+}

Deleted: trunk/hlfs/lfs-bootscripts-3.1.0-hlfs-3.patch
===================================================================
--- trunk/hlfs/lfs-bootscripts-3.1.0-hlfs-3.patch	2005-04-24 20:05:32 UTC (rev 925)
+++ trunk/hlfs/lfs-bootscripts-3.1.0-hlfs-3.patch	2005-04-24 23:38:24 UTC (rev 926)
@@ -1,152 +0,0 @@
-Submitted By: Robert Connolly <robert at linuxfromscratch dot org> (ashes)
-Date: 2005-03-19
-Initial Package Version: 3.1.0
-Upstream Status: Not submitted.
-Origin: lfs-bootscripts-2.0.5
-Description: This patch replaces syslog-ng with sysklogd.
-
-diff -Naur lfs-bootscripts-3.1.0.orig/Makefile lfs-bootscripts-3.1.0/Makefile
---- lfs-bootscripts-3.1.0.orig/Makefile	2005-01-23 10:46:53.469742394 +0000
-+++ lfs-bootscripts-3.1.0/Makefile	2005-01-23 10:47:48.521305631 +0000
-@@ -38,12 +38,12 @@
- 	install -m ${MODE} lfs/init.d/reboot        ${EXTDIR}/rc.d/init.d/
- 	install -m ${MODE} lfs/init.d/sendsignals   ${EXTDIR}/rc.d/init.d/
- 	install -m ${MODE} lfs/init.d/setclock      ${EXTDIR}/rc.d/init.d/
--	install -m ${MODE} lfs/init.d/syslog-ng	    ${EXTDIR}/rc.d/init.d
-+	install -m ${MODE} lfs/init.d/sysklogd	    ${EXTDIR}/rc.d/init.d
- 	install -m ${MODE} lfs/init.d/swap          ${EXTDIR}/rc.d/init.d/
- 	install -m ${MODE} lfs/init.d/template      ${EXTDIR}/rc.d/init.d/
- 	install -m ${MODE} lfs/init.d/udev          ${EXTDIR}/rc.d/init.d
- 	ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc0.d/K80network
--	ln -sf ../init.d/syslog-ng   ${EXTDIR}/rc.d/rc0.d/K90syslog-ng
-+	ln -sf ../init.d/sysklogd   ${EXTDIR}/rc.d/rc0.d/K90sysklogd
- 	ln -sf ../init.d/hotplug     ${EXTDIR}/rc.d/rc0.d/S50hotplug
- 	ln -sf ../init.d/sendsignals ${EXTDIR}/rc.d/rc0.d/S60sendsignals
- 	ln -sf ../init.d/mountfs     ${EXTDIR}/rc.d/rc0.d/S70mountfs
-@@ -51,17 +51,17 @@
- 	ln -sf ../init.d/localnet    ${EXTDIR}/rc.d/rc0.d/S90localnet
- 	ln -sf ../init.d/halt        ${EXTDIR}/rc.d/rc0.d/S99halt
- 	ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc1.d/K80network
--	ln -sf ../init.d/syslog-ng   ${EXTDIR}/rc.d/rc1.d/K90syslog-ng
-+	ln -sf ../init.d/sysklogd   ${EXTDIR}/rc.d/rc1.d/K90sysklogd
- 	ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc2.d/K80network
--	ln -sf ../init.d/syslog-ng   ${EXTDIR}/rc.d/rc2.d/K90syslog-ng
--	ln -sf ../init.d/syslog-ng   ${EXTDIR}/rc.d/rc3.d/S10syslog-ng
-+	ln -sf ../init.d/sysklogd   ${EXTDIR}/rc.d/rc2.d/K90sysklogd
-+	ln -sf ../init.d/sysklogd   ${EXTDIR}/rc.d/rc3.d/S10sysklogd
- 	ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc3.d/S20network
--	ln -sf ../init.d/syslog-ng   ${EXTDIR}/rc.d/rc4.d/S10syslog-ng
-+	ln -sf ../init.d/sysklogd   ${EXTDIR}/rc.d/rc4.d/S10sysklogd
- 	ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc4.d/S20network
--	ln -sf ../init.d/syslog-ng   ${EXTDIR}/rc.d/rc5.d/S10syslog-ng
-+	ln -sf ../init.d/sysklogd   ${EXTDIR}/rc.d/rc5.d/S10sysklogd
- 	ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc5.d/S20network
- 	ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc6.d/K80network
--	ln -sf ../init.d/syslog-ng   ${EXTDIR}/rc.d/rc6.d/K90syslog-ng
-+	ln -sf ../init.d/sysklogd   ${EXTDIR}/rc.d/rc6.d/K90sysklogd
- 	ln -sf ../init.d/hotplug     ${EXTDIR}/rc.d/rc6.d/S50hotplug
- 	ln -sf ../init.d/sendsignals ${EXTDIR}/rc.d/rc6.d/S60sendsignals
- 	ln -sf ../init.d/mountfs     ${EXTDIR}/rc.d/rc6.d/S70mountfs
-diff -Naur lfs-bootscripts-3.1.0.orig/lfs/init.d/sysklogd lfs-bootscripts-3.1.0/lfs/init.d/sysklogd
---- lfs-bootscripts-3.1.0.orig/lfs/init.d/sysklogd	1970-01-01 00:00:00.000000000 +0000
-+++ lfs-bootscripts-3.1.0/lfs/init.d/sysklogd	2005-01-23 11:25:58.335469735 +0000
-@@ -0,0 +1,45 @@
-+#!/bin/sh
-+# Begin $rc_base/init.d/sysklogd - Syslogd and Klogd loaders
-+
-+# Based on sysklogd script from LFS-3.1 and earlier.
-+# Rewritten by Gerard Beekmans  - gerard at linuxfromscratch.org
-+# Modified by Robert Connolly for HLFS.
-+
-+. /etc/sysconfig/rc
-+. $rc_functions
-+
-+case "$1" in
-+	start)
-+		echo "Starting system log daemon..."
-+		loadproc syslogd -m 0
-+
-+		echo "Starting kernel log daemon..."
-+		loadproc klogd
-+		;;
-+
-+	stop)
-+		echo "Stopping kernel log daemon..."
-+		killproc klogd
-+
-+		echo "Stopping system log daemon..."
-+		killproc syslogd
-+		;;
-+
-+	restart)
-+		$0 stop
-+		sleep 1
-+		$0 start
-+		;;
-+
-+	status)
-+		statusproc syslogd
-+		statusproc klogd
-+		;;
-+
-+	*)
-+		echo "Usage: $0 {start|stop|restart|status}"
-+		exit 1
-+		;;
-+esac
-+
-+# End $rc_base/init.d/sysklogd
-diff -Naur lfs-bootscripts-3.1.0.orig/lfs/init.d/syslog-ng lfs-bootscripts-3.1.0/lfs/init.d/syslog-ng
---- lfs-bootscripts-3.1.0.orig/lfs/init.d/syslog-ng	2005-01-23 10:46:53.465743516 +0000
-+++ lfs-bootscripts-3.1.0/lfs/init.d/syslog-ng	1970-01-01 00:00:00.000000000 +0000
-@@ -1,50 +0,0 @@
--#!/bin/sh
--########################################################################
--# Begin $rc_base/init.d/syslog-ng
--#
--# Description : Syslog-ng loader
--#
--# Authors     : Gerard Beekmans - gerard at linuxfromscratch.org
--#
--# Version     : 00.00
--#
--# Notes       :
--#
--########################################################################
--
--. /etc/sysconfig/rc
--. ${rc_functions}
--
--case "${1}" in
--	start)
--		boot_mesg "Starting system log daemon..."
--		loadproc syslog-ng
--		;;
--
--	stop)
--		boot_mesg "Stopping system log daemon..."
--		killproc syslog-ng
--		;;
--
--	reload)
--		boot_mesg "Reloading system log daemon config file..."
--		reloadproc syslog-ng 1
--		;;
--
--	restart)
--		${0} stop
--		sleep 1
--		${0} start
--		;;
--
--	status)
--		statusproc syslog-ng
--		;;
--
--	*)
--		echo "Usage: ${0} {start|stop|reload|restart|status}"
--		exit 1
--		;;
--esac
--
--# End $rc_base/init.d/syslog-ng

Deleted: trunk/lfs-bootscripts/lfs-bootscripts-3.1.0-hlfs-3.patch
===================================================================
--- trunk/lfs-bootscripts/lfs-bootscripts-3.1.0-hlfs-3.patch	2005-04-24 20:05:32 UTC (rev 925)
+++ trunk/lfs-bootscripts/lfs-bootscripts-3.1.0-hlfs-3.patch	2005-04-24 23:38:24 UTC (rev 926)
@@ -1 +0,0 @@
-link ../hlfs/lfs-bootscripts-3.1.0-hlfs-3.patch
\ No newline at end of file

Deleted: trunk/linux/linux-2.6.11.7-pseudo_random-1.patch
===================================================================
--- trunk/linux/linux-2.6.11.7-pseudo_random-1.patch	2005-04-24 20:05:32 UTC (rev 925)
+++ trunk/linux/linux-2.6.11.7-pseudo_random-1.patch	2005-04-24 23:38:24 UTC (rev 926)
@@ -1 +0,0 @@
-link ../hlfs/linux-2.6.11.7-pseudo_random-1.patch
\ No newline at end of file

Deleted: trunk/linux-libc-headers/linux-libc-headers-2.6.11.2-pseudo_random-1.patch
===================================================================
--- trunk/linux-libc-headers/linux-libc-headers-2.6.11.2-pseudo_random-1.patch	2005-04-24 20:05:32 UTC (rev 925)
+++ trunk/linux-libc-headers/linux-libc-headers-2.6.11.2-pseudo_random-1.patch	2005-04-24 23:38:24 UTC (rev 926)
@@ -1 +0,0 @@
-link ../hlfs/linux-libc-headers-2.6.11.2-pseudo_random-1.patch
\ No newline at end of file

Deleted: trunk/linux-libc-headers/linux-libc-headers-2.6.11.2-unistd_x86_PIC-1.patch
===================================================================
--- trunk/linux-libc-headers/linux-libc-headers-2.6.11.2-unistd_x86_PIC-1.patch	2005-04-24 20:05:32 UTC (rev 925)
+++ trunk/linux-libc-headers/linux-libc-headers-2.6.11.2-unistd_x86_PIC-1.patch	2005-04-24 23:38:24 UTC (rev 926)
@@ -1 +0,0 @@
-link ../hlfs/linux-libc-headers-2.6.11.2-unistd_x86_PIC-1.patch
\ No newline at end of file




More information about the patches mailing list