From c10f5aa29945760f1938de53342c39ba0f75426e Mon Sep 17 00:00:00 2001 From: Sebastian Jaenicke Date: Sat, 30 Aug 2003 23:16:38 +0000 Subject: [PATCH] Sebastian Jaenicke: upated sysvinit git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1263 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- Documentation/Developers/CHANGELOG-RENE | 1 + package/base/sysvinit/dev_vc_0.patch | 52 ++++++++----------------- package/base/sysvinit/sysvinit.desc | 4 +- package/base/sysvinit/sysvinit.patch | 14 ------- 4 files changed, 19 insertions(+), 52 deletions(-) diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index d73194471..1a0bd26bf 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -4,6 +4,7 @@ - Mathieu: mathieu repository cleanups, added gtkam, improvement to fmnewpackage, fixed typos in CHANGELOG-RENE, support for Z packed files + - Sebastian Jaenicke: updated sysvinit *) 2003-08-30 (2.0.0-rc1 - 2.0.0-rc2) diff --git a/package/base/sysvinit/dev_vc_0.patch b/package/base/sysvinit/dev_vc_0.patch index 727091717..f128e0a71 100644 --- a/package/base/sysvinit/dev_vc_0.patch +++ b/package/base/sysvinit/dev_vc_0.patch @@ -1,39 +1,7 @@ -# --- 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/sysvinit/dev_vc_0.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it 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. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./src/paths.h.orig Sun May 5 16:02:25 2002 -+++ ./src/paths.h Sun May 5 16:02:43 2002 -@@ -17,7 +17,7 @@ - #define INITLVL2 "/var/log/initrunlvl" /* COMPAT: New runlevel */ - /* Note: INITLVL2 definition needs INITLVL */ - #define PWRSTAT "/etc/powerstatus" /* COMPAT: SIGPWR reason (OK/BAD) */ --#define VT_MASTER "/dev/tty0" /* Virtual console master */ -+#define VT_MASTER "/dev/vc/0" /* Virtual console master */ - #define CONSOLE "/dev/console" /* Logical system console */ - #define SECURETTY "/etc/securetty" /* List of root terminals */ - #define SDALLOW "/etc/shutdown.allow" /* Users allowed to shutdown */ ---- ./src/bootlogd.c.orig Sun May 5 16:02:39 2002 -+++ ./src/bootlogd.c Sun May 5 16:02:43 2002 -@@ -313,7 +313,7 @@ +diff -Nur sysvinit-2.85.orig/src/bootlogd.c sysvinit-2.85/src/bootlogd.c +--- sysvinit-2.85.orig/src/bootlogd.c 2001-12-09 15:01:28.000000000 +0100 ++++ sysvinit-2.85/src/bootlogd.c 2003-08-30 15:49:12.000000000 +0200 +@@ -318,7 +318,7 @@ (void)ioctl(0, TIOCCONS, NULL); #if 1 /* Work around bug in 2.1/2.2 kernels. Fixed in 2.2.13 and 2.3.18 */ @@ -42,3 +10,15 @@ (void)ioctl(n, TIOCCONS, NULL); close(n); } +diff -Nur sysvinit-2.85.orig/src/paths.h sysvinit-2.85/src/paths.h +--- sysvinit-2.85.orig/src/paths.h 2003-04-14 13:37:01.000000000 +0200 ++++ sysvinit-2.85/src/paths.h 2003-08-30 15:49:38.000000000 +0200 +@@ -13,7 +13,7 @@ + * as published by the Free Software Foundation; either version + * 2 of the License, or (at your option) any later version. + */ +-#define VT_MASTER "/dev/tty0" /* Virtual console master */ ++#define VT_MASTER "/dev/vc/0" /* Virtual console master */ + #define CONSOLE "/dev/console" /* Logical system console */ + #define SECURETTY "/etc/securetty" /* List of root terminals */ + #define SDALLOW "/etc/shutdown.allow" /* Users allowed to shutdown */ diff --git a/package/base/sysvinit/sysvinit.desc b/package/base/sysvinit/sysvinit.desc index 369ec50de..148f7ff8c 100644 --- a/package/base/sysvinit/sysvinit.desc +++ b/package/base/sysvinit/sysvinit.desc @@ -37,8 +37,8 @@ [L] GPL [S] Stable -[V] 2.84 +[V] 2.85 [P] X -1---5---9 710.000 -[D] 2535447370 sysvinit-2.84.tar.gz ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/ +[D] 0 sysvinit-2.85.tar.gz ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/ diff --git a/package/base/sysvinit/sysvinit.patch b/package/base/sysvinit/sysvinit.patch index 2c79bd7b4..1c3fae1a0 100644 --- a/package/base/sysvinit/sysvinit.patch +++ b/package/base/sysvinit/sysvinit.patch @@ -20,20 +20,6 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- ---- ./src/paths.h.orig Sun Oct 21 17:36:43 2001 -+++ ./src/paths.h Sun Oct 21 19:11:24 2001 -@@ -13,9 +13,11 @@ - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. - */ -+#if 0 - #define INITLVL "/etc/initrunlvl" /* COMPAT: New runlevel */ - #define INITLVL2 "/var/log/initrunlvl" /* COMPAT: New runlevel */ - /* Note: INITLVL2 definition needs INITLVL */ -+#endif - #define PWRSTAT "/etc/powerstatus" /* COMPAT: SIGPWR reason (OK/BAD) */ - #define VT_MASTER "/dev/vc/0" /* Virtual console master */ - #define CONSOLE "/dev/console" /* Logical system console */ --- ./src/Makefile.orig Mon May 6 11:10:51 2002 +++ ./src/Makefile Mon May 6 11:12:55 2002 @@ -14,12 +14,8 @@