Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (ca628be46e40e67e135317bae272b79248b2983b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (ca628be46e40e67e135317bae272b79248b2983b)
  • Date: Sun, 22 Feb 2009 05:28:33 -0600

GIT changes to master grimoire by Ladislav Hagara <ladislav.hagara AT unob.cz>:

utils/coreutils/DETAILS | 4 -
utils/coreutils/HISTORY | 4 +
utils/coreutils/PRE_BUILD | 1
utils/coreutils/coreutils-utimens.patch | 113
--------------------------------
4 files changed, 6 insertions(+), 116 deletions(-)

New commits:
commit ca628be46e40e67e135317bae272b79248b2983b
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>

coreutils 7.1

diff --git a/utils/coreutils/DETAILS b/utils/coreutils/DETAILS
index 5a3c23f..4c5f1f4 100755
--- a/utils/coreutils/DETAILS
+++ b/utils/coreutils/DETAILS
@@ -1,6 +1,6 @@
SPELL=coreutils
- VERSION=6.12
- PATCHLEVEL=1
+ VERSION=7.1
+ PATCHLEVEL=0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/utils/coreutils/HISTORY b/utils/coreutils/HISTORY
index 0b0be76..28ea35f 100644
--- a/utils/coreutils/HISTORY
+++ b/utils/coreutils/HISTORY
@@ -1,3 +1,7 @@
+2009-02-22 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 7.1
+ * PRE_BUILD, coreutils-utimens.patch: removed patch
+
2009-02-17 Juuso Alasuutari <iuso AT sourcemage.org>
* CONFIGURE, PRE_BUILD, coreutils-smack.patch: Add optional
Simplified Mandatory Access Control Kernel (SMACK) support.
diff --git a/utils/coreutils/PRE_BUILD b/utils/coreutils/PRE_BUILD
index 00142be..36f4c63 100755
--- a/utils/coreutils/PRE_BUILD
+++ b/utils/coreutils/PRE_BUILD
@@ -1,6 +1,5 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-patch -p1 < ${SPELL_DIRECTORY}/coreutils-utimens.patch &&

if [[ $SMACK == y ]]; then
patch -p1 < "$SPELL_DIRECTORY/coreutils-smack.patch"
diff --git a/utils/coreutils/coreutils-utimens.patch
b/utils/coreutils/coreutils-utimens.patch
deleted file mode 100644
index 4cdcc86..0000000
--- a/utils/coreutils/coreutils-utimens.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- a/lib/utimens.c 2008-05-29 09:21:57.000000000 -0400
-+++ b/lib/utimens.c 2008-06-07 11:36:50.000000000 -0400
-@@ -96,20 +96,42 @@
- #endif
-
- /* POSIX 200x added two interfaces to set file timestamps with
-- nanosecond resolution. */
-+ nanosecond resolution. We provide a fallback for ENOSYS (for
-+ example, compiling against Linux 2.6.25 kernel headers and glibc
-+ 2.7, but running on Linux 2.6.18 kernel). */
- #if HAVE_UTIMENSAT
- if (fd < 0)
-- return utimensat (AT_FDCWD, file, timespec, 0);
-+ {
-+ int result = utimensat (AT_FDCWD, file, timespec, 0);
-+#ifdef __linux__
-+ /* Work around what might be a kernel bug:
-+ http://bugzilla.redhat.com/442352
-+ http://bugzilla.redhat.com/449910
-+ It appears that utimensat can mistakenly return 280 rather
-+ than 0 to indicate success.
-+ FIXME: remove in 2010 or whenever the offending kernels
-+ are no longer in common use. */
-+ if (0 < result)
-+ result = 0;
-+#endif
-+
-+ if (result == 0 || errno != ENOSYS)
-+ return result;
-+ }
- #endif
- #if HAVE_FUTIMENS
-- return futimens (fd, timespec);
--#else
-+ {
-+ int result = futimens (fd, timespec);
-+ if (result == 0 || errno != ENOSYS)
-+ return result;
-+ }
-+#endif
-
- /* The platform lacks an interface to set file timestamps with
- nanosecond resolution, so do the best we can, discarding any
- fractional part of the timestamp. */
- {
--# if HAVE_FUTIMESAT || HAVE_WORKING_UTIMES
-+#if HAVE_FUTIMESAT || HAVE_WORKING_UTIMES
- struct timeval timeval[2];
- struct timeval const *t;
- if (timespec)
-@@ -125,9 +147,9 @@
-
- if (fd < 0)
- {
--# if HAVE_FUTIMESAT
-+# if HAVE_FUTIMESAT
- return futimesat (AT_FDCWD, file, t);
--# endif
-+# endif
- }
- else
- {
-@@ -141,21 +163,21 @@
- worth optimizing, and who knows what other messed-up systems
- are out there? So play it safe and fall back on the code
- below. */
--# if HAVE_FUTIMESAT
-+# if HAVE_FUTIMESAT
- if (futimesat (fd, NULL, t) == 0)
- return 0;
--# elif HAVE_FUTIMES
-+# elif HAVE_FUTIMES
- if (futimes (fd, t) == 0)
- return 0;
--# endif
-+# endif
- }
--# endif /* HAVE_FUTIMESAT || HAVE_WORKING_UTIMES */
-+#endif /* HAVE_FUTIMESAT || HAVE_WORKING_UTIMES */
-
- if (!file)
- {
--# if ! (HAVE_FUTIMESAT || (HAVE_WORKING_UTIMES && HAVE_FUTIMES))
-+#if ! (HAVE_FUTIMESAT || (HAVE_WORKING_UTIMES && HAVE_FUTIMES))
- errno = ENOSYS;
--# endif
-+#endif
-
- /* Prefer EBADF to ENOSYS if both error numbers apply. */
- if (errno == ENOSYS)
-@@ -170,9 +192,9 @@
- return -1;
- }
-
--# if HAVE_WORKING_UTIMES
-+#if HAVE_WORKING_UTIMES
- return utimes (file, t);
--# else
-+#else
- {
- struct utimbuf utimbuf;
- struct utimbuf const *ut;
-@@ -187,9 +209,8 @@
-
- return utime (file, ut);
- }
--# endif /* !HAVE_WORKING_UTIMES */
-+#endif /* !HAVE_WORKING_UTIMES */
- }
--#endif /* !HAVE_FUTIMENS */
- }
-
- /* Set the access and modification time stamps of FILE to be



  • [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (ca628be46e40e67e135317bae272b79248b2983b), Ladislav Hagara, 02/22/2009

Archive powered by MHonArc 2.6.24.

Top of Page