diff --git a/.gitignore b/.gitignore index 13089be..457f3ad 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,6 @@ INIT.2010-07-01.tgz /ast-ksh.2012-08-01b.tgz /ksh-1.0.0-beta.1.tar.gz /ksh-1.0.0-beta.2.tar.gz +/ksh-1.0.0.tar.gz +/ksh-1.0.1.tar.gz +/ksh-1.0.2.tar.gz diff --git a/ksh-1.0.0-beta.2-fix-build.patch b/ksh-1.0.0-beta.2-fix-build.patch deleted file mode 100644 index b87b1c6..0000000 --- a/ksh-1.0.0-beta.2-fix-build.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/src/cmd/builtin/Mamfile b/src/cmd/builtin/Mamfile -index 34d463a..c69686e 100644 ---- a/src/cmd/builtin/Mamfile -+++ b/src/cmd/builtin/Mamfile -@@ -53,7 +53,7 @@ make install - exec - ${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -DERROR_CATALOG=\""builtin"\" -D_PACKAGE_ast -DCMD_STANDALONE=b_pty -c pty.c - done pty.o generated - bind -lutil dontcare -- exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${CCFLAGS} ${LDFLAGS} -lm ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o pty pty.o ${mam_libutil} ${mam_libast} ${mam_libcmd} -+ exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o pty pty.o -lm ${mam_libutil} ${mam_libast} ${mam_libcmd} - done pty generated - make ${INSTALLROOT}/bin - exec - if silent test ! -d ${INSTALLROOT}/bin -diff --git a/src/cmd/ksh93/Mamfile b/src/cmd/ksh93/Mamfile -index 873858a..148eea6 100644 ---- a/src/cmd/ksh93/Mamfile -+++ b/src/cmd/ksh93/Mamfile -@@ -67,7 +67,7 @@ make install - bind -ldll - bind -lcmd - bind -last -- bind -lm dontcare -+ bind -lm - bind -lnsl dontcare - exec - iffe ${IFFEFLAGS} -v -c "${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS}" ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libnsl} : run features/externs - done FEATURE/externs generated -@@ -1226,7 +1226,7 @@ make install - make data/math.tab implicit - done data/math.tab - done features/math.sh dontcare -- exec - iffe ${IFFEFLAGS} -v -c "${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS}" ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libnsl} : run features/math.sh ${PACKAGEROOT}/src/cmd/ksh93/data/math.tab -+ exec - iffe ${IFFEFLAGS} -v -c "${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS}" ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libnsl} -lm : run features/math.sh ${PACKAGEROOT}/src/cmd/ksh93/data/math.tab - make ${PACKAGE_ast_INCLUDE}/ast_standards.h implicit - done ${PACKAGE_ast_INCLUDE}/ast_standards.h dontcare - make ${INSTALLROOT}/src/lib/libast/FEATURE/float implicit -@@ -1393,7 +1393,7 @@ make install - prev +li - prev ${mam_libsocket} - prev ${mam_libsecdb} -- exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o ksh pmain.o ${mam_libshell} ${mam_libnsl} ${mam_libast} -+ exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o ksh pmain.o -lm ${mam_libshell} ${mam_libnsl} ${mam_libast} - done ksh generated - make shcomp - make shcomp.o -@@ -1415,7 +1415,7 @@ make install - prev +li - prev ${mam_libsocket} - prev ${mam_libsecdb} -- exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o shcomp shcomp.o ${mam_libshell} ${mam_libnsl} ${mam_libast} -+ exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o shcomp shcomp.o -lm ${mam_libshell} ${mam_libnsl} ${mam_libast} - done shcomp generated - make suid_exec - make suid_exec.o -@@ -1436,7 +1436,7 @@ make install - prev +li - prev ${mam_libsocket} - prev ${mam_libsecdb} -- exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS} -lm ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o suid_exec suid_exec.o ${mam_libast} ${mam_libnsl} ${mam_libast} -+ exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o suid_exec suid_exec.o -lm ${mam_libast} ${mam_libnsl} ${mam_libast} - done suid_exec generated - make shell - prev libshell.a archive diff --git a/ksh-1.0.0-beta.2-regre-tests.patch b/ksh-1.0.2-regre-tests.patch similarity index 100% rename from ksh-1.0.0-beta.2-regre-tests.patch rename to ksh-1.0.2-regre-tests.patch diff --git a/ksh.spec b/ksh.spec index cee95c1..08e87c0 100644 --- a/ksh.spec +++ b/ksh.spec @@ -1,23 +1,17 @@ -%global verBetaPrefix 1.0.0 -%global verBetaSuffix 2 -%global verBetaFull %{verBetaPrefix}-beta.%{verBetaSuffix} - Name: ksh Summary: The Original ATT Korn Shell URL: http://www.kornshell.com/ -License: EPL-1.0 +License: EPL-2.0 Epoch: 3 -Version: %{verBetaPrefix}~beta.%{verBetaSuffix} -Release: 2%{?dist} -Source0: https://github.com/ksh93/%{name}/archive/v%{verBetaFull}/%{name}-%{verBetaFull}.tar.gz +Version: 1.0.2 +Release: 1%{?dist} +Source0: https://github.com/ksh93/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz Source1: kshcomp.conf Source2: kshrc.rhs Source3: dotkshrc # temporary commenting out failing i686 test -Patch1: %{name}-%{verBetaFull}-regre-tests.patch -# in some build commands relocate "-lm" flag -Patch2: %{name}-%{verBetaFull}-fix-build.patch +Patch1: %{name}-%{version}-regre-tests.patch Conflicts: pdksh @@ -39,31 +33,33 @@ KornShell is a shell programming language, which is upward compatible with "sh" (the Bourne Shell). %prep -%autosetup -n %{name}-%{verBetaFull} -p1 +%autosetup -p1 -#/dev/fd test does not work because of mock +# /dev/fd test does not work because of mock sed -i 's|ls /dev/fd|ls /proc/self/fd|' src/cmd/ksh93/features/options # disable register for debugging 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 -Wno-maybe-uninitialized -Wno-lto-type-mismatch -P do $CC $f -E - /dev/null 2>&1 && XTRAFLAGS="$XTRAFLAGS $f" done -export CCFLAGS="$RPM_OPT_FLAGS $RPM_LD_FLAGS -fno-strict-aliasing $XTRAFLAGS" -./bin/package make +export CCFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing $XTRAFLAGS" +export LDFLAGS="$RPM_LD_FLAGS" +bin/package make %install -mkdir -p %{buildroot}{/bin,%{_bindir},%{_mandir}/man1} +# TODO +# bin/package install + +mkdir -p %{buildroot}{%{_bindir},%{_mandir}/man1} install -p -m 755 arch/*/bin/ksh %{buildroot}%{_bindir}/ksh93 install -p -m 755 arch/*/bin/shcomp %{buildroot}%{_bindir}/shcomp install -p -m 644 arch/*/man/man1/sh.1 %{buildroot}%{_mandir}/man1/ksh93.1 -mkdir -p %{buildroot}%{_sysconfdir}/skel -install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/skel/.kshrc +install -p -D -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/skel/.kshrc install -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/kshrc install -p -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/binfmt.d/kshcomp.conf @@ -74,7 +70,7 @@ touch %{buildroot}%{_bindir}/rksh touch %{buildroot}%{_mandir}/man1/rksh.1.gz %check -./bin/shtests --compile +bin/package test %post for s in /bin/ksh /bin/rksh /usr/bin/ksh /usr/bin/rksh @@ -130,13 +126,14 @@ else fi %files -%doc src/cmd/ksh93/COMPATIBILITY src/cmd/ksh93/RELEASE src/cmd/ksh93/TYPES +%doc src/cmd/ksh93/{COMPATIBILITY,RELEASE,TYPES,README} +%doc README.md NEWS %license LICENSE.md %{_bindir}/ksh93 %ghost %{_bindir}/ksh %ghost %{_bindir}/rksh %{_bindir}/shcomp -%{_mandir}/man1/* +%{_mandir}/man1/ksh93.1* %ghost %{_mandir}/man1/ksh.1.gz %ghost %{_mandir}/man1/rksh.1.gz %config(noreplace) %{_sysconfdir}/skel/.kshrc @@ -144,6 +141,10 @@ fi %config(noreplace) %{_sysconfdir}/binfmt.d/kshcomp.conf %changelog +* Mon Aug 08 2022 Vincent Mihalkovic - 3:1.0.2-1 +- new upstream release + Resolves: #2110530, #2114545 + * Thu Jul 21 2022 Fedora Release Engineering - 3:1.0.0~beta.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index cb81133..ab028e8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ksh-1.0.0-beta.2.tar.gz) = c2cd5a4b442bcff1dd2c1c054ee79c4cb131dce28d811dcd3476164d6cb7e88e6b317a094b16f227564a1266708ef0cfeca2af0929c00a19497cf1b67c647cf2 +SHA512 (ksh-1.0.2.tar.gz) = bc82b86e65425d3041e336e9745016f4ac4f6a5b173a5d59b1ac2a61ba1698c06d4d3ac5edf5a901c1aef57326bed9dd42776846aa4bbc221867ec3b2a6f752f