cups: bump version to 2.2.2

And tweak 0003-Sanitize-the-installation-process.patch for this new
release.

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/cups/0003-Sanitize-the-installation-process.patch b/package/cups/0003-Sanitize-the-installation-process.patch
index 25bfa42a30648f256741ac38b1a5e3431c93cefb..bf81f682df99e7438ec9a4f3c228262d4825e9af 100644 (file)
--- a/package/cups/0003-Sanitize-the-installation-process.patch
+++ b/package/cups/0003-Sanitize-the-installation-process.patch
@@ -18,13 +18,16 @@ cross-compiling:
    prevent overwriting those files/directories, which meant calling
    "make install" twice was failing.
 
+[Vincent: tweak the patch for 2.2.2 release]
+
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
 ---
  Makedefs.in        | 12 ++++++------
  conf/Makefile      |  6 +++---
  notifier/Makefile  |  2 +-
- scheduler/Makefile | 17 ++++++++---------
- 4 files changed, 18 insertions(+), 19 deletions(-)
+ scheduler/Makefile | 15 +++++++--------
+ 4 files changed, 17 insertions(+), 18 deletions(-)
 
 diff --git a/Makedefs.in b/Makedefs.in
 index 3afef0a..3e4f1bd 100644
@@ -84,18 +87,15 @@ index 3206dd0..c34a4d7 100644
  
  #
 diff --git a/scheduler/Makefile b/scheduler/Makefile
-index c7d244d..a96a528 100644
+index 251f017..25f2f5f 100644
 --- a/scheduler/Makefile
 +++ b/scheduler/Makefile
-@@ -148,30 +148,29 @@ install-data:
+@@ -146,28 +146,27 @@ install-data:
        echo Creating $(SERVERBIN)/driver...
        $(INSTALL_DIR) -m 755 $(SERVERBIN)/driver
        echo Creating $(SERVERROOT)...
 -      $(INSTALL_DIR) -m 755 -g $(CUPS_GROUP) $(SERVERROOT)
 +      $(INSTALL_DIR) -m 755 $(SERVERROOT)
-       echo Creating $(SERVERROOT)/interfaces...
--      $(INSTALL_DIR) -m 755 -g $(CUPS_GROUP) $(SERVERROOT)/interfaces
-+      $(INSTALL_DIR) -m 755 $(SERVERROOT)/interfaces
        echo Creating $(SERVERROOT)/ppd...
 -      $(INSTALL_DIR) -m 755 -g $(CUPS_GROUP) $(SERVERROOT)/ppd
 +      $(INSTALL_DIR) -m 755 $(SERVERROOT)/ppd

diff --git a/package/cups/cups.hash b/package/cups/cups.hash
index 2d103f2e1df1e4f7e4084142d3f8d7e3ad3bddd6..08c8c3c234abd1fdeb7313876a2cdad34ebc0296 100644 (file)
--- a/package/cups/cups.hash
+++ b/package/cups/cups.hash
@@ -1,2 +1,2 @@
 # Locally calculated:
-sha256 4b14fd833180ac529ebebea766a09094c2568bf8426e219cb3a1715304ef728d  cups-2.1.4-source.tar.gz
+sha256 f589bb7d5d1dc3aa0915d7cf2b808571ef2e1530cd1a6ebe76ae8f9f4994e4f6  cups-2.2.2-source.tar.gz

diff --git a/package/cups/cups.mk b/package/cups/cups.mk
index 2f8a18ec259f2dff1ac017b85a630fd34d3581e4..05737767f82b8b3435d2c457de14207e108b8b13 100644 (file)
--- a/package/cups/cups.mk
+++ b/package/cups/cups.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-CUPS_VERSION = 2.1.4
+CUPS_VERSION = 2.2.2
 CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.gz
-CUPS_SITE = https://github.com/apple/cups/releases/download/release-$(CUPS_VERSION)
+CUPS_SITE = https://github.com/apple/cups/releases/download/v$(CUPS_VERSION)
 CUPS_LICENSE = GPLv2 LGPLv2
 CUPS_LICENSE_FILES = LICENSE.txt
 CUPS_INSTALL_STAGING = YES