From: | "Robin H. Johnson (robbat2)" <robbat2@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in dev-vcs/cvs/files: cvs-1.12.12-rcs2log-coreutils.patch 01-cvs-env.d |
Date: | Wed, 05 Jan 2011 04:50:51 |
Message-Id: | 20110105045041.CE3B720057@flycatcher.gentoo.org |
1 | robbat2 11/01/05 04:50:41 |
2 | |
3 | Added: cvs-1.12.12-rcs2log-coreutils.patch 01-cvs-env.d |
4 | Log: |
5 | Bug #144114: Fix options for sort to use non-obsolete options. Bug #296823: Install env.d file for CVS_RSH setting. |
6 | |
7 | (Portage version: 2.2.0_alpha6/cvs/Linux x86_64) |
8 | |
9 | Revision Changes Path |
10 | 1.1 dev-vcs/cvs/files/cvs-1.12.12-rcs2log-coreutils.patch |
11 | |
12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/cvs/files/cvs-1.12.12-rcs2log-coreutils.patch?rev=1.1&view=markup |
13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/cvs/files/cvs-1.12.12-rcs2log-coreutils.patch?rev=1.1&content-type=text/plain |
14 | |
15 | Index: cvs-1.12.12-rcs2log-coreutils.patch |
16 | =================================================================== |
17 | X-Gentoo-bug: 144114 |
18 | |
19 | diff -Nuar cvs-1.12.12.orig//contrib/rcs2log.sh cvs-1.12.12//contrib/rcs2log.sh |
20 | --- cvs-1.12.12.orig//contrib/rcs2log.sh 2003-02-25 21:32:51.000000000 +0000 |
21 | +++ cvs-1.12.12//contrib/rcs2log.sh 2010-12-06 21:14:33.831532212 +0000 |
22 | @@ -620,7 +620,7 @@ |
23 | # Sort the log entries, first by date+time (in reverse order), |
24 | # then by author, then by log entry, and finally by file name and revision |
25 | # (just in case). |
26 | -sort -t"$SOH" +2 -4r +4 +0 | |
27 | +sort -t"$SOH" -k 3,4r -k 5 -k 1,2 | |
28 | |
29 | # Finally, reformat the sorted log entries. |
30 | $AWK -F"$SOH" ' |
31 | |
32 | |
33 | |
34 | 1.1 dev-vcs/cvs/files/01-cvs-env.d |
35 | |
36 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/cvs/files/01-cvs-env.d?rev=1.1&view=markup |
37 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/cvs/files/01-cvs-env.d?rev=1.1&content-type=text/plain |
38 | |
39 | Index: 01-cvs-env.d |
40 | =================================================================== |
41 | CVS_RSH="ssh" |