From owner-svn-ports-branches@FreeBSD.ORG Sun Aug 18 17:11:01 2013 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 ESMTP id 18D9EF98; Sun, 18 Aug 2013 17:11:01 +0000 (UTC) (envelope-from brd@FreeBSD.org) 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 EB73F2155; Sun, 18 Aug 2013 17:11:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7IHB0Ug007178; Sun, 18 Aug 2013 17:11:00 GMT (envelope-from brd@svn.freebsd.org) Received: (from brd@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7IHAxRT006460; Sun, 18 Aug 2013 17:10:59 GMT (envelope-from brd@svn.freebsd.org) Message-Id: <201308181710.r7IHAxRT006460@svn.freebsd.org> From: Brad Davis Date: Sun, 18 Aug 2013 17:10:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r324930 - in branches/RELENG_9_2_0: security/vuxml sysutils/puppet sysutils/puppet27 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.14 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, 18 Aug 2013 17:11:01 -0000 Author: brd (doc committer) Date: Sun Aug 18 17:10:59 2013 New Revision: 324930 URL: http://svnweb.freebsd.org/changeset/ports/324930 Log: MFH r324808 and r324813: Update sysutils/puppet to 3.2.4 and sysutils/puppet27 to 2.7.23. Approved by: portmgr (erwin@) and maintainer (swills@) Security: 2b2f6092-0694-11e3-9e8e-000c29f6ae42 Modified: branches/RELENG_9_2_0/security/vuxml/vuln.xml branches/RELENG_9_2_0/sysutils/puppet/Makefile branches/RELENG_9_2_0/sysutils/puppet/distinfo branches/RELENG_9_2_0/sysutils/puppet27/Makefile branches/RELENG_9_2_0/sysutils/puppet27/distinfo Directory Properties: branches/RELENG_9_2_0/ (props changed) Modified: branches/RELENG_9_2_0/security/vuxml/vuln.xml ============================================================================== --- branches/RELENG_9_2_0/security/vuxml/vuln.xml Sun Aug 18 16:13:02 2013 (r324929) +++ branches/RELENG_9_2_0/security/vuxml/vuln.xml Sun Aug 18 17:10:59 2013 (r324930) @@ -51,6 +51,43 @@ Note: Please add new entries to the beg --> + + puppet -- multiple vulnerabilities + + + puppet + 2.72.7.23 + 3.03.2.4 + + + + +

Puppet Labs reports:

+
By using the `resource_type` service, an attacker could + cause puppet to load arbitrary Ruby files from the puppet + master node's file system. While this behavior is not + enabled by default, `auth.conf` settings could be modified + to allow it. The exploit requires local file system access + to the Puppet Master.
+
Puppet Module Tool (PMT) did not correctly control + permissions of modules it installed, instead transferring + permissions that existed when the module was built.
+

+ + + + CVE-2013-4761 + CVE-2013-4956 + http://puppetlabs.com/security/cve/cve-2013-4761/ + http://puppetlabs.com/security/cve/cve-2013-4956/ + + + 2013-07-05 + 2013-08-16 + + + polarssl -- denial of service through unterminated loop in certificate parser Modified: branches/RELENG_9_2_0/sysutils/puppet/Makefile ============================================================================== --- branches/RELENG_9_2_0/sysutils/puppet/Makefile Sun Aug 18 16:13:02 2013 (r324929) +++ branches/RELENG_9_2_0/sysutils/puppet/Makefile Sun Aug 18 17:10:59 2013 (r324930) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= puppet -PORTVERSION= 3.2.3 +PORTVERSION= 3.2.4 CATEGORIES= sysutils MASTER_SITES= http://downloads.puppetlabs.com/puppet/ Modified: branches/RELENG_9_2_0/sysutils/puppet/distinfo ============================================================================== --- branches/RELENG_9_2_0/sysutils/puppet/distinfo Sun Aug 18 16:13:02 2013 (r324929) +++ branches/RELENG_9_2_0/sysutils/puppet/distinfo Sun Aug 18 17:10:59 2013 (r324930) @@ -1,2 +1,2 @@ -SHA256 (puppet-3.2.3.tar.gz) = 6a19927d6126b9f6f40e94997c0896a618da8983178ca0e30264122b70edf819 -SIZE (puppet-3.2.3.tar.gz) = 1782059 +SHA256 (puppet-3.2.4.tar.gz) = 8b38f4adee6237b8dd7b1956d90af97f2d0091245d6e30b708bbc8e333001358 +SIZE (puppet-3.2.4.tar.gz) = 1786216 Modified: branches/RELENG_9_2_0/sysutils/puppet27/Makefile ============================================================================== --- branches/RELENG_9_2_0/sysutils/puppet27/Makefile Sun Aug 18 16:13:02 2013 (r324929) +++ branches/RELENG_9_2_0/sysutils/puppet27/Makefile Sun Aug 18 17:10:59 2013 (r324930) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= puppet -PORTVERSION= 2.7.22 +PORTVERSION= 2.7.23 CATEGORIES= sysutils MASTER_SITES= http://downloads.puppetlabs.com/puppet/ Modified: branches/RELENG_9_2_0/sysutils/puppet27/distinfo ============================================================================== --- branches/RELENG_9_2_0/sysutils/puppet27/distinfo Sun Aug 18 16:13:02 2013 (r324929) +++ branches/RELENG_9_2_0/sysutils/puppet27/distinfo Sun Aug 18 17:10:59 2013 (r324930) @@ -1,2 +1,2 @@ -SHA256 (puppet-2.7.22.tar.gz) = bfd79c0aecdeea4e1a8573e9325fbcb48778603d908180e88897458f01fe06de -SIZE (puppet-2.7.22.tar.gz) = 2023230 +SHA256 (puppet-2.7.23.tar.gz) = 73bc0d5a2334dc484148141a32274703b65b78bf87ca41f7e2da1c38518ba490 +SIZE (puppet-2.7.23.tar.gz) = 2025639 From owner-svn-ports-branches@FreeBSD.ORG Mon Aug 19 11:48:27 2013 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 ESMTP id 799C6589; Mon, 19 Aug 2013 11:48:27 +0000 (UTC) (envelope-from garga@FreeBSD.org) 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 66D4728CE; Mon, 19 Aug 2013 11:48:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7JBmRsd093152; Mon, 19 Aug 2013 11:48:27 GMT (envelope-from garga@svn.freebsd.org) Received: (from garga@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7JBmQCk093148; Mon, 19 Aug 2013 11:48:26 GMT (envelope-from garga@svn.freebsd.org) Message-Id: <201308191148.r7JBmQCk093148@svn.freebsd.org> From: Renato Botelho Date: Mon, 19 Aug 2013 11:48:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r324975 - branches/RELENG_9_2_0/textproc/po4a 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.14 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, 19 Aug 2013 11:48:27 -0000 Author: garga Date: Mon Aug 19 11:48:26 2013 New Revision: 324975 URL: http://svnweb.freebsd.org/changeset/ports/324975 Log: MFH r324972: Unbreak po4a using old distfile while a proper solution with new one is not ready Approved by: portmgr (bdrewery) Modified: branches/RELENG_9_2_0/textproc/po4a/Makefile branches/RELENG_9_2_0/textproc/po4a/distinfo Modified: branches/RELENG_9_2_0/textproc/po4a/Makefile ============================================================================== --- branches/RELENG_9_2_0/textproc/po4a/Makefile Mon Aug 19 11:24:32 2013 (r324974) +++ branches/RELENG_9_2_0/textproc/po4a/Makefile Mon Aug 19 11:48:26 2013 (r324975) @@ -4,9 +4,8 @@ PORTNAME= po4a PORTVERSION= 0.44 CATEGORIES= textproc perl5 -MASTER_SITES= LOCAL/garga/po4a \ - http://pkgs.fedoraproject.org/repo/pkgs/po4a/po4a-0.44.tar.gz/ff7b6859d729a52a57a880d6cf6a7fcf/ \ - http://alioth.debian.org/frs/download.php/file/3786/ +MASTER_SITES= LOCAL/garga/po4a/orig \ + http://leaf.dragonflybsd.org/~marino/dports-src/ MAINTAINER= garga@FreeBSD.org COMMENT= Brings gettext translation tools to all kinds of docs @@ -21,8 +20,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} USES= gettext USE_PERL5= yes PERL_MODBUILD= yes - -BROKEN= Installing files in wrong place +WRKSRC= ${WRKDIR}/${PORTNAME}-v0.40.1 MANPREFIX= ${PREFIX} MAN3PREFIX= ${MANPREFIX} Modified: branches/RELENG_9_2_0/textproc/po4a/distinfo ============================================================================== --- branches/RELENG_9_2_0/textproc/po4a/distinfo Mon Aug 19 11:24:32 2013 (r324974) +++ branches/RELENG_9_2_0/textproc/po4a/distinfo Mon Aug 19 11:48:26 2013 (r324975) @@ -1,2 +1,2 @@ -SHA256 (po4a-0.44.tar.gz) = 718479ff301bfc5182a653d2392bef7ef172fff4a4996902cb68e32372a3a608 -SIZE (po4a-0.44.tar.gz) = 2166715 +SHA256 (po4a-0.44.tar.gz) = 141e6d0cf37950e043a21ef4a22be1d9620bdcd8af9143bb64217ff6176ab930 +SIZE (po4a-0.44.tar.gz) = 1801072 From owner-svn-ports-branches@FreeBSD.ORG Mon Aug 19 13:10:54 2013 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 ESMTP id EFBFF481 for ; Mon, 19 Aug 2013 13:10:54 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 B8CAE2D67 for ; Mon, 19 Aug 2013 13:10:54 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r7JDAsKk033531 for ; Mon, 19 Aug 2013 13:10:54 GMT (envelope-from bdrewery@freefall.freebsd.org) Received: (from bdrewery@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r7JDAslf033528 for svn-ports-branches@freebsd.org; Mon, 19 Aug 2013 13:10:54 GMT (envelope-from bdrewery) Received: (qmail 81821 invoked from network); 19 Aug 2013 08:10:52 -0500 Received: from unknown (HELO ?10.10.0.24?) (freebsd@shatow.net@10.10.0.24) by sweb.xzibition.com with ESMTPA; 19 Aug 2013 08:10:52 -0500 Message-ID: <52121959.4030809@FreeBSD.org> Date: Mon, 19 Aug 2013 08:10:49 -0500 From: Bryan Drewery Organization: FreeBSD User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130801 Thunderbird/17.0.8 MIME-Version: 1.0 To: Renato Botelho Subject: Re: svn commit: r324975 - branches/RELENG_9_2_0/textproc/po4a References: <201308191148.r7JBmQCk093148@svn.freebsd.org> In-Reply-To: <201308191148.r7JBmQCk093148@svn.freebsd.org> X-Enigmail-Version: 1.5.2 OpenPGP: id=3C9B0CF9; url=http://www.shatow.net/bryan/bryan.asc Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="hux4QCgna5Tt59xkfnkrkQgX7OfBXdjn6" Cc: svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.14 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, 19 Aug 2013 13:10:55 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --hux4QCgna5Tt59xkfnkrkQgX7OfBXdjn6 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 8/19/2013 6:48 AM, Renato Botelho wrote: > Author: garga > Date: Mon Aug 19 11:48:26 2013 > New Revision: 324975 > URL: http://svnweb.freebsd.org/changeset/ports/324975 >=20 > Log: > MFH r324972: > =20 > Unbreak po4a using old distfile while a proper solution with new one = is not > ready > =20 > Approved by: portmgr (bdrewery) >=20 > Modified: > branches/RELENG_9_2_0/textproc/po4a/Makefile > branches/RELENG_9_2_0/textproc/po4a/distinfo >=20 This missed the mergeinfo. Please follow https://wiki.freebsd.org/PortsSubversionPrimer#Merging next time. Merge (svn merge -c) and commit from root. I will fix the mergeinfo. --=20 Regards, Bryan Drewery --hux4QCgna5Tt59xkfnkrkQgX7OfBXdjn6 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (MingW32) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJSEhlZAAoJEG54KsA8mwz5aoIP/Av7lFOAck/rVyXFsicmRBYw DLntrkUrJutSx+U5P2lsmgUewD5tG0DuoecY2KzNrFFqB1rMJyflv90zAe4k8xTl mFhCgikeqrJGNfm4aHcH54mOQIiTWjFZY+qnqWwToC7xTNqR+clHJtaNIEUjnMIu NCIpFfdhiqZyy+eqluqYljoAvPOdYYORNfUFnJXoAlNbRhl8JjkUlURnZ90V30PS aws0UruJTR/LL4dbzsH7nN0IVUiEWZGMfclOb2LYqpCrVamZUztfZg09NDz5O0BB ihgbrmUxhS7dty3LuPK/cTgFbwTHznjKO6e/gqtKNigdycteCig2I3nzuqNjTCmG sylYoEYSctUthIiHm9XPNhA5JOAkwpsi0aRLhRlBytzLStpsuRV07+pUxvAVxT2o LbMN3/l3V+tFzAF/HGXZWa54mtfIq9rjlIerH0lNm+Nbb/KIlubeTRucW97lWmzv js+q85XxUyXqayYy66f+3wDdGbnM48EbuclpNtwME5h44n0ppMWuM7Bg9bObE96J RBwsvX9WWE3x1zztreIc3I8P+nyYPmMye4oGeMSpJusP8Fpdop1PC3NsX/RvCQF9 JRqT8GscVbSnPZLza7XkWm+FZQpBbNiN67REYe7/c60trok1RTyx/rSGlUwvwQrs BW+ioXDt5wAmhhw/heOg =oH6v -----END PGP SIGNATURE----- --hux4QCgna5Tt59xkfnkrkQgX7OfBXdjn6-- From owner-svn-ports-branches@FreeBSD.ORG Mon Aug 19 13:19:33 2013 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 ESMTP id 1B51BBC9; Mon, 19 Aug 2013 13:19:33 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) 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 E3C072E06; Mon, 19 Aug 2013 13:19:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7JDJW4W060364; Mon, 19 Aug 2013 13:19:32 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7JDJW4a060363; Mon, 19 Aug 2013 13:19:32 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201308191319.r7JDJW4a060363@svn.freebsd.org> From: Bryan Drewery Date: Mon, 19 Aug 2013 13:19:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r324988 - branches/RELENG_9_2_0 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.14 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, 19 Aug 2013 13:19:33 -0000 Author: bdrewery Date: Mon Aug 19 13:19:32 2013 New Revision: 324988 URL: http://svnweb.freebsd.org/changeset/ports/324988 Log: - Fix mergeinfo for r324975 With hat: portmgr Modified: Directory Properties: branches/RELENG_9_2_0/ (props changed) From owner-svn-ports-branches@FreeBSD.ORG Mon Aug 19 13:26:37 2013 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 ESMTP id 67AB2E50; Mon, 19 Aug 2013 13:26:37 +0000 (UTC) (envelope-from garga.bsd@gmail.com) Received: from mail-ye0-x22a.google.com (mail-ye0-x22a.google.com [IPv6:2607:f8b0:4002:c04::22a]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EBF392E6F; Mon, 19 Aug 2013 13:26:36 +0000 (UTC) Received: by mail-ye0-f170.google.com with SMTP id m7so102706yen.15 for ; Mon, 19 Aug 2013 06:26:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:organization:user-agent:mime-version:to :cc:subject:references:in-reply-to:content-type; bh=hLlm8jpUgXZhIHh0pyaV/sMckqo0beRHrK5PDkvFTP0=; b=c8NRsbZ8cLJyRdBhItEpTddVVlg00FZMOMD43SnzUYvesdwcVDapy9hlkXmvVotElf yQNDg/30aF8AO5/Ip22MDovpDBCDRuAQC9YxBnep0YfLPxKM5UNm87azz7/RD2aOmzMY qwitlg7QVZQz/JYzjbDk5K8WLeRTcGJXlUmmh/bHC7/9cBlndE/DJVMFQKB9xmPLTsGP 4rJl67kYWaFKgEa9HeubTpmorBQRxeQ8yDVAf6delpKAgswWOV5rHqSCI8zDfYyBkb2n 7LTzonoAtPvicAcHbnfHQgEpxhkDuc4nFqSUXBNs+d48eUaviSHn6FLQcQ543SxQQ5Mi zHdg== X-Received: by 10.236.123.36 with SMTP id u24mr1403764yhh.59.1376918796175; Mon, 19 Aug 2013 06:26:36 -0700 (PDT) Received: from [192.168.11.100] (201-92-85-4.dsl.telesp.net.br. [201.92.85.4]) by mx.google.com with ESMTPSA id s9sm13810042yhb.9.1969.12.31.16.00.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 19 Aug 2013 06:26:35 -0700 (PDT) Sender: Renato Botelho Message-ID: <52121D07.5060803@FreeBSD.org> Date: Mon, 19 Aug 2013 10:26:31 -0300 From: Renato Botelho Organization: The FreeBSD Project User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130805 Thunderbird/17.0.8 MIME-Version: 1.0 To: Bryan Drewery Subject: Re: svn commit: r324975 - branches/RELENG_9_2_0/textproc/po4a References: <201308191148.r7JBmQCk093148@svn.freebsd.org> <52121959.4030809@FreeBSD.org> In-Reply-To: <52121959.4030809@FreeBSD.org> X-Enigmail-Version: 1.5.2 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="WgSdDJrlgEssqUfB1RQt8MNDDhxjoRRVB" Cc: svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.14 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, 19 Aug 2013 13:26:37 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --WgSdDJrlgEssqUfB1RQt8MNDDhxjoRRVB Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 19-08-2013 10:10, Bryan Drewery wrote: > On 8/19/2013 6:48 AM, Renato Botelho wrote: >> Author: garga >> Date: Mon Aug 19 11:48:26 2013 >> New Revision: 324975 >> URL: http://svnweb.freebsd.org/changeset/ports/324975 >> >> Log: >> MFH r324972: >> =20 >> Unbreak po4a using old distfile while a proper solution with new one= is not >> ready >> =20 >> Approved by: portmgr (bdrewery) >> >> Modified: >> branches/RELENG_9_2_0/textproc/po4a/Makefile >> branches/RELENG_9_2_0/textproc/po4a/distinfo >> >=20 > This missed the mergeinfo. >=20 > Please follow https://wiki.freebsd.org/PortsSubversionPrimer#Merging > next time. >=20 > Merge (svn merge -c) and commit from root. >=20 > I will fix the mergeinfo. Thanks for fixing it. I figured out what happened, I did the right procedure on the wrong system, so I used a regular svn, without FreeBSD specifics. --=20 Renato Botelho GnuPG Key: http://www.FreeBSD.org/~garga/pubkey.asc --WgSdDJrlgEssqUfB1RQt8MNDDhxjoRRVB Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) Comment: GPGTools - http://gpgtools.org Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBCgAGBQJSEh0HAAoJEPHw56GfYleQQKsQAI9LuV4u1tcuCUGEScCBSW7t b4FQax+mv58uWQLZ/fLvzSWIHesuhjOfC9WbraVSJwyjJUWAwG9WKIfGK9PnfqAp HVKrppS/8kmKlgYywcEE54sfHX8yqPKyUn93dlvpnhamFb2+QqmfMF4ULneHlkD8 9kqu1ef8bU3xVic40lxeSeGfvocet/EP283vT5bNTYOyIJaRktb9wMc7OLwSmmh2 t/JlpTEoJpUTFDRsIQsxllOBsqhsNak7/lgqWCmLZMg12NDPzqEjYyp9PZqBcbJq 9v4/RmIRJL2eCHad8ZC3nKsRusW6ZombWx1vMxoBKCmugj9Au0OR0AaRiCWdzZHO 0BO0e/1c8FQwW/ORQINHQDqTimFdYA+Q9GFYMViExIIYY0ZxO8dvme9WbEMZ5KG4 +x4+LcCGd+fhNJhsAHjMRwKlzJMhechBGO1961GTSppE+1m7N6B3gt6T2+t2U95b WZ1vSz/5he/SLcsWbV0c+u2TEf52Zt+AQf8rk8DDHgLaqZQbfG8u7zSa5jUuvS/w 4q4dzd9561YxQpjFkon4JOEmkpe1kQ36XuFRG3bJszDKichhFlMdYCXdiJ0ZIQBu U7GI7tKe9BQDkQsqciqYaOAQB3+pfFNxDTU5Ep3yveU83DTRnxPhYwoPtPpxs0J/ crhF9rujRzSEIdFOR+H2 =yBbR -----END PGP SIGNATURE----- --WgSdDJrlgEssqUfB1RQt8MNDDhxjoRRVB--