From owner-svn-ports-svnadmin@freebsd.org Sun Apr 1 00:13:59 2018 Return-Path: Delivered-To: svn-ports-svnadmin@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CA8B6F6A7B9; Sun, 1 Apr 2018 00:13:59 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 829E17E5D7; Sun, 1 Apr 2018 00:13:59 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1354) id 7B18942AD; Sun, 1 Apr 2018 00:13:59 +0000 (UTC) From: Jan Beich To: ports-committers@freebsd.org Cc: svn-ports-all@freebsd.org, svn-ports-svnadmin@freebsd.org Subject: Re: svn commit: r466108 - svnadmin/conf References: <201804010005.w3105p4D014073@repo.freebsd.org> Date: Sun, 01 Apr 2018 02:13:55 +0200 In-Reply-To: <201804010005.w3105p4D014073@repo.freebsd.org> (Jan Beich's message of "Sun, 1 Apr 2018 00:05:51 +0000 (UTC)") Message-ID: <1sfz-pyv0-wny@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: svn-ports-svnadmin@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for svnadmin of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Apr 2018 00:14:00 -0000 Jan Beich writes: > Author: jbeich > Date: Sun Apr 1 00:05:51 2018 > New Revision: 466108 > URL: https://svnweb.freebsd.org/changeset/ports/466108 > > Log: > Give myself a larger limit temporarily for vuln.xml update ports-secteam@ can trim the file but the real issue is lots of CVE copy-pasta that should be handled by CPE strings instead. -- Here's the original error message. $ git svn dcommit Committing to svn+ssh://repo.freebsd.org/ports/head ... A mail/thunderbird/files/patch-bug1440717 M mail/thunderbird/Makefile Committed r466104 Index mismatch: 8b22c416f075823bfc3eab031764c8f4479f63bf != c85dbbe47110f39f7562439d5beeb44e640b6582 rereading b6f375ef19f4467b667b4e5726d066d1ff5dd0de A mail/thunderbird/files/patch-bug1440717 M mail/thunderbird/Makefile r466104 = fd6ed7741980eeb37b03e8afdab3e276f9e13271 (refs/remotes/origin/trunk) M security/vuxml/vuln.xml Committed r466105 M security/vuxml/vuln.xml r466105 = 23330af2e5dd1c5fa2a8e9322b72460a1de7e738 (refs/remotes/origin/trunk) M security/vuxml/vuln.xml Committed r466106 M security/vuxml/vuln.xml r466106 = 0aab7c83b038e60473e8bbcecc380ab8ce1b7c6f (refs/remotes/origin/trunk) M security/vuxml/vuln.xml ERROR from SVN: A repository hook failed: Commit blocked by pre-commit hook (exit code 1) with output: Sorry, you are trying to commit a 1152571 byte transaction! The safety limit is 1024000 bytes. You were about to ADD this to the repo. See svnadmin/hooks/scripts/sizelimit.py for instructions if this is intended. W: 580074b8579fbd10818847c3751e7880850e7d65 and refs/remotes/origin/trunk differ, using rebase: :040000 040000 eee20e8a1d56ccaafb3f0a799d30a0b78faf95d3 953a17b78265fad5d0e870961595c3886ab9d025 M security First, rewinding head to replay your work on top of it... Applying: security/vuxml: adjust thunderbird version for CVE-2018-5148 backport ERROR: Not all changes have been committed into SVN, however the committed ones (if any) seem to be successfully integrated into the working tree. Please see the above messages for details.