From 7fcdb075eee0c30662718d796e672a53726eaba15b8d99b4767df8d51c93491f Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Tue, 3 May 2011 14:43:52 +0000 Subject: [PATCH 1/4] - Remove services. OBS-URL: https://build.opensuse.org/package/show/Base:System/coreutils?expand=0&rev=121 --- _service | 14 -- _service:set_version:coreutils.spec | 162 ------------------ ...utils-8.12.tar.xz => coreutils-8.12.tar.xz | 0 coreutils.changes | 5 + 4 files changed, 5 insertions(+), 176 deletions(-) delete mode 100644 _service delete mode 100644 _service:set_version:coreutils.spec rename _service:download_url:coreutils-8.12.tar.xz => coreutils-8.12.tar.xz (100%) diff --git a/_service b/_service deleted file mode 100644 index 1657c2d..0000000 --- a/_service +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - ftp.gnu.orgftp/gnu/coreutils/coreutils-8.12.tar.xz - - _service:download_url:coreutils-8.12.tar.xz - sha256 - 1e3c0182cdd0042871741d694ae1166dd90eb9f03a16c0aac0a9072a7aa92faf - - - - \ No newline at end of file diff --git a/_service:set_version:coreutils.spec b/_service:set_version:coreutils.spec deleted file mode 100644 index 4537262..0000000 --- a/_service:set_version:coreutils.spec +++ /dev/null @@ -1,162 +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.12 -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 -Source4: coreutils-8.12.de.po.xz -Patch0: coreutils-misc.patch -Patch1: coreutils-remove_hostname_documentation.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 -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 - -xz -dc %{S:4} >po/de.po - -%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 %{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 /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/_service:download_url:coreutils-8.12.tar.xz b/coreutils-8.12.tar.xz similarity index 100% rename from _service:download_url:coreutils-8.12.tar.xz rename to coreutils-8.12.tar.xz diff --git a/coreutils.changes b/coreutils.changes index a3674c3..fb30195 100644 --- a/coreutils.changes +++ b/coreutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 3 16:42:41 CEST 2011 - pth@suse.de + +- Remove services. + ------------------------------------------------------------------- Tue May 3 14:28:01 CEST 2011 - ro@suse.de From 9ddf18a45cb8d4c140e041f98e0f8f575f7c44a72938f82ed34c066b18395da9 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 15 Jun 2011 09:48:02 +0000 Subject: [PATCH 2/4] Accepting request 73651 from Base:System baserev update by copy to link target OBS-URL: https://build.opensuse.org/request/show/73651 OBS-URL: https://build.opensuse.org/package/show/Base:System/coreutils?expand=0&rev=123 --- coreutils.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreutils.spec b/coreutils.spec index 1acba8d..70c2e8e 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.12 -Release: 1 +Release: 3 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 From a0273c4656d8ecf0638ee222df350a559a29f82af156eaf2eb55b25a8cec0a8c Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 15 Jun 2011 09:48:11 +0000 Subject: [PATCH 3/4] Updating link to change in openSUSE:Factory/coreutils revision 64.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/coreutils?expand=0&rev=11c715320cb6416813399993962657d7 --- coreutils.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreutils.spec b/coreutils.spec index 70c2e8e..886aad1 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.12 -Release: 3 +Release: 5 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 From def3aa015611b5f70b070976c737fe39e20edeac90d4064fbebcccf31396f1df Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 2 Aug 2011 09:49:11 +0000 Subject: [PATCH 4/4] Accepting request 77635 from home:leonardocf:branches:Base:System Avoid triggering unwanted AutoFS mounts (bnc#701659). OBS-URL: https://build.opensuse.org/request/show/77635 OBS-URL: https://build.opensuse.org/package/show/Base:System/coreutils?expand=0&rev=124 --- coreutils-acl-nofollow.patch | 84 ++++++++++++++++++++++++++++++++++++ coreutils.changes | 6 +++ coreutils.spec | 2 + 3 files changed, 92 insertions(+) create mode 100644 coreutils-acl-nofollow.patch diff --git a/coreutils-acl-nofollow.patch b/coreutils-acl-nofollow.patch new file mode 100644 index 0000000..ac5067e --- /dev/null +++ b/coreutils-acl-nofollow.patch @@ -0,0 +1,84 @@ +commit 95f7c57ff4090a5dee062044d2c7b99879077808 +Author: Kamil Dudka +Date: Fri Jul 22 14:48:42 2011 +0200 + + file-has-acl: use acl_extended_file_nofollow if available + + * lib/acl-internal.h (HAVE_ACL_EXTENDED_FILE): New macro. + (acl_extended_file): New macro. + * lib/file-has-acl.c (file_has_acl): Use acl_extended_file_nofollow. + * m4/acl.m4 (gl_FUNC_ACL): Check for acl_extended_file_nofollow. + This addresses http://bugzilla.redhat.com/692823. + +Index: coreutils-8.12/lib/acl-internal.h +=================================================================== +--- coreutils-8.12.orig/lib/acl-internal.h ++++ coreutils-8.12/lib/acl-internal.h +@@ -124,6 +124,12 @@ rpl_acl_set_fd (int fd, acl_t acl) + # endif + + /* Linux-specific */ ++# ifndef HAVE_ACL_EXTENDED_FILE_NOFOLLOW ++# define HAVE_ACL_EXTENDED_FILE_NOFOLLOW false ++# define acl_extended_file_nofollow(name) (-1) ++# endif ++ ++/* Linux-specific */ + # ifndef HAVE_ACL_FROM_MODE + # define HAVE_ACL_FROM_MODE false + # define acl_from_mode(mode) (NULL) +Index: coreutils-8.12/lib/file-has-acl.c +=================================================================== +--- coreutils-8.12.orig/lib/file-has-acl.c ++++ coreutils-8.12/lib/file-has-acl.c +@@ -339,12 +339,20 @@ file_has_acl (char const *name, struct s + /* Linux, FreeBSD, MacOS X, IRIX, Tru64 */ + int ret; + +- if (HAVE_ACL_EXTENDED_FILE) /* Linux */ ++ if (HAVE_ACL_EXTENDED_FILE || HAVE_ACL_EXTENDED_FILE_NOFOLLOW) /* Linux */ + { ++# if HAVE_ACL_EXTENDED_FILE_NOFOLLOW ++ /* acl_extended_file_nofollow() uses lgetxattr() in order to prevent ++ unnecessary mounts, but it returns the same result as we already ++ know that NAME is not a symbolic link at this point (modulo the ++ TOCTTOU race condition). */ ++ ret = acl_extended_file_nofollow (name); ++# else + /* On Linux, acl_extended_file is an optimized function: It only + makes two calls to getxattr(), one for ACL_TYPE_ACCESS, one for + ACL_TYPE_DEFAULT. */ + ret = acl_extended_file (name); ++# endif + } + else /* FreeBSD, MacOS X, IRIX, Tru64 */ + { +Index: coreutils-8.12/m4/acl.m4 +=================================================================== +--- coreutils-8.12.orig/m4/acl.m4 ++++ coreutils-8.12/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 \ + acl_free acl_from_mode acl_from_text \ +- acl_delete_def_file acl_extended_file \ ++ acl_delete_def_file acl_extended_file acl_extended_file_nofollow \ + acl_delete_fd_np acl_delete_file_np \ + acl_copy_ext_native acl_create_entry_np \ + acl_to_short_text acl_free_text]) +Index: coreutils-8.12/ChangeLog +=================================================================== +--- coreutils-8.12.orig/ChangeLog ++++ coreutils-8.12/ChangeLog +@@ -1,3 +1,11 @@ ++2011-07-22 Kamil Dudka ++ ++ file-has-acl: use acl_extended_file_nofollow if available ++ * lib/acl-internal.h (HAVE_ACL_EXTENDED_FILE): New macro. ++ (acl_extended_file): New macro. ++ * lib/file-has-acl.c (file_has_acl): Use acl_extended_file_nofollow. ++ * m4/acl.m4 (gl_FUNC_ACL): Check for acl_extended_file_nofollow. ++ + 2011-04-26 Jim Meyering + + version 8.12 diff --git a/coreutils.changes b/coreutils.changes index fb30195..4b9cabf 100644 --- a/coreutils.changes +++ b/coreutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Aug 2 00:26:05 UTC 2011 - lchiquitto@suse.com + +- file-has-acl: use acl_extended_file_nofollow if available to + avoid triggering unwanted AutoFS mounts (bnc#701659). + ------------------------------------------------------------------- Tue May 3 16:42:41 CEST 2011 - pth@suse.de diff --git a/coreutils.spec b/coreutils.spec index 886aad1..74449dc 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -56,6 +56,7 @@ 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build # this will create a cycle, broken up randomly - coreutils is just too core to have other # prerequires @@ -96,6 +97,7 @@ uname unexpand uniq unlink uptime users vdir wc who whoami yes %patch31 %patch32 %patch33 +%patch34 -p1 xz -dc %{S:4} >po/de.po