Author: mbanck
Date: 2006-11-14 11:49:09 +0100 (Tue, 14 Nov 2006)
New Revision: 1881
Added:
glibc-package/trunk/debian/patches/hurd-i386/cvs-futimes.diff
Removed:
glibc-package/trunk/debian/patches/hurd-i386/submitted-futimes.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* patches/hurd-i386/submitted-futimes.diff: Moved to ...
* patches/hurd-i386/cvs-futimes.diff: ... here, updated with the
version committed upstream by Roland McGrath.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-11-13 06:39:06 UTC (rev 1880)
+++ glibc-package/trunk/debian/changelog 2006-11-14 10:49:09 UTC (rev 1881)
@@ -1,8 +1,14 @@
glibc (2.3.6.ds1-9) unstable; urgency=low
+ [ Aurelien Jarno ]
* patches/kfreebsd/local-sysdeps.diff: update to revision 1718 (from
glibc-bsd).
+ [ Michael Banck ]
+ * patches/hurd-i386/submitted-futimes.diff: Moved to ...
+ * patches/hurd-i386/cvs-futimes.diff: ... here, updated with the
+ version committed upstream by Roland McGrath.
+
-- Aurelien Jarno <aurel32.RemoveThis@debian.org> Mon, 13 Nov 2006 07:37:02 +0100
glibc (2.3.6.ds1-
unstable; urgency=high
Added: glibc-package/trunk/debian/patches/hurd-i386/cvs-futimes.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/cvs-futimes.diff 2006-11-13 06:39:06 UTC (rev 1880)
+++ glibc-package/trunk/debian/patches/hurd-i386/cvs-futimes.diff 2006-11-14 10:49:09 UTC (rev 1881)
@@ -0,0 +1,130 @@
+2006-10-10 Roland McGrath <roland.RemoveThis@frob.com>
+
+ * sysdeps/mach/hurd/utimes.c: Use a union to avoid an improper cast.
+ * sysdeps/mach/hurd/futimes.c: Likewise.
+ * sysdeps/mach/hurd/lutimes.c: Likewise.
+
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/futimes.c,v
+retrieving revision 1.1
+retrieving revision 1.2
+diff -u -r1.1 -r1.2
+--- libc/sysdeps/mach/hurd/futimes.c 2002/08/27 02:09:20 1.1
++++ libc/sysdeps/mach/hurd/futimes.c 2006/10/10 09:28:40 1.2
+@@ -28,20 +28,24 @@
+ int
+ __futimes (int fd, const struct timeval tvp[2])
+ {
+- struct timeval timevals[2];
++ union tv
++ {
++ struct timeval tv;
++ time_value_t tvt;
++ };
++ const union tv *u = (const union tv *) tvp;
++ union tv nulltv[2];
+ error_t err;
+
+ if (tvp == NULL)
+ {
+ /* Setting the number of microseconds to `-1' tells the
+ underlying filesystems to use the current time. */
+- timevals[1].tv_usec = timevals[0].tv_usec = (time_t)-1;
+- tvp = timevals;
++ nulltv[0].tvt.microseconds = nulltv[1].tvt.microseconds = -1;
++ u = nulltv;
+ }
+
+- err = HURD_DPORT_USE (fd, __file_utimes (port,
+- *(time_value_t *) &tvp[0],
+- *(time_value_t *) &tvp[1]));
++ err = HURD_DPORT_USE (fd, __file_utimes (port, u[0].tvt, u[1].tvt));
+ return err ? __hurd_dfail (fd, err) : 0;
+ }
+ weak_alias (__futimes, futimes)
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/lutimes.c,v
+retrieving revision 1.1
+retrieving revision 1.2
+diff -u -r1.1 -r1.2
+--- libc/sysdeps/mach/hurd/lutimes.c 2002/08/27 02:09:20 1.1
++++ libc/sysdeps/mach/hurd/lutimes.c 2006/10/10 09:28:40 1.2
+@@ -28,7 +28,13 @@
+ int
+ __lutimes (const char *file, const struct timeval tvp[2])
+ {
+- struct timeval timevals[2];
++ union tv
++ {
++ struct timeval tv;
++ time_value_t tvt;
++ };
++ const union tv *u = (const union tv *) tvp;
++ union tv nulltv[2];
+ error_t err;
+ file_t port;
+
+@@ -36,15 +42,14 @@
+ {
+ /* Setting the number of microseconds to `-1' tells the
+ underlying filesystems to use the current time. */
+- timevals[1].tv_usec = timevals[0].tv_usec = (time_t)-1;
+- tvp = timevals;
++ nulltv[0].tvt.microseconds = nulltv[1].tvt.microseconds = -1;
++ u = nulltv;
+ }
+
+ port = __file_name_lookup (file, O_NOLINK, 0);
+ if (port == MACH_PORT_NULL)
+ return -1;
+- err = __file_utimes (port,
+- *(time_value_t *) &tvp[0], *(time_value_t *) &tvp[1]);
++ err = __file_utimes (port, u[0].tvt, u[1].tvt);
+ __mach_port_deallocate (__mach_task_self (), port);
+ if (err)
+ return __hurd_fail (err);
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/utimes.c,v
+retrieving revision 1.10
+retrieving revision 1.11
+diff -u -r1.10 -r1.11
+--- libc/sysdeps/mach/hurd/utimes.c 2001/07/06 04:55:57 1.10
++++ libc/sysdeps/mach/hurd/utimes.c 2006/10/10 09:28:40 1.11
+@@ -28,7 +29,13 @@
+ const char *file;
+ const struct timeval tvp[2];
+ {
+- struct timeval timevals[2];
++ union tv
++ {
++ struct timeval tv;
++ time_value_t tvt;
++ };
++ const union tv *u = (const union tv *) tvp;
++ union tv nulltv[2];
+ error_t err;
+ file_t port;
+
+@@ -36,19 +43,17 @@
+ {
+ /* Setting the number of microseconds to `-1' tells the
+ underlying filesystems to use the current time. */
+- timevals[1].tv_usec = timevals[0].tv_usec = (time_t)-1;
+- tvp = timevals;
++ nulltv[0].tvt.microseconds = nulltv[1].tvt.microseconds = -1;
++ u = nulltv;
+ }
+
+ port = __file_name_lookup (file, 0, 0);
+ if (port == MACH_PORT_NULL)
+ return -1;
+- err = __file_utimes (port,
+- *(time_value_t *) &tvp[0], *(time_value_t *) &tvp[1]);
++ err = __file_utimes (port, u[0].tvt, u[1].tvt);
+ __mach_port_deallocate (__mach_task_self (), port);
+ if (err)
+ return __hurd_fail (err);
+ return 0;
+ }
+-
+ weak_alias (__utimes, utimes)
Deleted: glibc-package/trunk/debian/patches/hurd-i386/submitted-futimes.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-futimes.diff 2006-11-13 06:39:06 UTC (rev 1880)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-futimes.diff 2006-11-14 10:49:09 UTC (rev 1881)
@@ -1,38 +0,0 @@
-Index: sysdeps/mach/hurd/futimes.c
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/futimes.c,v
-retrieving revision 1.1
-diff -u -p -r1.1 futimes.c
---- sysdeps/mach/hurd/futimes.c 27 Aug 2002 02:09:20 -0000 1.1
-+++ sysdeps/mach/hurd/futimes.c 23 Sep 2006 12:29:52 -0000
-@@ -28,20 +28,22 @@
- int
- __futimes (int fd, const struct timeval tvp[2])
- {
-- struct timeval timevals[2];
- error_t err;
-+ time_value_t new_atime, new_mtime;
-
- if (tvp == NULL)
-- {
- /* Setting the number of microseconds to `-1' tells the
- underlying filesystems to use the current time. */
-- timevals[1].tv_usec = timevals[0].tv_usec = (time_t)-1;
-- tvp = timevals;
-+ new_atime.microseconds = new_mtime.microseconds = -1;
-+ else
-+ {
-+ new_atime.seconds = tvp[0].tv_sec;
-+ new_atime.microseconds = tvp[0].tv_usec;
-+ new_mtime.seconds = tvp[1].tv_sec;
-+ new_mtime.microseconds = tvp[1].tv_usec;
- }
-
-- err = HURD_DPORT_USE (fd, __file_utimes (port,
-- *(time_value_t *) &tvp[0],
-- *(time_value_t *) &tvp[1]));
-+ err = HURD_DPORT_USE (fd, __file_utimes (port, new_atime, new_mtime));
- return err ? __hurd_dfail (fd, err) : 0;
- }
- weak_alias (__futimes, futimes)
-
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2006-11-13 06:39:06 UTC (rev 1880)
+++ glibc-package/trunk/debian/patches/series 2006-11-14 10:49:09 UTC (rev 1881)
@@ -75,6 +75,7 @@
hppa/cvs-no-ldbl-128.diff -p1
hppa/local-inlining.diff -p1
+hurd-i386/cvs-futimes.diff -p1
hurd-i386/cvs-getresuid-dyslexia.diff -p0
hurd-i386/cvs-getsid.diff -p1
hurd-i386/cvs-ioctl-pfinet.diff -p0
@@ -82,7 +83,6 @@
hurd-i386/cvs-posix-opts.diff -p1
hurd-i386/local-enable-ldconfig.diff -p1
hurd-i386/local-mlock.diff -p1
-hurd-i386/submitted-futimes.diff -p0
hurd-i386/submitted-ioctl-decode-argument.diff -p0
hurd-i386/submitted-sysvshm.diff -p1
--
To UNSUBSCRIBE, email to debian-glibc-REQUEST.RemoveThis@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster.RemoveThis@lists.debian.org
Linux