reinstate patch-configure as upstream patch not yet in [1.6.2] release.

http://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commitdiff;h=43376891c01f4aff1fbfb23beafebb5adfd0868c
revbump to pick it up.

3 files changed, 88 insertions, 5 deletions

diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index 6ce15f4f5f5..e0c2d04ad33 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.65 2014/08/28 13:38:29 jperkin Exp $
+# $NetBSD: Makefile,v 1.66 2014/08/29 10:29:14 richard Exp $
 
 DISTNAME=	libgcrypt-1.6.2
+PKGREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/libgcrypt/ \
 		http://gd.tuwien.ac.at/privacy/gnupg/libgcrypt/
@@ -31,9 +32,6 @@ CONFIGURE_ARGS+=	--disable-asm
 .endif
 CONFIGURE_ARGS+=	--disable-aesni-support
 
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ENV+=		gcry_cv_gcc_inline_asm_ssse3=no
-.endif
 
 # SCO OpenServer 5.0.7/3.2 has no socklen_t, but it is defined in pthread.h
 # from builtin GNU pth.
diff --git a/security/libgcrypt/distinfo b/security/libgcrypt/distinfo
index 9091dc456dd..e9cb1056c0e 100644
--- a/security/libgcrypt/distinfo
+++ b/security/libgcrypt/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.52 2014/08/21 21:04:15 wiz Exp $
+$NetBSD: distinfo,v 1.53 2014/08/29 10:29:14 richard Exp $
 
 SHA1 (libgcrypt-1.6.2.tar.bz2) = cc31aca87e4a3769cb86884a3f5982b2cc8eb7ec
 RMD160 (libgcrypt-1.6.2.tar.bz2) = 807df33a98468015293846fd589a213dad38be19
@@ -6,4 +6,5 @@ Size (libgcrypt-1.6.2.tar.bz2) = 2476101 bytes
 SHA1 (patch-aa) = 3dd44b8745128a6788d24f9eb00002624a5fc52b
 SHA1 (patch-ab) = 1a72ac897fbccbd58f0108b36a9ab2a6ee579b59
 SHA1 (patch-ad) = e74c9471e26029aeafca23d385ee0162ffc1864b
+SHA1 (patch-configure) = b9abea2f665ed0d8e0f36cf207f2cb9667bdfb4d
 SHA1 (patch-src_visibility.h) = 8cbbf6803ab34b4b7dda832aa8ee18247aa89518
diff --git a/security/libgcrypt/patches/patch-configure b/security/libgcrypt/patches/patch-configure
new file mode 100644
index 00000000000..2f35c17d0f7
--- /dev/null
+++ b/security/libgcrypt/patches/patch-configure
@@ -0,0 +1,84 @@
+$NetBSD: patch-configure,v 1.3 2014/08/29 10:29:15 richard Exp $
+
+reinstate patch as upstream patch not yet in [1.6.2] release.
+http://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commitdiff;h=43376891c01f4aff1fbfb23beafebb5adfd0868c
+
+--- configure.orig	2014-08-21 13:14:09.000000000 +0000
++++ configure
+@@ -16455,13 +16455,63 @@ $as_echo "#define HAVE_GCC_INLINE_ASM_BM
+ 
+ fi
+ 
++#
++# Check whether GCC assembler needs "-Wa,--divide" to correctly handle
++# constant division
++#
++if test $amd64_as_feature_detection = yes; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GCC assembler handles division correctly" >&5
++$as_echo_n "checking whether GCC assembler handles division correctly... " >&6; }
++if ${gcry_cv_gcc_as_const_division_ok+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  gcry_cv_gcc_as_const_division_ok=no
++        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++__asm__("xorl \$(123456789/12345678), %ebp;\n\t");
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  gcry_cv_gcc_as_const_division_ok=yes
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcry_cv_gcc_as_const_division_ok" >&5
++$as_echo "$gcry_cv_gcc_as_const_division_ok" >&6; }
++  if test "$gcry_cv_gcc_as_const_division_ok" = "no" ; then
++    #
++    # Add '-Wa,--divide' to CPPFLAGS and try check again.
++    #
++    _gcc_cppflags_save="$CPPFLAGS"
++    CPPFLAGS="$CPPFLAGS -Wa,--divide"
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GCC assembler handles division correctly with \"-Wa,--divide\"" >&5
++$as_echo_n "checking whether GCC assembler handles division correctly with \"-Wa,--divide\"... " >&6; }
++if ${gcry_cv_gcc_as_const_division_with_wadivide_ok+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  gcry_cv_gcc_as_const_division_with_wadivide_ok=no
++          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++__asm__("xorl \$(123456789/12345678), %ebp;\n\t");
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  gcry_cv_gcc_as_const_division_with_wadivide_ok=yes
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcry_cv_gcc_as_const_division_with_wadivide_ok" >&5
++$as_echo "$gcry_cv_gcc_as_const_division_with_wadivide_ok" >&6; }
++    if test "$gcry_cv_gcc_as_const_division_with_wadivide_ok" = "no" ; then
++      CPPFLAGS="$_gcc_cppflags_save"
++    fi
++  fi
++fi
+ 
+ #
+ # Check whether GCC assembler supports features needed for our amd64
+ # implementations
+ #
+ if test $amd64_as_feature_detection = yes; then
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GCC assembler is compatible for amd64 assembly implementations" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GCC assembler is compatible for amd64 assembly implementations" >&5
+ $as_echo_n "checking whether GCC assembler is compatible for amd64 assembly implementations... " >&6; }
+ if ${gcry_cv_gcc_amd64_platform_as_ok+:} false; then :
+   $as_echo_n "(cached) " >&6
+@@ -16481,6 +16531,11 @@ __asm__(
+ 		"asmfunc:\n\t"
+                 ".size asmfunc,.-asmfunc;\n\t"
+                 ".type asmfunc,@function;\n\t"
++                /* Test if assembler allows use of '/' for constant division
++                 * (Solaris/x86 issue). If previous constant division check
++                 * and "-Wa,--divide" workaround failed, this causes assembly
++                 * to be disable on this machine. */
++                 "xorl \$(123456789/12345678), %ebp;\n\t"
+             );
+ _ACEOF
+ if ac_fn_c_try_compile "$LINENO"; then :