Refresh patches with -pab to allow migration to source format 3.0 (quilt)

1 files changed, 53 insertions, 60 deletions

diff --git a/debian/patches/libpthread_recursive_mutex_initializer.patch b/debian/patches/libpthread_recursive_mutex_initializer.patch
index d9332b70..c6e3e536 100644
--- a/debian/patches/libpthread_recursive_mutex_initializer.patch
+++ b/debian/patches/libpthread_recursive_mutex_initializer.patch
@@ -1,8 +1,19 @@
-Index: libpthread/include/pthread/pthread.h
-===================================================================
---- libpthread/include/pthread/pthread.h.orig	2009-05-27 23:53:05.000000000 +0000
-+++ libpthread/include/pthread/pthread.h	2009-05-27 23:53:40.000000000 +0000
-@@ -313,6 +313,8 @@
+---
+ libpthread/include/pthread/pthread.h              |    2 ++
+ libpthread/sysdeps/generic/bits/mutex-attr.h      |    1 +
+ libpthread/sysdeps/generic/bits/mutex.h           |   10 +++++++++-
+ libpthread/sysdeps/generic/pt-mutex-destroy.c     |    3 ++-
+ libpthread/sysdeps/generic/pt-mutex-init.c        |   11 ++++-------
+ libpthread/sysdeps/generic/pt-mutex-timedlock.c   |   22 ++++++++++++++--------
+ libpthread/sysdeps/generic/pt-mutex-transfer-np.c |   11 +++++++++--
+ libpthread/sysdeps/generic/pt-mutex-trylock.c     |   14 ++++++++++----
+ libpthread/sysdeps/generic/pt-mutex-unlock.c      |   16 +++++++++++-----
+ libpthread/sysdeps/generic/pt-mutexattr.c         |    8 ++++++++
+ 10 files changed, 70 insertions(+), 28 deletions(-)
+
+--- a/libpthread/include/pthread/pthread.h
++++ b/libpthread/include/pthread/pthread.h
+@@ -313,6 +313,8 @@ extern int pthread_mutexattr_settype(pth
  /* Static initializer for recursive mutexes.  */
  
  #ifdef __USE_GNU
@@ -11,10 +22,8 @@ Index: libpthread/include/pthread/pthread.h
  # define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP \
    __PTHREAD_RECURSIVE_MUTEX_INITIALIZER
  #endif
-Index: libpthread/sysdeps/generic/pt-mutex-destroy.c
-===================================================================
---- libpthread/sysdeps/generic/pt-mutex-destroy.c.orig	2008-08-12 15:07:49.000000000 +0000
-+++ libpthread/sysdeps/generic/pt-mutex-destroy.c	2009-05-27 23:53:40.000000000 +0000
+--- a/libpthread/sysdeps/generic/pt-mutex-destroy.c
++++ b/libpthread/sysdeps/generic/pt-mutex-destroy.c
 @@ -26,7 +26,8 @@
  int
  _pthread_mutex_destroy (pthread_mutex_t *mutex)
@@ -25,11 +34,9 @@ Index: libpthread/sysdeps/generic/pt-mutex-destroy.c
      /* Static attributes.  */
      ;
    else
-Index: libpthread/sysdeps/generic/pt-mutex-init.c
-===================================================================
---- libpthread/sysdeps/generic/pt-mutex-init.c.orig	2008-08-12 15:07:49.000000000 +0000
-+++ libpthread/sysdeps/generic/pt-mutex-init.c	2009-05-27 23:53:40.000000000 +0000
-@@ -35,14 +35,11 @@
+--- a/libpthread/sysdeps/generic/pt-mutex-init.c
++++ b/libpthread/sysdeps/generic/pt-mutex-init.c
+@@ -35,14 +35,11 @@ _pthread_mutex_init (pthread_mutex_t *mu
      /* The default attributes.  */
      return 0;
  
@@ -48,11 +55,9 @@ Index: libpthread/sysdeps/generic/pt-mutex-init.c
    if (! mutex->attr)
      return ENOMEM;
  
-Index: libpthread/sysdeps/generic/pt-mutex-timedlock.c
-===================================================================
---- libpthread/sysdeps/generic/pt-mutex-timedlock.c.orig	2008-10-02 12:00:42.000000000 +0000
-+++ libpthread/sysdeps/generic/pt-mutex-timedlock.c	2009-05-27 23:53:40.000000000 +0000
-@@ -31,6 +31,12 @@
+--- a/libpthread/sysdeps/generic/pt-mutex-timedlock.c
++++ b/libpthread/sysdeps/generic/pt-mutex-timedlock.c
+@@ -31,6 +31,12 @@ __pthread_mutex_timedlock_internal (stru
  				    const struct timespec *abstime)
  {
    struct __pthread *self;
@@ -65,7 +70,7 @@ Index: libpthread/sysdeps/generic/pt-mutex-timedlock.c
  
    __pthread_spin_lock (&mutex->__lock);
    if (__pthread_spin_trylock (&mutex->__held) == 0)
-@@ -50,8 +56,8 @@
+@@ -50,8 +56,8 @@ __pthread_mutex_timedlock_internal (stru
  #endif
  #endif
  
@@ -76,7 +81,7 @@ Index: libpthread/sysdeps/generic/pt-mutex-timedlock.c
  	  {
  	  case PTHREAD_MUTEX_NORMAL:
  	    break;
-@@ -75,7 +81,7 @@
+@@ -75,7 +81,7 @@ __pthread_mutex_timedlock_internal (stru
    self = _pthread_self ();
    assert (self);
  
@@ -85,7 +90,7 @@ Index: libpthread/sysdeps/generic/pt-mutex-timedlock.c
      {
  #if defined(ALWAYS_TRACK_MUTEX_OWNER)
        assert (mutex->owner != self);
-@@ -83,7 +89,7 @@
+@@ -83,7 +89,7 @@ __pthread_mutex_timedlock_internal (stru
      }
    else
      {
@@ -94,7 +99,7 @@ Index: libpthread/sysdeps/generic/pt-mutex-timedlock.c
  	{
  	case PTHREAD_MUTEX_ERRORCHECK:
  	  if (mutex->owner == self)
-@@ -108,7 +114,7 @@
+@@ -108,7 +114,7 @@ __pthread_mutex_timedlock_internal (stru
      }
  
  #if !defined(ALWAYS_TRACK_MUTEX_OWNER)
@@ -103,7 +108,7 @@ Index: libpthread/sysdeps/generic/pt-mutex-timedlock.c
  #endif
      assert (mutex->owner);
  
-@@ -147,14 +153,14 @@
+@@ -147,14 +153,14 @@ __pthread_mutex_timedlock_internal (stru
      __pthread_block (self);
  
  #if !defined(ALWAYS_TRACK_MUTEX_OWNER)
@@ -121,11 +126,9 @@ Index: libpthread/sysdeps/generic/pt-mutex-timedlock.c
        {
        case PTHREAD_MUTEX_NORMAL:
  	break;
-Index: libpthread/sysdeps/generic/pt-mutex-transfer-np.c
-===================================================================
---- libpthread/sysdeps/generic/pt-mutex-transfer-np.c.orig	2008-10-02 12:00:40.000000000 +0000
-+++ libpthread/sysdeps/generic/pt-mutex-transfer-np.c	2009-05-27 23:53:40.000000000 +0000
-@@ -29,13 +29,20 @@
+--- a/libpthread/sysdeps/generic/pt-mutex-transfer-np.c
++++ b/libpthread/sysdeps/generic/pt-mutex-transfer-np.c
+@@ -29,13 +29,20 @@ __pthread_mutex_transfer_np (struct __pt
    assert (mutex->owner == _pthread_self ());
  
    struct __pthread *thread = __pthread_getid (tid);
@@ -147,7 +150,7 @@ Index: libpthread/sysdeps/generic/pt-mutex-transfer-np.c
      {
  
        if (mutex->owner != _pthread_self ())
-@@ -46,7 +53,7 @@
+@@ -46,7 +53,7 @@ __pthread_mutex_transfer_np (struct __pt
  
  #ifndef NDEBUG
  # if !defined(ALWAYS_TRACK_MUTEX_OWNER)
@@ -156,11 +159,9 @@ Index: libpthread/sysdeps/generic/pt-mutex-transfer-np.c
  # endif
      {
        mutex->owner = thread;
-Index: libpthread/sysdeps/generic/pt-mutex-trylock.c
-===================================================================
---- libpthread/sysdeps/generic/pt-mutex-trylock.c.orig	2009-05-27 23:53:39.000000000 +0000
-+++ libpthread/sysdeps/generic/pt-mutex-trylock.c	2009-05-27 23:53:40.000000000 +0000
-@@ -29,6 +29,12 @@
+--- a/libpthread/sysdeps/generic/pt-mutex-trylock.c
++++ b/libpthread/sysdeps/generic/pt-mutex-trylock.c
+@@ -29,6 +29,12 @@ __pthread_mutex_trylock (struct __pthrea
  {
    int err;
    struct __pthread *self;
@@ -173,7 +174,7 @@ Index: libpthread/sysdeps/generic/pt-mutex-trylock.c
  
    __pthread_spin_lock (&mutex->__lock);
    if (__pthread_spin_trylock (&mutex->__held) == 0)
-@@ -48,8 +54,8 @@
+@@ -48,8 +54,8 @@ __pthread_mutex_trylock (struct __pthrea
  #endif
  #endif
  
@@ -184,7 +185,7 @@ Index: libpthread/sysdeps/generic/pt-mutex-trylock.c
  	  {
  	  case PTHREAD_MUTEX_NORMAL:
  	    break;
-@@ -70,10 +76,10 @@
+@@ -70,10 +76,10 @@ __pthread_mutex_trylock (struct __pthrea
  
    err = EBUSY;
  
@@ -197,11 +198,9 @@ Index: libpthread/sysdeps/generic/pt-mutex-trylock.c
  	{
  	case PTHREAD_MUTEX_NORMAL:
  	  break;
-Index: libpthread/sysdeps/generic/pt-mutex-unlock.c
-===================================================================
---- libpthread/sysdeps/generic/pt-mutex-unlock.c.orig	2008-10-02 12:00:37.000000000 +0000
-+++ libpthread/sysdeps/generic/pt-mutex-unlock.c	2009-05-27 23:53:40.000000000 +0000
-@@ -28,10 +28,16 @@
+--- a/libpthread/sysdeps/generic/pt-mutex-unlock.c
++++ b/libpthread/sysdeps/generic/pt-mutex-unlock.c
+@@ -28,10 +28,16 @@ int
  __pthread_mutex_unlock (pthread_mutex_t *mutex)
  {
    struct __pthread *wakeup;
@@ -220,7 +219,7 @@ Index: libpthread/sysdeps/generic/pt-mutex-unlock.c
      {
  #if defined(ALWAYS_TRACK_MUTEX_OWNER)
  # ifndef NDEBUG
-@@ -45,7 +51,7 @@
+@@ -45,7 +51,7 @@ __pthread_mutex_unlock (pthread_mutex_t 
  #endif
      }
    else
@@ -229,7 +228,7 @@ Index: libpthread/sysdeps/generic/pt-mutex-unlock.c
        {
        case PTHREAD_MUTEX_ERRORCHECK:
        case PTHREAD_MUTEX_RECURSIVE:
-@@ -55,7 +61,7 @@
+@@ -55,7 +61,7 @@ __pthread_mutex_unlock (pthread_mutex_t 
  	    return EPERM;
  	  }
  
@@ -238,7 +237,7 @@ Index: libpthread/sysdeps/generic/pt-mutex-unlock.c
  	  if (--mutex->locks > 0)
  	    {
  	      __pthread_spin_unlock (&mutex->__lock);
-@@ -82,7 +88,7 @@
+@@ -82,7 +88,7 @@ __pthread_mutex_unlock (pthread_mutex_t 
  
  #ifndef NDEBUG
  # if !defined (ALWAYS_TRACK_MUTEX_OWNER)
@@ -247,11 +246,9 @@ Index: libpthread/sysdeps/generic/pt-mutex-unlock.c
  # endif
      {
        mutex->owner = wakeup;
-Index: libpthread/sysdeps/generic/pt-mutexattr.c
-===================================================================
---- libpthread/sysdeps/generic/pt-mutexattr.c.orig	2008-08-12 15:07:49.000000000 +0000
-+++ libpthread/sysdeps/generic/pt-mutexattr.c	2009-05-27 23:53:40.000000000 +0000
-@@ -28,6 +28,14 @@
+--- a/libpthread/sysdeps/generic/pt-mutexattr.c
++++ b/libpthread/sysdeps/generic/pt-mutexattr.c
+@@ -28,6 +28,14 @@ const struct __pthread_mutexattr __pthre
    mutex_type: PTHREAD_MUTEX_DEFAULT
  };
  
@@ -266,11 +263,9 @@ Index: libpthread/sysdeps/generic/pt-mutexattr.c
  const struct __pthread_mutexattr __pthread_recursive_mutexattr =
  {
    prioceiling: 0,
-Index: libpthread/sysdeps/generic/bits/mutex.h
-===================================================================
---- libpthread/sysdeps/generic/bits/mutex.h.orig	2009-01-10 13:22:27.000000000 +0000
-+++ libpthread/sysdeps/generic/bits/mutex.h	2009-05-27 23:53:40.000000000 +0000
-@@ -57,9 +57,17 @@
+--- a/libpthread/sysdeps/generic/bits/mutex.h
++++ b/libpthread/sysdeps/generic/bits/mutex.h
+@@ -57,9 +57,17 @@ struct __pthread_mutex
  #  define __PTHREAD_MUTEX_INITIALIZER \
      { __PTHREAD_SPIN_LOCK_INITIALIZER, __PTHREAD_SPIN_LOCK_INITIALIZER, 0, 0, 0, 0, 0, 0 }
  
@@ -289,11 +284,9 @@ Index: libpthread/sysdeps/generic/bits/mutex.h
  
  # endif
  #endif /* Not __pthread_mutex_defined.  */
-Index: libpthread/sysdeps/generic/bits/mutex-attr.h
-===================================================================
---- libpthread/sysdeps/generic/bits/mutex-attr.h.orig	2009-05-27 23:59:37.000000000 +0000
-+++ libpthread/sysdeps/generic/bits/mutex-attr.h	2009-05-27 23:59:44.000000000 +0000
-@@ -35,6 +35,7 @@
+--- a/libpthread/sysdeps/generic/bits/mutex-attr.h
++++ b/libpthread/sysdeps/generic/bits/mutex-attr.h
+@@ -35,6 +35,7 @@ struct __pthread_mutexattr
  };
  
  /* Attributes for a recursive mutex.  */