Re: [PR PATCH] [Updated] distcc updates

[JamiKettunen <JamiKettunen@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1221 bytes --]

There is an updated pull request by JamiKettunen against master on the void-packages repository

https://github.com/JamiKettunen/void-packages distcc-updates
https://github.com/void-linux/void-packages/pull/36180

distcc updates
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36180.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-distcc-updates-36180.patch --]
[-- Type: text/x-diff, Size: 4142 bytes --]

From 7ed99f296ec77bc25304f5e6c3369499ab3b2d7b Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 17 Mar 2022 00:36:42 +0200
Subject: [PATCH 1/3] chroot-distcc: update to 3.4.

---
 srcpkgs/chroot-distcc/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/chroot-distcc/template b/srcpkgs/chroot-distcc/template
index bb4e61983990..9087f60857a8 100644
--- a/srcpkgs/chroot-distcc/template
+++ b/srcpkgs/chroot-distcc/template
@@ -1,6 +1,6 @@
 # Template file for 'chroot-distcc'
 pkgname=chroot-distcc
-version=3.3.3
+version=3.4
 revision=1
 wrksrc="distcc-${version}"
 bootstrap=yes
@@ -13,9 +13,9 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://distcc.github.io"
 distfiles="https://github.com/distcc/distcc/releases/download/v${version}/distcc-${version}.tar.gz"
-checksum=bead25471d5a53ecfdf8f065a6fe48901c14d5008956c318c700e56bc87bf0bc
-
+checksum=2b99edda9dad9dbf283933a02eace6de7423fe5650daa4a728c950e5cd37bd7d
 conflicts="distcc>=0"
+
 CFLAGS="-fcommon"
 
 if [ "$CHROOT_READY" ]; then

From b1fb4e5f2e5394c9ce8846f9eaa6363141d74afd Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 17 Mar 2022 00:37:28 +0200
Subject: [PATCH 2/3] distcc: update to 3.4.

---
 srcpkgs/distcc/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/distcc/template b/srcpkgs/distcc/template
index 7a6c2483b575..5a8ad35b9d78 100644
--- a/srcpkgs/distcc/template
+++ b/srcpkgs/distcc/template
@@ -1,20 +1,20 @@
 # Template file for 'distcc'
 pkgname=distcc
-version=3.3.3
-revision=6
+version=3.4
+revision=1
 build_style=gnu-configure
 configure_args="--disable-Werror --with-gtk"
 conf_files="
 	/etc/distcc/hosts
 	/etc/distcc/clients.allow"
 hostmakedepends="automake libtool pkg-config which"
-makedepends="binutils-devel popt-devel avahi-libs-devel gtk+-devel"
+makedepends="binutils-devel popt-devel avahi-libs-devel gtk+3-devel"
 short_desc="Distributed compilation for faster C/C++ builds"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://distcc.github.io"
-distfiles="https://github.com/distcc/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=bead25471d5a53ecfdf8f065a6fe48901c14d5008956c318c700e56bc87bf0bc
+distfiles="https://github.com/distcc/distcc/releases/download/v${version}/distcc-${version}.tar.gz"
+checksum=2b99edda9dad9dbf283933a02eace6de7423fe5650daa4a728c950e5cd37bd7d
 conflicts="chroot-distcc>=0"
 
 subpackages="distcc-gtk"

From 75bb09ade1a3e561c76d9fe9f2ca56562b795b76 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 17 Mar 2022 00:37:36 +0200
Subject: [PATCH 3/3] distcc: modernize distccd runit service

The arguments to distccd can now be customized via a conf file as one
would expect.

The default loglevel of notice dumps all compile cmdlines into syslog
which I think is too verbose -> decrease it to warnings by default.
---
 srcpkgs/distcc/files/distccd/run | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/distcc/files/distccd/run b/srcpkgs/distcc/files/distccd/run
index 58c2676387ac..48e54d4c46ac 100755
--- a/srcpkgs/distcc/files/distccd/run
+++ b/srcpkgs/distcc/files/distccd/run
@@ -1,16 +1,13 @@
 #!/bin/sh
-PROG="distccd"
-USER="nobody"
-OPTIONS="--no-detach"
-OPTIONS="$OPTIONS --daemon"
-OPTIONS="$OPTIONS --user $USER"
+[ -r conf ] && . ./conf
+: ${USER:=nobody}
 ALLOW_FILE=/etc/distcc/clients.allow
 if [ -f "$ALLOW_FILE" ]; then
-        ALLOW_OPTIONS=$(sed -e 's/#.*$//' -e '/^\s*$/d' -e 's/^/--allow /' < $ALLOW_FILE)
+        ALLOW_OPTS=$(sed -e 's/#.*$//' -e '/^\s*$/d' -e 's/^/--allow /' < $ALLOW_FILE)
 fi
-if [ -z "$ALLOW_OPTIONS" ]; then
+if [ -z "$ALLOW_OPTS" ]; then
         # Default to allow localhost
-        ALLOW_OPTIONS="--allow 127.0.0.1"
+        ALLOW_OPTS="--allow 127.0.0.1"
 fi
-OPTIONS="$OPTIONS $ALLOW_OPTIONS"
-exec $PROG $OPTIONS
+OPTS="$OPTS $ALLOW_OPTS"
+exec distccd --daemon --no-detach --user $USER $OPTS