summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey D2017-11-04 09:47:02 +0300
committerAlexey D2017-11-04 09:47:02 +0300
commitca716a2d677f2de08bd863971528c97fc5dd3295 (patch)
tree204ad4e360e4925b72f376111a25ba47c251e186
parent05b78ec7109fac652f8eb127b8cb99d6ab77a4d8 (diff)
downloadaur-ca716a2d677f2de08bd863971528c97fc5dd3295.tar.gz
version 2.2.6-1
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD10
-rw-r--r--cups-fix-install-perms.patch23
3 files changed, 9 insertions, 38 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b3014baa9fc..36f7f5ae4df 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Tue Oct 17 06:19:55 UTC 2017
+# Sat Nov 4 06:46:26 UTC 2017
pkgbase = cups-nosystemd
pkgdesc = The CUPS Printing System - daemon package
- pkgver = 2.2.5
+ pkgver = 2.2.6
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.5
+ depends = libcups>=2.2.6
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.5
+ provides = cups=2.2.6
conflicts = cups
conflicts = cups-eudev
replaces = cups
@@ -45,21 +45,19 @@ 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.5/cups-2.2.5-source.tar.gz
+ source = https://github.com/apple/cups/releases/download/v2.2.6/cups-2.2.6-source.tar.gz
source = cups
source = cups.logrotate
source = cups.pam
source = cups-no-export-ssllibs.patch
source = cups-no-gzip-man.patch
- source = cups-fix-install-perms.patch
source = cups-1.6.2-statedir.patch
- sha256sums = a8795e2aa54dcfbdc9ff254a770f0d7154e35c981bca5b3369050c5193ab5a21
+ sha256sums = 40385778c2b3bdf55030d1c999734e22774c79e3425d91339ce677825620169b
sha256sums = 87cd833e7c07a36298341e35d5ce0534ce68fdf76ce3e9eda697e5455b963d1b
sha256sums = d87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9
sha256sums = 57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5
sha256sums = ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832
sha256sums = b8fc2e3bc603495f0278410350ea8f0161d9d83719feb64f573b63430cb4800b
- sha256sums = aa999532830b7f9f6e9f47e6fb15a4dccee5ac021abbcd2fff103dcf579cb4f7
sha256sums = 23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af
pkgname = cups-nosystemd
diff --git a/PKGBUILD b/PKGBUILD
index 78995709194..348495346cb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Andreas Radke <andyrtr@archlinux.org>
pkgname="cups-nosystemd"
-pkgver=2.2.5
+pkgver=2.2.6
pkgrel=1
pkgdesc="The CUPS Printing System - daemon package"
arch=('i686' 'x86_64')
@@ -35,16 +35,14 @@ source=(https://github.com/apple/cups/releases/download/v${pkgver}/cups-${pkgver
# improve build and linking
cups-no-export-ssllibs.patch
cups-no-gzip-man.patch
- cups-fix-install-perms.patch
cups-1.6.2-statedir.patch
)
-sha256sums=('a8795e2aa54dcfbdc9ff254a770f0d7154e35c981bca5b3369050c5193ab5a21'
+sha256sums=('40385778c2b3bdf55030d1c999734e22774c79e3425d91339ce677825620169b'
'87cd833e7c07a36298341e35d5ce0534ce68fdf76ce3e9eda697e5455b963d1b'
'd87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9'
'57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
'ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832'
'b8fc2e3bc603495f0278410350ea8f0161d9d83719feb64f573b63430cb4800b'
- 'aa999532830b7f9f6e9f47e6fb15a4dccee5ac021abbcd2fff103dcf579cb4f7'
'23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af')
prepare() {
@@ -60,9 +58,6 @@ prepare() {
# move /var/run -> /run for pid file
patch -Np1 -i "$srcdir"/cups-1.6.2-statedir.patch
- # fix permissions on some files (by Gentoo)
- 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
sed -i -e '6i# Disable cups internal logging - use logrotate instead' conf/cupsd.conf.in
@@ -83,6 +78,7 @@ build() {
--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 \
diff --git a/cups-fix-install-perms.patch b/cups-fix-install-perms.patch
deleted file mode 100644
index c66cca1782c..00000000000
--- a/cups-fix-install-perms.patch
+++ /dev/null
@@ -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...