|
|
@@ -3,8 +3,8 @@
|
|
|
Summary: GNU TLS Library
|
|
|
Summary(ja): GNU TLS ライブラリ
|
|
|
Name: gnutls
|
|
|
-Version: 2.10.5
|
|
|
-Release: 2%{?_dist_release}
|
|
|
+Version: 2.12.14
|
|
|
+Release: 1%{?_dist_release}
|
|
|
License: GPLv3+ and LGPLv2+
|
|
|
# The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv3+
|
|
|
Group: System Environment/Libraries
|
|
|
@@ -16,20 +16,19 @@ Source0: %{name}-%{version}.tar.bz2
|
|
|
Source1: libgnutls-config
|
|
|
|
|
|
#patches from fedora development
|
|
|
-#Patch1: gnutls-2.10.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.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
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
|
|
|
-BuildRequires: libgcrypt-devel >= 1.2.2, zlib-devel libtasn1-devel gmp-devel
|
|
|
-BuildRequires: gettext readline-devel libtool
|
|
|
-BuildRequires: guile-devel >= 1.8.6
|
|
|
-BuildRequires: lzo-devel
|
|
|
+BuildRequires: libgcrypt-devel >= 1.2.2, zlib-devel libtasn1-devel gmp-devel
|
|
|
+BuildRequires: gettext readline-devel libtool
|
|
|
+BuildRequires: guile-devel >= 1.8.6
|
|
|
+BuildRequires: lzo-devel nettle-devel
|
|
|
Requires: libgcrypt >= 1.2.2, zlib
|
|
|
Requires: lzo
|
|
|
|
|
|
@@ -91,6 +90,18 @@ the proposed standards by the IETF's TLS working group.
|
|
|
This package contains Guile bindings for the library.
|
|
|
#'
|
|
|
|
|
|
+%package c++
|
|
|
+Summary: The C++ interface to GnuTLS
|
|
|
+Group: System Environment/Libraries
|
|
|
+Requires: %{name}%{?_isa} = %{version}-%{release}
|
|
|
+
|
|
|
+%description c++
|
|
|
+GnuTLS is a project that aims to develop a library which provides a secure
|
|
|
+layer, over a reliable transport layer. Currently the GnuTLS library implements
|
|
|
+the proposed standards by the IETF's TLS working group.
|
|
|
+This package contains the C++ interface for the GnuTLS library.
|
|
|
+#'
|
|
|
+
|
|
|
%package -n compat32-%{name}
|
|
|
Summary: GNU TLS Library
|
|
|
Summary(ja): GNU TLS ライブラリ
|
|
|
@@ -136,23 +147,26 @@ This package contains Guile bindings for the library.
|
|
|
|
|
|
%prep
|
|
|
%setup -q
|
|
|
-#%patch1 -p1 -b .rpath
|
|
|
+%patch1 -p1 -b .rpath
|
|
|
%patch2 -p1 -b .link
|
|
|
%patch3 -p1 -b .nosrp
|
|
|
-%patch4 -p1 -b .errors
|
|
|
+%patch4 -p1 -b .skiptests
|
|
|
|
|
|
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
|
|
|
done
|
|
|
|
|
|
%build
|
|
|
-autoreconf
|
|
|
-%configure \
|
|
|
+#autoreconf
|
|
|
+%configure --with-libtasn1-prefix=%{_prefix} \
|
|
|
--with-lzo \
|
|
|
--with-included-libcfg \
|
|
|
+ --disable-openssl-compatibility \
|
|
|
--disable-srp-authentication \
|
|
|
--disable-static \
|
|
|
- --disable-srp-authentication
|
|
|
+ --disable-srp-authentication \
|
|
|
+ --disable-rpath \
|
|
|
+ --with-libgcrypt
|
|
|
# --with-included-libtasn1 \
|
|
|
# --with-included-opencdk \
|
|
|
# --with-included-lzo \
|
|
|
@@ -215,22 +229,24 @@ fi
|
|
|
%files -f libgnutls.lang
|
|
|
%defattr(-,root,root,-)
|
|
|
%{_libdir}/libgnutls*.so.*
|
|
|
+%{_libdir}/libgnutls-extra.so.*
|
|
|
%doc COPYING COPYING.LIB README AUTHORS
|
|
|
|
|
|
%files devel
|
|
|
%defattr(-,root,root,-)
|
|
|
%{_bindir}/libgnutls*-config
|
|
|
%{_includedir}/*
|
|
|
-#%{_libdir}/libgnutls*.a
|
|
|
%{_libdir}/libgnutls*.so
|
|
|
%{_libdir}/pkgconfig/*.pc
|
|
|
%{_mandir}/man3/*
|
|
|
%{_infodir}/gnutls*
|
|
|
+%{_infodir}/pkcs11-vision.png.gz
|
|
|
|
|
|
%files utils
|
|
|
%defattr(-,root,root,-)
|
|
|
%{_bindir}/certtool
|
|
|
%{_bindir}/psktool
|
|
|
+%{_bindir}/p11tool
|
|
|
%{_bindir}/gnutls*
|
|
|
%{_mandir}/man1/*
|
|
|
%doc doc/certtool.cfg
|
|
|
@@ -241,6 +257,9 @@ fi
|
|
|
%{_datadir}/guile/site/gnutls
|
|
|
%{_datadir}/guile/site/gnutls.scm
|
|
|
|
|
|
+%files c++
|
|
|
+%{_libdir}/libgnutlsxx.so.*
|
|
|
+
|
|
|
%if %{build_compat32}
|
|
|
%files -n compat32-%{name}
|
|
|
%defattr(-,root,root,-)
|
|
|
@@ -258,6 +277,11 @@ fi
|
|
|
%endif
|
|
|
|
|
|
%changelog
|
|
|
+* Sun Nov 04 2011 Toshiharu Kudoh <toshi.kd2@gmail.com> 2.12.14-1
|
|
|
+- new upstream release
|
|
|
+- synced Fedora development package
|
|
|
+- add new sub-package: c++
|
|
|
+
|
|
|
* Sun Apr 10 2011 IWAI, Masaharu <iwai@alib.jp> 2.10.5-2
|
|
|
- add Requires: libtasn1-devel for devel subpackage
|
|
|
|
|
|
@@ -315,7 +339,7 @@ fi
|
|
|
* Sun May 03 2009 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.6.6-1
|
|
|
- new upstream release with security fixes (CVE-2009-1415,1416,1417)
|
|
|
|
|
|
-* Wed Apr 15 2009 Toshiharu Kudoh <toshi.kd2@gmail.com> 2.6.6-1vl5
|
|
|
+* Wed Apr 15 2009 Toshiharu Kudoh <toshi.kd2@gmail.com> 2.6.5-1vl5
|
|
|
- update to 2.6.5
|
|
|
|
|
|
* Wed Mar 25 2009 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.6.4-2
|
kudoh