diff --git a/distcc/.SRCINFO b/distcc/.SRCINFO index 5c294f33f5..81db9d0927 100644 --- a/distcc/.SRCINFO +++ b/distcc/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = distcc pkgdesc = Distributed compilation service for C, C++ and Objective-C pkgver = 3.4 - pkgrel = 12 + pkgrel = 13 url = https://github.com/distcc/distcc arch = x86_64 arch = powerpc64le @@ -27,7 +27,7 @@ pkgbase = distcc b2sums = 8843f1d2ad3cb8d761644ffd19fa2868843c2f0c6b3dc5471c88ed34de0425b78193a3f01539c5c581eaf7c947a39e87f2bace80571cc54e7e0201ad5004e3cc b2sums = c48a6daea2cae5e5865c488e612c819e6f9bf4a1b205e2cd264b795de3450d40b0fe05264fbd8a3fe861f03e38d91e7e791ad67e22da5b5d0b43bcb380b8b4c9 b2sums = 9b6ffc02e9360fd92f7595e96ef2d69b5f6d72acf343009375fa081f86b26f51960b139c4f6e0e3c8befa37eba4894d61351bbfab6386389c262db0cc01a8b8e - b2sums = d1b057ce49994ac61e9d5a861c1c770452102300d47a9c396b3272d7f5afbd3fe3e865e6db11c046e73ae3b6886bc8970a10624650731d55132362436904f989 + b2sums = 777cc755c6699aa6d3e1c78ec37f8922c5088309e5e7cba14f75311460bc6c6728bde76b889c5503b29c0418a539f1182ca0de3062d6bf16b61ed3e698cb4c28 b2sums = 9e2fcd16070837f45852f4f8be6fc1a53d2f4c70a4058260d97ebde7d6bc58a6557d90a71b69a6a17d53e68c2b4d55b94afaf10b34610cac9ecf925298a02799 pkgname = distcc diff --git a/distcc/.nvchecker.toml b/distcc/.nvchecker.toml new file mode 100644 index 0000000000..a5ef3ca52b --- /dev/null +++ b/distcc/.nvchecker.toml @@ -0,0 +1,4 @@ +[distcc] +source = "git" +git = "https://github.com/distcc/distcc.git" +prefix = "v" diff --git a/distcc/PKGBUILD b/distcc/PKGBUILD index 57cc74a9b3..834994d1ff 100644 --- a/distcc/PKGBUILD +++ b/distcc/PKGBUILD @@ -5,10 +5,11 @@ # Contributor: Judd Vinet # Contributor: Giovanni Scafora # Contributor: Reza Jahanbakhshi +# Contributor: Vladislav Nepogodin pkgname=distcc pkgver=3.4 -pkgrel=12 +pkgrel=13 pkgdesc='Distributed compilation service for C, C++ and Objective-C' arch=(x86_64 powerpc64le powerpc64 powerpc riscv64) url='https://github.com/distcc/distcc' @@ -26,7 +27,7 @@ source=("git+$url?signed#tag=v$pkgver" b2sums=('8843f1d2ad3cb8d761644ffd19fa2868843c2f0c6b3dc5471c88ed34de0425b78193a3f01539c5c581eaf7c947a39e87f2bace80571cc54e7e0201ad5004e3cc' 'c48a6daea2cae5e5865c488e612c819e6f9bf4a1b205e2cd264b795de3450d40b0fe05264fbd8a3fe861f03e38d91e7e791ad67e22da5b5d0b43bcb380b8b4c9' '9b6ffc02e9360fd92f7595e96ef2d69b5f6d72acf343009375fa081f86b26f51960b139c4f6e0e3c8befa37eba4894d61351bbfab6386389c262db0cc01a8b8e' - 'd1b057ce49994ac61e9d5a861c1c770452102300d47a9c396b3272d7f5afbd3fe3e865e6db11c046e73ae3b6886bc8970a10624650731d55132362436904f989' + '777cc755c6699aa6d3e1c78ec37f8922c5088309e5e7cba14f75311460bc6c6728bde76b889c5503b29c0418a539f1182ca0de3062d6bf16b61ed3e698cb4c28' '9e2fcd16070837f45852f4f8be6fc1a53d2f4c70a4058260d97ebde7d6bc58a6557d90a71b69a6a17d53e68c2b4d55b94afaf10b34610cac9ecf925298a02799') validpgpkeys=(30782E2BE4EB9FD5B293D3DA6D100BF096B8A005) # Shawn Landden @@ -46,6 +47,9 @@ build() { # ref https://github.com/distcc/distcc/issues/454#issuecomment-1087865811 export CFLAGS+=' -DPY_SSIZE_T_CLEAN -fcommon' + # causes buffer overflow check to occur + export CFLAGS="${CFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}" + # ref FS#78400 export NATIVE_COMPILER_TRIPLE=x86_64-pc-linux-gnu-gcc @@ -71,8 +75,8 @@ package() { "$pkgdir/usr/lib/systemd/system/distccd.service" # Package symlinks - _targets=(c++ c89 c99 cc clang clang++ cpp g++ gcc ${CHOST}-g++ - ${CHOST}-gcc ${CHOST}-gcc-$(gcc -dumpversion)) + _targets=(c++ c89 c99 cc clang clang++ cpp g++ gcc $CARCH-pc-linux-gnu-g++ + $CARCH-pc-linux-gnu-gcc $CARCH-pc-linux-gnu-gcc-$(gcc -dumpversion)) install -d "$pkgdir/usr/lib/$pkgname/bin" for bin in "${_targets[@]}"; do # For whitelist since version 3.3, ref FS#57978 diff --git a/distcc/sysusers.conf b/distcc/sysusers.conf index c026a44348..e424ee5815 100644 --- a/distcc/sysusers.conf +++ b/distcc/sysusers.conf @@ -1,2 +1,2 @@ g distcc - - -u distcc - "distcc user" /usr/bin/nologin +u! distcc - "distcc user" /usr/bin/nologin