Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/ksh.git#336d54ef336311c2ac200f81ed79790730b3f564
This commit is contained in:
DistroBaker 2021-01-22 16:54:06 +00:00
parent db8b5b018f
commit 4e3755ad7e
4 changed files with 21 additions and 39 deletions

1
.fmf/version Normal file
View File

@ -0,0 +1 @@
1

View File

@ -7,7 +7,7 @@ URL: http://www.kornshell.com/
License: EPL
Epoch: 2
Version: %{releasedate}
Release: 251%{?dist}
Release: 252%{?dist}
Source0: http://www.research.att.com/~gsf/download/tgz/ast-ksh.%{release_date}.tgz
Source1: http://www.research.att.com/~gsf/download/tgz/INIT.%{release_date}.tgz
Source2: kshcomp.conf
@ -250,16 +250,16 @@ sed -i '/-c sh\/main.c/s|${mam_cc_FLAGS} |${mam_cc_FLAGS} ${CCFLAGS} |p' src/cmd
sed -i 1i"#define register" src/lib/libast/include/ast.h
%build
%set_build_flags
XTRAFLAGS=""
for f in -Wno-unknown-pragmas -Wno-missing-braces -Wno-unused-result -Wno-return-type -Wno-int-to-pointer-cast -Wno-parentheses -Wno-unused -Wno-unused-but-set-variable -Wno-cpp -P
do
gcc $f -E - </dev/null >/dev/null 2>&1 && XTRAFLAGS="$XTRAFLAGS $f"
$CC $f -E - </dev/null >/dev/null 2>&1 && XTRAFLAGS="$XTRAFLAGS $f"
done
./bin/package
./bin/package make mamake ||:
./bin/package make mamake ||:
export CCFLAGS="$RPM_OPT_FLAGS $RPM_LD_FLAGS -fno-strict-aliasing $XTRAFLAGS"
export CC=gcc
./bin/package make -S
#cp lib/package/LICENSES/epl LICENSE
@ -370,6 +370,9 @@ fi
%config(noreplace) %{_sysconfdir}/binfmt.d/kshcomp.conf
%changelog
* Fri Jan 22 2021 Vincent Mihalkovic <vmihalko@redhat.com> - 2:20120801-252
- Use set_build_flags and standard CC variables (commit: c488ab6)
* Thu Aug 13 2020 Siteshwar Vashisht <svashisht@redhat.com> - 2:20120801-251
- Restore ksh to version 20120801
Resolves: #1868715

14
plans/shell.fmf Normal file
View File

@ -0,0 +1,14 @@
summary:
Run relevant tests from the shell tests repository
discover:
how: fmf
url: https://src.fedoraproject.org/tests/shell
filter: component:ksh
prepare:
how: install
package: ksh
execute:
how: tmt
environment:
PACKAGES: ksh
SH_BIN: ksh

View File

@ -1,36 +0,0 @@
---
# Tests that run in classic context
- hosts: localhost
roles:
- role: standard-test-beakerlib
tags:
- classic
repositories:
- repo: "https://src.fedoraproject.org/tests/shell.git"
dest: "shell"
fmf_filter: "tier: 1, 2 & tags: classic"
environment:
PACKAGES: ksh
SH_BIN: ksh
required_packages:
- ksh
- expect # login requires expect
- which # smoke requires which
# Tests that run in container
- hosts: localhost
roles:
- role: standard-test-beakerlib
tags:
- container
repositories:
- repo: "https://src.fedoraproject.org/tests/shell.git"
dest: "shell"
fmf_filter: "tier: 1, 2 & tags: container, atomic"
environment:
PACKAGES: ksh
SH_BIN: ksh
required_packages:
- ksh
- which # smoke requires which