Package init
This commit is contained in:
overweight
commit
fbdb53b66d
52
fix-ipv6-handshake-failed.patch
Normal file
52
fix-ipv6-handshake-failed.patch
Normal file
@ -0,0 +1,52 @@
|
||||
From 93a6a9a753c541e04875648cf5671e422e4621df Mon Sep 17 00:00:00 2001
|
||||
From: lvying <lvying6@huawei.com>
|
||||
Date: Sat, 8 Jun 2019 22:36:10 -0400
|
||||
Subject: [PATCH] fix ipv6 handshake failed
|
||||
|
||||
reason: fix ipv6 handshake failed
|
||||
|
||||
Signed-off-by: lvying <lvying6@huawei.com>
|
||||
---
|
||||
lib/ext/server_name.c | 4 +++-
|
||||
lib/str.h | 10 ++++++++++
|
||||
2 files changed, 13 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/ext/server_name.c b/lib/ext/server_name.c
|
||||
index 259dc99..f61c1f2 100644
|
||||
--- a/lib/ext/server_name.c
|
||||
+++ b/lib/ext/server_name.c
|
||||
@@ -105,7 +105,9 @@ _gnutls_server_name_recv_params(gnutls_session_t session,
|
||||
DECR_LEN(data_size, len);
|
||||
|
||||
if (type == 0) { /* NAME_DNS */
|
||||
- if (!_gnutls_dnsname_is_valid((char*)p, len)) {
|
||||
+ _gnutls_debug_log("HSK[%p]: recieve server name: '%.*s'\n", session, len, p);
|
||||
+ /* fix ipv6 format server name invaild problem */
|
||||
+ if (!_gnutls_dnsname_is_valid((char*)p, len) && !_gnutls_ipv6_is_valid((char*)p, len)) {
|
||||
_gnutls_handshake_log
|
||||
("HSK[%p]: Server name is not acceptable: '%.*s'\n",
|
||||
session, (int) len, p);
|
||||
diff --git a/lib/str.h b/lib/str.h
|
||||
index 9f0e7d6..e0bca4b 100644
|
||||
--- a/lib/str.h
|
||||
+++ b/lib/str.h
|
||||
@@ -60,6 +60,16 @@ inline static unsigned _gnutls_str_is_print(const char *str, unsigned size)
|
||||
return 1;
|
||||
}
|
||||
|
||||
+inline static unsigned _gnutls_ipv6_is_valid(const char *str, unsigned size)
|
||||
+{
|
||||
+ unsigned i;
|
||||
+ for (i=0;i<size;i++) {
|
||||
+ if (!(c_isalnum(str[i]) || str[i] == ':' || str[i] == '%' || str[i] == '.'))
|
||||
+ return 0;
|
||||
+ }
|
||||
+ return 1;
|
||||
+}
|
||||
+
|
||||
inline static unsigned _gnutls_dnsname_is_valid(const char *str, unsigned size)
|
||||
{
|
||||
unsigned i;
|
||||
--
|
||||
2.19.1
|
||||
|
||||
12
gnutls-3.2.7-rpath.patch
Normal file
12
gnutls-3.2.7-rpath.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -ur gnutls-3.2.7.orig/configure gnutls-3.2.7/configure
|
||||
--- gnutls-3.2.7.orig/configure 2013-11-23 11:09:49.000000000 +0100
|
||||
+++ gnutls-3.2.7/configure 2013-11-25 16:53:05.559440656 +0100
|
||||
@@ -39652,7 +39652,7 @@
|
||||
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
|
||||
|
||||
11
gnutls-3.6.7-no-now-guile.patch
Normal file
11
gnutls-3.6.7-no-now-guile.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- a/guile/src/Makefile.in 2019-03-27 11:51:55.984398001 +0100
|
||||
+++ b/guile/src/Makefile.in 2019-03-27 11:52:27.259626076 +0100
|
||||
@@ -1472,7 +1472,7 @@
|
||||
# Use '-module' to build a "dlopenable module", in Libtool terms.
|
||||
# Use '-undefined' to placate Libtool on Windows; see
|
||||
# <https://lists.gnutls.org/pipermail/gnutls-devel/2014-December/007294.html>.
|
||||
-guile_gnutls_v_2_la_LDFLAGS = -module -no-undefined
|
||||
+guile_gnutls_v_2_la_LDFLAGS = -module -no-undefined -Wl,-z,lazy
|
||||
|
||||
# Linking against GnuTLS.
|
||||
GNUTLS_CORE_LIBS = $(top_builddir)/lib/libgnutls.la
|
||||
BIN
gnutls-3.6.9.tar.xz
Normal file
BIN
gnutls-3.6.9.tar.xz
Normal file
Binary file not shown.
BIN
gnutls-3.6.9.tar.xz.sig
Normal file
BIN
gnutls-3.6.9.tar.xz.sig
Normal file
Binary file not shown.
206
gnutls.spec
Normal file
206
gnutls.spec
Normal file
@ -0,0 +1,206 @@
|
||||
Name: gnutls
|
||||
Version: 3.6.9
|
||||
Release: 2
|
||||
Summary: The GNU Secure Communication Protocol Library
|
||||
|
||||
License: LGPLv2.1+ and GPLv3+
|
||||
URL: https://www.gnutls.org/
|
||||
Source0: https://www.gnupg.org/ftp/gcrypt/%{name}/v3.6/%{name}-%{version}.tar.xz
|
||||
Source1: https://www.gnupg.org/ftp/gcrypt/%{name}/v3.6/%{name}-%{version}.tar.xz.sig
|
||||
Patch1: gnutls-3.2.7-rpath.patch
|
||||
Patch2: gnutls-3.6.7-no-now-guile.patch
|
||||
Patch9000: fix-ipv6-handshake-failed.patch
|
||||
|
||||
%bcond_without dane
|
||||
%bcond_with guile
|
||||
%bcond_without fips
|
||||
|
||||
BuildRequires: p11-kit-devel, gettext-devel, zlib-devel, readline-devel
|
||||
BuildRequires: libtasn1-devel, libtool, automake, autoconf, texinfo
|
||||
BuildRequires: autogen-libopts-devel, autogen, gperf, gnupg2, gcc, gcc-c++
|
||||
BuildRequires: nettle-devel, trousers-devel, libidn2-devel
|
||||
BuildRequires: libunistring-devel, net-tools, softhsm
|
||||
BuildRequires: datefudge, p11-kit-trust, ca-certificates
|
||||
%if %{with fips}
|
||||
BuildRequires: fipscheck
|
||||
%endif
|
||||
%if %{with dane}
|
||||
BuildRequires: unbound-devel unbound-libs
|
||||
%endif
|
||||
%if %{with guile}
|
||||
BuildRequires: guile22-devel
|
||||
%endif
|
||||
|
||||
Requires: crypto-policies, p11-kit-trust, libtasn1, nettle
|
||||
Recommends: trousers >= 0.3.11.2
|
||||
|
||||
Provides: bundled(gnulib) = 20130424
|
||||
Provides: gnutls-utils gnutls-c++ gnutls-dane
|
||||
Obsoletes:gnutls-utils gnutls-c++ gnutls-dane
|
||||
|
||||
%description
|
||||
GnuTLS is a secure communications library implementing the SSL, TLS and DTLS
|
||||
protocols and technologies around them. It provides a simple C language
|
||||
application programming interface (API) to access the secure communications
|
||||
protocols as well as APIs to parse and write X.509, PKCS #12, and other
|
||||
required structures.
|
||||
The project strives to provide a secure communications back-end, simple to use
|
||||
and integrated with the rest of the base Linux libraries. A back-end designed
|
||||
to work and be secure out of the box, keeping the complexity of TLS and PKI out
|
||||
of application code.
|
||||
|
||||
%package devel
|
||||
Summary: Development files for %{name}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: pkgconf
|
||||
|
||||
%description devel
|
||||
This package contains files needed for developing applications with %{name}.
|
||||
|
||||
%package_help
|
||||
|
||||
%if %{with guile}
|
||||
%package guile
|
||||
Summary: Guile bindings for the GNUTLS library
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: guile
|
||||
|
||||
%description guile
|
||||
This package contains Guile bindings for the library.
|
||||
%endif
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup -n %{name}-%{version} -p1
|
||||
autoreconf
|
||||
|
||||
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
|
||||
|
||||
# Note that we explicitly enable SHA1, as SHA1 deprecation is handled
|
||||
# via the crypto policies
|
||||
|
||||
%build
|
||||
CCASFLAGS="$CCASFLAGS -Wa,--generate-missing-build-notes=yes"
|
||||
export CCASFLAGS
|
||||
|
||||
# These should be checked by m4/guile.m4 instead of configure.ac
|
||||
# taking into account of _guile_suffix
|
||||
guile_snarf=%{_bindir}/guile-snarf2.2
|
||||
export guile_snarf
|
||||
GUILD=%{_bindir}/guild2.2
|
||||
export GUILD
|
||||
|
||||
%configure --with-libtasn1-prefix=%{_prefix} \
|
||||
%if %{with fips}
|
||||
--enable-fips140-mode \
|
||||
%endif
|
||||
--enable-sha1-support \
|
||||
--disable-static \
|
||||
--disable-openssl-compatibility \
|
||||
--disable-non-suiteb-curves \
|
||||
--with-system-priority-file=%{_sysconfdir}/crypto-policies/back-ends/gnutls.config \
|
||||
--with-default-trust-store-pkcs11="pkcs11:" \
|
||||
--with-trousers-lib=%{_libdir}/libtspi.so.1 \
|
||||
--htmldir=%{_docdir}/manual \
|
||||
%if %{with guile}
|
||||
--enable-guile \
|
||||
--with-guile-extension-dir=%{_libdir}/guile/2.2 \
|
||||
%else
|
||||
--disable-guile \
|
||||
%endif
|
||||
%if %{with dane}
|
||||
--with-unbound-root-key-file=/var/lib/unbound/root.key \
|
||||
--enable-dane \
|
||||
%else
|
||||
--disable-dane \
|
||||
%endif
|
||||
--disable-rpath \
|
||||
--with-default-priority-string="@SYSTEM"
|
||||
|
||||
make %{?_smp_mflags} V=1
|
||||
|
||||
%if %{with fips}
|
||||
%define __spec_install_post \
|
||||
%{?__debug_package:%{__debug_install_post}} \
|
||||
%{__arch_install_post} \
|
||||
%{__os_install_post} \
|
||||
fipshmac -d $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_libdir}/libgnutls.so.30.*.* \
|
||||
file=`basename $RPM_BUILD_ROOT%{_libdir}/libgnutls.so.30.*.hmac` && mv $RPM_BUILD_ROOT%{_libdir}/$file $RPM_BUILD_ROOT%{_libdir}/.$file && ln -s .$file $RPM_BUILD_ROOT%{_libdir}/.libgnutls.so.30.hmac \
|
||||
%{nil}
|
||||
%endif
|
||||
|
||||
%install
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
make -C doc install-html DESTDIR=$RPM_BUILD_ROOT
|
||||
|
||||
%delete_la_and_a
|
||||
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/gnutls/libpkcs11mock1.*
|
||||
%if %{without dane}
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gnutls-dane.pc
|
||||
%endif
|
||||
|
||||
%find_lang gnutls
|
||||
|
||||
%check
|
||||
make check %{?_smp_mflags}
|
||||
|
||||
%files -f gnutls.lang
|
||||
%defattr(-,root,root)
|
||||
%doc README.md AUTHORS
|
||||
%license LICENSE doc/COPYING doc/COPYING.LESSER
|
||||
%{_bindir}/certtool
|
||||
%{_bindir}/tpmtool
|
||||
%{_bindir}/ocsptool
|
||||
%{_bindir}/psktool
|
||||
%{_bindir}/p11tool
|
||||
%{_bindir}/srptool
|
||||
%{_bindir}/gnutls*
|
||||
%if %{with dane}
|
||||
%{_bindir}/danetool
|
||||
%{_libdir}/libgnutls-dane.so.*
|
||||
%endif
|
||||
%{_libdir}/libgnutls.so.30*
|
||||
%{_libdir}/libgnutlsxx.so.*
|
||||
%if %{with fips}
|
||||
%{_libdir}/.libgnutls.so.30*.hmac
|
||||
%endif
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/pkgconfig/*.pc
|
||||
%{_libdir}/libgnutls*.so
|
||||
%if %{with fips}
|
||||
%{_libdir}/.libgnutls.so.*.hmac
|
||||
%endif
|
||||
%{_includedir}/*
|
||||
|
||||
%files help
|
||||
%defattr(-,root,root)
|
||||
%doc NEWS THANKS doc/certtool.cfg
|
||||
%{_mandir}/man1/*
|
||||
%{_mandir}/man3/*
|
||||
%{_infodir}/gnutls*
|
||||
%{_infodir}/pkcs11-vision*
|
||||
%{_docdir}/manual/*
|
||||
|
||||
%if %{with guile}
|
||||
%files guile
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/guile/2.2/guile-gnutls*.so*
|
||||
%{_libdir}/guile/2.2/site-ccache/gnutls.go
|
||||
%{_libdir}/guile/2.2/site-ccache/gnutls/extra.go
|
||||
%{_datadir}/guile/site/2.2/gnutls.scm
|
||||
%{_datadir}/guile/site/2.2/gnutls/extra.scm
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Sep 24 2019 openEuler Buildteam <buildteam@openeuler.org> - 3.6.9-2
|
||||
- Require adjust
|
||||
|
||||
* Wed Sep 11 2019 openEuler Buildteam <buildteam@openeuler.org> - 3.6.9-1
|
||||
- Package init
|
||||
Loading…
x
Reference in New Issue
Block a user