package/cups: bump to version 2.4.0

PATCH In review Angelo Compagnucci 2 participants 2 messages Dec 9, 2021 – Dec 12, 2021

lore

Share & tools

lore

Angelo Compagnucci

author

2021-12-09 21:40 UTC #0 lore raw

PATCH 1/1 package/cups: bump to version 2.4.0

Updating attached patch and configure parameters to the latest cups version.

Signed-off-by Angelo Compagnucci <[email protected]>

---
 ...move-man-from-BUILDDIRS-in-configure.patch | 21 +++++++++++--------
 package/cups/cups.hash                        |  2 +-
 package/cups/cups.mk                          |  6 +++---
 3 files changed, 16 insertions(+), 13 deletions(-)

package/cups/0001-Remove-man-from-BUILDDIRS-in-configure.patch +12 -9

index 7fcf7133c8..6b81a93de2 100644
@@ -8,23 +8,26 @@ Signed-off-by: Bernd Kuhls <[email protected]>
 Signed-off-by: Fabrice Fontaine <[email protected]>
 [Michael: updated for 2.3.3]
 Signed-off-by: Michael Trimarchi <[email protected]>
+[Angelo: updated for 2.4.0]
+Signed-off-by: Angelo Compagnucci <[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 a460a73..d427acb 100644
+index 3a162b6d5..fb629fdfd 100644
 --- a/config-scripts/cups-common.m4
 +++ b/config-scripts/cups-common.m4
-@@ -434,7 +434,7 @@ LIBHEADERSPRIV="\$(COREHEADERSPRIV) \$(DRIVERHEADERSPRIV)"
+@@ -462,7 +462,7 @@ LIBHEADERS="\$(COREHEADERS) \$(DRIVERHEADERS)"
+ LIBHEADERSPRIV="\$(COREHEADERSPRIV) \$(DRIVERHEADERSPRIV)"
  
- case "$COMPONENTS" in
- 	all)
--		BUILDDIRS="tools filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates"
-+		BUILDDIRS="tools filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale doc examples templates"
- 		;;
- 
- 	core)
+ AS_CASE(["$COMPONENTS"], [all], [
+-    BUILDDIRS="tools filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates"
++    BUILDDIRS="tools filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale doc examples templates"
+ ], [core], [
+     BUILDDIRS="tools examples locale"
+ ], [corelite], [
+
 -- 
 2.17.1

package/cups/cups.hash +1 -1

index 22e081255c..01939f804e 100644
@@ -1,4 +1,4 @@
 # Locally calculated:
-sha256  deb3575bbe79c0ae963402787f265bfcf8d804a71fc2c94318a74efec86f96df  cups-2.3.3op2-source.tar.gz
+sha256  9abecec128ca6847c5bb2d3e3d30c87b782c0697b9acf284d16fa38f80a3a6de  cups-2.4.0-source.tar.gz
 sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE
 sha256  1f8e5879fb8b15e3ee5111809fd3ca22c606d0897d6b5e74329e480c348e034d  NOTICE

package/cups/cups.mk +3 -3

index 80aecdba5e..e406d3bc64 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CUPS_VERSION = 2.3.3op2
+CUPS_VERSION = 2.4.0
 CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.gz
 CUPS_SITE = https://github.com/OpenPrinting/cups/releases/download/v$(CUPS_VERSION)
 CUPS_LICENSE = Apache-2.0 with GPL-2.0/LGPL-2.0 exception

@@ -50,10 +50,10 @@ CUPS_CONF_OPTS += --disable-dbus
 endif
 
 ifeq ($(BR2_PACKAGE_GNUTLS),y)
-CUPS_CONF_OPTS += --enable-gnutls
+CUPS_CONF_OPTS += --with-tls=yes
 CUPS_DEPENDENCIES += gnutls
 else
-CUPS_CONF_OPTS += --disable-gnutls
+CUPS_CONF_OPTS += --with-tls=no
 endif
 
 ifeq ($(BR2_PACKAGE_LIBUSB),y)

Signature · 6 lines

2.25.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

Arnout Vandecappelle

2021-12-12 14:10 UTC #1 lore raw

Quoted 4 lines · Angelo Compagnucci

Updating attached patch and configure parameters to the latest cups version.
Signed-off-by Angelo Compagnucci <[email protected]>

The hash of NOTICE has changed.
Applied to master with that fixed, thanks.

Regards,
Arnout

Quoted 73 lines

---
  ...move-man-from-BUILDDIRS-in-configure.patch | 21 +++++++++++--------
  package/cups/cups.hash                        |  2 +-
  package/cups/cups.mk                          |  6 +++---
  3 files changed, 16 insertions(+), 13 deletions(-)

package/cups/0001-Remove-man-from-BUILDDIRS-in-configure.patch +12 -9

index 7fcf7133c8..6b81a93de2 100644
@@ -8,23 +8,26 @@ Signed-off-by: Bernd Kuhls <[email protected]>
  Signed-off-by: Fabrice Fontaine <[email protected]>
  [Michael: updated for 2.3.3]
  Signed-off-by: Michael Trimarchi <[email protected]>
+[Angelo: updated for 2.4.0]
+Signed-off-by: Angelo Compagnucci <[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 a460a73..d427acb 100644
+index 3a162b6d5..fb629fdfd 100644
  --- a/config-scripts/cups-common.m4
  +++ b/config-scripts/cups-common.m4
-@@ -434,7 +434,7 @@ LIBHEADERSPRIV="\$(COREHEADERSPRIV) \$(DRIVERHEADERSPRIV)"
+@@ -462,7 +462,7 @@ LIBHEADERS="\$(COREHEADERS) \$(DRIVERHEADERS)"
+ LIBHEADERSPRIV="\$(COREHEADERSPRIV) \$(DRIVERHEADERSPRIV)"
 
- case "$COMPONENTS" in
- 	all)
--		BUILDDIRS="tools filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates"
-+		BUILDDIRS="tools filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale doc examples templates"
- 		;;
-
- 	core)
+ AS_CASE(["$COMPONENTS"], [all], [
+-    BUILDDIRS="tools filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates"
++    BUILDDIRS="tools filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale doc examples templates"
+ ], [core], [
+     BUILDDIRS="tools examples locale"
+ ], [corelite], [
+
  --
  2.17.1

package/cups/cups.hash +1 -1

index 22e081255c..01939f804e 100644
@@ -1,4 +1,4 @@
  # Locally calculated:
-sha256  deb3575bbe79c0ae963402787f265bfcf8d804a71fc2c94318a74efec86f96df  cups-2.3.3op2-source.tar.gz
+sha256  9abecec128ca6847c5bb2d3e3d30c87b782c0697b9acf284d16fa38f80a3a6de  cups-2.4.0-source.tar.gz
  sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE
  sha256  1f8e5879fb8b15e3ee5111809fd3ca22c606d0897d6b5e74329e480c348e034d  NOTICE

package/cups/cups.mk +1 -1

index 80aecdba5e..e406d3bc64 100644
@@ -4,7 +4,7 @@
  #
  ################################################################################
 
-CUPS_VERSION = 2.3.3op2
+CUPS_VERSION = 2.4.0
  CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.gz
  CUPS_SITE = https://github.com/OpenPrinting/cups/releases/download/v$(CUPS_VERSION)
  CUPS_LICENSE = Apache-2.0 with GPL-2.0/LGPL-2.0 exception

@@ -50,10 +50,10 @@ CUPS_CONF_OPTS += --disable-dbus
  endif

package/cups/cups.mk CUPS_CONF_OPTS += --disable-dbus · line 59

Quoted 10 lines

package/cups/cups.mk +2 -2

  ifeq ($(BR2_PACKAGE_GNUTLS),y)
-CUPS_CONF_OPTS += --enable-gnutls
+CUPS_CONF_OPTS += --with-tls=yes
  CUPS_DEPENDENCIES += gnutls
  else
-CUPS_CONF_OPTS += --disable-gnutls
+CUPS_CONF_OPTS += --with-tls=no
  endif
 
  ifeq ($(BR2_PACKAGE_LIBUSB),y)

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot