diff -Nru libgcrypt11-1.4.6/debian/changelog libgcrypt11-1.4.6/debian/changelog --- libgcrypt11-1.4.6/debian/changelog 2012-05-17 10:47:18.000000000 -0400 +++ libgcrypt11-1.4.6/debian/changelog 2012-05-17 11:06:44.000000000 -0400 @@ -1,3 +1,9 @@ +libgcrypt11 (1.4.6-4ubuntu2.1) natty-proposed; urgency=low + + * Do not call global_init when setting thread callbacks (LP: #423252) + + -- Adam Stokes Thu, 17 May 2012 11:05:48 -0400 + libgcrypt11 (1.4.6-4ubuntu2) natty; urgency=low * Move libgcrypt.so into /usr/lib/$(DEB_HOST_MULTIARCH) where it belongs. diff -Nru libgcrypt11-1.4.6/debian/patches/no-global-init-thread-callbacks.diff libgcrypt11-1.4.6/debian/patches/no-global-init-thread-callbacks.diff --- libgcrypt11-1.4.6/debian/patches/no-global-init-thread-callbacks.diff 1969-12-31 19:00:00.000000000 -0500 +++ libgcrypt11-1.4.6/debian/patches/no-global-init-thread-callbacks.diff 2012-05-17 11:05:16.000000000 -0400 @@ -0,0 +1,11 @@ +--- a/src/global.c ++++ b/src/global.c +@@ -440,8 +440,6 @@ + + case GCRYCTL_SET_THREAD_CBS: + err = ath_install (va_arg (arg_ptr, void *), any_init_done); +- if (! err) +- global_init (); + break; + + case GCRYCTL_FAST_POLL: diff -Nru libgcrypt11-1.4.6/debian/patches/series libgcrypt11-1.4.6/debian/patches/series --- libgcrypt11-1.4.6/debian/patches/series 2012-05-17 10:47:18.000000000 -0400 +++ libgcrypt11-1.4.6/debian/patches/series 2012-05-17 11:04:51.000000000 -0400 @@ -1,2 +1,3 @@ 12_lessdeps_libgcrypt-config.diff 13_ftbfs_gold.diff +no-global-init-thread-callbacks.diff