From 2785afe572b463d578e023c6d4668aae888e09a5 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sun, 1 Aug 2010 12:43:52 +0200 Subject: New upstream 20100701 snapshot. - debian/patches/dir_acces_fix.patch: Remove patch, merged upstream. - debian/patches/exec_fix.patch: Likewise. - debian/patches/libdiskfs-rename.patch: Likewise. - debian/patches/libpthread_mutex_owner.patch: Likewise. - debian/patches/libpthread_recursive_mutex_initializer.patch: Likewise. - debian/patches/libpthread_setcancel.patch: Likewise. - debian/patches/pfinet-gcc-4.3-fix.patch: Likewise. - debian/patches/procfs.patch: Likewise. - debian/patches/libpthread_cancel_init.patch: Likewise - debian/patches/libpthread_kill_0.patch: Likewise - debian/patches/console_current_vcs.patch: Likewise - debian/patches/hurd_console_startup.patch: Likewise - debian/patches/MAKEDEV.patch: Likewise - debian/patches/tmpfs.patch: Likewise - debian/patches/libpthread_procfs.patch: New patch, to enable libpthread and procfs build. --- debian/patches/libpthread_setcancel.patch | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 debian/patches/libpthread_setcancel.patch (limited to 'debian/patches/libpthread_setcancel.patch') diff --git a/debian/patches/libpthread_setcancel.patch b/debian/patches/libpthread_setcancel.patch deleted file mode 100644 index 601a698f..00000000 --- a/debian/patches/libpthread_setcancel.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- - libpthread/pthread/pt-setcancelstate.c | 3 ++- - libpthread/pthread/pt-setcanceltype.c | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - ---- a/libpthread/pthread/pt-setcancelstate.c -+++ b/libpthread/pthread/pt-setcancelstate.c -@@ -35,7 +35,8 @@ pthread_setcancelstate (int state, int * - break; - } - -- *oldstate = p->cancel_state; -+ if (oldstate) -+ *oldstate = p->cancel_state; - p->cancel_state = state; - - return 0; ---- a/libpthread/pthread/pt-setcanceltype.c -+++ b/libpthread/pthread/pt-setcanceltype.c -@@ -35,7 +35,8 @@ pthread_setcanceltype (int type, int *ol - break; - } - -- *oldtype = p->cancel_type; -+ if (oldtype) -+ *oldtype = p->cancel_type; - p->cancel_type = type; - - return 0; -- cgit v1.2.3