X-Git-Url: https://git.tld-linux.org/?p=packages%2Frc-scripts.git;a=blobdiff_plain;f=rc-scripts-tld.patch;h=1f30c9ed2eaceaecf495409a6a24ef2d3f7b5afc;hp=56dbbf4e7faddfeb879009cb067f6df13abf324b;hb=7eecf979560f5fbd06f940677f99a5cd743e8347;hpb=be10dac1baff45e310deaa5ef45bf8980cd57d23 diff --git a/rc-scripts-tld.patch b/rc-scripts-tld.patch index 56dbbf4..1f30c9e 100644 --- a/rc-scripts-tld.patch +++ b/rc-scripts-tld.patch @@ -1,7 +1,7 @@ -diff -ur rc-scripts-0.4.12.orig/doc/net-scripts.txt rc-scripts-0.4.12/doc/net-scripts.txt ---- rc-scripts-0.4.12.orig/doc/net-scripts.txt 2014-06-10 06:55:19.000000000 +0000 -+++ rc-scripts-0.4.12/doc/net-scripts.txt 2014-07-12 11:41:36.258000000 +0000 -@@ -145,11 +145,11 @@ +diff -urNp rc-scripts-0.4.13.orig/doc/net-scripts.txt rc-scripts-0.4.13/doc/net-scripts.txt +--- rc-scripts-0.4.13.orig/doc/net-scripts.txt 2014-06-10 06:55:19.000000000 +0000 ++++ rc-scripts-0.4.13/doc/net-scripts.txt 2015-02-06 13:30:49.145314244 +0000 +@@ -145,11 +145,11 @@ Files in /etc/sysconfig/interfaces/ INITSCRIPT= string which initialises your modem. Usualy something like AT&F0&C1&D2 @@ -15,7 +15,7 @@ diff -ur rc-scripts-0.4.12.orig/doc/net-scripts.txt rc-scripts-0.4.12/doc/net-sc PEERDNS=yes|no IPV6_PPP=yes|no use IPv6 for ppp -@@ -186,7 +186,7 @@ +@@ -186,7 +186,7 @@ Files in /etc/sysconfig/interfaces/ the connection. For SLIP devices, a DIP script is written from the chat script; for PPP devices, the chat script is used directly. @@ -24,18 +24,31 @@ diff -ur rc-scripts-0.4.12.orig/doc/net-scripts.txt rc-scripts-0.4.12/doc/net-sc (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.12.orig/doc/sysvinitfiles rc-scripts-0.4.12/doc/sysvinitfiles ---- rc-scripts-0.4.12.orig/doc/sysvinitfiles 2014-06-10 06:55:19.000000000 +0000 -+++ rc-scripts-0.4.12/doc/sysvinitfiles 2014-07-12 11:41:36.259000000 +0000 +diff -urNp rc-scripts-0.4.13.orig/doc/sysvinitfiles rc-scripts-0.4.13/doc/sysvinitfiles +--- rc-scripts-0.4.13.orig/doc/sysvinitfiles 2014-06-10 06:55:19.000000000 +0000 ++++ rc-scripts-0.4.13/doc/sysvinitfiles 2015-02-06 13:30:49.145314244 +0000 @@ -1,4 +1,4 @@ -Writing System V init scripts for PLD Linux +Writing System V init scripts for TLD Linux =============================================== All System V init scripts are named /etc/rc.d/init.d/ -diff -ur rc-scripts-0.4.12.orig/inittab rc-scripts-0.4.12/inittab ---- rc-scripts-0.4.12.orig/inittab 2014-06-10 06:55:19.000000000 +0000 -+++ rc-scripts-0.4.12/inittab 2014-07-12 11:41:36.259000000 +0000 +diff -urNp rc-scripts-0.4.13.orig/hwprofile rc-scripts-0.4.13/hwprofile +--- rc-scripts-0.4.13.orig/hwprofile 2014-06-10 06:55:19.000000000 +0000 ++++ rc-scripts-0.4.13/hwprofile 2015-02-06 13:36:28.437314244 +0000 +@@ -42,9 +42,6 @@ no opts - show help + -f - find proper profile and run it + -l - list configured profiles + -q - be quiet (used only in few modes) +- +-Please send all bug reports to: +-pld-rc-scripts@pld-linux.org. + ' + } + +diff -urNp rc-scripts-0.4.13.orig/inittab rc-scripts-0.4.13/inittab +--- rc-scripts-0.4.13.orig/inittab 2014-06-10 06:55:19.000000000 +0000 ++++ rc-scripts-0.4.13/inittab 2015-02-06 13:30:49.146314244 +0000 @@ -7,7 +7,7 @@ # Modified for RHS Linux by Marc Ewing and Donnie Barnes # @@ -45,9 +58,9 @@ diff -ur rc-scripts-0.4.12.orig/inittab rc-scripts-0.4.12/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.12.orig/lib/functions rc-scripts-0.4.12/lib/functions ---- rc-scripts-0.4.12.orig/lib/functions 2014-06-19 19:51:23.000000000 +0000 -+++ rc-scripts-0.4.12/lib/functions 2014-07-12 11:41:36.260000000 +0000 +diff -urNp rc-scripts-0.4.13.orig/lib/functions rc-scripts-0.4.13/lib/functions +--- rc-scripts-0.4.13.orig/lib/functions 2015-01-22 16:01:15.000000000 +0000 ++++ rc-scripts-0.4.13/lib/functions 2015-02-06 13:30:49.147314244 +0000 @@ -5,7 +5,7 @@ # # Author: Miquel van Smoorenburg, @@ -57,7 +70,7 @@ diff -ur rc-scripts-0.4.12.orig/lib/functions rc-scripts-0.4.12/lib/functions # Marek Obuchowicz # Arkadiusz Miśkiewicz # Michał Kochanowicz -@@ -47,7 +47,7 @@ +@@ -47,7 +47,7 @@ CDONE="$GREEN" # DONE and WORK color CBUSY="$MAGENTA" # BUSY color CFAIL="$RED" # FAIL and DIED color CPOWEREDBY="$CYAN" # "Powered by" color @@ -66,7 +79,7 @@ diff -ur rc-scripts-0.4.12.orig/lib/functions rc-scripts-0.4.12/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 -@@ -422,7 +422,7 @@ +@@ -422,7 +422,7 @@ msg_usage() { nls "Usage: %s" "$*" } @@ -75,10 +88,10 @@ diff -ur rc-scripts-0.4.12.orig/lib/functions rc-scripts-0.4.12/lib/functions show() { local text len time -diff -ur rc-scripts-0.4.12.orig/po/de.po rc-scripts-0.4.12/po/de.po ---- rc-scripts-0.4.12.orig/po/de.po 2014-06-10 06:55:19.000000000 +0000 -+++ rc-scripts-0.4.12/po/de.po 2014-07-12 11:41:36.260000000 +0000 -@@ -446,7 +446,7 @@ +diff -urNp rc-scripts-0.4.13.orig/po/de.po rc-scripts-0.4.13/po/de.po +--- rc-scripts-0.4.13.orig/po/de.po 2014-06-10 06:55:19.000000000 +0000 ++++ rc-scripts-0.4.13/po/de.po 2015-02-06 13:30:49.147314244 +0000 +@@ -446,7 +446,7 @@ msgid " in cpuset %s..." msgstr "" #: .././rc.d/rc.sysinit:231 @@ -87,10 +100,10 @@ diff -ur rc-scripts-0.4.12.orig/po/de.po rc-scripts-0.4.12/po/de.po msgstr "" #: .././rc.d/init.d/netfs:154 -diff -ur rc-scripts-0.4.12.orig/po/pl.po rc-scripts-0.4.12/po/pl.po ---- rc-scripts-0.4.12.orig/po/pl.po 2014-06-10 06:55:19.000000000 +0000 -+++ rc-scripts-0.4.12/po/pl.po 2014-07-12 11:41:36.274000000 +0000 -@@ -443,8 +443,8 @@ +diff -urNp rc-scripts-0.4.13.orig/po/pl.po rc-scripts-0.4.13/po/pl.po +--- rc-scripts-0.4.13.orig/po/pl.po 2014-06-10 06:55:19.000000000 +0000 ++++ rc-scripts-0.4.13/po/pl.po 2015-02-06 13:30:49.147314244 +0000 +@@ -443,8 +443,8 @@ msgid " in cpuset %s..." msgstr " w cpusecie %s..." #: .././rc.d/rc.sysinit:231 @@ -101,10 +114,10 @@ diff -ur rc-scripts-0.4.12.orig/po/pl.po rc-scripts-0.4.12/po/pl.po #: .././rc.d/init.d/netfs:154 msgid "Active NFS mountpoints: " -diff -ur rc-scripts-0.4.12.orig/po/rc-scripts.pot rc-scripts-0.4.12/po/rc-scripts.pot ---- rc-scripts-0.4.12.orig/po/rc-scripts.pot 2014-07-07 15:31:27.000000000 +0000 -+++ rc-scripts-0.4.12/po/rc-scripts.pot 2014-07-12 11:42:40.411000000 +0000 -@@ -172,7 +172,7 @@ +diff -urNp rc-scripts-0.4.13.orig/po/rc-scripts.pot rc-scripts-0.4.13/po/rc-scripts.pot +--- rc-scripts-0.4.13.orig/po/rc-scripts.pot 2015-01-22 16:03:03.000000000 +0000 ++++ rc-scripts-0.4.13/po/rc-scripts.pot 2015-02-06 13:30:49.148314244 +0000 +@@ -76,7 +76,7 @@ msgid "%s for %s exiting" msgstr "" #: .././rc.d/rc.sysinit:462 @@ -112,11 +125,11 @@ diff -ur rc-scripts-0.4.12.orig/po/rc-scripts.pot rc-scripts-0.4.12/po/rc-script +msgid "\t\t\t%sPowered by %sTLD Linux%s" msgstr "" - #: .././lib/ifdown-vlan:45 -diff -ur rc-scripts-0.4.12.orig/rc.d/rc.sysinit rc-scripts-0.4.12/rc.d/rc.sysinit ---- rc-scripts-0.4.12.orig/rc.d/rc.sysinit 2014-06-19 20:04:44.000000000 +0000 -+++ rc-scripts-0.4.12/rc.d/rc.sysinit 2014-07-12 11:41:36.275000000 +0000 -@@ -429,7 +429,7 @@ + #: .././rc.d/init.d/netfs:138 +diff -urNp rc-scripts-0.4.13.orig/rc.d/rc.sysinit rc-scripts-0.4.13/rc.d/rc.sysinit +--- rc-scripts-0.4.13.orig/rc.d/rc.sysinit 2015-01-22 16:01:18.000000000 +0000 ++++ rc-scripts-0.4.13/rc.d/rc.sysinit 2015-02-06 13:30:49.149314244 +0000 +@@ -429,7 +429,7 @@ if ! is_yes "$VSERVER" && [[ "$container init_selinux @@ -125,7 +138,7 @@ diff -ur rc-scripts-0.4.12.orig/rc.d/rc.sysinit rc-scripts-0.4.12/rc.d/rc.sysini if [ -x /etc/rc.d/rc.live ]; then /etc/rc.d/rc.live fi -@@ -460,7 +460,7 @@ +@@ -460,7 +460,7 @@ fi # Print welcome message @@ -134,10 +147,22 @@ diff -ur rc-scripts-0.4.12.orig/rc.d/rc.sysinit rc-scripts-0.4.12/rc.d/rc.sysini 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.12.orig/src/setuidgid.c rc-scripts-0.4.12/src/setuidgid.c ---- rc-scripts-0.4.12.orig/src/setuidgid.c 2013-11-02 20:50:20.000000000 +0000 -+++ rc-scripts-0.4.12/src/setuidgid.c 2014-07-12 11:41:36.275000000 +0000 -@@ -47,7 +47,7 @@ +diff -urNp rc-scripts-0.4.13.orig/service rc-scripts-0.4.13/service +--- rc-scripts-0.4.13.orig/service 2014-06-10 06:55:19.000000000 +0000 ++++ rc-scripts-0.4.13/service 2015-02-06 13:32:51.048314244 +0000 +@@ -123,7 +123,7 @@ status_all() { + done + } + +-VERSION="$(basename $0) ver. 0.91-pld" ++VERSION="$(basename $0) ver. 1.0-tld" + USAGE="Usage: $(basename $0) < option > | --status-all | \ + [ service_name [ command | --full-restart ] ]" + +diff -urNp rc-scripts-0.4.13.orig/src/setuidgid.c rc-scripts-0.4.13/src/setuidgid.c +--- rc-scripts-0.4.13.orig/src/setuidgid.c 2013-11-02 20:50:20.000000000 +0000 ++++ rc-scripts-0.4.13/src/setuidgid.c 2015-02-06 13:30:49.149314244 +0000 +@@ -47,7 +47,7 @@ void die2(const char *msg1, const char * exit(1); } void show_version() { @@ -146,9 +171,9 @@ diff -ur rc-scripts-0.4.12.orig/src/setuidgid.c rc-scripts-0.4.12/src/setuidgid. } void version() { show_version(); -diff -ur rc-scripts-0.4.12.orig/sysconfig/init-colors rc-scripts-0.4.12/sysconfig/init-colors ---- rc-scripts-0.4.12.orig/sysconfig/init-colors 2013-11-02 20:50:20.000000000 +0000 -+++ rc-scripts-0.4.12/sysconfig/init-colors 2014-07-12 11:41:36.276000000 +0000 +diff -urNp rc-scripts-0.4.13.orig/sysconfig/init-colors rc-scripts-0.4.13/sysconfig/init-colors +--- rc-scripts-0.4.13.orig/sysconfig/init-colors 2013-11-02 20:50:20.000000000 +0000 ++++ rc-scripts-0.4.13/sysconfig/init-colors 2015-02-06 13:30:49.149314244 +0000 @@ -1,11 +1,11 @@ -# Default PLD Linux colors. +# Default TLD Linux colors. @@ -163,10 +188,10 @@ diff -ur rc-scripts-0.4.12.orig/sysconfig/init-colors rc-scripts-0.4.12/sysconfi 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.12.orig/sysconfig/init-colors.gentoo rc-scripts-0.4.12/sysconfig/init-colors.gentoo ---- rc-scripts-0.4.12.orig/sysconfig/init-colors.gentoo 2013-11-02 20:50:20.000000000 +0000 -+++ rc-scripts-0.4.12/sysconfig/init-colors.gentoo 2014-07-12 11:41:36.276000000 +0000 -@@ -5,7 +5,7 @@ +diff -urNp rc-scripts-0.4.13.orig/sysconfig/init-colors.gentoo rc-scripts-0.4.13/sysconfig/init-colors.gentoo +--- rc-scripts-0.4.13.orig/sysconfig/init-colors.gentoo 2013-11-02 20:50:20.000000000 +0000 ++++ rc-scripts-0.4.13/sysconfig/init-colors.gentoo 2015-02-06 13:30:49.149314244 +0000 +@@ -5,7 +5,7 @@ CDONE="$GREEN $BOLD" # DONE and WORK co CBUSY="$MAGENTA $BOLD" # BUSY color CFAIL="$RED $BOLD" # FAIL and DIED color CPOWEREDBY="$BLUE $BOLD" # "Powered by" color @@ -175,10 +200,10 @@ diff -ur rc-scripts-0.4.12.orig/sysconfig/init-colors.gentoo rc-scripts-0.4.12/s 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.12.orig/sysconfig/network rc-scripts-0.4.12/sysconfig/network ---- rc-scripts-0.4.12.orig/sysconfig/network 2014-06-10 06:55:19.000000000 +0000 -+++ rc-scripts-0.4.12/sysconfig/network 2014-07-12 11:41:36.276000000 +0000 -@@ -11,7 +11,7 @@ +diff -urNp rc-scripts-0.4.13.orig/sysconfig/network rc-scripts-0.4.13/sysconfig/network +--- rc-scripts-0.4.13.orig/sysconfig/network 2014-06-10 06:55:19.000000000 +0000 ++++ rc-scripts-0.4.13/sysconfig/network 2015-02-06 13:30:49.151314244 +0000 +@@ -11,7 +11,7 @@ IPV4_NETWORKING=yes # then set it in /etc/sysctl.conf # Set hostname here