[mingw-gnutls: 13/23] Update to 2.12.11 to match Fedora native package.

epienbro epienbro at fedoraproject.org
Wed Mar 7 17:22:31 UTC 2012


commit 71273a51328468b4f23c9ca11d8c1491cb81b5c4
Author: Michael Cronenworth <mcronenworth at pdxinc.com>
Date:   Mon Oct 24 10:38:26 2011 -0500

    Update to 2.12.11 to match Fedora native package.

 .gitignore                                         |    1 +
 gnutls-2.10.1-handshake-errors.patch               |   57 -----------
 gnutls-2.12.11-docparse.patch                      |  102 +++++++++++++++++++
 gnutls-2.12.11-rpath.patch                         |  103 ++++++++++++++++++++
 ...2.10.1-nosrp.patch => gnutls-2.12.2-nosrp.patch |   31 +++---
 gnutls-2.12.7-dsa-skiptests.patch                  |   51 ++++++++++
 mingw32-gnutls.spec                                |   31 ++++--
 sources                                            |    2 +-
 8 files changed, 295 insertions(+), 83 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8cabef5..2f07286 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 gnutls-2.6.4-nosrp.tar.bz2
 /gnutls-2.10.5-nosrp.tar.bz2
+/gnutls-2.12.11-nosrp.tar.bz2
diff --git a/gnutls-2.12.11-docparse.patch b/gnutls-2.12.11-docparse.patch
new file mode 100644
index 0000000..4e9b5ae
--- /dev/null
+++ b/gnutls-2.12.11-docparse.patch
@@ -0,0 +1,102 @@
+diff -up gnutls-2.12.11/guile/modules/system/documentation/c-snarf.scm.docparse gnutls-2.12.11/guile/modules/system/documentation/c-snarf.scm
+--- gnutls-2.12.11/guile/modules/system/documentation/c-snarf.scm.docparse	2011-04-08 02:30:44.000000000 +0200
++++ gnutls-2.12.11/guile/modules/system/documentation/c-snarf.scm	2011-09-29 08:38:28.000000000 +0200
+@@ -1,6 +1,6 @@
+ ;;; c-snarf.scm  --  Parsing documentation "snarffed" from C files.
+ ;;;
+-;;; Copyright 2006, 2007, 2010 Free Software Foundation, Inc.
++;;; Copyright 2006, 2007, 2010, 2011 Free Software Foundation, Inc.
+ ;;;
+ ;;;
+ ;;; This program is free software; you can redistribute it and/or modify
+@@ -27,7 +27,7 @@
+ 
+   :export (run-cpp-and-extract-snarfing
+            parse-snarfing
+-           parse-snarfed-line snarf-line?))
++           parse-snarfed-line))
+ 
+ ;;; Author:  Ludovic Courtès
+ ;;;
+@@ -55,12 +55,6 @@
+ ;;; Parsing magic-snarffed CPP output.
+ ;;;
+ 
+-(define (snarf-line? line)
+-  "Return true if @var{line} (a string) can be considered a line produced by
+-the @code{snarf.h} snarfing macros."
+-  (and (>= (string-length line) 4)
+-       (string=? (substring line 0 4) "^^ {")))
+-
+ (define (parse-c-argument-list arg-string)
+   "Parse @var{arg-string} (a string representing a ANSI C argument list,
+ e.g., @var{(const SCM first, SCM second_arg)}) and return a list of strings
+@@ -99,7 +93,6 @@ of a procedure's documentation: @code{c-
+           (string-concatenate (reverse! result))
+           (loop (read) (cons str result)))))
+ 
+-  ;;(format (current-error-port) "doc-item: ~a~%" item)
+   (let* ((item (string-trim-both item #\space))
+ 	 (space (string-index item #\space)))
+     (if (not space)
+@@ -142,7 +135,7 @@ of a procedure's documentation: @code{c-
+ (define (parse-snarfed-line line)
+   "Parse @var{line}, a string that contains documentation returned for a
+ single function by the C preprocessor with the @code{-DSCM_MAGIC_SNARF_DOCS}
+-option.  @var{line} is assumed to obey the @code{snarf-line?} predicate."
++option.  @var{line} is assumed to be a complete \"^^ { ... ^^ }\" sequence."
+   (define (caret-split str)
+     (let loop ((str str)
+ 	       (result '()))
+@@ -168,16 +161,43 @@ option.  @var{line} is assumed to obey t
+ defined) output from @var{port} a return a list of alist, each of which
+ contains information about a specific function described in the C
+ preprocessor output."
++  (define start-marker "^^ {")
++  (define end-marker   "^^ }")
++
++  (define (read-snarf-lines start)
++    ;; Read the snarf lines that follow START until and end marker is found.
++    (let loop ((line   start)
++               (result '()))
++      (cond ((eof-object? line)
++             ;; EOF in the middle of a "^^ { ... ^^ }" sequence; shouldn't
++             ;; happen.
++             line)
++            ((string-contains line end-marker)
++             =>
++             (lambda (end)
++               (let ((result (cons (string-take line (+ 3 end))
++                                   result)))
++                 (string-concatenate-reverse result))))
++            ((string-prefix? "#" line)
++             ;; Presumably a "# LINENUM" directive; skip it.
++             (loop (read-line port) result))
++            (else
++             (loop (read-line port)
++                   (cons line result))))))
++
+   (let loop ((line (read-line port))
+ 	     (result '()))
+-    ;;(format (current-error-port) "line: ~a~%" line)
+-    (if (eof-object? line)
+-	result
+-	(cond ((snarf-line? line)
+-	       (loop (read-line port)
+-		     (cons (parse-snarfed-line line) result)))
+-	      (else
+-	       (loop (read-line port) result))))))
++    (cond ((eof-object? line)
++           result)
++          ((string-contains line start-marker)
++           =>
++           (lambda (start)
++             (let ((line
++                    (read-snarf-lines (string-drop line start))))
++               (loop (read-line port)
++                     (cons (parse-snarfed-line line) result)))))
++          (else
++           (loop (read-line port) result)))))
+ 
+ 
+ ;;; c-snarf.scm ends here
diff --git a/gnutls-2.12.11-rpath.patch b/gnutls-2.12.11-rpath.patch
new file mode 100644
index 0000000..4190a38
--- /dev/null
+++ b/gnutls-2.12.11-rpath.patch
@@ -0,0 +1,103 @@
+diff -up gnutls-2.12.11/build-aux/config.rpath gnutls-2.12.11/build-aux/config
+diff -up gnutls-2.12.11/configure.rpath gnutls-2.12.11/configure
+--- gnutls-2.12.11/configure.rpath	2011-09-18 20:32:37.000000000 +0200
++++ gnutls-2.12.11/configure	2011-09-27 18:32:17.000000000 +0200
+@@ -16377,7 +16377,7 @@ shlibpath_var=
+ shlibpath_overrides_runpath=unknown
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+-sys_lib_dlsearch_path_spec="/lib /usr/lib"
++sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64"
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -16835,7 +16835,7 @@ fi
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++    sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64 $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -20228,7 +20228,7 @@ shlibpath_var=
+ shlibpath_overrides_runpath=unknown
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+-sys_lib_dlsearch_path_spec="/lib /usr/lib"
++sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64"
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -20684,7 +20684,7 @@ fi
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++    sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64 $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+diff -up gnutls-2.12.11/lib/build-aux/config.rpath gnutls-2.12.11/lib/build-aux/config
+diff -up gnutls-2.12.11/lib/configure.rpath gnutls-2.12.11/lib/configure
+--- gnutls-2.12.11/lib/configure.rpath	2011-09-18 20:31:32.000000000 +0200
++++ gnutls-2.12.11/lib/configure	2011-09-27 18:33:22.000000000 +0200
+@@ -11989,7 +11989,7 @@ shlibpath_var=
+ shlibpath_overrides_runpath=unknown
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+-sys_lib_dlsearch_path_spec="/lib /usr/lib"
++sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64"
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -12447,7 +12447,7 @@ fi
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++    sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64 $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -30102,7 +30102,8 @@ shlibpath_var=
+ shlibpath_overrides_runpath=unknown
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+-sys_lib_dlsearch_path_spec="/lib /usr/lib"
++
++sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64"
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -30558,7 +30559,7 @@ fi
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++    sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64 $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+diff -up gnutls-2.12.11/libextra/build-aux/config.rpath gnutls-2.12.11/libextra/build-aux/config
+diff -up gnutls-2.12.11/libextra/configure.rpath gnutls-2.12.11/libextra/configure
+--- gnutls-2.12.11/libextra/configure.rpath	2011-09-18 20:32:07.000000000 +0200
++++ gnutls-2.12.11/libextra/configure	2011-09-27 18:33:55.000000000 +0200
+@@ -10658,7 +10658,7 @@ shlibpath_var=
+ shlibpath_overrides_runpath=unknown
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+-sys_lib_dlsearch_path_spec="/lib /usr/lib"
++sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64"
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -11116,7 +11116,7 @@ fi
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++    sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64 $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
diff --git a/gnutls-2.10.1-nosrp.patch b/gnutls-2.12.2-nosrp.patch
similarity index 73%
rename from gnutls-2.10.1-nosrp.patch
rename to gnutls-2.12.2-nosrp.patch
index 46ae493..eb31172 100644
--- a/gnutls-2.10.1-nosrp.patch
+++ b/gnutls-2.12.2-nosrp.patch
@@ -1,16 +1,7 @@
-diff -up gnutls-2.10.1/doc/gnutls.texi.nosrp gnutls-2.10.1/doc/gnutls.texi
---- gnutls-2.10.1/doc/gnutls.texi.nosrp	2010-06-21 09:50:55.000000000 +0200
-+++ gnutls-2.10.1/doc/gnutls.texi	2010-08-04 11:58:22.000000000 +0200
-@@ -524,7 +524,7 @@ data to the transport layer.
- @end itemize
- 
- Other callback functions such as the one set by
-- at ref{gnutls_srp_set_server_credentials_function}, may require more
-+gnutls_srp_set_server_credentials_function, may require more
- complicated input, including data to be allocated.  These callbacks
- should allocate and free memory using the functions shown below.
- 
-@@ -1576,9 +1576,9 @@ authenticated using a certificate with R
+diff -up gnutls-2.12.2/doc/cha-auth.texi.nosrp gnutls-2.12.2/doc/cha-auth.texi
+--- gnutls-2.12.2/doc/cha-auth.texi.nosrp	2011-04-08 02:30:44.000000000 +0200
++++ gnutls-2.12.2/doc/cha-auth.texi	2011-04-19 09:46:25.000000000 +0200
+@@ -255,9 +255,9 @@ authenticated using a certificate with R
  
  If clients supporting @acronym{SRP} know the username and password
  before the connection, should initialize the client credentials and
@@ -22,7 +13,7 @@ diff -up gnutls-2.10.1/doc/gnutls.texi.nosrp gnutls-2.10.1/doc/gnutls.texi
  the advantage that allows probing the server for @acronym{SRP}
  support.  In that case the callback function will be called twice per
  handshake.  The first time is before the ciphersuite is negotiated,
-@@ -1593,20 +1593,20 @@ In server side the default behaviour of 
+@@ -272,20 +272,20 @@ In server side the default behaviour of 
  the usernames and @acronym{SRP} verifiers from password files. These
  password files are the ones used by the @emph{Stanford srp libraries}
  and can be specified using the
@@ -48,3 +39,15 @@ diff -up gnutls-2.10.1/doc/gnutls.texi.nosrp gnutls-2.10.1/doc/gnutls.texi
  
  @end itemize
  
+diff -up gnutls-2.12.2/doc/cha-library.texi.nosrp gnutls-2.12.2/doc/cha-library.texi
+--- gnutls-2.12.2/doc/cha-library.texi.nosrp	2011-04-08 02:30:44.000000000 +0200
++++ gnutls-2.12.2/doc/cha-library.texi	2011-04-19 09:44:58.000000000 +0200
+@@ -174,7 +174,7 @@ data to the transport layer.
+ @end itemize
+ 
+ Other callback functions such as the one set by
+- at ref{gnutls_srp_set_server_credentials_function}, may require more
++gnutls_srp_set_server_credentials_function, may require more
+ complicated input, including data to be allocated.  These callbacks
+ should allocate and free memory using the functions shown below.
+ 
diff --git a/gnutls-2.12.7-dsa-skiptests.patch b/gnutls-2.12.7-dsa-skiptests.patch
new file mode 100644
index 0000000..64fa224
--- /dev/null
+++ b/gnutls-2.12.7-dsa-skiptests.patch
@@ -0,0 +1,51 @@
+diff -up gnutls-2.12.7/tests/dsa/testdsa.skiptests gnutls-2.12.7/tests/dsa/testdsa
+--- gnutls-2.12.7/tests/dsa/testdsa.skiptests	2011-06-05 21:12:47.000000000 +0200
++++ gnutls-2.12.7/tests/dsa/testdsa	2011-06-21 23:36:20.000000000 +0200
+@@ -60,14 +60,14 @@ $CLI $DEBUG -p $PORT 127.0.0.1 --insecur
+ echo "Checking server DSA-1024 with client DSA-2048 and TLS 1.0"
+ 
+ #try with client key of 2048 bits (should fail) 
+-$CLI $DEBUG -p $PORT 127.0.0.1 --insecure --x509certfile $srcdir/cert.dsa.2048.pem --x509keyfile $srcdir/dsa.2048.pem </dev/null >/dev/null 2>&1 && \
+-  fail "Succeeded connection to a server with a client DSA 2048 key and TLS 1.0!"
+-
+-echo "Checking server DSA-1024 with client DSA-3072 and TLS 1.0"
++#$CLI $DEBUG -p $PORT 127.0.0.1 --insecure --x509certfile $srcdir/cert.dsa.2048.pem --x509keyfile $srcdir/dsa.2048.pem </dev/null >/dev/null 2>&1 && \
++#  fail "Succeeded connection to a server with a client DSA 2048 key and TLS 1.0!"
++#
++#echo "Checking server DSA-1024 with client DSA-3072 and TLS 1.0"
+ 
+ #try with client key of 3072 bits (should fail) 
+-$CLI $DEBUG -p $PORT 127.0.0.1 --insecure --x509certfile $srcdir/cert.dsa.3072.pem --x509keyfile $srcdir/dsa.3072.pem </dev/null >/dev/null 2>&1 && \
+-  fail "Succeeded connection to a server with a client DSA 3072 key and TLS 1.0!"
++#$CLI $DEBUG -p $PORT 127.0.0.1 --insecure --x509certfile $srcdir/cert.dsa.3072.pem --x509keyfile $srcdir/dsa.3072.pem </dev/null >/dev/null 2>&1 && \
++#  fail "Succeeded connection to a server with a client DSA 3072 key and TLS 1.0!"
+ 
+ kill $PID
+ wait
+@@ -94,19 +94,21 @@ $CLI $DEBUG -p $PORT 127.0.0.1 --insecur
+ echo "Checking server DSA-1024 with client DSA-2048 and TLS 1.2"
+ 
+ #try with client key of 2048 bits (should succeed) 
+-$CLI $DEBUG -p $PORT 127.0.0.1 --insecure --x509certfile $srcdir/cert.dsa.2048.pem --x509keyfile $srcdir/dsa.2048.pem </dev/null >/dev/null || \
+-  fail "Failed connection to a server with a client DSA 2048 key and TLS 1.2!"
++#$CLI $DEBUG -p $PORT 127.0.0.1 --insecure --x509certfile $srcdir/cert.dsa.2048.pem --x509keyfile $srcdir/dsa.2048.pem </dev/null >/dev/null || \
++#  fail "Failed connection to a server with a client DSA 2048 key and TLS 1.2!"
+ 
+-echo "Checking server DSA-1024 with client DSA-3072 and TLS 1.2"
++#echo "Checking server DSA-1024 with client DSA-3072 and TLS 1.2"
+ 
+ #try with client key of 3072 bits (should succeed) 
+-$CLI $DEBUG -p $PORT 127.0.0.1 --insecure --x509certfile $srcdir/cert.dsa.3072.pem --x509keyfile $srcdir/dsa.3072.pem </dev/null >/dev/null || \
+-  fail "Failed connection to a server with a client DSA 3072 key and TLS 1.2!"
++#$CLI $DEBUG -p $PORT 127.0.0.1 --insecure --x509certfile $srcdir/cert.dsa.3072.pem --x509keyfile $srcdir/dsa.3072.pem </dev/null >/dev/null || \
++#  fail "Failed connection to a server with a client DSA 3072 key and TLS 1.2!"
+ 
+ 
+ kill $PID
+ wait
+ 
++exit 0
++
+ # DSA 2048 + TLS 1.0
+ 
+ echo "Checking DSA-2048 with TLS 1.0"
diff --git a/mingw32-gnutls.spec b/mingw32-gnutls.spec
index 6f63073..e2f115c 100644
--- a/mingw32-gnutls.spec
+++ b/mingw32-gnutls.spec
@@ -6,8 +6,8 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-gnutls
-Version:        2.10.5
-Release:        2%{?dist}
+Version:        2.12.11
+Release:        1%{?dist}
 Summary:        MinGW GnuTLS TLS/SSL encryption library
 
 License:        GPLv3+ and LGPLv2+
@@ -21,17 +21,19 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
-Patch2:         gnutls-2.8.6-link-libgcrypt.patch
+Patch1: gnutls-2.12.11-rpath.patch
+Patch2: gnutls-2.8.6-link-libgcrypt.patch
 # Remove nonexisting references from texinfo file
-Patch3:         gnutls-2.10.1-nosrp.patch
-# Backport from upstream git
-Patch4:         gnutls-2.10.1-handshake-errors.patch
+Patch3: gnutls-2.12.2-nosrp.patch
+# Skip tests that are expected to fail on libgcrypt build
+Patch4: gnutls-2.12.7-dsa-skiptests.patch
+# Upstream patch for doc parsing
+Patch5: gnutls-2.12.11-docparse.patch
 
 BuildRequires:  mingw32-filesystem >= 40
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-gcc-c++
 BuildRequires:  mingw32-binutils
-BuildRequires:  mingw32-dlfcn
 BuildRequires:  mingw32-libgpg-error
 BuildRequires:  mingw32-libgcrypt >= 1.2.2
 BuildRequires:  mingw32-gettext
@@ -63,9 +65,11 @@ for MinGW.
 %prep
 %setup -q -n gnutls-%{version}
 
+%patch1 -p1 -b .rpath
 %patch2 -p1 -b .link
 %patch3 -p1 -b .nosrp
-%patch4 -p1 -b .errors
+%patch4 -p1 -b .dsa-skiptests
+%patch5 -p1 -b .docparse
 
 for i in auth_srp_rsa.c auth_srp_sb64.c auth_srp_passwd.c auth_srp.c gnutls_srp.c ext_srp.c; do
     touch lib/$i
@@ -81,9 +85,11 @@ autoreconf
 %build
 PATH="%{_mingw32_bindir}:$PATH" \
 %{_mingw32_configure} \
+  --with-libgcrypt \
   --with-included-libtasn1 \
   --disable-srp-authentication \
-  --disable-static
+  --disable-static \
+  --without-p11-kit
 # %{?_smp_mflags} doesn't build correctly.
 make
 cp lib/COPYING COPYING.LIB
@@ -118,8 +124,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_bindir}/libgnutls-extra-26.def
 %{_mingw32_bindir}/libgnutls-extra-26.dll
 %{_mingw32_bindir}/libgnutls-openssl-26.def
-%{_mingw32_bindir}/libgnutls-openssl-26.dll
-%{_mingw32_bindir}/libgnutlsxx-26.dll
+%{_mingw32_bindir}/libgnutls-openssl-27.dll
+%{_mingw32_bindir}/libgnutlsxx-27.dll
 %{_mingw32_bindir}/psktool.exe
 %{_mingw32_libdir}/libgnutls-extra.dll.a
 %{_mingw32_libdir}/libgnutls-extra.la
@@ -135,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 24 2011 Michael Cronenworth <mike at cchtml.com> - 2.12.11-1
+- Update to 2.12.11
+
 * Wed Jul 06 2011 Kalev Lember <kalevlember at gmail.com> - 2.10.5-2
 - Rebuilt against win-iconv
 
diff --git a/sources b/sources
index 3378d7f..c2d307d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9dad7462ffdc3a6866a4aaaa62d8f0ad  gnutls-2.10.5-nosrp.tar.bz2
+c538384da66e4534a06b548430d736c0  gnutls-2.12.11-nosrp.tar.bz2


More information about the scm-commits mailing list