up to 045

diff --git a/dracut-bash44.patch b/dracut-bash44.patch
deleted file mode 100644 (file)
index 01c0692..0000000
--- a/dracut-bash44.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 54fe53c365c35a3ab9aa4a0c12908079ef376f1e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?tpg=20=28Tomasz=20Pawe=C2=B3=20Gajc=29?= <tpgxyz@gmail.com>
-Date: Tue, 1 Mar 2016 21:03:18 +0100
-Subject: [PATCH] strip NUL bytes in stream before push in string - fixes bug
- #118
-
----
- dracut.sh                                  | 2 +-
- modules.d/50drm/module-setup.sh            | 6 +++---
- modules.d/90kernel-modules/module-setup.sh | 6 +++---
- 3 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/dracut.sh b/dracut.sh
-index 98dbe0b..2b583de 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -1595,7 +1595,7 @@ if [[ $do_strip = yes ]] && ! [[ $DRACUT_FIPS_MODE ]]; then
-     # strip kernel modules, but do not touch signed modules
-     find "$initdir" -type f -path '*/lib/modules/*.ko' -print0 \
-         | while read -r -d $'\0' f || [ -n "$f" ]; do
--        SIG=$(tail -c 28 "$f")
-+        SIG=$(tail -c 28 "$f" | tr -d '\000')
-         [[ $SIG == '~Module signature appended~' ]] || { printf "%s\000" "$f"; }
-     done | xargs -r -0 strip -g
- 
-diff --git a/modules.d/50drm/module-setup.sh b/modules.d/50drm/module-setup.sh
-index 55a214e..80f8ecd 100755
---- a/modules.d/50drm/module-setup.sh
-+++ b/modules.d/50drm/module-setup.sh
-@@ -24,9 +24,9 @@ installkernel() {
-             local _fname _fcont
-             while read _fname || [ -n "$_fname" ]; do
-                 case "$_fname" in
--                    *.ko)    _fcont="$(<        $_fname)" ;;
--                    *.ko.gz) _fcont="$(gzip -dc $_fname)" ;;
--                    *.ko.xz) _fcont="$(xz -dc   $_fname)" ;;
-+                    *.ko)    _fcont="$(<        "$_fname" | tr -d '\000')" ;;
-+                    *.ko.gz) _fcont="$(gzip -dc "$_fname" | tr -d '\000')" ;;
-+                    *.ko.xz) _fcont="$(xz -dc   "$_fname" | tr -d '\000')" ;;
-                 esac
-                 [[   $_fcont =~ $_drm_drivers
-                 && ! $_fcont =~ iw_handler_get_spy ]] \
-diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
-index 300adc7..07b2912 100755
---- a/modules.d/90kernel-modules/module-setup.sh
-+++ b/modules.d/90kernel-modules/module-setup.sh
-@@ -10,9 +10,9 @@ installkernel() {
-             function bmf1() {
-                 local _f
-                 while read _f || [ -n "$_f" ]; do case "$_f" in
--                    *.ko)    [[ $(<         $_f) =~ $_blockfuncs ]] && echo "$_f" ;;
--                    *.ko.gz) [[ $(gzip -dc <$_f) =~ $_blockfuncs ]] && echo "$_f" ;;
--                    *.ko.xz) [[ $(xz -dc   <$_f) =~ $_blockfuncs ]] && echo "$_f" ;;
-+                    *.ko)    [[ $(<         "$_f" | tr -d '\000') =~ $_blockfuncs ]] && echo "$_f" ;;
-+                    *.ko.gz) [[ $(gzip -dc <"$_f" | tr -d '\000') =~ $_blockfuncs ]] && echo "$_f" ;;
-+                    *.ko.xz) [[ $(xz -dc   <"$_f" | tr -d '\000') =~ $_blockfuncs ]] && echo "$_f" ;;
-                     esac
-                 done
-                 return 0

diff --git a/dracut.spec b/dracut.spec
index 7147336aa29113b8b472a4cc29b3eb6bf47e5179..eff7ab7121b384aa220811b81bbc3d44f2bb5f30 100644 (file)
--- a/dracut.spec
+++ b/dracut.spec
@@ -1,12 +1,12 @@
 Summary:       Initramfs generator using udev
 Summary(pl.UTF-8):     Generator initramfs wykorzystujący udev
 Name:          dracut
-Version:       044
-Release:       5
+Version:       045
+Release:       1
 License:       GPL v2+
 Group:         Base
 Source0:       https://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
-# Source0-md5: fbb8b6aea24c2f7d328021bbf11788fd
+# Source0-md5: 70d8d222dcdd00b9ee3e05e3bc1d9435
 Source1:       pld.conf
 Patch1:                plymouth-libexec.patch
 Patch2:                os-release.patch
@@ -14,7 +14,6 @@ Patch3:               plymouth-logo.patch
 Patch4:                arch-libdir.patch
 Patch5:                systemd-paths.patch
 Patch6:                prelink-libs.patch
-Patch7:                %{name}-bash44.patch
 URL:           https://dracut.wiki.kernel.org/
 BuildRequires: asciidoc
 BuildRequires: dash
@@ -195,7 +194,6 @@ Bashowe dopełnianie składni dla polecenia dracut.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
 
 %{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/50plymouth/module-setup.sh
 %{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/95resume/module-setup.sh

diff --git a/os-release.patch b/os-release.patch
index f7b061dbe598f4a0fa4bec1ccdc66c269a379482..8650197689cf1bae128562125af1400be24300cd 100644 (file)
--- a/os-release.patch
+++ b/os-release.patch
@@ -9,13 +9,3 @@
  
  mkdir -m 0755 -p "${initdir}/usr/share/plymouth"
  
---- dracut-044/modules.d/99base/module-setup.sh        2015-11-25 15:22:28.000000000 +0200
-+++ dracut-044/modules.d/99base/module-setup.sh        2016-04-27 13:06:21.324369221 +0300
-@@ -77,6 +77,7 @@
-     VERSION_ID=$DRACUT_VERSION
-     ANSI_COLOR="0;34"
- 
-+    [ -e "${initdir}/usr/lib" ] || mkdir -m 0755 -p ${initdir}/usr/lib
-     {
-         echo NAME=\"$NAME\"
-         echo VERSION=\"$VERSION\"