[packages/krb5] - up to 1.20.2
qboosh
qboosh at pld-linux.org
Sat Feb 10 09:43:41 CET 2024
commit 894859526606a2e370a3675d750cc4a430882315
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Feb 10 08:30:02 2024 +0100
- up to 1.20.2
krb5-enospc.patch | 24 +++++++++-----------
krb5-openssl.patch | 65 ------------------------------------------------------
krb5-tests.patch | 28 +++++++++++++----------
krb5.spec | 8 +++----
4 files changed, 29 insertions(+), 96 deletions(-)
---
diff --git a/krb5.spec b/krb5.spec
index 7e7eabf..4b57a92 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.19.4
+Version: 1.20.2
Release: 0.1
License: MIT
Group: Networking
-Source0: http://web.mit.edu/kerberos/dist/krb5/1.19/%{name}-%{version}.tar.gz
-# Source0-md5: ef76083e58f8c49066180642d7c2814a
+Source0: http://web.mit.edu/kerberos/dist/krb5/1.20/%{name}-%{version}.tar.gz
+# Source0-md5: 7ac456e97c4959ebe5c836dc2f5aab2c
Source2: %{name}kdc.init
Source4: kadm5.acl
Source5: kerberos.logrotate
@@ -40,7 +40,6 @@ Patch0: %{name}-manpages.patch
Patch1: %{name}-audit.patch
Patch2: %{name}-db185.patch
Patch3: %{name}-as-needed.patch
-Patch4: %{name}-openssl.patch
# http://lite.mit.edu/
Patch6: %{name}-ktany.patch
Patch11: %{name}-brokenrev.patch
@@ -394,7 +393,6 @@ Dokumentacja systemu MIT Kerberos V5 w formacie HTML.
%patch1 -p1
%{?with_system_db:%patch2 -p1}
%patch3 -p1
-%patch4 -p1
%patch6 -p1
%patch11 -p1
%patch12 -p1
diff --git a/krb5-enospc.patch b/krb5-enospc.patch
index da5df75..fb80a86 100644
--- a/krb5-enospc.patch
+++ b/krb5-enospc.patch
@@ -1,21 +1,17 @@
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.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);
+--- krb5-1.20.2/src/clients/kinit/kinit.c.orig 2024-02-10 08:00:10.543015960 +0100
++++ krb5-1.20.2/src/clients/kinit/kinit.c 2024-02-10 08:08:02.060461532 +0100
+@@ -800,7 +800,11 @@ k5_kinit(struct k_opts *opts, struct k5_
+ if (!ret)
+ ret = krb5_cc_initialize(k5->ctx, mcc, cprinc);
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, ret, _("when initializing cache %s"),
- opts->k5_out_cache_name ? opts->k5_out_cache_name : "");
++ if ((ret == KRB5_CC_IO) && (errno != 0)) {
++ com_err(progname, ret, _("when creating temporary cache: %s"), strerror(errno));
++ } else {
+ com_err(progname, ret, _("when creating temporary cache"));
++ }
goto cleanup;
-+ }
}
if (opts->verbose)
- fprintf(stderr, _("Initialized cache\n"));
diff --git a/krb5-openssl.patch b/krb5-openssl.patch
deleted file mode 100644
index c4972b9..0000000
--- a/krb5-openssl.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- krb5-1.18.5/src/tests/softpkcs11/main.c.orig 2022-03-11 07:34:10.000000000 +0100
-+++ krb5-1.18.5/src/tests/softpkcs11/main.c 2024-02-09 19:44:41.605416248 +0100
-@@ -427,7 +427,7 @@ add_pubkey_info(struct st_object *o, CK_
- RSA *rsa;
- const BIGNUM *n, *e;
-
-- rsa = EVP_PKEY_get0_RSA(key);
-+ rsa = (RSA*)EVP_PKEY_get0_RSA(key);
- RSA_get0_key(rsa, &n, &e, NULL);
- modulus_bits = BN_num_bits(n);
-
-@@ -680,7 +680,7 @@ add_certificate(char *label,
- /* XXX verify keytype */
-
- if (key_type == CKK_RSA)
-- RSA_set_method(EVP_PKEY_get0_RSA(o->u.private_key.key),
-+ RSA_set_method((RSA*)EVP_PKEY_get0_RSA(o->u.private_key.key),
- RSA_PKCS1_OpenSSL());
-
- if (X509_check_private_key(cert, o->u.private_key.key) != 1) {
-@@ -1224,7 +1224,7 @@ C_Login(CK_SESSION_HANDLE hSession,
- }
-
- /* XXX check keytype */
-- RSA_set_method(EVP_PKEY_get0_RSA(o->u.private_key.key),
-+ RSA_set_method((RSA*)EVP_PKEY_get0_RSA(o->u.private_key.key),
- RSA_PKCS1_OpenSSL());
-
- if (X509_check_private_key(o->u.private_key.cert, o->u.private_key.key) != 1) {
-@@ -1512,7 +1512,7 @@ C_Encrypt(CK_SESSION_HANDLE hSession,
- return CKR_ARGUMENTS_BAD;
- }
-
-- rsa = EVP_PKEY_get0_RSA(o->u.public_key);
-+ rsa = (RSA*)EVP_PKEY_get0_RSA(o->u.public_key);
-
- if (rsa == NULL)
- return CKR_ARGUMENTS_BAD;
-@@ -1663,7 +1663,7 @@ C_Decrypt(CK_SESSION_HANDLE hSession,
- return CKR_ARGUMENTS_BAD;
- }
-
-- rsa = EVP_PKEY_get0_RSA(o->u.private_key.key);
-+ rsa = (RSA*)EVP_PKEY_get0_RSA(o->u.private_key.key);
-
- if (rsa == NULL)
- return CKR_ARGUMENTS_BAD;
-@@ -1822,7 +1822,7 @@ C_Sign(CK_SESSION_HANDLE hSession,
- return CKR_ARGUMENTS_BAD;
- }
-
-- rsa = EVP_PKEY_get0_RSA(o->u.private_key.key);
-+ rsa = (RSA*)EVP_PKEY_get0_RSA(o->u.private_key.key);
-
- if (rsa == NULL)
- return CKR_ARGUMENTS_BAD;
-@@ -1969,7 +1969,7 @@ C_Verify(CK_SESSION_HANDLE hSession,
- return CKR_ARGUMENTS_BAD;
- }
-
-- rsa = EVP_PKEY_get0_RSA(o->u.public_key);
-+ rsa = (RSA*)EVP_PKEY_get0_RSA(o->u.public_key);
-
- if (rsa == NULL)
- return CKR_ARGUMENTS_BAD;
diff --git a/krb5-tests.patch b/krb5-tests.patch
index b4ef6c1..8e6f9d4 100644
--- a/krb5-tests.patch
+++ b/krb5-tests.patch
@@ -68,13 +68,14 @@
install-unix:
$(INSTALL_PROGRAM) gss-client $(DESTDIR)$(CLIENT_BINDIR)/gss-client
---- krb5-1.19.4/src/tests/gssapi/Makefile.in.orig 2024-02-09 22:08:23.525373967 +0100
-+++ krb5-1.19.4/src/tests/gssapi/Makefile.in 2024-02-09 22:09:44.368269336 +0100
-@@ -49,16 +49,18 @@ check-pytests: ccinit ccrefresh t_accnam
- t_ciflags t_context t_credstore t_enctypes t_err t_export_cred \
+--- krb5-1.20.2/src/tests/gssapi/Makefile.in.orig 2024-02-10 08:09:57.599835601 +0100
++++ krb5-1.20.2/src/tests/gssapi/Makefile.in 2024-02-10 08:13:56.875206002 +0100
+@@ -50,17 +50,19 @@ check-pytests: ccinit ccrefresh t_accnam
t_export_name t_imp_cred t_inq_cred t_inq_ctx t_inq_mechs_name t_iov \
- t_lifetime t_pcontok t_s4u t_s4u2proxy_krb5 t_spnego t_srcattrs
+ t_lifetime t_pcontok t_s4u t_s4u2proxy_krb5 t_spnego t_srcattrs \
+ t_store_cred
- $(RUNPYTEST) $(srcdir)/t_gssapi.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_store_cred.py $(PYTESTFLAGS)
- $(RUNPYTEST) $(srcdir)/t_credstore.py $(PYTESTFLAGS)
- $(RUNPYTEST) $(srcdir)/t_bindings.py $(PYTESTFLAGS)
- $(RUNPYTEST) $(srcdir)/t_ccselect.py $(PYTESTFLAGS)
@@ -86,6 +87,7 @@
- $(RUNPYTEST) $(srcdir)/t_negoex.py $(PYTESTFLAGS)
+ if [ "$(OFFLINE)" = no ]; then \
+ $(RUNPYTEST) $(srcdir)/t_gssapi.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_store_cred.py $(PYTESTFLAGS) && \
+ $(RUNPYTEST) $(srcdir)/t_credstore.py $(PYTESTFLAGS) && \
+ $(RUNPYTEST) $(srcdir)/t_bindings.py $(PYTESTFLAGS) && \
+ $(RUNPYTEST) $(srcdir)/t_ccselect.py $(PYTESTFLAGS) && \
@@ -99,9 +101,9 @@
ccinit: ccinit.o $(KRB5_BASE_DEPLIBS)
$(CC_LINK) -o ccinit ccinit.o $(KRB5_BASE_LIBS)
---- krb5-1.18.5/src/tests/Makefile.in.orig 2024-02-09 18:30:44.222788945 +0100
-+++ krb5-1.18.5/src/tests/Makefile.in 2024-02-09 18:33:57.485075287 +0100
-@@ -98,88 +98,92 @@ krb5.conf: Makefile
+--- krb5-1.20.2/src/tests/Makefile.in.orig 2024-02-10 08:09:57.603168916 +0100
++++ krb5-1.20.2/src/tests/Makefile.in 2024-02-10 08:18:52.493604500 +0100
+@@ -108,89 +108,93 @@ krb5.conf: Makefile
mv krb5.new krb5.conf
kdb_check: kdc.conf krb5.conf
@@ -146,9 +148,9 @@
+ $(RM) $(TEST_DB)* stash_file ; \
+ fi
- check-pytests: adata etinfo forward gcred hist hooks hrealm icinterleave icred
- check-pytests: kdbtest localauth plugorder rdreq replay responder s2p s4u2proxy
- check-pytests: unlockiter s4u2self
+ check-pytests: adata conccache etinfo forward gcred hist hooks hrealm
+ check-pytests: icinterleave icred kdbtest localauth plugorder rdreq replay
+ check-pytests: responder s2p s4u2proxy unlockiter s4u2self
- $(RUNPYTEST) $(srcdir)/t_general.py $(PYTESTFLAGS)
- $(RUNPYTEST) $(srcdir)/t_hooks.py $(PYTESTFLAGS)
- $(RUNPYTEST) $(srcdir)/t_dump.py $(PYTESTFLAGS)
@@ -175,6 +177,7 @@
- $(RUNPYTEST) $(srcdir)/t_referral.py $(PYTESTFLAGS)
- $(RUNPYTEST) $(srcdir)/t_skew.py $(PYTESTFLAGS)
- $(RUNPYTEST) $(srcdir)/t_keytab.py $(PYTESTFLAGS)
+- $(RUNPYTEST) $(srcdir)/t_kadmin.py $(PYTESTFLAGS)
- $(RUNPYTEST) $(srcdir)/t_kadmin_acl.py $(PYTESTFLAGS)
- $(RUNPYTEST) $(srcdir)/t_kadmin_parsing.py $(PYTESTFLAGS)
- $(RUNPYTEST) $(srcdir)/t_kdb.py $(PYTESTFLAGS)
@@ -216,6 +219,7 @@
+ $(RUNPYTEST) $(srcdir)/t_referral.py $(PYTESTFLAGS) && \
+ $(RUNPYTEST) $(srcdir)/t_skew.py $(PYTESTFLAGS) && \
+ $(RUNPYTEST) $(srcdir)/t_keytab.py $(PYTESTFLAGS) && \
++ $(RUNPYTEST) $(srcdir)/t_kadmin.py $(PYTESTFLAGS) && \
+ $(RUNPYTEST) $(srcdir)/t_kadmin_acl.py $(PYTESTFLAGS) && \
+ $(RUNPYTEST) $(srcdir)/t_kadmin_parsing.py $(PYTESTFLAGS) && \
+ $(RUNPYTEST) $(srcdir)/t_kdb.py $(PYTESTFLAGS) && \
@@ -270,4 +274,4 @@
+ fi
clean:
- $(RM) adata etinfo forward gcred hist hooks hrealm icinterleave icred
+ $(RM) adata conccache etinfo forward gcred hist hooks hrealm
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/krb5.git/commitdiff/894859526606a2e370a3675d750cc4a430882315
More information about the pld-cvs-commit
mailing list