From patchwork Mon May 25 11:30:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 3131 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 "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 49Vvz00clRz43x9 for ; Mon, 25 May 2020 11:30:20 +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 "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 49Vvyx1BLkz1fp; Mon, 25 May 2020 11:30:17 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 49Vvyw4zkLz2yX5; Mon, 25 May 2020 11:30:16 +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 "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 49Vvys4sggz2xFj for ; Mon, 25 May 2020 11:30:13 +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) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 49Vvyr5DSnzWr for ; Mon, 25 May 2020 11:30:12 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1590406212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=Cn2OdrGDkvsog9wFriEO7tvHqR+Wo3dUO39DyRrjHEA=; b=J1BIccxtZsLTS8WQ+fIp9/mqxrQTd5ZTH50ugqcmzR3jHwaxD+0/OZzuZ7LG2P2e5DanGM ysIUlEEBpYFG+qAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1590406212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=Cn2OdrGDkvsog9wFriEO7tvHqR+Wo3dUO39DyRrjHEA=; b=N7hCXOgtx/OMxLtZIIVoEVm7gERt7H2hO181+vWk1lTd3tAIpLHYa7ltOT160o7lI6B9Q6 5TO8zmcHGjI+M6o4vVvaAVzAxEQi0HSWB5OH8rzt7nq1RLudyL0qveCbjAPO14XUEdjfeM U5CwQ0LE/2B9yibyEnCO4Z2oAwS1YWPhq6n1JOskRndHrFV9zN3ayRcyyjyd2xe9ytUxaO Dh+zoF0ZyRxnlOYLD8iU6aTXVx2D3qzB3DUxFSV3lLwh1vqYnipuOI6/dYTp4LAWLMwh6u wRtkLUpigYbIGDH56iHftkfmUM4v2fsMjpXOJL7lDLieeCG01sM2Do44ELG3oA== From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH 1/2] krb5: Update to 1.18.2 Date: Mon, 25 May 2020 13:30:06 +0200 Message-Id: <20200525113007.4822-1-matthias.fischer@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.mailfrom=matthias.fischer@ipfire.org 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" For details see: https://web.mit.edu/kerberos/krb5-1.18/krb5-1.18.2.html Signed-off-by: Matthias Fischer Reviewed-by: Michael Tremer --- config/rootfiles/packages/krb5 | 20 ++++++++++++++------ lfs/krb5 | 13 ++++--------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/config/rootfiles/packages/krb5 b/config/rootfiles/packages/krb5 index 0db708f4e..1d044f19a 100644 --- a/config/rootfiles/packages/krb5 +++ b/config/rootfiles/packages/krb5 @@ -16,6 +16,7 @@ usr/bin/kpasswd #usr/include/gssapi #usr/include/gssapi.h #usr/include/gssapi/gssapi.h +#usr/include/gssapi/gssapi_alloc.h #usr/include/gssapi/gssapi_ext.h #usr/include/gssapi/gssapi_generic.h #usr/include/gssapi/gssapi_krb5.h @@ -46,9 +47,12 @@ usr/bin/kpasswd #usr/include/krb5 #usr/include/krb5.h #usr/include/krb5/ccselect_plugin.h +#usr/include/krb5/certauth_plugin.h #usr/include/krb5/clpreauth_plugin.h #usr/include/krb5/hostrealm_plugin.h +#usr/include/krb5/kadm5_auth_plugin.h #usr/include/krb5/kadm5_hook_plugin.h +#usr/include/krb5/kdcpolicy_plugin.h #usr/include/krb5/kdcpreauth_plugin.h #usr/include/krb5/krb5.h #usr/include/krb5/localauth_plugin.h @@ -68,6 +72,7 @@ usr/lib/krb5/plugins/libkrb5 usr/lib/krb5/plugins/preauth usr/lib/krb5/plugins/preauth/otp.so usr/lib/krb5/plugins/preauth/pkinit.so +usr/lib/krb5/plugins/preauth/spake.so usr/lib/krb5/plugins/preauth/test.so usr/lib/krb5/plugins/tls usr/lib/krb5/plugins/tls/k5tls.so @@ -82,15 +87,15 @@ usr/lib/libk5crypto.so.3 usr/lib/libk5crypto.so.3.1 #usr/lib/libkadm5clnt.so #usr/lib/libkadm5clnt_mit.so -usr/lib/libkadm5clnt_mit.so.11 -usr/lib/libkadm5clnt_mit.so.11.0 +usr/lib/libkadm5clnt_mit.so.12 +usr/lib/libkadm5clnt_mit.so.12.0 #usr/lib/libkadm5srv.so #usr/lib/libkadm5srv_mit.so -usr/lib/libkadm5srv_mit.so.11 -usr/lib/libkadm5srv_mit.so.11.0 +usr/lib/libkadm5srv_mit.so.12 +usr/lib/libkadm5srv_mit.so.12.0 #usr/lib/libkdb5.so -usr/lib/libkdb5.so.8 -usr/lib/libkdb5.so.8.0 +usr/lib/libkdb5.so.10 +usr/lib/libkdb5.so.10.0 #usr/lib/libkrad.so usr/lib/libkrad.so.0 usr/lib/libkrad.so.0.0 @@ -128,11 +133,13 @@ usr/lib/libverto.so.0.0 #usr/share/examples/krb5/kdc.conf #usr/share/examples/krb5/krb5.conf #usr/share/examples/krb5/services.append +#usr/share/locale/de/LC_MESSAGES/mit-krb5.mo #usr/share/locale/en_US #usr/share/locale/en_US/LC_MESSAGES #usr/share/locale/en_US/LC_MESSAGES/mit-krb5.mo #usr/share/man/cat1 #usr/share/man/cat5 +#usr/share/man/cat7 #usr/share/man/cat8 #usr/share/man/man1/k5srvutil.1 #usr/share/man/man1/kadmin.1 @@ -153,6 +160,7 @@ usr/lib/libverto.so.0.0 #usr/share/man/man5/kadm5.acl.5 #usr/share/man/man5/kdc.conf.5 #usr/share/man/man5/krb5.conf.5 +#usr/share/man/man7/kerberos.7 #usr/share/man/man8/kadmin.local.8 #usr/share/man/man8/kadmind.8 #usr/share/man/man8/kdb5_ldap_util.8 diff --git a/lfs/krb5 b/lfs/krb5 index 4ab342c01..ea81961fe 100644 --- a/lfs/krb5 +++ b/lfs/krb5 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # +# Copyright (C) 2007-2020 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 # @@ -24,7 +24,7 @@ include Config -VER = 1.15.2 +VER = 1.18.2 THISAPP = krb5-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP)/src TARGET = $(DIR_INFO)/$(THISAPP) PROG = krb5 -PAK_VER = 3 +PAK_VER = 4 DEPS = @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b160f72161c730897dc7689f876b6e2a +$(DL_FILE)_MD5 = fd9087eaa43589a2480c2e22da91a17e install : $(TARGET) @@ -78,11 +78,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_SRC)/$(THISAPP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && sed -e "s@python2.5/Python.h@& python2.7/Python.h@g" \ - -e "s@-lpython2.5]@&,\n AC_CHECK_LIB(python2.7,main,[PYTHON_LIB=-lpython2.7])@g" \ - -i configure.in - cd $(DIR_APP) && autoconf - cd $(DIR_APP) && ./configure \ --prefix=/usr \ --sysconfdir=/etc \