Hello community,
here is the log from the commit of package coreutils for openSUSE:Factory checked in at 2013-01-22 15:08:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/coreutils (Old)
and /work/SRC/openSUSE:Factory/.coreutils.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "coreutils", Maintainer is "pth@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/coreutils/coreutils-testsuite.changes 2012-12-08 15:51:19.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.coreutils.new/coreutils-testsuite.changes 2013-01-22 15:08:44.000000000 +0100
@@ -1,0 +2,96 @@
+Sun Jan 20 13:18:28 UTC 2013 - mail@bernhard-voelker.de
+
+- Avoid segmentation fault in "join -i" with long line input (bnc#798541, VUL-1)
+
+ * src/join.c: Instead of usig unreliable alloca() stack allocation,
+ use heap allocation via xmalloc()+free().
+ (coreutils-i18n.patch, from Philipp Thomas )
+
+- Avoid segmentation fault in "sort -d" and "sort -M" with long line input
+ (bnc#798538, VUL-1)
+
+ * src/sort.c: Instead of usig unreliable alloca() stack allocation,
+ use heap allocation via xmalloc()+free().
+ (coreutils-i18n.patch, from Philipp Thomas )
+
+- Avoid segmentation fault in "uniq" with long line input (bnc#796243, VUL-1)
+
+ * src/cut.c: Instead of usig unreliable alloca() stack allocation,
+ use heap allocation via xmalloc()+free().
+ (coreutils-i18n.patch)
+
+- Fix test-suite errors (bnc#798261).
+
+ * tests/cp/fiemap-FMR: Fix path to src directory and declare
+ require_valgrind_ function.
+ (coreutils-cp-corrupt-fragmented-sparse.patch)
+ * tests/misc/cut:
+ Fix src/cut.c to properly pass output-delimiter tests.
+ Synchronize cut.c related part of the i18n patch with Fedora's.
+ Merge coreutils-i18n-infloop.patch into coreutils-i18n.patch.
+ Merge coreutils-i18n-uninit.patch into coreutils-i18n.patch.
+ In tests/misc/cut, do not replace the non-i18n error messages.
+ (coreutils-i18n.patch)
+ * tests/rm/ext3-perf:
+ This test failed due to heavy parallel CPU and/or disk load because it
+ is based on timeouts. Do not run the test-suite with 'make -jN.
+ (coreutils.spec, coreutils-testsuite.spec)
+ * tests/du/slink:
+ This test fails on OBS infrastructure and will be removed upstreams
+ in coreutils-8.21 anyway. Skip the test until we upgrade.
+ Upstream discussion:
+ http://lists.gnu.org/archive/html/coreutils/2013-01/msg00053.html
+ (coreutils-skip-du-slink-test.patch)
+ * Further spec changes:
+ Run more tests: also run "very expensive" tests; add acl, python-pyinotify,
+ strace and valgrind to the build requirements.
+ Remove patch5 and patch6 as they are now merged into coreutils-i18n.patch
+ (see above).
+ (coreutils.spec, coreutils-testsuite.spec)
+
+- Maintenance changes:
+ (coreutils.spec, coreutils-testsuite.spec)
+
+ * Add perl and texinfo to the build requirements as they are needed to
+ re-generate the man pages and the texinfo documentation.
+ * Remove already-active "-Wall" compiler option from CFLAGS variable.
+ * Install the compressed test-suite.log into the documentation directory
+ of the coreutils-testsuite package (section %check and %files).
+ * Properly guard the spec sections for the coreutils and the
+ coreutils-testsuite package.
+ * Update patches to reflect new line numbers.
+
+-------------------------------------------------------------------
+Thu Jan 10 21:18:52 CET 2013 - phisama@suse.de
+
+- Hardcode the name passed to find_lang so that it works for
+ coreutils-testsuite too.
+
+-------------------------------------------------------------------
+Thu Jan 10 11:58:17 CET 2013 - pth@suse.de
+
+- Don't call autoreconf on distributions older then 12.0
+ because their autoconf is too old, so also patch Makefile.in
+ in addition to Makefile.am where needed.
+
+-------------------------------------------------------------------
+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.
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/coreutils/coreutils.changes 2012-12-08 15:51:19.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.coreutils.new/coreutils.changes 2013-01-22 15:08:44.000000000 +0100
@@ -1,0 +2,76 @@
+Sun Jan 20 13:18:28 UTC 2013 - mail@bernhard-voelker.de
+
+- Avoid segmentation fault in "join -i" with long line input (bnc#798541, VUL-1)
+
+ * src/join.c: Instead of usig unreliable alloca() stack allocation,
+ use heap allocation via xmalloc()+free().
+ (coreutils-i18n.patch, from Philipp Thomas )
+
+- Avoid segmentation fault in "sort -d" and "sort -M" with long line input
+ (bnc#798538, VUL-1)
+
+ * src/sort.c: Instead of usig unreliable alloca() stack allocation,
+ use heap allocation via xmalloc()+free().
+ (coreutils-i18n.patch, from Philipp Thomas )
+
+- Avoid segmentation fault in "uniq" with long line input (bnc#796243, VUL-1)
+
+ * src/cut.c: Instead of usig unreliable alloca() stack allocation,
+ use heap allocation via xmalloc()+free().
+ (coreutils-i18n.patch)
+
+- Fix test-suite errors (bnc#798261).
+
+ * tests/cp/fiemap-FMR: Fix path to src directory and declare
+ require_valgrind_ function.
+ (coreutils-cp-corrupt-fragmented-sparse.patch)
+ * tests/misc/cut:
+ Fix src/cut.c to properly pass output-delimiter tests.
+ Synchronize cut.c related part of the i18n patch with Fedora's.
+ Merge coreutils-i18n-infloop.patch into coreutils-i18n.patch.
+ Merge coreutils-i18n-uninit.patch into coreutils-i18n.patch.
+ In tests/misc/cut, do not replace the non-i18n error messages.
+ (coreutils-i18n.patch)
+ * tests/rm/ext3-perf:
+ This test failed due to heavy parallel CPU and/or disk load because it
+ is based on timeouts. Do not run the test-suite with 'make -jN.
+ (coreutils.spec, coreutils-testsuite.spec)
+ * tests/du/slink:
+ This test fails on OBS infrastructure and will be removed upstreams
+ in coreutils-8.21 anyway. Skip the test until we upgrade.
+ Upstream discussion:
+ http://lists.gnu.org/archive/html/coreutils/2013-01/msg00053.html
+ (coreutils-skip-du-slink-test.patch)
+ * Further spec changes:
+ Run more tests: also run "very expensive" tests; add acl, python-pyinotify,
+ strace and valgrind to the build requirements.
+ Remove patch5 and patch6 as they are now merged into coreutils-i18n.patch
+ (see above).
+ (coreutils.spec, coreutils-testsuite.spec)
+
+- Maintenance changes:
+ (coreutils.spec, coreutils-testsuite.spec)
+
+ * Add perl and texinfo to the build requirements as they are needed to
+ re-generate the man pages and the texinfo documentation.
+ * Remove already-active "-Wall" compiler option from CFLAGS variable.
+ * Install the compressed test-suite.log into the documentation directory
+ of the coreutils-testsuite package (section %check and %files).
+ * Properly guard the spec sections for the coreutils and the
+ coreutils-testsuite package.
+ * Update patches to reflect new line numbers.
+
+-------------------------------------------------------------------
+Thu Jan 10 21:18:52 CET 2013 - phisama@suse.de
+
+- Hardcode the name passed to find_lang so that it works for
+ coreutils-testsuite too.
+
+-------------------------------------------------------------------
+Thu Jan 10 11:58:17 CET 2013 - pth@suse.de
+
+- Don't call autoreconf on distributions older then 12.0
+ because their autoconf is too old, so also patch Makefile.in
+ in addition to Makefile.am where needed.
+
+-------------------------------------------------------------------
Old:
----
coreutils-i18n-infloop.patch
coreutils-i18n-uninit.patch
New:
----
coreutils-skip-du-slink-test.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ coreutils-testsuite.spec ++++++
--- /var/tmp/diff_new_pack.OAPRnQ/_old 2013-01-22 15:08:46.000000000 +0100
+++ /var/tmp/diff_new_pack.OAPRnQ/_new 2013-01-22 15:08:46.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package coreutils-testsuite
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -27,9 +27,15 @@
BuildRequires: libcap-devel
BuildRequires: libselinux-devel
BuildRequires: pam-devel
+BuildRequires: perl
+BuildRequires: texinfo
%if "%{name}" == "coreutils-testsuite"
+BuildRequires: acl
BuildRequires: gdb
BuildRequires: perl-Expect
+BuildRequires: python-pyinotify
+BuildRequires: strace
+BuildRequires: valgrind
%endif
BuildRequires: xz
Url: http://www.gnu.org/software/coreutils/
@@ -62,8 +68,6 @@
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
@@ -82,11 +86,14 @@
Patch37: coreutils-bnc#697897-setsid.patch
Patch38: coreutils-cp-corrupt-fragmented-sparse.patch
Patch39: coreutils-no_silent-rule.patch
+Patch40: coreutils-df-always-hide-rootfs.patch
+Patch41: coreutils-skip-du-slink-test.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:
@@ -100,12 +107,11 @@
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
@@ -117,7 +123,6 @@
%patch23 -p1
%patch24
%patch25
-#
%patch30
%patch31
%patch32
@@ -129,27 +134,42 @@
%if 0%{suse_version} < 1200
%patch39
%endif
+%patch40 -p1
+%patch41 -p1
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
+%if 0%{suse_version} >= 1200
AUTOPOINT=true autoreconf -fi
-export CFLAGS="%optflags -Wall"
+%endif
+export CFLAGS="%optflags"
%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
+ DEFAULT_POSIX2_VERSION=200112 alternative=199209
make -C po update-po
make %{?_smp_mflags} V=1
-%if "%{name}" == "coreutils-testsuite"
+# ================================================
%check
-make %{?_smp_mflags} check-very-expensive
+%if "%{name}" == "coreutils-testsuite"
+ # Avoid parallel make, because otherwise some timeout based tests like
+ # rm/ext3-perf may fail due to high CPU or IO load.
+ make check-very-expensive
+ install -d -m 755 %{buildroot}%{_docdir}/%{name}
+ xz -c tests/test-suite.log > %{buildroot}%{_docdir}/%{name}/test-suite.log.xz
%endif
+# ================================================
%install
+%if "%{name}" == "coreutils"
%makeinstall pkglibexecdir=%{_libdir}/%{name}
test -f %{buildroot}%{_bindir}/su || \
install src/su %{buildroot}%{_bindir}/su
@@ -166,20 +186,27 @@
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
+%find_lang coreutils
+%endif
+# ================================================
%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
+%if "%{name}" == "coreutils"
+
%defattr(-,root,root)
%doc README NEWS
%config %{_sysconfdir}/pam.d/su
@@ -195,7 +222,17 @@
%doc %{_mandir}/man1/*.1.gz
%dir %{_prefix}/share/locale/*/LC_TIME
-%files lang -f %name.lang
+%files lang -f coreutils.lang
%defattr(-,root,root)
+%else
+
+# test-suite
+%dir %{_docdir}/%{name}
+%doc %{_docdir}/%{name}/test-suite.log.xz
+
+%endif
+
+# ================================================
+
%changelog
++++++ coreutils.spec ++++++
--- /var/tmp/diff_new_pack.OAPRnQ/_old 2013-01-22 15:08:46.000000000 +0100
+++ /var/tmp/diff_new_pack.OAPRnQ/_new 2013-01-22 15:08:46.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package coreutils
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -27,9 +27,15 @@
BuildRequires: libcap-devel
BuildRequires: libselinux-devel
BuildRequires: pam-devel
+BuildRequires: perl
+BuildRequires: texinfo
%if "%{name}" == "coreutils-testsuite"
+BuildRequires: acl
BuildRequires: gdb
BuildRequires: perl-Expect
+BuildRequires: python-pyinotify
+BuildRequires: strace
+BuildRequires: valgrind
%endif
BuildRequires: xz
Url: http://www.gnu.org/software/coreutils/
@@ -62,8 +68,6 @@
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
@@ -83,11 +87,13 @@
Patch38: coreutils-cp-corrupt-fragmented-sparse.patch
Patch39: coreutils-no_silent-rule.patch
Patch40: coreutils-df-always-hide-rootfs.patch
+Patch41: coreutils-skip-du-slink-test.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:
@@ -101,12 +107,11 @@
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
@@ -118,7 +123,6 @@
%patch23 -p1
%patch24
%patch25
-#
%patch30
%patch31
%patch32
@@ -131,15 +135,19 @@
%patch39
%endif
%patch40 -p1
+%patch41 -p1
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
+%if 0%{suse_version} >= 1200
AUTOPOINT=true autoreconf -fi
-export CFLAGS="%optflags -Wall"
+%endif
+export CFLAGS="%optflags"
%configure --libexecdir=%{_libdir} --without-included-regex \
--enable-install-program=arch,su \
gl_cv_func_printf_directive_n=yes \
@@ -149,12 +157,19 @@
make -C po update-po
make %{?_smp_mflags} V=1
-%if "%{name}" == "coreutils-testsuite"
+# ================================================
%check
-make %{?_smp_mflags} check-very-expensive
+%if "%{name}" == "coreutils-testsuite"
+ # Avoid parallel make, because otherwise some timeout based tests like
+ # rm/ext3-perf may fail due to high CPU or IO load.
+ make check-very-expensive
+ install -d -m 755 %{buildroot}%{_docdir}/%{name}
+ xz -c tests/test-suite.log > %{buildroot}%{_docdir}/%{name}/test-suite.log.xz
%endif
+# ================================================
%install
+%if "%{name}" == "coreutils"
%makeinstall pkglibexecdir=%{_libdir}/%{name}
test -f %{buildroot}%{_bindir}/su || \
install src/su %{buildroot}%{_bindir}/su
@@ -171,20 +186,27 @@
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
+%find_lang coreutils
+%endif
+# ================================================
%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
+%if "%{name}" == "coreutils"
+
%defattr(-,root,root)
%doc README NEWS
%config %{_sysconfdir}/pam.d/su
@@ -200,7 +222,17 @@
%doc %{_mandir}/man1/*.1.gz
%dir %{_prefix}/share/locale/*/LC_TIME
-%files lang -f %name.lang
+%files lang -f coreutils.lang
%defattr(-,root,root)
+%else
+
+# test-suite
+%dir %{_docdir}/%{name}
+%doc %{_docdir}/%{name}/test-suite.log.xz
+
+%endif
+
+# ================================================
+
%changelog
++++++ coreutils-8.6-compile-su-with-fpie.diff ++++++
--- /var/tmp/diff_new_pack.OAPRnQ/_old 2013-01-22 15:08:46.000000000 +0100
+++ /var/tmp/diff_new_pack.OAPRnQ/_new 2013-01-22 15:08:46.000000000 +0100
@@ -6,12 +6,12 @@
---
lib/Makefile.am | 2 +-
src/Makefile.am | 5 +++++
- 2 files changed, 6 insertions(+), 1 deletions(-)
+ 2 files changed, 6 insertions(+), 1 deletion(-)
Index: lib/Makefile.am
===================================================================
---- lib/Makefile.am.orig 2012-04-16 13:18:02.444819167 +0200
-+++ lib/Makefile.am 2012-04-16 13:18:07.729692419 +0200
+--- lib/Makefile.am.orig
++++ lib/Makefile.am
@@ -28,7 +28,7 @@ noinst_LIBRARIES =
include gnulib.mk
@@ -23,8 +23,8 @@
buffer-lcm.c buffer-lcm.h
Index: src/Makefile.am
===================================================================
---- src/Makefile.am.orig 2012-04-16 13:18:07.714692779 +0200
-+++ src/Makefile.am 2012-04-16 13:18:07.730692395 +0200
+--- src/Makefile.am.orig
++++ src/Makefile.am
@@ -361,6 +361,11 @@ uptime_LDADD += $(GETLOADAVG_LIBS)
su_SOURCES = su.c getdef.c
su_LDADD += $(LIB_CRYPT) $(PAM_LIBS)
++++++ coreutils-8.6-honor-settings-in-etc-default-su-resp-etc-login.defs.diff ++++++
--- /var/tmp/diff_new_pack.OAPRnQ/_old 2013-01-22 15:08:46.000000000 +0100
+++ /var/tmp/diff_new_pack.OAPRnQ/_new 2013-01-22 15:08:46.000000000 +0100
@@ -4,18 +4,19 @@
Subject: [PATCH 5/7] honor settings in /etc/default/su resp /etc/login.defs
---
- src/Makefile.am | 1 +
- src/getdef.c | 259 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/Makefile.am | 1
+ src/Makefile.in | 4
+ src/getdef.c | 259 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/getdef.h | 29 ++++++
- src/su.c | 13 +++-
- 4 files changed, 300 insertions(+), 2 deletions(-)
+ src/su.c | 13 ++
+ 5 files changed, 302 insertions(+), 4 deletions(-)
create mode 100644 src/getdef.c
create mode 100644 src/getdef.h
Index: src/Makefile.am
===================================================================
---- src/Makefile.am.orig 2012-04-16 13:18:07.682693547 +0200
-+++ src/Makefile.am 2012-04-16 13:18:34.609047413 +0200
+--- src/Makefile.am.orig
++++ src/Makefile.am
@@ -358,6 +358,7 @@ factor_LDADD += $(LIB_GMP)
uptime_LDADD += $(GETLOADAVG_LIBS)
@@ -24,10 +25,25 @@
su_LDADD += $(LIB_CRYPT) $(PAM_LIBS)
# for various ACL functions
+Index: src/Makefile.in
+===================================================================
+--- src/Makefile.in.orig
++++ src/Makefile.in
+@@ -592,8 +592,8 @@ stdbuf_DEPENDENCIES = $(am__DEPENDENCIES
+ stty_SOURCES = stty.c
+ stty_OBJECTS = stty.$(OBJEXT)
+ stty_DEPENDENCIES = $(am__DEPENDENCIES_2)
+-su_SOURCES = su.c
+-su_OBJECTS = su.$(OBJEXT)
++su_SOURCES = su.c getdef.c
++su_OBJECTS = su.$(OBJEXT) getdef.$(OBJEXT)
+ su_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
+ sum_SOURCES = sum.c
+ sum_OBJECTS = sum.$(OBJEXT)
Index: src/getdef.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ src/getdef.c 2012-04-16 13:18:07.714692779 +0200
+--- /dev/null
++++ src/getdef.c
@@ -0,0 +1,259 @@
+/* Copyright (C) 2003, 2004, 2005 Thorsten Kukuk
+ Author: Thorsten Kukuk
@@ -290,8 +306,8 @@
+#endif
Index: src/getdef.h
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ src/getdef.h 2012-04-16 13:18:07.714692779 +0200
+--- /dev/null
++++ src/getdef.h
@@ -0,0 +1,29 @@
+/* Copyright (C) 2003, 2005 Thorsten Kukuk
+ Author: Thorsten Kukuk
@@ -324,8 +340,8 @@
+#endif /* _GETDEF_H_ */
Index: src/su.c
===================================================================
---- src/su.c.orig 2012-04-16 13:18:07.706692971 +0200
-+++ src/su.c 2012-04-16 13:18:34.630046909 +0200
+--- src/su.c.orig
++++ src/su.c
@@ -111,6 +111,8 @@
# include
#endif
++++++ coreutils-8.6-log-all-su-attempts.diff ++++++
--- /var/tmp/diff_new_pack.OAPRnQ/_old 2013-01-22 15:08:46.000000000 +0100
+++ /var/tmp/diff_new_pack.OAPRnQ/_new 2013-01-22 15:08:46.000000000 +0100
@@ -7,10 +7,10 @@
src/su.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
-diff --git a/src/su.c b/src/su.c
-index 1d3d007..2a9e423 100644
---- a/src/su.c
-+++ b/src/su.c
+Index: coreutils-8.17/src/su.c
+===================================================================
+--- coreutils-8.17.orig/src/su.c
++++ coreutils-8.17/src/su.c
@@ -75,6 +75,9 @@
#if HAVE_SYSLOG_H && HAVE_SYSLOG
@@ -21,6 +21,3 @@
#else
# undef SYSLOG_SUCCESS
# undef SYSLOG_FAILURE
---
-1.7.1
-
++++++ coreutils-8.6-make-sure-sbin-resp-usr-sbin-are-in-PATH.diff ++++++
--- /var/tmp/diff_new_pack.OAPRnQ/_old 2013-01-22 15:08:46.000000000 +0100
+++ /var/tmp/diff_new_pack.OAPRnQ/_new 2013-01-22 15:08:46.000000000 +0100
@@ -9,8 +9,8 @@
Index: src/su.c
===================================================================
---- src/su.c.orig 2012-04-16 13:00:25.489424170 +0200
-+++ src/su.c 2012-04-16 13:01:12.161193827 +0200
+--- src/su.c.orig
++++ src/su.c
@@ -458,6 +458,117 @@ correct_password (const struct passwd *p
#endif /* !USE_PAM */
}
++++++ coreutils-8.6-pam-support-for-su.diff ++++++
--- /var/tmp/diff_new_pack.OAPRnQ/_old 2013-01-22 15:08:46.000000000 +0100
+++ /var/tmp/diff_new_pack.OAPRnQ/_new 2013-01-22 15:08:46.000000000 +0100
@@ -11,8 +11,8 @@
Index: configure.ac
===================================================================
---- configure.ac.orig 2012-03-24 19:22:13.000000000 +0100
-+++ configure.ac 2012-04-16 12:59:28.737919405 +0200
+--- configure.ac.orig
++++ configure.ac
@@ -185,6 +185,20 @@ fi
AC_FUNC_FORK
@@ -36,8 +36,8 @@
gl_ADD_PROG([optional_bin_progs], [chroot]))
Index: src/Makefile.am
===================================================================
---- src/Makefile.am.orig 2012-03-24 19:22:13.000000000 +0100
-+++ src/Makefile.am 2012-04-16 12:59:28.737919405 +0200
+--- src/Makefile.am.orig
++++ src/Makefile.am
@@ -357,8 +357,8 @@ factor_LDADD += $(LIB_GMP)
# for getloadavg
uptime_LDADD += $(GETLOADAVG_LIBS)
@@ -51,8 +51,8 @@
copy_LDADD += $(LIB_ACL)
Index: src/su.c
===================================================================
---- src/su.c.orig 2012-03-24 19:22:13.000000000 +0100
-+++ src/su.c 2012-04-16 13:00:06.496924665 +0200
+--- src/su.c.orig
++++ src/su.c
@@ -37,6 +37,16 @@
restricts who can su to UID 0 accounts. RMS considers that to
be fascist.
++++++ coreutils-8.6-set-sane-default-path.diff ++++++
--- /var/tmp/diff_new_pack.OAPRnQ/_old 2013-01-22 15:08:46.000000000 +0100
+++ /var/tmp/diff_new_pack.OAPRnQ/_new 2013-01-22 15:08:46.000000000 +0100
@@ -7,10 +7,10 @@
src/su.c | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
-diff --git a/src/su.c b/src/su.c
-index 2a9e423..0071622 100644
---- a/src/su.c
-+++ b/src/su.c
+Index: coreutils-8.17/src/su.c
+===================================================================
+--- coreutils-8.17.orig/src/su.c
++++ coreutils-8.17/src/su.c
@@ -112,18 +112,10 @@
#endif
@@ -32,6 +32,3 @@
/* The shell to run if none is given in the user's passwd entry. */
#define DEFAULT_SHELL "/bin/sh"
---
-1.7.1
-
++++++ coreutils-8.6-update-man-page-for-pam.diff ++++++
--- /var/tmp/diff_new_pack.OAPRnQ/_old 2013-01-22 15:08:46.000000000 +0100
+++ /var/tmp/diff_new_pack.OAPRnQ/_new 2013-01-22 15:08:46.000000000 +0100
@@ -9,9 +9,9 @@
Index: doc/coreutils.texi
===================================================================
---- doc/coreutils.texi.orig 2012-04-16 13:18:07.651694291 +0200
-+++ doc/coreutils.texi 2012-04-16 13:18:14.825522204 +0200
-@@ -15796,8 +15796,11 @@ to certain shells, etc.).
+--- doc/coreutils.texi.orig
++++ doc/coreutils.texi
+@@ -15806,8 +15806,11 @@ to certain shells, etc.).
@findex syslog
@command{su} can optionally be compiled to use @code{syslog} to report
failed, and optionally successful, @command{su} attempts. (If the system
@@ -25,7 +25,7 @@
The program accepts the following options. Also see @ref{Common options}.
-@@ -15878,33 +15881,6 @@ Exit status:
+@@ -15888,33 +15891,6 @@ Exit status:
the exit status of the subshell otherwise
@end display
++++++ coreutils-8.9-singlethreaded-sort.patch ++++++
--- /var/tmp/diff_new_pack.OAPRnQ/_old 2013-01-22 15:08:46.000000000 +0100
+++ /var/tmp/diff_new_pack.OAPRnQ/_new 2013-01-22 15:08:46.000000000 +0100
@@ -2,7 +2,7 @@
===================================================================
--- src/sort.c.orig
+++ src/sort.c
-@@ -5288,7 +5288,11 @@ main (int argc, char **argv)
+@@ -5291,7 +5291,11 @@ main (int argc, char **argv)
{
if (!nthreads)
{
++++++ coreutils-acl-nofollow.patch ++++++
--- /var/tmp/diff_new_pack.OAPRnQ/_old 2013-01-22 15:08:46.000000000 +0100
+++ /var/tmp/diff_new_pack.OAPRnQ/_new 2013-01-22 15:08:46.000000000 +0100
@@ -12,8 +12,8 @@
Index: lib/acl-internal.h
===================================================================
---- lib/acl-internal.h.orig 2012-03-09 08:31:00.000000000 +0100
-+++ lib/acl-internal.h 2012-04-16 13:17:12.470016537 +0200
+--- lib/acl-internal.h.orig
++++ lib/acl-internal.h
@@ -142,6 +142,12 @@ rpl_acl_set_fd (int fd, acl_t acl)
# endif
@@ -29,8 +29,8 @@
# define acl_from_mode(mode) (NULL)
Index: lib/file-has-acl.c
===================================================================
---- lib/file-has-acl.c.orig 2012-03-09 08:31:00.000000000 +0100
-+++ lib/file-has-acl.c 2012-04-16 13:17:12.471016513 +0200
+--- lib/file-has-acl.c.orig
++++ lib/file-has-acl.c
@@ -492,12 +492,20 @@ file_has_acl (char const *name, struct s
/* Linux, FreeBSD, MacOS X, IRIX, Tru64 */
int ret;
@@ -55,8 +55,8 @@
{
Index: m4/acl.m4
===================================================================
---- m4/acl.m4.orig 2012-01-06 10:14:31.000000000 +0100
-+++ m4/acl.m4 2012-04-16 13:17:12.471016513 +0200
+--- m4/acl.m4.orig
++++ m4/acl.m4
@@ -33,7 +33,7 @@ AC_DEFUN([gl_FUNC_ACL],
AC_CHECK_FUNCS(
[acl_get_file acl_get_fd acl_set_file acl_set_fd \
@@ -68,9 +68,9 @@
acl_to_short_text acl_free_text])
Index: ChangeLog
===================================================================
---- ChangeLog.orig 2012-03-26 14:15:03.000000000 +0200
-+++ ChangeLog 2012-04-16 13:17:12.474016441 +0200
-@@ -2815,6 +2815,14 @@
+--- ChangeLog.orig
++++ ChangeLog
+@@ -3272,6 +3272,14 @@
MacOS X 10.7 has an fdatasync that is not declared, and is rumored to
be ineffective. (Bug#9141)
++++++ coreutils-basename_documentation.patch ++++++
--- /var/tmp/diff_new_pack.OAPRnQ/_old 2013-01-22 15:08:46.000000000 +0100
+++ /var/tmp/diff_new_pack.OAPRnQ/_new 2013-01-22 15:08:46.000000000 +0100
@@ -1,8 +1,8 @@
Index: doc/coreutils.texi
===================================================================
---- doc/coreutils.texi.orig 2012-04-16 13:12:04.624344318 +0200
-+++ doc/coreutils.texi 2012-04-16 13:13:08.231837183 +0200
-@@ -12447,6 +12447,16 @@ This section describes commands that man
+--- doc/coreutils.texi.orig
++++ doc/coreutils.texi
+@@ -12457,6 +12457,16 @@ This section describes commands that man
@command{basename} removes any leading directory components from
@var{name}. Synopsis:
++++++ coreutils-bnc#697897-setsid.patch ++++++
--- /var/tmp/diff_new_pack.OAPRnQ/_old 2013-01-22 15:08:47.000000000 +0100
+++ /var/tmp/diff_new_pack.OAPRnQ/_new 2013-01-22 15:08:47.000000000 +0100
@@ -1,8 +1,8 @@
Index: doc/coreutils.info
===================================================================
---- doc/coreutils.info.orig 2012-03-26 14:08:30.000000000 +0200
-+++ doc/coreutils.info 2012-04-18 11:17:09.917545246 +0200
-@@ -12788,6 +12788,10 @@ and optionally successful, `su' attempts
+--- doc/coreutils.info.orig
++++ doc/coreutils.info
+@@ -12796,6 +12796,10 @@ and optionally successful, `su' attempts
`syslog'.) However, GNU `su' does not check if the user is a member of
the `wheel' group; see below.
@@ -13,7 +13,7 @@
The program accepts the following options. Also see *note Common
options::.
-@@ -12796,6 +12800,12 @@ options::.
+@@ -12804,6 +12808,12 @@ options::.
Pass COMMAND, a single command line to run, to the shell with a
`-c' option instead of starting an interactive shell.
@@ -28,8 +28,8 @@
Pass the `-f' option to the shell. This probably only makes sense
Index: src/su.c
===================================================================
---- src/su.c.orig 2012-04-18 11:17:09.856546407 +0200
-+++ src/su.c 2012-04-18 11:17:09.917545246 +0200
+--- src/su.c.orig
++++ src/su.c
@@ -141,6 +141,9 @@ static bool simulate_login;
/* If true, change some environment vars to indicate the user su'd to. */
static bool change_environment;
++++++ coreutils-cp-corrupt-fragmented-sparse.patch ++++++
--- /var/tmp/diff_new_pack.OAPRnQ/_old 2013-01-22 15:08:47.000000000 +0100
+++ /var/tmp/diff_new_pack.OAPRnQ/_new 2013-01-22 15:08:47.000000000 +0100
@@ -53,7 +53,7 @@
===================================================================
--- /dev/null
+++ tests/cp/fiemap-FMR
-@@ -0,0 +1,31 @@
+@@ -0,0 +1,41 @@
+#!/bin/sh
+# Trigger a free-memory read bug in cp from coreutils-[8.11..8.19]
+
@@ -72,9 +72,19 @@
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see http://www.gnu.org/licenses/.
+
-+. "${srcdir=.}/init.sh"; path_prepend_ ./src
++. "${srcdir=.}/init.sh"; path_prepend_ ../src
+print_ver_ cp
+
++# Skip the current test if valgrind doesn't work,
++# which could happen if not installed,
++# or hasn't support for the built architecture,
++# or hasn't appropriate error suppressions installed etc.
++require_valgrind_()
++{
++ valgrind --error-exitcode=1 true 2>/dev/null ||
++ skip_ "requires a working valgrind"
++}
++
+require_valgrind_
+require_perl_
+: ${PERL=perl}
++++++ coreutils-getaddrinfo.patch ++++++
--- /var/tmp/diff_new_pack.OAPRnQ/_old 2013-01-22 15:08:47.000000000 +0100
+++ /var/tmp/diff_new_pack.OAPRnQ/_new 2013-01-22 15:08:47.000000000 +0100
@@ -1,7 +1,7 @@
Index: gnulib-tests/test-getaddrinfo.c
===================================================================
---- gnulib-tests/test-getaddrinfo.c.orig 2012-04-16 13:18:02.424819645 +0200
-+++ gnulib-tests/test-getaddrinfo.c 2012-04-16 13:18:07.737692228 +0200
+--- gnulib-tests/test-getaddrinfo.c.orig
++++ gnulib-tests/test-getaddrinfo.c
@@ -86,11 +86,7 @@ simple (char const *host, char const *se
the test merely because someone is down the country on their
in-law's farm. */
++++++ coreutils-gl_printf_safe.patch ++++++
--- /var/tmp/diff_new_pack.OAPRnQ/_old 2013-01-22 15:08:47.000000000 +0100
+++ /var/tmp/diff_new_pack.OAPRnQ/_new 2013-01-22 15:08:47.000000000 +0100
@@ -1,8 +1,8 @@
Index: m4/gnulib-comp.m4
===================================================================
---- m4/gnulib-comp.m4.orig 2012-03-20 23:34:39.000000000 +0100
-+++ m4/gnulib-comp.m4 2012-04-16 12:57:23.373219154 +0200
-@@ -1584,7 +1584,6 @@ gl_POSIXTM
+--- m4/gnulib-comp.m4.orig
++++ m4/gnulib-comp.m4
+@@ -1597,7 +1597,6 @@ gl_POSIXTM
gl_POSIXVER
gl_FUNC_PRINTF_FREXP
gl_FUNC_PRINTF_FREXPL
++++++ coreutils-i18n.patch ++++++
++++ 680 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/coreutils/coreutils-i18n.patch
++++ and /work/SRC/openSUSE:Factory/.coreutils.new/coreutils-i18n.patch
++++++ coreutils-invalid-ids.patch ++++++
--- /var/tmp/diff_new_pack.OAPRnQ/_old 2013-01-22 15:08:47.000000000 +0100
+++ /var/tmp/diff_new_pack.OAPRnQ/_new 2013-01-22 15:08:47.000000000 +0100
@@ -13,8 +13,8 @@
Index: src/chgrp.c
===================================================================
---- src/chgrp.c.orig 2012-03-24 19:22:13.000000000 +0100
-+++ src/chgrp.c 2012-04-16 13:22:03.004026462 +0200
+--- src/chgrp.c.orig
++++ src/chgrp.c
@@ -88,7 +88,7 @@ parse_group (const char *name)
{
unsigned long int tmp;
++++++ coreutils-misc.patch ++++++
--- /var/tmp/diff_new_pack.OAPRnQ/_old 2013-01-22 15:08:47.000000000 +0100
+++ /var/tmp/diff_new_pack.OAPRnQ/_new 2013-01-22 15:08:47.000000000 +0100
@@ -1,7 +1,7 @@
Index: gnulib-tests/test-isnanl.h
===================================================================
---- gnulib-tests/test-isnanl.h.orig 2012-01-06 08:20:50.000000000 +0100
-+++ gnulib-tests/test-isnanl.h 2012-04-16 13:22:02.969027310 +0200
+--- gnulib-tests/test-isnanl.h.orig
++++ gnulib-tests/test-isnanl.h
@@ -47,7 +47,7 @@ main ()
/* Quiet NaN. */
ASSERT (isnanl (NaNl ()));
@@ -29,8 +29,8 @@
}
Index: tests/misc/help-version
===================================================================
---- tests/misc/help-version.orig 2012-03-24 19:22:13.000000000 +0100
-+++ tests/misc/help-version 2012-04-16 13:22:02.970027285 +0200
+--- tests/misc/help-version.orig
++++ tests/misc/help-version
@@ -251,6 +251,7 @@ parted_setup () { args="-s $tmp_in mklab
for i in $built_programs; do
# Skip these.
@@ -41,8 +41,8 @@
echo z |gzip > $zin
Index: tests/other-fs-tmpdir
===================================================================
---- tests/other-fs-tmpdir.orig 2012-03-24 19:22:13.000000000 +0100
-+++ tests/other-fs-tmpdir 2012-04-16 13:22:02.970027285 +0200
+--- tests/other-fs-tmpdir.orig
++++ tests/other-fs-tmpdir
@@ -43,6 +43,9 @@ for d in $CANDIDATE_TMP_DIRS; do
done
++++++ coreutils-ptr_int_casts.patch ++++++
--- /var/tmp/diff_new_pack.OAPRnQ/_old 2013-01-22 15:08:47.000000000 +0100
+++ /var/tmp/diff_new_pack.OAPRnQ/_new 2013-01-22 15:08:47.000000000 +0100
@@ -1,8 +1,8 @@
Index: src/join.c
===================================================================
---- src/join.c.orig 2012-04-16 16:54:22.032279169 +0200
-+++ src/join.c 2012-04-16 16:54:22.163275636 +0200
-@@ -1320,7 +1320,7 @@ main (int argc, char **argv)
+--- src/join.c.orig
++++ src/join.c
+@@ -1335,7 +1335,7 @@ main (int argc, char **argv)
case 't':
{
@@ -11,7 +11,7 @@
size_t newtablen;
newtab = xstrdup (optarg);
#if HAVE_MBRTOWC
-@@ -1342,7 +1342,7 @@ main (int argc, char **argv)
+@@ -1357,7 +1357,7 @@ main (int argc, char **argv)
newtablen = 1;
if (! newtab)
{
++++++ coreutils-remove_hostname_documentation.patch ++++++
--- /var/tmp/diff_new_pack.OAPRnQ/_old 2013-01-22 15:08:47.000000000 +0100
+++ /var/tmp/diff_new_pack.OAPRnQ/_new 2013-01-22 15:08:47.000000000 +0100
@@ -1,7 +1,7 @@
Index: doc/coreutils.texi
===================================================================
---- doc/coreutils.texi.orig 2012-03-26 07:38:37.000000000 +0200
-+++ doc/coreutils.texi 2012-04-16 13:22:12.487797130 +0200
+--- doc/coreutils.texi.orig
++++ doc/coreutils.texi
@@ -66,7 +66,6 @@
* groups: (coreutils)groups invocation. Print group names a user is in.
* head: (coreutils)head invocation. Output the first part of files.
@@ -27,7 +27,7 @@
* hostid invocation:: Print numeric host identifier
* uptime invocation:: Print system uptime and load
-@@ -14135,7 +14133,6 @@ information.
+@@ -14145,7 +14143,6 @@ information.
* arch invocation:: Print machine hardware name.
* nproc invocation:: Print the number of processors.
* uname invocation:: Print system information.
@@ -35,7 +35,7 @@
* hostid invocation:: Print numeric host identifier.
* uptime invocation:: Print system uptime and load.
@end menu
-@@ -14922,15 +14919,6 @@ easily available, as is the case with Li
+@@ -14932,15 +14929,6 @@ easily available, as is the case with Li
Print the machine hardware name (sometimes called the hardware class
or hardware type).
@@ -51,7 +51,7 @@
@item -p
@itemx --processor
@opindex -p
-@@ -14984,30 +14972,6 @@ Print the kernel version.
+@@ -14994,30 +14982,6 @@ Print the kernel version.
@exitstatus
@@ -84,8 +84,8 @@
@section @command{hostid}: Print numeric host identifier
Index: man/Makefile.am
===================================================================
---- man/Makefile.am.orig 2012-03-26 11:50:41.000000000 +0200
-+++ man/Makefile.am 2012-04-16 13:22:02.980027043 +0200
+--- man/Makefile.am.orig
++++ man/Makefile.am
@@ -199,7 +199,7 @@ check-x-vs-1:
@PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH; \
t=$@-t; \
@@ -97,9 +97,9 @@
rm $$t
Index: man/Makefile.in
===================================================================
---- man/Makefile.in.orig 2012-03-26 11:50:44.000000000 +0200
-+++ man/Makefile.in 2012-04-16 13:22:02.980027043 +0200
-@@ -2030,7 +2030,7 @@ check-x-vs-1:
+--- man/Makefile.in.orig
++++ man/Makefile.in
+@@ -2065,7 +2065,7 @@ check-x-vs-1:
@PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH; \
t=$@-t; \
(cd $(srcdir) && ls -1 *.x) | sed 's/\.x$$//' | $(ASSORT) > $$t;\
++++++ coreutils-skip-du-slink-test.patch ++++++
From: Bernhard Voelker
Date: Sun, 20 Jan 2013 14:12:00 +0200
Subject: [PATCH] Skip tests/du/slink on OBS
This test does not work on OBS infrastructure.
Discussed at:
http://lists.gnu.org/archive/html/coreutils/2013-01/msg00053.html
The test will be removed upstreams with coreutils-8.21.
Until then, skip this test.
---
tests/du/slink | 2 ++
1 file changed, 2 insertions(+)
Index: coreutils-8.17/tests/du/slink
===================================================================
--- coreutils-8.17.orig/tests/du/slink
+++ coreutils-8.17/tests/du/slink
@@ -19,6 +19,8 @@
. "${srcdir=.}/init.sh"; path_prepend_ ../src
print_ver_ du
+skip_ "test does not work on OpenSUSE Build Service infrastructure"
+
# Determine if '.' is on a local (would non-NFS be sufficient?) file system.
# At least on OSF/1 4.0d, when using an nfsv3 file system,
# each created symlink can end up having a size of 0.
++++++ coreutils-sysinfo.patch ++++++
--- /var/tmp/diff_new_pack.OAPRnQ/_old 2013-01-22 15:08:47.000000000 +0100
+++ /var/tmp/diff_new_pack.OAPRnQ/_new 2013-01-22 15:08:47.000000000 +0100
@@ -1,7 +1,7 @@
Index: src/uname.c
===================================================================
---- src/uname.c.orig 2012-03-24 21:26:51.000000000 +0100
-+++ src/uname.c 2012-04-16 13:22:02.996026656 +0200
+--- src/uname.c.orig
++++ src/uname.c
@@ -337,6 +337,36 @@ main (int argc, char **argv)
# endif
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org