diff options
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/patches/libpthread_setcancel.patch | 34 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 38 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index a28e6ae6..e086e349 100644 --- a/debian/changelog +++ b/debian/changelog @@ -49,8 +49,10 @@ hurd (20080921-1) UNRELEASED; urgency=low * debian/patches/dir_acces_fix.patch: New patch, fixes ext2fs crashes. * debian/patches/libports_stability.patch: New patch to keep the old behavior of libports. - * debian/patches/libpthread_fix.patch New patch from Thomas Schwinge to fix + * debian/patches/libpthread_fix.patch: New patch from Thomas Schwinge to fix libpthread. + * debian/patches/libpthread_setcancel.patch: New patch to fix configuration + of octave3.0. -- Michael Banck <mbanck@debian.org> Sat, 13 Sep 2008 23:43:27 +0200 diff --git a/debian/patches/libpthread_setcancel.patch b/debian/patches/libpthread_setcancel.patch new file mode 100644 index 00000000..a0351e82 --- /dev/null +++ b/debian/patches/libpthread_setcancel.patch @@ -0,0 +1,34 @@ +Index: libpthread/pthread/pt-setcancelstate.c +=================================================================== +RCS file: /cvsroot/hurd/hurd/libpthread/pthread/pt-setcancelstate.c,v +retrieving revision 1.1 +diff -u -p -r1.1 pt-setcancelstate.c +--- libpthread/pthread/pt-setcancelstate.c 10 Oct 2002 23:05:06 -0000 1.1 ++++ libpthread/pthread/pt-setcancelstate.c 28 Apr 2009 17:51:08 -0000 +@@ -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; +Index: libpthread/pthread/pt-setcanceltype.c +=================================================================== +RCS file: /cvsroot/hurd/hurd/libpthread/pthread/pt-setcanceltype.c,v +retrieving revision 1.1 +diff -u -p -r1.1 pt-setcanceltype.c +--- libpthread/pthread/pt-setcanceltype.c 10 Oct 2002 23:05:06 -0000 1.1 ++++ libpthread/pthread/pt-setcanceltype.c 28 Apr 2009 17:51:08 -0000 +@@ -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; diff --git a/debian/patches/series b/debian/patches/series index ad3a4587..d8c00182 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -25,3 +25,4 @@ stat_round.patch -p0 dir_acces_fix.patch -p0 libports_stability.patch -p0 libpthread_fix.patch -p0 +libpthread_setcancel.patch -p0 |