{"id":806585,"url":"http://patchwork.ozlabs.org/api/1.0/patches/806585/?format=json","project":{"id":27,"url":"http://patchwork.ozlabs.org/api/1.0/projects/27/?format=json","name":"Buildroot development","link_name":"buildroot","list_id":"buildroot.buildroot.org","list_email":"buildroot@buildroot.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20170828135216.31652-1-olivier.schonken@gmail.com>","date":"2017-08-28T13:52:16","name":"[1/1] cups: bump version to 2.2.4","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"d09740654b9dc8a897744b459e62faa06a74bcdd","submitter":{"id":23032,"url":"http://patchwork.ozlabs.org/api/1.0/people/23032/?format=json","name":"Olivier Schonken","email":"olivier.schonken@gmail.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/buildroot/patch/20170828135216.31652-1-olivier.schonken@gmail.com/mbox/","series":[{"id":174,"url":"http://patchwork.ozlabs.org/api/1.0/series/174/?format=json","date":"2017-08-28T13:52:16","name":"[1/1] cups: bump version to 2.2.4","version":1,"mbox":"http://patchwork.ozlabs.org/series/174/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/806585/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":["incoming@patchwork.ozlabs.org","buildroot@lists.busybox.net"],"Delivered-To":["patchwork-incoming@bilbo.ozlabs.org","buildroot@osuosl.org"],"Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=busybox.net\n\t(client-ip=140.211.166.133; helo=hemlock.osuosl.org;\n\tenvelope-from=buildroot-bounces@busybox.net;\n\treceiver=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"Y/pb58fY\"; dkim-atps=neutral"],"Received":["from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xgtWB0d78z9sMN\n\tfor ;\n\tMon, 28 Aug 2017 23:52:36 +1000 (AEST)","from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 89CDC89369;\n\tMon, 28 Aug 2017 13:52:31 +0000 (UTC)","from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 6ymYxVFn2fZl; Mon, 28 Aug 2017 13:52:29 +0000 (UTC)","from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 65A6789269;\n\tMon, 28 Aug 2017 13:52:29 +0000 (UTC)","from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id C29681C0A2B\n\tfor ;\n\tMon, 28 Aug 2017 13:52:27 +0000 (UTC)","from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id BC1BD87708\n\tfor ;\n\tMon, 28 Aug 2017 13:52:27 +0000 (UTC)","from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id o44uK-L78z5l for ;\n\tMon, 28 Aug 2017 13:52:26 +0000 (UTC)","from mail-wr0-f195.google.com (mail-wr0-f195.google.com\n\t[209.85.128.195])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id B954587633\n\tfor ; Mon, 28 Aug 2017 13:52:25 +0000 (UTC)","by mail-wr0-f195.google.com with SMTP id j3so409828wrb.5\n\tfor ; Mon, 28 Aug 2017 06:52:25 -0700 (PDT)","from localhost.localdomain ([41.169.36.129])\n\tby smtp.gmail.com with ESMTPSA id\n\ty32sm697952wrb.7.2017.08.28.06.52.20\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tMon, 28 Aug 2017 06:52:22 -0700 (PDT)"],"X-Virus-Scanned":["amavisd-new at osuosl.org","amavisd-new at osuosl.org"],"X-Greylist":"domain auto-whitelisted by SQLgrey-1.7.6","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=from:to:cc:subject:date:message-id:mime-version\n\t:content-transfer-encoding;\n\tbh=26W6WuDsjewVwvmOUPKv9cCfnAvNDeN/6qugbq8a/ls=;\n\tb=Y/pb58fYV0DyPWTyrxw1LROuh6BRSuzhKCplyc+v42IMmCRiQt9Opy8BhDTExS0nLD\n\tE/H7XAR7imsEYtT3d0NPsYDyYIltlTSiuIpBkBaMfnXaoQsL9OlWwmuy5/iFWHNFyOz3\n\ty1Khp71cvtCZLrL3IDXIA2Es0OSFETWoqXG9i8Os2lBBHewEP7j/GJZqeu6m64lZqwT2\n\tuWPcOhJTgIqy+mgIgp5X/2B8ynF6jiURsG2QO0FURBl7xIBfGTI6YPjnC0pEJQodWUma\n\tXcRJs0Rn86r7hIMyrqTRwUi56f9NHywCeMOEbC0vfbbCO/qaaVBC1A8s1Y06SzcX0H08\n\tE0uw==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version\n\t:content-transfer-encoding;\n\tbh=26W6WuDsjewVwvmOUPKv9cCfnAvNDeN/6qugbq8a/ls=;\n\tb=Vo66ATFCWLvOTk955OgOJshoov5/5ukh0RR+gm6mYmW40PFRdGpEFsgL/8gyOiKSB3\n\tZH8Vogjye7UVKOH4san2yp+WZQoWwGxUukilEMQ/ALkuLseAgd00OGeeN0dHLpzS3Juf\n\tk+T01zPdq4eZznSHGbMrzMI0bLE+/LkmCkmugZVZcY4dOdPCWOD1xnL3XrM4PXYDLZb5\n\tHa4A6pQmyjBvtY4xUPHtZwRpEHHweRUz9TXs9vfBiET4tsZlZGnjRABs1p/JLf8onmLf\n\tcmJg7Ek3SXzdqMd+26UZn0cqfSmXi/F7r1292tnkSlpLQDfmteym3alpzBqyXZkoDYUC\n\tNeIw==","X-Gm-Message-State":"AHYfb5ja7d6z8OE7uIKiO5cx336l7dOcLKwM+79uZEKhP09bk7MMJ3vw\n\tTBGnyqxNtfjupFv8","X-Received":"by 10.223.152.72 with SMTP id v66mr484040wrb.52.1503928343980;\n\tMon, 28 Aug 2017 06:52:23 -0700 (PDT)","From":"Olivier Schonken ","To":"buildroot@buildroot.org","Date":"Mon, 28 Aug 2017 15:52:16 +0200","Message-Id":"<20170828135216.31652-1-olivier.schonken@gmail.com>","X-Mailer":"git-send-email 2.11.0","MIME-Version":"1.0","Cc":"Olivier Schonken ","Subject":"[Buildroot] [PATCH 1/1] cups: bump version to 2.2.4","X-BeenThere":"buildroot@busybox.net","X-Mailman-Version":"2.1.18-1","Precedence":"list","List-Id":"Discussion and development of buildroot ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"buildroot-bounces@busybox.net","Sender":"\"buildroot\" "},"content":"Tweak 0003-Sanitize-the-installation-process.patch for 2.2.4\nTweak 0004-Remove-PIE-flags-from-the-build.patch for 2.2.4\nRemove 0005-Fix-static-linking-with-GnuTLS.patch as it was merged upstream\n\nSigned-off-by: Olivier Schonken \n---\n .../0003-Sanitize-the-installation-process.patch | 10 +++---\n .../0004-Remove-PIE-flags-from-the-build.patch | 7 ++--\n .../cups/0005-Fix-static-linking-with-GnuTLS.patch | 39 ----------------------\n package/cups/cups.hash | 2 +-\n package/cups/cups.mk | 2 +-\n 5 files changed, 12 insertions(+), 48 deletions(-)\n delete mode 100644 package/cups/0005-Fix-static-linking-with-GnuTLS.patch","diff":"diff --git a/package/cups/0003-Sanitize-the-installation-process.patch b/package/cups/0003-Sanitize-the-installation-process.patch\nindex bf81f682df..f1128daa2d 100644\n--- a/package/cups/0003-Sanitize-the-installation-process.patch\n+++ b/package/cups/0003-Sanitize-the-installation-process.patch\n@@ -18,10 +18,10 @@ cross-compiling:\n prevent overwriting those files/directories, which meant calling\n \"make install\" twice was failing.\n \n-[Vincent: tweak the patch for 2.2.2 release]\n+[Olivier: tweak the patch for 2.2.4 release]\n \n Signed-off-by: Thomas Petazzoni \n-Signed-off-by: Vicente Olivert Riera \n+Signed-off-by: Olivier Schonken \n ---\n Makedefs.in | 12 ++++++------\n conf/Makefile | 6 +++---\n@@ -37,7 +37,7 @@ index 3afef0a..3e4f1bd 100644\n # Installation programs...\n #\n \n--INSTALL_BIN\t=\t$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@\n+-INSTALL_BIN\t=\t$(LIBTOOL) $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@\n -INSTALL_COMPDATA =\t$(INSTALL) -c -m 444 @INSTALL_GZIP@\n +INSTALL_BIN\t=\t$(LIBTOOL) $(INSTALL) -c -m 755\n +INSTALL_COMPDATA =\t$(INSTALL) -c -m 644 @INSTALL_GZIP@\n@@ -45,9 +45,9 @@ index 3afef0a..3e4f1bd 100644\n -INSTALL_DATA\t=\t$(INSTALL) -c -m 444\n +INSTALL_DATA\t=\t$(INSTALL) -c -m 644\n INSTALL_DIR\t=\t$(INSTALL) -d\n--INSTALL_LIB\t=\t$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@\n+-INSTALL_LIB\t=\t$(LIBTOOL) $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@\n -INSTALL_MAN\t=\t$(INSTALL) -c -m 444\n--INSTALL_SCRIPT\t=\t$(INSTALL) -c -m 555\n+-INSTALL_SCRIPT\t=\t$(INSTALL) -c -m @CUPS_EXE_FILE_PERM@\n +INSTALL_LIB\t=\t$(LIBTOOL) $(INSTALL) -c -m 755\n +INSTALL_MAN\t=\t$(INSTALL) -c -m 644\n +INSTALL_SCRIPT\t=\t$(INSTALL) -c -m 755\ndiff --git a/package/cups/0004-Remove-PIE-flags-from-the-build.patch b/package/cups/0004-Remove-PIE-flags-from-the-build.patch\nindex 492418f70d..ea4f0b4a59 100644\n--- a/package/cups/0004-Remove-PIE-flags-from-the-build.patch\n+++ b/package/cups/0004-Remove-PIE-flags-from-the-build.patch\n@@ -7,7 +7,10 @@ Generating a statically linked binary built with PIE requires the\n Scrt1.o file, which isn't part of Buildroot uClibc toolchains. To\n solve this, we simply disable the PIE flags.\n \n+[olivier tweak patch for 2.2.4]\n+\n Signed-off-by: Thomas Petazzoni \n+Signed-off-by: Olivier Schonken \n ---\n Makedefs.in | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n@@ -16,13 +19,13 @@ diff --git a/Makedefs.in b/Makedefs.in\n index 3afef0a..299b297 100644\n --- a/Makedefs.in\n +++ b/Makedefs.in\n-@@ -142,7 +142,7 @@ IPPFIND_BIN\t=\t@IPPFIND_BIN@\n+@@ -148,7 +148,7 @@ IPPFIND_BIN\t=\t@IPPFIND_BIN@\n IPPFIND_MAN\t=\t@IPPFIND_MAN@\n LDFLAGS\t\t=\t-L../cgi-bin -L../cups -L../filter -L../ppdc \\\n \t\t\t-L../scheduler @LDARCHFLAGS@ \\\n -\t\t\t@LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)\n +\t\t\t@LDFLAGS@ @RELROFLAGS@ $(OPTIM)\n- LINKCUPS\t=\t@LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(LIBZ)\n+ LINKCUPS\t=\t@LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(SSLLIBS) $(LIBZ)\n LINKCUPSIMAGE\t=\t@LINKCUPSIMAGE@\n LIBS\t\t=\t$(LINKCUPS) $(COMMONLIBS)\n -- \ndiff --git a/package/cups/0005-Fix-static-linking-with-GnuTLS.patch b/package/cups/0005-Fix-static-linking-with-GnuTLS.patch\ndeleted file mode 100644\nindex 5702caae97..0000000000\n--- a/package/cups/0005-Fix-static-linking-with-GnuTLS.patch\n+++ /dev/null\n@@ -1,39 +0,0 @@\n-From 79a2389f590f4d16885bdd0715f3f04fd9fa6cc5 Mon Sep 17 00:00:00 2001\n-From: =?UTF-8?q?J=C3=B6rg=20Krause?= \n-Date: Sun, 28 Feb 2016 16:35:56 +0100\n-Subject: [PATCH] Fix static linking with GnuTLS\n-MIME-Version: 1.0\n-Content-Type: text/plain; charset=UTF-8\n-Content-Transfer-Encoding: 8bit\n-\n-cups forgets to link against the libs found by pkg-config if it is build with\n-GnuTLS support.\n-\n-Otherwise, static build fails with:\n-../cups/libcups.a(tls.o): In function `http_gnutls_create_credential':\n-cups-2.1.2/cups/tls-gnutls.c:762: undefined reference to `gnutls_x509_crt_init'\n-[..]\n-\n-Status upstream: Pending\n-\n-Signed-off-by: Jörg Krause \n----\n- Makedefs.in | 2 +-\n- 1 file changed, 1 insertion(+), 1 deletion(-)\n-\n-diff --git a/Makedefs.in b/Makedefs.in\n-index 299b297..ce9d535 100644\n---- a/Makedefs.in\n-+++ b/Makedefs.in\n-@@ -143,7 +143,7 @@ IPPFIND_MAN\t=\t@IPPFIND_MAN@\n- LDFLAGS\t\t=\t-L../cgi-bin -L../cups -L../filter -L../ppdc \\\n- \t\t\t-L../scheduler @LDARCHFLAGS@ \\\n- \t\t\t@LDFLAGS@ @RELROFLAGS@ $(OPTIM)\n--LINKCUPS\t=\t@LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(LIBZ)\n-+LINKCUPS\t=\t@LINKCUPS@ $(SSLLIBS) $(LIBGSSAPI) $(DNSSDLIBS) $(LIBZ)\n- LINKCUPSIMAGE\t=\t@LINKCUPSIMAGE@\n- LIBS\t\t=\t$(LINKCUPS) $(COMMONLIBS)\n- ONDEMANDFLAGS\t=\t@ONDEMANDFLAGS@\n--- \n-2.7.4\n-\ndiff --git a/package/cups/cups.hash b/package/cups/cups.hash\nindex 0eb415e505..f9eed42df1 100644\n--- a/package/cups/cups.hash\n+++ b/package/cups/cups.hash\n@@ -1,2 +1,2 @@\n # Locally calculated:\n-sha256 66701fe15838f2c892052c913bde1ba106bbee2e0a953c955a62ecacce76885f cups-2.2.3-source.tar.gz\n+sha256 596d4db72651c335469ae5f37b0da72ac9f97d73e30838d787065f559dea98cc cups-2.2.4-source.tar.gz\ndiff --git a/package/cups/cups.mk b/package/cups/cups.mk\nindex 6e95a436b0..f5e2a3f217 100644\n--- a/package/cups/cups.mk\n+++ b/package/cups/cups.mk\n@@ -4,7 +4,7 @@\n #\n ################################################################################\n \n-CUPS_VERSION = 2.2.3\n+CUPS_VERSION = 2.2.4\n CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.gz\n CUPS_SITE = https://github.com/apple/cups/releases/download/v$(CUPS_VERSION)\n CUPS_LICENSE = GPL-2.0, LGPL-2.0\n","prefixes":["1/1"]}