[arch-commits] Commit in cups/trunk (PKGBUILD start_cups_by_port631.diff)

[Andreas Radke]

    Date: Monday, September 26, 2016 @ 14:37:19
  Author: andyrtr
Revision: 276965

upgpkg: cups 2.2.0-4

- fix broken webinterface - remove "ListenStream=631" directive from the systemd socket activation file
- remove deprecated client.conf manpage from libcups - FS#50896

Read http://lists.cups.org/pipermail/cups/2015-October/027226.html why a client.conf file only setup without a cups server is a bad idea!

Modified:
  cups/trunk/PKGBUILD
Deleted:
  cups/trunk/start_cups_by_port631.diff

----------------------------+
 PKGBUILD                   |   10 +---------
 start_cups_by_port631.diff |   10 ----------
 2 files changed, 1 insertion(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-09-26 12:55:49 UTC (rev 276964)
+++ PKGBUILD	2016-09-26 14:37:19 UTC (rev 276965)
@@ -4,7 +4,7 @@
 pkgbase="cups"
 pkgname=('libcups' 'cups')
 pkgver=2.2.0
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.cups.org/"
@@ -21,7 +21,6 @@
         cups-1.6.0-fix-install-perms.patch
         # bugfixes
         cups-systemd-socket.patch
-        start_cups_by_port631.diff
         fix_endless_loops.diff
 )
 md5sums=('e22d943cff300411d3616dc2ee86272c'
@@ -33,7 +32,6 @@
          '451609db34f95209d64c38474de27ce1'
          '5117f65342fcc69c6a506529e4daca9e'
          '53bb3c80ee6823d36f9ab499373edfc5'
-         'f75c17b1b2d446a27b629f63622b9468'
          '32f6e1f907247dab466c37403d87d4e4')
 validpgpkeys=('3737FD0D0E63B30172440D2DDBA3A7AB08D76223') # CUPS.org (CUPS.org PGP key) <security at cups.org>
 
@@ -56,8 +54,6 @@
   # bug fixes
   # make sure network is up when starting and notify systemd - FC
   patch -Np1 -i ${srcdir}/cups-systemd-socket.patch
-  # make sure cupsd starts when requested via web interface
-  patch -Np1 -i ${srcdir}/start_cups_by_port631.diff
   # fix endless loops; FS#50796; https://github.com/apple/cups/issues/4870
   patch -Np1 -i ${srcdir}/fix_endless_loops.diff
 
@@ -108,10 +104,6 @@
   # put this into the libs pkg to make other software find the libs(no pkg-config file included)
   mkdir -p ${pkgdir}/usr/bin 
   install -m755 ${srcdir}/${pkgbase}-${pkgver}/cups-config ${pkgdir}/usr/bin/cups-config
-  
-  # install client.conf man page and config file
-  install -dm755 ${pkgdir}/usr/share/man/man5
-  install -Dm644  ${srcdir}/${pkgbase}-${pkgver}/man/client.conf.5 ${pkgdir}/usr/share/man/man5/
 }
 
 package_cups() {

Deleted: start_cups_by_port631.diff
===================================================================
--- start_cups_by_port631.diff	2016-09-26 12:55:49 UTC (rev 276964)
+++ start_cups_by_port631.diff	2016-09-26 14:37:19 UTC (rev 276965)
@@ -1,10 +0,0 @@
---- cups-2.2.0/scheduler/org.cups.cupsd.socket.in	2016-09-14 01:39:47.000000000 +0200
-+++ cups-2.2.0/scheduler/org.cups.cupsd.socket.in.new	2016-09-17 14:43:49.237741189 +0200
-@@ -3,6 +3,7 @@
- 
- [Socket]
- ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
-+ListenStream=631
- 
- [Install]
- WantedBy=sockets.target