version 2.2.5-1

5 files changed, 20 insertions, 211 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e9575b5d980..b3014baa9fc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sat Jul  8 06:16:57 UTC 2017
+# Tue Oct 17 06:19:55 UTC 2017
 pkgbase = cups-nosystemd
 	pkgdesc = The CUPS Printing System - daemon package
-	pkgver = 2.2.4
-	pkgrel = 2
+	pkgver = 2.2.5
+	pkgrel = 1
 	url = https://www.cups.org/
 	install = cups-nosystemd.install
 	arch = i686
@@ -22,7 +22,7 @@ pkgbase = cups-nosystemd
 	makedepends = inetutils
 	depends = acl
 	depends = pam
-	depends = libcups>=2.2.4
+	depends = libcups>=2.2.5
 	depends = cups-filters
 	depends = bc
 	depends = dbus
@@ -31,7 +31,7 @@ pkgbase = cups-nosystemd
 	optdepends = xdg-utils: xdg .desktop file support
 	optdepends = colord: for ICC color profile support
 	optdepends = cups-openrc: cups openrc initscript
-	provides = cups=2.2.4
+	provides = cups=2.2.5
 	conflicts = cups
 	conflicts = cups-eudev
 	replaces = cups
@@ -45,26 +45,22 @@ pkgbase = cups-nosystemd
 	backup = etc/dbus-1/system.d/cups.conf
 	backup = etc/logrotate.d/cups
 	backup = etc/pam.d/cups
-	source = https://github.com/apple/cups/releases/download/v2.2.4/cups-2.2.4-source.tar.gz
+	source = https://github.com/apple/cups/releases/download/v2.2.5/cups-2.2.5-source.tar.gz
 	source = cups
 	source = cups.logrotate
 	source = cups.pam
 	source = cups-no-export-ssllibs.patch
-	source = cups-no-gcrypt.patch
 	source = cups-no-gzip-man.patch
 	source = cups-fix-install-perms.patch
 	source = cups-1.6.2-statedir.patch
-	source = cupsGetDests.diff
-	sha256sums = 596d4db72651c335469ae5f37b0da72ac9f97d73e30838d787065f559dea98cc
+	sha256sums = a8795e2aa54dcfbdc9ff254a770f0d7154e35c981bca5b3369050c5193ab5a21
 	sha256sums = 87cd833e7c07a36298341e35d5ce0534ce68fdf76ce3e9eda697e5455b963d1b
 	sha256sums = d87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9
 	sha256sums = 57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5
 	sha256sums = ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832
-	sha256sums = 1423673e16e374ed372c5b69aebc785b6674bf40601c74a5c08454f672ffa7f1
 	sha256sums = b8fc2e3bc603495f0278410350ea8f0161d9d83719feb64f573b63430cb4800b
-	sha256sums = 2496b683920417c922d58c1f70807f7a0f0c818db9ce75fe182104bd4484027b
+	sha256sums = aa999532830b7f9f6e9f47e6fb15a4dccee5ac021abbcd2fff103dcf579cb4f7
 	sha256sums = 23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af
-	sha256sums = 25c1f212d0055848c9d46195d74ade64514675c83b2098e41ba1144bd6b8a05d
 
 pkgname = cups-nosystemd
 
diff --git a/PKGBUILD b/PKGBUILD
index fe8b616cbdd..78995709194 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname="cups-nosystemd"
-pkgver=2.2.4
-pkgrel=2
+pkgver=2.2.5
+pkgrel=1
 pkgdesc="The CUPS Printing System - daemon package"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -34,22 +34,18 @@ source=(https://github.com/apple/cups/releases/download/v${pkgver}/cups-${pkgver
         cups cups.logrotate cups.pam
         # improve build and linking
         cups-no-export-ssllibs.patch
-        cups-no-gcrypt.patch
         cups-no-gzip-man.patch
 	cups-fix-install-perms.patch
         cups-1.6.2-statedir.patch
-        cupsGetDests.diff
         )
-sha256sums=('596d4db72651c335469ae5f37b0da72ac9f97d73e30838d787065f559dea98cc'
+sha256sums=('a8795e2aa54dcfbdc9ff254a770f0d7154e35c981bca5b3369050c5193ab5a21'
             '87cd833e7c07a36298341e35d5ce0534ce68fdf76ce3e9eda697e5455b963d1b'
             'd87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9'
             '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
             'ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832'
-            '1423673e16e374ed372c5b69aebc785b6674bf40601c74a5c08454f672ffa7f1'
             'b8fc2e3bc603495f0278410350ea8f0161d9d83719feb64f573b63430cb4800b'
-            '2496b683920417c922d58c1f70807f7a0f0c818db9ce75fe182104bd4484027b'
-            '23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af'
-            '25c1f212d0055848c9d46195d74ade64514675c83b2098e41ba1144bd6b8a05d')
+            'aa999532830b7f9f6e9f47e6fb15a4dccee5ac021abbcd2fff103dcf579cb4f7'
+            '23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af')
 
 prepare() {
   cd cups-${pkgver}
@@ -57,8 +53,6 @@ prepare() {
   # improve build and linking
   # Do not export SSL libs in cups-config
   patch -Np1 -i "$srcdir"/cups-no-export-ssllibs.patch
-  # https://www.cups.org/str.php?L4399
-  patch -Np1 -i "$srcdir"/cups-no-gcrypt.patch
 
   # don't zip man pages in make install, let makepkg do that / Fedora
   patch -Np1 -i "$srcdir"/cups-no-gzip-man.patch
@@ -74,9 +68,6 @@ prepare() {
   sed -i -e '6i# Disable cups internal logging - use logrotate instead' conf/cupsd.conf.in
   sed -i -e '7iMaxLogSize 0' conf/cupsd.conf.in
 
-  # upstream fix for https://bugs.archlinux.org/task/54695
-  patch -Np1 -i ../cupsGetDests.diff
-
   # Rebuild configure script for not zipping man-pages.
   aclocal -I config-scripts
   autoconf -I config-scripts
diff --git a/cups-fix-install-perms.patch b/cups-fix-install-perms.patch
index 2ed0fa8f414..c66cca1782c 100644
--- a/cups-fix-install-perms.patch
+++ b/cups-fix-install-perms.patch
@@ -1,21 +1,21 @@
---- Makedefs.in	2017-06-30 17:44:38.000000000 +0200
-+++ Makedefs.in.new	2017-07-01 17:59:28.075942932 +0200
-@@ -38,14 +38,14 @@
+--- Makedefs.in	2017-10-13 20:22:26.000000000 +0200
++++ Makedefs.in.new	2017-10-13 21:35:07.435842127 +0200
+@@ -48,14 +48,14 @@
  # Installation programs...
  #
  
--INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
+-INSTALL_BIN	=	@LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
 -INSTALL_COMPDATA =	$(INSTALL) -c -m 444 @INSTALL_GZIP@
-+INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
++INSTALL_BIN	=	@LIBTOOL_INSTALL@ $(INSTALL) -c -m 755 @INSTALL_STRIP@
 +INSTALL_COMPDATA =	$(INSTALL) -c -m 644 @INSTALL_GZIP@
  INSTALL_CONFIG	=	$(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
 -INSTALL_DATA	=	$(INSTALL) -c -m 444
 +INSTALL_DATA	=	$(INSTALL) -c -m 644
  INSTALL_DIR	=	$(INSTALL) -d
--INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
+-INSTALL_LIB	=	@LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
 -INSTALL_MAN	=	$(INSTALL) -c -m 444
 -INSTALL_SCRIPT	=	$(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
-+INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
++INSTALL_LIB	=	@LIBTOOL_INSTALL@ $(INSTALL) -c -m 755 @INSTALL_STRIP@
 +INSTALL_MAN	=	$(INSTALL) -c -m 644
 +INSTALL_SCRIPT	=	$(INSTALL) -c -m 755
  
diff --git a/cups-no-gcrypt.patch b/cups-no-gcrypt.patch
deleted file mode 100644
index 0cd64b19187..00000000000
--- a/cups-no-gcrypt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up cups-2.0rc1/config-scripts/cups-ssl.m4.no-gcry cups-2.0rc1/config-scripts/cups-ssl.m4
---- cups-2.0rc1/config-scripts/cups-ssl.m4.no-gcry	2014-09-12 15:41:23.324760213 +0200
-+++ cups-2.0rc1/config-scripts/cups-ssl.m4	2014-09-12 15:43:13.124203363 +0200
-@@ -60,7 +60,6 @@ if test x$enable_ssl != xno; then
-     dnl Then look for GNU TLS...
-     if test $have_ssl = 0 -a "x$enable_gnutls" != "xno" -a "x$PKGCONFIG" != x; then
-     	AC_PATH_TOOL(LIBGNUTLSCONFIG,libgnutls-config)
--    	AC_PATH_TOOL(LIBGCRYPTCONFIG,libgcrypt-config)
- 	if $PKGCONFIG --exists gnutls; then
- 	    have_ssl=1
- 	    SSLLIBS=`$PKGCONFIG --libs gnutls`
diff --git a/cupsGetDests.diff b/cupsGetDests.diff
deleted file mode 100644
index 69e928d521f..00000000000
--- a/cupsGetDests.diff
+++ /dev/null
@@ -1,167 +0,0 @@
-diff --git a/cups/dest.c b/cups/dest.c
-index fc57ed342..9d7426ed3 100644
---- a/cups/dest.c
-+++ b/cups/dest.c
-@@ -1015,6 +1015,8 @@ cupsEnumDests(
- #endif /* HAVE_DNSSD || HAVE_AVAHI */
- 
- 
-+  DEBUG_printf(("cupsEnumDests(flags=%x, msec=%d, cancel=%p, type=%x, mask=%x, cb=%p, user_data=%p)", flags, msec, (void *)cancel, type, mask, (void *)cb, (void *)user_data));
-+
-  /*
-   * Range check input...
-   */
-@@ -1022,7 +1024,10 @@ cupsEnumDests(
-   (void)flags;
- 
-   if (!cb)
-+  {
-+    DEBUG_puts("1cupsEnumDests: No callback, returning 0.");
-     return (0);
-+  }
- 
-  /*
-   * Get ready to enumerate...
-@@ -1141,7 +1146,10 @@ cupsEnumDests(
- 
- #  ifdef HAVE_DNSSD
-   if (DNSServiceCreateConnection(&data.main_ref) != kDNSServiceErr_NoError)
-+  {
-+    DEBUG_puts("1cupsEnumDests: Unable to create service browser, returning 0.");
-     return (0);
-+  }
- 
-   main_fd = DNSServiceRefSockFD(data.main_ref);
- 
-@@ -1172,8 +1180,8 @@ cupsEnumDests(
- #  else /* HAVE_AVAHI */
-   if ((data.simple_poll = avahi_simple_poll_new()) == NULL)
-   {
--    DEBUG_puts("cupsEnumDests: Unable to create Avahi simple poll object.");
--    return (1);
-+    DEBUG_puts("1cupsEnumDests: Unable to create Avahi poll, returning 0.");
-+    return (0);
-   }
- 
-   avahi_simple_poll_set_func(data.simple_poll, cups_dnssd_poll_cb, &data);
-@@ -1183,9 +1191,9 @@ cupsEnumDests(
- 				 &error);
-   if (!data.client)
-   {
--    DEBUG_puts("cupsEnumDests: Unable to create Avahi client.");
-+    DEBUG_puts("1cupsEnumDests: Unable to create Avahi client, returning 0.");
-     avahi_simple_poll_free(data.simple_poll);
--    return (1);
-+    return (0);
-   }
- 
-   data.browsers = 1;
-@@ -1374,6 +1382,8 @@ cupsEnumDests(
- #  endif /* HAVE_DNSSD */
- #endif /* HAVE_DNSSD || HAVE_AVAHI */
- 
-+  DEBUG_puts("1cupsEnumDests: Returning 1.");
-+
-   return (1);
- }
- 
-@@ -2040,13 +2050,16 @@ cupsGetDests2(http_t      *http,	/* I - Connection to server or @code CUPS_HTTP_
-   _cups_globals_t *cg = _cupsGlobals();	/* Pointer to library globals */
- 
- 
-- /*
-+  DEBUG_printf(("cupsGetDests2(http=%p, dests=%p)", (void *)http, (void *)dests));
-+
-+/*
-   * Range check the input...
-   */
- 
-   if (!dests)
-   {
-     _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Bad NULL dests pointer"), 1);
-+    DEBUG_puts("1cupsGetDests2: NULL dests pointer, returning 0.");
-     return (0);
-   }
- 
-@@ -2061,6 +2074,8 @@ cupsGetDests2(http_t      *http,	/* I - Connection to server or @code CUPS_HTTP_
- 
-   if (cupsLastError() >= IPP_STATUS_REDIRECTION_OTHER_SITE)
-   {
-+    DEBUG_printf(("1cupsGetDests2: cupsLastError() is %s, returning 0.", cupsLastErrorString()));
-+
-     cupsFreeDests(data.num_dests, data.dests);
- 
-     *dests = (cups_dest_t *)0;
-@@ -2178,6 +2193,8 @@ cupsGetDests2(http_t      *http,	/* I - Connection to server or @code CUPS_HTTP_
-   if (data.num_dests > 0)
-     _cupsSetError(IPP_STATUS_OK, NULL, 0);
- 
-+  DEBUG_printf(("1cupsGetDests2: Returning %d destinations.", data.num_dests));
-+
-   return (data.num_dests);
- }
- 
-diff --git a/xcode/CUPS.xcodeproj/project.pbxproj b/xcode/CUPS.xcodeproj/project.pbxproj
-index 2edef8343..bdbb62d19 100644
---- a/xcode/CUPS.xcodeproj/project.pbxproj
-+++ b/xcode/CUPS.xcodeproj/project.pbxproj
-@@ -11049,8 +11049,6 @@
- 			buildSettings = {
- 				ASSETCATALOG_COMPRESSION = lossless;
- 				CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES;
--				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
--				CLANG_WARN_COMMA = YES;
- 				CLANG_WARN_EMPTY_BODY = YES;
- 				CLANG_WARN_ENUM_CONVERSION = YES;
- 				CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
-@@ -11067,7 +11065,7 @@
- 				GCC_NO_COMMON_BLOCKS = YES;
- 				GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
- 				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
--				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
-+				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
- 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
- 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
- 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-@@ -11096,8 +11094,6 @@
- 			buildSettings = {
- 				ASSETCATALOG_COMPRESSION = "respect-asset-catalog";
- 				CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES;
--				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
--				CLANG_WARN_COMMA = YES;
- 				CLANG_WARN_EMPTY_BODY = YES;
- 				CLANG_WARN_ENUM_CONVERSION = YES;
- 				CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
-@@ -11112,7 +11108,7 @@
- 				ENABLE_STRICT_OBJC_MSGSEND = YES;
- 				GCC_NO_COMMON_BLOCKS = YES;
- 				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
--				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
-+				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
- 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
- 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
- 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-
-diff --git a/cups/dest.c b/cups/dest.c
-index 9d7426ed3..09bb76b73 100644
---- a/cups/dest.c
-+++ b/cups/dest.c
-@@ -2072,17 +2072,6 @@ cupsGetDests2(http_t      *http,	/* I - Connection to server or @code CUPS_HTTP_
- 
-   cupsEnumDests(0, 1000, NULL, 0, 0, (cups_dest_cb_t)cups_get_cb, &data);
- 
--  if (cupsLastError() >= IPP_STATUS_REDIRECTION_OTHER_SITE)
--  {
--    DEBUG_printf(("1cupsGetDests2: cupsLastError() is %s, returning 0.", cupsLastErrorString()));
--
--    cupsFreeDests(data.num_dests, data.dests);
--
--    *dests = (cups_dest_t *)0;
--
--    return (0);
--  }
--
-  /*
-   * Make a copy of the "real" queues for a later sanity check...
-   */
-