Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 04 May 2026 11:57:38 +0000
From:      Cy Schubert <cy@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: e3fc36736631 - stable/15 - krb5: Adjust additional version strings
Message-ID:  <69f889b2.3732d.6126a328@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch stable/15 has been updated by cy:

URL: https://cgit.FreeBSD.org/src/commit/?id=e3fc367366319466dd91fe0217a06c0655e35a8a

commit e3fc367366319466dd91fe0217a06c0655e35a8a
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2026-05-01 14:40:19 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2026-05-04 11:57:27 +0000

    krb5: Adjust additional version strings
    
    Fixes:          736e411a737b
    
    (cherry picked from commit c64ee36e5d09ecee4ce4951047014c8461734fb5)
---
 krb5/include/autoconf.h              | 4 ++--
 krb5/util/build-tools/Makefile       | 1 +
 krb5/util/build-tools/krb5-config.sh | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/krb5/include/autoconf.h b/krb5/include/autoconf.h
index 760aca79176b..ef6a1fa2090d 100644
--- a/krb5/include/autoconf.h
+++ b/krb5/include/autoconf.h
@@ -641,7 +641,7 @@
 #define PACKAGE_NAME "Kerberos 5"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Kerberos 5 1.22.1"
+#define PACKAGE_STRING "Kerberos 5 1.22.2"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "krb5"
@@ -650,7 +650,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.22.1"
+#define PACKAGE_VERSION "1.22.2"
 
 /* Default PKCS11 module name */
 #define PKCS11_MODNAME "opensc-pkcs11.so"
diff --git a/krb5/util/build-tools/Makefile b/krb5/util/build-tools/Makefile
index 8bafbb777c07..bf8396dfd939 100644
--- a/krb5/util/build-tools/Makefile
+++ b/krb5/util/build-tools/Makefile
@@ -8,6 +8,7 @@
 #
 
 .include "../Makefile.inc"
+.include "../../Makefile.pc"
 
 SCRIPTS=	krb5-config.sh
 BINDIR?=	/usr/bin
diff --git a/krb5/util/build-tools/krb5-config.sh b/krb5/util/build-tools/krb5-config.sh
index 9980f054b88f..401c19474f84 100755
--- a/krb5/util/build-tools/krb5-config.sh
+++ b/krb5/util/build-tools/krb5-config.sh
@@ -26,7 +26,7 @@
 
 # Configurable parameters set by autoconf
 # Disreagard the above. Edit this by hand in the bespoke FreeBSD build.
-version_string="Kerberos 5 release 1.22.1"
+version_string="Kerberos 5 release 1.22.2"
 
 prefix=/usr
 exec_prefix=${prefix}


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69f889b2.3732d.6126a328>