kgess-mirror/freebsd-src
1
0
Fork 0
mirror of https://git.freebsd.org/src.git synced 2026-01-11 19:57:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

kerberos5: Fix the Heimdal pkgbase build

Browse source 
When LIB_PACKAGE was added, MIT Kerberos was updated to use it but
Heimdal was not, so it still used PACKAGE=kerberos-lib.  Since we
deleted kerberos-lib-all.ucl, this caused update-packages to fail
when WITHOUT_MITKRB5 is set.

Change the Heimdal libraries to use LIB_PACKAGE by setting this in
kerberos5/lib/Makefile.inc, and remove PACKAGE=kerberos-lib from the
individual Makefiles for each library.  This means Heimdal gets the
same set of packages as MIT Kerberos, except for kerberos-kdc which
we don't create for Heimdal.

Fixes:	929f5966a9 ("packages: Improve handling of -lib packages")
Reported by:	jlduran
Reviewed by:	jlduran, cy
Differential Revision:	https://reviews.freebsd.org/D52371
This commit is contained in:
Lexi Winter 2025-09-04 14:53:02 +01:00
parent 407c4d1eeb
commit 7e97c6adff
21 changed files with 4 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kerberos5/lib/Makefile.inc
View file

@ -1,3 +1,5 @@
PACKAGE= kerberos
LIB_PACKAGE=
SHLIB_MAJOR?= 11
.include "../Makefile.inc"

2
kerberos5/lib/libasn1/Makefile
View file

@ -1,5 +1,3 @@
PACKAGE= kerberos-lib
LIB= asn1
LDFLAGS+= -Wl,--no-undefined
INCS= asn1_err.h asn1-common.h heim_asn1.h der.h der-protos.h der-private.h

2
kerberos5/lib/libgssapi_krb5/Makefile
View file

@ -1,5 +1,3 @@
PACKAGE= kerberos-lib
LIB= gssapi_krb5
LDFLAGS+= -Wl,-Bsymbolic -Wl,--no-undefined
LIBADD= gssapi krb5 crypto roken asn1 com_err

2
kerberos5/lib/libgssapi_ntlm/Makefile
View file

@ -1,5 +1,3 @@
PACKAGE= kerberos-lib
LIB= gssapi_ntlm
LDFLAGS+= -Wl,-Bsymbolic -Wl,--no-undefined
LIBADD= crypto gssapi krb5 heimntlm roken

2
kerberos5/lib/libgssapi_spnego/Makefile
View file

@ -1,5 +1,3 @@
PACKAGE= kerberos-lib
LIB= gssapi_spnego
LDFLAGS+= -Wl,-Bsymbolic -Wl,--no-undefined
LIBADD= gssapi heimbase asn1 roken

2
kerberos5/lib/libhdb/Makefile
View file

@ -1,5 +1,3 @@
PACKAGE= kerberos-lib
LIB= hdb
LDFLAGS+= -Wl,--no-undefined ${LDAPLDFLAGS}
VERSION_MAP= ${KRB5DIR}/lib/hdb/version-script.map

2
kerberos5/lib/libheimbase/Makefile
View file

@ -1,5 +1,3 @@
PACKAGE= kerberos-lib
LIB= heimbase
LDFLAGS+= -Wl,--no-undefined
LIBADD= pthread

2
kerberos5/lib/libheimipcc/Makefile
View file

@ -1,5 +1,3 @@
PACKAGE= kerberos-lib
LIB= heimipcc
PRIVATELIB=
LIBADD= heimbase roken pthread

2
kerberos5/lib/libheimipcs/Makefile
View file

@ -1,5 +1,3 @@
PACKAGE= kerberos-lib
LIB= heimipcs
PRIVATELIB=
LIBADD= heimbase roken pthread

2
kerberos5/lib/libheimntlm/Makefile
View file

@ -1,5 +1,3 @@
PACKAGE= kerberos-lib
LIB= heimntlm
LDFLAGS+= -Wl,--no-undefined
LIBADD= crypto com_err krb5 roken

2
kerberos5/lib/libhx509/Makefile
View file

@ -1,5 +1,3 @@
PACKAGE= kerberos-lib
LIB= hx509
LDFLAGS+= -Wl,--no-undefined
VERSION_MAP= ${KRB5DIR}/lib/hx509/version-script.map

2
kerberos5/lib/libkadm5clnt/Makefile
View file

@ -1,5 +1,3 @@
PACKAGE= kerberos-lib
LIB= kadm5clnt
LDFLAGS+= -Wl,--no-undefined
LIBADD= com_err krb5 roken

2
kerberos5/lib/libkadm5srv/Makefile
View file

@ -1,5 +1,3 @@
PACKAGE= kerberos-lib
LIB= kadm5srv
LDFLAGS+= -Wl,--no-undefined
LIBADD= com_err hdb krb5 roken

2
kerberos5/lib/libkafs5/Makefile
View file

@ -1,5 +1,3 @@
PACKAGE= kerberos-lib
LIB= kafs5
LDFLAGS+= -Wl,--no-undefined
LIBADD= asn1 krb5 roken

2
kerberos5/lib/libkdc/Makefile
View file

@ -1,5 +1,3 @@
PACKAGE= kerberos-lib
LIB= kdc
LDFLAGS+= -Wl,--no-undefined
VERSION_MAP= ${KRB5DIR}/kdc/version-script.map

2
kerberos5/lib/libkrb5/Makefile
View file

@ -1,5 +1,3 @@
PACKAGE= kerberos-lib
LIB= krb5
LDFLAGS+= -Wl,--no-undefined
VERSION_MAP= ${KRB5DIR}/lib/krb5/version-script.map

2
kerberos5/lib/libroken/Makefile
View file

@ -1,5 +1,3 @@
PACKAGE= kerberos-lib
LIB= roken
LIBADD= crypt
VERSION_MAP= ${KRB5DIR}/lib/roken/version-script.map

2
kerberos5/lib/libsl/Makefile
View file

@ -1,5 +1,3 @@
PACKAGE= kerberos-lib
LIB= sl
INTERNALLIB=
SRCS= sl.c

2
kerberos5/lib/libvers/Makefile
View file

@ -1,5 +1,3 @@
PACKAGE= kerberos-lib
LIB= vers
INTERNALLIB=
SRCS= print_version.c roken.h

2
kerberos5/lib/libwind/Makefile
View file

@ -1,5 +1,3 @@
PACKAGE= kerberos-lib
LIB= wind
LDFLAGS+= -Wl,--no-undefined
VERSION_MAP= ${KRB5DIR}/lib/wind/version-script.map

3
lib/libcom_err/Makefile
View file

@ -1,4 +1,5 @@
PACKAGE= kerberos-lib
PACKAGE= kerberos
LIB_PACKAGE=
LIB= com_err
SRCS= com_err.c error.c