From patchwork Tue Jun 18 05:38:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Bobroff X-Patchwork-Id: 1117634 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45SdQN2Gqkz9sNp for ; Tue, 18 Jun 2019 16:26:34 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 595098546F; Tue, 18 Jun 2019 06:26:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VbL1rT4u8v+n; Tue, 18 Jun 2019 06:26:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 5830E855FF; Tue, 18 Jun 2019 06:26:30 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 58E991BF3BA for ; Tue, 18 Jun 2019 06:26:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 55B6E86223 for ; Tue, 18 Jun 2019 06:26:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Y3DPWFwmmNFC for ; Tue, 18 Jun 2019 06:26:27 +0000 (UTC) X-Greylist: delayed 00:47:27 by SQLgrey-1.7.6 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by whitealder.osuosl.org (Postfix) with ESMTPS id 1212586130 for ; Tue, 18 Jun 2019 06:26:27 +0000 (UTC) Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x5I5bULT129486 for ; Tue, 18 Jun 2019 01:39:00 -0400 Received: from e06smtp02.uk.ibm.com (e06smtp02.uk.ibm.com [195.75.94.98]) by mx0a-001b2d01.pphosted.com with ESMTP id 2t6qxjv0r5-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 18 Jun 2019 01:38:59 -0400 Received: from localhost by e06smtp02.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 18 Jun 2019 06:38:57 +0100 Received: from b06cxnps4074.portsmouth.uk.ibm.com (9.149.109.196) by e06smtp02.uk.ibm.com (192.168.101.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Tue, 18 Jun 2019 06:38:55 +0100 Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x5I5csDK28442798 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 18 Jun 2019 05:38:54 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5BAEE5206C; Tue, 18 Jun 2019 05:38:54 +0000 (GMT) Received: from ozlabs.au.ibm.com (unknown [9.192.253.14]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id C661A52051; Tue, 18 Jun 2019 05:38:53 +0000 (GMT) Received: from tungsten.ozlabs.ibm.com (haven.au.ibm.com [9.192.254.114]) (using TLSv1.2 with cipher DHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.au.ibm.com (Postfix) with ESMTPSA id 70D9EA020E; Tue, 18 Jun 2019 15:38:52 +1000 (AEST) From: Sam Bobroff To: buildroot@buildroot.org Date: Tue, 18 Jun 2019 15:38:52 +1000 X-Mailer: git-send-email 2.19.0.2.gcad72f5712 MIME-Version: 1.0 X-TM-AS-GCONF: 00 x-cbid: 19061805-0008-0000-0000-000002F4A7D1 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19061805-0009-0000-0000-00002261BD6C Message-Id: X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-06-18_03:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=4 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1906180046 Subject: [Buildroot] [PATCH 1/1] package/cups: bump to version 2.2.11 and add gzip fix X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: itsatharva@gmail.com, yann.morin.1998@free.fr, thomas.petazzoni@bootlin.com Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This patch bumps cups to version 2.2.11 so that an upstream fix will apply cleanly. The upstream fix corrects a build failure when GZIP is set in the build environment, as it is for buildroot's reproducible builds, as shown below: gzip: /bin/gzip.gz: Permission denied gzip: /bin/gzip.gz: Permission denied Makefile:114: recipe for target 'install-data' failed The patch will be included upstream in version 2.2.12. Fixes: - http://autobuild.buildroot.net/results/c4e0f6a3c79c9cb083a08f811b7d4838efef50f9/ Signed-off-by: Sam Bobroff --- Hi, As discussed elsewhere on the list in a thread starting with... http://lists.busybox.net/pipermail/buildroot/2019-June/252416.html ... the cups package currently fails to build when BR2_REPRODUCIBLE=y due to the upstream package using an environment variable 'GZIP'. While discussion of how/if to address this within buildroot is ongling, the upstream maintainer has already patched the issue in the cups package, so we might as well take advantage of it. Cheers, Sam. ...tead-of-GZIP-to-avoid-install-issues.patch | 294 ++++++++++++++++++ package/cups/cups.hash | 2 +- package/cups/cups.mk | 2 +- 3 files changed, 296 insertions(+), 2 deletions(-) create mode 100644 package/cups/0005-Use-GZIPPROG-instead-of-GZIP-to-avoid-install-issues.patch diff --git a/package/cups/0005-Use-GZIPPROG-instead-of-GZIP-to-avoid-install-issues.patch b/package/cups/0005-Use-GZIPPROG-instead-of-GZIP-to-avoid-install-issues.patch new file mode 100644 index 0000000000..cee4292eca --- /dev/null +++ b/package/cups/0005-Use-GZIPPROG-instead-of-GZIP-to-avoid-install-issues.patch @@ -0,0 +1,294 @@ +Backported from upstream (with a slight edit to drop a changelog hunk). +This can be dropped after the next cups release (2.2.12). + +commit 3676fc318a458f71df76620a7e66f5c5807cf9b1 +Author: Michael R Sweet +Date: Wed Jun 12 08:37:06 2019 -0400 + + Use GZIPPROG instead of GZIP to avoid install issues (Issue #5595) + +Signed-off-by: Sam Bobroff + +diff --git a/Makedefs.in b/Makedefs.in +index f614c0c1d..8541b4976 100644 +--- a/Makedefs.in ++++ b/Makedefs.in +@@ -1,7 +1,7 @@ + # + # Common makefile definitions for CUPS. + # +-# Copyright 2007-2018 by Apple Inc. ++# Copyright 2007-2019 by Apple Inc. + # Copyright 1997-2007 by Easy Software Products, all rights reserved. + # + # These coded instructions, statements, and computer programs are the +@@ -29,7 +29,7 @@ CHMOD = @CHMOD@ + CXX = @LIBTOOL_CXX@ @CXX@ + DSO = @DSO@ + DSOXX = @DSOXX@ +-GZIP = @GZIP@ ++GZIPPROG = @GZIPPROG@ + INSTALL = @INSTALL@ + LD = @LD@ + LD_CC = @LD_CC@ +diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 +index a1185bccc..0859efe08 100644 +--- a/config-scripts/cups-common.m4 ++++ b/config-scripts/cups-common.m4 +@@ -1,7 +1,7 @@ + dnl + dnl Common configuration stuff for CUPS. + dnl +-dnl Copyright 2007-2017 by Apple Inc. ++dnl Copyright 2007-2019 by Apple Inc. + dnl Copyright 1997-2007 by Easy Software Products, all rights reserved. + dnl + dnl These coded instructions, statements, and computer programs are the +@@ -42,7 +42,11 @@ AC_PROG_CXX(clang++ c++ g++) + AC_PROG_RANLIB + AC_PATH_PROG(AR,ar) + AC_PATH_PROG(CHMOD,chmod) +-AC_PATH_PROG(GZIP,gzip) ++AC_PATH_PROG(GZIPPROG,gzip) ++AC_MSG_CHECKING(for install-sh script) ++INSTALL="`pwd`/install-sh" ++AC_SUBST(INSTALL) ++AC_MSG_RESULT(using $INSTALL) + AC_PATH_PROG(LD,ld) + AC_PATH_PROG(LN,ln) + AC_PATH_PROG(MKDIR,mkdir) +@@ -51,6 +55,7 @@ AC_PATH_PROG(RM,rm) + AC_PATH_PROG(RMDIR,rmdir) + AC_PATH_PROG(SED,sed) + AC_PATH_PROG(XDGOPEN,xdg-open) ++ + if test "x$XDGOPEN" = x; then + CUPS_HTMLVIEW="htmlview" + else +@@ -58,11 +63,6 @@ else + fi + AC_SUBST(CUPS_HTMLVIEW) + +-AC_MSG_CHECKING(for install-sh script) +-INSTALL="`pwd`/install-sh" +-AC_SUBST(INSTALL) +-AC_MSG_RESULT(using $INSTALL) +- + if test "x$AR" = x; then + AC_MSG_ERROR([Unable to find required library archive command.]) + fi +@@ -266,14 +266,14 @@ dnl ZLIB + INSTALL_GZIP="" + LIBZ="" + AC_CHECK_HEADER(zlib.h, +- AC_CHECK_LIB(z, gzgets, ++ AC_CHECK_LIB(z, gzgets,[ + AC_DEFINE(HAVE_LIBZ) + LIBZ="-lz" + LIBS="$LIBS -lz" + AC_CHECK_LIB(z, inflateCopy, AC_DEFINE(HAVE_INFLATECOPY)) +- if test "x$GZIP" != z; then ++ if test "x$GZIPPROG" != x; then + INSTALL_GZIP="-z" +- fi)) ++ fi])) + AC_SUBST(INSTALL_GZIP) + AC_SUBST(LIBZ) + +diff --git a/configure b/configure +index 368906141..629fdddba 100755 +--- a/configure ++++ b/configure +@@ -1,6 +1,6 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.69 for CUPS 2.2.11. ++# Generated by GNU Autoconf 2.69 for CUPS 2.2.12. + # + # Report bugs to . + # +@@ -580,8 +580,8 @@ MAKEFLAGS= + # Identity of this package. + PACKAGE_NAME='CUPS' + PACKAGE_TARNAME='cups' +-PACKAGE_VERSION='2.2.11' +-PACKAGE_STRING='CUPS 2.2.11' ++PACKAGE_VERSION='2.2.12' ++PACKAGE_STRING='CUPS 2.2.12' + PACKAGE_BUGREPORT='https://github.com/apple/cups/issues' + PACKAGE_URL='https://www.cups.org/' + +@@ -762,7 +762,6 @@ LIBPAPER + LIBMALLOC + PKGCONFIG + INSTALLSTATIC +-INSTALL + CUPS_HTMLVIEW + XDGOPEN + SED +@@ -772,7 +771,8 @@ MV + MKDIR + LN + LD +-GZIP ++INSTALL ++GZIPPROG + CHMOD + AR + RANLIB +@@ -1480,7 +1480,7 @@ if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +-\`configure' configures CUPS 2.2.11 to adapt to many kinds of systems. ++\`configure' configures CUPS 2.2.12 to adapt to many kinds of systems. + + Usage: $0 [OPTION]... [VAR=VALUE]... + +@@ -1545,7 +1545,7 @@ fi + + if test -n "$ac_init_help"; then + case $ac_init_help in +- short | recursive ) echo "Configuration of CUPS 2.2.11:";; ++ short | recursive ) echo "Configuration of CUPS 2.2.12:";; + esac + cat <<\_ACEOF + +@@ -1726,7 +1726,7 @@ fi + test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF +-CUPS configure 2.2.11 ++CUPS configure 2.2.12 + generated by GNU Autoconf 2.69 + + Copyright (C) 2012 Free Software Foundation, Inc. +@@ -2190,7 +2190,7 @@ cat >config.log <<_ACEOF + This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + +-It was created by CUPS $as_me 2.2.11, which was ++It was created by CUPS $as_me 2.2.12, which was + generated by GNU Autoconf 2.69. Invocation command line was + + $ $0 $@ +@@ -2711,7 +2711,7 @@ done + ac_config_headers="$ac_config_headers config.h" + + +-CUPS_VERSION="2.2.11" ++CUPS_VERSION="2.2.12" + CUPS_REVISION="" + CUPS_BUILD="cups-$CUPS_VERSION" + +@@ -3948,12 +3948,12 @@ fi + set dummy gzip; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_path_GZIP+:} false; then : ++if ${ac_cv_path_GZIPPROG+:} false; then : + $as_echo_n "(cached) " >&6 + else +- case $GZIP in ++ case $GZIPPROG in + [\\/]* | ?:[\\/]*) +- ac_cv_path_GZIP="$GZIP" # Let the user override the test with a path. ++ ac_cv_path_GZIPPROG="$GZIPPROG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -3963,7 +3963,7 @@ do + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_path_GZIP="$as_dir/$ac_word$ac_exec_ext" ++ ac_cv_path_GZIPPROG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -3974,16 +3974,22 @@ IFS=$as_save_IFS + ;; + esac + fi +-GZIP=$ac_cv_path_GZIP +-if test -n "$GZIP"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GZIP" >&5 +-$as_echo "$GZIP" >&6; } ++GZIPPROG=$ac_cv_path_GZIPPROG ++if test -n "$GZIPPROG"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GZIPPROG" >&5 ++$as_echo "$GZIPPROG" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + + ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for install-sh script" >&5 ++$as_echo_n "checking for install-sh script... " >&6; } ++INSTALL="`pwd`/install-sh" ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using $INSTALL" >&5 ++$as_echo "using $INSTALL" >&6; } + # Extract the first word of "ld", so it can be a program name with args. + set dummy ld; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +@@ -4304,6 +4310,7 @@ $as_echo "no" >&6; } + fi + + ++ + if test "x$XDGOPEN" = x; then + CUPS_HTMLVIEW="htmlview" + else +@@ -4311,13 +4318,6 @@ else + fi + + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for install-sh script" >&5 +-$as_echo_n "checking for install-sh script... " >&6; } +-INSTALL="`pwd`/install-sh" +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using $INSTALL" >&5 +-$as_echo "using $INSTALL" >&6; } +- + if test "x$AR" = x; then + as_fn_error $? "Unable to find required library archive command." "$LINENO" 5 + fi +@@ -5718,7 +5718,8 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_gzgets" >&5 + $as_echo "$ac_cv_lib_z_gzgets" >&6; } + if test "x$ac_cv_lib_z_gzgets" = xyes; then : +- $as_echo "#define HAVE_LIBZ 1" >>confdefs.h ++ ++ $as_echo "#define HAVE_LIBZ 1" >>confdefs.h + + LIBZ="-lz" + LIBS="$LIBS -lz" +@@ -5763,7 +5764,7 @@ if test "x$ac_cv_lib_z_inflateCopy" = xyes; then : + + fi + +- if test "x$GZIP" != z; then ++ if test "x$GZIPPROG" != x; then + INSTALL_GZIP="-z" + fi + fi +@@ -10832,7 +10833,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + # report actual input values of CONFIG_FILES etc. instead of their + # values after options handling. + ac_log=" +-This file was extended by CUPS $as_me 2.2.11, which was ++This file was extended by CUPS $as_me 2.2.12, which was + generated by GNU Autoconf 2.69. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES +@@ -10895,7 +10896,7 @@ _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ +-CUPS config.status 2.2.11 ++CUPS config.status 2.2.12 + configured by $0, generated by GNU Autoconf 2.69, + with options \\"\$ac_cs_config\\" + diff --git a/package/cups/cups.hash b/package/cups/cups.hash index 3d238d61e6..1353b553d1 100644 --- a/package/cups/cups.hash +++ b/package/cups/cups.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 77c8b2b3bb7fe8b5fbfffc307f2c817b2d7ec67b657f261a1dd1c61ab81205bb cups-2.2.10-source.tar.gz +sha256 f58010813fd6903f690cdb0c0b91e4d1bc9e5b9570c28734229ba3ed2908b76c cups-2.2.11-source.tar.gz sha256 6e0e0ffbde118aae709f7ef65590de9071e8b2cd322f84fd645c6b64f3cc452c LICENSE.txt diff --git a/package/cups/cups.mk b/package/cups/cups.mk index b91fe7ac4c..1333b5402e 100644 --- a/package/cups/cups.mk +++ b/package/cups/cups.mk @@ -4,7 +4,7 @@ # ################################################################################ -CUPS_VERSION = 2.2.10 +CUPS_VERSION = 2.2.11 CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.gz CUPS_SITE = https://github.com/apple/cups/releases/download/v$(CUPS_VERSION) CUPS_LICENSE = GPL-2.0, LGPL-2.0