Signed-off-by: Marcel Lorenz marcel.lorenz@ipfire.org --- config/rootfiles/packages/krb5 | 20 +++++++++++--------- lfs/krb5 | 15 +++++---------- 2 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/config/rootfiles/packages/krb5 b/config/rootfiles/packages/krb5 index e1e7d64..59f94df 100644 --- a/config/rootfiles/packages/krb5 +++ b/config/rootfiles/packages/krb5 @@ -68,6 +68,9 @@ 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/test.so +#usr/lib/krb5/plugins/tls +usr/lib/krb5/plugins/tls/k5tls.so #usr/lib/libgssapi_krb5.so usr/lib/libgssapi_krb5.so.2 usr/lib/libgssapi_krb5.so.2.2 @@ -79,15 +82,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.9 -usr/lib/libkadm5clnt_mit.so.9.0 +usr/lib/libkadm5clnt_mit.so.10 +usr/lib/libkadm5clnt_mit.so.10.0 #usr/lib/libkadm5srv.so #usr/lib/libkadm5srv_mit.so -usr/lib/libkadm5srv_mit.so.9 -usr/lib/libkadm5srv_mit.so.9.0 +usr/lib/libkadm5srv_mit.so.10 +usr/lib/libkadm5srv_mit.so.10.0 #usr/lib/libkdb5.so -usr/lib/libkdb5.so.7 -usr/lib/libkdb5.so.7.0 +usr/lib/libkdb5.so.8 +usr/lib/libkdb5.so.8.0 #usr/lib/libkrad.so usr/lib/libkrad.so.0 usr/lib/libkrad.so.0.0 @@ -125,8 +128,6 @@ 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/gnats -#usr/share/gnats/mit #usr/share/locale/en_US #usr/share/locale/en_US/LC_MESSAGES #usr/share/locale/en_US/LC_MESSAGES/mit-krb5.mo @@ -140,7 +141,6 @@ usr/lib/libverto.so.0.0 #usr/share/man/man1/klist.1 #usr/share/man/man1/kpasswd.1 #usr/share/man/man1/krb5-config.1 -#usr/share/man/man1/krb5-send-pr.1 #usr/share/man/man1/ksu.1 #usr/share/man/man1/kswitch.1 #usr/share/man/man1/ktutil.1 @@ -163,3 +163,5 @@ usr/lib/libverto.so.0.0 #usr/share/man/man8/krb5kdc.8 #usr/share/man/man8/sserver.8 var/lib/krb5kdc +#var/lib/run +var/lib/run/krb5kdc diff --git a/lfs/krb5 b/lfs/krb5 index 3011982..7cfdb14 100644 --- a/lfs/krb5 +++ b/lfs/krb5 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2016 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.12.1 +VER = 1.14.3
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 = 1 +PAK_VER = 2
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 4a631b3474d3e44773f1ecda96f04400 +$(DL_FILE)_MD5 = f76e4f8a3c95bb59980dd5ef4b48aea9
install : $(TARGET)
@@ -77,13 +77,10 @@ $(subst %,%_MD5,$(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 < $(DIR_SRC)/src/patches/mitkrb-1.12.1-db2_fix-1.patch - 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 \ @@ -91,15 +88,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --with-system-et \ --with-system-ss \ --enable-dns-for-realm \ + --with-system-verto=no \ CPPFLAGS="-I/usr/include/et" - cd $(DIR_APP) && make #$(MAKETUNING) cd $(DIR_APP) && make install - for LIB in gssapi_krb5 gssrpc k5crypto kadm5clnt kadm5srv \ kdb5 kdb_ldap krad krb5 krb5support verto; do \ chmod -f -v 755 "/usr/lib/lib$$LIB.so"; \ done - @rm -rf $(DIR_SRC)/$(THISAPP) @$(POSTBUILD)