summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgraysky2020-09-08 14:05:28 -0400
committergraysky2020-09-08 14:05:28 -0400
commit4303710bef8ed273a739af9cfa29639e58b10830 (patch)
tree566503da91788db6f95aa495a3c68cfdfd3d186c
parent83811b3e60a509f3bb010dc566469fb212695655 (diff)
downloadaur-4303710bef8ed273a739af9cfa29639e58b10830.tar.gz
Update to 10.2.0.20200812-4
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD11
-rw-r--r--sysusers.conf2
3 files changed, 5 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 065129db3de..78b95c877cd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = distccd-x86_64
pkgdesc = Toolchain for x86_64 builds on Arch ARM volunteers via distcc
pkgver = 10.2.0.20200812
- pkgrel = 3
+ pkgrel = 4
url = https://github.com/graysky2/crosstool-ng_for_distcc
install = readme.install
arch = armv7h
@@ -16,11 +16,9 @@ pkgbase = distccd-x86_64
backup = etc/conf.d/distccd-x86_64
source = distccd-x86_64.service
source = distccd-x86_64.config
- source = sysusers.conf
validpgpkeys = 4E22BB637E26407D5DEE550988A032865EE46C4C
b2sums = dfbc894ed5ea69e2a2c066a5afde8d28b9f71082b7fa0401887c0ef9612d6d6f45a51f73a523963819de074ff00cdc6ef23bbc2623d84c0e5b9c3d7cc5a360e1
b2sums = 964d1f584c0d26a6a720edabcf0f7293949cf247d1ebecb87534cfb90e84493c6f2e97f23bd55090d774f8d136fdf33bc571d0927bb54893895bdf55e2f0a958
- b2sums = d1b057ce49994ac61e9d5a861c1c770452102300d47a9c396b3272d7f5afbd3fe3e865e6db11c046e73ae3b6886bc8970a10624650731d55132362436904f989
source_armv7h = http://repo-ck.com/PKG_source/x-tools86-armv7h-20200812.tar.zst
source_armv7h = http://repo-ck.com/PKG_source/x-tools86-armv7h-20200812.tar.zst.sig
b2sums_armv7h = 298a5ed0f1007073f056ae157d53376f7c850ffecd541735883de6c1cef6e777a75d1b43704dad0330e40fdf48e47a574a5180d5bd047b331fc818ff162e5ba8
diff --git a/PKGBUILD b/PKGBUILD
index 426c558534c..a2d53e03b48 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ arch=(armv7h aarch64)
_date=20200812
# inspect source tarball under $name/share/gcc-x.y.z
pkgver=10.2.0.$_date
-pkgrel=3
+pkgrel=4
license=('GPL' )
url="https://github.com/graysky2/crosstool-ng_for_distcc"
pkgdesc="Toolchain for x86_64 builds on Arch ARM volunteers via distcc"
@@ -13,8 +13,7 @@ depends=('distcc')
options=('libtool' 'emptydirs' '!strip')
source_armv7h=("http://repo-ck.com/PKG_source/x-tools86-armv7h-$_date.tar.zst"{,.sig})
source_aarch64=("http://repo-ck.com/PKG_source/x-tools86-aarch64-$_date.tar.zst"{,.sig})
-source=(distccd-x86_64.{service,config}
- sysusers.conf)
+source=(distccd-x86_64.{service,config})
noextract=("x-tools86-armv7h-$_date.tar.zst"
"x-tools86-aarch64-$_date.tar.zst")
backup=(etc/conf.d/distccd-x86_64)
@@ -23,8 +22,7 @@ validpgpkeys=(
'4E22BB637E26407D5DEE550988A032865EE46C4C' # graysky
)
b2sums=('dfbc894ed5ea69e2a2c066a5afde8d28b9f71082b7fa0401887c0ef9612d6d6f45a51f73a523963819de074ff00cdc6ef23bbc2623d84c0e5b9c3d7cc5a360e1'
- '964d1f584c0d26a6a720edabcf0f7293949cf247d1ebecb87534cfb90e84493c6f2e97f23bd55090d774f8d136fdf33bc571d0927bb54893895bdf55e2f0a958'
- 'd1b057ce49994ac61e9d5a861c1c770452102300d47a9c396b3272d7f5afbd3fe3e865e6db11c046e73ae3b6886bc8970a10624650731d55132362436904f989')
+ '964d1f584c0d26a6a720edabcf0f7293949cf247d1ebecb87534cfb90e84493c6f2e97f23bd55090d774f8d136fdf33bc571d0927bb54893895bdf55e2f0a958')
b2sums_armv7h=('298a5ed0f1007073f056ae157d53376f7c850ffecd541735883de6c1cef6e777a75d1b43704dad0330e40fdf48e47a574a5180d5bd047b331fc818ff162e5ba8'
'SKIP')
b2sums_aarch64=('6233bbf5cbe14012f18f60a91f65b9095b6398d8c14176a534d22eddfdfb5e889845ef5a321044cbb77ffef6197cbaf2876db24e67b31d53aae5b6d9d1d2f354'
@@ -45,8 +43,7 @@ package() {
ln -sf /usr/bin/distcc "${pkgdir}/usr/lib/distcc/x86_64-pc-linux-gnu-$bin"
done
- # FS#67629
- install -Dm644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/distccd-x86_64.conf"
+ # FS#67629 - since distcc is a dependency there is no need to provide a sysuser.d config
# install service and config
install -Dm644 "${srcdir}/distccd-x86_64.service" \
diff --git a/sysusers.conf b/sysusers.conf
deleted file mode 100644
index c026a443481..00000000000
--- a/sysusers.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-g distcc - -
-u distcc - "distcc user" /usr/bin/nologin