From 773b5dd4df762d3a9ce0666b1cfe84c41a1a7baca4b606e78fe19cc495251915 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 21 Aug 2023 05:30:48 +0000 Subject: [PATCH] Accepting request 1104190 from home:dimstar:Factory - xznew: Remove bashsism. - build: pass CONFIG_SHELL=/bin/sh to configure: the posix tools are setting the current SHELL as the shebang, which is overkill: any posix compliant shell, aka /bin/sh, is sufficient. OBS-URL: https://build.opensuse.org/request/show/1104190 OBS-URL: https://build.opensuse.org/package/show/Base:System/xz?expand=0&rev=138 --- xz.changes | 8 ++++++++ xz.spec | 2 +- xznew | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/xz.changes b/xz.changes index 73c61fb..c039c9c 100644 --- a/xz.changes +++ b/xz.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Aug 16 13:58:09 UTC 2023 - Dominique Leuenberger + +- xznew: Remove bashsism. +- build: pass CONFIG_SHELL=/bin/sh to configure: the posix tools + are setting the current SHELL as the shebang, which is overkill: + any posix compliant shell, aka /bin/sh, is sufficient. + ------------------------------------------------------------------- Thu Aug 3 07:01:39 UTC 2023 - Paolo Stivanin diff --git a/xz.spec b/xz.spec index 180a0a8..5fed776 100644 --- a/xz.spec +++ b/xz.spec @@ -83,7 +83,7 @@ export LDFLAGS="-Wl,-z,relro,-z,now -pie" %configure \ --with-pic \ --docdir=%{_docdir}/%{name} \ - --disable-static + --disable-static CONFIG_SHELL=/bin/sh %if 0%{?do_profiling} %make_build CFLAGS="${CFLAGS} %{cflags_profile_generate}" %make_build diff --git a/xznew b/xznew index 744913d..e48c258 100644 --- a/xznew +++ b/xznew @@ -52,7 +52,7 @@ if test -z "$cpmod" && ${TOUCH-touch} -r $tmp/1 $tmp/2 2>/dev/null; then fi # check about xz extension -xz $tmp/1 &> /dev/null +xz $tmp/1 > /dev/null 2>&1 ext=`echo $tmp/1* | sed "s|$tmp/1||"` rm -rf $tmp/ trap - 0 1 2 3 6 13 15