From owner-svn-ports-branches@freebsd.org Sun May 15 14:08:36 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 2789AB3BCC8; Sun, 15 May 2016 14:08:36 +0000 (UTC) (envelope-from gerald@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 DEEBD18D1; Sun, 15 May 2016 14:08:35 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4FE8ZfH054092; Sun, 15 May 2016 14:08:35 GMT (envelope-from gerald@FreeBSD.org) Received: (from gerald@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4FE8ZC6054091; Sun, 15 May 2016 14:08:35 GMT (envelope-from gerald@FreeBSD.org) Message-Id: <201605151408.u4FE8ZC6054091@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gerald set sender to gerald@FreeBSD.org using -f From: Gerald Pfeifer Date: Sun, 15 May 2016 14:08:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r415230 - branches/2016Q2/emulators/wine 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.22 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, 15 May 2016 14:08:36 -0000 Author: gerald Date: Sun May 15 14:08:34 2016 New Revision: 415230 URL: https://svnweb.freebsd.org/changeset/ports/415230 Log: Fix the build on FreeBSD 9.x by backporting r413495 and r413496 from mainline after a month: Force the use of GCC where it is the system compiler since COMPILER_VERSION will be 42 (the GCC version) even if clang is CHOSEN_COMPILER_TYPE in that case. PR: 206527 Approved by: portmgr (blanket for build fixes) Modified: branches/2016Q2/emulators/wine/Makefile Modified: branches/2016Q2/emulators/wine/Makefile ============================================================================== --- branches/2016Q2/emulators/wine/Makefile Sun May 15 13:07:43 2016 (r415229) +++ branches/2016Q2/emulators/wine/Makefile Sun May 15 14:08:34 2016 (r415230) @@ -119,11 +119,18 @@ X11_LIB_DEPENDS= libfontconfig.so:x11-fo CONFIGURE_ARGS+= --enable-win64 --libdir=${PREFIX}/lib PLIST_SUB+= WINE32="@comment " WINE64="" -.if ${CHOSEN_COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 38 +# Force the use of GCC where it is the system compiler since +# COMPILER_VERSION will be 42 (the GCC version) even if clang +# is CHOSEN_COMPILER_TYPE in that case. +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000054 +USE_GCC= yes +.else +. if ${CHOSEN_COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 38 CPPFLAGS+= -D__builtin_ms_va_list=__builtin_va_list \ -D__builtin_ms_va_start=__builtin_va_start \ -D__builtin_ms_va_end=__builtin_va_end \ -D__builtin_ms_va_copy=__builtin_va_copy +. endif .endif # Wine assumes a WoW64 package is available however WoW64 is not yet available on FreeBSD. From owner-svn-ports-branches@freebsd.org Sun May 15 19:12:36 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 E559AB3C5A5; Sun, 15 May 2016 19:12:36 +0000 (UTC) (envelope-from kwm@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 A060D1A2A; Sun, 15 May 2016 19:12:36 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4FJCZ63053836; Sun, 15 May 2016 19:12:35 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4FJCZjs053833; Sun, 15 May 2016 19:12:35 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201605151912.u4FJCZjs053833@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Sun, 15 May 2016 19:12:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r415279 - in branches/2016Q2/graphics/ImageMagick: . 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.22 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, 15 May 2016 19:12:37 -0000 Author: kwm Date: Sun May 15 19:12:35 2016 New Revision: 415279 URL: https://svnweb.freebsd.org/changeset/ports/415279 Log: MFH: r415107 Update ImageMagick to 6.9.4.1. Remove the delegate patch since it done in IM now. Security: 82b702e0-1907-11e6-857b-00221503d280 Approved by: ports-secteam (feld@) Deleted: branches/2016Q2/graphics/ImageMagick/files/patch-config_delegates.xml.in Modified: branches/2016Q2/graphics/ImageMagick/Makefile branches/2016Q2/graphics/ImageMagick/distinfo branches/2016Q2/graphics/ImageMagick/files/patch-config_policy.xml Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/graphics/ImageMagick/Makefile ============================================================================== --- branches/2016Q2/graphics/ImageMagick/Makefile Sun May 15 18:43:43 2016 (r415278) +++ branches/2016Q2/graphics/ImageMagick/Makefile Sun May 15 19:12:35 2016 (r415279) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= ImageMagick -DISTVERSION= 6.9.3-9 -PORTREVISION= 1 +DISTVERSION= 6.9.4-1 PORTEPOCH= 1 CATEGORIES= graphics perl5 MASTER_SITES= http://www.imagemagick.org/download/ \ Modified: branches/2016Q2/graphics/ImageMagick/distinfo ============================================================================== --- branches/2016Q2/graphics/ImageMagick/distinfo Sun May 15 18:43:43 2016 (r415278) +++ branches/2016Q2/graphics/ImageMagick/distinfo Sun May 15 19:12:35 2016 (r415279) @@ -1,2 +1,2 @@ -SHA256 (ImageMagick-6.9.3-9.tar.xz) = cec69db7d14cb1ab2d173381e5676219c678ca27b7af8878c6ffec18ec932960 -SIZE (ImageMagick-6.9.3-9.tar.xz) = 8777400 +SHA256 (ImageMagick-6.9.4-1.tar.xz) = 2ea0fef839cd5d6f134502b7cf7ee0e57a3f230b19771515d4aa44354f4c6b3b +SIZE (ImageMagick-6.9.4-1.tar.xz) = 8789688 Modified: branches/2016Q2/graphics/ImageMagick/files/patch-config_policy.xml ============================================================================== --- branches/2016Q2/graphics/ImageMagick/files/patch-config_policy.xml Sun May 15 18:43:43 2016 (r415278) +++ branches/2016Q2/graphics/ImageMagick/files/patch-config_policy.xml Sun May 15 19:12:35 2016 (r415279) @@ -1,8 +1,8 @@ ---- config/policy.xml.orig 2016-05-03 23:18:45.652543000 +0200 -+++ config/policy.xml 2016-05-03 23:19:23.818471000 +0200 -@@ -58,4 +58,9 @@ - - +--- config/policy.xml.orig 2016-05-09 19:28:58.000000000 +0200 ++++ config/policy.xml 2016-05-10 17:44:26.720503000 +0200 +@@ -64,4 +64,9 @@ + + + + From owner-svn-ports-branches@freebsd.org Sun May 15 19:14:03 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 B4873B3C5E4; Sun, 15 May 2016 19:14:03 +0000 (UTC) (envelope-from kwm@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 73D361B08; Sun, 15 May 2016 19:14:03 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4FJE24j054069; Sun, 15 May 2016 19:14:02 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4FJE2dK054066; Sun, 15 May 2016 19:14:02 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201605151914.u4FJE2dK054066@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Sun, 15 May 2016 19:14:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r415280 - in branches/2016Q2/graphics/ImageMagick7: . 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.22 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, 15 May 2016 19:14:03 -0000 Author: kwm Date: Sun May 15 19:14:02 2016 New Revision: 415280 URL: https://svnweb.freebsd.org/changeset/ports/415280 Log: MFH: r415108 Update ImageMagick7 to 7.0.1.3. Remove the delegate patch since it done in IM now. Security: 82b702e0-1907-11e6-857b-00221503d280 Approved by: ports-secteam (feld@) Deleted: branches/2016Q2/graphics/ImageMagick7/files/patch-config_delegates.xml.in Modified: branches/2016Q2/graphics/ImageMagick7/Makefile branches/2016Q2/graphics/ImageMagick7/distinfo branches/2016Q2/graphics/ImageMagick7/files/patch-config_policy.xml Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/graphics/ImageMagick7/Makefile ============================================================================== --- branches/2016Q2/graphics/ImageMagick7/Makefile Sun May 15 19:12:35 2016 (r415279) +++ branches/2016Q2/graphics/ImageMagick7/Makefile Sun May 15 19:14:02 2016 (r415280) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= ImageMagick -DISTVERSION= 7.0.1-0 -PORTREVISION= 1 +DISTVERSION= 7.0.1-3 CATEGORIES= graphics perl5 MASTER_SITES= http://www.imagemagick.org/download/ \ http://www.imagemagick.org/download/legacy/ \ Modified: branches/2016Q2/graphics/ImageMagick7/distinfo ============================================================================== --- branches/2016Q2/graphics/ImageMagick7/distinfo Sun May 15 19:12:35 2016 (r415279) +++ branches/2016Q2/graphics/ImageMagick7/distinfo Sun May 15 19:14:02 2016 (r415280) @@ -1,2 +1,2 @@ -SHA256 (ImageMagick-7.0.1-0.tar.xz) = bd15aaef2aa2393b3d62b821f5752d5f4066a90d3b0d9259d93217ad47c056d9 -SIZE (ImageMagick-7.0.1-0.tar.xz) = 8288172 +SHA256 (ImageMagick-7.0.1-3.tar.xz) = 4f5a39f145bb0326f811e0826a9216b8c449ee4485550aa8c2e7cfdaf26f08a0 +SIZE (ImageMagick-7.0.1-3.tar.xz) = 8286332 Modified: branches/2016Q2/graphics/ImageMagick7/files/patch-config_policy.xml ============================================================================== --- branches/2016Q2/graphics/ImageMagick7/files/patch-config_policy.xml Sun May 15 19:12:35 2016 (r415279) +++ branches/2016Q2/graphics/ImageMagick7/files/patch-config_policy.xml Sun May 15 19:14:02 2016 (r415280) @@ -1,8 +1,8 @@ ---- config/policy.xml.orig 2016-05-03 23:18:45.652543000 +0200 -+++ config/policy.xml 2016-05-03 23:19:23.818471000 +0200 -@@ -58,4 +58,9 @@ - - +--- config/policy.xml.orig 2016-05-09 19:28:58.000000000 +0200 ++++ config/policy.xml 2016-05-10 17:44:26.720503000 +0200 +@@ -64,4 +64,9 @@ + + + + From owner-svn-ports-branches@freebsd.org Sun May 15 23: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 AC68AB3C3C0; Sun, 15 May 2016 23:09:21 +0000 (UTC) (envelope-from brnrd@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 841D618EF; Sun, 15 May 2016 23:09:21 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4FN9Kpq024262; Sun, 15 May 2016 23:09:20 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4FN9KAo024261; Sun, 15 May 2016 23:09:20 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201605152309.u4FN9KAo024261@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sun, 15 May 2016 23:09:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r415290 - branches/2016Q2/www/squid 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.22 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, 15 May 2016 23:09:21 -0000 Author: brnrd Date: Sun May 15 23:09:20 2016 New Revision: 415290 URL: https://svnweb.freebsd.org/changeset/ports/415290 Log: MFH: r415227 www/squid: Fix configure errors for libssl - Fix building with ports' OpenSSL/LibreSSL - Use GSSAPI descriptions from Mk/Uses/gssapi.mk - Use more OPTIONS features PR: 208584 Submitted by: timp87@gmail.com (maintainer) Approved by: portmgr (feld) Modified: branches/2016Q2/www/squid/Makefile Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/www/squid/Makefile ============================================================================== --- branches/2016Q2/www/squid/Makefile Sun May 15 23:04:14 2016 (r415289) +++ branches/2016Q2/www/squid/Makefile Sun May 15 23:09:20 2016 (r415290) @@ -62,13 +62,20 @@ ARP_ACL_CONFIGURE_ENABLE= eui AUTH_LDAP_CFLAGS= -I${LOCALBASE}/include AUTH_LDAP_LDFLAGS= -L${LOCALBASE}/lib AUTH_LDAP_USE= OPENLDAP=yes +AUTH_LDAP_VARS= BASIC_AUTH+=LDAP EXTERNAL_ACL+=LDAP_group AUTH_SASL_CFLAGS= -I${LOCALBASE}/include AUTH_SASL_CPPFLAGS= -I${LOCALBASE}/include AUTH_SASL_LDFLAGS= -L${LOCALBASE}/lib AUTH_SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 +AUTH_SASL_VARS= BASIC_AUTH+=SASL AUTH_SMB3_RUN_DEPENDS= smbclient:net/samba36 +AUTH_SMB3_VARS= BASIC_AUTH+=SMB EXTERNAL_ACL+=wbinfo_group +AUTH_SMB3_PLIST_SUB= AUTH_SMB="" AUTH_SMB4_RUN_DEPENDS= smbclient:net/samba42 +AUTH_SMB4_VARS= BASIC_AUTH+=SMB EXTERNAL_ACL+=wbinfo_group +AUTH_SMB4_PLIST_SUB= AUTH_SMB="" AUTH_SQL_RUN_DEPENDS= p5-DBI>=1.08:databases/p5-DBI +AUTH_SQL_VARS= EXTERNAL_ACL+=SQL_session CACHE_DIGESTS_CONFIGURE_ENABLE= cache-digests DELAY_POOLS_CONFIGURE_ENABLE= delay-pools ECAP_CFLAGS= -I${LOCALBASE}/include @@ -90,14 +97,28 @@ IPV6_CONFIGURE_ENABLE= ipv6 KQUEUE_CONFIGURE_ENABLE= kqueue LARGEFILE_CONFIGURE_WITH= large-files LAX_HTTP_CONFIGURE_ENABLE= http-violations +FS_AUFS_VARS= STORAGE_SCHEMES+=aufs DISKIO_MODULES+=DiskThreads +FS_AUFS_LDFLAGS= -pthread +FS_AUFS_CONFIGURE_OFF= --without-pthreads +FS_DISKD_VARS= STORAGE_SCHEMES+=diskd DISKIO_MODULES+=DiskDaemon +FS_ROCK_VARS= STORAGE_SCHEMES+=rock NETTLE_LIB_DEPENDS= libnettle.so:security/nettle NETTLE_CONFIGURE_OFF= --without-nettle SNMP_CONFIGURE_ENABLE= snmp SSL_CONFIGURE_ENABLE= ssl +SSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} \ + LIBOPENSSL_CFLAGS=-I${OPENSSLINC} \ + LIBOPENSSL_LIBS="-lcrypto -lssl" +SSL_USE= OPENSSL=yes SSL_CRTD_CONFIGURE_ENABLE= ssl-crtd +SSL_CRTD_IMPLIES= SSL STACKTRACES_CONFIGURE_ENABLE= stacktraces +STACKTRACES_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gen-stacktrace STACKTRACES_LIB_DEPENDS= libunwind.so:devel/libunwind STACKTRACES_CONFIGURE_ON= --disable-strict-error-checking +STACKTRACES_CFLAGS= -g +STACKTRACES_LDFLAGS= -lunwind -L${LOCALBASE}/lib +STACKTRACES_VARS= strip="" TP_IPFW_CONFIGURE_ENABLE= ipfw-transparent TP_IPF_CONFIGURE_ENABLE= ipf-transparent TP_PF_CONFIGURE_ENABLE= pf-transparent @@ -112,23 +133,23 @@ GSSAPI_NONE_CONFIGURE_ON= --without-heim GSSAPI_BASE_USES= gssapi GSSAPI_BASE_CONFIGURE_ON= --with-heimdal-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} +GSSAPI_BASE_PLIST_SUB= AUTH_KERB="" +# Make it build on FreeBSD < 10 +GSSAPI_BASE_EXTRA_PATCHES= ${FILESDIR}/extra-patch-build-8-9 GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_HEIMDAL_CONFIGURE_ON= --with-heimdal-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} +GSSAPI_HEIMDAL_PLIST_SUB= AUTH_KERB="" GSSAPI_MIT_USES= gssapi:mit GSSAPI_MIT_CONFIGURE_ON= --with-mit-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} +GSSAPI_MIT_PLIST_SUB= AUTH_KERB="" # TODO: # add an option for external_acl/session (requires some kind of external # Berkeley DB support, unsure which one) ARP_ACL_DESC= ARP/MAC/EUI based authentification AUTH_DESC= Authentication helpers -GSSAPI_DESC= Install Kerberos authentication helpers -GSSAPI_NONE_DESC= Build without Kerberos support -GSSAPI_BASE_DESC= Build with Kerberos support from base -GSSAPI_HEIMDAL_DESC= Build with Kerberos support from security/heimdal -GSSAPI_MIT_DESC= Build with Kerberos support from security/krb5 AUTH_LDAP_DESC= Install LDAP authentication helpers AUTH_NIS_DESC= Install NIS/YP authentication helpers AUTH_SASL_DESC= Install SASL authentication helpers @@ -210,125 +231,48 @@ CONFIGURE_ARGS= --with-default-user=squi # Authentication methods and modules: -basic_auth= DB SMB_LM MSNT-multi-domain NCSA PAM POP3 RADIUS fake getpwnam -digest_auth= file -external_acl= file_userip time_quota unix_group -ntlm_auth= fake smb_lm - -.if ${PORT_OPTIONS:MAUTH_LDAP} -basic_auth+= LDAP -external_acl+= LDAP_group -.endif - -.if ${PORT_OPTIONS:MAUTH_SASL} -basic_auth+= SASL -.endif +BASIC_AUTH+= DB SMB_LM MSNT-multi-domain NCSA PAM POP3 RADIUS fake getpwnam +EXTERNAL_ACL+= file_userip time_quota unix_group -.if ${PORT_OPTIONS:MAUTH_SMB3} || ${PORT_OPTIONS:MAUTH_SMB4} -PLIST_SUB+= AUTH_SMB="" -basic_auth+= SMB -external_acl+= wbinfo_group -.else +.if !defined(AUTH_SMB) PLIST_SUB+= AUTH_SMB="@comment " .endif -.if ${PORT_OPTIONS:MAUTH_SQL} -external_acl+= SQL_session -.endif - # POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too: .if ${PORT_OPTIONS:MAUTH_NIS} && !defined(NO_NIS) && !defined(WITHOUT_NIS) -basic_auth+= NIS +BASIC_AUTH+= NIS .endif # POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too: .if ${PORT_OPTIONS:MGSSAPI_NONE} || defined(NO_KERBEROS) || defined(WITHOUT_KERBEROS) -negotiate_auth= none +NEGOTIATE_AUTH= none PLIST_SUB+= AUTH_KERB="@comment " .else + # The kerberos_ldap_group external helper also depends on LDAP and SASL: . if ${PORT_OPTIONS:MAUTH_LDAP} && ${PORT_OPTIONS:MAUTH_SASL} -external_acl+= kerberos_ldap_group +EXTERNAL_ACL+= kerberos_ldap_group . endif -negotiate_auth= kerberos wrapper -PLIST_SUB+= AUTH_KERB="" -.endif - -# Make it build on FreeBSD < 10 -.if ${PORT_OPTIONS:MGSSAPI_BASE} -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-build-8-9 +NEGOTIATE_AUTH= kerberos wrapper .endif -CONFIGURE_ARGS+= --enable-auth-basic="${basic_auth}" \ - --enable-auth-digest="${digest_auth}" \ - --enable-external-acl-helpers="${external_acl}" \ - --enable-auth-negotiate="${negotiate_auth}" \ - --enable-auth-ntlm="${ntlm_auth}" - -# Storage schemes: -storage_schemes= ufs -diskio_modules= AIO Blocking IpcIo Mmapped - -.if ${PORT_OPTIONS:MFS_AUFS} -storage_schemes+= aufs -diskio_modules+= DiskThreads -# Nil aufs threads is default, set any other value via SQUID_CONFIGURE_ARGS, -# e.g. SQUID_CONFIGURE_ARGS=--with-aufs-threads=N -LDFLAGS+= -pthread -.else -CONFIGURE_ARGS+= --without-pthreads -.endif - -.if ${PORT_OPTIONS:MFS_DISKD} -storage_schemes+= diskd -diskio_modules+= DiskDaemon -.endif - -.if ${PORT_OPTIONS:MFS_ROCK} -storage_schemes+= rock -.endif - -CONFIGURE_ARGS+= --enable-storeio="${storage_schemes}" \ - --enable-disk-io="${diskio_modules}" - -# Log daemon helpers: -logdaemon_helpers= file -CONFIGURE_ARGS+= --enable-log-daemon-helpers="${logdaemon_helpers}" - -# URL rewrite helpers: -url_rewrite_helpers= fake -CONFIGURE_ARGS+= --enable-url-rewrite-helpers="${url_rewrite_helpers}" - -# Storeid rewrite helpers: -storeid_rewrite_helpers= file -CONFIGURE_ARGS+= --enable-storeid-rewrite-helpers="${storeid_rewrite_helpers}" +# Storage schemes +STORAGE_SCHEMES+= ufs +DISKIO_MODULES+= AIO Blocking IpcIo Mmapped + +CONFIGURE_ARGS+= --enable-auth-basic="${BASIC_AUTH}" \ + --enable-auth-digest="file" \ + --enable-external-acl-helpers="${EXTERNAL_ACL}" \ + --enable-auth-negotiate="${NEGOTIATE_AUTH}" \ + --enable-auth-ntlm="fake smb_lm" \ + --enable-storeio="${STORAGE_SCHEMES}" \ + --enable-disk-io="${DISKIO_MODULES}" \ + --enable-log-daemon-helpers="file" \ + --enable-url-rewrite-helpers="fake" \ + --enable-storeid-rewrite-helpers="file" # Other options set via 'make config': -.if ${PORT_OPTIONS:MSSL} -# we need to .include bsd.openssl.mk manually here.because USE_OPENSSL only -# works when it is defined before bsd.port{.pre}.mk is .included. -# This makes it currently impossible to combine this macro with OPTIONS to -# conditionally include OpenSSL support. -# XXX: is this still true with OptionsNG as of 2015-03? -#.include "${.CURDIR}/../../Mk/bsd.openssl.mk" -.include "${PORTSDIR}/Mk/bsd.openssl.mk" -CONFIGURE_ARGS+= --with-openssl="${OPENSSLBASE}" -CFLAGS+= -I${OPENSSLINC} -LDFLAGS+= -L${OPENSSLLIB} -.endif - -.if ${PORT_OPTIONS:MSSL_CRTD} && !${PORT_OPTIONS:MSSL} -IGNORE=SSL_CRTD option can be used only if SSL option is enabled -.endif - -.if ${PORT_OPTIONS:MSTACKTRACES} -CFLAGS+= -g -LDFLAGS+= -lunwind -L${LOCALBASE}/lib -STRIP= -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gen-stacktrace -.endif - .if ${PORT_OPTIONS:MDEBUG} || defined(WITH_DEBUG) CONFIGURE_ARGS+= --disable-optimizations --enable-debug-cbdata WITH_DEBUG?= yes From owner-svn-ports-branches@freebsd.org Mon May 16 05:03: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 0FFC1B3CAFC; Mon, 16 May 2016 05:03:48 +0000 (UTC) (envelope-from lwhsu@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 D538217DE; Mon, 16 May 2016 05:03:47 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4G53luR035543; Mon, 16 May 2016 05:03:47 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4G53kpo035541; Mon, 16 May 2016 05:03:46 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <201605160503.u4G53kpo035541@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Mon, 16 May 2016 05:03:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r415305 - branches/2016Q2/devel/jenkins-lts 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.22 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: Mon, 16 May 2016 05:03:48 -0000 Author: lwhsu Date: Mon May 16 05:03:46 2016 New Revision: 415305 URL: https://svnweb.freebsd.org/changeset/ports/415305 Log: MFH: r415048 - Update to 1.651.2 Security: e387834a-17ef-11e6-9947-7054d2909b71 Approved by: swills (implicitly) Approved by: ports-secteam (junovitch) Modified: branches/2016Q2/devel/jenkins-lts/Makefile branches/2016Q2/devel/jenkins-lts/distinfo Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/devel/jenkins-lts/Makefile ============================================================================== --- branches/2016Q2/devel/jenkins-lts/Makefile Mon May 16 04:02:23 2016 (r415304) +++ branches/2016Q2/devel/jenkins-lts/Makefile Mon May 16 05:03:46 2016 (r415305) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= jenkins -PORTVERSION= 1.642.2 +PORTVERSION= 1.651.2 CATEGORIES= devel java MASTER_SITES= http://mirrors.jenkins-ci.org/war-stable/${PORTVERSION}/ PKGNAMESUFFIX= -lts Modified: branches/2016Q2/devel/jenkins-lts/distinfo ============================================================================== --- branches/2016Q2/devel/jenkins-lts/distinfo Mon May 16 04:02:23 2016 (r415304) +++ branches/2016Q2/devel/jenkins-lts/distinfo Mon May 16 05:03:46 2016 (r415305) @@ -1,2 +1,2 @@ -SHA256 (jenkins/1.642.2/jenkins.war) = 024b04524f230dea62424de95f372d8c89ed942b21dbef68117b259842b96907 -SIZE (jenkins/1.642.2/jenkins.war) = 63668826 +SHA256 (jenkins/1.651.2/jenkins.war) = 1e239db19071beaac3f2db3ec6a568346bbeb9087f5f0fcf19adf6ae62cbcc2b +SIZE (jenkins/1.651.2/jenkins.war) = 64673620 From owner-svn-ports-branches@freebsd.org Mon May 16 05:05:58 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 338E7B3CB8D; Mon, 16 May 2016 05:05:58 +0000 (UTC) (envelope-from lwhsu@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 00AFA197B; Mon, 16 May 2016 05:05:57 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4G55vO8035774; Mon, 16 May 2016 05:05:57 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4G55vii035772; Mon, 16 May 2016 05:05:57 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <201605160505.u4G55vii035772@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Mon, 16 May 2016 05:05:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r415306 - branches/2016Q2/devel/jenkins2 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.22 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: Mon, 16 May 2016 05:05:58 -0000 Author: lwhsu Date: Mon May 16 05:05:56 2016 New Revision: 415306 URL: https://svnweb.freebsd.org/changeset/ports/415306 Log: MFH: r415047 - Update to 2.3 Security: e387834a-17ef-11e6-9947-7054d2909b71 Approved by: ports-secteam (junovitch) Modified: branches/2016Q2/devel/jenkins2/Makefile branches/2016Q2/devel/jenkins2/distinfo Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/devel/jenkins2/Makefile ============================================================================== --- branches/2016Q2/devel/jenkins2/Makefile Mon May 16 05:03:46 2016 (r415305) +++ branches/2016Q2/devel/jenkins2/Makefile Mon May 16 05:05:56 2016 (r415306) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= jenkins2 -DISTVERSION= 2.0-beta1 +DISTVERSION= 2.3 CATEGORIES= devel java MASTER_SITES= http://mirrors.jenkins-ci.org/war-rc/${PORTVERSION:R}/ DISTNAME= jenkins Modified: branches/2016Q2/devel/jenkins2/distinfo ============================================================================== --- branches/2016Q2/devel/jenkins2/distinfo Mon May 16 05:03:46 2016 (r415305) +++ branches/2016Q2/devel/jenkins2/distinfo Mon May 16 05:05:56 2016 (r415306) @@ -1,2 +1,2 @@ -SHA256 (jenkins2/2.0.b1/jenkins.war) = 7ff7759e1d7a097e018c8001db5f4248db04d0bf39f9b0f06934c124a936cfa2 -SIZE (jenkins2/2.0.b1/jenkins.war) = 66520816 +SHA256 (jenkins2/2.3/jenkins.war) = e1a17311776daee38cb1c3a5e687140f39b8dc922d142f4b9c457803f76aa974 +SIZE (jenkins2/2.3/jenkins.war) = 66587456 From owner-svn-ports-branches@freebsd.org Mon May 16 05:07:51 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 06605B3CC10; Mon, 16 May 2016 05:07:51 +0000 (UTC) (envelope-from lwhsu@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 CC80D1A6A; Mon, 16 May 2016 05:07:50 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4G57oB9035986; Mon, 16 May 2016 05:07:50 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4G57nih035984; Mon, 16 May 2016 05:07:49 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <201605160507.u4G57nih035984@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Mon, 16 May 2016 05:07:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r415307 - branches/2016Q2/devel/jenkins 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.22 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: Mon, 16 May 2016 05:07:51 -0000 Author: lwhsu Date: Mon May 16 05:07:49 2016 New Revision: 415307 URL: https://svnweb.freebsd.org/changeset/ports/415307 Log: MFH: r415046 - Update to 2.3 Security: e387834a-17ef-11e6-9947-7054d2909b71 Approved by: ports-secteam (junovitch) Modified: branches/2016Q2/devel/jenkins/Makefile branches/2016Q2/devel/jenkins/distinfo Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/devel/jenkins/Makefile ============================================================================== --- branches/2016Q2/devel/jenkins/Makefile Mon May 16 05:05:56 2016 (r415306) +++ branches/2016Q2/devel/jenkins/Makefile Mon May 16 05:07:49 2016 (r415307) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= jenkins -PORTVERSION= 1.655 -PORTREVISION= 1 +PORTVERSION= 2.3 CATEGORIES= devel java MASTER_SITES= http://mirrors.jenkins-ci.org/war/${PORTVERSION}/ DISTNAME= jenkins Modified: branches/2016Q2/devel/jenkins/distinfo ============================================================================== --- branches/2016Q2/devel/jenkins/distinfo Mon May 16 05:05:56 2016 (r415306) +++ branches/2016Q2/devel/jenkins/distinfo Mon May 16 05:07:49 2016 (r415307) @@ -1,2 +1,2 @@ -SHA256 (jenkins/1.655/jenkins.war) = 0cee889af697c115961ce50229cc5e39d1b798c0a0a689687b745c0a938c8547 -SIZE (jenkins/1.655/jenkins.war) = 64683155 +SHA256 (jenkins/2.3/jenkins.war) = e1a17311776daee38cb1c3a5e687140f39b8dc922d142f4b9c457803f76aa974 +SIZE (jenkins/2.3/jenkins.war) = 66587456 From owner-svn-ports-branches@freebsd.org Mon May 16 12:34: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 04B52B3C300; Mon, 16 May 2016 12:34:47 +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 B13941AEB; Mon, 16 May 2016 12:34:46 +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 u4GCYjo3074559; Mon, 16 May 2016 12:34:45 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4GCYjDH074557; Mon, 16 May 2016 12:34:45 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201605161234.u4GCYjDH074557@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Mon, 16 May 2016 12:34:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r415320 - branches/2016Q2/mail/postfix 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.22 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: Mon, 16 May 2016 12:34:47 -0000 Author: ohauer Date: Mon May 16 12:34:45 2016 New Revision: 415320 URL: https://svnweb.freebsd.org/changeset/ports/415320 Log: MFH: r415286 - update to 3.1.1 Changelog: 20160228 Documentation: typos in postfix-tls-script(1) manpage. 20160327 Documentation: line wrapping in postconf(1) manpage. 20160310 Bugfix (introduced: Postfix 2.6): the Milter SMFIR_CHGFROM (replace sender) request lost the sender_bcc_maps address. Fixed by moving some record keeping to the sender output function. Files: cleanup/cleanup_envelope.c, cleanup/cleanup_addr.c, cleanup/cleanup_milter.c, cleanup/cleanup.h, regression tests. 20160410 Bugfix (introduced: Postfix 2.6): the "bad filetype" header_checks pattern falsely rejected Content-Mumble headers with ``name="example"; x-apple-part-url="example.com"''. Fixed by respecting the ";" separator between content attribute values. Reported by Cedric Knight. File: proto/header_checks. 20160515 Portability: OpenBSD 6.0. Files: makedefs, util/sys_defs.h. Approved by: ports-secteam (feld@) Modified: branches/2016Q2/mail/postfix/Makefile branches/2016Q2/mail/postfix/distinfo Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/mail/postfix/Makefile ============================================================================== --- branches/2016Q2/mail/postfix/Makefile Mon May 16 12:28:16 2016 (r415319) +++ branches/2016Q2/mail/postfix/Makefile Mon May 16 12:34:45 2016 (r415320) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= postfix -PORTVERSION= 3.1.0 +PORTVERSION= 3.1.1 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/ \ Modified: branches/2016Q2/mail/postfix/distinfo ============================================================================== --- branches/2016Q2/mail/postfix/distinfo Mon May 16 12:28:16 2016 (r415319) +++ branches/2016Q2/mail/postfix/distinfo Mon May 16 12:34:45 2016 (r415320) @@ -1,2 +1,3 @@ -SHA256 (postfix/postfix-3.1.0.tar.gz) = 88ac3e92755629077d9363319b1fa0db406efb10c2f22cdbb941bd8ab36fd733 -SIZE (postfix/postfix-3.1.0.tar.gz) = 4336709 +TIMESTAMP = 1463345893 +SHA256 (postfix/postfix-3.1.1.tar.gz) = 3deda4c34631970490b1b5fbb559905f93531bf1c7eb00e38b0d0deb1dba9982 +SIZE (postfix/postfix-3.1.1.tar.gz) = 4337295 From owner-svn-ports-branches@freebsd.org Tue May 17 02:04:09 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 7A7D0B3E7AE; Tue, 17 May 2016 02:04:09 +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 3B2EE1168; Tue, 17 May 2016 02:04:09 +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 u4H248tR036456; Tue, 17 May 2016 02:04:08 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4H248ar036453; Tue, 17 May 2016 02:04:08 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201605170204.u4H248ar036453@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 17 May 2016 02:04:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r415369 - branches/2016Q2/games/openra 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.22 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, 17 May 2016 02:04:09 -0000 Author: jbeich Date: Tue May 17 02:04:08 2016 New Revision: 415369 URL: https://svnweb.freebsd.org/changeset/ports/415369 Log: MFH: r414854 games/openra: update to 20160403 Changes: https://github.com/OpenRA/OpenRA/wiki/Changelog#release-20160508 Approved by: ports-secteam (junovitch) Modified: branches/2016Q2/games/openra/Makefile branches/2016Q2/games/openra/distinfo branches/2016Q2/games/openra/pkg-plist Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/games/openra/Makefile ============================================================================== --- branches/2016Q2/games/openra/Makefile Tue May 17 01:31:01 2016 (r415368) +++ branches/2016Q2/games/openra/Makefile Tue May 17 02:04:08 2016 (r415369) @@ -1,9 +1,8 @@ # $FreeBSD$ PORTNAME= openra -PORTVERSION= 20151224 +PORTVERSION= 20160508 DISTVERSIONPREFIX= release- -PORTREVISION= 2 CATEGORIES= games # XXX Convert to USES=nuget or package dependencies instead MASTER_SITES= https://nuget.org/api/v2/package/StyleCopPlus.MSBuild/4.7.49.5?dummy=/:StyleCopPlus \ @@ -13,31 +12,36 @@ MASTER_SITES= https://nuget.org/api/v2/p https://nuget.org/api/v2/package/Newtonsoft.Json/7.0.1?dummy=/:Newtonsoft_Json \ https://nuget.org/api/v2/package/RestSharp/105.2.3?dummy=/:RestSharp \ https://nuget.org/api/v2/package/MaxMind.GeoIP2/2.3.1?dummy=/:MaxMind_GeoIP2 \ - https://nuget.org/api/v2/package/SharpFont/3.0.1?dummy=/:SharpFont \ - https://nuget.org/api/v2/package/NUnit/2.6.4?dummy=/:NUnit \ - https://nuget.org/api/v2/package/Mono.Nat/1.2.21?dummy=/:Mono_Nat \ + https://nuget.org/api/v2/package/SharpFont/3.1.0?dummy=/:SharpFont \ + https://nuget.org/api/v2/package/NUnit/3.0.1?dummy=/:NUnit \ + https://nuget.org/api/v2/package/NUnit.Console/3.0.1?dummy=/:NUnit_Console \ + https://nuget.org/api/v2/package/Mono.Nat/1.2.24?dummy=/:Mono_Nat \ https://nuget.org/api/v2/package/FuzzyLogicLibrary/1.2.0?dummy=/:FuzzyLogicLibrary \ https://nuget.org/api/v2/package/SmartIrc4net/0.4.5.1?dummy=/:SmartIrc4net \ - https://github.com/${GH_ACCOUNT}/SDL2-CS/releases/download/20150709/:SDL2_CS \ - https://github.com/${GH_ACCOUNT}/Eluant/releases/download/20140425/:Eluant \ + https://github.com/${GH_ACCOUNT}/SDL2-CS/releases/download/20151227/:SDL2_CS \ + https://github.com/${GH_ACCOUNT}/OpenAL-CS/releases/download/20151227/:OpenAL_CS \ + https://github.com/${GH_ACCOUNT}/Eluant/releases/download/20160124/:Eluant \ https://geolite.maxmind.com/download/geoip/database/:GeoLite2 -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - StyleCopPlus.MSBuild-4.7.49.5.zip:StyleCopPlus \ +DISTFILES= StyleCopPlus.MSBuild-4.7.49.5.zip:StyleCopPlus \ StyleCop.MSBuild-4.7.49.0.zip:StyleCop \ SharpZipLib-0.86.0.zip:SharpZipLib \ MaxMind.Db-1.1.0.0.zip:MaxMind_Db \ Newtonsoft.Json-7.0.1.zip:Newtonsoft_Json \ RestSharp-105.2.3.zip:RestSharp \ MaxMind.GeoIP2-2.3.1.zip:MaxMind_GeoIP2 \ - SharpFont-3.0.1.zip:SharpFont \ - NUnit-2.6.4.zip:NUnit \ - Mono.Nat-1.2.21.zip:Mono_Nat \ + SharpFont-3.1.0.zip:SharpFont \ + NUnit-3.0.1.zip:NUnit \ + NUnit.Console-3.0.1.zip:NUnit_Console \ + Mono.Nat-1.2.24.zip:Mono_Nat \ FuzzyLogicLibrary-1.2.0.zip:FuzzyLogicLibrary \ SmartIrc4net-0.4.5.1.zip:SmartIrc4net \ SDL2-CS.dll:SDL2_CS \ + SDL2-CS.dll.config:SDL2_CS \ + OpenAL-CS.dll:OpenAL_CS \ + OpenAL-CS.dll.config:OpenAL_CS \ Eluant.dll:Eluant \ GeoLite2-Country.mmdb.gz:GeoLite2 -EXTRACT_ONLY= ${DISTFILES:C/:.*//:N*.dll:N*.mmdb*} +EXTRACT_ONLY= ${DISTFILES:C/:.*//:N*.dll:N*.config:N*.mmdb*} MAINTAINER= jbeich@FreeBSD.org COMMENT= Multiplayer re-envisioning of early RTS games by Westwood Studios Modified: branches/2016Q2/games/openra/distinfo ============================================================================== --- branches/2016Q2/games/openra/distinfo Tue May 17 01:31:01 2016 (r415368) +++ branches/2016Q2/games/openra/distinfo Tue May 17 02:04:08 2016 (r415369) @@ -1,5 +1,3 @@ -SHA256 (openra-OpenRA-release-20151224_GH0.tar.gz) = 71e127351f6053ae575c426a75d30987e996d04e87bf4147d623175f83efea35 -SIZE (openra-OpenRA-release-20151224_GH0.tar.gz) = 10722496 SHA256 (StyleCopPlus.MSBuild-4.7.49.5.zip) = b98a8ed20c5e82ff5fe6c2a52ecd45bffd4d4ab284611f35a25889c3bba364c3 SIZE (StyleCopPlus.MSBuild-4.7.49.5.zip) = 124724 SHA256 (StyleCop.MSBuild-4.7.49.0.zip) = 6680dedaa5d27fb1ead475015de98e476e58fa9a27e4b7ad0f08d5f7d8f6ee66 @@ -14,19 +12,29 @@ SHA256 (RestSharp-105.2.3.zip) = 352845b SIZE (RestSharp-105.2.3.zip) = 1152099 SHA256 (MaxMind.GeoIP2-2.3.1.zip) = ee613b3934df9bc3ba0a9049fc98323cd856a091b7ce97578d2ac86ae56e84e8 SIZE (MaxMind.GeoIP2-2.3.1.zip) = 22978 -SHA256 (SharpFont-3.0.1.zip) = 1a4e4d0a5e7a7adebb5093d21655e3166da801abc469dc41c586f555514cc3bc -SIZE (SharpFont-3.0.1.zip) = 60372 -SHA256 (NUnit-2.6.4.zip) = be8cde6e9754474d5d4f553addb6331cf442c2182a0eb4dc87618d744fd59ca9 -SIZE (NUnit-2.6.4.zip) = 99004 -SHA256 (Mono.Nat-1.2.21.zip) = fa380d8b531069e0dd7a5d8dffe70b128f591205e432074280859b9e65853d04 -SIZE (Mono.Nat-1.2.21.zip) = 23598 +SHA256 (SharpFont-3.1.0.zip) = 0256291172dd1fc767c37988dc515e2e4e425724db9eae3188207e124928fe8c +SIZE (SharpFont-3.1.0.zip) = 61251 +SHA256 (NUnit-3.0.1.zip) = 17ac607de03c861b9595fe7063ea5fe7ed60b72d063fb9c3ba2aeff4f61c72bc +SIZE (NUnit-3.0.1.zip) = 990994 +SHA256 (NUnit.Console-3.0.1.zip) = b744e7921a6d8e4fccd4c05cf50b040b6c8d11c4c7346ed1f6ba242b2ac78b94 +SIZE (NUnit.Console-3.0.1.zip) = 470168 +SHA256 (Mono.Nat-1.2.24.zip) = 5af2524a915dd269714c89be2096bfba34702a1a7a7ccc726a6cce102053d36d +SIZE (Mono.Nat-1.2.24.zip) = 23997 SHA256 (FuzzyLogicLibrary-1.2.0.zip) = b464509236260f53d963771ed99410a7e1cdbd268a2bde43b189e7d15044a174 SIZE (FuzzyLogicLibrary-1.2.0.zip) = 70571 SHA256 (SmartIrc4net-0.4.5.1.zip) = a1c2b2be28d798187ecd118768b03ca3193995182d1d92983df23bacbb61dfcc SIZE (SmartIrc4net-0.4.5.1.zip) = 104627 -SHA256 (SDL2-CS.dll) = acb68619a8043b044f55a0e3bf9eaaf7b418962dd58757defd6d74c0132f4757 -SIZE (SDL2-CS.dll) = 2884608 -SHA256 (Eluant.dll) = abb67679c241ae35a430f79696792cbd9093ceda5998f6f578d0fd763ee440b0 -SIZE (Eluant.dll) = 64000 -SHA256 (GeoLite2-Country.mmdb.gz) = 593c63d2861f7163b78a02a5e95c5e166cc0928650cad50e795c68045f40b91c -SIZE (GeoLite2-Country.mmdb.gz) = 1108460 +SHA256 (SDL2-CS.dll) = 76206c2795cd3fae569fececb95025d1f9d92c618e2625188510b3331e171c3f +SIZE (SDL2-CS.dll) = 86016 +SHA256 (SDL2-CS.dll.config) = eff0594f7e86d40a94c1b28f8db87478f3de1cf0857f3d46e384bcc6744ce094 +SIZE (SDL2-CS.dll.config) = 194 +SHA256 (OpenAL-CS.dll) = d33391fd954c670a3ba3db2d1553015f78652ea33ca3eaf949da6377ec947e53 +SIZE (OpenAL-CS.dll) = 18944 +SHA256 (OpenAL-CS.dll.config) = 58eaf46a749e466fce0a0ec43184073b0153aa8eb24c865219491bc1db989571 +SIZE (OpenAL-CS.dll.config) = 301 +SHA256 (Eluant.dll) = 218c4ea5424b44d746b5343563123beebc652fd9731967dfd49fed071b58df31 +SIZE (Eluant.dll) = 71168 +SHA256 (GeoLite2-Country.mmdb.gz) = 3bcd3e85566620ff316ed1a6f9f2a0df7cbc6c35ed069b5fdcc57d2235d80229 +SIZE (GeoLite2-Country.mmdb.gz) = 1150718 +SHA256 (openra-OpenRA-release-20160508_GH0.tar.gz) = 277f9bf9dbe4e9a0a3b66e6207cfc8dfee41e47b070af59229c50238db5e25ef +SIZE (openra-OpenRA-release-20160508_GH0.tar.gz) = 11617816 Modified: branches/2016Q2/games/openra/pkg-plist ============================================================================== --- branches/2016Q2/games/openra/pkg-plist Tue May 17 01:31:01 2016 (r415368) +++ branches/2016Q2/games/openra/pkg-plist Tue May 17 02:04:08 2016 (r415369) @@ -1,4 +1,5 @@ bin/openra +bin/openra-server share/applications/openra-join-servers.desktop share/applications/openra-replays.desktop share/applications/openra.desktop From owner-svn-ports-branches@freebsd.org Tue May 17 06:06:54 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 78C2EB3E54E; Tue, 17 May 2016 06:06:54 +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 30ECE12D0; Tue, 17 May 2016 06:06:54 +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 u4H66rPf009982; Tue, 17 May 2016 06:06:53 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4H66rsK009980; Tue, 17 May 2016 06:06:53 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201605170606.u4H66rsK009980@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Tue, 17 May 2016 06:06:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r415375 - branches/2016Q2/mail/postfix211 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.22 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, 17 May 2016 06:06:54 -0000 Author: ohauer Date: Tue May 17 06:06:53 2016 New Revision: 415375 URL: https://svnweb.freebsd.org/changeset/ports/415375 Log: MFH: r415321 - update to 2.11.8 Changelog: 20160310 Bugfix (introduced: Postfix 2.6): the Milter SMFIR_CHGFROM (replace sender) request lost the sender_bcc_maps address. Fixed by moving some record keeping to the sender output function. Files: cleanup/cleanup_envelope.c, cleanup/cleanup_addr.c, cleanup/cleanup_milter.c, cleanup/cleanup.h, regression tests. 20160410 Bugfix (introduced: Postfix 2.6): the "bad filetype" header_checks pattern falsely rejected Content-Mumble headers with ``name="example"; x-apple-part-url="example.com"''. Fixed by respecting the ";" separator between content attribute values. Reported by Cedric Knight. File: proto/header_checks. 20160515 Portability: OpenBSD 6.0. Files: makedefs, util/sys_defs.h. Approved by: ports-secteam (junovitch@) Modified: branches/2016Q2/mail/postfix211/Makefile branches/2016Q2/mail/postfix211/distinfo Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/mail/postfix211/Makefile ============================================================================== --- branches/2016Q2/mail/postfix211/Makefile Tue May 17 05:23:06 2016 (r415374) +++ branches/2016Q2/mail/postfix211/Makefile Tue May 17 06:06:53 2016 (r415375) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= postfix -PORTVERSION= 2.11.7 -PORTREVISION= 2 +PORTVERSION= 2.11.8 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/ \ Modified: branches/2016Q2/mail/postfix211/distinfo ============================================================================== --- branches/2016Q2/mail/postfix211/distinfo Tue May 17 05:23:06 2016 (r415374) +++ branches/2016Q2/mail/postfix211/distinfo Tue May 17 06:06:53 2016 (r415375) @@ -1,6 +1,5 @@ -SHA256 (postfix/postfix-2.11.7.tar.gz) = 05828b5b846e48fdc80db67d85409066010614af521070df4733459fbf447e20 -SIZE (postfix/postfix-2.11.7.tar.gz) = 4031689 -SHA256 (postfix/postfix-2.8.0-libspf2-1.2.x-0.patch.gz) = e5c38e5bc226cab109c02a4e530ab1aefd3bb06f2169f3e052bdf83d2727aacc -SIZE (postfix/postfix-2.8.0-libspf2-1.2.x-0.patch.gz) = 8191 +TIMESTAMP = 1463402666 +SHA256 (postfix/postfix-2.11.8.tar.gz) = 3c4ece0846b519e2e800608f3009e929a3c2a1c7841bf07397ec9edc7463c923 +SIZE (postfix/postfix-2.11.8.tar.gz) = 4032263 SHA256 (postfix/postfix-vda-v13-2.10.0.patch) = 6208021eb0b37ac6482e334e538ed5700cc22c4d4dd66ed9e975ae5f20bf935f SIZE (postfix/postfix-vda-v13-2.10.0.patch) = 55701 From owner-svn-ports-branches@freebsd.org Wed May 18 22:34:41 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 D01D1B41E13; Wed, 18 May 2016 22:34:41 +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 A0B1A11E8; Wed, 18 May 2016 22:34:41 +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 u4IMYe8X057353; Wed, 18 May 2016 22:34:40 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4IMYeYM057352; Wed, 18 May 2016 22:34:40 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201605182234.u4IMYeYM057352@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Wed, 18 May 2016 22:34:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r415467 - branches/2016Q2/multimedia/ffmpeg 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.22 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: Wed, 18 May 2016 22:34:41 -0000 Author: riggs Date: Wed May 18 22:34:40 2016 New Revision: 415467 URL: https://svnweb.freebsd.org/changeset/ports/415467 Log: MFH: r415463 Fix runtime issue: libvdpau must be LIB_DEPENDS PR: 209619 Submitted by: walter@lifeforms.nl Approved by: ports-secteam (feld) Modified: branches/2016Q2/multimedia/ffmpeg/Makefile Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/multimedia/ffmpeg/Makefile ============================================================================== --- branches/2016Q2/multimedia/ffmpeg/Makefile Wed May 18 22:17:09 2016 (r415466) +++ branches/2016Q2/multimedia/ffmpeg/Makefile Wed May 18 22:34:40 2016 (r415467) @@ -3,7 +3,7 @@ PORTNAME= ffmpeg PORTVERSION= 2.8.6 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ @@ -312,7 +312,7 @@ VAAPI_LIB_DEPENDS= libva.so:multimedia/l VAAPI_CONFIGURE_ENABLE= vaapi # vdpau -VDPAU_BUILD_DEPENDS= ${LOCALBASE}/include/vdpau/vdpau.h:multimedia/libvdpau +VDPAU_LIB_DEPENDS= libvdpau.so:multimedia/libvdpau VDPAU_CONFIGURE_ENABLE= vdpau # armv6 From owner-svn-ports-branches@freebsd.org Fri May 20 01:08:15 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 3F72EB41F20; Fri, 20 May 2016 01:08:15 +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 0782F1BA7; Fri, 20 May 2016 01:08:14 +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 u4K18EOM082506; Fri, 20 May 2016 01:08:14 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4K18DCT082502; Fri, 20 May 2016 01:08:13 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201605200108.u4K18DCT082502@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Fri, 20 May 2016 01:08:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r415535 - in branches/2016Q2/textproc/expat2: . 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.22 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, 20 May 2016 01:08:15 -0000 Author: junovitch Date: Fri May 20 01:08:13 2016 New Revision: 415535 URL: https://svnweb.freebsd.org/changeset/ports/415535 Log: MFH: r415534 textproc/expat2: update 2.1.0 -> 2.1.1 - Update USES for new release format - Drop CVE-2015-1283 patch now included in this release - Add patch for CVE-2016-0718 PR: 209360 Submitted by: tijl Approved by: ports-secteam (with hat) Security: CVE-2016-0718 Security: https://vuxml.FreeBSD.org/freebsd/57b3aba7-1e25-11e6-8dd3-002590263bf5.html Added: branches/2016Q2/textproc/expat2/files/patch-CVE-2016-0718-v2-2-1 - copied unchanged from r415534, head/textproc/expat2/files/patch-CVE-2016-0718-v2-2-1 Deleted: branches/2016Q2/textproc/expat2/files/CVE-2015-1283.patch Modified: branches/2016Q2/textproc/expat2/Makefile branches/2016Q2/textproc/expat2/distinfo branches/2016Q2/textproc/expat2/pkg-plist Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/textproc/expat2/Makefile ============================================================================== --- branches/2016Q2/textproc/expat2/Makefile Fri May 20 01:07:16 2016 (r415534) +++ branches/2016Q2/textproc/expat2/Makefile Fri May 20 01:08:13 2016 (r415535) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= expat -PORTVERSION= 2.1.0 -PORTREVISION= 3 +PORTVERSION= 2.1.1 CATEGORIES= textproc MASTER_SITES= SF @@ -12,14 +11,9 @@ COMMENT= XML 1.0 parser written in C GNU_CONFIGURE= yes ALL_TARGET= default -USES= libtool pathfix +USES= libtool pathfix tar:bz2 USE_LDCONFIG= yes -EXTRA_PATCHES= ${FILESDIR}/CVE-2015-1283.patch:-p1 - -post-patch: - @${REINPLACE_CMD} -e '/^DESTDIR =/d' ${WRKSRC}/Makefile.in - post-stage: ${LN} -s libexpat.so.1 ${STAGEDIR}${PREFIX}/lib/libexpat.so.6 Modified: branches/2016Q2/textproc/expat2/distinfo ============================================================================== --- branches/2016Q2/textproc/expat2/distinfo Fri May 20 01:07:16 2016 (r415534) +++ branches/2016Q2/textproc/expat2/distinfo Fri May 20 01:08:13 2016 (r415535) @@ -1,2 +1,3 @@ -SHA256 (expat-2.1.0.tar.gz) = 823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86 -SIZE (expat-2.1.0.tar.gz) = 562616 +TIMESTAMP = 1463705024 +SHA256 (expat-2.1.1.tar.bz2) = aff584e5a2f759dcfc6d48671e9529f6afe1e30b0cd6a4cec200cbe3f793de67 +SIZE (expat-2.1.1.tar.bz2) = 405103 Copied: branches/2016Q2/textproc/expat2/files/patch-CVE-2016-0718-v2-2-1 (from r415534, head/textproc/expat2/files/patch-CVE-2016-0718-v2-2-1) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/textproc/expat2/files/patch-CVE-2016-0718-v2-2-1 Fri May 20 01:08:13 2016 (r415535, copy of r415534, head/textproc/expat2/files/patch-CVE-2016-0718-v2-2-1) @@ -0,0 +1,754 @@ +From cdfcb1b5c95e93b00ae9e9d25708b4a3bee72c15 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping +Date: Mon, 2 May 2016 00:02:44 +0200 +Subject: [PATCH] Address CVE-2016-0718 (/patch/ version 2.2.1) + +* Out of bounds memory access when doing text conversion on malformed input +* Integer overflow related to memory allocation + +Reported by Gustavo Grieco + +Patch credits go to +* Christian Heimes +* Karl Waclawek +* Gustavo Grieco +* Sebastian Pipping +* Pascal Cuoq +--- + expat/lib/xmlparse.c | 34 +++++++++----- + expat/lib/xmltok.c | 115 +++++++++++++++++++++++++++++++++++------------- + expat/lib/xmltok.h | 10 ++++- + expat/lib/xmltok_impl.c | 62 +++++++++++++------------- + 4 files changed, 146 insertions(+), 75 deletions(-) + +diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c +index e308c79..13e080d 100644 +--- lib/xmlparse.c ++++ lib/xmlparse.c +@@ -2426,11 +2426,11 @@ doContent(XML_Parser parser, + for (;;) { + int bufSize; + int convLen; +- XmlConvert(enc, ++ const enum XML_Convert_Result convert_res = XmlConvert(enc, + &fromPtr, rawNameEnd, + (ICHAR **)&toPtr, (ICHAR *)tag->bufEnd - 1); + convLen = (int)(toPtr - (XML_Char *)tag->buf); +- if (fromPtr == rawNameEnd) { ++ if ((convert_res == XML_CONVERT_COMPLETED) || (convert_res == XML_CONVERT_INPUT_INCOMPLETE)) { + tag->name.strLen = convLen; + break; + } +@@ -2651,11 +2651,11 @@ doContent(XML_Parser parser, + if (MUST_CONVERT(enc, s)) { + for (;;) { + ICHAR *dataPtr = (ICHAR *)dataBuf; +- XmlConvert(enc, &s, next, &dataPtr, (ICHAR *)dataBufEnd); ++ const enum XML_Convert_Result convert_res = XmlConvert(enc, &s, next, &dataPtr, (ICHAR *)dataBufEnd); + *eventEndPP = s; + charDataHandler(handlerArg, dataBuf, + (int)(dataPtr - (ICHAR *)dataBuf)); +- if (s == next) ++ if ((convert_res == XML_CONVERT_COMPLETED) || (convert_res == XML_CONVERT_INPUT_INCOMPLETE)) + break; + *eventPP = s; + } +@@ -3261,11 +3261,11 @@ doCdataSection(XML_Parser parser, + if (MUST_CONVERT(enc, s)) { + for (;;) { + ICHAR *dataPtr = (ICHAR *)dataBuf; +- XmlConvert(enc, &s, next, &dataPtr, (ICHAR *)dataBufEnd); ++ const enum XML_Convert_Result convert_res = XmlConvert(enc, &s, next, &dataPtr, (ICHAR *)dataBufEnd); + *eventEndPP = next; + charDataHandler(handlerArg, dataBuf, + (int)(dataPtr - (ICHAR *)dataBuf)); +- if (s == next) ++ if ((convert_res == XML_CONVERT_COMPLETED) || (convert_res == XML_CONVERT_INPUT_INCOMPLETE)) + break; + *eventPP = s; + } +@@ -5342,6 +5342,7 @@ reportDefault(XML_Parser parser, const ENCODING *enc, + const char *s, const char *end) + { + if (MUST_CONVERT(enc, s)) { ++ enum XML_Convert_Result convert_res; + const char **eventPP; + const char **eventEndPP; + if (enc == encoding) { +@@ -5354,11 +5355,11 @@ reportDefault(XML_Parser parser, const ENCODING *enc, + } + do { + ICHAR *dataPtr = (ICHAR *)dataBuf; +- XmlConvert(enc, &s, end, &dataPtr, (ICHAR *)dataBufEnd); ++ convert_res = XmlConvert(enc, &s, end, &dataPtr, (ICHAR *)dataBufEnd); + *eventEndPP = s; + defaultHandler(handlerArg, dataBuf, (int)(dataPtr - (ICHAR *)dataBuf)); + *eventPP = s; +- } while (s != end); ++ } while ((convert_res != XML_CONVERT_COMPLETED) && (convert_res != XML_CONVERT_INPUT_INCOMPLETE)); + } + else + defaultHandler(handlerArg, (XML_Char *)s, (int)((XML_Char *)end - (XML_Char *)s)); +@@ -6163,8 +6164,8 @@ poolAppend(STRING_POOL *pool, const ENCODING *enc, + if (!pool->ptr && !poolGrow(pool)) + return NULL; + for (;;) { +- XmlConvert(enc, &ptr, end, (ICHAR **)&(pool->ptr), (ICHAR *)pool->end); +- if (ptr == end) ++ const enum XML_Convert_Result convert_res = XmlConvert(enc, &ptr, end, (ICHAR **)&(pool->ptr), (ICHAR *)pool->end); ++ if ((convert_res == XML_CONVERT_COMPLETED) || (convert_res == XML_CONVERT_INPUT_INCOMPLETE)) + break; + if (!poolGrow(pool)) + return NULL; +@@ -6248,8 +6249,13 @@ poolGrow(STRING_POOL *pool) + } + } + if (pool->blocks && pool->start == pool->blocks->s) { +- int blockSize = (int)(pool->end - pool->start)*2; +- BLOCK *temp = (BLOCK *) ++ BLOCK *temp; ++ int blockSize = (int)((unsigned)(pool->end - pool->start)*2U); ++ ++ if (blockSize < 0) ++ return XML_FALSE; ++ ++ temp = (BLOCK *) + pool->mem->realloc_fcn(pool->blocks, + (offsetof(BLOCK, s) + + blockSize * sizeof(XML_Char))); +@@ -6264,6 +6270,10 @@ poolGrow(STRING_POOL *pool) + else { + BLOCK *tem; + int blockSize = (int)(pool->end - pool->start); ++ ++ if (blockSize < 0) ++ return XML_FALSE; ++ + if (blockSize < INIT_BLOCK_SIZE) + blockSize = INIT_BLOCK_SIZE; + else +diff --git a/expat/lib/xmltok.c b/expat/lib/xmltok.c +index bf09dfc..cb98ce1 100644 +--- lib/xmltok.c ++++ lib/xmltok.c +@@ -318,39 +318,55 @@ enum { /* UTF8_cvalN is value of masked first byte of N byte sequence */ + UTF8_cval4 = 0xf0 + }; + +-static void PTRCALL ++static enum XML_Convert_Result PTRCALL + utf8_toUtf8(const ENCODING *enc, + const char **fromP, const char *fromLim, + char **toP, const char *toLim) + { ++ enum XML_Convert_Result res = XML_CONVERT_COMPLETED; + char *to; + const char *from; + if (fromLim - *fromP > toLim - *toP) { + /* Avoid copying partial characters. */ ++ res = XML_CONVERT_OUTPUT_EXHAUSTED; + for (fromLim = *fromP + (toLim - *toP); fromLim > *fromP; fromLim--) + if (((unsigned char)fromLim[-1] & 0xc0) != 0x80) + break; + } +- for (to = *toP, from = *fromP; from != fromLim; from++, to++) ++ for (to = *toP, from = *fromP; (from < fromLim) && (to < toLim); from++, to++) + *to = *from; + *fromP = from; + *toP = to; ++ ++ if ((to == toLim) && (from < fromLim)) ++ return XML_CONVERT_OUTPUT_EXHAUSTED; ++ else ++ return res; + } + +-static void PTRCALL ++static enum XML_Convert_Result PTRCALL + utf8_toUtf16(const ENCODING *enc, + const char **fromP, const char *fromLim, + unsigned short **toP, const unsigned short *toLim) + { ++ enum XML_Convert_Result res = XML_CONVERT_COMPLETED; + unsigned short *to = *toP; + const char *from = *fromP; +- while (from != fromLim && to != toLim) { ++ while (from < fromLim && to < toLim) { + switch (((struct normal_encoding *)enc)->type[(unsigned char)*from]) { + case BT_LEAD2: ++ if (fromLim - from < 2) { ++ res = XML_CONVERT_INPUT_INCOMPLETE; ++ break; ++ } + *to++ = (unsigned short)(((from[0] & 0x1f) << 6) | (from[1] & 0x3f)); + from += 2; + break; + case BT_LEAD3: ++ if (fromLim - from < 3) { ++ res = XML_CONVERT_INPUT_INCOMPLETE; ++ break; ++ } + *to++ = (unsigned short)(((from[0] & 0xf) << 12) + | ((from[1] & 0x3f) << 6) | (from[2] & 0x3f)); + from += 3; +@@ -358,8 +374,14 @@ utf8_toUtf16(const ENCODING *enc, + case BT_LEAD4: + { + unsigned long n; +- if (to + 1 == toLim) ++ if (toLim - to < 2) { ++ res = XML_CONVERT_OUTPUT_EXHAUSTED; + goto after; ++ } ++ if (fromLim - from < 4) { ++ res = XML_CONVERT_INPUT_INCOMPLETE; ++ goto after; ++ } + n = ((from[0] & 0x7) << 18) | ((from[1] & 0x3f) << 12) + | ((from[2] & 0x3f) << 6) | (from[3] & 0x3f); + n -= 0x10000; +@@ -377,6 +399,7 @@ utf8_toUtf16(const ENCODING *enc, + after: + *fromP = from; + *toP = to; ++ return res; + } + + #ifdef XML_NS +@@ -425,7 +448,7 @@ static const struct normal_encoding internal_utf8_encoding = { + STANDARD_VTABLE(sb_) NORMAL_VTABLE(utf8_) + }; + +-static void PTRCALL ++static enum XML_Convert_Result PTRCALL + latin1_toUtf8(const ENCODING *enc, + const char **fromP, const char *fromLim, + char **toP, const char *toLim) +@@ -433,30 +456,35 @@ latin1_toUtf8(const ENCODING *enc, + for (;;) { + unsigned char c; + if (*fromP == fromLim) +- break; ++ return XML_CONVERT_COMPLETED; + c = (unsigned char)**fromP; + if (c & 0x80) { + if (toLim - *toP < 2) +- break; ++ return XML_CONVERT_OUTPUT_EXHAUSTED; + *(*toP)++ = (char)((c >> 6) | UTF8_cval2); + *(*toP)++ = (char)((c & 0x3f) | 0x80); + (*fromP)++; + } + else { + if (*toP == toLim) +- break; ++ return XML_CONVERT_OUTPUT_EXHAUSTED; + *(*toP)++ = *(*fromP)++; + } + } + } + +-static void PTRCALL ++static enum XML_Convert_Result PTRCALL + latin1_toUtf16(const ENCODING *enc, + const char **fromP, const char *fromLim, + unsigned short **toP, const unsigned short *toLim) + { +- while (*fromP != fromLim && *toP != toLim) ++ while (*fromP < fromLim && *toP < toLim) + *(*toP)++ = (unsigned char)*(*fromP)++; ++ ++ if ((*toP == toLim) && (*fromP < fromLim)) ++ return XML_CONVERT_OUTPUT_EXHAUSTED; ++ else ++ return XML_CONVERT_COMPLETED; + } + + #ifdef XML_NS +@@ -483,13 +511,18 @@ static const struct normal_encoding latin1_encoding = { + STANDARD_VTABLE(sb_) + }; + +-static void PTRCALL ++static enum XML_Convert_Result PTRCALL + ascii_toUtf8(const ENCODING *enc, + const char **fromP, const char *fromLim, + char **toP, const char *toLim) + { +- while (*fromP != fromLim && *toP != toLim) ++ while (*fromP < fromLim && *toP < toLim) + *(*toP)++ = *(*fromP)++; ++ ++ if ((*toP == toLim) && (*fromP < fromLim)) ++ return XML_CONVERT_OUTPUT_EXHAUSTED; ++ else ++ return XML_CONVERT_COMPLETED; + } + + #ifdef XML_NS +@@ -536,13 +569,14 @@ unicode_byte_type(char hi, char lo) + } + + #define DEFINE_UTF16_TO_UTF8(E) \ +-static void PTRCALL \ ++static enum XML_Convert_Result PTRCALL \ + E ## toUtf8(const ENCODING *enc, \ + const char **fromP, const char *fromLim, \ + char **toP, const char *toLim) \ + { \ +- const char *from; \ +- for (from = *fromP; from != fromLim; from += 2) { \ ++ const char *from = *fromP; \ ++ fromLim = from + (((fromLim - from) >> 1) << 1); /* shrink to even */ \ ++ for (; from < fromLim; from += 2) { \ + int plane; \ + unsigned char lo2; \ + unsigned char lo = GET_LO(from); \ +@@ -552,7 +586,7 @@ E ## toUtf8(const ENCODING *enc, \ + if (lo < 0x80) { \ + if (*toP == toLim) { \ + *fromP = from; \ +- return; \ ++ return XML_CONVERT_OUTPUT_EXHAUSTED; \ + } \ + *(*toP)++ = lo; \ + break; \ +@@ -562,7 +596,7 @@ E ## toUtf8(const ENCODING *enc, \ + case 0x4: case 0x5: case 0x6: case 0x7: \ + if (toLim - *toP < 2) { \ + *fromP = from; \ +- return; \ ++ return XML_CONVERT_OUTPUT_EXHAUSTED; \ + } \ + *(*toP)++ = ((lo >> 6) | (hi << 2) | UTF8_cval2); \ + *(*toP)++ = ((lo & 0x3f) | 0x80); \ +@@ -570,7 +604,7 @@ E ## toUtf8(const ENCODING *enc, \ + default: \ + if (toLim - *toP < 3) { \ + *fromP = from; \ +- return; \ ++ return XML_CONVERT_OUTPUT_EXHAUSTED; \ + } \ + /* 16 bits divided 4, 6, 6 amongst 3 bytes */ \ + *(*toP)++ = ((hi >> 4) | UTF8_cval3); \ +@@ -580,7 +614,11 @@ E ## toUtf8(const ENCODING *enc, \ + case 0xD8: case 0xD9: case 0xDA: case 0xDB: \ + if (toLim - *toP < 4) { \ + *fromP = from; \ +- return; \ ++ return XML_CONVERT_OUTPUT_EXHAUSTED; \ ++ } \ ++ if (fromLim - from < 4) { \ ++ *fromP = from; \ ++ return XML_CONVERT_INPUT_INCOMPLETE; \ + } \ + plane = (((hi & 0x3) << 2) | ((lo >> 6) & 0x3)) + 1; \ + *(*toP)++ = ((plane >> 2) | UTF8_cval4); \ +@@ -596,20 +634,32 @@ E ## toUtf8(const ENCODING *enc, \ + } \ + } \ + *fromP = from; \ ++ if (from < fromLim) \ ++ return XML_CONVERT_INPUT_INCOMPLETE; \ ++ else \ ++ return XML_CONVERT_COMPLETED; \ + } + + #define DEFINE_UTF16_TO_UTF16(E) \ +-static void PTRCALL \ ++static enum XML_Convert_Result PTRCALL \ + E ## toUtf16(const ENCODING *enc, \ + const char **fromP, const char *fromLim, \ + unsigned short **toP, const unsigned short *toLim) \ + { \ ++ enum XML_Convert_Result res = XML_CONVERT_COMPLETED; \ ++ fromLim = *fromP + (((fromLim - *fromP) >> 1) << 1); /* shrink to even */ \ + /* Avoid copying first half only of surrogate */ \ + if (fromLim - *fromP > ((toLim - *toP) << 1) \ +- && (GET_HI(fromLim - 2) & 0xF8) == 0xD8) \ ++ && (GET_HI(fromLim - 2) & 0xF8) == 0xD8) { \ + fromLim -= 2; \ +- for (; *fromP != fromLim && *toP != toLim; *fromP += 2) \ ++ res = XML_CONVERT_INPUT_INCOMPLETE; \ ++ } \ ++ for (; *fromP < fromLim && *toP < toLim; *fromP += 2) \ + *(*toP)++ = (GET_HI(*fromP) << 8) | GET_LO(*fromP); \ ++ if ((*toP == toLim) && (*fromP < fromLim)) \ ++ return XML_CONVERT_OUTPUT_EXHAUSTED; \ ++ else \ ++ return res; \ + } + + #define SET2(ptr, ch) \ +@@ -1288,7 +1338,7 @@ unknown_isInvalid(const ENCODING *enc, const char *p) + return (c & ~0xFFFF) || checkCharRefNumber(c) < 0; + } + +-static void PTRCALL ++static enum XML_Convert_Result PTRCALL + unknown_toUtf8(const ENCODING *enc, + const char **fromP, const char *fromLim, + char **toP, const char *toLim) +@@ -1299,21 +1349,21 @@ unknown_toUtf8(const ENCODING *enc, + const char *utf8; + int n; + if (*fromP == fromLim) +- break; ++ return XML_CONVERT_COMPLETED; + utf8 = uenc->utf8[(unsigned char)**fromP]; + n = *utf8++; + if (n == 0) { + int c = uenc->convert(uenc->userData, *fromP); + n = XmlUtf8Encode(c, buf); + if (n > toLim - *toP) +- break; ++ return XML_CONVERT_OUTPUT_EXHAUSTED; + utf8 = buf; + *fromP += (AS_NORMAL_ENCODING(enc)->type[(unsigned char)**fromP] + - (BT_LEAD2 - 2)); + } + else { + if (n > toLim - *toP) +- break; ++ return XML_CONVERT_OUTPUT_EXHAUSTED; + (*fromP)++; + } + do { +@@ -1322,13 +1372,13 @@ unknown_toUtf8(const ENCODING *enc, + } + } + +-static void PTRCALL ++static enum XML_Convert_Result PTRCALL + unknown_toUtf16(const ENCODING *enc, + const char **fromP, const char *fromLim, + unsigned short **toP, const unsigned short *toLim) + { + const struct unknown_encoding *uenc = AS_UNKNOWN_ENCODING(enc); +- while (*fromP != fromLim && *toP != toLim) { ++ while (*fromP < fromLim && *toP < toLim) { + unsigned short c = uenc->utf16[(unsigned char)**fromP]; + if (c == 0) { + c = (unsigned short) +@@ -1340,6 +1390,11 @@ unknown_toUtf16(const ENCODING *enc, + (*fromP)++; + *(*toP)++ = c; + } ++ ++ if ((*toP == toLim) && (*fromP < fromLim)) ++ return XML_CONVERT_OUTPUT_EXHAUSTED; ++ else ++ return XML_CONVERT_COMPLETED; + } + + ENCODING * +@@ -1503,7 +1558,7 @@ initScan(const ENCODING * const *encodingTable, + { + const ENCODING **encPtr; + +- if (ptr == end) ++ if (ptr >= end) + return XML_TOK_NONE; + encPtr = enc->encPtr; + if (ptr + 1 == end) { +diff --git a/expat/lib/xmltok.h b/expat/lib/xmltok.h +index ca867aa..752007e 100644 +--- lib/xmltok.h ++++ lib/xmltok.h +@@ -130,6 +130,12 @@ typedef int (PTRCALL *SCANNER)(const ENCODING *, + const char *, + const char **); + ++enum XML_Convert_Result { ++ XML_CONVERT_COMPLETED = 0, ++ XML_CONVERT_INPUT_INCOMPLETE = 1, ++ XML_CONVERT_OUTPUT_EXHAUSTED = 2 /* and therefore potentially input remaining as well */ ++}; ++ + struct encoding { + SCANNER scanners[XML_N_STATES]; + SCANNER literalScanners[XML_N_LITERAL_TYPES]; +@@ -158,12 +164,12 @@ struct encoding { + const char *ptr, + const char *end, + const char **badPtr); +- void (PTRCALL *utf8Convert)(const ENCODING *enc, ++ enum XML_Convert_Result (PTRCALL *utf8Convert)(const ENCODING *enc, + const char **fromP, + const char *fromLim, + char **toP, + const char *toLim); +- void (PTRCALL *utf16Convert)(const ENCODING *enc, ++ enum XML_Convert_Result (PTRCALL *utf16Convert)(const ENCODING *enc, + const char **fromP, + const char *fromLim, + unsigned short **toP, +diff --git a/expat/lib/xmltok_impl.c b/expat/lib/xmltok_impl.c +index 9c2895b..6c5a3ba 100644 +--- lib/xmltok_impl.c ++++ lib/xmltok_impl.c +@@ -93,13 +93,13 @@ static int PTRCALL + PREFIX(scanComment)(const ENCODING *enc, const char *ptr, + const char *end, const char **nextTokPtr) + { +- if (ptr != end) { ++ if (ptr < end) { + if (!CHAR_MATCHES(enc, ptr, ASCII_MINUS)) { + *nextTokPtr = ptr; + return XML_TOK_INVALID; + } + ptr += MINBPC(enc); +- while (ptr != end) { ++ while (ptr < end) { + switch (BYTE_TYPE(enc, ptr)) { + INVALID_CASES(ptr, nextTokPtr) + case BT_MINUS: +@@ -147,7 +147,7 @@ PREFIX(scanDecl)(const ENCODING *enc, const char *ptr, + *nextTokPtr = ptr; + return XML_TOK_INVALID; + } +- while (ptr != end) { ++ while (ptr < end) { + switch (BYTE_TYPE(enc, ptr)) { + case BT_PERCNT: + if (ptr + MINBPC(enc) == end) +@@ -233,7 +233,7 @@ PREFIX(scanPi)(const ENCODING *enc, const char *ptr, + *nextTokPtr = ptr; + return XML_TOK_INVALID; + } +- while (ptr != end) { ++ while (ptr < end) { + switch (BYTE_TYPE(enc, ptr)) { + CHECK_NAME_CASES(enc, ptr, end, nextTokPtr) + case BT_S: case BT_CR: case BT_LF: +@@ -242,7 +242,7 @@ PREFIX(scanPi)(const ENCODING *enc, const char *ptr, + return XML_TOK_INVALID; + } + ptr += MINBPC(enc); +- while (ptr != end) { ++ while (ptr < end) { + switch (BYTE_TYPE(enc, ptr)) { + INVALID_CASES(ptr, nextTokPtr) + case BT_QUEST: +@@ -305,7 +305,7 @@ static int PTRCALL + PREFIX(cdataSectionTok)(const ENCODING *enc, const char *ptr, + const char *end, const char **nextTokPtr) + { +- if (ptr == end) ++ if (ptr >= end) + return XML_TOK_NONE; + if (MINBPC(enc) > 1) { + size_t n = end - ptr; +@@ -348,7 +348,7 @@ PREFIX(cdataSectionTok)(const ENCODING *enc, const char *ptr, + ptr += MINBPC(enc); + break; + } +- while (ptr != end) { ++ while (ptr < end) { + switch (BYTE_TYPE(enc, ptr)) { + #define LEAD_CASE(n) \ + case BT_LEAD ## n: \ +@@ -391,11 +391,11 @@ PREFIX(scanEndTag)(const ENCODING *enc, const char *ptr, + *nextTokPtr = ptr; + return XML_TOK_INVALID; + } +- while (ptr != end) { ++ while (ptr < end) { + switch (BYTE_TYPE(enc, ptr)) { + CHECK_NAME_CASES(enc, ptr, end, nextTokPtr) + case BT_S: case BT_CR: case BT_LF: +- for (ptr += MINBPC(enc); ptr != end; ptr += MINBPC(enc)) { ++ for (ptr += MINBPC(enc); ptr < end; ptr += MINBPC(enc)) { + switch (BYTE_TYPE(enc, ptr)) { + case BT_S: case BT_CR: case BT_LF: + break; +@@ -432,7 +432,7 @@ static int PTRCALL + PREFIX(scanHexCharRef)(const ENCODING *enc, const char *ptr, + const char *end, const char **nextTokPtr) + { +- if (ptr != end) { ++ if (ptr < end) { + switch (BYTE_TYPE(enc, ptr)) { + case BT_DIGIT: + case BT_HEX: +@@ -441,7 +441,7 @@ PREFIX(scanHexCharRef)(const ENCODING *enc, const char *ptr, + *nextTokPtr = ptr; + return XML_TOK_INVALID; + } +- for (ptr += MINBPC(enc); ptr != end; ptr += MINBPC(enc)) { ++ for (ptr += MINBPC(enc); ptr < end; ptr += MINBPC(enc)) { + switch (BYTE_TYPE(enc, ptr)) { + case BT_DIGIT: + case BT_HEX: +@@ -464,7 +464,7 @@ static int PTRCALL + PREFIX(scanCharRef)(const ENCODING *enc, const char *ptr, + const char *end, const char **nextTokPtr) + { +- if (ptr != end) { ++ if (ptr < end) { + if (CHAR_MATCHES(enc, ptr, ASCII_x)) + return PREFIX(scanHexCharRef)(enc, ptr + MINBPC(enc), end, nextTokPtr); + switch (BYTE_TYPE(enc, ptr)) { +@@ -474,7 +474,7 @@ PREFIX(scanCharRef)(const ENCODING *enc, const char *ptr, + *nextTokPtr = ptr; + return XML_TOK_INVALID; + } +- for (ptr += MINBPC(enc); ptr != end; ptr += MINBPC(enc)) { ++ for (ptr += MINBPC(enc); ptr < end; ptr += MINBPC(enc)) { + switch (BYTE_TYPE(enc, ptr)) { + case BT_DIGIT: + break; +@@ -506,7 +506,7 @@ PREFIX(scanRef)(const ENCODING *enc, const char *ptr, const char *end, + *nextTokPtr = ptr; + return XML_TOK_INVALID; + } +- while (ptr != end) { ++ while (ptr < end) { + switch (BYTE_TYPE(enc, ptr)) { + CHECK_NAME_CASES(enc, ptr, end, nextTokPtr) + case BT_SEMI: +@@ -529,7 +529,7 @@ PREFIX(scanAtts)(const ENCODING *enc, const char *ptr, const char *end, + #ifdef XML_NS + int hadColon = 0; + #endif +- while (ptr != end) { ++ while (ptr < end) { + switch (BYTE_TYPE(enc, ptr)) { + CHECK_NAME_CASES(enc, ptr, end, nextTokPtr) + #ifdef XML_NS +@@ -716,7 +716,7 @@ PREFIX(scanLt)(const ENCODING *enc, const char *ptr, const char *end, + hadColon = 0; + #endif + /* we have a start-tag */ +- while (ptr != end) { ++ while (ptr < end) { + switch (BYTE_TYPE(enc, ptr)) { + CHECK_NAME_CASES(enc, ptr, end, nextTokPtr) + #ifdef XML_NS +@@ -740,7 +740,7 @@ PREFIX(scanLt)(const ENCODING *enc, const char *ptr, const char *end, + case BT_S: case BT_CR: case BT_LF: + { + ptr += MINBPC(enc); +- while (ptr != end) { ++ while (ptr < end) { + switch (BYTE_TYPE(enc, ptr)) { + CHECK_NMSTRT_CASES(enc, ptr, end, nextTokPtr) + case BT_GT: +@@ -785,7 +785,7 @@ static int PTRCALL + PREFIX(contentTok)(const ENCODING *enc, const char *ptr, const char *end, + const char **nextTokPtr) + { +- if (ptr == end) ++ if (ptr >= end) + return XML_TOK_NONE; + if (MINBPC(enc) > 1) { + size_t n = end - ptr; +@@ -832,7 +832,7 @@ PREFIX(contentTok)(const ENCODING *enc, const char *ptr, const char *end, + ptr += MINBPC(enc); + break; + } +- while (ptr != end) { ++ while (ptr < end) { + switch (BYTE_TYPE(enc, ptr)) { + #define LEAD_CASE(n) \ + case BT_LEAD ## n: \ +@@ -895,7 +895,7 @@ PREFIX(scanPercent)(const ENCODING *enc, const char *ptr, const char *end, + *nextTokPtr = ptr; + return XML_TOK_INVALID; + } +- while (ptr != end) { ++ while (ptr < end) { + switch (BYTE_TYPE(enc, ptr)) { + CHECK_NAME_CASES(enc, ptr, end, nextTokPtr) + case BT_SEMI: +@@ -921,7 +921,7 @@ PREFIX(scanPoundName)(const ENCODING *enc, const char *ptr, const char *end, + *nextTokPtr = ptr; + return XML_TOK_INVALID; + } +- while (ptr != end) { ++ while (ptr < end) { + switch (BYTE_TYPE(enc, ptr)) { + CHECK_NAME_CASES(enc, ptr, end, nextTokPtr) + case BT_CR: case BT_LF: case BT_S: +@@ -941,7 +941,7 @@ PREFIX(scanLit)(int open, const ENCODING *enc, + const char *ptr, const char *end, + const char **nextTokPtr) + { +- while (ptr != end) { ++ while (ptr < end) { + int t = BYTE_TYPE(enc, ptr); + switch (t) { + INVALID_CASES(ptr, nextTokPtr) +@@ -973,7 +973,7 @@ PREFIX(prologTok)(const ENCODING *enc, const char *ptr, const char *end, + const char **nextTokPtr) + { + int tok; +- if (ptr == end) ++ if (ptr >= end) + return XML_TOK_NONE; + if (MINBPC(enc) > 1) { + size_t n = end - ptr; +@@ -1141,7 +1141,7 @@ PREFIX(prologTok)(const ENCODING *enc, const char *ptr, const char *end, + *nextTokPtr = ptr; + return XML_TOK_INVALID; + } +- while (ptr != end) { ++ while (ptr < end) { + switch (BYTE_TYPE(enc, ptr)) { + CHECK_NAME_CASES(enc, ptr, end, nextTokPtr) + case BT_GT: case BT_RPAR: case BT_COMMA: +@@ -1204,10 +1204,10 @@ PREFIX(attributeValueTok)(const ENCODING *enc, const char *ptr, + const char *end, const char **nextTokPtr) + { + const char *start; +- if (ptr == end) ++ if (ptr >= end) + return XML_TOK_NONE; + start = ptr; +- while (ptr != end) { ++ while (ptr < end) { + switch (BYTE_TYPE(enc, ptr)) { + #define LEAD_CASE(n) \ + case BT_LEAD ## n: ptr += n; break; +@@ -1262,10 +1262,10 @@ PREFIX(entityValueTok)(const ENCODING *enc, const char *ptr, + const char *end, const char **nextTokPtr) + { + const char *start; +- if (ptr == end) ++ if (ptr >= end) + return XML_TOK_NONE; + start = ptr; +- while (ptr != end) { ++ while (ptr < end) { + switch (BYTE_TYPE(enc, ptr)) { + #define LEAD_CASE(n) \ + case BT_LEAD ## n: ptr += n; break; +@@ -1326,7 +1326,7 @@ PREFIX(ignoreSectionTok)(const ENCODING *enc, const char *ptr, + end = ptr + n; + } + } +- while (ptr != end) { ++ while (ptr < end) { + switch (BYTE_TYPE(enc, ptr)) { + INVALID_CASES(ptr, nextTokPtr) + case BT_LT: +@@ -1373,7 +1373,7 @@ PREFIX(isPublicId)(const ENCODING *enc, const char *ptr, const char *end, + { + ptr += MINBPC(enc); + end -= MINBPC(enc); +- for (; ptr != end; ptr += MINBPC(enc)) { ++ for (; ptr < end; ptr += MINBPC(enc)) { + switch (BYTE_TYPE(enc, ptr)) { + case BT_DIGIT: + case BT_HEX: +@@ -1760,7 +1760,7 @@ PREFIX(updatePosition)(const ENCODING *enc, + case BT_CR: + pos->lineNumber++; + ptr += MINBPC(enc); +- if (ptr != end && BYTE_TYPE(enc, ptr) == BT_LF) ++ if (ptr < end && BYTE_TYPE(enc, ptr) == BT_LF) + ptr += MINBPC(enc); + pos->columnNumber = (XML_Size)-1; + break; +-- +2.8.2 Modified: branches/2016Q2/textproc/expat2/pkg-plist ============================================================================== --- branches/2016Q2/textproc/expat2/pkg-plist Fri May 20 01:07:16 2016 (r415534) +++ branches/2016Q2/textproc/expat2/pkg-plist Fri May 20 01:08:13 2016 (r415535) @@ -1,5 +1,6 @@ bin/xmlwf include/expat.h +include/expat_config.h include/expat_external.h lib/libexpat.a lib/libexpat.so From owner-svn-ports-branches@freebsd.org Fri May 20 01:23:58 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 22675B432B3; Fri, 20 May 2016 01:23:58 +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 E4E8616C1; Fri, 20 May 2016 01:23:57 +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 u4K1NvWr088809; Fri, 20 May 2016 01:23:57 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4K1NuU0088802; Fri, 20 May 2016 01:23:56 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201605200123.u4K1NuU0088802@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Fri, 20 May 2016 01:23:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r415537 - in branches/2016Q2/security/wpa_supplicant: . 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.22 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, 20 May 2016 01:23:58 -0000 Author: junovitch Date: Fri May 20 01:23:56 2016 New Revision: 415537 URL: https://svnweb.freebsd.org/changeset/ports/415537 Log: MFH: r415527 security/wpa_supplicant: Add security patch set 2016-1 A vulnerability was found in how hostapd and wpa_supplicant writes the configuration file update for the WPA/WPA2 passphrase parameter. If this parameter has been updated to include control characters either through a WPS operation (CVE-2016-4476) or through local configuration change over the wpa_supplicant control interface (CVE-2016-4477), the resulting configuration file may prevent the hostapd and wpa_supplicant from starting when the updated file is used. In addition for wpa_supplicant, it may be possible to load a local library file and execute code from there with the same privileges under which the wpa_supplicant process runs. These patches were developed upstream and published as a response to the security advisories CVE-2016-4476 and CVE-2016-4477. PR: 209564 Requested by: Sevan Janiyan Security: CVE-2016-4477 Security: CVE-2016-4476 Security: https://vuxml.FreeBSD.org/freebsd/967b852b-1e28-11e6-8dd3-002590263bf5.html Approved by: ports-secteam (with hat) Added: branches/2016Q2/security/wpa_supplicant/files/patch-2016_1_1-WPS-Reject-a-Credential-with-invalid-passphrase - copied unchanged from r415527, head/security/wpa_supplicant/files/patch-2016_1_1-WPS-Reject-a-Credential-with-invalid-passphrase branches/2016Q2/security/wpa_supplicant/files/patch-2016_1_2-Reject-psk-parameter-set-with-invalid-passphrase-cha - copied unchanged from r415527, head/security/wpa_supplicant/files/patch-2016_1_2-Reject-psk-parameter-set-with-invalid-passphrase-cha branches/2016Q2/security/wpa_supplicant/files/patch-2016_1_3-Remove-newlines-from-wpa_supplicant-config-network-o - copied unchanged from r415527, head/security/wpa_supplicant/files/patch-2016_1_3-Remove-newlines-from-wpa_supplicant-config-network-o branches/2016Q2/security/wpa_supplicant/files/patch-2016_1_4-Reject-SET_CRED-commands-with-newline-characters-in - copied unchanged from r415527, head/security/wpa_supplicant/files/patch-2016_1_4-Reject-SET_CRED-commands-with-newline-characters-in branches/2016Q2/security/wpa_supplicant/files/patch-2016_1_5-Reject-SET-commands-with-newline-characters-in-the-s - copied unchanged from r415527, head/security/wpa_supplicant/files/patch-2016_1_5-Reject-SET-commands-with-newline-characters-in-the-s Modified: branches/2016Q2/security/wpa_supplicant/Makefile Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/security/wpa_supplicant/Makefile ============================================================================== --- branches/2016Q2/security/wpa_supplicant/Makefile Fri May 20 01:22:31 2016 (r415536) +++ branches/2016Q2/security/wpa_supplicant/Makefile Fri May 20 01:23:56 2016 (r415537) @@ -2,7 +2,7 @@ PORTNAME= wpa_supplicant PORTVERSION= 2.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security net MASTER_SITES= http://w1.fi/releases/ Copied: branches/2016Q2/security/wpa_supplicant/files/patch-2016_1_1-WPS-Reject-a-Credential-with-invalid-passphrase (from r415527, head/security/wpa_supplicant/files/patch-2016_1_1-WPS-Reject-a-Credential-with-invalid-passphrase) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/security/wpa_supplicant/files/patch-2016_1_1-WPS-Reject-a-Credential-with-invalid-passphrase Fri May 20 01:23:56 2016 (r415537, copy of r415527, head/security/wpa_supplicant/files/patch-2016_1_1-WPS-Reject-a-Credential-with-invalid-passphrase) @@ -0,0 +1,76 @@ +From ecbb0b3dc122b0d290987cf9c84010bbe53e1022 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Fri, 4 Mar 2016 17:20:18 +0200 +Subject: [PATCH 1/5] WPS: Reject a Credential with invalid passphrase + +WPA/WPA2-Personal passphrase is not allowed to include control +characters. Reject a Credential received from a WPS Registrar both as +STA (Credential) and AP (AP Settings) if the credential is for WPAPSK or +WPA2PSK authentication type and includes an invalid passphrase. + +This fixes an issue where hostapd or wpa_supplicant could have updated +the configuration file PSK/passphrase parameter with arbitrary data from +an external device (Registrar) that may not be fully trusted. Should +such data include a newline character, the resulting configuration file +could become invalid and fail to be parsed. + +Signed-off-by: Jouni Malinen +--- + src/utils/common.c | 12 ++++++++++++ + src/utils/common.h | 1 + + src/wps/wps_attr_process.c | 10 ++++++++++ + 3 files changed, 23 insertions(+) + +--- src/utils/common.c ++++ src/utils/common.c +@@ -697,6 +697,18 @@ int is_hex(const u8 *data, size_t len) + } + + ++int has_ctrl_char(const u8 *data, size_t len) ++{ ++ size_t i; ++ ++ for (i = 0; i < len; i++) { ++ if (data[i] < 32 || data[i] == 127) ++ return 1; ++ } ++ return 0; ++} ++ ++ + size_t merge_byte_arrays(u8 *res, size_t res_len, + const u8 *src1, size_t src1_len, + const u8 *src2, size_t src2_len) +--- src/utils/common.h ++++ src/utils/common.h +@@ -488,6 +488,7 @@ const char * wpa_ssid_txt(const u8 *ssid, size_t ssid_len); + + char * wpa_config_parse_string(const char *value, size_t *len); + int is_hex(const u8 *data, size_t len); ++int has_ctrl_char(const u8 *data, size_t len); + size_t merge_byte_arrays(u8 *res, size_t res_len, + const u8 *src1, size_t src1_len, + const u8 *src2, size_t src2_len); +--- src/wps/wps_attr_process.c ++++ src/wps/wps_attr_process.c +@@ -229,6 +229,16 @@ static int wps_workaround_cred_key(struct wps_credential *cred) + cred->key_len--; + #endif /* CONFIG_WPS_STRICT */ + } ++ ++ ++ if (cred->auth_type & (WPS_AUTH_WPAPSK | WPS_AUTH_WPA2PSK) && ++ (cred->key_len < 8 || has_ctrl_char(cred->key, cred->key_len))) { ++ wpa_printf(MSG_INFO, "WPS: Reject credential with invalid WPA/WPA2-Personal passphrase"); ++ wpa_hexdump_ascii_key(MSG_INFO, "WPS: Network Key", ++ cred->key, cred->key_len); ++ return -1; ++ } ++ + return 0; + } + +-- +1.9.1 + Copied: branches/2016Q2/security/wpa_supplicant/files/patch-2016_1_2-Reject-psk-parameter-set-with-invalid-passphrase-cha (from r415527, head/security/wpa_supplicant/files/patch-2016_1_2-Reject-psk-parameter-set-with-invalid-passphrase-cha) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/security/wpa_supplicant/files/patch-2016_1_2-Reject-psk-parameter-set-with-invalid-passphrase-cha Fri May 20 01:23:56 2016 (r415537, copy of r415527, head/security/wpa_supplicant/files/patch-2016_1_2-Reject-psk-parameter-set-with-invalid-passphrase-cha) @@ -0,0 +1,49 @@ +From 73e4abb24a936014727924d8b0b2965edfc117dd Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Fri, 4 Mar 2016 18:46:41 +0200 +Subject: [PATCH 2/5] Reject psk parameter set with invalid passphrase + character + +WPA/WPA2-Personal passphrase is not allowed to include control +characters. Reject a passphrase configuration attempt if that passphrase +includes an invalid passphrase. + +This fixes an issue where wpa_supplicant could have updated the +configuration file psk parameter with arbitrary data from the control +interface or D-Bus interface. While those interfaces are supposed to be +accessible only for trusted users/applications, it may be possible that +an untrusted user has access to a management software component that +does not validate the passphrase value before passing it to +wpa_supplicant. + +This could allow such an untrusted user to inject up to 63 characters of +almost arbitrary data into the configuration file. Such configuration +file could result in wpa_supplicant trying to load a library (e.g., +opensc_engine_path, pkcs11_engine_path, pkcs11_module_path, +load_dynamic_eap) from user controlled location when starting again. +This would allow code from that library to be executed under the +wpa_supplicant process privileges. + +Signed-off-by: Jouni Malinen +--- + wpa_supplicant/config.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- wpa_supplicant/config.c ++++ wpa_supplicant/config.c +@@ -478,6 +478,12 @@ static int wpa_config_parse_psk(const struct parse_data *data, + } + wpa_hexdump_ascii_key(MSG_MSGDUMP, "PSK (ASCII passphrase)", + (u8 *) value, len); ++ if (has_ctrl_char((u8 *) value, len)) { ++ wpa_printf(MSG_ERROR, ++ "Line %d: Invalid passphrase character", ++ line); ++ return -1; ++ } + if (ssid->passphrase && os_strlen(ssid->passphrase) == len && + os_memcmp(ssid->passphrase, value, len) == 0) { + /* No change to the previously configured value */ +-- +1.9.1 + Copied: branches/2016Q2/security/wpa_supplicant/files/patch-2016_1_3-Remove-newlines-from-wpa_supplicant-config-network-o (from r415527, head/security/wpa_supplicant/files/patch-2016_1_3-Remove-newlines-from-wpa_supplicant-config-network-o) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/security/wpa_supplicant/files/patch-2016_1_3-Remove-newlines-from-wpa_supplicant-config-network-o Fri May 20 01:23:56 2016 (r415537, copy of r415527, head/security/wpa_supplicant/files/patch-2016_1_3-Remove-newlines-from-wpa_supplicant-config-network-o) @@ -0,0 +1,76 @@ +From 0fe5a234240a108b294a87174ad197f6b5cb38e9 Mon Sep 17 00:00:00 2001 +From: Paul Stewart +Date: Thu, 3 Mar 2016 15:40:19 -0800 +Subject: [PATCH 3/5] Remove newlines from wpa_supplicant config network + output + +Spurious newlines output while writing the config file can corrupt the +wpa_supplicant configuration. Avoid writing these for the network block +parameters. This is a generic filter that cover cases that may not have +been explicitly addressed with a more specific commit to avoid control +characters in the psk parameter. + +Signed-off-by: Paul Stewart +--- + src/utils/common.c | 11 +++++++++++ + src/utils/common.h | 1 + + wpa_supplicant/config.c | 15 +++++++++++++-- + 3 files changed, 25 insertions(+), 2 deletions(-) + +--- src/utils/common.c ++++ src/utils/common.c +@@ -709,6 +709,17 @@ int has_ctrl_char(const u8 *data, size_t len) + } + + ++int has_newline(const char *str) ++{ ++ while (*str) { ++ if (*str == '\n' || *str == '\r') ++ return 1; ++ str++; ++ } ++ return 0; ++} ++ ++ + size_t merge_byte_arrays(u8 *res, size_t res_len, + const u8 *src1, size_t src1_len, + const u8 *src2, size_t src2_len) +--- src/utils/common.h ++++ src/utils/common.h +@@ -489,6 +489,7 @@ const char * wpa_ssid_txt(const u8 *ssid, size_t ssid_len); + char * wpa_config_parse_string(const char *value, size_t *len); + int is_hex(const u8 *data, size_t len); + int has_ctrl_char(const u8 *data, size_t len); ++int has_newline(const char *str); + size_t merge_byte_arrays(u8 *res, size_t res_len, + const u8 *src1, size_t src1_len, + const u8 *src2, size_t src2_len); +--- wpa_supplicant/config.c ++++ wpa_supplicant/config.c +@@ -2699,8 +2699,19 @@ char * wpa_config_get(struct wpa_ssid *ssid, const char *var) + + for (i = 0; i < NUM_SSID_FIELDS; i++) { + const struct parse_data *field = &ssid_fields[i]; +- if (os_strcmp(var, field->name) == 0) +- return field->writer(field, ssid); ++ if (os_strcmp(var, field->name) == 0) { ++ char *ret = field->writer(field, ssid); ++ ++ if (ret && has_newline(ret)) { ++ wpa_printf(MSG_ERROR, ++ "Found newline in value for %s; not returning it", ++ var); ++ os_free(ret); ++ ret = NULL; ++ } ++ ++ return ret; ++ } + } + + return NULL; +-- +1.9.1 + Copied: branches/2016Q2/security/wpa_supplicant/files/patch-2016_1_4-Reject-SET_CRED-commands-with-newline-characters-in (from r415527, head/security/wpa_supplicant/files/patch-2016_1_4-Reject-SET_CRED-commands-with-newline-characters-in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/security/wpa_supplicant/files/patch-2016_1_4-Reject-SET_CRED-commands-with-newline-characters-in Fri May 20 01:23:56 2016 (r415537, copy of r415527, head/security/wpa_supplicant/files/patch-2016_1_4-Reject-SET_CRED-commands-with-newline-characters-in) @@ -0,0 +1,60 @@ +From b166cd84a77a6717be9600bf95378a0055d6f5a5 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Tue, 5 Apr 2016 23:33:10 +0300 +Subject: [PATCH 4/5] Reject SET_CRED commands with newline characters in the + string values + +Most of the cred block parameters are written as strings without +filtering and if there is an embedded newline character in the value, +unexpected configuration file data might be written. + +This fixes an issue where wpa_supplicant could have updated the +configuration file cred parameter with arbitrary data from the control +interface or D-Bus interface. While those interfaces are supposed to be +accessible only for trusted users/applications, it may be possible that +an untrusted user has access to a management software component that +does not validate the credential value before passing it to +wpa_supplicant. + +This could allow such an untrusted user to inject almost arbitrary data +into the configuration file. Such configuration file could result in +wpa_supplicant trying to load a library (e.g., opensc_engine_path, +pkcs11_engine_path, pkcs11_module_path, load_dynamic_eap) from user +controlled location when starting again. This would allow code from that +library to be executed under the wpa_supplicant process privileges. + +Signed-off-by: Jouni Malinen +--- + wpa_supplicant/config.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +--- wpa_supplicant/config.c ++++ wpa_supplicant/config.c +@@ -2896,6 +2896,8 @@ int wpa_config_set_cred(struct wpa_cred *cred, const char *var, + + if (os_strcmp(var, "password") == 0 && + os_strncmp(value, "ext:", 4) == 0) { ++ if (has_newline(value)) ++ return -1; + str_clear_free(cred->password); + cred->password = os_strdup(value); + cred->ext_password = 1; +@@ -2946,9 +2948,14 @@ int wpa_config_set_cred(struct wpa_cred *cred, const char *var, + } + + val = wpa_config_parse_string(value, &len); +- if (val == NULL) { ++ if (val == NULL || ++ (os_strcmp(var, "excluded_ssid") != 0 && ++ os_strcmp(var, "roaming_consortium") != 0 && ++ os_strcmp(var, "required_roaming_consortium") != 0 && ++ has_newline(val))) { + wpa_printf(MSG_ERROR, "Line %d: invalid field '%s' string " + "value '%s'.", line, var, value); ++ os_free(val); + return -1; + } + +-- +1.9.1 + Copied: branches/2016Q2/security/wpa_supplicant/files/patch-2016_1_5-Reject-SET-commands-with-newline-characters-in-the-s (from r415527, head/security/wpa_supplicant/files/patch-2016_1_5-Reject-SET-commands-with-newline-characters-in-the-s) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/security/wpa_supplicant/files/patch-2016_1_5-Reject-SET-commands-with-newline-characters-in-the-s Fri May 20 01:23:56 2016 (r415537, copy of r415527, head/security/wpa_supplicant/files/patch-2016_1_5-Reject-SET-commands-with-newline-characters-in-the-s) @@ -0,0 +1,48 @@ +From 2a3f56502b52375c3bf113cf92adfa99bad6b488 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Tue, 5 Apr 2016 23:55:48 +0300 +Subject: [PATCH 5/5] Reject SET commands with newline characters in the + string values + +Many of the global configuration parameters are written as strings +without filtering and if there is an embedded newline character in the +value, unexpected configuration file data might be written. + +This fixes an issue where wpa_supplicant could have updated the +configuration file global parameter with arbitrary data from the control +interface or D-Bus interface. While those interfaces are supposed to be +accessible only for trusted users/applications, it may be possible that +an untrusted user has access to a management software component that +does not validate the value of a parameter before passing it to +wpa_supplicant. + +This could allow such an untrusted user to inject almost arbitrary data +into the configuration file. Such configuration file could result in +wpa_supplicant trying to load a library (e.g., opensc_engine_path, +pkcs11_engine_path, pkcs11_module_path, load_dynamic_eap) from user +controlled location when starting again. This would allow code from that +library to be executed under the wpa_supplicant process privileges. + +Signed-off-by: Jouni Malinen +--- + wpa_supplicant/config.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- wpa_supplicant/config.c ++++ wpa_supplicant/config.c +@@ -3764,6 +3764,12 @@ static int wpa_global_config_parse_str(const struct global_parse_data *data, + return -1; + } + ++ if (has_newline(pos)) { ++ wpa_printf(MSG_ERROR, "Line %d: invalid %s value with newline", ++ line, data->name); ++ return -1; ++ } ++ + tmp = os_strdup(pos); + if (tmp == NULL) + return -1; +-- +1.9.1 + From owner-svn-ports-branches@freebsd.org Fri May 20 01:39: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 8CFECB43741; Fri, 20 May 2016 01:39:08 +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 458721F32; Fri, 20 May 2016 01:39:08 +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 u4K1d72G092205; Fri, 20 May 2016 01:39:07 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4K1d7Ha092203; Fri, 20 May 2016 01:39:07 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201605200139.u4K1d7Ha092203@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Fri, 20 May 2016 01:39:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r415538 - in branches/2016Q2/devel/jansson: . 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.22 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, 20 May 2016 01:39:08 -0000 Author: junovitch Date: Fri May 20 01:39:07 2016 New Revision: 415538 URL: https://svnweb.freebsd.org/changeset/ports/415538 Log: MFH: r415303 Fix issue to parse large flat json files. PR: 209492 Reported by: yuri@rawbw.com Approved by: ports-secteam (with hat) Modified: branches/2016Q2/devel/jansson/Makefile branches/2016Q2/devel/jansson/files/patch-CVE-2016-4425 Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/devel/jansson/Makefile ============================================================================== --- branches/2016Q2/devel/jansson/Makefile Fri May 20 01:23:56 2016 (r415537) +++ branches/2016Q2/devel/jansson/Makefile Fri May 20 01:39:07 2016 (r415538) @@ -3,7 +3,7 @@ PORTNAME= jansson PORTVERSION= 2.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= http://www.digip.org/jansson/releases/ Modified: branches/2016Q2/devel/jansson/files/patch-CVE-2016-4425 ============================================================================== --- branches/2016Q2/devel/jansson/files/patch-CVE-2016-4425 Fri May 20 01:23:56 2016 (r415537) +++ branches/2016Q2/devel/jansson/files/patch-CVE-2016-4425 Fri May 20 01:39:07 2016 (r415538) @@ -1,16 +1,16 @@ ---- src/jansson_config.h.in.orig 2016-05-04 11:43:48.386196000 +0800 -+++ src/jansson_config.h.in 2016-05-04 11:44:21.204996000 +0800 +--- src/jansson_config.h.in.orig 2016-05-16 10:22:34.333432000 +0800 ++++ src/jansson_config.h.in 2016-05-16 10:23:18.042096000 +0800 @@ -36,4 +36,8 @@ otherwise to 0. */ #define JSON_HAVE_LOCALECONV @json_have_localeconv@ +/* Maximum recursion depth for parsing JSON input. -+ * This limits the depth of e.g. array-within-array constructions. */ ++ This limits the depth of e.g. array-within-array constructions. */ +#define JSON_PARSER_MAX_DEPTH 2048 + #endif ---- src/load.c.orig 2016-05-04 11:44:34.356957000 +0800 -+++ src/load.c 2016-05-04 11:46:44.547307000 +0800 +--- src/load.c.orig 2014-10-02 12:59:26.000000000 +0800 ++++ src/load.c 2016-05-16 10:21:41.006239000 +0800 @@ -61,6 +61,7 @@ typedef struct { typedef struct { stream_t stream; @@ -32,7 +32,15 @@ switch(lex->token) { case TOKEN_STRING: { const char *value = lex->value.string.val; -@@ -877,6 +884,8 @@ static json_t *parse_json(lex_t *lex, si +@@ -870,6 +877,7 @@ static json_t *parse_value(lex_t *lex, s + if(!json) + return NULL; + ++ lex->depth--; + return json; + } + +@@ -877,6 +885,8 @@ static json_t *parse_json(lex_t *lex, si { json_t *result; From owner-svn-ports-branches@freebsd.org Fri May 20 01:49:15 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 4EDBAB43A03; Fri, 20 May 2016 01:49:15 +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 210A01732; Fri, 20 May 2016 01:49:15 +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 u4K1nECV095507; Fri, 20 May 2016 01:49:14 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4K1nEgH095505; Fri, 20 May 2016 01:49:14 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201605200149.u4K1nEgH095505@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Fri, 20 May 2016 01:49:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r415540 - branches/2016Q2/chinese/wordpress-zh_CN 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.22 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, 20 May 2016 01:49:15 -0000 Author: junovitch Date: Fri May 20 01:49:14 2016 New Revision: 415540 URL: https://svnweb.freebsd.org/changeset/ports/415540 Log: MFH: r415539 chinese/wordpress-zh_CN: update 4.4.2 -> 4.5.2 PR: 209409 Approved by: ports-secteam (with hat) Security: CVE-2016-4566 Security: CVE-2016-4567 Security: https://vuxml.FreeBSD.org/freebsd/3686917b-164d-11e6-94fa-002590263bf5.html Modified: branches/2016Q2/chinese/wordpress-zh_CN/Makefile branches/2016Q2/chinese/wordpress-zh_CN/distinfo Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/chinese/wordpress-zh_CN/Makefile ============================================================================== --- branches/2016Q2/chinese/wordpress-zh_CN/Makefile Fri May 20 01:48:47 2016 (r415539) +++ branches/2016Q2/chinese/wordpress-zh_CN/Makefile Fri May 20 01:49:14 2016 (r415540) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -PORTVERSION= 4.4.2 +PORTVERSION= 4.5.2 DISTVERSIONSUFFIX= -zh_CN CATEGORIES= chinese www MASTER_SITES= http://cn.wordpress.org/ Modified: branches/2016Q2/chinese/wordpress-zh_CN/distinfo ============================================================================== --- branches/2016Q2/chinese/wordpress-zh_CN/distinfo Fri May 20 01:48:47 2016 (r415539) +++ branches/2016Q2/chinese/wordpress-zh_CN/distinfo Fri May 20 01:49:14 2016 (r415540) @@ -1,2 +1,3 @@ -SHA256 (wordpress-4.4.2-zh_CN.tar.gz) = 19b1ed0281bc5de86b23373694f1de710c90cf528942ba4668f8566cce48100f -SIZE (wordpress-4.4.2-zh_CN.tar.gz) = 7519893 +TIMESTAMP = 1463708678 +SHA256 (wordpress-4.5.2-zh_CN.tar.gz) = 32dfc6d017c3e2bd043089faf83a9c0fe409b591de6cd384e89fb44f9522378c +SIZE (wordpress-4.5.2-zh_CN.tar.gz) = 8203318 From owner-svn-ports-branches@freebsd.org Fri May 20 20:58:57 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 33D95B44DB4; Fri, 20 May 2016 20:58:57 +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 1044E1F1B; Fri, 20 May 2016 20:58:56 +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 u4KKwus6049445; Fri, 20 May 2016 20:58:56 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4KKwuQV049443; Fri, 20 May 2016 20:58:56 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201605202058.u4KKwuQV049443@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 20 May 2016 20:58:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r415577 - in branches/2016Q2/www/chromium: . 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.22 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, 20 May 2016 20:58:57 -0000 Author: jbeich Date: Fri May 20 20:58:55 2016 New Revision: 415577 URL: https://svnweb.freebsd.org/changeset/ports/415577 Log: MFH: r415570 www/chromium: unbreak WebRTC microphone selection with PULSEAUDIO=off Similar to r414386. No kernel ALSA is available to enumerate soundcards, so assume sound(4) can always be used via ALSA plugins like "oss". This partially reverts https://codereview.chromium.org/7888011/ PR: 206480 Reported by: Betso Reviewed by: cem, cmt (briefly) Approved by: maintainer timeout (2 weeks) Approved by: ports-secteam (feld) Added: branches/2016Q2/www/chromium/files/patch-media__audio__alsa__audio_manager_alsa.cc - copied unchanged from r415570, head/www/chromium/files/patch-media__audio__alsa__audio_manager_alsa.cc Modified: branches/2016Q2/www/chromium/Makefile Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/www/chromium/Makefile ============================================================================== --- branches/2016Q2/www/chromium/Makefile Fri May 20 20:43:50 2016 (r415576) +++ branches/2016Q2/www/chromium/Makefile Fri May 20 20:58:55 2016 (r415577) @@ -52,6 +52,7 @@ LIB_DEPENDS= libcairo.so:graphics/cairo libwebp.so:graphics/webp RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \ + alsa-lib>=1.1.1_1:audio/alsa-lib \ droid-fonts-ttf>0:x11-fonts/droid-fonts-ttf \ xdg-open:devel/xdg-utils Copied: branches/2016Q2/www/chromium/files/patch-media__audio__alsa__audio_manager_alsa.cc (from r415570, head/www/chromium/files/patch-media__audio__alsa__audio_manager_alsa.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/www/chromium/files/patch-media__audio__alsa__audio_manager_alsa.cc Fri May 20 20:58:55 2016 (r415577, copy of r415570, head/www/chromium/files/patch-media__audio__alsa__audio_manager_alsa.cc) @@ -0,0 +1,54 @@ +--- media/audio/alsa/audio_manager_alsa.cc.orig 2016-04-07 19:01:10 UTC ++++ media/audio/alsa/audio_manager_alsa.cc +@@ -128,7 +128,9 @@ void AudioManagerAlsa::GetAlsaAudioDevic + int card = -1; + + // Loop through the sound cards to get ALSA device hints. ++#ifdef OS_LINUX + while (!wrapper_->CardNext(&card) && card >= 0) { ++#endif + void** hints = NULL; + int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints); + if (!error) { +@@ -140,7 +142,9 @@ void AudioManagerAlsa::GetAlsaAudioDevic + DLOG(WARNING) << "GetAlsaAudioDevices: unable to get device hints: " + << wrapper_->StrError(error); + } ++#ifdef OS_LINUX + } ++#endif + } + + void AudioManagerAlsa::GetAlsaDevicesInfo( +@@ -226,7 +230,11 @@ bool AudioManagerAlsa::IsAlsaDeviceAvail + // goes through software conversion if needed (e.g. incompatible + // sample rate). + // TODO(joi): Should we prefer "hw" instead? ++#ifdef OS_LINUX + static const char kDeviceTypeDesired[] = "plughw"; ++#else ++ static const char kDeviceTypeDesired[] = "plug"; ++#endif + return strncmp(kDeviceTypeDesired, + device_name, + arraysize(kDeviceTypeDesired) - 1) == 0; +@@ -250,7 +258,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDe + // Loop through the sound cards. + // Don't use snd_device_name_hint(-1,..) since there is a access violation + // inside this ALSA API with libasound.so.2.0.0. ++#ifdef OS_LINUX + while (!wrapper_->CardNext(&card) && (card >= 0) && !has_device) { ++#endif + int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints); + if (!error) { + for (void** hint_iter = hints; *hint_iter != NULL; hint_iter++) { +@@ -274,7 +284,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDe + DLOG(WARNING) << "HasAnyAudioDevice: unable to get device hints: " + << wrapper_->StrError(error); + } ++#ifdef OS_LINUX + } ++#endif + + return has_device; + } From owner-svn-ports-branches@freebsd.org Sat May 21 19:42:52 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 61489B450FA; Sat, 21 May 2016 19:42:52 +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 0A4A21232; Sat, 21 May 2016 19:42:51 +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 u4LJgpJ0064607; Sat, 21 May 2016 19:42:51 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4LJgpZO064605; Sat, 21 May 2016 19:42:51 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201605211942.u4LJgpZO064605@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Sat, 21 May 2016 19:42:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r415610 - branches/2016Q2/mail/postfix-current 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.22 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, 21 May 2016 19:42:52 -0000 Author: ohauer Date: Sat May 21 19:42:50 2016 New Revision: 415610 URL: https://svnweb.freebsd.org/changeset/ports/415610 Log: MFH: r415287 - update to 3.2-20160515 Changelog: 20160330 The collate.pl script by Viktor Dukhovni for grouping Postfix logfile records into "sessions" based on queue ID and process ID information. Files: auxiliary/collate/*. 20160407 Treat SASL_FAIL and SASL_NOMEM as temporary errors. Markus Benning. File: xsasl/xsasl_cyrus_server.c. 20160410 Bugfix (introduced: Postfix 2.6): the "bad filetype" header_checks pattern falsely rejected Content-Mumble headers with ``name="example"; x-apple-part-url="example.com"''. Fixed by respecting the ";" separator between content attribute values. Reported by Cedric Knight. File: proto/header_checks. 20160515 Portability: OpenBSD 6.0. Files: makedefs, util/sys_defs.h, dns/dns_str_resflags.c. Approved by: ports-secteam (feld@) Modified: branches/2016Q2/mail/postfix-current/Makefile branches/2016Q2/mail/postfix-current/distinfo Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/mail/postfix-current/Makefile ============================================================================== --- branches/2016Q2/mail/postfix-current/Makefile Sat May 21 19:38:23 2016 (r415609) +++ branches/2016Q2/mail/postfix-current/Makefile Sat May 21 19:42:50 2016 (r415610) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= postfix -DISTVERSION= 3.2-20160327 +DISTVERSION= 3.2-20160515 PORTEPOCH= 4 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/ \ Modified: branches/2016Q2/mail/postfix-current/distinfo ============================================================================== --- branches/2016Q2/mail/postfix-current/distinfo Sat May 21 19:38:23 2016 (r415609) +++ branches/2016Q2/mail/postfix-current/distinfo Sat May 21 19:42:50 2016 (r415610) @@ -1,2 +1,3 @@ -SHA256 (postfix/postfix-3.2-20160327.tar.gz) = 6718c0cba4e612229e42bb70013610682741b6b7e8c7952557cd6c6db72fc5f1 -SIZE (postfix/postfix-3.2-20160327.tar.gz) = 4334899 +TIMESTAMP = 1463345142 +SHA256 (postfix/postfix-3.2-20160515.tar.gz) = e2f73463c03c883179e4ca3f9dbc420d0e3c8cf7515039f0ab3819f6eae8f31c +SIZE (postfix/postfix-3.2-20160515.tar.gz) = 4336680