new upstream version

.gitignore

@@ -11,3 +11,4 @@ gnutls-2.10.1-nosrp.tar.bz2
 /gnutls-2.12.8-nosrp.tar.bz2
 /gnutls-2.12.9-nosrp.tar.bz2
 /gnutls-2.12.11-nosrp.tar.bz2
+/gnutls-2.12.12-nosrp.tar.bz2

gnutls-2.12.11-docparse.patch

@@ -1,102 +0,0 @@
-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

gnutls.spec

@@ -1,6 +1,6 @@
 Summary: A TLS protocol implementation
 Name: gnutls
-Version: 2.12.11
+Version: 2.12.12
 Release: 1%{?dist}
 # The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv3+
 License: GPLv3+ and LGPLv2+
@@ -21,8 +21,6 @@ Patch2: gnutls-2.8.6-link-libgcrypt.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
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: libgcrypt >= 1.2.2
@@ -90,7 +88,6 @@ This package contains Guile bindings for the library.
 %patch2 -p1 -b .link
 %patch3 -p1 -b .nosrp
 %patch4 -p1 -b .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
@@ -187,6 +184,9 @@ fi
 %{_datadir}/guile/site/gnutls.scm
 
 %changelog
+* Mon Oct 24 2011 Tomas Mraz <tmraz@redhat.com> 2.12.12-1
+- new upstream version
+
 * Thu Sep 29 2011 Tomas Mraz <tmraz@redhat.com> 2.12.11-1
 - new upstream version
 

sources

@@ -1 +1 @@
-c538384da66e4534a06b548430d736c0  gnutls-2.12.11-nosrp.tar.bz2
+3fbd510d8b85a1118ce44140964476ab  gnutls-2.12.12-nosrp.tar.bz2