diff options
Diffstat (limited to 'meta/recipes-extended/cups/cups.inc')
-rw-r--r-- | meta/recipes-extended/cups/cups.inc | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index f6d54c7cf2..6cfe314f20 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc | |||
@@ -13,6 +13,11 @@ SRC_URI = "https://github.com/apple/cups/releases/download/v${PV}/${BP}-source.t | |||
13 | file://0002-don-t-try-to-run-generated-binaries.patch \ | 13 | file://0002-don-t-try-to-run-generated-binaries.patch \ |
14 | file://0003-cups_1.4.6.bb-Fix-build-on-ppc64.patch \ | 14 | file://0003-cups_1.4.6.bb-Fix-build-on-ppc64.patch \ |
15 | file://0004-cups-fix-multilib-install-file-conflicts.patch\ | 15 | file://0004-cups-fix-multilib-install-file-conflicts.patch\ |
16 | file://CVE-2022-26691.patch \ | ||
17 | file://CVE-2023-32324.patch \ | ||
18 | file://CVE-2023-34241.patch \ | ||
19 | file://CVE-2023-32360.patch \ | ||
20 | file://CVE-2023-4504.patch \ | ||
16 | " | 21 | " |
17 | 22 | ||
18 | UPSTREAM_CHECK_URI = "https://github.com/apple/cups/releases" | 23 | UPSTREAM_CHECK_URI = "https://github.com/apple/cups/releases" |
@@ -41,7 +46,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', | |||
41 | PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" | 46 | PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" |
42 | PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl" | 47 | PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl" |
43 | PACKAGECONFIG[pam] = "--enable-pam --with-pam-module=unix, --disable-pam, libpam" | 48 | PACKAGECONFIG[pam] = "--enable-pam --with-pam-module=unix, --disable-pam, libpam" |
44 | PACKAGECONFIG[systemd] = "--with-systemd=${systemd_system_unitdir},--without-systemd,systemd" | 49 | PACKAGECONFIG[systemd] = "--with-systemd=${systemd_system_unitdir},--disable-systemd,systemd" |
45 | PACKAGECONFIG[xinetd] = "--with-xinetd=${sysconfdir}/xinetd.d,--without-xinetd,xinetd" | 50 | PACKAGECONFIG[xinetd] = "--with-xinetd=${sysconfdir}/xinetd.d,--without-xinetd,xinetd" |
46 | 51 | ||
47 | EXTRA_OECONF = " \ | 52 | EXTRA_OECONF = " \ |
@@ -52,6 +57,9 @@ EXTRA_OECONF = " \ | |||
52 | --enable-debug \ | 57 | --enable-debug \ |
53 | --disable-relro \ | 58 | --disable-relro \ |
54 | --enable-libusb \ | 59 | --enable-libusb \ |
60 | --with-system-groups=lpadmin \ | ||
61 | --with-cups-group=lp \ | ||
62 | --with-domainsocket=/run/cups/cups.sock \ | ||
55 | DSOFLAGS='${LDFLAGS}' \ | 63 | DSOFLAGS='${LDFLAGS}' \ |
56 | " | 64 | " |
57 | 65 | ||
@@ -113,3 +121,7 @@ SYSROOT_PREPROCESS_FUNCS += "cups_sysroot_preprocess" | |||
113 | cups_sysroot_preprocess () { | 121 | cups_sysroot_preprocess () { |
114 | sed -i ${SYSROOT_DESTDIR}${bindir_crossscripts}/cups-config -e 's:cups_datadir=.*:cups_datadir=${datadir}/cups:' -e 's:cups_serverbin=.*:cups_serverbin=${libexecdir}/cups:' | 122 | sed -i ${SYSROOT_DESTDIR}${bindir_crossscripts}/cups-config -e 's:cups_datadir=.*:cups_datadir=${datadir}/cups:' -e 's:cups_serverbin=.*:cups_serverbin=${libexecdir}/cups:' |
115 | } | 123 | } |
124 | |||
125 | # -25317 concerns /var/log/cups having lp ownership. Our /var/log/cups is | ||
126 | # root:root, so this doesn't apply. | ||
127 | CVE_CHECK_WHITELIST += "CVE-2021-25317" | ||