- merged 0.4.6 from PLD, updated TLD patch

diff --git a/rc-scripts-tld.patch b/rc-scripts-tld.patch
index 6f828d2152ec588a3e1f56d1068b1f988ffdfd3c..5b9feb619d6b4355560e8dbf6e39732d870872fb 100644 (file)
--- a/rc-scripts-tld.patch
+++ b/rc-scripts-tld.patch
@@ -1,6 +1,41 @@
-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
+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=<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
+@@ -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,9 +45,18 @@ 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
+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, <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>
 @@ -48,7 +48,7 @@
  CBUSY="$MAGENTA"      # BUSY color
  CFAIL="$RED"          # FAIL and DIED color
@@ -22,7 +66,7 @@ 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 @@
+@@ -390,7 +390,7 @@
        nls "Usage: %s" "$*"
  }
  
@@ -31,25 +75,25 @@ diff -ur rc-scripts-0.4.5.5.orig/lib/functions rc-scripts-0.4.5.5/lib/functions
  show() {
        local text len
  
-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.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%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.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%s"
@@ -57,9 +101,9 @@ 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
+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 ""
  
@@ -69,9 +113,9 @@ diff -ur rc-scripts-0.4.5.5.orig/po/rc-scripts.pot rc-scripts-0.4.5.5/po/rc-scri
  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
+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
@@ -90,9 +134,9 @@ 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.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 -ur rc-scripts-0.4.5.5.orig/src/setuidgid.c rc-scripts-0.4.5.5/src/setuidgi
  }
  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.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.
@@ -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.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

diff --git a/rc-scripts.spec b/rc-scripts.spec
index bc18a46a6d03541a161a726d69f7f31c6bae51f6..89ca1d943896deb44b6382e99bfcf4c8fe468013 100644 (file)
--- 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.5.5
-Release:       1
+Version:       0.4.6
+Release:       2
 License:       GPL v2
 Group:         Base
 Source0:       %{name}-%{version}.tar.gz
-# Source0-md5: e6f5f1d3afcdad7e0d808ffaaa8e2aba
+# Source0-md5: 4340461fd2bdfd04b71ec926ca3bad71
 Source1:       rc-local.service
 Source2:       sys-chroots.service
 Source3:       %{name}.tmpfiles
@@ -38,11 +38,11 @@ Requires:   /bin/basename
 Requires:      /bin/gettext
 Requires:      /bin/nice
 Requires:      /bin/ps
-Requires:      virtual(init-daemon)
 Requires:      SysVinit-tools >= 2.88-1
 Requires:      blockdev
 Requires:      coreutils
 Requires:      ethtool
+Requires:      virtual(init-daemon)
 Requires:      filesystem >= 4.0-1
 Requires:      findutils
 Requires:      fsck
@@ -60,7 +60,6 @@ Requires:     utempter
 Requires:      util-linux
 Requires:      virtual(module-tools)
 Suggests:      libcgroup
-Provides:      initscripts
 Obsoletes:     initscripts
 Obsoletes:     vserver-rc-scripts
 Conflicts:     LPRng < 3.8.0-2
@@ -71,13 +70,14 @@ Conflicts:  psacct < 6.3.5-10
 Conflicts:     tzdata < 2007b-1.1
 Conflicts:     udev-core < 1:135-2
 Conflicts:     lvm2 < 2.02.83
+Conflicts:     pdksh < 5.2.14-58
 Conflicts:     upstart-SysVinit < 2.86-25
 Conflicts:     wpa_supplicant < 0.6.3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _exec_prefix    /
 %define                localedir       /etc/sysconfig/locale
-%define        _bindir         /bin
+%define                _bindir         /bin
 %define                _sbindir        /sbin
 
 %description
@@ -183,6 +183,9 @@ ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/local.service
 install %{SOURCE2} $RPM_BUILD_ROOT%{systemdunitdir}/sys-chroots.service
 install %{SOURCE3} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 
+# packaged into SysVinit and systemd-init (supported options differ)
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man5/crypttab.5
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -203,7 +206,17 @@ chown root:root /var/cache/rc-scripts/msg.cache
 
 # move network interfaces description files to new location
 %triggerpostun -- initscripts
-mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
+[ -d /etc/sysconfig/network-scripts ] || exit 0
+cd /etc/sysconfig/network-scripts
+for iface in ifcfg-* ; do
+       [ -f $iface ] || continue
+       if [ -f /etc/sysconfig/interfaces/$iface ]; then
+               echo "/etc/sysconfig/interfaces/$iface renamed to /etc/sysconfig/interfaces/$iface.rpmnew"
+               mv -f /etc/sysconfig/interfaces/$iface{,.rpmnew}
+       fi
+       echo "/etc/sysconfig/network-scripts/$iface moved to /etc/sysconfig/interfaces/$iface"
+       mv -f /etc/sysconfig/network-scripts/$iface /etc/sysconfig/interfaces
+done
 
 %files
 %defattr(644,root,root,755)