r2502 - in glibc-package/trunk/debian: . patches patches/hurd-i386
Author: sthibaul-guest
Date: 2007-08-09 22:14:08 +0000 (Thu, 09 Aug 2007)
New Revision: 2502
Added:
glibc-package/trunk/debian/patches/hurd-i386/cvs-ECANCELED.diff
glibc-package/trunk/debian/patches/hurd-i386/cvs-lock-intern.diff
glibc-package/trunk/debian/patches/hurd-i386/cvs-sigsuspend-nocancel.diff
Removed:
glibc-package/trunk/debian/patches/hurd-i386/submitted-ECANCELED.diff
glibc-package/trunk/debian/patches/hurd-i386/submitted-lock-intern.diff
glibc-package/trunk/debian/patches/hurd-i386/submitted-sigsuspend-nocancel.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* Rename hurd-i386/submitted-lock-intern.diff into
hurd-i386/cvs-lock-intern.diff, hurd-i386/submitted-ECANCELED.diff
into hurd-i386/cvs-ECANCELED.diff and
hurd-i386/submitted-sigsuspend-nocancel.diff into
hurd-i386/cvs-sigsuspend-nocancel.diff as the patches have been accepted
upstream.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-08-07 14:06:26 UTC (rev 2501)
+++ glibc-package/trunk/debian/changelog 2007-08-09 22:14:08 UTC (rev 2502)
@@ -1,3 +1,15 @@
+glibc (2.6.1-2) unstable; urgency=low
+
+ [ Samuel Thibault ]
+ * Rename hurd-i386/submitted-lock-intern.diff into
+ hurd-i386/cvs-lock-intern.diff, hurd-i386/submitted-ECANCELED.diff
+ into hurd-i386/cvs-ECANCELED.diff and
+ hurd-i386/submitted-sigsuspend-nocancel.diff into
+ hurd-i386/cvs-sigsuspend-nocancel.diff as the patches have been accepted
+ upstream.
+
+ -- Aurelien Jarno <aurel32@debian.org> Wed, 01 Aug 2007 16:40:01 +0200
+
glibc (2.6.1-1) unstable; urgency=low
* New upstream version:
Copied: glibc-package/trunk/debian/patches/hurd-i386/cvs-ECANCELED.diff (from rev 2496, glibc-package/trunk/debian/patches/hurd-i386/submitted-ECANCELED.diff)
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/cvs-ECANCELED.diff (rev 0)
+++ glibc-package/trunk/debian/patches/hurd-i386/cvs-ECANCELED.diff 2007-08-09 22:14:08 UTC (rev 2502)
@@ -0,0 +1,22 @@
+--- glibc-2.6.orig/sysdeps/mach/hurd/bits/errno.h
++++ glibc-2.6/sysdeps/mach/hurd/bits/errno.h
+@@ -212,8 +212,8 @@
+ #define EPROTO _HURD_ERRNO (116)/* Protocol error */
+ ETIME = _HURD_ERRNO (117),
+ #define ETIME _HURD_ERRNO (117)/* Timer expired */
+- ECANCELED = _HURD_ERRNO (118),
+-#define ECANCELED _HURD_ERRNO (118)/* Operation canceled */
++ ECANCELED = _HURD_ERRNO (119),
++#define ECANCELED _HURD_ERRNO (119)/* Operation canceled */
+
+ /* Errors from <mach/message.h>. */
+ EMACH_SEND_IN_PROGRESS = 0x10000001,
+@@ -297,7 +297,7 @@
+
+ };
+
+-#define _HURD_ERRNOS 119
++#define _HURD_ERRNOS 120
+
+ /* User-visible type of error codes. It is ok to use `int' or
+ `kern_return_t' for these, but with `error_t' the debugger prints
Copied: glibc-package/trunk/debian/patches/hurd-i386/cvs-lock-intern.diff (from rev 2496, glibc-package/trunk/debian/patches/hurd-i386/submitted-lock-intern.diff)
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/cvs-lock-intern.diff (rev 0)
+++ glibc-package/trunk/debian/patches/hurd-i386/cvs-lock-intern.diff 2007-08-09 22:14:08 UTC (rev 2502)
@@ -0,0 +1,10 @@
+--- glibc-2.6.orig/mach/lock-intern.h
++++ glibc-2.6/mach/lock-intern.h
+@@ -19,6 +19,7 @@
+ #ifndef _LOCK_INTERN_H
+ #define _LOCK_INTERN_H
+
++#include <sys/cdefs.h>
+ #include <machine-lock.h>
+
+ #ifndef _EXTERN_INLINE
Copied: glibc-package/trunk/debian/patches/hurd-i386/cvs-sigsuspend-nocancel.diff (from rev 2496, glibc-package/trunk/debian/patches/hurd-i386/submitted-sigsuspend-nocancel.diff)
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/cvs-sigsuspend-nocancel.diff (rev 0)
+++ glibc-package/trunk/debian/patches/hurd-i386/cvs-sigsuspend-nocancel.diff 2007-08-09 22:14:08 UTC (rev 2502)
@@ -0,0 +1,10 @@
+See http://sourceware.org/bugzilla/show_bug.cgi?id=4126
+
+--- sysdeps/mach/hurd/sigsuspend.c.orig
++++ sysdeps/mach/hurd/sigsuspend.c
+@@ -80,4 +80,5 @@
+ return -1;
+ }
+ libc_hidden_def (__sigsuspend)
++strong_alias (__sigsuspend, sigsuspend_not_cancel)
+ weak_alias (__sigsuspend, sigsuspend)
Deleted: glibc-package/trunk/debian/patches/hurd-i386/submitted-ECANCELED.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-ECANCELED.diff 2007-08-07 14:06:26 UTC (rev 2501)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-ECANCELED.diff 2007-08-09 22:14:08 UTC (rev 2502)
@@ -1,22 +0,0 @@
---- glibc-2.6.orig/sysdeps/mach/hurd/bits/errno.h
-+++ glibc-2.6/sysdeps/mach/hurd/bits/errno.h
-@@ -212,8 +212,8 @@
- #define EPROTO _HURD_ERRNO (116)/* Protocol error */
- ETIME = _HURD_ERRNO (117),
- #define ETIME _HURD_ERRNO (117)/* Timer expired */
-- ECANCELED = _HURD_ERRNO (118),
--#define ECANCELED _HURD_ERRNO (118)/* Operation canceled */
-+ ECANCELED = _HURD_ERRNO (119),
-+#define ECANCELED _HURD_ERRNO (119)/* Operation canceled */
-
- /* Errors from <mach/message.h>. */
- EMACH_SEND_IN_PROGRESS = 0x10000001,
-@@ -297,7 +297,7 @@
-
- };
-
--#define _HURD_ERRNOS 119
-+#define _HURD_ERRNOS 120
-
- /* User-visible type of error codes. It is ok to use `int' or
- `kern_return_t' for these, but with `error_t' the debugger prints
Deleted: glibc-package/trunk/debian/patches/hurd-i386/submitted-lock-intern.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-lock-intern.diff 2007-08-07 14:06:26 UTC (rev 2501)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-lock-intern.diff 2007-08-09 22:14:08 UTC (rev 2502)
@@ -1,10 +0,0 @@
---- glibc-2.6.orig/mach/lock-intern.h
-+++ glibc-2.6/mach/lock-intern.h
-@@ -19,6 +19,7 @@
- #ifndef _LOCK_INTERN_H
- #define _LOCK_INTERN_H
-
-+#include <sys/cdefs.h>
- #include <machine-lock.h>
-
- #ifndef _EXTERN_INLINE
Deleted: glibc-package/trunk/debian/patches/hurd-i386/submitted-sigsuspend-nocancel.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-sigsuspend-nocancel.diff 2007-08-07 14:06:26 UTC (rev 2501)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-sigsuspend-nocancel.diff 2007-08-09 22:14:08 UTC (rev 2502)
@@ -1,10 +0,0 @@
-See http://sourceware.org/bugzilla/show_bug.cgi?id=4126
-
---- sysdeps/mach/hurd/sigsuspend.c.orig
-+++ sysdeps/mach/hurd/sigsuspend.c
-@@ -80,4 +80,5 @@
- return -1;
- }
- libc_hidden_def (__sigsuspend)
-+strong_alias (__sigsuspend, sigsuspend_not_cancel)
- weak_alias (__sigsuspend, sigsuspend)
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2007-08-07 14:06:26 UTC (rev 2501)
+++ glibc-package/trunk/debian/patches/series 2007-08-09 22:14:08 UTC (rev 2502)
@@ -64,15 +64,15 @@
hurd-i386/local-msg-nosignal.diff -p0
hurd-i386/local-tls.diff
hurd-i386/local-tls-support.diff -p0
-hurd-i386/submitted-sigsuspend-nocancel.diff -p0
+hurd-i386/cvs-sigsuspend-nocancel.diff -p0
hurd-i386/submitted-ioctl-decode-argument.diff -p0
hurd-i386/submitted-libc_once.diff -p0
hurd-i386/submitted-stat.diff -p0
hurd-i386/submitted-sysvshm.diff
hurd-i386/submitted-trivial.diff -p0
hurd-i386/submitted-ioctl-unsigned-size_t.diff -p0
-hurd-i386/submitted-lock-intern.diff
-hurd-i386/submitted-ECANCELED.diff
+hurd-i386/cvs-lock-intern.diff
+hurd-i386/cvs-ECANCELED.diff
i386/local-biarch.diff
i386/local-cmov.diff -p0
Reply to: