From patchwork Thu Jul 14 10:27:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 5749 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Lk9gB5V2zz3wjd for ; Thu, 14 Jul 2022 10:28:06 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Lk9g95CZzzxx; Thu, 14 Jul 2022 10:28:05 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Lk9g9412bz2y0s; Thu, 14 Jul 2022 10:28:05 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Lk9g83FQzz2xPW for ; Thu, 14 Jul 2022 10:28:04 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Lk9g71xtzzkB for ; Thu, 14 Jul 2022 10:28:02 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1657794484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FGjjIOmmjv63b1kAMcG3za9vD7pMyBc6nnhp88lkH74=; b=5vcBTXiwj2IMo2swWOlsZe3koIl8BhjWtjqIKYS0zHhBr54JYZtUIvi61iuEXz8fA/Pr8a syp1LppOYJxumiAg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1657794484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FGjjIOmmjv63b1kAMcG3za9vD7pMyBc6nnhp88lkH74=; b=All6QDdXE66roKT9AFZrXvIZuaUELm4M5JYlQowN2RAWi25Ivar0gs2hJCmO3PXRJzHX5o SjzQSnCGrQKrKjuxx8fZSoLBMPZzc+QlHFYtU/c6lyh0DxGHos5cr5Wpb7FyKGaXWhqKq3 ytgFAU5DRBLMGbwnxKsCP8ScNNGbTH/76ixePWTeVSd8AUJ/MAJPSfQMvPp3gsD4gqw3qT KUf4Kcc9YeaaQe7B1Z+Pf6ggeqpByIdIIR6btDO1fQ7MVkZVy0JqDkECLQ88AIhYX7Ln8O xQ1M10qcNAQUXsOYbwnNXhPNJcGy/tZ+zW7iTud9k+fZbodI/dMnPQz0KfGtPg== Message-ID: <8d57c978-3758-1cf3-019a-50b156f38ea5@ipfire.org> Date: Thu, 14 Jul 2022 10:27:59 +0000 MIME-Version: 1.0 Content-Language: en-US To: "IPFire: Development" From: =?utf-8?q?Peter_M=C3=BCller?= Subject: [PATCH] krb5: Update to 1.20 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Please refer to https://web.mit.edu/kerberos/krb5-1.20/ for the release notes of this version. No rootfile changes were necessary. Signed-off-by: Peter Müller --- lfs/krb5 | 9 +++------ .../krb5-1.18.3_prevent_spurious_text.patch | 18 ------------------ 2 files changed, 3 insertions(+), 24 deletions(-) delete mode 100644 src/patches/krb5-1.18.3_prevent_spurious_text.patch diff --git a/lfs/krb5 b/lfs/krb5 index e08948005..ce7d52d11 100644 --- a/lfs/krb5 +++ b/lfs/krb5 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 IPFire Team # +# Copyright (C) 2007-2022 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -26,7 +26,7 @@ include Config SUMMARY = Kerberos -VER = 1.19.2 +VER = 1.20 THISAPP = krb5-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 963722721201e75381c91a2af6e982f569a5b1602beb2d1ded83d35f6f914235a6ed91e5d54f56c97e94921a32ed27c49aded258327966ee13d39485208c38d8 +$(DL_FILE)_BLAKE2 = fdaaab6c16dbe073c4308f312e321536b582b75fad10e5450be66b6b828825c8c775e56f5287d4a7df819d20889e5c0d9cc1d179d861c9caba185332c0db7387 install : $(TARGET) @@ -77,10 +77,7 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_SRC)/$(THISAPP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - - cd $(DIR_APP) && patch -Np2 -i $(DIR_SRC)/src/patches/krb5-1.18.3_prevent_spurious_text.patch cd $(DIR_APP) && patch -Np2 -i $(DIR_SRC)/src/patches/krb5-1.18.3_remove_known_failed_test.patch - cd $(DIR_APP) && ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/src/patches/krb5-1.18.3_prevent_spurious_text.patch b/src/patches/krb5-1.18.3_prevent_spurious_text.patch deleted file mode 100644 index 0e3015379..000000000 --- a/src/patches/krb5-1.18.3_prevent_spurious_text.patch +++ /dev/null @@ -1,18 +0,0 @@ -Submitted By: linuxfromscratch DOT org -Date: 2020-11-19 -Initial Package Version: 1.18.3 -Origin: http://www.linuxfromscratch.org/blfs/view/svn/postlfs/mitkrb.html -Description: Patch increases the width of the virtual terminal used for some tests to prevent some spurious text in the output which is taken as a failure. - -diff --color -Nur krb5-1.18.3.orig/src/tests/dejagnu/config/default.exp krb5-1.18.3/src/tests/dejagnu/config/default.exp ---- krb5-1.18.3.orig/src/tests/dejagnu/config/default.exp 2020-12-07 04:51:12.997708618 +0100 -+++ krb5-1.18.3/src/tests/dejagnu/config/default.exp 2020-12-07 04:56:29.805839425 +0100 -@@ -12,7 +12,7 @@ - # realm name, defaulting to KRBTEST.COM. - - set timeout 100 --set stty_init {erase \^h kill \^u} -+set stty_init {erase \^h kill \^u cols 300} - set env(TERM) dumb - - set des3_krbtgt 0