Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=07ca0d47d8af30c8f1eb43e778b8bb88e66dade7
commit 07ca0d47d8af30c8f1eb43e778b8bb88e66dade7 Author: DeX77 <[email protected]> Date: Mon Apr 17 20:37:22 2017 +0200 dracut-045-1-x86_64 * version bump diff --git a/source/base-extra/dracut/FrugalBuild b/source/base-extra/dracut/FrugalBuild index 8525da3..96a38f6 100644 --- a/source/base-extra/dracut/FrugalBuild +++ b/source/base-extra/dracut/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: James Buren <[email protected]> pkgname=dracut -pkgver=044 -pkgrel=3 +pkgver=045 +pkgrel=1 pkgdesc="Generic initramfs generationtool" rodepends=('systemd>=227-15' 'util-linux>=2.27.1-4' 'bash>=4.4' \ 'dash>=0.5.8' 'kbd>=2.0.3-3' 'cpio>=2.12-3' 'multipath-tools>=0.5.0-4' \ @@ -11,13 +11,12 @@ rodepends=('systemd>=227-15' 'util-linux>=2.27.1-4' 'bash>=4.4' \ 'dmraid' ) makedepends=("docbook-sgml-dtd" "libxslt" "docbook-xsl" "docbook-xml" "asciidoc") groups=('base-extra') -archs=('i686' 'x86_64') +archs=('x86_64') url="http://www.kernel.org/pub/linux/utils/boot/dracut/dracut.html"; up2date="Flasttar http://www.kernel.org/pub/linux/utils/boot/dracut/"; source=(http://kernel.org/pub/linux/utils/boot/dracut/$pkgname-$pkgver.tar.xz \ - fix_fakeroot.patch \ - bash_44_compat.patch ) -signatures=(${source/.tar.xz/.tar.sign} '' '') + fix_fakeroot.patch ) +signatures=(${source/.tar.xz/.tar.sign} '') backup=(etc/dracut.conf) options=('scriptlet' 'force') diff --git a/source/base-extra/dracut/bash_44_compat.patch b/source/base-extra/dracut/bash_44_compat.patch deleted file mode 100644 index 01c0692..0000000 --- a/source/base-extra/dracut/bash_44_compat.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?= <[email protected]> -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/source/base-extra/dracut/fix_fakeroot.patch b/source/base-extra/dracut/fix_fakeroot.patch index 6adf464..3227c4a 100644 --- a/source/base-extra/dracut/fix_fakeroot.patch +++ b/source/base-extra/dracut/fix_fakeroot.patch @@ -1,10 +1,10 @@ ---- dracut-043/dracut.sh 2015-06-15 12:27:21.000000000 +0200 -+++ dracut-043.new/dracut.sh 2015-07-29 15:27:31.885990049 +0200 -@@ -1722,7 +1722,7 @@ - [[ "$(cpio --help)" == *--reproducible* ]] && CPIO_REPRODUCIBLE=1 +--- dracut-045/dracut.sh 2017-04-03 10:26:25.000000000 +0200 ++++ dracut-045.new/dracut.sh 2017-04-17 20:35:54.000000000 +0200 +@@ -1717,7 +1717,7 @@ + fi fi --[[ "$UID" != 0 ]] && cpio_owner_root="-R 0:0" +-[[ "$EUID" != 0 ]] && cpio_owner_root="-R 0:0" +cpio_owner_root="-R 0:0" if [[ $create_early_cpio = yes ]]; then _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
