[arch-commits] Commit in cups/trunk (PKGBUILD cups-fix-install-perms.patch)

[Andreas Radke]

    Date: Wednesday, November 1, 2017 @ 15:48:26
  Author: andyrtr
Revision: 308808

upgpkg: cups 2.2.6-1

upstream update 2.2.6

Modified:
  cups/trunk/PKGBUILD
Deleted:
  cups/trunk/cups-fix-install-perms.patch

------------------------------+
 PKGBUILD                     |    9 +++------
 cups-fix-install-perms.patch |   23 -----------------------
 2 files changed, 3 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-01 15:02:03 UTC (rev 308807)
+++ PKGBUILD	2017-11-01 15:48:26 UTC (rev 308808)
@@ -3,7 +3,7 @@
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
-pkgver=2.2.5
+pkgver=2.2.6
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -17,10 +17,9 @@
         cups-no-export-ssllibs.patch
         cups-no-gzip-man.patch
         cups-1.6.2-statedir.patch
-        cups-fix-install-perms.patch
         # bugfixes
         cups-systemd-socket.patch)
-sha256sums=('a8795e2aa54dcfbdc9ff254a770f0d7154e35c981bca5b3369050c5193ab5a21'
+sha256sums=('40385778c2b3bdf55030d1c999734e22774c79e3425d91339ce677825620169b'
             'SKIP'
             'd87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9'
             '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
@@ -27,7 +26,6 @@
             'ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832'
             'b8fc2e3bc603495f0278410350ea8f0161d9d83719feb64f573b63430cb4800b'
             '23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af'
-            'aa999532830b7f9f6e9f47e6fb15a4dccee5ac021abbcd2fff103dcf579cb4f7'
             'cdad3c266cb2abb0f90af3113420fa47a09e3ed974a2ffa9fb6a642e11971d65')
 validpgpkeys=('3737FD0D0E63B30172440D2DDBA3A7AB08D76223') # CUPS.org (CUPS.org PGP key) <security at cups.org>
 
@@ -42,8 +40,6 @@
   patch -Np1 -i ${srcdir}/cups-no-gzip-man.patch
   # 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-fix-install-perms.patch
 
   # bug fixes
   # make sure network is up when starting and notify systemd - FC
@@ -68,6 +64,7 @@
      --libdir=/usr/lib \
      --with-logdir=/var/log/cups \
      --with-docdir=/usr/share/cups/doc \
+     --with-exe-file-perm=0755 \
      --with-cups-user=daemon \
      --with-cups-group=lp \
      --enable-pam=yes \

Deleted: cups-fix-install-perms.patch
===================================================================
--- cups-fix-install-perms.patch	2017-11-01 15:02:03 UTC (rev 308807)
+++ cups-fix-install-perms.patch	2017-11-01 15:48:26 UTC (rev 308808)
@@ -1,23 +0,0 @@
---- 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@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
--INSTALL_COMPDATA =	$(INSTALL) -c -m 444 @INSTALL_GZIP@
-+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@ $(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@ $(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...