Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 01 Apr 2018 02:13:55 +0200
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org
Cc:        svn-ports-all@freebsd.org, svn-ports-svnadmin@freebsd.org
Subject:   Re: svn commit: r466108 - svnadmin/conf
Message-ID:  <1sfz-pyv0-wny@FreeBSD.org>
In-Reply-To: <201804010005.w3105p4D014073@repo.freebsd.org> (Jan Beich's message of "Sun, 1 Apr 2018 00:05:51 %2B0000 (UTC)")
References:  <201804010005.w3105p4D014073@repo.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
Jan Beich <jbeich@FreeBSD.org> 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.



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1sfz-pyv0-wny>