Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/stable/13' into stable/22.1
Browse files Browse the repository at this point in the history
  • Loading branch information
fichtner committed Jan 6, 2022
2 parents 7371a26 + 1d15c6b commit d5e3ee5
Show file tree
Hide file tree
Showing 158 changed files with 375 additions and 46 deletions.
2 changes: 1 addition & 1 deletion bin/domainname/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# $FreeBSD$

PACKAGE=runtime
PACKAGE=yp
PROG= domainname

.include <bsd.prog.mk>
2 changes: 2 additions & 0 deletions cddl/usr.sbin/dwatch/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

.include <src.opts.mk>

PACKAGE= dwatch

SUBDIR= libexec

.if ${MK_EXAMPLES} != "no"
Expand Down
1 change: 1 addition & 0 deletions cddl/usr.sbin/dwatch/examples/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# $FreeBSD$

PACKAGE= dwatch
FILESDIR= ${SHAREDIR}/examples/dwatch
FILES= profile_template

Expand Down
1 change: 1 addition & 0 deletions cddl/usr.sbin/dwatch/libexec/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# $FreeBSD$

PACKAGE= dwatch
FILESDIR= ${LIBEXECDIR}/dwatch
FILES= chmod \
errno \
Expand Down
2 changes: 2 additions & 0 deletions etc/mtree/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

.include <src.opts.mk>

PACKAGE= mtree

# NOTE: BSD.debug.dist is unconditionally installed for developer ease-of-use.
FILES= \
BSD.debug.dist \
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/lib/libasn1/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

LIB= asn1
LDFLAGS= -Wl,--no-undefined
INCS= asn1_err.h asn1-common.h heim_asn1.h der.h der-protos.h der-private.h
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/lib/libgssapi_krb5/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

LIB= gssapi_krb5
LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined
LIBADD= gssapi krb5 crypto roken asn1 com_err
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/lib/libgssapi_ntlm/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

LIB= gssapi_ntlm
LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined
LIBADD= crypto gssapi krb5 heimntlm roken
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/lib/libgssapi_spnego/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

LIB= gssapi_spnego
LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined
LIBADD= gssapi heimbase asn1 roken
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/lib/libhdb/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

LIB= hdb
LDFLAGS= -Wl,--no-undefined ${LDAPLDFLAGS}
VERSION_MAP= ${KRB5DIR}/lib/hdb/version-script.map
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/lib/libheimbase/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#$FreeBSD$

PACKAGE= kerberos

LIB= heimbase
LDFLAGS= -Wl,--no-undefined
LIBADD= pthread
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/lib/libheimipcc/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#$FreeBSD$

PACKAGE= kerberos

LIB= heimipcc
PRIVATELIB=
LIBADD= heimbase roken pthread
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/lib/libheimipcs/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#$FreeBSD$

PACKAGE= kerberos

LIB= heimipcs
PRIVATELIB=
LIBADD= heimbase roken pthread
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/lib/libheimntlm/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

LIB= heimntlm
LDFLAGS= -Wl,--no-undefined
LIBADD= crypto com_err krb5 roken
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/lib/libhx509/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

LIB= hx509
LDFLAGS= -Wl,--no-undefined
VERSION_MAP= ${KRB5DIR}/lib/hx509/version-script.map
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/lib/libkadm5clnt/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

LIB= kadm5clnt
LDFLAGS= -Wl,--no-undefined
LIBADD= com_err krb5 roken
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/lib/libkadm5srv/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

LIB= kadm5srv
LDFLAGS= -Wl,--no-undefined
LIBADD= com_err hdb krb5 roken
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/lib/libkafs5/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

LIB= kafs5
LDFLAGS= -Wl,--no-undefined
LIBADD= asn1 krb5 roken
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/lib/libkdc/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#$FreeBSD$

PACKAGE= kerberos

LIB= kdc
LDFLAGS= -Wl,--no-undefined
VERSION_MAP= ${KRB5DIR}/kdc/version-script.map
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/lib/libkrb5/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

LIB= krb5
LDFLAGS= -Wl,--no-undefined
VERSION_MAP= ${KRB5DIR}/lib/krb5/version-script.map
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/lib/libroken/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

LIB= roken
LIBADD= crypt
VERSION_MAP= ${KRB5DIR}/lib/roken/version-script.map
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/lib/libsl/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

LIB= sl
INTERNALLIB=
SRCS= sl.c
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/lib/libvers/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

LIB= vers
INTERNALLIB=
SRCS= print_version.c roken.h
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/lib/libwind/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#$FreeBSD$

PACKAGE= kerberos

LIB= wind
LDFLAGS= -Wl,--no-undefined
VERSION_MAP= ${KRB5DIR}/lib/wind/version-script.map
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/libexec/digest-service/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

PROG= digest-service
MAN=
CFLAGS+= -I${KRB5DIR}/kdc \
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/libexec/hprop/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

PROG= hprop
MAN= hprop.8
SRCS= hprop.c mit_dump.c
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/libexec/hpropd/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

PROG= hpropd
MAN= hpropd.8
CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 \
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/libexec/ipropd-master/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

PROG= ipropd-master
MAN= iprop.8
SRCS= ipropd_common.c ipropd_master.c kadm5_err.h
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/libexec/ipropd-slave/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

PROG= ipropd-slave
MAN=
SRCS= ipropd_common.c ipropd_slave.c kadm5_err.h
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/libexec/kadmind/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

PROG= kadmind
MAN= kadmind.8
SRCS= rpc.c \
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/libexec/kcm/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

PROG= kcm
MAN= kcm.8

Expand Down
2 changes: 2 additions & 0 deletions kerberos5/libexec/kdc/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

PROG= kdc
MAN= kdc.8

Expand Down
2 changes: 2 additions & 0 deletions kerberos5/libexec/kdigest/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

PROG= kdigest
MAN= kdigest.8
CFLAGS+= -I${KRB5DIR}/lib/asn1 \
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/libexec/kfd/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

PROG= kfd
MAN= kfd.8
CFLAGS+= -I${KRB5DIR}/lib/asn1 \
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/libexec/kimpersonate/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

PROG= kimpersonate
MAN= kimpersonate.8
CFLAGS+= -I${KRB5DIR}/lib/hx509 \
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/libexec/kpasswdd/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

PROG= kpasswdd
MAN= kpasswdd.8
CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/libhdb ${LDAPCFLAGS}
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/tools/asn1_compile/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

PROG= asn1_compile
MAN=
LIBROKEN_A= ${.OBJDIR:H:H}/lib/libroken/libroken.a
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/tools/make-roken/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

PROG= make-roken
MAN=

Expand Down
2 changes: 2 additions & 0 deletions kerberos5/tools/slc/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

PROG= slc
LIBROKEN_A= ${.OBJDIR:H:H}/lib/libroken/libroken.a
LIBADD= vers
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/usr.bin/hxtool/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

PROG= hxtool
MAN=
CFLAGS+= -I${KRB5DIR}/lib/hx509 \
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/usr.bin/kadmin/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

PROG= kadmin
MAN= kadmin.8

Expand Down
2 changes: 2 additions & 0 deletions kerberos5/usr.bin/kcc/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

PROG= kcc
MAN= klist.1 kswitch.1
LINKS= ${BINDIR}/kcc ${BINDIR}/klist \
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/usr.bin/kdestroy/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

PROG= kdestroy
CFLAGS+=-I${KRB5DIR}/lib/roken
LIBADD= kafs5 krb5 roken vers
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/usr.bin/kf/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

PROG= kf
MAN= kf.1
CFLAGS+= -I${KRB5DIR}/lib/asn1 \
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/usr.bin/kgetcred/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

PROG= kgetcred
CFLAGS+= -I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/roken
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/usr.bin/kinit/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

PROG= kinit
CFLAGS+=-I${KRB5DIR}/lib/roken
LIBADD= kafs5 krb5 heimntlm roken crypto vers
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/usr.bin/kpasswd/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

PROG= kpasswd
CFLAGS+=-I${KRB5DIR}/lib/roken
LIBADD= hdb krb5 roken vers crypto
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/usr.bin/krb5-config/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

SCRIPTS=krb5-config
MAN= krb5-config.1

Expand Down
2 changes: 2 additions & 0 deletions kerberos5/usr.bin/ksu/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

PROG= ksu
.if defined(ENABLE_SUID_K5SU)
BINMODE=4555
Expand Down
2 changes: 2 additions & 0 deletions kerberos5/usr.bin/string2key/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= kerberos

PROG= string2key
MAN= string2key.8
CFLAGS+= -I${KRB5DIR}/kdc \
Expand Down
Loading

0 comments on commit d5e3ee5

Please sign in to comment.