Hello community, here is the log from the commit of package distcc for openSUSE:Factory checked in at 2018-03-20 21:56:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/distcc (Old) and /work/SRC/openSUSE:Factory/.distcc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "distcc" Tue Mar 20 21:56:10 2018 rev:4 rq:586294 version:3.3 Changes: -------- --- /work/SRC/openSUSE:Factory/distcc/distcc.changes 2017-11-27 22:15:39.536628532 +0100 +++ /work/SRC/openSUSE:Factory/.distcc.new/distcc.changes 2018-03-20 21:56:13.098629526 +0100 @@ -1,0 +2,25 @@ +Tue Mar 13 09:09:59 UTC 2018 - [email protected] + +- Ensure neutrality of description. + +------------------------------------------------------------------- +Tue Mar 13 00:02:21 UTC 2018 - [email protected] + +- Update to 3.3 + * Use masquerade as compiler white-list. + * New --allow-private (the default) which allows non-global IP + and IPv6 addresses. + * Cross-compilation support. + * Fix parsing of IPv6 addresses. + * Python 3, not python 2. + * Can build without python (and without pump mode or tests). +- cleanup with spec-cleaner +- use %autosetup macro +- drop distcc-minilzo-2.08.patch (upstreamed) +- drop distcc-3.0-fix-fortify.patch (upstreamed) +- rebase distcc-3.2_rc1-freedesktop.patch +- rebase distcc-3.2_rc1-gssapi.patch +- rebase distcc-3.2_rc1-python.patch +- renumber patches + +------------------------------------------------------------------- Old: ---- distcc-3.0-fix-fortify.patch distcc-minilzo-2.08.patch v3.2rc1.tar.gz New: ---- distcc-3.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ distcc.spec ++++++ --- /var/tmp/diff_new_pack.FUfplj/_old 2018-03-20 21:56:14.106593232 +0100 +++ /var/tmp/diff_new_pack.FUfplj/_new 2018-03-20 21:56:14.106593232 +0100 @@ -1,7 +1,7 @@ # # spec file for package distcc # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,31 +18,30 @@ #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} - %define _fillupdir /var/adm/fillup-templates + %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif - Name: distcc -Version: 3.2rc1 +Version: 3.3 Release: 0 -Summary: A fast, free distributed C/C++ compiler -License: GPL-2.0+ +Summary: A distributed C/C++ compiler +License: GPL-2.0-or-later Group: Development/Tools/Building Url: https://github.com/distcc/distcc -Source0: https://github.com/distcc/distcc/archive/v%{version}.tar.gz +Source0: https://github.com/distcc/distcc/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: distccd.sysconfig Source2: distccd.service Source3: distccd.firewall -Patch0: distcc-3.0-fix-fortify.patch -Patch2: distcc-3.2_rc1-freedesktop.patch -Patch3: distcc-3.2_rc1-gssapi.patch -Patch4: distcc-3.2_rc1-python.patch -Patch5: distcc-minilzo-2.08.patch +Patch1: distcc-3.2_rc1-freedesktop.patch +Patch2: distcc-3.2_rc1-gssapi.patch +Patch3: distcc-3.2_rc1-python.patch BuildRequires: autoconf BuildRequires: automake +BuildRequires: binutils-devel BuildRequires: fdupes BuildRequires: gcc BuildRequires: libtool BuildRequires: make +BuildRequires: pkgconfig BuildRequires: python BuildRequires: systemd BuildRequires: update-desktop-files @@ -52,25 +51,25 @@ BuildRequires: pkgconfig(libgnomeui-2.0) BuildRequires: pkgconfig(libgssglue) BuildRequires: pkgconfig(pango) -BuildRequires: pkgconfig(python) +BuildRequires: pkgconfig(python3) Recommends: %{name}-server = %{version} Suggests: %{name}-gui = %{version} %description -distcc is a program to distribute builds of C, C++, Objective C or Objective -C++ code across several machines on a network. distcc should always generate -the same results as a local build, is simple to install and use, and is -usually much faster than a local compile. +distcc is a program to distribute builds of C, C++, Objective C or +Objective C++ code across several machines on a network, thereby +completing the task in less time. distcc should always generate the +same results as a local build. %package gui Summary: GUI monitor for distcc server/client Group: Development/Tools/Building %description gui -distcc is a program to distribute builds of C, C++, Objective C or Objective -C++ code across several machines on a network. distcc should always generate -the same results as a local build, is simple to install and use, and is -usually much faster than a local compile. +distcc is a program to distribute builds of C, C++, Objective C or +Objective C++ code across several machines on a network, thereby +completing the task in less time. distcc should always generate the +same results as a local build. %package server Summary: Server for distributed C/C++ compilation @@ -82,12 +81,7 @@ This package contains the compilation server needed to use %{name}. %prep -%setup -q -%patch0 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 +%autosetup -p1 # do not use date/time in the c files modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" @@ -103,7 +97,6 @@ export CFLAGS="%{optflags} -fno-strict-aliasing" export CXXFLAGS="%{optflags} -fno-strict-aliasing" %configure \ - --with-docdir=%{_docdir}/%{name} \ --disable-Werror \ --enable-rfc2553 \ --with-gtk \ @@ -117,7 +110,7 @@ make %{?_smp_mflags} %install -%make_install +%make_install docdir=%{_docdir}/%{name} # service mkdir -p %{buildroot}/%{_sbindir} ln -sf service %{buildroot}/%{_sbindir}/rc%{name}d @@ -135,8 +128,9 @@ ln -sf %{_bindir}/%{name} %{buildroot}%{_libexecdir}/%{name}/bin/cpp ln -sf %{_bindir}/%{name} %{buildroot}%{_libexecdir}/%{name}/bin/clang ln -sf %{_bindir}/%{name} %{buildroot}%{_libexecdir}/%{name}/bin/clang++ -# pointless installed file -rm -rf %{buildroot}%{_docdir}/distcc/INSTALL + +# pointless files +rm -rf %{buildroot}%{_docdir}/%{name}/{INSTALL,COPYING} # cleanups %suse_update_desktop_file -r distccmon-gnome Development Building %fdupes ${buildroot} @@ -161,11 +155,11 @@ %desktop_database_postun %files -%defattr(-,root,root) -%doc AUTHORS doc/* NEWS README.pump TODO -%doc COPYING README survey.txt +%license COPYING +%doc AUTHORS doc/* NEWS README.pump TODO README survey.txt %dir %{_libexecdir}/distcc %dir %{_libexecdir}/distcc/bin +%dir %{_docdir}/distcc %{_libexecdir}/distcc/bin/c++ %{_libexecdir}/distcc/bin/cc %{_libexecdir}/distcc/bin/cpp @@ -173,19 +167,21 @@ %{_libexecdir}/distcc/bin/gcc %{_libexecdir}/distcc/bin/clang %{_libexecdir}/distcc/bin/clang++ +%{_sbindir}/update-distcc-symlinks %{_bindir}/distcc %{_bindir}/distccmon-text %{_bindir}/lsdistcc %{_bindir}/pump -%{_mandir}/man1/distcc.1.* +%{_mandir}/man1/distcc.1%{?ext_man} +%{_mandir}/man1/lsdistcc.1%{?ext_man} %{_mandir}/man1/pump* -%{_mandir}/man1/distccmon-text.1.* +%{_mandir}/man1/distccmon-text.1%{?ext_man} %dir %{_sysconfdir}/distcc %config(noreplace) %{_sysconfdir}/%{name}/hosts %files server -%defattr(-,root,root) -%doc COPYING README +%license COPYING +%doc README %{_bindir}/distccd %{_unitdir}/distccd.service %{_sbindir}/rcdistccd @@ -195,10 +191,9 @@ %{_mandir}/man1/include_server* %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/distccd %{_fillupdir}/* -%{python_sitearch}/include_server* +%{python3_sitearch}/include_server* %files gui -%defattr(-,root,root) %{_bindir}/distccmon-gnome %{_datadir}/applications/distccmon-gnome.desktop %{_datadir}/pixmaps/distccmon-gnome-icon.png ++++++ distcc-3.2_rc1-freedesktop.patch ++++++ --- /var/tmp/diff_new_pack.FUfplj/_old 2018-03-20 21:56:14.142591936 +0100 +++ /var/tmp/diff_new_pack.FUfplj/_new 2018-03-20 21:56:14.146591792 +0100 @@ -1,6 +1,5 @@ -diff -Naur distcc-3.2rc1.orig/Makefile.in distcc-3.2rc1/Makefile.in ---- distcc-3.2rc1.orig/Makefile.in 2011-10-26 11:07:15.000000000 +0900 -+++ distcc-3.2rc1/Makefile.in 2011-10-27 16:57:46.815272689 +0900 +--- a/Makefile.in 2011-10-26 11:07:15.000000000 +0900 ++++ b/Makefile.in 2011-10-27 16:57:46.815272689 +0900 @@ -50,13 +50,14 @@ includedir = @includedir@ oldincludedir = /usr/include @@ -18,16 +17,6 @@ # arguments to pkgconfig GNOME_PACKAGES = @GNOME_PACKAGES@ -@@ -1016,7 +1017,8 @@ - @echo " documents $(DESTDIR)$(docdir)" - @echo " programs $(DESTDIR)$(bindir)" - @echo " system configuration $(DESTDIR)$(sysconfdir)" -- @echo " shared data files $(DESTDIR)$(pkgdatadir)" -+ @echo " icons $(DESTDIR)$(icondir)" -+ @echo " .desktop file $(DESTDIR)$(desktopdir)" - - - # install-sh can't handle multiple arguments, but we don't need any @@ -1108,10 +1110,10 @@ done @@ -43,18 +32,17 @@ install-conf: $(conf_files) $(default_files) $(mkinstalldirs) "$(DESTDIR)$(sysconfdir)/distcc" -diff -Naur distcc-3.2rc1.orig/gnome/distccmon-gnome.desktop distcc-3.2rc1/gnome/distccmon-gnome.desktop ---- distcc-3.2rc1.orig/gnome/distccmon-gnome.desktop 2011-04-06 03:58:58.000000000 +0900 -+++ distcc-3.2rc1/gnome/distccmon-gnome.desktop 2011-10-27 17:01:50.792242592 +0900 +--- a/gnome/distccmon-gnome.desktop 2011-04-06 03:58:58.000000000 +0900 ++++ b/gnome/distccmon-gnome.desktop 2011-10-27 17:01:50.792242592 +0900 @@ -1,6 +1,4 @@ [Desktop Entry] -Version=0.9.4 -Encoding=UTF-8 Exec=distccmon-gnome Name=distcc monitor - Name[sv]=distcc �vervakare + Name[sv]=distcc övervakare @@ -8,9 +6,9 @@ - GenericName[sv]=Distribuerad kompilerings-�vervakare + GenericName[sv]=Distribuerad kompilerings-övervakare Comment=Graphical view of distributed compile tasks Comment[sv]=Grafisk vy av distribuerade kompileringsuppgifter -Icon=distccmon-gnome-icon.png @@ -65,9 +53,8 @@ -Categories=GNOME;Application;Development; +Categories=GNOME;Development; StartupNotify=true -diff -Naur distcc-3.2rc1.orig/src/mon-gnome.c distcc-3.2rc1/src/mon-gnome.c ---- distcc-3.2rc1.orig/src/mon-gnome.c 2008-12-03 06:50:25.000000000 +0900 -+++ distcc-3.2rc1/src/mon-gnome.c 2011-10-27 16:54:50.220566026 +0900 +--- a/src/mon-gnome.c 2008-12-03 06:50:25.000000000 +0900 ++++ b/src/mon-gnome.c 2011-10-27 16:54:50.220566026 +0900 @@ -599,7 +599,7 @@ #if GTK_CHECK_VERSION(2,2,0) ++++++ distcc-3.2_rc1-gssapi.patch ++++++ --- /var/tmp/diff_new_pack.FUfplj/_old 2018-03-20 21:56:14.154591504 +0100 +++ /var/tmp/diff_new_pack.FUfplj/_new 2018-03-20 21:56:14.154591504 +0100 @@ -1,26 +1,25 @@ -diff -Naur distcc-3.2rc1.orig/configure.ac distcc-3.2rc1/configure.ac ---- distcc-3.2rc1.orig/configure.ac 2011-10-21 13:40:55.000000000 +0900 -+++ distcc-3.2rc1/configure.ac 2011-10-27 18:06:58.938922585 +0900 -@@ -15,6 +15,8 @@ +--- a/configure.ac 2011-10-21 13:40:55.000000000 +0900 ++++ b/configure.ac 2011-10-27 18:06:58.938922585 +0900 +@@ -14,6 +14,8 @@ + AC_CONFIG_HEADERS(src/config.h) - AC_CANONICAL_HOST +PKG_PROG_PKG_CONFIG + # FreeBSD installs its version of libpopt into /usr/local/, but does # not put that on the default library and header path. # Solaris doesn't even ship libpopt. We used to add that path if -@@ -502,16 +504,17 @@ +@@ -503,16 +505,17 @@ [provide mutual authentication services via the GSS-API])]) if test x"$with_auth" = xyes; then - AC_SEARCH_LIBS([gss_init_sec_context], -- [gssapi gssapi_krb5], +- [gssapi gssapi_krb5 gss], - AC_DEFINE(HAVE_GSSAPI, 1, [Define if the GSS_API is available]) + PKG_CHECK_MODULES(GSSAPI, libgssglue, + [AC_DEFINE(HAVE_GSSAPI, 1, [Define if the GSS_API is available]) -+ CFLAGS="$CFLAGS $GSSAPI_CFLAGS" -+ LIBS="$LIBS $GSSAPI_LIBS" ++ CFLAGS="$CFLAGS $GSSAPI_CFLAGS" ++ LIBS="$LIBS $GSSAPI_LIBS" AUTH_COMMON_OBJS="src/auth_common.o" AUTH_DISTCC_OBJS="src/auth_distcc.o" - AUTH_DISTCCD_OBJS="src/auth_distccd.o", ++++++ distcc-3.2_rc1-python.patch ++++++ --- /var/tmp/diff_new_pack.FUfplj/_old 2018-03-20 21:56:14.166591072 +0100 +++ /var/tmp/diff_new_pack.FUfplj/_new 2018-03-20 21:56:14.166591072 +0100 @@ -1,246 +1,216 @@ -diff -Naur distcc-3.2rc1.orig/bench/statistics.py distcc-3.2rc1/bench/statistics.py ---- distcc-3.2rc1.orig/bench/statistics.py 2008-12-03 06:50:21.000000000 +0900 -+++ distcc-3.2rc1/bench/statistics.py 2011-10-27 17:05:08.418023081 +0900 +--- a/bench/statistics.py 2008-12-03 06:50:21.000000000 +0900 ++++ b/bench/statistics.py 2011-10-27 17:05:08.418023081 +0900 @@ -1,4 +1,4 @@ -#! /usr/bin/env python2.2 +#! /usr/bin/env python # benchmark -- automated system for testing distcc correctness # and performance on various source trees. -diff -Naur distcc-3.2rc1.orig/configure.ac distcc-3.2rc1/configure.ac ---- distcc-3.2rc1.orig/configure.ac 2011-10-21 13:40:55.000000000 +0900 -+++ distcc-3.2rc1/configure.ac 2011-10-27 17:05:31.179112690 +0900 -@@ -243,7 +243,7 @@ - # - # NB: Cannot use AC_CONFIG_LIBOBJ_DIR here, because it's not present - # in autoconf 2.53. --AC_PATH_PROGS(PYTHON, [python2.6 python-2.6 python2.5 python-2.5 python2.4 python-2.4 python]) -+AC_PATH_PROGS(PYTHON, [python]) - AC_ARG_VAR(PYTHON, [Python interpreter]) - # Python 1 doesn't even support -V - if ! "$PYTHON" -V 2>&1 | grep "^Python" >/dev/null; then -diff -Naur distcc-3.2rc1.orig/include_server/basics.py distcc-3.2rc1/include_server/basics.py ---- distcc-3.2rc1.orig/include_server/basics.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.2rc1/include_server/basics.py 2011-10-27 17:05:08.421023097 +0900 -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.4 -+#!/usr/bin/python +--- a/include_server/basics.py 2008-12-03 06:50:31.000000000 +0900 ++++ b/include_server/basics.py 2011-10-27 17:05:08.421023097 +0900 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python3 # # Copyright 2007 Google Inc. # -diff -Naur distcc-3.2rc1.orig/include_server/basics_test.py distcc-3.2rc1/include_server/basics_test.py ---- distcc-3.2rc1.orig/include_server/basics_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.2rc1/include_server/basics_test.py 2011-10-27 17:05:08.421023097 +0900 +--- a/include_server/basics_test.py 2008-12-03 06:50:31.000000000 +0900 ++++ b/include_server/basics_test.py 2011-10-27 17:05:08.421023097 +0900 @@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python +-#! /usr/bin/env python3 ++#! /usr/bin/python3 # Copyright 2007 Google Inc. # -diff -Naur distcc-3.2rc1.orig/include_server/c_extensions_test.py distcc-3.2rc1/include_server/c_extensions_test.py ---- distcc-3.2rc1.orig/include_server/c_extensions_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.2rc1/include_server/c_extensions_test.py 2011-10-27 17:05:08.421023097 +0900 +--- a/include_server/c_extensions_test.py 2008-12-03 06:50:31.000000000 +0900 ++++ b/include_server/c_extensions_test.py 2011-10-27 17:05:08.421023097 +0900 @@ -1,4 +1,4 @@ --#!/usr/bin/python2.4 -+#!/usr/bin/python +-#!/usr/bin/env python3 ++#!/usr/bin/python3 # Copyright 2007 Google Inc. # -diff -Naur distcc-3.2rc1.orig/include_server/cache_basics.py distcc-3.2rc1/include_server/cache_basics.py ---- distcc-3.2rc1.orig/include_server/cache_basics.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.2rc1/include_server/cache_basics.py 2011-10-27 17:05:08.422023101 +0900 +--- a/include_server/cache_basics.py 2008-12-03 06:50:31.000000000 +0900 ++++ b/include_server/cache_basics.py 2011-10-27 17:05:08.422023101 +0900 @@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python +-#! /usr/bin/env python3 ++#! /usr/bin/python3 # Copyright 2007 Google Inc. # -diff -Naur distcc-3.2rc1.orig/include_server/compiler_defaults.py distcc-3.2rc1/include_server/compiler_defaults.py ---- distcc-3.2rc1.orig/include_server/compiler_defaults.py 2011-04-06 03:58:59.000000000 +0900 -+++ distcc-3.2rc1/include_server/compiler_defaults.py 2011-10-27 17:05:08.422023101 +0900 +--- a/include_server/compiler_defaults.py 2011-04-06 03:58:59.000000000 +0900 ++++ b/include_server/compiler_defaults.py 2011-10-27 17:05:08.422023101 +0900 @@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python +-#! /usr/bin/env python3 ++#! /usr/bin/python3 # Copyright 2007 Google Inc. # -diff -Naur distcc-3.2rc1.orig/include_server/compress_files.py distcc-3.2rc1/include_server/compress_files.py ---- distcc-3.2rc1.orig/include_server/compress_files.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.2rc1/include_server/compress_files.py 2011-10-27 17:05:08.422023101 +0900 +--- a/include_server/compress_files.py 2008-12-03 06:50:31.000000000 +0900 ++++ b/include_server/compress_files.py 2011-10-27 17:05:08.422023101 +0900 @@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python +-#! /usr/bin/env python3 ++#! /usr/bin/python3 # Copyright 2007 Google Inc. # -diff -Naur distcc-3.2rc1.orig/include_server/include_analyzer.py distcc-3.2rc1/include_server/include_analyzer.py ---- distcc-3.2rc1.orig/include_server/include_analyzer.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.2rc1/include_server/include_analyzer.py 2011-10-27 17:05:08.422023101 +0900 +--- a/include_server/include_analyzer.py 2008-12-03 06:50:31.000000000 +0900 ++++ b/include_server/include_analyzer.py 2011-10-27 17:05:08.422023101 +0900 @@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python +-#! /usr/bin/env python3 ++#! /usr/bin/python3 # Copyright 2007 Google Inc. # -diff -Naur distcc-3.2rc1.orig/include_server/include_analyzer_memoizing_node.py distcc-3.2rc1/include_server/include_analyzer_memoizing_node.py ---- distcc-3.2rc1.orig/include_server/include_analyzer_memoizing_node.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.2rc1/include_server/include_analyzer_memoizing_node.py 2011-10-27 17:05:08.422023101 +0900 +--- a/include_server/include_analyzer_memoizing_node.py 2008-12-03 06:50:31.000000000 +0900 ++++ b/include_server/include_analyzer_memoizing_node.py 2011-10-27 17:05:08.422023101 +0900 @@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python +-#! /usr/bin/env python3 ++#! /usr/bin/python3 # Copyright 2007 Google Inc. # -diff -Naur distcc-3.2rc1.orig/include_server/include_analyzer_memoizing_node_test.py distcc-3.2rc1/include_server/include_analyzer_memoizing_node_test.py ---- distcc-3.2rc1.orig/include_server/include_analyzer_memoizing_node_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.2rc1/include_server/include_analyzer_memoizing_node_test.py 2011-10-27 17:05:08.423023105 +0900 +--- a/include_server/include_analyzer_memoizing_node_test.py 2008-12-03 06:50:31.000000000 +0900 ++++ b/include_server/include_analyzer_memoizing_node_test.py 2011-10-27 17:05:08.423023105 +0900 @@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python +-#! /usr/bin/env python3 ++#! /usr/bin/python3 # Copyright 2007 Google Inc. # -diff -Naur distcc-3.2rc1.orig/include_server/include_analyzer_test.py distcc-3.2rc1/include_server/include_analyzer_test.py ---- distcc-3.2rc1.orig/include_server/include_analyzer_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.2rc1/include_server/include_analyzer_test.py 2011-10-27 17:05:08.423023105 +0900 +--- a/include_server/include_analyzer_test.py 2008-12-03 06:50:31.000000000 +0900 ++++ b/include_server/include_analyzer_test.py 2011-10-27 17:05:08.423023105 +0900 @@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python +-#! /usr/bin/env python3 ++#! /usr/bin/python3 # Copyright 2007 Google Inc. # -diff -Naur distcc-3.2rc1.orig/include_server/include_server.py distcc-3.2rc1/include_server/include_server.py ---- distcc-3.2rc1.orig/include_server/include_server.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.2rc1/include_server/include_server.py 2011-10-27 17:05:08.423023105 +0900 +--- a/include_server/include_server.py 2008-12-03 06:50:31.000000000 +0900 ++++ b/include_server/include_server.py 2011-10-27 17:05:08.423023105 +0900 @@ -1,4 +1,4 @@ --#!/usr/bin/python2.4 -+#!/usr/bin/python +-#!/usr/bin/env python3 ++#!/usr/bin/python3 # Copyright 2007 Google Inc. # -diff -Naur distcc-3.2rc1.orig/include_server/include_server_test.py distcc-3.2rc1/include_server/include_server_test.py ---- distcc-3.2rc1.orig/include_server/include_server_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.2rc1/include_server/include_server_test.py 2011-10-27 17:05:08.423023105 +0900 +--- a/include_server/include_server_test.py 2008-12-03 06:50:31.000000000 +0900 ++++ b/include_server/include_server_test.py 2011-10-27 17:05:08.423023105 +0900 @@ -1,4 +1,4 @@ --#!/usr/bin/python2.4 -+#!/usr/bin/python +-#!/usr/bin/env python3 ++#!/usr/bin/python3 # Copyright 2007 Google Inc. # -diff -Naur distcc-3.2rc1.orig/include_server/macro_eval.py distcc-3.2rc1/include_server/macro_eval.py ---- distcc-3.2rc1.orig/include_server/macro_eval.py 2011-04-06 03:58:59.000000000 +0900 -+++ distcc-3.2rc1/include_server/macro_eval.py 2011-10-27 17:05:08.423023105 +0900 +--- a/include_server/macro_eval.py 2011-04-06 03:58:59.000000000 +0900 ++++ b/include_server/macro_eval.py 2011-10-27 17:05:08.423023105 +0900 @@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python +-#! /usr/bin/env python3 ++#! /usr/bin/python3 # Copyright 2007 Google Inc. # -diff -Naur distcc-3.2rc1.orig/include_server/macro_eval_test.py distcc-3.2rc1/include_server/macro_eval_test.py ---- distcc-3.2rc1.orig/include_server/macro_eval_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.2rc1/include_server/macro_eval_test.py 2011-10-27 17:05:08.423023105 +0900 +--- a/include_server/macro_eval_test.py 2008-12-03 06:50:31.000000000 +0900 ++++ b/include_server/macro_eval_test.py 2011-10-27 17:05:08.423023105 +0900 @@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python +-#! /usr/bin/env python3 ++#! /usr/bin/python3 # Copyright 2007 Google Inc. # -diff -Naur distcc-3.2rc1.orig/include_server/mirror_path.py distcc-3.2rc1/include_server/mirror_path.py ---- distcc-3.2rc1.orig/include_server/mirror_path.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.2rc1/include_server/mirror_path.py 2011-10-27 17:05:08.424023109 +0900 +--- a/include_server/mirror_path.py 2008-12-03 06:50:31.000000000 +0900 ++++ b/include_server/mirror_path.py 2011-10-27 17:05:08.424023109 +0900 @@ -1,4 +1,4 @@ --#!/usr/bin/python2.4 -+#!/usr/bin/python +-#!/usr/bin/env python3 ++#!/usr/bin/python3 # Copyright 2007 Google Inc. # -diff -Naur distcc-3.2rc1.orig/include_server/mirror_path_test.py distcc-3.2rc1/include_server/mirror_path_test.py ---- distcc-3.2rc1.orig/include_server/mirror_path_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.2rc1/include_server/mirror_path_test.py 2011-10-27 17:05:08.424023109 +0900 +--- a/include_server/mirror_path_test.py 2008-12-03 06:50:31.000000000 +0900 ++++ b/include_server/mirror_path_test.py 2011-10-27 17:05:08.424023109 +0900 @@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python +-#! /usr/bin/env python3 ++#! /usr/bin/python3 # Copyright 2007 Google Inc. # -diff -Naur distcc-3.2rc1.orig/include_server/parse_command.py distcc-3.2rc1/include_server/parse_command.py ---- distcc-3.2rc1.orig/include_server/parse_command.py 2011-04-06 03:58:59.000000000 +0900 -+++ distcc-3.2rc1/include_server/parse_command.py 2011-10-27 17:05:08.424023109 +0900 +--- a/include_server/parse_command.py 2011-04-06 03:58:59.000000000 +0900 ++++ b/include_server/parse_command.py 2011-10-27 17:05:08.424023109 +0900 @@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python +-#! /usr/bin/env python3 ++#! /usr/bin/python3 # Copyright 2007 Google Inc. # -diff -Naur distcc-3.2rc1.orig/include_server/parse_command_test.py distcc-3.2rc1/include_server/parse_command_test.py ---- distcc-3.2rc1.orig/include_server/parse_command_test.py 2011-04-06 03:58:59.000000000 +0900 -+++ distcc-3.2rc1/include_server/parse_command_test.py 2011-10-27 17:05:08.424023109 +0900 +--- a/include_server/parse_command_test.py 2011-04-06 03:58:59.000000000 +0900 ++++ b/include_server/parse_command_test.py 2011-10-27 17:05:08.424023109 +0900 @@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python +-#! /usr/bin/env python3 ++#! /usr/bin/python3 # Copyright 2007 Google Inc. # -diff -Naur distcc-3.2rc1.orig/include_server/parse_file.py distcc-3.2rc1/include_server/parse_file.py ---- distcc-3.2rc1.orig/include_server/parse_file.py 2011-04-06 03:58:59.000000000 +0900 -+++ distcc-3.2rc1/include_server/parse_file.py 2011-10-27 17:05:08.424023109 +0900 +--- a/include_server/parse_file.py 2011-04-06 03:58:59.000000000 +0900 ++++ b/include_server/parse_file.py 2011-10-27 17:05:08.424023109 +0900 @@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python +-#! /usr/bin/env python3 ++#! /usr/bin/python3 # Copyright 2007 Google Inc. # -diff -Naur distcc-3.2rc1.orig/include_server/parse_file_test.py distcc-3.2rc1/include_server/parse_file_test.py ---- distcc-3.2rc1.orig/include_server/parse_file_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.2rc1/include_server/parse_file_test.py 2011-10-27 17:05:08.424023109 +0900 +--- a/include_server/parse_file_test.py 2008-12-03 06:50:31.000000000 +0900 ++++ b/include_server/parse_file_test.py 2011-10-27 17:05:08.424023109 +0900 @@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python +-#! /usr/bin/env python3 ++#! /usr/bin/python3 # Copyright 2007 Google Inc. # -diff -Naur distcc-3.2rc1.orig/include_server/run.py distcc-3.2rc1/include_server/run.py ---- distcc-3.2rc1.orig/include_server/run.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.2rc1/include_server/run.py 2011-10-27 17:05:08.424023109 +0900 +--- a/include_server/run.py 2008-12-03 06:50:31.000000000 +0900 ++++ b/include_server/run.py 2011-10-27 17:05:08.424023109 +0900 @@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python +-#! /usr/bin/env python3 ++#! /usr/bin/python3 # Copyright 2007 Google Inc. # -diff -Naur distcc-3.2rc1.orig/include_server/setup.py distcc-3.2rc1/include_server/setup.py ---- distcc-3.2rc1.orig/include_server/setup.py 2011-04-06 03:58:59.000000000 +0900 -+++ distcc-3.2rc1/include_server/setup.py 2011-10-27 17:05:08.425023113 +0900 +--- a/include_server/setup.py 2011-04-06 03:58:59.000000000 +0900 ++++ b/include_server/setup.py 2011-10-27 17:05:08.425023113 +0900 @@ -1,4 +1,4 @@ --#!/usr/bin/python2.4 -+#!/usr/bin/python +-#!/usr/bin/env python3 ++#!/usr/bin/python3 # Copyright 2007 Google Inc. # -diff -Naur distcc-3.2rc1.orig/include_server/statistics.py distcc-3.2rc1/include_server/statistics.py ---- distcc-3.2rc1.orig/include_server/statistics.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.2rc1/include_server/statistics.py 2011-10-27 17:05:08.425023113 +0900 +--- a/include_server/statistics.py 2008-12-03 06:50:31.000000000 +0900 ++++ b/include_server/statistics.py 2011-10-27 17:05:08.425023113 +0900 @@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python +-#! /usr/bin/env python3 ++#! /usr/bin/python3 # # Copyright 2007 Google Inc. # -diff -Naur distcc-3.2rc1.orig/test/onetest.py distcc-3.2rc1/test/onetest.py ---- distcc-3.2rc1.orig/test/onetest.py 2008-12-03 06:50:22.000000000 +0900 -+++ distcc-3.2rc1/test/onetest.py 2011-10-27 17:05:08.432023140 +0900 +--- a/test/onetest.py 2008-12-03 06:50:22.000000000 +0900 ++++ b/test/onetest.py 2011-10-27 17:05:08.432023140 +0900 @@ -1,4 +1,4 @@ --#!/usr/bin/python2.4 -+#!/usr/bin/python +-#!/usr/bin/env python3 ++#!/usr/bin/python3 # # Copyright 2007 Google Inc. # -diff -Naur distcc-3.2rc1.orig/test/testdistcc.py distcc-3.2rc1/test/testdistcc.py ---- distcc-3.2rc1.orig/test/testdistcc.py 2011-10-21 11:40:49.000000000 +0900 -+++ distcc-3.2rc1/test/testdistcc.py 2011-10-27 17:05:08.432023140 +0900 +--- a/test/testdistcc.py 2011-10-21 11:40:49.000000000 +0900 ++++ b/test/testdistcc.py 2011-10-27 17:05:08.432023140 +0900 @@ -1,4 +1,4 @@ --#! /usr/bin/env python2.2 -+#! /usr/bin/env python +-#! /usr/bin/env python3 ++#! /usr/bin/python # Copyright (C) 2002, 2003, 2004 by Martin Pool <[email protected]> # Copyright 2007 Google Inc. +--- a/update-distcc-symlinks.py 2018-03-12 21:05:56.325853740 -0400 ++++ b/update-distcc-symlinks.py 2018-03-12 21:06:03.205684850 -0400 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python3 + + import subprocess, string, os, stat, re +
