Compare commits
75 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ac38d264ed | ||
|
|
c68f9f566f |
||
|
|
d6c3c6e517 | ||
|
|
227e833d53 | ||
|
|
7868f048fb | ||
|
|
eaa063e13e | ||
|
|
af5b873272 | ||
|
|
01febed462 | ||
|
|
f9cdb1c078 | ||
|
|
34aba6f9e4 | ||
|
|
1f2a5801fc | ||
|
|
1d13651d9f | ||
|
|
a358eb3b08 | ||
|
|
e3c4a93617 | ||
|
|
53706aeb4c | ||
|
|
9a3c865350 | ||
|
|
1fd77d2533 | ||
|
|
9ec53577bd | ||
|
|
b5fc0eb6b1 | ||
|
|
c109904502 | ||
|
|
1be483011a | ||
|
|
372c1bae6c | ||
|
|
0811db734b | ||
|
|
1784ef6a01 | ||
|
|
1fa13a9bff | ||
|
|
a9da4a55f2 | ||
|
|
996c9e58cc | ||
|
|
8fcb51a814 | ||
|
|
98662a9c46 | ||
|
|
9542d05e68 | ||
|
|
88199b8014 | ||
|
|
e3c52e8686 | ||
|
|
75909450e9 | ||
|
|
8f25db9b3a | ||
|
|
bec7808886 | ||
|
|
f988253071 | ||
|
|
d07598b6fa | ||
|
|
608ab1c4cd | ||
|
|
82a0a5968d | ||
|
|
6a8b4dd229 | ||
|
|
fecec0b0e0 | ||
|
|
bf88776004 | ||
|
|
39937137b1 | ||
|
|
34132615bb | ||
|
|
d60c7c584f | ||
|
|
ec53838b7f | ||
|
|
20982793aa |
||
|
|
a723e62ca0 | ||
|
|
5f17e95f07 | ||
|
|
bc81d7f136 |
||
|
|
62b6be0612 | ||
|
|
28b3e4f6f1 | ||
|
|
c83d01be41 | ||
|
|
7128ddbd68 | ||
|
|
4ba5b3addc | ||
|
|
f06f790764 | ||
|
|
a689e94a2d | ||
|
|
dc514d1e2e | ||
|
|
98b28b26d8 | ||
|
|
5c082f8e2c | ||
|
|
9764fdea91 | ||
|
|
ec7e696300 | ||
|
|
037d453731 | ||
|
|
843aa2f986 | ||
|
|
028c6026b6 | ||
|
|
2393219369 | ||
|
|
0b0356f43c | ||
|
|
aa89ac84da | ||
|
|
3aa802cfd1 | ||
|
|
7debb1f1bc | ||
|
|
0acafb8033 | ||
|
|
506f653551 | ||
|
|
0683921c49 | ||
|
|
5c40a50954 | ||
|
|
1979c07e47 |
14 changed files with 434 additions and 86 deletions
1
.fmf/version
Normal file
1
.fmf/version
Normal file
|
|
@ -0,0 +1 @@
|
|||
1
|
||||
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -2,3 +2,6 @@ which-2.16.tar.gz
|
|||
which-2.18.tar.gz
|
||||
which-2.19.tar.gz
|
||||
/which-2.20.tar.gz
|
||||
/which-2.21.tar.gz
|
||||
/which-2.22.tar.gz
|
||||
/which-2.23.tar.gz
|
||||
|
|
|
|||
7
STAGE1-which
Normal file
7
STAGE1-which
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
srpm $1
|
||||
mcd $BUILDDIR/$1
|
||||
$SRC/${1}-*/configure $TCONFIGARGS
|
||||
notparallel
|
||||
test -d tools/gnulib/lib && make $J V=1 -C tools/gnulib/lib
|
||||
make $J V=1
|
||||
make $J install DESTDIR=${ROOTFS}
|
||||
5
plans/ci.fmf
Normal file
5
plans/ci.fmf
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
summary: Basic smoke test
|
||||
discover:
|
||||
how: fmf
|
||||
execute:
|
||||
how: tmt
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
95be0501a466e515422cde4af46b2744 which-2.20.tar.gz
|
||||
SHA512 (which-2.23.tar.gz) = 738807f79e8cfc5967541a28ae7021247c04c4177279f09be2c19c069af450a7e3b19baf9079fe5569b25b4630bb400be242a123647e52c9fe54f0ad007317bf
|
||||
|
|
|
|||
64
tests/basic-functionality-test/Makefile
Normal file
64
tests/basic-functionality-test/Makefile
Normal file
|
|
@ -0,0 +1,64 @@
|
|||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#
|
||||
# Makefile of /CoreOS/which/Sanity/basic-functionality-test
|
||||
# Description: tests basic functionality
|
||||
# Author: Karel Srot <ksrot@redhat.com>
|
||||
#
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#
|
||||
# Copyright (c) 2017 Red Hat, Inc.
|
||||
#
|
||||
# This copyrighted material is made available to anyone wishing
|
||||
# to use, modify, copy, or redistribute it subject to the terms
|
||||
# and conditions of the GNU General Public License version 2.
|
||||
#
|
||||
# This program is distributed in the hope that it will be
|
||||
# useful, but WITHOUT ANY WARRANTY; without even the implied
|
||||
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||
# PURPOSE. See the GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public
|
||||
# License along with this program; if not, write to the Free
|
||||
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
# Boston, MA 02110-1301, USA.
|
||||
#
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
export TEST=/CoreOS/which/Sanity/basic-functionality-test
|
||||
export TESTVERSION=1.0
|
||||
|
||||
BUILT_FILES=
|
||||
|
||||
FILES=$(METADATA) runtest.sh Makefile PURPOSE
|
||||
|
||||
.PHONY: all install download clean
|
||||
|
||||
run: $(FILES) build
|
||||
./runtest.sh
|
||||
|
||||
build: $(BUILT_FILES)
|
||||
test -x runtest.sh || chmod a+x runtest.sh
|
||||
|
||||
clean:
|
||||
rm -f *~ $(BUILT_FILES)
|
||||
|
||||
|
||||
include /usr/share/rhts/lib/rhts-make.include
|
||||
|
||||
$(METADATA): Makefile
|
||||
@echo "Owner: Karel Srot <ksrot@redhat.com>" > $(METADATA)
|
||||
@echo "Name: $(TEST)" >> $(METADATA)
|
||||
@echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
|
||||
@echo "Path: $(TEST_DIR)" >> $(METADATA)
|
||||
@echo "Description: tests basic functionality" >> $(METADATA)
|
||||
@echo "Type: Sanity" >> $(METADATA)
|
||||
@echo "TestTime: 5m" >> $(METADATA)
|
||||
@echo "RunFor: which" >> $(METADATA)
|
||||
@echo "Requires: which" >> $(METADATA)
|
||||
@echo "Priority: Normal" >> $(METADATA)
|
||||
@echo "License: GPLv2" >> $(METADATA)
|
||||
@echo "Confidential: no" >> $(METADATA)
|
||||
@echo "Destructive: no" >> $(METADATA)
|
||||
@echo "Releases: -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA)
|
||||
|
||||
rhts-lint $(METADATA)
|
||||
11
tests/basic-functionality-test/PURPOSE
Normal file
11
tests/basic-functionality-test/PURPOSE
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
PURPOSE of /CoreOS/which/Sanity/basic-functionality-test
|
||||
Description: tests basic functionality
|
||||
Author: Karel Srot <ksrot@redhat.com>
|
||||
|
||||
tests following scenarios:
|
||||
* test --version
|
||||
* test locating the bash binary
|
||||
* test an alias
|
||||
* test non existing command
|
||||
* test with customized PATH
|
||||
* test options -a / --all
|
||||
14
tests/basic-functionality-test/main.fmf
Normal file
14
tests/basic-functionality-test/main.fmf
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
summary: tests basic functionality
|
||||
description: "tests following scenarios:\n * test --version\n * test locating the
|
||||
bash binary\n * test an alias\n * test non existing command\n * test with customized
|
||||
PATH\n * test options -a / --all\n"
|
||||
contact: Karel Srot <ksrot@redhat.com>
|
||||
component:
|
||||
- which
|
||||
test: ./runtest.sh
|
||||
framework: beakerlib
|
||||
recommend:
|
||||
- which
|
||||
duration: 5m
|
||||
extra-summary: /CoreOS/which/Sanity/basic-functionality-test
|
||||
extra-task: /CoreOS/which/Sanity/basic-functionality-test
|
||||
89
tests/basic-functionality-test/runtest.sh
Executable file
89
tests/basic-functionality-test/runtest.sh
Executable file
|
|
@ -0,0 +1,89 @@
|
|||
#!/bin/bash
|
||||
# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#
|
||||
# runtest.sh of /CoreOS/which/Sanity/basic-functionality-test
|
||||
# Description: tests basic functionality
|
||||
# Author: Karel Srot <ksrot@redhat.com>
|
||||
#
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#
|
||||
# Copyright (c) 2017 Red Hat, Inc.
|
||||
#
|
||||
# This copyrighted material is made available to anyone wishing
|
||||
# to use, modify, copy, or redistribute it subject to the terms
|
||||
# and conditions of the GNU General Public License version 2.
|
||||
#
|
||||
# This program is distributed in the hope that it will be
|
||||
# useful, but WITHOUT ANY WARRANTY; without even the implied
|
||||
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||
# PURPOSE. See the GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public
|
||||
# License along with this program; if not, write to the Free
|
||||
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
# Boston, MA 02110-1301, USA.
|
||||
#
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
# Include Beaker environment
|
||||
. /usr/share/beakerlib/beakerlib.sh || exit 1
|
||||
|
||||
PACKAGE="which"
|
||||
|
||||
TRUE_BINARY=/bin/true
|
||||
BASHBIN=/bin/bash
|
||||
|
||||
rlIsRHEL 6 && TRUE_BINARY=/bin/true
|
||||
|
||||
rlJournalStart
|
||||
rlPhaseStartSetup
|
||||
rlAssertRpm $PACKAGE
|
||||
rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
|
||||
rlRun "pushd $TmpDir"
|
||||
rlRun "cp -p $TRUE_BINARY $TmpDir"
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartTest "test --version"
|
||||
rlRun "VERSION=\$( rpm -q --qf '%{VERSION}' which )"
|
||||
rlRun -s "which --version"
|
||||
rlAssertGrep "GNU which v${VERSION}" $rlRun_LOG
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartTest "test locating the bash binary"
|
||||
rlRun -s "which bash"
|
||||
rlAssertGrep "$BASHBIN" $rlRun_LOG
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartTest "test an alias"
|
||||
rlRun "echo 'alias foo=bar' > bashrc"
|
||||
rlRun -s "echo -e 'alias foo=true\nwhich foo' | bash -i"
|
||||
rlAssertGrep "alias foo='true'" $rlRun_LOG
|
||||
rlAssertGrep "$TRUE_BINARY" $rlRun_LOG
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartTest "test non existing command"
|
||||
rlRun -s "which foobar" 1
|
||||
rlAssertGrep "no foobar in ($PATH)" $rlRun_LOG
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartTest "test with customized PATH"
|
||||
rlRun -s "bash -c 'export PATH=$TmpDir:$PATH; which true'"
|
||||
rlAssertGrep $TmpDir/true $rlRun_LOG
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartTest "test options -a / --all"
|
||||
rlRun -s "bash -c 'export PATH=$TmpDir:$PATH; which -a true'"
|
||||
rlAssertGrep $TmpDir/true $rlRun_LOG
|
||||
rlAssertGrep $TRUE_BINARY $rlRun_LOG
|
||||
rlRun -s "bash -c 'export PATH=$TmpDir:$PATH; which --all true'"
|
||||
rlAssertGrep $TmpDir/true $rlRun_LOG
|
||||
rlAssertGrep $TRUE_BINARY $rlRun_LOG
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartCleanup
|
||||
rlRun "popd"
|
||||
rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
|
||||
rlPhaseEnd
|
||||
rlJournalPrintText
|
||||
rlJournalEnd
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
diff -up which-2.19/bash.c.afs which-2.19/bash.c
|
||||
--- which-2.19/bash.c.afs 2008-01-18 19:03:40.000000000 +0100
|
||||
+++ which-2.19/bash.c 2008-01-25 11:41:14.000000000 +0100
|
||||
@@ -34,7 +34,6 @@
|
||||
*/
|
||||
#define HAVE_GETGROUPS
|
||||
#undef SHELL
|
||||
-#undef AFS
|
||||
#undef NOGROUP
|
||||
|
||||
/*
|
||||
@@ -251,7 +250,7 @@ file_status (char const* name)
|
||||
|
||||
r = FS_EXISTS;
|
||||
|
||||
-#if defined (AFS)
|
||||
+ if (getenv("AFS")) {
|
||||
/* We have to use access(2) to determine access because AFS does not
|
||||
support Unix file system semantics. This may produce wrong
|
||||
answers for non-AFS files when ruid != euid. I hate AFS. */
|
||||
@@ -261,8 +260,9 @@ file_status (char const* name)
|
||||
r |= FS_READABLE;
|
||||
|
||||
return r;
|
||||
-#else /* !AFS */
|
||||
-
|
||||
+ }
|
||||
+ else /* !AFS */
|
||||
+ {
|
||||
/* Find out if the file is actually executable. By definition, the
|
||||
only other criteria is that the file has an execute bit set that
|
||||
we can use. The same with whether or not a file is readable. */
|
||||
@@ -305,7 +305,7 @@ file_status (char const* name)
|
||||
}
|
||||
|
||||
return r;
|
||||
-#endif /* !AFS */
|
||||
+ } /* !AFS */
|
||||
}
|
||||
|
||||
/* From bash-3.2 / general.c / line 534 ; Changes: Using 'strchr' instead of 'xstrchr'. */
|
||||
13
which-2.21-warning.patch
Normal file
13
which-2.21-warning.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff -up which-2.22/tilde.c.me which-2.22/tilde.c
|
||||
--- which-2.22/tilde.c.me 2025-01-27 10:30:39.731725763 +0100
|
||||
+++ which-2.22/tilde.c 2025-01-27 10:32:11.158379146 +0100
|
||||
@@ -189,7 +189,8 @@ char *tilde_expand(const char *string)
|
||||
int result_size, result_index;
|
||||
|
||||
result_index = result_size = 0;
|
||||
- if (result = strchr(string, '~'))
|
||||
+ result = strchr(string, '~');
|
||||
+ if (result)
|
||||
result = (char *) xmalloc(result_size = (strlen(string) + 16));
|
||||
else
|
||||
result = (char *) xmalloc(result_size = (strlen(string) + 1));
|
||||
248
which.spec
248
which.spec
|
|
@ -1,64 +1,234 @@
|
|||
%global has_which2_alias 1
|
||||
|
||||
Summary: Displays where a particular program in your path is located
|
||||
Name: which
|
||||
Version: 2.20
|
||||
Release: 2%{?dist}
|
||||
License: GPLv3
|
||||
Group: Applications/System
|
||||
Source0: http://www.xs4all.nl/~carlo17/which/%{name}-%{version}.tar.gz
|
||||
Version: 2.23
|
||||
Release: 3%{?dist}
|
||||
License: GPL-3.0-only
|
||||
Source0: http://ftp.gnu.org/gnu/which/%{name}-%{version}.tar.gz
|
||||
Source1: which2.sh
|
||||
Source2: which2.csh
|
||||
Url: http://www.xs4all.nl/~carlo17/which/
|
||||
Patch: which-2.19-afs.patch
|
||||
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
Patch0: which-2.21-warning.patch
|
||||
Url: https://savannah.gnu.org/projects/which/
|
||||
Requires: coreutils
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc gcc-c++
|
||||
BuildRequires: readline-devel
|
||||
Requires(preun): /sbin/install-info
|
||||
Requires(post): /sbin/install-info
|
||||
|
||||
%description
|
||||
The which command shows the full pathname of a specified program, if
|
||||
the specified program is in your PATH.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
%patch -p1 -b .afs
|
||||
|
||||
%autosetup -p1
|
||||
|
||||
%build
|
||||
%configure
|
||||
|
||||
make %{?_smp_mflags}
|
||||
%make_build
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
%make_install
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
|
||||
install -p -m 644 %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
|
||||
%if %{has_which2_alias}
|
||||
install -p -m 644 %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
|
||||
%endif
|
||||
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
|
||||
|
||||
%post
|
||||
/sbin/install-info --quiet --info-dir=%{_infodir} %{_infodir}/which.info.gz
|
||||
exit 0
|
||||
|
||||
%preun
|
||||
if [ $1 = 0 ]; then
|
||||
/sbin/install-info --quiet --info-dir=%{_infodir} --delete %{_infodir}/which.info.gz
|
||||
fi
|
||||
exit 0
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc COPYING EXAMPLES README AUTHORS NEWS
|
||||
%license COPYING
|
||||
%doc EXAMPLES README AUTHORS NEWS
|
||||
%if %{has_which2_alias}
|
||||
%attr(0644,root,root) %{_sysconfdir}/profile.d/which2.*
|
||||
%{_bindir}/*
|
||||
%{_infodir}/which.info.gz
|
||||
%{_mandir}/*/*
|
||||
%endif
|
||||
%{_bindir}/which
|
||||
%{_infodir}/which.info*
|
||||
%{_mandir}/man1/which.1*
|
||||
|
||||
%changelog
|
||||
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.23-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Wed Jun 18 2025 Than Ngo <than@redhat.com> - 2.23-2
|
||||
- Add a check to ensure that /proc/$$/exe can be read
|
||||
|
||||
* Mon Feb 03 2025 Than Ngo <than@redhat.com> - 2.23-1
|
||||
- Fixed rhbz#2343361, update to 2.23
|
||||
|
||||
* Sat Feb 01 2025 Than Ngo <than@redhat.com> - 2.22-2
|
||||
- Fixed rhbz#2343113, regression
|
||||
|
||||
* Mon Jan 27 2025 Than Ngo <than@redhat.com> - 2.22-1
|
||||
- Fixed rhbz#2342020, update to 2.22
|
||||
|
||||
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.21-43
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.21-42
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.21-41
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.21-40
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Wed Mar 08 2023 Than Ngo <than@redhat.com> - 2.21-39
|
||||
- fixed #2175953, enable which2 alias
|
||||
|
||||
* Sun Feb 19 2023 Than Ngo <than@redhat.com> - 2.21-38
|
||||
- migrated to SPDX license
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.21-37
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Mon Nov 07 2022 Than Ngo <than@redhat.com> - 2.21-36
|
||||
- which fails for long path
|
||||
|
||||
* Fri Aug 05 2022 Than Ngo <than@redhat.com> - 2.21-35
|
||||
- disable which2 alias and function by default as it caused more problems than benefits
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.21-34
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Wed Feb 09 2022 Than Ngo <than@redhat.com> - 2.21-33
|
||||
- make which2.sh script more robust,
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.21-32
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Thu Dec 02 2021 Than Ngo <than@redhat.com> - 2.21-31
|
||||
- check shell correctly
|
||||
|
||||
* Tue Oct 26 2021 Than Ngo <than@redhat.com> - 2.21-30
|
||||
- disable the --read-functions option in korn shells
|
||||
|
||||
* Fri Oct 15 2021 Than Ngo <than@redhat.com> - 2.21-29
|
||||
- Fixed regression, use export instead alias
|
||||
|
||||
* Sun Oct 10 2021 Than Ngo <than@redhat.com> - 2.21-28
|
||||
- Resolves: #2009547, which treats function contents as aliases when parsing ksh
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.21-27
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Tue May 04 2021 Than Ngo <than@redhat.com> - 2.21-26
|
||||
- Resolves: #1942153, fixed unbound variable
|
||||
|
||||
* Mon Apr 26 2021 Than Ngo <than@redhat.com> - 2.21-25
|
||||
- improved which2.sh
|
||||
|
||||
* Tue Mar 23 2021 Than Ngo <than@redhat.com> - 2.21-24
|
||||
- fixed regression if SHELL=zsh
|
||||
|
||||
* Sun Mar 21 2021 Than Ngo <than@redhat.com> - 2.21-23
|
||||
- fixed coverity issues
|
||||
- improved which2.sh
|
||||
|
||||
* Thu Mar 18 2021 Than Ngo <than@redhat.com> - 2.21-22
|
||||
- fixed syntax error testcase: a=b which ls
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.21-21
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.21-20
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Wed Mar 25 2020 Than Ngo <than@redhat.com> - 2.21-19
|
||||
- fixed #1817138 - Invalid syntax in /etc/profile.d/which2
|
||||
|
||||
* Tue Mar 24 2020 Than Ngo <than@redhat.com> - 2.21-18
|
||||
- set correct alias for mksh
|
||||
|
||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.21-17
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Tue Nov 05 2019 Than Ngo <than@redhat.com> - 2.21-16
|
||||
- set correct alias for ksh
|
||||
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.21-15
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Mon Feb 04 2019 Than Ngo <than@redhat.com> - 2.21-14
|
||||
- bump release
|
||||
|
||||
* Mon Feb 04 2019 Than Ngo <than@redhat.com> - 2.21-13
|
||||
- bump release
|
||||
|
||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.21-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Thu Jul 26 2018 Than Ngo <than@redhat.com> - 2.21-11
|
||||
- fixed more coverity issue
|
||||
|
||||
* Mon Jul 23 2018 Than Ngo <than@redhat.com> - 2.21-10
|
||||
- Fix coverity issues
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.21-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Fri Feb 16 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 2.21-8
|
||||
- Fix invalid [ ... ] syntax which results in complaints by zsh.
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=1546221
|
||||
- Remove pointless Group tag, buildroot cleaning and %%defattr.
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.21-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Mon Feb 05 2018 Than Ngo <than@redhat.com> - 2.21-6
|
||||
- added CI tests using the standard test interface
|
||||
|
||||
* Wed Jan 31 2018 Than Ngo <than@redhat.com> - 2.21-5
|
||||
- fixed bz#1526500 - 'declare' not found under ksh
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.21-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.21-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.21-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Mon Jun 27 2016 Than Ngo <than@redhat.com> - 2.21-1
|
||||
- update to 2.21
|
||||
|
||||
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.20-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Sat Feb 21 2015 Till Maas <opensource@till.name> - 2.20-11
|
||||
- Rebuilt for Fedora 23 Change
|
||||
https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
|
||||
|
||||
* Thu Feb 19 2015 Till Maas <opensource@till.name> - 2.20-10
|
||||
- Use alias instead of exported function for which to avoid bashism,
|
||||
http://unix.stackexchange.com/questions/59360/#59431
|
||||
|
||||
* Wed Feb 18 2015 Till Maas <opensource@till.name> - 2.20-9
|
||||
- Check functions (#1194044)
|
||||
- Use %%license
|
||||
|
||||
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.20-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.20-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.20-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.20-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.20-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.20-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.20-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
|
|
@ -232,7 +402,7 @@ rm -rf $RPM_BUILD_ROOT
|
|||
- Generate which-2.spec from which-2.spec.in with automatic VERSION
|
||||
and CHANGELOG substitution.
|
||||
|
||||
* Tue May 14 1999 Carlo Wood <carlo@gnu.org>
|
||||
* Fri May 14 1999 Carlo Wood <carlo@gnu.org>
|
||||
- Moved assignment of CFLAGS to the configure line, using RPM_OPT_FLAGS now.
|
||||
- Corrected Source: line to point to ftp.gnu.org.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
# Initialization script for csh
|
||||
|
||||
# export AFS if you are in AFS environment
|
||||
|
||||
# alias which 'alias | /usr/bin/which --tty-only --read-alias --show-dot --show-tilde'
|
||||
|
|
|
|||
20
which2.sh
20
which2.sh
|
|
@ -1,4 +1,18 @@
|
|||
# Initialization script for bash and sh
|
||||
# shellcheck shell=sh
|
||||
# Initialization script for bash, sh, mksh and ksh
|
||||
|
||||
# export AFS if you are in AFS environment
|
||||
alias which='alias | /usr/bin/which --tty-only --read-alias --show-dot --show-tilde'
|
||||
if [ -r /proc/$$/exe ]; then
|
||||
SHELLNAME=$(basename $(readlink /proc/$$/exe))
|
||||
else
|
||||
SHELLNAME="unknown"
|
||||
fi
|
||||
case "$SHELLNAME" in
|
||||
*ksh*|zsh)
|
||||
alias which='alias | /usr/bin/which --tty-only --read-alias --show-tilde --show-dot'
|
||||
;;
|
||||
bash|sh)
|
||||
alias which='(alias; declare -f) | /usr/bin/which --tty-only --read-alias --read-functions --show-tilde --show-dot'
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue