diff --git a/_service:download_url:coreutils-8.10.tar.xz b/_service:download_url:coreutils-8.10.tar.xz deleted file mode 100644 index 9fddd0a..0000000 --- a/_service:download_url:coreutils-8.10.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8258785cbab6580f2e0376769a7b98ab3e1ddfca2d6f48e5490a51688d0bee83 -size 4753304 diff --git a/_service:set_version:coreutils.spec b/_service:set_version:coreutils.spec deleted file mode 100644 index f4279ef..0000000 --- a/_service:set_version:coreutils.spec +++ /dev/null @@ -1,165 +0,0 @@ -# -# spec file for package coreutils -# -# Copyright (c) 2011 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 -Summary: GNU Core Utilities -BuildRequires: help2man libacl-devel libcap-devel libselinux-devel pam-devel xz -Url: http://www.gnu.org/software/coreutils/ -License: GFDLv1.2 ; GPLv2+ ; GPLv3+ -Group: System/Base -Version: 8.10 -Release: 0 -Provides: fileutils = %{version}, sh-utils = %{version}, stat = %version}, textutils = %{version}, mktemp = %{version} -Obsoletes: fileutils < %{version}, sh-utils < %{version}, stat < %version}, textutils < %{version}, mktemp < %{version} -Obsoletes: libselinux <= 1.23.11-3 libselinux-32bit = 9 libselinux-64bit = 9 libselinux-x86 = 9 -AutoReqProv: on -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 -Patch0: coreutils-misc.patch -Patch1: coreutils-no_hostname_and_hostid.patch -Patch2: coreutils-gl_printf_safe.patch -Patch4: coreutils-8.6-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 -#Next two patches added after 8.10 release so should be obsolete with next release -Patch34: coreutils-compute_range_endpoint.patch -Patch35: coreutils-fix_sparse_fiemap_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: - -[ 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 -%patch4 -%patch5 -%patch6 -%patch0 -%patch1 -%patch2 -%patch8 -%patch16 -%patch20 -%patch21 -%patch22 -p1 -%patch23 -p1 -%patch24 -p1 -%patch25 -p1 -# -%patch30 -p1 -%patch31 -%patch32 -%patch33 -%patch34 -p1 -%patch35 -p1 - -%build -AUTOPOINT=true autoreconf -fi -export CFLAGS="%optflags -Wall" -%configure --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 - -%install -%makeinstall -test -f %{buildroot}%{_bindir}/su || \ - install src/su %{buildroot}%{_bindir}/su -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 - mv %{buildroot}%{_bindir}/$i %{buildroot}/bin/$i - test $i = su && echo -n '%%attr(4755,root,root) ' - echo /bin/$i -done > bin.files -ln -sf ../../bin/{basename,sort,stat,touch,readlink,md5sum} %{buildroot}%{_bindir} -install -d -m 755 %{buildroot}/etc/pam.d -install -m 644 %{SOURCE:1} %{buildroot}/etc/pam.d/su -install -m 644 %{SOURCE:1} %{buildroot}/etc/pam.d/su-l -install -d -m 755 %{buildroot}/etc/default -install -m 644 %{SOURCE: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 /bin/su - -%clean -rm -rf %{buildroot} - -%files -f bin.files -%defattr(-,root,root) -%doc README NEWS -%config %{_sysconfdir}/pam.d/su -%config %{_sysconfdir}/pam.d/su-l -%config(noreplace) %{_sysconfdir}/default/su -%{_bindir}/* -%{_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 diff --git a/coreutils-8.6-i18n.patch b/coreutils-8.6-i18n.patch index 8ef8a79..04fc8d7 100644 --- a/coreutils-8.6-i18n.patch +++ b/coreutils-8.6-i18n.patch @@ -20,7 +20,7 @@ Index: lib/linebuffer.h =================================================================== --- lib/linebuffer.h.orig 2011-01-06 09:47:56.000000000 +0100 -+++ lib/linebuffer.h 2011-02-09 18:40:35.272982763 +0100 ++++ lib/linebuffer.h 2011-02-10 15:59:59.159604973 +0100 @@ -21,6 +21,11 @@ # include @@ -46,7 +46,7 @@ Index: lib/linebuffer.h Index: src/cut.c =================================================================== --- src/cut.c.orig 2011-01-31 13:40:38.000000000 +0100 -+++ src/cut.c 2011-02-09 18:40:35.282982128 +0100 ++++ src/cut.c 2011-02-10 16:00:21.825167755 +0100 @@ -28,6 +28,11 @@ #include #include @@ -640,7 +640,7 @@ Index: src/cut.c Index: src/expand.c =================================================================== --- src/expand.c.orig 2011-01-31 13:40:38.000000000 +0100 -+++ src/expand.c 2011-02-09 18:40:35.299981048 +0100 ++++ src/expand.c 2011-02-10 15:59:59.229600533 +0100 @@ -38,12 +38,29 @@ #include #include @@ -831,7 +831,7 @@ Index: src/expand.c Index: src/fold.c =================================================================== --- src/fold.c.orig 2011-01-31 13:40:38.000000000 +0100 -+++ src/fold.c 2011-02-09 18:40:35.325979398 +0100 ++++ src/fold.c 2011-02-10 15:59:59.271597870 +0100 @@ -22,12 +22,34 @@ #include #include @@ -1233,7 +1233,7 @@ Index: src/fold.c Index: src/join.c =================================================================== --- src/join.c.orig 2011-01-31 13:40:38.000000000 +0100 -+++ src/join.c 2011-02-09 19:03:26.663911090 +0100 ++++ src/join.c 2011-02-10 16:03:29.484268348 +0100 @@ -22,18 +22,32 @@ #include #include @@ -1603,7 +1603,40 @@ Index: src/join.c xfields (line); if (prevline[which - 1]) -@@ -562,7 +785,6 @@ static void +@@ -536,22 +759,29 @@ prfield (size_t n, struct line const *li + } + + /* Output all the fields in line, other than the join field. */ ++#define PUT_TAB_CHAR \ ++ do \ ++ { \ ++ (tab != NULL) ? \ ++ fwrite(tab, sizeof(char), tablen, stdout) : putchar (' '); \ ++ } \ ++ while (0) ++ + + static void + prfields (struct line const *line, size_t join_field, size_t autocount) + { + size_t i; + size_t nfields = autoformat ? autocount : line->nfields; +- char output_separator = tab < 0 ? ' ' : tab; + + for (i = 0; i < join_field && i < nfields; ++i) + { +- putchar (output_separator); ++ PUT_TAB_CHAR; + prfield (i, line); + } + for (i = join_field + 1; i < nfields; ++i) + { +- putchar (output_separator); ++ PUT_TAB_CHAR; + prfield (i, line); + } + } +@@ -562,7 +792,6 @@ static void prjoin (struct line const *line1, struct line const *line2) { const struct outlist *outlist; @@ -1611,7 +1644,7 @@ Index: src/join.c size_t field; struct line const *line; -@@ -596,7 +818,7 @@ prjoin (struct line const *line1, struct +@@ -596,7 +825,7 @@ prjoin (struct line const *line1, struct o = o->next; if (o == NULL) break; @@ -1620,7 +1653,7 @@ Index: src/join.c } putchar ('\n'); } -@@ -1075,21 +1297,46 @@ main (int argc, char **argv) +@@ -1075,21 +1304,46 @@ main (int argc, char **argv) case 't': { @@ -1679,7 +1712,7 @@ Index: src/join.c Index: src/pr.c =================================================================== --- src/pr.c.orig 2011-01-31 13:40:38.000000000 +0100 -+++ src/pr.c 2011-02-09 18:40:35.383975713 +0100 ++++ src/pr.c 2011-02-10 15:59:59.310595397 +0100 @@ -312,6 +312,32 @@ #include @@ -2405,7 +2438,7 @@ Index: src/pr.c Index: src/sort.c =================================================================== --- src/sort.c.orig 2011-02-03 11:24:35.000000000 +0100 -+++ src/sort.c 2011-02-09 19:05:14.492064742 +0100 ++++ src/sort.c 2011-02-10 16:00:21.720174413 +0100 @@ -22,11 +22,20 @@ #include @@ -3356,7 +3389,7 @@ Index: src/sort.c Index: src/unexpand.c =================================================================== --- src/unexpand.c.orig 2011-01-31 13:40:38.000000000 +0100 -+++ src/unexpand.c 2011-02-09 18:40:35.433972538 +0100 ++++ src/unexpand.c 2011-02-10 15:59:59.390590326 +0100 @@ -39,12 +39,29 @@ #include #include @@ -3613,7 +3646,7 @@ Index: src/unexpand.c Index: src/uniq.c =================================================================== --- src/uniq.c.orig 2011-01-31 13:40:38.000000000 +0100 -+++ src/uniq.c 2011-02-09 18:40:35.467970384 +0100 ++++ src/uniq.c 2011-02-10 15:59:59.440587155 +0100 @@ -21,6 +21,16 @@ #include #include @@ -3984,7 +4017,7 @@ Index: src/uniq.c Index: tests/Makefile.am =================================================================== --- tests/Makefile.am.orig 2011-01-31 18:26:06.000000000 +0100 -+++ tests/Makefile.am 2011-02-09 18:40:35.492968791 +0100 ++++ tests/Makefile.am 2011-02-10 16:00:18.705365581 +0100 @@ -236,6 +236,7 @@ TESTS = \ misc/sort-debug-keys \ misc/sort-debug-warn \ @@ -4007,7 +4040,7 @@ Index: tests/Makefile.am Index: tests/misc/cut =================================================================== --- tests/misc/cut.orig 2011-01-31 13:40:38.000000000 +0100 -+++ tests/misc/cut 2011-02-09 18:40:35.517967204 +0100 ++++ tests/misc/cut 2011-02-10 16:00:18.981348087 +0100 @@ -26,7 +26,7 @@ use strict; my $prog = 'cut'; my $try = "Try \`$prog --help' for more information.\n"; @@ -4029,7 +4062,7 @@ Index: tests/misc/cut Index: tests/misc/mb1.I =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ tests/misc/mb1.I 2011-02-09 18:40:35.542965616 +0100 ++++ tests/misc/mb1.I 2011-02-10 15:59:59.632574982 +0100 @@ -0,0 +1,4 @@ +Apple＠10 +Banana＠5 @@ -4038,7 +4071,7 @@ Index: tests/misc/mb1.I Index: tests/misc/mb1.X =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ tests/misc/mb1.X 2011-02-09 18:40:35.567964028 +0100 ++++ tests/misc/mb1.X 2011-02-10 15:59:59.673572383 +0100 @@ -0,0 +1,4 @@ +Banana＠5 +Apple＠10 @@ -4047,7 +4080,7 @@ Index: tests/misc/mb1.X Index: tests/misc/mb2.I =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ tests/misc/mb2.I 2011-02-09 18:40:35.625960344 +0100 ++++ tests/misc/mb2.I 2011-02-10 15:59:59.698570797 +0100 @@ -0,0 +1,4 @@ +Apple＠ＡＡ10＠＠20 +Banana＠ＡＡ5＠＠30 @@ -4056,7 +4089,7 @@ Index: tests/misc/mb2.I Index: tests/misc/mb2.X =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ tests/misc/mb2.X 2011-02-09 18:40:35.668957612 +0100 ++++ tests/misc/mb2.X 2011-02-10 15:59:59.732568640 +0100 @@ -0,0 +1,4 @@ +Citrus＠ＡＡ20＠＠5 +Cherry＠ＡＡ30＠＠10 @@ -4065,7 +4098,7 @@ Index: tests/misc/mb2.X Index: tests/misc/sort-mb-tests =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ tests/misc/sort-mb-tests 2011-02-09 18:40:35.693956026 +0100 ++++ tests/misc/sort-mb-tests 2011-02-10 15:59:59.757567054 +0100 @@ -0,0 +1,58 @@ +#! /bin/sh +case $# in diff --git a/coreutils.changes b/coreutils.changes index 23891e5..ef2de1d 100644 --- a/coreutils.changes +++ b/coreutils.changes @@ -44,6 +44,7 @@ Thu Feb 10 14:35:49 CET 2011 - pth@suse.de - Add upstream patch that fixes a segfault in cut. - Add upstream patch to fix sparse fiemap tests. +- Fix i18n patch for join. ------------------------------------------------------------------- Fri Jan 14 14:13:28 CET 2011 - uli@suse.de diff --git a/coreutils.spec b/coreutils.spec index 2b012ba..eea7759 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -24,7 +24,7 @@ Url: http://www.gnu.org/software/coreutils/ License: GFDLv1.2 ; GPLv2+ ; GPLv3+ Group: System/Base Version: 8.10 -Release: 1 +Release: 0 Provides: fileutils = %{version}, sh-utils = %{version}, stat = %version}, textutils = %{version}, mktemp = %{version} Obsoletes: fileutils < %{version}, sh-utils < %{version}, stat < %version}, textutils < %{version}, mktemp < %{version} Obsoletes: libselinux <= 1.23.11-3 libselinux-32bit = 9 libselinux-64bit = 9 libselinux-x86 = 9 @@ -126,10 +126,10 @@ do done > bin.files ln -sf ../../bin/{basename,sort,stat,touch,readlink,md5sum} %{buildroot}%{_bindir} install -d -m 755 %{buildroot}/etc/pam.d -install -m 644 %{SOURCE:1} %{buildroot}/etc/pam.d/su -install -m 644 %{SOURCE:1} %{buildroot}/etc/pam.d/su-l +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 %{SOURCE:2} %{buildroot}/etc/default/su +install -m 644 %{S:2} %{buildroot}/etc/default/su echo '.so man1/test.1' > %{buildroot}/%{_mandir}/man1/\[.1 %find_lang %name