From 685d8303059db10edda8920dd6b050f5c42df01f Mon Sep 17 00:00:00 2001 From: Michael Banck Date: Sat, 5 May 2007 15:58:00 +0000 Subject: * debian/patches/convert_nano_to_microseconds_fix.patch: New patch, fix conversion from nanoseconds to microseconds, taken from CVS. --- debian/changelog | 2 + .../patches/convert_nano_to_microseconds_fix.patch | 72 ++++++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 debian/patches/convert_nano_to_microseconds_fix.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index cf272c41..7c8b442a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ hurd (20060825-2+SVN) unreleased; urgency=low Debian GNU Hurd maintainers and no longer by upstream. * debian/patches/glibc_stat_updates.patch: New patch, updates for stat changes in glibc, by Thomas Schwinge. + * debian/patches/convert_nano_to_microseconds_fix.patch: New patch, + fix conversion from nanoseconds to microseconds, taken from CVS. -- Michael Banck Sat, 7 Oct 2006 14:31:57 +0200 diff --git a/debian/patches/convert_nano_to_microseconds_fix.patch b/debian/patches/convert_nano_to_microseconds_fix.patch new file mode 100644 index 00000000..b01e3275 --- /dev/null +++ b/debian/patches/convert_nano_to_microseconds_fix.patch @@ -0,0 +1,72 @@ +2007-03-25 Thomas Schwinge + + * isofs/inode.c (read_disknode): Correctly convert from nanoseconds to + microseconds. + +2007-03-30 Thomas Schwinge + + * inode.c (read_node): Correctly convert from nanoseconds to + microseconds. + +=================================================================== +RCS file: /sources/hurd/hurd/fatfs/inode.c,v +retrieving revision 1.5 +retrieving revision 1.6 +diff -u -r1.5 -r1.6 +--- hurd/fatfs/inode.c 2003/08/06 21:47:57 1.5 ++++ hurd/fatfs/inode.c 2007/03/30 14:15:49 1.6 +@@ -384,7 +387,7 @@ + fat_to_epoch (dr->write_date, dr->write_time, &ts); + st->st_ctime = st->st_mtime = st->st_atime = ts.tv_sec; + st->st_ctime_usec = st->st_mtime_usec = st->st_atime_usec +- = ts.tv_nsec * 1000; ++ = ts.tv_nsec / 1000; + } + + st->st_blksize = bytes_per_sector; +=================================================================== +RCS file: /sources/hurd/hurd/isofs/inode.c,v +retrieving revision 1.16 +retrieving revision 1.17 +diff -u -r1.16 -r1.17 +--- hurd/isofs/inode.c 2002/08/06 12:33:17 1.16 ++++ hurd/isofs/inode.c 2007/03/25 20:29:33 1.17 +@@ -1,5 +1,5 @@ + /* +- Copyright (C) 1997,98,2002 Free Software Foundation, Inc. ++ Copyright (C) 1997, 1998, 2002, 2007 Free Software Foundation, Inc. + Written by Thomas Bushnell, n/BSG. + + This file is part of the GNU Hurd. +@@ -433,7 +433,7 @@ + isodate_915 (dr->date, &ts); + st->st_ctime = st->st_mtime = st->st_atime = ts.tv_sec; + st->st_ctime_usec = st->st_mtime_usec = st->st_atime_usec +- = ts.tv_nsec * 1000; ++ = ts.tv_nsec / 1000; + } + + /* Override what we have better info for */ +@@ -442,19 +442,19 @@ + if (rl->tfflags & TF_CREATION) + { + st->st_ctime = rl->ctime.tv_sec; +- st->st_ctime_usec = rl->ctime.tv_nsec * 1000; ++ st->st_ctime_usec = rl->ctime.tv_nsec / 1000; + } + + if (rl->tfflags & TF_ACCESS) + { + st->st_atime = rl->atime.tv_sec; +- st->st_atime_usec = rl->atime.tv_nsec * 1000; ++ st->st_atime_usec = rl->atime.tv_nsec / 1000; + } + + if (rl->tfflags & TF_MODIFY) + { + st->st_mtime = rl->mtime.tv_sec; +- st->st_mtime_usec = rl->mtime.tv_nsec * 1000; ++ st->st_mtime_usec = rl->mtime.tv_nsec / 1000; + } + } + -- cgit v1.2.3