[krb5] Update to 1.22.1 (#47142)

This commit is contained in:
Kai Pastor
2025-09-03 22:58:15 +02:00
committed by GitHub
parent 7a4d6afa0e
commit c842d6ecb0
5 changed files with 15 additions and 23 deletions

View File

@@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO krb5/krb5
REF krb5-${VERSION}-final
SHA512 82ea07acbc91a0352579aeec4f20d1c6d2c3f024640eaaa046f3ec5852d5d9c84143a1e0d04a5cf146f90c3406830823845eb608907f4060d7f765dfe0fb10a8
SHA512 4abfc37679483727fdad827afcf53729e6316febdf985a70133ee1dabaf8516e7fa771c1cfbc8fd557fed868c50f16b26bb59939ec091c2dd7019d0b2234ef1f
HEAD_REF master
PATCHES
static-deps.diff

View File

@@ -1,17 +1,5 @@
diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 3d66a87..cf3e3e6 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -226,6 +226,7 @@ old_CFLAGS="$CFLAGS"
# On Solaris, -pthreads is added to CFLAGS, no extra explicit libraries.
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
AC_SUBST(PTHREAD_CFLAGS)
+AC_SUBST(PTHREAD_LIBS)
old_LIBS="$LIBS"
LIBS="$PTHREAD_LIBS $LIBS"
AC_MSG_NOTICE(rechecking with PTHREAD_... options)
diff --git a/src/build-tools/mit-krb5.pc.in b/src/build-tools/mit-krb5.pc.in
index fdc5577..745d5ec 100644
index fdc5577..0cea3ec 100644
--- a/src/build-tools/mit-krb5.pc.in
+++ b/src/build-tools/mit-krb5.pc.in
@@ -12,4 +12,4 @@ Description: An implementation of Kerberos network authentication
@@ -19,17 +7,17 @@ index fdc5577..745d5ec 100644
Cflags: -I${includedir}
Libs: -L${libdir} -lkrb5 -lk5crypto @COM_ERR_LIB@
-Libs.private: -lkrb5support
+Libs.private: -lkrb5support @GEN_LIB@ @MACOS_FRAMEWORK@ @LIBS@ @DL_LIB@ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
+Libs.private: -lkrb5support @MACOS_FRAMEWORK@ @LIBS@ @DL_LIB@ @PTHREAD_CFLAGS@
diff --git a/src/config/pre.in b/src/config/pre.in
index a0c60c7..a8432a8 100644
index 1197c1f..8bba26a 100644
--- a/src/config/pre.in
+++ b/src/config/pre.in
@@ -379,7 +379,7 @@ SUPPORT_LIB = -l$(SUPPORT_LIBNAME)
@@ -377,7 +377,7 @@ SUPPORT_LIB = -l$(SUPPORT_LIBNAME)
# HESIOD_LIBS is -lhesiod...
HESIOD_LIBS = @HESIOD_LIBS@
-KRB5_BASE_LIBS = $(KRB5_LIB) $(K5CRYPTO_LIB) $(COM_ERR_LIB) $(SUPPORT_LIB) $(GEN_LIB) $(LIBS) $(DL_LIB)
+KRB5_BASE_LIBS = $(KRB5_LIB) $(K5CRYPTO_LIB) $(COM_ERR_LIB) $(SUPPORT_LIB) $(GEN_LIB) @MACOS_FRAMEWORK@ $(LIBS) $(DL_LIB)
-KRB5_BASE_LIBS = $(KRB5_LIB) $(K5CRYPTO_LIB) $(COM_ERR_LIB) $(SUPPORT_LIB) $(LIBS) $(DL_LIB)
+KRB5_BASE_LIBS = $(KRB5_LIB) $(K5CRYPTO_LIB) $(COM_ERR_LIB) $(SUPPORT_LIB) @MACOS_FRAMEWORK@ $(LIBS) $(DL_LIB)
KDB5_LIBS = $(KDB5_LIB) $(GSSRPC_LIBS)
GSS_LIBS = $(GSS_KRB5_LIB)
# needs fixing if ever used on macOS!

View File

@@ -1,8 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"name": "krb5",
"version": "1.21.3",
"port-version": 3,
"version": "1.22.1",
"description": [
"Kerberos is a network authentication protocol.",
"It is designed to provide strong authentication for client/server applications by using secret-key cryptography.",

View File

@@ -4377,8 +4377,8 @@
"port-version": 0
},
"krb5": {
"baseline": "1.21.3",
"port-version": 3
"baseline": "1.22.1",
"port-version": 0
},
"ktx": {
"baseline": "4.3.2",

View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "20994b6f6cc0b70580c74fdc4e2e468a6840049a",
"version": "1.22.1",
"port-version": 0
},
{
"git-tree": "425b11afbf125c0562e8d08b1fbbe87579e1c564",
"version": "1.21.3",