diff options
| -rw-r--r-- | meta/recipes-connectivity/bind/bind_9.18.20.bb | 5 | ||||
| -rw-r--r-- | meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.3.bb | 1 | ||||
| -rw-r--r-- | meta/recipes-connectivity/openssh/openssh_9.5p1.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-extended/cups/cups.inc | 3 | ||||
| -rw-r--r-- | meta/recipes-extended/libtirpc/libtirpc_1.3.4.bb | 5 | ||||
| -rw-r--r-- | meta/recipes-support/curl/curl_8.4.0.bb | 5 | ||||
| -rw-r--r-- | meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-support/libsoup/libsoup_3.4.4.bb | 2 |
8 files changed, 15 insertions, 10 deletions
diff --git a/meta/recipes-connectivity/bind/bind_9.18.20.bb b/meta/recipes-connectivity/bind/bind_9.18.20.bb index 187685eef57..7b61682ceb5 100644 --- a/meta/recipes-connectivity/bind/bind_9.18.20.bb +++ b/meta/recipes-connectivity/bind/bind_9.18.20.bb @@ -33,14 +33,15 @@ CVE_STATUS[CVE-2019-6470] = "not-applicable-config: Issue only affects dhcpd wit inherit autotools update-rc.d systemd useradd pkgconfig multilib_header update-alternatives # PACKAGECONFIGs readline and libedit should NOT be set at same time -PACKAGECONFIG ?= "readline" +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'krb5', 'gssapi', '', d)} readline" +PACKAGECONFIG[gssapi] = "--with-gssapi=yes,--with-gssapi=no,krb5" PACKAGECONFIG[httpstats] = "--with-libxml2=${STAGING_DIR_HOST}${prefix},--without-libxml2,libxml2" PACKAGECONFIG[readline] = "--with-readline=readline,,readline" PACKAGECONFIG[libedit] = "--with-readline=libedit,,libedit" PACKAGECONFIG[dns-over-http] = "--enable-doh,--disable-doh,nghttp2" EXTRA_OECONF = " --disable-auto-validation \ - --with-gssapi=no --with-lmdb=no --with-zlib \ + --with-lmdb=no --with-zlib \ --sysconfdir=${sysconfdir}/bind \ --with-openssl=${STAGING_DIR_HOST}${prefix} \ " diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.3.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.3.bb index 5f337cf2214..b169d84f876 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.3.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.3.bb @@ -64,6 +64,7 @@ LDFLAGS:append = " -lsqlite3 -levent" PACKAGECONFIG ??= "tcp-wrappers nfsv4 nfsv41 \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 systemd', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'krb5', 'gssapi', '', d)} \ " PACKAGECONFIG:remove:libc-musl = "tcp-wrappers" diff --git a/meta/recipes-connectivity/openssh/openssh_9.5p1.bb b/meta/recipes-connectivity/openssh/openssh_9.5p1.bb index bbb8fb091ad..1813a4a662b 100644 --- a/meta/recipes-connectivity/openssh/openssh_9.5p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_9.5p1.bb @@ -55,7 +55,7 @@ SYSTEMD_SERVICE:${PN}-sshd = "sshd.socket sshd.service" inherit autotools-brokensep ptest pkgconfig DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'krb5', 'kerberos', '', d)}" PACKAGECONFIG[kerberos] = "--with-kerberos5,--without-kerberos5,krb5" PACKAGECONFIG[ldns] = "--with-ldns,--without-ldns,ldns" PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit" diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index ff5f55e62a2..7f62c96db28 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -37,12 +37,14 @@ GROUPADD_PARAM:${PN} = "--system lpadmin" SYSTEMD_SERVICE:${PN} = "cups.socket cups.path cups.service cups-lpd.socket" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'krb5', 'gssapi', '', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)} \ openssl \ " PACKAGECONFIG[avahi] = "--with-dnssd=avahi,--with-dnssd=no,avahi" PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl" PACKAGECONFIG[gnutls] = "--with-tls=gnutls,,gnutls,,,openssl" +PACKAGECONFIG[gssapi] = "--enable-gssapi,--disable-gssapi,krb5" PACKAGECONFIG[openssl] = "--with-tls=openssl,,openssl,,,gnutls" PACKAGECONFIG[pam] = "--enable-pam --with-pam-module=unix, --disable-pam, libpam" PACKAGECONFIG[systemd] = "--with-systemd=${systemd_system_unitdir},--without-systemd,systemd" @@ -53,7 +55,6 @@ EXTRA_OECONF = " \ --enable-dbus \ --with-dbusdir=${sysconfdir}/dbus-1 \ --enable-browsing \ - --disable-gssapi \ --enable-debug \ --disable-relro \ --enable-libusb \ diff --git a/meta/recipes-extended/libtirpc/libtirpc_1.3.4.bb b/meta/recipes-extended/libtirpc/libtirpc_1.3.4.bb index 16c7a6007ac..20794096ee9 100644 --- a/meta/recipes-extended/libtirpc/libtirpc_1.3.4.bb +++ b/meta/recipes-extended/libtirpc/libtirpc_1.3.4.bb @@ -20,12 +20,11 @@ CVE_STATUS[CVE-2021-46828] = "fixed-version: fixed in 1.3.3rc1 so not present in inherit autotools pkgconfig -PACKAGECONFIG ??= "" -PACKAGECONFIG[gssapi] = "--enable-gssapi,--disable-gssapi,krb5" - PACKAGECONFIG ??= "\ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'krb5', 'gssapi', '', d)} \ " +PACKAGECONFIG[gssapi] = "--enable-gssapi,--disable-gssapi,krb5" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6" do_install:append() { diff --git a/meta/recipes-support/curl/curl_8.4.0.bb b/meta/recipes-support/curl/curl_8.4.0.bb index 5f97730bf4c..f1bec26df1d 100644 --- a/meta/recipes-support/curl/curl_8.4.0.bb +++ b/meta/recipes-support/curl/curl_8.4.0.bb @@ -24,7 +24,10 @@ inherit autotools pkgconfig binconfig multilib_header ptest # Entropy source for random PACKAGECONFIG option RANDOM ?= "/dev/urandom" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} aws basic-auth bearer-auth digest-auth negotiate-auth libidn openssl proxy random threaded-resolver verbose zlib" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 krb5', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'krb5', 'kerberos-auth', '', d)} \ + aws basic-auth bearer-auth digest-auth negotiate-auth libidn openssl \ + proxy random threaded-resolver verbose zlib" PACKAGECONFIG:class-native = "ipv6 openssl proxy random threaded-resolver verbose zlib" PACKAGECONFIG:class-nativesdk = "ipv6 openssl proxy random threaded-resolver verbose zlib" diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb index ee20530b644..1b583960424 100644 --- a/meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb +++ b/meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb @@ -26,7 +26,7 @@ UPSTREAM_CHECK_REGEX = "libsoup-(?P<pver>2(\.(?!99)\d+)+)\.tar" GIR_MESON_ENABLE_FLAG = 'enabled' GIR_MESON_DISABLE_FLAG = 'disabled' -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'krb5', 'gssapi', '', d)}" PACKAGECONFIG[brotli] = "-Dbrotli=enabled,-Dbrotli=disabled,brotli" # libsoup-gnome is entirely deprecated and just stubs in 2.42 onwards PACKAGECONFIG[gnome] = "-Dgnome=true,-Dgnome=false" diff --git a/meta/recipes-support/libsoup/libsoup_3.4.4.bb b/meta/recipes-support/libsoup/libsoup_3.4.4.bb index 6d382a7852c..ff2df583fe0 100644 --- a/meta/recipes-support/libsoup/libsoup_3.4.4.bb +++ b/meta/recipes-support/libsoup/libsoup_3.4.4.bb @@ -24,7 +24,7 @@ inherit meson gettext pkgconfig upstream-version-is-even gobject-introspection g GIR_MESON_ENABLE_FLAG = 'enabled' GIR_MESON_DISABLE_FLAG = 'disabled' -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'krb5', 'gssapi', '', d)}" PACKAGECONFIG[brotli] = "-Dbrotli=enabled,-Dbrotli=disabled,brotli" PACKAGECONFIG[gssapi] = "-Dgssapi=enabled,-Dgssapi=disabled,krb5" PACKAGECONFIG[ntlm] = "-Dntlm=enabled,-Dntlm=disabled" |