1 |
commit: e1af6ce004ccc7c13d7d5680efe8d8fa46ffaca4 |
2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jun 27 22:08:03 2016 +0000 |
4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jun 27 22:11:22 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1af6ce0 |
7 |
|
8 |
dev-vcs/cvs: drop old "stable" 1.11.x series. |
9 |
|
10 |
Package-Manager: portage-2.2.28 |
11 |
|
12 |
dev-vcs/cvs/Manifest | 4 - |
13 |
dev-vcs/cvs/cvs-1.11.23.ebuild | 62 -------- |
14 |
dev-vcs/cvs/files/cvs-1.11.23-CVE-2010-3846.patch | 167 ---------------------- |
15 |
dev-vcs/cvs/files/cvs-1.11.23-getline64.patch | 36 ----- |
16 |
4 files changed, 269 deletions(-) |
17 |
|
18 |
diff --git a/dev-vcs/cvs/Manifest b/dev-vcs/cvs/Manifest |
19 |
index a6876db..e350aaf 100644 |
20 |
--- a/dev-vcs/cvs/Manifest |
21 |
+++ b/dev-vcs/cvs/Manifest |
22 |
@@ -1,8 +1,4 @@ |
23 |
-DIST cederqvist-1.11.23.html.bz2 112336 SHA256 7b44791e77d3cc56e2ce970303f4003a8a759e432cfa97de93fa45c4d78f80d9 SHA512 671d9d0d364c7ec21c8b5ae357bf7be097447342053b6eb442d6b367ff1b79e17b8494cac21a08c7a897c039ede7e08992d4af158fb2a68847506f7841f98789 WHIRLPOOL c58dba2bf0ca96a17099f5488f34b1343385e67a22a20697a0de4c9affb30f21fbd790b5fd874487e5f40ce2978ee961e8b876910ac520da35ec7ceb07edf139 |
24 |
-DIST cederqvist-1.11.23.pdf 1134081 SHA256 0ef6dc37510e43be1bcae50c635dedcbb2d56f16968946ff0a304a43f87a7d59 SHA512 6b5f7603ff38eaf0747d364f74960c5bb3ba172fd93436440644396ba9e94538cc3c258c8c44d5fc3437c73eacc8727381f0caa94651227a74353bb46029d490 WHIRLPOOL 31d5e9ff2abe0bf93f9be6f8657690a24c55037d621bc54e735d078a7ac1b089d55d0ea57b8450c47611d6ea7aff54aeed7f7bfbe1ff02188b25abcea164bcd0 |
25 |
-DIST cederqvist-1.11.23.ps 1129600 SHA256 6b35cbeecd6fa069e59743716f2766f5bfffe3013a59cf72d833e5837b20abc0 SHA512 0a0e14bb611a210d4fbacd187a8fd2d8ce2746df1487ec0272cb4abe9027194109adfa7ffe97fada1457203eac7428605e3b3def11a6fece4140e08b66ded17e WHIRLPOOL c24b5dea728a9a317fdbdf212351bb04525daebccc94a68fee8bc717f68ce8f1a9de7446422bffc07e9a27a005bf4a8d6bffcee31a2e83cb3cac34ee993f8cbb |
26 |
DIST cederqvist-1.12.12.html.tar.bz2 137581 SHA256 6bdd66581ec363e05313a14db27cd3c201b547cdfc9ea2f8edde74e78301f0f6 SHA512 c4f6bdc294b719c1c9f6e8b7d1d4faa9e2aafccd37924e9d4772f8d802da3e7f5ae1778b295989db256b23bb1d0914023db7237adaf07833caaee499ae6b6fa3 WHIRLPOOL 41dd1e0d944a02eeca10539b87b5cfcadbf4fd5923c872aa86e5673bb6a98f774d5378e8b4f1c2e6c6a62e6dc6a4d02c69b5e51ad03da899903070effd62adc9 |
27 |
DIST cederqvist-1.12.12.pdf 1252423 SHA256 211c5792d24bfd5694f23bc217a161d880bfb2447c41016fab6f657168b041ce SHA512 aa90b76664ca103cf41831a5595d5e99df9fd87633aa5a500569f43854ca6e409a26b655f02ed59cde1c37ce88c40e06f3b3376ad71fdc9487032c3f0898706a WHIRLPOOL 88d015117c05716df6d0cdc763f16dc488f0641624475e9bd33478485dd32e36a7ee5c49a1789ebdd173e665ae5963e75975342d7308e8e453adb65dd31ec6c5 |
28 |
DIST cederqvist-1.12.12.ps 1262208 SHA256 0e14189614e2c5ead49bfe0ecd187239f8adc3e66371b49d52163be821e44cab SHA512 9a061ef90c664fbb4f882644f72c4f80ffbe0233b6b364511b1c7f18f0a53383980a6ddda326b6df1f2fe1899aed3225de89b55a65a1d9101ba81d1c10c067e2 WHIRLPOOL fb1616ca734e51a626713e7e78786ecbff18378966c2c131f6992df248096d38e850123449d3a5a6aa111ee209f90ef48848da7366b21cb6befeccf07ce54ab6 |
29 |
-DIST cvs-1.11.23.tar.bz2 2942652 SHA256 400f51b59d85116e79b844f2d5dbbad4759442a789b401a94aa5052c3d7a4aa9 SHA512 d84360b51b966f19ac3f1728265ff25e46d3a3ce6d9e7e30b154f0975bb10ce4f82f5ca3f308d2ff169c2b5dd97b0243e910d2e8ad59a5857aef7a70b9026b19 WHIRLPOOL 0f4a14989c29ee76a911edcbcb9b946f3710d1015391e7a219c841bf3cd03678994d572f23a66975030e9ca2eb64abc7f7665a535203bc81653d754491039252 |
30 |
DIST cvs-1.12.12.tar.bz2 3197171 SHA256 9fb9176d268b9019768fc57dedc2920c28fbeda5ba224c2348550d4f25043edc SHA512 31c679b77b887e02d9c8c381b0dfb42f1207ef4ca806cd92843638eb2126ed032e99bda70a3e20ea2a029670ff39c40088a43435632e381739e6c2f978e6f4bb WHIRLPOOL 74257976cdb957e86fb9fb7e54fc8c0b7210f72136ce05327203d935195e7a3bdda0c1d616dc04cb1d6495cb038ca7275e88488eddb5d936c1cfceb94583278c |
31 |
|
32 |
diff --git a/dev-vcs/cvs/cvs-1.11.23.ebuild b/dev-vcs/cvs/cvs-1.11.23.ebuild |
33 |
deleted file mode 100644 |
34 |
index b85ae1d..0000000 |
35 |
--- a/dev-vcs/cvs/cvs-1.11.23.ebuild |
36 |
+++ /dev/null |
37 |
@@ -1,62 +0,0 @@ |
38 |
-# Copyright 1999-2014 Gentoo Foundation |
39 |
-# Distributed under the terms of the GNU General Public License v2 |
40 |
-# $Id$ |
41 |
- |
42 |
-EAPI=3 |
43 |
- |
44 |
-inherit eutils |
45 |
- |
46 |
-DESCRIPTION="Concurrent Versions System - source code revision control tools" |
47 |
-HOMEPAGE="http://www.nongnu.org/cvs/" |
48 |
-SRC_URI="mirror://gnu/non-gnu/cvs/source/stable/${PV}/${P}.tar.bz2 |
49 |
- doc? ( mirror://gnu/non-gnu/cvs/source/stable/${PV}/cederqvist-${PV}.html.bz2 |
50 |
- mirror://gnu/non-gnu/cvs/source/stable/${PV}/cederqvist-${PV}.pdf |
51 |
- mirror://gnu/non-gnu/cvs/source/stable/${PV}/cederqvist-${PV}.ps )" |
52 |
- |
53 |
-LICENSE="GPL-2 LGPL-2" |
54 |
-SLOT="0" |
55 |
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
56 |
-KEYWORDS="~arm64 ~ppc-aix ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
57 |
-IUSE="doc emacs" |
58 |
-RESTRICT='test' |
59 |
- |
60 |
-DEPEND=">=sys-libs/zlib-1.1.4" |
61 |
- |
62 |
-src_prepare() { |
63 |
- epatch "${FILESDIR}"/${P}-CVE-2010-3846.patch |
64 |
- epatch "${FILESDIR}"/${P}-getline64.patch |
65 |
- |
66 |
- # remove a useless binary |
67 |
- einfo "Removing a compiled binary" |
68 |
- find "${S}" -type f -name getdate -exec rm \{\} \; |
69 |
-} |
70 |
- |
71 |
-src_configure() { |
72 |
- [[ ${CHOST} == *-interix* ]] && export ac_cv_header_inttypes_h=no |
73 |
- |
74 |
- econf --with-tmpdir=/tmp --without-gssapi || die |
75 |
-} |
76 |
- |
77 |
-src_install() { |
78 |
- einstall || die |
79 |
- |
80 |
- insinto /etc/xinetd.d |
81 |
- newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver || die "newins failed" |
82 |
- |
83 |
- dodoc BUGS ChangeLog* DEVEL* FAQ HACKING \ |
84 |
- MINOR* NEWS PROJECTS README* TESTS TODO |
85 |
- |
86 |
- if use emacs; then |
87 |
- insinto /usr/share/emacs/site-lisp |
88 |
- doins cvs-format.el || die "doins failed" |
89 |
- fi |
90 |
- |
91 |
- if use doc; then |
92 |
- dodoc "${DISTDIR}"/cederqvist-${PV}.pdf |
93 |
- dodoc "${DISTDIR}"/cederqvist-${PV}.ps |
94 |
- tar xjf "${DISTDIR}"/cederqvist-${PV}.html.tar.bz2 |
95 |
- dohtml -r cederqvist-${PV}.html/* |
96 |
- cd "${ED}"/usr/share/doc/${PF}/html/ |
97 |
- ln -s cvs.html index.html |
98 |
- fi |
99 |
-} |
100 |
|
101 |
diff --git a/dev-vcs/cvs/files/cvs-1.11.23-CVE-2010-3846.patch b/dev-vcs/cvs/files/cvs-1.11.23-CVE-2010-3846.patch |
102 |
deleted file mode 100644 |
103 |
index e1560ce..0000000 |
104 |
--- a/dev-vcs/cvs/files/cvs-1.11.23-CVE-2010-3846.patch |
105 |
+++ /dev/null |
106 |
@@ -1,167 +0,0 @@ |
107 |
-From b122edcb68ff05bb6eb22f6e50423e7f1050841b Mon Sep 17 00:00:00 2001 |
108 |
-From: Larry Jones <lawrence.jones@×××××××.com> |
109 |
-Date: Thu, 21 Oct 2010 10:08:16 +0200 |
110 |
-Subject: [PATCH] Fix for CVE-2010-3846 |
111 |
-MIME-Version: 1.0 |
112 |
-Content-Type: text/plain; charset=UTF-8 |
113 |
-Content-Transfer-Encoding: 8bit |
114 |
- |
115 |
-Mallformed RCS revision (delete after the end of input file, or overlayed |
116 |
-deleted regions) screws output file image size computation. This leads to |
117 |
-write attempt after the allocated memory opening hiden memory corruption |
118 |
-driven by CVS server. |
119 |
- |
120 |
-Signed-off-by: Petr Písař <ppisar@××××××.com> |
121 |
---- |
122 |
- src/rcs.c | 52 +++++++++++++++++++++++++++++----------------------- |
123 |
- 1 files changed, 29 insertions(+), 23 deletions(-) |
124 |
- |
125 |
-diff --git a/src/rcs.c b/src/rcs.c |
126 |
-index 7d0d078..2f88f85 100644 |
127 |
---- a/src/rcs.c |
128 |
-+++ b/src/rcs.c |
129 |
-@@ -7128,7 +7128,7 @@ apply_rcs_changes (orig_lines, diffbuf, difflen, name, addvers, delvers) |
130 |
- struct deltafrag *dfhead; |
131 |
- struct deltafrag **dftail; |
132 |
- struct deltafrag *df; |
133 |
-- unsigned long numlines, lastmodline, offset; |
134 |
-+ unsigned long numlines, offset; |
135 |
- struct linevector lines; |
136 |
- int err; |
137 |
- |
138 |
-@@ -7202,12 +7202,12 @@ apply_rcs_changes (orig_lines, diffbuf, difflen, name, addvers, delvers) |
139 |
- |
140 |
- /* New temp data structure to hold new org before |
141 |
- copy back into original structure. */ |
142 |
-- lines.nlines = lines.lines_alloced = numlines; |
143 |
-+ lines.lines_alloced = numlines; |
144 |
- lines.vector = xmalloc (numlines * sizeof *lines.vector); |
145 |
- |
146 |
- /* We changed the list order to first to last -- so the |
147 |
- list never gets larger than the size numlines. */ |
148 |
-- lastmodline = 0; |
149 |
-+ lines.nlines = 0; |
150 |
- |
151 |
- /* offset created when adding/removing lines |
152 |
- between new and original structure */ |
153 |
-@@ -7216,25 +7216,24 @@ apply_rcs_changes (orig_lines, diffbuf, difflen, name, addvers, delvers) |
154 |
- for (df = dfhead; df != NULL; ) |
155 |
- { |
156 |
- unsigned int ln; |
157 |
-- unsigned long deltaend; |
158 |
-+ unsigned long newpos = df->pos - offset; |
159 |
- |
160 |
-- if (df->pos > orig_lines->nlines) |
161 |
-+ if (newpos < lines.nlines || newpos > numlines) |
162 |
- err = 1; |
163 |
- |
164 |
- /* On error, just free the rest of the list. */ |
165 |
- if (!err) |
166 |
- { |
167 |
-- /* Here we need to get to the line where the next insert will |
168 |
-+ /* Here we need to get to the line where the next change will |
169 |
- begin, which is DF->pos in ORIG_LINES. We will fill up to |
170 |
- DF->pos - OFFSET in LINES with original items. */ |
171 |
-- for (deltaend = df->pos - offset; |
172 |
-- lastmodline < deltaend; |
173 |
-- lastmodline++) |
174 |
-+ while (lines.nlines < newpos) |
175 |
- { |
176 |
- /* we need to copy from the orig structure into new one */ |
177 |
-- lines.vector[lastmodline] = |
178 |
-- orig_lines->vector[lastmodline + offset]; |
179 |
-- lines.vector[lastmodline]->refcount++; |
180 |
-+ lines.vector[lines.nlines] = |
181 |
-+ orig_lines->vector[lines.nlines + offset]; |
182 |
-+ lines.vector[lines.nlines]->refcount++; |
183 |
-+ lines.nlines++; |
184 |
- } |
185 |
- |
186 |
- switch (df->type) |
187 |
-@@ -7246,7 +7245,12 @@ apply_rcs_changes (orig_lines, diffbuf, difflen, name, addvers, delvers) |
188 |
- struct line *q; |
189 |
- int nextline_newline; |
190 |
- size_t nextline_len; |
191 |
-- |
192 |
-+ |
193 |
-+ if (newpos + df->nlines > numlines) |
194 |
-+ { |
195 |
-+ err = 1; |
196 |
-+ break; |
197 |
-+ } |
198 |
- textend = df->new_lines + df->len; |
199 |
- nextline_newline = 0; |
200 |
- nextline_text = df->new_lines; |
201 |
-@@ -7271,8 +7275,7 @@ apply_rcs_changes (orig_lines, diffbuf, difflen, name, addvers, delvers) |
202 |
- q->has_newline = nextline_newline; |
203 |
- q->refcount = 1; |
204 |
- memcpy (q->text, nextline_text, nextline_len); |
205 |
-- lines.vector[lastmodline++] = q; |
206 |
-- offset--; |
207 |
-+ lines.vector[lines.nlines++] = q; |
208 |
- |
209 |
- nextline_text = (char *)p + 1; |
210 |
- nextline_newline = 0; |
211 |
-@@ -7286,11 +7289,11 @@ apply_rcs_changes (orig_lines, diffbuf, difflen, name, addvers, delvers) |
212 |
- q->has_newline = nextline_newline; |
213 |
- q->refcount = 1; |
214 |
- memcpy (q->text, nextline_text, nextline_len); |
215 |
-- lines.vector[lastmodline++] = q; |
216 |
-+ lines.vector[lines.nlines++] = q; |
217 |
- |
218 |
- /* For each line we add the offset between the #'s |
219 |
- decreases. */ |
220 |
-- offset--; |
221 |
-+ offset -= df->nlines; |
222 |
- break; |
223 |
- } |
224 |
- |
225 |
-@@ -7301,7 +7304,9 @@ apply_rcs_changes (orig_lines, diffbuf, difflen, name, addvers, delvers) |
226 |
- if (df->pos + df->nlines > orig_lines->nlines) |
227 |
- err = 1; |
228 |
- else if (delvers) |
229 |
-+ { |
230 |
- for (ln = df->pos; ln < df->pos + df->nlines; ++ln) |
231 |
-+ { |
232 |
- if (orig_lines->vector[ln]->refcount > 1) |
233 |
- /* Annotate needs this but, since the original |
234 |
- * vector is disposed of before returning from |
235 |
-@@ -7309,6 +7314,8 @@ apply_rcs_changes (orig_lines, diffbuf, difflen, name, addvers, delvers) |
236 |
- * there are multiple references. |
237 |
- */ |
238 |
- orig_lines->vector[ln]->vers = delvers; |
239 |
-+ } |
240 |
-+ } |
241 |
- break; |
242 |
- } |
243 |
- } |
244 |
-@@ -7328,21 +7335,20 @@ apply_rcs_changes (orig_lines, diffbuf, difflen, name, addvers, delvers) |
245 |
- else |
246 |
- { |
247 |
- /* add the rest of the remaining lines to the data vector */ |
248 |
-- for (; lastmodline < numlines; lastmodline++) |
249 |
-+ while (lines.nlines < numlines) |
250 |
- { |
251 |
- /* we need to copy from the orig structure into new one */ |
252 |
-- lines.vector[lastmodline] = orig_lines->vector[lastmodline |
253 |
-+ lines.vector[lines.nlines] = orig_lines->vector[lines.nlines |
254 |
- + offset]; |
255 |
-- lines.vector[lastmodline]->refcount++; |
256 |
-+ lines.vector[lines.nlines]->refcount++; |
257 |
-+ lines.nlines++; |
258 |
- } |
259 |
- |
260 |
- /* Move the lines vector to the original structure for output, |
261 |
- * first deleting the old. |
262 |
- */ |
263 |
- linevector_free (orig_lines); |
264 |
-- orig_lines->vector = lines.vector; |
265 |
-- orig_lines->lines_alloced = numlines; |
266 |
-- orig_lines->nlines = lines.nlines; |
267 |
-+ *orig_lines = lines; |
268 |
- } |
269 |
- |
270 |
- return !err; |
271 |
--- |
272 |
-1.7.2.3 |
273 |
- |
274 |
|
275 |
diff --git a/dev-vcs/cvs/files/cvs-1.11.23-getline64.patch b/dev-vcs/cvs/files/cvs-1.11.23-getline64.patch |
276 |
deleted file mode 100644 |
277 |
index f93fca4..0000000 |
278 |
--- a/dev-vcs/cvs/files/cvs-1.11.23-getline64.patch |
279 |
+++ /dev/null |
280 |
@@ -1,36 +0,0 @@ |
281 |
-http://pkgs.fedoraproject.org/gitweb/?p=cvs.git;a=blob;f=cvs-1.11.23-getline64.patch;h=99942e0589e4ff26e87a927c1a54662954876e64;hb=HEAD |
282 |
- |
283 |
---- cvs-1.11.23/lib/getline.c |
284 |
-+++ cvs-1.11.23/lib/getline.c |
285 |
-@@ -154,7 +154,7 @@ |
286 |
- return ret; |
287 |
- } |
288 |
- |
289 |
--int |
290 |
-+ssize_t |
291 |
- getline (lineptr, n, stream) |
292 |
- char **lineptr; |
293 |
- size_t *n; |
294 |
-@@ -163,7 +163,7 @@ |
295 |
- return getstr (lineptr, n, stream, '\n', 0, GETLINE_NO_LIMIT); |
296 |
- } |
297 |
- |
298 |
--int |
299 |
-+ssize_t |
300 |
- getline_safe (lineptr, n, stream, limit) |
301 |
- char **lineptr; |
302 |
- size_t *n; |
303 |
---- cvs-1.11.23/lib/getline.h |
304 |
-+++ cvs-1.11.23/lib/getline.h |
305 |
-@@ -11,9 +11,9 @@ |
306 |
- |
307 |
- #define GETLINE_NO_LIMIT -1 |
308 |
- |
309 |
--int |
310 |
-+ssize_t |
311 |
- getline __PROTO ((char **_lineptr, size_t *_n, FILE *_stream)); |
312 |
--int |
313 |
-+ssize_t |
314 |
- getline_safe __PROTO ((char **_lineptr, size_t *_n, FILE *_stream, |
315 |
- int limit)); |
316 |
- int |