gnutls-3.6.4-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11895 ec354946-7b23-47d6-9f5a-488ba84defc7

g/gnutls/gnutls-vl.spec

@@ -3,8 +3,8 @@
 Summary:	GNU TLS Library
 Summary(ja):	GNU TLS ライブラリ
 Name:		gnutls
-Version:	3.4.14
-Release:	3%{?_dist_release}
+Version:	3.6.4
+Release:	1%{?_dist_release}
 License:	GPLv3+ and LGPLv2+
 # The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv3+
 Group:		System Environment/Libraries
@@ -14,34 +14,34 @@ Source1:	libgnutls-config
 
 #patches from fedora development
 Patch1: gnutls-3.2.7-rpath.patch
-Patch3: gnutls-3.1.11-nosrp.patch
+Patch2:	gnutls-3.6.4-no-now-guile.patch
+Patch3: gnutls-3.6.4-fix-rehandshake.patch
 
 # Vine Patches
 # Nothing...
 
 # Security fixes
-# CVE-2016-7444/GNUTLS-SA-2016-3
-Patch2001: https://gitlab.com/gnutls/gnutls/commit/964632f37dfdfb914ebc5e49db4fa29af35b1de9.patch
-# from Fedora
-# CVE-2017-5337, CVE-2017-5334, CVE-2017-5336, CVE-2017-5335
-Patch3001: gnutls-3.4.17-various-flaws1.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-BuildRequires:	libtasn1-devel >= 4.3
-BuildRequires:	datefudge
+BuildRequires:	libtasn1-devel >= 4.13
+Requires:		libtasn1 >= 4.13
+BuildRequires:	libunistring-devel
+BuildRequires:	datefudge >= 1.22
 BuildRequires:	gmp-devel
 BuildRequires:	gettext readline-devel libtool
 BuildRequires:	guile-devel >= 1.8.6
 BuildRequires:	p11-kit-devel >= 0.21.3
-BuildRequires:  nettle-devel >= 3.1.1
+BuildRequires:	nettle-devel >= 3.4
+Requires:		nettle >= 3.4
 BuildRequires:	texinfo, autogen
+BuildRequires:	unbound-devel unbound-libs
 BuildRequires:	zlib-devel
-Requires:      zlib
+Requires:		zlib
 # for tests
 BuildRequires:	net-tools
 
-Requires(post):   ldconfig
-Requires(postun): ldconfig
+Requires(post):	ldconfig
+Requires(postun):	ldconfig
 
 Vendor:		Project Vine
 Distribution:	Vine Linux
@@ -154,24 +154,27 @@ This package contains Guile bindings for the library.
 #'
 
 %prep
-%setup -q
+%autosetup -p1
 
-%patch1 -p1 -b .rpath
-%patch3 -p1 -b .nosrp
-%patch2001 -p1
-%patch3001 -p1
+sed -i -e 's|sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/lib /usr/lib %{_libdir}|g' configure
+rm -f lib/minitasn1/*.c lib/minitasn1/*.h
+rm -f src/libopts/*.c src/libopts/*.h src/libopts/compat/*.c src/libopts/compat/*.h 
+
+echo "SYSTEM=NORMAL" >> tests/system.prio
 
 %build
 export LDFLAGS="-Wl,--no-add-needed"
 # autoreconf -fi
 %configure \
-	--disable-openssl-compatibility \
-	--disable-srp-authentication \
+	--enable-sha1-support \
 	--disable-static \
-	--disable-srp-authentication \
+	--disable-openssl-compatibility \
 	--disable-non-suiteb-curves \
+	--enable-guile \
+	--with-unbound-root-key-file=/var/lib/unbound/root.key \
+	--enable-dane \
 	--disable-rpath \
-        --enable-guile
+	%{nil}
 #	--with-libgcrypt
 #	--with-lzo \
 #	--with-included-libcfg \
@@ -187,29 +190,17 @@ make %{?_smp_mflags}
 # makeinstall macro causes build error, why?
 make install DESTDIR=%{buildroot}
 
-rm -f $RPM_BUILD_ROOT%{_bindir}/srptool
-rm -f $RPM_BUILD_ROOT%{_bindir}/danetool
-rm -f $RPM_BUILD_ROOT%{_bindir}/gnutls-srpcrypt
-# replace libgnutls*-config
-%__install -d %{buildroot}%{_bindir}
-%__install -p -m755 %{SOURCE1} %{buildroot}%{_bindir}/libgnutls-config
-# %__install -p -m755 %{SOURCE1} %{buildroot}%{_bindir}/libgnutls-extra-config
-
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/srptool.1
-rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*srp*
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/libguile*.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gnutls-dane.pc
-
-# remove unneeded files
-%__rm -f %{buildroot}%{_libdir}/*.la
-%__rm -f %{buildroot}%{_libdir}/guile/2.0/*.la
+rm -f %{buildroot}%{_infodir}/dir
+rm -f %{buildroot}%{_libdir}/*.la
+rm -f %{buildroot}%{_libdir}/libguile*.a
+rm -f %{buildroot}%{_libdir}/guile/2.0/*.la
+rm -f %{buildroot}%{_libdir}/gnutls/libpkcs11mock1.*
+rm -rf %{buildroot}%{_docdir}/gnutls
 
 %find_lang gnutls
 
 %check
-make check
+make check %{?_smp_mflags}
 
 %clean
 rm -rf %{buildroot}
@@ -243,12 +234,12 @@ fi
 %files -f gnutls.lang
 %defattr(-,root,root,-)
 %{_libdir}/libgnutls.so.30*
+%{_libdir}/libgnutls-dane.so.*
 # %{_libdir}/libgnutls-xssl.so.0*
-%doc README AUTHORS NEWS THANKS
+%doc README* AUTHORS NEWS THANKS
 
 %files devel
 %defattr(-,root,root,-)
-%{_bindir}/libgnutls*-config
 %{_includedir}/*
 %{_libdir}/libgnutls*.so
 %{_libdir}/pkgconfig/*.pc
@@ -259,9 +250,11 @@ fi
 %files utils
 %defattr(-,root,root,-)
 %{_bindir}/certtool
+%{_bindir}/danetool
 %{_bindir}/psktool
 %{_bindir}/p11tool
 %{_bindir}/ocsptool
+%{_bindir}/srptool
 %{_bindir}/gnutls*
 %{_mandir}/man1/*
 %doc doc/certtool.cfg
@@ -269,8 +262,10 @@ fi
 %files guile
 %defattr(-,root,root,-)
 %{_libdir}/guile/2.0/guile*.so*
-%{_datadir}/guile/site/gnutls
-%{_datadir}/guile/site/gnutls.scm
+%{_libdir}/guile/2.0/site-ccache/gnutls.go
+%{_libdir}/guile/2.0/site-ccache/gnutls/extra.go
+%{_datadir}/guile/site/2.0/gnutls
+%{_datadir}/guile/site/2.0/gnutls.scm
 
 %files c++
 %{_libdir}/libgnutlsxx.so.*
@@ -279,6 +274,7 @@ fi
 %files -n compat32-%{name}
 %defattr(-,root,root,-)
 %{_libdir}/libgnutls.so.30*
+%{_libdir}/libgnutls-dane.so.*
 # %{_libdir}/libgnutls-xssl.so.0*
 
 %files -n compat32-%{name}-devel
@@ -290,9 +286,17 @@ fi
 %files -n compat32-%{name}-guile
 %defattr(-,root,root,-)
 %{_libdir}/guile/2.0/guile*.so*
+%{_libdir}/guile/2.0/site-ccache/gnutls.go
+%{_libdir}/guile/2.0/site-ccache/gnutls/extra.go
 %endif
 
 %changelog
+* Thu Nov 08 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.6.4-1
+- new upstream release.
+- dropped Patch2-3,1001 and 2001.
+- imported Patch2-3 from rawhide.
+- enabled DANE support.
+
 * Sat Jan 28 2017 IWAI, Masaharu <iwaim.sub@gmail.com> 3.4.14-3
 - fix CVE-2017-5337, CVE-2017-5334, CVE-2017-5336, CVE-2017-5335
  - add Patch3001 from Fedora 24 gnutls-3.4.17-2.fc24