[Pkg-gnupg-commit] r424 - in /libgpg-error/trunk/debian: changelog control patches/hppa-lock-obj-tweak.patch patches/series

[dkg at users.alioth.debian.org]

Author: dkg
Date: Tue Aug  5 13:56:49 2014
New Revision: 424

URL: http://svn.debian.org/wsvn/pkg-gnupg/?sc=1&rev=424
Log:
fix hppa, adopt by pkg-gnupg-maint

Added:
    libgpg-error/trunk/debian/patches/hppa-lock-obj-tweak.patch
Modified:
    libgpg-error/trunk/debian/changelog
    libgpg-error/trunk/debian/control
    libgpg-error/trunk/debian/patches/series

Modified: libgpg-error/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnupg/libgpg-error/trunk/debian/changelog?rev=424&op=diff
==============================================================================
--- libgpg-error/trunk/debian/changelog	(original)
+++ libgpg-error/trunk/debian/changelog	Tue Aug  5 13:56:49 2014
@@ -1,3 +1,12 @@
+libgpg-error (1.13-1) unstable; urgency=medium
+
+  * Adopt by pkg-gnupg team, after conferring with previous maintainer.  Thanks,
+    Jose Carlos Garcia Sogo!
+  * tweak hppa lock-obj struct. (Closes: #757060) Thanks, John David Anglin!
+  * bump standards-version to 3.9.5 (no changes needed)
+
+ -- Daniel Kahn Gillmor <dkg at fifthhorseman.net>  Tue, 05 Aug 2014 09:41:50 -0400
+
 libgpg-error (1.13-0.4) unstable; urgency=medium
 
   * NMU

Modified: libgpg-error/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnupg/libgpg-error/trunk/debian/control?rev=424&op=diff
==============================================================================
--- libgpg-error/trunk/debian/control	(original)
+++ libgpg-error/trunk/debian/control	Tue Aug  5 13:56:49 2014
@@ -1,10 +1,12 @@
 Source: libgpg-error
 Section: libs
-Maintainer: Jose Carlos Garcia Sogo <jsogo at debian.org>
-Uploaders: Matthias Urlichs <smurf at debian.org>
+Maintainer: Debian GnuPG Maintainers <pkg-gnupg-maint at lists.alioth.debian.org>
+Uploaders: Matthias Urlichs <smurf at debian.org>,
+ Jose Carlos Garcia Sogo <jsogo at debian.org>,
+ Daniel Kahn Gillmor <dkg at fifthhorseman.net>
 Priority: standard
 Build-Depends: dh-autoreconf, debhelper (>> 8.1.3~)
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://www.gnupg.org/related_software/libgpg-error/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnupg/libgpg-error/trunk/
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnupg/libgpg-error/trunk/

Added: libgpg-error/trunk/debian/patches/hppa-lock-obj-tweak.patch
URL: http://svn.debian.org/wsvn/pkg-gnupg/libgpg-error/trunk/debian/patches/hppa-lock-obj-tweak.patch?rev=424&op=file
==============================================================================
--- libgpg-error/trunk/debian/patches/hppa-lock-obj-tweak.patch	(added)
+++ libgpg-error/trunk/debian/patches/hppa-lock-obj-tweak.patch	Tue Aug  5 13:56:49 2014
@@ -0,0 +1,43 @@
+commit 66b69f72ab8706eefbcd49b5a62e6e56d9053f3c
+Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+Date:   Tue Aug 5 09:30:38 2014 -0400
+
+    Fix struct alignment on hppa-linux
+    
+    As reported by John David Anglin <dave.anglin at bell.net>:
+    
+    libgpg-error fails to build on hppa because the t-lock test fails.
+    The test fails because the _gpgrt_lock_t and gpgrt_lock_t objects have
+    different sizes.  This happens becuase the pthread_mutex_t type on
+    hppa-linux has 16-byte alignement, but the code in
+    gen-posix-lock-obj.c assumes that a long or pointer to long will
+    provide sufficient alignment.
+    
+    (see https://bugs.debian.org/757060)
+
+diff --git a/src/gen-posix-lock-obj.c b/src/gen-posix-lock-obj.c
+index df732c3..faba83e 100644
+--- a/src/gen-posix-lock-obj.c
++++ b/src/gen-posix-lock-obj.c
+@@ -76,6 +76,9 @@ main (void)
+           "  long _vers;\n"
+           "  union {\n"
+           "    volatile char _priv[%d];\n"
++#if defined(__hppa__) && defined(__linux__)
++          "    int __lock __attribute__ ((aligned(16)));\n"
++#endif
+           "    long _x_align;\n"
+           "    long *_xp_align;\n"
+           "  } u;\n"
+diff --git a/src/syscfg/lock-obj-pub.hppa-unknown-linux-gnu.h b/src/syscfg/lock-obj-pub.hppa-unknown-linux-gnu.h
+index fd47664..7758604 100644
+--- a/src/syscfg/lock-obj-pub.hppa-unknown-linux-gnu.h
++++ b/src/syscfg/lock-obj-pub.hppa-unknown-linux-gnu.h
+@@ -7,6 +7,7 @@ typedef struct
+   long _vers;
+   union {
+     volatile char _priv[48];
++    int __lock __attribute__ ((aligned(16)));
+     long _x_align;
+     long *_xp_align;
+   } u;

Modified: libgpg-error/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnupg/libgpg-error/trunk/debian/patches/series?rev=424&op=diff
==============================================================================
--- libgpg-error/trunk/debian/patches/series	(original)
+++ libgpg-error/trunk/debian/patches/series	Tue Aug  5 13:56:49 2014
@@ -1 +1,2 @@
 pre-built-lock-obj.patch
+hppa-lock-obj-tweak.patch