| |
@@ -12,14 +12,7 @@
|
| |
print(string.sub(hash, 0, 16))
|
| |
}
|
| |
|
| |
- %global with_srp 0%{?fedora} < 38
|
| |
-
|
| |
- %global with_mingw 0
|
| |
- %if 0%{?fedora}
|
| |
- %global with_mingw 0%{!?_without_mingw:1}
|
| |
- %endif
|
| |
-
|
| |
- Version: 3.8.0
|
| |
+ Version: 3.8.1
|
| |
Release: %{?autorelease}%{!?autorelease:1%{?dist}}
|
| |
Patch: gnutls-3.2.7-rpath.patch
|
| |
|
| |
@@ -38,10 +31,23 @@
|
| |
%bcond_with certificate_compression
|
| |
%bcond_without tests
|
| |
|
| |
+ %if 0%{?fedora} < 38
|
| |
+ %bcond_without srp
|
| |
+ %else
|
| |
+ %bcond_with srp
|
| |
+ %endif
|
| |
+
|
| |
+ %if 0%{?fedora}
|
| |
+ %bcond_without mingw
|
| |
+ %else
|
| |
+ %bcond_with mingw
|
| |
+ %endif
|
| |
+
|
| |
+
|
| |
Summary: A TLS protocol implementation
|
| |
Name: gnutls
|
| |
# The libraries are LGPLv2.1+, utilities are GPLv3+
|
| |
- License: GPLv3+ and LGPLv2+
|
| |
+ License: GPL-3.0-or-later AND LGPL-2.1-or-later
|
| |
BuildRequires: p11-kit-devel >= 0.21.3, gettext-devel
|
| |
BuildRequires: readline-devel, libtasn1-devel >= 4.3
|
| |
%if %{with certificate_compression}
|
| |
@@ -59,7 +65,7 @@
|
| |
%endif
|
| |
BuildRequires: libidn2-devel
|
| |
BuildRequires: libunistring-devel
|
| |
- BuildRequires: net-tools, datefudge, softhsm, gcc, gcc-c++
|
| |
+ BuildRequires: net-tools, softhsm, gcc, gcc-c++
|
| |
BuildRequires: gnupg2
|
| |
BuildRequires: git-core
|
| |
|
| |
@@ -78,7 +84,7 @@
|
| |
%endif
|
| |
BuildRequires: make gtk-doc
|
| |
|
| |
- %if %{with_mingw}
|
| |
+ %if %{with mingw}
|
| |
BuildRequires: mingw32-filesystem >= 95
|
| |
BuildRequires: mingw32-gcc
|
| |
BuildRequires: mingw32-gcc-c++
|
| |
@@ -120,7 +126,7 @@
|
| |
Requires: pkgconfig
|
| |
|
| |
%package utils
|
| |
- License: GPLv3+
|
| |
+ License: GPL-3.0-or-later
|
| |
Summary: Command line tools for TLS protocol
|
| |
Requires: %{name}%{?_isa} = %{version}-%{release}
|
| |
%if %{with dane}
|
| |
@@ -176,7 +182,7 @@
|
| |
TLS certificates through DNSSEC.
|
| |
%endif
|
| |
|
| |
- %if %{with_mingw}
|
| |
+ %if %{with mingw}
|
| |
%package -n mingw32-%{name}
|
| |
Summary: MinGW GnuTLS TLS/SSL encryption library
|
| |
Requires: pkgconfig
|
| |
@@ -239,7 +245,7 @@
|
| |
%else
|
| |
--disable-gost \
|
| |
%endif
|
| |
- %if %{with_srp}
|
| |
+ %if %{with srp}
|
| |
--enable-srp-authentication \
|
| |
%endif
|
| |
%ifarch %{ix86}
|
| |
@@ -280,11 +286,11 @@
|
| |
%make_build
|
| |
popd
|
| |
|
| |
- %if %{with_mingw}
|
| |
+ %if %{with mingw}
|
| |
# MinGW does not support CCASFLAGS
|
| |
export CCASFLAGS=""
|
| |
%mingw_configure \
|
| |
- %if %{with_srp}
|
| |
+ %if %{with srp}
|
| |
--enable-srp-authentication \
|
| |
%endif
|
| |
--enable-sha1-support \
|
| |
@@ -335,7 +341,7 @@
|
| |
%find_lang gnutls
|
| |
popd
|
| |
|
| |
- %if %{with_mingw}
|
| |
+ %if %{with mingw}
|
| |
%mingw_make_install
|
| |
|
| |
# Remove .la files
|
| |
@@ -400,7 +406,7 @@
|
| |
%{_bindir}/ocsptool
|
| |
%{_bindir}/psktool
|
| |
%{_bindir}/p11tool
|
| |
- %if %{with_srp}
|
| |
+ %if %{with srp}
|
| |
%{_bindir}/srptool
|
| |
%endif
|
| |
%if %{with dane}
|
| |
@@ -415,7 +421,7 @@
|
| |
%{_libdir}/libgnutls-dane.so.*
|
| |
%endif
|
| |
|
| |
- %if %{with_mingw}
|
| |
+ %if %{with mingw}
|
| |
%files -n mingw32-%{name}
|
| |
%license LICENSE doc/COPYING doc/COPYING.LESSER
|
| |
%{mingw32_bindir}/certtool.exe
|
| |
@@ -426,7 +432,7 @@
|
| |
%{mingw32_bindir}/ocsptool.exe
|
| |
%{mingw32_bindir}/p11tool.exe
|
| |
%{mingw32_bindir}/psktool.exe
|
| |
- %if %{with_srp}
|
| |
+ %if %{with srp}
|
| |
%{mingw32_bindir}/srptool.exe
|
| |
%endif
|
| |
%{mingw32_libdir}/libgnutls.dll.a
|
| |
@@ -444,7 +450,7 @@
|
| |
%{mingw64_bindir}/ocsptool.exe
|
| |
%{mingw64_bindir}/p11tool.exe
|
| |
%{mingw64_bindir}/psktool.exe
|
| |
- %if %{with_srp}
|
| |
+ %if %{with srp}
|
| |
%{mingw64_bindir}/srptool.exe
|
| |
%endif
|
| |
%{mingw64_libdir}/libgnutls.dll.a
|
| |
zfridric
commented 10 months ago
Upstream tag: 3.8.1
Upstream commit: 513570a5