[Bug 1959101] Re: sync/merge krb5

[Andreas Hasenack]

This can indeed be a sync, the only change wrt ubuntu is the openssl3
patch was renamed:

--- krb5-1.19.2-ubuntu/debian/patches/series	2021-11-30 06:54:14.000000000 -0300
+++ krb5-1.19.2-debian/debian/patches/series	2021-10-27 17:04:42.000000000 -0300
@@ -8,4 +8,4 @@
 debian-local/0008-Use-isystem-for-include-paths.patch
 0009-Add-.gitignore.patch
 0011-Fix-KDC-null-deref-on-TGS-inner-body-null-server.patch
-0012-Fix-softpkcs11-build-issues-with-openssl-3.0.patch
+0011-Fix-softpkcs11-build-issues-with-openssl-3.0.patch

Contents are "the same":
$ diff -u krb5-1.19.2-ubuntu/debian/patches/0012-Fix-softpkcs11-build-issues-with-openssl-3.0.patch krb5-1.19.2-debian/debian/patches/0011-Fix-softpkcs11-build-issues-with-openssl-3.0.patch
--- krb5-1.19.2-ubuntu/debian/patches/0012-Fix-softpkcs11-build-issues-with-openssl-3.0.patch	2021-11-30 06:54:17.000000000 -0300
+++ krb5-1.19.2-debian/debian/patches/0011-Fix-softpkcs11-build-issues-with-openssl-3.0.patch	2021-10-27 17:04:42.000000000 -0300
@@ -1,7 +1,6 @@
-From 7c1bf1c800ef9837179d78fab95a2103623558db Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood at redhat.com>
 Date: Sat, 15 May 2021 17:35:25 -0400
-Subject: [PATCH] Fix softpkcs11 build issues with openssl 3.0
+Subject: Fix softpkcs11 build issues with openssl 3.0
 
 EVP_PKEY_get0_RSA() has been modified to have const return type.  Remove
 its usages in favor of the EVP_PKEY interface.  Also remove calls to
@@ -15,12 +14,14 @@
 Move several argument validation checks to the top of their functions.
 
 Fix some incorrect/inconsistent log messages.
+
+(cherry picked from commit 00de1aad7b3647b91017c7009b0bc65cd0c8b2e0)
 ---
- src/tests/softpkcs11/main.c | 290 +++++++++++++-----------------------
+ src/tests/softpkcs11/main.c | 290 ++++++++++++++++----------------------------
  1 file changed, 106 insertions(+), 184 deletions(-)
 
 diff --git a/src/tests/softpkcs11/main.c b/src/tests/softpkcs11/main.c
-index 1cccdfb43..caa537b68 100644
+index 1cccdfb..caa537b 100644
 --- a/src/tests/softpkcs11/main.c
 +++ b/src/tests/softpkcs11/main.c
 @@ -375,10 +375,9 @@ add_st_object(void)
@@ -522,6 +523,3 @@
  CK_FUNCTION_LIST funcs = {
      { 2, 11 },
      C_Initialize,
--- 
-2.32.0
-


** Changed in: krb5 (Ubuntu)
       Status: New => In Progress

-- 
You received this bug notification because you are a member of Ubuntu
Foundations Bugs, which is subscribed to krb5 in Ubuntu.
https://bugs.launchpad.net/bugs/1959101

Title:
  sync/merge krb5

Status in krb5 package in Ubuntu:
  In Progress

Bug description:
  We went ahead of debian because of openssl3:
  krb5 (1.19.2-0ubuntu1) jammy; urgency=medium

    [ Sam Hartman ]
    * New Upstream version
    * Depend on tex-gyre, Closes: #997407

    [Simon Chopin]
    * d/p/0012-Fix-softpkcs11-build-issues-with-openssl-3.0.patch:
      Cherry-picked from upstream master to fix OpenSSL3 build.
      Closes: #995152, LP: #1945795

   -- Simon Chopin <simon.chopin at canonical.com>  Tue, 30 Nov 2021
  10:54:17 +0100

  Debian unstable still has 1.18.3-7, but experimental got 1.19.2-1:
  krb5 (1.19.2-1) experimental; urgency=medium

    * New Upstream version
    * Include patch to work with OpenSSL 3.0, Closes: #995152
    * Depend on tex-gyre, Closes: #997407
      
   -- Sam Hartman <hartmans at debian.org>  Wed, 27 Oct 2021 14:04:42 -0600

  Since we are already at 1.19.2, we might as well merge/sync with
  experimental.

To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/krb5/+bug/1959101/+subscriptions