[arch-commits] Commit in cups/trunk (PKGBUILD cups-systemd-socket.patch)

[Andreas Radke]

    Date: Sunday, November 15, 2020 @ 18:25:30
  Author: andyrtr
Revision: 401235

upgpkg: cups 2.3.3+106+ga72b0140e-1: update to recent git commit now fully renamed service naming scheme supporting

Modified:
  cups/trunk/PKGBUILD
  cups/trunk/cups-systemd-socket.patch

---------------------------+
 PKGBUILD                  |   13 +++----------
 cups-systemd-socket.patch |    4 ++--
 2 files changed, 5 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-15 16:56:38 UTC (rev 401234)
+++ PKGBUILD	2020-11-15 18:25:30 UTC (rev 401235)
@@ -2,8 +2,8 @@
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
-_commit=59137acc14cffad7fa1c076ea09f6d555aac203d # master 2020-11-14
-pkgver=2.3.3+105+g59137acc1
+_commit=a72b0140ee9ad72f7ffc1f46fbe962bde159cbb8 # master 2020-11-15
+pkgver=2.3.3+106+ga72b0140e
 pkgrel=1
 arch=('x86_64')
 license=('Apache' 'custom')
@@ -31,7 +31,7 @@
             '06173dfaea37bdd9b39b3e09aba98c34ae7112a2f521db45a688907d8848caa2'
             'ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832'
             '23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af'
-            'f0d65d37aa57de0481244f9f0dc1fe2277a1fbe43e5333e24649c2f9e10f414e'
+            '5fb8b1df744ddff3652d9940fe2c084f4146b22a60b95a7eb97a2ed29e0d3a10'
             'd4537526c1e075866ae22ad263da000fc2a592d36c26b79a459a1cfdade2bb2d')
 validpgpkeys=('3737FD0D0E63B30172440D2DDBA3A7AB08D76223') # CUPS.org (CUPS.org PGP key) <security at cups.org>
 validpgpkeys+=('45D083946E3035282B3CCA9AF434104235DA97EB') # "CUPS.org <security at cups.org>"
@@ -186,11 +186,4 @@
 
   # comment out unnecessary PageLogFormat entry
   sed -i -e 's:PageLogFormat:#PageLogFormat:' "$pkgdir"/etc/cups/cupsd.conf*
-
-  # rename the systems service files
-  mv "${pkgdir}"/usr/lib/systemd/system/org.cups.cups-lpd.socket "${pkgdir}"/usr/lib/systemd/system/cups-lpd.socket
-  mv "${pkgdir}"/usr/lib/systemd/system/org.cups.cups-lpd at .service "${pkgdir}"/usr/lib/systemd/system/cups-lpd at .service
-  mv "${pkgdir}"/usr/lib/systemd/system/org.cups.cupsd.path "${pkgdir}"/usr/lib/systemd/system/cups.path
-  mv "${pkgdir}"/usr/lib/systemd/system/org.cups.cupsd.service "${pkgdir}"/usr/lib/systemd/system/cups.service
-  mv "${pkgdir}"/usr/lib/systemd/system/org.cups.cupsd.socket "${pkgdir}"/usr/lib/systemd/system/cups.socket
 }

Modified: cups-systemd-socket.patch
===================================================================
--- cups-systemd-socket.patch	2020-11-15 16:56:38 UTC (rev 401234)
+++ cups-systemd-socket.patch	2020-11-15 18:25:30 UTC (rev 401235)
@@ -19,8 +19,8 @@
    if (fg)
      cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
 diff -up cups-2.0.2/scheduler/org.cups.cupsd.path.in.ustTJg cups-2.0.2/scheduler/org.cups.cupsd.path.in
---- cups-2.3.0/scheduler/org.cups.cupsd.service.in	2019-08-23 17:19:38.000000000 +0200
-+++ cups-2.3.0/scheduler/org.cups.cupsd.service.in.new	2019-08-25 20:20:25.805339727 +0200
+--- cups-2.3.0/scheduler/cups.service.in	2019-08-23 17:19:38.000000000 +0200
++++ cups-2.3.0/scheduler/cups.service.in.new	2019-08-25 20:20:25.805339727 +0200
 @@ -1,12 +1,13 @@
  [Unit]
  Description=CUPS Scheduler