From patchwork Fri Jun 19 14:57:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1313012 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=rjBNEjcV; dkim-atps=neutral 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 49pMNx6rslz9sWp for ; Sat, 20 Jun 2020 00:57:53 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 0A9D3899AA; Fri, 19 Jun 2020 14:57:49 +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 cTz7cnuKtcx4; Fri, 19 Jun 2020 14:57:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 47697899A5; Fri, 19 Jun 2020 14:57:47 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id DAFC31BF860 for ; Fri, 19 Jun 2020 14:57:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D53542040E for ; Fri, 19 Jun 2020 14:57:27 +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 drBxpZOJ9n56 for ; Fri, 19 Jun 2020 14:57:26 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by silver.osuosl.org (Postfix) with ESMTPS id 572C3203F2 for ; Fri, 19 Jun 2020 14:57:26 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id q2so7552775wrv.8 for ; Fri, 19 Jun 2020 07:57:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=52GL9B580wP/k7k9ygqDhbgvVNKNalJNgylls+upUu4=; b=rjBNEjcV/RceB+0bVBOQbmhO1QDNJkbz0JK11yfaZ+O2k9PZWSfsVE1Y87FnfgjYss xbzpm6QgOSLb7uGZVecBx6Ugc2RDnNhC5bIArsoqikXX6CHvPPeYgQ4HYEct/zUsn9Ug uJtaV3IooyWFByL2kIBOu+YqWg00juMiapNOA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=52GL9B580wP/k7k9ygqDhbgvVNKNalJNgylls+upUu4=; b=iUKjAmO+KYBkw/VZnxaKbdWHqLwbl8bsljslEgcMwA+Dxaew0VPs/7GNsAoA+8fYr2 NzCdFi50umbPuxweFx7i/HcICT7zzcXtD5jdY/qRtvO0LiG9c9MNJ9aLW6l6dy+R3xsD 8j6Vtc2LrAh0CtZKCdLdTeQPUFObO+xGdyssY2yU1ivUZKxfRAtPoDIu9/932CVk5OeN NOffVPbtzaBDvF3UsuSTDArOKnk/oL5AsuxYZ57OwsyzL4jucgRvIKX46CUjmLmI2J4h ZmI0okP3AIcR9xMmR8yyCOkHYZggJU1HurCuR64MWP6ZfXIRQZHqzd+KMPNN7IOR19zv oXKg== X-Gm-Message-State: AOAM530DlhnEFIlkoN7jOAKkGs8qbYYpAHIPjb7sFGaimq/m179BC2Te XMFnaNw0pCt7tNYCtzEOi6AnOz6qaXyzoA== X-Google-Smtp-Source: ABdhPJyFsxYKdoSyOXSmfXkBDrj1lf88XFqTLGXuEBwWsgpK/S+1AgPPoaDy1a5OmjpclvlcSAHSwA== X-Received: by 2002:a5d:4a8a:: with SMTP id o10mr4460526wrq.222.1592578644263; Fri, 19 Jun 2020 07:57:24 -0700 (PDT) Received: from localhost.localdomain (host194055151123.static.fidoka.tech. [194.55.151.123]) by smtp.gmail.com with ESMTPSA id a16sm7302165wrx.8.2020.06.19.07.57.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jun 2020 07:57:23 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Fri, 19 Jun 2020 16:57:13 +0200 Message-Id: <20200619145719.2352019-2-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200619145719.2352019-1-angelo@amarulasolutions.com> References: <20200619145719.2352019-1-angelo@amarulasolutions.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 1/7] package/dejavu: Install dejavu fonts in staging dir 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: Michael Trimarchi , Angelo Compagnucci Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Michael Trimarchi The dejavu font is used by cups-filters and needs to be installed in staging directory. Signed-off-by: Michael Trimarchi Signed-off-by: Angelo Compagnucci --- package/dejavu/dejavu.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/dejavu/dejavu.mk b/package/dejavu/dejavu.mk index 9b57f0992e..be3d91f179 100644 --- a/package/dejavu/dejavu.mk +++ b/package/dejavu/dejavu.mk @@ -11,6 +11,7 @@ DEJAVU_LICENSE_FILES = LICENSE DEJAVU_FONTS_INSTALL = DEJAVU_FONTCONFIG_CONF_INSTALL = +DEJAVU_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_DEJAVU_MONO),y) DEJAVU_FONTS_INSTALL += DejaVuSansMono*.ttf @@ -50,6 +51,14 @@ define DEJAVU_FONTCONFIG_CONF_INSTALL_CMDS endef endif +define DEJAVU_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/usr/share/fonts/dejavu/ + for i in $(DEJAVU_FONTS_INSTALL) ; do \ + $(INSTALL) -m 0644 $(@D)/ttf/$$i \ + $(STAGING_DIR)/usr/share/fonts/dejavu/ || exit 1 ; \ + done +endef + define DEJAVU_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/usr/share/fonts/dejavu/ for i in $(DEJAVU_FONTS_INSTALL) ; do \ From patchwork Fri Jun 19 14:57:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1313014 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=M3H0rnPt; dkim-atps=neutral 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 49pMNy5xwXz9sfF for ; Sat, 20 Jun 2020 00:57:54 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 5C636899AD; Fri, 19 Jun 2020 14:57:49 +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 2IBxCWPgLwzy; Fri, 19 Jun 2020 14:57:48 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 85802899D4; Fri, 19 Jun 2020 14:57:48 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 448BF1BF860 for ; Fri, 19 Jun 2020 14:57:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 418C486521 for ; Fri, 19 Jun 2020 14:57:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id en9gbTB1wnZz for ; Fri, 19 Jun 2020 14:57:27 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 600F086508 for ; Fri, 19 Jun 2020 14:57:27 +0000 (UTC) Received: by mail-wr1-f43.google.com with SMTP id v3so2497967wrc.1 for ; Fri, 19 Jun 2020 07:57:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ppHypeDPY4F/0wF7UCnCCKs+bUvkCtt6n8RLRhRVpi4=; b=M3H0rnPtam+oT9OQEHyF6Q4hgeVBOP4tnTpCmeHXgDh5gvXPUbQ4ZCOZZJfIDbD3+x scG17I6dh9z0rE0EaEiKAwQy2ISo/Z2y1w4vjCspmQUYE0/kiwavEEWhp8UWCjad192j 8uH0mMyrA165Kp023QoMRNAoMDLz3lVeHlntw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ppHypeDPY4F/0wF7UCnCCKs+bUvkCtt6n8RLRhRVpi4=; b=r7NMG9KjOCbojuVtJDCsCxBWB8tnF4JmFG7iAe562r1tQF9zGVxVGHraWUe/wpQy56 AvIGY76+DOXjmXn7+N6G/QdKnmdMbK5K5MEQhS+dW78SAj4eNlgIHTMJIrrdIRvHQ8a0 zgxr2azaRDQ8z9O0zrpkGKD8L2bCshP0zpKXloWufkgiT5uUaBAhDl+fTBnpspYxSTtX iArtrzTqL0hSOvwRq9JJytAZdsAkxcM4vrwlVpXVcP3xfkrmZ9JnAHapqm4TabF3bBgz t6eR0/G5Gr03ihLD5pe+hyPhVnwJylVAgSlVHTYlQmFHNykpUtXvhcqmWJhZgAy5w0tq kBfA== X-Gm-Message-State: AOAM530pW0lSpzNfiS8gjl9VqAfYG2TLPUGt0UbAWLvvJ1GtoAgKHA/q dk757DyGjvV3yjqQHlnjin0r3As6Tz2j1w== X-Google-Smtp-Source: ABdhPJzXbmAtc1xToBEe9w2YQK75QzNyH3SSem8RCLaUXWI03nt6PPocz4DrthEeyRqF0QvbsH/AxQ== X-Received: by 2002:adf:f209:: with SMTP id p9mr4362435wro.86.1592578645376; Fri, 19 Jun 2020 07:57:25 -0700 (PDT) Received: from localhost.localdomain (host194055151123.static.fidoka.tech. [194.55.151.123]) by smtp.gmail.com with ESMTPSA id a16sm7302165wrx.8.2020.06.19.07.57.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jun 2020 07:57:24 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Fri, 19 Jun 2020 16:57:14 +0200 Message-Id: <20200619145719.2352019-3-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200619145719.2352019-1-angelo@amarulasolutions.com> References: <20200619145719.2352019-1-angelo@amarulasolutions.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 2/7] package/cups-filters: bump to version 1.27.5 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: Michael Trimarchi , Angelo Compagnucci Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This patch bumps cups-filters to version 1.27.5. While bumping, fixing also the missing installation for the service files for cups-browsed. Signed-off-by: Michael Trimarchi Signed-off-by: Angelo Compagnucci --- package/cups-filters/Config.in | 3 +++ package/cups-filters/S82cups-browsed | 23 +++++++++++++++++++++++ package/cups-filters/cups-filters.hash | 2 +- package/cups-filters/cups-filters.mk | 20 +++++++++++++++++--- 4 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 package/cups-filters/S82cups-browsed diff --git a/package/cups-filters/Config.in b/package/cups-filters/Config.in index 9e4e37ca6b..26e8d4aa06 100644 --- a/package/cups-filters/Config.in +++ b/package/cups-filters/Config.in @@ -8,6 +8,9 @@ config BR2_PACKAGE_CUPS_FILTERS depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_PACKAGE_CUPS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + select BR2_PACKAGE_DEJAVU + select BR2_PACKAGE_DEJAVU_SANS + select BR2_PACKAGE_DEJAVU_SERIF select BR2_PACKAGE_JPEG select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_FREETYPE diff --git a/package/cups-filters/S82cups-browsed b/package/cups-filters/S82cups-browsed new file mode 100644 index 0000000000..c73ff1fbfa --- /dev/null +++ b/package/cups-filters/S82cups-browsed @@ -0,0 +1,23 @@ +#!/bin/sh + +case "$1" in + start) + printf "Starting cups-browsed: " + start-stop-daemon -S -q -m -p /var/run/cups-browsed.pid \ + -b -x cups-browsed -- -c /etc/cups/cups-browsed.conf + [ $? = 0 ] && echo "OK" || echo "FAIL" + ;; + stop) + printf "Stopping cups-browsed: " + start-stop-daemon -K -q -p /var/run/cups-browsed.pid + [ $? = 0 ] && echo "OK" || echo "FAIL" + ;; + restart) + "$0" stop + sleep 1 + "$0" start + ;; + *) + echo "Usage: $0 {start|stop|restart}" + ;; +esac diff --git a/package/cups-filters/cups-filters.hash b/package/cups-filters/cups-filters.hash index 9e24abe393..61cb42a438 100644 --- a/package/cups-filters/cups-filters.hash +++ b/package/cups-filters/cups-filters.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 ff8679fcd0c31c25d229262c7ad100ba161ef6b2aa455a2df673dd74ef93f488 cups-filters-1.26.0.tar.gz +sha256 08e4081ce50ce2e620af6e950bdcf64cea2ab4c81ab3c5ea05da25d82ad62db6 cups-filters-1.27.5.tar.gz sha256 527463af65312372111804589a9624f4c52813e253062ae351e75af5003f317f COPYING diff --git a/package/cups-filters/cups-filters.mk b/package/cups-filters/cups-filters.mk index 1f17018bc5..20d4c68995 100644 --- a/package/cups-filters/cups-filters.mk +++ b/package/cups-filters/cups-filters.mk @@ -4,12 +4,12 @@ # ################################################################################ -CUPS_FILTERS_VERSION = 1.26.0 +CUPS_FILTERS_VERSION = 1.27.5 CUPS_FILTERS_SITE = http://openprinting.org/download/cups-filters CUPS_FILTERS_LICENSE = GPL-2.0, GPL-2.0+, GPL-3.0, GPL-3.0+, LGPL-2, LGPL-2.1+, MIT, BSD-4-Clause CUPS_FILTERS_LICENSE_FILES = COPYING -CUPS_FILTERS_DEPENDENCIES = cups libglib2 lcms2 qpdf fontconfig freetype jpeg +CUPS_FILTERS_DEPENDENCIES = cups libglib2 lcms2 qpdf fontconfig freetype jpeg dejavu CUPS_FILTERS_CONF_OPTS = \ --disable-mutool \ @@ -19,7 +19,10 @@ CUPS_FILTERS_CONF_OPTS = \ --with-cups-config=$(STAGING_DIR)/usr/bin/cups-config \ --with-sysroot=$(STAGING_DIR) \ --with-pdftops=pdftops \ - --with-jpeg + --with-jpeg \ + --with-rcdir=no \ + --with-fontdir=$(STAGING_DIR)/usr/share/fonts/ \ + --with-test-font-path=$(STAGING_DIR)/usr/share/fonts/dejavu/DejaVuSans.ttf ifeq ($(BR2_PACKAGE_LIBPNG),y) CUPS_FILTERS_CONF_OPTS += --with-png @@ -71,4 +74,15 @@ else CUPS_FILTERS_CONF_OPTS += --disable-poppler endif +define CUPS_FILTERS_INSTALL_INIT_SYSV + @$(RM) $(TARGET_DIR)/etc/init.d/cups-browsed + $(INSTALL) -D -m 0755 package/cups-filters/S82cups-browsed \ + $(TARGET_DIR)/etc/init.d/S82cups-browsed +endef + +define CUPS_FILTERS_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0755 $(@D)/utils/cups-browsed.service \ + $(TARGET_DIR)/usr/lib/systemd/system/cups-browsed.service +endef + $(eval $(autotools-package)) From patchwork Fri Jun 19 14:57:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1313020 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=kC30gGfP; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49pMP36cW6z9shk for ; Sat, 20 Jun 2020 00:57:59 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3152687BA8; Fri, 19 Jun 2020 14:57:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ErrfAXYlEAQR; Fri, 19 Jun 2020 14:57:50 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 032BD879B4; Fri, 19 Jun 2020 14:57:50 +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 D4D601BF860 for ; Fri, 19 Jun 2020 14:57:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D0E8288FC1 for ; Fri, 19 Jun 2020 14:57:30 +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 UN-4+j+ybKfT for ; Fri, 19 Jun 2020 14:57:29 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by whitealder.osuosl.org (Postfix) with ESMTPS id 34DF288E88 for ; Fri, 19 Jun 2020 14:57:28 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id e1so9997909wrt.5 for ; Fri, 19 Jun 2020 07:57:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zL/Y/TuFrgE2NBF+gy/eoVwV6lLvMhuoUTAvQOvAfXA=; b=kC30gGfPLV26H40ZiP0ctwh46pTyTZ6Xn8P9hkvz2iznUcfCxDvDpEvoTTAXZTZwQu IIMIA+VNEZLmRJLyewcQySMYSkJ0Jmjm2rddh6cLq+dz3hj6zDABEk9BbOEKwzNCXULg uGgf9+gDbUyNwjDijia3ZH8jOHmCLl2l2w7Gs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zL/Y/TuFrgE2NBF+gy/eoVwV6lLvMhuoUTAvQOvAfXA=; b=U4YyQYvcqYertGBx/sQQH1NDKeAxPJF2WwALs+3cXPbZD9+OlSk3Vv+JilYfdPARFv x+LsGezJZ9IdWLsmd4dGSa4Y61CMT7+Z0OlaMgCB7Exu54uYhh88F4MVlb3wQWnAlGQs rWyolHUU4oYrZGEIkwVl23gyNv2fp1gujPnyk2bRluZIrZW6dYCZmDvMrfrb+dqczKMc uPZ+V/c4YQylYmvNZbWfZMmRu0hChv7d21SBQmMOIzV7poRh9bkTEQ4zs0ddMYu+ONZg mvk7UWkrMxyWW7hliu1AuRyQYgehEbhchbRBtpIxE5rwReKO1HozPPSPdbjIczCsBBhj 9pDw== X-Gm-Message-State: AOAM531CwGQMwRJ62uEgr9tUuhPo7L8Z/owPRzDTJvdx69QZsXZyJEMi niMbhWZ3tluYR+bmsdT/23alMxjHBTdFCQ== X-Google-Smtp-Source: ABdhPJxSB7DMmok7D7m4VfAayrfTYNtvs7u8g5F/4TDVk273sZuM67a9RV0dtq2GC0enB/JW57BlCg== X-Received: by 2002:a5d:4910:: with SMTP id x16mr1687613wrq.401.1592578646597; Fri, 19 Jun 2020 07:57:26 -0700 (PDT) Received: from localhost.localdomain (host194055151123.static.fidoka.tech. [194.55.151.123]) by smtp.gmail.com with ESMTPSA id a16sm7302165wrx.8.2020.06.19.07.57.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jun 2020 07:57:25 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Fri, 19 Jun 2020 16:57:15 +0200 Message-Id: <20200619145719.2352019-4-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200619145719.2352019-1-angelo@amarulasolutions.com> References: <20200619145719.2352019-1-angelo@amarulasolutions.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 3/7] package/cups: bump to version 2.3.3 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: Michael Trimarchi , Angelo Compagnucci Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This patch bumps cups to version 2.3.3. While bumping, fixing also the wrong installation of service files: the rcdir was left to the default value, that means installing the service files into the /etc/rcX.d directory. Adding also a simplified systemv service file for loading cupsd. Signed-off-by: Michael Trimarchi Signed-off-by: Angelo Compagnucci --- ...move-man-from-BUILDDIRS-in-configure.patch | 8 ++++--- package/cups/0002-Do-not-use-genstrings.patch | 14 ++++++----- ...0004-Remove-PIE-flags-from-the-build.patch | 8 ++++--- package/cups/S81cupsd | 23 +++++++++++++++++++ package/cups/cups.hash | 2 +- package/cups/cups.mk | 11 +++++++-- 6 files changed, 51 insertions(+), 15 deletions(-) create mode 100644 package/cups/S81cupsd diff --git a/package/cups/0001-Remove-man-from-BUILDDIRS-in-configure.patch b/package/cups/0001-Remove-man-from-BUILDDIRS-in-configure.patch index b1ab7cbace..7fcf7133c8 100644 --- a/package/cups/0001-Remove-man-from-BUILDDIRS-in-configure.patch +++ b/package/cups/0001-Remove-man-from-BUILDDIRS-in-configure.patch @@ -6,15 +6,17 @@ Subject: [PATCH] Remove man from BUILDDIRS in configure Signed-off-by: Bernd Kuhls [Fabrice: updated for 2.3.0] Signed-off-by: Fabrice Fontaine +[Michael: updated for 2.3.3] +Signed-off-by: Michael Trimarchi --- config-scripts/cups-common.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 -index fbba715..77d0f5c 100644 +index a460a73..d427acb 100644 --- a/config-scripts/cups-common.m4 +++ b/config-scripts/cups-common.m4 -@@ -446,7 +446,7 @@ AC_ARG_WITH(components, [ --with-components set components to build: +@@ -434,7 +434,7 @@ LIBHEADERSPRIV="\$(COREHEADERSPRIV) \$(DRIVERHEADERSPRIV)" case "$COMPONENTS" in all) @@ -24,5 +26,5 @@ index fbba715..77d0f5c 100644 core) -- -2.8.1 +2.17.1 diff --git a/package/cups/0002-Do-not-use-genstrings.patch b/package/cups/0002-Do-not-use-genstrings.patch index b3566b8b15..c7d6735b5f 100644 --- a/package/cups/0002-Do-not-use-genstrings.patch +++ b/package/cups/0002-Do-not-use-genstrings.patch @@ -16,23 +16,25 @@ genstrings call.] Signed-off-by: Thomas Petazzoni [Fabrice: updated for 2.3.0] Signed-off-by: Fabrice Fontaine +[Michael: updated for 2.3.3] +Signed-off-by: Michael Trimarchi --- ppdc/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/ppdc/Makefile b/ppdc/Makefile -index 68bf6b2..d57a0c9 100644 +index 32e2e0b..7b18879 100644 --- a/ppdc/Makefile +++ b/ppdc/Makefile -@@ -242,8 +242,6 @@ 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)" $@ +@@ -186,8 +186,6 @@ 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)" $@ - echo Generating localization strings... - ./genstrings >sample.c # -- -2.6.4 +2.17.1 diff --git a/package/cups/0004-Remove-PIE-flags-from-the-build.patch b/package/cups/0004-Remove-PIE-flags-from-the-build.patch index 8401e133e9..c2765dff09 100644 --- a/package/cups/0004-Remove-PIE-flags-from-the-build.patch +++ b/package/cups/0004-Remove-PIE-flags-from-the-build.patch @@ -13,15 +13,17 @@ Signed-off-by: Thomas Petazzoni Signed-off-by: Olivier Schonken [Fabrice: updated for 2.3.0] Signed-off-by: Fabrice Fontaine +[Michael: updated for 2.3.3] +Signed-off-by: Michael Trimarchi --- Makedefs.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makedefs.in b/Makedefs.in -index 3afef0a..299b297 100644 +index 5f1d32f..d669ea8 100644 --- a/Makedefs.in +++ b/Makedefs.in -@@ -148,7 +148,7 @@ IPPFIND_BIN = @IPPFIND_BIN@ +@@ -155,7 +155,7 @@ ALL_CXXFLAGS = -I.. -D_CUPS_SOURCE $(CXXFLAGS) \ $(ONDEMANDFLAGS) $(OPTIONS) ALL_DSOFLAGS = -L../cups @ARCHFLAGS@ @RELROFLAGS@ $(DSOFLAGS) $(OPTIM) ALL_LDFLAGS = -L../cups @LDARCHFLAGS@ @RELROFLAGS@ $(LDFLAGS) \ @@ -31,5 +33,5 @@ index 3afef0a..299b297 100644 ARFLAGS = @ARFLAGS@ BACKLIBS = @BACKLIBS@ -- -2.7.4 +2.17.1 diff --git a/package/cups/S81cupsd b/package/cups/S81cupsd new file mode 100644 index 0000000000..f527d55f1e --- /dev/null +++ b/package/cups/S81cupsd @@ -0,0 +1,23 @@ +#!/bin/sh + +case "$1" in + start) + printf "Starting cupsd: " + start-stop-daemon -S -q -m -p /var/run/cupsd.pid \ + -b -x cupsd -- -C /etc/cups/cupsd.conf -s /etc/cups/cups-files + [ $? = 0 ] && echo "OK" || echo "FAIL" + ;; + stop) + printf "Stopping cupsd: " + start-stop-daemon -K -q -p /var/run/cupsd.pid + [ $? = 0 ] && echo "OK" || echo "FAIL" + ;; + restart) + "$0" stop + sleep 1 + "$0" start + ;; + *) + echo "Usage: $0 {start|stop|restart}" + ;; +esac diff --git a/package/cups/cups.hash b/package/cups/cups.hash index 8f037c6420..2eb289e209 100644 --- a/package/cups/cups.hash +++ b/package/cups/cups.hash @@ -1,4 +1,4 @@ # Locally calculated: -sha256 1bca9d89507e3f68cbc84482fe46ae8d5333af5bc2b9061347b2007182ac77ce cups-2.3.1-source.tar.gz +sha256 261fd948bce8647b6d5cb2a1784f0c24cc52b5c4e827b71d726020bcc502f3ee cups-2.3.3-source.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE sha256 a5d616e6322a9cb1a971e18765025edfca4f3cd9c0eafc32d6d2eb4b8c8787b5 NOTICE diff --git a/package/cups/cups.mk b/package/cups/cups.mk index 18f01d8484..461e0d9143 100644 --- a/package/cups/cups.mk +++ b/package/cups/cups.mk @@ -4,7 +4,7 @@ # ################################################################################ -CUPS_VERSION = 2.3.1 +CUPS_VERSION = 2.3.3 CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.gz CUPS_SITE = https://github.com/apple/cups/releases/download/v$(CUPS_VERSION) CUPS_LICENSE = Apache-2.0 with GPL-2.0/LGPL-2.0 exception @@ -21,7 +21,8 @@ CUPS_CONF_OPTS = \ --with-docdir=/usr/share/cups/doc-root \ --disable-gssapi \ --disable-pam \ - --libdir=/usr/lib + --libdir=/usr/lib \ + --with-rcdir=no CUPS_CONFIG_SCRIPTS = cups-config CUPS_DEPENDENCIES = \ host-autoconf \ @@ -71,4 +72,10 @@ else CUPS_CONF_OPTS += --disable-avahi endif +define CUPS_INSTALL_INIT_SYSV + @$(RM) $(TARGET_DIR)/etc/init.d/cups + $(INSTALL) -D -m 0755 package/cups/S81cupsd \ + $(TARGET_DIR)/etc/init.d/S81cupsd +endef + $(eval $(autotools-package)) From patchwork Fri Jun 19 14:57:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1313015 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=WEA4ZA6q; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49pMP03YLpz9sfN for ; Sat, 20 Jun 2020 00:57:56 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id DBA878960C; Fri, 19 Jun 2020 14:57:53 +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 VWqpCe14WIbX; Fri, 19 Jun 2020 14:57:51 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 30D23895ED; Fri, 19 Jun 2020 14:57:51 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id E07CE1BF860 for ; Fri, 19 Jun 2020 14:57:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id DA2792283C for ; Fri, 19 Jun 2020 14:57:31 +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 84QI-8NNhFRB for ; Fri, 19 Jun 2020 14:57:30 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by silver.osuosl.org (Postfix) with ESMTPS id E492A2040E for ; Fri, 19 Jun 2020 14:57:29 +0000 (UTC) Received: by mail-wr1-f49.google.com with SMTP id l11so10015143wru.0 for ; Fri, 19 Jun 2020 07:57:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qM149OxufJaKATEgeDB+s0L29mOQVlDyX+9aMxqyjUQ=; b=WEA4ZA6qLmyydsXPZFVZcnfvVNK7EsJmQMm75KUmdxowAiGwd/mgLdqN0WU2HpsWzi lP1692+CQOsfnOQIRgaufZ7g9s3amjZzUknFAQfLZTW2NtYfq9ezMzC5OrTfSSY0zUia 4eY+hDsLZ37G+LRXKU+NCbXVMT7gVBeG2lhPk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qM149OxufJaKATEgeDB+s0L29mOQVlDyX+9aMxqyjUQ=; b=WfMDxST9V2K6flGnkAi87JJgZ1OpLr3EBFSPeWsxkwFqPg4QTKGU4KH44iJuMgoJgM C1gzGKxao0JUpPVEFm0lRl4KM2fb2Ieg+bOCdxxxqFtiqiXmozfaY6PH6KFf6LTsjlRi Nt7jHOTpG3Y6ogOrvW0LpNS+Bm5+iItzWK6A14YJt+J5VeHDZbQnFIZhSv5NQz8siH64 52rgUeEjj8wF1J5r2tUFfjA1VLDwttJ3qrNleHOcUxiiGFe2lf70pgpfkUQPQVUWJ1qO 9HP6uRjFKJSk3/QjAIgDIEgFzlzvLC6WMPwoU52DrkTwdQIH6Lwqpd6dmi0O7Lekz134 QDsA== X-Gm-Message-State: AOAM531ukbCOnrDACeKwMKc4lXOhKp8/Ug8OhApAcyZfErn1vFDzalUJ 3YnCZA7MDEJCvHO15Y4LqheEmOPGznK1EA== X-Google-Smtp-Source: ABdhPJzK8ZP+2mGcCPN+tj/yyiSNpe7kgU8YFVRSGaUAnt0+RqeoKo7MnXs21x1GmGoKH98wHn6MMQ== X-Received: by 2002:a5d:49c4:: with SMTP id t4mr4408638wrs.127.1592578647894; Fri, 19 Jun 2020 07:57:27 -0700 (PDT) Received: from localhost.localdomain (host194055151123.static.fidoka.tech. [194.55.151.123]) by smtp.gmail.com with ESMTPSA id a16sm7302165wrx.8.2020.06.19.07.57.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jun 2020 07:57:27 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Fri, 19 Jun 2020 16:57:16 +0200 Message-Id: <20200619145719.2352019-5-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200619145719.2352019-1-angelo@amarulasolutions.com> References: <20200619145719.2352019-1-angelo@amarulasolutions.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 4/7] package/cups: Add lp user as default cups user 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: Angelo Compagnucci Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This patch is a backport from the rockchip tree. Author: Jeffy Chen Date: Tue Nov 13 18:25:34 2018 +0800 package: cups: Add lp user as default cups user Change-Id: Ic7434fe0a7b41b86b5b8b097fa29dd9718e29aa5 Signed-off-by: Jeffy Chen but fixes the CUPS_USERS table. Signed-off-by: Angelo Compagnucci --- package/cups/cups.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/cups/cups.mk b/package/cups/cups.mk index 461e0d9143..40fe210c94 100644 --- a/package/cups/cups.mk +++ b/package/cups/cups.mk @@ -22,6 +22,9 @@ CUPS_CONF_OPTS = \ --disable-gssapi \ --disable-pam \ --libdir=/usr/lib \ + --with-cups-user=lp \ + --with-cups-group=lp \ + --with-system-groups="lpadmin sys root" \ --with-rcdir=no CUPS_CONFIG_SCRIPTS = cups-config CUPS_DEPENDENCIES = \ @@ -78,4 +81,9 @@ define CUPS_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S81cupsd endef +define CUPS_USERS + lp -1 lp -1 * /var/spool/lpd /bin/false - lp + - - lpadmin -1 * - - - Printers admin group. +endef + $(eval $(autotools-package)) From patchwork Fri Jun 19 14:57:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1313019 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=NvQ7NgRA; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49pMP22q6kz9sWp for ; Sat, 20 Jun 2020 00:57:58 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E896A87AB1; Fri, 19 Jun 2020 14:57:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZVm2Y58Day5c; Fri, 19 Jun 2020 14:57:52 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id A8C1787ADD; Fri, 19 Jun 2020 14:57:52 +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 2AC2A1BF9C6 for ; Fri, 19 Jun 2020 14:57:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 27DF188FC1 for ; Fri, 19 Jun 2020 14:57:32 +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 dEzO9zpndCIH for ; Fri, 19 Jun 2020 14:57:31 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id 482FE88E88 for ; Fri, 19 Jun 2020 14:57:31 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id d128so9387960wmc.1 for ; Fri, 19 Jun 2020 07:57:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=C/o+pMG4BBWjXWS4mC+gJBoHkKQcs4r9FNxge8ppzgE=; b=NvQ7NgRAnSyYxLOWnaaOJ7QSsGfeWLAN7KzZpv/LyfSf3e2uFzeUycOwrejrhikHbK W4M+0ywhTdrS9pjiylQvLy7vYZnzbknbxLAylwzeXQRA1UUdRVUNwwQrWXsMz9mnflYe GX0cQb4hbtCFn8s583mk13w5YVTk3gOUMGEDw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=C/o+pMG4BBWjXWS4mC+gJBoHkKQcs4r9FNxge8ppzgE=; b=KSwlCZOOPeVoMByFDqtYmnuuBIxH0s/IhS3DjQOns0rBHIDSfdWW1w9tzwLQpTX2oG 2SU4TRknSd28Uitg2hISbQJxm8NWAtsRgP4OxFs4nMGoW125h427q152zMn+gW4AwbiZ rUHfBahx6q2bWaEjADRhId29c5DKnLlPRnbNM2V/Eft+G+Vex/HCsWRGNw/Iemj0hl3r CmiNqPo7hQwSjH3uTPRw7q47Abx3XFjTYLOfuNKSDUBPoUN0ktUf+LGHXy/5n1mTw9VO 4AEO69S8bjWVpGGZCjCSrS1b/KEFqWBp80Zm5JVB80yqPKB72jbFVAivj+9NJ4xGlZDo CCGg== X-Gm-Message-State: AOAM533b1IdtU5OljFE5XoEJ2tzi02QoYv+sCpynKIR4m+YGTS3ATg8V QjD5ojoof1P2alXswb942rzQ0k8X099OXw== X-Google-Smtp-Source: ABdhPJz0ZtjZoqpjSAUXeDHldGZImCP1O/DofP5ickDPWJrZ32Y/lKvBGmoNDO1g/C/1JbGOWQnfyA== X-Received: by 2002:a1c:3881:: with SMTP id f123mr4114117wma.178.1592578649290; Fri, 19 Jun 2020 07:57:29 -0700 (PDT) Received: from localhost.localdomain (host194055151123.static.fidoka.tech. [194.55.151.123]) by smtp.gmail.com with ESMTPSA id a16sm7302165wrx.8.2020.06.19.07.57.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jun 2020 07:57:28 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Fri, 19 Jun 2020 16:57:17 +0200 Message-Id: <20200619145719.2352019-6-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200619145719.2352019-1-angelo@amarulasolutions.com> References: <20200619145719.2352019-1-angelo@amarulasolutions.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 5/7] package/cups: Add udev rules to assign usb printers group to lp 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: Michael Trimarchi , Angelo Compagnucci Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This patch is based on patch from the rockchip tree: commit c8a337593660f27379c30248a11bf08dc8712113 Author: Jeffy Chen Date: Tue Nov 13 18:59:43 2018 +0800 package: cups: Add udev rules to assign usb printers' group to lp Change-Id: Ieae17deaa7d3623e1f0e1cc826871f1719d98d88 Signed-off-by: Jeffy Chen Signed-off-by: Michael Trimarchi Signed-off-by: Angelo Compagnucci --- package/cups/70-usb-printers.rules | 4 ++++ package/cups/cups.mk | 9 +++++++++ 2 files changed, 13 insertions(+) create mode 100644 package/cups/70-usb-printers.rules diff --git a/package/cups/70-usb-printers.rules b/package/cups/70-usb-printers.rules new file mode 100644 index 0000000000..537645523d --- /dev/null +++ b/package/cups/70-usb-printers.rules @@ -0,0 +1,4 @@ +# Allow USB printers in the lp group +# Match rules converted from usblp.c driver's usblp_ids +ACTION=="add", SUBSYSTEM=="usb", ATTR{bInterfaceClass}=="07", ATTR{bInterfaceSubClass}=="01", GROUP="lp" +ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="04b8", ATTRS{idProduct}=="0202", GROUP="lp" diff --git a/package/cups/cups.mk b/package/cups/cups.mk index 40fe210c94..617b402969 100644 --- a/package/cups/cups.mk +++ b/package/cups/cups.mk @@ -75,6 +75,15 @@ else CUPS_CONF_OPTS += --disable-avahi endif +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) +define CUPS_INSTALL_UDEV_RULES + $(INSTALL) -D -m 0644 package/cups/70-usb-printers.rules \ + $(TARGET_DIR)/lib/udev/rules.d/70-usb-printers.rules +endef + +CUPS_POST_INSTALL_TARGET_HOOKS += CUPS_INSTALL_UDEV_RULES +endif + define CUPS_INSTALL_INIT_SYSV @$(RM) $(TARGET_DIR)/etc/init.d/cups $(INSTALL) -D -m 0755 package/cups/S81cupsd \ From patchwork Fri Jun 19 14:57:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1313016 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=Pl9SyiBL; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49pMP22q92z9sf9 for ; Sat, 20 Jun 2020 00:57:57 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id EB15D2544B; Fri, 19 Jun 2020 14:57:55 +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 CPwHYxxURM83; Fri, 19 Jun 2020 14:57:54 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 019B720447; Fri, 19 Jun 2020 14:57:54 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 4D6A61BF860 for ; Fri, 19 Jun 2020 14:57:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 49BAE2283C for ; Fri, 19 Jun 2020 14:57:33 +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 YZjRjEEjhPLc for ; Fri, 19 Jun 2020 14:57:32 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by silver.osuosl.org (Postfix) with ESMTPS id 891382040E for ; Fri, 19 Jun 2020 14:57:32 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id g10so8701242wmh.4 for ; Fri, 19 Jun 2020 07:57:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7wPp2oshIKzivKmLjWGovn91xf7tM0zL/tRABus5wEM=; b=Pl9SyiBLcEmoVorcM/i0fJTsMkbd+uxdgugx470Qv3qcL3ilMVQ2lReNd50UMEr5GP l8WjuFAFAR8slLSNs68qvtsCdWSCf6mUijRPxG7yckTvlxcoMfcQcV87Iavu9hvz+6mo tPPgzldZ2q35nCtS73QpYZfoLM3jXbWINguLw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7wPp2oshIKzivKmLjWGovn91xf7tM0zL/tRABus5wEM=; b=W0MeF5M/2PLqd1IK+L9KB2m1qK9tNSLG2B7FShkzUWRaaqAdDTDNrBck9B/N4/eT2h vBpdRSaf5wWyx/XzTQbrZNIriXaEzaZjgZk8aDWpWbC9jtPlH+i0HQbqs8y3XoKMdr0e szAuuva4qnEEAcCNbct7wg1o/HScMZW53zypU+sAo3p5eTRYHPakJw378UbXr4SJ3pFG dATLGLPhxyuybr0eNrrzD6fNH/8XiX6XY28ap2M/e/x726ylYSWbsNPDjPuhRvSnxhoh 9Y7Y/Sezpdj9kb9D8hWliHcwJ/nHlA7deJkghgzRXMJOn4xol3e9ljFYaVaGhv8RlJuJ elIA== X-Gm-Message-State: AOAM533mAGniW83E+dUmR9QQJi5W5Fm1B8GR4OWCYtrfseW6qUNhI9TN 8kknVhet7bLkyXXIZY4VugCPPzqVHn5IxA== X-Google-Smtp-Source: ABdhPJz+H3fOcbjFk23lhjTerajARVfLleNohBCoZAZRYtlmC9Uuq7mBC5Aj9cNC5YknIVwhoGYl2A== X-Received: by 2002:a1c:7414:: with SMTP id p20mr4116608wmc.124.1592578650479; Fri, 19 Jun 2020 07:57:30 -0700 (PDT) Received: from localhost.localdomain (host194055151123.static.fidoka.tech. [194.55.151.123]) by smtp.gmail.com with ESMTPSA id a16sm7302165wrx.8.2020.06.19.07.57.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jun 2020 07:57:29 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Fri, 19 Jun 2020 16:57:18 +0200 Message-Id: <20200619145719.2352019-7-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200619145719.2352019-1-angelo@amarulasolutions.com> References: <20200619145719.2352019-1-angelo@amarulasolutions.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 6/7] package/cups: adding python support 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: Michael Trimarchi , Angelo Compagnucci Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Enables python support if python is available. Signed-off-by: Michael Trimarchi Signed-off-by: Angelo Compagnucci --- package/cups/cups.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/cups/cups.mk b/package/cups/cups.mk index 617b402969..67690b61c4 100644 --- a/package/cups/cups.mk +++ b/package/cups/cups.mk @@ -75,6 +75,13 @@ else CUPS_CONF_OPTS += --disable-avahi endif +ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) +CUPS_CONF_OPTS += --with-python +CUPS_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3) +else +CUPS_CONF_OPTS += --without-python +endif + ifeq ($(BR2_PACKAGE_HAS_UDEV),y) define CUPS_INSTALL_UDEV_RULES $(INSTALL) -D -m 0644 package/cups/70-usb-printers.rules \ From patchwork Fri Jun 19 14:57:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1313017 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=aAWaSsVX; dkim-atps=neutral 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 49pMP22qpvz9sfR for ; Sat, 20 Jun 2020 00:57:58 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id F0D39899ED; Fri, 19 Jun 2020 14:57:55 +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 egZQlNK8L4k2; Fri, 19 Jun 2020 14:57:55 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 67DA4899F1; Fri, 19 Jun 2020 14:57:55 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id C26891BF860 for ; Fri, 19 Jun 2020 14:57:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id BF64B865A5 for ; Fri, 19 Jun 2020 14:57:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id biPrInjaVlli for ; Fri, 19 Jun 2020 14:57:37 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 6AA92866F2 for ; Fri, 19 Jun 2020 14:57:37 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id b82so8704036wmb.1 for ; Fri, 19 Jun 2020 07:57:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Pdws9W3+ucWZnnUkB8pfuVNqlJU4D4bt0f+YmndSt3s=; b=aAWaSsVXo7vlxa4aJvCNLY131N569hrnIr8xHm8CryiyFCTSfXsdZN76m+2xxQyUZq IGjeMfX9gRHiLFKE5xe63lv4od3v7J7wSlQWoLTVSPeBG4Zae1XoZ27ercS3btEpLpqi 0nifnqpyF27pj+l+rEW0ClJ0Vt2SQ7l75f/1o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Pdws9W3+ucWZnnUkB8pfuVNqlJU4D4bt0f+YmndSt3s=; b=gDOI6Mg1T3u676ZUVwI9pqC4uEw9ho61WeSKWPZQdW1tvZOX2RW0XiqoJdcGQnK0tG K9ks6nbvOKgbFhxe21Ny/DmVQl7DJ3SKQ3y7T96AFiw8NmcgZxHBhvOBON8wkkX6gp4+ YAnrXAeHT3iyG4HEHaEB7OHWUjTi8KUczCQIXjR2rXwM0+iDN7I6N5TetsObVeS24iws gX6OetgAbTWVFBdlNkYjbXITCvI86ajY1dOz+YNnSrBAo1Lr5zxOtDuQiB+hFptxumQw +fuy0FBQsThFtEQw6KxntTzbJNPCAkFOwYyKgaIFrD9QzpJdAx/4Crj/SsLHCxw/38Kb 1qsQ== X-Gm-Message-State: AOAM533l0sZ7yWutcmMl2e/uUxTMTatu+dG8t++KQz3pLnwve7hVnsbj usEOtqG7z/WvGRB+3SbO17NfeodyN72AuA== X-Google-Smtp-Source: ABdhPJxrXQ4egLIq2yFee8je56xJYhGSozqfbqGwpt+RE9Oo+2mYJNr3zpwi+h3qFWqqrZZkEJGHmg== X-Received: by 2002:a1c:4c0d:: with SMTP id z13mr3932466wmf.97.1592578651685; Fri, 19 Jun 2020 07:57:31 -0700 (PDT) Received: from localhost.localdomain (host194055151123.static.fidoka.tech. [194.55.151.123]) by smtp.gmail.com with ESMTPSA id a16sm7302165wrx.8.2020.06.19.07.57.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jun 2020 07:57:30 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Fri, 19 Jun 2020 16:57:19 +0200 Message-Id: <20200619145719.2352019-8-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200619145719.2352019-1-angelo@amarulasolutions.com> References: <20200619145719.2352019-1-angelo@amarulasolutions.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 7/7] package/qt5: Enable cups support when BR2_PACKAGE_CUPS 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: Michael Trimarchi , Angelo Compagnucci Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Michael Trimarchi Cups support in QT should be enable if CUPS is available system wide. Signed-off-by: Michael Trimarchi Signed-off-by: Angelo Compagnucci --- package/qt5/qt5base/qt5base.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 42d77306cc..c6b459a0e1 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -23,7 +23,6 @@ QT5BASE_INSTALL_STAGING = YES # feature enabled QT5BASE_CONFIGURE_OPTS += \ -optimized-qmake \ - -no-cups \ -no-iconv \ -system-zlib \ -system-pcre \ @@ -108,6 +107,13 @@ ifeq ($(BR2_PACKAGE_HAS_UDEV),y) QT5BASE_DEPENDENCIES += udev endif +ifeq ($(BR2_PACKAGE_CUPS), y) +QT5BASE_DEPENDENCIES += cups +QT5BASE_CONFIGURE_OPTS += -cups +else +QT5BASE_CONFIGURE_OPTS += -no-cups +endif + # Qt5 SQL Plugins ifeq ($(BR2_PACKAGE_QT5BASE_SQL),y) ifeq ($(BR2_PACKAGE_QT5BASE_MYSQL),y)