Index: devel/distcc/Makefile =================================================================== --- devel/distcc/Makefile +++ devel/distcc/Makefile @@ -3,29 +3,31 @@ # $MCom: ports/devel/distcc/Makefile,v 1.3 2007/10/21 02:46:13 ahze Exp $ PORTNAME= distcc -PORTVERSION= 3.3.2 +PORTVERSION= 3.3.3 CATEGORIES= devel MAINTAINER= ports@FreeBSD.org -COMMENT= Distribute compilation of C(++) code acrosss machines on a network +COMMENT= Distribute compilation of C(++) code across machines on a network LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +BUILD_DEPENDS= ${LOCALBASE}/lib/libiberty.a:devel/gnulibiberty LIB_DEPENDS= libpopt.so:devel/popt GNU_CONFIGURE= yes USES= autoreconf alias gmake libtool pkgconfig USE_GITHUB= yes GH_ACCOUNT= distcc -GH_TAGNAME= 9a09372 +GH_TAGNAME= 4cde9bc GROUPS= distcc USERS= distcc +ETCDIR= ${PREFIX}/etc CCLINKDIR?= libexec/distcc -CONFIGURE_ARGS= --disable-Werror CC=${CC} PTHREAD_CC=${CC} -CONFIGURE_ENV= PYTHON="${NONEXISTENT}" +CONFIGURE_ARGS= --disable-Werror --sysconfdir=${ETCDIR} \ + CC=${CC} PTHREAD_CC=${CC} CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -34,10 +36,16 @@ USE_RC_SUBR= distccd BIN_FILES= distcc distccmon-text lsdistcc -DOC_FILES= protocol-1.txt status-1.txt \ - protocol-2.txt reporting-bugs.txt -MAN_FILES= distcc.1 distccd.1 distccmon-text.1 -README_FILES= AUTHORS INSTALL NEWS README +DOC_FILES= protocol-1.txt \ + protocol-2.txt \ + protocol-3.txt \ + protocol-3-impl.txt \ + protocol-gssapi.txt \ + reporting-bugs.txt \ + status-1.txt \ + survey.txt +MAN_FILES= distcc.1 distccd.1 distccmon-text.1 lsdistcc.1 +README_FILES= AUTHORS INSTALL NEWS README TODO SBIN_FILES= distccd PLIST_FILES= ${BIN_FILES:S|^|bin/|} @@ -45,7 +53,7 @@ PLIST_FILES+= ${MAN_FILES:S|^|man/man1/|:S|$|.gz|} PLIST_FILES+= ${SBIN_FILES:S|^|sbin/|} -OPTIONS_DEFINE= AVAHI CLANGLINK DOCS IPV6 LLVMLINK +OPTIONS_DEFINE= AVAHI CLANGLINK DOCS IPV6 LLVMLINK PUMP OPTIONS_RADIO= GUI OPTIONS_RADIO_GUI= GNOME GTK @@ -54,6 +62,7 @@ GNOME_DESC= Monitor based on GNOME GTK_DESC= Monitor based on GTK LLVMLINK_DESC= Create llvm compiler links if llvm is installed +PUMP_DESC= Distribute compilation as well as preprocessing to distcc servers AVAHI_CONFIGURE_WITH= avahi AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app @@ -66,7 +75,11 @@ GTK_USES= gnome GTK_USE= GNOME=gtk20 IPV6_CONFIGURE_ENABLE= rfc2553 +PUMP_CONFIGURE_ENABLE= pump-mode +PUMP_USES= python:3.1+ shebangfix +SHEBANG_FILES+= update-distcc-symlinks.py + DISTCC_COMPILERS= CC c++ cc .include @@ -106,30 +119,31 @@ ${WRKSRC}/src/mon-gnome.c .endif -do-install: - cd ${WRKSRC} && ${INSTALL_PROGRAM} ${BIN_FILES} \ - ${STAGEDIR}${PREFIX}/bin - cd ${WRKSRC} && ${INSTALL_PROGRAM} ${SBIN_FILES} \ - ${STAGEDIR}${PREFIX}/sbin - ${MKDIR} ${STAGEDIR}${PREFIX}/${CCLINKDIR} +.if ${PORT_OPTIONS:MPUMP} +BIN_FILES+= pump +MAN_FILES+= include_server.1 pump.1 +README_FILES+= README.pump +INCLUDE_SERVER_FILES+= \ + include_server-${PORTVERSION}-py${PYTHON_VER}.egg-info \ + include_server/distcc_pump_c_extensions.so \ + include_server/include_server.py \ + include_server/include_server_test.py \ + include_server/include_analyzer_test.py \ + include_server/include_analyzer_memoizing_node_test.py \ + include_server/include_analyzer_memoizing_node.py \ + include_server/include_analyzer.py + +PLIST_FILES+= ${INCLUDE_SERVER_FILES:S|^|lib/python${PYTHON_VER}/site-packages/|} +.endif + +post-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/${CCLINKDIR} .for link in ${DISTCC_COMPILERS} - ${LN} -sf ${PREFIX}/bin/distcc \ + @${LN} ${STAGEDIR}${PREFIX}/bin/distcc \ ${STAGEDIR}${PREFIX}/${CCLINKDIR}/${link} .endfor -.if ${PORT_OPTIONS:MGNOME} || ${PORT_OPTIONS:MGTK} - cd ${WRKSRC}/gnome && ${INSTALL_DATA} distccmon-gnome.desktop \ - ${STAGEDIR}${DESKTOPDIR} - cd ${WRKSRC}/gnome && ${INSTALL_DATA} distccmon-gnome-icon.png \ - ${STAGEDIR}${PREFIX}/share/pixmaps -.endif - cd ${WRKSRC}/man && ${INSTALL_MAN} ${MAN_FILES} \ - ${STAGEDIR}${MANPREFIX}/man/man1 -do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${README_FILES} \ - ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC}/doc && ${INSTALL_DATA} ${DOC_FILES} \ - ${STAGEDIR}${DOCSDIR} +do-test: + @cd ${WRKSRC} && ${MAKE} check .include Index: devel/distcc/distinfo =================================================================== --- devel/distcc/distinfo +++ devel/distcc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1532697406 -SHA256 (distcc-distcc-3.3.2-9a09372_GH0.tar.gz) = 3d98605a017c0a0e70f30a007801941bec9a87e9f41994bdfa0a9ea613a61e7b -SIZE (distcc-distcc-3.3.2-9a09372_GH0.tar.gz) = 908231 +TIMESTAMP = 1566574521 +SHA256 (distcc-distcc-3.3.3-4cde9bc_GH0.tar.gz) = 4749283d795f50504961bccbf87e049b6602f170499618a88fbeddeaf5880701 +SIZE (distcc-distcc-3.3.3-4cde9bc_GH0.tar.gz) = 1000058 Index: devel/distcc/files/patch-Makefile.in =================================================================== --- /dev/null +++ devel/distcc/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2019-08-23 15:46:38 UTC ++++ Makefile.in +@@ -1046,7 +1046,7 @@ install-programs: $(bin_PROGRAMS) $(sbin + $(INSTALL_PROGRAM) "$$p" "$(DESTDIR)$(bindir)" || exit 1; \ + done + for p in $(sbin_PROGRAMS); do \ +- $(INSTALL_PROGRAM) "$$p" "$(DESTDIR)$(sbindir)" || exit 1; \ ++ $(INSTALL_SCRIPT) "$$p" "$(DESTDIR)$(sbindir)" || exit 1; \ + done + + # See comments for the include-server target. Also, we work around an issue in Index: devel/distcc/files/patch-configure.ac =================================================================== --- devel/distcc/files/patch-configure.ac +++ /dev/null @@ -1,17 +0,0 @@ ---- configure.ac.orig 2008-12-02 23:17:13 UTC -+++ configure.ac -@@ -86,9 +86,12 @@ AC_ARG_WITH(included-popt, - AC_HELP_STRING([--with-included-popt], [use bundled popt library, not from system])) - - AC_ARG_ENABLE(rfc2553, -- AC_HELP_STRING([--enable-rfc2553], [use getaddrinfo, getnameinfo, etc]), -- AC_DEFINE(ENABLE_RFC2553,1,[Use getaddrinfo(), getnameinfo(), etc])) -+ AC_HELP_STRING([--enable-rfc2553], [use getaddrinfo, getnameinfo, etc])) - -+if test x"$enable_rfc2553" = xyes -+then -+ AC_DEFINE(ENABLE_RFC2553,1,[Use getaddrinfo(), getnameinfo(), etc]) -+fi - - AC_ARG_WITH(gnome, - AC_HELP_STRING([--with-gnome], [build GNOME-based monitor])) Index: devel/distcc/files/patch-src_dparent.c =================================================================== --- devel/distcc/files/patch-src_dparent.c +++ /dev/null @@ -1,20 +0,0 @@ ---- src/dparent.c.orig 2008-12-02 23:17:13 UTC -+++ src/dparent.c -@@ -308,6 +308,9 @@ static void dcc_save_pid(pid_t pid) - **/ - void dcc_remove_pid(void) - { -+ /* distcc user, we are running as, cannot delete files in /var/run -+ */ -+#if 0 - if (!arg_pid_file) - return; - -@@ -315,6 +318,7 @@ void dcc_remove_pid(void) - rs_log_warning("failed to remove pid file %s: %s", - arg_pid_file, strerror(errno)); - } -+#endif - } - - Index: security/py-pylibacl/Makefile =================================================================== --- security/py-pylibacl/Makefile +++ security/py-pylibacl/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pylibacl -PORTVERSION= 0.5.2 +PORTVERSION= 0.5.4 CATEGORIES= security python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,9 +16,12 @@ USES= python USE_PYTHON= autoplist concurrent distutils -PORTDOCS= NEWS README +PORTDOCS= NEWS README.rst OPTIONS_DEFINE= DOCS + +do-test: + @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/ Index: security/py-pylibacl/distinfo =================================================================== --- security/py-pylibacl/distinfo +++ security/py-pylibacl/distinfo @@ -1,2 +1,3 @@ -SHA256 (pylibacl-0.5.2.tar.gz) = efc71d91587def528576a65283f90dbb69cf02901dc9fd592cc1b5094cd5c0c2 -SIZE (pylibacl-0.5.2.tar.gz) = 31728 +TIMESTAMP = 1575654898 +SHA256 (pylibacl-0.5.4.tar.gz) = 060f375aeff90a16fbc3a827b7e234694ad636485d8ecd6654e01e1fc4ea3b37 +SIZE (pylibacl-0.5.4.tar.gz) = 37016 Index: security/py-pylibacl/files/patch-test-test_acls.py =================================================================== --- /dev/null +++ security/py-pylibacl/files/patch-test-test_acls.py @@ -0,0 +1,83 @@ +--- test/test_acls.py.orig 2019-03-03 11:47:04 UTC ++++ test/test_acls.py +@@ -177,13 +177,16 @@ class LoadTests(aclTest, unittest.TestCase): + class AclExtensions(aclTest, unittest.TestCase): + """ACL extensions checks""" + ++ # Linux-specific tests that cause NameErrors when the flag ++ # functionality is tested. ++ ''' + @unittest.skipUnless(HAS_ACL_FROM_MODE, "Missing HAS_ACL_FROM_MODE") + def testFromMode(self): + """Test loading ACLs from an octal mode""" + acl1 = posix1e.ACL(mode=M0644) + self.assertTrue(acl1.valid(), + "ACL created via octal mode shoule be valid") +- ++ + @unittest.skipUnless(HAS_ACL_CHECK, "ACL check not supported") + def testAclCheck(self): + """Test the acl_check method""" +@@ -191,7 +194,7 @@ class AclExtensions(aclTest, unittest.TestCase): + self.assertFalse(acl1.check(), "ACL is not valid") + acl2 = posix1e.ACL() + self.assertTrue(acl2.check(), "Empty ACL should not be valid") +- ++ + @unittest.skipUnless(HAS_EXTENDED_CHECK, "Extended ACL check not supported") + def testExtended(self): + """Test the acl_extended function""" +@@ -208,7 +211,7 @@ class AclExtensions(aclTest, unittest.TestCase): + for item in fd, fname: + self.assertTrue(has_extended(item), + "An extended ACL should be reported as such") +- ++ + @unittest.skipUnless(HAS_EXTENDED_CHECK, "Extended ACL check not supported") + def testExtendedArgHandling(self): + self.assertRaises(TypeError, has_extended) +@@ -251,6 +254,8 @@ class AclExtensions(aclTest, unittest.TestCase): + self.assertTrue(acl1 != True) + self.assertFalse(acl1 == 1) + self.assertRaises(TypeError, operator.gt, acl1, True) ++ ''' ++ # End + + @unittest.skipUnless(hasattr(posix1e.ACL, "__cmp__"), "__cmp__ is missing") + @unittest.skipUnless(__pypy__ is None, "Disabled under pypy") +@@ -264,12 +269,17 @@ class AclExtensions(aclTest, unittest.TestCase): + self.assertRaises(TypeError, acl1.applyto, object()) + self.assertRaises(TypeError, acl1.applyto, object(), object()) + ++ # Linux-specific tests that cause NameErrors when the flag ++ # functionality is tested. ++ ''' + @unittest.skipUnless(HAS_ACL_ENTRY, "ACL entries not supported") + def testAclIterator(self): + acl = posix1e.ACL(text=BASIC_ACL_TEXT) + #self.assertEqual(len(acl), 3) + for entry in acl: + self.assertIs(entry.parent, acl) ++ ''' ++ # End + + + class WriteTests(aclTest, unittest.TestCase): +@@ -295,6 +305,9 @@ class WriteTests(aclTest, unittest.TestCase): + acl2.applyto(dname) + + ++# Linux-specific tests that cause NameErrors when the flag ++# functionality is tested. ++''' + @unittest.skipUnless(HAS_ACL_ENTRY, "ACL entries not supported") + class ModificationTests(aclTest, unittest.TestCase): + """ACL modification tests""" +@@ -670,6 +683,7 @@ class ModificationTests(aclTest, unittest.TestCase): + self.assertRaises(EnvironmentError, set_tag, tag) + # Check tag is still valid. + self.assertEqual(e.tag_type, posix1e.ACL_USER_OBJ) ++''' + + if __name__ == "__main__": + unittest.main()