pool/distcc
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 586294 from devel:tools:building

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/586294
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/distcc?expand=0&rev=4
This commit is contained in:
Dominique Leuenberger 2018-03-20 20:56:10 +00:00 committed by Git OBS Bridge
commit 3abdd3d3e2
9 changed files with 280 additions and 12126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
distcc-3.0-fix-fortify.patch
View File

@ -1,11 +0,0 @@
diff -ru a/src/snprintf.h b/src/snprintf.h
--- a/src/snprintf.h 2008-08-06 15:52:06.000000000 -0500
+++ b/src/snprintf.h 2009-01-04 15:19:22.000000000 -0600
@@ -7,6 +7,7 @@
*/
#include <stdarg.h>
+#include "config.h"
#ifdef __GNUC__
/** Use gcc attribute to check printf fns. a1 is the 1-based index of

29
distcc-3.2_rc1-freedesktop.patch
View File

@ -1,6 +1,5 @@
diff -Naur distcc-3.2rc1.orig/Makefile.in distcc-3.2rc1/Makefile.in --- a/Makefile.in 2011-10-26 11:07:15.000000000 +0900
--- distcc-3.2rc1.orig/Makefile.in 2011-10-26 11:07:15.000000000 +0900 +++ b/Makefile.in 2011-10-27 16:57:46.815272689 +0900
+++ distcc-3.2rc1/Makefile.in 2011-10-27 16:57:46.815272689 +0900
@@ -50,13 +50,14 @@ @@ -50,13 +50,14 @@
includedir = @includedir@ includedir = @includedir@
oldincludedir = /usr/include oldincludedir = /usr/include
@ -18,16 +17,6 @@ diff -Naur distcc-3.2rc1.orig/Makefile.in distcc-3.2rc1/Makefile.in
# arguments to pkgconfig # arguments to pkgconfig
GNOME_PACKAGES = @GNOME_PACKAGES@ 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 @@ @@ -1108,10 +1110,10 @@
done done
@ -43,18 +32,17 @@ diff -Naur distcc-3.2rc1.orig/Makefile.in distcc-3.2rc1/Makefile.in
install-conf: $(conf_files) $(default_files) install-conf: $(conf_files) $(default_files)
$(mkinstalldirs) "$(DESTDIR)$(sysconfdir)/distcc" $(mkinstalldirs) "$(DESTDIR)$(sysconfdir)/distcc"
diff -Naur distcc-3.2rc1.orig/gnome/distccmon-gnome.desktop distcc-3.2rc1/gnome/distccmon-gnome.desktop --- a/gnome/distccmon-gnome.desktop 2011-04-06 03:58:58.000000000 +0900
--- distcc-3.2rc1.orig/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
+++ distcc-3.2rc1/gnome/distccmon-gnome.desktop 2011-10-27 17:01:50.792242592 +0900
@@ -1,6 +1,4 @@ @@ -1,6 +1,4 @@
[Desktop Entry] [Desktop Entry]
-Version=0.9.4 -Version=0.9.4
-Encoding=UTF-8 -Encoding=UTF-8
Exec=distccmon-gnome Exec=distccmon-gnome
Name=distcc monitor Name=distcc monitor
Name[sv]=distcc övervakare Name[sv]=distcc övervakare
@@ -8,9 +6,9 @@ @@ -8,9 +6,9 @@
GenericName[sv]=Distribuerad kompilerings-övervakare GenericName[sv]=Distribuerad kompilerings-övervakare
Comment=Graphical view of distributed compile tasks Comment=Graphical view of distributed compile tasks
Comment[sv]=Grafisk vy av distribuerade kompileringsuppgifter Comment[sv]=Grafisk vy av distribuerade kompileringsuppgifter
-Icon=distccmon-gnome-icon.png -Icon=distccmon-gnome-icon.png
@ -65,9 +53,8 @@ diff -Naur distcc-3.2rc1.orig/gnome/distccmon-gnome.desktop distcc-3.2rc1/gnome/
-Categories=GNOME;Application;Development; -Categories=GNOME;Application;Development;
+Categories=GNOME;Development; +Categories=GNOME;Development;
StartupNotify=true StartupNotify=true
diff -Naur distcc-3.2rc1.orig/src/mon-gnome.c distcc-3.2rc1/src/mon-gnome.c --- a/src/mon-gnome.c 2008-12-03 06:50:25.000000000 +0900
--- distcc-3.2rc1.orig/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
+++ distcc-3.2rc1/src/mon-gnome.c 2011-10-27 16:54:50.220566026 +0900
@@ -599,7 +599,7 @@ @@ -599,7 +599,7 @@
#if GTK_CHECK_VERSION(2,2,0) #if GTK_CHECK_VERSION(2,2,0)

17
distcc-3.2_rc1-gssapi.patch
View File

@ -1,26 +1,25 @@
diff -Naur distcc-3.2rc1.orig/configure.ac distcc-3.2rc1/configure.ac --- a/configure.ac 2011-10-21 13:40:55.000000000 +0900
--- distcc-3.2rc1.orig/configure.ac 2011-10-21 13:40:55.000000000 +0900 +++ b/configure.ac 2011-10-27 18:06:58.938922585 +0900
+++ distcc-3.2rc1/configure.ac 2011-10-27 18:06:58.938922585 +0900 @@ -14,6 +14,8 @@
@@ -15,6 +15,8 @@
AC_CONFIG_HEADERS(src/config.h) AC_CONFIG_HEADERS(src/config.h)
AC_CANONICAL_HOST
+PKG_PROG_PKG_CONFIG +PKG_PROG_PKG_CONFIG
+ +
# FreeBSD installs its version of libpopt into /usr/local/, but does # FreeBSD installs its version of libpopt into /usr/local/, but does
# not put that on the default library and header path. # not put that on the default library and header path.
# Solaris doesn't even ship libpopt. We used to add that path if # 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])]) [provide mutual authentication services via the GSS-API])])
if test x"$with_auth" = xyes; then if test x"$with_auth" = xyes; then
- AC_SEARCH_LIBS([gss_init_sec_context], - 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]) - AC_DEFINE(HAVE_GSSAPI, 1, [Define if the GSS_API is available])
+ PKG_CHECK_MODULES(GSSAPI, libgssglue, + PKG_CHECK_MODULES(GSSAPI, libgssglue,
+ [AC_DEFINE(HAVE_GSSAPI, 1, [Define if the GSS_API is available]) + [AC_DEFINE(HAVE_GSSAPI, 1, [Define if the GSS_API is available])
+ CFLAGS="$CFLAGS $GSSAPI_CFLAGS" + CFLAGS="$CFLAGS $GSSAPI_CFLAGS"
+ LIBS="$LIBS $GSSAPI_LIBS" + LIBS="$LIBS $GSSAPI_LIBS"
AUTH_COMMON_OBJS="src/auth_common.o" AUTH_COMMON_OBJS="src/auth_common.o"
AUTH_DISTCC_OBJS="src/auth_distcc.o" AUTH_DISTCC_OBJS="src/auth_distcc.o"
- AUTH_DISTCCD_OBJS="src/auth_distccd.o", - AUTH_DISTCCD_OBJS="src/auth_distccd.o",

432
distcc-3.2_rc1-python.patch
View File

@ -1,246 +1,216 @@
diff -Naur distcc-3.2rc1.orig/bench/statistics.py distcc-3.2rc1/bench/statistics.py --- a/bench/statistics.py 2008-12-03 06:50:21.000000000 +0900
--- distcc-3.2rc1.orig/bench/statistics.py 2008-12-03 06:50:21.000000000 +0900 +++ b/bench/statistics.py 2011-10-27 17:05:08.418023081 +0900
+++ distcc-3.2rc1/bench/statistics.py 2011-10-27 17:05:08.418023081 +0900
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-#! /usr/bin/env python2.2 -#! /usr/bin/env python2.2
+#! /usr/bin/env python +#! /usr/bin/env python
# benchmark -- automated system for testing distcc correctness # benchmark -- automated system for testing distcc correctness
# and performance on various source trees. # and performance on various source trees.
diff -Naur distcc-3.2rc1.orig/configure.ac distcc-3.2rc1/configure.ac --- a/include_server/basics.py 2008-12-03 06:50:31.000000000 +0900
--- distcc-3.2rc1.orig/configure.ac 2011-10-21 13:40:55.000000000 +0900 +++ b/include_server/basics.py 2011-10-27 17:05:08.421023097 +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 @@ @@ -1,4 +1,4 @@
-#!/usr/bin/python2.4 -#!/usr/bin/env python3
+#!/usr/bin/python +#!/usr/bin/python3
# #
# Copyright 2007 Google Inc. # Copyright 2007 Google Inc.
# #
diff -Naur distcc-3.2rc1.orig/include_server/basics_test.py distcc-3.2rc1/include_server/basics_test.py --- a/include_server/basics_test.py 2008-12-03 06:50:31.000000000 +0900
--- distcc-3.2rc1.orig/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
+++ distcc-3.2rc1/include_server/basics_test.py 2011-10-27 17:05:08.421023097 +0900
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-#! /usr/bin/python2.4 -#! /usr/bin/env python3
+#! /usr/bin/python3
# Copyright 2007 Google Inc.
#
--- 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/env python3
+#!/usr/bin/python3
# Copyright 2007 Google Inc.
#
--- 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/env python3
+#! /usr/bin/python3
# Copyright 2007 Google Inc.
#
--- 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/env python3
+#! /usr/bin/python3
# Copyright 2007 Google Inc.
#
--- 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/env python3
+#! /usr/bin/python3
# Copyright 2007 Google Inc.
#
--- 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/env python3
+#! /usr/bin/python3
# Copyright 2007 Google Inc.
#
--- 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/env python3
+#! /usr/bin/python3
# Copyright 2007 Google Inc.
#
--- 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/env python3
+#! /usr/bin/python3
# Copyright 2007 Google Inc.
#
--- 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/env python3
+#! /usr/bin/python3
# Copyright 2007 Google Inc.
#
--- 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/env python3
+#!/usr/bin/python3
# Copyright 2007 Google Inc.
#
--- 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/env python3
+#!/usr/bin/python3
# Copyright 2007 Google Inc.
#
--- 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/env python3
+#! /usr/bin/python3
# Copyright 2007 Google Inc.
#
--- 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/env python3
+#! /usr/bin/python3
# Copyright 2007 Google Inc.
#
--- 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/env python3
+#!/usr/bin/python3
# Copyright 2007 Google Inc.
#
--- 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/env python3
+#! /usr/bin/python3
# Copyright 2007 Google Inc.
#
--- 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/env python3
+#! /usr/bin/python3
# Copyright 2007 Google Inc.
#
--- 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/env python3
+#! /usr/bin/python3
# Copyright 2007 Google Inc.
#
--- 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/env python3
+#! /usr/bin/python3
# Copyright 2007 Google Inc.
#
--- 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/env python3
+#! /usr/bin/python3
# Copyright 2007 Google Inc.
#
--- 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/env python3
+#! /usr/bin/python3
# Copyright 2007 Google Inc.
#
--- 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/env python3
+#!/usr/bin/python3
# Copyright 2007 Google Inc.
#
--- 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/env python3
+#! /usr/bin/python3
#
# Copyright 2007 Google Inc.
#
--- 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/env python3
+#!/usr/bin/python3
#
# Copyright 2007 Google Inc.
#
--- 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 python3
+#! /usr/bin/python +#! /usr/bin/python
# 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
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
# 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
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.4
+#! /usr/bin/python
# 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
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.4
+#! /usr/bin/python
# 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
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.4
+#! /usr/bin/python
# 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
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.4
+#! /usr/bin/python
# 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
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.4
+#! /usr/bin/python
# 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
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.4
+#! /usr/bin/python
# 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
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.4
+#! /usr/bin/python
# 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
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
# 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
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
# 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
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.4
+#! /usr/bin/python
# 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
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.4
+#! /usr/bin/python
# 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
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
# 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
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.4
+#! /usr/bin/python
# 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
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.4
+#! /usr/bin/python
# 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
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.4
+#! /usr/bin/python
# 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
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.4
+#! /usr/bin/python
# 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
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.4
+#! /usr/bin/python
# 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
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.4
+#! /usr/bin/python
# 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
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
# 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
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.4
+#! /usr/bin/python
#
# 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
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python
#
# 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
@@ -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 (C) 2002, 2003, 2004 by Martin Pool <mbp@samba.org>
# Copyright 2007 Google Inc. # 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

3
distcc-3.3.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c389146e88e645304cdfd8ce5fb63de5dbdead76d5e3919692b757027f673537
size 997156

11811
distcc-minilzo-2.08.patch
View File

File diff suppressed because it is too large Load Diff

25
distcc.changes
View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Tue Mar 13 09:09:59 UTC 2018 - jengelh@inai.de
- Ensure neutrality of description.
-------------------------------------------------------------------
Tue Mar 13 00:02:21 UTC 2018 - avindra@opensuse.org
- 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
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 23 13:49:22 UTC 2017 - rbrown@suse.com Thu Nov 23 13:49:22 UTC 2017 - rbrown@suse.com

75
distcc.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package distcc # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -18,31 +18,30 @@
#Compat macro for new _fillupdir macro introduced in Nov 2017 #Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir} %if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates %define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif %endif
Name: distcc Name: distcc
Version: 3.2rc1 Version: 3.3
Release: 0 Release: 0
Summary: A fast, free distributed C/C++ compiler Summary: A distributed C/C++ compiler
License: GPL-2.0+ License: GPL-2.0-or-later
Group: Development/Tools/Building Group: Development/Tools/Building
Url: https://github.com/distcc/distcc 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 Source1: distccd.sysconfig
Source2: distccd.service Source2: distccd.service
Source3: distccd.firewall Source3: distccd.firewall
Patch0: distcc-3.0-fix-fortify.patch Patch1: distcc-3.2_rc1-freedesktop.patch
Patch2: distcc-3.2_rc1-freedesktop.patch Patch2: distcc-3.2_rc1-gssapi.patch
Patch3: distcc-3.2_rc1-gssapi.patch Patch3: distcc-3.2_rc1-python.patch
Patch4: distcc-3.2_rc1-python.patch
Patch5: distcc-minilzo-2.08.patch
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: binutils-devel
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gcc BuildRequires: gcc
BuildRequires: libtool BuildRequires: libtool
BuildRequires: make BuildRequires: make
BuildRequires: pkgconfig
BuildRequires: python BuildRequires: python
BuildRequires: systemd BuildRequires: systemd
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
@ -52,25 +51,25 @@ BuildRequires: pkgconfig(libgnome-2.0)
BuildRequires: pkgconfig(libgnomeui-2.0) BuildRequires: pkgconfig(libgnomeui-2.0)
BuildRequires: pkgconfig(libgssglue) BuildRequires: pkgconfig(libgssglue)
BuildRequires: pkgconfig(pango) BuildRequires: pkgconfig(pango)
BuildRequires: pkgconfig(python) BuildRequires: pkgconfig(python3)
Recommends: %{name}-server = %{version} Recommends: %{name}-server = %{version}
Suggests: %{name}-gui = %{version} Suggests: %{name}-gui = %{version}
%description %description
distcc is a program to distribute builds of C, C++, Objective C or Objective distcc is a program to distribute builds of C, C++, Objective C or
C++ code across several machines on a network. distcc should always generate Objective C++ code across several machines on a network, thereby
the same results as a local build, is simple to install and use, and is completing the task in less time. distcc should always generate the
usually much faster than a local compile. same results as a local build.
%package gui %package gui
Summary: GUI monitor for distcc server/client Summary: GUI monitor for distcc server/client
Group: Development/Tools/Building Group: Development/Tools/Building
%description gui %description gui
distcc is a program to distribute builds of C, C++, Objective C or Objective distcc is a program to distribute builds of C, C++, Objective C or
C++ code across several machines on a network. distcc should always generate Objective C++ code across several machines on a network, thereby
the same results as a local build, is simple to install and use, and is completing the task in less time. distcc should always generate the
usually much faster than a local compile. same results as a local build.
%package server %package server
Summary: Server for distributed C/C++ compilation Summary: Server for distributed C/C++ compilation
@ -82,12 +81,7 @@ Requires: %{name} = %{version}
This package contains the compilation server needed to use %{name}. This package contains the compilation server needed to use %{name}.
%prep %prep
%setup -q %autosetup -p1
%patch0 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
# do not use date/time in the c files # do not use date/time in the c files
modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")"
@ -103,7 +97,6 @@ autoreconf -fvi
export CFLAGS="%{optflags} -fno-strict-aliasing" export CFLAGS="%{optflags} -fno-strict-aliasing"
export CXXFLAGS="%{optflags} -fno-strict-aliasing" export CXXFLAGS="%{optflags} -fno-strict-aliasing"
%configure \ %configure \
--with-docdir=%{_docdir}/%{name} \
--disable-Werror \ --disable-Werror \
--enable-rfc2553 \ --enable-rfc2553 \
--with-gtk \ --with-gtk \
@ -117,7 +110,7 @@ sed -i \
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
%make_install %make_install docdir=%{_docdir}/%{name}
# service # service
mkdir -p %{buildroot}/%{_sbindir} mkdir -p %{buildroot}/%{_sbindir}
ln -sf service %{buildroot}/%{_sbindir}/rc%{name}d ln -sf service %{buildroot}/%{_sbindir}/rc%{name}d
@ -135,8 +128,9 @@ ln -sf %{_bindir}/%{name} %{buildroot}%{_libexecdir}/%{name}/bin/c++
ln -sf %{_bindir}/%{name} %{buildroot}%{_libexecdir}/%{name}/bin/cpp 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
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 # cleanups
%suse_update_desktop_file -r distccmon-gnome Development Building %suse_update_desktop_file -r distccmon-gnome Development Building
%fdupes ${buildroot} %fdupes ${buildroot}
@ -161,11 +155,11 @@ rm -rf %{buildroot}%{_docdir}/distcc/INSTALL
%desktop_database_postun %desktop_database_postun
%files %files
%defattr(-,root,root) %license COPYING
%doc AUTHORS doc/* NEWS README.pump TODO %doc AUTHORS doc/* NEWS README.pump TODO README survey.txt
%doc COPYING README survey.txt
%dir %{_libexecdir}/distcc %dir %{_libexecdir}/distcc
%dir %{_libexecdir}/distcc/bin %dir %{_libexecdir}/distcc/bin
%dir %{_docdir}/distcc
%{_libexecdir}/distcc/bin/c++ %{_libexecdir}/distcc/bin/c++
%{_libexecdir}/distcc/bin/cc %{_libexecdir}/distcc/bin/cc
%{_libexecdir}/distcc/bin/cpp %{_libexecdir}/distcc/bin/cpp
@ -173,19 +167,21 @@ rm -rf %{buildroot}%{_docdir}/distcc/INSTALL
%{_libexecdir}/distcc/bin/gcc %{_libexecdir}/distcc/bin/gcc
%{_libexecdir}/distcc/bin/clang %{_libexecdir}/distcc/bin/clang
%{_libexecdir}/distcc/bin/clang++ %{_libexecdir}/distcc/bin/clang++
%{_sbindir}/update-distcc-symlinks
%{_bindir}/distcc %{_bindir}/distcc
%{_bindir}/distccmon-text %{_bindir}/distccmon-text
%{_bindir}/lsdistcc %{_bindir}/lsdistcc
%{_bindir}/pump %{_bindir}/pump
%{_mandir}/man1/distcc.1.* %{_mandir}/man1/distcc.1%{?ext_man}
%{_mandir}/man1/lsdistcc.1%{?ext_man}
%{_mandir}/man1/pump* %{_mandir}/man1/pump*
%{_mandir}/man1/distccmon-text.1.* %{_mandir}/man1/distccmon-text.1%{?ext_man}
%dir %{_sysconfdir}/distcc %dir %{_sysconfdir}/distcc
%config(noreplace) %{_sysconfdir}/%{name}/hosts %config(noreplace) %{_sysconfdir}/%{name}/hosts
%files server %files server
%defattr(-,root,root) %license COPYING
%doc COPYING README %doc README
%{_bindir}/distccd %{_bindir}/distccd
%{_unitdir}/distccd.service %{_unitdir}/distccd.service
%{_sbindir}/rcdistccd %{_sbindir}/rcdistccd
@ -195,10 +191,9 @@ rm -rf %{buildroot}%{_docdir}/distcc/INSTALL
%{_mandir}/man1/include_server* %{_mandir}/man1/include_server*
%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/distccd %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/distccd
%{_fillupdir}/* %{_fillupdir}/*
%{python_sitearch}/include_server* %{python3_sitearch}/include_server*
%files gui %files gui
%defattr(-,root,root)
%{_bindir}/distccmon-gnome %{_bindir}/distccmon-gnome
%{_datadir}/applications/distccmon-gnome.desktop %{_datadir}/applications/distccmon-gnome.desktop
%{_datadir}/pixmaps/distccmon-gnome-icon.png %{_datadir}/pixmaps/distccmon-gnome-icon.png

3
v3.2rc1.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:33e85981ff6afd94efc38b23b2d8b9036b3dff2dc6eac6982b9ff0ae1de64caa
size 936590