[pkgsrc/trunk]: pkgsrc/devel distcc: updated to 3.3

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/devel distcc: updated to 3.3
From: adam <adam%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 09:36:45 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/1c6344744cb9
branches:  trunk
changeset: 382704:1c6344744cb9
user:      adam <adam%pkgsrc.org@localhost>
date:      Wed Jul 11 07:30:40 2018 +0000

description:
distcc: updated to 3.3

3.3 - Charlie the unicorn
* 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).
For those upgrading: you must run update-distcc-symlinks on every server machine, and add manually (see MASQUERADING of distcc(1)) those compilers it does not detect.

diffstat:

 devel/distcc-pump/PLIST                |   4 +--
 devel/distcc/Makefile                  |   4 +-
 devel/distcc/Makefile.common           |  15 ++++++-----
 devel/distcc/PLIST                     |  10 +++++++-
 devel/distcc/distinfo                  |  13 ++++-----
 devel/distcc/patches/patch-Makefile.in |  43 ++++++++++++++++++++++++++++++++++
 devel/distcc/patches/patch-ae          |  31 ------------------------
 devel/distcc/patches/patch-src_io.c    |  13 ----------
 devel/distccmon-gnome/Makefile         |   5 +--
 devel/distccmon-gtk/Makefile           |   5 +--
 10 files changed, 73 insertions(+), 70 deletions(-)

diffs (243 lines):

diff -r 2d4876ba7953 -r 1c6344744cb9 devel/distcc-pump/PLIST
--- a/devel/distcc-pump/PLIST   Wed Jul 11 06:39:27 2018 +0000
+++ b/devel/distcc-pump/PLIST   Wed Jul 11 07:30:40 2018 +0000
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:48:41 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/07/11 07:30:40 adam Exp $
 bin/pump
-${PYSITELIB}/include_server/__init__.py
-${PYSITELIB}/include_server/__init__.pyc
 ${PYSITELIB}/include_server/basics.py
 ${PYSITELIB}/include_server/basics.pyc
 ${PYSITELIB}/include_server/basics_test.py
diff -r 2d4876ba7953 -r 1c6344744cb9 devel/distcc/Makefile
--- a/devel/distcc/Makefile     Wed Jul 11 06:39:27 2018 +0000
+++ b/devel/distcc/Makefile     Wed Jul 11 07:30:40 2018 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2014/04/25 16:13:31 adam Exp $
+# $NetBSD: Makefile,v 1.37 2018/07/11 07:30:40 adam Exp $
 
-PKGNAME=       ${DISTNAME:S/rc1//}
+PKGNAME=       ${DISTNAME}
 COMMENT=       Tool for distributed C/C++ compiling
 
 .include "Makefile.common"
diff -r 2d4876ba7953 -r 1c6344744cb9 devel/distcc/Makefile.common
--- a/devel/distcc/Makefile.common      Wed Jul 11 06:39:27 2018 +0000
+++ b/devel/distcc/Makefile.common      Wed Jul 11 07:30:40 2018 +0000
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile.common,v 1.12 2018/07/04 13:40:13 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.13 2018/07/11 07:30:40 adam Exp $
 # used by devel/distcc-pump/Makefile
 # used by devel/distccmon-gnome/Makefile
 # used by devel/distccmon-gtk/Makefile
 
-# XXX: in the future, remove rc1 substitutions from Makefiles mentioned above
-DISTNAME=      distcc-3.2rc1
+DISTNAME=      distcc-3.3
 CATEGORIES=    devel
-MASTER_SITES=  http://distcc.googlecode.com/files/
-EXTRACT_SUFX=  .tar.bz2
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=distcc/}
+GITHUB_PROJECT=        distcc
+GITHUB_RELEASE=        v${PKGVERSION_NOREV}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://distcc.org/
+HOMEPAGE=      https://github.com/distcc/distcc
 LICENSE=       gnu-gpl-v2
 
 DISTINFO_FILE=         ${.CURDIR}/../../devel/distcc/distinfo
@@ -21,7 +21,8 @@
 CONFIGURE_ARGS+=       --disable-Werror
 CONFIGURE_ARGS+=       --enable-rfc2553
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
-#CONFIGURE_ENV+=       ac_cv_path_PYTHON=/dev/null
+CONFIGURE_ARGS+=       --without-avahi
+CONFIGURE_ARGS+=       --without-libiberty
 
 CHECK_PORTABILITY_SKIP+=       contrib/redhat/*
 
diff -r 2d4876ba7953 -r 1c6344744cb9 devel/distcc/PLIST
--- a/devel/distcc/PLIST        Wed Jul 11 06:39:27 2018 +0000
+++ b/devel/distcc/PLIST        Wed Jul 11 07:30:40 2018 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2014/03/11 14:05:01 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.17 2018/07/11 07:30:40 adam Exp $
 bin/distcc
 bin/distccd
 bin/distccmon-text
@@ -7,6 +7,7 @@
 man/man1/distccd.1
 man/man1/distccmon-text.1
 man/man1/include_server.1
+man/man1/lsdistcc.1.gz
 man/man1/pump.1
 share/doc/distcc/AUTHORS
 share/doc/distcc/COPYING
@@ -15,12 +16,19 @@
 share/doc/distcc/README
 share/doc/distcc/README.pump
 share/doc/distcc/TODO
+share/doc/distcc/example/README
+share/doc/distcc/example/default
+share/doc/distcc/example/hosts.allow
 share/doc/distcc/example/init
 share/doc/distcc/example/init-suse
 share/doc/distcc/example/logrotate
+share/doc/distcc/example/services
 share/doc/distcc/example/xinetd
 share/doc/distcc/protocol-1.txt
 share/doc/distcc/protocol-2.txt
+share/doc/distcc/protocol-3-impl.txt
+share/doc/distcc/protocol-3.txt
+share/doc/distcc/protocol-gssapi.txt
 share/doc/distcc/reporting-bugs.txt
 share/doc/distcc/status-1.txt
 share/doc/distcc/survey.txt
diff -r 2d4876ba7953 -r 1c6344744cb9 devel/distcc/distinfo
--- a/devel/distcc/distinfo     Wed Jul 11 06:39:27 2018 +0000
+++ b/devel/distcc/distinfo     Wed Jul 11 07:30:40 2018 +0000
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.23 2015/11/03 03:27:23 agc Exp $
+$NetBSD: distinfo,v 1.24 2018/07/11 07:30:40 adam Exp $
 
-SHA1 (distcc-3.2rc1.tar.bz2) = 7564e4a4890ad6ff78ec0de620329b71179361e7
-RMD160 (distcc-3.2rc1.tar.bz2) = 505447b910d90ea403a98fe0d0a3a0fa92cd7039
-SHA512 (distcc-3.2rc1.tar.bz2) = 98b2e8423d724bbb6a615d946d170441a8e293310785f867d7a277b318c043a37b0af39ae8ed1f7a0667803de9db1d1925199bad85130cf9bd9cb347635125ee
-Size (distcc-3.2rc1.tar.bz2) = 609904 bytes
+SHA1 (distcc-3.3.tar.gz) = 20c9f3085d7211945b7f3f8a60bce704a8a0f127
+RMD160 (distcc-3.3.tar.gz) = b74efe4c744b1bd1c4c6c998d4c8c481c38e293f
+SHA512 (distcc-3.3.tar.gz) = 459c175c8ac905bc70299e77ac11b6d24782bd69c9152126249c9af8fbb4c269e6f7317b02abf50cf6cc0405dd0f887e803320e19dc528a19c4c488640c615dc
+Size (distcc-3.3.tar.gz) = 1171281 bytes
+SHA1 (patch-Makefile.in) = c5da08b6269413857b04854592b0271d76337982
 SHA1 (patch-aa) = f459c5e80a60b80f391d9d6c37d8ad2574740372
 SHA1 (patch-ab) = c3a306be0a3576b33f506bd6516d8242ceec07ca
 SHA1 (patch-ac) = 618015e2954dc54c6db3712381749feb17106647
-SHA1 (patch-ae) = d4e5eba767f08a1c346c0223ddf88e98a5ed7c59
-SHA1 (patch-src_io.c) = 5c662a4f9af20b5cffbd6285a3b0d6d6c4066571
diff -r 2d4876ba7953 -r 1c6344744cb9 devel/distcc/patches/patch-Makefile.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/distcc/patches/patch-Makefile.in    Wed Jul 11 07:30:40 2018 +0000
@@ -0,0 +1,43 @@
+$NetBSD: patch-Makefile.in,v 1.1 2018/07/11 07:30:40 adam Exp $
+
+Do not install stuff that requires Python.
+
+--- Makefile.in.orig   2018-03-07 23:03:59.000000000 +0000
++++ Makefile.in
+@@ -420,8 +420,7 @@ bin_PROGRAMS = \
+       lsdistcc@EXEEXT@ \
+       @GNOME_BIN@ 
+ 
+-sbin_PROGRAMS = \
+-      update-distcc-symlinks
++sbin_PROGRAMS =
+ 
+ check_PROGRAMS = \
+       h_argvtostr@EXEEXT@ \
+@@ -465,7 +464,7 @@ check_include_server_PY = \
+ 
+ ## NOTE: "all" must be the first (default) rule, aside from patterns.
+ 
+-all: $(bin_PROGRAMS) $(sbin_PROGRAMS) pump include-server
++all: $(bin_PROGRAMS) $(sbin_PROGRAMS)
+ 
+ #  src/config.h.in is used by config.status
+ Makefile: Makefile.in src/config.h.in config.status
+@@ -1040,7 +1039,7 @@ showpaths:
+ # tricky features so mkinstalldirs and cp will do
+ 
+ install: showpaths install-doc install-man install-programs \
+-      install-include-server install-example @INSTALL_GNOME@ install-conf
++      install-example @INSTALL_GNOME@
+ 
+ install-programs: $(bin_PROGRAMS) $(sbin_PROGRAMS)
+       $(mkinstalldirs) "$(DESTDIR)$(bindir)"
+@@ -1098,7 +1097,7 @@ install-include-server: include-server p
+         INCLUDE_SERVER=`grep '/include_server.py$$' "$(include_server_builddir)/install.log"` && \
+         sed "s,^include_server='',include_server='$$INCLUDE_SERVER'," \
+           pump > "$(include_server_builddir)/pump" && \
+-        $(INSTALL_PROGRAM) "$(include_server_builddir)/pump" "$(DESTDIR)$(bindir)"; \
++        $(INSTALL_SCRIPT) "$(include_server_builddir)/pump" "$(DESTDIR)$(bindir)"; \
+       fi
+ 
+ install-man: $(man1_MEN)
diff -r 2d4876ba7953 -r 1c6344744cb9 devel/distcc/patches/patch-ae
--- a/devel/distcc/patches/patch-ae     Wed Jul 11 06:39:27 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2009/01/17 13:27:48 adam Exp $
-
---- Makefile.in.orig   2008-12-02 22:50:31.000000000 +0100
-+++ Makefile.in
-@@ -447,7 +447,7 @@ check_include_server_PY = \
- 
- ## NOTE: "all" must be the first (default) rule, aside from patterns.
- 
--all: $(bin_PROGRAMS) pump include-server
-+all: $(bin_PROGRAMS)
- 
- #  src/config.h.in is used by config.status
- Makefile: Makefile.in src/config.h.in config.status
-@@ -1010,7 +1010,7 @@ showpaths:
- # tricky features so mkinstalldirs and cp will do
- 
- install: showpaths install-doc install-man install-programs \
--      install-include-server install-example @INSTALL_GNOME@ install-conf
-+      install-example @INSTALL_GNOME@
- 
- install-programs: $(bin_PROGRAMS)
-       $(mkinstalldirs) "$(DESTDIR)$(bindir)"
-@@ -1064,7 +1064,7 @@ install-include-server: include-server p
-         INCLUDE_SERVER=`grep '/include_server.py$$' "$(include_server_builddir)/install.log"` && \
-         sed "s,^include_server='',include_server='$$INCLUDE_SERVER'," \
-           pump > "$(include_server_builddir)/pump" && \
--        $(INSTALL_PROGRAM) "$(include_server_builddir)/pump" "$(DESTDIR)$(bindir)"; \
-+        $(INSTALL_SCRIPT) "$(include_server_builddir)/pump" "$(DESTDIR)$(bindir)"; \
-       fi
- 
- install-man: $(man1_MEN)
diff -r 2d4876ba7953 -r 1c6344744cb9 devel/distcc/patches/patch-src_io.c
--- a/devel/distcc/patches/patch-src_io.c       Wed Jul 11 06:39:27 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_io.c,v 1.1 2012/12/24 13:45:02 ryoon Exp $
-
---- src/io.c.orig      2008-12-02 21:50:25.000000000 +0000
-+++ src/io.c
-@@ -242,7 +242,7 @@ int dcc_writex(int fd, const void *buf, 
-  **/
- int tcp_cork_sock(int POSSIBLY_UNUSED(fd), int POSSIBLY_UNUSED(corked))
- {
--#ifdef TCP_CORK
-+#if defined(TCP_CORK) && defined(SOL_TCP)
-     if (!dcc_getenv_bool("DISTCC_TCP_CORK", 1))
-         return 0;
- 
diff -r 2d4876ba7953 -r 1c6344744cb9 devel/distccmon-gnome/Makefile
--- a/devel/distccmon-gnome/Makefile    Wed Jul 11 06:39:27 2018 +0000
+++ b/devel/distccmon-gnome/Makefile    Wed Jul 11 07:30:40 2018 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.60 2018/04/16 14:34:19 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2018/07/11 07:30:40 adam Exp $
 
-PKGNAME=       ${DISTNAME:S/-/-gnome-/:S/rc1//}
-PKGREVISION=   10
+PKGNAME=       ${DISTNAME:S/-/-gnome-/}
 CATEGORIES+=   gnome
 COMMENT=       Graphical monitor for distcc, the distributed C/C++ compiler
 
diff -r 2d4876ba7953 -r 1c6344744cb9 devel/distccmon-gtk/Makefile
--- a/devel/distccmon-gtk/Makefile      Wed Jul 11 06:39:27 2018 +0000
+++ b/devel/distccmon-gtk/Makefile      Wed Jul 11 07:30:40 2018 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2018/07/04 13:40:13 jperkin Exp $
+# $NetBSD: Makefile,v 1.39 2018/07/11 07:30:40 adam Exp $
 
-PKGNAME=       ${DISTNAME:S/-/-gtk-/:S/rc1//}
-PKGREVISION=   7
+PKGNAME=       ${DISTNAME:S/-/-gtk-/}
 COMMENT=       Graphical monitor for distcc, the distributed C/C++ compiler
 
 .include "../../devel/distcc/Makefile.common"
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Updated devel/distcc, security/py-cryptodome
Next by Date: [pkgsrc/trunk]: pkgsrc/databases/py-asyncpg py-asyncpg: updated to 0.17.0
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated devel/distcc, security/py-cryptodome
Next by Thread: [pkgsrc/trunk]: pkgsrc/databases/py-asyncpg py-asyncpg: updated to 0.17.0
Indexes:
Home | Main Index | Thread Index | Old Index