#103 Update f38 to upstream release 3.8.2
Merged 7 months ago by ueno. Opened 7 months ago by ueno.
rpms/ ueno/gnutls 3.8.2-f38-update  into  f38

file modified
+2
@@ -146,3 +146,5 @@ 

  /gnutls-release-keyring.gpg

  /gnutls-3.8.1.tar.xz

  /gnutls-3.8.1.tar.xz.sig

+ /gnutls-3.8.2.tar.xz

+ /gnutls-3.8.2.tar.xz.sig

file modified
+1 -1
@@ -1,3 +1,3 @@ 

  This repository is maintained by packit.

  https://packit.dev/

- The file was generated using packit 0.78.0.

+ The file was generated using packit 0.85.0.

@@ -1,12 +1,25 @@ 

+ From 18c555b4d2461ad202996398609552b9c4ecd43b Mon Sep 17 00:00:00 2001

+ From: rpm-build <rpm-build>

+ Date: Wed, 22 Nov 2023 15:21:49 +0900

+ Subject: [PATCH] gnutls-3.7.8-ktls_skip_tls12_chachapoly_test.patch

+ 

+ Signed-off-by: rpm-build <rpm-build>

+ ---

+  tests/gnutls_ktls.c | 1 -

+  1 file changed, 1 deletion(-)

+ 

  diff --git a/tests/gnutls_ktls.c b/tests/gnutls_ktls.c

- index 919270778..778a2f94a 100644

+ index ccbe566..049c888 100644

  --- a/tests/gnutls_ktls.c

  +++ b/tests/gnutls_ktls.c

- @@ -351,7 +351,6 @@ void doit(void)

+ @@ -347,7 +347,6 @@ void doit(void)

+  {

   	run("NORMAL:-VERS-ALL:+VERS-TLS1.2:-CIPHER-ALL:+AES-128-GCM");

   	run("NORMAL:-VERS-ALL:+VERS-TLS1.2:-CIPHER-ALL:+AES-256-GCM");

-  	run("NORMAL:-VERS-ALL:+VERS-TLS1.2:-CIPHER-ALL:+AES-128-CCM");

  -	run("NORMAL:-VERS-ALL:+VERS-TLS1.2:-CIPHER-ALL:+CHACHA20-POLY1305");

   	run("NORMAL:-VERS-ALL:+VERS-TLS1.3:-CIPHER-ALL:+AES-128-GCM");

   	run("NORMAL:-VERS-ALL:+VERS-TLS1.3:-CIPHER-ALL:+AES-256-GCM");

-  	run("NORMAL:-VERS-ALL:+VERS-TLS1.3:-CIPHER-ALL:+AES-128-CCM");

+  	run("NORMAL:-VERS-ALL:+VERS-TLS1.3:-CIPHER-ALL:+CHACHA20-POLY1305");

+ -- 

+ 2.41.0

+ 

file modified
+18 -6
@@ -12,13 +12,10 @@ 

  print(string.sub(hash, 0, 16))

  }

  

- Version: 3.8.1

+ Version: 3.8.2

  Release: %{?autorelease}%{!?autorelease:1%{?dist}}

  Patch: gnutls-3.2.7-rpath.patch

  

- # Delete only after the kernel has been patched for thested systems

- Patch: gnutls-3.7.8-ktls_disable_keyupdate_test.patch

- 

  # follow https://gitlab.com/gnutls/gnutls/-/issues/1443

  Patch: gnutls-3.7.8-ktls_skip_tls12_chachapoly_test.patch

  
@@ -31,7 +28,7 @@ 

  %bcond_with certificate_compression

  %bcond_without tests

  

- %if 0%{?fedora} < 38

+ %if 0%{?fedora} && 0%{?fedora} < 38

  %bcond_without srp

  %else

  %bcond_with srp
@@ -373,7 +370,22 @@ 

  %check

  %if %{with tests}

  pushd native_build

- make check %{?_smp_mflags} GNUTLS_SYSTEM_PRIORITY_FILE=/dev/null

+ 

+ # KeyUpdate is not yet supported in the kernel.

+ xfail_tests=ktls_keyupdate.sh

+ 

+ # The ktls.sh test currently only supports kernel 5.11+.  This needs to

+ # be checked at run time, as the koji builder might be using a different

+ # version of kernel on the host than the one indicated by the

+ # kernel-devel package.

+ 

+ case "$(uname -r)" in

+   4.* | 5.[0-9].* | 5.10.* )

+     xfail_tests="$xfail_tests ktls.sh"

+     ;;

+ esac

+ 

+ make check %{?_smp_mflags} GNUTLS_SYSTEM_PRIORITY_FILE=/dev/null XFAIL_TESTS="$xfail_tests"

  popd

  %endif

  

file modified
+2 -2
@@ -1,3 +1,3 @@ 

- SHA512 (gnutls-3.8.1.tar.xz) = 22e78db86b835843df897d14ad633d8a553c0f9b1389daa0c2f864869c6b9ca889028d434f9552237dc4f1b37c978fbe0cce166e3768e5d4e8850ff69a6fc872

- SHA512 (gnutls-3.8.1.tar.xz.sig) = f03fde611927c83f6b57af695d5610ba3cefbb88a261cf5485c94b3fb32c7480a77c68a353a6a28185337195e30011d6b5578c53ea4180a656cf7b175156f7f1

+ SHA512 (gnutls-3.8.2.tar.xz) = b3aa6e0fa7272cfca0bb0d364fe5dc9ca70cfd41878631d57271ba0a597cf6020a55a19e97a2c02f13a253455b119d296cf6f701be2b4e6880ebeeb07c93ef38

+ SHA512 (gnutls-3.8.2.tar.xz.sig) = 9feb30bfccb8c83e83d3d6df009f2a61f4c48eb357c988789c93b2e5a06a34cb490f33741ad0fd4f881fcd34747b3cf9c5aa45bbb15da680ebba35e07ba602f6

  SHA512 (gnutls-release-keyring.gpg) = 5c14d83f4f37bd319c652db0d76fc5bb04752fb461bbe853e25b20ffe41d6d14faae6c0bdd0193ac6242975bf1205ce606a9d0082261cc4581fd680abfcdbd4d

Upstream tag: 3.8.2
Upstream commit: e840a07f

rebased onto 2c603ad

7 months ago

Pull-Request has been merged by ueno

7 months ago