diff --git a/meta/recipes-extended/cups/cups/0001-use-echo-only-in-init.patch b/meta/recipes-extended/cups/cups/0001-use-echo-only-in-init.patch index 80bbad0a44..9116b8e781 100644 --- a/meta/recipes-extended/cups/cups/0001-use-echo-only-in-init.patch +++ b/meta/recipes-extended/cups/cups/0001-use-echo-only-in-init.patch @@ -1,7 +1,7 @@ -From a3f4d8ba97f4669a95943a7e65eb61aa44ce7999 Mon Sep 17 00:00:00 2001 +From e80a7f0aa247ea28e069fe90dccb647a47867ad2 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Thu, 13 Dec 2012 19:03:52 -0800 -Subject: [PATCH 1/4] use echo only in init +Subject: [PATCH] use echo only in init Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Alexander Kanavin @@ -10,10 +10,10 @@ Signed-off-by: Alexander Kanavin 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scheduler/cups.sh.in b/scheduler/cups.sh.in -index 89ac36d..6618a0f 100644 +index 74cce18..c57f0db 100644 --- a/scheduler/cups.sh.in +++ b/scheduler/cups.sh.in -@@ -50,7 +50,7 @@ case "`uname`" in +@@ -51,7 +51,7 @@ case "`uname`" in ECHO_ERROR=: ;; @@ -22,6 +22,3 @@ index 89ac36d..6618a0f 100644 IS_ON=/bin/true if test -f /etc/init.d/functions; then . /etc/init.d/functions --- -2.17.1 - 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 2bc26edbfc..27d4578add 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 @@ -1,21 +1,20 @@ -From 3e9a965dcd65ab2d40b753b6f792a1a4559182aa Mon Sep 17 00:00:00 2001 +From f058c45a70e1536e4269dc41f28233c1582659a2 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 30 Jan 2011 16:37:27 +0100 -Subject: [PATCH 2/4] don't try to run generated binaries +Subject: [PATCH] don't try to run generated binaries Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Koen Kooi - --- - ppdc/Makefile | 32 ++++++++++++++++---------------- - 1 file changed, 16 insertions(+), 16 deletions(-) + ppdc/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ppdc/Makefile b/ppdc/Makefile -index 32e2e0b..f1478d4 100644 +index e36ed11..3fe97e1 100644 --- a/ppdc/Makefile +++ b/ppdc/Makefile -@@ -186,8 +186,8 @@ genstrings: genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \ +@@ -187,8 +187,8 @@ genstrings: genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \ $(LD_CXX) $(ARCHFLAGS) $(ALL_LDFLAGS) -o genstrings genstrings.o \ libcupsppdc.a $(LINKCUPSSTATIC) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ @@ -26,6 +25,3 @@ index 32e2e0b..f1478d4 100644 # --- -2.17.1 - diff --git a/meta/recipes-extended/cups/cups/0004-cups-fix-multilib-install-file-conflicts.patch b/meta/recipes-extended/cups/cups/0004-cups-fix-multilib-install-file-conflicts.patch index bc9260307c..c1f48aa1e2 100644 --- a/meta/recipes-extended/cups/cups/0004-cups-fix-multilib-install-file-conflicts.patch +++ b/meta/recipes-extended/cups/cups/0004-cups-fix-multilib-install-file-conflicts.patch @@ -1,7 +1,7 @@ -From 7dbda1887aa19ab720aff22312f4caff2d575f62 Mon Sep 17 00:00:00 2001 +From d58d7f245f0e4667c29501ec9929734b96f4e16b Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Wed, 3 Oct 2018 00:27:11 +0800 -Subject: [PATCH 4/4] cups: fix multilib install file conflicts +Subject: [PATCH] cups: fix multilib install file conflicts @CUPS_SERVERBIN@ is ${libdir} related that causes multilib install file conflict. Remove @CUPS_SERVERBIN@ from the comment line of cups-files.conf to @@ -10,16 +10,15 @@ avoid the conflict. Upstream-Status: Inappropriate [OE specific] Signed-off-by: Kai Kang - --- conf/cups-files.conf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in -index 4a78ba6..03c6582 100644 +index 93584a1..65b7052 100644 --- a/conf/cups-files.conf.in +++ b/conf/cups-files.conf.in -@@ -73,7 +73,7 @@ PageLog @CUPS_LOGDIR@/page_log +@@ -67,7 +67,7 @@ PageLog @CUPS_LOGDIR@/page_log #RequestRoot @CUPS_REQUESTS@ # Location of helper programs... @@ -28,6 +27,3 @@ index 4a78ba6..03c6582 100644 # SSL/TLS keychain for the scheduler... #ServerKeychain @CUPS_SERVERKEYCHAIN@ --- -2.17.1 - diff --git a/meta/recipes-extended/cups/cups/libexecdir.patch b/meta/recipes-extended/cups/cups/libexecdir.patch index 7ccad94f0f..3e7ac48a55 100644 --- a/meta/recipes-extended/cups/cups/libexecdir.patch +++ b/meta/recipes-extended/cups/cups/libexecdir.patch @@ -1,4 +1,4 @@ -From 1724f7bcdbcfdb445778f8a2e530c5c094c18c10 Mon Sep 17 00:00:00 2001 +From 9b219659be2f57e8d52c567cf961c5ac82f760b2 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 13 Jul 2021 12:56:30 +0100 Subject: [PATCH] Use $libexecdir instead of hardcoding $prefix/lib as this @@ -6,13 +6,12 @@ Subject: [PATCH] Use $libexecdir instead of hardcoding $prefix/lib as this Upstream-Status: Pending Signed-off-by: Ross Burton - --- config-scripts/cups-directories.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4 -index 2033d47..230166e 100644 +index 069ee7b..2f67e5b 100644 --- a/config-scripts/cups-directories.m4 +++ b/config-scripts/cups-directories.m4 @@ -239,7 +239,7 @@ AC_SUBST([CUPS_REQUESTS]) diff --git a/meta/recipes-extended/cups/cups_2.4.7.bb b/meta/recipes-extended/cups/cups_2.4.8.bb similarity index 51% rename from meta/recipes-extended/cups/cups_2.4.7.bb rename to meta/recipes-extended/cups/cups_2.4.8.bb index f4b0282e4c..c0cddf7e99 100644 --- a/meta/recipes-extended/cups/cups_2.4.7.bb +++ b/meta/recipes-extended/cups/cups_2.4.8.bb @@ -2,4 +2,4 @@ require cups.inc LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI[sha256sum] = "dd54228dd903526428ce7e37961afaed230ad310788141da75cebaa08362cf6c" +SRC_URI[sha256sum] = "75c326b4ba73975efcc9a25078c4b04cdb4ee333caaad0d0823dbd522c6479a0"