diff options
Diffstat (limited to 'sys-apps/shadow/files/4.1.2.2/shadow-svn-2364.patch')
| -rw-r--r-- | sys-apps/shadow/files/4.1.2.2/shadow-svn-2364.patch | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/sys-apps/shadow/files/4.1.2.2/shadow-svn-2364.patch b/sys-apps/shadow/files/4.1.2.2/shadow-svn-2364.patch new file mode 100644 index 000000000000..59333feb0be7 --- /dev/null +++ b/sys-apps/shadow/files/4.1.2.2/shadow-svn-2364.patch @@ -0,0 +1,61 @@ +http://bugs.gentoo.org/256784 + +From 060292366348d55eb90b5c3f4f15768ffc7639d2 Mon Sep 17 00:00:00 2001 +From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7> +Date: Sun, 7 Sep 2008 00:05:38 +0000 +Subject: [PATCH] * libmisc/copydir.c, configure.in: Check for the presence of + st_mtim and st_mtimensec, as for st_atim and st_atimensec. + +git-svn-id: svn://svn.debian.org/pkg-shadow/upstream/trunk@2364 5a98b0ae-9ef6-0310-add3-de5d479b70d7 +--- + ChangeLog | 5 +++++ + configure.in | 2 ++ + libmisc/copydir.c | 17 ++++++++++++----- + 3 files changed, 19 insertions(+), 5 deletions(-) + ++2008-09-07 Nicolas François <nicolas.francois@centraliens.net> ++ ++ * libmisc/copydir.c, configure.in: Check for the presence of ++ st_mtim and st_mtimensec, as for st_atim and st_atimensec. + +/* configure.in changes are in the 4.1.2.2 configure.in ... */ + +diff --git a/libmisc/copydir.c b/libmisc/copydir.c +index cdd2037..a9aec98 100644 +--- a/libmisc/copydir.c ++++ b/libmisc/copydir.c +@@ -288,19 +288,26 @@ static int copy_entry (const char *src, const char *dst, + if (LSTAT (src, &sb) == -1) { + /* If we cannot stat the file, do not care. */ + } else { +-#ifdef HAVE_STRUCT_STAT_ST_ATIM ++#ifdef HAVE_STRUCT_STAT_ST_ATIM + mt[0].tv_sec = sb.st_atim.tv_sec; + mt[0].tv_usec = sb.st_atim.tv_nsec / 1000; +- mt[1].tv_sec = sb.st_mtim.tv_sec; +- mt[1].tv_usec = sb.st_mtim.tv_nsec / 1000; + #else + mt[0].tv_sec = sb.st_atime; +- mt[1].tv_sec = sb.st_mtime; + #ifdef HAVE_STRUCT_STAT_ST_ATIMENSEC + mt[0].tv_usec = sb.st_atimensec / 1000; +- mt[1].tv_usec = sb.st_mtimensec / 1000; + #else + mt[0].tv_usec = 0; ++#endif ++#endif ++ ++#ifdef HAVE_STRUCT_STAT_ST_MTIM ++ mt[1].tv_sec = sb.st_mtim.tv_sec; ++ mt[1].tv_usec = sb.st_mtim.tv_nsec / 1000; ++#else ++ mt[1].tv_sec = sb.st_mtime; ++#ifdef HAVE_STRUCT_STAT_ST_MTIMENSEC ++ mt[1].tv_usec = sb.st_mtimensec / 1000; ++#else + mt[1].tv_usec = 0; + #endif + #endif +-- +1.6.1.2 + |