Bug#673933: eglibc: FTBFS with patch from experimental (hurd-i386/libpthread_clean.diff patches the wrong file)
tags 673933 + patch
quit
Jonathan Nieder wrote:
> The attached patch seems to fix it.
Here's the same as a patch against the repo on svn.debian.org.
Index: debian/changelog
===================================================================
--- debian/changelog (revision 5255)
+++ debian/changelog (working copy)
@@ -25,6 +25,12 @@
sendto() calls with NULL addr.
* control/{main,libc}: Remove libpthread-stubs-dev dependency on hurd-i386.
+ [ Jonathan Nieder ]
+ * debian/patches/hurd-i386/libpthread_{clean.diff,librt-link.diff}:
+ correct filenames on "diff --git" lines. Otherwise, very recent
+ (post-2.6.1) versions of GNU patch fail to apply the patches.
+ Closes: #673933.
+
-- Clint Adams <clint@debian.org> Fri, 04 May 2012 23:39:00 -0400
eglibc (2.13-32) unstable; urgency=medium
Index: debian/patches/hurd-i386/libpthread_librt-link.diff
===================================================================
--- debian/patches/hurd-i386/libpthread_librt-link.diff (revision 5255)
+++ debian/patches/hurd-i386/libpthread_librt-link.diff (working copy)
@@ -1,4 +1,4 @@
-diff --git a/Makefile b/Makefile
+diff --git a/libpthread/Makefile b/libpthread/Makefile
index e8c77e3..4112694 100644
--- a/libpthread/Makefile
+++ b/libpthread/Makefile
Index: debian/patches/hurd-i386/libpthread_clean.diff
===================================================================
--- debian/patches/hurd-i386/libpthread_clean.diff (revision 5255)
+++ debian/patches/hurd-i386/libpthread_clean.diff (working copy)
@@ -1,7 +1,7 @@
These come from the l4 implementation and come in the way of the glibc
Makefiles, drop them.
-diff --git a/signal/README b/signal/README
+diff --git a/libpthread/signal/README b/libpthread/signal/README
deleted file mode 100644
index 5487e2e..0000000
--- a/libpthread/signal/README
@@ -11,7 +11,7 @@
-for operating systems where signals are managed at user-level. It is
-up to the run-time to catch the signals and forward them to the
-implementation via, e.g., the pthread_kill_info_np call.
-diff --git a/signal/TODO b/signal/TODO
+diff --git a/libpthread/signal/TODO b/libpthread/signal/TODO
deleted file mode 100644
index 1148abb..0000000
--- a/libpthread/signal/TODO
@@ -47,7 +47,7 @@
-
-Implement sigtimedwait, sigqueue.
\ No newline at end of file
-diff --git a/signal/kill.c b/signal/kill.c
+diff --git a/libpthread/signal/kill.c b/libpthread/signal/kill.c
deleted file mode 100644
index 27c9c32..0000000
--- a/libpthread/signal/kill.c
@@ -123,7 +123,7 @@
- return pthread_kill (pthread_self (), signo);
-}
-
-diff --git a/signal/pt-kill-siginfo-np.c b/signal/pt-kill-siginfo-np.c
+diff --git a/libpthread/signal/pt-kill-siginfo-np.c b/libpthread/signal/pt-kill-siginfo-np.c
deleted file mode 100644
index 9bdf6cc..0000000
--- a/libpthread/signal/pt-kill-siginfo-np.c
@@ -217,7 +217,7 @@
- return 0;
-}
-
-diff --git a/signal/sig-internal.c b/signal/sig-internal.c
+diff --git a/libpthread/signal/sig-internal.c b/libpthread/signal/sig-internal.c
deleted file mode 100644
index f73f38b..0000000
--- a/libpthread/signal/sig-internal.c
@@ -249,7 +249,7 @@
-
-sigset_t process_pending;
-siginfo_t process_pending_info[NSIG];
-diff --git a/signal/sig-internal.h b/signal/sig-internal.h
+diff --git a/libpthread/signal/sig-internal.h b/libpthread/signal/sig-internal.h
deleted file mode 100644
index 6c86c79..0000000
--- a/libpthread/signal/sig-internal.h
@@ -432,7 +432,7 @@
-}
-
-#endif
-diff --git a/signal/sigaction.c b/signal/sigaction.c
+diff --git a/libpthread/signal/sigaction.c b/libpthread/signal/sigaction.c
deleted file mode 100644
index 0126c99..0000000
--- a/libpthread/signal/sigaction.c
@@ -510,7 +510,7 @@
- return 0;
-}
-
-diff --git a/signal/sigaltstack.c b/signal/sigaltstack.c
+diff --git a/libpthread/signal/sigaltstack.c b/libpthread/signal/sigaltstack.c
deleted file mode 100644
index 8334811..0000000
--- a/libpthread/signal/sigaltstack.c
@@ -585,7 +585,7 @@
- }
- return 0;
-}
-diff --git a/signal/signal-dispatch.c b/signal/signal-dispatch.c
+diff --git a/libpthread/signal/signal-dispatch.c b/libpthread/signal/signal-dispatch.c
deleted file mode 100644
index 40440b7..0000000
--- a/libpthread/signal/signal-dispatch.c
@@ -708,7 +708,7 @@
-
- SIGNAL_DISPATCH_EXIT;
-}
-diff --git a/signal/signal.h b/signal/signal.h
+diff --git a/libpthread/signal/signal.h b/libpthread/signal/signal.h
deleted file mode 100644
index a33d995..0000000
--- a/libpthread/signal/signal.h
@@ -989,7 +989,7 @@
- const struct timespec *restrict timespec);
-
-#endif
-diff --git a/signal/sigpending.c b/signal/sigpending.c
+diff --git a/libpthread/signal/sigpending.c b/libpthread/signal/sigpending.c
deleted file mode 100644
index 609b55d..0000000
--- a/libpthread/signal/sigpending.c
@@ -1033,7 +1033,7 @@
-
- return 0;
-}
-diff --git a/signal/sigsuspend.c b/signal/sigsuspend.c
+diff --git a/libpthread/signal/sigsuspend.c b/libpthread/signal/sigsuspend.c
deleted file mode 100644
index 73cf12a..0000000
--- a/libpthread/signal/sigsuspend.c
@@ -1068,7 +1068,7 @@
- errno = EOPNOTSUPP;
- return -1;
-}
-diff --git a/signal/sigtimedwait.c b/signal/sigtimedwait.c
+diff --git a/libpthread/signal/sigtimedwait.c b/libpthread/signal/sigtimedwait.c
deleted file mode 100644
index 52cd017..0000000
--- a/libpthread/signal/sigtimedwait.c
@@ -1104,7 +1104,7 @@
- return -1;
-}
-
-diff --git a/signal/sigwaiter.c b/signal/sigwaiter.c
+diff --git a/libpthread/signal/sigwaiter.c b/libpthread/signal/sigwaiter.c
deleted file mode 100644
index 8d041ac..0000000
--- a/libpthread/signal/sigwaiter.c
@@ -1201,7 +1201,7 @@
-
- futex_wake (&waiter->info.si_signo, 1);
-}
-diff --git a/signal/sigwaitinfo.c b/signal/sigwaitinfo.c
+diff --git a/libpthread/signal/sigwaitinfo.c b/libpthread/signal/sigwaitinfo.c
deleted file mode 100644
index 1b47079..0000000
--- a/libpthread/signal/sigwaitinfo.c
@@ -1281,7 +1281,7 @@
- return 0;
-}
-
-diff --git a/include/libc-symbols.h b/include/libc-symbols.h
+diff --git a/libpthread/include/libc-symbols.h b/libpthread/include/libc-symbols.h
deleted file mode 100644
index 54dd6e2..0000000
--- a/libpthread/include/libc-symbols.h
@@ -1682,7 +1682,7 @@
-#endif
-
-#endif /* libc-symbols.h */
-diff --git a/include/set-hooks.h b/include/set-hooks.h
+diff --git a/libpthread/include/set-hooks.h b/libpthread/include/set-hooks.h
deleted file mode 100644
index 9ed71b3..0000000
--- a/libpthread/include/set-hooks.h
Reply to: