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 peter.mueller@ipfire.org --- 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 info@ipfire.org # +# Copyright (C) 2007-2022 IPFire Team info@ipfire.org # # # # 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