summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgraysky2020-08-20 13:24:40 -0400
committergraysky2020-08-20 13:26:26 -0400
commit9193fb5d5806fa5779647bea2a5be5c734e38bf4 (patch)
tree48bafbe2af7ceebc31492fdeb724f6a44bce690c
parentb2c03293a56cf7aa42ccc23f4e51e05f26971609 (diff)
downloadaur-9193fb5d5806fa5779647bea2a5be5c734e38bf4.tar.gz
Update to 9.3.0.20200428-1
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD12
-rw-r--r--service.in2
-rw-r--r--sysusers.conf2
4 files changed, 15 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5577d290c23..90ff06eff1a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = distccd-alarm
pkgdesc = Official toolchain for Arch ARM builds via distcc on x86_64 volunteers
pkgver = 9.3.0.20200428
- pkgrel = 1
+ pkgrel = 2
url = https://archlinuxarm.org/wiki/Distcc_Cross-Compiling
arch = x86_64
license = GPL
@@ -20,13 +20,15 @@ pkgbase = distccd-alarm
source = config.in
source = service.in
source = readme.in
+ source = sysusers.conf
md5sums = 2e17110e55bd82abbbcb58afc5f0a165
md5sums = 834338535921e0208f03bd23b49097b6
md5sums = 67002d06aab2258f5043497087b33555
md5sums = a197dedc3134a2e7c7221494ba4ebeff
md5sums = 89694ceb3a0fb07413ffef810173ee55
- md5sums = 7e664f8ce386f467f1a7381c9ac3c06f
+ md5sums = 26741c886597e3fd8d8fc0a61aa8a49a
md5sums = da6ee5bb971d28b85e49d456a3889349
+ md5sums = cc2464a203444bb9287849d6773e544c
pkgname = distccd-alarm-armv5
diff --git a/PKGBUILD b/PKGBUILD
index 288ad8598ce..7ab3b34bbc3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=("${_subarchs[@]/#/$pkgbase-}")
_date=20200428
# inspect source tarball under $name/share/gcc-x.y.z
pkgver=9.3.0.$_date
-pkgrel=1
+pkgrel=2
_pkgrel_upstream=1
#_URL="https://archlinuxarm.org/builder/xtools/$pkgver-$pkgrel"
_URL="https://archlinuxarm.org/builder/xtools"
@@ -23,7 +23,7 @@ source=(
"x-tools6h-$_date.tar.xz::$_URL/x-tools6h.tar.xz"
"x-tools7h-$_date.tar.xz::$_URL/x-tools7h.tar.xz"
"x-tools8-$_date.tar.xz::$_URL/x-tools8.tar.xz"
-'config.in' 'service.in' 'readme.in'
+'config.in' 'service.in' 'readme.in' 'sysusers.conf'
)
noextract=(
"x-tools-$_date.tar.xz"
@@ -37,8 +37,9 @@ md5sums=('2e17110e55bd82abbbcb58afc5f0a165'
'67002d06aab2258f5043497087b33555'
'a197dedc3134a2e7c7221494ba4ebeff'
'89694ceb3a0fb07413ffef810173ee55'
- '7e664f8ce386f467f1a7381c9ac3c06f'
- 'da6ee5bb971d28b85e49d456a3889349')
+ '26741c886597e3fd8d8fc0a61aa8a49a'
+ 'da6ee5bb971d28b85e49d456a3889349'
+ 'cc2464a203444bb9287849d6773e544c')
build() {
# setup config and services
@@ -85,6 +86,9 @@ _package_subarch() {
install -d "${pkgdir}/opt"
bsdtar -x --uid 0 --gid 0 -f "${srcdir}/$2-$_date.tar.xz" -C "${pkgdir}/opt"
+ # FS#67629
+ install -Dm644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/distccd.conf"
+
# install services
install -Dm644 "${srcdir}/distccd-$1.service" \
"${pkgdir}/usr/lib/systemd/system/distccd-$1.service"
diff --git a/service.in b/service.in
index 5507cf3ef8d..14c02277c84 100644
--- a/service.in
+++ b/service.in
@@ -4,7 +4,7 @@ Documentation=man:distccd(1)
After=network.target
[Service]
-User=nobody
+User=distcc
EnvironmentFile=/etc/conf.d/distccd-@VERS@
ExecStart=/usr/bin/distccd --no-detach --daemon $DISTCC_ARGS
diff --git a/sysusers.conf b/sysusers.conf
new file mode 100644
index 00000000000..c026a443481
--- /dev/null
+++ b/sysusers.conf
@@ -0,0 +1,2 @@
+g distcc - -
+u distcc - "distcc user" /usr/bin/nologin