summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey D2017-07-03 11:36:59 +0300
committerAlexey D2017-07-03 11:36:59 +0300
commitd5356e0aebe32525fa8a7b5c9f256c6db4c684d2 (patch)
treeefec0dddec636dff7b1dd34ed21339b11fc47dfb
parent64c956367d9a36d49d58e25c0960a4b0b50e1f45 (diff)
downloadaur-d5356e0aebe32525fa8a7b5c9f256c6db4c684d2.tar.gz
version 2.2.4-1
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD10
-rw-r--r--cups-fix-install-perms.patch (renamed from cups-1.6.0-fix-install-perms.patch)14
3 files changed, 19 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c73b48cca67..02e40b3d6fd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sun Apr 2 05:01:40 UTC 2017
+# Mon Jul 3 08:36:29 UTC 2017
pkgbase = cups-nosystemd
pkgdesc = The CUPS Printing System - daemon package
- pkgver = 2.2.3
+ pkgver = 2.2.4
pkgrel = 1
url = https://www.cups.org/
install = cups-nosystemd.install
@@ -22,7 +22,7 @@ pkgbase = cups-nosystemd
makedepends = inetutils
depends = acl
depends = pam
- depends = libcups>=2.2.3
+ depends = libcups>=2.2.4
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.3
+ provides = cups=2.2.4
conflicts = cups
conflicts = cups-eudev
replaces = cups
@@ -45,23 +45,23 @@ 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.3/cups-2.2.3-source.tar.gz
+ source = https://github.com/apple/cups/releases/download/v2.2.4/cups-2.2.4-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-1.6.0-fix-install-perms.patch
+ source = cups-fix-install-perms.patch
source = cups-1.6.2-statedir.patch
- sha256sums = 66701fe15838f2c892052c913bde1ba106bbee2e0a953c955a62ecacce76885f
+ sha256sums = 596d4db72651c335469ae5f37b0da72ac9f97d73e30838d787065f559dea98cc
sha256sums = 87cd833e7c07a36298341e35d5ce0534ce68fdf76ce3e9eda697e5455b963d1b
sha256sums = d87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9
sha256sums = 57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5
sha256sums = ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832
sha256sums = 1423673e16e374ed372c5b69aebc785b6674bf40601c74a5c08454f672ffa7f1
sha256sums = b8fc2e3bc603495f0278410350ea8f0161d9d83719feb64f573b63430cb4800b
- sha256sums = 4a4a885bb2e111bd67bcb90a5780f33841b18bc02382317fb5e64c384aa0c4c8
+ sha256sums = 2496b683920417c922d58c1f70807f7a0f0c818db9ce75fe182104bd4484027b
sha256sums = 23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af
pkgname = cups-nosystemd
diff --git a/PKGBUILD b/PKGBUILD
index 63846e9192c..5aa28fe6457 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Andreas Radke <andyrtr@archlinux.org>
pkgname="cups-nosystemd"
-pkgver=2.2.3
+pkgver=2.2.4
pkgrel=1
pkgdesc="The CUPS Printing System - daemon package"
arch=('i686' 'x86_64')
@@ -36,17 +36,17 @@ source=(https://github.com/apple/cups/releases/download/v${pkgver}/cups-${pkgver
cups-no-export-ssllibs.patch
cups-no-gcrypt.patch
cups-no-gzip-man.patch
- cups-1.6.0-fix-install-perms.patch
+ cups-fix-install-perms.patch
cups-1.6.2-statedir.patch
)
-sha256sums=('66701fe15838f2c892052c913bde1ba106bbee2e0a953c955a62ecacce76885f'
+sha256sums=('596d4db72651c335469ae5f37b0da72ac9f97d73e30838d787065f559dea98cc'
'87cd833e7c07a36298341e35d5ce0534ce68fdf76ce3e9eda697e5455b963d1b'
'd87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9'
'57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
'ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832'
'1423673e16e374ed372c5b69aebc785b6674bf40601c74a5c08454f672ffa7f1'
'b8fc2e3bc603495f0278410350ea8f0161d9d83719feb64f573b63430cb4800b'
- '4a4a885bb2e111bd67bcb90a5780f33841b18bc02382317fb5e64c384aa0c4c8'
+ '2496b683920417c922d58c1f70807f7a0f0c818db9ce75fe182104bd4484027b'
'23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af')
prepare() {
@@ -65,7 +65,7 @@ prepare() {
patch -Np1 -i "$srcdir"/cups-1.6.2-statedir.patch
# fix permissions on some files (by Gentoo)
- patch -Np0 -i "$srcdir"/cups-1.6.0-fix-install-perms.patch
+ patch -Np0 -i "$srcdir"/cups-fix-install-perms.patch
# set MaxLogSize to 0 to prevent using cups internal log rotation
sed -i -e '5i\ ' conf/cupsd.conf.in
diff --git a/cups-1.6.0-fix-install-perms.patch b/cups-fix-install-perms.patch
index 2d7a77c44f3..2ed0fa8f414 100644
--- a/cups-1.6.0-fix-install-perms.patch
+++ b/cups-fix-install-perms.patch
@@ -1,12 +1,10 @@
-Index: Makedefs.in
-===================================================================
---- Makedefs.in (Revision 10520)
-+++ Makedefs.in (Arbeitskopie)
-@@ -40,14 +40,14 @@
+--- 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 555 @INSTALL_STRIP@
+-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@
@@ -14,9 +12,9 @@ Index: Makedefs.in
-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_LIB = $(LIBTOOL) $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
-INSTALL_MAN = $(INSTALL) -c -m 444
--INSTALL_SCRIPT = $(INSTALL) -c -m 555
+-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