[arch-commits] Commit in distcc/trunk (PKGBUILD distccd.service sysusers.conf)

Alexander Rødseth arodseth at archlinux.org
Mon Sep 7 19:20:06 UTC 2020


    Date: Monday, September 7, 2020 @ 19:20:06
  Author: arodseth
Revision: 700200

upgpkg: distcc 3.3.3-6

Added:
  distcc/trunk/sysusers.conf
Modified:
  distcc/trunk/PKGBUILD
  distcc/trunk/distccd.service

-----------------+
 PKGBUILD        |   23 +++++++++++++++--------
 distccd.service |    4 ++--
 sysusers.conf   |    2 ++
 3 files changed, 19 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-07 19:18:10 UTC (rev 700199)
+++ PKGBUILD	2020-09-07 19:20:06 UTC (rev 700200)
@@ -1,12 +1,12 @@
 # Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
+# Contributor: John <graysky at archlinux.us>
 # Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
 # Contributor: Judd Vinet <jvinet at zeroflux.org>
 # Contributor: Giovanni Scafora <giovanni at archlinux.org>
-# Contributor: John <graysky at archlinux.us>
 
 pkgname=distcc
 pkgver=3.3.3
-pkgrel=5
+pkgrel=6
 pkgdesc='Distributed compilation service for C, C++ and Objective-C'
 arch=(x86_64)
 url='https://github.com/distcc/distcc'
@@ -14,14 +14,17 @@
 depends=(avahi popt python)
 makedepends=(git gtk2 setconf)
 optdepends=('gtk2: for distccmon-gnome')
-backup=('etc/conf.d/distccd'
-        'etc/distcc/hosts')
+backup=(etc/conf.d/distccd
+        etc/distcc/hosts)
 source=("git+$url#commit=4cde9bcfbda589abd842e3bbc652ce369085eaae" # tag: v3.3.3
-        'distccd.conf.d'
-        'distccd.service')
+        distccd.conf.d
+        distccd.service
+        sysusers.conf)
 sha256sums=('SKIP'
             '43e02b461841ca2976816c244a0eca8b24820ca143f73cc0924403d75a8c012f'
-            '6d46844f0bebd56541e1a233f9f02a51cc17885120e832bfb37711217403d32f')
+            '360493245590d8c1480ff93cd30c9e81cb86efebacd78e45f37e7d6cdbcc2136'
+            '4e037a6225f498b51d6902d117be979454ac78ec5fd2f65f1d5a38e10859612a')
+
 prepare() {
   cd "$pkgname"
 
@@ -36,10 +39,11 @@
 build() {
   cd "$pkgname"
 
+  export CFLAGS+=' -fcommon'
   ./configure \
-    --prefix=/usr \
     --enable-rfc2553 \
     --mandir=/usr/share/man \
+    --prefix=/usr \
     --sbindir=/usr/bin \
     --sysconfdir=/etc \
     --with-gtk
@@ -73,6 +77,9 @@
     # Needed for makepkg to work
     ln -sf "../../../bin/$pkgname" "$pkgdir/usr/lib/$pkgname/bin/$bin"
   done
+
+  # FS#67629
+  install -Dm644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/distccd.conf"
 }
 
 # getver: distcc.org

Modified: distccd.service
===================================================================
--- distccd.service	2020-09-07 19:18:10 UTC (rev 700199)
+++ distccd.service	2020-09-07 19:20:06 UTC (rev 700200)
@@ -1,10 +1,10 @@
 [Unit]
-Description=Distributed compilation server for C, C++ and Objective-C
+Description=Distributed C, C++ and Objective-C compiler
 Documentation=man:distccd(1)
 After=network.target
 
 [Service]
-User=nobody
+User=distcc
 EnvironmentFile=/etc/conf.d/distccd
 ExecStart=/usr/bin/distccd --no-detach --daemon $DISTCC_ARGS
 

Added: sysusers.conf
===================================================================
--- sysusers.conf	                        (rev 0)
+++ sysusers.conf	2020-09-07 19:20:06 UTC (rev 700200)
@@ -0,0 +1,2 @@
+g distcc - -
+u distcc - "distcc user" /usr/bin/nologin


More information about the arch-commits mailing list