From a03853c88e10f4456f18264015854f626fc40ca9 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sun, 2 Jul 2017 16:46:26 +0200 Subject: [PATCH] cups: update to 2.2.4 --- .../cups-1.6.0-fix-install-perms.patch | 25 ------------------- .../cups/patches/cups-1.6.2-statedir.patch | 12 --------- .../cups/patches/cups-fix-install-perms.patch | 18 +++++++++++++ srcpkgs/cups/template | 18 ++++++------- 4 files changed, 26 insertions(+), 47 deletions(-) delete mode 100644 srcpkgs/cups/patches/cups-1.6.0-fix-install-perms.patch delete mode 100644 srcpkgs/cups/patches/cups-1.6.2-statedir.patch create mode 100644 srcpkgs/cups/patches/cups-fix-install-perms.patch diff --git a/srcpkgs/cups/patches/cups-1.6.0-fix-install-perms.patch b/srcpkgs/cups/patches/cups-1.6.0-fix-install-perms.patch deleted file mode 100644 index dee8b69c2cb..00000000000 --- a/srcpkgs/cups/patches/cups-1.6.0-fix-install-perms.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: Makedefs.in -=================================================================== ---- a/Makedefs.in (Revision 10520) -+++ b/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... diff --git a/srcpkgs/cups/patches/cups-1.6.2-statedir.patch b/srcpkgs/cups/patches/cups-1.6.2-statedir.patch deleted file mode 100644 index c44ebed07c5..00000000000 --- a/srcpkgs/cups/patches/cups-1.6.2-statedir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN cups-1.6.2.orig/config-scripts/cups-directories.m4 cups-1.6.2/config-scripts/cups-directories.m4 ---- cups-1.6.2.orig/config-scripts/cups-directories.m4 2012-10-01 03:55:23.000000000 +0200 -+++ cups-1.6.2/config-scripts/cups-directories.m4 2013-04-02 00:11:41.000000000 +0200 -@@ -420,7 +420,7 @@ - ;; - *) - # All others -- CUPS_STATEDIR="$localstatedir/run/cups" -+ CUPS_STATEDIR="/run/cups" - ;; - esac]) - AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR") diff --git a/srcpkgs/cups/patches/cups-fix-install-perms.patch b/srcpkgs/cups/patches/cups-fix-install-perms.patch new file mode 100644 index 00000000000..bb85063747b --- /dev/null +++ b/srcpkgs/cups/patches/cups-fix-install-perms.patch @@ -0,0 +1,18 @@ +--- a/Makedefs.in ++++ b/Makedefs.in +@@ -39,12 +39,12 @@ + # + + INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@ +-INSTALL_COMPDATA = $(INSTALL) -c -m 444 @INSTALL_GZIP@ ++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_MAN = $(INSTALL) -c -m 644 + INSTALL_SCRIPT = $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ + + # diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template index b3d7d54f332..f6775a88965 100644 --- a/srcpkgs/cups/template +++ b/srcpkgs/cups/template @@ -1,21 +1,21 @@ # Template file for 'cups' pkgname=cups -version=2.2.3 +version=2.2.4 revision=1 patch_args="-Np1" short_desc="Common Unix Printing System" maintainer="Juan RP " -homepage="http://www.cups.org/" +homepage="https://www.cups.org/" license="GPL-2" distfiles="https://github.com/apple/cups/releases/download/v${version}/cups-${version}-source.tar.gz" -checksum=66701fe15838f2c892052c913bde1ba106bbee2e0a953c955a62ecacce76885f +checksum=596d4db72651c335469ae5f37b0da72ac9f97d73e30838d787065f559dea98cc hostmakedepends="automake pkg-config poppler-utils gnutls-devel avahi-libs-devel" makedepends="acl-devel libjpeg-turbo-devel libpng-devel tiff-devel gnutls-devel pam-devel poppler-devel libusb-devel avahi-libs-devel libpaper-devel $(vopt_if gssapi mit-krb5-devel)" depends="xdg-utils" -conf_files="/etc/pam.d/cups /etc/cups/*.conf" +conf_files="/etc/pam.d/cups /etc/cups/*.conf /etc/xinetd.d/cups-lpd" make_dirs=" /usr/lib/cups/driver 0755 root root /var/log/cups 0750 root root @@ -46,12 +46,13 @@ do_configure() { ./configure ${configure_args} --sbindir=/usr/bin --libdir=/usr/lib \ --enable-acl --enable-dbus --enable-raw-printing \ --enable-threads --with-logdir=/var/log/cups \ - --with-docdir=/usr/share/cups/doc \ + --with-docdir=/usr/share/cups/doc --with-rundir=/run/cups \ --with-cups-user=cups --with-cups-group=lp --enable-relro \ --enable-libpaper --enable-avahi --enable-pam --enable-ssl \ --with-menudir=/usr/share/applications --with-xinetd=/etc/xinetd.d \ - --with-optim="${CFLAGS}" --without-systemd \ - --without-perl --without-php --without-python $(vopt_enable gssapi) + --with-optim="${CFLAGS}" --disable-systemd --disable-launchd \ + --without-rcdir --without-java --without-perl --without-php \ + --without-python $(vopt_enable gssapi) } do_build() { # Do not run genstrings binary in cross builds. @@ -63,9 +64,6 @@ do_build() { } do_install() { make BUILDROOT=${DESTDIR} install - # Remove sysvinit scripts. - rm -rf ${DESTDIR}/etc/rc.d - rm -rf ${DESTDIR}/etc/init.d # compress some driver files, adopted from Fedora find ${DESTDIR}/usr/share/cups/model -name "*.ppd"|xargs gzip -n9f