From c45f0a574c2ab01e3607f276630ded22d317a0d7 Mon Sep 17 00:00:00 2001
From: Marcin Krol <hawk@tld-linux.org>
Date: Fri, 19 Apr 2013 09:20:27 +0000
Subject: [PATCH] - merged 0.4.5.5 from PLD - use just TLD Linux as distro name

---
 rc-scripts-tld.patch | 78 ++++++++++++++++++++++----------------------
 rc-scripts.spec      |  7 ++--
 2 files changed, 42 insertions(+), 43 deletions(-)

diff --git a/rc-scripts-tld.patch b/rc-scripts-tld.patch
index d2b4f90..6f828d2 100644
--- a/rc-scripts-tld.patch
+++ b/rc-scripts-tld.patch
@@ -1,6 +1,6 @@
-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.5.5.orig/inittab rc-scripts-0.4.5.5/inittab
+--- rc-scripts-0.4.5.5.orig/inittab	2009-08-16 20:49:36.000000000 +0000
++++ rc-scripts-0.4.5.5/inittab	2013-04-19 09:16:05.768697156 +0000
 @@ -8,7 +8,7 @@
  #		Modified for RHS Linux by Marc Ewing and Donnie Barnes
  #
@@ -10,15 +10,15 @@ 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.5.5.orig/lib/functions rc-scripts-0.4.5.5/lib/functions
+--- rc-scripts-0.4.5.5.orig/lib/functions	2012-12-17 07:39:12.000000000 +0000
++++ rc-scripts-0.4.5.5/lib/functions	2013-04-19 09:16:05.768697156 +0000
 @@ -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
@@ -31,48 +31,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
+diff -ur rc-scripts-0.4.5.5.orig/po/de.po rc-scripts-0.4.5.5/po/de.po
+--- rc-scripts-0.4.5.5.orig/po/de.po	2011-08-20 10:14:14.000000000 +0000
++++ rc-scripts-0.4.5.5/po/de.po	2013-04-19 09:16:05.769697764 +0000
 @@ -452,7 +452,7 @@
  msgstr ""
  
  #: .././rc.d/rc.sysinit:227
 -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
+diff -ur rc-scripts-0.4.5.5.orig/po/pl.po rc-scripts-0.4.5.5/po/pl.po
+--- rc-scripts-0.4.5.5.orig/po/pl.po	2011-08-20 10:14:14.000000000 +0000
++++ rc-scripts-0.4.5.5/po/pl.po	2013-04-19 09:16:05.770697122 +0000
 @@ -449,8 +449,8 @@
  msgstr " w cpusecie %s..."
  
  #: .././rc.d/rc.sysinit:227
 -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.5.5.orig/po/rc-scripts.pot rc-scripts-0.4.5.5/po/rc-scripts.pot
+--- rc-scripts-0.4.5.5.orig/po/rc-scripts.pot	2013-03-18 08:22:14.000000000 +0000
++++ rc-scripts-0.4.5.5/po/rc-scripts.pot	2013-04-19 09:16:45.091571818 +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.5.5.orig/rc.d/rc.sysinit rc-scripts-0.4.5.5/rc.d/rc.sysinit
+--- rc-scripts-0.4.5.5.orig/rc.d/rc.sysinit	2013-03-09 23:09:19.000000000 +0000
++++ rc-scripts-0.4.5.5/rc.d/rc.sysinit	2013-04-19 09:16:05.781759105 +0000
+@@ -197,7 +197,7 @@
  		mount -n -o gid=17 -t selinuxfs selinuxfs /selinux
  	fi
  
@@ -81,18 +81,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.5.5.orig/src/setuidgid.c rc-scripts-0.4.5.5/src/setuidgid.c
+--- rc-scripts-0.4.5.5.orig/src/setuidgid.c	2011-08-20 10:14:13.000000000 +0000
++++ rc-scripts-0.4.5.5/src/setuidgid.c	2013-04-19 09:16:05.782573379 +0000
 @@ -47,7 +47,7 @@
  	exit(1);
  }
@@ -102,9 +102,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.5.5.orig/sysconfig/init-colors rc-scripts-0.4.5.5/sysconfig/init-colors
+--- rc-scripts-0.4.5.5.orig/sysconfig/init-colors	2009-08-16 20:49:35.000000000 +0000
++++ rc-scripts-0.4.5.5/sysconfig/init-colors	2013-04-19 09:16:05.782573379 +0000
 @@ -1,11 +1,11 @@
 -# Default PLD Linux colors.
 +# Default TLD Linux colors.
@@ -115,19 +115,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.5.5.orig/sysconfig/init-colors.gentoo rc-scripts-0.4.5.5/sysconfig/init-colors.gentoo
+--- rc-scripts-0.4.5.5.orig/sysconfig/init-colors.gentoo	2009-08-16 20:49:35.000000000 +0000
++++ rc-scripts-0.4.5.5/sysconfig/init-colors.gentoo	2013-04-19 09:16:05.783696952 +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
diff --git a/rc-scripts.spec b/rc-scripts.spec
index 6c5296f..bc18a46 100644
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -7,13 +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.5.4
-Release:	3
+Version:	0.4.5.5
+Release:	1
 License:	GPL v2
 Group:		Base
-#Source0:	ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
 Source0:	%{name}-%{version}.tar.gz
-# Source0-md5:	e073e75ca6220e463bd659d25feefde6
+# Source0-md5:	e6f5f1d3afcdad7e0d808ffaaa8e2aba
 Source1:	rc-local.service
 Source2:	sys-chroots.service
 Source3:	%{name}.tmpfiles
-- 
2.49.0