From 3c72be6a7d8fb1e4160a524b0e35d7d960a36ae9 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sat, 5 Oct 2024 14:13:59 +0000 Subject: [PATCH] extra/distcc to 3.4-11 --- extra/distcc/.SRCINFO | 6 +++--- extra/distcc/.nvchecker.toml | 4 ++++ extra/distcc/PKGBUILD | 10 +++++++--- 3 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 extra/distcc/.nvchecker.toml diff --git a/extra/distcc/.SRCINFO b/extra/distcc/.SRCINFO index 976ab3e0a..471db9390 100644 --- a/extra/distcc/.SRCINFO +++ b/extra/distcc/.SRCINFO @@ -1,10 +1,10 @@ pkgbase = distcc pkgdesc = Distributed compilation service for C, C++ and Objective-C pkgver = 3.4 - pkgrel = 10 + pkgrel = 11 url = https://github.com/distcc/distcc arch = x86_64 - license = GPL + license = GPL-2.0-only makedepends = git makedepends = gtk3 makedepends = python-setuptools @@ -20,7 +20,7 @@ pkgbase = distcc source = sysusers.conf source = meson_triple.patch::https://github.com/distcc/distcc/pull/427/commits/850db9eec0d5dd7f47ade8ffca91b679081f6d85.patch validpgpkeys = 30782E2BE4EB9FD5B293D3DA6D100BF096B8A005 - b2sums = SKIP + b2sums = 8843f1d2ad3cb8d761644ffd19fa2868843c2f0c6b3dc5471c88ed34de0425b78193a3f01539c5c581eaf7c947a39e87f2bace80571cc54e7e0201ad5004e3cc b2sums = c48a6daea2cae5e5865c488e612c819e6f9bf4a1b205e2cd264b795de3450d40b0fe05264fbd8a3fe861f03e38d91e7e791ad67e22da5b5d0b43bcb380b8b4c9 b2sums = 9b6ffc02e9360fd92f7595e96ef2d69b5f6d72acf343009375fa081f86b26f51960b139c4f6e0e3c8befa37eba4894d61351bbfab6386389c262db0cc01a8b8e b2sums = d1b057ce49994ac61e9d5a861c1c770452102300d47a9c396b3272d7f5afbd3fe3e865e6db11c046e73ae3b6886bc8970a10624650731d55132362436904f989 diff --git a/extra/distcc/.nvchecker.toml b/extra/distcc/.nvchecker.toml new file mode 100644 index 000000000..a5ef3ca52 --- /dev/null +++ b/extra/distcc/.nvchecker.toml @@ -0,0 +1,4 @@ +[distcc] +source = "git" +git = "https://github.com/distcc/distcc.git" +prefix = "v" diff --git a/extra/distcc/PKGBUILD b/extra/distcc/PKGBUILD index 3ca1e6da2..d9b6a5829 100644 --- a/extra/distcc/PKGBUILD +++ b/extra/distcc/PKGBUILD @@ -4,6 +4,7 @@ # Contributor: Judd Vinet # Contributor: Giovanni Scafora # Contributor: Reza Jahanbakhshi +# Contributor: Vladislav Nepogodin # ALARM: Kevin Mihelich # - added --without-avahi to configure @@ -12,11 +13,11 @@ pkgname=distcc pkgver=3.4 -pkgrel=10 +pkgrel=11 pkgdesc='Distributed compilation service for C, C++ and Objective-C' arch=(x86_64) url='https://github.com/distcc/distcc' -license=(GPL) +license=(GPL-2.0-only) depends=(popt) makedepends=(git gtk3 python-setuptools) optdepends=("python: for python bindings" @@ -29,7 +30,7 @@ source=("git+$url?signed#tag=v$pkgver" sysusers.conf meson_triple.patch::https://github.com/distcc/distcc/pull/427/commits/850db9eec0d5dd7f47ade8ffca91b679081f6d85.patch allow-zero-timeout.patch) -b2sums=('SKIP' +b2sums=('8843f1d2ad3cb8d761644ffd19fa2868843c2f0c6b3dc5471c88ed34de0425b78193a3f01539c5c581eaf7c947a39e87f2bace80571cc54e7e0201ad5004e3cc' 'c48a6daea2cae5e5865c488e612c819e6f9bf4a1b205e2cd264b795de3450d40b0fe05264fbd8a3fe861f03e38d91e7e791ad67e22da5b5d0b43bcb380b8b4c9' '9b6ffc02e9360fd92f7595e96ef2d69b5f6d72acf343009375fa081f86b26f51960b139c4f6e0e3c8befa37eba4894d61351bbfab6386389c262db0cc01a8b8e' 'd1b057ce49994ac61e9d5a861c1c770452102300d47a9c396b3272d7f5afbd3fe3e865e6db11c046e73ae3b6886bc8970a10624650731d55132362436904f989' @@ -55,6 +56,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}" + ./configure \ --enable-rfc2553 \ --mandir=/usr/share/man \