SHA256
1
0
forked from pool/coreutils

Accepting request 144029 from Base:System

supersedes request 143406:
* mention patch name in changelog,
* fix crash in "df --total" due to bad rootfs hiding

OBS-URL: https://build.opensuse.org/request/show/144029
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/coreutils?expand=0&rev=83
This commit is contained in:
Ismail Dönmez 2012-12-08 14:51:18 +00:00 committed by Git OBS Bridge
commit 4572ee5d60
7 changed files with 2491 additions and 3 deletions

View File

@ -0,0 +1,14 @@
Index: coreutils-8.17/src/df.c
===================================================================
--- coreutils-8.17.orig/src/df.c
+++ coreutils-8.17/src/df.c
@@ -474,6 +474,9 @@ get_dev (char const *disk, char const *m
if (!selected_fstype (fstype) || excluded_fstype (fstype))
return;
+ if (fstype && !show_all_fs && (STRNCMP_LIT (fstype, "rootfs") == 0))
+ return;
+
/* If MOUNT_POINT is NULL, then the file system is not mounted, and this
program reports on the file system that the special file is on.
It would be better to report on the unmounted file system,

View File

@ -0,0 +1,25 @@
From: Philipp Thomas <pth@suse.de>
Date: 2012-11-08 13:06:34+01:00
Subject: Remove AM_SILENT_RULES
References:
Upstream:
This removes AM_SILENT_RULES so that autoreconf succeeds with older automake
versions.
---
configure.ac | 1 -
1 file changed, 1 deletion(-)
Index: configure.ac
===================================================================
--- configure.ac.orig 2012-11-08 12:57:12.224507908 +0100
+++ configure.ac 2012-11-08 13:04:32.064100936 +0100
@@ -33,7 +33,6 @@ AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([lib/config.h:lib/config.hin])
AM_INIT_AUTOMAKE([1.11.1 no-dist-gzip dist-xz color-tests parallel-tests])
-AM_SILENT_RULES([yes]) # make --enable-silent-rules the default.
dnl POSIXCHECK is worthwhile for maintainers, but adds several seconds
dnl (more than 10% execution time) to ./configure, with no benefit for

2196
coreutils-testsuite.changes Normal file

File diff suppressed because it is too large Load Diff

201
coreutils-testsuite.spec Normal file
View File

@ -0,0 +1,201 @@
#
# spec file for package coreutils-testsuite
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: coreutils-testsuite
Summary: GNU Core Utilities
License: GPL-3.0+
Group: System/Base
BuildRequires: automake
BuildRequires: gmp-devel
BuildRequires: help2man
BuildRequires: libacl-devel
BuildRequires: libcap-devel
BuildRequires: libselinux-devel
BuildRequires: pam-devel
%if "%{name}" == "coreutils-testsuite"
BuildRequires: gdb
BuildRequires: perl-Expect
%endif
BuildRequires: xz
Url: http://www.gnu.org/software/coreutils/
Version: 8.17
Release: 0
Provides: fileutils = %{version}
Provides: mktemp = %{version}
Provides: sh-utils = %{version}
Provides: stat = %version}
Provides: textutils = %{version}
Obsoletes: fileutils < %{version}
Obsoletes: libselinux <= 1.23.11-3
Obsoletes: libselinux-32bit = 9
Obsoletes: libselinux-64bit = 9
Obsoletes: libselinux-x86 = 9
Obsoletes: mktemp < %{version}
Obsoletes: sh-utils < %{version}
Obsoletes: stat < %version}
Obsoletes: textutils < %{version}
PreReq: %{install_info_prereq}
Recommends: %{name}-lang = %version
Requires: pam >= 1.1.1.90
Source: coreutils-%{version}.tar.xz
Source1: su.pamd
Source2: su.default
Source3: baselibs.conf
Source4: coreutils-%{version}.de.po.xz
Patch0: coreutils-misc.patch
Patch1: coreutils-remove_hostname_documentation.patch
Patch2: coreutils-gl_printf_safe.patch
#Remove the bogus coreutils version from the i18n patch name
Patch4: coreutils-i18n.patch
Patch5: coreutils-i18n-uninit.patch
Patch6: coreutils-i18n-infloop.patch
Patch8: coreutils-sysinfo.patch
Patch16: coreutils-invalid-ids.patch
Patch20: coreutils-8.6-pam-support-for-su.diff
Patch21: coreutils-8.6-update-man-page-for-pam.diff
Patch22: coreutils-8.6-log-all-su-attempts.diff
Patch23: coreutils-8.6-set-sane-default-path.diff
Patch24: coreutils-8.6-honor-settings-in-etc-default-su-resp-etc-login.defs.diff
Patch25: coreutils-8.6-make-sure-sbin-resp-usr-sbin-are-in-PATH.diff
#
Patch30: coreutils-8.6-compile-su-with-fpie.diff
Patch31: coreutils-getaddrinfo.patch
Patch32: coreutils-ptr_int_casts.patch
Patch33: coreutils-8.9-singlethreaded-sort.patch
Patch34: coreutils-acl-nofollow.patch
Patch36: coreutils-basename_documentation.patch
Patch37: coreutils-bnc#697897-setsid.patch
Patch38: coreutils-cp-corrupt-fragmented-sparse.patch
Patch39: coreutils-no_silent-rule.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# this will create a cycle, broken up randomly - coreutils is just too core to have other
# prerequires
#PreReq: permissions
%description
Basic file, shell, and text manipulation utilities. The package
contains the following programs:
[ arch base64 basename cat chcon chgrp chmod chown chroot cksum comm cp
csplit cut date dd df dir dircolors dirname du echo env expand expr
factor false fmt fold groups head id install join kill link ln logname
ls md5sum mkdir mkfifo mknod mktemp mv nice nl nohup od paste pathchk
pinky pr printenv printf ptx pwd readlink rm rmdir runcon seq sha1sum
sha224sum sha256sum sha384sum sha512sum shred shuf sleep sort split
stat stty su sum sync tac tail tee test timeout touch tr true tsort tty
uname unexpand uniq unlink uptime users vdir wc who whoami yes
%lang_package
%prep
%setup -q -n coreutils-%{version}
%patch4
%patch5
%patch6
%patch0
%patch1
%patch2
%patch8
%patch16
%patch20
%patch21
%patch22 -p1
%patch23 -p1
%patch24
%patch25
#
%patch30
%patch31
%patch32
%patch33
%patch34
%patch36
%patch37
%patch38
%if 0%{suse_version} < 1200
%patch39
%endif
xz -dc %{S:4} >po/de.po
%build
AUTOPOINT=true autoreconf -fi
export CFLAGS="%optflags -Wall"
%configure --libexecdir=%{_libdir} --without-included-regex \
--enable-install-program=arch,su \
gl_cv_func_printf_directive_n=yes \
gl_cv_func_isnanl_works=yes \
DEFAULT_POSIX2_VERSION=199209
make -C po update-po
make %{?_smp_mflags} V=1
%if "%{name}" == "coreutils-testsuite"
%check
make %{?_smp_mflags} check-very-expensive
%endif
%install
%makeinstall pkglibexecdir=%{_libdir}/%{name}
test -f %{buildroot}%{_bindir}/su || \
install src/su %{buildroot}%{_bindir}/su
#UsrMerge
install -d %{buildroot}/bin
for i in arch basename cat chgrp chmod chown cp date dd df echo false kill ln ls mkdir mknod mktemp mv pwd rm rmdir sleep sort stat stty su sync touch true uname readlink md5sum
do
ln -sf %{_bindir}/$i %{buildroot}/bin/$i
done
#EndUsrMerge
install -d -m 755 %{buildroot}/etc/pam.d
install -m 644 %{S:1} %{buildroot}/etc/pam.d/su
install -m 644 %{S:1} %{buildroot}/etc/pam.d/su-l
install -d -m 755 %{buildroot}/etc/default
install -m 644 %{S:2} %{buildroot}/etc/default/su
echo '.so man1/test.1' > %{buildroot}/%{_mandir}/man1/\[.1
%find_lang %name
%post
%install_info --info-dir=%{_infodir} %{_infodir}/coreutils.info.gz
# may fail if permissions is not there, but there is no way around that
%set_permissions %{_bindir}/su
%postun
%install_info_delete --info-dir=%{_infodir} %{_infodir}/coreutils.info.gz
%verifyscript
%verify_permissions -e %{_bindir}/su
%files
%defattr(-,root,root)
%doc README NEWS
%config %{_sysconfdir}/pam.d/su
%config %{_sysconfdir}/pam.d/su-l
%config(noreplace) %{_sysconfdir}/default/su
%attr(4755,root,root) %{_bindir}/su
%{_bindir}/*
#UsrMerge
/bin/*
#EndUsrMerge
%{_libdir}/%{name}
%doc %{_infodir}/coreutils.info*.gz
%doc %{_mandir}/man1/*.1.gz
%dir %{_prefix}/share/locale/*/LC_TIME
%files lang -f %name.lang
%defattr(-,root,root)
%changelog

View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
Tue Dec 4 08:16:35 UTC 2012 - mail@bernhard-voelker.de
- Update default posix version to 200112 (bnc#783352).
- Add coreutils-df-always-hide-rootfs.patch:
Hide rootfs in df (df not using yet /proc/self/mountinfo).
-------------------------------------------------------------------
Mon Nov 19 13:04:44 UTC 2012 - idonmez@suse.com
- Statically link to gmp otherwise expr depends on gmp and gmp
configure script depends on expr which creates a build cycle.
-------------------------------------------------------------------
Thu Nov 8 13:12:25 CET 2012 - pth@suse.de
- Add the missing parts in coreutil.spec so that the testsuite is
only run when coreutils-testsuite is built. Also add additional
BuildRequires for the testsuite.
-------------------------------------------------------------------
Tue Nov 6 13:23:45 CET 2012 - pth@suse.de
- Add script pre_checkin.sh that creates spec and changes for
coreutils-testsuite from their coreutils counterparts.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Oct 28 20:31:28 UTC 2012 - mail@bernhard-voelker.de Sun Oct 28 20:31:28 UTC 2012 - mail@bernhard-voelker.de
@ -7,7 +33,7 @@ Sun Oct 28 20:31:28 UTC 2012 - mail@bernhard-voelker.de
This could happen with a very fragmented and sparse input file, This could happen with a very fragmented and sparse input file,
on GNU/Linux file systems supporting fiemap extent scanning. on GNU/Linux file systems supporting fiemap extent scanning.
This bug also affects mv when it resorts to copying, and install. This bug also affects mv when it resorts to copying, and install.
[bug introduced in coreutils-8.11] [bug introduced in coreutils-8.11] (bnc#788459 gnu#12656)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 21 11:55:12 UTC 2012 - froh@suse.com Fri Sep 21 11:55:12 UTC 2012 - froh@suse.com

View File

@ -27,6 +27,10 @@ BuildRequires: libacl-devel
BuildRequires: libcap-devel BuildRequires: libcap-devel
BuildRequires: libselinux-devel BuildRequires: libselinux-devel
BuildRequires: pam-devel BuildRequires: pam-devel
%if "%{name}" == "coreutils-testsuite"
BuildRequires: gdb
BuildRequires: perl-Expect
%endif
BuildRequires: xz BuildRequires: xz
Url: http://www.gnu.org/software/coreutils/ Url: http://www.gnu.org/software/coreutils/
Version: 8.17 Version: 8.17
@ -77,6 +81,8 @@ Patch34: coreutils-acl-nofollow.patch
Patch36: coreutils-basename_documentation.patch Patch36: coreutils-basename_documentation.patch
Patch37: coreutils-bnc#697897-setsid.patch Patch37: coreutils-bnc#697897-setsid.patch
Patch38: coreutils-cp-corrupt-fragmented-sparse.patch Patch38: coreutils-cp-corrupt-fragmented-sparse.patch
Patch39: coreutils-no_silent-rule.patch
Patch40: coreutils-df-always-hide-rootfs.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
# this will create a cycle, broken up randomly - coreutils is just too core to have other # this will create a cycle, broken up randomly - coreutils is just too core to have other
# prerequires # prerequires
@ -97,7 +103,7 @@ uname unexpand uniq unlink uptime users vdir wc who whoami yes
%lang_package %lang_package
%prep %prep
%setup -q %setup -q -n coreutils-%{version}
%patch4 %patch4
%patch5 %patch5
%patch6 %patch6
@ -121,9 +127,16 @@ uname unexpand uniq unlink uptime users vdir wc who whoami yes
%patch36 %patch36
%patch37 %patch37
%patch38 %patch38
%if 0%{suse_version} < 1200
%patch39
%endif
%patch40 -p1
xz -dc %{S:4} >po/de.po xz -dc %{S:4} >po/de.po
# We need to statically link to gmp, otherwise we have a build loop
sed -i s,'$(LIB_GMP)',%{_libdir}/libgmp.a,g src/Makefile.am
%build %build
AUTOPOINT=true autoreconf -fi AUTOPOINT=true autoreconf -fi
export CFLAGS="%optflags -Wall" export CFLAGS="%optflags -Wall"
@ -131,11 +144,16 @@ export CFLAGS="%optflags -Wall"
--enable-install-program=arch,su \ --enable-install-program=arch,su \
gl_cv_func_printf_directive_n=yes \ gl_cv_func_printf_directive_n=yes \
gl_cv_func_isnanl_works=yes \ gl_cv_func_isnanl_works=yes \
DEFAULT_POSIX2_VERSION=199209 DEFAULT_POSIX2_VERSION=200112 alternative=199209
make -C po update-po make -C po update-po
make %{?_smp_mflags} V=1 make %{?_smp_mflags} V=1
%if "%{name}" == "coreutils-testsuite"
%check
make %{?_smp_mflags} check-very-expensive
%endif
%install %install
%makeinstall pkglibexecdir=%{_libdir}/%{name} %makeinstall pkglibexecdir=%{_libdir}/%{name}
test -f %{buildroot}%{_bindir}/su || \ test -f %{buildroot}%{_bindir}/su || \

8
pre_checkin.sh Normal file
View File

@ -0,0 +1,8 @@
#!/bin/bash
# This script has to be run prior to a check-in if changes were done
# to spec and/or changes
sed -e "s,^\(Name:.*coreutils\),\1-testsuite," coreutils.spec > coreutils-testsuite.spec
cp coreutils.changes coreutils-testsuite.changes
osc service localrun format_spec_file