[1/2] krb5: Update to 1.18.2

Message ID 20200525113007.4822-1-matthias.fischer@ipfire.org
State New
Headers show
Series
  • [1/2] krb5: Update to 1.18.2
Related show

Commit Message

Matthias Fischer May 25, 2020, 11:30 a.m. UTC
For details see:
https://web.mit.edu/kerberos/krb5-1.18/krb5-1.18.2.html

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
---
 config/rootfiles/packages/krb5 | 20 ++++++++++++++------
 lfs/krb5                       | 13 ++++---------
 2 files changed, 18 insertions(+), 15 deletions(-)

Comments

Michael Tremer May 26, 2020, 10:10 a.m. UTC | #1
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>

This package bumps the library. So everything that is linked against it needs to be shipped again, too.

Did you check which packages those are?

-Michael

> On 25 May 2020, at 12:30, Matthias Fischer <matthias.fischer@ipfire.org> wrote:
> 
> For details see:
> https://web.mit.edu/kerberos/krb5-1.18/krb5-1.18.2.html
> 
> Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
> ---
> 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  <info@ipfire.org>                     #
> +# Copyright (C) 2007-2020  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        #
> @@ -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 \
> -- 
> 2.18.0
>

Patch

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  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  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        #
@@ -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 \