From owner-svn-ports-branches@FreeBSD.ORG Sun Jan 26 12:25:41 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 5B725532; Sun, 26 Jan 2014 12:25:41 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2D534122A; Sun, 26 Jan 2014 12:25:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0QCPf4s023523; Sun, 26 Jan 2014 12:25:41 GMT (envelope-from riggs@svn.freebsd.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0QCPePl023521; Sun, 26 Jan 2014 12:25:40 GMT (envelope-from riggs@svn.freebsd.org) Message-Id: <201401261225.s0QCPePl023521@svn.freebsd.org> From: Thomas Zander Date: Sun, 26 Jan 2014 12:25:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341166 - in branches/2014Q1/multimedia/oggvideotools: . 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.17 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, 26 Jan 2014 12:25:41 -0000 Author: riggs Date: Sun Jan 26 12:25:40 2014 New Revision: 341166 URL: http://svnweb.freebsd.org/changeset/ports/341166 QAT: https://qat.redports.org/buildarchive/r341166/ Log: MFH: r341157 Fix runtime issue: Non-integer frame rates could not be handled - Fix incorrect handling of input arguments (new patch file patch-src_cmdlineextractor.h) Submitter proposed fix after talking to upstream author - Bump PORTREVISION PR: ports/185738 Submitted by: Sergey Chernikov (s.bilberry@gmail.com) Approved by: portmgr (antoine), thierry (mentor) Added: branches/2014Q1/multimedia/oggvideotools/files/patch-src_cmdlineextractor.h - copied unchanged from r341157, head/multimedia/oggvideotools/files/patch-src_cmdlineextractor.h Modified: branches/2014Q1/multimedia/oggvideotools/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/multimedia/oggvideotools/Makefile ============================================================================== --- branches/2014Q1/multimedia/oggvideotools/Makefile Sun Jan 26 12:17:39 2014 (r341165) +++ branches/2014Q1/multimedia/oggvideotools/Makefile Sun Jan 26 12:25:40 2014 (r341166) @@ -3,7 +3,7 @@ PORTNAME= oggvideotools PORTVERSION= 0.8a -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTNAME} Copied: branches/2014Q1/multimedia/oggvideotools/files/patch-src_cmdlineextractor.h (from r341157, head/multimedia/oggvideotools/files/patch-src_cmdlineextractor.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/multimedia/oggvideotools/files/patch-src_cmdlineextractor.h Sun Jan 26 12:25:40 2014 (r341166, copy of r341157, head/multimedia/oggvideotools/files/patch-src_cmdlineextractor.h) @@ -0,0 +1,11 @@ +--- src/cmdlineextractor.h.orig 2010-05-30 21:11:10.000000000 +0200 ++++ src/cmdlineextractor.h 2014-01-25 18:46:51.620972183 +0100 +@@ -20,7 +20,7 @@ + #include "oggComment.h" + #include "blendElement.h" + +-const std::string validChars ( "0123456789,x" ); ++const std::string validChars ( "0123456789,x:" ); + const std::string + validTextChars ( "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 /\\.,=;:-_" ); + From owner-svn-ports-branches@FreeBSD.ORG Mon Jan 27 22:54:11 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 413A1C93; Mon, 27 Jan 2014 22:54: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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2C20919D7; Mon, 27 Jan 2014 22:54:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0RMsBel047253; Mon, 27 Jan 2014 22:54:11 GMT (envelope-from matthew@svn.freebsd.org) Received: (from matthew@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0RMsAQr047251; Mon, 27 Jan 2014 22:54:10 GMT (envelope-from matthew@svn.freebsd.org) Message-Id: <201401272254.s0RMsAQr047251@svn.freebsd.org> From: Matthew Seaman Date: Mon, 27 Jan 2014 22:54:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341468 - branches/2014Q1/mail/p5-Email-Address-List 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.17 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, 27 Jan 2014 22:54:11 -0000 Author: matthew Date: Mon Jan 27 22:54:10 2014 New Revision: 341468 URL: http://svnweb.freebsd.org/changeset/ports/341468 QAT: https://qat.redports.org/buildarchive/r341468/ Log: MFH: r341448 Update to 0.03 This fixes a denial-of-service vulnerability in the www/rt42 port which depends on mail/p5-Email-Address-List Security: d1dfc4c7-8791-11e3-a371-6805ca0b3d42 Approved by: portmgr (erwin) Modified: branches/2014Q1/mail/p5-Email-Address-List/Makefile branches/2014Q1/mail/p5-Email-Address-List/distinfo Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/mail/p5-Email-Address-List/Makefile ============================================================================== --- branches/2014Q1/mail/p5-Email-Address-List/Makefile Mon Jan 27 22:53:24 2014 (r341467) +++ branches/2014Q1/mail/p5-Email-Address-List/Makefile Mon Jan 27 22:54:10 2014 (r341468) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= Email-Address-List -PORTVERSION= 0.01 -PORTREVISION= 1 +PORTVERSION= 0.03 CATEGORIES= mail perl5 -MASTER_SITES= CPAN +MASTER_SITES= http://download.bestpractical.com/mirror/ \ + CPAN PKGNAMEPREFIX= p5- MAINTAINER= matthew@FreeBSD.org Modified: branches/2014Q1/mail/p5-Email-Address-List/distinfo ============================================================================== --- branches/2014Q1/mail/p5-Email-Address-List/distinfo Mon Jan 27 22:53:24 2014 (r341467) +++ branches/2014Q1/mail/p5-Email-Address-List/distinfo Mon Jan 27 22:54:10 2014 (r341468) @@ -1,2 +1,2 @@ -SHA256 (Email-Address-List-0.01.tar.gz) = 8ff17fc06ff6d67d378e30f16e2e1930f2a1d5db2f7f59973b4166d38cac4a3e -SIZE (Email-Address-List-0.01.tar.gz) = 26082 +SHA256 (Email-Address-List-0.03.tar.gz) = 3cd0e92e5233178263f632e9c5d1fbfddfe09503baa251174aca4ee2fa5f87fe +SIZE (Email-Address-List-0.03.tar.gz) = 29318 From owner-svn-ports-branches@FreeBSD.ORG Mon Jan 27 23:01:17 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 19C13E7B; Mon, 27 Jan 2014 23:01:17 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DFD7A1A74; Mon, 27 Jan 2014 23:01:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0RN1GM0051029; Mon, 27 Jan 2014 23:01:16 GMT (envelope-from matthew@svn.freebsd.org) Received: (from matthew@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0RN1GPF051027; Mon, 27 Jan 2014 23:01:16 GMT (envelope-from matthew@svn.freebsd.org) Message-Id: <201401272301.s0RN1GPF051027@svn.freebsd.org> From: Matthew Seaman Date: Mon, 27 Jan 2014 23:01:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341470 - branches/2014Q1/www/rt42 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.17 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, 27 Jan 2014 23:01:17 -0000 Author: matthew Date: Mon Jan 27 23:01:16 2014 New Revision: 341470 URL: http://svnweb.freebsd.org/changeset/ports/341470 QAT: https://qat.redports.org/buildarchive/r341470/ Log: MFH: r341450 Due to a denial-of-service vulnerability in www/rt42 versions 4.2.0 -- 4.2.2 inclusive, require at least version 0.03 of mail/p5-Email-Address-List. It's this port which is vulnerable, but the essential fix is to update p5-Email-Address-List. Security: d1dfc4c7-8791-11e3-a371-6805ca0b3d42 Approved by: portmgr (erwin) Modified: branches/2014Q1/www/rt42/Makefile branches/2014Q1/www/rt42/Makefile.cpan Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/www/rt42/Makefile ============================================================================== --- branches/2014Q1/www/rt42/Makefile Mon Jan 27 23:01:11 2014 (r341469) +++ branches/2014Q1/www/rt42/Makefile Mon Jan 27 23:01:16 2014 (r341470) @@ -2,7 +2,7 @@ PORTNAME= rt DISTVERSION= 4.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= http://download.bestpractical.com/pub/rt/release/ PKGNAMESUFFIX= 42 Modified: branches/2014Q1/www/rt42/Makefile.cpan ============================================================================== --- branches/2014Q1/www/rt42/Makefile.cpan Mon Jan 27 23:01:11 2014 (r341469) +++ branches/2014Q1/www/rt42/Makefile.cpan Mon Jan 27 23:01:16 2014 (r341470) @@ -91,7 +91,7 @@ CORE_DEPS= p5-Apache-Session>=1.53:${POR p5-Devel-GlobalDestruction>0:${PORTSDIR}/devel/p5-Devel-GlobalDestruction \ p5-Devel-StackTrace>=1.30:${PORTSDIR}/devel/p5-Devel-StackTrace \ p5-Email-Address>=1.89.7:${PORTSDIR}/mail/p5-Email-Address \ - p5-Email-Address-List>0:${PORTSDIR}/mail/p5-Email-Address-List \ + p5-Email-Address-List>=0.03:${PORTSDIR}/mail/p5-Email-Address-List \ p5-File-ShareDir>0:${PORTSDIR}/devel/p5-File-ShareDir \ p5-HTML-FormatText-WithLinks-AndTables>0:${PORTSDIR}/textproc/p5-HTML-FormatText-WithLinks-AndTables \ p5-HTML-FormatText-WithLinks>=0.14:${PORTSDIR}/textproc/p5-HTML-FormatText-WithLinks \ From owner-svn-ports-branches@FreeBSD.ORG Mon Jan 27 23:45:11 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 B63F72AC; Mon, 27 Jan 2014 23:45: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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A0F8E1E35; Mon, 27 Jan 2014 23:45:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0RNjBRx067567; Mon, 27 Jan 2014 23:45:11 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0RNjBVb067566; Mon, 27 Jan 2014 23:45:11 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201401272345.s0RNjBVb067566@svn.freebsd.org> From: Mathieu Arnold Date: Mon, 27 Jan 2014 23:45:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341481 - branches/2014Q1/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.17 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, 27 Jan 2014 23:45:11 -0000 Author: mat Date: Mon Jan 27 23:45:10 2014 New Revision: 341481 URL: http://svnweb.freebsd.org/changeset/ports/341481 QAT: https://qat.redports.org/buildarchive/r341481/ Log: MFH: r341403, r341408, r341446, r341451, r341466, r341469 - Document multiple DoS vulnerabilities in strongswan Security: CVE-2013-5018 Security: CVE-2013-6075 Security: CVE-2013-6076 vuxml entry concerning the recent security advisory about www/rt42 from 4.2.0 to 4.2.2 inclusive. This is slightly unusual in the the fix is applied to a completely different port mail/p5-Email-Address-List which www/rt42 depends on.. Security: d1dfc4c7-8791-11e3-a371-6805ca0b3d42 Document vulnerabilities in www/chromium < 32.0.1700.102 Obtained from: http://googlechromereleases.blogspot.nl/ Sponsored by: Absolight Modified: branches/2014Q1/security/vuxml/vuln.xml Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q1/security/vuxml/vuln.xml Mon Jan 27 23:44:43 2014 (r341480) +++ branches/2014Q1/security/vuxml/vuln.xml Mon Jan 27 23:45:10 2014 (r341481) @@ -51,6 +51,126 @@ Note: Please add new entries to the beg --> + + chromium -- multiple vulnerabilities + + + chromium + 32.0.1700.102 + + + + +

Google Chrome Releases reports:

+
+

14 security fixes in this release, including:

+
    +
  • [330420] High CVE-2013-6649: Use-after-free in SVG images. + Credit to Atte Kettunen of OUSPG.
    • +
  • [331444] High CVE-2013-6650: Memory corruption in V8. This + issue was fixed in v8 version 3.22.24.16. Credit to Christian + Holler.
    • +
+
+ + + + CVE-2013-6649 + CVE-2013-6650 + http://googlechromereleases.blogspot.nl/ + + + 2014-01-27 + 2014-01-27 + + + + + rt42 -- denial-of-service attack via the email gateway + + + rt42 + 4.24.2.2_2 + + + p5-Email-Address-List + 0.02 + + + + +

The RT development team reports:

+
+

Versions of RT between 4.2.0 and 4.2.2 (inclusive) are + vulnerable to a denial-of-service attack via the email + gateway; any installation which accepts mail from untrusted + sources is vulnerable, regardless of the permissions + configuration inside RT. This vulnerability is assigned + CVE-2014-1474.

+

This vulnerability is caused by poor parsing performance + in the Email::Address::List module, which RT depends on. We + recommend that affected users upgrade their version of + Email::Address::List to v0.02 or above, which resolves the + issue. Due to a communications mishap, the release on CPAN + will temporarily appear as "unauthorized," and the + command-line cpan client will hence not install it. We + expect this to be resolved shortly; in the meantime, the + release is also available from our server.

+
+ + + + CVE-2014-1474 + http://blog.bestpractical.com/2014/01/security-vulnerability-in-rt-42.html + + + 2014-01-27 + 2014-01-27 + + + + + strongswan -- multiple DoS vulnerabilities + + + strongswan + 5.1.1 + + + + +

strongSwan Project reports:

+
+

A DoS vulnerability triggered by crafted IKEv1 fragmentation + payloads was discovered in strongSwan's IKE daemon charon. All + versions since 5.0.2 are affected.

+
+
+

A DoS vulnerability and potential authorization bypass triggered + by a crafted ID_DER_ASN1_DN ID payload was discovered in strongSwan. + All versions since 4.3.3 are affected.

+
+
+

A DoS vulnerability in strongSwan was discovered, which is + triggered by XAuth usernames and EAP identities in versions + 5.0.3 and 5.0.4.

+
+ + + + CVE-2013-5018 + CVE-2013-6075 + CVE-2013-6076 + http://www.strongswan.org/blog/2013/08/01/strongswan-denial-of-service-vulnerability-%28cve-2013-5018%29.html + http://www.strongswan.org/blog/2013/11/01/strongswan-denial-of-service-vulnerability-%28cve-2013-6075%29.html + http://www.strongswan.org/blog/2013/11/01/strongswan-denial-of-service-vulnerability-%28cve-2013-6076%29.html + + + 2013-11-01 + 2014-01-27 + + + varnish -- DoS vulnerability in Varnish HTTP cache From owner-svn-ports-branches@FreeBSD.ORG Tue Jan 28 16:35:49 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 54860D2B; Tue, 28 Jan 2014 16:35:49 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 404E51EB4; Tue, 28 Jan 2014 16:35:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0SGZncJ066769; Tue, 28 Jan 2014 16:35:49 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0SGZn5J066767; Tue, 28 Jan 2014 16:35:49 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201401281635.s0SGZn5J066767@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Tue, 28 Jan 2014 16:35:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341619 - branches/2014Q1/textproc/groff 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.17 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, 28 Jan 2014 16:35:49 -0000 Author: des Date: Tue Jan 28 16:35:48 2014 New Revision: 341619 URL: http://svnweb.freebsd.org/changeset/ports/341619 QAT: https://qat.redports.org/buildarchive/r341619/ Log: MFH: r340831 Replace hardcoded ghostscript build dependency with USE_GHOSTSCRIPT_RUN. Approved by: portmgr (bapt) Modified: branches/2014Q1/textproc/groff/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/textproc/groff/Makefile ============================================================================== --- branches/2014Q1/textproc/groff/Makefile Tue Jan 28 16:32:55 2014 (r341618) +++ branches/2014Q1/textproc/groff/Makefile Tue Jan 28 16:35:48 2014 (r341619) @@ -3,7 +3,7 @@ PORTNAME= groff PORTVERSION= 1.21 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= groff @@ -13,10 +13,10 @@ COMMENT= Software typesetting package LICENSE= GPLv3 -BUILD_DEPENDS= ${LOCALBASE}/bin/gs:${PORTSDIR}/print/ghostscript8 \ - ${LOCALBASE}/bin/psselect:${PORTSDIR}/print/psutils +BUILD_DEPENDS= ${LOCALBASE}/bin/psselect:${PORTSDIR}/print/psutils RUN_DEPENDS:= ${BUILD_DEPENDS} +USE_GHOSTSCRIPT_RUN= yes USES= gmake perl5 GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-awk=/usr/bin/awk From owner-svn-ports-branches@FreeBSD.ORG Tue Jan 28 17:33:26 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 99EB45B2; Tue, 28 Jan 2014 17:33:26 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6B61F14C6; Tue, 28 Jan 2014 17:33:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0SHXQXD091624; Tue, 28 Jan 2014 17:33:26 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0SHXQS0091622; Tue, 28 Jan 2014 17:33:26 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201401281733.s0SHXQS0091622@svn.freebsd.org> From: Rene Ladan Date: Tue, 28 Jan 2014 17:33:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341644 - branches/2014Q1/www/chromium 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.17 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, 28 Jan 2014 17:33:26 -0000 Author: rene Date: Tue Jan 28 17:33:25 2014 New Revision: 341644 URL: http://svnweb.freebsd.org/changeset/ports/341644 QAT: https://qat.redports.org/buildarchive/r341644/ Log: MFH: r341643 Update to 32.0.1700.102 Security: http://www.vuxml.org/freebsd/f9810c43-87a5-11e3-9214-00262d5ed8ee.html Approved by: portmgr (mat) Modified: branches/2014Q1/www/chromium/Makefile branches/2014Q1/www/chromium/distinfo Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/www/chromium/Makefile ============================================================================== --- branches/2014Q1/www/chromium/Makefile Tue Jan 28 17:18:47 2014 (r341643) +++ branches/2014Q1/www/chromium/Makefile Tue Jan 28 17:33:25 2014 (r341644) @@ -5,7 +5,7 @@ PORTNAME= chromium DISTVERSIONPREFIX= courgette-redacted- -DISTVERSION= 32.0.1700.77 +DISTVERSION= 32.0.1700.102 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/:testdata \ http://download.goodking.org/downloads/:browser \ Modified: branches/2014Q1/www/chromium/distinfo ============================================================================== --- branches/2014Q1/www/chromium/distinfo Tue Jan 28 17:18:47 2014 (r341643) +++ branches/2014Q1/www/chromium/distinfo Tue Jan 28 17:33:25 2014 (r341644) @@ -1,4 +1,4 @@ -SHA256 (chromium-courgette-redacted-32.0.1700.77.tar.xz) = c616f4d4d917b3aa1cf78a200b44e9ae22fed9fb3671ee6d8058f961dc6cad24 -SIZE (chromium-courgette-redacted-32.0.1700.77.tar.xz) = 186231264 -SHA256 (chromium-32.0.1700.77-testdata.tar.xz) = 7da813a54e84d2aa655cd376d2eae41f64132a8790cbc8bcadd9220ef9d6bcd0 -SIZE (chromium-32.0.1700.77-testdata.tar.xz) = 112139016 +SHA256 (chromium-courgette-redacted-32.0.1700.102.tar.xz) = 8caa05f6040ce4f41f8b8ce778340df920e92a1e30ef8991004088124ca55348 +SIZE (chromium-courgette-redacted-32.0.1700.102.tar.xz) = 186247120 +SHA256 (chromium-32.0.1700.102-testdata.tar.xz) = 48d53cd2e8eae62b1a4bbf1aaefc8c53ca26351487d27f326910a1a22d94b643 +SIZE (chromium-32.0.1700.102-testdata.tar.xz) = 112146500 From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 29 20:35:50 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 BFB3CAD4; Wed, 29 Jan 2014 20:35:50 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A96A912F8; Wed, 29 Jan 2014 20:35:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0TKZoGr035281; Wed, 29 Jan 2014 20:35:50 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0TKZn6W035272; Wed, 29 Jan 2014 20:35:49 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201401292035.s0TKZn6W035272@svn.freebsd.org> From: Mathieu Arnold Date: Wed, 29 Jan 2014 20:35:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341776 - in branches/2014Q1/textproc/htmldoc: . 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.17 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, 29 Jan 2014 20:35:50 -0000 Author: mat Date: Wed Jan 29 20:35:48 2014 New Revision: 341776 URL: http://svnweb.freebsd.org/changeset/ports/341776 QAT: https://qat.redports.org/buildarchive/r341776/ Log: MFH: r341774 Upgrade to HTMLDOC 1.8.28, fixing security-relevant bugs. Support staging, and modernize LIB_DEPENDS. Tweak build environment to get proper detection of png/jpeg libs. Switch to using BZIP2 tarballs. Sponsored by: Absolight Added: branches/2014Q1/textproc/htmldoc/files/patch-htmldoc__http-private.h - copied unchanged from r341774, head/textproc/htmldoc/files/patch-htmldoc__http-private.h branches/2014Q1/textproc/htmldoc/files/patch-htmldoc__http.c - copied unchanged from r341774, head/textproc/htmldoc/files/patch-htmldoc__http.c branches/2014Q1/textproc/htmldoc/files/patch-htmldoc__image.cxx - copied unchanged from r341774, head/textproc/htmldoc/files/patch-htmldoc__image.cxx branches/2014Q1/textproc/htmldoc/files/patch-htmldoc__ps-pdf.cxx - copied unchanged from r341774, head/textproc/htmldoc/files/patch-htmldoc__ps-pdf.cxx Deleted: branches/2014Q1/textproc/htmldoc/files/patch-image.cxx branches/2014Q1/textproc/htmldoc/files/patch-openssl Modified: branches/2014Q1/textproc/htmldoc/Makefile branches/2014Q1/textproc/htmldoc/distinfo branches/2014Q1/textproc/htmldoc/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/textproc/htmldoc/Makefile ============================================================================== --- branches/2014Q1/textproc/htmldoc/Makefile Wed Jan 29 20:24:49 2014 (r341775) +++ branches/2014Q1/textproc/htmldoc/Makefile Wed Jan 29 20:35:48 2014 (r341776) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= htmldoc -PORTVERSION= 1.8.27 -PORTREVISION= 7 +PORTVERSION= 1.8.28 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_EASYSW} MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION} @@ -12,25 +11,27 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-sou MAINTAINER= jose@diasfernandes.pt COMMENT= Converts HTML to PDF and/or PostScript -LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ - png15:${PORTSDIR}/graphics/png +LICENSE= GPLv2 + +LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libpng15.so:${PORTSDIR}/graphics/png OPTIONS_DEFINE= HTMLDOCGUI HTMLDOCGUI_DESC= Build GUI front-end -# .bz2 file is available since Aug 2, but we don't want to -# start mirroring _in addition to_ the .gz variant. When the -# vendor's release is updated again, we should switch to .bz2 -#USE_BZIP2= yes +USE_BZIP2= yes GNU_CONFIGURE= yes -NO_STAGE= yes # Configure seems broken and ignores these ATM: -CONFIGURE_ARGS+=--enable-localjpeg --enable-localzlib --enable-localpng +CONFIGURE_ARGS+=--disable-localjpeg --disable-localzlib --disable-localpng WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} EXCLUDE= png jpeg zlib htmldoc/md5* htmldoc/rc4* htmldoc/snprintf* EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ,} +INSTALL_TARGET= install \ + bindir=${STAGEDIR}${PREFIX}/bin \ + datadir=${STAGEDIR}${PREFIX}/share \ + mandir=${STAGEDIR}${MANPREFIX}/man +LDFLAGS+= -L${LOCALBASE}/lib -MAN1= htmldoc.1 post-patch: ${REINPLACE_CMD} -e 's,@JPEG@ @ZLIB@ @PNG@ ,,' ${WRKSRC}/Makefile.in ${REINPLACE_CMD} -e 's|@LDFLAGS@|-L${LOCALBASE}/lib @LDFLAGS@|' \ @@ -39,13 +40,18 @@ post-patch: # Remove redundant code: ${REINPLACE_CMD} -Ee 's,(md5|snprintf|rc4)\.o,,g' \ ${WRKSRC}/htmldoc/Makefile + ${REINPLACE_CMD} -Ee 's,md5-private\.h,,;s,rc4\.h,,' \ + ${WRKSRC}/htmldoc/Dependencies post-configure: ${REINPLACE_CMD} -e \ 's|../png/libpng.a ../zlib/libz.a ../jpeg/libjpeg.a|-ljpeg -lpng -lz|' ${WRKSRC}/Makedefs -.include +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/htmldoc + .include +.include .if ${PORT_OPTIONS:MHTMLDOCGUI} LIB_DEPENDS+= fltk:${PORTSDIR}/x11-toolkits/fltk Modified: branches/2014Q1/textproc/htmldoc/distinfo ============================================================================== --- branches/2014Q1/textproc/htmldoc/distinfo Wed Jan 29 20:24:49 2014 (r341775) +++ branches/2014Q1/textproc/htmldoc/distinfo Wed Jan 29 20:35:48 2014 (r341776) @@ -1,2 +1,2 @@ -SHA256 (htmldoc-1.8.27-source.tar.gz) = 64f6d9f40f00f9cc68df6508123e88ed30fef924881fd28dca45358ecd79d320 -SIZE (htmldoc-1.8.27-source.tar.gz) = 4462252 +SHA256 (htmldoc-1.8.28-source.tar.bz2) = 2a688bd820ad6f7bdebb274716102dafbf4d5fcfa20a5b8d87a56b030d184732 +SIZE (htmldoc-1.8.28-source.tar.bz2) = 4026568 Copied: branches/2014Q1/textproc/htmldoc/files/patch-htmldoc__http-private.h (from r341774, head/textproc/htmldoc/files/patch-htmldoc__http-private.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/textproc/htmldoc/files/patch-htmldoc__http-private.h Wed Jan 29 20:35:48 2014 (r341776, copy of r341774, head/textproc/htmldoc/files/patch-htmldoc__http-private.h) @@ -0,0 +1,25 @@ +--- ./htmldoc/http-private.h.orig 2011-12-30 08:41:10.000000000 +0100 ++++ ./htmldoc/http-private.h 2014-01-28 04:47:41.000000000 +0100 +@@ -83,12 +83,12 @@ + # endif /* __sgi || (__APPLE__ && !_SOCKLEN_T) */ + + # include "http.h" +-# include "md5-private.h" + + # if defined HAVE_LIBSSL + # include + # include + # include ++# include + # elif defined HAVE_GNUTLS + # include + # include +@@ -276,7 +276,7 @@ + char buffer[HTTP_MAX_BUFFER]; + /* Buffer for incoming data */ + int auth_type; /* Authentication in use */ +- _cups_md5_state_t md5_state; /* MD5 state */ ++ MD5_CTX md5_state; /* MD5 state */ + char nonce[HTTP_MAX_VALUE]; + /* Nonce value */ + int nonce_count; /* Nonce count */ Copied: branches/2014Q1/textproc/htmldoc/files/patch-htmldoc__http.c (from r341774, head/textproc/htmldoc/files/patch-htmldoc__http.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/textproc/htmldoc/files/patch-htmldoc__http.c Wed Jan 29 20:35:48 2014 (r341776, copy of r341774, head/textproc/htmldoc/files/patch-htmldoc__http.c) @@ -0,0 +1,11 @@ +--- ./htmldoc/http.c.orig 2014-01-05 21:41:32.000000000 +0100 ++++ ./htmldoc/http.c 2014-01-28 04:47:07.000000000 +0100 +@@ -1228,6 +1228,8 @@ + * Using the current time is a dubious random seed, but on some systems + * it is the best we can do (on others, this seed isn't even used...) + */ ++#define CUPS_RAND() arc4random() ++#define CUPS_SRAND(v) arc4random_stir() + + CUPS_SRAND(time(NULL)); + Copied: branches/2014Q1/textproc/htmldoc/files/patch-htmldoc__image.cxx (from r341774, head/textproc/htmldoc/files/patch-htmldoc__image.cxx) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/textproc/htmldoc/files/patch-htmldoc__image.cxx Wed Jan 29 20:35:48 2014 (r341776, copy of r341774, head/textproc/htmldoc/files/patch-htmldoc__image.cxx) @@ -0,0 +1,10 @@ +--- ./htmldoc/image.cxx.orig 2013-08-09 04:53:39.000000000 +0200 ++++ ./htmldoc/image.cxx 2014-01-28 04:47:41.000000000 +0100 +@@ -44,6 +44,7 @@ + } + + #include /* Portable Network Graphics (PNG) definitions */ ++#include + + + /* Copied: branches/2014Q1/textproc/htmldoc/files/patch-htmldoc__ps-pdf.cxx (from r341774, head/textproc/htmldoc/files/patch-htmldoc__ps-pdf.cxx) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/textproc/htmldoc/files/patch-htmldoc__ps-pdf.cxx Wed Jan 29 20:35:48 2014 (r341776, copy of r341774, head/textproc/htmldoc/files/patch-htmldoc__ps-pdf.cxx) @@ -0,0 +1,285 @@ +--- ./htmldoc/ps-pdf.cxx.orig 2014-01-06 04:42:43.000000000 +0100 ++++ ./htmldoc/ps-pdf.cxx 2014-01-28 04:47:41.000000000 +0100 +@@ -120,13 +120,9 @@ + + /*#define DEBUG*/ + #include "htmldoc.h" +-#include "md5-private.h" +-#define md5_append _cupsMD5Append +-#define md5_finish _cupsMD5Finish +-#define md5_init _cupsMD5Init + typedef unsigned char md5_byte_t; +-#define md5_state_t _cups_md5_state_t +-#include "rc4.h" ++#include ++#include + #include + #include + #include +@@ -331,8 +327,8 @@ + static uchar comp_buffer[8192]; + static uchar encrypt_key[16]; + static int encrypt_len; +-static rc4_context_t encrypt_state; +-static md5_byte_t file_id[16]; ++static RC4_KEY encrypt_state; ++static unsigned char file_id[16]; + + + /* +@@ -10545,7 +10541,7 @@ + { + // Encrypt the colormap... + encrypt_init(); +- rc4_encrypt(&encrypt_state, cmap[0], cmap[0], ncolors * 3); ++ RC4(&encrypt_state, ncolors * 3, cmap[0], cmap[0]); + } + + fprintf(out, "/ColorSpace[/Indexed/DeviceRGB %d<", ncolors - 1); +@@ -11166,9 +11162,9 @@ + int font_desc[TYPE_MAX][STYLE_MAX]; + /* Font descriptor objects */ + char temp[1024]; /* Temporary string */ +- md5_state_t md5; /* MD5 state */ +- md5_byte_t digest[16]; /* MD5 digest value */ +- rc4_context_t rc4; /* RC4 context */ ++ MD5_CTX md5; /* MD5 state */ ++ unsigned char digest[16]; /* MD5 digest value */ ++ RC4_KEY rc4; /* RC4 context */ + uchar owner_pad[32], /* Padded owner password */ + owner_key[32], /* Owner key */ + user_pad[32], /* Padded user password */ +@@ -11568,10 +11564,10 @@ + * Compute the file ID... + */ + +- md5_init(&md5); +- md5_append(&md5, (md5_byte_t *)OutputPath, sizeof(OutputPath)); +- md5_append(&md5, (md5_byte_t *)&doc_time, sizeof(doc_time)); +- md5_finish(&md5, file_id); ++ MD5_Init(&md5); ++ MD5_Update(&md5, (unsigned char *)OutputPath, sizeof(OutputPath)); ++ MD5_Update(&md5, (unsigned char *)&doc_time, sizeof(doc_time)); ++ MD5_Final(file_id, &md5); + + /* + * Setup encryption stuff as necessary... +@@ -11627,18 +11623,18 @@ + * Compute the owner key... + */ + +- md5_init(&md5); +- md5_append(&md5, owner_pad, 32); +- md5_finish(&md5, digest); ++ MD5_Init(&md5); ++ MD5_Update(&md5, owner_pad, 32); ++ MD5_Final(digest, &md5); + + if (encrypt_len > 5) + { + // MD5 the result 50 more times... + for (i = 0; i < 50; i ++) + { +- md5_init(&md5); +- md5_append(&md5, digest, 16); +- md5_finish(&md5, digest); ++ MD5_Init(&md5); ++ MD5_Update(&md5, digest, 16); ++ MD5_Final(digest, &md5); + } + + // Copy the padded user password... +@@ -11651,14 +11647,14 @@ + for (j = 0; j < encrypt_len; j ++) + encrypt_key[j] = digest[j] ^ i; + +- rc4_init(&rc4, encrypt_key, encrypt_len); +- rc4_encrypt(&rc4, owner_key, owner_key, 32); ++ RC4_set_key(&rc4, encrypt_len, encrypt_key); ++ RC4(&rc4, 32, owner_key, owner_key); + } + } + else + { +- rc4_init(&rc4, digest, encrypt_len); +- rc4_encrypt(&rc4, user_pad, owner_key, 32); ++ RC4_set_key(&rc4, encrypt_len, digest); ++ RC4(&rc4, 32, user_pad, owner_key); + } + + /* +@@ -11680,27 +11676,27 @@ + * Compute the encryption key... + */ + +- md5_init(&md5); +- md5_append(&md5, user_pad, 32); +- md5_append(&md5, owner_key, 32); ++ MD5_Init(&md5); ++ MD5_Update(&md5, user_pad, 32); ++ MD5_Update(&md5, owner_key, 32); + + perm_bytes[0] = perm_value; + perm_bytes[1] = perm_value >> 8; + perm_bytes[2] = perm_value >> 16; + perm_bytes[3] = perm_value >> 24; + +- md5_append(&md5, perm_bytes, 4); +- md5_append(&md5, file_id, 16); +- md5_finish(&md5, digest); ++ MD5_Update(&md5, perm_bytes, 4); ++ MD5_Update(&md5, file_id, 16); ++ MD5_Final(digest, &md5); + + if (encrypt_len > 5) + { + // MD5 the result 50 times.. + for (i = 0; i < 50; i ++) + { +- md5_init(&md5); +- md5_append(&md5, digest, 16); +- md5_finish(&md5, digest); ++ MD5_Init(&md5); ++ MD5_Update(&md5, digest, 16); ++ MD5_Final(digest, &md5); + } + } + +@@ -11712,10 +11708,10 @@ + + if (encrypt_len > 5) + { +- md5_init(&md5); +- md5_append(&md5, pad, 32); +- md5_append(&md5, file_id, 16); +- md5_finish(&md5, user_key); ++ MD5_Init(&md5); ++ MD5_Update(&md5, pad, 32); ++ MD5_Update(&md5, file_id, 16); ++ MD5_Final(user_key, &md5); + + memset(user_key + 16, 0, 16); + +@@ -11726,14 +11722,14 @@ + for (j = 0; j < encrypt_len; j ++) + digest[j] = encrypt_key[j] ^ i; + +- rc4_init(&rc4, digest, encrypt_len); +- rc4_encrypt(&rc4, user_key, user_key, 16); ++ RC4_set_key(&rc4, encrypt_len, digest); ++ RC4(&rc4, 16, user_key, user_key); + } + } + else + { +- rc4_init(&rc4, encrypt_key, encrypt_len); +- rc4_encrypt(&rc4, pad, user_key, 32); ++ RC4_set_key(&rc4, encrypt_len, encrypt_key); ++ RC4(&rc4, 32, pad, user_key); + } + + /* +@@ -11920,7 +11916,7 @@ + else + bytes = len; + +- rc4_encrypt(&encrypt_state, s, news, bytes); ++ RC4(&encrypt_state, bytes, s, news); + + for (i = 0; i < bytes; i ++) + fprintf(out, "%02x", news[i]); +@@ -12585,7 +12581,7 @@ + unicode[0] = 0xfe; // Start with BOM + unicode[1] = 0xff; + +- rc4_encrypt(&encrypt_state, unicode, enicode, 2); ++ RC4(&encrypt_state, 2, unicode, enicode); + + fprintf(out, "%02x%02x", enicode[0], enicode[1]); + +@@ -12595,7 +12591,7 @@ + unicode[0] = ch >> 8; + unicode[1] = ch; + +- rc4_encrypt(&encrypt_state, unicode, enicode, 2); ++ RC4(&encrypt_state, 2, unicode, enicode); + + fprintf(out, "%02x%02x", enicode[0], enicode[1]); + } +@@ -12627,8 +12623,8 @@ + int i; /* Looping var */ + uchar data[21], /* Key data */ + *dataptr; /* Pointer to key data */ +- md5_state_t md5; /* MD5 state */ +- md5_byte_t digest[16]; /* MD5 digest value */ ++ MD5_CTX md5; /* MD5 state */ ++ unsigned char digest[16]; /* MD5 digest value */ + + + /* +@@ -12648,18 +12644,18 @@ + * Hash it... + */ + +- md5_init(&md5); +- md5_append(&md5, data, encrypt_len + 5); +- md5_finish(&md5, digest); ++ MD5_Init(&md5); ++ MD5_Update(&md5, data, encrypt_len + 5); ++ MD5_Final(digest, &md5); + + /* + * Initialize the RC4 context using the first N+5 bytes of the digest... + */ + + if (encrypt_len > 11) +- rc4_init(&encrypt_state, digest, 16); ++ RC4_set_key(&encrypt_state, 16, digest); + else +- rc4_init(&encrypt_state, digest, encrypt_len + 5); ++ RC4_set_key(&encrypt_state, encrypt_len + 5, digest); + } + + +@@ -12727,8 +12723,8 @@ + else + { + if (Encryption) +- rc4_encrypt(&encrypt_state, comp_buffer, comp_buffer, +- (uchar *)compressor.next_out - (uchar *)comp_buffer); ++ RC4(&encrypt_state, (uchar *)compressor.next_out - (uchar *)comp_buffer, ++ comp_buffer, comp_buffer); + + fwrite(comp_buffer, (uchar *)compressor.next_out - (uchar *)comp_buffer, + 1, out); +@@ -12751,8 +12747,8 @@ + else + { + if (Encryption) +- rc4_encrypt(&encrypt_state, comp_buffer, comp_buffer, +- (uchar *)compressor.next_out - (uchar *)comp_buffer); ++ RC4(&encrypt_state, (uchar *)compressor.next_out - (uchar *)comp_buffer, ++ comp_buffer, comp_buffer); + + fwrite(comp_buffer, (uchar *)compressor.next_out - (uchar *)comp_buffer, + 1, out); +@@ -12844,8 +12840,8 @@ + else + { + if (Encryption) +- rc4_encrypt(&encrypt_state, comp_buffer, comp_buffer, +- (uchar *)compressor.next_out - (uchar *)comp_buffer); ++ RC4(&encrypt_state, (uchar *)compressor.next_out - (uchar *)comp_buffer, ++ comp_buffer, comp_buffer); + + fwrite(comp_buffer, + (uchar *)compressor.next_out - (uchar *)comp_buffer, 1, out); +@@ -12878,7 +12874,7 @@ + if ((bytes = length - i) > (int)sizeof(newbuf)) + bytes = sizeof(newbuf); + +- rc4_encrypt(&encrypt_state, buf + i, newbuf, bytes); ++ RC4(&encrypt_state, bytes, buf + i, newbuf); + fwrite(newbuf, bytes, 1, out); + } + } Modified: branches/2014Q1/textproc/htmldoc/pkg-plist ============================================================================== --- branches/2014Q1/textproc/htmldoc/pkg-plist Wed Jan 29 20:24:49 2014 (r341775) +++ branches/2014Q1/textproc/htmldoc/pkg-plist Wed Jan 29 20:35:48 2014 (r341776) @@ -1,4 +1,5 @@ bin/htmldoc +man/man1/htmldoc.1.gz %%DOCSDIR%%/help.html %%DOCSDIR%%/htmldoc.pdf %%DATADIR%%/fonts/Courier-Bold.afm From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 29 22:39:58 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 3F15410F; Wed, 29 Jan 2014 22:39:58 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 266D31E16; Wed, 29 Jan 2014 22:39:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0TMdwjX083128; Wed, 29 Jan 2014 22:39:58 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0TMdw1Y083127; Wed, 29 Jan 2014 22:39:58 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201401292239.s0TMdw1Y083127@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Wed, 29 Jan 2014 22:39:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341789 - branches/2014Q1/Mk 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.17 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, 29 Jan 2014 22:39:58 -0000 Author: des Date: Wed Jan 29 22:39:57 2014 New Revision: 341789 URL: http://svnweb.freebsd.org/changeset/ports/341789 QAT: https://qat.redports.org/buildarchive/r341789/ Log: MFH: r341785 Remove lame CPAN mirror. Approved by: portmgr (bapt) Modified: branches/2014Q1/Mk/bsd.sites.mk Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/Mk/bsd.sites.mk ============================================================================== --- branches/2014Q1/Mk/bsd.sites.mk Wed Jan 29 22:39:37 2014 (r341788) +++ branches/2014Q1/Mk/bsd.sites.mk Wed Jan 29 22:39:57 2014 (r341789) @@ -936,7 +936,6 @@ MASTER_SITE_PERL_CPAN_BY+= \ http://ftp.jaist.ac.jp/pub/CPAN/%CPANSORT%/%SUBDIR%/ \ ftp://ftp.sunet.se/pub/lang/perl/CPAN/%CPANSORT%/%SUBDIR%/ \ ftp://ftp.mirrorservice.org/sites/cpan.perl.org/CPAN/%CPANSORT%/%SUBDIR%/ \ - http://at.cpan.org/%CPANSORT%/%SUBDIR%/ \ ftp://ftp.auckland.ac.nz/pub/perl/CPAN/%CPANSORT%/%SUBDIR%/ \ http://backpan.perl.org/%CPANSORT%/%SUBDIR%/ \ ftp://ftp.funet.fi/pub/languages/perl/CPAN/%CPANSORT%/%SUBDIR%/ \ From owner-svn-ports-branches@FreeBSD.ORG Thu Jan 30 14:48:37 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 5976962F; Thu, 30 Jan 2014 14:48:37 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 44E6C1353; Thu, 30 Jan 2014 14:48:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0UEmbCx085379; Thu, 30 Jan 2014 14:48:37 GMT (envelope-from madpilot@svn.freebsd.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0UEmaAW085377; Thu, 30 Jan 2014 14:48:36 GMT (envelope-from madpilot@svn.freebsd.org) Message-Id: <201401301448.s0UEmaAW085377@svn.freebsd.org> From: Guido Falsi Date: Thu, 30 Jan 2014 14:48:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341843 - in branches/2014Q1/comms/smstools3: . 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.17 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, 30 Jan 2014 14:48:37 -0000 Author: madpilot Date: Thu Jan 30 14:48:36 2014 New Revision: 341843 URL: http://svnweb.freebsd.org/changeset/ports/341843 QAT: https://qat.redports.org/buildarchive/r341843/ Log: MFH: r341822 - Add note in rc script on how to log to syslog Thanks to Dmitry Selivanov for testing. Reported by: Dmitry Selivanov and a few others Approved by: portmgr (antoine) Modified: branches/2014Q1/comms/smstools3/Makefile branches/2014Q1/comms/smstools3/files/smsd.in Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/comms/smstools3/Makefile ============================================================================== --- branches/2014Q1/comms/smstools3/Makefile Thu Jan 30 14:26:06 2014 (r341842) +++ branches/2014Q1/comms/smstools3/Makefile Thu Jan 30 14:48:36 2014 (r341843) @@ -3,7 +3,7 @@ PORTNAME= smstools PORTVERSION= 3.1.15 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= comms MASTER_SITES= http://smstools3.kekekasvi.com/packages/ DISTNAME= smstools3-${PORTVERSION} Modified: branches/2014Q1/comms/smstools3/files/smsd.in ============================================================================== --- branches/2014Q1/comms/smstools3/files/smsd.in Thu Jan 30 14:26:06 2014 (r341842) +++ branches/2014Q1/comms/smstools3/files/smsd.in Thu Jan 30 14:48:36 2014 (r341843) @@ -10,6 +10,12 @@ # # smsd_enable="YES" # +# NOTE: to make smsd log to syslog specify: +# +# smsd_logfile="syslog" +# +# in rc.conf +# . /etc/rc.subr name=smsd From owner-svn-ports-branches@FreeBSD.ORG Fri Jan 31 09:21:54 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 AC3B4B19; Fri, 31 Jan 2014 09:21:54 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 97E7E1A92; Fri, 31 Jan 2014 09:21:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0V9Ls1Q024644; Fri, 31 Jan 2014 09:21:54 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0V9LsHe024641; Fri, 31 Jan 2014 09:21:54 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201401310921.s0V9LsHe024641@svn.freebsd.org> From: Mathieu Arnold Date: Fri, 31 Jan 2014 09:21:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341955 - branches/2014Q1/dns/bind99 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.17 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, 31 Jan 2014 09:21:54 -0000 Author: mat Date: Fri Jan 31 09:21:53 2014 New Revision: 341955 URL: http://svnweb.freebsd.org/changeset/ports/341955 QAT: https://qat.redports.org/buildarchive/r341955/ Log: MFH: r341947 Update to 9.9.5. Changes: https://lists.isc.org/pipermail/bind-announce/2014-January/000896.html Sponsored by: Absolight Modified: branches/2014Q1/dns/bind99/Makefile branches/2014Q1/dns/bind99/distinfo branches/2014Q1/dns/bind99/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/dns/bind99/Makefile ============================================================================== --- branches/2014Q1/dns/bind99/Makefile Fri Jan 31 09:20:58 2014 (r341954) +++ branches/2014Q1/dns/bind99/Makefile Fri Jan 31 09:21:53 2014 (r341955) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME?= bind99 -PORTVERSION= 9.9.4.2 +PORTVERSION= 9.9.5 CATEGORIES= dns net ipv6 MASTER_SITES= ${MASTER_SITE_ISC} MASTER_SITE_SUBDIR= bind9/${ISCVERSION} @@ -13,7 +13,7 @@ COMMENT= BIND DNS suite with updated DNS LICENSE= ISCL # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.9.4-P2 +ISCVERSION= 9.9.5 MAKE_JOBS_UNSAFE= yes @@ -197,7 +197,7 @@ PLIST_SUB+= NOBASE="" PLIST_SUB+= NOBASE="@comment " .endif -MAN1?= arpaname.1 dig.1 host.1 isc-config.sh.1 nslookup.1 nsupdate.1 +MAN1?= arpaname.1 dig.1 host.1 isc-config.sh.1 nslookup.1 nsupdate.1 bind9-config.1 .if !defined(BIND_TOOLS_SLAVE) MAN3= lwres.3 lwres_addr_parse.3 lwres_buffer.3 lwres_buffer_add.3 \ lwres_buffer_back.3 lwres_buffer_clear.3 lwres_buffer_first.3 \ Modified: branches/2014Q1/dns/bind99/distinfo ============================================================================== --- branches/2014Q1/dns/bind99/distinfo Fri Jan 31 09:20:58 2014 (r341954) +++ branches/2014Q1/dns/bind99/distinfo Fri Jan 31 09:21:53 2014 (r341955) @@ -1,2 +1,2 @@ -SHA256 (bind-9.9.4-P2.tar.gz) = 50f3c6431e26d3f322b69092a49c92e163e73029fe4a1933ce532dc97ec40a89 -SIZE (bind-9.9.4-P2.tar.gz) = 7513077 +SHA256 (bind-9.9.5.tar.gz) = d4b64c1dde442145a316679acff2df4008aa117ae52dfa3a6bc69efecc7840d1 +SIZE (bind-9.9.5.tar.gz) = 7729695 Modified: branches/2014Q1/dns/bind99/pkg-plist ============================================================================== --- branches/2014Q1/dns/bind99/pkg-plist Fri Jan 31 09:20:58 2014 (r341954) +++ branches/2014Q1/dns/bind99/pkg-plist Fri Jan 31 09:21:53 2014 (r341955) @@ -1,3 +1,4 @@ +bin/bind9-config bin/dig bin/host bin/isc-config.sh @@ -14,6 +15,7 @@ include/dns/byaddr.h include/dns/cache.h include/dns/callbacks.h include/dns/cert.h +include/dns/client.h include/dns/clientinfo.h include/dns/compress.h include/dns/db.h @@ -54,13 +56,13 @@ include/dns/rdatasetiter.h include/dns/rdataslab.h include/dns/rdatastruct.h include/dns/rdatatype.h -include/dns/rpz.h -include/dns/sdlz.h include/dns/request.h include/dns/resolver.h include/dns/result.h include/dns/rootns.h +include/dns/rpz.h include/dns/sdb.h +include/dns/sdlz.h include/dns/secalg.h include/dns/secproto.h include/dns/soa.h @@ -68,6 +70,7 @@ include/dns/ssu.h include/dns/tcpmsg.h include/dns/time.h include/dns/tkey.h +include/dns/tsec.h include/dns/tsig.h include/dns/ttl.h include/dns/types.h @@ -163,6 +166,7 @@ include/isc/taskpool.h include/isc/thread.h include/isc/time.h include/isc/timer.h +include/isc/tm.h include/isc/types.h include/isc/util.h include/isc/version.h @@ -208,6 +212,7 @@ lib/liblwres.a sbin/arpaname sbin/ddns-confgen sbin/dnssec-dsfromkey +sbin/dnssec-importkey sbin/dnssec-keyfromlabel sbin/dnssec-keygen sbin/dnssec-revoke From owner-svn-ports-branches@FreeBSD.ORG Fri Jan 31 09:24:06 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 32B46DC0; Fri, 31 Jan 2014 09:24:06 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1E6311AAE; Fri, 31 Jan 2014 09:24:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0V9O533025212; Fri, 31 Jan 2014 09:24:05 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0V9O5Ka025207; Fri, 31 Jan 2014 09:24:05 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201401310924.s0V9O5Ka025207@svn.freebsd.org> From: Mathieu Arnold Date: Fri, 31 Jan 2014 09:24:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341958 - branches/2014Q1/dns/bind98 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.17 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, 31 Jan 2014 09:24:06 -0000 Author: mat Date: Fri Jan 31 09:24:05 2014 New Revision: 341958 URL: http://svnweb.freebsd.org/changeset/ports/341958 QAT: https://qat.redports.org/buildarchive/r341958/ Log: MFH: r341951 Update to 9.8.7. Changes: https://lists.isc.org/pipermail/bind-announce/2014-January/000895.html Sponsored by: Absolight Modified: branches/2014Q1/dns/bind98/Makefile branches/2014Q1/dns/bind98/distinfo branches/2014Q1/dns/bind98/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/dns/bind98/Makefile ============================================================================== --- branches/2014Q1/dns/bind98/Makefile Fri Jan 31 09:23:34 2014 (r341957) +++ branches/2014Q1/dns/bind98/Makefile Fri Jan 31 09:24:05 2014 (r341958) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= bind98 -PORTVERSION= 9.8.6.2 +PORTVERSION= 9.8.7 CATEGORIES= dns net ipv6 MASTER_SITES= ${MASTER_SITE_ISC} MASTER_SITE_SUBDIR= bind9/${ISCVERSION} @@ -13,7 +13,7 @@ COMMENT= BIND DNS suite with updated DNS LICENSE= ISCL # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.8.6-P2 +ISCVERSION= 9.8.7 MAKE_JOBS_UNSAFE= yes @@ -190,7 +190,7 @@ PLIST_SUB+= NOBASE="" PLIST_SUB+= NOBASE="@comment " .endif -MAN1= arpaname.1 dig.1 host.1 isc-config.sh.1 nslookup.1 nsupdate.1 +MAN1= arpaname.1 dig.1 host.1 isc-config.sh.1 nslookup.1 nsupdate.1 bind9-config.1 MAN3= lwres.3 lwres_addr_parse.3 lwres_buffer.3 lwres_buffer_add.3 \ lwres_buffer_back.3 lwres_buffer_clear.3 lwres_buffer_first.3 \ lwres_buffer_forward.3 lwres_buffer_getmem.3 lwres_buffer_getuint16.3 \ Modified: branches/2014Q1/dns/bind98/distinfo ============================================================================== --- branches/2014Q1/dns/bind98/distinfo Fri Jan 31 09:23:34 2014 (r341957) +++ branches/2014Q1/dns/bind98/distinfo Fri Jan 31 09:24:05 2014 (r341958) @@ -1,4 +1,4 @@ -SHA256 (bind-9.8.6-P2.tar.gz) = e5c87bdf102ac5b2563955393a2f4805e7574dc7addd03d18152c2f70befedeb -SIZE (bind-9.8.6-P2.tar.gz) = 7275835 +SHA256 (bind-9.8.7.tar.gz) = c59e7469f0e14b81df0962833cd9b0279290f0c28ef4e2e234973bc5bfa34308 +SIZE (bind-9.8.7.tar.gz) = 7477496 SHA256 (rpz2+rl-9.8.6.patch) = 76b988205ce17034ff6c03cff943d0e579a5a46dbc47e1fac83704c88fb96d79 SIZE (rpz2+rl-9.8.6.patch) = 348361 Modified: branches/2014Q1/dns/bind98/pkg-plist ============================================================================== --- branches/2014Q1/dns/bind98/pkg-plist Fri Jan 31 09:23:34 2014 (r341957) +++ branches/2014Q1/dns/bind98/pkg-plist Fri Jan 31 09:24:05 2014 (r341958) @@ -1,3 +1,4 @@ +bin/bind9-config bin/dig bin/host bin/isc-config.sh @@ -14,6 +15,7 @@ include/dns/byaddr.h include/dns/cache.h include/dns/callbacks.h include/dns/cert.h +include/dns/client.h include/dns/compress.h include/dns/db.h include/dns/dbiterator.h @@ -53,13 +55,13 @@ include/dns/rdatasetiter.h include/dns/rdataslab.h include/dns/rdatastruct.h include/dns/rdatatype.h -include/dns/rpz.h -include/dns/sdlz.h include/dns/request.h include/dns/resolver.h include/dns/result.h include/dns/rootns.h +include/dns/rpz.h include/dns/sdb.h +include/dns/sdlz.h include/dns/secalg.h include/dns/secproto.h include/dns/soa.h @@ -67,6 +69,7 @@ include/dns/ssu.h include/dns/tcpmsg.h include/dns/time.h include/dns/tkey.h +include/dns/tsec.h include/dns/tsig.h include/dns/ttl.h include/dns/types.h From owner-svn-ports-branches@FreeBSD.ORG Fri Jan 31 13:36:45 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 22656A15; Fri, 31 Jan 2014 13:36:45 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0DFFD117D; Fri, 31 Jan 2014 13:36:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0VDai1j023552; Fri, 31 Jan 2014 13:36:44 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0VDaibd023551; Fri, 31 Jan 2014 13:36:44 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201401311336.s0VDaibd023551@svn.freebsd.org> From: Pietro Cerutti Date: Fri, 31 Jan 2014 13:36:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341992 - in branches/2014Q1/audio/osalp: . 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.17 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, 31 Jan 2014 13:36:45 -0000 Author: gahr Date: Fri Jan 31 13:36:44 2014 New Revision: 341992 URL: http://svnweb.freebsd.org/changeset/ports/341992 QAT: https://qat.redports.org/buildarchive/r341992/ Log: MFH: r341840 - Fix build on modern compilers [MFH] - STAGE-clean Approved by: portmgr Added: branches/2014Q1/audio/osalp/files/ - copied from r341840, head/audio/osalp/files/ Modified: branches/2014Q1/audio/osalp/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/audio/osalp/Makefile ============================================================================== --- branches/2014Q1/audio/osalp/Makefile Fri Jan 31 13:23:40 2014 (r341991) +++ branches/2014Q1/audio/osalp/Makefile Fri Jan 31 13:36:44 2014 (r341992) @@ -21,10 +21,20 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --enable-all USE_LDCONFIG= yes -NO_STAGE= yes PLIST_SUB= VERSION=${PORTVERSION} CONFLICTS= libaudiofile-[0-9]* +post-patch: + ${FIND} ${WRKSRC} -name "*.cc" | ${XARGS} ${REINPLACE_CMD} -E \ + 's|iostream.h|iostream|; \ + s|[[:space:]]cout| std::cout|g; \ + s|[[:space:]]endl| std::endl|g; \ + s|[[:space:]]cerr| std::cerr|g;' + +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaflib-${PORTVERSION}.so \ + ${STAGEDIR}${PREFIX}/lib/aflib/lib*-${PORTVERSION}.so + .include From owner-svn-ports-branches@FreeBSD.ORG Fri Jan 31 17:21:22 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 2FB58795; Fri, 31 Jan 2014 17:21:22 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1B83715B5; Fri, 31 Jan 2014 17:21:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0VHLLNT015324; Fri, 31 Jan 2014 17:21:21 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0VHLLhY015323; Fri, 31 Jan 2014 17:21:21 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201401311721.s0VHLLhY015323@svn.freebsd.org> From: Antoine Brodin Date: Fri, 31 Jan 2014 17:21:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r342047 - branches/2014Q1/textproc/dblatex 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.17 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, 31 Jan 2014 17:21:22 -0000 Author: antoine Date: Fri Jan 31 17:21:21 2014 New Revision: 342047 URL: http://svnweb.freebsd.org/changeset/ports/342047 QAT: https://qat.redports.org/buildarchive/r342047/ Log: MFH: r337966 - Fix packaging after switch to setuptools (egginfo in plist) - Stage support - Use PYDISTUTILS_AUTOPLIST Approved by: portmgr (implicit) Deleted: branches/2014Q1/textproc/dblatex/pkg-plist Modified: branches/2014Q1/textproc/dblatex/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/textproc/dblatex/Makefile ============================================================================== --- branches/2014Q1/textproc/dblatex/Makefile Fri Jan 31 17:13:46 2014 (r342046) +++ branches/2014Q1/textproc/dblatex/Makefile Fri Jan 31 17:21:21 2014 (r342047) @@ -16,23 +16,23 @@ RUN_DEPENDS= xsltproc:${PORTSDIR}/textpr USE_BZIP2= yes USE_TEX= tex -USE_PYTHON= 2.5+ +USE_PYTHON= yes USE_PYDISTUTILS=yes -PYDISTUTILS_INSTALLARGS= -c -O1 --prefix=${PREFIX} \ - --catalogs=${PREFIX}/share/xml/catalog.ports +PYDISTUTILS_AUTOPLIST=yes -PYDISTUTILS_NOEGGINFO= yes -PLIST_SUB+= PYDISTUTILS_EGGINFO=${PYDISTUTILS_EGGINFO} +OPTIONS_DEFINE= DOCS -MAN1= dblatex.1 -MANCOMPRESSED= yes +.include -NO_STAGE= yes post-patch: -.if defined(NOPORTDOCS) +.if ! ${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -e '/pdfdocs),/d' ${WRKSRC}/setup.py @${REINPLACE_CMD} -e '/htmldoc)/d' ${WRKSRC}/setup.py .endif @${REINPLACE_CMD} -e "s,share/man/man1,man/man1,g" ${WRKSRC}/setup.py -.include +.include + +PYDISTUTILS_INSTALLARGS+= --catalogs=${PREFIX}/share/xml/catalog.ports + +.include From owner-svn-ports-branches@FreeBSD.ORG Fri Jan 31 17:25:20 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 D5B5CAF9; Fri, 31 Jan 2014 17:25:20 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C1B941607; Fri, 31 Jan 2014 17:25:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0VHPKKr015885; Fri, 31 Jan 2014 17:25:20 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0VHPKSd015884; Fri, 31 Jan 2014 17:25:20 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201401311725.s0VHPKSd015884@svn.freebsd.org> From: Antoine Brodin Date: Fri, 31 Jan 2014 17:25:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r342048 - branches/2014Q1/databases/mydbf2mysql 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.17 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, 31 Jan 2014 17:25:20 -0000 Author: antoine Date: Fri Jan 31 17:25:20 2014 New Revision: 342048 URL: http://svnweb.freebsd.org/changeset/ports/342048 QAT: https://qat.redports.org/buildarchive/r342048/ Log: MFH: r339643 Fix packaging after the move from distutils to setuptools (egginfo is now a directory, not a file): - Use PYDISTUTILS_AUTOPLIST - Stage support - Bump PORTREVISION Approved by: portmgr (implicit) Deleted: branches/2014Q1/databases/mydbf2mysql/pkg-plist Modified: branches/2014Q1/databases/mydbf2mysql/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/databases/mydbf2mysql/Makefile ============================================================================== --- branches/2014Q1/databases/mydbf2mysql/Makefile Fri Jan 31 17:21:21 2014 (r342047) +++ branches/2014Q1/databases/mydbf2mysql/Makefile Fri Jan 31 17:25:20 2014 (r342048) @@ -3,6 +3,7 @@ PORTNAME= mydbf2mysql PORTVERSION= 0.8.4.5 +PORTREVISION= 1 CATEGORIES= databases python MASTER_SITES= SF/mydbf2mysql/mydbf2mysql/${PORTVERSION}/ DISTNAME= MyDBF2MySQL-${PORTVERSION} @@ -13,17 +14,11 @@ COMMENT= Flexible tool for DBF import in RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb RUN_DEPENDS+= ydbf=0.0.1:${PORTSDIR}/devel/py-ydbf -PLIST_SUB+= PYTHON_VER=${PYTHON_VER} USE_PYTHON= 2.6+ USE_PYDISTUTILS=yes +PYDISTUTILS_AUTOPLIST=yes USE_BZIP2= yes -PYDISTUTILS_NOEGGINFO= yes -PYDISTUTILS_PKGNAME= MyDBF2MySQL -PYDISTUTILS_PKGVERSION= ${PORTVERSION} WRKSRC= ${WRKDIR}/${PORTNAME}/${PORTNAME}/dist/${DISTNAME}/ -MAN1= mydbf2mysql.1 - -NO_STAGE= yes .include From owner-svn-ports-branches@FreeBSD.ORG Fri Jan 31 17:27:55 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 2558B332; Fri, 31 Jan 2014 17:27:55 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1109B1654; Fri, 31 Jan 2014 17:27:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0VHRslx016264; Fri, 31 Jan 2014 17:27:54 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0VHRsRP016263; Fri, 31 Jan 2014 17:27:54 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201401311727.s0VHRsRP016263@svn.freebsd.org> From: Antoine Brodin Date: Fri, 31 Jan 2014 17:27:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r342049 - branches/2014Q1/graphics/pysvg 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.17 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, 31 Jan 2014 17:27:55 -0000 Author: antoine Date: Fri Jan 31 17:27:54 2014 New Revision: 342049 URL: http://svnweb.freebsd.org/changeset/ports/342049 QAT: https://qat.redports.org/buildarchive/r342049/ Log: MFH: r337894 graphics/pysvn: Fix package manifest, support stage Package was unable to create a manifest due to the presence of a directory in the pkg-plist. Change the port to generate the pkg-plist automatically and support stage. Approved by: maintainer (Olivier Duchateau) Approved by: portmgr (implicit) Deleted: branches/2014Q1/graphics/pysvg/pkg-plist Modified: branches/2014Q1/graphics/pysvg/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/graphics/pysvg/Makefile ============================================================================== --- branches/2014Q1/graphics/pysvg/Makefile Fri Jan 31 17:25:20 2014 (r342048) +++ branches/2014Q1/graphics/pysvg/Makefile Fri Jan 31 17:27:54 2014 (r342049) @@ -3,17 +3,17 @@ PORTNAME= pysvg PORTVERSION= 0.2.1 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= GOOGLE_CODE MAINTAINER= duchateau.olivier@gmail.com COMMENT= pySVG - creating svg with python -USE_PYDISTUTILS=yes +USE_PYDISTUTILS= yes +PYDISTUTILS_AUTOPLIST= yes + USE_PYTHON= -2.7 USE_ZIP= yes -PLIST_SUB= PYDISTUTILS_EGGINFO=${PYDISTUTILS_EGGINFO} - -NO_STAGE= yes .include From owner-svn-ports-branches@FreeBSD.ORG Sat Feb 1 16:01:15 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 568E1375; Sat, 1 Feb 2014 16:01:15 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3643B18FB; Sat, 1 Feb 2014 16:01:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s11G1F08043494; Sat, 1 Feb 2014 16:01:15 GMT (envelope-from riggs@svn.freebsd.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s11G1EKo043491; Sat, 1 Feb 2014 16:01:14 GMT (envelope-from riggs@svn.freebsd.org) Message-Id: <201402011601.s11G1EKo043491@svn.freebsd.org> From: Thomas Zander Date: Sat, 1 Feb 2014 16:01:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r342178 - in branches/2014Q1/multimedia/motion: . 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.17 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, 01 Feb 2014 16:01:15 -0000 Author: riggs Date: Sat Feb 1 16:01:14 2014 New Revision: 342178 URL: http://svnweb.freebsd.org/changeset/ports/342178 QAT: https://qat.redports.org/buildarchive/r342178/ Log: MFH: r342064 - Un-break port - Stage support - Replace USE_GMAKE by USES - New format for LIB_DEPENDS - Use /boot/modules via KMODDIR as in other ports PR: ports/184406 Submitted by: Ildar Hizbulin Approved by: portmgr (implicit), co-mentor (jadawin) Deleted: branches/2014Q1/multimedia/motion/files/patch-ffmpeg.c Modified: branches/2014Q1/multimedia/motion/Makefile branches/2014Q1/multimedia/motion/files/patch-configure.in branches/2014Q1/multimedia/motion/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/multimedia/motion/Makefile ============================================================================== --- branches/2014Q1/multimedia/motion/Makefile Sat Feb 1 15:54:44 2014 (r342177) +++ branches/2014Q1/multimedia/motion/Makefile Sat Feb 1 16:01:14 2014 (r342178) @@ -3,18 +3,16 @@ PORTNAME= motion PORTVERSION= 3.2.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20-%20${PORTVERSION:R}/${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Motion detection application -BROKEN= Fails to build - LICENSE= GPLv2 -LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg OPTIONS_DEFINE= FFMPEG MYSQL PGSQL DOCS EXAMPLES OPTIONS_SINGLE= VIDEO @@ -24,31 +22,30 @@ VIDEO_DESC= Video capture driver. Choose BKTR_DESC= BKTR based TV capture cards PWCBSD_DESC= PWCBSD based Webcams -USE_GMAKE= yes +USES= gmake USE_AUTOTOOLS= autoconf CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAN1= motion.1 PORTDOCS= CHANGELOG CREDITS README README.FreeBSD \ motion_guide.html PORTEXAMPLES= motion-dist.conf thread1.conf thread2.conf \ thread3.conf thread4.conf -NO_STAGE= yes .include .if ${PORT_OPTIONS:MBKTR} CONFIGURE_ARGS+=--with-bktr -CFLAGS+= -DWITHOUT_V4L .else CONFIGURE_ARGS+=--without-bktr .endif .if ${PORT_OPTIONS:MPWCBSD} +# Location /boot/modules is hard coded in the pwc port, so use it here too +KMODDIR= /boot/modules BUILD_DEPENDS+= v4l_compat>=1.0.20060801:${PORTSDIR}/multimedia/v4l_compat -RUN_DEPENDS+= /boot/modules/pwc.ko:${PORTSDIR}/multimedia/pwcbsd +RUN_DEPENDS+= ${KMODDIR}/pwc.ko:${PORTSDIR}/multimedia/pwcbsd CONFIGURE_ARGS+=--with-pwcbsd CFLAGS+= -DWITHOUT_V4L .else @@ -58,7 +55,7 @@ CONFIGURE_ARGS+=--without-pwcbsd CONFIGURE_ARGS+=--without-linuxthreads .if ${PORT_OPTIONS:MFFMPEG} -LIB_DEPENDS+= avformat:${PORTSDIR}/multimedia/ffmpeg +LIB_DEPENDS+= libavformat0.so:${PORTSDIR}/multimedia/ffmpeg0 CONFIGURE_ARGS+=--with-ffmpeg=${LOCALBASE} .else CONFIGURE_ARGS+=--without-ffmpeg @@ -94,26 +91,26 @@ post-patch: 's|jpeg_mem_dest|local_jpeg_mem_dest|' ${WRKSRC}/picture.c do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/motion ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/motion.1 ${MANPREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/motion ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/motion.1 ${STAGEDIR}${MANPREFIX}/man/man1 ${INSTALL_SCRIPT} ${WRKSRC}/motion.init-FreeBSD.sh \ - ${PREFIX}/etc/rc.d/motion + ${STAGEDIR}${PREFIX}/etc/rc.d/motion ${INSTALL_DATA} ${WRKSRC}/motion-dist.conf \ - ${PREFIX}/etc/motion.conf.sample -.if !exists(${PREFIX}/etc/motion.conf) - ${INSTALL_DATA} ${PREFIX}/etc/motion.conf.sample \ - ${PREFIX}/etc/motion.conf + ${STAGEDIR}${PREFIX}/etc/motion.conf.sample +.if !exists(${STAGEDIR}${PREFIX}/etc/motion.conf) + ${INSTALL_DATA} ${STAGEDIR}${PREFIX}/etc/motion.conf.sample \ + ${STAGEDIR}${PREFIX}/etc/motion.conf .endif .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor .endif .if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${EXAMPLESDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for f in ${PORTEXAMPLES} - ${INSTALL_DATA} ${WRKSRC}/${f} ${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${EXAMPLESDIR} .endfor .endif Modified: branches/2014Q1/multimedia/motion/files/patch-configure.in ============================================================================== --- branches/2014Q1/multimedia/motion/files/patch-configure.in Sat Feb 1 15:54:44 2014 (r342177) +++ branches/2014Q1/multimedia/motion/files/patch-configure.in Sat Feb 1 16:01:14 2014 (r342178) @@ -1,5 +1,5 @@ ---- configure.in.orig 2010-06-01 15:48:23.000000000 +0900 -+++ configure.in 2012-06-08 23:21:55.000000000 +0900 +--- configure.in.orig 2010-06-01 10:48:23.000000000 +0400 ++++ configure.in 2013-12-01 13:32:23.000000000 +0400 @@ -316,7 +316,7 @@ # else if test "${FFMPEG_DIR}" = "yes"; then @@ -9,62 +9,70 @@ if test -f /usr/lib64/libavcodec.a -o -f /usr/lib64/libavcodec.so && test -f /usr/lib64/libavformat.a -o -f /usr/lib64/libavformat.so ; then AC_MSG_RESULT(found in /usr/lib64) -@@ -347,7 +347,7 @@ +@@ -347,11 +347,11 @@ echo "" fi else - AC_MSG_CHECKING(for ffmpeg in -> [${FFMPEG_DIR}] <-) +- if test -f ${FFMPEG_DIR}/lib/libavcodec.a -o -f ${FFMPEG_DIR}/lib/libavcodec.so && test -f ${FFMPEG_DIR}/lib/libavformat.a -o -f ${FFMPEG_DIR}/lib/libavformat.so ; then + AC_MSG_CHECKING(for ffmpeg libraries in -> [${FFMPEG_DIR}] <-) - if test -f ${FFMPEG_DIR}/lib/libavcodec.a -o -f ${FFMPEG_DIR}/lib/libavcodec.so && test -f ${FFMPEG_DIR}/lib/libavformat.a -o -f ${FFMPEG_DIR}/lib/libavformat.so ; then ++ if test -f ${FFMPEG_DIR}/lib/ffmpeg0/libavcodec0.a -o -f ${FFMPEG_DIR}/lib/ffmpeg0/libavcodec0.so && test -f ${FFMPEG_DIR}/lib/ffmpeg0/libavformat0.a -o -f ${FFMPEG_DIR}/lib/ffmpeg0/libavformat0.so ; then AC_MSG_RESULT(found) FFMPEG_OK="found" -@@ -392,9 +392,11 @@ - elif test -f ${FFMPEG_DIR}/include/libavformat/avformat.h; then - AC_MSG_RESULT(found ${FFMPEG_DIR}/include/libavformat/avformat.h) - FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include -DFFMPEG_NEW_INCLUDES" -+ AVFORMAT="-I${FFMPEG_DIR}/include/libavformat" - elif test -f ${FFMPEG_DIR}/include/ffmpeg/libavformat/avformat.h; then - AC_MSG_RESULT(found ${FFMPEG_DIR}/include/ffmpeg/libavformat/avformat.h) - FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include/ffmpeg -DFFMPEG_NEW_INCLUDES" -+ AVFORMAT="-I${FFMPEG_DIR}/include/ffmpeg/libavformat" +- FFMPEG_LIB="${FFMPEG_DIR}/lib" ++ FFMPEG_LIB="${FFMPEG_DIR}/lib/ffmpeg0" + elif test -f ${FFMPEG_DIR}/libavcodec.a -o -f ${FFMPEG_DIR}/libavcodec.so && test -f ${FFMPEG_DIR}/libavformat.a -o -f ${FFMPEG_DIR}/libavformat.so ; then + AC_MSG_RESULT(found) + FFMPEG_LIB="${FFMPEG_DIR}" +@@ -389,12 +389,12 @@ + elif test -f ${FFMPEG_DIR}/include/ffmpeg/avformat.h; then + AC_MSG_RESULT(found ${FFMPEG_DIR}/include/ffmpeg/avformat.h) + FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include/ffmpeg" +- elif test -f ${FFMPEG_DIR}/include/libavformat/avformat.h; then +- AC_MSG_RESULT(found ${FFMPEG_DIR}/include/libavformat/avformat.h) +- FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include -DFFMPEG_NEW_INCLUDES" +- elif test -f ${FFMPEG_DIR}/include/ffmpeg/libavformat/avformat.h; then +- AC_MSG_RESULT(found ${FFMPEG_DIR}/include/ffmpeg/libavformat/avformat.h) +- FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include/ffmpeg -DFFMPEG_NEW_INCLUDES" ++# elif test -f ${FFMPEG_DIR}/include/libavformat/avformat.h; then ++# AC_MSG_RESULT(found ${FFMPEG_DIR}/include/libavformat/avformat.h) ++# FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include -DFFMPEG_NEW_INCLUDES" ++ elif test -f ${FFMPEG_DIR}/include/ffmpeg0/libavformat/avformat.h; then ++ AC_MSG_RESULT(found ${FFMPEG_DIR}/include/ffmpeg0/libavformat/avformat.h) ++ FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include/ffmpeg0 -DFFMPEG_NEW_INCLUDES" else AC_MSG_RESULT(not found) FFMPEG_OK="no_found" -@@ -423,9 +425,11 @@ - AC_MSG_CHECKING([file_protocol is defined in ffmpeg ?]) - saved_CFLAGS=$CFLAGS - saved_LIBS=$LIBS -- CFLAGS="${FFMPEG_CFLAGS}" -+ -+ -+ CFLAGS="${FFMPEG_CFLAGS} ${AVFORMAT}" - LIBS="$TEMP_LIBS" -- -+ - AC_COMPILE_IFELSE( - [ - #include -@@ -442,7 +446,8 @@ - ] - ) - CFLAGS=$saved_CFLAGS -- LIBS=$saved_LIBS -+ LIBS=$saved_LIBS -+ - fi - fi - fi -@@ -1067,6 +1072,13 @@ +@@ -413,9 +413,9 @@ + # + + if test "${FFMPEG_OK}" = "found"; then +- TEMP_LIBS="$TEMP_LIBS -L${FFMPEG_LIB} -lavformat -lavcodec -lavutil -lm -lz" ++ TEMP_LIBS="$TEMP_LIBS -L${FFMPEG_LIB} -lavformat0 -lavcodec0 -lavutil0 -lm -lz" + TEMP_LDFLAGS="${TEMP_LDFLAGS} -L${FFMPEG_LIB}" +- TEMP_CFLAGS="${TEMP_CFLAGS} -DHAVE_FFMPEG ${FFMPEG_CFLAGS}" ++ TEMP_CFLAGS="-DHAVE_FFMPEG ${FFMPEG_CFLAGS} ${TEMP_CFLAGS}" + + FFMPEG_OBJ="ffmpeg.o" + AC_SUBST(FFMPEG_OBJ) +@@ -751,7 +751,7 @@ + if test "${V4L}" = "no"; then + AC_MSG_CHECKING(for V42L support) + AC_MSG_RESULT(skipping) +-else ++elif test "${BKTR}" = "no"; then + AC_CHECK_TYPE([struct v4l2_buffer], + [SUPPORTED_V4L2=true], + [SUPPORTED_V4L2=false], +@@ -1067,6 +1067,11 @@ LIBS="${TEMP_LIBS}" LDFLAGS="${TEMP_LDFLAGS}" -+ +AC_CHECK_FUNC(avformat_alloc_context, AC_DEFINE([have_avformat_alloc_context],1,[Define to 1 if you have avformat_alloc_context support])) +AC_CHECK_FUNC(av_avformat_alloc_context, AC_DEFINE([have_av_avformat_alloc_context],1,[Define to 1 if you have av_avformat_alloc_context support])) +AC_CHECK_FUNC(av_register_protocol2, AC_DEFINE([have_av_register_protocol2],1,[Define to 1 if you have av_register_protocol2 support])) +AC_CHECK_FUNC(av_register_protocol, AC_DEFINE([have_av_register_protocol],1,[Define to 1 if you have av_register_protocol support])) + -+ # # Add the right exec path for rc scripts # Modified: branches/2014Q1/multimedia/motion/pkg-plist ============================================================================== --- branches/2014Q1/multimedia/motion/pkg-plist Sat Feb 1 15:54:44 2014 (r342177) +++ branches/2014Q1/multimedia/motion/pkg-plist Sat Feb 1 16:01:14 2014 (r342178) @@ -1,4 +1,5 @@ bin/motion +man/man1/motion.1.gz @unexec if cmp -s %D/etc/motion.conf %D/etc/motion.conf.sample; then rm -f %D/etc/motion.conf; fi etc/motion.conf.sample @exec [ -f %B/motion.conf ] || cp %B/%f %B/motion.conf From owner-svn-ports-branches@FreeBSD.ORG Sat Feb 1 16:02:43 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 92E5D462; Sat, 1 Feb 2014 16:02:43 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7DAB21908; Sat, 1 Feb 2014 16:02:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s11G2hi7044492; Sat, 1 Feb 2014 16:02:43 GMT (envelope-from riggs@svn.freebsd.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s11G2g2H044485; Sat, 1 Feb 2014 16:02:42 GMT (envelope-from riggs@svn.freebsd.org) Message-Id: <201402011602.s11G2g2H044485@svn.freebsd.org> From: Thomas Zander Date: Sat, 1 Feb 2014 16:02:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r342179 - in branches/2014Q1/multimedia/motion: . 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.17 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, 01 Feb 2014 16:02:43 -0000 Author: riggs Date: Sat Feb 1 16:02:42 2014 New Revision: 342179 URL: http://svnweb.freebsd.org/changeset/ports/342179 QAT: https://qat.redports.org/buildarchive/r342179/ Log: MFH: r342125 - Bump PORTREVISION - Use startup script via USE_RC_SUBR - Add pkg-message to inform about startup script - Fix a runtime error using wrong pid file in daemonised process Approved by: portmgr (miwi), thierry (mentor) Added: branches/2014Q1/multimedia/motion/files/motion.in - copied unchanged from r342125, head/multimedia/motion/files/motion.in branches/2014Q1/multimedia/motion/files/pkg-message.in - copied unchanged from r342125, head/multimedia/motion/files/pkg-message.in Modified: branches/2014Q1/multimedia/motion/Makefile branches/2014Q1/multimedia/motion/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/multimedia/motion/Makefile ============================================================================== --- branches/2014Q1/multimedia/motion/Makefile Sat Feb 1 16:01:14 2014 (r342178) +++ branches/2014Q1/multimedia/motion/Makefile Sat Feb 1 16:02:42 2014 (r342179) @@ -3,7 +3,7 @@ PORTNAME= motion PORTVERSION= 3.2.12 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20-%20${PORTVERSION:R}/${PORTVERSION} @@ -25,6 +25,9 @@ PWCBSD_DESC= PWCBSD based Webcams USES= gmake USE_AUTOTOOLS= autoconf +USE_RC_SUBR= ${PORTNAME} +SUB_FILES= pkg-message + CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -89,12 +92,13 @@ post-patch: # Resolve name collision with jpeg-8 @${REINPLACE_CMD} -e \ 's|jpeg_mem_dest|local_jpeg_mem_dest|' ${WRKSRC}/picture.c +# Fix pidfile path + @${REINPLACE_CMD} -e \ + 's|/run/motion|/run|' ${WRKSRC}/motion-dist.conf.in do-install: ${INSTALL_PROGRAM} ${WRKSRC}/motion ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/motion.1 ${STAGEDIR}${MANPREFIX}/man/man1 - ${INSTALL_SCRIPT} ${WRKSRC}/motion.init-FreeBSD.sh \ - ${STAGEDIR}${PREFIX}/etc/rc.d/motion ${INSTALL_DATA} ${WRKSRC}/motion-dist.conf \ ${STAGEDIR}${PREFIX}/etc/motion.conf.sample .if !exists(${STAGEDIR}${PREFIX}/etc/motion.conf) Copied: branches/2014Q1/multimedia/motion/files/motion.in (from r342125, head/multimedia/motion/files/motion.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/multimedia/motion/files/motion.in Sat Feb 1 16:02:42 2014 (r342179, copy of r342125, head/multimedia/motion/files/motion.in) @@ -0,0 +1,26 @@ +#!/bin/sh + +# $FreeBSD$ +# +# PROVIDE: motion +# REQUIRE: DAEMON +# KEYWORD: shutdown +# +# Add the following line in /etc/rc.conf to enable motion at startup +# +# motion_enable="YES" + +. /etc/rc.subr + +name=motion +rcvar=motion_enable + +load_rc_config $name + +: ${motion_enable:=NO} + +command=%%PREFIX%%/bin/${name} +pidfile="/var/run/${name}.pid" +required_files=%%PREFIX%%/etc/${name}.conf + +run_rc_command "$1" Copied: branches/2014Q1/multimedia/motion/files/pkg-message.in (from r342125, head/multimedia/motion/files/pkg-message.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/multimedia/motion/files/pkg-message.in Sat Feb 1 16:02:42 2014 (r342179, copy of r342125, head/multimedia/motion/files/pkg-message.in) @@ -0,0 +1,15 @@ +**************************************************************** +To use the motion service properly, you should edit + + %%PREFIX%%/etc/motion.conf + +according to your needs. +To automatically start the service at boot time, +add the following line to /etc/rc.conf: + + motion_enable="YES" + +Then, to start the service right now without reboot, execute + + service motion start +**************************************************************** Modified: branches/2014Q1/multimedia/motion/pkg-plist ============================================================================== --- branches/2014Q1/multimedia/motion/pkg-plist Sat Feb 1 16:01:14 2014 (r342178) +++ branches/2014Q1/multimedia/motion/pkg-plist Sat Feb 1 16:02:42 2014 (r342179) @@ -3,4 +3,3 @@ man/man1/motion.1.gz @unexec if cmp -s %D/etc/motion.conf %D/etc/motion.conf.sample; then rm -f %D/etc/motion.conf; fi etc/motion.conf.sample @exec [ -f %B/motion.conf ] || cp %B/%f %B/motion.conf -etc/rc.d/motion