X-Git-Url: https://git.tld-linux.org/?p=packages%2Frc-scripts.git;a=blobdiff_plain;f=rc-scripts-tld.patch;h=56dbbf4e7faddfeb879009cb067f6df13abf324b;hp=6f828d2152ec588a3e1f56d1068b1f988ffdfd3c;hb=c7c16bf8f52e3f480ff79c2eaa4729379ecf01e7;hpb=c45f0a574c2ab01e3607f276630ded22d317a0d7

diff --git a/rc-scripts-tld.patch b/rc-scripts-tld.patch
index 6f828d2..56dbbf4 100644
--- a/rc-scripts-tld.patch
+++ b/rc-scripts-tld.patch
@@ -1,7 +1,42 @@
-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 @@
+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 @@
+     INITSCRIPT=<modem command>
+       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>
+       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
+@@ -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.
+-  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.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
+@@ -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/<servicename>
+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
+@@ -7,7 +7,7 @@
  #		Modified for RHS Linux by Marc Ewing and Donnie Barnes
  #
  
@@ -10,10 +45,19 @@ diff -ur rc-scripts-0.4.5.5.orig/inittab rc-scripts-0.4.5.5/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.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 @@
+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
+@@ -5,7 +5,7 @@
+ #
+ # Author:	Miquel van Smoorenburg, <miquels@drinkel.nl.mugnet.org>
+ # Hacked by:	Greg Galloway and Marc Ewing
+-# Modified for PLD Linux by:
++# Modified for TLD Linux by:
+ #		Marek Obuchowicz <elephant@pld-linux.org>
+ #		Arkadiusz Miśkiewicz <misiek@pld-linux.org>
+ #		Michał Kochanowicz <mkochano@pld-linux.org>
+@@ -47,7 +47,7 @@
  CBUSY="$MAGENTA"	# BUSY color
  CFAIL="$RED"		# FAIL and DIED color
  CPOWEREDBY="$CYAN"	# "Powered by" color
@@ -22,34 +66,34 @@ diff -ur rc-scripts-0.4.5.5.orig/lib/functions rc-scripts-0.4.5.5/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
-@@ -379,7 +379,7 @@
+@@ -422,7 +422,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.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 @@
+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 @@
  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%s"
  msgstr ""
  
  #: .././rc.d/init.d/netfs:154
-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 @@
+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 @@
  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%s"
@@ -57,31 +101,31 @@ diff -ur rc-scripts-0.4.5.5.orig/po/pl.po rc-scripts-0.4.5.5/po/pl.po
  
  #: .././rc.d/init.d/netfs:154
  msgid "Active NFS mountpoints: "
-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 @@
+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 @@
  msgstr ""
  
- #: .././rc.d/rc.sysinit:242
+ #: .././rc.d/rc.sysinit:462
 -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.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
+ #: .././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 @@
+ 
+ 	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 @@
+@@ -460,7 +460,7 @@
  
  
  # Print welcome message
@@ -90,21 +134,21 @@ diff -ur rc-scripts-0.4.5.5.orig/rc.d/rc.sysinit rc-scripts-0.4.5.5/rc.d/rc.sysi
  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.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
+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 @@
  	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.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
+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
 @@ -1,11 +1,11 @@
 -# Default PLD Linux colors.
 +# Default TLD Linux colors.
@@ -119,9 +163,9 @@ diff -ur rc-scripts-0.4.5.5.orig/sysconfig/init-colors rc-scripts-0.4.5.5/syscon
  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.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
+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 @@
  CBUSY="$MAGENTA $BOLD"		# BUSY color
  CFAIL="$RED $BOLD"		# FAIL and DIED color
@@ -131,3 +175,15 @@ diff -ur rc-scripts-0.4.5.5.orig/sysconfig/init-colors.gentoo rc-scripts-0.4.5.5
  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 @@
+ # 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.