[Buildroot] [git commit] package/cups: bump to version 2.4.0

[Arnout Vandecappelle (Essensium/Mind)]

commit: https://git.buildroot.net/buildroot/commit/?id=07230bfcbc4b3c760a1d96a2595e3557c5e7278b
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

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

NOTICE changed hash: author "Michael R Sweet" changed to "OpenPrinting"

Signed-off-by: Angelo Compagnucci <angelo at amarulasolutions.com>
[Arnout: handle changed hash of NOTICE]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout at mind.be>
---
 ...001-Remove-man-from-BUILDDIRS-in-configure.patch | 21 ++++++++++++---------
 package/cups/cups.hash                              |  4 ++--
 package/cups/cups.mk                                |  6 +++---
 3 files changed, 17 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 7fcf7133c8..6b81a93de2 100644
--- a/package/cups/0001-Remove-man-from-BUILDDIRS-in-configure.patch
+++ b/package/cups/0001-Remove-man-from-BUILDDIRS-in-configure.patch
@@ -8,23 +8,26 @@ Signed-off-by: Bernd Kuhls <bernd.kuhls at t-online.de>
 Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
 [Michael: updated for 2.3.3]
 Signed-off-by: Michael Trimarchi <michael at amarulasolutions.com>
+[Angelo: updated for 2.4.0]
+Signed-off-by: Angelo Compagnucci <angelo at amarulasolutions.com>
 ---
  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
 
diff --git a/package/cups/cups.hash b/package/cups/cups.hash
index 22e081255c..b0e3654b3d 100644
--- a/package/cups/cups.hash
+++ b/package/cups/cups.hash
@@ -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
+sha256  a2a46d024e4d78dd2475d89f2f3d905578edfeca7dcb041e1d0ba079d9a87b48  NOTICE
diff --git a/package/cups/cups.mk b/package/cups/cups.mk
index 80aecdba5e..e406d3bc64 100644
--- a/package/cups/cups.mk
+++ b/package/cups/cups.mk
@@ -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)