- md5

diff --git a/color-fix.patch b/color-fix.patch
deleted file mode 100644 (file)
index 3af2643..0000000
--- a/color-fix.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 5d89b49a413e24dae01d41cdb0d50b919ad4830e Mon Sep 17 00:00:00 2001
-From: Marcin Krol <hawk@tld-linux.org>
-Date: Fri, 8 May 2020 21:18:49 +0200
-Subject: [PATCH] - drop setting color to white as default, use color reset
- instead
-
----
- lib/functions         | 7 +++----
- sysconfig/init-colors | 2 +-
- 2 files changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/lib/functions b/lib/functions
-index fb41ffa..8f08dc6 100644
---- a/lib/functions
-+++ b/lib/functions
-@@ -39,7 +39,6 @@ BLUE=4
- MAGENTA=5
- CYAN=6
- WHITE=7
--NORMAL=15
- # Bold definition (second parameter to termput setaf)
- BOLD=1
- NOBOLD=0
-@@ -53,7 +52,7 @@ 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
--CCHARS="$NORMAL"      # Color of these characters (look at /etc/sysconfig/init-colors.gentoo example)
-+CCHARS="$WHITE"               # Color of these characters (look at /etc/sysconfig/init-colors.gentoo example)
- 
- # Source configuration if available - may override default values
- [ -r /etc/sysconfig/init-colors ] && . /etc/sysconfig/init-colors
-@@ -283,7 +282,7 @@ termput() {
-                       is_yes "$COLOR_INIT" && echo -ne "\033[${ISBOLD};3${2}m"
-                       ;;
-               op)
--                      termput setaf $NORMAL
-+                      echo -ne "\033[0m"
-                       ;;
-               esac
-       else
-@@ -296,7 +295,7 @@ termput() {
-                       is_yes "$COLOR_INIT" && tput setaf "$2"
-                       ;;
-               op)
--                      termput setaf $NORMAL
-+                      tput sgr0
-                       ;;
-               esac
-       fi
-diff --git a/sysconfig/init-colors b/sysconfig/init-colors
-index 1632fdb..8798b96 100644
---- a/sysconfig/init-colors
-+++ b/sysconfig/init-colors
-@@ -9,4 +9,4 @@ 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
--CCHARS="$NORMAL"      # Color of these characters (look at /usr/share/doc/rc-scripts-*/init-colors.gentoo.gz example)
-+CCHARS="$WHITE"               # Color of these characters (look at /usr/share/doc/rc-scripts-*/init-colors.gentoo.gz example)
--- 
-2.25.1
-

diff --git a/cryptsetup-locks.patch b/cryptsetup-locks.patch
deleted file mode 100644 (file)
index 028ba32..0000000
--- a/cryptsetup-locks.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Marcin Krol <hawk@tld-linux.org>
-Date: Wed, 1 Mar 2023 00:57:42 +0000 (+0100)
-Subject: - disable lock checks (happens on LUKS2 and fails during system boot)
-X-Git-Url: https://git.tld-linux.org/?p=rc-scripts.git;a=commitdiff_plain;h=6066bc28dc8b40335ea2a4554691900fa6813c8a
-
-- disable lock checks (happens on LUKS2 and fails during system boot)
----
-
-diff --git a/rc.d/init.d/cryptsetup b/rc.d/init.d/cryptsetup
-index 263a39c..d5ac2c3 100755
---- a/rc.d/init.d/cryptsetup
-+++ b/rc.d/init.d/cryptsetup
-@@ -105,7 +105,7 @@ init_crypto() {
-                       continue
-               fi
- 
--              if /sbin/cryptsetup isLuks "$src" 2>/dev/null; then
-+              if /sbin/cryptsetup --disable-locks isLuks "$src" 2>/dev/null; then
-                       if key_is_random "$key"; then
-                               nls "%s: LUKS requires non-random key, skipping" "$dst"
-                               ret=1
-@@ -114,7 +114,7 @@ init_crypto() {
-                       if [ -n "$params" ]; then
-                               nls "%s: options are invalid for LUKS partitions, ignoring them" "$dst"
-                       fi
--                      /sbin/cryptsetup ${key:+-d $key} luksOpen "$src" "$dst" <&1
-+                      /sbin/cryptsetup --disable-locks ${key:+-d $key} luksOpen "$src" "$dst" <&1
-               fi
-               rc=$?
-               if [ $rc -ne 0 ]; then
-@@ -144,7 +144,7 @@ halt_crypto() {
-       [ -z "$dst" -o "${dst#\#}" != "$dst" ] && continue
-         if [ -b "/dev/mapper/$dst" ]; then
-             if LC_ALL=C /sbin/dmsetup info "$dst" | grep -q '^Open count: *0$'; then
--                /sbin/cryptsetup remove "$dst"
-+                /sbin/cryptsetup --disable-locks remove "$dst"
-             else
-                 fnval=1
-             fi

diff --git a/rc-scripts.spec b/rc-scripts.spec
index 359020cd815042edc77e8689385236cda9e12e7a..cd029fc3b15a895332f5a832d4585a43d2c498f5 100644 (file)
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -7,14 +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
 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.5.2
-Release:       5
+Version:       0.5.3
+Release:       1

 License:       GPL v2
 Group:         Base
 Source0:       %{name}-%{version}.tar.gz
 License:       GPL v2
 Group:         Base
 Source0:       %{name}-%{version}.tar.gz

-# Source0-md5: bc6f66a2511cf866e852d40349d7b609
-Patch0:                color-fix.patch
-Patch1:                cryptsetup-locks.patch
+# Source0-md5: 4d4edbbda63e5229573eda3b6c507e35

 URL:           https://git.tld-linux.org/?p=rc-scripts.git
 BuildRequires: autoconf
 BuildRequires: automake
 URL:           https://git.tld-linux.org/?p=rc-scripts.git
 BuildRequires: autoconf
 BuildRequires: automake


@@ -45,6 +43,7 @@ Requires:     gettext
 Requires:      grep
 Requires:      hostname
 Requires:      iproute2
 Requires:      grep
 Requires:      hostname
 Requires:      iproute2

+Requires:      iproute2-tc

 Requires:      iputils-arping
 Requires:      mingetty
 Requires:      mktemp
 Requires:      iputils-arping
 Requires:      mingetty
 Requires:      mktemp


@@ -103,8 +102,6 @@ programcıklar içerir.
 
 %prep
 %setup -q
 
 %prep
 %setup -q

-%patch0 -p1
-%patch1 -p1

 
 # hack, currently this results in errno@@GLIBC_PRIVATE symbol in ppp-watch:
 #GLIB_LIBS="-Wl,-static `$PKG_CONFIG --libs --static glib-2.0` -Wl,-Bdynamic"
 
 # hack, currently this results in errno@@GLIBC_PRIVATE symbol in ppp-watch:
 #GLIB_LIBS="-Wl,-static `$PKG_CONFIG --libs --static glib-2.0` -Wl,-Bdynamic"