From f473250138a2007838763a55c60a463f26e2891b0257757e3ac3c7b065bff638 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 23 Jan 2015 17:36:17 +0000 Subject: [PATCH] Accepting request 263477 from home:Ledest:bashisms - fix bashisms in brp-compress, symset-table and check-rpaths scripts - fix shebang in find-supplements.ksyms script that contains bash-specific constructions OBS-URL: https://build.opensuse.org/request/show/263477 OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=349 --- brpcompress.diff | 2 +- modalias-kernel_module.diff | 2 +- modalias.diff | 2 +- rpm-4.12.0.1-fix-bashisms.patch | 12 ++++++++++++ rpm.changes | 14 ++++++++++++++ rpm.spec | 2 ++ symset-table | 7 ++++--- 7 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 rpm-4.12.0.1-fix-bashisms.patch diff --git a/brpcompress.diff b/brpcompress.diff index 475265b..087e6ad 100644 --- a/brpcompress.diff +++ b/brpcompress.diff @@ -14,7 +14,7 @@ COMPRESS="gzip -9 -n" COMPRESS_EXT=.gz -+function check_for_hard_link ++check_for_hard_link() +{ + dir=$1 + b=$2 diff --git a/modalias-kernel_module.diff b/modalias-kernel_module.diff index 524e02e..2b00f37 100644 --- a/modalias-kernel_module.diff +++ b/modalias-kernel_module.diff @@ -3,7 +3,7 @@ Index: scripts/find-supplements.ksyms --- scripts/find-supplements.ksyms.orig +++ scripts/find-supplements.ksyms @@ -1,6 +1,8 @@ - #! /bin/sh + #!/bin/bash +SPECFILE=${RPMBUILD_SPECFILE:-/usr/src/packages/SOURCES/$1.spec} IFS=$'\n' diff --git a/modalias.diff b/modalias.diff index abcdefd..2340f25 100644 --- a/modalias.diff +++ b/modalias.diff @@ -25,7 +25,7 @@ --- ./scripts/find-supplements.ksyms.orig 2011-05-11 15:01:39.000000000 +0000 +++ ./scripts/find-supplements.ksyms 2011-05-11 15:01:39.000000000 +0000 @@ -0,0 +1,56 @@ -+#! /bin/sh ++#!/bin/bash + +IFS=$'\n' + diff --git a/rpm-4.12.0.1-fix-bashisms.patch b/rpm-4.12.0.1-fix-bashisms.patch new file mode 100644 index 0000000..4c72a52 --- /dev/null +++ b/rpm-4.12.0.1-fix-bashisms.patch @@ -0,0 +1,12 @@ +diff -Ndur rpm-4.12.0.1/scripts/check-rpaths rpm-4.12.0.1-fix-bashisms/scripts/check-rpaths +--- rpm-4.12.0.1/scripts/check-rpaths 2014-06-30 11:47:14.000000000 +0300 ++++ rpm-4.12.0.1-fix-bashisms/scripts/check-rpaths 2014-11-30 04:51:05.189260640 +0200 +@@ -17,7 +17,7 @@ + + + test -z "$QA_SKIP_RPATHS" || { +- echo $"WARNING: '\$QA_SKIP_RPATHS' is obsoleted by 'QA_RPATHS=[0-7]'" >&2 ++ echo "WARNING: '\$QA_SKIP_RPATHS' is obsoleted by 'QA_RPATHS=[0-7]'" >&2 + exit 0 + } + diff --git a/rpm.changes b/rpm.changes index 1263f86..dea93a4 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sun Nov 30 02:59:00 UTC 2014 - Led + +- fix bashisms in brp-compress, symset-table and check-rpaths + scripts +- fix shebang in find-supplements.ksyms script that contains + bash-specific constructions +- updated patches: + * modalias.diff + * modalias-kernel_module.diff + * brpcompress.diff +- add patches: + * rpm-4.12.0.1-fix-bashisms.patch + ------------------------------------------------------------------- Tue Nov 11 10:51:37 UTC 2014 - mmarek@suse.cz diff --git a/rpm.spec b/rpm.spec index da4c50e..4f939fc 100644 --- a/rpm.spec +++ b/rpm.spec @@ -61,6 +61,7 @@ Source11: db-4.8.30.tar.bz2 Source12: baselibs.conf Patch1: beecrypt-4.1.2.diff Patch2: db.diff +Patch3: rpm-4.12.0.1-fix-bashisms.patch # quilt patches start here Patch11: debugedit.diff Patch13: ignore-auxv.diff @@ -209,6 +210,7 @@ ln -s beecrypt-4.1.2 beecrypt chmod -R u+w db/* rm -f rpmdb/db.h %patch -P 1 -P 2 +%patch3 -p1 %patch -P 11 -P 12 -P 13 -P 14 -P 15 -P 16 -P 17 -P 18 -P 19 %patch -P 20 -P 21 -P 24 -P 25 -P 26 -P 27 -P 28 -P 29 %patch -P 30 -P 31 -P 32 -P 33 -P 34 -P 35 -P 36 -P 37 -P 38 -P 39 diff --git a/symset-table b/symset-table index e9a5f2c..3348059 100644 --- a/symset-table +++ b/symset-table @@ -13,13 +13,14 @@ tmpdir=$(mktemp -t -d ${0##*/}.XXXXXX) trap "cd / ; rm -rf $tmpdir" EXIT cd $tmpdir -shopt -s nullglob -for symsets in /boot/symsets-*.tar.gz; do +ls /boot/symsets-*.tar.gz 2>/dev/null | +while read symsets; do zcat $symsets \ | tar xf - done -for symsets in *; do +ls * 2>/dev/null | +while read symsets; do krel=${symsets#symsets-} for symset in $symsets/*; do class=${symset##*/} ; class=${class%.*}