cups: update to 2.3.3op2

Apple are no longer maintaining CUPS, and future development is now
happening under the OpenPrinting project:

https://ftp.pwg.org/pub/pwg/liaison/openprinting/presentations/cups-plenary-may-2021.pdf

Also stop disabling the manpage installation as manpages are useful, and
remove some patch chunks that are not required.

The CVE-2020-10001 patch is dropped as this is incorporated into 2.3.3op2.

(From OE-Core rev: 53bd9a96a003a7103b8475f9c1ad7ef999e34f87)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

7 files changed, 39 insertions, 194 deletions

diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc
index be5a11c944..df23825466 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -8,18 +8,17 @@ SECTION = "console/utils"
 LICENSE = "Apache-2.0"
 DEPENDS = "libpng jpeg dbus zlib libusb1"
 
-SRC_URI = "https://github.com/apple/cups/releases/download/v${PV}/${BP}-source.tar.gz \
+SRC_URI = "https://github.com/OpenPrinting/cups/releases/download/v${PV}/cups-${PV}-source.tar.gz \
            file://0001-use-echo-only-in-init.patch \
            file://0002-don-t-try-to-run-generated-binaries.patch \
-           file://0003-cups_1.4.6.bb-Fix-build-on-ppc64.patch \
+           file://libexecdir.patch \
            file://0004-cups-fix-multilib-install-file-conflicts.patch \
            file://volatiles.99_cups \
            file://cups-volatiles.conf \
-           file://CVE-2020-10001.patch \
            "
 
-UPSTREAM_CHECK_URI = "https://github.com/apple/cups/releases"
-UPSTREAM_CHECK_REGEX = "cups-(?P<pver>\d+\.\d+(\.\d+)?)-source.tar"
+UPSTREAM_CHECK_URI = "https://github.com/OpenPrinting/cups/releases"
+UPSTREAM_CHECK_REGEX = "cups-(?P<pver>.+)-source.tar"
 
 # Issue only applies to MacOS
 CVE_CHECK_WHITELIST += "CVE-2008-1033"
@@ -37,7 +36,7 @@ inherit autotools-brokensep binconfig useradd systemd pkgconfig multilib_script
 USERADD_PACKAGES = "${PN}"
 GROUPADD_PARAM_${PN} = "--system lpadmin"
 
-SYSTEMD_SERVICE_${PN} = "org.cups.cupsd.socket org.cups.cupsd.path org.cups.cupsd.service org.cups.cups-lpd.socket"
+SYSTEMD_SERVICE_${PN} = "cups.socket cups.path cups.service cups-lpd.socket"
 
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \
                    ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)}"
@@ -63,20 +62,8 @@ EXTRA_OECONF = " \
 
 EXTRA_AUTORECONF += "--exclude=autoheader"
 
-do_compile () {
-        echo "all:"    >  man/Makefile
-        echo "libs:" >> man/Makefile
-        echo "install:" >> man/Makefile
-        echo "install-data:" >> man/Makefile
-        echo "install-exec:" >> man/Makefile
-        echo "install-headers:" >> man/Makefile
-        echo "install-libs:" >> man/Makefile
-
-        oe_runmake
-}
-
 do_install () {
-        oe_runmake "DSTROOT=${D}" install
+        oe_runmake "DESTDIR=${D}" install
 
         # Remove /var/run from package as cupsd will populate it on startup
         rm -fr ${D}/${localstatedir}/run
@@ -105,8 +92,7 @@ do_install () {
 PACKAGES =+ "${PN}-lib ${PN}-libimage"
 
 RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'procps', '', d)}"
-FILES_${PN} += "${libexecdir}/cups/ \
-               "
+FILES_${PN} += "${libexecdir}/cups/"
 
 FILES_${PN}-lib = "${libdir}/libcups.so.*"
 
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
  
  
  #
-@@ -205,9 +205,9 @@ ppdc-static:                ppdc.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) foo.drv foo-fr.po
-        $(LD_CXX) $(ARCHFLAGS) $(ALL_LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \
-                $(LINKCUPSSTATIC)
-        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
--       echo Testing PPD compiler...
--       ./ppdc-static -l en,fr -I ../data foo.drv
--       ./ppdc-static -l en,fr -z -I ../data foo.drv
-+#      echo Testing PPD compiler...
-+#      ./ppdc-static -l en,fr -I ../data foo.drv
-+#      ./ppdc-static -l en,fr -z -I ../data foo.drv
- 
- 
- #
-@@ -235,17 +235,17 @@ ppdi-static:              ppdc-static ppdi.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC)
-        $(LD_CXX) $(ARCHFLAGS) $(ALL_LDFLAGS) -o ppdi-static ppdi.o libcupsppdc.a \
-                $(LINKCUPSSTATIC)
-        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
--       echo Testing PPD importer...
--       $(RM) -r ppd ppd2 sample-import.drv
--       ./ppdc-static -l en -I ../data sample.drv
--       ./ppdi-static -I ../data -o sample-import.drv ppd/*
--       ./ppdc-static -l en -I ../data -d ppd2 sample-import.drv
--       if diff -r ppd ppd2 >/dev/null; then \
--               echo PPD import OK; \
--       else \
--               echo PPD import FAILED; \
--               exit 1; \
--       fi
-+#      echo Testing PPD importer...
-+#      $(RM) -r ppd ppd2 sample-import.drv
-+#      ./ppdc-static -l en -I ../data sample.drv
-+#      ./ppdi-static -I ../data -o sample-import.drv ppd/*
-+#      ./ppdc-static -l en -I ../data -d ppd2 sample-import.drv
-+#      if diff -r ppd ppd2 >/dev/null; then \
-+#              echo PPD import OK; \
-+#      else \
-+#              echo PPD import FAILED; \
-+#              exit 1; \
-+#      fi
- 
- 
- #
 -- 
 2.17.1
 
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 @@
-From 66c2079ae91389ee0f9d704bf0d2cccd53b2c603 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 22 Jul 2012 16:54:17 -0700
-Subject: [PATCH 3/4] cups_1.4.6.bb: Fix build on ppc64
-
-Make CUPS_SERVERBIN relative to libdir otherwise on 64bit arches
-e.g. ppc64 where base libdir is lib64 this does not go well
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Inappropriate [OE config specific]
-
-Update on 20190904:
-Redefine CUPS_SERVERBIN to "$libexecdir/cups" which solves file confliction
-when multilib is enabled.
-
-Signed-off-by: Kai Kang <kai.kang@windriver.com>
-
----
- config-scripts/cups-directories.m4 | 2 +-
- configure                          | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4
-index b74083a..9a5abb2 100644
---- a/config-scripts/cups-directories.m4
-+++ b/config-scripts/cups-directories.m4
-@@ -270,7 +270,7 @@ case "$host_os_name" in
-        *)
-                # All others
-                INSTALL_SYSV="install-sysv"
--               CUPS_SERVERBIN="$exec_prefix/lib/cups"
-+               CUPS_SERVERBIN="$libexecdir/cups"
-                ;;
- esac
- 
-diff --git a/configure b/configure
-index d3df145..bc68a6c 100755
---- a/configure
-+++ b/configure
-@@ -6420,7 +6420,7 @@ case "$host_os_name" in
-        *)
-                # All others
-                INSTALL_SYSV="install-sysv"
--               CUPS_SERVERBIN="$exec_prefix/lib/cups"
-+               CUPS_SERVERBIN="$libexecdir/cups"
-                ;;
- esac
- 
--- 
-2.17.1
-
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 @@
-From efbea1742bd30f842fbbfb87a473e5c84f4162f9 Mon Sep 17 00:00:00 2001
-From: Michael R Sweet <msweet@msweet.org>
-Date: Mon, 1 Feb 2021 15:02:32 -0500
-Subject: [PATCH] Fix a buffer (read) overflow in ippReadIO (CVE-2020-10001)
-
-Upstream-Status: Backport
-CVE: CVE-2020-10001
-
-Reference to upstream patch:
-[https://github.com/OpenPrinting/cups/commit/efbea1742bd30f842fbbfb87a473e5c84f4162f9]
-
-[SG: Addapted for version 2.3.3]
-Signed-off-by: Stefan Ghinea <stefan.ghinea@windriver.com>
----
- CHANGES.md | 2 ++
- cups/ipp.c | 8 +++++---
- 2 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/CHANGES.md b/CHANGES.md
-index df72892..5ca12da 100644
---- a/CHANGES.md
-+++ b/CHANGES.md
-@@ -4,6 +4,8 @@ CHANGES - 2.3.3 - 2020-04-24
- Changes in CUPS v2.3.3
- ----------------------
- 
-+- Security: Fixed a buffer (read) overflow in the `ippReadIO` function
-+  (CVE-2020-10001)
- - CVE-2020-3898: The `ppdOpen` function did not handle invalid UI
-   constraint.  `ppdcSource::get_resolution` function did not handle
-   invalid resolution strings.
-diff --git a/cups/ipp.c b/cups/ipp.c
-index 3d52934..adbb26f 100644
---- a/cups/ipp.c
-+++ b/cups/ipp.c
-@@ -2866,7 +2866,8 @@ ippReadIO(void       *src,                /* I - Data source */
-   unsigned char                *buffer,        /* Data buffer */
-                        string[IPP_MAX_TEXT],
-                                        /* Small string buffer */
--                       *bufptr;        /* Pointer into buffer */
-+                       *bufptr,        /* Pointer into buffer */
-+                       *bufend;        /* End of buffer */
-   ipp_attribute_t      *attr;          /* Current attribute */
-   ipp_tag_t            tag;            /* Current tag */
-   ipp_tag_t            value_tag;      /* Current value tag */
-@@ -3441,6 +3442,7 @@ ippReadIO(void       *src,                /* I - Data source */
-                }
- 
-                 bufptr = buffer;
-+                bufend = buffer + n;
- 
-               /*
-                * text-with-language and name-with-language are composite
-@@ -3454,7 +3456,7 @@ ippReadIO(void       *src,                /* I - Data source */
- 
-                n = (bufptr[0] << 8) | bufptr[1];
- 
--               if ((bufptr + 2 + n) >= (buffer + IPP_BUF_SIZE) || n >= (int)sizeof(string))
-+               if ((bufptr + 2 + n + 2) > bufend || n >= (int)sizeof(string))
-                {
-                  _cupsSetError(IPP_STATUS_ERROR_INTERNAL,
-                                _("IPP language length overflows value."), 1);
-@@ -3481,7 +3483,7 @@ ippReadIO(void       *src,                /* I - Data source */
-                 bufptr += 2 + n;
-                n = (bufptr[0] << 8) | bufptr[1];
- 
--               if ((bufptr + 2 + n) >= (buffer + IPP_BUF_SIZE))
-+               if ((bufptr + 2 + n) > bufend)
-                {
-                  _cupsSetError(IPP_STATUS_ERROR_INTERNAL,
-                                _("IPP string length overflows value."), 1);
--- 
-2.17.1
-
diff --git a/meta/recipes-extended/cups/cups/libexecdir.patch b/meta/recipes-extended/cups/cups/libexecdir.patch
new file mode 100644
index 0000000000..2e15841b0d
--- /dev/null
+++ b/meta/recipes-extended/cups/cups/libexecdir.patch
@@ -0,0 +1,27 @@
+Use $libexecdir instead of hardcoding $prefix/lib as this breaks multilib builds.
+
+Upstream-Status: Inappropriate
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+
+diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4
+index 1430af3a6..6efedc604 100644
+--- a/config-scripts/cups-directories.m4
++++ b/config-scripts/cups-directories.m4
+@@ -265,7 +265,7 @@ case "$host_os_name" in
+        *-gnu)
+                # GNUs
+                INSTALL_SYSV="install-sysv"
+-               CUPS_SERVERBIN="$exec_prefix/lib/cups"
++               CUPS_SERVERBIN="$libexecdir/cups"
+                ;;
+        *bsd* | darwin*)
+                # *BSD and Darwin (macOS)
+@@ -275,7 +275,7 @@ case "$host_os_name" in
+        *)
+                # All others
+                INSTALL_SYSV="install-sysv"
+-               CUPS_SERVERBIN="$exec_prefix/lib/cups"
++               CUPS_SERVERBIN="$libexecdir/cups"
+                ;;
+ esac
+ 
\ No newline at end of file
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 @@
-require cups.inc
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI[md5sum] = "412434ceefbdf3ec71bc9188a035f589"
-SRC_URI[sha256sum] = "261fd948bce8647b6d5cb2a1784f0c24cc52b5c4e827b71d726020bcc502f3ee"
diff --git a/meta/recipes-extended/cups/cups_2.3.3op2.bb b/meta/recipes-extended/cups/cups_2.3.3op2.bb
new file mode 100644
index 0000000000..fc2aa702f5
--- /dev/null
+++ b/meta/recipes-extended/cups/cups_2.3.3op2.bb
@@ -0,0 +1,5 @@
+require cups.inc
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+
+SRC_URI[sha256sum] = "deb3575bbe79c0ae963402787f265bfcf8d804a71fc2c94318a74efec86f96df"