diff --git a/.gitignore b/.gitignore index 7827728..e69de29 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +0,0 @@ -distcc-2.18.3.tar.bz2 -/distcc-3.1.tar.bz2 -/distcc-3.2rc1.tar.bz2 -/distcc-3.2rc1.tar.gz -/distcc-3.3.2.tar.gz -/distcc-3.3.3.tar.gz -/distcc-3.3.5.tar.gz -/distcc-3.4.tar.gz diff --git a/479.patch b/479.patch deleted file mode 100644 index 0f55826..0000000 --- a/479.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 83e030a852daf1d4d8c906e46f86375d421b781e Mon Sep 17 00:00:00 2001 -From: hephooey -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; diff --git a/crash.patch b/crash.patch deleted file mode 100644 index 5fb26e1..0000000 --- a/crash.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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; diff --git a/distcc-localhost.patch b/distcc-localhost.patch deleted file mode 100644 index c1b3c12..0000000 --- a/distcc-localhost.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- contrib/redhat/sysconfig~ 2011-10-26 07:42:02.000000000 -0500 -+++ contrib/redhat/sysconfig 2019-02-21 08:55:03.921586180 -0600 -@@ -1,7 +1,7 @@ - ### See distcc(1) manual page for more information on these options. - ### - --#OPTIONS="--nice 5 --jobs 5 --allow 10.0.0.0/24 --port 1234" -+OPTIONS="--nice 5 --jobs 5 --allow 127.0.0.0/8 --port 1234" - #USER="distcc" - - ### Set this if don't want distccd to use gcc or g++ by accident. diff --git a/distcc.spec b/distcc.spec deleted file mode 100644 index 113b0ed..0000000 --- a/distcc.spec +++ /dev/null @@ -1,374 +0,0 @@ -%global _lto_cflags %nil - -Name: distcc -Version: 3.4 -Release: 12%{?dist} -Summary: Distributed C/C++ compilation -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: gtk3-devel -BuildRequires: pango-devel -BuildRequires: python3-devel -Buildrequires: python3-setuptools -BuildRequires: desktop-file-utils -BuildRequires: avahi-devel -BuildRequires: krb5-devel -BuildRequires: binutils-devel -BuildRequires: systemd-rpm-macros -BuildRequires: make - -%description -distcc is a program to distribute compilation of C or C++ code across -several machines on a network. distcc should always generate the same -results as a local compile, is simple to install and use, and is often -two or more times faster than a local compile. - - -%package gnome -Summary: Gnome frontend of distcc monitoring tool -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description gnome -This package contains the Gnome frontend of the distcc monitoring tool. - - -%package server -Summary: Server for distributed C/C++ compilation -License: GPL-2.0-or-later - -Requires: %{name}%{?_isa} = %{version}-%{release} -%{?systemd_requires} - -%description server -This package contains the compilation server needed to use %{name}. - - -%prep -%setup -q -%patch -P 0 -p0 -%patch -P 1 -p0 -%patch -P 2 -p1 - -%build -export PYTHON='/usr/bin/python3' -./autogen.sh -export CFLAGS="%{optflags} -fcommon" -%configure --with-gtk --disable-Werror --with-auth -%make_build - - -%install -%make_install - -desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop - -# Install sample hosts file -install -Dm 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/hosts - -# Install sample distccd config file -install -Dm 0644 contrib/redhat/sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/distccd - -# Install distcdd unit file -mkdir -p $RPM_BUILD_ROOT%{_unitdir} -install -Dm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/distccd.service - -# Install distcc dirs -mkdir -p $RPM_BUILD_ROOT/usr/lib/distcc -mkdir -p $RPM_BUILD_ROOT/usr/lib/gcc-cross -if [ ! -d $RPM_BUILD_ROOT/usr/lib64 ]; then - mkdir -p $RPM_BUILD_ROOT/usr/lib64 -fi -ln -s /usr/lib/distcc $RPM_BUILD_ROOT/usr/lib64/distcc - -rm -rf $RPM_BUILD_ROOT%{_docdir}/* - -%post server -%systemd_post distccd.service -%{_sbindir}/update-distcc-symlinks > /dev/null 2>&1 - -%preun server -%systemd_preun distccd.service - -%postun server -%systemd_postun_with_restart distccd.service - -%files -%license COPYING -%doc AUTHORS doc/* NEWS README.pump TODO -%doc INSTALL README survey.txt -%{_bindir}/distcc -%{_bindir}/distccmon-text -%{_bindir}/lsdistcc -%{_bindir}/pump -%{_mandir}/man1/distcc.* -%{_mandir}/man1/distccmon* -%{_mandir}/man1/pump* -%{_mandir}/man1/include_server* -%{_mandir}/man1/lsdistcc* -%dir %{_sysconfdir}/%{name} -%config(noreplace) %{_sysconfdir}/%{name}/hosts -%{python3_sitearch}/include_server* - - -%files gnome -%{_bindir}/distccmon-gnome -%{_datadir}/pixmaps/distccmon-gnome.png -%{_datadir}/applications/*.desktop - - -%files server -%license COPYING -%doc README -%{_bindir}/distccd -%{_unitdir}/* -%{_sysconfdir}/default/distcc -%{_sysconfdir}/distcc/*allow* -%{_mandir}/man1/distccd* -%config(noreplace) %{_sysconfdir}/sysconfig/distccd -%{_sbindir}/update-distcc-symlinks -%dir /usr/lib/distcc -/usr/lib64/distcc -%dir /usr/lib/gcc-cross - -%changelog -* Fri Sep 19 2025 Python Maint - 3.4-12 -- Rebuilt for Python 3.14.0rc3 bytecode - -* Fri Aug 15 2025 Python Maint - 3.4-11 -- Rebuilt for Python 3.14.0rc2 bytecode - -* Wed Jul 23 2025 Fedora Release Engineering - 3.4-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Mon Jun 02 2025 Python Maint - 3.4-9 -- Rebuilt for Python 3.14 - -* Thu Jan 16 2025 Fedora Release Engineering - 3.4-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Mon Oct 21 2024 Gwyn Ciesla - 3.4-7 -- Patch for Py_ssize_t - -* Wed Jul 17 2024 Fedora Release Engineering - 3.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri Jun 07 2024 Python Maint - 3.4-5 -- Rebuilt for Python 3.13 - -* Tue Feb 13 2024 Gwyn Ciesla - 3.4-4 -- Disable LTO to fix distccmon-gnome crash, 2263992. - -* Wed Jan 24 2024 Fedora Release Engineering - 3.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 3.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 05 2024 Gwyn Ciesla - 3.4-1 -- 3.4 - -* Wed Jul 19 2023 Fedora Release Engineering - 3.3.5-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jun 13 2023 Python Maint - 3.3.5-14 -- Rebuilt for Python 3.12 - -* Tue Mar 07 2023 Gwyn Ciesla - 3.3.5-13 -- migrated to SPDX license - -* Thu Jan 19 2023 Fedora Release Engineering - 3.3.5-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Dec 21 2022 Gwyn Ciesla - 3.3.5-11 -- BR setuptools. - -* Thu Jul 21 2022 Fedora Release Engineering - 3.3.5-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Jun 13 2022 Python Maint - 3.3.5-9 -- Rebuilt for Python 3.11 - -* Thu Jan 20 2022 Fedora Release Engineering - 3.3.5-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 3.3.5-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 04 2021 Python Maint - 3.3.5-6 -- Rebuilt for Python 3.10 - -* Wed Mar 24 2021 Gwyn Ciesla - 3.3.5-5 -- Fix desktop file icon path. - -* Mon Mar 08 2021 Gwyn Ciesla - 3.3.5-4 -- Silence update-distcc-symlinks at install time. - -* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 3.3.5-3 -- Rebuilt for updated systemd-rpm-macros - See https://pagure.io/fesco/issue/2583. - -* Tue Jan 26 2021 Fedora Release Engineering - 3.3.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jan 04 2021 Gwyn Ciesla - 3.3.5-1 -- 3.3.5 - -* Mon Nov 23 2020 Gwyn Ciesla - 3.3.3-10 -- Spec cleanup, fix FTBFS. - -* Wed Sep 16 2020 Gwyn Ciesla - 3.3.3-9 -- Use gtk, not gnome, for monitor. - -* Sat Aug 01 2020 Fedora Release Engineering - 3.3.3-8 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 3.3.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue May 26 2020 Miro Hrončok - 3.3.3-6 -- Rebuilt for Python 3.9 - -* Wed Jan 29 2020 Gwyn Ciesla - 3.3.3-5 -- Build with -fcommon for gcc10. - -* Tue Jan 28 2020 Fedora Release Engineering - 3.3.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Oct 03 2019 Miro Hrončok - 3.3.3-3 -- Rebuilt for Python 3.8.0rc1 (#1748018) - -* Mon Aug 19 2019 Miro Hrončok - 3.3.3-2 -- Rebuilt for Python 3.8 - -* Thu Aug 15 2019 Gwyn Ciesla - 3.3.3-1 -- 3.3.3 - -* Tue Aug 06 2019 Gwyn Ciesla - 3.3.2-1 -- Python 3. - -* Wed Jul 24 2019 Fedora Release Engineering - 3.2rc1-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Tue May 07 2019 Gwyn Ciesla - 3.2rc1-23 -- Honor clients.allow - -* Thu Feb 21 2019 Gwyn Ciesla - 3.2rc1-22 -- Restrict to localhost by default. - -* Thu Jan 31 2019 Fedora Release Engineering - 3.2rc1-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 3.2rc1-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Mar 13 2018 Iryna Shcherbina - 3.2rc1-19 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Wed Feb 07 2018 Fedora Release Engineering - 3.2rc1-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Dec 21 2017 Gwyn Ciesla - 3.2rc1-17 -- Drop --verbose, BZ 1523785. - -* Thu Dec 21 2017 Gwyn Ciesla - 3.2rc1-16 -- Patch for argument bug, BZ 1527368 -- Move required components for pump to client package, BZ 1525851 - -* Wed Aug 02 2017 Fedora Release Engineering - 3.2rc1-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 3.2rc1-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 3.2rc1-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Jul 19 2016 Fedora Release Engineering - 3.2rc1-12 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Wed Feb 03 2016 Fedora Release Engineering - 3.2rc1-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 3.2rc1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu Mar 12 2015 Jon Ciesla - 3.2rc1-9 -- Enable authentication support, BZ 1201039. - -* Wed Aug 20 2014 Andy Grover - 3.2rc1-8 -- Add patch distcc-minilzo-2.08.patch, to fix CVE-2014-4607 (BZ 1131791) - -* Sat Aug 16 2014 Fedora Release Engineering - 3.2rc1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 3.2rc1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu Aug 08 2013 Jon Ciesla - 3.2rc1-5 -- Fixed unversioned docdir issue, BZ 993722. - -* Sat Aug 03 2013 Fedora Release Engineering - 3.2rc1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu May 16 2013 Jon Ciesla - 3.2rc1-3 -- chmod -x .service, BZ 963912 - -* Wed Feb 13 2013 Fedora Release Engineering - 3.2rc1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Oct 25 2012 Jon Ciesla - 3.2rc1-1 -- Latest upstream, BZ 870200. - -* Wed Jul 18 2012 Fedora Release Engineering - 3.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Apr 13 2012 Jon Ciesla - 3.1-6 -- Add hardened build. - -* Tue Jan 31 2012 Jon Ciesla - 3.1-5 -- Migrate to systemd, BZ 770409. - -* Fri Jan 13 2012 Fedora Release Engineering - 3.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Thu Nov 10 2011 Jon Ciesla - 3.1-3 -- Rebuild for libpng 1.5. - -* Tue Feb 08 2011 Fedora Release Engineering - 3.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Oct 07 2010 Jon Ciesla - 3.1-1 -- New upstream, BZ 641032. - -* Fri Jul 24 2009 Fedora Release Engineering - 2.18.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Tue Feb 24 2009 Fedora Release Engineering - 2.18.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Fri Feb 22 2008 Denis Leroy - 2.18.3-4 -- Added Avahi support patch from Lennart - -* Tue Feb 19 2008 Denis Leroy - 2.18.3-3 -- LSB header for init script - -* Mon Feb 18 2008 Denis Leroy - 2.18.3-2 -- Fixed Source0 URL, fixed init script - -* Mon Feb 4 2008 Denis Leroy - 2.18.3-1 -- First version - diff --git a/distccd.init b/distccd.init deleted file mode 100644 index c0ae9ac..0000000 --- a/distccd.init +++ /dev/null @@ -1,111 +0,0 @@ -#!/bin/sh -# -# distccd - A distributed compilation server. -# -# -# chkconfig: - 80 20 -# description: distccd - distcc distributed compilation server -# - -### BEGIN INIT INFO -# Provides: distccd -# Required-Start: $network $syslog $local_fs -# Required-Stop: $network $syslog $local_fs -# Default-Stop: 0 1 2 6 -# Short-Description: Distributed C/C++ Compilation Server -# Description: distcc is a program to distribute compilation of C or C++ -# code across several machines on a network. distcc should -# always generate the same results as a local compile, is -# simple to install and use, and is often two or more times -# faster than a local compile. -### END INIT INFO - -# Source function library. -. /etc/rc.d/init.d/functions - -exec="/usr/bin/distccd" -prog="distccd" - -# Default variables -SYSCONFIG="/etc/sysconfig/distccd" -OPTIONS="" -USER="nobody" -DISTCCPATH="$PATH" - -[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog - -lockfile=/var/lock/subsys/$prog - -start() { - [ -x $exec ] || exit 5 - [ -z "$OPTIONS" ] && exit 6 - echo -n $"Starting $prog: " - DISTCCD_PATH="$DISTCCPATH" $prog --daemon --user "$USER" $OPTIONS && success || failure - retval=$? - echo - [ $retval -eq 0 ] && touch $lockfile - return $retval -} - -stop() { - echo -n $"Stopping $prog: " - killproc $prog - retval=$? - echo - [ $retval -eq 0 ] && rm -f $lockfile - return $retval -} - -restart() { - stop - start -} - -reload() { - restart -} - -force_reload() { - restart -} - -rh_status() { - # run checks to determine if the service is running or use generic status - status $prog -} - -rh_status_q() { - rh_status >/dev/null 2>&1 -} - -case "$1" in - start) - rh_status_q && exit 0 - $1 - ;; - stop) - rh_status_q || exit 0 - $1 - ;; - restart) - $1 - ;; - reload) - rh_status_q || exit 7 - $1 - ;; - force-reload) - force_reload - ;; - status) - rh_status - ;; - condrestart|try-restart) - rh_status_q || exit 0 - restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}" - exit 2 -esac -exit $? diff --git a/distccd.service b/distccd.service deleted file mode 100644 index 0fe0c01..0000000 --- a/distccd.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Distccd A Distributed Compilation Server -After=network.target - -[Service] -User=nobody -EnvironmentFile=-/etc/sysconfig/distccd -ExecStart=/usr/bin/distccd --no-detach --daemon --whitelist=/etc/distcc/clients.allow $OPTIONS - -[Install] -WantedBy=multi-user.target diff --git a/hosts.sample b/hosts.sample deleted file mode 100644 index bb9a289..0000000 --- a/hosts.sample +++ /dev/null @@ -1,11 +0,0 @@ -# The grammar of the host file is, informally: -# -# DISTCC_HOSTS = HOSTSPEC ... -# HOSTSPEC = LOCAL_HOST | SSH_HOST | TCP_HOST | OLDSTYLE_TCP_HOST -# LOCAL_HOST = localhost[/LIMIT] -# SSH_HOST = [USER]@HOSTID[/LIMIT][:COMMAND][OPTIONS] -# TCP_HOST = HOSTID[:PORT][/LIMIT][OPTIONS] -# OLDSTYLE_TCP_HOST = HOSTID[/LIMIT][:PORT][OPTIONS] -# HOSTID = HOSTNAME | IPV4 -# OPTIONS = ,OPTION[OPTIONS] -# OPTION = lzo diff --git a/sources b/sources index 1f53dc1..e69de29 100644 --- a/sources +++ b/sources @@ -1 +0,0 @@ -SHA512 (distcc-3.4.tar.gz) = aa6018326da8aa73b40479471c0c26d752ea17b46b40caa55662885e4d67a920eb2e33f0cceec9d1738050a069660a4be1175448c0ad9762c7ea9527f556a02b