From patchwork Wed Jun 24 20:43:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1316574 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=DgYbWWDp; 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 49sZrB4jsxz9sSn for ; Thu, 25 Jun 2020 06:44:10 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 8DE4C88418; Wed, 24 Jun 2020 20:44:07 +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 qGCDZgF41DkN; Wed, 24 Jun 2020 20:44:06 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 3D71488415; Wed, 24 Jun 2020 20:44:06 +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 6BF371BF2AA for ; Wed, 24 Jun 2020 20:44:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 68DE5203EA for ; Wed, 24 Jun 2020 20:44:00 +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 fdpdHzQdopzn for ; Wed, 24 Jun 2020 20:43:59 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by silver.osuosl.org (Postfix) with ESMTPS id DDCE52039C for ; Wed, 24 Jun 2020 20:43:58 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id z13so3603716wrw.5 for ; Wed, 24 Jun 2020 13:43:58 -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=QyUFJx8qx3KAYDvpm7MVXSsCFW7yAkiNkS3bJS1UBEs=; b=DgYbWWDpl6qyv6Ue4nqoaM3TtdMuKmGAq1q8+ySbIFZKnrDzURqjb4uKbwQ8XRmJ1r SImxIyW2Z+crNGurUliCmVoSYluTtocZc+6trPWY7mcjJVl+uxJCFPH5rtlx1gLboG3+ l47NfN7TQ3SbA+5c/we/x4du5c0u8S4BDDMvg= 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=QyUFJx8qx3KAYDvpm7MVXSsCFW7yAkiNkS3bJS1UBEs=; b=R9EZtVu7LDjfm0+gkNyhq+J8x/6HPb2La5ai5Ov2MLRj+OMjJ9wW+w8n2jzzKEzSJC A8XirECQ4vOzgQZtVsBLA6kVlxBM9ho87EKoA3f1ewECcLitewMAZ/Y1isMIn1s/pDBE xGAmIPamRl2z8XY7rtLHq77Fi3PyT2zr/5m8Bh+hlFbodLuvvjDQRsyycp1wgAEK0o2i CVRDNd1z13PF7DtH1Yi156NSOOPFVUhq3s9ABnSCyhSt29j+e5PDbMqZLPZ28+TTZbry JfhQu+y/Yy8ZdLhSIgb2+7DMScdPNDIw2+Xbl4iE1HU+Hse0qYyBXLkrIXEzifvjLgka FKbg== X-Gm-Message-State: AOAM531tOwnCHX/86I/1eWvGfsFYXUDWyJCIyNd5IIlSLrzZu3Irb57c E1FUhlfxJQePJ7jg4+Ste2ThbZDhGXNyaA== X-Google-Smtp-Source: ABdhPJwzvv3afTkrQHMXdl1rqjW2B/y7Q0KZ5tROcksm/N2dbfNfyv4HeAupEX81y6puv5wZo0q11g== X-Received: by 2002:adf:f751:: with SMTP id z17mr23558462wrp.114.1593031436817; Wed, 24 Jun 2020 13:43:56 -0700 (PDT) Received: from localhost.localdomain (host194055151123.static.fidoka.tech. [194.55.151.123]) by smtp.gmail.com with ESMTPSA id 11sm9643996wmg.41.2020.06.24.13.43.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2020 13:43:56 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Wed, 24 Jun 2020 22:43:41 +0200 Message-Id: <20200624204347.797088-2-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200624204347.797088-1-angelo@amarulasolutions.com> References: <20200624204347.797088-1-angelo@amarulasolutions.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 1/7] package/cups-filters: fix cups-browsed service 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" cups-browsed service is compiled and installed by the package, but the corresponding services file were not installed for systemv and systemd. Signed-off-by: Angelo Compagnucci --- package/cups-filters/S82cups-browsed | 48 ++++++++++++++++++++++++++++ package/cups-filters/cups-filters.mk | 13 +++++++- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 package/cups-filters/S82cups-browsed diff --git a/package/cups-filters/S82cups-browsed b/package/cups-filters/S82cups-browsed new file mode 100644 index 0000000000..08909c7f98 --- /dev/null +++ b/package/cups-filters/S82cups-browsed @@ -0,0 +1,48 @@ +#!/bin/sh + +DAEMON="cups-browsed" +PIDFILE="/var/run/$DAEMON.pid" + +start() { + printf 'Starting %s: ' "$DAEMON" + # shellcheck disable=SC2086 # we need the word splitting + start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/sbin/$DAEMON" \ + -- -c /etc/cups/cups-browsed.conf + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p "$PIDFILE" + status=$? + if [ "$status" -eq 0 ]; then + rm -f "$PIDFILE" + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + sleep 1 + start +} + +case "$1" in + start|stop|restart) + "$1";; + reload) + # Restart, since there is no true "reload" feature. + restart;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/package/cups-filters/cups-filters.mk b/package/cups-filters/cups-filters.mk index 1f17018bc5..0a2622b87b 100644 --- a/package/cups-filters/cups-filters.mk +++ b/package/cups-filters/cups-filters.mk @@ -19,7 +19,8 @@ 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 ifeq ($(BR2_PACKAGE_LIBPNG),y) CUPS_FILTERS_CONF_OPTS += --with-png @@ -71,4 +72,14 @@ else CUPS_FILTERS_CONF_OPTS += --disable-poppler endif +define CUPS_FILTERS_INSTALL_INIT_SYSV + $(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 Wed Jun 24 20:43:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1316576 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=HYKStIp3; 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 49sZrD3Sg2z9sRW for ; Thu, 25 Jun 2020 06:44:12 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3289186A29; Wed, 24 Jun 2020 20:44:09 +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 lPGJZvMBKe4C; Wed, 24 Jun 2020 20:44:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 32B8F86B90; Wed, 24 Jun 2020 20:44:07 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 889001BF2AA for ; Wed, 24 Jun 2020 20:44:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 8447088408 for ; Wed, 24 Jun 2020 20:44:01 +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 WQoU8SwuNaBp for ; Wed, 24 Jun 2020 20:44:00 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by hemlock.osuosl.org (Postfix) with ESMTPS id 3397488402 for ; Wed, 24 Jun 2020 20:44:00 +0000 (UTC) Received: by mail-wm1-f48.google.com with SMTP id l17so3534285wmj.0 for ; Wed, 24 Jun 2020 13:44:00 -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=QAV5juCMd9F7jUPjwWM6NiEMpRSHkieor7ATKqpxizk=; b=HYKStIp3MPfDtkX4mbHVGDE6aD1VK26kfy571l7WyRpXtHri+JQ89yS7VYv1KDHHeh P+MsuVA2YN1sg//Xn9k0zs3+bU4WaCTxl+P8EALTrY88Glvi7TAmFv64Cb5sDjxSfDzn nzWDl8Rgc9Fxo6t/a5QkZ0VrphdmGbJdYe85M= 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=QAV5juCMd9F7jUPjwWM6NiEMpRSHkieor7ATKqpxizk=; b=UFKGrZcF2RtF2suwOdZB30OJhF2BLjn09SwYwRaE0vcOfeK2d2JHisTWlWNZznRH4g PV3JbJMRdWJNXjxbNjS+TNWxvBPGq61Pz3vX5Htvnx5xW4G/YCavXHZyoLfvUHg3BLew Kzd+KC8MdVpHjw+0HmQbT/hM6Oj/7WNxKObZAgEZsiQu0YQHOjwQVLmwunORGMRcc/g1 D7v5FriyMXhYCK4u7Fe0AsfEPL6kJxjA24WYFMi+1riiHQRFMSbCt/xmtOlY33PIhmSM B2wNgnwxhqHqNiiBCxWqpFG0JE3l6EnBjJN/ngL9Of25/mKN/QKDqjpFlQ5m5CXlCAS6 5n8A== X-Gm-Message-State: AOAM5324NoTlEy9HJNLnlmNea/FsN9pXS7k4yvbu2GAzdNaH39NXL5Le FSjxOoXsDMYWmU6KtcQfSI+GaFesvp2z3Q== X-Google-Smtp-Source: ABdhPJxRQUhlXkPc1h+2xOMiO9Wa7Qr4+wtMUKxfmiumsGfxCsfo3ONEXTciMTsnCjOElP9MmC06DQ== X-Received: by 2002:a1c:6887:: with SMTP id d129mr31065382wmc.179.1593031438048; Wed, 24 Jun 2020 13:43:58 -0700 (PDT) Received: from localhost.localdomain (host194055151123.static.fidoka.tech. [194.55.151.123]) by smtp.gmail.com with ESMTPSA id 11sm9643996wmg.41.2020.06.24.13.43.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2020 13:43:57 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Wed, 24 Jun 2020 22:43:42 +0200 Message-Id: <20200624204347.797088-3-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200624204347.797088-1-angelo@amarulasolutions.com> References: <20200624204347.797088-1-angelo@amarulasolutions.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 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. Signed-off-by: Angelo Compagnucci Signed-off-by: Michael Trimarchi --- package/cups-filters/cups-filters.hash | 2 +- package/cups-filters/cups-filters.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 0a2622b87b..c622fb68af 100644 --- a/package/cups-filters/cups-filters.mk +++ b/package/cups-filters/cups-filters.mk @@ -4,7 +4,7 @@ # ################################################################################ -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 From patchwork Wed Jun 24 20:43:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1316575 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=GFanE5Cz; 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 49sZrC2ff8z9sSt for ; Thu, 25 Jun 2020 06:44:11 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D01FE864F5; Wed, 24 Jun 2020 20:44:09 +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 gBATeS5tqH91; Wed, 24 Jun 2020 20:44:08 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 0113E875EE; Wed, 24 Jun 2020 20:44:08 +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 D7F761BF2AA for ; Wed, 24 Jun 2020 20:44:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D3855877DC for ; Wed, 24 Jun 2020 20:44:02 +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 KHJtRwJJfMq1 for ; Wed, 24 Jun 2020 20:44:01 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by whitealder.osuosl.org (Postfix) with ESMTPS id 77718877D6 for ; Wed, 24 Jun 2020 20:44:01 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id z13so3603827wrw.5 for ; Wed, 24 Jun 2020 13:44:01 -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=HS+1UxahAVRBS1xabVyKkNQmhoVvlLHnu8zJsfN/0ms=; b=GFanE5CzOE7JAG752fGw8Fz8dPD3FK3QGbtGv+td386TjiP5wti94AtUm8qzIpIGVK kieHhLWVRouF/HNQEN2capy23PhEmaB4CAszutIzuV7nI+aEnLnTKEuyp+n14F77duzQ /f3/wQ+BtFCGddfoY8tgK7OPnJl6lYJeeugPI= 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=HS+1UxahAVRBS1xabVyKkNQmhoVvlLHnu8zJsfN/0ms=; b=H7wte1EomPgHy60cda+kTC/07hcGRBIOO5UR9ZtMo6/p7/5pCGKRGYky7r+XK3vx9g AYmCiPkPh+nuBXyIbV9cVsci6EI4msVt5WesCKfJOrO9w7AQj8OKs4xwNez7bdHgurFd sdStPltcKCxeRcKmessGnLqMx1UPlCbKKGiAoHnlLn2I4seMVqhyBwJYLt3jGkbvLaSA owuXk1uXB5OLbwq5IOYzivcZzUIcq3OHH/Hrjnx9dG/FeK3/6OOV4HOvSLufY2czkQRW t8gu87FkXHzbkGKph9GvslKa2/u/alM9Lz2/oZc6XNFNASe/nTYbRYx6yuJeHAoGn+Qr Re3w== X-Gm-Message-State: AOAM530BWrXPVMXuLabwtjqpsnPjBp+Ft2u8ndOjm2CWEKsI67sg3WBE nHbNKc3UPr+eTfqCRIdft1ddMdLZc8/QqQ== X-Google-Smtp-Source: ABdhPJxihtDrobo7CkZ7bQEv5TVzfQY2WtWmYY0L5pRBVnaYTztWXC5FbIOKQ2LD08CjsIGPgECjRA== X-Received: by 2002:a5d:54c9:: with SMTP id x9mr34704134wrv.247.1593031439467; Wed, 24 Jun 2020 13:43:59 -0700 (PDT) Received: from localhost.localdomain (host194055151123.static.fidoka.tech. [194.55.151.123]) by smtp.gmail.com with ESMTPSA id 11sm9643996wmg.41.2020.06.24.13.43.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2020 13:43:58 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Wed, 24 Jun 2020 22:43:43 +0200 Message-Id: <20200624204347.797088-4-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200624204347.797088-1-angelo@amarulasolutions.com> References: <20200624204347.797088-1-angelo@amarulasolutions.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 3/7] package/cups: fix cups service 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" Cups service for systemv was erroneously installed in /etc/rcX.d and therefore not working. This patch adds also a buildroot style systemv init script instead of using the example provided by the package. Signed-off-by: Angelo Compagnucci --- package/cups/S81cupsd | 48 +++++++++++++++++++++++++++++++++++++++++++ package/cups/cups.mk | 9 +++++++- 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 package/cups/S81cupsd diff --git a/package/cups/S81cupsd b/package/cups/S81cupsd new file mode 100644 index 0000000000..13b43ded5e --- /dev/null +++ b/package/cups/S81cupsd @@ -0,0 +1,48 @@ +#!/bin/sh + +DAEMON="cupsd" +PIDFILE="/var/run/$DAEMON.pid" + +start() { + printf 'Starting %s: ' "$DAEMON" + # shellcheck disable=SC2086 # we need the word splitting + start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/sbin/$DAEMON" \ + -- -C /etc/cups/cupsd.conf -s /etc/cups/cups-files + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p "$PIDFILE" + status=$? + if [ "$status" -eq 0 ]; then + rm -f "$PIDFILE" + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + sleep 1 + start +} + +case "$1" in + start|stop|restart) + "$1";; + reload) + # Restart, since there is no true "reload" feature. + restart;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/package/cups/cups.mk b/package/cups/cups.mk index 18f01d8484..cff198b06a 100644 --- a/package/cups/cups.mk +++ b/package/cups/cups.mk @@ -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 Wed Jun 24 20:43:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1316580 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=gQUq7FOE; 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 49sZrM6lvCz9sSn for ; Thu, 25 Jun 2020 06:44:19 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 64B132154C; Wed, 24 Jun 2020 20:44:18 +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 VtC0GfjMAhK8; Wed, 24 Jun 2020 20:44:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 05928220A2; Wed, 24 Jun 2020 20:44:11 +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 B144A1BF2AA for ; Wed, 24 Jun 2020 20:44:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id AEE6D86BBC for ; Wed, 24 Jun 2020 20:44:04 +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 zaa550z5NNFP for ; Wed, 24 Jun 2020 20:44:03 +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 fraxinus.osuosl.org (Postfix) with ESMTPS id 2CBBF866AD for ; Wed, 24 Jun 2020 20:44:02 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id o2so3788920wmh.2 for ; Wed, 24 Jun 2020 13:44:02 -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=NjvRQdGIIlKrX71+ZB2V5O5sYj0qJC9MjAYHCprO8ps=; b=gQUq7FOEVGeBpdgAhVSUmRbfOVRlW8sIkCo9nGuYdkttEhrVrFkIoVEZA7qjMxrb2N U6RFWkPkwqhsTh3N4FsMGxyWrXocX7TeTGiFrLth5+KUuHtDkq68ncwl/ZUs6VqcByn2 wa8Gwby7iGEO1sfYnsOjR1tBWGWvwoq8/mb4w= 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=NjvRQdGIIlKrX71+ZB2V5O5sYj0qJC9MjAYHCprO8ps=; b=CIxyfQGfKZR6jAq7PzfKwxr3tj7Eyf3zhRlpsKWeFCpLy6w32saRGfLX5g+OeBh31z X4Aj0f9ZftmiubGq6XMIBhyznJcsu/Cwh/ocbQLb1pfdAOgWjPZ54eWDhIxMb8gpd+uK rsarjRd3UiaPaJuY9WwpnJKBef8IvsIFL9Bqtm1XorEjfHc7D2YDw8lcMLJTEK9iJQwj ArpJOHu1kS/ejUyvwrJBtHwnrBiTwFLfKH3OI+6E0VNdBi/nPAQfKQEI4h0e3trWodpF lrI05svPTK/3d/wewJhswLJQ6QSKxerfpTtxw8rRrf8UHqGZFPsmbfhMS1wBZwM7WG4G TUEw== X-Gm-Message-State: AOAM533hMOCZ/E8bqomR/RjTpLp5h2KT+a1SlFe8OOxZtlLVx4DINqRd du8cG7Gy3cJ4GMWGF0hzSxtuivXKjZxxOg== X-Google-Smtp-Source: ABdhPJxUdxbK3SRrkfc1hOUVbuYLs1+JFVqkpiC00vs9lkU2hYJCqs3G6quVvidqz94lfXfHJpcz/w== X-Received: by 2002:a1c:4343:: with SMTP id q64mr20147216wma.20.1593031440644; Wed, 24 Jun 2020 13:44:00 -0700 (PDT) Received: from localhost.localdomain (host194055151123.static.fidoka.tech. [194.55.151.123]) by smtp.gmail.com with ESMTPSA id 11sm9643996wmg.41.2020.06.24.13.43.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2020 13:44:00 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Wed, 24 Jun 2020 22:43:44 +0200 Message-Id: <20200624204347.797088-5-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200624204347.797088-1-angelo@amarulasolutions.com> References: <20200624204347.797088-1-angelo@amarulasolutions.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 4/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. Signed-off-by: Angelo Compagnucci Signed-off-by: Michael Trimarchi Tested-by: Adam Duskett --- ...01-Remove-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/cups.hash | 2 +- package/cups/cups.mk | 2 +- 5 files changed, 20 insertions(+), 14 deletions(-) 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/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 cff198b06a..acd8c2066b 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 From patchwork Wed Jun 24 20:43:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1316578 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=pF2Jj7kN; 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 49sZrK5Rpnz9sRW for ; Thu, 25 Jun 2020 06:44:17 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 543C186C47; Wed, 24 Jun 2020 20:44:16 +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 m-XjOEltOQ78; Wed, 24 Jun 2020 20:44:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 577F686BE5; Wed, 24 Jun 2020 20:44:13 +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 D527E1BF97C for ; Wed, 24 Jun 2020 20:44:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D0876875EE for ; Wed, 24 Jun 2020 20:44:07 +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 AdtSRyvEmlBu for ; Wed, 24 Jun 2020 20:44:04 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by whitealder.osuosl.org (Postfix) with ESMTPS id 84555864F5 for ; Wed, 24 Jun 2020 20:44:04 +0000 (UTC) Received: by mail-wm1-f53.google.com with SMTP id q15so3516152wmj.2 for ; Wed, 24 Jun 2020 13:44:04 -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=hShYBoXiOSQS7dtU5a4hz9zcrWI8UuYefq9AVWaw1sI=; b=pF2Jj7kNCWbSPH7QnQhcVpN4IRT/5PM1OBx49G4H6R1rNfTFkHM+yFfvO9Qsr1LXMi IPce03qz2RohRBI2IQCSVIxmTBHyQFwTzU/nClTg5vHXVNxfZ8MFmFQ+kyCl3MXdapdM StX2hCYGjSUbS/2X8W5Rhl1aeN6OKFdSgAoQA= 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=hShYBoXiOSQS7dtU5a4hz9zcrWI8UuYefq9AVWaw1sI=; b=n5pEnp95vHoB3cPkJzBeO3ZV6E/Po62B18rp8lXQfwPKF2+m44dQ7AH68dDpT4urCo ZxBK40npzbFt7EGRJjeBgihOjnNk22jXFZzQaQSDmJsiD2PEQx4BlwMw4EOWGgTqZVqL apK1qdBf9FWmEvkuKJQOaeeuvZpL4hTj5fDUqMxkBDsv9HFfaMIZQ0Kps8v1X2/joQ5B Jycl612reM82HHJAbgz9A+YECFyQWSU+91g7JrnKw6DaZKI4quea38rUI1uRcR8YOb3E K6f8PnZ6j/xKQFkZ1no3usTctBVPI9WKqUTeLmjg44Ihw4gKZCzS+Qz/wrIG3iXqO1ql rNhw== X-Gm-Message-State: AOAM532apBFYWL+qYtVHiJhKm3/soKwqOTG20g4sASbFl/XNFj0ekk5y pCI3IZ9yvvZCyr3UZ5nabF9lQgnyNKn9PA== X-Google-Smtp-Source: ABdhPJxidDtJPHXvqqkXmSrPDxoKMfcHuXRjTvQyx9smBkp08QDD2RHPMBJojye9xkfHHdOAVMbvLA== X-Received: by 2002:a05:600c:21d7:: with SMTP id x23mr33270717wmj.95.1593031442399; Wed, 24 Jun 2020 13:44:02 -0700 (PDT) Received: from localhost.localdomain (host194055151123.static.fidoka.tech. [194.55.151.123]) by smtp.gmail.com with ESMTPSA id 11sm9643996wmg.41.2020.06.24.13.44.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2020 13:44:01 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Wed, 24 Jun 2020 22:43:45 +0200 Message-Id: <20200624204347.797088-6-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200624204347.797088-1-angelo@amarulasolutions.com> References: <20200624204347.797088-1-angelo@amarulasolutions.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 5/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 User lp is necessary for running the cups spooler. Groups lpadmin grants administrative privileges to users. Signed-off-by: Angelo Compagnucci --- package/cups/cups.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/cups/cups.mk b/package/cups/cups.mk index acd8c2066b..e86374b027 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,11 @@ define CUPS_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S81cupsd endef +# lp user is needed to run cups spooler +# lpadmin group membership grants administrative privileges +define CUPS_USERS + lp -1 lp -1 * /var/spool/lpd /bin/false - lp + - - lpadmin -1 * - - - Printers admin group. +endef + $(eval $(autotools-package)) From patchwork Wed Jun 24 20:43:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1316579 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=VlsKe8Kf; 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 49sZrK6B4vz9sSn for ; Thu, 25 Jun 2020 06:44:17 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4F6CA87858; Wed, 24 Jun 2020 20:44:16 +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 tz3mlSnRsVJa; Wed, 24 Jun 2020 20:44:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 677238785E; Wed, 24 Jun 2020 20:44:14 +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 257D31BF2AA for ; Wed, 24 Jun 2020 20:44:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 218DA860CE for ; Wed, 24 Jun 2020 20:44:09 +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 M4fiyAg6gLss for ; Wed, 24 Jun 2020 20:44:05 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by whitealder.osuosl.org (Postfix) with ESMTPS id 95F5C86B18 for ; Wed, 24 Jun 2020 20:44:05 +0000 (UTC) Received: by mail-wr1-f46.google.com with SMTP id j4so1121438wrp.10 for ; Wed, 24 Jun 2020 13:44:05 -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=eFPlS/Lg8cCLaVOrMhLSoHxt/pKcJ3XuYQbGMKeQuMo=; b=VlsKe8KfhOKq+YmK4GProobOZajLa/lastGn83Jb2i6iTnU64yjr5rYGANjtqakT0T w+aT35GEdR1pd4kkY94hZi79pU24oHmfpeZJAZo9sRU8VgLmdFDHGX4FnCQrXv0QJWiv a8YQfwSixnOvwbZNQ6dQNZLFKosJ+MrSfWcGo= 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=eFPlS/Lg8cCLaVOrMhLSoHxt/pKcJ3XuYQbGMKeQuMo=; b=S8/XGF+Kzs+bick1NYIAnWxHTmgQGEsxAH+3oNfzHxaGQYHCn0FPEWKRtCH+SZyc4V 1yz26iQWZsO6DsyKSgwoOs/sjUAY+Mc0d4nABOxvCwENk/D6ZV6rDpKzlZpi4LXfnwuX yd+KEQTGAHwost8jmNn88LgaD5016FGbi53h7xarVUPgyEKgj0IuE8jMmAm+9x7B94Qe JjVWjMVlY7YnRGlLCJpF503kk1wCH8NLYeK/0ZDf3xZN4UYyAMM5ljpFreeeF0d3ymCX D27zJt+aXjI3DoiSS4M3OmvtcYgO67gXxkwTVEDK+28fD+6y+FWCZaMLMQqsiANX+BlF U4Ng== X-Gm-Message-State: AOAM530DVeEWnzh/PLVMM4STj/wpazaP6htz0emyAcvN/keLHiileqsN OvFXuRDmMweIz0ZNm9CopLl69v/9ht0Xjg== X-Google-Smtp-Source: ABdhPJzjOJwpew2DFUaso+jIuxSod0woM9Jc+vK7MGIrJhtZqRcxNz0Xr4A4yxZxuv8Jz/6YGvMcDQ== X-Received: by 2002:adf:f4c1:: with SMTP id h1mr31325448wrp.328.1593031443632; Wed, 24 Jun 2020 13:44:03 -0700 (PDT) Received: from localhost.localdomain (host194055151123.static.fidoka.tech. [194.55.151.123]) by smtp.gmail.com with ESMTPSA id 11sm9643996wmg.41.2020.06.24.13.44.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2020 13:44:03 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Wed, 24 Jun 2020 22:43:46 +0200 Message-Id: <20200624204347.797088-7-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200624204347.797088-1-angelo@amarulasolutions.com> References: <20200624204347.797088-1-angelo@amarulasolutions.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 6/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 but removes a hardcoded device usb vendor/id and keps only the usb printer class. Signed-off-by: Angelo Compagnucci Signed-off-by: Michael Trimarchi --- package/cups/70-usb-printers.rules | 3 +++ package/cups/cups.mk | 9 +++++++++ 2 files changed, 12 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..67e7f5e938 --- /dev/null +++ b/package/cups/70-usb-printers.rules @@ -0,0 +1,3 @@ +# 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" diff --git a/package/cups/cups.mk b/package/cups/cups.mk index e86374b027..805a80e854 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 Wed Jun 24 20:43:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1316577 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=THxDEYJk; 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 49sZrG25fJz9sRW for ; Thu, 25 Jun 2020 06:44:14 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id D22FD8840C; Wed, 24 Jun 2020 20:44:12 +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 nhstXcpm7eod; Wed, 24 Jun 2020 20:44:12 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 3542288412; Wed, 24 Jun 2020 20:44:12 +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 A846C1BF2AA for ; Wed, 24 Jun 2020 20:44:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A475F860CE for ; Wed, 24 Jun 2020 20:44:07 +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 q8dG4LxjbTOc for ; Wed, 24 Jun 2020 20:44:07 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by whitealder.osuosl.org (Postfix) with ESMTPS id B6F4A875EE for ; Wed, 24 Jun 2020 20:44:06 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id z13so3604049wrw.5 for ; Wed, 24 Jun 2020 13:44:06 -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=ujdK1ypQOH80lzYvf4iySVTIgd3KAwgdiFwNjHfxdhc=; b=THxDEYJkKKKHnXsqW9MxIlBGbu1K8O0SVPjocL5wX3zqfxA0hVJjN1h5TKvyQERybg lSB4rfAPX7GmWyyEcGcCT32uvQwzkldZfEjga+epoO/myaZr+fZ9LN0oGocO5DTyEN7z rnKPOgjJI0G/CzWYro2zAU33GuRJK1mvym6UE= 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=ujdK1ypQOH80lzYvf4iySVTIgd3KAwgdiFwNjHfxdhc=; b=Kf1Z4Er8dcUnAH7op89qtTFYb0Ytya7bPglmTyMSuVSmJjy9XHurES/zilg7DcrdkQ bLfyzPa8Kwpz99gtSLZOM4rvfxhxKlBMZ1HHrYCAc6mVsgGfNoeb2oMP1PCtIrs+Fmqj npfR1cs5dGrJWKh6eW2rJDhli+v/5TGb7khoWSyhMcoXua65xsSC9TLjf+lUEBGXFgXg YOa3tItxm35GI4GLJBakqhxPA/KnE1OG5t3iSN4mLwr9sHqkj02v01eqt1P2CC7UQ1V1 7n0vNehAQZ5CPz1ofFH3bwwcVNS3YPMOV6YjUe5VNnFABiCYt6E+updMNX+2R/aLRrF2 WxSw== X-Gm-Message-State: AOAM533jn304vGx4ROhe9B13NY+mE3Xtx5JsYRx2erVQJKvc7L4xz87v idgk+aKNidig7WUW9f3GW6A0IFNjzoAdQQ== X-Google-Smtp-Source: ABdhPJyhOhvxGymvkc6uoVpFv5K+tKxhCS9Lrrvs8SmA1oypGGoRfK+TZ74AEMlyhxVlI0zQlpfW+A== X-Received: by 2002:adf:e5d0:: with SMTP id a16mr16115862wrn.48.1593031444749; Wed, 24 Jun 2020 13:44:04 -0700 (PDT) Received: from localhost.localdomain (host194055151123.static.fidoka.tech. [194.55.151.123]) by smtp.gmail.com with ESMTPSA id 11sm9643996wmg.41.2020.06.24.13.44.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2020 13:44:04 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Wed, 24 Jun 2020 22:43:47 +0200 Message-Id: <20200624204347.797088-8-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200624204347.797088-1-angelo@amarulasolutions.com> References: <20200624204347.797088-1-angelo@amarulasolutions.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 7/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: Angelo Compagnucci Signed-off-by: Michael Trimarchi --- package/cups/cups.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/cups/cups.mk b/package/cups/cups.mk index 805a80e854..67baaf82f9 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 \