From patchwork Mon Jul 1 16:57:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 45844 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id AEB4EC3DA55 for ; Mon, 1 Jul 2024 16:57:59 +0000 (UTC) Received: from a27-31.smtp-out.us-west-2.amazonses.com (a27-31.smtp-out.us-west-2.amazonses.com [54.240.27.31]) by mx.groups.io with SMTP id smtpd.web11.2187.1719853076589172202 for ; Mon, 01 Jul 2024 09:57:56 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx header.b=OGivHBNa; dkim=pass header.i=@amazonses.com header.s=7v7vs6w47njt4pimodk5mmttbegzsi6n header.b=SKVXcrZV; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.31, mailfrom: 010101906f3b4e37-227ff3f8-a072-4ec2-8aad-8aa4f1b81dec-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx; d=yoctoproject.org; t=1719853076; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=FEXuV7DW4a+3QX0THGaFQxzkDpYSxc0c20jbki4Pu/g=; b=OGivHBNauhRsOrgnMItWjp1t/vr0IfEeN81tC6/9mE2w3iCfr8PBFb6YhG14aQ/o m+jMK/qJDkpiySYiCaUtH8aAXySsIkvliKUSirQnENjq98YA8ICdSfmTsFtRv6411/0 bVD+vA/D7wPIs9J4w1aUsWibCMI051aaL4dSWbAY= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=7v7vs6w47njt4pimodk5mmttbegzsi6n; d=amazonses.com; t=1719853076; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=FEXuV7DW4a+3QX0THGaFQxzkDpYSxc0c20jbki4Pu/g=; b=SKVXcrZVOYQKvXQJkwSBCc9qNz01vn9EWeYe5BNH4WLP29tV7OKxDlX8fYXp/Rik iAQz+2JmXCU9vNOXwt972Po1U3iJqTQnBLBOgNwOkE+aHxEMjlQ3n/N15Ml2Sa+OHzu v0T4b+4BYH/9/KwL7aTDLX3tKYPuOvPYuVYicysg= MIME-Version: 1.0 From: auh@yoctoproject.org To: Chen Qi Cc: openembedded-core@lists.openembedded.org Subject: [AUH] cups: upgrading to 2.4.10 SUCCEEDED Message-ID: <010101906f3b4e37-227ff3f8-a072-4ec2-8aad-8aa4f1b81dec-000000@us-west-2.amazonses.com> Date: Mon, 1 Jul 2024 16:57:56 +0000 Feedback-ID: ::1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2024.07.01-54.240.27.31 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 01 Jul 2024 16:57:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/201356 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *cups* to *2.4.10* has Succeeded. Next steps: - apply the patch: git am 0001-cups-upgrade-2.4.9-2.4.10.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From d3e95f6bdb0ca65c732d6d267ea3c8fb98a544bc Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Mon, 1 Jul 2024 10:38:18 +0000 Subject: [PATCH] cups: upgrade 2.4.9 -> 2.4.10 --- .../cups/cups/0001-use-echo-only-in-init.patch | 11 ++++------- ...002-don-t-try-to-run-generated-binaries.patch | 16 ++++++---------- ...ups-fix-multilib-install-file-conflicts.patch | 12 ++++-------- meta/recipes-extended/cups/cups/libexecdir.patch | 5 ++--- .../cups/{cups_2.4.9.bb => cups_2.4.10.bb} | 2 +- 5 files changed, 17 insertions(+), 29 deletions(-) rename meta/recipes-extended/cups/{cups_2.4.9.bb => cups_2.4.10.bb} (51%) 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..baa8004e74 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 5585d9c124f8107b1e4978923edbb94e1222c005 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..a03dc55c5b 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 5d9243e5a7cb32fa16bbc9accddf0842d3eaf661 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..19f167a91b 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 c05a265bb03268460ce1f6a3d17d7cd38eb1e445 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..c0c6f2e4b5 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 a94d8d987426e4a7ac79a98ca8dc6ee4ac3f7b9c 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.9.bb b/meta/recipes-extended/cups/cups_2.4.10.bb similarity index 51% rename from meta/recipes-extended/cups/cups_2.4.9.bb rename to meta/recipes-extended/cups/cups_2.4.10.bb index e0a3522004..e16ad47cf5 100644 --- a/meta/recipes-extended/cups/cups_2.4.9.bb +++ b/meta/recipes-extended/cups/cups_2.4.10.bb @@ -2,4 +2,4 @@ require cups.inc LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI[sha256sum] = "38fbf4535a10554113e013d54fedda03ee88007ea6a9761d626a04e1e4489e8c" +SRC_URI[sha256sum] = "d75757c2bc0f7a28b02ee4d52ca9e4b1aa1ba2affe16b985854f5336940e5ad7"