[crux-commits] ports/contrib (3.5): distcc: 3.1 -> 3.3.3

commit d0d951f448074fdf4d87335a4d9853145ecd5300 Author: Danny Rawlins <monster.romster@gmail.com> Date: Mon Aug 19 23:29:14 2019 +1000 distcc: 3.1 -> 3.3.3 diff --git a/distcc/.footprint b/distcc/.footprint index 5d8c083b..0470c0dd 100644 --- a/distcc/.footprint +++ b/distcc/.footprint @@ -21,3 +21,4 @@ drwxr-xr-x root/root usr/share/man/man1/ -rw-r--r-- root/root usr/share/man/man1/distcc.1.gz -rw-r--r-- root/root usr/share/man/man1/distccd.1.gz -rw-r--r-- root/root usr/share/man/man1/distccmon-text.1.gz +-rw-r--r-- root/root usr/share/man/man1/lsdistcc.1.gz diff --git a/distcc/.signature b/distcc/.signature index ee217c23..a0f37603 100644 --- a/distcc/.signature +++ b/distcc/.signature @@ -1,9 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3zTsG3UOty2EqkPJk69e0iFdOoM9rSrCUyKWGLUliXrZYqVovj4vRvF+Wjij6XJ5sOEQetfXsajMppEu68Kk8Ag= -SHA256 (Pkgfile) = b2c90c5e673cb8bd883226c9b0ed315e5c846806498541d03e913671a750cf7e -SHA256 (.footprint) = 156f6ce2096912e79f79424c6937d1bdabf2bdcb5b19abadee4512fda44f2fdf -SHA256 (distcc-3.1.tar.gz) = 721523b81584b4104cf48da8d629ffa0768adb4e032885dcd4e25ffd6703dd63 +RWSagIOpLGJF3zSQHvqBKxQHWXcO8HEc8c6VY9yvtukcdhj/NSv7K7VGVaeB3KCFm+q9okEMaqKEr7+zU2Ap6yosj/uw3K4nXA8= +SHA256 (Pkgfile) = bae8ad528bc728efb13331347d4cfcc676d91a9f67ad4a951a17088dd0d9776e +SHA256 (.footprint) = 96261a14be1f68dc197a6eeab9ce9ffa685b7921e7802d2e62313e11e68575d4 +SHA256 (distcc-3.3.3.tar.gz) = bead25471d5a53ecfdf8f065a6fe48901c14d5008956c318c700e56bc87bf0bc SHA256 (distccd) = d440c68490aab6c4552848d9253d033a0169cae56a0b94d75f68fa81642bb847 -SHA256 (distcc-3.1-freedesktop.patch) = bf8694f4d1eb5e757615929bc58587f538ce733891097eb42204423cab644798 -SHA256 (distcc-3.1-python.patch) = 8ba3c0745a30b5901cfb37f4231d754e5779cbc5a6fa173fb196661d2a035cc2 -SHA256 (distcc-3.1-argc-fix.patch) = e576553f27c7fabc2dcd3f361a98e2db70fef9fa4f08df91a8bb00c178912a1b diff --git a/distcc/Pkgfile b/distcc/Pkgfile index 58195471..47c5702f 100644 --- a/distcc/Pkgfile +++ b/distcc/Pkgfile @@ -1,41 +1,33 @@ # Description: A tool to distribute compilations. # URL: http://distcc.org/ # Maintainer: Danny Rawlins, crux at romster dot me -# Packager: Johannes Winkelmann, jw at tks6 dot net -# Optional: python +# Optional: python3 gtk avahi name=distcc -version=3.1 -release=6 -source=(https://github.com/distcc/distcc/archive/$name-$version.tar.gz - distccd - distcc-3.1-freedesktop.patch - distcc-3.1-python.patch - distcc-3.1-argc-fix.patch) +version=3.3.3 +release=1 +source=(https://github.com/distcc/distcc/releases/download/v$version/$name-$version.... + distccd) build() { - #cd $name-$version - cd distcc-distcc-3.1 + cd $name-$version - ./autogen.sh +[ -e '/usr/lib/pkgconfig/python-3.7.pc' ] || PKGMK_DISTCC+=' --disable-pump-mode' +[ -e '/usr/lib/pkgconfig/gtk+-2.0.pc' ] || PKGMK_DISTCC+=' --without-gtk' +[ -e '/usr/lib/pkgconfig/popt.pc' ] || PKGMK_DISTCC+=' --with-included-popt' - patch -p 1 -i $SRC/distcc-3.1-freedesktop.patch - patch -p 1 -i $SRC/distcc-3.1-python.patch - patch -p 2 -i $SRC/distcc-3.1-argc-fix.patch + ./autogen.sh - ./configure \ + ./configure ${PKGMK_DISTCC} \ --prefix=/usr \ - --mandir=/usr/share/man \ - --without-gnome \ - --without-gtk \ - --disable-Werror \ - --with-included-popt + --sysconfdir=/etc \ + --enable-rfc2553 \ + --disable-Werror make make DESTDIR=$PKG install # distccd should be in sbin - install -d $PKG/usr/sbin mv $PKG/usr/bin/distccd $PKG/usr/sbin/distccd # install service @@ -49,11 +41,11 @@ build() { done cd - - rm -rf $PKG/usr/share/doc $PKG/usr/etc/default $PKG/usr/etc/distcc - rmdir $PKG/usr/etc + # cleanup + rm -r $PKG/usr/share/doc $PKG/etc/distcc $PKG/etc/default + rm $PKG//usr/sbin/update-distcc-symlinks # python is required for pump mode - if [ "$(prt-get isinst python)" = 'package python is not installed' ]; then - rm $PKG/usr/share/man/man1/{pump,include_server}.1 - fi +[ -e '/usr/lib/pkgconfig/python-3.7.pc' ] || \ + rm $PKG/usr/share/man/man1/{pump,include_server}.1.gz } diff --git a/distcc/distcc-3.1-argc-fix.patch b/distcc/distcc-3.1-argc-fix.patch deleted file mode 100644 index d7f30b55..00000000 --- a/distcc/distcc-3.1-argc-fix.patch +++ /dev/null @@ -1,17 +0,0 @@ -this fixes virtualbox not compiling with distcc - -https://bugs.gentoo.org/show_bug.cgi?id=351979 -http://code.google.com/p/distcc/issues/detail?id=83 -http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=626926 - ---- distcc-3.1.orig/source/src/arg.c -+++ distcc-3.1/source/src/arg.c -@@ -515,6 +515,8 @@ - } - free(argv); - *argv_ptr = argv = new_argv; -+ i += extra_args - 1; -+ argc += extra_args - 1; - } - } - return 0; diff --git a/distcc/distcc-3.1-freedesktop.patch b/distcc/distcc-3.1-freedesktop.patch deleted file mode 100644 index b23db21a..00000000 --- a/distcc/distcc-3.1-freedesktop.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff -Naur distcc-3.1.orig/Makefile.in distcc-3.1/Makefile.in ---- distcc-3.1.orig/Makefile.in 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/Makefile.in 2009-02-02 00:40:20.000000000 +0900 -@@ -49,13 +49,14 @@ - includedir = @includedir@ - oldincludedir = /usr/include - docdir = @docdir@ --pkgdatadir = $(datadir)/@PACKAGE_NAME@ -+icondir = $(datadir)/pixmaps -+desktopdir = $(datadir)/applications - - include_server_builddir = $(builddir)/_include_server - - # These must be done from here, not from autoconf, because they can - # contain variable expansions written in Make syntax. Ew. --DIR_DEFS = -DSYSCONFDIR="\"${sysconfdir}\"" -DPKGDATADIR="\"${pkgdatadir}\"" -+DIR_DEFS = -DSYSCONFDIR="\"${sysconfdir}\"" -DICONDIR="\"${icondir}\"" - - # arguments to pkgconfig - GNOME_PACKAGES = @GNOME_PACKAGES@ -@@ -1003,7 +1004,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 -@@ -1086,10 +1088,10 @@ - done - - install-gnome-data: $(gnome_data) -- $(mkinstalldirs) "$(DESTDIR)$(pkgdatadir)" -- for p in $(gnome_data); do \ -- $(INSTALL_DATA) "$$p" "$(DESTDIR)$(pkgdatadir)" || exit 1; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(icondir) -+ $(mkinstalldirs) $(DESTDIR)$(desktopdir) -+ $(INSTALL_DATA) gnome/distccmon-gnome-icon.png $(DESTDIR)$(icondir) -+ $(INSTALL_DATA) gnome/distccmon-gnome.desktop $(DESTDIR)$(desktopdir) - - install-conf: $(conf_files) $(default_files) - $(mkinstalldirs) "$(DESTDIR)$(sysconfdir)/distcc" -diff -Naur distcc-3.1.orig/gnome/distccmon-gnome.desktop distcc-3.1/gnome/distccmon-gnome.desktop ---- distcc-3.1.orig/gnome/distccmon-gnome.desktop 2008-12-03 06:50:27.000000000 +0900 -+++ distcc-3.1/gnome/distccmon-gnome.desktop 2009-02-02 00:40:55.000000000 +0900 -@@ -1,13 +1,11 @@ - [Desktop Entry] --Version=0.9.4 --Encoding=UTF-8 - Exec=distccmon-gnome - Name=distcc monitor - GenericName=Distributed Compile Monitor - Comment=Graphical view of distributed compile tasks --Icon=distccmon-gnome-icon.png -+Icon=distccmon-gnome-icon - TryExec=distccmon-gnome - Terminal=false - Type=Application --Categories=GNOME;Application;Development; -+Categories=GNOME;Development; - StartupNotify=true -diff -Naur distcc-3.1.orig/src/mon-gnome.c distcc-3.1/src/mon-gnome.c ---- distcc-3.1.orig/src/mon-gnome.c 2008-12-03 06:50:25.000000000 +0900 -+++ distcc-3.1/src/mon-gnome.c 2009-02-02 00:41:18.000000000 +0900 -@@ -599,7 +599,7 @@ - - #if GTK_CHECK_VERSION(2,2,0) - gtk_window_set_icon_from_file (GTK_WINDOW (mainwin), -- PKGDATADIR "/distccmon-gnome-icon.png", -+ ICONDIR "/distccmon-gnome-icon.png", - NULL); - #endif - diff --git a/distcc/distcc-3.1-python.patch b/distcc/distcc-3.1-python.patch deleted file mode 100644 index 733357a5..00000000 --- a/distcc/distcc-3.1-python.patch +++ /dev/null @@ -1,258 +0,0 @@ -diff -Naur distcc-3.1.orig/bench/statistics.py distcc-3.1/bench/statistics.py ---- distcc-3.1.orig/bench/statistics.py 2008-12-03 06:50:21.000000000 +0900 -+++ distcc-3.1/bench/statistics.py 2009-03-17 01:29:26.000000000 +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.1.orig/configure distcc-3.1/configure ---- distcc-3.1.orig/configure 2008-12-03 06:50:34.000000000 +0900 -+++ distcc-3.1/configure 2009-03-17 01:31:09.000000000 +0900 -@@ -3629,7 +3629,7 @@ - # - # NB: Cannot use AC_CONFIG_LIBOBJ_DIR here, because it's not present - # in autoconf 2.53. --for ac_prog in python2.5 python-2.5 python2.4 python-2.4 python -+for ac_prog in python - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 -diff -Naur distcc-3.1.orig/configure.ac distcc-3.1/configure.ac ---- distcc-3.1.orig/configure.ac 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/configure.ac 2009-03-17 01:29:04.000000000 +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.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.1.orig/include_server/basics.py distcc-3.1/include_server/basics.py ---- distcc-3.1.orig/include_server/basics.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/basics.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.4 -+#!/usr/bin/python - # - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/basics_test.py distcc-3.1/include_server/basics_test.py ---- distcc-3.1.orig/include_server/basics_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/basics_test.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/c_extensions_test.py distcc-3.1/include_server/c_extensions_test.py ---- distcc-3.1.orig/include_server/c_extensions_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/c_extensions_test.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.4 -+#!/usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/cache_basics.py distcc-3.1/include_server/cache_basics.py ---- distcc-3.1.orig/include_server/cache_basics.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/cache_basics.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/compiler_defaults.py distcc-3.1/include_server/compiler_defaults.py ---- distcc-3.1.orig/include_server/compiler_defaults.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/compiler_defaults.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/compress_files.py distcc-3.1/include_server/compress_files.py ---- distcc-3.1.orig/include_server/compress_files.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/compress_files.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/include_analyzer.py distcc-3.1/include_server/include_analyzer.py ---- distcc-3.1.orig/include_server/include_analyzer.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/include_analyzer.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/include_analyzer_memoizing_node.py distcc-3.1/include_server/include_analyzer_memoizing_node.py ---- distcc-3.1.orig/include_server/include_analyzer_memoizing_node.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/include_analyzer_memoizing_node.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/include_analyzer_memoizing_node_test.py distcc-3.1/include_server/include_analyzer_memoizing_node_test.py ---- distcc-3.1.orig/include_server/include_analyzer_memoizing_node_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/include_analyzer_memoizing_node_test.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/include_analyzer_test.py distcc-3.1/include_server/include_analyzer_test.py ---- distcc-3.1.orig/include_server/include_analyzer_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/include_analyzer_test.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/include_server.py distcc-3.1/include_server/include_server.py ---- distcc-3.1.orig/include_server/include_server.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/include_server.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.4 -+#!/usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/include_server_test.py distcc-3.1/include_server/include_server_test.py ---- distcc-3.1.orig/include_server/include_server_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/include_server_test.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.4 -+#!/usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/macro_eval.py distcc-3.1/include_server/macro_eval.py ---- distcc-3.1.orig/include_server/macro_eval.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/macro_eval.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/macro_eval_test.py distcc-3.1/include_server/macro_eval_test.py ---- distcc-3.1.orig/include_server/macro_eval_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/macro_eval_test.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/mirror_path.py distcc-3.1/include_server/mirror_path.py ---- distcc-3.1.orig/include_server/mirror_path.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/mirror_path.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.4 -+#!/usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/mirror_path_test.py distcc-3.1/include_server/mirror_path_test.py ---- distcc-3.1.orig/include_server/mirror_path_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/mirror_path_test.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/parse_command.py distcc-3.1/include_server/parse_command.py ---- distcc-3.1.orig/include_server/parse_command.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/parse_command.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/parse_command_test.py distcc-3.1/include_server/parse_command_test.py ---- distcc-3.1.orig/include_server/parse_command_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/parse_command_test.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/parse_file.py distcc-3.1/include_server/parse_file.py ---- distcc-3.1.orig/include_server/parse_file.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/parse_file.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/parse_file_test.py distcc-3.1/include_server/parse_file_test.py ---- distcc-3.1.orig/include_server/parse_file_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/parse_file_test.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/run.py distcc-3.1/include_server/run.py ---- distcc-3.1.orig/include_server/run.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/run.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/setup.py distcc-3.1/include_server/setup.py ---- distcc-3.1.orig/include_server/setup.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/setup.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.4 -+#!/usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/statistics.py distcc-3.1/include_server/statistics.py ---- distcc-3.1.orig/include_server/statistics.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/statistics.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - # - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/test/onetest.py distcc-3.1/test/onetest.py ---- distcc-3.1.orig/test/onetest.py 2008-12-03 06:50:22.000000000 +0900 -+++ distcc-3.1/test/onetest.py 2009-03-17 01:29:44.000000000 +0900 -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.4 -+#!/usr/bin/python - # - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/test/testdistcc.py distcc-3.1/test/testdistcc.py ---- distcc-3.1.orig/test/testdistcc.py 2008-12-03 06:50:22.000000000 +0900 -+++ distcc-3.1/test/testdistcc.py 2009-03-17 01:29:36.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python2.2 -+#! /usr/bin/env python - - # Copyright (C) 2002, 2003, 2004 by Martin Pool <mbp@samba.org> - # Copyright 2007 Google Inc.