Restrict to localhost by default.

Patch from upstream svn.

Signed-off-by: Andy Grover <agrover@redhat.com>

.gitignore

@@ -1,2 +1,3 @@
 distcc-2.18.3.tar.bz2
 /distcc-3.1.tar.bz2
+/distcc-3.2rc1.tar.bz2

distcc-localhost.patch

@@ -0,0 +1,11 @@
+--- 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.

distcc.spec

@@ -1,20 +1,21 @@
-%define _hardened_build 1
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 # eval to 2.3 if python isn't yet present, workaround for no python in fc4 minimal buildroot
 %{!?python_version: %define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]' || echo "2.3")}
 
 
 Name:       distcc
-Version:    3.1
-Release:    7%{?dist}
+Version:    3.2rc1
+Release:    3%{?dist}
 Summary:    Distributed C/C++ compilation
 Group:      Development/Tools
 License:    GPLv2+
 URL:        http://distcc.org/
 Source0:    http://distcc.googlecode.com/files/distcc-%{version}.tar.bz2
 Source1:    hosts.sample
-Source2:    distccd.service
+Source2:    distccd.init
 #Patch0:     distcc-2.18.3-avahi.patch
+Patch0:     distcc-minilzo-2.08.patch
+Patch1:     distcc-localhost.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: popt-devel
@@ -37,12 +38,9 @@ Summary:    Server for distributed C/C++ compilation
 Group:      Development/Tools
 License:    GPLv2+
 
-#Requires(post): /sbin/chkconfig
-#Requires(preun): /sbin/chkconfig
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
-Requires(post): systemd-sysv
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
+
 
 %description server
 This package contains the compilation server needed to use %{name}.
@@ -50,8 +48,8 @@ This package contains the compilation server needed to use %{name}.
 
 %prep
 %setup -q
-#%%patch0 -p1 -b .avahi
-
+%patch0 -p1
+%patch1 -p0
 
 %build
 %configure --with-gnome --with-docdir=%{_datadir}/doc/%{name}-%{version} --disable-Werror
@@ -74,11 +72,7 @@ install -Dm 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/hosts
 install -Dm 0644 contrib/redhat/sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/distccd
 
 # Install distccd init file
-#install -Dm 0755 %%{SOURCE2} $RPM_BUILD_ROOT%%{_sysconfdir}/init.d/distccd
-
-# Install distcdd unit file
-mkdir -p $RPM_BUILD_ROOT%{_unitdir}
-install -Dm 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/distccd.service
+install -Dm 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/distccd
 
 
 %post
@@ -86,41 +80,16 @@ update-desktop-database &> /dev/null ||:
 
 
 %post server
-#[ $1 -lt 2 ] && /sbin/chkconfig --add distccd ||:
-if [ $1 -eq 1 ] ; then 
-    # Initial installation 
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
+[ $1 -lt 2 ] && /sbin/chkconfig --add distccd ||:
+
 
 %preun server
-#[ $1 -eq 0 ] && /sbin/chkconfig --del distccd ||:
-if [ $1 -eq 0 ] ; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable distccd.service > /dev/null 2>&1 || :
-    /bin/systemctl stop distccd.service > /dev/null 2>&1 || :
-fi
-
-%postun server
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-    # Package upgrade, not uninstall
-    /bin/systemctl try-restart distccd.service >/dev/null 2>&1 || :
-fi
+[ $1 -eq 0 ] && /sbin/chkconfig --del distccd ||:
 
 
 %postun
 update-desktop-database &> /dev/null ||:
 
-%triggerun -- distcc-server < 3.1-5
-# Save the current service runlevel info
-# User must manually run systemd-sysv-convert --apply distccd
-# to migrate them to systemd targets
-/usr/bin/systemd-sysv-convert --save distccd >/dev/null 2>&1 ||:
-
-# Run these because the SysV package being removed won't do them
-/sbin/chkconfig --del distccd >/dev/null 2>&1 || :
-/bin/systemctl try-restart distccd.service >/dev/null 2>&1 || :
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -145,8 +114,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_bindir}/distccd
-#%%{_sysconfdir}/init.d/*
-%{_unitdir}/*
+%{_sysconfdir}/init.d/*
 %{_sysconfdir}/default/distcc
 %{_sysconfdir}/distcc/*allow*
 %{_mandir}/man1/distccd*
@@ -156,14 +124,14 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/include_server*
 
 %changelog
-* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+* Thu Feb 21 2019 Gwyn Ciesla <gwync@protonmail.com> - 3.2rc1-3
+- Restrict to localhost by default.
 
-* Fri Apr 13 2012 Jon Ciesla <limburgher@gmail.com> - 3.1-6
-- Add hardened build.
+* Wed Aug 20 2014 Andy Grover <agrover@redhat.com> - 3.2rc1-2
+- Add patch distcc-minilzo-2.08.patch, to fix CVE-2014-4607 (BZ 1131791)
 
-* Tue Jan 31 2012 Jon Ciesla <limburgher@gmail.com> - 3.1-5
-- Migrate to systemd, BZ 770409.
+* Fri Oct 26 2012 Jon Ciesla <limburgher@gmail.com> - 3.2rc1-1
+- Latest upstream, BZ 870200.
 
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

distccd.service

@@ -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 --verbose --no-detach --daemon $OPTIONS
-
-[Install]
-WantedBy=multi-user.target

sources

@@ -1 +1 @@
-a1a9d3853df7133669fffec2a9aab9f3  distcc-3.1.tar.bz2
+18cd4f33f5cfc3e75675cafc568fb9cf  distcc-3.2rc1.tar.bz2