Attachment 617397 Details for Bug 855454 – Patch against master: re-enable unit tests; fix failing test; link tests against shared libs

[patch] Patch against master: re-enable unit tests; fix failing test; link tests against shared libs

gpgme-reenable-and-fix-tests.patch (text/plain), 7.94 KB, created by John Morris on 2012-09-26 05:41:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Morris

Created: 2012-09-26 05:41:55 UTC

Size: 7.94 KB

patch

obsolete

>commit e6f60c971059942cbe494e4d7113fd85d12e9217
>Author: John Morris <john@zultron.com>
>Date:   Tue Sep 25 23:56:21 2012 -0500
>
>    Re-enable gpgme 'gpg' unit tests; fix failing unit test
>    
>    Unit tests in the tests/gpg directory would fail except that they have
>    been disabled.  In order get around libgpg-error-devel not providing
>    static libs, link against shared libraries; see bug #855451.
>    
>    This patch re-enables unit testing in the gpg directory:
>    
>    - specfile:  remove --disable on  %%configure line
>    - specfile:  add BuildRequires: glibc-static for tests/gpg/t-thread1
>    - config_extras patch:  fix hunks that disable
>      gpg_error_libs and libs_pthread config
>    - ImplicitDSOLinking.patch:  add test/gpg/Makefile.in
>    
>    Fix failing unit test, tests/gpg/t-encrypt-sign
>    
>    - Add patch 4:  gpgme-1.3.0-tests_gpg_t-encrypt-sign_fix.patch
>    
>    For more info:
>    http://lists.gnupg.org/pipermail/gnupg-devel/2011-April/026054.html
>
>    Also:
>    - quiet configure warning 'could not find g13'
>    
>    Also .gitignore changes:
>    - ignore 'fedpkg local' build artifacts
>    - ignore emacs cruft
>    - generalize source file globs
>
>diff --git a/.gitignore b/.gitignore
>index d76f663..c40c327 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -1,4 +1,12 @@
>-gpgme-1.2.0.tar.bz2
>-gpgme-1.2.0.tar.bz2.sig
>-/gpgme-1.3.0.tar.bz2.sig
>-/gpgme-1.3.0.tar.bz2
>+# ignore sources
>+/gpgme-[0-9].[0-9].[0-9].tar.bz2
>+/gpgme-[0-9].[0-9].[0-9].tar.bz2.sig
>+# ignore fedpkg local build artifacts
>+/.build-*.log
>+/gpgme-[0-9].[0-9].[0-9]/
>+/gpgme-[0-9].[0-9].[0-9]-*.src.rpm
>+/i686/
>+/x86_64/
>+# ignore emacs cruft
>+/.#*
>+/#*
>diff --git a/gpgme-1.3.0-ImplicitDSOLinking.patch b/gpgme-1.3.0-ImplicitDSOLinking.patch
>index cd2f7a5..17b6d38 100644
>--- a/gpgme-1.3.0-ImplicitDSOLinking.patch
>+++ b/gpgme-1.3.0-ImplicitDSOLinking.patch
>@@ -22,18 +22,20 @@ diff -up gpgme-1.3.0/src/Makefile.in.ImplicitDSOLinking gpgme-1.3.0/src/Makefile
>  all: $(BUILT_SOURCES)
>  	$(MAKE) $(AM_MAKEFLAGS) all-am
>  
>-diff -up gpgme-1.3.0/tests/gpgsm/Makefile.am.ImplicitDSOLinking gpgme-1.3.0/tests/gpgsm/Makefile.am
>---- gpgme-1.3.0/tests/gpgsm/Makefile.am.ImplicitDSOLinking	2008-12-03 14:39:48.000000000 +0100
>-+++ gpgme-1.3.0/tests/gpgsm/Makefile.am	2011-02-11 17:36:32.000000000 +0100
>-@@ -32,7 +32,7 @@ EXTRA_DIST = cert_dfn_pca01.der cert_dfn
>- INCLUDES = -I$(top_builddir)/src
>+diff -up gpgme-1.3.0/tests/gpg/Makefile.in.ImplicitDSOLinking gpgme-1.3.0/tests/gpg/Makefile.in
>+--- gpgme-1.3.0/tests/gpg/Makefile.in.ImplicitDSOLinking	2010-01-11 05:06:54.000000000 -0600
>++++ gpgme-1.3.0/tests/gpg/Makefile.in	2012-09-07 13:57:08.485271081 -0500
>+@@ -377,8 +377,8 @@ EXTRA_DIST = mkdemodirs.in pubdemo.asc s
>  
>+ INCLUDES = -I$(top_builddir)/src
>  AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
> -LDADD = ../../src/libgpgme.la
>+-t_thread1_LDADD = ../../src/libgpgme-pthread.la
> +LDADD = ../../src/libgpgme.la @GPG_ERROR_LIBS@
>++t_thread1_LDADD = $(LDADD) ../../src/libgpgme-pthread.la -lpthread
>+ all: all-am
>  
>- # We don't run t-genkey in the test suite, because it takes too long
>- # and needs a working pinentry.
>+ .SUFFIXES:
> diff -up gpgme-1.3.0/tests/gpgsm/Makefile.in.ImplicitDSOLinking gpgme-1.3.0/tests/gpgsm/Makefile.in
> --- gpgme-1.3.0/tests/gpgsm/Makefile.in.ImplicitDSOLinking	2010-01-11 12:06:54.000000000 +0100
> +++ gpgme-1.3.0/tests/gpgsm/Makefile.in	2011-02-11 17:36:32.000000000 +0100
>diff --git a/gpgme-1.3.0-config_extras.patch b/gpgme-1.3.0-config_extras.patch
>index 7b9a643..9e1972a 100644
>--- a/gpgme-1.3.0-config_extras.patch
>+++ b/gpgme-1.3.0-config_extras.patch
>@@ -1,7 +1,7 @@
> diff -up gpgme-1.3.0/src/gpgme-config.in.config_extras gpgme-1.3.0/src/gpgme-config.in
> --- gpgme-1.3.0/src/gpgme-config.in.config_extras	2009-10-23 08:44:56.000000000 -0500
> +++ gpgme-1.3.0/src/gpgme-config.in	2011-03-17 13:15:12.511565537 -0500
>-@@ -20,26 +20,26 @@ LC_ALL=C
>+@@ -20,8 +20,8 @@ LC_ALL=C
>  LANG=C
>  
>  # Network libraries.
>@@ -12,10 +12,7 @@ diff -up gpgme-1.3.0/src/gpgme-config.in.config_extras gpgme-1.3.0/src/gpgme-con
>  
>  # Configure libgpg-error.
>  gpg_error_cflags="@GPG_ERROR_CFLAGS@"
>--gpg_error_libs="@GPG_ERROR_LIBS@"
>-+#gpg_error_libs="@GPG_ERROR_LIBS@"
>- 
>- # Configure thread packages.
>+@@ -31,7 +31,7 @@
>  thread_modules=""
>  
>  @HAVE_PTH_TRUE@thread_modules="$thread_modules pth"
>@@ -24,8 +21,7 @@ diff -up gpgme-1.3.0/src/gpgme-config.in.config_extras gpgme-1.3.0/src/gpgme-con
>  cflags_pth="@PTH_CFLAGS@"
>  
>  @HAVE_PTHREAD_TRUE@thread_modules="$thread_modules pthread"
>--libs_pthread="-lpthread"
>-+#libs_pthread="-lpthread"
>+@@ -39,7 +39,7 @@
>  cflags_pthread=""
>  
>  # Configure glib.
>diff --git a/gpgme-1.3.0-tests_gpg_t-encrypt-sign_fix.patch b/gpgme-1.3.0-tests_gpg_t-encrypt-sign_fix.patch
>new file mode 100644
>index 0000000..d7f2efd
>--- /dev/null
>+++ b/gpgme-1.3.0-tests_gpg_t-encrypt-sign_fix.patch
>@@ -0,0 +1,18 @@
>+This patch fixes the t-encrypt-sign failing unit test; more info here:
>+
>+http://lists.gnupg.org/pipermail/gnupg-devel/2011-April/026054.html
>+
>+diff --git a/tests/gpg/t-encrypt-sign.c b/tests/gpg/t-encrypt-sign.c
>+index 9da5ff0..9d00340 100644
>+--- a/tests/gpg/t-encrypt-sign.c
>++++ b/tests/gpg/t-encrypt-sign.c
>+@@ -60,7 +60,8 @@ check_result (gpgme_sign_result_t result, gpgme_sig_mode_t type)
>+ 	       result->signatures->pubkey_algo);
>+       exit (1);
>+     }
>+-  if (result->signatures->hash_algo != GPGME_MD_SHA1)
>++  if (result->signatures->hash_algo != GPGME_MD_SHA1
>++      && result->signatures->hash_algo != GPGME_MD_RMD160)
>+     {
>+       fprintf (stderr, "Wrong hash algorithm reported: %i\n",
>+ 	       result->signatures->hash_algo);
>diff --git a/gpgme.spec b/gpgme.spec
>index 7df89f8..00a4c5c 100644
>--- a/gpgme.spec
>+++ b/gpgme.spec
>@@ -2,7 +2,7 @@
> Name:    gpgme
> Summary: GnuPG Made Easy - high level crypto API
> Version: 1.3.0
>-Release: 9%{?dist}
>+Release: 10%{?dist}
> 
> License: LGPLv2+
> Group:   Applications/System
>@@ -20,16 +20,18 @@ Patch2:  gpgme-1.3.0-ImplicitDSOLinking.patch
> # add -D_FILE_OFFSET_BITS... to gpgme-config, upstreamable
> Patch3:  gpgme-1.2.0-largefile.patch
> 
>+# fix t-encrypt-sign failing unit test; see:
>+# http://lists.gnupg.org/pipermail/gnupg-devel/2011-April/026054.html
>+Patch4:  gpgme-1.3.0-tests_gpg_t-encrypt-sign_fix.patch
>+
> BuildRequires: gawk
> BuildRequires: gnupg2
> BuildRequires: gnupg2-smime
> BuildRequires: libgpg-error-devel
> BuildRequires: pth-devel
> BuildRequires: libassuan2-devel
>+BuildRequires: glibc-static
> 
>-# --disable-gpg-test required since 'make check' currently includes some
>-# gpg(1)-specific tests
>-%define _with_gpg --with-gpg=%{_bindir}/gpg2 --disable-gpg-test
> Requires: gnupg2
> 
> # On the following architectures workaround multiarch conflict of -devel packages:
>@@ -63,6 +65,7 @@ Requires(postun): /sbin/install-info
> %patch1 -p1 -b .config_extras
> %patch2 -p1 -b .ImplicitDSOLinking
> %patch3 -p1 -b .largefile
>+%patch4 -p1 -b .t-encrypt-sign
> 
> ## HACK ALERT
> # The config script already suppresses the -L if it's /usr/lib, so cheat and
>@@ -72,9 +75,11 @@ sed -i -e 's|^libdir=@libdir@$|libdir=@exec_prefix@/lib|g' src/gpgme-config.in
> %build
> %configure \
>   --disable-static \
>-  %{?_with_gpg}
>+  --without-g13 \
>+  --with-gpg=%{_bindir}/gpg2
> 
>-make %{?_smp_mflags}
>+# link against gpg-error dynamic libs instead of static
>+make %{?_smp_mflags} GPG_ERROR_LIBS=%{_libdir}/libgpg-error.so
> 
> 
> %install
>@@ -141,6 +146,18 @@ fi
> 
> 
> %changelog
>+* Fri Sep  7 2012 John Morris <john@zultron.com> - 1.3.0-10
>+- re-enable gpg tests:
>+-   specfile:  remove --disable on  %%configure line
>+-   specfile:  add BuildRequires: glibc-static for tests/gpg/t-thread1
>+-   specfile:  build against libgpg-error static libs
>+-   config_extras patch:  fix hunks that disable
>+    gpg_error_libs and libs_pthread config
>+-   ImplicitDSOLinking.patch:  add test/gpg/Makefile.in
>+- Add patch to fix failing unit test:
>+  http://lists.gnupg.org/pipermail/gnupg-devel/2011-April/026054.html
>+- quiet configure warning 'could not find g13'
>+
> * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.0-9
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
>

Actions: View | Diff

Attachments on bug 855454: 610835 | 610841 | 617397