[arch-commits] Commit in cups/trunk (3 files)

[Andreas Radke]

    Date: Saturday, July 1, 2017 @ 16:05:56
  Author: andyrtr
Revision: 299498

upgpkg: cups 2.2.4-1

upstream update 2.2.4

Added:
  cups/trunk/cups-fix-install-perms.patch
    (from rev 299497, cups/trunk/cups-1.6.0-fix-install-perms.patch)
Modified:
  cups/trunk/PKGBUILD
Deleted:
  cups/trunk/cups-1.6.0-fix-install-perms.patch

------------------------------------+
 PKGBUILD                           |   10 +++++-----
 cups-1.6.0-fix-install-perms.patch |   25 -------------------------
 cups-fix-install-perms.patch       |   23 +++++++++++++++++++++++
 3 files changed, 28 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-01 14:39:30 UTC (rev 299497)
+++ PKGBUILD	2017-07-01 16:05:56 UTC (rev 299498)
@@ -3,7 +3,7 @@
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
-pkgver=2.2.3
+pkgver=2.2.4
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -18,11 +18,11 @@
         cups-no-gcrypt.patch
         cups-no-gzip-man.patch
         cups-1.6.2-statedir.patch
-        cups-1.6.0-fix-install-perms.patch
+        cups-fix-install-perms.patch
         # bugfixes
         cups-systemd-socket.patch
 )
-sha256sums=('66701fe15838f2c892052c913bde1ba106bbee2e0a953c955a62ecacce76885f'
+sha256sums=('596d4db72651c335469ae5f37b0da72ac9f97d73e30838d787065f559dea98cc'
             'SKIP'
             'd87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9'
             '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
@@ -30,7 +30,7 @@
             '1423673e16e374ed372c5b69aebc785b6674bf40601c74a5c08454f672ffa7f1'
             'b8fc2e3bc603495f0278410350ea8f0161d9d83719feb64f573b63430cb4800b'
             '23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af'
-            '4a4a885bb2e111bd67bcb90a5780f33841b18bc02382317fb5e64c384aa0c4c8'
+            '2496b683920417c922d58c1f70807f7a0f0c818db9ce75fe182104bd4484027b'
             'cdad3c266cb2abb0f90af3113420fa47a09e3ed974a2ffa9fb6a642e11971d65')
 validpgpkeys=('3737FD0D0E63B30172440D2DDBA3A7AB08D76223') # CUPS.org (CUPS.org PGP key) <security at cups.org>
 
@@ -48,7 +48,7 @@
   # move /var/run -> /run for pid file
   patch -Np1 -i ${srcdir}/cups-1.6.2-statedir.patch
   # 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
+  patch -Np0 -i ${srcdir}/cups-fix-install-perms.patch
 
   # bug fixes
   # make sure network is up when starting and notify systemd - FC

Deleted: cups-1.6.0-fix-install-perms.patch
===================================================================
--- cups-1.6.0-fix-install-perms.patch	2017-07-01 14:39:30 UTC (rev 299497)
+++ cups-1.6.0-fix-install-perms.patch	2017-07-01 16:05:56 UTC (rev 299498)
@@ -1,25 +0,0 @@
-Index: Makedefs.in
-===================================================================
---- Makedefs.in	(Revision 10520)
-+++ Makedefs.in	(Arbeitskopie)
-@@ -40,14 +40,14 @@
- # Installation programs...
- #
- 
--INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
--INSTALL_COMPDATA =	$(INSTALL) -c -m 444 @INSTALL_GZIP@
-+INSTALL_BIN	=	$(LIBTOOL) $(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 555 @INSTALL_STRIP@
--INSTALL_MAN	=	$(INSTALL) -c -m 444
--INSTALL_SCRIPT	=	$(INSTALL) -c -m 555
-+INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
-+INSTALL_MAN	=	$(INSTALL) -c -m 644
-+INSTALL_SCRIPT	=	$(INSTALL) -c -m 755
- 
- #
- # Default user, group, and system groups for the scheduler...

Copied: cups/trunk/cups-fix-install-perms.patch (from rev 299497, cups/trunk/cups-1.6.0-fix-install-perms.patch)
===================================================================
--- cups-fix-install-perms.patch	                        (rev 0)
+++ cups-fix-install-perms.patch	2017-07-01 16:05:56 UTC (rev 299498)
@@ -0,0 +1,23 @@
+--- 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 @@
+ # Installation programs...
+ #
+ 
+-INSTALL_BIN	=	$(LIBTOOL) $(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_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_MAN	=	$(INSTALL) -c -m 444
+-INSTALL_SCRIPT	=	$(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
++INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
++INSTALL_MAN	=	$(INSTALL) -c -m 644
++INSTALL_SCRIPT	=	$(INSTALL) -c -m 755
+ 
+ #
+ # Default user, group, and system groups for the scheduler...