From owner-svn-ports-branches@freebsd.org Sun Mar 20 18:18:22 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0DE34AD65FA; Sun, 20 Mar 2016 18:18:22 +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 DE6F4EBA; Sun, 20 Mar 2016 18:18:21 +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 u2KIILGT016994; Sun, 20 Mar 2016 18:18:21 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2KIIK1Y016990; Sun, 20 Mar 2016 18:18:20 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201603201818.u2KIIK1Y016990@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Sun, 20 Mar 2016 18:18:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r411472 - in branches/2016Q1/net-mgmt/victorops-nagios: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Mar 2016 18:18:22 -0000 Author: feld Date: Sun Mar 20 18:18:20 2016 New Revision: 411472 URL: https://svnweb.freebsd.org/changeset/ports/411472 Log: MFH: r411471 net-mgmt/victorops-nagios: Unbreak port - Update to 1.4.20 - Port modernization PR: 206350 Approved by: ports-secteam (with hat) Deleted: branches/2016Q1/net-mgmt/victorops-nagios/files/patch-check_victorops_cmds branches/2016Q1/net-mgmt/victorops-nagios/files/patch-check_victorops_forwarder branches/2016Q1/net-mgmt/victorops-nagios/files/patch-do_victorops_heartbeat branches/2016Q1/net-mgmt/victorops-nagios/files/patch-enqueue_alert branches/2016Q1/net-mgmt/victorops-nagios/files/patch-forward_alerts branches/2016Q1/net-mgmt/victorops-nagios/files/patch-support_collect.sh branches/2016Q1/net-mgmt/victorops-nagios/files/patch-utils branches/2016Q1/net-mgmt/victorops-nagios/files/patch-victorops.cron Modified: branches/2016Q1/net-mgmt/victorops-nagios/Makefile branches/2016Q1/net-mgmt/victorops-nagios/distinfo branches/2016Q1/net-mgmt/victorops-nagios/files/qpage-patch branches/2016Q1/net-mgmt/victorops-nagios/pkg-plist Directory Properties: branches/2016Q1/ (props changed) Modified: branches/2016Q1/net-mgmt/victorops-nagios/Makefile ============================================================================== --- branches/2016Q1/net-mgmt/victorops-nagios/Makefile Sun Mar 20 18:16:58 2016 (r411471) +++ branches/2016Q1/net-mgmt/victorops-nagios/Makefile Sun Mar 20 18:18:20 2016 (r411472) @@ -2,18 +2,19 @@ # $FreeBSD$ PORTNAME= victorops-nagios -PORTVERSION= 1.1.8 +PORTVERSION= 1.4.20 CATEGORIES= net-mgmt MASTER_SITES= http://software.victorops.com/ -DISTNAME= ${PORTNAME}_${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} MAINTAINER= rand@iteris.com COMMENT= Nagios integration for VictorOps incident notification service -BROKEN= Unfetchable +USES= shebangfix +SHEBANG_FILES= ${WRKSRC}/opt/victorops/nagios_plugin/bin/* NO_WRKSUBDIR= YES NO_BUILD= YES +NO_ARCH= YES RESTRICTED= Redistribution of software prohibited by VictorOps @@ -21,29 +22,25 @@ OPTIONS_DEFINE= QPAGE OPTIONS_DEFAULT= QPAGE_DESC= Integrate qpage for victorops server problems -RUN_DEPENDS+= bash:${PORTSDIR}/shells/bash +RUN_DEPENDS+= bash:${PORTSDIR}/shells/bash \ + curl:${PORTSDIR}/ftp/curl -.include -.if ${PORT_OPTIONS:MQPAGE} -RUN_DEPENDS+= qpage:${PORTSDIR}/comms/qpage -EXTRA_PATCHES+= ${FILESDIR}/qpage-patch -.endif - -post-patch: - @${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} \ - -e '1s|#!/bin/bash|#!/usr/local/bin/bash|' +QPAGE_RUN_DEPENDS+= qpage:${PORTSDIR}/comms/qpage +QPAGE_EXTRA_PATCHES+= ${FILESDIR}/qpage-patch do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily ${INSTALL_DATA} ${WRKSRC}/etc/cron.daily/victorops ${STAGEDIR}${PREFIX}/etc/periodic/daily/400.victorops ${MKDIR} ${STAGEDIR}${PREFIX}/etc/nagios -.for i in victorops victorops_email vo_test_svc vo_test_svc_cmd - ${INSTALL_DATA} ${WRKSRC}/opt/victorops/nagios_plugin/nagios_conf/${i}.cfg ${STAGEDIR}${PREFIX}/etc/nagios/${i}.cfg-sample -.endfor ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/victorops + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/victorops + ${MKDIR} ${STAGEDIR}/var/log/victorops + ${INSTALL_DATA} ${WRKSRC}/opt/victorops/nagios_plugin/nagios_conf/victorops.cfg ${STAGEDIR}${PREFIX}/etc/nagios/victorops.cfg-sample + ${INSTALL_DATA} ${WRKSRC}/opt/victorops/nagios_plugin/conf/env.sh.sample ${STAGEDIR}${PREFIX}/etc/victorops + ${INSTALL_DATA} ${WRKSRC}/opt/victorops/nagios_plugin/conf/proxy.sh.sample ${STAGEDIR}${PREFIX}/etc/victorops .for i in check_test_svc check_victorops_cmds check_victorops_forwarder \ do_victorops_heartbeat enqueue_alert forward_alert_file forward_alerts \ - send_email_alert send_status stop_forwarder support_collect.sh \ + send_email_alert send_status stop_forwarder \ url_encode.sed utils ${INSTALL_SCRIPT} ${WRKSRC}/opt/victorops/nagios_plugin/bin/${i} ${STAGEDIR}${PREFIX}/libexec/victorops/${i} .endfor Modified: branches/2016Q1/net-mgmt/victorops-nagios/distinfo ============================================================================== --- branches/2016Q1/net-mgmt/victorops-nagios/distinfo Sun Mar 20 18:16:58 2016 (r411471) +++ branches/2016Q1/net-mgmt/victorops-nagios/distinfo Sun Mar 20 18:18:20 2016 (r411472) @@ -1,2 +1,2 @@ -SHA256 (victorops-nagios_1.1.8.tar.gz) = 796e146552e27b45d0339c9c74883ba8048125887461f9e69a1e36cbd752e1a2 -SIZE (victorops-nagios_1.1.8.tar.gz) = 12838 +SHA256 (victorops-nagios-1.4.20.tar.gz) = 87d8c87182e8945357cb9b602d19452754a4decb4809a8594a2495a04f3d9664 +SIZE (victorops-nagios-1.4.20.tar.gz) = 1678731 Modified: branches/2016Q1/net-mgmt/victorops-nagios/files/qpage-patch ============================================================================== --- branches/2016Q1/net-mgmt/victorops-nagios/files/qpage-patch Sun Mar 20 18:16:58 2016 (r411471) +++ branches/2016Q1/net-mgmt/victorops-nagios/files/qpage-patch Sun Mar 20 18:18:20 2016 (r411472) @@ -1,38 +1,27 @@ ---- opt/victorops/nagios_plugin/bin/send_email_alert.orig 2014-06-11 10:39:13.918151547 -0500 -+++ opt/victorops/nagios_plugin/bin/send_email_alert 2014-06-11 11:20:43.930977406 -0500 -@@ -31,6 +31,7 @@ +--- opt/victorops/nagios_plugin/bin/send_email_alert.orig 2016-01-16 21:20:46 UTC ++++ opt/victorops/nagios_plugin/bin/send_email_alert +@@ -34,6 +34,7 @@ fi # Build the contact email list ORG_SLUG="$(getVal _CONTACTVO_ORGANIZATION_ID unkonwn_org)" CONTACTEMAIL="$(getVal _CONTACTVO_CONTACTEMAIL)" +CONTACTPAGER="$(getVal CONTACTPAGER)" VO_CONTACT="failsafe+$ORG_SLUG@victorops.net" - WGET_LOG=/tmp/victorops_forward_wget.out - STDERR_LOG=/tmp/victorops_forward_wget.err -@@ -42,10 +43,16 @@ + WGET_LOG=$LOG_DIR/victorops_forward_wget.out + STDERR_LOG=$LOG_DIR/victorops_forward_wget.err +@@ -45,10 +46,16 @@ if (( $IS_SERVICE )); then if [ "$CONTACTEMAIL" != "" ]; then - $PRINTF "%b" "***** Alert *****\n\nNotification Type: $(getVal NOTIFICATIONTYPE)\n\nService: $(getVal SERVICEDESC)\nHost: $(getVal HOSTALIAS)\nAddress: $(getVal HOSTADDRESS)\nState: $(getVal SERVICESTATE)\n\nDate/Time: $(getVal LONGDATETIME)\n\nAdditional Info:\n\n$(getVal SERVICEOUTPUT)\n\n" | $MAIL -s "** $(getVal NOTIFICATIONTYPE) Service Alert: $(getVal HOSTALIAS)/$(getVal SERVICEDESC) is $(getVal SERVICESTATE) **" $CONTACTEMAIL + printf "%b" "***** Alert *****\n\nNotification Type: $(getVal NOTIFICATIONTYPE)\n\nService: $(getVal SERVICEDESC)\nHost: $(getVal HOSTALIAS)\nAddress: $(getVal HOSTADDRESS)\nState: $(getVal SERVICESTATE)\n\nDate/Time: $(getVal LONGDATETIME)\n\nAdditional Info:\n\n$(getVal SERVICEOUTPUT)\n\n" | mail -s "** $(getVal NOTIFICATIONTYPE) Service Alert: $(getVal HOSTALIAS)/$(getVal SERVICEDESC) is $(getVal SERVICESTATE) **" $CONTACTEMAIL fi + if [ "$CONTACTPAGER" != "" ]; then -+ $PRINTF "%b" "$(getVal SERVICEDESC) $(getVal NOTIFICATIONTYPE) for $(getVal HOSTNAME) is $(getVal SERVICESTATE) at $(getVal TIME) $(getVal SERVICEOUTPUT)" | $QPAGE -f icinga $CONTACTPAGER ++ printf "%b" "$(getVal SERVICEDESC) $(getVal NOTIFICATIONTYPE) for $(getVal HOSTNAME) is $(getVal SERVICESTATE) at $(getVal TIME) $(getVal SERVICEOUTPUT)" | qpage -f icinga $CONTACTPAGER + fi else if [ "$CONTACTEMAIL" != "" ]; then - $PRINTF "%b" "***** Alert *****\n\nNotification Type: $(getVal NOTIFICATIONTYPE)\nHost: $(getVal HOSTNAME)\nState: $(getVal HOSTSTATE)\nAddress: $(getVal HOSTADDRESS)\nInfo: $(getVal HOSTOUTPUT)\n\nDate/Time: $(getVal LONGDATETIME)\n" | $MAIL -s "** $(getVal NOTIFICATIONTYPE) Host Alert: $(getVal HOSTNAME) is $(getVal HOSTSTATE) **" $CONTACTEMAIL + printf "%b" "***** Alert *****\n\nNotification Type: $(getVal NOTIFICATIONTYPE)\nHost: $(getVal HOSTNAME)\nState: $(getVal HOSTSTATE)\nAddress: $(getVal HOSTADDRESS)\nInfo: $(getVal HOSTOUTPUT)\n\nDate/Time: $(getVal LONGDATETIME)\n" | mail -s "** $(getVal NOTIFICATIONTYPE) Host Alert: $(getVal HOSTNAME) is $(getVal HOSTSTATE) **" $CONTACTEMAIL fi + if [ "$CONTACTPAGER" != "" ]; then -+ $PRINTF "%b" "$(getVal HOSTNAME) is $(getVal HOSTSTATE) at $(getVal TIME) -- $(getVal HOSTOUTPUT)" | $QPAGE -f icinga $CONTACTPAGER ++ printf "%b" "$(getVal HOSTNAME) is $(getVal HOSTSTATE) at $(getVal TIME) -- $(getVal HOSTOUTPUT)" | qpage -f icinga $CONTACTPAGER + fi fi # *** # *** Make sure the mail command is the last thing in this file so the including file can check the exit code ---- opt/victorops/nagios_plugin/bin/utils.orig 2014-06-16 20:12:16.713013963 -0500 -+++ opt/victorops/nagios_plugin/bin/utils 2014-06-16 20:12:58.533005832 -0500 -@@ -110,6 +110,7 @@ - MV=$(findApp mv) - PRINTF=$(findApp printf) - PS=$(findApp ps) -+QPAGE=$(findApp qpage) - SED=$(findApp sed) - SLEEP=$(findApp sleep) - TAR=$(findApp tar) - Modified: branches/2016Q1/net-mgmt/victorops-nagios/pkg-plist ============================================================================== --- branches/2016Q1/net-mgmt/victorops-nagios/pkg-plist Sun Mar 20 18:16:58 2016 (r411471) +++ branches/2016Q1/net-mgmt/victorops-nagios/pkg-plist Sun Mar 20 18:18:20 2016 (r411472) @@ -1,7 +1,6 @@ -etc/nagios/victorops.cfg-sample -etc/nagios/victorops_email.cfg-sample -etc/nagios/vo_test_svc.cfg-sample -etc/nagios/vo_test_svc_cmd.cfg-sample +@sample etc/victorops/env.sh.sample +@sample etc/victorops/proxy.sh.sample +@sample etc/nagios/victorops.cfg-sample etc/periodic/daily/400.victorops libexec/victorops/check_test_svc libexec/victorops/check_victorops_cmds @@ -13,6 +12,8 @@ libexec/victorops/forward_alerts libexec/victorops/send_email_alert libexec/victorops/send_status libexec/victorops/stop_forwarder -libexec/victorops/support_collect.sh libexec/victorops/url_encode.sed libexec/victorops/utils +@dir etc/nagios +@dir etc/victorops +@dir /var/log/victorops From owner-svn-ports-branches@freebsd.org Mon Mar 21 02:35:46 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4CBABAD60CF; Mon, 21 Mar 2016 02:35:46 +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 052E7256; Mon, 21 Mar 2016 02:35:45 +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 u2L2ZjuV078081; Mon, 21 Mar 2016 02:35:45 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2L2Zj37078079; Mon, 21 Mar 2016 02:35:45 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201603210235.u2L2Zj37078079@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Mon, 21 Mar 2016 02:35:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r411531 - in branches/2016Q1/devel/pcre2: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Mar 2016 02:35:46 -0000 Author: feld Date: Mon Mar 21 02:35:44 2016 New Revision: 411531 URL: https://svnweb.freebsd.org/changeset/ports/411531 Log: MFH: r411530 devel/pcre2: Add patch to resolve CVE PR: 208167 Obtained from: PCRE svn (r489) Security: CVE-2016-3191 Approved by: ports-secteam (with hat) Added: branches/2016Q1/devel/pcre2/files/patch-CVE-2016-3191 - copied unchanged from r411530, head/devel/pcre2/files/patch-CVE-2016-3191 Modified: branches/2016Q1/devel/pcre2/Makefile Directory Properties: branches/2016Q1/ (props changed) Modified: branches/2016Q1/devel/pcre2/Makefile ============================================================================== --- branches/2016Q1/devel/pcre2/Makefile Mon Mar 21 02:34:50 2016 (r411530) +++ branches/2016Q1/devel/pcre2/Makefile Mon Mar 21 02:35:44 2016 (r411531) @@ -3,7 +3,7 @@ PORTNAME= pcre2 PORTVERSION= 10.20 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= SF/pcre/${PORTNAME}/${PORTVERSION} \ ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ \ Copied: branches/2016Q1/devel/pcre2/files/patch-CVE-2016-3191 (from r411530, head/devel/pcre2/files/patch-CVE-2016-3191) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/devel/pcre2/files/patch-CVE-2016-3191 Mon Mar 21 02:35:44 2016 (r411531, copy of r411530, head/devel/pcre2/files/patch-CVE-2016-3191) @@ -0,0 +1,27 @@ +--- src/pcre2_compile.c 2016/02/06 16:40:59 488 ++++ src/pcre2_compile.c 2016/02/10 18:24:02 489 +@@ -5901,10 +5901,22 @@ + goto FAILED; + } + cb->had_accept = TRUE; ++ ++ /* In the first pass, just accumulate the length required; ++ otherwise hitting (*ACCEPT) inside many nested parentheses can ++ cause workspace overflow. */ ++ + for (oc = cb->open_caps; oc != NULL; oc = oc->next) + { +- *code++ = OP_CLOSE; +- PUT2INC(code, 0, oc->number); ++ if (lengthptr != NULL) ++ { ++ *lengthptr += CU2BYTES(1) + IMM2_SIZE; ++ } ++ else ++ { ++ *code++ = OP_CLOSE; ++ PUT2INC(code, 0, oc->number); ++ } + } + setverb = *code++ = + (cb->assert_depth > 0)? OP_ASSERT_ACCEPT : OP_ACCEPT; From owner-svn-ports-branches@freebsd.org Mon Mar 21 02:41:23 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 091F5AD61DF; Mon, 21 Mar 2016 02:41:23 +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 D781099D; Mon, 21 Mar 2016 02:41:22 +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 u2L2fMrG079537; Mon, 21 Mar 2016 02:41:22 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2L2fLbB079533; Mon, 21 Mar 2016 02:41:21 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201603210241.u2L2fLbB079533@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Mon, 21 Mar 2016 02:41:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r411533 - in branches/2016Q1/devel/pcre: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Mar 2016 02:41:23 -0000 Author: feld Date: Mon Mar 21 02:41:21 2016 New Revision: 411533 URL: https://svnweb.freebsd.org/changeset/ports/411533 Log: MFH: r411532 devel/pcre: Update to 8.38 - Remove patches now in the 8.38 release - Add patch to resolve outstanding CVE PR: 208167 Obtained from: PCRE svn (r1631) Security: CVE-2016-3191 Approved by: ports-secteam (with hat) Added: branches/2016Q1/devel/pcre/files/patch-CVE-2016-3191 - copied unchanged from r411532, head/devel/pcre/files/patch-CVE-2016-3191 Deleted: branches/2016Q1/devel/pcre/files/patch-CVE-2015-5073 branches/2016Q1/devel/pcre/files/patch-buffer-overflow branches/2016Q1/devel/pcre/files/patch-r1585-buffer-overflow branches/2016Q1/devel/pcre/files/patch-r1594-heap-overflow Modified: branches/2016Q1/devel/pcre/Makefile branches/2016Q1/devel/pcre/distinfo branches/2016Q1/devel/pcre/pkg-plist Directory Properties: branches/2016Q1/ (props changed) Modified: branches/2016Q1/devel/pcre/Makefile ============================================================================== --- branches/2016Q1/devel/pcre/Makefile Mon Mar 21 02:40:25 2016 (r411532) +++ branches/2016Q1/devel/pcre/Makefile Mon Mar 21 02:41:21 2016 (r411533) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= pcre -PORTVERSION= 8.37 -PORTREVISION= 4 +PORTVERSION= 8.38 +PORTREVISION= 0 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \ ftp://ftp.csx.cam.ac.uk/pub/software/programming/${PORTNAME}/ \ Modified: branches/2016Q1/devel/pcre/distinfo ============================================================================== --- branches/2016Q1/devel/pcre/distinfo Mon Mar 21 02:40:25 2016 (r411532) +++ branches/2016Q1/devel/pcre/distinfo Mon Mar 21 02:41:21 2016 (r411533) @@ -1,2 +1,2 @@ -SHA256 (pcre-8.37.tar.bz2) = 51679ea8006ce31379fb0860e46dd86665d864b5020fc9cd19e71260eef4789d -SIZE (pcre-8.37.tar.bz2) = 1557603 +SHA256 (pcre-8.38.tar.bz2) = b9e02d36e23024d6c02a2e5b25204b3a4fa6ade43e0a5f869f254f49535079df +SIZE (pcre-8.38.tar.bz2) = 1562265 Copied: branches/2016Q1/devel/pcre/files/patch-CVE-2016-3191 (from r411532, head/devel/pcre/files/patch-CVE-2016-3191) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/devel/pcre/files/patch-CVE-2016-3191 Mon Mar 21 02:41:21 2016 (r411533, copy of r411532, head/devel/pcre/files/patch-CVE-2016-3191) @@ -0,0 +1,94 @@ +--- pcre_compile.c 2016/02/10 10:53:45 1630 ++++ pcre_compile.c 2016/02/10 19:13:17 1631 +@@ -6,7 +6,7 @@ + and semantics are as close as possible to those of the Perl 5 language. + + Written by Philip Hazel +- Copyright (c) 1997-2014 University of Cambridge ++ Copyright (c) 1997-2016 University of Cambridge + + ----------------------------------------------------------------------------- + Redistribution and use in source and binary forms, with or without +@@ -560,6 +560,7 @@ + /* 85 */ + "parentheses are too deeply nested (stack check)\0" + "digits missing in \\x{} or \\o{}\0" ++ "regular expression is too complicated\0" + ; + + /* Table to identify digits and hex digits. This is used when compiling +@@ -4591,7 +4592,8 @@ + if (code > cd->start_workspace + cd->workspace_size - + WORK_SIZE_SAFETY_MARGIN) /* Check for overrun */ + { +- *errorcodeptr = ERR52; ++ *errorcodeptr = (code >= cd->start_workspace + cd->workspace_size)? ++ ERR52 : ERR87; + goto FAILED; + } + +@@ -6626,8 +6628,21 @@ + cd->had_accept = TRUE; + for (oc = cd->open_caps; oc != NULL; oc = oc->next) + { +- *code++ = OP_CLOSE; +- PUT2INC(code, 0, oc->number); ++ if (lengthptr != NULL) ++ { ++#ifdef COMPILE_PCRE8 ++ *lengthptr += 1 + IMM2_SIZE; ++#elif defined COMPILE_PCRE16 ++ *lengthptr += 2 + IMM2_SIZE; ++#elif defined COMPILE_PCRE32 ++ *lengthptr += 4 + IMM2_SIZE; ++#endif ++ } ++ else ++ { ++ *code++ = OP_CLOSE; ++ PUT2INC(code, 0, oc->number); ++ } + } + setverb = *code++ = + (cd->assert_depth > 0)? OP_ASSERT_ACCEPT : OP_ACCEPT; +--- pcre_internal.h 2016/02/10 10:53:45 1630 ++++ pcre_internal.h 2016/02/10 19:13:17 1631 +@@ -7,7 +7,7 @@ + and semantics are as close as possible to those of the Perl 5 language. + + Written by Philip Hazel +- Copyright (c) 1997-2014 University of Cambridge ++ Copyright (c) 1997-2016 University of Cambridge + + ----------------------------------------------------------------------------- + Redistribution and use in source and binary forms, with or without +@@ -2289,7 +2289,7 @@ + ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59, + ERR60, ERR61, ERR62, ERR63, ERR64, ERR65, ERR66, ERR67, ERR68, ERR69, + ERR70, ERR71, ERR72, ERR73, ERR74, ERR75, ERR76, ERR77, ERR78, ERR79, +- ERR80, ERR81, ERR82, ERR83, ERR84, ERR85, ERR86, ERRCOUNT }; ++ ERR80, ERR81, ERR82, ERR83, ERR84, ERR85, ERR86, ERR87, ERRCOUNT }; + + /* JIT compiling modes. The function list is indexed by them. */ + +--- pcreposix.c 2016/02/10 10:53:45 1630 ++++ pcreposix.c 2016/02/10 19:13:17 1631 +@@ -6,7 +6,7 @@ + and semantics are as close as possible to those of the Perl 5 language. + + Written by Philip Hazel +- Copyright (c) 1997-2014 University of Cambridge ++ Copyright (c) 1997-2016 University of Cambridge + + ----------------------------------------------------------------------------- + Redistribution and use in source and binary forms, with or without +@@ -173,7 +173,8 @@ + REG_BADPAT, /* group name must start with a non-digit */ + /* 85 */ + REG_BADPAT, /* parentheses too deeply nested (stack check) */ +- REG_BADPAT /* missing digits in \x{} or \o{} */ ++ REG_BADPAT, /* missing digits in \x{} or \o{} */ ++ REG_BADPAT /* pattern too complicated */ + }; + + /* Table of texts corresponding to POSIX error codes */ Modified: branches/2016Q1/devel/pcre/pkg-plist ============================================================================== --- branches/2016Q1/devel/pcre/pkg-plist Mon Mar 21 02:40:25 2016 (r411532) +++ branches/2016Q1/devel/pcre/pkg-plist Mon Mar 21 02:41:21 2016 (r411533) @@ -10,16 +10,16 @@ include/pcrecpp.h lib/libpcre.a lib/libpcre.so lib/libpcre.so.1 -lib/libpcre.so.1.2.5 +lib/libpcre.so.1.2.6 lib/libpcre.so.3 lib/libpcre16.a lib/libpcre16.so lib/libpcre16.so.0 -lib/libpcre16.so.0.2.5 +lib/libpcre16.so.0.2.6 lib/libpcre32.a lib/libpcre32.so lib/libpcre32.so.0 -lib/libpcre32.so.0.0.5 +lib/libpcre32.so.0.0.6 lib/libpcrecpp.a lib/libpcrecpp.so lib/libpcrecpp.so.0 From owner-svn-ports-branches@freebsd.org Mon Mar 21 13:47:53 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 18EF6AD721F; Mon, 21 Mar 2016 13:47:53 +0000 (UTC) (envelope-from garga@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 C3F526E1; Mon, 21 Mar 2016 13:47:52 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2LDlp2f083591; Mon, 21 Mar 2016 13:47:51 GMT (envelope-from garga@FreeBSD.org) Received: (from garga@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2LDlpru083589; Mon, 21 Mar 2016 13:47:51 GMT (envelope-from garga@FreeBSD.org) Message-Id: <201603211347.u2LDlpru083589@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: garga set sender to garga@FreeBSD.org using -f From: Renato Botelho Date: Mon, 21 Mar 2016 13:47:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r411561 - in branches/2016Q1/devel/git: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Mar 2016 13:47:53 -0000 Author: garga Date: Mon Mar 21 13:47:51 2016 New Revision: 411561 URL: https://svnweb.freebsd.org/changeset/ports/411561 Log: MFH: r411551 Import a patch from git mailing list to fix build with gcc 4.2.1 and remove dependency of newer gcc to build it on 9.x Obtained from: http://thread.gmane.org/gmane.comp.version-control.git/289397 Approved by: ports-secteam (feld) Added: branches/2016Q1/devel/git/files/patch-git-compat-util.h - copied unchanged from r411551, head/devel/git/files/patch-git-compat-util.h Modified: branches/2016Q1/devel/git/Makefile Directory Properties: branches/2016Q1/ (props changed) Modified: branches/2016Q1/devel/git/Makefile ============================================================================== --- branches/2016Q1/devel/git/Makefile Mon Mar 21 13:27:33 2016 (r411560) +++ branches/2016Q1/devel/git/Makefile Mon Mar 21 13:47:51 2016 (r411561) @@ -3,6 +3,7 @@ PORTNAME= git DISTVERSION= 2.7.4 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= KERNEL_ORG/software/scm/git DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ Copied: branches/2016Q1/devel/git/files/patch-git-compat-util.h (from r411551, head/devel/git/files/patch-git-compat-util.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/devel/git/files/patch-git-compat-util.h Mon Mar 21 13:47:51 2016 (r411561, copy of r411551, head/devel/git/files/patch-git-compat-util.h) @@ -0,0 +1,13 @@ +--- git-compat-util.h.orig 2016-03-21 10:34:43 UTC ++++ git-compat-util.h +@@ -715,8 +715,8 @@ static inline size_t st_add(size_t a, si + (uintmax_t)a, (uintmax_t)b); + return a + b; + } +-#define st_add3(a,b,c) st_add((a),st_add((b),(c))) +-#define st_add4(a,b,c,d) st_add((a),st_add3((b),(c),(d))) ++#define st_add3(a,b,c) st_add(st_add((a),(b)),(c)) ++#define st_add4(a,b,c,d) st_add(st_add3((a),(b),(c)),(d)) + + static inline size_t st_mult(size_t a, size_t b) + { From owner-svn-ports-branches@freebsd.org Mon Mar 21 20:41:23 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5F120AD83F5; Mon, 21 Mar 2016 20:41:23 +0000 (UTC) (envelope-from antoine@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 311B9A13; Mon, 21 Mar 2016 20:41:23 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2LKfMcP014776; Mon, 21 Mar 2016 20:41:22 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2LKfM7D014775; Mon, 21 Mar 2016 20:41:22 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201603212041.u2LKfM7D014775@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Mon, 21 Mar 2016 20:41:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r411618 - branches/2016Q1/misc/freebsd-doc-en X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Mar 2016 20:41:23 -0000 Author: antoine Date: Mon Mar 21 20:41:22 2016 New Revision: 411618 URL: https://svnweb.freebsd.org/changeset/ports/411618 Log: MFH: r411616 Ignore on the 9.3 i386 package builders, java seems to have issues in 9.3 i386 jails on the package builders Reported by: pkg-fallout Modified: branches/2016Q1/misc/freebsd-doc-en/Makefile Directory Properties: branches/2016Q1/ (props changed) Modified: branches/2016Q1/misc/freebsd-doc-en/Makefile ============================================================================== --- branches/2016Q1/misc/freebsd-doc-en/Makefile Mon Mar 21 20:41:05 2016 (r411617) +++ branches/2016Q1/misc/freebsd-doc-en/Makefile Mon Mar 21 20:41:22 2016 (r411618) @@ -54,6 +54,10 @@ OPTIONS_SET+= ${AVAILABLEFORMATS} .include +.if defined(PACKAGE_BUILDING) && ${OSVERSION} < 1000000 && ${ARCH} == i386 +IGNORE= fails to build on the package builders in 9.x i386 jails due to java exceptions +.endif + .for O in ${AVAILABLEFORMATS} .if ${PORT_OPTIONS:M${O}} DOCFORMAT+= ${O:tl:S,_,-,} From owner-svn-ports-branches@freebsd.org Tue Mar 22 13:12:08 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9F49BAD967E; Tue, 22 Mar 2016 13:12:08 +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 6291428C; Tue, 22 Mar 2016 13:12:08 +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 u2MDC7Wj019749; Tue, 22 Mar 2016 13:12:07 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2MDC7nS019743; Tue, 22 Mar 2016 13:12:07 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201603221312.u2MDC7nS019743@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Tue, 22 Mar 2016 13:12:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r411658 - in branches/2016Q1/mail/milter-greylist: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Mar 2016 13:12:08 -0000 Author: feld Date: Tue Mar 22 13:12:06 2016 New Revision: 411658 URL: https://svnweb.freebsd.org/changeset/ports/411658 Log: mail/milter-greylist: Fix options - Remove DKIM option as it reportedly never worked - Regenerate patches to appease portlint PR: 207246 Approved by: ports-secteam (with hat) Modified: branches/2016Q1/mail/milter-greylist/Makefile branches/2016Q1/mail/milter-greylist/files/patch-configure branches/2016Q1/mail/milter-greylist/files/patch-greylist.conf branches/2016Q1/mail/milter-greylist/files/patch-ldapcheck.c branches/2016Q1/mail/milter-greylist/files/patch-sync.c Directory Properties: branches/2016Q1/ (props changed) Modified: branches/2016Q1/mail/milter-greylist/Makefile ============================================================================== --- branches/2016Q1/mail/milter-greylist/Makefile Tue Mar 22 13:11:14 2016 (r411657) +++ branches/2016Q1/mail/milter-greylist/Makefile Tue Mar 22 13:12:06 2016 (r411658) @@ -3,7 +3,7 @@ PORTNAME= milter-greylist PORTVERSION= 4.4.3 -PORTREVISION= 4 +PORTREVISION= 6 CATEGORIES= mail MASTER_SITES= ftp://ftp.espci.fr/pub/milter-greylist/ \ http://fossies.org/unix/privat/ @@ -31,9 +31,8 @@ USES= tar:tgz # installed port preference over it. ## -OPTIONS_DEFINE= SPF GEOIP CURL DKIM LDAP P0F POSTFIX DOCS EXAMPLES +OPTIONS_DEFINE= SPF GEOIP CURL LDAP P0F POSTFIX DOCS EXAMPLES SPF_DESC= SPF support -DKIM_DESC= DKIM support CURL_DESC= curl support P0F_DESC= P0F support POSTFIX_DESC= Use Postfix instead of Sendmail @@ -42,7 +41,6 @@ P0F_RUN_DEPENDS= p0f:${PORTSDIR}/net-mgm SPF_LIB_DEPENDS= libspf2.so:${PORTSDIR}/mail/libspf2 CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl GEOIP_LIB_DEPENDS= libGeoIP.so:${PORTSDIR}/net/GeoIP -DKIM_LIB_DEPENDS= libdkim.so:${PORTSDIR}/mail/libdkim POSTFIX_CONFIGURE_ENABLE= postfix POSTFIX_LDFLAGS_OFF= ${SENDMAIL_LDFLAGS} @@ -50,10 +48,9 @@ POSTFIX_LIBS_OFF= ${SENDMAIL_LDADD} P0F_CONFIGURE_ENABLE= p0f306 -DKIM_CONFIGURE_WITH= --with-libdkim=${LOCALBASE} -SPF_CONFIGURE_WITH= --with-libspf2=${LOCALBASE} -GEOIP__CONFIGURE_WITH= --with-libGeoIP=${LOCALBASE} -CURL_CONFIGURE_WITH= --with-libcurl=${LOCALBASE} +SPF_CONFIGURE_ON= --with-libspf2=${LOCALBASE} +GEOIP_CONFIGURE_ON= --with-libGeoIP=${LOCALBASE} +CURL_CONFIGURE_ON= --with-libcurl=${LOCALBASE} LDAP_CONFIGURE_ON= --with-openldap=${LOCALBASE} LDAP_LDFLAGS= -L${LOCALBASE}/lib LDAP_USE= OPENLDAP=yes Modified: branches/2016Q1/mail/milter-greylist/files/patch-configure ============================================================================== --- branches/2016Q1/mail/milter-greylist/files/patch-configure Tue Mar 22 13:11:14 2016 (r411657) +++ branches/2016Q1/mail/milter-greylist/files/patch-configure Tue Mar 22 13:12:06 2016 (r411658) @@ -1,8 +1,7 @@ Index: configure -diff -u configure.orig configure ---- configure.orig 2013-03-07 22:26:11.000000000 +0900 -+++ configure 2013-03-14 15:35:15.476674058 +0900 -@@ -5899,7 +5899,7 @@ +--- configure.orig 2013-03-07 13:26:11 UTC ++++ configure +@@ -5899,7 +5899,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5 $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; } if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then : Modified: branches/2016Q1/mail/milter-greylist/files/patch-greylist.conf ============================================================================== --- branches/2016Q1/mail/milter-greylist/files/patch-greylist.conf Tue Mar 22 13:11:14 2016 (r411657) +++ branches/2016Q1/mail/milter-greylist/files/patch-greylist.conf Tue Mar 22 13:12:06 2016 (r411658) @@ -1,6 +1,6 @@ ---- greylist.conf.orig 2009-02-13 01:39:01.000000000 +0300 -+++ greylist.conf 2009-04-22 09:10:46.000000000 +0400 -@@ -9,7 +9,7 @@ +--- greylist.conf.orig 2013-01-27 02:10:19 UTC ++++ greylist.conf +@@ -9,7 +9,7 @@ pidfile "/var/run/milter-greylist.pid" socket "/var/milter-greylist/milter-greylist.sock" dumpfile "/var/milter-greylist/greylist.db" 600 dumpfreq 1 Modified: branches/2016Q1/mail/milter-greylist/files/patch-ldapcheck.c ============================================================================== --- branches/2016Q1/mail/milter-greylist/files/patch-ldapcheck.c Tue Mar 22 13:11:14 2016 (r411657) +++ branches/2016Q1/mail/milter-greylist/files/patch-ldapcheck.c Tue Mar 22 13:12:06 2016 (r411658) @@ -1,6 +1,6 @@ ---- ldapcheck.c.orig 2009-04-09 05:26:46.000000000 +0200 -+++ ldapcheck.c 2009-10-23 23:57:42.000000000 +0200 -@@ -58,6 +58,22 @@ +--- ldapcheck.c.orig 2013-01-19 16:01:15 UTC ++++ ldapcheck.c +@@ -60,6 +60,22 @@ __RCSID("$Id: ldapcheck.c,v 1.18 2013/01 #include "prop.h" #include "ldapcheck.h" Modified: branches/2016Q1/mail/milter-greylist/files/patch-sync.c ============================================================================== --- branches/2016Q1/mail/milter-greylist/files/patch-sync.c Tue Mar 22 13:11:14 2016 (r411657) +++ branches/2016Q1/mail/milter-greylist/files/patch-sync.c Tue Mar 22 13:12:06 2016 (r411658) @@ -1,8 +1,7 @@ Index: sync.c -diff -u -p sync.c.orig sync.c ---- sync.c.orig 2010-04-17 12:19:02.000000000 +0900 -+++ sync.c 2013-03-14 14:57:39.284674283 +0900 -@@ -478,7 +478,11 @@ peer_connect(peer) /* peer list is read- +--- sync.c.orig 2010-06-16 01:30:30 UTC ++++ sync.c +@@ -487,7 +487,11 @@ peer_connect(peer) /* peer list is read- #ifdef AF_INET6 case AF_INET6: SA6(res->ai_addr)->sin6_port = service; From owner-svn-ports-branches@freebsd.org Wed Mar 23 00:36:28 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4BFD599AC20; Wed, 23 Mar 2016 00:36:28 +0000 (UTC) (envelope-from jgh@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 050831340; Wed, 23 Mar 2016 00:36:27 +0000 (UTC) (envelope-from jgh@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2N0aREH026899; Wed, 23 Mar 2016 00:36:27 GMT (envelope-from jgh@FreeBSD.org) Received: (from jgh@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2N0aRwK026897; Wed, 23 Mar 2016 00:36:27 GMT (envelope-from jgh@FreeBSD.org) Message-Id: <201603230036.u2N0aRwK026897@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jgh set sender to jgh@FreeBSD.org using -f From: Jason Helfman Date: Wed, 23 Mar 2016 00:36:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r411682 - branches/2016Q1/deskutils/xpad X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Mar 2016 00:36:28 -0000 Author: jgh Date: Wed Mar 23 00:36:26 2016 New Revision: 411682 URL: https://svnweb.freebsd.org/changeset/ports/411682 Log: MFH: r409470 r411680 Approved by: ports-secteam (with hat) - update to 4.6.0 Changes: https://launchpadlibrarian.net/226572923/ChangeLog - update to 4.7.0 Changes: https://launchpadlibrarian.net/247614751/ChangeLog Modified: branches/2016Q1/deskutils/xpad/Makefile branches/2016Q1/deskutils/xpad/distinfo Directory Properties: branches/2016Q1/ (props changed) Modified: branches/2016Q1/deskutils/xpad/Makefile ============================================================================== --- branches/2016Q1/deskutils/xpad/Makefile Wed Mar 23 00:29:52 2016 (r411681) +++ branches/2016Q1/deskutils/xpad/Makefile Wed Mar 23 00:36:26 2016 (r411682) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= xpad -PORTVERSION= 4.5.0 -PORTREVISION= 1 +PORTVERSION= 4.7.0 CATEGORIES= deskutils -MASTER_SITES= http://launchpad.net/${PORTNAME}/trunk/4.5/+download/ +MASTER_SITES= https://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/ MAINTAINER= jgh@FreeBSD.org COMMENT= Virtual note-pad system for your X11 desktop @@ -35,6 +34,8 @@ NLS_CONFIGURE_ENABLE= nls post-patch: @${REINPLACE_CMD} -e 's|glib/glist.h|glib.h|g' \ ${WRKSRC}/src/xpad-undo.c + @${REINPLACE_CMD} -e 's|/etc/xdg/autostart|${LOCALBASE}/etc/xdg/autostart|g' \ + ${WRKSRC}/Makefile.am post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: branches/2016Q1/deskutils/xpad/distinfo ============================================================================== --- branches/2016Q1/deskutils/xpad/distinfo Wed Mar 23 00:29:52 2016 (r411681) +++ branches/2016Q1/deskutils/xpad/distinfo Wed Mar 23 00:36:26 2016 (r411682) @@ -1,2 +1,2 @@ -SHA256 (xpad-4.5.0.tar.bz2) = f870cefc92593febf266bb0f90ceb0feeb4af7eb1033625fca50933701a7b9e8 -SIZE (xpad-4.5.0.tar.bz2) = 1907957 +SHA256 (xpad-4.7.0.tar.bz2) = 4b11963077e265d8ca8396b2a8e841c068a95f538197397631fdd75ab195b13c +SIZE (xpad-4.7.0.tar.bz2) = 240374 From owner-svn-ports-branches@freebsd.org Wed Mar 23 23:28:23 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F1B08ADB996; Wed, 23 Mar 2016 23:28:23 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C392B1953; Wed, 23 Mar 2016 23:28:23 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2NNSMJN046031; Wed, 23 Mar 2016 23:28:22 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2NNSMvf046030; Wed, 23 Mar 2016 23:28:22 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201603232328.u2NNSMvf046030@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Wed, 23 Mar 2016 23:28:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r411746 - branches/2016Q1/x11/leechcraft X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Mar 2016 23:28:24 -0000 Author: rakuco Date: Wed Mar 23 23:28:22 2016 New Revision: 411746 URL: https://svnweb.freebsd.org/changeset/ports/411746 Log: MFH: r411745 Drop MAKE_JOBS_UNSAFE. The port built fine with -j56 on Poudriere, and it also ran fine. I'm tempted to believe whatever problems there were when the port was initially added to the tree have since been solved, and the port should be make jobs safe now. PR: 207191 Approved by: maintainer timeout (vg, 39 days) Approved by: portmgr blanket approval Modified: branches/2016Q1/x11/leechcraft/Makefile Directory Properties: branches/2016Q1/ (props changed) Modified: branches/2016Q1/x11/leechcraft/Makefile ============================================================================== --- branches/2016Q1/x11/leechcraft/Makefile Wed Mar 23 23:26:19 2016 (r411745) +++ branches/2016Q1/x11/leechcraft/Makefile Wed Mar 23 23:28:22 2016 (r411746) @@ -19,7 +19,6 @@ LIB_DEPENDS= libqwt6.so:${PORTSDIR}/x11- #LC_REV= 1526-g7fdb92a INSTALLS_ICONS= yes -MAKE_JOBS_UNSAFE=yes USE_LDCONFIG= yes USES= cmake pkgconfig tar:xz USE_QT4= corelib declarative gui network script sql sql-sqlite3_run \ From owner-svn-ports-branches@freebsd.org Thu Mar 24 13:29:07 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 426DEADB6D0; Thu, 24 Mar 2016 13:29:07 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E9B3915ED; Thu, 24 Mar 2016 13:29:06 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2ODT6VM009096; Thu, 24 Mar 2016 13:29:06 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2ODT5sK009094; Thu, 24 Mar 2016 13:29:05 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201603241329.u2ODT5sK009094@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 24 Mar 2016 13:29:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r411783 - branches/2016Q1/security/umit X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Mar 2016 13:29:07 -0000 Author: amdmi3 Date: Thu Mar 24 13:29:05 2016 New Revision: 411783 URL: https://svnweb.freebsd.org/changeset/ports/411783 Log: MFH: r411782 - Fix symlink to icon file - While here, add LICENSE_FILE PR: 208237 Submitted by: admin@vladiom.com.ua Approved by: ports-secteam blanket Modified: branches/2016Q1/security/umit/Makefile branches/2016Q1/security/umit/pkg-plist Directory Properties: branches/2016Q1/ (props changed) Modified: branches/2016Q1/security/umit/Makefile ============================================================================== --- branches/2016Q1/security/umit/Makefile Thu Mar 24 13:27:58 2016 (r411782) +++ branches/2016Q1/security/umit/Makefile Thu Mar 24 13:29:05 2016 (r411783) @@ -3,7 +3,7 @@ PORTNAME= umit PORTVERSION= 1.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= security MASTER_SITES= SF PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,6 +12,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Nmap frontend developed with Python and PyGTK LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \ ${LOCALBASE}/bin/nmap:${PORTSDIR}/security/nmap @@ -41,7 +42,7 @@ post-patch: post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps - @${LN} -sf ${DATADIR}/pixmaps/umit_48x48.png \ + @${LN} -sf ${PREFIX}/share/pixmaps/umit/umit_48x48.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/umit.png .include Modified: branches/2016Q1/security/umit/pkg-plist ============================================================================== --- branches/2016Q1/security/umit/pkg-plist Thu Mar 24 13:27:58 2016 (r411782) +++ branches/2016Q1/security/umit/pkg-plist Thu Mar 24 13:29:05 2016 (r411783) @@ -706,10 +706,10 @@ share/pixmaps/umit/wizard_logo.png %%DATADIR%%/misc/os_classification.dmp %%DATADIR%%/misc/os_db.dmp %%DATADIR%%/misc/services.dmp -@dir %%DATADIR%%/plugins %%DATADIR%%/sql/sqlite-delete-triggers.sql %%DATADIR%%/sql/sqlite-drop-tables.sql %%DATADIR%%/sql/sqlite-drop-triggers.sql %%DATADIR%%/sql/sqlite-insert-triggers.sql %%DATADIR%%/sql/sqlite-schema.sql %%DATADIR%%/sql/sqlite-update-triggers.sql +@dir %%DATADIR%%/plugins From owner-svn-ports-branches@freebsd.org Fri Mar 25 10:34:23 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7A3D7ADDA3C; Fri, 25 Mar 2016 10:34:23 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4A82B17C7; Fri, 25 Mar 2016 10:34:23 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2PAYMSY098967; Fri, 25 Mar 2016 10:34:22 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2PAYMeq098966; Fri, 25 Mar 2016 10:34:22 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201603251034.u2PAYMeq098966@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Fri, 25 Mar 2016 10:34:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r411832 - branches/2016Q1/devel/qt5-help X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Mar 2016 10:34:23 -0000 Author: rakuco Date: Fri Mar 25 10:34:22 2016 New Revision: 411832 URL: https://svnweb.freebsd.org/changeset/ports/411832 Log: MFH: r411831 Add a runtime dependency on databases/qt5-sqldrivers-sqlite3. Tools such as qcollectiongenerator fail to run when it is not present. Approved by: portmgr blanket approval Modified: branches/2016Q1/devel/qt5-help/Makefile Directory Properties: branches/2016Q1/ (props changed) Modified: branches/2016Q1/devel/qt5-help/Makefile ============================================================================== --- branches/2016Q1/devel/qt5-help/Makefile Fri Mar 25 10:33:07 2016 (r411831) +++ branches/2016Q1/devel/qt5-help/Makefile Fri Mar 25 10:34:22 2016 (r411832) @@ -2,13 +2,15 @@ PORTNAME= help DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt online help integration module -USE_QT5= clucene core gui network sql widgets buildtools_build +USE_QT5= clucene core gui network sql widgets \ + buildtools_build sql-sqlite3_run QT_DIST= tools USES= qmake USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} From owner-svn-ports-branches@freebsd.org Sat Mar 26 19:23:14 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 88DACADEC2E; Sat, 26 Mar 2016 19:23:14 +0000 (UTC) (envelope-from pi@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 5A0D91D51; Sat, 26 Mar 2016 19:23:14 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2QJND1l008491; Sat, 26 Mar 2016 19:23:13 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2QJNDYk008489; Sat, 26 Mar 2016 19:23:13 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201603261923.u2QJNDYk008489@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sat, 26 Mar 2016 19:23:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r411959 - branches/2016Q1/sysutils/sas2ircu X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Mar 2016 19:23:14 -0000 Author: pi Date: Sat Mar 26 19:23:13 2016 New Revision: 411959 URL: https://svnweb.freebsd.org/changeset/ports/411959 Log: sysutils/sas2ircu: fix distinfo from upstream - the PDF changed a little bit, no code changes PR: 208304 Submitted by: Daniel Austin (maintainer) Approved by: portmgr blanket (quarterly fails to build) Modified: branches/2016Q1/sysutils/sas2ircu/Makefile branches/2016Q1/sysutils/sas2ircu/distinfo Modified: branches/2016Q1/sysutils/sas2ircu/Makefile ============================================================================== --- branches/2016Q1/sysutils/sas2ircu/Makefile Sat Mar 26 19:17:00 2016 (r411958) +++ branches/2016Q1/sysutils/sas2ircu/Makefile Sat Mar 26 19:23:13 2016 (r411959) @@ -2,6 +2,7 @@ PORTNAME= sas2ircu PORTVERSION= 20.00.00.00 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://docs.avagotech.com/docs-and-downloads/host-bus-adapters/host-bus-adapters-common-files/sas_sata_6g_p20/ DISTNAME= SAS2IRCU_P20 Modified: branches/2016Q1/sysutils/sas2ircu/distinfo ============================================================================== --- branches/2016Q1/sysutils/sas2ircu/distinfo Sat Mar 26 19:17:00 2016 (r411958) +++ branches/2016Q1/sysutils/sas2ircu/distinfo Sat Mar 26 19:23:13 2016 (r411959) @@ -1,2 +1,2 @@ -SHA256 (SAS2IRCU_P20.zip) = e6ab5df212aeaa7976f822695450593d78741a8bd5337c95907a3fbca4d62d7c -SIZE (SAS2IRCU_P20.zip) = 2601241 +SHA256 (SAS2IRCU_P20.zip) = cfcd37dcdb0ccd86d5546e1945e40cfcd11ba8fdaaeee94521a03855f448f35d +SIZE (SAS2IRCU_P20.zip) = 2777954