From 20acefbf8258b39228e46bbf0b03904cedf58738 Mon Sep 17 00:00:00 2001 From: duyiwei Date: Wed, 28 Feb 2024 08:05:54 +0000 Subject: [PATCH 1/2] detach the sub package gnutls-utils and gnutls-dane from gnutls Signed-off-by: duyiwei --- gnutls.spec | 68 +++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 56 insertions(+), 12 deletions(-) diff --git a/gnutls.spec b/gnutls.spec index 99bca99..86a221e 100644 --- a/gnutls.spec +++ b/gnutls.spec @@ -1,6 +1,6 @@ Name: gnutls Version: 3.8.2 -Release: 1 +Release: 2 Summary: The GNU Secure Communication Protocol Library License: LGPLv2.1+ and GPLv3+ @@ -36,12 +36,8 @@ Requires: crypto-policies, p11-kit-trust, libtasn1, nettle Recommends: trousers >= 0.3.11.2 Provides: bundled(gnulib) = 20130424 -Provides: gnutls-utils = %{version}-%{release} Provides: gnutls-c++ = %{version}-%{release} -Provides: gnutls-dane = %{version}-%{release} -Obsoletes: gnutls-utils < %{version}-%{release} -Obsoletes: gnutls-c++ < %{version}-%{release} -Obsoletes: gnutls-dane < %{version}-%{release} +Obsoletes: gnutls-c++ < %{version}-%{release} %description GnuTLS is a secure communications library implementing the SSL, TLS and DTLS @@ -57,11 +53,47 @@ of application code. %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} +%if %{with dane} +Requires: %{name}-dane%{?_isa} = %{version}-%{release} +%endif Requires: pkgconf %description devel This package contains files needed for developing applications with %{name}. +%package utils +License: GPL-3.0-or-later +Summary: Command line tools for TLS protocol +Requires: %{name}%{?_isa} = %{version}-%{release} +%if %{with dane} +Requires: %{name}-dane%{?_isa} = %{version}-%{release} +%endif + +%description utils +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, OpenPGP and +other required structures. +This package contains command line TLS client and server and certificate +manipulation tools. + +%if %{with dane} +%package dane +Summary: A DANE protocol implementation for GnuTLS +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description dane +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, OpenPGP and +other required structures. +This package contains library that implements the DANE protocol for verifying +TLS certificates through DNSSEC. + +%endif + %package_help %if %{with guile} @@ -158,22 +190,31 @@ make check %{?_smp_mflags} %defattr(-,root,root) %doc README.md AUTHORS %license LICENSE doc/COPYING doc/COPYING.LESSER +%{_libdir}/libgnutls.so.30* +%{_libdir}/libgnutlsxx.so.* +%if %{with fips} +%{_libdir}/.libgnutls.so.*.hmac +%endif + +%files utils %{_bindir}/certtool %{_bindir}/tpmtool %{_bindir}/ocsptool %{_bindir}/psktool %{_bindir}/p11tool -%{_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.*.hmac +%{_bindir}/gnutls* +%{_mandir}/man1/* +%doc doc/certtool.cfg + +%if %{with dane} +%files dane +%{_libdir}/libgnutls-dane.so.* %endif + %files devel %defattr(-,root,root) %{_libdir}/pkgconfig/*.pc @@ -200,6 +241,9 @@ make check %{?_smp_mflags} %endif %changelog +* Wed Feb 28 2024 duyiwei - 3.8.2-2 +- detach the sub package gnutls-utils and gnutls-dane from gnutls + * Mon Jan 29 2024 xuraoqing - 3.8.2-1 - update to 3.8.2 - some API and ABI modifications, see NEWS for details -- Gitee From 1419d36c9c75eb8546cc1a7938699b71767da2b1 Mon Sep 17 00:00:00 2001 From: wangyaoyong Date: Tue, 26 Mar 2024 19:19:21 +0800 Subject: [PATCH 2/2] support change CC to compile with clang Signed-off-by: wangyaoyong --- gnutls.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnutls.spec b/gnutls.spec index 86a221e..5e58c2b 100644 --- a/gnutls.spec +++ b/gnutls.spec @@ -1,6 +1,6 @@ Name: gnutls Version: 3.8.2 -Release: 2 +Release: 3 Summary: The GNU Secure Communication Protocol Library License: LGPLv2.1+ and GPLv3+ @@ -121,8 +121,10 @@ echo "SYSTEM=NORMAL" >> tests/system.prio # via the crypto policies %build +%if "%toolchain" != "clang" CCASFLAGS="$CCASFLAGS -Wa,--generate-missing-build-notes=yes" export CCASFLAGS +%endif # These should be checked by m4/guile.m4 instead of configure.ac # taking into account of _guile_suffix @@ -241,6 +243,9 @@ make check %{?_smp_mflags} %endif %changelog +* Fri Mar 22 2024 wangyaoyong - 3.8.2-3 +- support change CC to compile with clang + * Wed Feb 28 2024 duyiwei - 3.8.2-2 - detach the sub package gnutls-utils and gnutls-dane from gnutls -- Gitee