From nobody Fri Aug 19 13:27:37 2022 X-Original-To: dev-commits-src-branches@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 4M8Mxj5S4Pz4Z7qk; Fri, 19 Aug 2022 13:27:37 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M8Mxj4xVPz47DZ; Fri, 19 Aug 2022 13:27:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660915657; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8kZdTRmHjTqxZiFdtvOkm3QVV4nCIBztIhMPdYwikls=; b=JKZK6R72eOSTJjQ3rXv2lLNfG0ryNo1Qe7Xz6qckO4cCJ2LYlp5SK8bRM1loEL2Qq5Hw/T uzCqMxj5bRp+NwFNdbK7s94vqk8AJVih5UjKlrGMRPzYth4S45wL1rc/oDZ0/+I1YYid4b P+bC0004ZftOxfNXVJKXNyaPgbF/MYSL59kmWy7b5hTsyFZHr5TTcfN++CPCC0JZfixNog yMHbp1TxRngWFoHK4u1zEb9ByUMBZkA71379wIRDQSjKkJeLcZKArM0jip+rHQHV/a/BPH WUCbY4oQaR/eLJzZXcgQmBoeN7L/IfqYVqyrLVqsJQkipWVBq4BiDVwa9Z5yrg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4M8Mxj3pCvzv3c; Fri, 19 Aug 2022 13:27:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27JDRb3K008100; Fri, 19 Aug 2022 13:27:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27JDRbEr008099; Fri, 19 Aug 2022 13:27:37 GMT (envelope-from git) Date: Fri, 19 Aug 2022 13:27:37 GMT Message-Id: <202208191327.27JDRbEr008099@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Doug Rabson Subject: git: f5bbed62172b - stable/13 - pkgbase: split kerberos binaries and libs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dfr X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f5bbed62172b067cd8a2cf685b3b1314cf883efa Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660915657; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8kZdTRmHjTqxZiFdtvOkm3QVV4nCIBztIhMPdYwikls=; b=h6cNdU3K7yyZCw7F3UcpkZslEwWEJVqrIWNRER7QcRhHLHTgviktyzMbsNBHTmJ0eipDMZ IdV7EnINTG9O4am7jh1ozW6+jwfs7X2ewk2YH05SzB3jnMAi5VagC3VYwaiYSy/jsR4J6j 1GdZlNCOvjbhz5dJRqxTCaCCzGjsNKFoFvpMkSl3ikN9ts6vTKlwbQpFAvqBw/Uraha2mn Zc4eTTePcxrqQCZ85e5FlyxrPRnhHL/7S0Ao3V5Xc4rQd+/3ULWLetn/So7ZfTYBB1HVlX dRAtA8X+UsDHa9Q3tw8+FMONGVANRtQ4MUBhW1NEv+aRKu/zOQpiti1fYMqQZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660915657; a=rsa-sha256; cv=none; b=h6ZLomEeGhp6+/QX+lSMmvrfiL7fc7jYF+nna6w6zi9qHwlsAcG3nXpYlVlAppKuWSmnL3 mGu82sr2oxLYqQ6epe+OTLqshbGVrCtKn8KxgZYYoCgv60jUOJ03lkgYATxcyeZMbRu2yG B3qMjzNqwuW2Fahy2CxbK7C4ORCcudrJ9g7h/J1QpJCQ/TeVsUS8cKoWKgslwYF8nmR3pt cxB/niiQVL8kGuhLkenbZ2TMDEnMDuSBgaIKThmWT3+PGMt5b4nEloBaM80uR9GL0wdj7c zXNuczOFylLJ4yXXpc9ObbaG/tnRbvp+73nL0VXipmG5g0QbvFanguxuvPXaRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=f5bbed62172b067cd8a2cf685b3b1314cf883efa commit f5bbed62172b067cd8a2cf685b3b1314cf883efa Author: Doug Rabson AuthorDate: 2022-07-29 09:14:34 +0000 Commit: Doug Rabson CommitDate: 2022-08-19 13:27:16 +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 (cherry picked from commit 6e4dbb7feff42275c3025dbc25d6ea6cce4e5fd7) --- 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 a3739c11fa33..511adf4a65ce 100644 --- a/release/packages/Makefile.package +++ b/release/packages/Makefile.package @@ -73,6 +73,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