From owner-svn-ports-branches@freebsd.org Sun Jul 23 13:46:36 2017 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 AF6E4D7EAB7; Sun, 23 Jul 2017 13:46:36 +0000 (UTC) (envelope-from feld@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 8A9CE252C; Sun, 23 Jul 2017 13:46:36 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6NDkZ11024754; Sun, 23 Jul 2017 13:46:35 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6NDkZ9q024748; Sun, 23 Jul 2017 13:46:35 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201707231346.v6NDkZ9q024748@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Sun, 23 Jul 2017 13:46:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r446474 - in branches/2017Q3/net: samba44 samba45 samba46 X-SVN-Group: ports-branches X-SVN-Commit-Author: feld X-SVN-Commit-Paths: in branches/2017Q3/net: samba44 samba45 samba46 X-SVN-Commit-Revision: 446474 X-SVN-Commit-Repository: ports 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.23 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, 23 Jul 2017 13:46:36 -0000 Author: feld Date: Sun Jul 23 13:46:35 2017 New Revision: 446474 URL: https://svnweb.freebsd.org/changeset/ports/446474 Log: MFH: r445650 Samba 4.6.6, 4.5.12 and 4.4.15 Security update for the CVE-2017-11103: Orpheus' Lyre KDC-REP service name validation in Heimdal Security: CVE-2017-11103 Approved by: ports-secteam (with hat) Modified: branches/2017Q3/net/samba44/Makefile branches/2017Q3/net/samba44/distinfo branches/2017Q3/net/samba45/Makefile branches/2017Q3/net/samba45/distinfo branches/2017Q3/net/samba46/Makefile branches/2017Q3/net/samba46/distinfo Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/net/samba44/Makefile ============================================================================== --- branches/2017Q3/net/samba44/Makefile Sun Jul 23 13:13:11 2017 (r446473) +++ branches/2017Q3/net/samba44/Makefile Sun Jul 23 13:46:35 2017 (r446474) @@ -3,7 +3,7 @@ PORTNAME?= ${SAMBA4_BASENAME}44 PORTVERSION?= ${SAMBA4_VERSION} -PORTREVISION?= 1 +PORTREVISION?= 0 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} @@ -13,13 +13,13 @@ COMMENT?= Free SMB/CIFS and AD/DC server and client f LICENSE= GPLv3 -CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba4[1-356]-4.* p5-Parse-Pidl-4.* +CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba4[1-35-9]-4.* p5-Parse-Pidl-4.* #EXTRA_PATCHES= ${PATCHDIR}/extra-patch-security:-p1 SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.4.14 +SAMBA4_VERSION= 4.4.15 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} @@ -159,11 +159,6 @@ CONFIGURE_ARGS+= \ --without-gettext \ --with-sendfile-support \ ${ICONV_CONFIGURE_BASE} -# for libexecinfo: (so that __builtin_frame_address() finds the top of the stack) -.if ${ARCH} == "amd64" -CFLAGS+= -fno-omit-frame-pointer -.endif - .if ${PORT_OPTIONS:MBIND99} RUN_DEPENDS+= bind99>=9.9.0.0:dns/bind99 SUB_LIST+= NSUPDATE="@comment " @@ -399,10 +394,19 @@ SUB_FILES= pkg-message README.FreeBSD # Make sure that the right version of Python is used by the tools # https://bugzilla.samba.org/show_bug.cgi?id=7305 SHEBANG_FILES= ${PATCH_WRKSRC}/source4/scripting/bin/* + +# for libexecinfo: (so that __builtin_frame_address() finds the top of the stack) +.if ${ARCH} == "amd64" +CFLAGS+= -fno-omit-frame-pointer +.endif # No fancy color error messages .if ${COMPILER_TYPE} == "clang" CFLAGS+= -fno-color-diagnostics .endif +.if ${readline_ARGS} == port +CFLAGS+= -D_FUNCTION_DEF +.endif + CONFIGURE_ENV+= NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s' MAKE_ENV+= NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s' Modified: branches/2017Q3/net/samba44/distinfo ============================================================================== --- branches/2017Q3/net/samba44/distinfo Sun Jul 23 13:13:11 2017 (r446473) +++ branches/2017Q3/net/samba44/distinfo Sun Jul 23 13:46:35 2017 (r446474) @@ -1,3 +1,3 @@ -TIMESTAMP = 1495629061 -SHA256 (samba-4.4.14.tar.gz) = b0a564af71536f12f01aae2e1d93a04c588dd53b81a3f3eaf9bb73ba4f6f57dd -SIZE (samba-4.4.14.tar.gz) = 20766497 +TIMESTAMP = 1499891749 +SHA256 (samba-4.4.15.tar.gz) = 011d1a64afecd9e04f14581a6a2afd1f73c33fa1cdc5bfe3aa11c4752954731c +SIZE (samba-4.4.15.tar.gz) = 20774186 Modified: branches/2017Q3/net/samba45/Makefile ============================================================================== --- branches/2017Q3/net/samba45/Makefile Sun Jul 23 13:13:11 2017 (r446473) +++ branches/2017Q3/net/samba45/Makefile Sun Jul 23 13:46:35 2017 (r446474) @@ -3,7 +3,7 @@ PORTNAME?= ${SAMBA4_BASENAME}45 PORTVERSION?= ${SAMBA4_VERSION} -PORTREVISION?= 1 +PORTREVISION?= 0 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} @@ -13,13 +13,13 @@ COMMENT?= Free SMB/CIFS and AD/DC server and client LICENSE= GPLv3 -CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba4[1-46]-4.* p5-Parse-Pidl-4.* +CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba4[1-46-9]-4.* p5-Parse-Pidl-4.* #EXTRA_PATCHES= ${PATCHDIR}/extra-patch-security:-p1 SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.5.10 +SAMBA4_VERSION= 4.5.12 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} @@ -289,6 +289,10 @@ CFLAGS+= -fno-omit-frame-pointer .if ${CHOSEN_COMPILER_TYPE} == clang CFLAGS+= -fno-color-diagnostics .endif +.if ${readline_ARGS} == port +CFLAGS+= -D_FUNCTION_DEF +.endif + CONFIGURE_ENV+= NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s' MAKE_ENV+= NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s' Modified: branches/2017Q3/net/samba45/distinfo ============================================================================== --- branches/2017Q3/net/samba45/distinfo Sun Jul 23 13:13:11 2017 (r446473) +++ branches/2017Q3/net/samba45/distinfo Sun Jul 23 13:46:35 2017 (r446474) @@ -1,3 +1,3 @@ -TIMESTAMP = 1495629026 -SHA256 (samba-4.5.10.tar.gz) = 7cb753f5f6d5527ef40d4c1f47dacafb7c876cb304b4906ccb390c6a18477714 -SIZE (samba-4.5.10.tar.gz) = 20989431 +TIMESTAMP = 1499887054 +SHA256 (samba-4.5.12.tar.gz) = f4c17123e3cc852a5ecc7e38884b00deab57632b9519aebc243e2a94b9b5ace4 +SIZE (samba-4.5.12.tar.gz) = 21011562 Modified: branches/2017Q3/net/samba46/Makefile ============================================================================== --- branches/2017Q3/net/samba46/Makefile Sun Jul 23 13:13:11 2017 (r446473) +++ branches/2017Q3/net/samba46/Makefile Sun Jul 23 13:46:35 2017 (r446474) @@ -3,7 +3,7 @@ PORTNAME?= ${SAMBA4_BASENAME}46 PORTVERSION?= ${SAMBA4_VERSION} -PORTREVISION?= 1 +PORTREVISION?= 0 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} @@ -13,13 +13,13 @@ COMMENT?= Free SMB/CIFS and AD/DC server and client LICENSE= GPLv3 -CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba4[1-5]-4.* p5-Parse-Pidl-4.* +CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba4[1-57-9]-4.* p5-Parse-Pidl-4.* #EXTRA_PATCHES= ${PATCHDIR}/extra-patch-security:-p1 SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.6.4 +SAMBA4_VERSION= 4.6.6 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} @@ -288,6 +288,9 @@ CFLAGS+= -fno-omit-frame-pointer .endif .if ${CHOSEN_COMPILER_TYPE} == clang CFLAGS+= -fno-color-diagnostics +.endif +.if ${readline_ARGS} == port +CFLAGS+= -D_FUNCTION_DEF .endif CONFIGURE_ENV+= NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s' MAKE_ENV+= NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s' Modified: branches/2017Q3/net/samba46/distinfo ============================================================================== --- branches/2017Q3/net/samba46/distinfo Sun Jul 23 13:13:11 2017 (r446473) +++ branches/2017Q3/net/samba46/distinfo Sun Jul 23 13:46:35 2017 (r446474) @@ -1,3 +1,3 @@ -TIMESTAMP = 1495628999 -SHA256 (samba-4.6.4.tar.gz) = 4ac67329d18e5586dc75db50e23b81c1f6c45a2d5bb9752ea6d90dcca08d9a61 -SIZE (samba-4.6.4.tar.gz) = 21108045 +TIMESTAMP = 1499871845 +SHA256 (samba-4.6.6.tar.gz) = fc31c809f7d85ae30f2b7dcddcb8404201b626047458cb5f2b743d4f6f3f1a8e +SIZE (samba-4.6.6.tar.gz) = 21120791 From owner-svn-ports-branches@freebsd.org Sun Jul 23 14:00:45 2017 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 3FC97D7EDD1; Sun, 23 Jul 2017 14:00:45 +0000 (UTC) (envelope-from eugen@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 0CCC62AD3; Sun, 23 Jul 2017 14:00:44 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6NE0ih2029168; Sun, 23 Jul 2017 14:00:44 GMT (envelope-from eugen@FreeBSD.org) Received: (from eugen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6NE0iwb029166; Sun, 23 Jul 2017 14:00:44 GMT (envelope-from eugen@FreeBSD.org) Message-Id: <201707231400.v6NE0iwb029166@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eugen set sender to eugen@FreeBSD.org using -f From: Eugene Grosbein Date: Sun, 23 Jul 2017 14:00:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r446476 - in branches/2017Q3/deskutils/tpb: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: eugen X-SVN-Commit-Paths: in branches/2017Q3/deskutils/tpb: . files X-SVN-Commit-Revision: 446476 X-SVN-Commit-Repository: ports 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.23 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, 23 Jul 2017 14:00:45 -0000 Author: eugen Date: Sun Jul 23 14:00:43 2017 New Revision: 446476 URL: https://svnweb.freebsd.org/changeset/ports/446476 Log: MFH: r446371 - Fix volume control for TPB by correcting typing error: replace wrong "dec.acpi_ibm.0.volume" with right "dev.acpi_ibm.0.volume" - assign submitter as maintainer for this unmaintained port - bump PORTREVISION. PR: 220900 Submitted by: Dmitry Luhtionov Approved by: az (mentor) Approved by: ports-secteam Modified: branches/2017Q3/deskutils/tpb/Makefile branches/2017Q3/deskutils/tpb/files/patch-src-tpb.c Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/deskutils/tpb/Makefile ============================================================================== --- branches/2017Q3/deskutils/tpb/Makefile Sun Jul 23 13:58:45 2017 (r446475) +++ branches/2017Q3/deskutils/tpb/Makefile Sun Jul 23 14:00:43 2017 (r446476) @@ -3,11 +3,11 @@ PORTNAME= tpb PORTVERSION= 0.6.4 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= deskutils MASTER_SITES= SAVANNAH -MAINTAINER= ports@FreeBSD.org +MAINTAINER= dmitryluhtionov@gmail.com COMMENT= On-Screen-Display for hotkeys of IBM ThinkPads LICENSE= GPLv2+ Modified: branches/2017Q3/deskutils/tpb/files/patch-src-tpb.c ============================================================================== --- branches/2017Q3/deskutils/tpb/files/patch-src-tpb.c Sun Jul 23 13:58:45 2017 (r446475) +++ branches/2017Q3/deskutils/tpb/files/patch-src-tpb.c Sun Jul 23 14:00:43 2017 (r446476) @@ -156,7 +156,7 @@ +#ifdef __FreeBSD__ + u_int n = thinkpad_state->volume_level; + -+ if (sysctlbyname("dec.acpi_ibm.0.volume", NULL, NULL, &n, sizeof(n)) != 0) ++ if (sysctlbyname("dev.acpi_ibm.0.volume", NULL, NULL, &n, sizeof(n)) != 0) + fprintf(stderr, _("Unable to set volume sysctl")); + else { +#endif From owner-svn-ports-branches@freebsd.org Sun Jul 23 14:17:18 2017 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 34AB7D7F28E; Sun, 23 Jul 2017 14:17:18 +0000 (UTC) (envelope-from sunpoet@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 0389934DC; Sun, 23 Jul 2017 14:17:17 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6NEHHKF037559; Sun, 23 Jul 2017 14:17:17 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6NEHHuS037558; Sun, 23 Jul 2017 14:17:17 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201707231417.v6NEHHuS037558@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sun, 23 Jul 2017 14:17:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r446479 - branches/2017Q3/dns/ldns X-SVN-Group: ports-branches X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: branches/2017Q3/dns/ldns X-SVN-Commit-Revision: 446479 X-SVN-Commit-Repository: ports 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.23 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, 23 Jul 2017 14:17:18 -0000 Author: sunpoet Date: Sun Jul 23 14:17:16 2017 New Revision: 446479 URL: https://svnweb.freebsd.org/changeset/ports/446479 Log: MFH: r446473 Remove perl5 from RUN_DEPENDS - Bump PORTREVISION for dependency change PR: 220910 Submitted by: Andrew Romanenko Approved by: Jaap Akkerhuis (maintainer) Approved by: ports-secteam (feld) Modified: branches/2017Q3/dns/ldns/Makefile Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/dns/ldns/Makefile ============================================================================== --- branches/2017Q3/dns/ldns/Makefile Sun Jul 23 14:16:08 2017 (r446478) +++ branches/2017Q3/dns/ldns/Makefile Sun Jul 23 14:17:16 2017 (r446479) @@ -3,6 +3,7 @@ PORTNAME= ldns PORTVERSION= 1.7.0 +PORTREVISION= 1 CATEGORIES= dns MASTER_SITES= http://www.nlnetlabs.nl/downloads/ldns/ \ LOCAL/ehaupt @@ -15,6 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE GNU_CONFIGURE= yes USES= cpe gmake libtool ssl perl5 +USE_PERL5= build CPE_VENDOR= nlnetlabs USE_LDCONFIG= yes From owner-svn-ports-branches@freebsd.org Sun Jul 23 14:25:03 2017 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 BD772D7F52F; Sun, 23 Jul 2017 14:25:03 +0000 (UTC) (envelope-from sunpoet@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 872263A19; Sun, 23 Jul 2017 14:25:03 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6NEP2O9041726; Sun, 23 Jul 2017 14:25:02 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6NEP21l041724; Sun, 23 Jul 2017 14:25:02 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201707231425.v6NEP21l041724@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sun, 23 Jul 2017 14:25:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r446481 - branches/2017Q3/devel/tortoisehg X-SVN-Group: ports-branches X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: branches/2017Q3/devel/tortoisehg X-SVN-Commit-Revision: 446481 X-SVN-Commit-Repository: ports 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.23 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, 23 Jul 2017 14:25:03 -0000 Author: sunpoet Date: Sun Jul 23 14:25:02 2017 New Revision: 446481 URL: https://svnweb.freebsd.org/changeset/ports/446481 Log: MFH: r446220 Update to 4.2.1 Changes: https://bitbucket.org/tortoisehg/thg/wiki/ReleaseNotes PR: 220780 Submitted by: sunpoet (myself) Approved by: arrowd <6yearold@gmail.com> (maintainer) Approved by: ports-secteam (feld) Modified: branches/2017Q3/devel/tortoisehg/Makefile branches/2017Q3/devel/tortoisehg/distinfo Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/devel/tortoisehg/Makefile ============================================================================== --- branches/2017Q3/devel/tortoisehg/Makefile Sun Jul 23 14:19:04 2017 (r446480) +++ branches/2017Q3/devel/tortoisehg/Makefile Sun Jul 23 14:25:02 2017 (r446481) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= tortoisehg -PORTVERSION= 4.1.3 +PORTVERSION= 4.2.1 CATEGORIES= devel MASTER_SITES= https://bitbucket.org/tortoisehg/targz/downloads/ #MASTER_SITES= http://cdn.bitbucket.org/tortoisehg/targz/downloads/ Modified: branches/2017Q3/devel/tortoisehg/distinfo ============================================================================== --- branches/2017Q3/devel/tortoisehg/distinfo Sun Jul 23 14:19:04 2017 (r446480) +++ branches/2017Q3/devel/tortoisehg/distinfo Sun Jul 23 14:25:02 2017 (r446481) @@ -1,3 +1,3 @@ -TIMESTAMP = 1493222975 -SHA256 (tortoisehg-4.1.3.tar.gz) = 003ca6b45b2e32c754dc1fa3905f76b82181e51734ca32450a115d7a9e015c4d -SIZE (tortoisehg-4.1.3.tar.gz) = 7919254 +TIMESTAMP = 1500137755 +SHA256 (tortoisehg-4.2.1.tar.gz) = e821b9c4fc2c8ab8a1d743c56b6f002c4994d737120b388d38b4891dcd57ecca +SIZE (tortoisehg-4.2.1.tar.gz) = 7921681 From owner-svn-ports-branches@freebsd.org Sun Jul 23 14:40:00 2017 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 514DDD7F979; Sun, 23 Jul 2017 14:40:00 +0000 (UTC) (envelope-from feld@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 1D614635FD; Sun, 23 Jul 2017 14:40:00 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6NEdxN7046428; Sun, 23 Jul 2017 14:39:59 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6NEdxVw046426; Sun, 23 Jul 2017 14:39:59 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201707231439.v6NEdxVw046426@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Sun, 23 Jul 2017 14:39:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r446485 - in branches/2017Q3/databases: percona55-server percona56-server X-SVN-Group: ports-branches X-SVN-Commit-Author: feld X-SVN-Commit-Paths: in branches/2017Q3/databases: percona55-server percona56-server X-SVN-Commit-Revision: 446485 X-SVN-Commit-Repository: ports 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.23 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, 23 Jul 2017 14:40:00 -0000 Author: feld Date: Sun Jul 23 14:39:58 2017 New Revision: 446485 URL: https://svnweb.freebsd.org/changeset/ports/446485 Log: MFH: r446475 databases/percona55-server percona56-server: Fix OPENSSL option to actually enable linking with OpenSSL Differential Revision: https://reviews.freebsd.org/D9122 Approved by: ports-secteam (with hat) Modified: branches/2017Q3/databases/percona55-server/Makefile branches/2017Q3/databases/percona56-server/Makefile Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/databases/percona55-server/Makefile ============================================================================== --- branches/2017Q3/databases/percona55-server/Makefile Sun Jul 23 14:37:24 2017 (r446484) +++ branches/2017Q3/databases/percona55-server/Makefile Sun Jul 23 14:39:58 2017 (r446485) @@ -2,7 +2,7 @@ PORTNAME?= percona DISTVERSION= 5.5.54-38.6 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= databases ipv6 MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.5/Percona-Server-${DISTVERSION}/source/tarball/ PKGNAMESUFFIX?= 55-server @@ -48,7 +48,8 @@ SHEBANG_FILES= scripts/*.pl* scripts/*.sh .include .if ${PORT_OPTIONS:MOPENSSL} -CMAKE_ARGS+= -DWITH_SSL=bundled +CMAKE_ARGS+= -DWITH_SSL=system +OPENSSL_USES= ssl .endif .if ${PORT_OPTIONS:MFASTMTX} CMAKE_ARGS+= -DWITH_FAST_MUTEXES=1 Modified: branches/2017Q3/databases/percona56-server/Makefile ============================================================================== --- branches/2017Q3/databases/percona56-server/Makefile Sun Jul 23 14:37:24 2017 (r446484) +++ branches/2017Q3/databases/percona56-server/Makefile Sun Jul 23 14:39:58 2017 (r446485) @@ -3,7 +3,7 @@ PORTNAME?= percona DISTVERSION= 5.6.35-80.0 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= databases ipv6 MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${DISTVERSION}/source/tarball/ PKGNAMESUFFIX?= 56-server @@ -27,7 +27,8 @@ FASTMTX_DESC= Replace mutexes with spinlocks FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1 INNODBMEMCACHED_DESC= InnoDB Memcached plugin INNODBMEMCACHED_CMAKE_ON= -DWITH_INNODB_MEMCACHED=1 -OPENSSL_CMAKE_ON= -DWITH_SSL=bundled +OPENSSL_CMAKE_ON= -DWITH_SSL=system +OPENSSL_USES= ssl TOKUDB_DESC= TokuDB Engine (experimental) TOKUDB_CMAKE_ON= -DUSE_CTAGS=0 TOKUDB_EXTRA_PATCHES=${PATCHDIR}/extrapatch-tokudb From owner-svn-ports-branches@freebsd.org Sun Jul 23 14:41:39 2017 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 B3D06D7FC7F; Sun, 23 Jul 2017 14:41:39 +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 8ED3463945; Sun, 23 Jul 2017 14:41:39 +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 v6NEfcgw048828; Sun, 23 Jul 2017 14:41:38 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6NEfcbv048823; Sun, 23 Jul 2017 14:41:38 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201707231441.v6NEfcbv048823@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 23 Jul 2017 14:41:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r446486 - in branches/2017Q3/multimedia: mencoder mplayer X-SVN-Group: ports-branches X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: in branches/2017Q3/multimedia: mencoder mplayer X-SVN-Commit-Revision: 446486 X-SVN-Commit-Repository: ports 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.23 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, 23 Jul 2017 14:41:39 -0000 Author: riggs Date: Sun Jul 23 14:41:38 2017 New Revision: 446486 URL: https://svnweb.freebsd.org/changeset/ports/446486 Log: MFH: r446391 Update to a recent upstream snapshot as of 2017-07-22 Approved by: ports-secteam (feld) Modified: branches/2017Q3/multimedia/mencoder/distinfo branches/2017Q3/multimedia/mplayer/Makefile branches/2017Q3/multimedia/mplayer/Makefile.common branches/2017Q3/multimedia/mplayer/distinfo Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/multimedia/mencoder/distinfo ============================================================================== --- branches/2017Q3/multimedia/mencoder/distinfo Sun Jul 23 14:39:58 2017 (r446485) +++ branches/2017Q3/multimedia/mencoder/distinfo Sun Jul 23 14:41:38 2017 (r446486) @@ -1,3 +1,3 @@ -TIMESTAMP = 1492268117 -SHA256 (mplayer-1.3.0.20170415.tar.xz) = 36aa3cb7b3033ac77f50e7f83f6eb925743da2a492714ff45eef788ee50b5ebe -SIZE (mplayer-1.3.0.20170415.tar.xz) = 5165244 +TIMESTAMP = 1500723616 +SHA256 (mplayer-1.3.0.20170722.tar.xz) = 04275a660afb0eba44b4d4fef9fffff0b4cb1940c4fbf145cf76bdd3f6c46ddd +SIZE (mplayer-1.3.0.20170722.tar.xz) = 5166812 Modified: branches/2017Q3/multimedia/mplayer/Makefile ============================================================================== --- branches/2017Q3/multimedia/mplayer/Makefile Sun Jul 23 14:39:58 2017 (r446485) +++ branches/2017Q3/multimedia/mplayer/Makefile Sun Jul 23 14:41:38 2017 (r446486) @@ -3,7 +3,6 @@ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g} -PORTREVISION= 1 CATEGORIES= multimedia audio MAINTAINER= riggs@FreeBSD.org Modified: branches/2017Q3/multimedia/mplayer/Makefile.common ============================================================================== --- branches/2017Q3/multimedia/mplayer/Makefile.common Sun Jul 23 14:39:58 2017 (r446485) +++ branches/2017Q3/multimedia/mplayer/Makefile.common Sun Jul 23 14:41:38 2017 (r446486) @@ -5,8 +5,7 @@ # $FreeBSD$ MPLAYER_PORT_VERSION= 1.3.0 -MPLAYER_SNAPSHOT_DATE= 2017-04-15 -PORTREVISION?= 1 +MPLAYER_SNAPSHOT_DATE= 2017-07-22 MASTER_SITES= LOCAL/riggs/mplayer DISTNAME= mplayer-${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g} WRKSRC= ${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE} Modified: branches/2017Q3/multimedia/mplayer/distinfo ============================================================================== --- branches/2017Q3/multimedia/mplayer/distinfo Sun Jul 23 14:39:58 2017 (r446485) +++ branches/2017Q3/multimedia/mplayer/distinfo Sun Jul 23 14:41:38 2017 (r446486) @@ -1,3 +1,3 @@ -TIMESTAMP = 1492266977 -SHA256 (mplayer-1.3.0.20170415.tar.xz) = 36aa3cb7b3033ac77f50e7f83f6eb925743da2a492714ff45eef788ee50b5ebe -SIZE (mplayer-1.3.0.20170415.tar.xz) = 5165244 +TIMESTAMP = 1500719399 +SHA256 (mplayer-1.3.0.20170722.tar.xz) = 04275a660afb0eba44b4d4fef9fffff0b4cb1940c4fbf145cf76bdd3f6c46ddd +SIZE (mplayer-1.3.0.20170722.tar.xz) = 5166812 From owner-svn-ports-branches@freebsd.org Sun Jul 23 15:34:43 2017 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 E0366D9ACFB; Sun, 23 Jul 2017 15:34:43 +0000 (UTC) (envelope-from woodsb02@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 AE67365133; Sun, 23 Jul 2017 15:34:43 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6NFYgqu071513; Sun, 23 Jul 2017 15:34:42 GMT (envelope-from woodsb02@FreeBSD.org) Received: (from woodsb02@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6NFYgkV071511; Sun, 23 Jul 2017 15:34:42 GMT (envelope-from woodsb02@FreeBSD.org) Message-Id: <201707231534.v6NFYgkV071511@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: woodsb02 set sender to woodsb02@FreeBSD.org using -f From: Ben Woods Date: Sun, 23 Jul 2017 15:34:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r446490 - in branches/2017Q3/misc/mc: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: woodsb02 X-SVN-Commit-Paths: in branches/2017Q3/misc/mc: . files X-SVN-Commit-Revision: 446490 X-SVN-Commit-Repository: ports 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.23 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, 23 Jul 2017 15:34:44 -0000 Author: woodsb02 Date: Sun Jul 23 15:34:42 2017 New Revision: 446490 URL: https://svnweb.freebsd.org/changeset/ports/446490 Log: MFH: r446488 misc/mc: Fix invalid tty baudrate detection disabling verbose mode PR: 220944 Submitted by: Michael Büker Obtained from: https://midnight-commander.org/ticket/2452#comment:15 Approved by: ports-secteam blanket Added: branches/2017Q3/misc/mc/files/patch-src_filemanager_midnight.c - copied unchanged from r446488, head/misc/mc/files/patch-src_filemanager_midnight.c Modified: branches/2017Q3/misc/mc/Makefile Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/misc/mc/Makefile ============================================================================== --- branches/2017Q3/misc/mc/Makefile Sun Jul 23 15:28:05 2017 (r446489) +++ branches/2017Q3/misc/mc/Makefile Sun Jul 23 15:34:42 2017 (r446490) @@ -3,7 +3,7 @@ PORTNAME= mc PORTVERSION= 4.8.19 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= misc shells MASTER_SITES= http://ftp.midnight-commander.org/ \ http://ftp.osuosl.org/pub/midnightcommander/ Copied: branches/2017Q3/misc/mc/files/patch-src_filemanager_midnight.c (from r446488, head/misc/mc/files/patch-src_filemanager_midnight.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q3/misc/mc/files/patch-src_filemanager_midnight.c Sun Jul 23 15:34:42 2017 (r446490, copy of r446488, head/misc/mc/files/patch-src_filemanager_midnight.c) @@ -0,0 +1,11 @@ +--- src/filemanager/midnight.c.orig 2017-03-04 17:51:38 UTC ++++ src/filemanager/midnight.c +@@ -879,7 +879,7 @@ setup_mc (void) + add_select_channel (mc_global.tty.subshell_pty, load_prompt, 0); + #endif /* !ENABLE_SUBSHELL */ + +- if ((tty_baudrate () < 9600) || mc_global.tty.slow_terminal) ++ if ((tty_baudrate () > 0 && tty_baudrate () < 9600) || mc_global.tty.slow_terminal) + verbose = FALSE; + } + From owner-svn-ports-branches@freebsd.org Sun Jul 23 16:08:01 2017 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 20E1CDA48B8; Sun, 23 Jul 2017 16:08:01 +0000 (UTC) (envelope-from cpm@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 EECC666098; Sun, 23 Jul 2017 16:08:00 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6NG8019084344; Sun, 23 Jul 2017 16:08:00 GMT (envelope-from cpm@FreeBSD.org) Received: (from cpm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6NG7x4d084337; Sun, 23 Jul 2017 16:07:59 GMT (envelope-from cpm@FreeBSD.org) Message-Id: <201707231607.v6NG7x4d084337@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cpm set sender to cpm@FreeBSD.org using -f From: "Carlos J. Puga Medina" Date: Sun, 23 Jul 2017 16:07:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r446494 - branches/2017Q3/security/libgcrypt X-SVN-Group: ports-branches X-SVN-Commit-Author: cpm X-SVN-Commit-Paths: branches/2017Q3/security/libgcrypt X-SVN-Commit-Revision: 446494 X-SVN-Commit-Repository: ports 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.23 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, 23 Jul 2017 16:08:01 -0000 Author: cpm Date: Sun Jul 23 16:07:59 2017 New Revision: 446494 URL: https://svnweb.freebsd.org/changeset/ports/446494 Log: MFH: r446306 security/libgcrypt: update to 1.8.0 - Update libgcrypt to 1.8.0 - Update libgpg-error version required to 1.25 - Bump library version in pkg-plist Changes: https://lists.gnupg.org/pipermail/gnupg-announce/2017q3/000410.html Binary compatibility report: https://abi-laboratory.pro/tracker/compat_report/libgcrypt/1.7.8/1.8.0/d9ddd/abi_compat_report.html PR: 220858 Exp-run by: antoine Approved by: ports-secteam (feld) Modified: branches/2017Q3/security/libgcrypt/Makefile branches/2017Q3/security/libgcrypt/distinfo branches/2017Q3/security/libgcrypt/pkg-plist Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/security/libgcrypt/Makefile ============================================================================== --- branches/2017Q3/security/libgcrypt/Makefile Sun Jul 23 16:05:38 2017 (r446493) +++ branches/2017Q3/security/libgcrypt/Makefile Sun Jul 23 16:07:59 2017 (r446494) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= libgcrypt -PORTVERSION= 1.7.8 +PORTVERSION= 1.8.0 CATEGORIES= security MASTER_SITES= GNUPG @@ -11,8 +11,8 @@ COMMENT= General purpose crypto library based on code LICENSE= GPLv2+ LGPL21+ LICENSE_COMB= multi -BUILD_DEPENDS= libgpg-error>=1.8:security/libgpg-error -RUN_DEPENDS= libgpg-error>=1.8:security/libgpg-error +BUILD_DEPENDS= libgpg-error>=1.25:security/libgpg-error +RUN_DEPENDS= libgpg-error>=1.25:security/libgpg-error USES= cpe libtool makeinfo tar:bzip2 CPE_VENDOR= gnupg Modified: branches/2017Q3/security/libgcrypt/distinfo ============================================================================== --- branches/2017Q3/security/libgcrypt/distinfo Sun Jul 23 16:05:38 2017 (r446493) +++ branches/2017Q3/security/libgcrypt/distinfo Sun Jul 23 16:07:59 2017 (r446494) @@ -1,3 +1,3 @@ -TIMESTAMP = 1498827790 -SHA256 (libgcrypt-1.7.8.tar.bz2) = 948276ea47e6ba0244f36a17b51dcdd52cfd1e664b0a1ac3bc82134fb6cec199 -SIZE (libgcrypt-1.7.8.tar.bz2) = 2897853 +TIMESTAMP = 1500481367 +SHA256 (libgcrypt-1.8.0.tar.bz2) = 23e49697b87cc4173b03b4757c8df4314e3149058fa18bdc4f82098f103d891b +SIZE (libgcrypt-1.8.0.tar.bz2) = 2963266 Modified: branches/2017Q3/security/libgcrypt/pkg-plist ============================================================================== --- branches/2017Q3/security/libgcrypt/pkg-plist Sun Jul 23 16:05:38 2017 (r446493) +++ branches/2017Q3/security/libgcrypt/pkg-plist Sun Jul 23 16:07:59 2017 (r446494) @@ -6,6 +6,6 @@ include/gcrypt.h lib/libgcrypt.a lib/libgcrypt.so lib/libgcrypt.so.20 -lib/libgcrypt.so.20.1.8 +lib/libgcrypt.so.20.2.0 man/man1/hmac256.1.gz share/aclocal/libgcrypt.m4 From owner-svn-ports-branches@freebsd.org Sun Jul 23 16:09:30 2017 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 19662DA4A11; Sun, 23 Jul 2017 16:09:30 +0000 (UTC) (envelope-from cpm@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 D9D236625C; Sun, 23 Jul 2017 16:09:29 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6NG9TFv084573; Sun, 23 Jul 2017 16:09:29 GMT (envelope-from cpm@FreeBSD.org) Received: (from cpm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6NG9TNt084572; Sun, 23 Jul 2017 16:09:29 GMT (envelope-from cpm@FreeBSD.org) Message-Id: <201707231609.v6NG9TNt084572@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cpm set sender to cpm@FreeBSD.org using -f From: "Carlos J. Puga Medina" Date: Sun, 23 Jul 2017 16:09:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r446495 - in branches/2017Q3/security/libgcrypt: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: cpm X-SVN-Commit-Paths: in branches/2017Q3/security/libgcrypt: . files X-SVN-Commit-Revision: 446495 X-SVN-Commit-Repository: ports 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.23 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, 23 Jul 2017 16:09:30 -0000 Author: cpm Date: Sun Jul 23 16:09:28 2017 New Revision: 446495 URL: https://svnweb.freebsd.org/changeset/ports/446495 Log: MFH: r446350 - Remove unnecessary extra-patch-aarch64 (applied upstream) Reported by: Shawn Webb via email Approved by: ports-secteam (blanket) Deleted: branches/2017Q3/security/libgcrypt/files/ Modified: branches/2017Q3/security/libgcrypt/Makefile Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/security/libgcrypt/Makefile ============================================================================== --- branches/2017Q3/security/libgcrypt/Makefile Sun Jul 23 16:07:59 2017 (r446494) +++ branches/2017Q3/security/libgcrypt/Makefile Sun Jul 23 16:09:28 2017 (r446495) @@ -33,10 +33,6 @@ OPTIONS_DEFINE= DOCS .include -.if ${ARCH} == "aarch64" -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-aarch64 -.endif - .if ${ARCH} == "powerpc" CONFIGURE_ARGS+= --disable-asm .endif From owner-svn-ports-branches@freebsd.org Sun Jul 23 16:52:46 2017 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 3BA8ADA555F; Sun, 23 Jul 2017 16:52:46 +0000 (UTC) (envelope-from mmokhi@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 F2AC967644; Sun, 23 Jul 2017 16:52:45 +0000 (UTC) (envelope-from mmokhi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6NGqjR0004886; Sun, 23 Jul 2017 16:52:45 GMT (envelope-from mmokhi@FreeBSD.org) Received: (from mmokhi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6NGqieE004879; Sun, 23 Jul 2017 16:52:44 GMT (envelope-from mmokhi@FreeBSD.org) Message-Id: <201707231652.v6NGqieE004879@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmokhi set sender to mmokhi@FreeBSD.org using -f From: Mahdi Mokhtari Date: Sun, 23 Jul 2017 16:52:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r446497 - in branches/2017Q3/databases: mysql57-client mysql57-client/files mysql57-server mysql57-server/files X-SVN-Group: ports-branches X-SVN-Commit-Author: mmokhi X-SVN-Commit-Paths: in branches/2017Q3/databases: mysql57-client mysql57-client/files mysql57-server mysql57-server/files X-SVN-Commit-Revision: 446497 X-SVN-Commit-Repository: ports 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.23 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, 23 Jul 2017 16:52:46 -0000 Author: mmokhi Date: Sun Jul 23 16:52:44 2017 New Revision: 446497 URL: https://svnweb.freebsd.org/changeset/ports/446497 Log: MFH: r446496 databases/mysql57-{server client}: Fix broken SASL/LDAP integration on newest 5.7.19 upgrade -Add a SASL/LDAP option for mysql57-client -Fix plugin.cmake for "FreeBSD != Linux" case For new plugin, MySQL build assumes everything is MacOS or Windows or Linux. This breaks upgrades when you have SASL/LDAP client-library installed. Because it "Decides" that you "Want" SASL/LDAP support and tries to build it. PR: 220865 Submitted by: mmokhi Reported by: Vladimir Omelchuk Reviewed by: mat, feld (mentors) Approved by: feld (mentor) Differential Revision: https://reviews.freebsd.org/D11667 Approved by: ports-secteam (feld) Added: branches/2017Q3/databases/mysql57-client/files/patch-cmake_plugin.cmake - copied unchanged from r446496, head/databases/mysql57-client/files/patch-cmake_plugin.cmake branches/2017Q3/databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt - copied unchanged from r446496, head/databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt branches/2017Q3/databases/mysql57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt - copied unchanged from r446496, head/databases/mysql57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt Modified: branches/2017Q3/databases/mysql57-client/Makefile branches/2017Q3/databases/mysql57-client/pkg-plist branches/2017Q3/databases/mysql57-server/Makefile branches/2017Q3/databases/mysql57-server/files/patch-cmake_plugin.cmake Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/databases/mysql57-client/Makefile ============================================================================== --- branches/2017Q3/databases/mysql57-client/Makefile Sun Jul 23 16:45:07 2017 (r446496) +++ branches/2017Q3/databases/mysql57-client/Makefile Sun Jul 23 16:52:44 2017 (r446497) @@ -2,6 +2,7 @@ # $FreeBSD$ PORTNAME= mysql +PORTREVISION= 1 PKGNAMESUFFIX= 57-client COMMENT= Multithreaded SQL database (client) @@ -31,6 +32,15 @@ MMAN1= comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 CLIENT_ONLY= yes + +OPTIONS_GROUP+= PLUGINS +PLUGINS_DESC= Default Client Plugins +OPTIONS_GROUP_PLUGINS= SASLCLIENT +SASLCLIENT_DESC= SASL client plugin module +SASLCLIENT_CMAKE_BOOL= WITH_AUTHENTICATION_LDAP +SASLCLIENT_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 +SASLCLIENT_BUILD_DEPENDS= ${LOCALBASE}/include/sasl/sasl.h:net/openldap24-sasl-client +OPTIONS_DEFAULT+= SASLCLIENT # issue 166367: adding symlinks for back-compatibility with ${lib}_r post-install: Copied: branches/2017Q3/databases/mysql57-client/files/patch-cmake_plugin.cmake (from r446496, head/databases/mysql57-client/files/patch-cmake_plugin.cmake) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q3/databases/mysql57-client/files/patch-cmake_plugin.cmake Sun Jul 23 16:52:44 2017 (r446497, copy of r446496, head/databases/mysql57-client/files/patch-cmake_plugin.cmake) @@ -0,0 +1,43 @@ +--- cmake/plugin.cmake.orig 2017-06-22 14:13:19 UTC ++++ cmake/plugin.cmake +@@ -219,9 +219,16 @@ MACRO(MYSQL_ADD_PLUGIN) + # Thus we skip TARGET_LINK_LIBRARIES on Linux, as it would only generate + # an additional dependency. + # Use MYSQL_PLUGIN_IMPORT for static data symbols to be exported. +- IF(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux") ++ # ++ # P.S. "FreeBSD" is obviously not "Linux" but it behaves near similar in this case. ++ IF(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + TARGET_LINK_LIBRARIES (${target} mysqld ${ARG_LINK_LIBRARIES}) + ENDIF() ++ IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") ++ SET_TARGET_PROPERTIES(${target} PROPERTIES ++ LINK_FLAGS "-L%%FREEBSD_LOCAL_LIB%% ${LINK_FLAGS} " ++ ) ++ ENDIF() + ADD_DEPENDENCIES(${target} GenError ${ARG_DEPENDENCIES}) + + IF(NOT ARG_MODULE_ONLY) +@@ -239,13 +246,17 @@ MACRO(MYSQL_ADD_PLUGIN) + MYSQL_INSTALL_TARGETS(${target} + DESTINATION ${INSTALL_PLUGINDIR} + COMPONENT ${INSTALL_COMPONENT}) +- INSTALL_DEBUG_TARGET(${target} +- DESTINATION ${INSTALL_PLUGINDIR}/debug +- COMPONENT ${INSTALL_COMPONENT}) ++ IF(CMAKE_BUILD_TYPE MATCHES "Debug") ++ INSTALL_DEBUG_TARGET(${target} ++ DESTINATION ${INSTALL_PLUGINDIR}/debug ++ COMPONENT ${INSTALL_COMPONENT}) ++ # Add installed files to list for RPMs ++ FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files ++ "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n") ++ ENDIF() + # Add installed files to list for RPMs + FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files +- "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n" +- "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n") ++ "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n") + # For internal testing in PB2, append collections files + IF(DEFINED ENV{PB2WORKDIR}) + PLUGIN_APPEND_COLLECTIONS(${plugin}) Copied: branches/2017Q3/databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt (from r446496, head/databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q3/databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt Sun Jul 23 16:52:44 2017 (r446497, copy of r446496, head/databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt) @@ -0,0 +1,18 @@ +--- libmysql/authentication_ldap/CMakeLists.txt.orig 2017-07-20 22:54:16 UTC ++++ libmysql/authentication_ldap/CMakeLists.txt +@@ -52,8 +52,10 @@ ELSE () + SET(SASL_LIBRARY "sasl2") + ENDIF () + +-MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client +- auth_ldap_sasl_client.cc log_client.cc +- LINK_LIBRARIES ${SASL_LIBRARY} +- MODULE_ONLY +- MODULE_OUTPUT_NAME "authentication_ldap_sasl_client") ++IF (WITH_AUTHENTICATION_LDAP) ++ MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client ++ auth_ldap_sasl_client.cc log_client.cc ++ LINK_LIBRARIES ${SASL_LIBRARY} ++ MODULE_ONLY ++ MODULE_OUTPUT_NAME "authentication_ldap_sasl_client") ++ENDIF() Modified: branches/2017Q3/databases/mysql57-client/pkg-plist ============================================================================== --- branches/2017Q3/databases/mysql57-client/pkg-plist Sun Jul 23 16:45:07 2017 (r446496) +++ branches/2017Q3/databases/mysql57-client/pkg-plist Sun Jul 23 16:52:44 2017 (r446497) @@ -125,6 +125,7 @@ lib/mysql/libmysqlservices.a lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so lib/mysql/libmysqlclient_r.so.20 +%%SASLCLIENT%%lib/mysql/plugin/authentication_ldap_sasl_client.so libdata/pkgconfig/mysqlclient.pc man/man1/comp_err.1.gz man/man1/mysql.1.gz Modified: branches/2017Q3/databases/mysql57-server/Makefile ============================================================================== --- branches/2017Q3/databases/mysql57-server/Makefile Sun Jul 23 16:45:07 2017 (r446496) +++ branches/2017Q3/databases/mysql57-server/Makefile Sun Jul 23 16:52:44 2017 (r446497) @@ -3,6 +3,7 @@ PORTNAME?= mysql PORTVERSION= 5.7.18 +PORTREVISION= 1 CATEGORIES= databases ipv6 MASTER_SITES= MYSQL/MySQL-5.7 PKGNAMESUFFIX?= 57-server @@ -55,7 +56,8 @@ CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ -DWITH_LIBEVENT=system \ -DWITH_LZ4=system \ -DWITH_ZLIB=system \ - -DINSTALL_MYSQLTESTDIR=0 + -DINSTALL_MYSQLTESTDIR=0 \ + -DWITH_DEBUG=0 SHEBANG_FILES= scripts/*.pl* scripts/*.sh @@ -71,6 +73,8 @@ PLIST_SUB= MY_DBDIR=${MY_DBDIR} \ MY_SECDIR=${MY_SECDIR} \ MY_TMPDIR=${MY_TMPDIR} +OPTIONS_SUB= YES + # MySQL-Server part .if !defined(CLIENT_ONLY) USES+= mysql:57 @@ -98,9 +102,8 @@ MMAN1= my_print_defaults.1 myisam_ftdump.1 myisamchk. CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" -OPTIONS_GROUP= STORAGE +OPTIONS_GROUP+= STORAGE OPTIONS_GROUP_STORAGE= ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE PARTITION PERFSCHEMA -OPTIONS_SUB= YES STORAGE_DESC= Permissible "Storage Engines" (to compile statically into the server) ARCHIVE_DESC= Compile "Archive Storage" statically in server BLACKHOLE_DESC= Compile "Blackhole Storage" statically in server @@ -119,8 +122,8 @@ PARTITION_CMAKE_ON= -DWITH_PARTITION_STORAGE_ENGINE=1 PERFSCHEMA_CMAKE_ON= -DWITH_PERFSCHEMA_STORAGE_ENGINE=1 OPTIONS_GROUP+= FEATURES -OPTIONS_GROUP_FEATURES= PERFSCHM FEATURES_DESC= Default features knobs +OPTIONS_GROUP_FEATURES= PERFSCHM PERFSCHM_DESC= Enable "Performance Schema" by default (High RAM usage) OPTIONS_DEFAULT+= PERFSCHM @@ -128,6 +131,10 @@ PERFSCHM_SUB_LIST+= PERFSCHEMRC="" PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--skip-performance-schema" FEDERATED_SUB_LIST+= FEDER="--federated" FEDERATED_SUB_LIST_OFF+= FEDER="" + +# issue 220865: Currently there's no source to be built with server-side support. +# But this keeps the pkg-plist not overlaping +CMAKE_ARGS+= -DWITH_AUTHENTICATION_LDAP=0 .endif .include @@ -143,6 +150,9 @@ post-extract: post-patch: @${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt + # issue 220865: MySQL developers forgot that FreeBSD != Linux + @${REINPLACE_CMD} -e 's|%%FREEBSD_LOCAL_LIB%%|${LOCALBASE}/lib|g' \ + ${WRKSRC}/cmake/plugin.cmake .if !defined(CLIENT_ONLY) post-install: Modified: branches/2017Q3/databases/mysql57-server/files/patch-cmake_plugin.cmake ============================================================================== --- branches/2017Q3/databases/mysql57-server/files/patch-cmake_plugin.cmake Sun Jul 23 16:45:07 2017 (r446496) +++ branches/2017Q3/databases/mysql57-server/files/patch-cmake_plugin.cmake Sun Jul 23 16:52:44 2017 (r446497) @@ -1,12 +1,43 @@ ---- cmake/plugin.cmake.orig 2016-03-28 18:06:12 UTC +--- cmake/plugin.cmake.orig 2017-06-22 14:13:19 UTC +++ cmake/plugin.cmake -@@ -237,9 +237,6 @@ MACRO(MYSQL_ADD_PLUGIN) +@@ -219,9 +219,16 @@ MACRO(MYSQL_ADD_PLUGIN) + # Thus we skip TARGET_LINK_LIBRARIES on Linux, as it would only generate + # an additional dependency. + # Use MYSQL_PLUGIN_IMPORT for static data symbols to be exported. +- IF(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux") ++ # ++ # P.S. "FreeBSD" is obviously not "Linux" but it behaves near similar in this case. ++ IF(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + TARGET_LINK_LIBRARIES (${target} mysqld ${ARG_LINK_LIBRARIES}) + ENDIF() ++ IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") ++ SET_TARGET_PROPERTIES(${target} PROPERTIES ++ LINK_FLAGS "-L%%FREEBSD_LOCAL_LIB%% ${LINK_FLAGS} " ++ ) ++ ENDIF() + ADD_DEPENDENCIES(${target} GenError ${ARG_DEPENDENCIES}) + + IF(NOT ARG_MODULE_ONLY) +@@ -239,13 +246,17 @@ MACRO(MYSQL_ADD_PLUGIN) MYSQL_INSTALL_TARGETS(${target} DESTINATION ${INSTALL_PLUGINDIR} COMPONENT ${INSTALL_COMPONENT}) - INSTALL_DEBUG_TARGET(${target} - DESTINATION ${INSTALL_PLUGINDIR}/debug - COMPONENT ${INSTALL_COMPONENT}) ++ IF(CMAKE_BUILD_TYPE MATCHES "Debug") ++ INSTALL_DEBUG_TARGET(${target} ++ DESTINATION ${INSTALL_PLUGINDIR}/debug ++ COMPONENT ${INSTALL_COMPONENT}) ++ # Add installed files to list for RPMs ++ FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files ++ "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n") ++ ENDIF() # Add installed files to list for RPMs FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files - "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n" +- "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n" +- "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n") ++ "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n") + # For internal testing in PB2, append collections files + IF(DEFINED ENV{PB2WORKDIR}) + PLUGIN_APPEND_COLLECTIONS(${plugin}) Copied: branches/2017Q3/databases/mysql57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt (from r446496, head/databases/mysql57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q3/databases/mysql57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt Sun Jul 23 16:52:44 2017 (r446497, copy of r446496, head/databases/mysql57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt) @@ -0,0 +1,18 @@ +--- libmysql/authentication_ldap/CMakeLists.txt.orig 2017-07-20 22:54:16 UTC ++++ libmysql/authentication_ldap/CMakeLists.txt +@@ -52,8 +52,10 @@ ELSE () + SET(SASL_LIBRARY "sasl2") + ENDIF () + +-MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client +- auth_ldap_sasl_client.cc log_client.cc +- LINK_LIBRARIES ${SASL_LIBRARY} +- MODULE_ONLY +- MODULE_OUTPUT_NAME "authentication_ldap_sasl_client") ++IF (WITH_AUTHENTICATION_LDAP) ++ MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client ++ auth_ldap_sasl_client.cc log_client.cc ++ LINK_LIBRARIES ${SASL_LIBRARY} ++ MODULE_ONLY ++ MODULE_OUTPUT_NAME "authentication_ldap_sasl_client") ++ENDIF() From owner-svn-ports-branches@freebsd.org Sun Jul 23 17:26:03 2017 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 6AA0DDA91D6; Sun, 23 Jul 2017 17:26:03 +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 469DA68917; Sun, 23 Jul 2017 17:26:03 +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 v6NHQ2LT018205; Sun, 23 Jul 2017 17:26:02 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6NHQ2uh018203; Sun, 23 Jul 2017 17:26:02 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201707231726.v6NHQ2uh018203@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 23 Jul 2017 17:26:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r446501 - branches/2017Q3/devel/poco X-SVN-Group: ports-branches X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: branches/2017Q3/devel/poco X-SVN-Commit-Revision: 446501 X-SVN-Commit-Repository: ports 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.23 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, 23 Jul 2017 17:26:03 -0000 Author: riggs Date: Sun Jul 23 17:26:02 2017 New Revision: 446501 URL: https://svnweb.freebsd.org/changeset/ports/446501 Log: MFH: r446500 Fix build / plist when SSL OPTION is not selected PR: 219506 Submitted by: henry.hu.sh@gmail.com (maintainer) Approved by: ports-secteam (build fix blanket) Modified: branches/2017Q3/devel/poco/Makefile branches/2017Q3/devel/poco/pkg-plist Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/devel/poco/Makefile ============================================================================== --- branches/2017Q3/devel/poco/Makefile Sun Jul 23 17:21:37 2017 (r446500) +++ branches/2017Q3/devel/poco/Makefile Sun Jul 23 17:26:02 2017 (r446501) @@ -4,6 +4,7 @@ PORTNAME= poco PORTVERSION= 1.7.8 DISTVERSIONSUFFIX= -all +PORTREVISION= 1 CATEGORIES= devel net MASTER_SITES= http://pocoproject.org/releases/${PORTNAME}-${PORTVERSION}/ Modified: branches/2017Q3/devel/poco/pkg-plist ============================================================================== --- branches/2017Q3/devel/poco/pkg-plist Sun Jul 23 17:21:37 2017 (r446500) +++ branches/2017Q3/devel/poco/pkg-plist Sun Jul 23 17:26:02 2017 (r446501) @@ -400,20 +400,20 @@ include/Poco/Net/HTTPResponse.h %%SSL%%include/Poco/Net/HTTPSClientSession.h %%SSL%%include/Poco/Net/HTTPSSessionInstantiator.h %%SSL%%include/Poco/Net/HTTPSStreamFactory.h -%%SSL%%include/Poco/Net/HTTPServer.h -%%SSL%%include/Poco/Net/HTTPServerConnection.h -%%SSL%%include/Poco/Net/HTTPServerConnectionFactory.h -%%SSL%%include/Poco/Net/HTTPServerParams.h -%%SSL%%include/Poco/Net/HTTPServerRequest.h -%%SSL%%include/Poco/Net/HTTPServerRequestImpl.h -%%SSL%%include/Poco/Net/HTTPServerResponse.h -%%SSL%%include/Poco/Net/HTTPServerResponseImpl.h -%%SSL%%include/Poco/Net/HTTPServerSession.h -%%SSL%%include/Poco/Net/HTTPSession.h -%%SSL%%include/Poco/Net/HTTPSessionFactory.h -%%SSL%%include/Poco/Net/HTTPSessionInstantiator.h -%%SSL%%include/Poco/Net/HTTPStream.h -%%SSL%%include/Poco/Net/HTTPStreamFactory.h +include/Poco/Net/HTTPServer.h +include/Poco/Net/HTTPServerConnection.h +include/Poco/Net/HTTPServerConnectionFactory.h +include/Poco/Net/HTTPServerParams.h +include/Poco/Net/HTTPServerRequest.h +include/Poco/Net/HTTPServerRequestImpl.h +include/Poco/Net/HTTPServerResponse.h +include/Poco/Net/HTTPServerResponseImpl.h +include/Poco/Net/HTTPServerSession.h +include/Poco/Net/HTTPSession.h +include/Poco/Net/HTTPSessionFactory.h +include/Poco/Net/HTTPSessionInstantiator.h +include/Poco/Net/HTTPStream.h +include/Poco/Net/HTTPStreamFactory.h include/Poco/Net/HostEntry.h include/Poco/Net/ICMPClient.h include/Poco/Net/ICMPEventArgs.h @@ -779,8 +779,8 @@ lib/cmake/Poco/PocoNetConfigVersion.cmake %%SSL%%lib/cmake/Poco/PocoNetSSLConfigVersion.cmake %%SSL%%lib/cmake/Poco/PocoNetSSLTargets.cmake %%SSL%%lib/cmake/Poco/PocoNetSSLTargets-%%CMAKE_BUILD_TYPE%%.cmake -%%SSL%%lib/cmake/Poco/PocoNetTargets.cmake -%%SSL%%lib/cmake/Poco/PocoNetTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Poco/PocoNetTargets.cmake +lib/cmake/Poco/PocoNetTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Poco/PocoUtilConfig.cmake lib/cmake/Poco/PocoUtilConfigVersion.cmake lib/cmake/Poco/PocoUtilTargets.cmake @@ -809,8 +809,8 @@ lib/libPocoJSON.so lib/libPocoJSON.so.%%SHLIB_MAJOR%% lib/libPocoMongoDB.so lib/libPocoMongoDB.so.%%SHLIB_MAJOR%% -%%SSL%%lib/libPocoNet.so -%%SSL%%lib/libPocoNet.so.%%SHLIB_MAJOR%% +lib/libPocoNet.so +lib/libPocoNet.so.%%SHLIB_MAJOR%% %%SSL%%lib/libPocoNetSSL.so %%SSL%%lib/libPocoNetSSL.so.%%SHLIB_MAJOR%% lib/libPocoUtil.so From owner-svn-ports-branches@freebsd.org Mon Jul 24 11:04:31 2017 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 8CF93C7AF1D; Mon, 24 Jul 2017 11:04:31 +0000 (UTC) (envelope-from tz@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 5B4C46435E; Mon, 24 Jul 2017 11:04:31 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6OB4UQd049119; Mon, 24 Jul 2017 11:04:30 GMT (envelope-from tz@FreeBSD.org) Received: (from tz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6OB4U3H049117; Mon, 24 Jul 2017 11:04:30 GMT (envelope-from tz@FreeBSD.org) Message-Id: <201707241104.v6OB4U3H049117@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org using -f From: Torsten Zuehlsdorff Date: Mon, 24 Jul 2017 11:04:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r446519 - branches/2017Q3/www/gitlab X-SVN-Group: ports-branches X-SVN-Commit-Author: tz X-SVN-Commit-Paths: branches/2017Q3/www/gitlab X-SVN-Commit-Revision: 446519 X-SVN-Commit-Repository: ports 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.23 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, 24 Jul 2017 11:04:31 -0000 Author: tz Date: Mon Jul 24 11:04:30 2017 New Revision: 446519 URL: https://svnweb.freebsd.org/changeset/ports/446519 Log: MFH: r446314 www/gitlab: Update from 9.1.8 to 9.1.9 Changelog: https://github.com/gitlabhq/gitlabhq/blob/v9.1.9/CHANGELOG.md Approved by: ports-secteam (miwi) Modified: branches/2017Q3/www/gitlab/Makefile branches/2017Q3/www/gitlab/distinfo Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/www/gitlab/Makefile ============================================================================== --- branches/2017Q3/www/gitlab/Makefile Mon Jul 24 11:00:03 2017 (r446518) +++ branches/2017Q3/www/gitlab/Makefile Mon Jul 24 11:04:30 2017 (r446519) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gitlab -PORTVERSION= 9.1.8 +PORTVERSION= 9.1.9 DISTVERSIONPREFIX= v CATEGORIES= www devel Modified: branches/2017Q3/www/gitlab/distinfo ============================================================================== --- branches/2017Q3/www/gitlab/distinfo Mon Jul 24 11:00:03 2017 (r446518) +++ branches/2017Q3/www/gitlab/distinfo Mon Jul 24 11:04:30 2017 (r446519) @@ -1,3 +1,3 @@ -TIMESTAMP = 1500536986 -SHA256 (gitlabhq-gitlabhq-v9.1.8_GH0.tar.gz) = a997937ceb6e7a264564a614ca07a67637b1e93fd5a7c554bfd7ad6aab603e66 -SIZE (gitlabhq-gitlabhq-v9.1.8_GH0.tar.gz) = 30513186 +TIMESTAMP = 1500625034 +SHA256 (gitlabhq-gitlabhq-v9.1.9_GH0.tar.gz) = f7db8e1a1f807fd2bbf0e1afc997e44aea343feb849153e5eb6a908c9ee595dc +SIZE (gitlabhq-gitlabhq-v9.1.9_GH0.tar.gz) = 30514631 From owner-svn-ports-branches@freebsd.org Mon Jul 24 11:09:29 2017 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 3850DC7AFAD; Mon, 24 Jul 2017 11:09:29 +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 02422644C2; Mon, 24 Jul 2017 11:09:28 +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 v6OB9Rr8049482; Mon, 24 Jul 2017 11:09:27 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6OB9RTc049481; Mon, 24 Jul 2017 11:09:27 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <201707241109.v6OB9RTc049481@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Mon, 24 Jul 2017 11:09:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r446520 - branches/2017Q3/devel/arcanist X-SVN-Group: ports-branches X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: branches/2017Q3/devel/arcanist X-SVN-Commit-Revision: 446520 X-SVN-Commit-Repository: ports 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.23 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, 24 Jul 2017 11:09:29 -0000 Author: lwhsu Date: Mon Jul 24 11:09:27 2017 New Revision: 446520 URL: https://svnweb.freebsd.org/changeset/ports/446520 Log: MFH: r446298 Add required php-hash to the dependencies PR: 220886 Submitted by: lwhsu Approved by: grembo Approved by: ports-secteam (miwi) Modified: branches/2017Q3/devel/arcanist/Makefile Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/devel/arcanist/Makefile ============================================================================== --- branches/2017Q3/devel/arcanist/Makefile Mon Jul 24 11:04:30 2017 (r446519) +++ branches/2017Q3/devel/arcanist/Makefile Mon Jul 24 11:09:27 2017 (r446520) @@ -2,6 +2,7 @@ PORTNAME= arcanist PORTVERSION= 20170630 +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= php- @@ -16,7 +17,7 @@ CONFLICTS= arc-* PHP_DESTDIR= lib/php/arcanist RUN_DEPENDS= php-libphutil>0:devel/libphutil USES= php -USE_PHP= curl dom json simplexml +USE_PHP= curl dom hash json simplexml USE_GITHUB= yes NO_BUILD= yes NO_ARCH= yes From owner-svn-ports-branches@freebsd.org Mon Jul 24 12:56:08 2017 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 F308FC7D9EC; Mon, 24 Jul 2017 12:56:08 +0000 (UTC) (envelope-from woodsb02@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 CF737677A2; Mon, 24 Jul 2017 12:56:08 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6OCu7hA094432; Mon, 24 Jul 2017 12:56:07 GMT (envelope-from woodsb02@FreeBSD.org) Received: (from woodsb02@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6OCu7oP094428; Mon, 24 Jul 2017 12:56:07 GMT (envelope-from woodsb02@FreeBSD.org) Message-Id: <201707241256.v6OCu7oP094428@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: woodsb02 set sender to woodsb02@FreeBSD.org using -f From: Ben Woods Date: Mon, 24 Jul 2017 12:56:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r446525 - in branches/2017Q3/x11: lightdm lightdm-gtk-greeter lightdm-gtk-greeter/files lightdm/files X-SVN-Group: ports-branches X-SVN-Commit-Author: woodsb02 X-SVN-Commit-Paths: in branches/2017Q3/x11: lightdm lightdm-gtk-greeter lightdm-gtk-greeter/files lightdm/files X-SVN-Commit-Revision: 446525 X-SVN-Commit-Repository: ports 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.23 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, 24 Jul 2017 12:56:09 -0000 Author: woodsb02 Date: Mon Jul 24 12:56:07 2017 New Revision: 446525 URL: https://svnweb.freebsd.org/changeset/ports/446525 Log: MFH: r446523 x11/lightdm: Fix locale selection - Allow locale selection on login screen. First, lightdm must be patched to correctly detect utf8 locales, which have a UTF-8 suffix on FreeBSD instead of utf8 like on Linux systems. Secondly, we have to use locale codes in the language menuitem as FreeBSD doesn't have support for locale naming (missing _NL_IDENTIFICATION_LANGUAGE implementation). - Use @sample for lightdm-gtk-greeter config file to prevent it from being overwritten when the package is reinstalled / upgraded. PR: 220614 Submitted by: pawel Approved by: ports-secteam blanket Added: branches/2017Q3/x11/lightdm-gtk-greeter/files/ - copied from r446523, head/x11/lightdm-gtk-greeter/files/ Modified: branches/2017Q3/x11/lightdm-gtk-greeter/Makefile branches/2017Q3/x11/lightdm-gtk-greeter/pkg-plist branches/2017Q3/x11/lightdm/Makefile branches/2017Q3/x11/lightdm/files/patch-liblightdm-gobject_language.c Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/x11/lightdm-gtk-greeter/Makefile ============================================================================== --- branches/2017Q3/x11/lightdm-gtk-greeter/Makefile Mon Jul 24 12:48:20 2017 (r446524) +++ branches/2017Q3/x11/lightdm-gtk-greeter/Makefile Mon Jul 24 12:56:07 2017 (r446525) @@ -3,6 +3,7 @@ PORTNAME= lightdm-gtk-greeter PORTVERSION= 2.0.2 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/ @@ -19,5 +20,9 @@ GNU_CONFIGURE= yes USE_GNOME= cairo gdkpixbuf2 gtk30 intltool USE_XFCE= libexo USE_XORG= x11 + +post-install: + (cd ${STAGEDIR}${PREFIX}/etc/lightdm && ${MV} lightdm-gtk-greeter.conf \ + lightdm-gtk-greeter.conf.sample) .include Modified: branches/2017Q3/x11/lightdm-gtk-greeter/pkg-plist ============================================================================== --- branches/2017Q3/x11/lightdm-gtk-greeter/pkg-plist Mon Jul 24 12:48:20 2017 (r446524) +++ branches/2017Q3/x11/lightdm-gtk-greeter/pkg-plist Mon Jul 24 12:56:07 2017 (r446525) @@ -1,4 +1,4 @@ -etc/lightdm/lightdm-gtk-greeter.conf +@sample etc/lightdm/lightdm-gtk-greeter.conf.sample sbin/lightdm-gtk-greeter %%PORTDOCS%%%%DOCSDIR%%/sample-lightdm-gtk-greeter.css share/icons/hicolor/scalable/places/budgie-desktop_badge-symbolic.svg Modified: branches/2017Q3/x11/lightdm/Makefile ============================================================================== --- branches/2017Q3/x11/lightdm/Makefile Mon Jul 24 12:48:20 2017 (r446524) +++ branches/2017Q3/x11/lightdm/Makefile Mon Jul 24 12:56:07 2017 (r446525) @@ -3,7 +3,7 @@ PORTNAME= lightdm PORTVERSION= 1.20.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11 MASTER_SITES= https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/ Modified: branches/2017Q3/x11/lightdm/files/patch-liblightdm-gobject_language.c ============================================================================== --- branches/2017Q3/x11/lightdm/files/patch-liblightdm-gobject_language.c Mon Jul 24 12:48:20 2017 (r446524) +++ branches/2017Q3/x11/lightdm/files/patch-liblightdm-gobject_language.c Mon Jul 24 12:56:07 2017 (r446525) @@ -1,8 +1,52 @@ https://bugs.launchpad.net/lightdm/+bug/790186 ---- liblightdm-gobject/language.c.orig 2016-12-09 01:04:48 UTC +--- liblightdm-gobject/language.c.orig 2016-09-30 03:23:52 UTC +++ liblightdm-gobject/language.c -@@ -248,10 +248,16 @@ lightdm_language_get_name (LightDMLangua +@@ -36,6 +36,12 @@ G_DEFINE_TYPE (LightDMLanguage, lightdm_language, G_TY + static gboolean have_languages = FALSE; + static GList *languages = NULL; + ++static gboolean ++is_utf8 (const gchar *code) ++{ ++ return g_strrstr (code, ".utf8") || g_strrstr (code, ".UTF-8"); ++} ++ + static void + update_languages (void) + { +@@ -72,7 +78,7 @@ update_languages (void) + continue; + + /* Ignore the non-interesting languages */ +- if (strcmp (command, "locale -a") == 0 && !g_strrstr (code, ".utf8")) ++ if (strcmp (command, "locale -a") == 0 && !is_utf8 (code)) + continue; + + language = g_object_new (LIGHTDM_TYPE_LANGUAGE, "code", code, NULL); +@@ -88,12 +94,6 @@ update_languages (void) + have_languages = TRUE; + } + +-static gboolean +-is_utf8 (const gchar *code) +-{ +- return g_strrstr (code, ".utf8") || g_strrstr (code, ".UTF-8"); +-} +- + /* Get a valid locale name that can be passed to setlocale(), so we always can use nl_langinfo() to get language and country names. */ + static gchar * + get_locale_name (const gchar *code) +@@ -133,7 +133,7 @@ get_locale_name (const gchar *code) + for (i = 0; avail_locales[i]; i++) + { + gchar *loc = avail_locales[i]; +- if (!g_strrstr (loc, ".utf8")) ++ if (!is_utf8 (loc)) + continue; + if (g_str_has_prefix (loc, language)) + { +@@ -227,10 +227,16 @@ lightdm_language_get_name (LightDMLanguage *language) if (locale) { gchar *current = setlocale (LC_ALL, NULL); @@ -19,7 +63,7 @@ https://bugs.launchpad.net/lightdm/+bug/790186 if (language_en && strlen (language_en) > 0) priv->name = g_strdup (dgettext ("iso_639_3", language_en)); -@@ -291,10 +297,16 @@ lightdm_language_get_territory (LightDML +@@ -270,10 +276,16 @@ lightdm_language_get_territory (LightDMLanguage *langu if (locale) { gchar *current = setlocale (LC_ALL, NULL); From owner-svn-ports-branches@freebsd.org Mon Jul 24 17:01:35 2017 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 D4F26CFE984; Mon, 24 Jul 2017 17:01:35 +0000 (UTC) (envelope-from bdrewery@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 A249F6F6B5; Mon, 24 Jul 2017 17:01:35 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6OH1YTk093352; Mon, 24 Jul 2017 17:01:34 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6OH1YHG093351; Mon, 24 Jul 2017 17:01:34 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201707241701.v6OH1YHG093351@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Mon, 24 Jul 2017 17:01:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r446537 - branches/2017Q3/devel/ccache X-SVN-Group: ports-branches X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: branches/2017Q3/devel/ccache X-SVN-Commit-Revision: 446537 X-SVN-Commit-Repository: ports 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.23 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, 24 Jul 2017 17:01:35 -0000 Author: bdrewery Date: Mon Jul 24 17:01:34 2017 New Revision: 446537 URL: https://svnweb.freebsd.org/changeset/ports/446537 Log: MFH: r445062 r446536 - Fix LICENSE - Add LICENSE_FILE - Add links for gcc 8 Approved by: bdrewery@FreeBSD.org (maintainer, implicit) Fix ccache-memcached-static to actually build statically. This was broken by r440469. Pointyhat to: bdrewery Sponsored by: Dell EMC Isilon Approved by: portmgr (implicit) Modified: branches/2017Q3/devel/ccache/Makefile Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/devel/ccache/Makefile ============================================================================== --- branches/2017Q3/devel/ccache/Makefile Mon Jul 24 17:00:10 2017 (r446536) +++ branches/2017Q3/devel/ccache/Makefile Mon Jul 24 17:01:34 2017 (r446537) @@ -3,7 +3,7 @@ PORTNAME= ccache PORTVERSION= 3.3.4 -PORTREVISION= 3 +PORTREVISION= 5 CATEGORIES= devel MASTER_SITES= http://www.samba.org/ftp/ccache/ \ LOCAL/bdrewery @@ -11,7 +11,8 @@ MASTER_SITES= http://www.samba.org/ftp/ccache/ \ MAINTAINER= bdrewery@FreeBSD.org COMMENT= Tool to minimize the compile time of C/C++ programs -LICENSE= GPLv3 +LICENSE= GPLv3+ +LICENSE_FILE= ${WRKSRC}/GPL-3.0.txt CONFLICTS_INSTALL= ccache-static-[0-9]* ccache-memcached-[0-9]* ccache-memcached-static-[0-9]* @@ -61,6 +62,8 @@ NO_CCACHE_DEPEND= yes OPTIONS_SUB= yes +STATIC_LDFLAGS= -static + .include . if ${COMPILER_TYPE} == clang @@ -75,7 +78,7 @@ PLIST_SUB+= CCLINKDIR="${CCLINKDIR}" CCACHE_COMPILERS+= icc icpc .endif -GNU_COMPILERS+= 34 42 43 44 45 46 47 48 49 5 6 7 +GNU_COMPILERS+= 34 42 43 44 45 46 47 48 49 5 6 7 8 CCACHE_COMPILERS+= cc c++ CC gcc g++ ${GNU_COMPILERS:S|^|gcc|} ${GNU_COMPILERS:S|^|g++|} .if ${PORT_OPTIONS:MCLANGLINK} From owner-svn-ports-branches@freebsd.org Tue Jul 25 00:38:37 2017 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 B163CDACC86; Tue, 25 Jul 2017 00:38:37 +0000 (UTC) (envelope-from bdrewery@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 8BB568373A; Tue, 25 Jul 2017 00:38:37 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6P0ca0R080507; Tue, 25 Jul 2017 00:38:36 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6P0caIA080505; Tue, 25 Jul 2017 00:38:36 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201707250038.v6P0caIA080505@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 25 Jul 2017 00:38:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r446551 - in branches/2017Q3/devel/ccache: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in branches/2017Q3/devel/ccache: . files X-SVN-Commit-Revision: 446551 X-SVN-Commit-Repository: ports 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.23 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, 25 Jul 2017 00:38:37 -0000 Author: bdrewery Date: Tue Jul 25 00:38:36 2017 New Revision: 446551 URL: https://svnweb.freebsd.org/changeset/ports/446551 Log: MFH: r446550 Properly add needed libsasl2 libs after r440469, fixing build with libmemcached+sasl2. Sponsored by: Dell EMC Isilon Approved by: portmgr (implicit) Modified: branches/2017Q3/devel/ccache/Makefile branches/2017Q3/devel/ccache/files/extra-patch-memcached-configure.ac Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/devel/ccache/Makefile ============================================================================== --- branches/2017Q3/devel/ccache/Makefile Tue Jul 25 00:38:06 2017 (r446550) +++ branches/2017Q3/devel/ccache/Makefile Tue Jul 25 00:38:36 2017 (r446551) @@ -3,7 +3,7 @@ PORTNAME= ccache PORTVERSION= 3.3.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MASTER_SITES= http://www.samba.org/ftp/ccache/ \ LOCAL/bdrewery Modified: branches/2017Q3/devel/ccache/files/extra-patch-memcached-configure.ac ============================================================================== --- branches/2017Q3/devel/ccache/files/extra-patch-memcached-configure.ac Tue Jul 25 00:38:06 2017 (r446550) +++ branches/2017Q3/devel/ccache/files/extra-patch-memcached-configure.ac Tue Jul 25 00:38:36 2017 (r446551) @@ -1,5 +1,5 @@ ---- configure.ac.orig 2017-05-08 20:36:24.922407000 -0700 -+++ configure.ac 2017-05-08 20:39:41.725107000 -0700 +--- configure.ac.orig 2017-07-24 16:42:21.493682000 -0700 ++++ configure.ac 2017-07-24 17:36:06.122588000 -0700 @@ -28,6 +28,10 @@ AC_PROG_CC_C99 if test "$ac_cv_prog_cc_c99" = no; then AC_MSG_ERROR(cannot find a C99-compatible compiler) @@ -11,7 +11,7 @@ AC_PROG_CPP AC_PROG_INSTALL -@@ -97,19 +101,36 @@ AC_ARG_ENABLE(memcached, +@@ -97,19 +101,38 @@ AC_ARG_ENABLE(memcached, [AS_HELP_STRING([--enable-memcached], [enable memcached as a cache backend])]) @@ -35,12 +35,14 @@ + ac_cv_have_libsasl2=no, -lcrypto -lopie -lmd) + fi + if test x$ac_cv_have_libsasl2 = xyes; then -+ AC_CHECK_LIB(memcached, memcached,[],[ ++ AC_CHECK_LIB(memcached, memcached,[ ++ LIBS="${LIBS} -lsasl2 -lcrypto -lopie -lmd -lmemcached" ++ ] ++ ,[ + echo ' WARNING: recent version libmemcached not found' + echo ' please install libmemcached > 1.0 with development files' + exit 1 + ], -lsasl2 -lcrypto -lopie -lmd) -+ extra_ldflags="${extra_ldflags} -lcrypto -lopie -lmd" + else + AC_CHECK_LIB(memcached, memcached,[],[ + echo ' WARNING: recent version libmemcached not found' From owner-svn-ports-branches@freebsd.org Tue Jul 25 14:15:10 2017 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 6E4D5C7D4A4; Tue, 25 Jul 2017 14:15:10 +0000 (UTC) (envelope-from swills@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 492DD7CEA2; Tue, 25 Jul 2017 14:15:10 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6PEF9q5018046; Tue, 25 Jul 2017 14:15:09 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6PEF9FD018042; Tue, 25 Jul 2017 14:15:09 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201707251415.v6PEF9FD018042@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Tue, 25 Jul 2017 14:15:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r446585 - in branches/2017Q3/devel/gsoap: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in branches/2017Q3/devel/gsoap: . files X-SVN-Commit-Revision: 446585 X-SVN-Commit-Repository: ports 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.23 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, 25 Jul 2017 14:15:10 -0000 Author: swills Date: Tue Jul 25 14:15:08 2017 New Revision: 446585 URL: https://svnweb.freebsd.org/changeset/ports/446585 Log: MFH: r446584 devel/gsoap: Update to 2.8.50 PR: 220977 Security: 8745c67e-7dd1-4165-96e2-fcf9da2dc5b5 With Hat: ports-secteam@ Approved by: ports-secteam@ (implicit) Modified: branches/2017Q3/devel/gsoap/Makefile branches/2017Q3/devel/gsoap/distinfo branches/2017Q3/devel/gsoap/files/patch-gsoap_wsdl_Makefile.in branches/2017Q3/devel/gsoap/pkg-plist Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/devel/gsoap/Makefile ============================================================================== --- branches/2017Q3/devel/gsoap/Makefile Tue Jul 25 14:14:19 2017 (r446584) +++ branches/2017Q3/devel/gsoap/Makefile Tue Jul 25 14:15:08 2017 (r446585) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gsoap -PORTVERSION= 2.8.46 +PORTVERSION= 2.8.50 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}2/gsoap-2.8 DISTNAME= ${PORTNAME}_${PORTVERSION} Modified: branches/2017Q3/devel/gsoap/distinfo ============================================================================== --- branches/2017Q3/devel/gsoap/distinfo Tue Jul 25 14:14:19 2017 (r446584) +++ branches/2017Q3/devel/gsoap/distinfo Tue Jul 25 14:15:08 2017 (r446585) @@ -1,3 +1,3 @@ -TIMESTAMP = 1495260869 -SHA256 (gsoap_2.8.46.zip) = 3083818fb42b9e7251daf21728132db15354eb8c14060c2dc6949dafbec976be -SIZE (gsoap_2.8.46.zip) = 33607528 +TIMESTAMP = 1500917106 +SHA256 (gsoap_2.8.50.zip) = d1225f297963d1336ffaa7557990a2a0c8c7700774baa107ecb5467bfc0a265a +SIZE (gsoap_2.8.50.zip) = 34688187 Modified: branches/2017Q3/devel/gsoap/files/patch-gsoap_wsdl_Makefile.in ============================================================================== --- branches/2017Q3/devel/gsoap/files/patch-gsoap_wsdl_Makefile.in Tue Jul 25 14:14:19 2017 (r446584) +++ branches/2017Q3/devel/gsoap/files/patch-gsoap_wsdl_Makefile.in Tue Jul 25 14:15:08 2017 (r446585) @@ -1,9 +1,9 @@ ---- gsoap/wsdl/Makefile.in.orig 2017-04-08 13:59:08 UTC -+++ gsoap/wsdl/Makefile.in -@@ -314,7 +314,7 @@ SOAP_FLAGS = -SC -pwsdl -I$(srcdir) -I$( +--- gsoap/wsdl/Makefile.in.orig 2017-07-24 13:25:52.574440000 -0400 ++++ gsoap/wsdl/Makefile.in 2017-07-24 13:26:49.901559000 -0400 +@@ -315,7 +315,7 @@ SOAP_FLAGS = -SC -pwsdl -I$(srcdir) -I$(top_srcdir)/gs BUILT_SOURCES = $(SOAP_CPP_SRC) - wsdl2h_CFLAGS = $(C_DEBUG_FLAGS) $(WSDL2H_EXTRA_FLAGS) - wsdl2h_CXXFLAGS = $(C_DEBUG_FLAGS) $(WSDL2H_EXTRA_FLAGS) $(WSDL2H_IMPORTPATH) + wsdl2h_CFLAGS = $(C_DEBUG_FLAGS) $(SOAPCPP2_NO_C_LOCALE) $(WSDL2H_EXTRA_FLAGS) + wsdl2h_CXXFLAGS = $(C_DEBUG_FLAGS) $(SOAPCPP2_NO_C_LOCALE) $(WSDL2H_EXTRA_FLAGS) $(WSDL2H_IMPORTPATH) -wsdl2h_CPPFLAGS = $(AM_CPPFLAGS) $(SOAPCPP2_NONAMESPACES) -D$(platform) +wsdl2h_CPPFLAGS = $(AM_CPPFLAGS) $(SOAPCPP2_NONAMESPACES) $(WSDL2H_IMPORTPATH) -D$(platform) wsdl2h_SOURCES = wsdl2h.cpp wsdl.cpp wadl.cpp schema.cpp types.cpp service.cpp soap.cpp mime.cpp wsp.cpp bpel.cpp $(SOAP_CPP_SRC) Modified: branches/2017Q3/devel/gsoap/pkg-plist ============================================================================== --- branches/2017Q3/devel/gsoap/pkg-plist Tue Jul 25 14:14:19 2017 (r446584) +++ branches/2017Q3/devel/gsoap/pkg-plist Tue Jul 25 14:15:08 2017 (r446585) @@ -152,6 +152,8 @@ libdata/pkgconfig/gsoapssl.pc %%DATADIR%%/plugin/cacerts.c %%DATADIR%%/plugin/cacerts.h %%DATADIR%%/plugin/calcrest.h +%%DATADIR%%/plugin/curlapi.c +%%DATADIR%%/plugin/curlapi.h %%DATADIR%%/plugin/httpda.c %%DATADIR%%/plugin/httpda.h %%DATADIR%%/plugin/httpdatest.c From owner-svn-ports-branches@freebsd.org Tue Jul 25 15:04:25 2017 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 76EFEC7E73F; Tue, 25 Jul 2017 15:04:25 +0000 (UTC) (envelope-from mmokhi@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 5114E7EE66; Tue, 25 Jul 2017 15:04:25 +0000 (UTC) (envelope-from mmokhi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6PF4ObO038985; Tue, 25 Jul 2017 15:04:24 GMT (envelope-from mmokhi@FreeBSD.org) Received: (from mmokhi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6PF4O77038980; Tue, 25 Jul 2017 15:04:24 GMT (envelope-from mmokhi@FreeBSD.org) Message-Id: <201707251504.v6PF4O77038980@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmokhi set sender to mmokhi@FreeBSD.org using -f From: Mahdi Mokhtari Date: Tue, 25 Jul 2017 15:04:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r446589 - in branches/2017Q3/databases: mysql57-client mysql57-client/files mysql57-server X-SVN-Group: ports-branches X-SVN-Commit-Author: mmokhi X-SVN-Commit-Paths: in branches/2017Q3/databases: mysql57-client mysql57-client/files mysql57-server X-SVN-Commit-Revision: 446589 X-SVN-Commit-Repository: ports 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.23 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, 25 Jul 2017 15:04:25 -0000 Author: mmokhi Date: Tue Jul 25 15:04:23 2017 New Revision: 446589 URL: https://svnweb.freebsd.org/changeset/ports/446589 Log: MFH: r446203 databases/mysql57-{client/server}: Update to 5.7.19 ChangeLog for this update: https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-19.html PR: 220849 Reviewed by: mat (mentor) Approved by: mat (mentor) Sponsored by: Netzkommune GmbH Differential Revision: https://reviews.freebsd.org/D11656 Approved by: ports-secteam (feld) Added: branches/2017Q3/databases/mysql57-client/files/patch-mysys_my__symlink.c - copied unchanged from r446203, head/databases/mysql57-client/files/patch-mysys_my__symlink.c Modified: branches/2017Q3/databases/mysql57-client/Makefile branches/2017Q3/databases/mysql57-client/files/patch-CMakeLists.txt branches/2017Q3/databases/mysql57-server/Makefile branches/2017Q3/databases/mysql57-server/distinfo Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/databases/mysql57-client/Makefile ============================================================================== --- branches/2017Q3/databases/mysql57-client/Makefile Tue Jul 25 14:43:31 2017 (r446588) +++ branches/2017Q3/databases/mysql57-client/Makefile Tue Jul 25 15:04:23 2017 (r446589) @@ -23,7 +23,8 @@ CONFLICTS_INSTALL= mysql5[0-68-9]-client-* \ mariadb[0-9][0-9]-client-* \ percona[0-9][0-9]-client-* -CMAKE_ARGS+= -DWITHOUT_SERVER=1 +CMAKE_ARGS+= -DWITHOUT_SERVER=1 \ + -DWITH_NDBCLUSTER=1 USE_LDCONFIG+= ${PREFIX}/lib/mysql Modified: branches/2017Q3/databases/mysql57-client/files/patch-CMakeLists.txt ============================================================================== --- branches/2017Q3/databases/mysql57-client/files/patch-CMakeLists.txt Tue Jul 25 14:43:31 2017 (r446588) +++ branches/2017Q3/databases/mysql57-client/files/patch-CMakeLists.txt Tue Jul 25 15:04:23 2017 (r446589) @@ -1,7 +1,17 @@ ---- CMakeLists.txt.orig 2016-03-28 18:06:12 UTC +--- CMakeLists.txt.orig 2017-06-22 14:13:19 UTC +++ CMakeLists.txt -@@ -606,8 +606,8 @@ ENDIF() +@@ -610,9 +610,6 @@ IF(NOT WITHOUT_SERVER) + SET (MYSQLD_STATIC_EMBEDDED_PLUGIN_LIBS "" CACHE INTERNAL "") + # Add storage engines and plugins. + CONFIGURE_PLUGINS() +-ELSE() +- # We may still want Cluster client libraries, use -DWITH_NDBCLUSTER=1 +- ADD_SUBDIRECTORY(storage/ndb) + ENDIF() + ADD_SUBDIRECTORY(include) +@@ -647,8 +644,8 @@ ENDIF() + ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(client) -ADD_SUBDIRECTORY(sql/share) @@ -10,7 +20,7 @@ IF(UNIX) ADD_SUBDIRECTORY(man) -@@ -676,14 +676,13 @@ ELSE() +@@ -719,14 +716,13 @@ ELSE() SET(CPACK_GENERATOR "TGZ") ENDIF() ADD_SUBDIRECTORY(packaging/WiX) @@ -26,7 +36,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") INSTALL(FILES COPYING LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -706,6 +705,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") +@@ -749,6 +745,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") PATTERN "sp-imp-spec.txt" EXCLUDE ) ENDIF() Copied: branches/2017Q3/databases/mysql57-client/files/patch-mysys_my__symlink.c (from r446203, head/databases/mysql57-client/files/patch-mysys_my__symlink.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q3/databases/mysql57-client/files/patch-mysys_my__symlink.c Tue Jul 25 15:04:23 2017 (r446589, copy of r446203, head/databases/mysql57-client/files/patch-mysys_my__symlink.c) @@ -0,0 +1,10 @@ +--- mysys/my_symlink.c.orig 2017-07-19 12:10:42 UTC ++++ mysys/my_symlink.c +@@ -23,6 +23,7 @@ + #include + #include + #endif ++#include "my_dir.h" + + /* + Reads the content of a symbolic link Modified: branches/2017Q3/databases/mysql57-server/Makefile ============================================================================== --- branches/2017Q3/databases/mysql57-server/Makefile Tue Jul 25 14:43:31 2017 (r446588) +++ branches/2017Q3/databases/mysql57-server/Makefile Tue Jul 25 15:04:23 2017 (r446589) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 5.7.18 +PORTVERSION= 5.7.19 PORTREVISION= 1 CATEGORIES= databases ipv6 MASTER_SITES= MYSQL/MySQL-5.7 Modified: branches/2017Q3/databases/mysql57-server/distinfo ============================================================================== --- branches/2017Q3/databases/mysql57-server/distinfo Tue Jul 25 14:43:31 2017 (r446588) +++ branches/2017Q3/databases/mysql57-server/distinfo Tue Jul 25 15:04:23 2017 (r446589) @@ -1,3 +1,3 @@ -TIMESTAMP = 1492018141 -SHA256 (mysql-boost-5.7.18.tar.gz) = ae6f5e2cf7b936496cf60260cd7fd5a0862c21f48cd240448021c4ea067a0f0c -SIZE (mysql-boost-5.7.18.tar.gz) = 61612105 +TIMESTAMP = 1500470016 +SHA256 (mysql-boost-5.7.19.tar.gz) = 22e5034e40e0731eff521b7aaf7584b76297a69875ee50026b12f2bfac3e1bca +SIZE (mysql-boost-5.7.19.tar.gz) = 48799895 From owner-svn-ports-branches@freebsd.org Wed Jul 26 08:02:11 2017 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 638DFDB4419; Wed, 26 Jul 2017 08:02:11 +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 315BF7DECD; Wed, 26 Jul 2017 08:02:11 +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 v6Q82AuT056651; Wed, 26 Jul 2017 08:02:10 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6Q82AE6056650; Wed, 26 Jul 2017 08:02:10 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201707260802.v6Q82AE6056650@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 26 Jul 2017 08:02:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r446645 - branches/2017Q3/devel/clanlib X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2017Q3/devel/clanlib X-SVN-Commit-Revision: 446645 X-SVN-Commit-Repository: ports 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.23 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, 26 Jul 2017 08:02:11 -0000 Author: jbeich Date: Wed Jul 26 08:02:10 2017 New Revision: 446645 URL: https://svnweb.freebsd.org/changeset/ports/446645 Log: MFH: r446644 devel/clanlib: drop lang/gcc* dependency on x86 and arm - Convert to USES=compiler and USES=localbase Approved by: ports-secteam blanket Modified: branches/2017Q3/devel/clanlib/Makefile Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/devel/clanlib/Makefile ============================================================================== --- branches/2017Q3/devel/clanlib/Makefile Wed Jul 26 07:59:55 2017 (r446644) +++ branches/2017Q3/devel/clanlib/Makefile Wed Jul 26 08:02:10 2017 (r446645) @@ -3,7 +3,7 @@ PORTNAME= clanlib PORTVERSION= 2.3.7 -PORTREVISION= 11 +PORTREVISION= 12 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= http://www.clanlib.org/download/releases-2.0/ @@ -23,14 +23,12 @@ LIB_DEPENDS= libpng.so:graphics/png \ NOT_FOR_ARCHS= aarch64 armv6 powerpc powerpc64 NOT_FOR_ARCHS_REASON= invokes x86 asm -USES= execinfo gmake jpeg libtool pathfix pkgconfig sqlite tar:tgz -USE_GCC= yes +USES= compiler:c++0x execinfo gmake jpeg libtool localbase:ldflags \ + pathfix pkgconfig sqlite tar:tgz USE_XORG= x11 USE_LDCONFIG= yes USE_GL= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-docs \ --enable-clanDisplay \ From owner-svn-ports-branches@freebsd.org Thu Jul 27 09:28:09 2017 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 5EFA4DC6215; Thu, 27 Jul 2017 09:28:09 +0000 (UTC) (envelope-from mm@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 216C36E5C8; Thu, 27 Jul 2017 09:28:09 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6R9S8QQ090734; Thu, 27 Jul 2017 09:28:08 GMT (envelope-from mm@FreeBSD.org) Received: (from mm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6R9S8wF090732; Thu, 27 Jul 2017 09:28:08 GMT (envelope-from mm@FreeBSD.org) Message-Id: <201707270928.v6R9S8wF090732@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mm set sender to mm@FreeBSD.org using -f From: Martin Matuska Date: Thu, 27 Jul 2017 09:28:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r446727 - branches/2017Q3/net-im/jabberd X-SVN-Group: ports-branches X-SVN-Commit-Author: mm X-SVN-Commit-Paths: branches/2017Q3/net-im/jabberd X-SVN-Commit-Revision: 446727 X-SVN-Commit-Repository: ports 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.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2017 09:28:09 -0000 Author: mm Date: Thu Jul 27 09:28:07 2017 New Revision: 446727 URL: https://svnweb.freebsd.org/changeset/ports/446727 Log: MFH 446659: Update net-im/jabberd to 2.6.1 PR: 221014 Security: CVE-2017-10807 Approved by: ports-secteam (feld) Modified: branches/2017Q3/net-im/jabberd/Makefile branches/2017Q3/net-im/jabberd/distinfo Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/net-im/jabberd/Makefile ============================================================================== --- branches/2017Q3/net-im/jabberd/Makefile Thu Jul 27 09:19:00 2017 (r446726) +++ branches/2017Q3/net-im/jabberd/Makefile Thu Jul 27 09:28:07 2017 (r446727) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= jabberd -PORTVERSION= 2.5.0 -PORTREVISION= 1 +PORTVERSION= 2.6.1 CATEGORIES= net-im MASTER_SITES= https://github.com/jabberd2/jabberd2/releases/download/${PORTNAME}-${DISTVERSION}/ \ LOCAL/matthew/${PORTNAME} Modified: branches/2017Q3/net-im/jabberd/distinfo ============================================================================== --- branches/2017Q3/net-im/jabberd/distinfo Thu Jul 27 09:19:00 2017 (r446726) +++ branches/2017Q3/net-im/jabberd/distinfo Thu Jul 27 09:28:07 2017 (r446727) @@ -1,3 +1,3 @@ -TIMESTAMP = 1485542106 -SHA256 (jabberd-2.5.0.tar.xz) = 9ec4a8be6c01fe68cccee347e08aab34399205ecfe3557985debc368b86aeb8a -SIZE (jabberd-2.5.0.tar.xz) = 1507916 +TIMESTAMP = 1501080298 +SHA256 (jabberd-2.6.1.tar.xz) = c22d45bd4105b344351cbbfd6da99755182f64120747d18e91b6267a73775099 +SIZE (jabberd-2.6.1.tar.xz) = 1542156 From owner-svn-ports-branches@freebsd.org Thu Jul 27 17:00:07 2017 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 886DDDAB2C8; Thu, 27 Jul 2017 17:00:07 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6398F82F4F; Thu, 27 Jul 2017 17:00:07 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6RH06Mu078290; Thu, 27 Jul 2017 17:00:06 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6RH06u1078286; Thu, 27 Jul 2017 17:00:06 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201707271700.v6RH06u1078286@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 27 Jul 2017 17:00:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r446765 - in branches/2017Q3/emulators: ppsspp ppsspp/files rpcs3 rpcs3/files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2017Q3/emulators: ppsspp ppsspp/files rpcs3 rpcs3/files X-SVN-Commit-Revision: 446765 X-SVN-Commit-Repository: ports 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.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2017 17:00:07 -0000 Author: jbeich Date: Thu Jul 27 17:00:05 2017 New Revision: 446765 URL: https://svnweb.freebsd.org/changeset/ports/446765 Log: MFH: r446352 emulators/{ppsspp,rpcs3}: switch to MAP_32BIT This may slightly improve JIT stability. Approved by: ports-secteam (miwi) Modified: branches/2017Q3/emulators/ppsspp/Makefile branches/2017Q3/emulators/ppsspp/files/patch-Common_MemoryUtil.cpp branches/2017Q3/emulators/rpcs3/Makefile branches/2017Q3/emulators/rpcs3/files/patch-Utilities_JIT.cpp Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/emulators/ppsspp/Makefile ============================================================================== --- branches/2017Q3/emulators/ppsspp/Makefile Thu Jul 27 16:48:52 2017 (r446764) +++ branches/2017Q3/emulators/ppsspp/Makefile Thu Jul 27 17:00:05 2017 (r446765) @@ -3,7 +3,7 @@ PORTNAME= ppsspp DISTVERSIONPREFIX= v DISTVERSION?= 1.4.2 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= emulators # XXX Get from Debian once #697821 lands MASTER_SITES= https://bazaar.launchpad.net/~sergio-br2/${PORTNAME}/debian-sdl/download/5/${PORTNAME}.1-20140802045408-dd26dik367ztj5xg-8/:manpage Modified: branches/2017Q3/emulators/ppsspp/files/patch-Common_MemoryUtil.cpp ============================================================================== --- branches/2017Q3/emulators/ppsspp/files/patch-Common_MemoryUtil.cpp Thu Jul 27 16:48:52 2017 (r446764) +++ branches/2017Q3/emulators/ppsspp/files/patch-Common_MemoryUtil.cpp Thu Jul 27 17:00:05 2017 (r446765) @@ -1,35 +1,31 @@ ---- Common/MemoryUtil.cpp.orig 2015-11-19 15:07:48 UTC +https://github.com/hrydgard/ppsspp/pull/9857 + +--- Common/MemoryUtil.cpp.orig 2017-05-27 09:58:05 UTC +++ Common/MemoryUtil.cpp -@@ -32,6 +32,10 @@ - #include +@@ -154,7 +154,7 @@ void *AllocateExecutableMemory(size_t size) { + } + #else + static char *map_hint = 0; +-#if defined(_M_X64) ++#if defined(_M_X64) && !defined(MAP_32BIT) + // Try to request one that is close to our memory location if we're in high memory. + // We use a dummy global variable to give us a good location to start from. + if (!map_hint) { +@@ -176,7 +176,7 @@ void *AllocateExecutableMemory(size_t size) { + void* ptr = mmap(map_hint, size, prot, + MAP_ANON | MAP_PRIVATE + #if defined(_M_X64) && defined(MAP_32BIT) +- | ((uintptr_t) map_hint == 0 ? MAP_32BIT : 0) ++ | MAP_32BIT #endif + , -1, 0); -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) -+#include -+#endif -+ - #ifndef _WIN32 - #include - #endif -@@ -149,6 +153,21 @@ void *AllocateExecutableMemory(size_t si - map_hint = (char*)round_page(&hint_location) - 0x20000000; // 0.5gb lower than our approximate location - else - map_hint = (char*)0x20000000; // 0.5GB mark in memory -+ -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) -+ // XXX Fix maximum data segment size (data + BSS + heap) to 256 MB. -+ // This allows avoiding calling mmap(2) with MAP_FIXED. -+ // On FreeBSD, without lowering this limit, calling mmap(2) -+ // without MAP_FIXED will result in getting an address just -+ // beyond maximum data segment size which will be far beyond -+ // the desired 2 GB. -+ struct rlimit limit; -+ limit.rlim_cur = 0x10000000; // 256 MB -+ limit.rlim_max = 0x10000000; -+ if(setrlimit(RLIMIT_DATA, &limit) != 0) { -+ PanicAlert("Failed to lower maximum data segment size"); -+ } -+#endif +@@ -193,7 +193,7 @@ void *AllocateExecutableMemory(size_t size) { + ERROR_LOG(MEMMAP, "Failed to allocate executable memory (%d)", (int)size); + PanicAlert("Failed to allocate executable memory\n%s", GetLastErrorMsg()); } - else if ((uintptr_t) map_hint > 0xFFFFFFFFULL) - { +-#if defined(_M_X64) && !defined(_WIN32) ++#if defined(_M_X64) && !defined(MAP_32BIT) && !defined(_WIN32) + else if ((uintptr_t)map_hint <= 0xFFFFFFFF) { + // Round up if we're below 32-bit mark, probably allocating sequentially. + map_hint += round_page(size); Modified: branches/2017Q3/emulators/rpcs3/Makefile ============================================================================== --- branches/2017Q3/emulators/rpcs3/Makefile Thu Jul 27 16:48:52 2017 (r446764) +++ branches/2017Q3/emulators/rpcs3/Makefile Thu Jul 27 17:00:05 2017 (r446765) @@ -3,6 +3,7 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v DISTVERSION= 0.0.3 +PORTREVISION= 1 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org Modified: branches/2017Q3/emulators/rpcs3/files/patch-Utilities_JIT.cpp ============================================================================== --- branches/2017Q3/emulators/rpcs3/files/patch-Utilities_JIT.cpp Thu Jul 27 16:48:52 2017 (r446764) +++ branches/2017Q3/emulators/rpcs3/files/patch-Utilities_JIT.cpp Thu Jul 27 17:00:05 2017 (r446765) @@ -1,35 +1,33 @@ ---- Utilities/JIT.cpp.orig 2017-07-10 15:42:02 UTC +FreeBSD ignores address hints with default RLIMIT_DATA + +--- Utilities/JIT.cpp.orig 2017-07-20 15:05:34 UTC +++ Utilities/JIT.cpp -@@ -31,6 +31,10 @@ +@@ -30,6 +30,8 @@ + + #ifdef _WIN32 #include ++#else ++#include #endif -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) -+#include -+#endif -+ #include "JIT.h" - - // Memory manager mutex -@@ -45,6 +49,21 @@ static void* const s_memory = []() -> void* - llvm::InitializeNativeTarget(); +@@ -47,6 +49,11 @@ static void* const s_memory = []() -> void* llvm::InitializeNativeTargetAsmPrinter(); LLVMLinkInMCJIT(); -+ -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) -+ // XXX Fix maximum data segment size (data + BSS + heap) to 256 MB. -+ // This allows avoiding calling mmap(2) with MAP_FIXED. -+ // On FreeBSD, without lowering this limit, calling mmap(2) -+ // without MAP_FIXED will result in getting an address just -+ // beyond maximum data segment size which will be far beyond -+ // the desired 2 GB. -+ struct rlimit limit; -+ limit.rlim_cur = 0x10000000; // 256 MB -+ limit.rlim_max = 0x10000000; -+ if(setrlimit(RLIMIT_DATA, &limit) != 0) { -+ LOG_ERROR(GENERAL, "LLVM: Failed to lower maximum data segment size"); -+ } -+#endif ++#ifdef MAP_32BIT ++ auto ptr = ::mmap(nullptr, s_memory_size, PROT_NONE, MAP_ANON | MAP_PRIVATE | MAP_32BIT, -1, 0); ++ if (ptr != MAP_FAILED) ++ return ptr; ++#else for (u64 addr = 0x10000000; addr <= 0x80000000 - s_memory_size; addr += 0x1000000) { + if (auto ptr = utils::memory_reserve(s_memory_size, (void*)addr)) +@@ -54,6 +61,7 @@ static void* const s_memory = []() -> void* + return ptr; + } + } ++#endif + + return utils::memory_reserve(s_memory_size); + }(); From owner-svn-ports-branches@freebsd.org Thu Jul 27 20:44:07 2017 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 65096DAF811; Thu, 27 Jul 2017 20:44:07 +0000 (UTC) (envelope-from bdrewery@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 33A5D64007; Thu, 27 Jul 2017 20:44:07 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6RKi65d072326; Thu, 27 Jul 2017 20:44:06 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6RKi6WQ072324; Thu, 27 Jul 2017 20:44:06 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201707272044.v6RKi6WQ072324@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 27 Jul 2017 20:44:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r446778 - in branches/2017Q3/devel/ccache: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in branches/2017Q3/devel/ccache: . files X-SVN-Commit-Revision: 446778 X-SVN-Commit-Repository: ports 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.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2017 20:44:07 -0000 Author: bdrewery Date: Thu Jul 27 20:44:06 2017 New Revision: 446778 URL: https://svnweb.freebsd.org/changeset/ports/446778 Log: MFH: r446777 MEMCACHED+STATIC: Fix not having HAVE_LIBMEMCACHED defined. This was causing memcached functionality to not work. Also flip around the link ordering for libmemcached and libsasl2 to resolve link-time issues. Sponsored by: Dell EMC Isilon Approved by: portmgr (implicit) Modified: branches/2017Q3/devel/ccache/Makefile branches/2017Q3/devel/ccache/files/extra-patch-memcached-configure.ac Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/devel/ccache/Makefile ============================================================================== --- branches/2017Q3/devel/ccache/Makefile Thu Jul 27 20:43:21 2017 (r446777) +++ branches/2017Q3/devel/ccache/Makefile Thu Jul 27 20:44:06 2017 (r446778) @@ -3,7 +3,7 @@ PORTNAME= ccache PORTVERSION= 3.3.4 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= devel MASTER_SITES= http://www.samba.org/ftp/ccache/ \ LOCAL/bdrewery Modified: branches/2017Q3/devel/ccache/files/extra-patch-memcached-configure.ac ============================================================================== --- branches/2017Q3/devel/ccache/files/extra-patch-memcached-configure.ac Thu Jul 27 20:43:21 2017 (r446777) +++ branches/2017Q3/devel/ccache/files/extra-patch-memcached-configure.ac Thu Jul 27 20:44:06 2017 (r446778) @@ -1,5 +1,5 @@ ---- configure.ac.orig 2017-07-24 16:42:21.493682000 -0700 -+++ configure.ac 2017-07-24 17:36:06.122588000 -0700 +--- configure.ac.orig 2017-07-27 13:36:38.827581000 -0700 ++++ configure.ac 2017-07-27 13:39:10.856958000 -0700 @@ -28,6 +28,10 @@ AC_PROG_CC_C99 if test "$ac_cv_prog_cc_c99" = no; then AC_MSG_ERROR(cannot find a C99-compatible compiler) @@ -11,7 +11,7 @@ AC_PROG_CPP AC_PROG_INSTALL -@@ -97,19 +101,38 @@ AC_ARG_ENABLE(memcached, +@@ -97,19 +101,39 @@ AC_ARG_ENABLE(memcached, [AS_HELP_STRING([--enable-memcached], [enable memcached as a cache backend])]) @@ -36,7 +36,8 @@ + fi + if test x$ac_cv_have_libsasl2 = xyes; then + AC_CHECK_LIB(memcached, memcached,[ -+ LIBS="${LIBS} -lsasl2 -lcrypto -lopie -lmd -lmemcached" ++ LIBS="${LIBS} -lmemcached -lsasl2 -lcrypto -lopie -lmd" ++ AC_DEFINE(HAVE_LIBMEMCACHED, 1) + ] + ,[ + echo ' WARNING: recent version libmemcached not found' From owner-svn-ports-branches@freebsd.org Sat Jul 29 23:30:41 2017 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 7DE91DCD6A2; Sat, 29 Jul 2017 23:30:41 +0000 (UTC) (envelope-from mm@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 4B64680559; Sat, 29 Jul 2017 23:30:41 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6TNUe2J017644; Sat, 29 Jul 2017 23:30:40 GMT (envelope-from mm@FreeBSD.org) Received: (from mm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6TNUefs017642; Sat, 29 Jul 2017 23:30:40 GMT (envelope-from mm@FreeBSD.org) Message-Id: <201707292330.v6TNUefs017642@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mm set sender to mm@FreeBSD.org using -f From: Martin Matuska Date: Sat, 29 Jul 2017 23:30:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r446905 - branches/2017Q3/ftp/proftpd X-SVN-Group: ports-branches X-SVN-Commit-Author: mm X-SVN-Commit-Paths: branches/2017Q3/ftp/proftpd X-SVN-Commit-Revision: 446905 X-SVN-Commit-Repository: ports 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.23 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, 29 Jul 2017 23:30:41 -0000 Author: mm Date: Sat Jul 29 23:30:40 2017 New Revision: 446905 URL: https://svnweb.freebsd.org/changeset/ports/446905 Log: MFH r445718: Update ProFTPd to 1.3.5e Security: CVE-2017-7418 Approved by: ports-secteam (delphij) Modified: branches/2017Q3/ftp/proftpd/Makefile branches/2017Q3/ftp/proftpd/distinfo Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/ftp/proftpd/Makefile ============================================================================== --- branches/2017Q3/ftp/proftpd/Makefile Sat Jul 29 21:28:20 2017 (r446904) +++ branches/2017Q3/ftp/proftpd/Makefile Sat Jul 29 23:30:40 2017 (r446905) @@ -26,7 +26,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/sbin/proftpd:ftp/proftpd RUN_DEPENDS+= ${LOCALBASE}/sbin/proftpd:ftp/proftpd .endif -PROFTPD_VERSION= 1.3.5d +PROFTPD_VERSION= 1.3.5e .if defined(_BUILDING_PROFTPD_MODULE) DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} Modified: branches/2017Q3/ftp/proftpd/distinfo ============================================================================== --- branches/2017Q3/ftp/proftpd/distinfo Sat Jul 29 21:28:20 2017 (r446904) +++ branches/2017Q3/ftp/proftpd/distinfo Sat Jul 29 23:30:40 2017 (r446905) @@ -1,6 +1,6 @@ -TIMESTAMP = 1485543509 -SHA256 (proftpd-1.3.5d.tar.gz) = f4e2997be7f22a5b31d7ac72497ed4f4471d24d32385978350410713e76129ac -SIZE (proftpd-1.3.5d.tar.gz) = 29966560 +TIMESTAMP = 1499982806 +SHA256 (proftpd-1.3.5e.tar.gz) = 8307dc0103a8e716b99745919be7f09b54708c57c7d5aa70262f7593dc56bc9d +SIZE (proftpd-1.3.5e.tar.gz) = 29968142 SHA256 (mod_clamav-v0.14rc2.tar.gz) = 0a865a659541f7ff5c46532c79aac652cdd004f604fb6a874f57dfb95bfe5a1e SIZE (mod_clamav-v0.14rc2.tar.gz) = 19721 SHA256 (mod_sql_tds-4.13.tar.gz) = 9d9fb6c4b9a952739a84e166ed8b0d93f539c7bcf73e32923318e00cbd7eea08