Author: sthibault
Date: 2011-02-16 23:32:08 +0000 (Wed, 16 Feb 2011)
New Revision: 4525
Added:
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-header-prot.diff
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-psiginfo.diff
Removed:
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-header-prot.diff
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-psiginfo.diff
Modified:
glibc-package/branches/eglibc-2.13/debian/changelog
glibc-package/branches/eglibc-2.13/debian/patches/series
Log:
Rename patches/hurd-i386/submitted-header-prot.diff and
patches/hurd-i386/submitted-psiginfo.diff, already applied upstream
Modified: glibc-package/branches/eglibc-2.13/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/changelog 2011-02-16 22:53:19 UTC
(rev 4524)
+++ glibc-package/branches/eglibc-2.13/debian/changelog 2011-02-16 23:32:08 UTC
(rev 4525)
@@ -120,8 +120,8 @@
[ Samuel Thibault ]
* Add patches/any/cvs-glro_dl_debug_mask.diff to fix build without
EGLIBC_RTLD_DEBUG support.
- * Add patches/hurd-i386/submitted-header-prot.diff,
- patches/hurd-i386/submitted-psiginfo.diff, and
+ * Add patches/hurd-i386/cvs-header-prot.diff,
+ patches/hurd-i386/cvs-psiginfo.diff, and
patches/hurd-i386/local-ptsname.diff to fix hurd-i386 build.
* Update expected hurd-i386 failures with new tests.
Copied:
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-header-prot.diff
(from rev 4524,
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-header-prot.diff)
===================================================================
---
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-header-prot.diff
(rev 0)
+++
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-header-prot.diff
2011-02-16 23:32:08 UTC (rev 4525)
@@ -0,0 +1,43 @@
+2011-02-16 Samuel Thibault <samuel.thiba...@ens-lyon.org>
+
+ * sysdeps/mach/i386/sysdep.h: Add _MACH_I386_SYSDEP_H inclusion
+ protection macro.
+ * sysdeps/mach/i386/thread_state.h: Add _MACH_I386_THREAD_STATE_H
+ inclusion protection macro.
+
+--- a/sysdeps/mach/i386/sysdep.h.original 2011-02-12 02:25:25.000000000
+0000
++++ b/sysdeps/mach/i386/sysdep.h 2011-02-12 02:25:54.000000000 +0000
+@@ -18,6 +18,9 @@
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
++#ifndef _MACH_I386_SYSDEP_H
++#define _MACH_I386_SYSDEP_H 1
++
+ /* Defines RTLD_PRIVATE_ERRNO and USE_DL_SYSINFO. */
+ #include <dl-sysdep.h>
+ #include <tls.h>
+@@ -78,3 +81,5 @@
+ #undef ENTRY
+ #undef ALIGN
+ #include <sysdeps/unix/i386/sysdep.h>
++
++#endif /* mach/i386/sysdep.h */
+--- a/sysdeps/mach/i386/thread_state.h.original 2011-02-12
02:26:16.000000000 +0000
++++ b/sysdeps/mach/i386/thread_state.h 2011-02-12 02:26:31.000000000 +0000
+@@ -17,6 +17,9 @@
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
++#ifndef _MACH_I386_THREAD_STATE_H
++#define _MACH_I386_THREAD_STATE_H 1
++
+ #include <mach/machine/thread_status.h>
+
+ #define MACHINE_NEW_THREAD_STATE_FLAVOR i386_THREAD_STATE
+@@ -45,3 +48,5 @@ struct machine_thread_all_state
+ };
+
+ #include <sysdeps/mach/thread_state.h>
++
++#endif /* mach/i386/thread_state.h */
Copied:
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-psiginfo.diff
(from rev 4524,
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-psiginfo.diff)
===================================================================
---
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-psiginfo.diff
(rev 0)
+++
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-psiginfo.diff
2011-02-16 23:32:08 UTC (rev 4525)
@@ -0,0 +1,33 @@
+2011-02-16 Samuel Thibault <samuel.thiba...@ens-lyon.org>
+
+ * stdio-common/psiginfo.c (psiginfo): Check pinfo->si_signo against
+ SIGRTMIN and SIGRTMAX and print information in that case only when
+ SIGRTMIN is defined.
+
+---
+ psiginfo.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+--- eglibc-2.13/stdio-common/psiginfo.c.original 2011-02-10
18:39:10.000000000 +0000
++++ eglibc-2.13/stdio-common/psiginfo.c 2011-02-10 18:40:19.000000000
+0000
+@@ -86,8 +86,12 @@ psiginfo (const siginfo_t *pinfo, const
+ const char *desc;
+ if (pinfo->si_signo >= 0 && pinfo->si_signo < NSIG
+ && ((desc = INTUSE(_sys_siglist)[pinfo->si_signo]) != NULL
+- || (pinfo->si_signo >= SIGRTMIN && pinfo->si_signo < SIGRTMAX)))
++#ifdef SIGRTMIN
++ || (pinfo->si_signo >= SIGRTMIN && pinfo->si_signo < SIGRTMAX)
++#endif
++ ))
+ {
++#ifdef SIGRTMIN
+ if (desc == NULL)
+ {
+ if (pinfo->si_signo - SIGRTMIN < SIGRTMAX - pinfo->si_signo)
+@@ -106,6 +110,7 @@ psiginfo (const siginfo_t *pinfo, const
+ }
+ }
+ else
++#endif
+ fprintf (fp, "%s (", _(desc));
+
+ const char *base = NULL;
Deleted:
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-header-prot.diff
===================================================================
---
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-header-prot.diff
2011-02-16 22:53:19 UTC (rev 4524)
+++
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-header-prot.diff
2011-02-16 23:32:08 UTC (rev 4525)
@@ -1,43 +0,0 @@
-2011-02-16 Samuel Thibault <samuel.thiba...@ens-lyon.org>
-
- * sysdeps/mach/i386/sysdep.h: Add _MACH_I386_SYSDEP_H inclusion
- protection macro.
- * sysdeps/mach/i386/thread_state.h: Add _MACH_I386_THREAD_STATE_H
- inclusion protection macro.
-
---- a/sysdeps/mach/i386/sysdep.h.original 2011-02-12 02:25:25.000000000
+0000
-+++ b/sysdeps/mach/i386/sysdep.h 2011-02-12 02:25:54.000000000 +0000
-@@ -18,6 +18,9 @@
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
-
-+#ifndef _MACH_I386_SYSDEP_H
-+#define _MACH_I386_SYSDEP_H 1
-+
- /* Defines RTLD_PRIVATE_ERRNO and USE_DL_SYSINFO. */
- #include <dl-sysdep.h>
- #include <tls.h>
-@@ -78,3 +81,5 @@
- #undef ENTRY
- #undef ALIGN
- #include <sysdeps/unix/i386/sysdep.h>
-+
-+#endif /* mach/i386/sysdep.h */
---- a/sysdeps/mach/i386/thread_state.h.original 2011-02-12
02:26:16.000000000 +0000
-+++ b/sysdeps/mach/i386/thread_state.h 2011-02-12 02:26:31.000000000 +0000
-@@ -17,6 +17,9 @@
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
-
-+#ifndef _MACH_I386_THREAD_STATE_H
-+#define _MACH_I386_THREAD_STATE_H 1
-+
- #include <mach/machine/thread_status.h>
-
- #define MACHINE_NEW_THREAD_STATE_FLAVOR i386_THREAD_STATE
-@@ -45,3 +48,5 @@ struct machine_thread_all_state
- };
-
- #include <sysdeps/mach/thread_state.h>
-+
-+#endif /* mach/i386/thread_state.h */
Deleted:
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-psiginfo.diff
===================================================================
---
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-psiginfo.diff
2011-02-16 22:53:19 UTC (rev 4524)
+++
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-psiginfo.diff
2011-02-16 23:32:08 UTC (rev 4525)
@@ -1,33 +0,0 @@
-2011-02-16 Samuel Thibault <samuel.thiba...@ens-lyon.org>
-
- * stdio-common/psiginfo.c (psiginfo): Check pinfo->si_signo against
- SIGRTMIN and SIGRTMAX and print information in that case only when
- SIGRTMIN is defined.
-
----
- psiginfo.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
---- eglibc-2.13/stdio-common/psiginfo.c.original 2011-02-10
18:39:10.000000000 +0000
-+++ eglibc-2.13/stdio-common/psiginfo.c 2011-02-10 18:40:19.000000000
+0000
-@@ -86,8 +86,12 @@ psiginfo (const siginfo_t *pinfo, const
- const char *desc;
- if (pinfo->si_signo >= 0 && pinfo->si_signo < NSIG
- && ((desc = INTUSE(_sys_siglist)[pinfo->si_signo]) != NULL
-- || (pinfo->si_signo >= SIGRTMIN && pinfo->si_signo < SIGRTMAX)))
-+#ifdef SIGRTMIN
-+ || (pinfo->si_signo >= SIGRTMIN && pinfo->si_signo < SIGRTMAX)
-+#endif
-+ ))
- {
-+#ifdef SIGRTMIN
- if (desc == NULL)
- {
- if (pinfo->si_signo - SIGRTMIN < SIGRTMAX - pinfo->si_signo)
-@@ -106,6 +110,7 @@ psiginfo (const siginfo_t *pinfo, const
- }
- }
- else
-+#endif
- fprintf (fp, "%s (", _(desc));
-
- const char *base = NULL;
Modified: glibc-package/branches/eglibc-2.13/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/series 2011-02-16
22:53:19 UTC (rev 4524)
+++ glibc-package/branches/eglibc-2.13/debian/patches/series 2011-02-16
23:32:08 UTC (rev 4525)
@@ -112,8 +112,8 @@
hurd-i386/local-no-hp-timing.diff
hurd-i386/submitted-catch-signal.diff
hurd-i386/local-sendmsg-SCM_RIGHTS.diff
-hurd-i386/submitted-header-prot.diff
-hurd-i386/submitted-psiginfo.diff
+hurd-i386/cvs-header-prot.diff
+hurd-i386/cvs-psiginfo.diff
hurd-i386/local-ptsname.diff
ia64/local-dlfptr.diff
--
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ppqqv-0006mt...@alioth.debian.org
