From patchwork Fri Sep 11 10:05:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier Schonken X-Patchwork-Id: 516664 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 6DACC140784 for ; Fri, 11 Sep 2015 20:05:42 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=jmj8frD3; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 35D9527575; Fri, 11 Sep 2015 10:05:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aLpPPBkLvtJa; Fri, 11 Sep 2015 10:05:32 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id EED3E2D6C1; Fri, 11 Sep 2015 10:05:29 +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 2B88C1C2869 for ; Fri, 11 Sep 2015 10:05:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 246AF91AB0 for ; Fri, 11 Sep 2015 10:05: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 1ut8D+raGsf5 for ; Fri, 11 Sep 2015 10:05:26 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com [209.85.212.179]) by whitealder.osuosl.org (Postfix) with ESMTPS id 7F37F91AB1 for ; Fri, 11 Sep 2015 10:05:26 +0000 (UTC) Received: by wicfx3 with SMTP id fx3so52283136wic.0 for ; Fri, 11 Sep 2015 03:05:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=iVukm/kcbW6reETNORFzO95u5i219UNMO2yWs8n0p7A=; b=jmj8frD34soJ7Q4wLdv65nyFdOaRgiVMunEIQ0ROAMQ+WwHqYo0PQcwW1aA6X1hqgN dZOA6bFCqEi2nPA1hexKpuUmw3nwNNfOHcnCdHOQf5MIrgJvasuTraN+iL6GTX2h9Ss6 nDmMEy/5IkxNryaVdrxOJa1iCvDEoAj8pSbJUjAg6uKxX9inn8FrR3GM34oZfPSUpa3z D6bzULxi/Nd+1VzzEZsvACTGgdZkZqqjWDialcK9ydih6AFwP8I7dmfW3SoU+j9Jy8Mq D6RX85KdolhVyzbIet4Cl6QBNjHMZIOgtkHObVmzXLD4l8hAszg4D42GSDh2yo+K4NyB a2NA== X-Received: by 10.180.99.193 with SMTP id es1mr15967013wib.29.1441965925197; Fri, 11 Sep 2015 03:05:25 -0700 (PDT) Received: from localhost.localdomain ([41.169.36.129]) by smtp.gmail.com with ESMTPSA id xw2sm978090wjc.12.2015.09.11.03.05.23 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 11 Sep 2015 03:05:24 -0700 (PDT) From: Olivier Schonken To: buildroot@busybox.net Date: Fri, 11 Sep 2015 12:05:08 +0200 Message-Id: <1441965911-22138-2-git-send-email-olivier.schonken@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1441965911-22138-1-git-send-email-olivier.schonken@gmail.com> References: <1441965911-22138-1-git-send-email-olivier.schonken@gmail.com> Cc: Olivier Schonken Subject: [Buildroot] [PATCH 1/4] package/cups: Un-deprecate, and update CUPS to 2.1.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Remove 0001-fix-static.patch - Fixed upstream Remove 0002-fix-stack-protector-check.patch - Fixed upstream Remove 0003-mantohtml.patch - Replaced by 0001-Remove-building-html-from-man- makefile.patch Add 0002-Do-not-use-genstrings.patch Signed-off-by: Olivier Schonken --- ...01-Remove-building-html-from-man-makefile.patch | 27 +++++++++++++ package/cups/0001-fix-static.patch | 28 -------------- package/cups/0002-Do-not-use-genstrings.patch | 27 +++++++++++++ package/cups/0002-fix-stack-protector-check.patch | 25 ------------ package/cups/0003-mantohtml.patch | 11 ------ package/cups/Config.in | 19 ++++++---- package/cups/cups.hash | 2 + package/cups/cups.mk | 44 +++++++++++++--------- 8 files changed, 94 insertions(+), 89 deletions(-) create mode 100644 package/cups/0001-Remove-building-html-from-man-makefile.patch delete mode 100644 package/cups/0001-fix-static.patch create mode 100644 package/cups/0002-Do-not-use-genstrings.patch delete mode 100644 package/cups/0002-fix-stack-protector-check.patch delete mode 100644 package/cups/0003-mantohtml.patch create mode 100644 package/cups/cups.hash diff --git a/package/cups/0001-Remove-building-html-from-man-makefile.patch b/package/cups/0001-Remove-building-html-from-man-makefile.patch new file mode 100644 index 0000000..546e76b --- /dev/null +++ b/package/cups/0001-Remove-building-html-from-man-makefile.patch @@ -0,0 +1,27 @@ +From da960a1384625d2550ffbf5765a10fe9b3aa5a51 Mon Sep 17 00:00:00 2001 +From: Olivier Schonken +Date: Wed, 18 Mar 2015 20:30:39 +0200 +Subject: [PATCH 1/2] Remove building html from man makefile + +Building and using mantohtml causes problems for cross-compiling + +Signed-off-by: Olivier Schonken +--- + man/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/man/Makefile b/man/Makefile +index dc1a8c0..0ad42a1 100644 +--- a/man/Makefile ++++ b/man/Makefile +@@ -73,7 +73,7 @@ MAN8 = cupsaccept.$(MAN8EXT) \ + # Make everything... + # + +-all: $(MAN1) $(MAN5) $(MAN7) $(MAN8) html ++all: $(MAN1) $(MAN5) $(MAN7) $(MAN8) + + + # +-- +1.9.1 diff --git a/package/cups/0001-fix-static.patch b/package/cups/0001-fix-static.patch deleted file mode 100644 index 4c9d0d4..0000000 --- a/package/cups/0001-fix-static.patch +++ /dev/null @@ -1,28 +0,0 @@ -cups: fix static linking - -Append -lz to the cups linking libs to fix a problem like this one: - -../cups/libcups.a(file.o): In function `cupsFileSeek': -/home/test/test/1/output/build/cups-1.3.11/cups/file.c:1444: undefined -reference to `inflateEnd' -collect2: error: ld returned 1 exit status -make[2]: *** [ipp] Error 1 -make[2]: *** Waiting for unfinished jobs.... - -This solution is the same used upstream in newer versions. - -Fixes: - http://autobuild.buildroot.net/results/f3d/f3d4f67ce7ee1d54f5bd4c87dfddb7417db614e5/ - -Signed-off-by: Vicente Olivert Riera ---- cups-1.3.11/Makedefs.in.orig 2014-03-05 13:28:10.175437880 +0000 -+++ cups-1.3.11/Makedefs.in 2014-03-05 13:28:35.398845162 +0000 -@@ -132,7 +132,7 @@ LDFLAGS = -L../cups -L../filter @LDARCH - LEGACY_BACKENDS = @LEGACY_BACKENDS@ - LIBCUPSORDER = @LIBCUPSORDER@ - LIBCUPSIMAGEORDER = @LIBCUPSIMAGEORDER@ --LINKCUPS = @LINKCUPS@ $(SSLLIBS) -+LINKCUPS = @LINKCUPS@ $(SSLLIBS) $(LIBZ) - LINKCUPSIMAGE = @LINKCUPSIMAGE@ - LIBS = $(LINKCUPS) $(COMMONLIBS) - OPTIM = @OPTIM@ diff --git a/package/cups/0002-Do-not-use-genstrings.patch b/package/cups/0002-Do-not-use-genstrings.patch new file mode 100644 index 0000000..e5b2de3 --- /dev/null +++ b/package/cups/0002-Do-not-use-genstrings.patch @@ -0,0 +1,27 @@ +From a863814f6dadda054c964897210789eafff6f605 Mon Sep 17 00:00:00 2001 +From: Olivier Schonken +Date: Wed, 18 Mar 2015 20:33:41 +0200 +Subject: [PATCH 2/2] Do not use genstrings + +Using cross compiled genstrings while cross-compiling will break compilation. + +Signed-off-by: Olivier Schonken +--- + ppdc/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ppdc/Makefile b/ppdc/Makefile +index bc8bb64..f6bae25 100644 +--- a/ppdc/Makefile ++++ b/ppdc/Makefile +@@ -243,7 +243,7 @@ genstrings: genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \ + libcupsppdc.a ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \ + $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) + echo Generating localization strings... +- ./genstrings >sample.c ++ #./genstrings >sample.c + + + # +-- +1.9.1 diff --git a/package/cups/0002-fix-stack-protector-check.patch b/package/cups/0002-fix-stack-protector-check.patch deleted file mode 100644 index 1db35ff..0000000 --- a/package/cups/0002-fix-stack-protector-check.patch +++ /dev/null @@ -1,25 +0,0 @@ -[PATCH]: use AC_TRY_LINK for stack protector check - -Actually try to link an executable to test for stack protector support, -as gcc seems to accept the -fstack-protector argument even when it's -compiled with --disable-libssp (but linking fails with a error -finding -lssp_nonshared). - -Signed-off-by: Peter Korsgaard ---- - config-scripts/cups-compiler.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: cups-1.3.9/config-scripts/cups-compiler.m4 -=================================================================== ---- cups-1.3.9.orig/config-scripts/cups-compiler.m4 -+++ cups-1.3.9/config-scripts/cups-compiler.m4 -@@ -109,7 +109,7 @@ if test -n "$GCC"; then - AC_MSG_CHECKING(if GCC supports -fstack-protector) - OLDCFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -fstack-protector" -- AC_TRY_COMPILE(,, -+ AC_TRY_LINK(,, - OPTIM="$OPTIM -fstack-protector" - AC_MSG_RESULT(yes), - AC_MSG_RESULT(no)) diff --git a/package/cups/0003-mantohtml.patch b/package/cups/0003-mantohtml.patch deleted file mode 100644 index e6a10b0..0000000 --- a/package/cups/0003-mantohtml.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cups-1.3.5/man/Makefile 2007-07-12 21:01:14.000000000 -0400 -+++ cups-1.3.5/man/Makefile 2008-02-11 08:55:24.000000000 -0500 -@@ -173,7 +173,7 @@ html: $(MAN1) $(MAN5) $(MAN7) $(MAN8) ma - done - - mantohtml: mantohtml.o -- $(CC) $(LDFLAGS) -o $@ mantohtml.o -+ gcc -I/usr/include -I../ -L/usr/lib mantohtml.c -o mantohtml - - - # diff --git a/package/cups/Config.in b/package/cups/Config.in index 8e60221..d89c86b 100644 --- a/package/cups/Config.in +++ b/package/cups/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_CUPS bool "cups" - # serious security issues, needs upgrading - depends on BR2_DEPRECATED_SINCE_2015_05 + # needs libstdcpp for ppdc + depends on BR2_INSTALL_LIBSTDCPP # needs fork() depends on BR2_USE_MMU help @@ -13,11 +13,16 @@ if BR2_PACKAGE_CUPS config BR2_PACKAGE_CUPS_PDFTOPS bool "pdftops support" - depends on BR2_INSTALL_LIBSTDCPP - help - Enable pdftops support + depends on BR2_DEPRECATED_SINCE_2015_05 -comment "pdftops support needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP +config BR2_PACKAGE_CUPS_AVAHI + bool "avahi support" + depends on !BR2_STATIC_LIBS # avahi + depends on !BR2_TOOLCHAIN_HAS_THREADS # avahi + select BR2_PACKAGE_AVAHI + select BR2_PACKAGE_AVAHI_DAEMON + help + Enable Avahi support. + Select this if you want cups to support Bonjour protocol. endif diff --git a/package/cups/cups.hash b/package/cups/cups.hash new file mode 100644 index 0000000..7c22b55 --- /dev/null +++ b/package/cups/cups.hash @@ -0,0 +1,2 @@ +# From https://www.cups.org/ +md5 c4e57a66298bfdba66bb3d5bedd317a4 cups-2.1.0-source.tar.bz2 diff --git a/package/cups/cups.mk b/package/cups/cups.mk index c028ef4..0056462 100644 --- a/package/cups/cups.mk +++ b/package/cups/cups.mk @@ -4,7 +4,7 @@ # ################################################################################ -CUPS_VERSION = 1.3.11 +CUPS_VERSION = 2.1.0 CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.bz2 CUPS_SITE = http://www.cups.org/software/$(CUPS_VERSION) CUPS_LICENSE = GPLv2 LGPLv2 @@ -16,16 +16,14 @@ CUPS_CONF_OPTS = \ --without-perl \ --without-java \ --without-php \ - --disable-gnutls \ --disable-gssapi \ --libdir=/usr/lib CUPS_CONFIG_SCRIPTS = cups-config -CUPS_DEPENDENCIES = \ - $(if $(BR2_PACKAGE_ZLIB),zlib) \ - $(if $(BR2_PACKAGE_LIBPNG),libpng) \ - $(if $(BR2_PACKAGE_JPEG),jpeg) \ - $(if $(BR2_PACKAGE_TIFF),tiff) +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +CUPS_CONF_OPTS += --with-systemdunitdir=/usr/lib/systemd/system +CUPS_DEPENDENCIES += systemd +endif ifeq ($(BR2_PACKAGE_DBUS),y) CUPS_CONF_OPTS += --enable-dbus @@ -34,8 +32,11 @@ else CUPS_CONF_OPTS += --disable-dbus endif -ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) -CUPS_DEPENDENCIES += xlib_libX11 +ifeq ($(BR2_PACKAGE_GNUTLS),y) +CUPS_CONF_OPTS += --enable-gnutls +CUPS_DEPENDENCIES += gnutls +else +CUPS_CONF_OPTS += --disable-gnutls endif ifeq ($(BR2_PACKAGE_PYTHON),y) @@ -45,18 +46,25 @@ else CUPS_CONF_OPTS += --without-python endif -ifeq ($(BR2_PACKAGE_CUPS_PDFTOPS),y) -CUPS_CONF_OPTS += --enable-pdftops +ifeq ($(BR2_PACKAGE_LIBUSB),y) +CUPS_CONF_OPTS += --enable-libusb +CUPS_DEPENDENCIES += libusb else -CUPS_CONF_OPTS += --disable-pdftops +CUPS_CONF_OPTS += --disable-libusb endif -# standard autoreconf fails with autoheader failures -define CUPS_FIXUP_AUTOCONF - cd $(@D) && $(AUTOCONF) -endef -CUPS_DEPENDENCIES += host-autoconf +ifeq ($(BR2_PACKAGE_LIBPAPER),y) +CUPS_CONF_OPTS += --enable-libpaper +CUPS_DEPENDENCIES += libpaper +else +CUPS_CONF_OPTS += --disable-libpaper +endif -CUPS_PRE_CONFIGURE_HOOKS += CUPS_FIXUP_AUTOCONF +ifeq ($(BR2_PACKAGE_CUPS_AVAHI),y) +CUPS_DEPENDENCIES += avahi +CUPS_CONF_OPTS += --enable-avahi +else +CUPS_CONF_OPTS += --disable-avahi +endif $(eval $(autotools-package))