diff options
Diffstat (limited to 'meta/recipes-extended/cups')
7 files changed, 77 insertions, 221 deletions
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index 244c87001f..9688efafae 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc | |||
@@ -6,77 +6,68 @@ document types." | |||
6 | HOMEPAGE = "https://www.cups.org/" | 6 | HOMEPAGE = "https://www.cups.org/" |
7 | SECTION = "console/utils" | 7 | SECTION = "console/utils" |
8 | LICENSE = "Apache-2.0" | 8 | LICENSE = "Apache-2.0" |
9 | DEPENDS = "gnutls libpng jpeg dbus zlib libusb1" | 9 | DEPENDS = "libpng jpeg dbus zlib libusb1" |
10 | 10 | ||
11 | SRC_URI = "https://github.com/apple/cups/releases/download/v${PV}/${BP}-source.tar.gz \ | 11 | SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/cups-${PV}-source.tar.gz \ |
12 | file://0001-use-echo-only-in-init.patch \ | 12 | file://0001-use-echo-only-in-init.patch \ |
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://libexecdir.patch \ |
15 | file://0004-cups-fix-multilib-install-file-conflicts.patch \ | 15 | file://0004-cups-fix-multilib-install-file-conflicts.patch \ |
16 | file://volatiles.99_cups \ | 16 | file://volatiles.99_cups \ |
17 | file://cups-volatiles.conf \ | 17 | file://cups-volatiles.conf \ |
18 | file://CVE-2020-10001.patch \ | ||
19 | " | 18 | " |
20 | 19 | ||
21 | UPSTREAM_CHECK_URI = "https://github.com/apple/cups/releases" | 20 | GITHUB_BASE_URI = "https://github.com/OpenPrinting/cups/releases" |
22 | UPSTREAM_CHECK_REGEX = "cups-(?P<pver>\d+\.\d+(\.\d+)?)-source.tar" | ||
23 | 21 | ||
24 | # Issue only applies to MacOS | 22 | CVE_STATUS[CVE-2008-1033] = "not-applicable-platform: Issue only applies to MacOS" |
25 | CVE_CHECK_WHITELIST += "CVE-2008-1033" | 23 | CVE_STATUS[CVE-2009-0032] = "cpe-incorrect: Issue affects pdfdistiller plugin used with but not part of cups" |
26 | # Issue affects pdfdistiller plugin used with but not part of cups | 24 | CVE_STATUS[CVE-2018-6553] = "not-applicable-platform: This is an Ubuntu only issue" |
27 | CVE_CHECK_WHITELIST += "CVE-2009-0032" | 25 | CVE_STATUS[CVE-2022-26691] = "fixed-version: This is fixed in 2.4.2 but the cve-check class still reports it" |
28 | # This is an Ubuntu only issue. | 26 | CVE_STATUS[CVE-2021-25317] = "not-applicable-config: This concerns /var/log/cups having lp ownership, our /var/log/cups is root:root, so this doesn't apply." |
29 | CVE_CHECK_WHITELIST += "CVE-2018-6553" | ||
30 | 27 | ||
31 | LEAD_SONAME = "libcupsdriver.so" | 28 | LEAD_SONAME = "libcupsdriver.so" |
32 | 29 | ||
33 | CLEANBROKEN = "1" | 30 | CLEANBROKEN = "1" |
34 | 31 | ||
35 | inherit autotools-brokensep binconfig useradd systemd pkgconfig multilib_script | 32 | inherit autotools-brokensep binconfig useradd systemd pkgconfig multilib_script github-releases |
36 | 33 | ||
37 | USERADD_PACKAGES = "${PN}" | 34 | USERADD_PACKAGES = "${PN}" |
38 | GROUPADD_PARAM_${PN} = "--system lpadmin" | 35 | GROUPADD_PARAM:${PN} = "--system lpadmin" |
39 | 36 | ||
40 | SYSTEMD_SERVICE_${PN} = "org.cups.cupsd.socket org.cups.cupsd.path org.cups.cupsd.service org.cups.cups-lpd.socket" | 37 | SYSTEMD_SERVICE:${PN} = "cups.socket cups.path cups.service cups-lpd.socket" |
41 | 38 | ||
42 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ | 39 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ |
43 | ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)}" | 40 | ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)} \ |
44 | PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" | 41 | openssl \ |
42 | " | ||
43 | PACKAGECONFIG[avahi] = "--with-dnssd=avahi,--with-dnssd=no,avahi" | ||
45 | PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl" | 44 | PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl" |
45 | PACKAGECONFIG[gnutls] = "--with-tls=gnutls,,gnutls,,,openssl" | ||
46 | PACKAGECONFIG[openssl] = "--with-tls=openssl,,openssl,,,gnutls" | ||
46 | PACKAGECONFIG[pam] = "--enable-pam --with-pam-module=unix, --disable-pam, libpam" | 47 | PACKAGECONFIG[pam] = "--enable-pam --with-pam-module=unix, --disable-pam, libpam" |
47 | PACKAGECONFIG[systemd] = "--with-systemd=${systemd_system_unitdir},--without-systemd,systemd" | 48 | PACKAGECONFIG[systemd] = "--with-systemd=${systemd_system_unitdir},--without-systemd,systemd" |
48 | PACKAGECONFIG[xinetd] = "--with-xinetd=${sysconfdir}/xinetd.d,--without-xinetd,xinetd" | 49 | PACKAGECONFIG[xinetd] = "--with-xinetd=${sysconfdir}/xinetd.d,--without-xinetd,xinetd" |
50 | PACKAGECONFIG[webif] = "--enable-webif,--disable-webif" | ||
49 | 51 | ||
50 | EXTRA_OECONF = " \ | 52 | EXTRA_OECONF = " \ |
51 | --enable-gnutls \ | ||
52 | --enable-dbus \ | 53 | --enable-dbus \ |
54 | --with-dbusdir=${sysconfdir}/dbus-1 \ | ||
53 | --enable-browsing \ | 55 | --enable-browsing \ |
54 | --disable-gssapi \ | 56 | --disable-gssapi \ |
55 | --enable-debug \ | 57 | --enable-debug \ |
56 | --disable-relro \ | 58 | --disable-relro \ |
57 | --enable-libusb \ | 59 | --enable-libusb \ |
58 | --with-system-groups=lpadmin \ | 60 | --with-system-groups=lpadmin,root,sys,wheel \ |
59 | --with-cups-group=lp \ | 61 | --with-cups-group=lp \ |
60 | --with-domainsocket=/run/cups/cups.sock \ | 62 | --with-domainsocket=/run/cups/cups.sock \ |
63 | --with-pkgconfpath=${libdir}/pkgconfig \ | ||
61 | DSOFLAGS='${LDFLAGS}' \ | 64 | DSOFLAGS='${LDFLAGS}' \ |
62 | " | 65 | " |
63 | 66 | ||
64 | EXTRA_AUTORECONF += "--exclude=autoheader" | 67 | EXTRA_AUTORECONF += "--exclude=autoheader" |
65 | 68 | ||
66 | do_compile () { | ||
67 | echo "all:" > man/Makefile | ||
68 | echo "libs:" >> man/Makefile | ||
69 | echo "install:" >> man/Makefile | ||
70 | echo "install-data:" >> man/Makefile | ||
71 | echo "install-exec:" >> man/Makefile | ||
72 | echo "install-headers:" >> man/Makefile | ||
73 | echo "install-libs:" >> man/Makefile | ||
74 | |||
75 | oe_runmake | ||
76 | } | ||
77 | |||
78 | do_install () { | 69 | do_install () { |
79 | oe_runmake "DSTROOT=${D}" install | 70 | oe_runmake "BUILDROOT=${D}" install |
80 | 71 | ||
81 | # Remove /var/run from package as cupsd will populate it on startup | 72 | # Remove /var/run from package as cupsd will populate it on startup |
82 | rm -fr ${D}/${localstatedir}/run | 73 | rm -fr ${D}/${localstatedir}/run |
@@ -84,7 +75,7 @@ do_install () { | |||
84 | rmdir ${D}/${libexecdir}/${BPN}/driver | 75 | rmdir ${D}/${libexecdir}/${BPN}/driver |
85 | 76 | ||
86 | # Fix the pam configuration file permissions | 77 | # Fix the pam configuration file permissions |
87 | if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then | 78 | if ${@bb.utils.contains('PACKAGECONFIG', 'pam', 'true', 'false', d)}; then |
88 | chmod 0644 ${D}${sysconfdir}/pam.d/cups | 79 | chmod 0644 ${D}${sysconfdir}/pam.d/cups |
89 | fi | 80 | fi |
90 | 81 | ||
@@ -93,36 +84,34 @@ do_install () { | |||
93 | rm -rf ${D}${sysconfdir}/init.d/ | 84 | rm -rf ${D}${sysconfdir}/init.d/ |
94 | rm -rf ${D}${sysconfdir}/rc* | 85 | rm -rf ${D}${sysconfdir}/rc* |
95 | install -d ${D}${sysconfdir}/tmpfiles.d | 86 | install -d ${D}${sysconfdir}/tmpfiles.d |
96 | install -m 0644 ${WORKDIR}/cups-volatiles.conf \ | 87 | install -m 0644 ${UNPACKDIR}/cups-volatiles.conf \ |
97 | ${D}${sysconfdir}/tmpfiles.d/cups.conf | 88 | ${D}${sysconfdir}/tmpfiles.d/cups.conf |
98 | else | 89 | else |
99 | install -d ${D}${sysconfdir}/default/volatiles | 90 | install -d ${D}${sysconfdir}/default/volatiles |
100 | install -m 0644 ${WORKDIR}/volatiles.99_cups \ | 91 | install -m 0644 ${UNPACKDIR}/volatiles.99_cups \ |
101 | ${D}${sysconfdir}/default/volatiles/99_cups | 92 | ${D}${sysconfdir}/default/volatiles/99_cups |
102 | fi | 93 | fi |
103 | } | 94 | } |
104 | 95 | ||
105 | PACKAGES =+ "${PN}-lib ${PN}-libimage" | 96 | PACKAGES =+ "${PN}-lib ${PN}-libimage ${PN}-webif" |
106 | 97 | ||
107 | RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'procps', '', d)}" | 98 | RDEPENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'procps', '', d)}" |
108 | FILES_${PN} += "${libexecdir}/cups/ \ | 99 | FILES:${PN} += "${libexecdir}/cups/" |
109 | " | ||
110 | 100 | ||
111 | FILES_${PN}-lib = "${libdir}/libcups.so.*" | 101 | FILES:${PN}-lib = "${libdir}/libcups.so.*" |
112 | 102 | ||
113 | FILES_${PN}-libimage = "${libdir}/libcupsimage.so.*" | 103 | FILES:${PN}-libimage = "${libdir}/libcupsimage.so.*" |
114 | 104 | ||
115 | #package the html for the webgui inside the main packages (~1MB uncompressed) | 105 | # put the html for the web interface into its own PACKAGE |
106 | FILES:${PN}-webif += "${datadir}/doc/cups/ ${datadir}/icons/" | ||
107 | RRECOMMENDS:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'webif', '${PN}-webif', '', d)}" | ||
116 | 108 | ||
117 | FILES_${PN} += "${datadir}/doc/cups/images \ | 109 | CONFFILES:${PN} += "${sysconfdir}/cups/cupsd.conf" |
118 | ${datadir}/doc/cups/*html \ | ||
119 | ${datadir}/doc/cups/*.css \ | ||
120 | ${datadir}/icons/ \ | ||
121 | " | ||
122 | CONFFILES_${PN} += "${sysconfdir}/cups/cupsd.conf" | ||
123 | 110 | ||
124 | MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/cups-config" | 111 | MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/cups-config" |
125 | 112 | ||
113 | LOCALE_PATHS += "${datadir}/cups/templates" | ||
114 | |||
126 | SYSROOT_PREPROCESS_FUNCS += "cups_sysroot_preprocess" | 115 | SYSROOT_PREPROCESS_FUNCS += "cups_sysroot_preprocess" |
127 | cups_sysroot_preprocess () { | 116 | cups_sysroot_preprocess () { |
128 | sed -i ${SYSROOT_DESTDIR}${bindir_crossscripts}/cups-config -e 's:cups_datadir=.*:cups_datadir=${datadir}/cups:' -e 's:cups_serverbin=.*:cups_serverbin=${libexecdir}/cups:' | 117 | sed -i ${SYSROOT_DESTDIR}${bindir_crossscripts}/cups-config -e 's:cups_datadir=.*:cups_datadir=${datadir}/cups:' -e 's:cups_serverbin=.*:cups_serverbin=${libexecdir}/cups:' |
diff --git a/meta/recipes-extended/cups/cups/0002-don-t-try-to-run-generated-binaries.patch b/meta/recipes-extended/cups/cups/0002-don-t-try-to-run-generated-binaries.patch index ea248e4710..2bc26edbfc 100644 --- a/meta/recipes-extended/cups/cups/0002-don-t-try-to-run-generated-binaries.patch +++ b/meta/recipes-extended/cups/cups/0002-don-t-try-to-run-generated-binaries.patch | |||
@@ -26,48 +26,6 @@ index 32e2e0b..f1478d4 100644 | |||
26 | 26 | ||
27 | 27 | ||
28 | # | 28 | # |
29 | @@ -205,9 +205,9 @@ ppdc-static: ppdc.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) foo.drv foo-fr.po | ||
30 | $(LD_CXX) $(ARCHFLAGS) $(ALL_LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \ | ||
31 | $(LINKCUPSSTATIC) | ||
32 | $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ | ||
33 | - echo Testing PPD compiler... | ||
34 | - ./ppdc-static -l en,fr -I ../data foo.drv | ||
35 | - ./ppdc-static -l en,fr -z -I ../data foo.drv | ||
36 | +# echo Testing PPD compiler... | ||
37 | +# ./ppdc-static -l en,fr -I ../data foo.drv | ||
38 | +# ./ppdc-static -l en,fr -z -I ../data foo.drv | ||
39 | |||
40 | |||
41 | # | ||
42 | @@ -235,17 +235,17 @@ ppdi-static: ppdc-static ppdi.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) | ||
43 | $(LD_CXX) $(ARCHFLAGS) $(ALL_LDFLAGS) -o ppdi-static ppdi.o libcupsppdc.a \ | ||
44 | $(LINKCUPSSTATIC) | ||
45 | $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ | ||
46 | - echo Testing PPD importer... | ||
47 | - $(RM) -r ppd ppd2 sample-import.drv | ||
48 | - ./ppdc-static -l en -I ../data sample.drv | ||
49 | - ./ppdi-static -I ../data -o sample-import.drv ppd/* | ||
50 | - ./ppdc-static -l en -I ../data -d ppd2 sample-import.drv | ||
51 | - if diff -r ppd ppd2 >/dev/null; then \ | ||
52 | - echo PPD import OK; \ | ||
53 | - else \ | ||
54 | - echo PPD import FAILED; \ | ||
55 | - exit 1; \ | ||
56 | - fi | ||
57 | +# echo Testing PPD importer... | ||
58 | +# $(RM) -r ppd ppd2 sample-import.drv | ||
59 | +# ./ppdc-static -l en -I ../data sample.drv | ||
60 | +# ./ppdi-static -I ../data -o sample-import.drv ppd/* | ||
61 | +# ./ppdc-static -l en -I ../data -d ppd2 sample-import.drv | ||
62 | +# if diff -r ppd ppd2 >/dev/null; then \ | ||
63 | +# echo PPD import OK; \ | ||
64 | +# else \ | ||
65 | +# echo PPD import FAILED; \ | ||
66 | +# exit 1; \ | ||
67 | +# fi | ||
68 | |||
69 | |||
70 | # | ||
71 | -- | 29 | -- |
72 | 2.17.1 | 30 | 2.17.1 |
73 | 31 | ||
diff --git a/meta/recipes-extended/cups/cups/0003-cups_1.4.6.bb-Fix-build-on-ppc64.patch b/meta/recipes-extended/cups/cups/0003-cups_1.4.6.bb-Fix-build-on-ppc64.patch deleted file mode 100644 index b48c7a9ad2..0000000000 --- a/meta/recipes-extended/cups/cups/0003-cups_1.4.6.bb-Fix-build-on-ppc64.patch +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | From 66c2079ae91389ee0f9d704bf0d2cccd53b2c603 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 22 Jul 2012 16:54:17 -0700 | ||
4 | Subject: [PATCH 3/4] cups_1.4.6.bb: Fix build on ppc64 | ||
5 | |||
6 | Make CUPS_SERVERBIN relative to libdir otherwise on 64bit arches | ||
7 | e.g. ppc64 where base libdir is lib64 this does not go well | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | Upstream-Status: Inappropriate [OE config specific] | ||
11 | |||
12 | Update on 20190904: | ||
13 | Redefine CUPS_SERVERBIN to "$libexecdir/cups" which solves file confliction | ||
14 | when multilib is enabled. | ||
15 | |||
16 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
17 | |||
18 | --- | ||
19 | config-scripts/cups-directories.m4 | 2 +- | ||
20 | configure | 2 +- | ||
21 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
22 | |||
23 | diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4 | ||
24 | index b74083a..9a5abb2 100644 | ||
25 | --- a/config-scripts/cups-directories.m4 | ||
26 | +++ b/config-scripts/cups-directories.m4 | ||
27 | @@ -270,7 +270,7 @@ case "$host_os_name" in | ||
28 | *) | ||
29 | # All others | ||
30 | INSTALL_SYSV="install-sysv" | ||
31 | - CUPS_SERVERBIN="$exec_prefix/lib/cups" | ||
32 | + CUPS_SERVERBIN="$libexecdir/cups" | ||
33 | ;; | ||
34 | esac | ||
35 | |||
36 | diff --git a/configure b/configure | ||
37 | index d3df145..bc68a6c 100755 | ||
38 | --- a/configure | ||
39 | +++ b/configure | ||
40 | @@ -6420,7 +6420,7 @@ case "$host_os_name" in | ||
41 | *) | ||
42 | # All others | ||
43 | INSTALL_SYSV="install-sysv" | ||
44 | - CUPS_SERVERBIN="$exec_prefix/lib/cups" | ||
45 | + CUPS_SERVERBIN="$libexecdir/cups" | ||
46 | ;; | ||
47 | esac | ||
48 | |||
49 | -- | ||
50 | 2.17.1 | ||
51 | |||
diff --git a/meta/recipes-extended/cups/cups/CVE-2020-10001.patch b/meta/recipes-extended/cups/cups/CVE-2020-10001.patch deleted file mode 100644 index 09a0a5765d..0000000000 --- a/meta/recipes-extended/cups/cups/CVE-2020-10001.patch +++ /dev/null | |||
@@ -1,74 +0,0 @@ | |||
1 | From efbea1742bd30f842fbbfb87a473e5c84f4162f9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Michael R Sweet <msweet@msweet.org> | ||
3 | Date: Mon, 1 Feb 2021 15:02:32 -0500 | ||
4 | Subject: [PATCH] Fix a buffer (read) overflow in ippReadIO (CVE-2020-10001) | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | CVE: CVE-2020-10001 | ||
8 | |||
9 | Reference to upstream patch: | ||
10 | [https://github.com/OpenPrinting/cups/commit/efbea1742bd30f842fbbfb87a473e5c84f4162f9] | ||
11 | |||
12 | [SG: Addapted for version 2.3.3] | ||
13 | Signed-off-by: Stefan Ghinea <stefan.ghinea@windriver.com> | ||
14 | --- | ||
15 | CHANGES.md | 2 ++ | ||
16 | cups/ipp.c | 8 +++++--- | ||
17 | 2 files changed, 7 insertions(+), 3 deletions(-) | ||
18 | |||
19 | diff --git a/CHANGES.md b/CHANGES.md | ||
20 | index df72892..5ca12da 100644 | ||
21 | --- a/CHANGES.md | ||
22 | +++ b/CHANGES.md | ||
23 | @@ -4,6 +4,8 @@ CHANGES - 2.3.3 - 2020-04-24 | ||
24 | Changes in CUPS v2.3.3 | ||
25 | ---------------------- | ||
26 | |||
27 | +- Security: Fixed a buffer (read) overflow in the `ippReadIO` function | ||
28 | + (CVE-2020-10001) | ||
29 | - CVE-2020-3898: The `ppdOpen` function did not handle invalid UI | ||
30 | constraint. `ppdcSource::get_resolution` function did not handle | ||
31 | invalid resolution strings. | ||
32 | diff --git a/cups/ipp.c b/cups/ipp.c | ||
33 | index 3d52934..adbb26f 100644 | ||
34 | --- a/cups/ipp.c | ||
35 | +++ b/cups/ipp.c | ||
36 | @@ -2866,7 +2866,8 @@ ippReadIO(void *src, /* I - Data source */ | ||
37 | unsigned char *buffer, /* Data buffer */ | ||
38 | string[IPP_MAX_TEXT], | ||
39 | /* Small string buffer */ | ||
40 | - *bufptr; /* Pointer into buffer */ | ||
41 | + *bufptr, /* Pointer into buffer */ | ||
42 | + *bufend; /* End of buffer */ | ||
43 | ipp_attribute_t *attr; /* Current attribute */ | ||
44 | ipp_tag_t tag; /* Current tag */ | ||
45 | ipp_tag_t value_tag; /* Current value tag */ | ||
46 | @@ -3441,6 +3442,7 @@ ippReadIO(void *src, /* I - Data source */ | ||
47 | } | ||
48 | |||
49 | bufptr = buffer; | ||
50 | + bufend = buffer + n; | ||
51 | |||
52 | /* | ||
53 | * text-with-language and name-with-language are composite | ||
54 | @@ -3454,7 +3456,7 @@ ippReadIO(void *src, /* I - Data source */ | ||
55 | |||
56 | n = (bufptr[0] << 8) | bufptr[1]; | ||
57 | |||
58 | - if ((bufptr + 2 + n) >= (buffer + IPP_BUF_SIZE) || n >= (int)sizeof(string)) | ||
59 | + if ((bufptr + 2 + n + 2) > bufend || n >= (int)sizeof(string)) | ||
60 | { | ||
61 | _cupsSetError(IPP_STATUS_ERROR_INTERNAL, | ||
62 | _("IPP language length overflows value."), 1); | ||
63 | @@ -3481,7 +3483,7 @@ ippReadIO(void *src, /* I - Data source */ | ||
64 | bufptr += 2 + n; | ||
65 | n = (bufptr[0] << 8) | bufptr[1]; | ||
66 | |||
67 | - if ((bufptr + 2 + n) >= (buffer + IPP_BUF_SIZE)) | ||
68 | + if ((bufptr + 2 + n) > bufend) | ||
69 | { | ||
70 | _cupsSetError(IPP_STATUS_ERROR_INTERNAL, | ||
71 | _("IPP string length overflows value."), 1); | ||
72 | -- | ||
73 | 2.17.1 | ||
74 | |||
diff --git a/meta/recipes-extended/cups/cups/libexecdir.patch b/meta/recipes-extended/cups/cups/libexecdir.patch new file mode 100644 index 0000000000..7ccad94f0f --- /dev/null +++ b/meta/recipes-extended/cups/cups/libexecdir.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From 1724f7bcdbcfdb445778f8a2e530c5c094c18c10 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@arm.com> | ||
3 | Date: Tue, 13 Jul 2021 12:56:30 +0100 | ||
4 | Subject: [PATCH] Use $libexecdir instead of hardcoding $prefix/lib as this | ||
5 | breaks multilib builds. | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
9 | |||
10 | --- | ||
11 | config-scripts/cups-directories.m4 | 4 ++-- | ||
12 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
13 | |||
14 | diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4 | ||
15 | index 2033d47..230166e 100644 | ||
16 | --- a/config-scripts/cups-directories.m4 | ||
17 | +++ b/config-scripts/cups-directories.m4 | ||
18 | @@ -239,7 +239,7 @@ AC_SUBST([CUPS_REQUESTS]) | ||
19 | AS_CASE(["$host_os_name"], [*-gnu], [ | ||
20 | # GNUs | ||
21 | INSTALL_SYSV="install-sysv" | ||
22 | - CUPS_SERVERBIN="$exec_prefix/lib/cups" | ||
23 | + CUPS_SERVERBIN="$libexecdir/cups" | ||
24 | ], [*bsd* | darwin*], [ | ||
25 | # *BSD and Darwin (macOS) | ||
26 | INSTALL_SYSV="" | ||
27 | @@ -247,7 +247,7 @@ AS_CASE(["$host_os_name"], [*-gnu], [ | ||
28 | ], [*], [ | ||
29 | # All others | ||
30 | INSTALL_SYSV="install-sysv" | ||
31 | - CUPS_SERVERBIN="$exec_prefix/lib/cups" | ||
32 | + CUPS_SERVERBIN="$libexecdir/cups" | ||
33 | ]) | ||
34 | |||
35 | AC_DEFINE_UNQUOTED([CUPS_SERVERBIN], ["$CUPS_SERVERBIN"], [Location of server programs.]) | ||
diff --git a/meta/recipes-extended/cups/cups_2.3.3.bb b/meta/recipes-extended/cups/cups_2.3.3.bb deleted file mode 100644 index 5caeb6f58b..0000000000 --- a/meta/recipes-extended/cups/cups_2.3.3.bb +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | require cups.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | ||
4 | |||
5 | SRC_URI[md5sum] = "412434ceefbdf3ec71bc9188a035f589" | ||
6 | SRC_URI[sha256sum] = "261fd948bce8647b6d5cb2a1784f0c24cc52b5c4e827b71d726020bcc502f3ee" | ||
diff --git a/meta/recipes-extended/cups/cups_2.4.8.bb b/meta/recipes-extended/cups/cups_2.4.8.bb new file mode 100644 index 0000000000..c0cddf7e99 --- /dev/null +++ b/meta/recipes-extended/cups/cups_2.4.8.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require cups.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | ||
4 | |||
5 | SRC_URI[sha256sum] = "75c326b4ba73975efcc9a25078c4b04cdb4ee333caaad0d0823dbd522c6479a0" | ||