summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorSamuel Thibault <sthibault@debian.org>2009-01-23 23:49:19 +0000
committerSamuel Thibault <sthibault@debian.org>2009-01-23 23:49:19 +0000
commit36dc07799adf03f649d30b01a23b9de84ef90ba2 (patch)
tree8b9be9f29ac14901d8d70d8b00beaf302b050a57 /debian
parenta3665f6e6db3960152ec7466bc1684f30710b30d (diff)
* debian/patches/libpthread_rwlock_initializer.patch: New patch, add missing
PTHREAD_RWLOCK_INITIALIZER.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog5
-rw-r--r--debian/patches/libpthread_rwlock_initializer.patch16
-rw-r--r--debian/patches/series1
3 files changed, 22 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 4de24358..509d561c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
hurd (20080921-1) UNRELEASED; urgency=low
+ [ Michael Banck ]
* New snapshot from CVS.
+ debian/patches/diskfs_lookup_error_fix.patch: Removed, applied upstream.
+ debian/patches/libpthread_mutex-no-include.patch: Likewise.
@@ -34,6 +35,10 @@ hurd (20080921-1) UNRELEASED; urgency=low
* debian/patches/libpthread_mutex_owner.patch: New patch, fix a hang in
libpthread, by Neal Walfield.
+ [ Samuel Thibault ]
+ * debian/patches/libpthread_rwlock_initializer.patch: New patch, add missing
+ PTHREAD_RWLOCK_INITIALIZER.
+
-- Michael Banck <mbanck@debian.org> Sat, 13 Sep 2008 23:43:27 +0200
hurd (20080607-6) unstable; urgency=low
diff --git a/debian/patches/libpthread_rwlock_initializer.patch b/debian/patches/libpthread_rwlock_initializer.patch
new file mode 100644
index 00000000..f54617ac
--- /dev/null
+++ b/debian/patches/libpthread_rwlock_initializer.patch
@@ -0,0 +1,16 @@
+Index: libpthread/include/pthread/pthread.h
+===================================================================
+RCS file: /cvsroot/hurd/hurd/libpthread/include/pthread/pthread.h,v
+retrieving revision 1.15
+retrieving revision 1.16
+diff -u -p -r1.15 -r1.16
+--- libpthread/include/pthread/pthread.h 12 Aug 2008 15:07:49 -0000 1.15
++++ libpthread/include/pthread/pthread.h 21 Dec 2008 18:41:27 -0000 1.16
+@@ -521,6 +521,7 @@ extern int pthread_rwlockattr_setpshared
+
+ #include <bits/rwlock.h>
+
++#define PTHREAD_RWLOCK_INITIALIZER __PTHREAD_RWLOCK_INITIALIZER
+ /* Create a rwlock object with attributes given by ATTR and strore the
+ result in *RWLOCK. */
+ extern int pthread_rwlock_init (pthread_rwlock_t *__restrict rwlock,
diff --git a/debian/patches/series b/debian/patches/series
index edaf30fa..7b2cab6f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,6 +6,7 @@ init_try_runsystem.gnu.patch -p0
install-msgids.diff -p2
libpager_update_seqno.patch -p0
libpthread_mutex_owner.patch -p0
+libpthread_rwlock_initializer.patch -p0
libpthread_stubs.patch -p0
libpthread_tls.patch -p0
makedev.diff -p0