From owner-svn-ports-branches@freebsd.org Sun Apr 10 01:22:25 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4E6D8B01FD0; Sun, 10 Apr 2016 01:22:25 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 06BDA15CD; Sun, 10 Apr 2016 01:22:24 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3A1MO9Q090315; Sun, 10 Apr 2016 01:22:24 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3A1MOta090313; Sun, 10 Apr 2016 01:22:24 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201604100122.u3A1MOta090313@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Sun, 10 Apr 2016 01:22:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r412885 - in branches/2016Q2/games/taipan: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Apr 2016 01:22:25 -0000 Author: junovitch Date: Sun Apr 10 01:22:23 2016 New Revision: 412885 URL: https://svnweb.freebsd.org/changeset/ports/412885 Log: MFH: r412884 games/taipan: fix out of bounds array subscript taipan.c:2709:7: warning: array index 4 is past the end of the array (which contains 4 elements) [-Warray-bounds] PR: 206771 Submitted by: Dave Walton Submitted by: c.brinkhaus@t-online.de Approved by: ports-secteam (with hat) Modified: branches/2016Q2/games/taipan/Makefile branches/2016Q2/games/taipan/files/patch-taipan.c Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/games/taipan/Makefile ============================================================================== --- branches/2016Q2/games/taipan/Makefile Sun Apr 10 01:21:51 2016 (r412884) +++ branches/2016Q2/games/taipan/Makefile Sun Apr 10 01:22:23 2016 (r412885) @@ -3,7 +3,7 @@ PORTNAME= taipan PORTVERSION= 0.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SUNSITE/games/textrpg Modified: branches/2016Q2/games/taipan/files/patch-taipan.c ============================================================================== --- branches/2016Q2/games/taipan/files/patch-taipan.c Sun Apr 10 01:21:51 2016 (r412884) +++ branches/2016Q2/games/taipan/files/patch-taipan.c Sun Apr 10 01:22:23 2016 (r412885) @@ -1,6 +1,6 @@ ---- taipan.c.orig Fri Mar 15 15:05:41 2002 -+++ taipan.c Fri Mar 15 15:08:30 2002 -@@ -2572,7 +2572,7 @@ +--- taipan.c.orig 2001-12-31 16:09:20 UTC ++++ taipan.c +@@ -2572,7 +2572,7 @@ void mchenry(void) amount = get_num(9); if (amount == -1) { @@ -9,3 +9,13 @@ } if (amount <= cash) { +@@ -2705,8 +2705,8 @@ void final_stats(void) + bank = 0; + hkw_[0] = 0; + hkw_[1] = 0; ++ hkw_[2] = 0; + hkw_[3] = 0; +- hkw_[4] = 0; + hold_[0] = 0; + hold_[1] = 0; + hold_[2] = 0; From owner-svn-ports-branches@freebsd.org Sun Apr 10 06:09:29 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A02A5B092F3; Sun, 10 Apr 2016 06:09:29 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 49E0C18DF; Sun, 10 Apr 2016 06:09:29 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3A69SUT075551; Sun, 10 Apr 2016 06:09:28 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3A69S78075550; Sun, 10 Apr 2016 06:09:28 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201604100609.u3A69S78075550@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 10 Apr 2016 06:09:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r412890 - branches/2016Q2/devel/obby/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Apr 2016 06:09:29 -0000 Author: riggs Date: Sun Apr 10 06:09:28 2016 New Revision: 412890 URL: https://svnweb.freebsd.org/changeset/ports/412890 Log: MFH: r412889 Fix build with libc++ 3.8.0 PR: 208622 Submitted by: dim Approved by: ports-secteam (build fix blanket) Added: branches/2016Q2/devel/obby/files/ - copied from r412889, head/devel/obby/files/ Modified: Directory Properties: branches/2016Q2/ (props changed) From owner-svn-ports-branches@freebsd.org Tue Apr 12 03:31:08 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9FD3DB0DEE2; Tue, 12 Apr 2016 03:31:08 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 630271DE6; Tue, 12 Apr 2016 03:31:08 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3C3V722016541; Tue, 12 Apr 2016 03:31:07 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3C3V70a016535; Tue, 12 Apr 2016 03:31:07 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201604120331.u3C3V70a016535@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Tue, 12 Apr 2016 03:31:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r413094 - in branches/2016Q2/www/apache24: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Apr 2016 03:31:08 -0000 Author: ohauer Date: Tue Apr 12 03:31:06 2016 New Revision: 413094 URL: https://svnweb.freebsd.org/changeset/ports/413094 Log: MFH: r413035 - update to 2.4.20 - use ${OPTION}_IMPLIES and remove some IGNORES - turn on proxy_html and xml2enc as default [1] [1] Often requested by users. The modules are not enabled in the default configuration. Full changelog for apache version 2.4.19/2.4.20: http://www.apache.org/dist/httpd/CHANGES_2.4.20 Note: Apache httpd 2.4.19 was not released. Approved by: ports-secteam (junovitch) Deleted: branches/2016Q2/www/apache24/files/patch-modules_ssl_ssl__engine__io.c Modified: branches/2016Q2/www/apache24/Makefile branches/2016Q2/www/apache24/Makefile.modules branches/2016Q2/www/apache24/Makefile.options branches/2016Q2/www/apache24/distinfo branches/2016Q2/www/apache24/files/patch-Makefile.in branches/2016Q2/www/apache24/pkg-plist Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/www/apache24/Makefile ============================================================================== --- branches/2016Q2/www/apache24/Makefile Tue Apr 12 03:26:52 2016 (r413093) +++ branches/2016Q2/www/apache24/Makefile Tue Apr 12 03:31:06 2016 (r413094) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= apache24 -PORTVERSION= 2.4.18 +PORTVERSION= 2.4.20 CATEGORIES= www ipv6 MASTER_SITES= APACHE_HTTPD DISTNAME= httpd-${PORTVERSION} @@ -52,6 +52,17 @@ WITH_SSL_PORT?= 443 .include "${APACHEDIR}/Makefile.options" .include "${APACHEDIR}/Makefile.options.desc" +# IMPLIES +AUTHN_DBD_IMPLIES= DBD +HEARTBEAT_IMPLIES= WATCHDOG STATUS +HEARTMONITOR_IMPLIES= WATCHDOG STATUS +LBMETHOD_HEARTBEAT_IMPLIES= WATCHDOG STATUS HEARTMONITOR + +# MPM +MPM_PREFORK_CONFIGURE_ON= --with-mpm=prefork +MPM_WORKER_CONFIGURE_ON= --with-mpm=worker +MPM_EVENT_CONFIGURE_ON= --with-mpm=event + AUTHNZ_LDAP_CONFIGURE_ON= --enable-authnz-ldap # http://httpd.apache.org/docs/2.4/bind.html @@ -184,7 +195,7 @@ post-install-LOG_FORENSIC-on: modlist: extract @${AWK} '/: checking whether to enable mod_/ \ {printf "%%%%%s%%%%libexec/apache24/%s.so\n", \ - toupper($$8), $$8}' ${WRKSRC}/configure \ + toupper($$8), $$8}' ${WRKSRC}/configure.upstream \ | ${TR} -d '"' \ | ${SORT} -u \ | ${GREP} -E -v '^%%MOD_(HTTP|ISAPI|LOG_CONFIG|PRIVILEGES|SO|UNIXD)%%' Modified: branches/2016Q2/www/apache24/Makefile.modules ============================================================================== --- branches/2016Q2/www/apache24/Makefile.modules Tue Apr 12 03:26:52 2016 (r413093) +++ branches/2016Q2/www/apache24/Makefile.modules Tue Apr 12 03:31:06 2016 (r413094) @@ -1,20 +1,11 @@ # $FreeBSD$ # -# Note by Clement Laforet: (to generate PLIST_SUB entries for modules) -# gsed 's/^\(.*\)mod\(.*\)\.so/%%\MOD\U\2%%\L\1mod\2\.so/' pkg-plist > tmp -# mv tmp pkg-plist -# - # ============================================= # Maintainer note for OPTION handling: # To set additional option use # PORT_OPTIONS+= -# To unset an OPTION, even the OPTION is set in OPTIONS_FILE use -# WITHOUT_MODULES+= -# Using OPTIONS_EXCLUDE and OPTIONS_OVERRIDE do not work as expected -# if the OPTION is enabled by the user, therefore we calculate -# them in bsd.apache.mk with help of WITHOUT_MODULES -# The other methode is to set IGNORE's and force the user to adjust OPTIONS +# To set / unset an OPTION, even the OPTION is set / unset in OPTIONS_FILE use +# WITH="MODULE1 MODULE2 ..." or WITHOUT="MODULE1 MODULE2 ..." .if defined(_PREMKINCLUDED) @@ -37,11 +28,6 @@ IGNORE= SESSION_CRYPTO requires APR-util .endif # exists APU_CONFIG # ============================================= -# if build with shared MPM the last module will be activated -# see apache issue 53882 - -# XXX in case we use OPTIONS for MPM -# we do not have a WITH_MPM variable .if ${PORT_OPTIONS:MMPM_SHARED} SUB_LIST+= MPM_FALLBACK_CHECK="" PLIST_SUB+= MPM_SHARED="" @@ -51,17 +37,7 @@ SUB_LIST+= MPM_FALLBACK_CHECK="\#" PLIST_SUB+= MPM_SHARED="@comment " .endif -.if ${PORT_OPTIONS:MMPM_PREFORK} -CONFIGURE_ARGS+= --with-mpm=prefork -.elif ${PORT_OPTIONS:MMPM_WORKER} -CONFIGURE_ARGS+= --with-mpm=worker -.elif ${PORT_OPTIONS:MMPM_EVENT} -CONFIGURE_ARGS+= --with-mpm=event -.else -IGNORE= Unknown MPM: -.endif # ============================================= - # build develop/example modules only with additional confirmation .for DEVMOD in ${EXAMPLE_MODULES} . if ${PORT_OPTIONS:M${DEVMOD}} @@ -92,28 +68,12 @@ WITH_EXCEPTION_HOOK= yes CONFIGURE_ARGS+= --enable-exception-hook .endif -# watchdog modules -.if ! ${PORT_OPTIONS:MWATCHDOG} || ! ${PORT_OPTIONS:MSTATUS} -. if ${PORT_OPTIONS:MHEARTBEAT} -IGNORE= HEARTBEAT requires WATCHDOG and STATUS -. elif ${PORT_OPTIONS:MHEARTMONITOR} -IGNORE= HEARTMONITOR requires WATCHDOG and STATUS -. endif -.endif -.if ${PORT_OPTIONS:MLBMETHOD_HEARTBEAT} && ! ${PORT_OPTIONS:MHEARTMONITOR} -IGNORE= LBMETHOD_HEARTBEAT requires WATCHDOG, STATUS and HEARTMONITOR -.endif - .if ${PORT_OPTIONS:MAUTH_BASIC} || ${PORT_OPTIONS:MAUTH_DIGEST} . if !${APACHE_MODULES:MAUTHN*} IGNORE= AUTH_BASIC and AUTH_DIGEST need at least one AUTHN provider . endif .endif -. if ${PORT_OPTIONS:MAUTHN_DBD} && ! ${PORT_OPTIONS:MDBD} -IGNORE= AUTHN_DBD requires DBD -. endif - .if ${PORT_OPTIONS:MAUTH_BASIC} . if !${APACHE_MODULES:MAUTHZ*} IGNORE= AUTH_BASIC need at least one AUTHZ provider Modified: branches/2016Q2/www/apache24/Makefile.options ============================================================================== --- branches/2016Q2/www/apache24/Makefile.options Tue Apr 12 03:26:52 2016 (r413093) +++ branches/2016Q2/www/apache24/Makefile.options Tue Apr 12 03:31:06 2016 (r413094) @@ -9,13 +9,12 @@ # UNIXD LOG_CONFIG +# mod_proxy_html and xml2enc depending on libxml2 PROXY_ENABLED_MODULES= \ PROXY_AJP PROXY_BALANCER PROXY_CONNECT PROXY_EXPRESS PROXY_FCGI \ - PROXY_FDPASS PROXY_FTP PROXY_HTTP PROXY_SCGI PROXY_WSTUNNEL + PROXY_FDPASS PROXY_FTP PROXY_HTTP PROXY_HTML PROXY_SCGI PROXY_WSTUNNEL -# mod_proxy_html depends on libxml2 -PROXY_DISABLED_MODULES= \ - PROXY_HTML +PROXY_DISABLED_MODULES= # SESSION_CRYPTO need APR build with crypto (EVP support in APR) SESSION_ENABLED_MODULES= \ @@ -52,10 +51,10 @@ MOST_ENABLED_MODULES= \ SPELING SSL STATUS SUBSTITUTE \ UNIQUE_ID USERDIR USERTRACK \ VERSION VHOST_ALIAS \ - WATCHDOG + WATCHDOG XML2ENC MOST_DISABLED_MODULES:= \ - AUTHNZ_LDAP IDENT LDAP LUA SOCACHE_DC SUEXEC XML2ENC HTTP2 + AUTHNZ_LDAP IDENT LDAP LUA SOCACHE_DC SUEXEC HTTP2 # XXX PROXY and SESSION are modules but also used to # enable/disable additional PROXY/SESSION modules Modified: branches/2016Q2/www/apache24/distinfo ============================================================================== --- branches/2016Q2/www/apache24/distinfo Tue Apr 12 03:26:52 2016 (r413093) +++ branches/2016Q2/www/apache24/distinfo Tue Apr 12 03:31:06 2016 (r413094) @@ -1,2 +1,2 @@ -SHA256 (apache24/httpd-2.4.18.tar.bz2) = 0644b050de41f5c9f67c825285049b144690421acb709b06fe53eddfa8a9fd4c -SIZE (apache24/httpd-2.4.18.tar.bz2) = 5181291 +SHA256 (apache24/httpd-2.4.20.tar.bz2) = 0e76a375ed3dbac636f50ac39de966ece443751fe4d62392f9a360a19d94d0da +SIZE (apache24/httpd-2.4.20.tar.bz2) = 6331344 Modified: branches/2016Q2/www/apache24/files/patch-Makefile.in ============================================================================== --- branches/2016Q2/www/apache24/files/patch-Makefile.in Tue Apr 12 03:26:52 2016 (r413093) +++ branches/2016Q2/www/apache24/files/patch-Makefile.in Tue Apr 12 03:31:06 2016 (r413094) @@ -1,4 +1,4 @@ ---- Makefile.in.orig 2015-04-15 18:06:04 UTC +--- Makefile.in.orig 2016-03-20 15:51:49 UTC +++ Makefile.in @@ -32,12 +32,9 @@ include $(top_srcdir)/build/program.mk install-conf: @@ -90,7 +90,7 @@ install-other: @test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir) -@@ -251,12 +222,7 @@ install-man: +@@ -252,12 +223,7 @@ install-man: @test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir) @cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1 @cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8 Modified: branches/2016Q2/www/apache24/pkg-plist ============================================================================== --- branches/2016Q2/www/apache24/pkg-plist Tue Apr 12 03:26:52 2016 (r413093) +++ branches/2016Q2/www/apache24/pkg-plist Tue Apr 12 03:31:06 2016 (r413094) @@ -62,6 +62,7 @@ include/apache24/mod_rewrite.h include/apache24/mod_session.h include/apache24/mod_so.h include/apache24/mod_ssl.h +include/apache24/mod_ssl_openssl.h include/apache24/mod_status.h include/apache24/mod_unixd.h include/apache24/mod_watchdog.h @@ -89,14 +90,17 @@ libexec/apache24/httpd.exp %%MOD_ALIAS%%libexec/apache24/mod_alias.so %%MOD_ALLOWMETHODS%%libexec/apache24/mod_allowmethods.so %%MOD_ASIS%%libexec/apache24/mod_asis.so -%%MOD_AUTHNZ_FCGI%%libexec/apache24/mod_authnz_fcgi.so -%%MOD_AUTHNZ_LDAP%%libexec/apache24/mod_authnz_ldap.so +%%MOD_AUTH_BASIC%%libexec/apache24/mod_auth_basic.so +%%MOD_AUTH_DIGEST%%libexec/apache24/mod_auth_digest.so +%%MOD_AUTH_FORM%%libexec/apache24/mod_auth_form.so %%MOD_AUTHN_ANON%%libexec/apache24/mod_authn_anon.so %%MOD_AUTHN_CORE%%libexec/apache24/mod_authn_core.so %%MOD_AUTHN_DBD%%libexec/apache24/mod_authn_dbd.so %%MOD_AUTHN_DBM%%libexec/apache24/mod_authn_dbm.so %%MOD_AUTHN_FILE%%libexec/apache24/mod_authn_file.so %%MOD_AUTHN_SOCACHE%%libexec/apache24/mod_authn_socache.so +%%MOD_AUTHNZ_FCGI%%libexec/apache24/mod_authnz_fcgi.so +%%MOD_AUTHNZ_LDAP%%libexec/apache24/mod_authnz_ldap.so %%MOD_AUTHZ_CORE%%libexec/apache24/mod_authz_core.so %%MOD_AUTHZ_DBD%%libexec/apache24/mod_authz_dbd.so %%MOD_AUTHZ_DBM%%libexec/apache24/mod_authz_dbm.so @@ -104,9 +108,6 @@ libexec/apache24/httpd.exp %%MOD_AUTHZ_HOST%%libexec/apache24/mod_authz_host.so %%MOD_AUTHZ_OWNER%%libexec/apache24/mod_authz_owner.so %%MOD_AUTHZ_USER%%libexec/apache24/mod_authz_user.so -%%MOD_AUTH_BASIC%%libexec/apache24/mod_auth_basic.so -%%MOD_AUTH_DIGEST%%libexec/apache24/mod_auth_digest.so -%%MOD_AUTH_FORM%%libexec/apache24/mod_auth_form.so %%MOD_AUTOINDEX%%libexec/apache24/mod_autoindex.so %%MOD_BUCKETEER%%libexec/apache24/mod_bucketeer.so %%MOD_BUFFER%%libexec/apache24/mod_buffer.so @@ -149,10 +150,10 @@ libexec/apache24/httpd.exp %%MOD_LBMETHOD_BYTRAFFIC%%libexec/apache24/mod_lbmethod_bytraffic.so %%MOD_LBMETHOD_HEARTBEAT%%libexec/apache24/mod_lbmethod_heartbeat.so %%MOD_LDAP%%libexec/apache24/mod_ldap.so -%%MOD_LOGIO%%libexec/apache24/mod_logio.so libexec/apache24/mod_log_config.so %%MOD_LOG_DEBUG%%libexec/apache24/mod_log_debug.so %%MOD_LOG_FORENSIC%%libexec/apache24/mod_log_forensic.so +%%MOD_LOGIO%%libexec/apache24/mod_logio.so %%MOD_LUA%%libexec/apache24/mod_lua.so %%MOD_MACRO%%libexec/apache24/mod_macro.so %%MOD_MIME%%libexec/apache24/mod_mime.so From owner-svn-ports-branches@freebsd.org Thu Apr 14 01:54:04 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 90B35B0FBB9; Thu, 14 Apr 2016 01:54:04 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4E91B1A43; Thu, 14 Apr 2016 01:54:04 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3E1s3gw082409; Thu, 14 Apr 2016 01:54:03 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3E1s2OP082400; Thu, 14 Apr 2016 01:54:02 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201604140154.u3E1s2OP082400@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Thu, 14 Apr 2016 01:54:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r413237 - in branches/2016Q2: databases/ldb databases/tdb devel/talloc devel/tevent X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Apr 2016 01:54:04 -0000 Author: junovitch Date: Thu Apr 14 01:54:02 2016 New Revision: 413237 URL: https://svnweb.freebsd.org/changeset/ports/413237 Log: MFH: r413162 This is routine update for the Samba supplimentary libraries, bumping them to the versions that commonly acceptable by recent Samba ports, in particular, samba44. Approved by: ports-secteam (with hat) Modified: branches/2016Q2/databases/ldb/Makefile branches/2016Q2/databases/ldb/distinfo branches/2016Q2/databases/tdb/Makefile branches/2016Q2/databases/tdb/distinfo branches/2016Q2/devel/talloc/Makefile branches/2016Q2/devel/talloc/distinfo branches/2016Q2/devel/tevent/Makefile branches/2016Q2/devel/tevent/distinfo Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/databases/ldb/Makefile ============================================================================== --- branches/2016Q2/databases/ldb/Makefile Thu Apr 14 01:11:53 2016 (r413236) +++ branches/2016Q2/databases/ldb/Makefile Thu Apr 14 01:54:02 2016 (r413237) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= ldb -PORTVERSION= 1.1.24 +PORTVERSION= 1.1.26 PORTREVISION= 0 PORTEPOCH= 0 CATEGORIES= databases @@ -33,7 +33,7 @@ OPTIONS_DEFINE= MANPAGES MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl) BUILD_DEPENDS+= talloc>=2.1.5:devel/talloc \ - tevent>=0.9.26:devel/tevent \ + tevent>=0.9.27:devel/tevent \ tdb>=1.3.8,1:databases/tdb \ popt>=0:devel/popt RUN_DEPENDS:= ${BUILD_DEPENDS} Modified: branches/2016Q2/databases/ldb/distinfo ============================================================================== --- branches/2016Q2/databases/ldb/distinfo Thu Apr 14 01:11:53 2016 (r413236) +++ branches/2016Q2/databases/ldb/distinfo Thu Apr 14 01:54:02 2016 (r413237) @@ -1,2 +1,2 @@ -SHA256 (ldb-1.1.24.tar.gz) = 45e9f52473f0d013f0ea090cce35d6836a6e67e8d4dcdd7077dabdf8b1314b21 -SIZE (ldb-1.1.24.tar.gz) = 1258405 +SHA256 (ldb-1.1.26.tar.gz) = 8843c7a72b980d9413ba6c494c039bccd10c524b37fda2917afb147745d8b2e6 +SIZE (ldb-1.1.26.tar.gz) = 1262660 Modified: branches/2016Q2/databases/tdb/Makefile ============================================================================== --- branches/2016Q2/databases/tdb/Makefile Thu Apr 14 01:11:53 2016 (r413236) +++ branches/2016Q2/databases/tdb/Makefile Thu Apr 14 01:54:02 2016 (r413237) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= tdb -PORTVERSION= 1.3.8 +PORTVERSION= 1.3.9 PORTREVISION= 0 PORTEPOCH= 1 CATEGORIES= databases Modified: branches/2016Q2/databases/tdb/distinfo ============================================================================== --- branches/2016Q2/databases/tdb/distinfo Thu Apr 14 01:11:53 2016 (r413236) +++ branches/2016Q2/databases/tdb/distinfo Thu Apr 14 01:54:02 2016 (r413237) @@ -1,2 +1,2 @@ -SHA256 (tdb-1.3.8.tar.gz) = 0605ac0427eac9c23bf61ebfd8206a07d5ece198498eab1769cd0cfb6e7de6b1 -SIZE (tdb-1.3.8.tar.gz) = 494106 +SHA256 (tdb-1.3.9.tar.gz) = 7101f726e6d5c70f14e577b01c133e2e6059c4455239115e56a12ba64fc084d2 +SIZE (tdb-1.3.9.tar.gz) = 493585 Modified: branches/2016Q2/devel/talloc/Makefile ============================================================================== --- branches/2016Q2/devel/talloc/Makefile Thu Apr 14 01:11:53 2016 (r413236) +++ branches/2016Q2/devel/talloc/Makefile Thu Apr 14 01:54:02 2016 (r413237) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= talloc -PORTVERSION= 2.1.5 +PORTVERSION= 2.1.6 PORTREVISION= 0 PORTEPOCH= 0 CATEGORIES= devel Modified: branches/2016Q2/devel/talloc/distinfo ============================================================================== --- branches/2016Q2/devel/talloc/distinfo Thu Apr 14 01:11:53 2016 (r413236) +++ branches/2016Q2/devel/talloc/distinfo Thu Apr 14 01:54:02 2016 (r413237) @@ -1,2 +1,2 @@ -SHA256 (talloc-2.1.5.tar.gz) = 3833e750cf0b8c3439186cba38800cba9e26adfbce10ee98ba709c24eb1cdddd -SIZE (talloc-2.1.5.tar.gz) = 436193 +SHA256 (talloc-2.1.6.tar.gz) = 3b8e1a50bacb359d99942e0dd9941cef779ae4b5eb20f138873bd8270cb1d47b +SIZE (talloc-2.1.6.tar.gz) = 436983 Modified: branches/2016Q2/devel/tevent/Makefile ============================================================================== --- branches/2016Q2/devel/tevent/Makefile Thu Apr 14 01:11:53 2016 (r413236) +++ branches/2016Q2/devel/tevent/Makefile Thu Apr 14 01:54:02 2016 (r413237) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= tevent -PORTVERSION= 0.9.26 +PORTVERSION= 0.9.28 PORTREVISION= 0 PORTEPOCH= 0 CATEGORIES= devel Modified: branches/2016Q2/devel/tevent/distinfo ============================================================================== --- branches/2016Q2/devel/tevent/distinfo Thu Apr 14 01:11:53 2016 (r413236) +++ branches/2016Q2/devel/tevent/distinfo Thu Apr 14 01:54:02 2016 (r413237) @@ -1,2 +1,2 @@ -SHA256 (tevent-0.9.26.tar.gz) = 262c14d78ede13f2c4fc5e61485ae7250a201782d94735a1d8412652453370bd -SIZE (tevent-0.9.26.tar.gz) = 581664 +SHA256 (tevent-0.9.28.tar.gz) = 04d953379025b1560af5c4ffcce58a3ee84db7aaa09c9f1e3eff5b2945a13529 +SIZE (tevent-0.9.28.tar.gz) = 581522 From owner-svn-ports-branches@freebsd.org Thu Apr 14 01:55:47 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 334A1B0FE00; Thu, 14 Apr 2016 01:55:47 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E99EF1BE2; Thu, 14 Apr 2016 01:55:46 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3E1tkMj082722; Thu, 14 Apr 2016 01:55:46 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3E1tjfA082714; Thu, 14 Apr 2016 01:55:45 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201604140155.u3E1tjfA082714@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Thu, 14 Apr 2016 01:55:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r413238 - in branches/2016Q2: . net/samba42 net/samba42/files net/samba43 net/samba43/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Apr 2016 01:55:47 -0000 Author: junovitch Date: Thu Apr 14 01:55:45 2016 New Revision: 413238 URL: https://svnweb.freebsd.org/changeset/ports/413238 Log: MFH: r413163 r413173 r413163 Update Samba ports to versions 4.2.11 and 4.3.8 respectivelly, to address BadLock vulnerability(http://badlock.org). r413173 Add a note about configuration changes in the Samba ports due to BadLock vulnerability. Security: CVE-2015-5370 Security: CVE-2016-2110 Security: CVE-2016-2111 Security: CVE-2016-2112 Security: CVE-2016-2113 Security: CVE-2016-2114 Security: CVE-2016-2115 Security: CVE-2016-2118 Security: https://vuxml.FreeBSD.org/freebsd/a636fc26-00d9-11e6-b704-000c292e4fd8.html Approved by: ports-secteam (with hat) Added: branches/2016Q2/net/samba43/files/extra-patch-progress - copied unchanged from r413163, head/net/samba43/files/extra-patch-progress Deleted: branches/2016Q2/net/samba42/files/extra-patch-security branches/2016Q2/net/samba43/files/extra-patch-security Modified: branches/2016Q2/UPDATING branches/2016Q2/net/samba42/Makefile branches/2016Q2/net/samba42/distinfo branches/2016Q2/net/samba42/pkg-plist branches/2016Q2/net/samba43/Makefile branches/2016Q2/net/samba43/distinfo branches/2016Q2/net/samba43/pkg-plist Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/UPDATING ============================================================================== --- branches/2016Q2/UPDATING Thu Apr 14 01:54:02 2016 (r413237) +++ branches/2016Q2/UPDATING Thu Apr 14 01:55:45 2016 (r413238) @@ -5,6 +5,31 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20160412: + AFFECTS: Users of net/samba42 and net/samba/43 + AUTHOR: timur@FreeBSD.org + + Samba 4.2.x and 4.3.x ports have been updated to address + BadLock(http://badlock.org) vulnerability, as well as few other + discovered. + + Please note that Samba 4.1.x and older versions are also affected by + the issues fixed with this release but are not supported anymore. It is + strongly recommend to upgrade to a recent version at your earliest + convenience. + + The security updates include new smb.conf options and a number of + stricter behaviours to prevent Man in the Middle attacks. Between these + changes, compatibility with a large number of older software versions + has been lost in the default configuration. + + For more information about the related behaviour changes and the + security issues please visit: + + https://www.samba.org/samba/latest_news.html#4.4.2 + https://www.samba.org/samba/history/samba-4.3.8.html + https://www.samba.org/samba/history/samba-4.2.11.html + 20160404: AFFECTS: mail/spamassassin AUTHOR: adamw@FreeBSD.org Modified: branches/2016Q2/net/samba42/Makefile ============================================================================== --- branches/2016Q2/net/samba42/Makefile Thu Apr 14 01:54:02 2016 (r413237) +++ branches/2016Q2/net/samba42/Makefile Thu Apr 14 01:55:45 2016 (r413238) @@ -3,7 +3,7 @@ PORTNAME?= ${SAMBA4_BASENAME}42 PORTVERSION?= ${SAMBA4_VERSION} -PORTREVISION?= 2 +PORTREVISION?= 0 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} @@ -15,11 +15,11 @@ LICENSE= GPLv3 CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba41-4.1.* samba43-4.3.* -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-security:-p1 +#EXTRA_PATCHES= ${PATCHDIR}/extra-patch-security:-p1 SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.2.7 +SAMBA4_VERSION= 4.2.11 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} Modified: branches/2016Q2/net/samba42/distinfo ============================================================================== --- branches/2016Q2/net/samba42/distinfo Thu Apr 14 01:54:02 2016 (r413237) +++ branches/2016Q2/net/samba42/distinfo Thu Apr 14 01:55:45 2016 (r413238) @@ -1,2 +1,2 @@ -SHA256 (samba-4.2.7.tar.gz) = f586ab3166ce4c663360f15b1de24ef083816a5471856e3ad49bc26b35f0104a -SIZE (samba-4.2.7.tar.gz) = 20741971 +SHA256 (samba-4.2.11.tar.gz) = 75bce53c922e51352933c9846f2c4b1e251fabb80927adb426a773a321ee01f8 +SIZE (samba-4.2.11.tar.gz) = 20875348 Modified: branches/2016Q2/net/samba42/pkg-plist ============================================================================== --- branches/2016Q2/net/samba42/pkg-plist Thu Apr 14 01:54:02 2016 (r413237) +++ branches/2016Q2/net/samba42/pkg-plist Thu Apr 14 01:55:45 2016 (r413238) @@ -1,4 +1,3 @@ -bin/async_connect_send_test bin/cifsdd bin/dbwrap_tool bin/eventlogadm @@ -672,6 +671,7 @@ lib/shared-modules/vfs/zfsacl.so %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/bare.py %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/dnsserver.py %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/misc.py +%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/raw_protocol.py %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/registry.py %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/rpc_talloc.py %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/rpcecho.py @@ -683,7 +683,7 @@ lib/shared-modules/vfs/zfsacl.so %%PYTHON_SITELIBDIR%%/samba/tests/docs.py %%PYTHON_SITELIBDIR%%/samba/tests/dsdb.py %%PYTHON_SITELIBDIR%%/samba/tests/gensec.py -%%PYTHON_SITELIBDIR%%/samba/tests/getopt.py +%%PYTHON_SITELIBDIR%%/samba/tests/get_opt.py %%PYTHON_SITELIBDIR%%/samba/tests/hostconfig.py %%PYTHON_SITELIBDIR%%/samba/tests/libsmb_samba_internal.py %%PYTHON_SITELIBDIR%%/samba/tests/messaging.py Modified: branches/2016Q2/net/samba43/Makefile ============================================================================== --- branches/2016Q2/net/samba43/Makefile Thu Apr 14 01:54:02 2016 (r413237) +++ branches/2016Q2/net/samba43/Makefile Thu Apr 14 01:55:45 2016 (r413238) @@ -3,7 +3,7 @@ PORTNAME?= ${SAMBA4_BASENAME}43 PORTVERSION?= ${SAMBA4_VERSION} -PORTREVISION?= 2 +PORTREVISION?= 0 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} @@ -15,11 +15,11 @@ LICENSE= GPLv3 CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba41-4.1.* samba42-4.2.* -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-security:-p1 +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-progress:-p1 SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.3.3 +SAMBA4_VERSION= 4.3.8 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} @@ -430,7 +430,7 @@ SAMBA_MAN7+= samba.7 winbind_krb5_locat SAMBA_MAN8+= eventlogadm.8 idmap_ad.8 idmap_autorid.8 idmap_hash.8 \ idmap_ldap.8 idmap_nss.8 idmap_rfc2307.8 idmap_rid.8 \ idmap_tdb.8 idmap_tdb2.8 net.8 nmbd.8 pam_winbind.8 pdbedit.8 \ - samba-regedit.8 samba-tool.8 samba.8 smbd.8 smbpasswd.8 \ + samba-regedit.8 samba-tool.8 samba.8 smbd.8 smbpasswd.8 smbspool_krb5_wrapper.8 \ smbspool.8 smbta-util.8 vfs_acl_tdb.8 vfs_acl_xattr.8 \ vfs_aio_fork.8 vfs_aio_linux.8 vfs_aio_pthread.8 \ vfs_audit.8 vfs_cacheprime.8 vfs_cap.8 vfs_catia.8 vfs_ceph.8 \ Modified: branches/2016Q2/net/samba43/distinfo ============================================================================== --- branches/2016Q2/net/samba43/distinfo Thu Apr 14 01:54:02 2016 (r413237) +++ branches/2016Q2/net/samba43/distinfo Thu Apr 14 01:55:45 2016 (r413238) @@ -1,2 +1,2 @@ -SHA256 (samba-4.3.3.tar.gz) = e62d21313acbb29e24b0b80aaf2b63fdd1ccce4cfb741f333deca95a1a3a70df -SIZE (samba-4.3.3.tar.gz) = 20427281 +SHA256 (samba-4.3.8.tar.gz) = 379dc66c3a0a483bf5bed37be6e5d182934db7c4102b21929a6c4602b32b2b10 +SIZE (samba-4.3.8.tar.gz) = 20568773 Copied: branches/2016Q2/net/samba43/files/extra-patch-progress (from r413163, head/net/samba43/files/extra-patch-progress) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/net/samba43/files/extra-patch-progress Thu Apr 14 01:55:45 2016 (r413238, copy of r413163, head/net/samba43/files/extra-patch-progress) @@ -0,0 +1,31 @@ +diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c +index c65fb08..13713fc 100644 +--- a/source3/passdb/pdb_ldap.c ++++ b/source3/passdb/pdb_ldap.c +@@ -1005,7 +1005,7 @@ static bool init_sam_from_ldap(struct ldapsam_privates *ldap_state, + entry, + "gecos", + ctx); +- if (unix_pw.pw_gecos) { ++ if (unix_pw.pw_gecos==NULL) { + unix_pw.pw_gecos = fullname; + } + unix_pw.pw_dir = smbldap_talloc_single_attribute( +@@ -1013,7 +1013,7 @@ static bool init_sam_from_ldap(struct ldapsam_privates *ldap_state, + entry, + "homeDirectory", + ctx); +- if (unix_pw.pw_dir) { ++ if (unix_pw.pw_dir==NULL) { + unix_pw.pw_dir = discard_const_p(char, ""); + } + unix_pw.pw_shell = smbldap_talloc_single_attribute( +@@ -1021,7 +1021,7 @@ static bool init_sam_from_ldap(struct ldapsam_privates *ldap_state, + entry, + "loginShell", + ctx); +- if (unix_pw.pw_shell) { ++ if (unix_pw.pw_shell==NULL) { + unix_pw.pw_shell = discard_const_p(char, ""); + } + Modified: branches/2016Q2/net/samba43/pkg-plist ============================================================================== --- branches/2016Q2/net/samba43/pkg-plist Thu Apr 14 01:54:02 2016 (r413237) +++ branches/2016Q2/net/samba43/pkg-plist Thu Apr 14 01:55:45 2016 (r413238) @@ -1,4 +1,3 @@ -bin/async_connect_send_test bin/cifsdd bin/dbwrap_tool bin/eventlogadm @@ -625,6 +624,7 @@ lib/shared-modules/vfs/zfsacl.so %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/dnsserver.py %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/integer.py %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/misc.py +%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/raw_protocol.py %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/registry.py %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/rpc_talloc.py %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/rpcecho.py @@ -636,7 +636,7 @@ lib/shared-modules/vfs/zfsacl.so %%PYTHON_SITELIBDIR%%/samba/tests/docs.py %%PYTHON_SITELIBDIR%%/samba/tests/dsdb.py %%PYTHON_SITELIBDIR%%/samba/tests/gensec.py -%%PYTHON_SITELIBDIR%%/samba/tests/getopt.py +%%PYTHON_SITELIBDIR%%/samba/tests/get_opt.py %%PYTHON_SITELIBDIR%%/samba/tests/hostconfig.py %%PYTHON_SITELIBDIR%%/samba/tests/kcc/__init__.py %%PYTHON_SITELIBDIR%%/samba/tests/kcc/graph.py @@ -839,8 +839,9 @@ man/man8/samba-tool.8.gz man/man8/samba.8.gz man/man8/smbd.8.gz man/man8/smbpasswd.8.gz -man/man8/smbspool.8.gz man/man8/smbta-util.8.gz +man/man8/smbspool_krb5_wrapper.8.gz +man/man8/smbspool.8.gz man/man8/vfs_acl_tdb.8.gz man/man8/vfs_acl_xattr.8.gz man/man8/vfs_aio_fork.8.gz From owner-svn-ports-branches@freebsd.org Thu Apr 14 02:09:21 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 03ACBB0F3F0; Thu, 14 Apr 2016 02:09:21 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AF91212CB; Thu, 14 Apr 2016 02:09:20 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3E29JkT086258; Thu, 14 Apr 2016 02:09:19 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3E29Jcj086255; Thu, 14 Apr 2016 02:09:19 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201604140209.u3E29Jcj086255@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Thu, 14 Apr 2016 02:09:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r413240 - branches/2016Q2/lang/go X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Apr 2016 02:09:21 -0000 Author: junovitch Date: Thu Apr 14 02:09:19 2016 New Revision: 413240 URL: https://svnweb.freebsd.org/changeset/ports/413240 Log: MFH: r413200 - Update to 1.6.1 Security: CVE-2016-3959 Security: https://vuxml.FreeBSD.org/freebsd/f2217cdf-01e4-11e6-b1ce-002590263bf5.html Approved by: ports-secteam (with hat) Modified: branches/2016Q2/lang/go/Makefile branches/2016Q2/lang/go/distinfo branches/2016Q2/lang/go/pkg-plist Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/lang/go/Makefile ============================================================================== --- branches/2016Q2/lang/go/Makefile Thu Apr 14 02:07:44 2016 (r413239) +++ branches/2016Q2/lang/go/Makefile Thu Apr 14 02:09:19 2016 (r413240) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= go -PORTVERSION= 1.6 +PORTVERSION= 1.6.1 PORTEPOCH= 1 CATEGORIES= lang MASTER_SITES= http://golang.org/dl/ Modified: branches/2016Q2/lang/go/distinfo ============================================================================== --- branches/2016Q2/lang/go/distinfo Thu Apr 14 02:07:44 2016 (r413239) +++ branches/2016Q2/lang/go/distinfo Thu Apr 14 02:09:19 2016 (r413240) @@ -1,2 +1,2 @@ -SHA256 (go1.6.src.tar.gz) = a96cce8ce43a9bf9b2a4c7d470bc7ee0cb00410da815980681c8353218dcf146 -SIZE (go1.6.src.tar.gz) = 12613308 +SHA256 (go1.6.1.src.tar.gz) = 1d4b53cdee51b2298afcf50926a7fa44b286f0bf24ff8323ce690a66daa7193f +SIZE (go1.6.1.src.tar.gz) = 12615799 Modified: branches/2016Q2/lang/go/pkg-plist ============================================================================== --- branches/2016Q2/lang/go/pkg-plist Thu Apr 14 02:07:44 2016 (r413239) +++ branches/2016Q2/lang/go/pkg-plist Thu Apr 14 02:09:19 2016 (r413240) @@ -811,6 +811,7 @@ go/pkg/%%opsys_ARCH%%/index/suffixarray. go/pkg/%%opsys_ARCH%%/internal/golang.org/x/net/http2/hpack.a go/pkg/%%opsys_ARCH%%/internal/race.a go/pkg/%%opsys_ARCH%%/internal/singleflight.a +go/pkg/%%opsys_ARCH%%/internal/syscall/windows/sysdll.a go/pkg/%%opsys_ARCH%%/internal/testenv.a go/pkg/%%opsys_ARCH%%/internal/trace.a go/pkg/%%opsys_ARCH%%/io.a @@ -2514,6 +2515,7 @@ go/src/internal/syscall/windows/registry go/src/internal/syscall/windows/registry/value.go go/src/internal/syscall/windows/registry/zsyscall_windows.go go/src/internal/syscall/windows/syscall_windows.go +go/src/internal/syscall/windows/sysdll/sysdll.go go/src/internal/syscall/windows/zsyscall_windows.go go/src/internal/testenv/testenv.go go/src/internal/trace/goroutines.go From owner-svn-ports-branches@freebsd.org Thu Apr 14 14:28:05 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9AF55B10958; Thu, 14 Apr 2016 14:28:05 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6A5E01583; Thu, 14 Apr 2016 14:28:05 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3EES4Wx011207; Thu, 14 Apr 2016 14:28:04 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3EES4Lk011206; Thu, 14 Apr 2016 14:28:04 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201604141428.u3EES4Lk011206@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 14 Apr 2016 14:28:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r413263 - branches/2016Q2/misc/auto-multiple-choice X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Apr 2016 14:28:05 -0000 Author: amdmi3 Date: Thu Apr 14 14:28:04 2016 New Revision: 413263 URL: https://svnweb.freebsd.org/changeset/ports/413263 Log: MFH: r413262 - Remove incorrect prebuilt script so it's regenerated with correct paths during build PR: 208576 Submitted by: hiroto.kagotani@gmail.com (maintainer) Approved by: ports-secteam blanket Modified: branches/2016Q2/misc/auto-multiple-choice/Makefile Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/misc/auto-multiple-choice/Makefile ============================================================================== --- branches/2016Q2/misc/auto-multiple-choice/Makefile Thu Apr 14 14:21:05 2016 (r413262) +++ branches/2016Q2/misc/auto-multiple-choice/Makefile Thu Apr 14 14:28:04 2016 (r413263) @@ -2,6 +2,7 @@ PORTNAME= auto-multiple-choice PORTVERSION= 1.3.0 +PORTREVISION= 1 CATEGORIES= misc MASTER_SITES= http://download.gna.org/auto-qcm/ DISTNAME= auto-multiple-choice_${PORTVERSION}_precomp @@ -59,6 +60,7 @@ post-patch: ${WRKSRC}/*.pl ${WRKSRC}/*.pl.in @${REINPLACE_CMD} -e "s|^#! @/PERLPATH/@|#!${LOCALBASE}/bin/perl|" \ ${WRKSRC}/auto-multiple-choice.in + @${RM} ${WRKSRC}/vars-subs.pl pre-install: ${MKDIR} ${STAGEDIR}/${SHARED_MIMEINFO_DIR} \ From owner-svn-ports-branches@freebsd.org Fri Apr 15 04:20:14 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A3FC0AEC547; Fri, 15 Apr 2016 04:20:14 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5DC8D11E7; Fri, 15 Apr 2016 04:20:14 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3F4KDPX068800; Fri, 15 Apr 2016 04:20:13 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3F4KDTu068796; Fri, 15 Apr 2016 04:20:13 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201604150420.u3F4KDTu068796@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 15 Apr 2016 04:20:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r413323 - in branches/2016Q2/audio/praat: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2016 04:20:14 -0000 Author: jbeich Date: Fri Apr 15 04:20:12 2016 New Revision: 413323 URL: https://svnweb.freebsd.org/changeset/ports/413323 Log: MFH: r413318 audio/praat: unbreak sound support Portaudio doesn't work with alsa-plugins-oss, so switch to native OSS. ALSA lib confmisc.c:768:(parse_card) cannot find card '0' ALSA lib conf.c:4292:(_snd_config_evaluate) function snd_func_card_driver returned error: No such file or directory [...] PR: 208728 Reported by: kaltheat@gmail.com Approved by: Jason Bacon (maintainer) Approved by: ports-secteam (junovitch) Added: branches/2016Q2/audio/praat/files/patch-external_portaudio_Makefile - copied unchanged from r413318, head/audio/praat/files/patch-external_portaudio_Makefile branches/2016Q2/audio/praat/files/patch-external_portaudio_pa__unix__hostapis.c - copied unchanged from r413318, head/audio/praat/files/patch-external_portaudio_pa__unix__hostapis.c Modified: branches/2016Q2/audio/praat/Makefile branches/2016Q2/audio/praat/files/makefile.defs.freebsd.alsa Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/audio/praat/Makefile ============================================================================== --- branches/2016Q2/audio/praat/Makefile Fri Apr 15 02:05:27 2016 (r413322) +++ branches/2016Q2/audio/praat/Makefile Fri Apr 15 04:20:12 2016 (r413323) @@ -4,7 +4,7 @@ PORTNAME= praat PORTVERSION= 5.4.08 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio science MAINTAINER= bacon4000@gmail.com @@ -19,8 +19,6 @@ USE_GNOME= gtk20 MAKEFILE= makefile PLIST_FILES= bin/praat man/man1/praat.1.gz -LIB_DEPENDS+= libasound.so:audio/alsa-lib - .include .if ${OSVERSION} < 1000000 Modified: branches/2016Q2/audio/praat/files/makefile.defs.freebsd.alsa ============================================================================== --- branches/2016Q2/audio/praat/files/makefile.defs.freebsd.alsa Fri Apr 15 02:05:27 2016 (r413322) +++ branches/2016Q2/audio/praat/files/makefile.defs.freebsd.alsa Fri Apr 15 04:20:12 2016 (r413323) @@ -8,17 +8,18 @@ CC ?= gcc CXX ?= g++ -CFLAGS = -std=gnu99 -DUNIX -Dlinux -DALSA `pkg-config --cflags gtk+-2.0` -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O1 -g1 +CFLAGS = -std=gnu99 -DUNIX -Dlinux -DHAVE_SYS_SOUNDCARD_H `pkg-config --cflags gtk+-2.0` -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O1 -g1 -CXXFLAGS = -std=gnu++11 -Wshadow -DUNIX -Dlinux -DALSA `pkg-config --cflags gtk+-2.0` -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O1 -g1 -I%%WRKSRC%%/sys -I%%WRKSRC%%/dwsys -I%%WRKSRC%%/num -I%%WRKSRC%%/stat -I%%WRKSRC%%/kar -I%%WRKSRC%%/dwtools -I%%WRKSRC%%/fon -I%%WRKSRC%%/LPC -I%%WRKSRC%%/EEG -I%%WRKSRC%%/external/espeak -I%%WRKSRC%%/external/flac -I%%WRKSRC%%/external/mp3 -I%%WRKSRC%%/external/gsl -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/unicode +CXXFLAGS = -std=gnu++11 -Wshadow -DUNIX -Dlinux -DHAVE_SYS_SOUNDCARD_H `pkg-config --cflags gtk+-2.0` -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O1 -g1 -I%%WRKSRC%%/sys -I%%WRKSRC%%/dwsys -I%%WRKSRC%%/num -I%%WRKSRC%%/stat -I%%WRKSRC%%/kar -I%%WRKSRC%%/dwtools -I%%WRKSRC%%/fon -I%%WRKSRC%%/LPC -I%%WRKSRC%%/EEG -I%%WRKSRC%%/external/espeak -I%%WRKSRC%%/external/flac -I%%WRKSRC%%/external/mp3 -I%%WRKSRC%%/external/gsl -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/unicode LINK ?= $(CXX) EXECUTABLE = praat -LIBS = `pkg-config --libs gtk+-2.0` -L%%LOCALBASE%%/lib -lm -lasound -lpthread -ltinfow +LIBS = `pkg-config --libs gtk+-2.0` -L%%LOCALBASE%%/lib -lm -lpthread -ltinfow AR = ar RANLIB = ls ICON = MAIN_ICON = +PA_BACKEND = pa_unix_oss.o Copied: branches/2016Q2/audio/praat/files/patch-external_portaudio_Makefile (from r413318, head/audio/praat/files/patch-external_portaudio_Makefile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/audio/praat/files/patch-external_portaudio_Makefile Fri Apr 15 04:20:12 2016 (r413323, copy of r413318, head/audio/praat/files/patch-external_portaudio_Makefile) @@ -0,0 +1,13 @@ +--- external/portaudio/Makefile.orig 2015-05-20 01:47:31 UTC ++++ external/portaudio/Makefile +@@ -3,8 +3,9 @@ + + include ../../makefile.defs + ++PA_BACKEND ?= pa_linux_alsa.o + OBJECTS = \ +- pa_unix_hostapis.o pa_unix_util.o pa_linux_alsa.o \ ++ pa_unix_hostapis.o pa_unix_util.o $(PA_BACKEND) \ + pa_win_hostapis.o pa_win_util.o pa_win_wmme.o pa_win_waveformat.o \ + pa_front.o pa_debugprint.o pa_cpuload.o \ + pa_allocation.o pa_process.o pa_converters.o pa_dither.o \ Copied: branches/2016Q2/audio/praat/files/patch-external_portaudio_pa__unix__hostapis.c (from r413318, head/audio/praat/files/patch-external_portaudio_pa__unix__hostapis.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/audio/praat/files/patch-external_portaudio_pa__unix__hostapis.c Fri Apr 15 04:20:12 2016 (r413323, copy of r413318, head/audio/praat/files/patch-external_portaudio_pa__unix__hostapis.c) @@ -0,0 +1,11 @@ +--- external/portaudio/pa_unix_hostapis.c.orig 2015-05-20 01:47:31 UTC ++++ external/portaudio/pa_unix_hostapis.c +@@ -60,6 +60,8 @@ PaUtilHostApiInitializer *paHostApiIniti + { + #if defined (linux) && defined (ALSA) + PaAlsa_Initialize, // ppgb ++ #else ++ PaOSS_Initialize, + #endif + 0 /* NULL terminated array */ + }; From owner-svn-ports-branches@freebsd.org Fri Apr 15 11:51:16 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BE33BAEDA5F; Fri, 15 Apr 2016 11:51:16 +0000 (UTC) (envelope-from robak@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8AC4A132F; Fri, 15 Apr 2016 11:51:16 +0000 (UTC) (envelope-from robak@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3FBpF9S005995; Fri, 15 Apr 2016 11:51:15 GMT (envelope-from robak@FreeBSD.org) Received: (from robak@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3FBpFWG005994; Fri, 15 Apr 2016 11:51:15 GMT (envelope-from robak@FreeBSD.org) Message-Id: <201604151151.u3FBpFWG005994@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: robak set sender to robak@FreeBSD.org using -f From: Bartek Rutkowski Date: Fri, 15 Apr 2016 11:51:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r413336 - branches/2016Q2/net-p2p/btsync X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2016 11:51:16 -0000 Author: robak Date: Fri Apr 15 11:51:15 2016 New Revision: 413336 URL: https://svnweb.freebsd.org/changeset/ports/413336 Log: MFH: r413315 net-p2p/btsync: update upstream location PR: 208796 Submitted by: joshruehlig@gmail.com (maintainer) Approved by: ports-secteam Modified: branches/2016Q2/net-p2p/btsync/Makefile Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/net-p2p/btsync/Makefile ============================================================================== --- branches/2016Q2/net-p2p/btsync/Makefile Fri Apr 15 11:48:32 2016 (r413335) +++ branches/2016Q2/net-p2p/btsync/Makefile Fri Apr 15 11:51:15 2016 (r413336) @@ -3,8 +3,8 @@ PORTNAME= btsync PORTVERSION= 2.3.6 CATEGORIES= net-p2p -MASTER_SITES= https://download-cdn.getsyncapp.com/${PORTVERSION}/FreeBSD-${CONFIG_ARCH}/ \ - http://download-cdn.getsyncapp.com/${PORTVERSION}/FreeBSD-${CONFIG_ARCH}/ +MASTER_SITES= https://download-cdn.getsync.com/${PORTVERSION}/FreeBSD-${CONFIG_ARCH}/ \ + http://download-cdn.getsync.com/${PORTVERSION}/FreeBSD-${CONFIG_ARCH}/ DISTNAME= BitTorrent-Sync_freebsd_${CONFIG_ARCH} MAINTAINER= joshruehlig@gmail.com From owner-svn-ports-branches@freebsd.org Fri Apr 15 17:18:28 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 31F01AEDD8E; Fri, 15 Apr 2016 17:18:28 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E89E51249; Fri, 15 Apr 2016 17:18:27 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3FHIRgM012167; Fri, 15 Apr 2016 17:18:27 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3FHIRoA012165; Fri, 15 Apr 2016 17:18:27 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201604151718.u3FHIRoA012165@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Fri, 15 Apr 2016 17:18:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r413355 - in branches/2016Q2/databases/tokyocabinet: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2016 17:18:28 -0000 Author: adamw Date: Fri Apr 15 17:18:26 2016 New Revision: 413355 URL: https://svnweb.freebsd.org/changeset/ports/413355 Log: MFH: r413150 r413151 Fix build, install, and package in multiple situations, and use OPTIONS helpers to do so. 1) FASTEST option build fails because -fforce-addr doesn't exist, so just remove it from CFLAGS. 2) disabling SHARED broke build The post-install, as well as the plist, never handled the case when SHARED was disabled. By using OPTIONS_SUB and post-install-SHARED-on, it now works. 3) DEBUG and LZMA were incompatible Building with debugging symbols against the external liblzma from ports caused the build to fail. Mark these as incompatible with each other. 4) PROFILE prevents .so from being built Building with profiling enabled disables shared objects from being built, so simply mark these as mutually exclusive. 5) The extra patching for the DOCS option is not needed, so just remove that whole business. It would be advisable to have better descriptions for the LZMA and LZO options, because lzma and lzo support are still enabled with those options deselected: it just uses the libraries from base instead. Approved by: ports-secteam (junovitch) Deleted: branches/2016Q2/databases/tokyocabinet/files/ Modified: branches/2016Q2/databases/tokyocabinet/Makefile branches/2016Q2/databases/tokyocabinet/pkg-plist Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/databases/tokyocabinet/Makefile ============================================================================== --- branches/2016Q2/databases/tokyocabinet/Makefile Fri Apr 15 16:46:24 2016 (r413354) +++ branches/2016Q2/databases/tokyocabinet/Makefile Fri Apr 15 17:18:26 2016 (r413355) @@ -17,8 +17,12 @@ GNU_CONFIGURE= yes USES= gmake USE_LDCONFIG= yes +PORTDOCS= * + OPTIONS_DEFINE= DEBUG DEVEL FASTEST LZMA LZO PTHREAD PROFILE SHARED SWAB UYIELD DOCS OPTIONS_DEFAULT= PTHREAD SHARED +OPTIONS_SUB= yes + DEBUG_DESC= Debugging support DEVEL_DESC= Development build FASTEST_DESC= Fastest run @@ -30,51 +34,32 @@ SHARED_DESC= Shared build SWAB_DESC= Swapping byte-orders build UYIELD_DESC= Detecting race conditions -.include +DEBUG_CONFIGURE_ENABLE= debug +DEBUG_PREVENTS= LZMA + +DEVEL_CONFIGURE_ENABLE= devel + +FASTEST_CONFIGURE_ENABLE= fastest -.if ${PORT_OPTIONS:MDOCS} -PORTDOCS= * -.else -EXTRA_PATCHES= ${FILESDIR}/extra-patch-Makefile.in -.endif - -.if ${PORT_OPTIONS:MDEBUG} -CONFIGURE_ARGS+= --enable-debug -.endif -.if ${PORT_OPTIONS:MDEVEL} -CONFIGURE_ARGS+= --enable-devel -.endif -.if ${PORT_OPTIONS:MFASTEST} -CONFIGURE_ARGS+= --enable-fastest -.endif # to not confuse with system liblzma -.if ${PORT_OPTIONS:MLZMA} -CONFIGURE_ARGS+= --enable-exlzma -LIB_DEPENDS+= liblzma.so.1:archivers/lzmalib -.else -CONFIGURE_ARGS+= --disable-exlzma -.endif -.if ${PORT_OPTIONS:MLZO} -CONFIGURE_ARGS+= --enable-exlzo -LIB_DEPENDS+= liblzo2.so:archivers/lzo2 -.else -CONFIGURE_ARGS+= --disable-exlzo -.endif -.if ! ${PORT_OPTIONS:MPTHREAD} -CONFIGURE_ARGS+= --disable-pthread -.endif -.if ${PORT_OPTIONS:MPROFILE} -CONFIGURE_ARGS+= --enable-profile -.endif -.if ! ${PORT_OPTIONS:MSHARED} -CONFIGURE_ARGS+= --disable-shared -.endif -.if ${PORT_OPTIONS:MSWAB} -CONFIGURE_ARGS+= --enable-swab -.endif -.if ${PORT_OPTIONS:MUYIELD} -CONFIGURE_ARGS+= --enable-uyield -.endif +LZMA_CONFIGURE_ENABLE= exlzma +LZMA_LIB_DEPENDS= liblzma.so.1:archivers/lzmalib +LZMA_PREVENTS= DEBUG + +LZO_CONFIGURE_ENABLE= exlzo +LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2 + +PTHREAD_CONFIGURE_ENABLE= pthread + +PROFILE_CONFIGURE_ENABLE= profile +PROFILE_PREVENTS= SHARED + +SHARED_CONFIGURE_ENABLE= shared +SHARED_PREVENTS= PROFILE + +SWAB_CONFIGURE_ENABLE= swab + +UYIELD_CONFIGURE_ENABLE= uyield SHLIB_VER= 9.11.0 SHLIB_VER_MAJ= 9 @@ -88,8 +73,13 @@ post-patch: -e 's|@datarootdir@|@datarootdir@/doc|' \ ${WRKSRC}/Makefile.in +post-patch-FASTEST-on: + ${REINPLACE_CMD} -e 's|-fforce-addr||' ${WRKSRC}/configure + post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/*.so \ - ${STAGEDIR}${PREFIX}/libexec/tcawmgr.cgi + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/libexec/tcawmgr.cgi + +post-install-SHARED-on: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so .include Modified: branches/2016Q2/databases/tokyocabinet/pkg-plist ============================================================================== --- branches/2016Q2/databases/tokyocabinet/pkg-plist Fri Apr 15 16:46:24 2016 (r413354) +++ branches/2016Q2/databases/tokyocabinet/pkg-plist Fri Apr 15 17:18:26 2016 (r413355) @@ -23,9 +23,9 @@ include/tchdb.h include/tcutil.h include/tctdb.h lib/libtokyocabinet.a -lib/libtokyocabinet.so -lib/libtokyocabinet.so.%%SHLIB_VER_MAJ%% -lib/libtokyocabinet.so.%%SHLIB_VER%% +%%SHARED%%lib/libtokyocabinet.so +%%SHARED%%lib/libtokyocabinet.so.%%SHLIB_VER_MAJ%% +%%SHARED%%lib/libtokyocabinet.so.%%SHLIB_VER%% libdata/pkgconfig/tokyocabinet.pc libexec/tcawmgr.cgi man/man1/tcamgr.1.gz From owner-svn-ports-branches@freebsd.org Fri Apr 15 17:42:07 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D3945AED91F; Fri, 15 Apr 2016 17:42:07 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A14D911F3; Fri, 15 Apr 2016 17:42:07 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3FHg6EA021375; Fri, 15 Apr 2016 17:42:06 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3FHg6XO021374; Fri, 15 Apr 2016 17:42:06 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201604151742.u3FHg6XO021374@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 15 Apr 2016 17:42:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r413358 - branches/2016Q2/multimedia/transcode X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2016 17:42:07 -0000 Author: jbeich Date: Fri Apr 15 17:42:06 2016 New Revision: 413358 URL: https://svnweb.freebsd.org/changeset/ports/413358 Log: MFH: r413356 multimedia/transcode: unbreak fetch fetch: http://cdn.bitbucket.org/france/transcode-tcforge/downloads/transcode-1.1.7.tar.bz2: Forbidden PR: 208818 Submitted by: Ben Woods Approved by: Naram Qashat (maintainer) Approved by: ports-secteam blanket Modified: branches/2016Q2/multimedia/transcode/Makefile Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/multimedia/transcode/Makefile ============================================================================== --- branches/2016Q2/multimedia/transcode/Makefile Fri Apr 15 17:40:32 2016 (r413357) +++ branches/2016Q2/multimedia/transcode/Makefile Fri Apr 15 17:42:06 2016 (r413358) @@ -5,7 +5,7 @@ PORTNAME= transcode PORTVERSION= 1.1.7 PORTREVISION= 25 CATEGORIES= multimedia -MASTER_SITES= http://cdn.bitbucket.org/france/transcode-tcforge/downloads/ +MASTER_SITES= https://bitbucket.org/france/transcode-tcforge/downloads/ MAINTAINER= cyberbotx@cyberbotx.com COMMENT= Text-console utility for video stream processing From owner-svn-ports-branches@freebsd.org Sat Apr 16 10:14:33 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1C8FCB10A2F; Sat, 16 Apr 2016 10:14:33 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EC807137A; Sat, 16 Apr 2016 10:14:32 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3GAEWq3026618; Sat, 16 Apr 2016 10:14:32 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3GAEV4O026615; Sat, 16 Apr 2016 10:14:31 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201604161014.u3GAEV4O026615@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Sat, 16 Apr 2016 10:14:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r413425 - in branches/2016Q2/net: asterisk13 pjsip X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Apr 2016 10:14:33 -0000 Author: madpilot Date: Sat Apr 16 10:14:31 2016 New Revision: 413425 URL: https://svnweb.freebsd.org/changeset/ports/413425 Log: MFH: r413365 - Update net/asterisk13 to 13.8.1 - Change PJ_IOQUEUE_MAX_HANDLES build time limit in pjsip as suggested by asterisk project [1] to mitigate potential DoS [2] - Add DEBUG and IPV6 options to pjsip port Obtained from: https://wiki.asterisk.org/wiki/display/AST/Building+and+Installing+pjproject [1] Security: ee50726e-0319-11e6-aa86-001999f8d30b e21474c6-031a-11e6-aa86-001999f8d30b [2] Approved by: ports-secteam (feld) Modified: branches/2016Q2/net/asterisk13/Makefile branches/2016Q2/net/asterisk13/distinfo branches/2016Q2/net/pjsip/Makefile Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/net/asterisk13/Makefile ============================================================================== --- branches/2016Q2/net/asterisk13/Makefile Sat Apr 16 10:06:16 2016 (r413424) +++ branches/2016Q2/net/asterisk13/Makefile Sat Apr 16 10:14:31 2016 (r413425) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 13.8.0 +PORTVERSION= 13.8.1 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:main,g729 MASTER_SITE_SUBDIR= asterisk/:main \ Modified: branches/2016Q2/net/asterisk13/distinfo ============================================================================== --- branches/2016Q2/net/asterisk13/distinfo Sat Apr 16 10:06:16 2016 (r413424) +++ branches/2016Q2/net/asterisk13/distinfo Sat Apr 16 10:14:31 2016 (r413425) @@ -1,5 +1,5 @@ -SHA256 (asterisk-13.8.0.tar.gz) = 9953d3ea0023f7be0e14aed587725dacc199116c9453587093e1489073b53d5d -SIZE (asterisk-13.8.0.tar.gz) = 32520658 +SHA256 (asterisk-13.8.1.tar.gz) = 87edf926855bcccc0ef1838acc6bc5e767da1f403e0482dc328b982d044b770d +SIZE (asterisk-13.8.1.tar.gz) = 32488096 SHA256 (asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9 SIZE (asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123 SHA256 (asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585 Modified: branches/2016Q2/net/pjsip/Makefile ============================================================================== --- branches/2016Q2/net/pjsip/Makefile Sat Apr 16 10:06:16 2016 (r413424) +++ branches/2016Q2/net/pjsip/Makefile Sat Apr 16 10:14:31 2016 (r413425) @@ -2,6 +2,7 @@ PORTNAME= pjsip PORTVERSION= 2.4.5 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.pjsip.org/release/${PORTVERSION}/ DISTNAME= pjproject-${DISTVERSION} @@ -23,7 +24,7 @@ USE_LDCONFIG= yes PLIST_SUB= CONFIGURE_TARGET="${CONFIGURE_TARGET}" MAKE_JOBS_UNSAFE= yes -OPTIONS_DEFINE= FFMPEG G711 G722 G7221 GSM ILBC L16 OPENH264 RESAMPLE RESAMPLEDLL \ +OPTIONS_DEFINE= DEBUG FFMPEG G711 G722 G7221 GSM ILBC IPV6 L16 OPENH264 RESAMPLE RESAMPLEDLL \ SAMPLERATE SDL SHARED SPEEX SPEEXAEC V4L IPV6 SOUND VIDEO AMR EXTSRTP OPTIONS_DEFAULT=G711 G722 G7221 GSM ILBC L16 SHARED SPEEX SPEEXAEC @@ -43,6 +44,8 @@ EXTSRTP_DESC= Use libsrtp port (needed t OPTIONS_SUB= yes +DEBUG_CFLAGS= -DNDEBUG=0 +DEBUG_CFLAGS_OFF= -DNDEBUG=1 FFMPEG_CONFIGURE_ENABLE= ffmpeg FFMPEG_LIB_DEPENDS= libswresample.so:multimedia/ffmpeg G711_CONFIGURE_ENABLE= g711-codec @@ -52,6 +55,8 @@ GSM_CONFIGURE_ENABLE= gsm-codec GSM_LIB_DEPENDS= libgsm.so:audio/gsm GSM_CONFIGURE_ON= --with-external-gsm ILBC_CONFIGURE_ENABLE= ilbc-codec +IPV6_CFLAGS= -DPJ_HAS_IPV6=1 +IPV6_CFLAGS_OFF= -DPJ_HAS_IPV6=1 L16_CONFIGURE_ENABLE= l16-codec OPENH264_CONFIGURE_ENABLE= openh264 OPENH264_LIB_DEPENDS= libopenh264.so:multimedia/openh264 @@ -81,5 +86,7 @@ EXTSRTP_LIB_DEPENDS= libsrtp.so:net/lib post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/pkgconfig.py + @${ECHO} "#include " > ${WRKSRC}/pjlib/include/pj/config_site.h + @${ECHO} "#define PJ_IOQUEUE_MAX_HANDLES (FD_SETSIZE)" >> ${WRKSRC}/pjlib/include/pj/config_site.h .include From owner-svn-ports-branches@freebsd.org Sat Apr 16 14:56:44 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6EACBAED7E9; Sat, 16 Apr 2016 14:56:44 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3DEC11BC5; Sat, 16 Apr 2016 14:56:44 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3GEuhle013895; Sat, 16 Apr 2016 14:56:43 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3GEuhbn013894; Sat, 16 Apr 2016 14:56:43 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <201604161456.u3GEuhbn013894@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Sat, 16 Apr 2016 14:56:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r413442 - branches/2016Q2/www/rt40 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Apr 2016 14:56:44 -0000 Author: matthew Date: Sat Apr 16 14:56:43 2016 New Revision: 413442 URL: https://svnweb.freebsd.org/changeset/ports/413442 Log: MFH: r413334 Remove CONFLICTS_INSTALL against rt38 which is long gone from ports. Remove a stray ${PORTSDIR} that escaped mat's purge [1] Reported by: garga [1] Approved by: ports-secteam (feld) Modified: branches/2016Q2/www/rt40/Makefile.cpan (contents, props changed) Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/www/rt40/Makefile.cpan ============================================================================== --- branches/2016Q2/www/rt40/Makefile.cpan Sat Apr 16 14:48:12 2016 (r413441) +++ branches/2016Q2/www/rt40/Makefile.cpan Sat Apr 16 14:56:43 2016 (r413442) @@ -98,7 +98,7 @@ DEV_DEPS= p5-Email-Abstract>0:mail/p5-Em p5-Test-MockTime>0:devel/p5-Test-MockTime \ p5-Test-WWW-Mechanize-PSGI>0:devel/p5-Test-WWW-Mechanize-PSGI \ p5-Test-WWW-Mechanize>=1.30:devel/p5-Test-WWW-Mechanize \ - p5-Test-Warn>0:${PORTSDIR}devel/p5-Test-Warn \ + p5-Test-Warn>0:devel/p5-Test-Warn \ p5-WWW-Mechanize>=1.52:www/p5-WWW-Mechanize \ p5-Plack-Middleware-Test-StashWarnings>=0.08:www/p5-Plack-Middleware-Test-StashWarnings \ p5-XML-Simple>0:textproc/p5-XML-Simple From owner-svn-ports-branches@freebsd.org Sat Apr 16 17:30:00 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 749A5B10BCA; Sat, 16 Apr 2016 17:30:00 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 35F8C1B86; Sat, 16 Apr 2016 17:30:00 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3GHTxrD061566; Sat, 16 Apr 2016 17:29:59 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3GHTxex061564; Sat, 16 Apr 2016 17:29:59 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201604161729.u3GHTxex061564@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Sat, 16 Apr 2016 17:29:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r413466 - in branches/2016Q2/multimedia/qt5-multimedia: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Apr 2016 17:30:00 -0000 Author: rakuco Date: Sat Apr 16 17:29:59 2016 New Revision: 413466 URL: https://svnweb.freebsd.org/changeset/ports/413466 Log: MFH: r413463 Add patch to fix underrun errors in the ALSA plugin. The ALSA plugin doesn't suspend the ALSA device when the ::suspend() method is called. This results in underrun errors when it's resumed. In ALSA, stopping a pcm doesn't close it, so the ALSA stop/start functions map to the QAudioInput suspend/resume functions. PR: 208598 Submitted by: shurd Approved by: ports-secteam (junovitch) Added: branches/2016Q2/multimedia/qt5-multimedia/files/patch-git_9047d9b - copied unchanged from r413463, head/multimedia/qt5-multimedia/files/patch-git_9047d9b Modified: branches/2016Q2/multimedia/qt5-multimedia/Makefile Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/multimedia/qt5-multimedia/Makefile ============================================================================== --- branches/2016Q2/multimedia/qt5-multimedia/Makefile Sat Apr 16 17:29:07 2016 (r413465) +++ branches/2016Q2/multimedia/qt5-multimedia/Makefile Sat Apr 16 17:29:59 2016 (r413466) @@ -2,6 +2,7 @@ PORTNAME= multimedia DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= multimedia PKGNAMEPREFIX= qt5- Copied: branches/2016Q2/multimedia/qt5-multimedia/files/patch-git_9047d9b (from r413463, head/multimedia/qt5-multimedia/files/patch-git_9047d9b) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/multimedia/qt5-multimedia/files/patch-git_9047d9b Sat Apr 16 17:29:59 2016 (r413466, copy of r413463, head/multimedia/qt5-multimedia/files/patch-git_9047d9b) @@ -0,0 +1,36 @@ +commit 9047d9b84e9d94d193e77abd81f5980eff77d73a +Author: Stephen Hurd +Date: Thu Apr 14 19:11:01 2016 -0700 + + ALSA: Call snd_pcm_drain() on suspend + + The ALSA plugin previously didn't suspend the ALSA device when the + ::suspend() method is called. This results in underrun errors when + it's resumed. + + In ALSA, stopping a pcm doesn't close it, so the ALSA stop/start + functions map to the QAudioInput suspend/resume functions. + + Change-Id: I2507065a1b7472af29eef70c531b9f6e8e5b3072 + Reviewed-by: Christian Stromme + +--- src/plugins/alsa/qalsaaudioinput.cpp ++++ src/plugins/alsa/qalsaaudioinput.cpp +@@ -701,6 +701,7 @@ qint64 QAlsaAudioInput::processedUSecs() const + void QAlsaAudioInput::suspend() + { + if(deviceState == QAudio::ActiveState||resuming) { ++ snd_pcm_drain(handle); + timer->stop(); + deviceState = QAudio::SuspendedState; + emit stateChanged(deviceState); +--- src/plugins/alsa/qalsaaudiooutput.cpp ++++ src/plugins/alsa/qalsaaudiooutput.cpp +@@ -673,6 +673,7 @@ QAudioFormat QAlsaAudioOutput::format() const + void QAlsaAudioOutput::suspend() + { + if(deviceState == QAudio::ActiveState || deviceState == QAudio::IdleState || resuming) { ++ snd_pcm_drain(handle); + timer->stop(); + deviceState = QAudio::SuspendedState; + errorState = QAudio::NoError; From owner-svn-ports-branches@freebsd.org Sat Apr 16 18:10:48 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 859C9B110D0; Sat, 16 Apr 2016 18:10:48 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4411312CB; Sat, 16 Apr 2016 18:10:48 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3GIAlr8076101; Sat, 16 Apr 2016 18:10:47 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3GIAk5x076094; Sat, 16 Apr 2016 18:10:46 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201604161810.u3GIAk5x076094@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Sat, 16 Apr 2016 18:10:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r413475 - in branches/2016Q2/www/mod_security: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Apr 2016 18:10:48 -0000 Author: ohauer Date: Sat Apr 16 18:10:46 2016 New Revision: 413475 URL: https://svnweb.freebsd.org/changeset/ports/413475 Log: MFH: r413465 - update to 2.9.1 - install etc/apache2x/modules.d/280_mod_security.conf.sample - adjust README and pkg-message to reflect new module activation - adjust and sort pkg-plist Changes: - ModSecurity: update to 2.9.1 - Add support for Lua 5.1 or higher (was 5.1 only) - pkg-plist: bring back mod_unique_id activation, fix deprecated @exec - README: point user to configuration files PR: 208144 Submitted by: Walter Hop (maintainer) Approved by: ports-secteam (jason) Added: branches/2016Q2/www/mod_security/files/280_mod_security.conf.sample.in - copied unchanged from r413465, head/www/mod_security/files/280_mod_security.conf.sample.in Modified: branches/2016Q2/www/mod_security/Makefile branches/2016Q2/www/mod_security/distinfo branches/2016Q2/www/mod_security/files/README.in branches/2016Q2/www/mod_security/files/pkg-message.in branches/2016Q2/www/mod_security/pkg-plist Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/www/mod_security/Makefile ============================================================================== --- branches/2016Q2/www/mod_security/Makefile Sat Apr 16 18:08:55 2016 (r413474) +++ branches/2016Q2/www/mod_security/Makefile Sat Apr 16 18:10:46 2016 (r413475) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= mod_security -PORTVERSION= 2.9.0 +PORTVERSION= 2.9.1 CATEGORIES= www security MASTER_SITES= http://www.modsecurity.org/tarball/${PORTVERSION}/ PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} @@ -34,18 +34,16 @@ DOCSDIR= ${PREFIX}/share/doc/${MODULENAM SUB_FILES+= pkg-message SUB_FILES+= README -SUB_LIST+= APACHEETCDIR="${APACHEETCDIR}" -SUB_LIST+= APACHEMODDIR="${APACHEMODDIR}" - -PLIST_SUB+= APXS="${APXS}" -PLIST_SUB+= APACHEMODDIR="${APACHEMODDIR}" +SUB_FILES+= ${APMOD_FILE}.sample +APMOD_FILE= 280_${PORTNAME}.conf +SUB_LIST+= APMOD_FILE=${APMOD_FILE} OPTIONS_DEFINE= DOCS FUZZYHASH LUA MLOGC OPTIONS_SUB= yes LUA_CONFIGURE_ON= --with-lua=${LOCALBASE} LUA_CONFIGURE_OFF+= --without-lua -LUA_USES= lua:51 +LUA_USES= lua:51+ MLOGC_DESC= Build ModSecurity Log Collector MLOGC_CONFIGURE_ON= --disable-errors @@ -79,4 +77,7 @@ post-install: (cd ${WRKSRC} && ${COPYTREE_SHARE} doc ${STAGEDIR}${DOCSDIR}) ${INSTALL_DATA} ${WRKDIR}/README ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d + ${INSTALL_DATA} ${WRKDIR}/${APMOD_FILE}.sample ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d + .include Modified: branches/2016Q2/www/mod_security/distinfo ============================================================================== --- branches/2016Q2/www/mod_security/distinfo Sat Apr 16 18:08:55 2016 (r413474) +++ branches/2016Q2/www/mod_security/distinfo Sat Apr 16 18:10:46 2016 (r413475) @@ -1,2 +1,2 @@ -SHA256 (modsecurity-2.9.0.tar.gz) = e2bbf789966c1f80094d88d9085a81bde082b2054f8e38e0db571ca49208f434 -SIZE (modsecurity-2.9.0.tar.gz) = 4246467 +SHA256 (modsecurity-2.9.1.tar.gz) = 958cc5a7a7430f93fac0fd6f8b9aa92fc1801efce0cda797d6029d44080a9b24 +SIZE (modsecurity-2.9.1.tar.gz) = 4261212 Copied: branches/2016Q2/www/mod_security/files/280_mod_security.conf.sample.in (from r413465, head/www/mod_security/files/280_mod_security.conf.sample.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/www/mod_security/files/280_mod_security.conf.sample.in Sat Apr 16 18:10:46 2016 (r413475, copy of r413465, head/www/mod_security/files/280_mod_security.conf.sample.in) @@ -0,0 +1,25 @@ +## $FreeBSD$ +## vim: set filetype=apache: +## +## module file for mod_security +## +## PROVIDE: mod_security2 +## REQUIRE: mod_unique_id + +## +## To enable ModSecurity in Apache, enable the modules +## mod_unique_id (in httpd.conf) and +## mod_security2 in this config file +## +## Additionally, load configuration and rules with an Include line from +## %%ETCDIR%%/*.conf +## +## Most users will use the signatures from the OWASP Core Rule Set (CRS). +## For configuration instructions, see %%DOCSDIR%%/README. +## + +## apache modules for mod_security +#LoadModule unique_id_module %%APACHEMODDIR%%/mod_unique_id.so +#LoadModule security2_module %%APACHEMODDIR%%/mod_security2.so +#Include %%ETCDIR%%/*.conf + Modified: branches/2016Q2/www/mod_security/files/README.in ============================================================================== --- branches/2016Q2/www/mod_security/files/README.in Sat Apr 16 18:08:55 2016 (r413474) +++ branches/2016Q2/www/mod_security/files/README.in Sat Apr 16 18:10:46 2016 (r413475) @@ -1,10 +1,14 @@ Configuring ModSecurity on FreeBSD ---------------------------------- -To enable ModSecurity in Apache, add the following to your httpd.conf: +To enable ModSecurity in Apache, follow the instructions in - LoadModule security2_module %%APACHEMODDIR%%/mod_security2.so - Include etc/modsecurity/*.conf + %%PREFIX%%/%%APACHEETCDIR%%/modules.d/%%APMOD_FILE%% + +ModSecurity has various configuration options. +To change them, edit the following file: + + %%ETCDIR%%/modsecurity.conf Getting the Core Rule Set ------------------------- @@ -16,11 +20,13 @@ for all our ModSecurity related stuff, a under it. pkg install git - cd /usr/local/etc/modsecurity + cd %%ETCDIR%% git clone https://github.com/SpiderLabs/owasp-modsecurity-crs cp owasp-modsecurity-crs/modsecurity_crs_10_setup.conf.example \ crs.conf +The CRS has various config options. To change them, edit crs.conf. + To activate the CRS base rules, add the following to your httpd.conf: Include etc/modsecurity/owasp-modsecurity-crs/base_rules/*.conf @@ -78,6 +84,6 @@ exceptions. You probably want to keep the CRS updated from time to time. You can do this with Git: - cd /usr/local/etc/modsecurity/owasp-modsecurity-crs + cd %%ETCDIR%%/owasp-modsecurity-crs git pull apachectl restart Modified: branches/2016Q2/www/mod_security/files/pkg-message.in ============================================================================== --- branches/2016Q2/www/mod_security/files/pkg-message.in Sat Apr 16 18:08:55 2016 (r413474) +++ branches/2016Q2/www/mod_security/files/pkg-message.in Sat Apr 16 18:10:46 2016 (r413475) @@ -1,9 +1,8 @@ You have installed ModSecurity. -To enable ModSecurity in Apache, add the following to your httpd.conf: +To enable ModSecurity in Apache, follow the instructions in - LoadModule security2_module %%APACHEMODDIR%%/mod_security2.so - Include etc/modsecurity/*.conf + %%PREFIX%%/%%APACHEETCDIR%%/modules.d/%%APMOD_FILE%% Most users will use the signatures from the OWASP Core Rule Set (CRS). For configuration instructions, see %%DOCSDIR%%/README. Modified: branches/2016Q2/www/mod_security/pkg-plist ============================================================================== --- branches/2016Q2/www/mod_security/pkg-plist Sat Apr 16 18:08:55 2016 (r413474) +++ branches/2016Q2/www/mod_security/pkg-plist Sat Apr 16 18:10:46 2016 (r413475) @@ -1,8 +1,8 @@ +%%MLOGC%%bin/mlogc +%%MLOGC%%bin/mlogc-batch-load.pl bin/rules-updater.pl -lib/mod_security2.so -%%APACHEMODDIR%%/mod_security2.so -@comment @exec %%APXS%% -e -n unique_id -a %%APACHEMODDIR%%/mod_unique_id.so +@sample %%APACHEETCDIR%%/modules.d/280_mod_security.conf.sample @sample %%ETCDIR%%/modsecurity.conf.sample %%ETCDIR%%/unicode.mapping -%%MLOGC%%bin/mlogc -%%MLOGC%%bin/mlogc-batch-load.pl +lib/%%AP_MODULE%% +%%APACHEMODDIR%%/%%AP_MODULE%%