From ee39364a9795863d9a2ee5bc1b1a159e0eec7304 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Mon, 10 Jul 2023 11:43:11 +0200 Subject: [PATCH 1/4] - release 6 --- rc-scripts.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rc-scripts.spec b/rc-scripts.spec index 359020c..ab0a425 100644 --- a/rc-scripts.spec +++ b/rc-scripts.spec @@ -8,7 +8,7 @@ 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 +Release: 6 License: GPL v2 Group: Base Source0: %{name}-%{version}.tar.gz -- 2.45.1 From 3c758567c738aa33a731284cd96ad8e5a44cd11a Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sun, 28 Apr 2024 20:07:17 +0200 Subject: [PATCH 2/4] - tc is now in separate package --- rc-scripts.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rc-scripts.spec b/rc-scripts.spec index ab0a425..7b23974 100644 --- a/rc-scripts.spec +++ b/rc-scripts.spec @@ -8,7 +8,7 @@ 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: 6 +Release: 7 License: GPL v2 Group: Base Source0: %{name}-%{version}.tar.gz @@ -45,6 +45,7 @@ Requires: gettext Requires: grep Requires: hostname Requires: iproute2 +Requires: iproute2-tc Requires: iputils-arping Requires: mingetty Requires: mktemp -- 2.45.1 From 8bc586796b8fe15df64d427b03a9fd0e0972d4e4 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Thu, 16 May 2024 01:24:38 +0200 Subject: [PATCH 3/4] - updated to 0.5.3 --- color-fix.patch | 63 ------------------------------------------ cryptsetup-locks.patch | 39 -------------------------- rc-scripts.spec | 8 ++---- 3 files changed, 2 insertions(+), 108 deletions(-) delete mode 100644 color-fix.patch delete mode 100644 cryptsetup-locks.patch diff --git a/color-fix.patch b/color-fix.patch deleted file mode 100644 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 -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 index 028ba32..0000000 --- a/cryptsetup-locks.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: Marcin Krol -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 7b23974..e694cc1 100644 --- 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 -Version: 0.5.2 -Release: 7 +Version: 0.5.3 +Release: 1 License: GPL v2 Group: Base Source0: %{name}-%{version}.tar.gz # Source0-md5: bc6f66a2511cf866e852d40349d7b609 -Patch0: color-fix.patch -Patch1: cryptsetup-locks.patch URL: https://git.tld-linux.org/?p=rc-scripts.git BuildRequires: autoconf BuildRequires: automake @@ -104,8 +102,6 @@ programcıklar içerir. %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" -- 2.45.1 From f90c6f44c466cc8518959a51bf901218a2bd32fb Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Thu, 16 May 2024 01:25:26 +0200 Subject: [PATCH 4/4] - md5 --- rc-scripts.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rc-scripts.spec b/rc-scripts.spec index e694cc1..cd029fc 100644 --- a/rc-scripts.spec +++ b/rc-scripts.spec @@ -12,7 +12,7 @@ Release: 1 License: GPL v2 Group: Base Source0: %{name}-%{version}.tar.gz -# Source0-md5: bc6f66a2511cf866e852d40349d7b609 +# Source0-md5: 4d4edbbda63e5229573eda3b6c507e35 URL: https://git.tld-linux.org/?p=rc-scripts.git BuildRequires: autoconf BuildRequires: automake -- 2.45.1