rpms/gnutls
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

new upstream version

Browse Source
This commit is contained in:
Tomas Mraz 2011-09-29 10:00:35 +02:00
parent c7325b3968
commit 2486b7bf5c
3 changed files with 153 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
gnutls-2.12.11-docparse.patch Normal file
View File

@ -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

85
gnutls-2.12.2-rpath.patch → gnutls-2.12.11-rpath.patch
View File

@ -1,8 +1,8 @@
diff -up gnutls-2.12.2/build-aux/config.rpath gnutls-2.12.2/build-aux/config
diff -up gnutls-2.12.2/configure.rpath gnutls-2.12.2/configure
--- gnutls-2.12.2/configure.rpath 2011-04-08 18:18:09.000000000 +0200
+++ gnutls-2.12.2/configure 2011-04-19 10:55:42.000000000 +0200
@@ -16740,7 +16740,7 @@ shlibpath_var=
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"
@ -11,16 +11,16 @@ diff -up gnutls-2.12.2/configure.rpath gnutls-2.12.2/configure
need_lib_prefix=unknown
hardcode_into_libs=no
@@ -17125,7 +17125,7 @@ rm -f core conftest.err conftest.$ac_obj
@@ -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;/^$/d' | tr '\n' ' '`
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
@@ -20209,7 +20209,7 @@ shlibpath_var=
@@ -20228,7 +20228,7 @@ shlibpath_var=
shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
@ -29,20 +29,20 @@ diff -up gnutls-2.12.2/configure.rpath gnutls-2.12.2/configure
need_lib_prefix=unknown
hardcode_into_libs=no
@@ -20593,7 +20593,7 @@ rm -f core conftest.err conftest.$ac_obj
@@ -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;/^$/d' | tr '\n' ' '`
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.2/lib/build-aux/config.rpath gnutls-2.12.2/lib/build-aux/config
diff -up gnutls-2.12.2/lib/configure.rpath gnutls-2.12.2/lib/configure
--- gnutls-2.12.2/lib/configure.rpath 2011-04-08 18:17:13.000000000 +0200
+++ gnutls-2.12.2/lib/configure 2011-04-19 10:57:03.000000000 +0200
@@ -10842,7 +10842,7 @@ shlibpath_var=
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"
@ -51,16 +51,39 @@ diff -up gnutls-2.12.2/lib/configure.rpath gnutls-2.12.2/lib/configure
need_lib_prefix=unknown
hardcode_into_libs=no
@@ -11227,7 +11227,7 @@ rm -f core conftest.err conftest.$ac_obj
@@ -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;/^$/d' | tr '\n' ' '`
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
@@ -28572,7 +28572,7 @@ shlibpath_var=
@@ -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"
@ -69,32 +92,10 @@ diff -up gnutls-2.12.2/lib/configure.rpath gnutls-2.12.2/lib/configure
need_lib_prefix=unknown
hardcode_into_libs=no
@@ -28956,7 +28956,7 @@ rm -f core conftest.err conftest.$ac_obj
@@ -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;/^$/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.2/libextra/build-aux/config.rpath gnutls-2.12.2/libextra/build-aux/config
diff -up gnutls-2.12.2/libextra/configure.rpath gnutls-2.12.2/libextra/configure
--- gnutls-2.12.2/libextra/configure.rpath 2011-04-08 18:17:42.000000000 +0200
+++ gnutls-2.12.2/libextra/configure 2011-04-19 10:57:59.000000000 +0200
@@ -9971,7 +9971,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
@@ -10356,7 +10356,7 @@ rm -f core conftest.err conftest.$ac_obj
# 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;/^$/d' | tr '\n' ' '`
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

10
gnutls.spec
View File

@ -1,6 +1,6 @@
Summary: A TLS protocol implementation
Name: gnutls
Version: 2.12.9
Version: 2.12.11
Release: 1%{?dist}
# The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv3+
License: GPLv3+ and LGPLv2+
@ -15,12 +15,14 @@ URL: http://www.gnutls.org/
# XXX patent tainted SRP code removed.
Source0: %{name}-%{version}-nosrp.tar.bz2
Source1: libgnutls-config
Patch1: gnutls-2.12.2-rpath.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.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
@ -88,6 +90,7 @@ 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
@ -184,6 +187,9 @@ fi
%{_datadir}/guile/site/gnutls.scm
%changelog
* Thu Sep 29 2011 Tomas Mraz <tmraz@redhat.com> 2.12.11-1
- new upstream version
* Fri Aug 26 2011 Tomas Mraz <tmraz@redhat.com> 2.12.9-1
- new upstream version