Cups revamp
v3 cover Cups revamp
s series fixes various nitpicks we found using cups and do some bumps.
Changelog:v1->v2:
* Adding missing patch "Add lp user as default cups user" v1->v2:
* Fixes to Signed-of
* Decoupling service file fixing from bumps
* Better explaining backported patches
Angelo Compagnucci (7):
package/cups-filters: fix cups-browsed service package/cups-filters: bump to version 1.27.5 package/cups: fix cups service
package/cups: bump to version 2.3.3
package/cups: Add lp user as default cups user package/cups: Add udev rules to assign usb printers group to lp package/cups: adding python support
package/cups-filters/S82cups-browsed | 48 +++++++++++++++++++ package/cups-filters/cups-filters.hash | 2 +- package/cups-filters/cups-filters.mk | 15 +++++- ...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/70-usb-printers.rules | 3 ++ package/cups/S81cupsd | 48 +++++++++++++++++++ package/cups/cups.hash | 2 +- package/cups/cups.mk | 37 +++++++++++++- 10 files changed, 167 insertions(+), 18 deletions(-) create mode 100644 package/cups-filters/S82cups-browsed create mode 100644 package/cups/70-usb-printers.rules create mode 100644 package/cups/S81cupsd
Signature · 1 line
2.25.1
PATCH v3 1/7 package/cups-filters: fix cups-browsed service
cups-browsed service is compiled and installed by the package, but the corresponding services file were not installed for systemv and systemd.
--- 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
package/cups-filters/S82cups-browsed new file +48 -0
@@ -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
package/cups-filters/cups-filters.mk +12 -1
@@ -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))
Signature · 1 line
2.25.1
PATCH v3 1/7 package/cups-filters: fix cups-browsed service
Hello,
Quoted 5 lines · On Wed, 24 Jun 2020 22:43:41 +0200 Angelo Compagnucci…
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 <[email protected]>
I've applied, after tweaking a bit the commit title and commit log, as well as after replacing --with-rcdir=no by --without-rcdir, as we use the --without-XYZ in Buildroot in general.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v3 2/7 package/cups-filters: bump to version 1.27.5
In reply to Angelo CompagnucciThis patch bumps cups-filters to version 1.27.5.
--- package/cups-filters/cups-filters.hash | 2 +- package/cups-filters/cups-filters.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
package/cups-filters/cups-filters.hash +1 -1
@@ -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
package/cups-filters/cups-filters.mk +1 -1
@@ -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
Signature · 1 line
2.25.1
Thomas Petazzoni
AppliedPATCH v3 2/7 package/cups-filters: bump to version 1.27.5
Quoted 8 lines · On Wed, 24 Jun 2020 22:43:42 +0200 Angelo Compagnucci…
This patch bumps cups-filters to version 1.27.5.
Signed-off-by Angelo Compagnucci <[email protected]>Signed-off-by Michael Trimarchi <[email protected]>--- package/cups-filters/cups-filters.hash | 2 +- package/cups-filters/cups-filters.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v3 3/7 package/cups: fix cups service
In reply to Angelo CompagnucciCups 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.
--- package/cups/S81cupsd | 48 +++++++++++++++++++++++++++++++++++++++++++ package/cups/cups.mk | 9 +++++++- 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 package/cups/S81cupsd
package/cups/S81cupsd new file +48 -0
@@ -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
package/cups/cups.mk +8 -1
@@ -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))
Signature · 1 line
2.25.1
PATCH v3 3/7 package/cups: fix cups service
Hello Angelo,
Quoted 6 lines · On Wed, 24 Jun 2020 22:43:43 +0200 Angelo Compagnucci…
Cups service for systemv was erroneously installed in
/etc/rcX.dand 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 <[email protected]>
Thanks, I have applied, after some changes. See below.
package/cups/S81cupsd line 9
Quoted 4 lines
package/cups/S81cupsd new file +4
-0+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" \
I don't know how this was tested: cupsd is installed in /usr/sbin/, not in /sbin/. Or perhaps you had a merged /usr and so you didn't notice ?
package/cups/cups.mk CUPS_CONF_OPTS = \ · line 25
Quoted 2 lines
package/cups/cups.mk +2
-0+ --libdir=/usr/lib \ + --with-rcdir=no
Changed to:
--without-rcdir
I looked at the code and tested it, and it works as expected.
package/cups/cups.mk else · line 76
Quoted 2 lines
package/cups/cups.mk +2
-0+define CUPS_INSTALL_INIT_SYSV + $(RM) $(TARGET_DIR)/etc/init.d/cups
This is not needed: --without-rcdir ensures it is not installed. So I dropped this line.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v3 4/7 package/cups: bump to version 2.3.3
In reply to Angelo CompagnucciThis patch bumps cups to version 2.3.3.
--- ...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(-)
package/cups/0001-Remove-man-from-BUILDDIRS-in-configure.patch +5 -3
@@ -6,15 +6,17 @@ Subject: [PATCH] Remove man from BUILDDIRS in configure Signed-off-by: Bernd Kuhls <[email protected]> [Fabrice: updated for 2.3.0] Signed-off-by: Fabrice Fontaine <[email protected]> +[Michael: updated for 2.3.3] +Signed-off-by: Michael Trimarchi <[email protected]> --- 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
package/cups/0002-Do-not-use-genstrings.patch +8 -6
@@ -16,23 +16,25 @@ genstrings call.] Signed-off-by: Thomas Petazzoni <[email protected]> [Fabrice: updated for 2.3.0] Signed-off-by: Fabrice Fontaine <[email protected]> +[Michael: updated for 2.3.3] +Signed-off-by: Michael Trimarchi <[email protected]> --- 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
package/cups/0004-Remove-PIE-flags-from-the-build.patch +5 -3
@@ -13,15 +13,17 @@ Signed-off-by: Thomas Petazzoni <[email protected]> Signed-off-by: Olivier Schonken <[email protected]> [Fabrice: updated for 2.3.0] Signed-off-by: Fabrice Fontaine <[email protected]> +[Michael: updated for 2.3.3] +Signed-off-by: Michael Trimarchi <[email protected]> --- 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
package/cups/cups.hash +1 -1
@@ -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
package/cups/cups.mk +1 -1
@@ -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
Signature · 1 line
2.25.1
PATCH v3 4/7 package/cups: bump to version 2.3.3
All;
This version bump fixes CVE-2020-3898 and CVE-2019-8842, so this should be considered
a security fix.
I tested the whole series and it works as expected!
Quoted 141 lines · Angelo Compagnucci
This patch bumps cups to version 2.3.3.
Signed-off-by Angelo Compagnucci <[email protected]>Signed-off-by Michael Trimarchi <[email protected]>--- ...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(-)package/cups/0001-Remove-man-from-BUILDDIRS-in-configure.patch +5
-3@@ -6,15 +6,17 @@ Subject: [PATCH] Remove man from BUILDDIRS in configure Signed-off-by: Bernd Kuhls <[email protected]> [Fabrice: updated for 2.3.0] Signed-off-by: Fabrice Fontaine <[email protected]> +[Michael: updated for 2.3.3] +Signed-off-by: Michael Trimarchi <[email protected]> --- 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.1package/cups/0002-Do-not-use-genstrings.patch +8
-6@@ -16,23 +16,25 @@ genstrings call.] Signed-off-by: Thomas Petazzoni <[email protected]> [Fabrice: updated for 2.3.0] Signed-off-by: Fabrice Fontaine <[email protected]> +[Michael: updated for 2.3.3] +Signed-off-by: Michael Trimarchi <[email protected]> --- 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.1package/cups/0004-Remove-PIE-flags-from-the-build.patch +5
-3@@ -13,15 +13,17 @@ Signed-off-by: Thomas Petazzoni <[email protected]> Signed-off-by: Olivier Schonken <[email protected]> [Fabrice: updated for 2.3.0] Signed-off-by: Fabrice Fontaine <[email protected]> +[Michael: updated for 2.3.3] +Signed-off-by: Michael Trimarchi <[email protected]> --- 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.1package/cups/cups.hash +1
-1@@ -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 NOTICEpackage/cups/cups.mk +1
-2@@ -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 --2.25.1
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Thomas Petazzoni
AppliedPATCH v3 4/7 package/cups: bump to version 2.3.3
In reply to Angelo CompagnucciQuoted 11 lines · On Wed, 24 Jun 2020 22:43:44 +0200 Angelo Compagnucci…
This patch bumps cups to version 2.3.3.
Signed-off-by Angelo Compagnucci <[email protected]>Signed-off-by Michael Trimarchi <[email protected]>--- ...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(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v3 4/7 package/cups: bump to version 2.3.3
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Quoted 2 lines · On Wed, 24 Jun 2020 22:43:44 +0200 Angelo Compagnucci…
This patch bumps cups to version 2.3.3.
Quoted 9 lines
Quoted 9 lines
Signed-off-by Angelo Compagnucci <[email protected]>Signed-off-by Michael Trimarchi <[email protected]>---
...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(-)
Committed to 2020.02.x and 2020.05.x after updating the commit message to clarify that this is a security bump, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH v3 5/7 package/cups: Add lp user as default cups user
In reply to Angelo CompagnucciThis patch is a backport from the rockchip tree.
Author: Jeffy Chen <[email protected]> Date: Tue Nov 13 18:25:34 2018 +0800
package: cups: Add lp user as default cups user
User lp is necessary for running the cups spooler. Groups lpadmin grants administrative privileges to users.
--- package/cups/cups.mk | 10 ++++++++++ 1 file changed, 10 insertions(+)
package/cups/cups.mk +10 -0
@@ -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))
Signature · 1 line
2.25.1
Arnout Vandecappelle
AppliedPATCH v3 5/7 package/cups: Add lp user as default cups user
Quoted 7 lines · Angelo Compagnucci
This patch is a backport from the rockchip tree.
Author: Jeffy Chen <[email protected]> Date: Tue Nov 13 18:25:34 2018 +0800package: cups: Add lp user as default cups user
Quoted 7 lines
Change-Id Ic7434fe0a7b41b86b5b8b097fa29dd9718e29aa5Signed-off-by Jeffy Chen <[email protected]>User lp is necessary for running the cups spooler. Groups lpadmin grants administrative privileges to users.
Signed-off-by Angelo Compagnucci <[email protected]>
Applied to master, thanks.
Regards,
Arnout
Quoted 31 lines
--- package/cups/cups.mk | 10 ++++++++++ 1 file changed, 10 insertions(+)package/cups/cups.mk +10
-0@@ -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))
PATCH v3 5/7 package/cups: Add lp user as default cups user
Quoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Arnout" == Arnout Vandecappelle <[email protected]> writes:
Quoted 7 lines · Angelo Compagnucci
This patch is a backport from the rockchip tree.
Author: Jeffy Chen <[email protected]> Date: Tue Nov 13 18:25:34 2018 +0800package: cups: Add lp user as default cups user
Quoted 7 lines
Quoted 7 lines
Change-Id Ic7434fe0a7b41b86b5b8b097fa29dd9718e29aa5Signed-off-by Jeffy Chen <[email protected]>User lp is necessary for running the cups spooler. Groups lpadmin grants administrative privileges to users.
Signed-off-by Angelo Compagnucci <[email protected]>
Committed to 2020.02.x, 2020.05.x and 2020.08.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH v3 6/7 package/cups: Add udev rules to assign usb printers group to lp
In reply to Angelo CompagnucciThis patch is based on patch from the rockchip tree:
commit c8a337593660f27379c30248a11bf08dc8712113
Author: Jeffy Chen <[email protected]> Date: Tue Nov 13 18:59:43 2018 +0800
package: cups: Add udev rules to assign usb printers' group to lp
but removes a hardcoded device usb vendor/id and keps only the usb printer class.
--- 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
package/cups/70-usb-printers.rules new file +3 -0
@@ -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"
package/cups/cups.mk +9 -0
@@ -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 \
Signature · 1 line
2.25.1
Arnout Vandecappelle
AppliedPATCH v3 6/7 package/cups: Add udev rules to assign usb printers group to lp
Quoted 8 lines · Angelo Compagnucci
This patch is based on patch from the rockchip tree:
commit
c8a337593660f27379c30248a11bf08dc8712113Author: Jeffy Chen <[email protected]> Date: Tue Nov 13 18:59:43 2018 +0800package: cups: Add udev rules to assign usb printers' group to lp
Quoted 8 lines
Change-Id Ieae17deaa7d3623e1f0e1cc826871f1719d98d88Signed-off-by Jeffy Chen <[email protected]>but removes a hardcoded device usb vendor/id and keps only the usb printer class.
Signed-off-by Angelo Compagnucci <[email protected]>Signed-off-by Michael Trimarchi <[email protected]>
Applied to master, thanks.
Regards,
Arnout
Quoted 36 lines
--- 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.rulespackage/cups/70-usb-printers.rules new file +3
-0@@ -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"package/cups/cups.mk +9
-0@@ -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 \
PATCH v3 6/7 package/cups: Add udev rules to assign usb printers group to lp
Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Arnout" == Arnout Vandecappelle <[email protected]> writes:
Quoted 8 lines · Angelo Compagnucci
This patch is based on patch from the rockchip tree:
commit
c8a337593660f27379c30248a11bf08dc8712113Author: Jeffy Chen <[email protected]> Date: Tue Nov 13 18:59:43 2018 +0800package: cups: Add udev rules to assign usb printers' group to lp
Quoted 8 lines
Quoted 8 lines
Change-Id Ieae17deaa7d3623e1f0e1cc826871f1719d98d88Signed-off-by Jeffy Chen <[email protected]>but removes a hardcoded device usb vendor/id and keps only the usb printer class.
Signed-off-by Angelo Compagnucci <[email protected]>Signed-off-by Michael Trimarchi <[email protected]>
Committed to 2020.02.x, 2020.08.x and 2020.08.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH v3 7/7 package/cups: adding python support
In reply to Angelo CompagnucciEnables python support if python is available.
--- package/cups/cups.mk | 7 +++++++ 1 file changed, 7 insertions(+)
package/cups/cups.mk +7 -0
@@ -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 \
Signature · 1 line
2.25.1
PATCH v3 7/7 package/cups: adding python support
Quoted 13 lines · Angelo Compagnucci
Enables python support if python is available.
Signed-off-by Angelo Compagnucci <[email protected]>Signed-off-by Michael Trimarchi <[email protected]>--- package/cups/cups.mk | 7 +++++++ 1 file changed, 7 insertions(+)package/cups/cups.mk +0
-0
package/cups/cups.mk else · line 83
Quoted 9 lines
package/cups/cups.mk +6
-0@@ -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
configure doesn't know this option, and I couldn't find any reference to python
in the cups 2.3.3 source tree. So I marked this path as rejected.
Regards,
Arnout
Quoted 5 lines
package/cups/cups.mk +1
-0+ ifeq ($(BR2_PACKAGE_HAS_UDEV),y) define CUPS_INSTALL_UDEV_RULES $(INSTALL) -D -m 0644 package/cups/70-usb-printers.rules \
v3 cover Cups revamp
In reply to Angelo CompagnucciAll;
The cups bump in this series also fixes CVE-2020-3898 and CVE-2019-8842, and as such
should be considered a security patch as well.
With that being said, I tested the changes and they all work as expected.
Quoted 43 lines · Angelo Compagnucci
s series fixes various nitpicks we found using cups and do some bumps.
Changelog:
v1->v2:
* Adding missing patch "Add lp user as default cups user"v1->v2:
* Fixes to Signed-of
* Decoupling service file fixing from bumps
* Better explaining backported patchesAngelo Compagnucci (7):
package/cups-filters: fix cups-browsed service package/cups-filters: bump to version 1.27.5 package/cups: fix cups service
package/cups: bump to version 2.3.3
package/cups: Add lp user as default cups user package/cups: Add udev rules to assign usb printers group to lp package/cups: adding python supportpackage/cups-filters/S82cups-browsed | 48 +++++++++++++++++++ package/cups-filters/cups-filters.hash | 2 +- package/cups-filters/cups-filters.mk | 15 +++++- ...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/70-usb-printers.rules | 3 ++ package/cups/S81cupsd | 48 +++++++++++++++++++ package/cups/cups.hash | 2 +- package/cups/cups.mk | 37 +++++++++++++- 10 files changed, 167 insertions(+), 18 deletions(-) create mode 100644 package/cups-filters/S82cups-browsed create mode 100644 package/cups/70-usb-printers.rules create mode 100644 package/cups/S81cupsd--
2.25.1_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot