X-Git-Url: https://git.tld-linux.org/?p=packages%2Frc-scripts.git;a=blobdiff_plain;f=rc-scripts-tld.patch;h=5b9feb619d6b4355560e8dbf6e39732d870872fb;hp=d2b4f90b0e9dc63fb9bb2f0e52b9b7a6e5f6bb28;hb=07a27a778f8023c7b88840e9e0b50376fb606ee9;hpb=068040a7ccb6f9951b77f4541af278f87f6c9e45 diff --git a/rc-scripts-tld.patch b/rc-scripts-tld.patch index d2b4f90..5b9feb6 100644 --- a/rc-scripts-tld.patch +++ b/rc-scripts-tld.patch @@ -1,6 +1,41 @@ -diff -urN rc-scripts-0.4.5.1.pld//inittab rc-scripts-0.4.5.1/inittab ---- rc-scripts-0.4.5.1.pld//inittab 2012-04-01 19:46:54.662913738 +0000 -+++ rc-scripts-0.4.5.1/inittab 2011-10-03 20:39:36.000000000 +0000 +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 @@ + INITSCRIPT= + string which initialises your modem. Usualy something like + AT&F0&C1&D2 +- (PLD Linux rc-scripts specific option) ++ (TLD Linux rc-scripts specific option) + DATAFORCHAT= + List of variables which should be exported to chat script. + Used mostly for passing USERNAME and PASSWORD into it. (see below) +- (PLD Linux rc-scripts specific option) ++ (TLD Linux rc-scripts specific option) + PEERDNS=yes|no + IPV6_PPP=yes|no + use IPv6 for ppp +@@ -188,7 +188,7 @@ + the connection. For SLIP devices, a DIP script is written + from the chat script; for PPP devices, the chat script is used + directly. +- In PLD Linux version of rc-scripts, this file is parsed by shell ++ In TLD Linux version of rc-scripts, this file is parsed by shell + (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 +@@ -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 @@ # Modified for RHS Linux by Marc Ewing and Donnie Barnes # @@ -10,19 +45,28 @@ diff -urN rc-scripts-0.4.5.1.pld//inittab rc-scripts-0.4.5.1/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 -urN rc-scripts-0.4.5.1.pld//lib/functions rc-scripts-0.4.5.1/lib/functions ---- rc-scripts-0.4.5.1.pld//lib/functions 2012-04-01 19:46:54.331047818 +0000 -+++ rc-scripts-0.4.5.1/lib/functions 2011-10-03 20:39:36.000000000 +0000 +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 @@ + # + # Author: Miquel van Smoorenburg, + # Hacked by: Greg Galloway and Marc Ewing +-# Modified for PLD Linux by: ++# Modified for TLD Linux by: + # Marek Obuchowicz + # Arkadiusz Miśkiewicz + # Michał Kochanowicz @@ -48,7 +48,7 @@ CBUSY="$MAGENTA" # BUSY color CFAIL="$RED" # FAIL and DIED color CPOWEREDBY="$CYAN" # "Powered by" color -CPLD="$GREEN" # "PLD Linux Distribution" color -+CTLD="$GREEN" # "TLD Linux Distribution" color ++CTLD="$GREEN" # "TLD Linux" color 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 -@@ -379,7 +379,7 @@ +@@ -390,7 +390,7 @@ nls "Usage: %s" "$*" } @@ -31,48 +75,48 @@ diff -urN rc-scripts-0.4.5.1.pld//lib/functions rc-scripts-0.4.5.1/lib/functions show() { local text len -diff -urN rc-scripts-0.4.5.1.pld//po/de.po rc-scripts-0.4.5.1/po/de.po ---- rc-scripts-0.4.5.1.pld//po/de.po 2012-04-01 19:46:54.405047851 +0000 -+++ rc-scripts-0.4.5.1/po/de.po 2011-10-03 20:39:36.000000000 +0000 -@@ -452,7 +452,7 @@ +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 @@ msgstr "" - #: .././rc.d/rc.sysinit:227 + #: .././rc.d/rc.sysinit:231 -msgid "\t\t\t%sPowered by %sPLD Linux Distribution%s" -+msgid "\t\t\t%sPowered by %sTLD Linux Distribution%s" ++msgid "\t\t\t%sPowered by %sTLD Linux%s" msgstr "" #: .././rc.d/init.d/netfs:154 -diff -urN rc-scripts-0.4.5.1.pld//po/pl.po rc-scripts-0.4.5.1/po/pl.po ---- rc-scripts-0.4.5.1.pld//po/pl.po 2012-04-01 19:46:54.406047776 +0000 -+++ rc-scripts-0.4.5.1/po/pl.po 2011-10-03 20:39:36.000000000 +0000 -@@ -449,8 +449,8 @@ +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 @@ msgstr " w cpusecie %s..." - #: .././rc.d/rc.sysinit:227 + #: .././rc.d/rc.sysinit:231 -msgid "\t\t\t%sPowered by %sPLD Linux Distribution%s" -msgstr "\t\t\t%sNapędzane przez %sPLD Linux Distribution%s" -+msgid "\t\t\t%sPowered by %sTLD Linux Distribution%s" -+msgstr "\t\t\t%sNapędzane przez %sTLD Linux Distribution%s" ++msgid "\t\t\t%sPowered by %sTLD Linux%s" ++msgstr "\t\t\t%sNapędzane przez %sTLD Linux%s" #: .././rc.d/init.d/netfs:154 msgid "Active NFS mountpoints: " -diff -urN rc-scripts-0.4.5.1.pld//po/rc-scripts.pot rc-scripts-0.4.5.1/po/rc-scripts.pot ---- rc-scripts-0.4.5.1.pld//po/rc-scripts.pot 2012-04-01 19:46:54.407047712 +0000 -+++ rc-scripts-0.4.5.1/po/rc-scripts.pot 2011-10-03 20:39:36.000000000 +0000 -@@ -455,7 +455,7 @@ +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 @@ msgstr "" - #: .././rc.d/rc.sysinit:239 + #: .././rc.d/rc.sysinit:242 -msgid "\t\t\t%sPowered by %sPLD Linux Distribution%s" -+msgid "\t\t\t%sPowered by %sTLD Linux Distribution%s" ++msgid "\t\t\t%sPowered by %sTLD Linux%s" msgstr "" #: .././rc.d/init.d/netfs:154 -diff -urN rc-scripts-0.4.5.1.pld//rc.d/rc.sysinit rc-scripts-0.4.5.1/rc.d/rc.sysinit ---- rc-scripts-0.4.5.1.pld//rc.d/rc.sysinit 2012-04-01 19:46:54.442048015 +0000 -+++ rc-scripts-0.4.5.1/rc.d/rc.sysinit 2011-10-03 20:39:36.000000000 +0000 -@@ -186,7 +186,7 @@ +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 @@ -81,18 +125,18 @@ diff -urN rc-scripts-0.4.5.1.pld//rc.d/rc.sysinit rc-scripts-0.4.5.1/rc.d/rc.sys if [ -x /etc/rc.d/rc.live ]; then /etc/rc.d/rc.live fi -@@ -229,7 +229,7 @@ +@@ -240,7 +240,7 @@ # Print welcome message -nls "\t\t\t%sPowered by %sPLD Linux Distribution%s" "$(termput setaf $CPOWEREDBY)" "$(termput setaf $CPLD)" "$(termput op)" -+nls "\t\t\t%sPowered by %sTLD Linux Distribution%s" "$(termput setaf $CPOWEREDBY)" "$(termput setaf $CTLD)" "$(termput op)" ++nls "\t\t\t%sPowered by %sTLD Linux%s" "$(termput setaf $CPOWEREDBY)" "$(termput setaf $CTLD)" "$(termput op)" if ! is_no "$RC_PROMPT"; then nls -n "\t\t Press %sI%s to enter interactive startup" "$(termput setaf $CI)" "$(termput op)" echo -diff -urN rc-scripts-0.4.5.1.pld//src/setuidgid.c rc-scripts-0.4.5.1/src/setuidgid.c ---- rc-scripts-0.4.5.1.pld//src/setuidgid.c 2012-04-01 19:46:54.204907409 +0000 -+++ rc-scripts-0.4.5.1/src/setuidgid.c 2011-10-03 20:39:36.000000000 +0000 +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 @@ -47,7 +47,7 @@ exit(1); } @@ -102,9 +146,9 @@ diff -urN rc-scripts-0.4.5.1.pld//src/setuidgid.c rc-scripts-0.4.5.1/src/setuidg } void version() { show_version(); -diff -urN rc-scripts-0.4.5.1.pld//sysconfig/init-colors rc-scripts-0.4.5.1/sysconfig/init-colors ---- rc-scripts-0.4.5.1.pld//sysconfig/init-colors 2012-04-01 19:46:54.649047787 +0000 -+++ rc-scripts-0.4.5.1/sysconfig/init-colors 2011-10-03 20:39:36.000000000 +0000 +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 @@ -1,11 +1,11 @@ -# Default PLD Linux colors. +# Default TLD Linux colors. @@ -115,19 +159,19 @@ diff -urN rc-scripts-0.4.5.1.pld//sysconfig/init-colors rc-scripts-0.4.5.1/sysco CFAIL="$RED" # FAIL and DIED color CPOWEREDBY="$CYAN" # "Powered by" color -CPLD="$GREEN" # "PLD Linux Distribution" color -+CTLD="$GREEN" # "TLD Linux Distribution" color ++CTLD="$GREEN" # "TLD Linux" color 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 -urN rc-scripts-0.4.5.1.pld//sysconfig/init-colors.gentoo rc-scripts-0.4.5.1/sysconfig/init-colors.gentoo ---- rc-scripts-0.4.5.1.pld//sysconfig/init-colors.gentoo 2012-04-01 19:46:54.654925316 +0000 -+++ rc-scripts-0.4.5.1/sysconfig/init-colors.gentoo 2011-10-03 20:39:36.000000000 +0000 +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 @@ -5,7 +5,7 @@ CBUSY="$MAGENTA $BOLD" # BUSY color CFAIL="$RED $BOLD" # FAIL and DIED color CPOWEREDBY="$BLUE $BOLD" # "Powered by" color -CPLD="$GREEN $BOLD" # "PLD Linux Distribution" color -+CTLD="$GREEN $BOLD" # "TLD Linux Distribution" color ++CTLD="$GREEN $BOLD" # "TLD Linux" color 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