git: 6e4dbb7feff4 - main - pkgbase: split kerberos binaries and libs

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Doug Rabson <dfr_at_FreeBSD.org>
Date: Wed, 03 Aug 2022 10:04:13 UTC
The branch main has been updated by dfr:

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

commit 6e4dbb7feff42275c3025dbc25d6ea6cce4e5fd7
Author:     Doug Rabson <dfr@FreeBSD.org>
AuthorDate: 2022-07-29 09:14:34 +0000
Commit:     Doug Rabson <dfr@FreeBSD.org>
CommitDate: 2022-08-03 10:02:28 +0000

    pkgbase: split kerberos binaries and libs
    
    Summary:
    This allows installing packages that depend on kerberos libraries
    without pulling in all the binaries. It also moves libgssapi to runtime
    to allow installing kerbereos libraries without adding a dependancy on
    the large utilities package. It makes sense to put libgssapi in runtime
    rather than kerberos-lib since this is a plugin layer which is intended
    to support any GSS-API mechanisms, not just kerberos.
    
    A good example of a package which uses kerberos libraries without
    needing the kerberos utilities is sshd. This uses the kerberos GSS-API
    libraries to implement its GSSAPIAuthentication option.
    
    MFC after: 2 weeks
    
    Subscribers: imp
    
    Differential Revision: https://reviews.freebsd.org/D36028
---
 kerberos5/lib/libasn1/Makefile          | 2 +-
 kerberos5/lib/libgssapi_krb5/Makefile   | 2 +-
 kerberos5/lib/libgssapi_ntlm/Makefile   | 2 +-
 kerberos5/lib/libgssapi_spnego/Makefile | 2 +-
 kerberos5/lib/libhdb/Makefile           | 2 +-
 kerberos5/lib/libheimbase/Makefile      | 2 +-
 kerberos5/lib/libheimipcc/Makefile      | 2 +-
 kerberos5/lib/libheimipcs/Makefile      | 2 +-
 kerberos5/lib/libheimntlm/Makefile      | 2 +-
 kerberos5/lib/libhx509/Makefile         | 2 +-
 kerberos5/lib/libkadm5clnt/Makefile     | 2 +-
 kerberos5/lib/libkadm5srv/Makefile      | 2 +-
 kerberos5/lib/libkafs5/Makefile         | 2 +-
 kerberos5/lib/libkdc/Makefile           | 2 +-
 kerberos5/lib/libkrb5/Makefile          | 2 +-
 kerberos5/lib/libroken/Makefile         | 2 +-
 kerberos5/lib/libsl/Makefile            | 2 +-
 kerberos5/lib/libvers/Makefile          | 2 +-
 kerberos5/lib/libwind/Makefile          | 2 +-
 lib/libgssapi/Makefile                  | 1 +
 release/packages/Makefile.package       | 2 ++
 21 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/kerberos5/lib/libasn1/Makefile b/kerberos5/lib/libasn1/Makefile
index 1772965239e8..60213ce0673f 100644
--- a/kerberos5/lib/libasn1/Makefile
+++ b/kerberos5/lib/libasn1/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PACKAGE=	kerberos
+PACKAGE=	kerberos-lib
 
 LIB=	asn1
 LDFLAGS=	-Wl,--no-undefined
diff --git a/kerberos5/lib/libgssapi_krb5/Makefile b/kerberos5/lib/libgssapi_krb5/Makefile
index fe64b99d57f0..3d50b002d9c9 100644
--- a/kerberos5/lib/libgssapi_krb5/Makefile
+++ b/kerberos5/lib/libgssapi_krb5/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PACKAGE=	kerberos
+PACKAGE=	kerberos-lib
 
 LIB=	gssapi_krb5
 LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined
diff --git a/kerberos5/lib/libgssapi_ntlm/Makefile b/kerberos5/lib/libgssapi_ntlm/Makefile
index 224404600205..a6860d54add9 100644
--- a/kerberos5/lib/libgssapi_ntlm/Makefile
+++ b/kerberos5/lib/libgssapi_ntlm/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PACKAGE=	kerberos
+PACKAGE=	kerberos-lib
 
 LIB=	gssapi_ntlm
 LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined
diff --git a/kerberos5/lib/libgssapi_spnego/Makefile b/kerberos5/lib/libgssapi_spnego/Makefile
index bfd235b27981..609ecd69c79c 100644
--- a/kerberos5/lib/libgssapi_spnego/Makefile
+++ b/kerberos5/lib/libgssapi_spnego/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PACKAGE=	kerberos
+PACKAGE=	kerberos-lib
 
 LIB=	gssapi_spnego
 LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined
diff --git a/kerberos5/lib/libhdb/Makefile b/kerberos5/lib/libhdb/Makefile
index 647ee1513148..f39d54d6c2d7 100644
--- a/kerberos5/lib/libhdb/Makefile
+++ b/kerberos5/lib/libhdb/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PACKAGE=	kerberos
+PACKAGE=	kerberos-lib
 
 LIB=	hdb
 LDFLAGS=	-Wl,--no-undefined ${LDAPLDFLAGS}
diff --git a/kerberos5/lib/libheimbase/Makefile b/kerberos5/lib/libheimbase/Makefile
index d98d6ebbb4f4..b369b666f2ec 100644
--- a/kerberos5/lib/libheimbase/Makefile
+++ b/kerberos5/lib/libheimbase/Makefile
@@ -1,6 +1,6 @@
 #$FreeBSD$
 
-PACKAGE=	kerberos
+PACKAGE=	kerberos-lib
 
 LIB=	heimbase
 LDFLAGS=	-Wl,--no-undefined
diff --git a/kerberos5/lib/libheimipcc/Makefile b/kerberos5/lib/libheimipcc/Makefile
index d102058720e7..3cebdee96941 100644
--- a/kerberos5/lib/libheimipcc/Makefile
+++ b/kerberos5/lib/libheimipcc/Makefile
@@ -1,6 +1,6 @@
 #$FreeBSD$
 
-PACKAGE=	kerberos
+PACKAGE=	kerberos-lib
 
 LIB=	heimipcc
 PRIVATELIB=
diff --git a/kerberos5/lib/libheimipcs/Makefile b/kerberos5/lib/libheimipcs/Makefile
index 308b5ecd6840..17e81702061c 100644
--- a/kerberos5/lib/libheimipcs/Makefile
+++ b/kerberos5/lib/libheimipcs/Makefile
@@ -1,6 +1,6 @@
 #$FreeBSD$
 
-PACKAGE=	kerberos
+PACKAGE=	kerberos-lib
 
 LIB=	heimipcs
 PRIVATELIB=
diff --git a/kerberos5/lib/libheimntlm/Makefile b/kerberos5/lib/libheimntlm/Makefile
index a422ef641a49..03f37a6ad71d 100644
--- a/kerberos5/lib/libheimntlm/Makefile
+++ b/kerberos5/lib/libheimntlm/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PACKAGE=	kerberos
+PACKAGE=	kerberos-lib
 
 LIB=	heimntlm
 LDFLAGS=	-Wl,--no-undefined
diff --git a/kerberos5/lib/libhx509/Makefile b/kerberos5/lib/libhx509/Makefile
index 175dc63a0bb7..a17216d254a6 100644
--- a/kerberos5/lib/libhx509/Makefile
+++ b/kerberos5/lib/libhx509/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PACKAGE=	kerberos
+PACKAGE=	kerberos-lib
 
 LIB=	hx509
 LDFLAGS=	-Wl,--no-undefined
diff --git a/kerberos5/lib/libkadm5clnt/Makefile b/kerberos5/lib/libkadm5clnt/Makefile
index e336f85fc302..94359aa40c7c 100644
--- a/kerberos5/lib/libkadm5clnt/Makefile
+++ b/kerberos5/lib/libkadm5clnt/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PACKAGE=	kerberos
+PACKAGE=	kerberos-lib
 
 LIB=	kadm5clnt
 LDFLAGS=	-Wl,--no-undefined
diff --git a/kerberos5/lib/libkadm5srv/Makefile b/kerberos5/lib/libkadm5srv/Makefile
index fac25253d26e..d07aecf6781b 100644
--- a/kerberos5/lib/libkadm5srv/Makefile
+++ b/kerberos5/lib/libkadm5srv/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PACKAGE=	kerberos
+PACKAGE=	kerberos-lib
 
 LIB=	kadm5srv
 LDFLAGS=	-Wl,--no-undefined
diff --git a/kerberos5/lib/libkafs5/Makefile b/kerberos5/lib/libkafs5/Makefile
index 67ad3920bbd9..a522aea3ad75 100644
--- a/kerberos5/lib/libkafs5/Makefile
+++ b/kerberos5/lib/libkafs5/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PACKAGE=	kerberos
+PACKAGE=	kerberos-lib
 
 LIB=	kafs5
 LDFLAGS=	-Wl,--no-undefined
diff --git a/kerberos5/lib/libkdc/Makefile b/kerberos5/lib/libkdc/Makefile
index 423a8919bc28..e98967d0c3d1 100644
--- a/kerberos5/lib/libkdc/Makefile
+++ b/kerberos5/lib/libkdc/Makefile
@@ -1,6 +1,6 @@
 #$FreeBSD$
 
-PACKAGE=	kerberos
+PACKAGE=	kerberos-lib
 
 LIB=	kdc
 LDFLAGS=	-Wl,--no-undefined
diff --git a/kerberos5/lib/libkrb5/Makefile b/kerberos5/lib/libkrb5/Makefile
index 2aaa0da9fe1e..2f3304dc4e7d 100644
--- a/kerberos5/lib/libkrb5/Makefile
+++ b/kerberos5/lib/libkrb5/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PACKAGE=	kerberos
+PACKAGE=	kerberos-lib
 
 LIB=	krb5
 LDFLAGS=	-Wl,--no-undefined
diff --git a/kerberos5/lib/libroken/Makefile b/kerberos5/lib/libroken/Makefile
index bea5694ce348..92e1301cb335 100644
--- a/kerberos5/lib/libroken/Makefile
+++ b/kerberos5/lib/libroken/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PACKAGE=	kerberos
+PACKAGE=	kerberos-lib
 
 LIB=	roken
 LIBADD=	crypt
diff --git a/kerberos5/lib/libsl/Makefile b/kerberos5/lib/libsl/Makefile
index 766d5931d8d8..f98fcb3da7d1 100644
--- a/kerberos5/lib/libsl/Makefile
+++ b/kerberos5/lib/libsl/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PACKAGE=	kerberos
+PACKAGE=	kerberos-lib
 
 LIB=	sl
 INTERNALLIB=
diff --git a/kerberos5/lib/libvers/Makefile b/kerberos5/lib/libvers/Makefile
index a4f46d62f043..9585337fce39 100644
--- a/kerberos5/lib/libvers/Makefile
+++ b/kerberos5/lib/libvers/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PACKAGE=	kerberos
+PACKAGE=	kerberos-lib
 
 LIB=	vers
 INTERNALLIB=
diff --git a/kerberos5/lib/libwind/Makefile b/kerberos5/lib/libwind/Makefile
index ef1ca66696c9..6c11415f7005 100644
--- a/kerberos5/lib/libwind/Makefile
+++ b/kerberos5/lib/libwind/Makefile
@@ -1,6 +1,6 @@
 #$FreeBSD$
 
-PACKAGE=	kerberos
+PACKAGE=	kerberos-lib
 
 LIB=	wind
 LDFLAGS=	-Wl,--no-undefined
diff --git a/lib/libgssapi/Makefile b/lib/libgssapi/Makefile
index 3094631e8536..0982b88ab59c 100644
--- a/lib/libgssapi/Makefile
+++ b/lib/libgssapi/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE= runtime
 LIB=		gssapi
 SHLIB_MAJOR=	10
 VERSION_DEF=	${SRCTOP}/lib/libc/Versions.def
diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
index 0edee34d8556..7c076d4b2a7c 100644
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -75,6 +75,8 @@ jail-lib32-development_DESCR=32-bit Development Files
 jail-lib32-profile_DESCR=32-bit Profiling Libraries
 kerberos_COMMENT=	Kerberos Utilities
 kerberos_DESC=		Kerberos Utilities
+kerberos-lib_COMMENT=	Kerberos Libraries
+kerberos-lib_DESC=	Kerberos Libraries
 kernel_COMMENT= 	FreeBSD Kernel
 kernel_DESC= 		FreeBSD Kernel
 manuals_COMMENT= 	Manual Pages