Update to 2.2.2 source version

5 files changed, 93 insertions, 58 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 28d05d05df7d..dc0718dd3d68 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = cups-ipp14
-	pkgver = 2.1.3
+	pkgver = 2.2.2
 	pkgrel = 1
 	url = http://www.cups.org/
 	arch = i686
@@ -27,10 +27,11 @@ pkgbase = cups-ipp14
 	makedepends = libpaper
 	makedepends = valgrind
 	provides = cups
+	provides = cups-ipp144
 	conflicts = cups
 	replaces = cups
-	source = http://www.cups.org/software/2.1.3/cups-2.1.3-source.tar.bz2
-	source = http://www.cups.org/software/2.1.3/cups-2.1.3-source.tar.bz2.sig
+	source = https://github.com/apple/cups/releases/download/v2.2.2/cups-2.2.2-source.tar.gz
+	source = https://github.com/apple/cups/releases/download/v2.2.2/cups-2.2.2-source.tar.gz.sig
 	source = cups.logrotate
 	source = cups.pam
 	source = cups-no-export-ssllibs.patch
@@ -38,32 +39,35 @@ pkgbase = cups-ipp14
 	source = cups-no-gzip-man.patch
 	source = cups-1.6.2-statedir.patch
 	source = cups-1.6.0-fix-install-perms.patch
+	source = cups-systemd-socket.patch
 	source = add-ipp-backend-of-cups-1.4.patch
-	md5sums = 62b8fafd590e75f72316915790b0850a
-	md5sums = SKIP
-	md5sums = fc8286f185e2cc5f7e1f6843bf193e2b
-	md5sums = 96f82c38f3f540b53f3e5144900acf17
-	md5sums = 3ba9e3410df1dc3015463d615ef91b3b
-	md5sums = 1beb4896f217bc241bc08a422274ec0c
-	md5sums = 90c30380d4c8cd48a908cfdadae1ea24
-	md5sums = 451609db34f95209d64c38474de27ce1
-	md5sums = 5117f65342fcc69c6a506529e4daca9e
-	md5sums = 49e1c75beb87e9b7c9511f59509839e7
+	validpgpkeys = 3737FD0D0E63B30172440D2DDBA3A7AB08D76223
+	sha256sums = f589bb7d5d1dc3aa0915d7cf2b808571ef2e1530cd1a6ebe76ae8f9f4994e4f6
+	sha256sums = SKIP
+	sha256sums = d87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9
+	sha256sums = 57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5
+	sha256sums = ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832
+	sha256sums = 1423673e16e374ed372c5b69aebc785b6674bf40601c74a5c08454f672ffa7f1
+	sha256sums = b8fc2e3bc603495f0278410350ea8f0161d9d83719feb64f573b63430cb4800b
+	sha256sums = 23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af
+	sha256sums = 4a4a885bb2e111bd67bcb90a5780f33841b18bc02382317fb5e64c384aa0c4c8
+	sha256sums = cdad3c266cb2abb0f90af3113420fa47a09e3ed974a2ffa9fb6a642e11971d65
+	sha256sums = 375614399e38ddb7af9375472a75e8a83eb3c587595ee079286cbc45094e3c26
 
 pkgname = cups-ipp14
 	pkgdesc = The CUPS Printing System - daemon package
 	install = cups.install
 	depends = acl
 	depends = pam
-	depends = libcups-ipp14>=2.1.3
+	depends = libcups-ipp144>=2.2.2
 	depends = cups-filters
 	depends = bc
-	depends = colord
 	depends = dbus
 	depends = systemd
 	depends = libpaper
 	depends = hicolor-icon-theme
 	optdepends = xdg-utils: xdg .desktop file support
+	optdepends = colord: for ICC color profile support
 	backup = etc/cups/cupsd.conf
 	backup = etc/cups/snmp.conf
 	backup = etc/cups/printers.conf
diff --git a/PKGBUILD b/PKGBUILD
index 2a6ecaf3725e..cc273d91cace 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,10 +7,10 @@ pkgbase="${_pkgbase}-ipp14"
 ### Commenting the "split packages sections - unsupported by AUR apparently ###
 #pkgname=('libcups-ipp14' 'cups-ipp14')
 pkgname=(${pkgbase})
-pkgver=2.1.3
+pkgver=2.2.2
 pkgrel=1
 arch=('i686' 'x86_64')
-provides=('cups')
+provides=('cups' 'cups-ipp144')
 replaces=('cups')
 conflicts=('cups')
 license=('GPL')
@@ -18,7 +18,7 @@ url="http://www.cups.org/"
 makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'pam' 'xdg-utils' 'krb5' 'gnutls'
              'cups-filters' 'bc' 'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus' 
              'avahi'  'hicolor-icon-theme' 'systemd' 'inetutils' 'libpaper' 'valgrind')
-source=(http://www.cups.org/software/${pkgver}/cups-${pkgver}-source.tar.bz2{,.sig}
+source=(https://github.com/apple/cups/releases/download/v${pkgver}/cups-${pkgver}-source.tar.gz{,.sig}
         cups.logrotate cups.pam
         # improve build and linking
         cups-no-export-ssllibs.patch
@@ -27,25 +27,27 @@ source=(http://www.cups.org/software/${pkgver}/cups-${pkgver}-source.tar.bz2{,.s
         cups-1.6.2-statedir.patch
         cups-1.6.0-fix-install-perms.patch
         # bugfixes
+        cups-systemd-socket.patch
         # IPP 1.4
         add-ipp-backend-of-cups-1.4.patch)
 
-md5sums=('62b8fafd590e75f72316915790b0850a'
-         'SKIP'
-         'fc8286f185e2cc5f7e1f6843bf193e2b'
-         '96f82c38f3f540b53f3e5144900acf17'
-         '3ba9e3410df1dc3015463d615ef91b3b'
-         '1beb4896f217bc241bc08a422274ec0c'
-         '90c30380d4c8cd48a908cfdadae1ea24'
-         '451609db34f95209d64c38474de27ce1'
-         '5117f65342fcc69c6a506529e4daca9e'
-         '49e1c75beb87e9b7c9511f59509839e7')
-
+sha256sums=('f589bb7d5d1dc3aa0915d7cf2b808571ef2e1530cd1a6ebe76ae8f9f4994e4f6'
+            'SKIP'
+            'd87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9'
+            '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
+            'ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832'
+            '1423673e16e374ed372c5b69aebc785b6674bf40601c74a5c08454f672ffa7f1'
+            'b8fc2e3bc603495f0278410350ea8f0161d9d83719feb64f573b63430cb4800b'
+            '23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af'
+            '4a4a885bb2e111bd67bcb90a5780f33841b18bc02382317fb5e64c384aa0c4c8'
+            'cdad3c266cb2abb0f90af3113420fa47a09e3ed974a2ffa9fb6a642e11971d65'
+            '375614399e38ddb7af9375472a75e8a83eb3c587595ee079286cbc45094e3c26')
+validpgpkeys=('3737FD0D0E63B30172440D2DDBA3A7AB08D76223') # CUPS.org (CUPS.org PGP key) <security@cups.org>
 
 prepare() {
 
   cd ${_pkgbase}-${pkgver}
-  
+
   # Applying patch to add ipp14 backend:
   patch -Np1 -i ${srcdir}/add-ipp-backend-of-cups-1.4.patch
 
@@ -61,8 +63,10 @@ prepare() {
   # fix permissions on some files (by Gentoo) - alternative: cups-0755.patch by FC
   patch -Np0 -i ${srcdir}/cups-1.6.0-fix-install-perms.patch
 
-  # bug fixes 
-  
+  # bug fixes
+  # make sure network is up when starting and notify systemd - FC
+  patch -Np1 -i ${srcdir}/cups-systemd-socket.patch
+
   # set MaxLogSize to 0 to prevent using cups internal log rotation
   sed -i -e '5i\ ' conf/cupsd.conf.in
   sed -i -e '6i# Disable cups internal logging - use logrotate instead' conf/cupsd.conf.in
@@ -113,9 +117,10 @@ backup=(etc/cups/cupsd.conf
         etc/dbus-1/system.d/cups.conf
         etc/logrotate.d/cups
         etc/pam.d/cups)
-depends=('acl' 'pam' "libcups-ipp14>=${pkgver}" 'cups-filters' 'bc' 'colord'
+depends=('acl' 'pam' "libcups-ipp144>=${pkgver}" 'cups-filters' 'bc' 
          'dbus' 'systemd' 'libpaper' 'hicolor-icon-theme')
-optdepends=('xdg-utils: xdg .desktop file support')
+optdepends=('xdg-utils: xdg .desktop file support'
+            'colord: for ICC color profile support')
 
   cd ${_pkgbase}-${pkgver}
   make BUILDROOT=${pkgdir} install-data install-exec
@@ -128,7 +133,7 @@ optdepends=('xdg-utils: xdg .desktop file support')
   rm -rf ${pkgdir}/etc/init.d
   install -D -m644 ../cups.logrotate ${pkgdir}/etc/logrotate.d/cups
   install -D -m644 ../cups.pam ${pkgdir}/etc/pam.d/cups
-  
+
   # fix perms on /var/spool and /etc
   chmod 755 ${pkgdir}/var/spool
   chmod 755 ${pkgdir}/etc
diff --git a/cups-no-gzip-man.patch b/cups-no-gzip-man.patch
index 69899b9cb7d9..a66971cbc4b7 100644
--- a/cups-no-gzip-man.patch
+++ b/cups-no-gzip-man.patch
@@ -4,7 +4,7 @@ diff -up cups-1.5b1/config-scripts/cups-manpages.m4.no-gzip-man cups-1.5b1/confi
 @@ -69,10 +69,10 @@ case "$uname" in
  		;;
  	Linux* | GNU* | Darwin*)
- 		# Linux, GNU Hurd, and OS X
+ 		# Linux, GNU Hurd, and macOS
 -		MAN1EXT=1.gz
 -		MAN5EXT=5.gz
 -		MAN7EXT=7.gz
diff --git a/cups-systemd-socket.patch b/cups-systemd-socket.patch
new file mode 100644
index 000000000000..035fde10d173
--- /dev/null
+++ b/cups-systemd-socket.patch
@@ -0,0 +1,48 @@
+diff -up cups-2.0.2/scheduler/main.c.ustTJg cups-2.0.2/scheduler/main.c
+--- cups-2.0.2/scheduler/main.c.ustTJg	2015-02-10 13:40:24.121547526 +0100
++++ cups-2.0.2/scheduler/main.c	2015-02-10 13:40:24.295545063 +0100
+@@ -690,8 +690,15 @@ main(int  argc,				/* I - Number of comm
+ 
+ #if defined(HAVE_ONDEMAND)
+   if (OnDemand)
++  {
+     cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started on demand.");
+-  else
++# ifdef HAVE_SYSTEMD
++    sd_notifyf(0, "READY=1\n"
++               "STATUS=Scheduler is running...\n"
++               "MAINPID=%lu",
++               (unsigned long) getpid());
++# endif /* HAVE_SYSTEMD */
++  } else
+ #endif /* HAVE_ONDEMAND */
+   if (fg)
+     cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
+diff -up cups-2.0.2/scheduler/org.cups.cupsd.path.in.ustTJg cups-2.0.2/scheduler/org.cups.cupsd.path.in
+--- cups-2.0.2/scheduler/org.cups.cupsd.path.in.ustTJg	2014-03-21 15:50:24.000000000 +0100
++++ cups-2.0.2/scheduler/org.cups.cupsd.path.in	2015-02-10 13:40:24.295545063 +0100
+@@ -2,7 +2,7 @@
+ Description=CUPS Scheduler
+ 
+ [Path]
+-PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
++PathExistsGlob=@CUPS_REQUESTS@/d*
+ 
+ [Install]
+ WantedBy=multi-user.target
+diff -up cups-2.0.2/scheduler/org.cups.cupsd.service.in.ustTJg cups-2.0.2/scheduler/org.cups.cupsd.service.in
+--- cups-2.0.2/scheduler/org.cups.cupsd.service.in.ustTJg	2014-10-21 13:55:01.000000000 +0200
++++ cups-2.0.2/scheduler/org.cups.cupsd.service.in	2015-02-10 13:40:24.296545049 +0100
+@@ -1,10 +1,11 @@
+ [Unit]
+ Description=CUPS Scheduler
+ Documentation=man:cupsd(8)
++After=network.target
+ 
+ [Service]
+ ExecStart=@sbindir@/cupsd -l
+-Type=simple
++Type=notify
+ 
+ [Install]
+ Also=org.cups.cupsd.socket org.cups.cupsd.path
diff --git a/cups.install b/cups.install
index 77fac9326d27..23732bb74898 100644
--- a/cups.install
+++ b/cups.install
@@ -1,28 +1,6 @@
 post_install() {
-    if [ -x usr/bin/xdg-icon-resource ]; then
-      xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-    fi
  echo ">> If you use an HTTPS connection to CUPS, the first time you access"
  echo ">> the interface it may take a very long time before the site comes up."
  echo ">> This is because the first request triggers the generation of the CUPS"
  echo ">> SSL certificates which can be a very time-consuming job."
 }
-
-post_upgrade() {
-    if [ -x usr/bin/xdg-icon-resource ]; then
-      xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-    fi
-  
-  if [ "`vercmp $2 2.0.0-1`" -lt 0 ]; then
-    # important upgrade notice
-    echo "> systemd unit names have been renamed"
-    echo "> you should systemctl stop and disable cups.service and"
-    echo "> systemctl daemon-reload, start and enable org.cups.cupsd.service"
-  fi
-}
-
-post_remove() {
-    if [ -x usr/bin/xdg-icon-resource ]; then
-      xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-    fi
-}