From owner-svn-ports-branches@FreeBSD.ORG Mon Sep 1 12:59:25 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CE50C6B5; Mon, 1 Sep 2014 12:59:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 A05C61894; Mon, 1 Sep 2014 12:59:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s81CxPkU018062; Mon, 1 Sep 2014 12:59:25 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s81CxPgP018061; Mon, 1 Sep 2014 12:59:25 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201409011259.s81CxPgP018061@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Mon, 1 Sep 2014 12:59:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r366873 - branches/pkg_install X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 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, 01 Sep 2014 12:59:25 -0000 Author: bapt Date: Mon Sep 1 12:59:25 2014 New Revision: 366873 URL: http://svnweb.freebsd.org/changeset/ports/366873 QAT: https://qat.redports.org/buildarchive/r366873/ Log: Create a pkg_install branch, to allow committers who would like to continue supporting pkg_install to commit in. This branch is opened to all commiters Added: branches/pkg_install/ - copied from r366872, head/ From owner-svn-ports-branches@FreeBSD.ORG Wed Sep 3 20:17:36 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 869AE457; Wed, 3 Sep 2014 20:17:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 6FF8A1EC7; Wed, 3 Sep 2014 20:17:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s83KHa9O031871; Wed, 3 Sep 2014 20:17:36 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s83KHXYL031849; Wed, 3 Sep 2014 20:17:33 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201409032017.s83KHXYL031849@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Wed, 3 Sep 2014 20:17:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r367226 - in branches/2014Q3/lang/maude: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 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, 03 Sep 2014 20:17:36 -0000 Author: riggs Date: Wed Sep 3 20:17:33 2014 New Revision: 367226 URL: http://svnweb.freebsd.org/changeset/ports/367226 QAT: https://qat.redports.org/buildarchive/r367226/ Log: MFH: r367223 - Stagify - Fix build on clang - Add MAKE_JOBS_UNSAFE - Add LICENSE - Add DOCS option - Bump PORTREVISION - Pet portlint PR: 191049 Submitted by: k@stereochro.me Reviewed by: cpm@fbsd.es, joemann@beefree.free.de, marino, riggs Final patch by: cpm@fbsd.es, riggs Approved by: portmgr (erwin) Added: branches/2014Q3/lang/maude/files/extra-patch-Mixfix-lexerAux - copied unchanged from r367223, head/lang/maude/files/extra-patch-Mixfix-lexerAux branches/2014Q3/lang/maude/files/patch-src__BuiltIn__stringOpSymbol.cc - copied unchanged from r367223, head/lang/maude/files/patch-src__BuiltIn__stringOpSymbol.cc branches/2014Q3/lang/maude/files/patch-src__Mixfix__bottom.yy - copied unchanged from r367223, head/lang/maude/files/patch-src__Mixfix__bottom.yy branches/2014Q3/lang/maude/files/patch-src__Mixfix__commands.yy - copied unchanged from r367223, head/lang/maude/files/patch-src__Mixfix__commands.yy branches/2014Q3/lang/maude/files/patch-src__Mixfix__interact.cc - copied unchanged from r367223, head/lang/maude/files/patch-src__Mixfix__interact.cc branches/2014Q3/lang/maude/files/patch-src__Mixfix__modules.yy - copied unchanged from r367223, head/lang/maude/files/patch-src__Mixfix__modules.yy branches/2014Q3/lang/maude/files/patch-src__Mixfix__token.cc - copied unchanged from r367223, head/lang/maude/files/patch-src__Mixfix__token.cc branches/2014Q3/lang/maude/files/patch-src__Mixfix__top.yy - copied unchanged from r367223, head/lang/maude/files/patch-src__Mixfix__top.yy branches/2014Q3/lang/maude/files/patch-src__ObjectSystem__configSymbol.hh - copied unchanged from r367223, head/lang/maude/files/patch-src__ObjectSystem__configSymbol.hh branches/2014Q3/lang/maude/files/patch-src__ObjectSystem__objectMap.cc - copied unchanged from r367223, head/lang/maude/files/patch-src__ObjectSystem__objectMap.cc branches/2014Q3/lang/maude/files/patch-src__ObjectSystem__objectSystemRewritingContext.hh - copied unchanged from r367223, head/lang/maude/files/patch-src__ObjectSystem__objectSystemRewritingContext.hh branches/2014Q3/lang/maude/files/patch-src__Utility__ropeStuff.hh - copied unchanged from r367223, head/lang/maude/files/patch-src__Utility__ropeStuff.hh Modified: branches/2014Q3/lang/maude/Makefile Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/lang/maude/Makefile ============================================================================== --- branches/2014Q3/lang/maude/Makefile Wed Sep 3 20:16:29 2014 (r367225) +++ branches/2014Q3/lang/maude/Makefile Wed Sep 3 20:17:33 2014 (r367226) @@ -3,17 +3,22 @@ PORTNAME= maude PORTVERSION= 2.6 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= http://maude.cs.uiuc.edu/versions/${PORTVERSION}/ DISTNAME= Maude-${PORTVERSION} -MAINTAINER= joemann@beefree.free.de -COMMENT= A high-performance reflective language +MAINTAINER= ports@FreeBSD.org +COMMENT= High-performance reflective language -LIB_DEPENDS= bdd:${PORTSDIR}/science/buddy \ - tecla:${PORTSDIR}/devel/libtecla \ - gmp:${PORTSDIR}/math/gmp \ - sigsegv:${PORTSDIR}/devel/libsigsegv +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + +BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex +LIB_DEPENDS= libbdd.so:${PORTSDIR}/science/buddy \ + libtecla.so:${PORTSDIR}/devel/libtecla \ + libgmp.so:${PORTSDIR}/math/gmp \ + libsigsegv.so:${PORTSDIR}/devel/libsigsegv USES= bison USE_AUTOTOOLS= aclocal autoheader automake @@ -22,16 +27,22 @@ GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --datadir=${DATADIR} +MAKE_JOBS_UNSAFE= yes FULL_MAUDE_VER= 26b -OPTIONS_DEFINE= FULL_MAUDE +OPTIONS_DEFINE= DOCS FULL_MAUDE OPTIONS_DEFAULT= FULL_MAUDE FULL_MAUDE_DESC= Install full-maude${FULL_MAUDE_VER} -NO_STAGE= yes +PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README + .include +.if ${OSVERSION} >= 1000000 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-Mixfix-lexerAux +.endif + .if ${PORT_OPTIONS:MFULL_MAUDE} MASTER_SITES+= http://maude.lcc.uma.es/FullMaude/FM${FULL_MAUDE_VER}/:fm FULL_MAUDE= full-maude${FULL_MAUDE_VER}.maude @@ -45,8 +56,8 @@ PLIST_SUB+= FULL_MAUDE_VER="${FULL_MAUDE PLIST_SUB+= FULL_MAUDE="@comment " .endif -.if ${PORT_OPTIONS:MFULL_MAUDE} post-extract: +.if ${PORT_OPTIONS:MFULL_MAUDE} ${UNZIP_CMD} ${DISTDIR}/${FULL_MAUDE_DIST} ${FULL_MAUDE} -d ${WRKDIR} .endif @@ -54,9 +65,11 @@ post-patch: @${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' \ ${WRKSRC}/src/Mixfix/global.hh -.if ${PORT_OPTIONS:MFULL_MAUDE} post-install: - ${INSTALL_DATA} ${WRKDIR}/${FULL_MAUDE} ${DATADIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} +.if ${PORT_OPTIONS:MFULL_MAUDE} + ${INSTALL_DATA} ${WRKDIR}/${FULL_MAUDE} ${STAGEDIR}${DATADIR} .endif .include Copied: branches/2014Q3/lang/maude/files/extra-patch-Mixfix-lexerAux (from r367223, head/lang/maude/files/extra-patch-Mixfix-lexerAux) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/lang/maude/files/extra-patch-Mixfix-lexerAux Wed Sep 3 20:17:33 2014 (r367226, copy of r367223, head/lang/maude/files/extra-patch-Mixfix-lexerAux) @@ -0,0 +1,22 @@ +--- ./src/Mixfix/lexerAux.cc.orig 2014-09-03 02:54:57.000000000 +0200 ++++ ./src/Mixfix/lexerAux.cc 2014-09-03 02:55:40.000000000 +0200 +@@ -35,7 +35,7 @@ + bool fakeNewlineStack[MAX_IN_DEPTH]; + + void +-getInput(char* buf, int& result, int max_size) ++getInput(char* buf, size_t& result, size_t max_size) + { + result = YY_NULL; + if (UserLevelRewritingContext::interrupted()) +--- ./src/Mixfix/lexerAux.hh.orig 2014-09-03 02:56:33.000000000 +0200 ++++ ./src/Mixfix/lexerAux.hh 2014-09-03 02:57:05.000000000 +0200 +@@ -27,7 +27,7 @@ + //extern int inStackPtr; + //extern YY_BUFFER_STATE inStack[]; + +-void getInput(char* buf, int& result, int max_size); ++void getInput(char* buf, size_t& result, size_t max_size); + void lexerIdMode(); + void lexerTokenTreeMode(int terminatingTokens); + void lexerCmdMode(); Copied: branches/2014Q3/lang/maude/files/patch-src__BuiltIn__stringOpSymbol.cc (from r367223, head/lang/maude/files/patch-src__BuiltIn__stringOpSymbol.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/lang/maude/files/patch-src__BuiltIn__stringOpSymbol.cc Wed Sep 3 20:17:33 2014 (r367226, copy of r367223, head/lang/maude/files/patch-src__BuiltIn__stringOpSymbol.cc) @@ -0,0 +1,11 @@ +--- ./src/BuiltIn/stringOpSymbol.cc.orig 2014-09-03 02:36:06.000000000 +0200 ++++ ./src/BuiltIn/stringOpSymbol.cc 2014-09-03 02:32:45.000000000 +0200 +@@ -472,7 +472,7 @@ + const mpz_class& n0 = succSymbol->getNat(a0); + if (n0 <= 255) + { +- char c = n0.get_si(); ++ char c[2] = { n0.get_si(), 0 }; + return rewriteToString(subject, context, crope(c)); + } + } Copied: branches/2014Q3/lang/maude/files/patch-src__Mixfix__bottom.yy (from r367223, head/lang/maude/files/patch-src__Mixfix__bottom.yy) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/lang/maude/files/patch-src__Mixfix__bottom.yy Wed Sep 3 20:17:33 2014 (r367226, copy of r367223, head/lang/maude/files/patch-src__Mixfix__bottom.yy) @@ -0,0 +1,11 @@ +--- ./src/Mixfix/bottom.yy.orig 2014-09-03 02:49:14.000000000 +0200 ++++ ./src/Mixfix/bottom.yy 2014-09-03 02:50:56.000000000 +0200 +@@ -23,7 +23,7 @@ + %% + + static void +-yyerror(char *s) ++yyerror(UserLevelRewritingContext::ParseResult *parseResult, char *s) + { + if (!(UserLevelRewritingContext::interrupted())) + IssueWarning(LineNumber(lineNumber) << ": " << s); Copied: branches/2014Q3/lang/maude/files/patch-src__Mixfix__commands.yy (from r367223, head/lang/maude/files/patch-src__Mixfix__commands.yy) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/lang/maude/files/patch-src__Mixfix__commands.yy Wed Sep 3 20:17:33 2014 (r367226, copy of r367223, head/lang/maude/files/patch-src__Mixfix__commands.yy) @@ -0,0 +1,17 @@ +--- ./src/Mixfix/commands.yy.orig 2014-09-03 02:51:54.000000000 +0200 ++++ ./src/Mixfix/commands.yy 2014-09-03 02:53:05.000000000 +0200 +@@ -23,12 +23,12 @@ + /* + * Commands. + */ +-command : KW_SELECT { lexBubble(END_COMMAND, 1) } ++command : KW_SELECT { lexBubble(END_COMMAND, 1); } + endBubble + { + interpreter.setCurrentModule(lexerBubble); + } +- | KW_DUMP { lexBubble(END_COMMAND, 1) } ++ | KW_DUMP { lexBubble(END_COMMAND, 1); } + endBubble + { + if (interpreter.setCurrentModule(lexerBubble)) Copied: branches/2014Q3/lang/maude/files/patch-src__Mixfix__interact.cc (from r367223, head/lang/maude/files/patch-src__Mixfix__interact.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/lang/maude/files/patch-src__Mixfix__interact.cc Wed Sep 3 20:17:33 2014 (r367226, copy of r367223, head/lang/maude/files/patch-src__Mixfix__interact.cc) @@ -0,0 +1,18 @@ +--- ./src/Mixfix/interact.cc.orig 2014-09-03 02:53:35.000000000 +0200 ++++ ./src/Mixfix/interact.cc 2014-09-03 02:54:14.000000000 +0200 +@@ -25,13 +25,14 @@ + // + #include + ++#include "surface.h" ++ + bool UserLevelRewritingContext::interactiveFlag = true; + bool UserLevelRewritingContext::ctrlC_Flag = false; + bool UserLevelRewritingContext::stepFlag = false; + bool UserLevelRewritingContext::abortFlag = false; + int UserLevelRewritingContext::debugLevel = 0; + +-int yyparse(void*); + void cleanUpParser(); + void cleanUpLexer(); + Copied: branches/2014Q3/lang/maude/files/patch-src__Mixfix__modules.yy (from r367223, head/lang/maude/files/patch-src__Mixfix__modules.yy) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/lang/maude/files/patch-src__Mixfix__modules.yy Wed Sep 3 20:17:33 2014 (r367226, copy of r367223, head/lang/maude/files/patch-src__Mixfix__modules.yy) @@ -0,0 +1,11 @@ +--- ./src/Mixfix/modules.yy.orig 2014-09-03 02:57:44.000000000 +0200 ++++ ./src/Mixfix/modules.yy 2014-09-03 02:58:03.000000000 +0200 +@@ -247,7 +247,7 @@ + // press on. + // + opDescription = lexerBubble; +- lexBubble(END_STATEMENT, 1) ++ lexBubble(END_STATEMENT, 1); + } + endBubble + { Copied: branches/2014Q3/lang/maude/files/patch-src__Mixfix__token.cc (from r367223, head/lang/maude/files/patch-src__Mixfix__token.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/lang/maude/files/patch-src__Mixfix__token.cc Wed Sep 3 20:17:33 2014 (r367226, copy of r367223, head/lang/maude/files/patch-src__Mixfix__token.cc) @@ -0,0 +1,11 @@ +--- ./src/Mixfix/token.cc.orig 2014-09-03 02:58:50.000000000 +0200 ++++ ./src/Mixfix/token.cc 2014-09-03 02:59:18.000000000 +0200 +@@ -632,7 +632,7 @@ + } + } + } +- result.append(c); ++ result.push_back(c); + seenBackslash = false; + } + CantHappen("bad end to string"); Copied: branches/2014Q3/lang/maude/files/patch-src__Mixfix__top.yy (from r367223, head/lang/maude/files/patch-src__Mixfix__top.yy) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/lang/maude/files/patch-src__Mixfix__top.yy Wed Sep 3 20:17:33 2014 (r367226, copy of r367223, head/lang/maude/files/patch-src__Mixfix__top.yy) @@ -0,0 +1,25 @@ +--- ./src/Mixfix/top.yy.orig 2014-09-03 03:00:02.000000000 +0200 ++++ ./src/Mixfix/top.yy 2014-09-03 03:02:15.000000000 +0200 +@@ -59,7 +59,6 @@ + #define store(token) tokenSequence.append(token) + #define fragClear() fragments.contractTo(0); + #define fragStore(token) fragments.append(token) +-#define YYPARSE_PARAM parseResult + #define PARSE_RESULT (*((UserLevelRewritingContext::ParseResult*) parseResult)) + + #define CM interpreter.getCurrentModule() +@@ -91,12 +90,13 @@ + Int64 number; + Int64 number2; + +-static void yyerror(char *s); ++static void yyerror(UserLevelRewritingContext::ParseResult *parseResult, char *s); + + void cleanUpModuleExpression(); + void cleanUpParser(); + void missingSpace(const Token& token); + %} ++%parse-param { UserLevelRewritingContext::ParseResult *parseResult } + %pure_parser + + %union Copied: branches/2014Q3/lang/maude/files/patch-src__ObjectSystem__configSymbol.hh (from r367223, head/lang/maude/files/patch-src__ObjectSystem__configSymbol.hh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/lang/maude/files/patch-src__ObjectSystem__configSymbol.hh Wed Sep 3 20:17:33 2014 (r367226, copy of r367223, head/lang/maude/files/patch-src__ObjectSystem__configSymbol.hh) @@ -0,0 +1,11 @@ +--- ./src/ObjectSystem/configSymbol.hh.orig 2014-09-03 02:37:37.000000000 +0200 ++++ ./src/ObjectSystem/configSymbol.hh 2014-09-03 02:38:05.000000000 +0200 +@@ -50,7 +50,7 @@ + private: + struct symbolLt + { +- bool operator()(const Symbol* d1, const Symbol* d2) ++ bool operator()(const Symbol* d1, const Symbol* d2) const + { + return d1->compare(d2) < 0; + } Copied: branches/2014Q3/lang/maude/files/patch-src__ObjectSystem__objectMap.cc (from r367223, head/lang/maude/files/patch-src__ObjectSystem__objectMap.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/lang/maude/files/patch-src__ObjectSystem__objectMap.cc Wed Sep 3 20:17:33 2014 (r367226, copy of r367223, head/lang/maude/files/patch-src__ObjectSystem__objectMap.cc) @@ -0,0 +1,11 @@ +--- ./src/ObjectSystem/objectMap.cc.orig 2014-09-03 02:39:09.000000000 +0200 ++++ ./src/ObjectSystem/objectMap.cc 2014-09-03 02:39:20.000000000 +0200 +@@ -50,7 +50,7 @@ + + struct ConfigSymbol::dagNodeLt + { +- bool operator()(const DagNode* d1, const DagNode* d2) ++ bool operator()(const DagNode* d1, const DagNode* d2) const + { + return d1->compare(d2) < 0; + } Copied: branches/2014Q3/lang/maude/files/patch-src__ObjectSystem__objectSystemRewritingContext.hh (from r367223, head/lang/maude/files/patch-src__ObjectSystem__objectSystemRewritingContext.hh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/lang/maude/files/patch-src__ObjectSystem__objectSystemRewritingContext.hh Wed Sep 3 20:17:33 2014 (r367226, copy of r367223, head/lang/maude/files/patch-src__ObjectSystem__objectSystemRewritingContext.hh) @@ -0,0 +1,11 @@ +--- ./src/ObjectSystem/objectSystemRewritingContext.hh.orig 2014-09-03 02:40:31.000000000 +0200 ++++ ./src/ObjectSystem/objectSystemRewritingContext.hh 2014-09-03 02:40:48.000000000 +0200 +@@ -62,7 +62,7 @@ + private: + struct dagNodeLt + { +- bool operator()(const DagNode* d1, const DagNode* d2) ++ bool operator()(const DagNode* d1, const DagNode* d2) const + { + return d1->compare(d2) < 0; + } Copied: branches/2014Q3/lang/maude/files/patch-src__Utility__ropeStuff.hh (from r367223, head/lang/maude/files/patch-src__Utility__ropeStuff.hh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/lang/maude/files/patch-src__Utility__ropeStuff.hh Wed Sep 3 20:17:33 2014 (r367226, copy of r367223, head/lang/maude/files/patch-src__Utility__ropeStuff.hh) @@ -0,0 +1,20 @@ +--- ./src/Utility/ropeStuff.hh.orig 2014-09-03 02:27:15.000000000 +0200 ++++ ./src/Utility/ropeStuff.hh 2014-09-03 02:28:58.000000000 +0200 +@@ -25,6 +25,11 @@ + // + #ifndef _ropeStuff_hh_ + #define _ropeStuff_hh_ ++#include ++#ifdef _LIBCPP_VERSION ++#include ++typedef std::string crope; ++#else + #ifdef __GNUC__ + #if __GNUC__ < 3 + #include +@@ -50,3 +55,5 @@ + #include + #endif + #endif ++ ++#endif From owner-svn-ports-branches@FreeBSD.ORG Wed Sep 3 20:32:12 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D8D91CA6; Wed, 3 Sep 2014 20:32:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 B882B112E; Wed, 3 Sep 2014 20:32:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s83KWBto043934; Wed, 3 Sep 2014 20:32:11 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s83KWBEX043931; Wed, 3 Sep 2014 20:32:11 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201409032032.s83KWBEX043931@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Wed, 3 Sep 2014 20:32:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r367232 - branches/2014Q3/security/vuxml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 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, 03 Sep 2014 20:32:12 -0000 Author: ohauer Date: Wed Sep 3 20:32:11 2014 New Revision: 367232 URL: http://svnweb.freebsd.org/changeset/ports/367232 QAT: https://qat.redports.org/buildarchive/r367232/ Log: MFH: r367225 - update vid f927e06c-1109-11e4-b090-20cf30e32f6d (httpd-2.2.29 was released today) Approved by: portmgr (erwin@) Modified: branches/2014Q3/security/vuxml/vuln.xml Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q3/security/vuxml/vuln.xml Wed Sep 3 20:31:48 2014 (r367231) +++ branches/2014Q3/security/vuxml/vuln.xml Wed Sep 3 20:32:11 2014 (r367232) @@ -653,29 +653,29 @@ Notes: apache22 - 2.2.02.2.27_6 + 2.2.02.2.29 apache22-event-mpm - 2.2.02.2.27_6 + 2.2.02.2.29 apache22-itk-mpm - 2.2.02.2.27_6 + 2.2.02.2.29 apache22-peruser-mpm - 2.2.02.2.27_6 + 2.2.02.2.29 apache22-worker-mpm - 2.2.02.2.27_6 + 2.2.02.2.29

Apache HTTP SERVER PROJECT reports:

-
+

mod_deflate: The DEFLATE input filter (inflates request bodies) now limits the length and compression ratio of inflated request bodies to avoid denial of service via highly compressed bodies. See directives @@ -689,6 +689,10 @@ Notes: communication with scripts.

Fix a race condition in scoreboard handling, which could lead to a heap buffer overflow.

+

core: HTTP trailers could be used to replace HTTP headers late during + request processing, potentially undoing or otherwise confusing modules + that examined or modified request headers earlier. Adds "MergeTrailers" + directive to restore legacy behavior.

@@ -696,10 +700,12 @@ Notes: CVE-2014-0118 CVE-2014-0231 CVE-2014-0226 + CVE-2013-5704 2014-07-19 2014-07-24 + 2014-09-03 From owner-svn-ports-branches@FreeBSD.ORG Wed Sep 3 20:51:08 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 98C8F449; Wed, 3 Sep 2014 20:51:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 83340139E; Wed, 3 Sep 2014 20:51:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s83Kp8Do056559; Wed, 3 Sep 2014 20:51:08 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s83Kp7YN056555; Wed, 3 Sep 2014 20:51:07 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201409032051.s83Kp7YN056555@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Wed, 3 Sep 2014 20:51:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r367234 - in branches/2014Q3/www/apache22: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 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, 03 Sep 2014 20:51:08 -0000 Author: ohauer Date: Wed Sep 3 20:51:07 2014 New Revision: 367234 URL: http://svnweb.freebsd.org/changeset/ports/367234 QAT: https://qat.redports.org/buildarchive/r367234/ Log: MFH: r367227 - update to 2.2.29 - use PTHREAD_LIBS/CFLAGS instead -pthread Changes with Apache 2.2.29 http://www.apache.org/dist/httpd/CHANGES_2.2.29 *) Corrected docs/manual pages for new MergeTrailers directive and other out of date documentation. [William Rowe] Changes with Apache 2.2.28 *) SECURITY: CVE-2014-0118 (cve.mitre.org) [1] mod_deflate: The DEFLATE input filter (inflates request bodies) now limits the length and compression ratio of inflated request bodies to avoid denial of service via highly compressed bodies. See directives DeflateInflateLimitRequestBody, DeflateInflateRatioLimit, and DeflateInflateRatioBurst. [Yann Ylavic, Eric Covener] *) SECURITY: CVE-2014-0231 (cve.mitre.org) [1] mod_cgid: Fix a denial of service against CGI scripts that do not consume stdin that could lead to lingering HTTPD child processes filling up the scoreboard and eventually hanging the server. By default, the client I/O timeout (Timeout directive) now applies to communication with scripts. The CGIDScriptTimeout directive can be used to set a different timeout for communication with scripts. [Rainer Jung, Eric Covener, Yann Ylavic] *) SECURITY: CVE-2014-0226 (cve.mitre.org) [1] Fix a race condition in scoreboard handling, which could lead to a heap buffer overflow. [Joe Orton, Eric Covener, Jeff Trawick] *) SECURITY: CVE-2013-5704 (cve.mitre.org) [2] core: HTTP trailers could be used to replace HTTP headers late during request processing, potentially undoing or otherwise confusing modules that examined or modified request headers earlier. Adds "MergeTrailers" directive to restore legacy behavior. [Edward Lu, Yann Ylavic, Joe Orton, Eric Covener] *) core: Detect incomplete request and response bodies, log an error and forward it to the underlying filters. PR 55475. [Yann Ylavic] *) mod_deflate: Handle Zlib header and validation bytes received in multiple chunks. PR 46146. [Yann Ylavic] *) mod_proxy: Don't reuse a SSL backend connection whose requested SNI differs. PR 55782. [Yann Ylavic] *) mod_deflate: Fix inflation of files larger than 4GB. PR 56062. [Lukas Bezdicka ] *) mod_dav: Fix improper encoding in PROPFIND responses. PR 56480. [Ben Reser] *) mod_ssl: Extend the scope of SSLSessionCacheTimeout to sessions resumed by TLS session resumption (RFC 5077). [Rainer Jung] *) mod_proxy_ajp: Forward local IP address as a custom request attribute like we already do for the remote port. [Rainer Jung] *) mod_deflate: Don't fail when flushing inflated data to the user-agent and that coincides with the end of stream ("Zlib error flushing inflate buffer"). PR 56196. [Christoph Fausak ] *) mod_cache, mod_disk_cache: With CacheLock enabled, responses with a Vary header might not get the benefit of the thundering herd protection due to an incorrect internal cache key. PR 50317. [Ruediger Pluem, Jan Kaluza, Yann Ylavic] *) mod_rewrite: Support session cookies with the CO= flag when later parameters are used. The doc for this implied the feature had been backported for quite some time. PR56014 [Eric Covener] *) mod_cache: Don't remove stale cache entries that cannot be conditionally revalidated. This prevents the thundering herd protection from serving stale responses during a revalidation. PR 50317. [Eric Covener, Jan Kaluza, Ruediger Pluem] *) core: Increase TCP_DEFER_ACCEPT socket option to from 1 to 30 seconds. PR 41270. [Dean Gaudet ] [1] CVE issues already fixed since FreeBSD-ports r362845 [2] new CVE-2013-5704 issue fixed in 2.2.29 Approved by: portmgr (erwin@) Security: f927e06c-1109-11e4-b090-20cf30e32f6d Security: CVE-2013-5704 Deleted: branches/2014Q3/www/apache22/files/patch-CVE-2014-0118__mod_deflate.c branches/2014Q3/www/apache22/files/patch-CVE-2014-0226__scoreboard.c branches/2014Q3/www/apache22/files/patch-CVE-2014-0231__mod_cgid.c Modified: branches/2014Q3/www/apache22/Makefile branches/2014Q3/www/apache22/Makefile.modules branches/2014Q3/www/apache22/distinfo Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/www/apache22/Makefile ============================================================================== --- branches/2014Q3/www/apache22/Makefile Wed Sep 3 20:49:19 2014 (r367233) +++ branches/2014Q3/www/apache22/Makefile Wed Sep 3 20:51:07 2014 (r367234) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= apache22 -PORTVERSION= 2.2.27 -PORTREVISION?= 6 +PORTVERSION= 2.2.29 +PORTREVISION?= 0 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} DISTNAME= httpd-${PORTVERSION} Modified: branches/2014Q3/www/apache22/Makefile.modules ============================================================================== --- branches/2014Q3/www/apache22/Makefile.modules Wed Sep 3 20:49:19 2014 (r367233) +++ branches/2014Q3/www/apache22/Makefile.modules Wed Sep 3 20:51:07 2014 (r367234) @@ -101,18 +101,19 @@ CONFIGURE_ARGS+= --enable-exception-hook .if ${PORT_OPTIONS:MAUTH_BASIC} || ${PORT_OPTIONS:MAUTH_DIGEST} . if !${APACHE_MODULES:MAUTHN*} -IGNORE= AUTH_BASIC and AUTH_DIGEST need at last one AUTHN provider -. endif +IGNORE= AUTH_BASIC and AUTH_DIGEST need at least one AUTHN provider +. endif .endif .if ${PORT_OPTIONS:MAUTH_BASIC} . if !${APACHE_MODULES:MAUTHZ*} -IGNORE= AUTH_BASIC need at last one AUTHZ provider -. endif +IGNORE= AUTH_BASIC need at least one AUTHZ provider +. endif .endif .if defined(APR_HAS_THREADS) -LDFLAGS+= -pthread +CFLAGS+= ${PTHREAD_CFLAGS} +LDFLAGS+= ${PTHREAD_LIBS} .else . if exists(${APR_CONFIG}) && ${PORT_OPTIONS:MMEM_CACHE} IGNORE= MEM_CACHE requires APR threads. Please rebuild APR with THREAD support Modified: branches/2014Q3/www/apache22/distinfo ============================================================================== --- branches/2014Q3/www/apache22/distinfo Wed Sep 3 20:49:19 2014 (r367233) +++ branches/2014Q3/www/apache22/distinfo Wed Sep 3 20:51:07 2014 (r367234) @@ -1,2 +1,2 @@ -SHA256 (apache22/httpd-2.2.27.tar.bz2) = 205973ded6ca55c056ce9c84d73ab708f7829f330193bd39b651463b8d4f8147 -SIZE (apache22/httpd-2.2.27.tar.bz2) = 5616798 +SHA256 (apache22/httpd-2.2.29.tar.bz2) = 574b4f994b99178dfd5160bcb14025402e2ce381be9889b83e4be0ffbf5839a4 +SIZE (apache22/httpd-2.2.29.tar.bz2) = 5625498 From owner-svn-ports-branches@FreeBSD.ORG Fri Sep 5 15:56:30 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A052722A; Fri, 5 Sep 2014 15:56:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 71AA51953; Fri, 5 Sep 2014 15:56:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s85FuUbU084356; Fri, 5 Sep 2014 15:56:30 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s85FuUx2084355; Fri, 5 Sep 2014 15:56:30 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201409051556.s85FuUx2084355@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Fri, 5 Sep 2014 15:56:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r367350 - branches/2014Q3/security/vuxml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2014 15:56:30 -0000 Author: tijl Date: Fri Sep 5 15:56:29 2014 New Revision: 367350 URL: http://svnweb.freebsd.org/changeset/ports/367350 QAT: https://qat.redports.org/buildarchive/r367350/ Log: MFH: r367344 Document trafficserver vulnerability Approved by: portmgr (erwin) Modified: branches/2014Q3/security/vuxml/vuln.xml Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q3/security/vuxml/vuln.xml Fri Sep 5 15:44:10 2014 (r367349) +++ branches/2014Q3/security/vuxml/vuln.xml Fri Sep 5 15:56:29 2014 (r367350) @@ -57,6 +57,37 @@ Notes: --> + + trafficserver -- unspecified vulnerability + + + trafficserver + 5.0.1 + + + + +

Bryan Call reports:

+
+

Below is our announcement for the security issue reported to us + from Yahoo! Japan. All versions of Apache Traffic Server are + vulnerable. We urge users to upgrade to either 4.2.1.1 or 5.0.1 + immediately.

+

This fixes CVE-2014-3525 and limits access to how the health + checks are performed.

+
+ + + + CVE-2014-3525 + http://mail-archives.apache.org/mod_mbox/trafficserver-users/201407.mbox/%3CBFCEC9C8-1BE9-4DCA-AF9C-B8FE798EEC07@yahoo-inc.com%3E + + + 2014-07-23 + 2014-09-05 + + + chromium -- multiple vulnerabilities