From nobody Thu May 14 19:05:05 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGfsZ152Wz5Wr1l for ; Thu, 14 May 2026 19:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGfsY4zVbz47BM for ; Thu, 14 May 2026 19:05:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eMTiyKIk47IRD9t43fV0PmqwWgwCxisCxckTY8YI+AU=; b=rSRIWl7+2JVKywUvVMJXBnjf2feKT3hsmdO46O5kW7mf10d6kIP2hP4mzB71FglN0FHdli ZPK3b+RL4uxilGTq93Pjg0sCpWTCYhkqyppFApiPGTDWL2NLsz9rqT22kUrKKorj1gnNKg 3MNwHksydupkwHQoq7LcEpWTnALxDIvwE6gPjzZa8aKPy7ghla5UCOQFE//onBwKHQvQxn UuWIkyK6eG48zpEUoHZH3d2a6zBCfbk+tmdVF8uiTXJzLWDVLUG1wQUFRQd5ujy5h1So77 uwRBYTwZnAYKpCDfxcdctYFUZjrUg88DrOZuvP52I93Vb+tEK3P0DToyXbw2Zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778785505; a=rsa-sha256; cv=none; b=WCTXp3zE/fedN3idOaiIQOAUlwo5sEPrXFK6ES++X+t5MkJyxzoELXmZ4Jpg0wtAHR7F41 yTI+evqm8Hyifo81Si/M/VtJ6elOGLzHaY52ZAejTjUcNbcqNoc6n/EuLqgkbsYSQ+Mt2U SYw8Ne1v7gugxfQp0nnT9NSBOkAJ+uNzt5NXZ27TQr5SwmI3AG7wbFtfD2IF2rGPLkaswu EMwhQbJL4qtcnnWvkGqp1Y6Gv2AOaVVpcEORRonAWR6W2iJ3LUWJ2Vv6nhh9iRuV6jjN9G /m0xTAAoHy6UH+HAwxTISMo/f0wv+Hk6qOHyUmizUunmwaF/gEad5UlFC+q6mA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eMTiyKIk47IRD9t43fV0PmqwWgwCxisCxckTY8YI+AU=; b=DJxinTne59f0FkQ+iAUabEYMyQcbiX6967/NqzA4k5aO+YQTGj4XZsSk5xBdiGJUPAO9Yl Fo/1kLncxfqOBNhrF399uh+BQ+whSXypd7QgTWyUluCDyYBZ+VGHB12RudDRXplnlLTSkQ h3WVBl+4VstdqzA3HQ8OSoOIOX1VNhVs/TKvPef+bOieHxJGglTwzM/GvlNs7Q8rpmIBOU u2P4cEYTXGFqXjNqnqU98goPd3qNXA/Fwpcu2SfWqhClYN+On6JFsB3fp1ILrA9wtyDfi6 zYPwYvZa9cdrqjhCGVYNi6Y2PgWACjU3mQJ02DW2GWBCXf0mAvFn2DuZlbmiiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGfsY445LzqKv for ; Thu, 14 May 2026 19:05:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26e96 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 19:05:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Cy Schubert From: Colin Percival Subject: git: 684cb0d678d2 - releng/15.1 - krb5: Adjust additional version strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 684cb0d678d233c08fdc008a2b95e64be04d5dab Auto-Submitted: auto-generated Date: Thu, 14 May 2026 19:05:05 +0000 Message-Id: <6a061ce1.26e96.7eaa386f@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=684cb0d678d233c08fdc008a2b95e64be04d5dab commit 684cb0d678d233c08fdc008a2b95e64be04d5dab Author: Cy Schubert AuthorDate: 2026-05-01 14:40:19 +0000 Commit: Colin Percival CommitDate: 2026-05-14 19:04:18 +0000 krb5: Adjust additional version strings Approved by: re (cperciva) Fixes: 736e411a737b (cherry picked from commit c64ee36e5d09ecee4ce4951047014c8461734fb5) (cherry picked from commit e3fc367366319466dd91fe0217a06c0655e35a8a) --- 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}