From 477f14536b9ec09c3cd8305cea3bda54b3cf2892 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sun, 11 May 2014 14:54:38 +0000 Subject: [PATCH] - updated to 0.4.11 --- rc-scripts-tld.patch | 84 ++++++++++++++++++++++---------------------- rc-scripts.spec | 6 ++-- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/rc-scripts-tld.patch b/rc-scripts-tld.patch index bcfe0a0..8f59c1f 100644 --- a/rc-scripts-tld.patch +++ b/rc-scripts-tld.patch @@ -1,6 +1,6 @@ -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 +diff -ur rc-scripts-0.4.11.orig/doc/net-scripts.txt rc-scripts-0.4.11/doc/net-scripts.txt +--- rc-scripts-0.4.11.orig/doc/net-scripts.txt 2013-11-18 21:13:37.000000000 +0000 ++++ rc-scripts-0.4.11/doc/net-scripts.txt 2014-05-11 14:50:20.914999706 +0000 @@ -145,11 +145,11 @@ INITSCRIPT= string which initialises your modem. Usualy something like @@ -24,18 +24,18 @@ diff -ur rc-scripts-0.4.9.pld/doc/net-scripts.txt rc-scripts-0.4.9.tld/doc/net-s (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.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 +diff -ur rc-scripts-0.4.11.orig/doc/sysvinitfiles rc-scripts-0.4.11/doc/sysvinitfiles +--- rc-scripts-0.4.11.orig/doc/sysvinitfiles 2013-11-18 21:13:37.000000000 +0000 ++++ rc-scripts-0.4.11/doc/sysvinitfiles 2014-05-11 14:50:20.922999875 +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.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 +diff -ur rc-scripts-0.4.11.orig/inittab rc-scripts-0.4.11/inittab +--- rc-scripts-0.4.11.orig/inittab 2013-11-18 21:13:37.000000000 +0000 ++++ rc-scripts-0.4.11/inittab 2014-05-11 14:50:20.923999896 +0000 @@ -7,7 +7,7 @@ # Modified for RHS Linux by Marc Ewing and Donnie Barnes # @@ -45,9 +45,9 @@ diff -ur rc-scripts-0.4.9.pld/inittab rc-scripts-0.4.9.tld/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.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 +diff -ur rc-scripts-0.4.11.orig/lib/functions rc-scripts-0.4.11/lib/functions +--- rc-scripts-0.4.11.orig/lib/functions 2014-03-20 19:25:43.000000000 +0000 ++++ rc-scripts-0.4.11/lib/functions 2014-05-11 14:50:20.924999913 +0000 @@ -5,7 +5,7 @@ # # Author: Miquel van Smoorenburg, @@ -66,7 +66,7 @@ diff -ur rc-scripts-0.4.9.pld/lib/functions rc-scripts-0.4.9.tld/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 -@@ -412,7 +412,7 @@ +@@ -423,7 +423,7 @@ nls "Usage: %s" "$*" } @@ -75,9 +75,9 @@ diff -ur rc-scripts-0.4.9.pld/lib/functions rc-scripts-0.4.9.tld/lib/functions show() { local text len time -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 +diff -ur rc-scripts-0.4.11.orig/po/de.po rc-scripts-0.4.11/po/de.po +--- rc-scripts-0.4.11.orig/po/de.po 2013-11-18 21:13:37.000000000 +0000 ++++ rc-scripts-0.4.11/po/de.po 2014-05-11 14:50:20.925999928 +0000 @@ -446,7 +446,7 @@ msgstr "" @@ -87,9 +87,9 @@ diff -ur rc-scripts-0.4.9.pld/po/de.po rc-scripts-0.4.9.tld/po/de.po msgstr "" #: .././rc.d/init.d/netfs:154 -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 +diff -ur rc-scripts-0.4.11.orig/po/pl.po rc-scripts-0.4.11/po/pl.po +--- rc-scripts-0.4.11.orig/po/pl.po 2013-11-18 21:13:37.000000000 +0000 ++++ rc-scripts-0.4.11/po/pl.po 2014-05-11 14:50:20.926999937 +0000 @@ -443,8 +443,8 @@ msgstr " w cpusecie %s..." @@ -101,22 +101,22 @@ diff -ur rc-scripts-0.4.9.pld/po/pl.po rc-scripts-0.4.9.tld/po/pl.po #: .././rc.d/init.d/netfs:154 msgid "Active NFS mountpoints: " -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 @@ +diff -ur rc-scripts-0.4.11.orig/po/rc-scripts.pot rc-scripts-0.4.11/po/rc-scripts.pot +--- rc-scripts-0.4.11.orig/po/rc-scripts.pot 2014-03-29 18:22:44.000000000 +0000 ++++ rc-scripts-0.4.11/po/rc-scripts.pot 2014-05-11 14:51:06.169000176 +0000 +@@ -340,7 +340,7 @@ msgstr "" - #: .././rc.d/rc.sysinit:410 + #: .././rc.d/rc.sysinit:421 -msgid "\t\t\t%sPowered by %sPLD Linux Distribution%s" +msgid "\t\t\t%sPowered by %sTLD Linux%s" msgstr "" - #: .././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 @@ + #: .././rc.d/init.d/netfs:133 +diff -ur rc-scripts-0.4.11.orig/rc.d/rc.sysinit rc-scripts-0.4.11/rc.d/rc.sysinit +--- rc-scripts-0.4.11.orig/rc.d/rc.sysinit 2014-03-02 10:02:29.000000000 +0000 ++++ rc-scripts-0.4.11/rc.d/rc.sysinit 2014-05-11 14:50:20.927999953 +0000 +@@ -388,7 +388,7 @@ init_selinux @@ -125,7 +125,7 @@ diff -ur rc-scripts-0.4.9.pld/rc.d/rc.sysinit rc-scripts-0.4.9.tld/rc.d/rc.sysin if [ -x /etc/rc.d/rc.live ]; then /etc/rc.d/rc.live fi -@@ -408,7 +408,7 @@ +@@ -419,7 +419,7 @@ # Print welcome message @@ -134,9 +134,9 @@ diff -ur rc-scripts-0.4.9.pld/rc.d/rc.sysinit rc-scripts-0.4.9.tld/rc.d/rc.sysin 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.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 +diff -ur rc-scripts-0.4.11.orig/src/setuidgid.c rc-scripts-0.4.11/src/setuidgid.c +--- rc-scripts-0.4.11.orig/src/setuidgid.c 2013-11-02 20:50:20.000000000 +0000 ++++ rc-scripts-0.4.11/src/setuidgid.c 2014-05-11 14:50:21.302999773 +0000 @@ -47,7 +47,7 @@ exit(1); } @@ -146,9 +146,9 @@ diff -ur rc-scripts-0.4.9.pld/src/setuidgid.c rc-scripts-0.4.9.tld/src/setuidgid } void version() { show_version(); -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 +diff -ur rc-scripts-0.4.11.orig/sysconfig/init-colors rc-scripts-0.4.11/sysconfig/init-colors +--- rc-scripts-0.4.11.orig/sysconfig/init-colors 2013-11-02 20:50:20.000000000 +0000 ++++ rc-scripts-0.4.11/sysconfig/init-colors 2014-05-11 14:50:21.309999919 +0000 @@ -1,11 +1,11 @@ -# Default PLD Linux colors. +# Default TLD Linux colors. @@ -163,9 +163,9 @@ diff -ur rc-scripts-0.4.9.pld/sysconfig/init-colors rc-scripts-0.4.9.tld/sysconf 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.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 +diff -ur rc-scripts-0.4.11.orig/sysconfig/init-colors.gentoo rc-scripts-0.4.11/sysconfig/init-colors.gentoo +--- rc-scripts-0.4.11.orig/sysconfig/init-colors.gentoo 2013-11-02 20:50:20.000000000 +0000 ++++ rc-scripts-0.4.11/sysconfig/init-colors.gentoo 2014-05-11 14:50:21.309999919 +0000 @@ -5,7 +5,7 @@ CBUSY="$MAGENTA $BOLD" # BUSY color CFAIL="$RED $BOLD" # FAIL and DIED color @@ -175,9 +175,9 @@ diff -ur rc-scripts-0.4.9.pld/sysconfig/init-colors.gentoo rc-scripts-0.4.9.tld/ 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 +diff -ur rc-scripts-0.4.11.orig/sysconfig/network rc-scripts-0.4.11/sysconfig/network +--- rc-scripts-0.4.11.orig/sysconfig/network 2013-11-18 21:13:38.000000000 +0000 ++++ rc-scripts-0.4.11/sysconfig/network 2014-05-11 14:50:21.310999933 +0000 @@ -11,7 +11,7 @@ # then set it in /etc/sysctl.conf diff --git a/rc-scripts.spec b/rc-scripts.spec index c11066a..d4b1dcd 100644 --- a/rc-scripts.spec +++ b/rc-scripts.spec @@ -7,12 +7,12 @@ Summary(fr.UTF-8): inittab et scripts /etc/rc.d Summary(pl.UTF-8): inittab i skrypty startowe z katalogu /etc/rc.d Summary(tr.UTF-8): inittab ve /etc/rc.d dosyaları Name: rc-scripts -Version: 0.4.9 -Release: 3 +Version: 0.4.11 +Release: 1 License: GPL v2 Group: Base Source0: %{name}-%{version}.tar.gz -# Source0-md5: 6adfd906d1888cbc97fe4c0627fd3d3e +# Source0-md5: 78ec84184df3e6da086163525b407238 Source1: rc-local.service Source2: sys-chroots.service Source3: %{name}.tmpfiles -- 2.37.3