Compare commits

...
Sign in to create a new pull request.

22 commits

Author SHA1 Message Date
Python Maint
055c8480d3 Rebuilt for Python 3.14.0rc3 bytecode 2025-09-19 12:13:50 +02:00
Python Maint
4d11b0280b Rebuilt for Python 3.14.0rc2 bytecode 2025-08-15 12:44:27 +02:00
Fedora Release Engineering
0da26add79 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-23 19:19:59 +00:00
Python Maint
de52c7d141 Rebuilt for Python 3.14 2025-06-02 19:55:04 +02:00
Fedora Release Engineering
b7f1195d73 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-16 15:51:37 +00:00
Gwyn Ciesla
b0efecb1a2 Patch for Py_ssize_t 2024-10-21 10:38:04 -05:00
Fedora Release Engineering
10951a8c74 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-17 21:04:11 +00:00
Python Maint
20b6b3b33d Rebuilt for Python 3.13 2024-06-07 08:31:15 +02:00
Gwyn Ciesla
5d7d44bcb8 Disable LTO to fix distccmon-gnome crash, 2263992. 2024-02-13 14:30:31 -06:00
Fedora Release Engineering
b4f96ad004 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-24 09:31:31 +00:00
Fedora Release Engineering
0412dc267f Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-19 17:14:45 +00:00
Gwyn Ciesla
cc833f0fa8 3.4 2024-01-16 13:59:38 -06:00
Fedora Release Engineering
aef4c7fb6f Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-19 17:33:02 +00:00
Python Maint
16dc27af83 Rebuilt for Python 3.12 2023-06-13 20:20:24 +02:00
Gwyn Ciesla
5f8ed83495 migrated to SPDX license 2023-03-07 15:18:27 -06:00
Fedora Release Engineering
bb4535fa28 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-19 01:29:06 +00:00
Gwyn Ciesla
d6954a8e6f BR setuptools 2022-12-21 12:42:09 -06:00
Fedora Release Engineering
0cf08f2b7f Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-21 00:32:43 +00:00
Python Maint
13d2a4fe93 Rebuilt for Python 3.11 2022-06-13 14:49:22 +02:00
Fedora Release Engineering
75b9cee786 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-20 00:44:33 +00:00
Fedora Release Engineering
bafc9f14cc - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-21 20:51:17 +00:00
Python Maint
e8faa0691c Rebuilt for Python 3.10 2021-06-04 20:03:02 +02:00
5 changed files with 146 additions and 8 deletions

1
.gitignore vendored
View file

@ -5,3 +5,4 @@ distcc-2.18.3.tar.bz2
/distcc-3.3.2.tar.gz
/distcc-3.3.3.tar.gz
/distcc-3.3.5.tar.gz
/distcc-3.4.tar.gz

55
479.patch Normal file
View file

@ -0,0 +1,55 @@
From 83e030a852daf1d4d8c906e46f86375d421b781e Mon Sep 17 00:00:00 2001
From: hephooey <hephooey@users.noreply.github.com>
Date: Sun, 15 Jan 2023 15:43:50 -0500
Subject: [PATCH] Replace int with Py_ssize_t for distcc pump extension
Defining PY_SSIZE_T_CLEAN is required since python 3.10, and I have to
modify the type of length to match it. Otherwise functions like
OsPathExists will always return False.
The PY_SSIZE_T_CLEAN macro is supported at least back to python 3.5
according to docs.python.org, that is why I included it without any
python version conditions
---
.../c_extensions/distcc_pump_c_extensions_module.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/include_server/c_extensions/distcc_pump_c_extensions_module.c b/include_server/c_extensions/distcc_pump_c_extensions_module.c
index 763dd425..a4c6e9eb 100644
--- a/include_server/c_extensions/distcc_pump_c_extensions_module.c
+++ b/include_server/c_extensions/distcc_pump_c_extensions_module.c
@@ -21,6 +21,7 @@
/* distcc_pump_c_extensions_module.c -- Python bindings for distcc-pump
* extensions */
+#define PY_SSIZE_T_CLEAN
#include "Python.h"
static const char *version = ".01";
@@ -56,7 +57,7 @@ static PyObject *
CompressLzo1xAlloc(PyObject *dummy, PyObject *args) {
PyObject *string_object;
const char *in_buf;
- int in_len;
+ Py_ssize_t in_len;
char *out_buf;
size_t out_len;
UNUSED(dummy);
@@ -241,7 +242,7 @@ static /* const */ char OsPathExists_doc__[] =
static PyObject *
OsPathExists(PyObject *dummy, PyObject *args) {
const char *in;
- int len;
+ Py_ssize_t len;
int res;
struct stat buf;
@@ -275,7 +276,7 @@ static /* const */ char OsPathIsFile_doc__[] =
static PyObject *
OsPathIsFile(PyObject *dummy, PyObject *args) {
const char *in;
- int len;
+ Py_ssize_t len;
int res;
struct stat buf;

11
crash.patch Normal file
View file

@ -0,0 +1,11 @@
--- src/compile.c 2021-05-11 13:26:29.000000000 -0400
+++ src/compile.c 2024-01-15 16:45:00.558851171 -0500
@@ -584,7 +584,7 @@
return -ENOENT;
- newcmd_len = strlen(target_with_vendor) + 1 + strlen(argv[0] + 1);
+ newcmd_len = strlen(target_with_vendor) + 1 + strlen(argv[0]) + 1;
newcmd = malloc(newcmd_len);
if (!newcmd)
return -ENOMEM;

View file

@ -1,24 +1,27 @@
%define _hardened_build 1
%global _lto_cflags %nil
Name: distcc
Version: 3.3.5
Release: 5%{?dist}
Version: 3.4
Release: 12%{?dist}
Summary: Distributed C/C++ compilation
License: GPLv2+
License: GPL-2.0-or-later
URL: https://github.com/distcc/distcc
Source0: https://github.com/distcc/distcc/archive/v%{version}/%{name}-%{version}.tar.gz
Source1: hosts.sample
Source2: distccd.service
Patch0: distcc-localhost.patch
Patch1: crash.patch
Patch2: 479.patch
BuildRequires: automake
BuildRequires: autoconf
BuildRequires: which
BuildRequires: libtool
BuildRequires: popt-devel
BuildRequires: gtk2-devel
BuildRequires: gtk3-devel
BuildRequires: pango-devel
BuildRequires: python3-devel
Buildrequires: python3-setuptools
BuildRequires: desktop-file-utils
BuildRequires: avahi-devel
BuildRequires: krb5-devel
@ -43,7 +46,7 @@ This package contains the Gnome frontend of the distcc monitoring tool.
%package server
Summary: Server for distributed C/C++ compilation
License: GPLv2+
License: GPL-2.0-or-later
Requires: %{name}%{?_isa} = %{version}-%{release}
%{?systemd_requires}
@ -54,7 +57,9 @@ This package contains the compilation server needed to use %{name}.
%prep
%setup -q
%patch0 -p0
%patch -P 0 -p0
%patch -P 1 -p0
%patch -P 2 -p1
%build
export PYTHON='/usr/bin/python3'
@ -138,6 +143,72 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/*
%dir /usr/lib/gcc-cross
%changelog
* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 3.4-12
- Rebuilt for Python 3.14.0rc3 bytecode
* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 3.4-11
- Rebuilt for Python 3.14.0rc2 bytecode
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.4-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Mon Jun 02 2025 Python Maint <python-maint@redhat.com> - 3.4-9
- Rebuilt for Python 3.14
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.4-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Mon Oct 21 2024 Gwyn Ciesla <gwync@protonmail.com> - 3.4-7
- Patch for Py_ssize_t
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.4-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 3.4-5
- Rebuilt for Python 3.13
* Tue Feb 13 2024 Gwyn Ciesla <gwync@protonmail.com> - 3.4-4
- Disable LTO to fix distccmon-gnome crash, 2263992.
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 05 2024 Gwyn Ciesla <gwync@protonmail.com> - 3.4-1
- 3.4
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.5-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 3.3.5-14
- Rebuilt for Python 3.12
* Tue Mar 07 2023 Gwyn Ciesla <gwync@protonmail.com> - 3.3.5-13
- migrated to SPDX license
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.5-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Wed Dec 21 2022 Gwyn Ciesla <gwync@protonmail.com> - 3.3.5-11
- BR setuptools.
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.5-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 3.3.5-9
- Rebuilt for Python 3.11
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.5-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.5-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 3.3.5-6
- Rebuilt for Python 3.10
* Wed Mar 24 2021 Gwyn Ciesla <gwync@protonmail.com> - 3.3.5-5
- Fix desktop file icon path.

View file

@ -1 +1 @@
SHA512 (distcc-3.3.5.tar.gz) = 7db03fef5c3d1d829a95da36e8ccb6aa618cf27f9304f5755b23ff5b0a838e4646ce258e782d1a0f41bef8421caa031f18f2f07d7334ec8a908d43e8dd523b61
SHA512 (distcc-3.4.tar.gz) = aa6018326da8aa73b40479471c0c26d752ea17b46b40caa55662885e4d67a920eb2e33f0cceec9d1738050a069660a4be1175448c0ad9762c7ea9527f556a02b