From 0d5464140e41f7007628bedc3b345c037949d74e Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sat, 23 Nov 2013 14:05:25 +0000 Subject: [PATCH] - updated to 0.4.9 --- rc-scripts-tld.patch | 116 ++++++++++++++++++++++++------------------- 1 file changed, 64 insertions(+), 52 deletions(-) diff --git a/rc-scripts-tld.patch b/rc-scripts-tld.patch index 5b9feb6..bcfe0a0 100644 --- a/rc-scripts-tld.patch +++ b/rc-scripts-tld.patch @@ -1,7 +1,7 @@ -diff -ur rc-scripts-0.4.6.orig/doc/net-scripts.txt rc-scripts-0.4.6/doc/net-scripts.txt ---- rc-scripts-0.4.6.orig/doc/net-scripts.txt 2011-08-14 19:40:39.000000000 +0000 -+++ rc-scripts-0.4.6/doc/net-scripts.txt 2013-07-05 16:00:07.672571908 +0000 -@@ -147,11 +147,11 @@ +diff -ur rc-scripts-0.4.9.pld/doc/net-scripts.txt rc-scripts-0.4.9.tld/doc/net-scripts.txt +--- rc-scripts-0.4.9.pld/doc/net-scripts.txt 2013-11-11 10:54:45.000000000 +0000 ++++ rc-scripts-0.4.9.tld/doc/net-scripts.txt 2013-11-23 13:52:14.613645836 +0000 +@@ -145,11 +145,11 @@ INITSCRIPT= string which initialises your modem. Usualy something like AT&F0&C1&D2 @@ -15,7 +15,7 @@ diff -ur rc-scripts-0.4.6.orig/doc/net-scripts.txt rc-scripts-0.4.6/doc/net-scri PEERDNS=yes|no IPV6_PPP=yes|no use IPv6 for ppp -@@ -188,7 +188,7 @@ +@@ -186,7 +186,7 @@ the connection. For SLIP devices, a DIP script is written from the chat script; for PPP devices, the chat script is used directly. @@ -24,19 +24,19 @@ diff -ur rc-scripts-0.4.6.orig/doc/net-scripts.txt rc-scripts-0.4.6/doc/net-scri (actually by grep in firstplace to get rid of comments) before it is passed to chat. This allows you to substitute shell variables with their values -diff -ur rc-scripts-0.4.6.orig/doc/sysvinitfiles rc-scripts-0.4.6/doc/sysvinitfiles ---- rc-scripts-0.4.6.orig/doc/sysvinitfiles 2009-07-25 19:18:23.000000000 +0000 -+++ rc-scripts-0.4.6/doc/sysvinitfiles 2013-07-05 16:00:15.809511547 +0000 +diff -ur rc-scripts-0.4.9.pld/doc/sysvinitfiles rc-scripts-0.4.9.tld/doc/sysvinitfiles +--- rc-scripts-0.4.9.pld/doc/sysvinitfiles 2013-11-11 10:54:45.000000000 +0000 ++++ rc-scripts-0.4.9.tld/doc/sysvinitfiles 2013-11-23 13:54:12.352641484 +0000 @@ -1,4 +1,4 @@ -Writing System V init scripts for PLD Linux +Writing System V init scripts for TLD Linux - $Id: sysvinitfiles 7002 2006-02-23 10:38:31Z glen $ =============================================== -diff -ur rc-scripts-0.4.6.orig/inittab rc-scripts-0.4.6/inittab ---- rc-scripts-0.4.6.orig/inittab 2009-07-25 19:18:26.000000000 +0000 -+++ rc-scripts-0.4.6/inittab 2013-07-05 15:57:43.348634556 +0000 -@@ -8,7 +8,7 @@ + All System V init scripts are named /etc/rc.d/init.d/ +diff -ur rc-scripts-0.4.9.pld/inittab rc-scripts-0.4.9.tld/inittab +--- rc-scripts-0.4.9.pld/inittab 2013-11-11 10:54:45.000000000 +0000 ++++ rc-scripts-0.4.9.tld/inittab 2013-11-23 13:52:14.614645854 +0000 +@@ -7,7 +7,7 @@ # Modified for RHS Linux by Marc Ewing and Donnie Barnes # @@ -45,10 +45,10 @@ diff -ur rc-scripts-0.4.6.orig/inittab rc-scripts-0.4.6/inittab # 0 - halt (Do NOT set initdefault to this) # 1 - Single user mode # 2 - Multiuser, without NFS (The same as 3, if you do not have networking) -diff -ur rc-scripts-0.4.6.orig/lib/functions rc-scripts-0.4.6/lib/functions ---- rc-scripts-0.4.6.orig/lib/functions 2013-04-09 22:07:35.000000000 +0000 -+++ rc-scripts-0.4.6/lib/functions 2013-07-05 16:02:22.954571716 +0000 -@@ -6,7 +6,7 @@ +diff -ur rc-scripts-0.4.9.pld/lib/functions rc-scripts-0.4.9.tld/lib/functions +--- rc-scripts-0.4.9.pld/lib/functions 2013-11-11 10:54:45.000000000 +0000 ++++ rc-scripts-0.4.9.tld/lib/functions 2013-11-23 13:52:14.615645870 +0000 +@@ -5,7 +5,7 @@ # # Author: Miquel van Smoorenburg, # Hacked by: Greg Galloway and Marc Ewing @@ -57,7 +57,7 @@ diff -ur rc-scripts-0.4.6.orig/lib/functions rc-scripts-0.4.6/lib/functions # Marek Obuchowicz # Arkadiusz Miśkiewicz # Michał Kochanowicz -@@ -48,7 +48,7 @@ +@@ -47,7 +47,7 @@ CBUSY="$MAGENTA" # BUSY color CFAIL="$RED" # FAIL and DIED color CPOWEREDBY="$CYAN" # "Powered by" color @@ -66,19 +66,19 @@ diff -ur rc-scripts-0.4.6.orig/lib/functions rc-scripts-0.4.6/lib/functions CI="$RED" # Capital I color (press I to enter interactive startup) CRESMAN="$GREEN" # "Resource Manager" color CHARS="" # Characters displayed on the beginning of show line -@@ -390,7 +390,7 @@ +@@ -412,7 +412,7 @@ nls "Usage: %s" "$*" } -# Some functions to handle PLD Linux-style messages +# Some functions to handle TLD Linux-style messages show() { - local text len + local text len time -diff -ur rc-scripts-0.4.6.orig/po/de.po rc-scripts-0.4.6/po/de.po ---- rc-scripts-0.4.6.orig/po/de.po 2013-05-15 21:04:51.000000000 +0000 -+++ rc-scripts-0.4.6/po/de.po 2013-07-05 16:00:59.662509781 +0000 -@@ -447,7 +447,7 @@ +diff -ur rc-scripts-0.4.9.pld/po/de.po rc-scripts-0.4.9.tld/po/de.po +--- rc-scripts-0.4.9.pld/po/de.po 2013-11-11 10:54:45.000000000 +0000 ++++ rc-scripts-0.4.9.tld/po/de.po 2013-11-23 13:52:14.616645883 +0000 +@@ -446,7 +446,7 @@ msgstr "" #: .././rc.d/rc.sysinit:231 @@ -87,10 +87,10 @@ diff -ur rc-scripts-0.4.6.orig/po/de.po rc-scripts-0.4.6/po/de.po msgstr "" #: .././rc.d/init.d/netfs:154 -diff -ur rc-scripts-0.4.6.orig/po/pl.po rc-scripts-0.4.6/po/pl.po ---- rc-scripts-0.4.6.orig/po/pl.po 2013-05-15 21:04:51.000000000 +0000 -+++ rc-scripts-0.4.6/po/pl.po 2013-07-05 16:00:43.505634070 +0000 -@@ -444,8 +444,8 @@ +diff -ur rc-scripts-0.4.9.pld/po/pl.po rc-scripts-0.4.9.tld/po/pl.po +--- rc-scripts-0.4.9.pld/po/pl.po 2013-11-11 10:54:45.000000000 +0000 ++++ rc-scripts-0.4.9.tld/po/pl.po 2013-11-23 13:52:14.616645883 +0000 +@@ -443,8 +443,8 @@ msgstr " w cpusecie %s..." #: .././rc.d/rc.sysinit:231 @@ -101,31 +101,31 @@ diff -ur rc-scripts-0.4.6.orig/po/pl.po rc-scripts-0.4.6/po/pl.po #: .././rc.d/init.d/netfs:154 msgid "Active NFS mountpoints: " -diff -ur rc-scripts-0.4.6.orig/po/rc-scripts.pot rc-scripts-0.4.6/po/rc-scripts.pot ---- rc-scripts-0.4.6.orig/po/rc-scripts.pot 2013-05-15 21:08:27.000000000 +0000 -+++ rc-scripts-0.4.6/po/rc-scripts.pot 2013-07-05 16:01:08.914510770 +0000 -@@ -456,7 +456,7 @@ +diff -ur rc-scripts-0.4.9.pld/po/rc-scripts.pot rc-scripts-0.4.9.tld/po/rc-scripts.pot +--- rc-scripts-0.4.9.pld/po/rc-scripts.pot 2013-11-11 11:36:52.000000000 +0000 ++++ rc-scripts-0.4.9.tld/po/rc-scripts.pot 2013-11-23 13:54:32.914640920 +0000 +@@ -164,7 +164,7 @@ msgstr "" - #: .././rc.d/rc.sysinit:242 + #: .././rc.d/rc.sysinit:410 -msgid "\t\t\t%sPowered by %sPLD Linux Distribution%s" +msgid "\t\t\t%sPowered by %sTLD Linux%s" msgstr "" - #: .././rc.d/init.d/netfs:154 -diff -ur rc-scripts-0.4.6.orig/rc.d/rc.sysinit rc-scripts-0.4.6/rc.d/rc.sysinit ---- rc-scripts-0.4.6.orig/rc.d/rc.sysinit 2013-04-03 08:48:26.000000000 +0000 -+++ rc-scripts-0.4.6/rc.d/rc.sysinit 2013-07-05 16:02:41.163571481 +0000 -@@ -197,7 +197,7 @@ - mount -n -o gid=17 -t selinuxfs selinuxfs /selinux - fi + #: .././rc.d/init.d/network:240 +diff -ur rc-scripts-0.4.9.pld/rc.d/rc.sysinit rc-scripts-0.4.9.tld/rc.d/rc.sysinit +--- rc-scripts-0.4.9.pld/rc.d/rc.sysinit 2013-11-11 10:58:44.000000000 +0000 ++++ rc-scripts-0.4.9.tld/rc.d/rc.sysinit 2013-11-23 13:52:14.632645961 +0000 +@@ -377,7 +377,7 @@ + + init_selinux - # PLD Linux LiveCD support + # TLD Linux LiveCD support if [ -x /etc/rc.d/rc.live ]; then /etc/rc.d/rc.live fi -@@ -240,7 +240,7 @@ +@@ -408,7 +408,7 @@ # Print welcome message @@ -134,21 +134,21 @@ diff -ur rc-scripts-0.4.6.orig/rc.d/rc.sysinit rc-scripts-0.4.6/rc.d/rc.sysinit if ! is_no "$RC_PROMPT"; then nls -n "\t\t Press %sI%s to enter interactive startup" "$(termput setaf $CI)" "$(termput op)" echo -diff -ur rc-scripts-0.4.6.orig/src/setuidgid.c rc-scripts-0.4.6/src/setuidgid.c ---- rc-scripts-0.4.6.orig/src/setuidgid.c 2011-08-14 19:40:37.000000000 +0000 -+++ rc-scripts-0.4.6/src/setuidgid.c 2013-07-05 15:57:54.940509815 +0000 +diff -ur rc-scripts-0.4.9.pld/src/setuidgid.c rc-scripts-0.4.9.tld/src/setuidgid.c +--- rc-scripts-0.4.9.pld/src/setuidgid.c 2013-11-11 10:54:45.000000000 +0000 ++++ rc-scripts-0.4.9.tld/src/setuidgid.c 2013-11-23 13:53:32.983642538 +0000 @@ -47,7 +47,7 @@ exit(1); } void show_version() { -- fprintf(stderr, "%s $Rev: 12308 $ (PLD Linux rc-scripts)\n", progname); -+ fprintf(stderr, "%s $Rev: 12308 $ (TLD Linux rc-scripts)\n", progname); +- fprintf(stderr, "%s $Rev$ (PLD Linux rc-scripts)\n", progname); ++ fprintf(stderr, "%s $Rev$ (TLD Linux rc-scripts)\n", progname); } void version() { show_version(); -diff -ur rc-scripts-0.4.6.orig/sysconfig/init-colors rc-scripts-0.4.6/sysconfig/init-colors ---- rc-scripts-0.4.6.orig/sysconfig/init-colors 2009-07-25 19:18:26.000000000 +0000 -+++ rc-scripts-0.4.6/sysconfig/init-colors 2013-07-05 16:02:27.154572333 +0000 +diff -ur rc-scripts-0.4.9.pld/sysconfig/init-colors rc-scripts-0.4.9.tld/sysconfig/init-colors +--- rc-scripts-0.4.9.pld/sysconfig/init-colors 2013-11-11 10:54:45.000000000 +0000 ++++ rc-scripts-0.4.9.tld/sysconfig/init-colors 2013-11-23 13:52:14.633645961 +0000 @@ -1,11 +1,11 @@ -# Default PLD Linux colors. +# Default TLD Linux colors. @@ -163,9 +163,9 @@ diff -ur rc-scripts-0.4.6.orig/sysconfig/init-colors rc-scripts-0.4.6/sysconfig/ CI="$RED" # Capital I color (press I to enter interactive startup) CRESMAN="$GREEN" # "Resource Manager" color CHARS="" # Characters displayed on the beginning of show line -diff -ur rc-scripts-0.4.6.orig/sysconfig/init-colors.gentoo rc-scripts-0.4.6/sysconfig/init-colors.gentoo ---- rc-scripts-0.4.6.orig/sysconfig/init-colors.gentoo 2009-07-25 19:18:26.000000000 +0000 -+++ rc-scripts-0.4.6/sysconfig/init-colors.gentoo 2013-07-05 16:02:31.796572366 +0000 +diff -ur rc-scripts-0.4.9.pld/sysconfig/init-colors.gentoo rc-scripts-0.4.9.tld/sysconfig/init-colors.gentoo +--- rc-scripts-0.4.9.pld/sysconfig/init-colors.gentoo 2013-11-11 10:54:45.000000000 +0000 ++++ rc-scripts-0.4.9.tld/sysconfig/init-colors.gentoo 2013-11-23 13:52:14.633645961 +0000 @@ -5,7 +5,7 @@ CBUSY="$MAGENTA $BOLD" # BUSY color CFAIL="$RED $BOLD" # FAIL and DIED color @@ -175,3 +175,15 @@ diff -ur rc-scripts-0.4.6.orig/sysconfig/init-colors.gentoo rc-scripts-0.4.6/sys CI="$RED $BOLD" # Capital I color (press I to enter interactive startup) CRESMAN="$GREEN $BOLD" # "Resource Manager" color CHARS=" * " # Characters displayed on the beginning of show line +diff -ur rc-scripts-0.4.9.pld/sysconfig/network rc-scripts-0.4.9.tld/sysconfig/network +--- rc-scripts-0.4.9.pld/sysconfig/network 2013-11-11 10:54:45.000000000 +0000 ++++ rc-scripts-0.4.9.tld/sysconfig/network 2013-11-23 13:56:19.667637118 +0000 +@@ -11,7 +11,7 @@ + # then set it in /etc/sysctl.conf + + # Set hostname here +-HOSTNAME=pldmachine ++HOSTNAME=tldlinux + + # Allow udev to create /etc/sysconfig/interfaces/ifcfg-* automatically? + # See /lib/udev/net_helper for details. -- 2.46.0