[arch-commits] Commit in dopewars/trunk (PKGBUILD dopewars.service dopewars.socket)

[Alexander Rødseth]

    Date: Monday, July 2, 2018 @ 19:45:31
  Author: arodseth
Revision: 350211

upgpkg: dopewars 1.5.12-10

Added:
  dopewars/trunk/dopewars.socket
Modified:
  dopewars/trunk/PKGBUILD
  dopewars/trunk/dopewars.service

------------------+
 PKGBUILD         |   32 +++++++++++++++++++++-----------
 dopewars.service |   21 +++++++++++----------
 dopewars.socket  |    9 +++++++++
 3 files changed, 41 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-07-02 19:45:24 UTC (rev 350210)
+++ PKGBUILD	2018-07-02 19:45:31 UTC (rev 350211)
@@ -12,12 +12,19 @@
 url='https://dopewars.sourceforge.net/'
 license=('GPL')
 arch=('x86_64')
-depends=('alsa-lib' 'audiofile' 'gtk2' 'ncurses' 'sdl_mixer')
+depends=('ncurses')
+makedepends=('alsa-lib' 'audiofile' 'gtk2' 'ncurses' 'sdl_mixer')
+optdepends=('alsa-lib: for audio'
+            'audiofile: for audio'
+            'gtk2: for the graphical interface'
+            'sdl_mixer: for audio')
 backup=('srv/dopewars/dopewars.sco')
 source=("https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
-        'dopewars.service')
+        'dopewars.service'
+        'dopewars.socket')
 sha256sums=('23059dcdea96c6072b148ee21d76237ef3535e5be90b3b2d8239d150feee0c19'
-            'b81fe5156d1a0f650f9005bd9c7f92cb531817c2f9adc0b48d36834aacd9101f')
+            '3e3e2e9a800a248e9fb6091ea98b99151df3f3498b53f7a08e11dcc5005c77e0'
+            '2bbe36f89dce8e9d018ab1abc90526fe96491311944821bb5e44950c903c73be')
 
 build() {
   cd "$pkgname-$pkgver"
@@ -30,21 +37,24 @@
 }
 
 package() {
+  msg2 'Packaging application...'
   make -C "$pkgname-$pkgver" \
     DESKTOPDIR="$pkgdir/usr/share/applications" \
     DESTDIR="$pkgdir" \
     install
 
-  # fix permissions
-  chmod 0755 "$pkgdir/usr/bin/dopewars"
+  msg2 'Packaging systemd service and socket files...'
+  install -Dm644 dopewars.service \
+    "$pkgdir/usr/lib/systemd/system/dopewars.service"
+  install -Dm644 dopewars.socket \
+    "$pkgdir/usr/lib/systemd/system/dopewars.socket"
+
+  msg2 'Setting file permissions...'
+  chown root:games "$pkgdir/usr/bin/dopewars"
+  chown -R root:games "$pkgdir/srv/dopewars"
+  chmod 2755 "$pkgdir/usr/bin/dopewars"
   chmod 0775 "$pkgdir/srv/dopewars"
   chmod 0664 "$pkgdir/srv/dopewars/dopewars.sco"
-  chown root:root "$pkgdir/usr/bin/dopewars"
-  chown root:root "$pkgdir/srv/dopewars"
-  chown root:root "$pkgdir/srv/dopewars/dopewars.sco"
-
-  install -Dm644 dopewars.service \
-    "$pkgdir/usr/lib/systemd/system/dopewars.service"
 }
 
 # vim: ts=2 sw=2 et:

Modified: dopewars.service
===================================================================
--- dopewars.service	2018-07-02 19:45:24 UTC (rev 350210)
+++ dopewars.service	2018-07-02 19:45:31 UTC (rev 350211)
@@ -1,7 +1,8 @@
 [Unit]
 Description=Dopewars Server
 Documentation=https://dopewars.sourceforge.io/docs/server.html
-After=network.target
+After=network.target dopewars.socket
+Requires=dopewars.socket
 Wants=network-online.target systemd-networkd-wait-online.service
 
 [Service]
@@ -10,24 +11,24 @@
 PIDFile=/run/dw/dw.pid
 RemainAfterExit=yes
 ExecStop=/usr/bin/pkill -F /run/dw/dw.pid
-User=dopewars
-Group=games
-DynamicUser=yes
-PrivateDevices=true
 KillMode=mixed
 KillSignal=SIGQUIT
 TimeoutStopSec=5s
-ProtectSystem=full
-ProtectHome=true
+Nice=4
+DynamicUser=yes
+User=dopewars
+Group=games
 ReadOnlyPaths=/usr/bin
 ReadWritePaths=/srv/dopewars
 LogsDirectory=dw
 RuntimeDirectory=dw
+PrivateDevices=true
+ProtectSystem=full
+ProtectHome=true
+NoNewPrivileges=true
+MemoryDenyWriteExecute=true
 CapabilityBoundingSet=CAP_NET_BIND_SERVICE
 AmbientCapabilities=CAP_NET_BIND_SERVICE
-NoNewPrivileges=true
-MemoryDenyWriteExecute=true
-Nice=5
 
 [Install]
 WantedBy=multi-user.target

Added: dopewars.socket
===================================================================
--- dopewars.socket	                        (rev 0)
+++ dopewars.socket	2018-07-02 19:45:31 UTC (rev 350211)
@@ -0,0 +1,9 @@
+[Unit]
+Description=Dopewars Server
+PartOf=dopewars.service
+
+[Socket]
+ListenStream=7902
+
+[Install]
+WantedBy=sockets.target