aboutsummaryrefslogtreecommitdiff
path: root/krb5
diff options
context:
space:
mode:
Diffstat (limited to 'krb5')
-rw-r--r--krb5/Makefile.inc3
-rw-r--r--krb5/include/Makefile2
-rw-r--r--krb5/include/Makefile.inc2
-rw-r--r--krb5/include/autoconf.h12
-rw-r--r--krb5/lib/Makefile.inc2
-rw-r--r--krb5/lib/kadm5clnt/Makefile3
-rw-r--r--krb5/libexec/Makefile.inc2
-rw-r--r--krb5/usr.bin/Makefile.inc1
-rw-r--r--krb5/usr.bin/ksu/Makefile3
-rw-r--r--krb5/usr.sbin/gss-server/Makefile2
-rw-r--r--krb5/usr.sbin/sim_server/Makefile2
-rw-r--r--krb5/usr.sbin/sserver/Makefile2
-rw-r--r--krb5/util/Makefile.inc2
-rw-r--r--krb5/util/build-tools/Makefile3
-rwxr-xr-xkrb5/util/build-tools/krb5-config.sh2
-rw-r--r--krb5/util/compile_et/Makefile3
-rw-r--r--krb5/util/et/Makefile3
-rw-r--r--krb5/util/profile/Makefile2
-rw-r--r--krb5/util/ss/Makefile2
-rw-r--r--krb5/util/support/Makefile2
-rw-r--r--krb5/util/verto/Makefile2
21 files changed, 24 insertions, 33 deletions
diff --git a/krb5/Makefile.inc b/krb5/Makefile.inc
index 6db4e8d964aa..34d04daab0b1 100644
--- a/krb5/Makefile.inc
+++ b/krb5/Makefile.inc
@@ -9,7 +9,8 @@
.include <src.opts.mk>
-KRB5_VERSION= 1.22-final
+PACKAGE?= kerberos
+KRB5_VERSION= 1.22.1
# MIT KRB5 uses KRB5_DIR. Heimdal uses KRB5DIR.
KRB5_SRCTOP= ${SRCTOP}/krb5
diff --git a/krb5/include/Makefile b/krb5/include/Makefile
index 759c81685da9..8ce743e95d95 100644
--- a/krb5/include/Makefile
+++ b/krb5/include/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= kerberos-lib
-
.include <src.opts.mk>
.include "../Makefile.inc"
diff --git a/krb5/include/Makefile.inc b/krb5/include/Makefile.inc
index 5c21860b6157..8005a7b99e37 100644
--- a/krb5/include/Makefile.inc
+++ b/krb5/include/Makefile.inc
@@ -7,6 +7,4 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= kerberos-lib
-
.include "../Makefile.inc"
diff --git a/krb5/include/autoconf.h b/krb5/include/autoconf.h
index 19979b060f10..760aca79176b 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.0"
+#define PACKAGE_STRING "Kerberos 5 1.22.1"
/* 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.0"
+#define PACKAGE_VERSION "1.22.1"
/* Default PKCS11 module name */
#define PKCS11_MODNAME "opensc-pkcs11.so"
@@ -691,7 +691,15 @@
#define STDC_HEADERS 1
/* Define to 1 if strerror_r returns char *. */
+#ifdef __linux__
+#include <features.h>
+#endif
+#ifdef __GLIBC__
+/* Bootstrapping on GNU/Linux */
+#define STRERROR_R_CHAR_P 1
+#else
/* #undef STRERROR_R_CHAR_P */
+#endif
/* Define if sys_errlist is defined in errno.h */
#define SYS_ERRLIST_DECLARED 1
diff --git a/krb5/lib/Makefile.inc b/krb5/lib/Makefile.inc
index 50cacb9492ac..7fc36229a864 100644
--- a/krb5/lib/Makefile.inc
+++ b/krb5/lib/Makefile.inc
@@ -9,7 +9,7 @@
.include "../Makefile.inc"
-PACKAGE?= kerberos-lib
+LIB_PACKAGE=
KRB5_KRB5LIBDIR= ${KRB5_SRCLIBDIR}/krb5
KRB5_K5CRYPTODIR= ${KRB5_SRCLIBDIR}/crypto
diff --git a/krb5/lib/kadm5clnt/Makefile b/krb5/lib/kadm5clnt/Makefile
index 52a7187cf9bb..ef01a5f779e3 100644
--- a/krb5/lib/kadm5clnt/Makefile
+++ b/krb5/lib/kadm5clnt/Makefile
@@ -86,7 +86,8 @@ ${CHPASS_UTIL_STRINGS_ERR_C}: ${CHPASS_UTIL_STRINGS_ERR}
rm -f et-c-${.PREFIX}.et et-c-${.PREFIX}.c
afterinstall:
- ${INSTALL_LIBSYMLINK} ${SHLIB_LINK} ${DESTDIR}${LIBDIR}/libkadm5clnt.so
+ ${INSTALL_LIBSYMLINK} ${DEV_TAG_ARGS} ${SHLIB_LINK} \
+ ${DESTDIR}${LIBDIR}/libkadm5clnt.so
.include <bsd.lib.mk>
diff --git a/krb5/libexec/Makefile.inc b/krb5/libexec/Makefile.inc
index 9bec75eba9cb..b40d1999f23f 100644
--- a/krb5/libexec/Makefile.inc
+++ b/krb5/libexec/Makefile.inc
@@ -9,5 +9,5 @@
.include "../Makefile.inc"
-PACKAGE?= kerberos-kdc
+PACKAGE= kerberos-kdc
BINDIR?= /usr/libexec
diff --git a/krb5/usr.bin/Makefile.inc b/krb5/usr.bin/Makefile.inc
index edd734628950..55e21f80936c 100644
--- a/krb5/usr.bin/Makefile.inc
+++ b/krb5/usr.bin/Makefile.inc
@@ -9,5 +9,4 @@
.include "../Makefile.inc"
-PACKAGE?= kerberos
BINDIR?= /usr/bin
diff --git a/krb5/usr.bin/ksu/Makefile b/krb5/usr.bin/ksu/Makefile
index aaec461ce0b0..93860e38ce5c 100644
--- a/krb5/usr.bin/ksu/Makefile
+++ b/krb5/usr.bin/ksu/Makefile
@@ -24,7 +24,8 @@ SRCS= authorization.c \
CFLAGS+=-I${KRB5_DIR}/include \
-I${KRB5_SRCTOP}/include \
- -DGET_TGT_VIA_PASSWD
+ -DGET_TGT_VIA_PASSWD \
+ -DPRINC_LOOK_AHEAD
MAN= ksu.1
diff --git a/krb5/usr.sbin/gss-server/Makefile b/krb5/usr.sbin/gss-server/Makefile
index 67a51edb45b3..6b56e11f0ac4 100644
--- a/krb5/usr.sbin/gss-server/Makefile
+++ b/krb5/usr.sbin/gss-server/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= kerberos
-
PROG= gss-server
LIBADD= gssapi_krb5 krb5 k5crypto com_err krb5profile krb5support sys
diff --git a/krb5/usr.sbin/sim_server/Makefile b/krb5/usr.sbin/sim_server/Makefile
index d46942e0cb91..ddeff682466f 100644
--- a/krb5/usr.sbin/sim_server/Makefile
+++ b/krb5/usr.sbin/sim_server/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= kerberos
-
PROG= sim_server
LIBADD= krb5 k5crypto com_err krb5profile krb5support sys
diff --git a/krb5/usr.sbin/sserver/Makefile b/krb5/usr.sbin/sserver/Makefile
index 67cdf9777742..ae5e120848ff 100644
--- a/krb5/usr.sbin/sserver/Makefile
+++ b/krb5/usr.sbin/sserver/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= kerberos
-
PROG= sserver
LIBADD= krb5 k5crypto com_err krb5profile krb5support sys
diff --git a/krb5/util/Makefile.inc b/krb5/util/Makefile.inc
index e9357fa4cc66..f1e61f498a4c 100644
--- a/krb5/util/Makefile.inc
+++ b/krb5/util/Makefile.inc
@@ -9,5 +9,7 @@
.include "../Makefile.inc"
+LIB_PACKAGE=
+
SHLIBDIR?= /usr/lib
SHLIB_MAJOR?= 122
diff --git a/krb5/util/build-tools/Makefile b/krb5/util/build-tools/Makefile
index 53de0be92fd2..8bafbb777c07 100644
--- a/krb5/util/build-tools/Makefile
+++ b/krb5/util/build-tools/Makefile
@@ -7,12 +7,11 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= kerberos-lib
-
.include "../Makefile.inc"
SCRIPTS= krb5-config.sh
BINDIR?= /usr/bin
+TAGS= dev
MAN= krb5-config.1
diff --git a/krb5/util/build-tools/krb5-config.sh b/krb5/util/build-tools/krb5-config.sh
index b23fe0141345..9980f054b88f 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.0"
+version_string="Kerberos 5 release 1.22.1"
prefix=/usr
exec_prefix=${prefix}
diff --git a/krb5/util/compile_et/Makefile b/krb5/util/compile_et/Makefile
index 015ef088d90f..fb87de3dd9c6 100644
--- a/krb5/util/compile_et/Makefile
+++ b/krb5/util/compile_et/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= kerberos
-
.include "../Makefile.inc"
SRC_ETDIR= ${KRB5_DIR}/util/et
@@ -18,6 +16,7 @@ SCRIPTS= compile_et
BINDIR?= /usr/bin
MAN= compile_et.1
CLEANFILES= compile_et
+TAGS+= dev
compile_et: compile_et.sh
sh ${SRC_ETDIR}/config_script ${SRC_ETDIR}/compile_et.sh \
diff --git a/krb5/util/et/Makefile b/krb5/util/et/Makefile
index 0d474efa1e8e..35ac601629d7 100644
--- a/krb5/util/et/Makefile
+++ b/krb5/util/et/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= kerberos-lib
-
.include <src.opts.mk>
.include "../Makefile.inc"
@@ -44,6 +42,7 @@ ETSCRIPTS= et_c.awk \
ETSCRIPTSDIR= ${KRB5_ETDIR}
ETSCRIPTSMODE= 0444
+ETSCRIPTSTAGS= dev
.include <bsd.lib.mk>
diff --git a/krb5/util/profile/Makefile b/krb5/util/profile/Makefile
index 751d648fa58e..e62d66636161 100644
--- a/krb5/util/profile/Makefile
+++ b/krb5/util/profile/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= kerberos-lib
-
.include <src.opts.mk>
.include "../Makefile.inc"
diff --git a/krb5/util/ss/Makefile b/krb5/util/ss/Makefile
index ac01f683ff67..2c48ccf56573 100644
--- a/krb5/util/ss/Makefile
+++ b/krb5/util/ss/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= kerberos-lib
-
.include <src.opts.mk>
.include "../Makefile.inc"
diff --git a/krb5/util/support/Makefile b/krb5/util/support/Makefile
index f73f5d31990a..e2e677fee89d 100644
--- a/krb5/util/support/Makefile
+++ b/krb5/util/support/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= kerberos-lib
-
.include <src.opts.mk>
.include "../Makefile.inc"
diff --git a/krb5/util/verto/Makefile b/krb5/util/verto/Makefile
index 66d9d8ef4e0b..3ae9da9df20b 100644
--- a/krb5/util/verto/Makefile
+++ b/krb5/util/verto/Makefile
@@ -7,8 +7,6 @@
# under sponsorship from the FreeBSD Foundation.
#
-PACKAGE= kerberos-lib
-
.include <src.opts.mk>
.include "../Makefile.inc"
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-09 17:48:22 +0000