[packages/krb5] - up to 1.16 - updated enospc,tests patches
qboosh
qboosh at pld-linux.org
Mon Apr 2 20:58:52 CEST 2018
commit 8f4c3a2dba6b495a538be8f2b86ddcebc0705c59
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Mon Apr 2 20:58:50 2018 +0200
- up to 1.16
- updated enospc,tests patches
krb5-enospc.patch | 25 ++++++++++++-----------
krb5-tests.patch | 60 +++++++++++++++++++------------------------------------
krb5.spec | 16 +++++++--------
3 files changed, 42 insertions(+), 59 deletions(-)
---
diff --git a/krb5.spec b/krb5.spec
index 88c8c7c..91b6f68 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -18,12 +18,12 @@
Summary: Kerberos V5 System
Summary(pl.UTF-8): System Kerberos V5
Name: krb5
-Version: 1.15.1
+Version: 1.16
Release: 0.1
License: MIT
Group: Networking
-Source0: http://web.mit.edu/kerberos/dist/krb5/1.15/%{name}-%{version}.tar.gz
-# Source0-md5: 8022f3a1cde8463e44fd35ef42731f85
+Source0: http://web.mit.edu/kerberos/dist/krb5/1.16/%{name}-%{version}.tar.gz
+# Source0-md5: 23c5e9f07642db4a67f7a5b6168b1319
Source2: %{name}kdc.init
Source4: kadm5.acl
Source5: kerberos.logrotate
@@ -475,8 +475,9 @@ echo '.so man1/kadmin.1' > $RPM_BUILD_ROOT%{_mandir}/man8/kadmin.local.8
# fix permissions for deps generation
find $RPM_BUILD_ROOT -type f -name '*.so*' | xargs chmod +x
-# the only translation is empty (as of 1.15)
-#find_lang mit-krb5
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/krb5/plugins/preauth/test.so
+
+%find_lang mit-krb5
%clean
rm -rf $RPM_BUILD_ROOT
@@ -692,8 +693,7 @@ fi
%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/krb5.keytab
%{_mandir}/man5/krb5.conf.5*
-%files libs
-# -f mit-krb5.lang
+%files libs -f mit-krb5.lang
%defattr(644,root,root,755)
%doc NOTICE README
%attr(755,root,root) %{_libdir}/libgssapi_krb5.so.*.*
@@ -707,7 +707,7 @@ fi
%attr(755,root,root) %{_libdir}/libkadm5srv_mit.so.*.*
%attr(755,root,root) %ghost %{_libdir}/libkadm5srv_mit.so.11
%attr(755,root,root) %{_libdir}/libkdb5.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libkdb5.so.8
+%attr(755,root,root) %ghost %{_libdir}/libkdb5.so.9
%attr(755,root,root) %{_libdir}/libkrad.so.*.*
%attr(755,root,root) %ghost %{_libdir}/libkrad.so.0
%attr(755,root,root) %{_libdir}/libkrb5.so.*.*
diff --git a/krb5-enospc.patch b/krb5-enospc.patch
index 03f33a5..da5df75 100644
--- a/krb5-enospc.patch
+++ b/krb5-enospc.patch
@@ -1,20 +1,21 @@
If the error message is going to be ambiguous, try to give the user some clue
by returning the last error reported by the OS.
---- krb5-1.12.1/src/clients/kinit/kinit.c.orig 2014-03-13 16:59:01.573794523 +0100
-+++ krb5-1.12.1/src/clients/kinit/kinit.c 2014-03-13 17:03:50.860449052 +0100
-@@ -851,8 +851,14 @@
- code = krb5_cc_initialize(k5->ctx, k5->out_cc, opts->canonicalize ?
- my_creds.client : k5->me);
- if (code) {
-+ if ((code == KRB5_CC_IO) && (errno != 0)) {
-+ com_err(progname, code, "when initializing cache %s: %s",
-+ opts->k5_out_cache_name?opts->k5_out_cache_name:"",
+--- krb5-1.16/src/clients/kinit/kinit.c.orig 2018-04-02 19:53:38.218343400 +0200
++++ krb5-1.16/src/clients/kinit/kinit.c 2018-04-02 19:59:46.085005866 +0200
+@@ -820,9 +820,15 @@
+ ret = krb5_cc_initialize(k5->ctx, k5->out_cc, opts->canonicalize ?
+ my_creds.client : k5->me);
+ if (ret) {
++ if ((ret == KRB5_CC_IO) && (errno != 0)) {
++ com_err(progname, ret, "when initializing cache %s: %s",
++ opts->k5_out_cache_name ? opts->k5_out_cache_name : "",
+ strerror(errno));
+ } else {
- com_err(progname, code, _("when initializing cache %s"),
- opts->k5_out_cache_name?opts->k5_out_cache_name:"");
-+ }
+ com_err(progname, ret, _("when initializing cache %s"),
+ opts->k5_out_cache_name ? opts->k5_out_cache_name : "");
goto cleanup;
++ }
}
if (opts->verbose)
+ fprintf(stderr, _("Initialized cache\n"));
diff --git a/krb5-tests.patch b/krb5-tests.patch
index 50a6d35..93d4c90 100644
--- a/krb5-tests.patch
+++ b/krb5-tests.patch
@@ -79,12 +79,12 @@
install-unix:
$(INSTALL_PROGRAM) gss-client $(DESTDIR)$(CLIENT_BINDIR)/gss-client
---- krb5-1.15/src/tests/gssapi/Makefile.in.orig 2017-02-18 08:35:55.481165250 +0100
-+++ krb5-1.15/src/tests/gssapi/Makefile.in 2017-02-18 08:37:07.877831093 +0100
-@@ -44,13 +44,15 @@
+--- krb5-1.16/src/tests/gssapi/Makefile.in.orig 2018-04-02 20:00:12.548338898 +0200
++++ krb5-1.16/src/tests/gssapi/Makefile.in 2018-04-02 20:25:00.528321908 +0200
+@@ -45,13 +45,15 @@
t_enctypes t_err t_export_cred t_export_name t_imp_cred t_inq_cred \
- t_inq_ctx t_inq_mechs_name t_iov t_pcontok t_s4u t_s4u2proxy_krb5 \
- t_spnego t_srcattrs
+ t_inq_ctx t_inq_mechs_name t_iov t_lifetime t_pcontok t_s4u \
+ t_s4u2proxy_krb5 t_spnego t_srcattrs
- $(RUNPYTEST) $(srcdir)/t_gssapi.py $(PYTESTFLAGS)
- $(RUNPYTEST) $(srcdir)/t_ccselect.py $(PYTESTFLAGS)
- $(RUNPYTEST) $(srcdir)/t_client_keytab.py $(PYTESTFLAGS)
@@ -104,36 +104,9 @@
ccinit: ccinit.o $(KRB5_BASE_DEPLIBS)
$(CC_LINK) -o ccinit ccinit.o $(KRB5_BASE_LIBS)
-#--- krb5-1.9.1/src/tests/mkeystash_compat/Makefile.in~ 2010-12-03 01:05:44.000000000 +0100
-#+++ krb5-1.9.1/src/tests/mkeystash_compat/Makefile.in 2011-08-03 12:55:23.507781811 +0200
-#@@ -37,14 +37,16 @@
-#
-# # Verify that the mkey stash code is backward compat with old/non-keytab stashfile format
-# mkeystash_check: kdc.conf krb5.conf bigendian
-#- $(RM) $(TEST_DB)* stash_file
-#- $(RUN_SETUP) $(VALGRIND) ../../kadmin/dbutil/kdb5_util $(KDB_OPTS) create -s -W
-#- # overwrite keytab stash file with old format stash, depends on endianness of current test system
-#- ./bigendian && cp $(srcdir)/old_stash_bendian stash_file || cp $(srcdir)/old_stash_lendian stash_file
-#- # getprinc will fail if old stash file can not be read
-#- $(RUN_SETUP) $(VALGRIND) ../../kadmin/cli/kadmin.local $(KADMIN_OPTS) -q 'getprinc K/M'
-#- $(RUN_SETUP) $(VALGRIND) ../../kadmin/dbutil/kdb5_util $(KDB_OPTS) destroy -f
-#- $(RM) $(TEST_DB)* stash_file
-#+ if [ "$(OFFLINE)" = no ]; then \
-#+ $(RM) $(TEST_DB)* stash_file && \
-#+ $(RUN_SETUP) $(VALGRIND) ../../kadmin/dbutil/kdb5_util $(KDB_OPTS) create -s -W && \
-#+ # overwrite keytab stash file with old format stash, depends on endianness of current test system && \
-#+ ./bigendian && cp $(srcdir)/old_stash_bendian stash_file || cp $(srcdir)/old_stash_lendian stash_file && \
-#+ # getprinc will fail if old stash file can not be read && \
-#+ $(RUN_SETUP) $(VALGRIND) ../../kadmin/cli/kadmin.local $(KADMIN_OPTS) -q 'getprinc K/M' && \
-#+ $(RUN_SETUP) $(VALGRIND) ../../kadmin/dbutil/kdb5_util $(KDB_OPTS) destroy -f && \
-#+ $(RM) $(TEST_DB)* stash_file ; \
-#+ fi
-#
-# clean::
-# $(RM) kdc.conf krb5.conf bigendian.$(OBJEXT) bigendian
---- krb5-1.15/src/tests/Makefile.in.orig 2017-02-18 08:43:08.467826973 +0100
-+++ krb5-1.15/src/tests/Makefile.in 2017-02-18 09:09:28.181142270 +0100
-@@ -89,84 +89,88 @@
+--- krb5-1.16/src/tests/Makefile.in.orig 2018-04-02 20:00:12.561672231 +0200
++++ krb5-1.16/src/tests/Makefile.in 2018-04-02 20:27:45.764986688 +0200
+@@ -92,89 +92,93 @@
mv krb5.new krb5.conf
kdb_check: kdc.conf krb5.conf
@@ -190,8 +163,9 @@
+ $(RM) $(TEST_DB)* stash_file ; \
+ fi
- check-pytests: adata etinfo forward gcred hist hooks hrealm icred kdbtest
- check-pytests: localauth plugorder rdreq responder s2p s4u2proxy unlockiter
+ check-pytests: adata etinfo forward gcred hist hooks hrealm icinterleave icred
+ check-pytests: kdbtest localauth plugorder rdreq responder s2p s4u2proxy
+ check-pytests: unlockiter
- $(RUNPYTEST) $(srcdir)/t_general.py $(PYTESTFLAGS)
- $(RUNPYTEST) $(srcdir)/t_hooks.py $(PYTESTFLAGS)
- $(RUNPYTEST) $(srcdir)/t_dump.py $(PYTESTFLAGS)
@@ -203,6 +177,7 @@
- $(RUNPYTEST) $(srcdir)/t_otp.py $(PYTESTFLAGS)
- $(RUNPYTEST) $(srcdir)/t_localauth.py $(PYTESTFLAGS)
- $(RUNPYTEST) $(srcdir)/t_kadm5_hook.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_kadm5_auth.py $(PYTESTFLAGS)
- $(RUNPYTEST) $(srcdir)/t_pwqual.py $(PYTESTFLAGS)
- $(RUNPYTEST) $(srcdir)/t_hostrealm.py $(PYTESTFLAGS)
- $(RUNPYTEST) $(srcdir)/t_kdb_locking.py $(PYTESTFLAGS)
@@ -241,6 +216,7 @@
+ $(RUNPYTEST) $(srcdir)/t_otp.py $(PYTESTFLAGS) && \
+ $(RUNPYTEST) $(srcdir)/t_localauth.py $(PYTESTFLAGS) && \
+ $(RUNPYTEST) $(srcdir)/t_kadm5_hook.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_kadm5_auth.py $(PYTESTFLAGS) && \
+ $(RUNPYTEST) $(srcdir)/t_pwqual.py $(PYTESTFLAGS) && \
+ $(RUNPYTEST) $(srcdir)/t_hostrealm.py $(PYTESTFLAGS) && \
+ $(RUNPYTEST) $(srcdir)/t_kdb_locking.py $(PYTESTFLAGS) && \
@@ -280,6 +256,9 @@
- $(RUNPYTEST) $(srcdir)/t_preauth.py $(PYTESTFLAGS)
- $(RUNPYTEST) $(srcdir)/t_princflags.py $(PYTESTFLAGS)
- $(RUNPYTEST) $(srcdir)/t_tabdump.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_certauth.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_y2038.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_kdcpolicy.py $(PYTESTFLAGS)
+ -i au.log && \
+ $(RUNPYTEST) $(srcdir)/t_salt.py $(PYTESTFLAGS) && \
+ $(RUNPYTEST) $(srcdir)/t_etype_info.py $(PYTESTFLAGS) && \
@@ -291,8 +270,11 @@
+ $(RUNPYTEST) $(srcdir)/t_authdata.py $(PYTESTFLAGS) && \
+ $(RUNPYTEST) $(srcdir)/t_preauth.py $(PYTESTFLAGS) && \
+ $(RUNPYTEST) $(srcdir)/t_princflags.py $(PYTESTFLAGS) && \
-+ $(RUNPYTEST) $(srcdir)/t_tabdump.py $(PYTESTFLAGS) ; \
++ $(RUNPYTEST) $(srcdir)/t_tabdump.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_certauth.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_y2038.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_kdcpolicy.py $(PYTESTFLAGS) ; \
+ fi
clean:
- $(RM) adata etinfo forward gcred hist hooks hrealm icred kdbtest
+ $(RM) adata etinfo forward gcred hist hooks hrealm icinterleave icred
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/krb5.git/commitdiff/8f4c3a2dba6b495a538be8f2b86ddcebc0705c59
More information about the pld-cvs-commit
mailing list