Merge branch 'master' into private-kdudka-coreutils-next
This commit is contained in:
Kamil Dudka
commit
1abe689c6a
|
|
@ -1 +1,2 @@
|
|||
/coreutils-[0-9.]*.tar.xz
|
||||
/coreutils-ss.tar.xz
|
||||
|
|
|
|||
|
|
@ -0,0 +1,16 @@
|
|||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIcBAABAgAGBQJYwOwaAAoJEN9v2XEwYDfZQrUP/RdXj/ug35e+u+VD1ts9/b8n
|
||||
7JihJmxngEZQAJECNTMbJ7mNj6DhpMY0Jg/Hwg7zJT28T6QDeS1Iuk3Id4uM5eFa
|
||||
CgHKAZumntSMTkQdNvnCEFEIqu+L8BtBYGcOaw66wAFNFw3jdJUUs2sOST2r46jR
|
||||
N7aY9oARKJuHfgTZ2BI2zL0Q+poXM1O0k/U+BScE6c139zJsbg+1uM9kGVtJWPkM
|
||||
EPLFWkbTgjYnt+qEFrDlWL0YFOS42sgR7P1sVfBC1nAu5lwgzPy62OtGv9WCEBhm
|
||||
3+PRNZ0KLW8CKp06llG/0bG4QwssWs6p/vPwrRGeAg6pKsRNN1ni27AnDThiPgvz
|
||||
YbBLgU+EZj1HuibvYArHXNKY2+O5ZC3nYU6bdAffl3TAtrGFA1ncZXGiFD5UgOQ2
|
||||
V9Q38S41FUEwKGtf9tWGCRTxrb4FQ1CDzJglV9vHKetn4mgH/HpEG/q07k4RNW5d
|
||||
ikfrS0xFxbqtLjlY3UqvtkrFyVQFY093ozsP7fKsq53JAtEWc3YvXR8UCbliU+gV
|
||||
5qug0REBQafe9EAyH+oq0dzD2BZ3KtFcjtKI/2UzAf3idcyygsHgcEPQObqI8BfD
|
||||
NscEMjdFY7+Zh5w2shQlyq4xr2aI2nXCX3+AMcS/6Yfg6W6fBvgIjtmXBrQsbWpV
|
||||
DBcx50TVDa/ERBX1+FI1
|
||||
=skPR
|
||||
-----END PGP SIGNATURE-----
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
#!/bin/sh -
|
||||
# Reduce requires for coreutils-single
|
||||
# Needed since it has overlapping "binaries" with the main package
|
||||
# Ideally we could do the following in the spec only for the single subpackage
|
||||
# %define __requires_exclude_from ^(%{_bindir}|%{_sbindir})/([^c]|c[^o]|co[^r]|cor[^e])
|
||||
|
||||
original_find_requires="$1"
|
||||
shift
|
||||
|
||||
# Get the list of files.
|
||||
files=`sed "s/['\"]/\\\&/g"`
|
||||
|
||||
single_bin='/usr/bin/coreutils'
|
||||
|
||||
single=`echo $files | grep "$single_bin"`
|
||||
|
||||
echo $files | tr [:blank:] '\n' |
|
||||
if [ "$single" ]; then
|
||||
# Only allow the coreutils multicall binary
|
||||
# Also adjust for .single renaming
|
||||
sed -n 's|\(.*'"$single_bin"'\)\(.single\)\?$|\1.single|p'
|
||||
else
|
||||
cat
|
||||
fi |
|
||||
$original_find_requires
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/src/who.c b/src/who.c
|
||||
index 55733b4..3ad4774 100644
|
||||
--- a/src/who.c
|
||||
+++ b/src/who.c
|
||||
@@ -81,7 +81,7 @@
|
||||
# define UT_TYPE_NEW_TIME(U) false
|
||||
#endif
|
||||
|
||||
-#define IDLESTR_LEN 6
|
||||
+#define IDLESTR_LEN 10
|
||||
|
||||
#if HAVE_STRUCT_XTMP_UT_PID
|
||||
# define PIDSTR_DECL_AND_INIT(Var, Utmp_ent) \
|
||||
|
|
@ -1,16 +1,16 @@
|
|||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIcBAABAgAGBQJYt4nkAAoJEN9v2XEwYDfZlKQQAJ8Q0+dbBjkhoJaNUxqlUEE6
|
||||
Ztcnz76BOhvFwBYsfQbKdKRQw+EG91q0MkJKFW29jDxPDRMvwE/FSv9DziCHCP+E
|
||||
sE8DhrA96h5oCrlTcwtm2TVxPHCD8aMheOvtH/gjNaabsjPy3f6G/qnuuQNS9EPt
|
||||
Nl0S88avvtcPSEXicb07kfp+iRou+me00AsvzNLct/jlkTgiYx3zdCoFdEx90lMN
|
||||
hQYPYRYrPZyMpF+tNFqW5jk+5WrF7UEflUwKG5hlWeJfJPFgnk0WxGdowjIbaEfZ
|
||||
8DhXC2NIa3JALUAEAS+riyKcxmYuyKLTFNlqiOB2plM8KIglYLJS/3RjW+gjqBAk
|
||||
WoTtKfdAuVCOMH8A6GWJsdwqTmA7M+wpkpis3O1p5mTnrZrZAaYgFasaH2F70QvM
|
||||
oeYcnFdcA8umiPahUhqvW9iNBETyte8ZZ5YWSTH/eyeYGd/+7wupVoRJTBxih0+X
|
||||
LBkIYGjQcKKWGpFCBpHFktndYSvTymX6nBgtfO1KeS75gc5YdI8MD80JdJdbInVB
|
||||
3lV5EhNjy8LdK2ENDU6wP/RTmP1hmCKoYCZ+fV9uMcwGv2LG00o0dGfpMu7rNdag
|
||||
lnDiYL7jyeZBfpXxaNliSD4JfcZFI3Oy9Y5e4UY/l+DNt9zePh4OpbKB39ksOCZ4
|
||||
URM54C6UqukaVHpJrfPr
|
||||
=nWad
|
||||
iQIcBAABAgAGBQJZpSaHAAoJEN9v2XEwYDfZnxwQAI17IlB+43c3agpkSeteQ0T0
|
||||
ZJubRGqQyl+qkhKePRVsjQOgBFT4R7vNd7tUZX3B4/dqvNEL2jmq8i6YqryjvFUO
|
||||
3zAfPlsG5LGAAKYPI1Hlgkvai/9j0bR4srqo8GRwO9BqvPpgRik1/PMUXl2/mmEU
|
||||
Du1G2ZnnEkpqU4HwCZpnG8QSkmot3FLnXSzHILpqeKf+5tdFdYJ6/IvWoihcR7iS
|
||||
e9GWMpkDUgTqPQZhEo/BeroNB0SAt39ttPXqo281lV0CtRbiRTG2rMoXOejQvvpw
|
||||
d5Ae2CUl0lmbbfBdRFmxXM1nTDCSjdgHedq1TZycCIfsPtEdQpPb/HPtG7N043JH
|
||||
gGCoGheL4z69uc4fMGWOihjZ11zD3gnG2F4QEw9RK0tQFoZXLULwiBbhw+gg5zRK
|
||||
MZNrXvqBkb0VOwGWBegpTGmX/Lo+SzVrHyxeG51MR8edx4tKSccy2TU+yXUWFnjK
|
||||
EIDkr6L3JbIj3Htr6CBFNyjTx2J6zW5AHUH09jW5AdRM/FFvtBFMAXn0BTd+D2mh
|
||||
Ot5oI8XRgcfa0rI9pp3NLKJbrsexdbWfJelZvw+ZUdQ5Gqih7rRuueR1h6RPv90e
|
||||
I0+XEpWTJcy362RpEv95g1lfS12HJ6XKFQGPXnQY/KfhDK5uPn/avwS06p3yhGy7
|
||||
R/9eXlwhetpBiBrYxajB
|
||||
=YraG
|
||||
-----END PGP SIGNATURE-----
|
||||
|
|
|
|||
|
|
@ -1,23 +1,20 @@
|
|||
Summary: A set of basic GNU tools commonly used in shell scripts
|
||||
Name: coreutils
|
||||
Version: 8.26
|
||||
Version: 8.27
|
||||
Release: 9999%{?dist}
|
||||
License: GPLv3+
|
||||
Group: System Environment/Base
|
||||
Url: http://www.gnu.org/software/coreutils/
|
||||
Url: https://www.gnu.org/software/coreutils/
|
||||
Source0: https://pixelbeat.org/cu/coreutils-ss.tar.xz
|
||||
Source50: supported_utils
|
||||
Source105: coreutils-colorls.sh
|
||||
Source106: coreutils-colorls.csh
|
||||
|
||||
# Provide our own custom requires for coreutils-single package
|
||||
Source10: coreutils-find-requires.sh
|
||||
%global _use_internal_dependency_generator 0
|
||||
%global __find_provides %{_rpmconfigdir}/find-provides
|
||||
%global __find_requires %{SOURCE10} %{_rpmconfigdir}/find-requires
|
||||
# do not make coreutils-single depend on /usr/bin/coreutils
|
||||
%global __requires_exclude ^%{_bindir}/coreutils$
|
||||
|
||||
# disable the test-lock gnulib test prone to deadlock
|
||||
Patch1: coreutils-8.26-test-lock.patch
|
||||
Patch100: coreutils-8.26-test-lock.patch
|
||||
|
||||
#add note about no difference between binary/text mode on Linux - md5sum manpage
|
||||
Patch101: coreutils-6.10-manpages.patch
|
||||
|
|
@ -54,8 +51,6 @@ Patch808: coreutils-i18n-fold-newline.patch
|
|||
|
||||
#getgrouplist() patch from Ulrich Drepper.
|
||||
Patch908: coreutils-getgrouplist.patch
|
||||
#Prevent buffer overflow in who(1) (bug #158405).
|
||||
Patch912: coreutils-overflow.patch
|
||||
|
||||
#SELINUX Patch - implements Redhat changes
|
||||
#(upstream did some SELinux implementation unlike with RedHat patch)
|
||||
|
|
@ -64,8 +59,6 @@ Patch950: coreutils-selinux.patch
|
|||
Conflicts: filesystem < 3
|
||||
# To avoid clobbering installs
|
||||
Conflicts: coreutils-single
|
||||
# To give priority to this package
|
||||
Obsoletes: coreutils-single
|
||||
Provides: /bin/basename
|
||||
Provides: /bin/cat
|
||||
Provides: /bin/chgrp
|
||||
|
|
@ -120,14 +113,17 @@ BuildRequires: glibc-langpack-en
|
|||
Requires: %{name}-common = %{version}-%{release}
|
||||
Requires: ncurses
|
||||
|
||||
Provides: bundled(gnulib)
|
||||
Provides: coreutils-full = %{version}-%{release}
|
||||
Provides: fileutils = %{version}-%{release}
|
||||
Provides: sh-utils = %{version}-%{release}
|
||||
Provides: stat = %{version}-%{release}
|
||||
Provides: textutils = %{version}-%{release}
|
||||
|
||||
#old mktemp package had epoch 3, so we have to use 4 for coreutils
|
||||
Provides: mktemp = 4:%{version}-%{release}
|
||||
Provides: bundled(gnulib)
|
||||
Obsoletes: mktemp < 4:%{version}-%{release}
|
||||
|
||||
Obsoletes: fileutils <= 4.1.9
|
||||
Obsoletes: sh-utils <= 2.0.12
|
||||
Obsoletes: stat <= 3.3
|
||||
|
|
@ -165,7 +161,7 @@ Optional though recommended components,
|
|||
including documentation and translations.
|
||||
|
||||
%prep
|
||||
%autosetup -N -n %{name}-%{version}.57-00381
|
||||
%autosetup -N -n %{name}-%{version}.99-3ebdc3
|
||||
|
||||
# will be modified by coreutils-8.25-DIR_COLORS.patch
|
||||
tee DIR_COLORS{,.256color,.lightbgcolor} <src/dircolors.hin >/dev/null
|
||||
|
|
@ -179,11 +175,6 @@ tee DIR_COLORS{,.256color,.lightbgcolor} <src/dircolors.hin >/dev/null
|
|||
find tests -name '*.sh' -perm 0644 -print -exec chmod 0755 '{}' '+'
|
||||
(echo "<<< done") 2>/dev/null
|
||||
|
||||
#fix typos/mistakes in localized documentation(#439410, #440056)
|
||||
find ./po/ -name "*.p*" | xargs \
|
||||
sed -i \
|
||||
-e 's/-dpR/-cdpR/'
|
||||
|
||||
autoreconf -fiv
|
||||
|
||||
%build
|
||||
|
|
@ -247,17 +238,8 @@ install -p -c -m644 DIR_COLORS{,.256color,.lightbgcolor} \
|
|||
install -p -c -m644 %SOURCE105 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/colorls.sh
|
||||
install -p -c -m644 %SOURCE106 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/colorls.csh
|
||||
|
||||
# Use hard links instead of symbolic links for LC_TIME files (bug #246729).
|
||||
find %{buildroot}%{_datadir}/locale -type l | \
|
||||
(while read link
|
||||
do
|
||||
target=$(readlink "$link")
|
||||
rm -f "$link"
|
||||
ln "$(dirname "$link")/$target" "$link"
|
||||
done)
|
||||
|
||||
%find_lang %name
|
||||
#Add the %lang(xyz) ownership for the LC_TIME dirs as well...
|
||||
# Add the %%lang(xyz) ownership for the LC_TIME dirs as well...
|
||||
grep LC_TIME %name.lang | cut -d'/' -f1-6 | sed -e 's/) /) %%dir /g' >>%name.lang
|
||||
|
||||
# (sb) Deal with Installed (but unpackaged) file(s) found
|
||||
|
|
@ -276,21 +258,20 @@ if [ -f %{_infodir}/%{name}.info.gz ]; then
|
|||
fi
|
||||
|
||||
%files -f supported_utils
|
||||
%defattr(-,root,root,-)
|
||||
%exclude %{_bindir}/*.single
|
||||
%dir %{_libexecdir}/coreutils
|
||||
%{_libexecdir}/coreutils/*.so
|
||||
|
||||
%files single
|
||||
%defattr(-,root,root,-)
|
||||
%{_bindir}/*.single
|
||||
%{_sbindir}/chroot.single
|
||||
%dir %{_libexecdir}/coreutils
|
||||
%{_libexecdir}/coreutils/*.so.single
|
||||
# duplicate the license because coreutils-common does not need to be installed
|
||||
%{!?_licensedir:%global license %%doc}
|
||||
%license COPYING
|
||||
|
||||
%files common -f %{name}.lang
|
||||
%defattr(-,root,root,-)
|
||||
%config(noreplace) %{_sysconfdir}/DIR_COLORS*
|
||||
%config(noreplace) %{_sysconfdir}/profile.d/*
|
||||
%{_infodir}/coreutils*
|
||||
|
|
@ -300,6 +281,56 @@ fi
|
|||
%license COPYING
|
||||
|
||||
%changelog
|
||||
* Tue Aug 22 2017 Ville Skyttä <ville.skytta@iki.fi> - 8.27-16
|
||||
- Own the %%{_libexecdir}/coreutils dir
|
||||
|
||||
* Fri Aug 18 2017 Kamil Dudka <kdudka@redhat.com> - 8.27-15
|
||||
- ptx: fix a possible crash caused by integer overflow (#1482445)
|
||||
|
||||
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 8.27-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Fri Jul 28 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 8.27-13
|
||||
- Enable separate debuginfo back
|
||||
|
||||
* Wed Jul 26 2017 Kamil Dudka <kdudka@redhat.com> - 8.27-12
|
||||
- avoid build failure caused broken RPM code that produces debuginfo packages
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 8.27-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Tue May 30 2017 Sebastian Kisela <skisela@redhat.com> - 8.27-10
|
||||
- doc: mention `setpriv --no-new-privs` feature in runcon info
|
||||
|
||||
* Tue May 16 2017 Kamil Dudka <kdudka@redhat.com> - 8.27-9
|
||||
- add coreutils-full provides for coreutils to make it explicitly installable
|
||||
|
||||
* Wed May 03 2017 Kamil Dudka <kdudka@redhat.com> - 8.27-8
|
||||
- drop coreutils-overflow.patch no longer needed (#158405)
|
||||
|
||||
* Wed May 03 2017 Kamil Dudka <kdudka@redhat.com> - 8.27-7
|
||||
- drop workaround for already fixed rpm-build bug (#1306559)
|
||||
|
||||
* Wed May 03 2017 Kamil Dudka <kdudka@redhat.com> - 8.27-6
|
||||
- do not mention a deprecated option in localized man pages
|
||||
- drop workaround no longer needed for 10 years old rpm-build bug (#246729)
|
||||
- drop unnecessary uses of %%defattr
|
||||
|
||||
* Fri Apr 28 2017 Sebastian Kisela <skisela@redhat.com> - 8.27-5
|
||||
- tail: revert to polling if a followed directory is replaced (#1283760)
|
||||
|
||||
* Thu Apr 27 2017 Kamil Dudka <kdudka@redhat.com> - 8.27-4
|
||||
- date, touch: fix out-of-bounds write via large TZ variable (CVE-2017-7476)
|
||||
|
||||
* Tue Apr 25 2017 Kamil Dudka <kdudka@redhat.com> - 8.27-3
|
||||
- do not obsolete coreutils-single, so it can be installed by DNF2 (#1444802)
|
||||
|
||||
* Wed Mar 15 2017 Kamil Dudka <kdudka@redhat.com> - 8.27-2
|
||||
- fix spurious build failure caused by the misc/date-debug test
|
||||
|
||||
* Thu Mar 09 2017 Kamil Dudka <kdudka@redhat.com> - 8.27-1
|
||||
- new upstream release 8.27
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 8.26-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (coreutils-ss.tar.xz) = de87f4cd7bef5efc3653b7a572be5240ebc843a0894272930bb0f4589d22b6658b2965dd03bbe5540f8a74f7e5aa8f6aed38abf9e6d10d4b2bdb82662ea2c769
|
||||
SHA512 (coreutils-ss.tar.xz) = e6f52bd4c1b56479f5ff59c92404e4dd83912e3a4ffc2576284d0ff92b2c111c471b0f297fe3e37c58491cc61fdff355bd21d503e35aa19f8f330d513054da7b
|
||||
|
|
|
|||
Loading…
Reference in New Issue