Gentoo Archives: gentoo-commits

From: "Robin H. Johnson" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/cvs/, dev-vcs/cvs/files/
Date: Mon, 27 Jun 2016 22:11:35
Message-Id: 1467065482.6869b19cce09eb397f7e46add3e4e37a7d4677b3.robbat2@gentoo
1 commit: 6869b19cce09eb397f7e46add3e4e37a7d4677b3
2 Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 27 22:05:59 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=6869b19c
7
8 dev-vcs/cvs: Drop broken cvs-12.13 per bug #124733.
9
10 Package-Manager: portage-2.2.28
11
12 dev-vcs/cvs/Manifest | 5 -
13 dev-vcs/cvs/cvs-1.12.13-r1.ebuild | 131 -----------------
14 dev-vcs/cvs/cvs-1.12.13-r2.ebuild | 132 ------------------
15 dev-vcs/cvs/cvs-1.12.13.1-r1.ebuild | 154 --------------------
16 dev-vcs/cvs/cvs-1.12.13.1-r2.ebuild | 155 ---------------------
17 dev-vcs/cvs/cvs-1.12.13.1.ebuild | 151 --------------------
18 dev-vcs/cvs/files/cvs-1.12.13-openat.patch | 21 ---
19 dev-vcs/cvs/files/cvs-1.12.13-zlib.patch | 31 -----
20 .../cvs/files/cvs-1.12.13.1-block-requests.patch | 101 --------------
21 .../cvs-1.12.13.1-fix-gnulib-SEGV-vasnprintf.patch | 42 ------
22 dev-vcs/cvs/files/cvs-1.12.13.1-gl-mempcpy.patch | 24 ----
23 .../cvs/files/cvs-1.12.13.1-hash-nameclash.patch | 43 ------
24 .../cvs/files/cvs-1.12.13.1-use-include_next.patch | 30 ----
25 13 files changed, 1020 deletions(-)
26
27 diff --git a/dev-vcs/cvs/Manifest b/dev-vcs/cvs/Manifest
28 index bda243d..a6876db 100644
29 --- a/dev-vcs/cvs/Manifest
30 +++ b/dev-vcs/cvs/Manifest
31 @@ -4,10 +4,5 @@ DIST cederqvist-1.11.23.ps 1129600 SHA256 6b35cbeecd6fa069e59743716f2766f5bfffe3
32 DIST cederqvist-1.12.12.html.tar.bz2 137581 SHA256 6bdd66581ec363e05313a14db27cd3c201b547cdfc9ea2f8edde74e78301f0f6 SHA512 c4f6bdc294b719c1c9f6e8b7d1d4faa9e2aafccd37924e9d4772f8d802da3e7f5ae1778b295989db256b23bb1d0914023db7237adaf07833caaee499ae6b6fa3 WHIRLPOOL 41dd1e0d944a02eeca10539b87b5cfcadbf4fd5923c872aa86e5673bb6a98f774d5378e8b4f1c2e6c6a62e6dc6a4d02c69b5e51ad03da899903070effd62adc9
33 DIST cederqvist-1.12.12.pdf 1252423 SHA256 211c5792d24bfd5694f23bc217a161d880bfb2447c41016fab6f657168b041ce SHA512 aa90b76664ca103cf41831a5595d5e99df9fd87633aa5a500569f43854ca6e409a26b655f02ed59cde1c37ce88c40e06f3b3376ad71fdc9487032c3f0898706a WHIRLPOOL 88d015117c05716df6d0cdc763f16dc488f0641624475e9bd33478485dd32e36a7ee5c49a1789ebdd173e665ae5963e75975342d7308e8e453adb65dd31ec6c5
34 DIST cederqvist-1.12.12.ps 1262208 SHA256 0e14189614e2c5ead49bfe0ecd187239f8adc3e66371b49d52163be821e44cab SHA512 9a061ef90c664fbb4f882644f72c4f80ffbe0233b6b364511b1c7f18f0a53383980a6ddda326b6df1f2fe1899aed3225de89b55a65a1d9101ba81d1c10c067e2 WHIRLPOOL fb1616ca734e51a626713e7e78786ecbff18378966c2c131f6992df248096d38e850123449d3a5a6aa111ee209f90ef48848da7366b21cb6befeccf07ce54ab6
35 -DIST cederqvist-1.12.13.html.tar.bz2 140382 SHA256 1a9a34e07c00de5102224b48cbc53384992aea197c91c20b6140dd6885b5ae87 SHA512 4305b5b5d6ec75288e8be0f818815898523de465bd2dc1f55dc277a423815608e619e6fb50d47d29c378249db53f7dba2cc6b4e996f8cd2c1eecf5b9db5957c3 WHIRLPOOL 8b72d282e466b85ad2e898c52a934df55af530a458c39171e4de31a71e1d7c0dbf85674387021f0bc4d87b480a3ff32084574294425923b64c10998e0716abdc
36 -DIST cederqvist-1.12.13.pdf 1297631 SHA256 4f24b2ac3b81c97798cad42cba8ffe6cc65405f13e5a58a4b063aa9fffc4a7bc SHA512 56ff658265a4e08df6bcd59b1bcb046cbcb92d4107fd4fc54a35601e379af048fdab720500207a4ea6b757058bb52973c7723a02f43b5de8c9fee7f09379ba1f WHIRLPOOL 5ca68dbc70dfbf98a61700f696c4b197a8943f3122d419e2ae2a1f085c589b02c3e90bdadfa657351e51dfbf4a40781babcc47319e157aede3f67be8edf08493
37 -DIST cederqvist-1.12.13.ps 1280573 SHA256 a955722b89155e390635b1220fa67a096c97141d83ac53a7840323c01d13aa91 SHA512 7a6e9605c82b4d105d37663b12ce9fc89eb8e9153897ceeb6d4fd18da07947180b96167f67cd04df0ec2682d431bbb6840c8c87ccd97ddb596dd2efd31bbf1e4 WHIRLPOOL 2b6249d9cba0d08b76e9d8ae24828cfbfae71c2f109e35ca425c0122a79dc3a66a52ec9506971eab031d730743ed3bc5c01b583e3e9a538f067e22e6d78a6c0f
38 DIST cvs-1.11.23.tar.bz2 2942652 SHA256 400f51b59d85116e79b844f2d5dbbad4759442a789b401a94aa5052c3d7a4aa9 SHA512 d84360b51b966f19ac3f1728265ff25e46d3a3ce6d9e7e30b154f0975bb10ce4f82f5ca3f308d2ff169c2b5dd97b0243e910d2e8ad59a5857aef7a70b9026b19 WHIRLPOOL 0f4a14989c29ee76a911edcbcb9b946f3710d1015391e7a219c841bf3cd03678994d572f23a66975030e9ca2eb64abc7f7665a535203bc81653d754491039252
39 DIST cvs-1.12.12.tar.bz2 3197171 SHA256 9fb9176d268b9019768fc57dedc2920c28fbeda5ba224c2348550d4f25043edc SHA512 31c679b77b887e02d9c8c381b0dfb42f1207ef4ca806cd92843638eb2126ed032e99bda70a3e20ea2a029670ff39c40088a43435632e381739e6c2f978e6f4bb WHIRLPOOL 74257976cdb957e86fb9fb7e54fc8c0b7210f72136ce05327203d935195e7a3bdda0c1d616dc04cb1d6495cb038ca7275e88488eddb5d936c1cfceb94583278c
40 -DIST cvs-1.12.13.1.tar.bz2 4075630 SHA256 de7f374d8c4ac414c04e8d44ce9a5d3da919825a6a332d747e299dc7a80c2218 SHA512 db318c0c70b47283bd469d792bdfe5335e5375e3b25beb79a7aea8435209b944cfa7ba51bdef9935f708e3a26a06b72defdb698974f2951cc9afd615f970986b WHIRLPOOL 3369e59e9f598cf6de28577302d62d3f6b00f705a0a5729c7ebf7b956d899e85afaaa160be2c4f7a4c710c1dd8860301ad1855c874229e39dbe60a5acc91a884
41 -DIST cvs-1.12.13.tar.bz2 3911104 SHA256 78853613b9a6873a30e1cc2417f738c330e75f887afdaf7b3d0800cb19ca515e SHA512 7d10f808de62190b18d4f706d2d03ab218a508bfb52047ff3e830e293ec40c5e8bf6cc743ef72a5c24be5aa867c9e4892d7d475a026a98b296a3764b4bd0f4d8 WHIRLPOOL 0662c898e05dfe9e45ee1615cfc86bdf664dfc74ddcbea8833e0f98b22e5ea65920d401d3f9a674d5e567eb10f94a29631487a2f8e43a49685888ca94f98ab62
42
43 diff --git a/dev-vcs/cvs/cvs-1.12.13-r1.ebuild b/dev-vcs/cvs/cvs-1.12.13-r1.ebuild
44 deleted file mode 100644
45 index a96af96..0000000
46 --- a/dev-vcs/cvs/cvs-1.12.13-r1.ebuild
47 +++ /dev/null
48 @@ -1,131 +0,0 @@
49 -# Copyright 1999-2014 Gentoo Foundation
50 -# Distributed under the terms of the GNU General Public License v2
51 -# $Id$
52 -
53 -EAPI=3
54 -
55 -inherit eutils pam toolchain-funcs
56 -
57 -DESCRIPTION="Concurrent Versions System - source code revision control tools"
58 -HOMEPAGE="http://www.nongnu.org/cvs/"
59 -
60 -SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2
61 - doc? ( mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.html.tar.bz2
62 - mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.pdf
63 - mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.ps )"
64 -
65 -LICENSE="GPL-2 LGPL-2"
66 -SLOT="0"
67 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
68 -
69 -IUSE="crypt doc emacs kerberos nls pam server"
70 -
71 -DEPEND=">=sys-libs/zlib-1.1.4
72 - kerberos? ( virtual/krb5 )
73 - pam? ( virtual/pam )"
74 -
75 -src_unpack() {
76 - unpack ${P}.tar.bz2
77 - use doc && unpack cederqvist-${PV}.html.tar.bz2
78 -}
79 -
80 -src_prepare() {
81 - epatch "${FILESDIR}"/${PN}-1.12.12-cvsbug-tmpfix.patch
82 - epatch "${FILESDIR}"/${P}-openat.patch
83 - epatch "${FILESDIR}"/${P}-zlib.patch
84 - epatch "${FILESDIR}"/${PN}-1.12.12-install-sh.patch
85 - # this testcase was not updated
86 - #sed -i.orig -e '/unrecognized keyword.*BogusOption/s,98,73,g' \
87 - # ${S}/src/sanity.sh
88 - # this one fails when the testpath path contains '.'
89 - sed -i.orig -e '/newfile config3/s,a-z,a-z.,g' \
90 - "${S}"/src/sanity.sh
91 -}
92 -
93 -src_configure() {
94 - local myconf
95 - # the tests need the server and proxy
96 - if use test; then
97 - use server || \
98 - ewarn "The server and proxy code are enabled as they are required for tests."
99 - myconf="--enable-server --enable-proxy"
100 - fi
101 - if tc-is-cross-compiler ; then
102 - # Sane defaults when cross-compiling (as these tests want to
103 - # try and execute code).
104 - export cvs_cv_func_printf_ptr="yes"
105 - fi
106 - econf \
107 - --with-external-zlib \
108 - --with-tmpdir=/tmp \
109 - $(use_enable crypt encryption) \
110 - $(use_with kerberos gssapi) \
111 - $(use_enable nls) \
112 - $(use_enable pam) \
113 - $(use_enable server) \
114 - $(use_enable server proxy)
115 -}
116 -
117 -src_install() {
118 - einstall || die
119 -
120 - if use server; then
121 - insinto /etc/xinetd.d
122 - newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver || die "newins failed"
123 - fi
124 -
125 - dodoc BUGS ChangeLog* DEVEL* FAQ HACKING \
126 - MINOR* NEWS PROJECTS README* TESTS TODO
127 -
128 - if use emacs; then
129 - insinto /usr/share/emacs/site-lisp
130 - doins cvs-format.el || die "doins failed"
131 - fi
132 -
133 - if use doc; then
134 - dodoc "${DISTDIR}"/cederqvist-${PV}.pdf
135 - dodoc "${DISTDIR}"/cederqvist-${PV}.ps
136 - tar xjf "${DISTDIR}"/cederqvist-${PV}.html.tar.bz2
137 - dohtml -r cederqvist-${PV}.html/*
138 - dosym cvs.html /usr/share/doc/${PF}/html/index.html
139 - fi
140 -
141 - newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs
142 -}
143 -
144 -src_test() {
145 - einfo "If you want to see realtime status, or check out a failure,"
146 - einfo "please look at ${S}/src/check.log*"
147 - if [ -n "$TEST_REMOTE_AND_PROXY" ]; then
148 - einfo "local, remote, and proxy tests enabled."
149 - else
150 - einfo "Only testing local mode. Please see ebuild for other modes."
151 - fi
152 -
153 - cd "${S}"/src
154 - export TESTDIR="${T}/tests-local"
155 - mkdir -p "$TESTDIR"
156 - # we only do the local tests by default
157 - make localcheck || die "Some local test failed."
158 - mv -f check.log check.log-local
159 -
160 - # if you want to test the remote and proxy modes, things get a little bit
161 - # complicated. You need to set up a SSH config file at ~portage/.ssh/config
162 - # that allows the portage user to login without any authentication, and also
163 - # set up the ~portage/.ssh/known_hosts file for your machine.
164 - # We do not do this by default, as it is unsafe from a security point of
165 - # view, and requires root level ssh changes.
166 - if [ -n "$TEST_REMOTE_AND_PROXY" ]; then
167 - cd "${S}"/src
168 - export TESTDIR="${T}/tests-remote"
169 - mkdir -p "$TESTDIR"
170 - make remotecheck || die "Some remote test failed."
171 - mv -f check.log check.log-remote
172 -
173 - cd "${S}"/src
174 - export TESTDIR="${T}/tests-proxy"
175 - mkdir -p "$TESTDIR"
176 - make proxycheck || die "Some proxy test failed."
177 - mv -f check.log check.log-proxy
178 - fi
179 -}
180
181 diff --git a/dev-vcs/cvs/cvs-1.12.13-r2.ebuild b/dev-vcs/cvs/cvs-1.12.13-r2.ebuild
182 deleted file mode 100644
183 index de3d18d..0000000
184 --- a/dev-vcs/cvs/cvs-1.12.13-r2.ebuild
185 +++ /dev/null
186 @@ -1,132 +0,0 @@
187 -# Copyright 1999-2014 Gentoo Foundation
188 -# Distributed under the terms of the GNU General Public License v2
189 -# $Id$
190 -
191 -EAPI=3
192 -
193 -inherit eutils pam toolchain-funcs
194 -
195 -DESCRIPTION="Concurrent Versions System - source code revision control tools"
196 -HOMEPAGE="http://www.nongnu.org/cvs/"
197 -
198 -SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2
199 - doc? ( mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.html.tar.bz2
200 - mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.pdf
201 - mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.ps )"
202 -
203 -LICENSE="GPL-2 LGPL-2"
204 -SLOT="0"
205 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
206 -
207 -IUSE="crypt doc emacs kerberos nls pam server"
208 -
209 -DEPEND=">=sys-libs/zlib-1.1.4
210 - kerberos? ( virtual/krb5 )
211 - pam? ( virtual/pam )"
212 -
213 -src_unpack() {
214 - unpack ${P}.tar.bz2
215 - use doc && unpack cederqvist-${PV}.html.tar.bz2
216 -}
217 -
218 -src_prepare() {
219 - epatch "${FILESDIR}"/${PN}-1.12.12-cvsbug-tmpfix.patch
220 - epatch "${FILESDIR}"/${P}-openat.patch
221 - epatch "${FILESDIR}"/${P}-zlib.patch
222 - epatch "${FILESDIR}"/${PN}-1.12.12-install-sh.patch
223 - epatch "${FILESDIR}"/${PN}-1.12.12-fix-massive-leak.patch
224 - # this testcase was not updated
225 - #sed -i.orig -e '/unrecognized keyword.*BogusOption/s,98,73,g' \
226 - # ${S}/src/sanity.sh
227 - # this one fails when the testpath path contains '.'
228 - sed -i.orig -e '/newfile config3/s,a-z,a-z.,g' \
229 - "${S}"/src/sanity.sh
230 -}
231 -
232 -src_configure() {
233 - local myconf
234 - # the tests need the server and proxy
235 - if use test; then
236 - use server || \
237 - ewarn "The server and proxy code are enabled as they are required for tests."
238 - myconf="--enable-server --enable-proxy"
239 - fi
240 - if tc-is-cross-compiler ; then
241 - # Sane defaults when cross-compiling (as these tests want to
242 - # try and execute code).
243 - export cvs_cv_func_printf_ptr="yes"
244 - fi
245 - econf \
246 - --with-external-zlib \
247 - --with-tmpdir=/tmp \
248 - $(use_enable crypt encryption) \
249 - $(use_with kerberos gssapi) \
250 - $(use_enable nls) \
251 - $(use_enable pam) \
252 - $(use_enable server) \
253 - $(use_enable server proxy)
254 -}
255 -
256 -src_install() {
257 - einstall || die
258 -
259 - if use server; then
260 - insinto /etc/xinetd.d
261 - newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver || die "newins failed"
262 - fi
263 -
264 - dodoc BUGS ChangeLog* DEVEL* FAQ HACKING \
265 - MINOR* NEWS PROJECTS README* TESTS TODO
266 -
267 - if use emacs; then
268 - insinto /usr/share/emacs/site-lisp
269 - doins cvs-format.el || die "doins failed"
270 - fi
271 -
272 - if use doc; then
273 - dodoc "${DISTDIR}"/cederqvist-${PV}.pdf
274 - dodoc "${DISTDIR}"/cederqvist-${PV}.ps
275 - tar xjf "${DISTDIR}"/cederqvist-${PV}.html.tar.bz2
276 - dohtml -r cederqvist-${PV}.html/*
277 - dosym cvs.html /usr/share/doc/${PF}/html/index.html
278 - fi
279 -
280 - newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs
281 -}
282 -
283 -src_test() {
284 - einfo "If you want to see realtime status, or check out a failure,"
285 - einfo "please look at ${S}/src/check.log*"
286 - if [ -n "$TEST_REMOTE_AND_PROXY" ]; then
287 - einfo "local, remote, and proxy tests enabled."
288 - else
289 - einfo "Only testing local mode. Please see ebuild for other modes."
290 - fi
291 -
292 - cd "${S}"/src
293 - export TESTDIR="${T}/tests-local"
294 - mkdir -p "$TESTDIR"
295 - # we only do the local tests by default
296 - make localcheck || die "Some local test failed."
297 - mv -f check.log check.log-local
298 -
299 - # if you want to test the remote and proxy modes, things get a little bit
300 - # complicated. You need to set up a SSH config file at ~portage/.ssh/config
301 - # that allows the portage user to login without any authentication, and also
302 - # set up the ~portage/.ssh/known_hosts file for your machine.
303 - # We do not do this by default, as it is unsafe from a security point of
304 - # view, and requires root level ssh changes.
305 - if [ -n "$TEST_REMOTE_AND_PROXY" ]; then
306 - cd "${S}"/src
307 - export TESTDIR="${T}/tests-remote"
308 - mkdir -p "$TESTDIR"
309 - make remotecheck || die "Some remote test failed."
310 - mv -f check.log check.log-remote
311 -
312 - cd "${S}"/src
313 - export TESTDIR="${T}/tests-proxy"
314 - mkdir -p "$TESTDIR"
315 - make proxycheck || die "Some proxy test failed."
316 - mv -f check.log check.log-proxy
317 - fi
318 -}
319
320 diff --git a/dev-vcs/cvs/cvs-1.12.13.1-r1.ebuild b/dev-vcs/cvs/cvs-1.12.13.1-r1.ebuild
321 deleted file mode 100644
322 index 8c06d88..0000000
323 --- a/dev-vcs/cvs/cvs-1.12.13.1-r1.ebuild
324 +++ /dev/null
325 @@ -1,154 +0,0 @@
326 -# Copyright 1999-2014 Gentoo Foundation
327 -# Distributed under the terms of the GNU General Public License v2
328 -# $Id$
329 -
330 -EAPI=3
331 -
332 -inherit eutils pam toolchain-funcs versionator
333 -
334 -DESCRIPTION="Concurrent Versions System - source code revision control tools"
335 -HOMEPAGE="http://www.nongnu.org/cvs/"
336 -
337 -DOC_PV="$(get_version_component_range 1-3)"
338 -FEAT_URIBASE="mirror://gnu/non-gnu/cvs/source/feature/${PV}/"
339 -DOC_URIBASE="mirror://gnu/non-gnu/cvs/source/feature/${DOC_PV}/"
340 -SNAP_URIBASE="mirror://gnu/non-gnu/cvs/source/nightly-snapshots/feature/"
341 -SRC_URI="
342 - ${FEAT_URIBASE}/${P}.tar.bz2
343 - ${SNAP_URIBASE}/${P}.tar.bz2
344 - doc? (
345 - ${DOC_URIBASE}/cederqvist-${DOC_PV}.html.tar.bz2
346 - ${DOC_URIBASE}/cederqvist-${DOC_PV}.pdf
347 - ${DOC_URIBASE}/cederqvist-${DOC_PV}.ps
348 - )"
349 -
350 -LICENSE="GPL-2 LGPL-2"
351 -SLOT="0"
352 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
353 -
354 -IUSE="crypt doc kerberos nls pam server"
355 -
356 -RDEPEND=">=sys-libs/zlib-1.1.4
357 - kerberos? ( virtual/krb5 )
358 - pam? ( virtual/pam )"
359 -DEPEND="${RDEPEND}"
360 -
361 -src_unpack() {
362 - unpack ${P}.tar.bz2
363 - use doc && unpack cederqvist-${DOC_PV}.html.tar.bz2
364 -}
365 -
366 -src_prepare() {
367 - epatch "${FILESDIR}"/${PN}-1.12.12-cvsbug-tmpfix.patch
368 - epatch "${FILESDIR}"/${PN}-1.12.12-install-sh.patch
369 - epatch "${FILESDIR}"/${PN}-1.12.13.1-block-requests.patch
370 - epatch "${FILESDIR}"/${PN}-1.12.13.1-hash-nameclash.patch # for AIX
371 - epatch "${FILESDIR}"/${PN}-1.12.13.1-gl-mempcpy.patch # for AIX
372 - epatch "${FILESDIR}"/${PN}-1.12.12-fix-massive-leak.patch
373 - epatch "${FILESDIR}"/${PN}-1.12.13.1-use-include_next.patch
374 - # Applied by upstream:
375 - #epatch "${FILESDIR}"/${PN}-1.12.13-openat.patch
376 - #epatch "${FILESDIR}"/${PN}-1.12.13-zlib.patch
377 -
378 - # this testcase was not updated
379 - #sed -i.orig -e '/unrecognized keyword.*BogusOption/s,98,73,g' \
380 - # ${S}/src/sanity.sh
381 - # this one fails when the testpath path contains '.'
382 - sed -i.orig \
383 - -e '/newfile config3/s,a-z,a-z.,g' \
384 - "${S}"/src/sanity.sh
385 -
386 - elog "If you want any CVS server functionality, you MUST emerge with USE=server!"
387 -}
388 -
389 -src_configure() {
390 - local myconf
391 - # the tests need the server and proxy
392 - if use test; then
393 - use server || \
394 - ewarn "The server and proxy code are enabled as they are required for tests."
395 - myconf="--enable-server --enable-proxy"
396 - fi
397 - if tc-is-cross-compiler ; then
398 - # Sane defaults when cross-compiling (as these tests want to
399 - # try and execute code).
400 - export cvs_cv_func_printf_ptr="yes"
401 - fi
402 - econf \
403 - --with-external-zlib \
404 - --with-tmpdir=/tmp \
405 - $(use_enable crypt encryption) \
406 - $(use_with kerberos gssapi) \
407 - $(use_enable nls) \
408 - $(use_enable pam) \
409 - $(use_enable server) \
410 - $(use_enable server proxy) \
411 - ${myconf}
412 -}
413 -
414 -src_install() {
415 - emake install DESTDIR="${D}" || die
416 -
417 - if use server; then
418 - insinto /etc/xinetd.d
419 - newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver || die "newins failed"
420 - fi
421 -
422 - dodoc BUGS ChangeLog* DEVEL* FAQ HACKING \
423 - MINOR* NEWS PROJECTS README* TESTS TODO
424 -
425 - # Not installed into emacs site-lisp because it clobbers the normal C
426 - # indentations.
427 - dodoc cvs-format.el || die "dodoc failed"
428 -
429 - use server && newdoc "${FILESDIR}"/${PN}-1.12.12-cvs-custom.c cvs-custom.c
430 -
431 - if use doc; then
432 - dodoc "${DISTDIR}"/cederqvist-${DOC_PV}.pdf
433 - dodoc "${DISTDIR}"/cederqvist-${DOC_PV}.ps
434 - dohtml -r "${WORKDIR}"/cederqvist-${DOC_PV}.html/
435 - dosym cvs.html /usr/share/doc/${PF}/html/index.html
436 - fi
437 -
438 - newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs
439 -}
440 -
441 -_run_one_test() {
442 - mode="$1" ; shift
443 - einfo "Starting ${mode} test"
444 - cd "${S}"/src
445 - export TESTDIR="${T}/tests-${mode}"
446 - rm -rf "$TESTDIR" # Clean up from any previous test passes
447 - mkdir -p "$TESTDIR"
448 - emake -j1 ${mode}check || die "Some ${mode} test failed."
449 - mv -f check.log check.log-${mode}
450 - einfo "${mode} test completed successfully, log is check.log-${mode}"
451 -}
452 -
453 -src_test() {
454 - einfo "If you want to see realtime status, or check out a failure,"
455 - einfo "please look at ${S}/src/check.log*"
456 -
457 - if [ "$TEST_REMOTE_AND_PROXY" == "1" ]; then
458 - einfo "local, remote, and proxy tests enabled."
459 - else
460 - einfo "Only testing local mode. Please see ebuild for other modes."
461 - fi
462 -
463 - # we only do the local tests by default
464 - _run_one_test local
465 -
466 - # if you want to test the remote and proxy modes, things get a little bit
467 - # complicated. You need to set up a SSH config file at ~portage/.ssh/config
468 - # that allows the portage user to login without any authentication, and also
469 - # set up the ~portage/.ssh/known_hosts file for your machine.
470 - # We do not do this by default, as it is unsafe from a security point of
471 - # view, and requires root level ssh changes.
472 - # Note that this also requires having a real shell for the portage user, so make
473 - # sure that su -c 'ssh portage@mybox' portage works first!
474 - # (It uses the local ip, not loopback)
475 - if [ "$TEST_REMOTE_AND_PROXY" == "1" ]; then
476 - _run_one_test remote
477 - _run_one_test proxy
478 - fi
479 -}
480
481 diff --git a/dev-vcs/cvs/cvs-1.12.13.1-r2.ebuild b/dev-vcs/cvs/cvs-1.12.13.1-r2.ebuild
482 deleted file mode 100644
483 index 912f17e..0000000
484 --- a/dev-vcs/cvs/cvs-1.12.13.1-r2.ebuild
485 +++ /dev/null
486 @@ -1,155 +0,0 @@
487 -# Copyright 1999-2014 Gentoo Foundation
488 -# Distributed under the terms of the GNU General Public License v2
489 -# $Id$
490 -
491 -EAPI=3
492 -
493 -inherit eutils pam toolchain-funcs versionator
494 -
495 -DESCRIPTION="Concurrent Versions System - source code revision control tools"
496 -HOMEPAGE="http://www.nongnu.org/cvs/"
497 -
498 -DOC_PV="$(get_version_component_range 1-3)"
499 -FEAT_URIBASE="mirror://gnu/non-gnu/cvs/source/feature/${PV}/"
500 -DOC_URIBASE="mirror://gnu/non-gnu/cvs/source/feature/${DOC_PV}/"
501 -SNAP_URIBASE="mirror://gnu/non-gnu/cvs/source/nightly-snapshots/feature/"
502 -SRC_URI="
503 - ${FEAT_URIBASE}/${P}.tar.bz2
504 - ${SNAP_URIBASE}/${P}.tar.bz2
505 - doc? (
506 - ${DOC_URIBASE}/cederqvist-${DOC_PV}.html.tar.bz2
507 - ${DOC_URIBASE}/cederqvist-${DOC_PV}.pdf
508 - ${DOC_URIBASE}/cederqvist-${DOC_PV}.ps
509 - )"
510 -
511 -LICENSE="GPL-2 LGPL-2"
512 -SLOT="0"
513 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
514 -
515 -IUSE="crypt doc kerberos nls pam server"
516 -
517 -RDEPEND=">=sys-libs/zlib-1.1.4
518 - kerberos? ( virtual/krb5 )
519 - pam? ( virtual/pam )"
520 -DEPEND="${RDEPEND}"
521 -
522 -src_unpack() {
523 - unpack ${P}.tar.bz2
524 - use doc && unpack cederqvist-${DOC_PV}.html.tar.bz2
525 -}
526 -
527 -src_prepare() {
528 - epatch "${FILESDIR}"/${PN}-1.12.12-cvsbug-tmpfix.patch
529 - epatch "${FILESDIR}"/${PN}-1.12.12-install-sh.patch
530 - epatch "${FILESDIR}"/${PN}-1.12.13.1-block-requests.patch
531 - epatch "${FILESDIR}"/${PN}-1.12.13.1-hash-nameclash.patch # for AIX
532 - epatch "${FILESDIR}"/${PN}-1.12.13.1-gl-mempcpy.patch # for AIX
533 - epatch "${FILESDIR}"/${PN}-1.12.12-fix-massive-leak.patch
534 - epatch "${FILESDIR}"/${PN}-1.12.13.1-use-include_next.patch
535 - epatch "${FILESDIR}"/${PN}-1.12.13.1-fix-gnulib-SEGV-vasnprintf.patch
536 - # Applied by upstream:
537 - #epatch "${FILESDIR}"/${PN}-1.12.13-openat.patch
538 - #epatch "${FILESDIR}"/${PN}-1.12.13-zlib.patch
539 -
540 - # this testcase was not updated
541 - #sed -i.orig -e '/unrecognized keyword.*BogusOption/s,98,73,g' \
542 - # ${S}/src/sanity.sh
543 - # this one fails when the testpath path contains '.'
544 - sed -i.orig \
545 - -e '/newfile config3/s,a-z,a-z.,g' \
546 - "${S}"/src/sanity.sh
547 -
548 - elog "If you want any CVS server functionality, you MUST emerge with USE=server!"
549 -}
550 -
551 -src_configure() {
552 - local myconf
553 - # the tests need the server and proxy
554 - if use test; then
555 - use server || \
556 - ewarn "The server and proxy code are enabled as they are required for tests."
557 - myconf="--enable-server --enable-proxy"
558 - fi
559 - if tc-is-cross-compiler ; then
560 - # Sane defaults when cross-compiling (as these tests want to
561 - # try and execute code).
562 - export cvs_cv_func_printf_ptr="yes"
563 - fi
564 - econf \
565 - --with-external-zlib \
566 - --with-tmpdir=/tmp \
567 - $(use_enable crypt encryption) \
568 - $(use_with kerberos gssapi) \
569 - $(use_enable nls) \
570 - $(use_enable pam) \
571 - $(use_enable server) \
572 - $(use_enable server proxy) \
573 - ${myconf}
574 -}
575 -
576 -src_install() {
577 - emake install DESTDIR="${D}" || die
578 -
579 - if use server; then
580 - insinto /etc/xinetd.d
581 - newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver || die "newins failed"
582 - fi
583 -
584 - dodoc BUGS ChangeLog* DEVEL* FAQ HACKING \
585 - MINOR* NEWS PROJECTS README* TESTS TODO
586 -
587 - # Not installed into emacs site-lisp because it clobbers the normal C
588 - # indentations.
589 - dodoc cvs-format.el || die "dodoc failed"
590 -
591 - use server && newdoc "${FILESDIR}"/${PN}-1.12.12-cvs-custom.c cvs-custom.c
592 -
593 - if use doc; then
594 - dodoc "${DISTDIR}"/cederqvist-${DOC_PV}.pdf
595 - dodoc "${DISTDIR}"/cederqvist-${DOC_PV}.ps
596 - dohtml -r "${WORKDIR}"/cederqvist-${DOC_PV}.html/
597 - dosym cvs.html /usr/share/doc/${PF}/html/index.html
598 - fi
599 -
600 - newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs
601 -}
602 -
603 -_run_one_test() {
604 - mode="$1" ; shift
605 - einfo "Starting ${mode} test"
606 - cd "${S}"/src
607 - export TESTDIR="${T}/tests-${mode}"
608 - rm -rf "$TESTDIR" # Clean up from any previous test passes
609 - mkdir -p "$TESTDIR"
610 - emake -j1 ${mode}check || die "Some ${mode} test failed."
611 - mv -f check.log check.log-${mode}
612 - einfo "${mode} test completed successfully, log is check.log-${mode}"
613 -}
614 -
615 -src_test() {
616 - einfo "If you want to see realtime status, or check out a failure,"
617 - einfo "please look at ${S}/src/check.log*"
618 -
619 - if [ "$TEST_REMOTE_AND_PROXY" == "1" ]; then
620 - einfo "local, remote, and proxy tests enabled."
621 - else
622 - einfo "Only testing local mode. Please see ebuild for other modes."
623 - fi
624 -
625 - # we only do the local tests by default
626 - _run_one_test local
627 -
628 - # if you want to test the remote and proxy modes, things get a little bit
629 - # complicated. You need to set up a SSH config file at ~portage/.ssh/config
630 - # that allows the portage user to login without any authentication, and also
631 - # set up the ~portage/.ssh/known_hosts file for your machine.
632 - # We do not do this by default, as it is unsafe from a security point of
633 - # view, and requires root level ssh changes.
634 - # Note that this also requires having a real shell for the portage user, so make
635 - # sure that su -c 'ssh portage@mybox' portage works first!
636 - # (It uses the local ip, not loopback)
637 - if [ "$TEST_REMOTE_AND_PROXY" == "1" ]; then
638 - _run_one_test remote
639 - _run_one_test proxy
640 - fi
641 -}
642
643 diff --git a/dev-vcs/cvs/cvs-1.12.13.1.ebuild b/dev-vcs/cvs/cvs-1.12.13.1.ebuild
644 deleted file mode 100644
645 index 2422d3a..0000000
646 --- a/dev-vcs/cvs/cvs-1.12.13.1.ebuild
647 +++ /dev/null
648 @@ -1,151 +0,0 @@
649 -# Copyright 1999-2014 Gentoo Foundation
650 -# Distributed under the terms of the GNU General Public License v2
651 -# $Id$
652 -
653 -EAPI=3
654 -
655 -inherit eutils pam toolchain-funcs versionator
656 -
657 -DESCRIPTION="Concurrent Versions System - source code revision control tools"
658 -HOMEPAGE="http://www.nongnu.org/cvs/"
659 -
660 -DOC_PV="$(get_version_component_range 1-3)"
661 -FEAT_URIBASE="mirror://gnu/non-gnu/cvs/source/feature/${PV}/"
662 -DOC_URIBASE="mirror://gnu/non-gnu/cvs/source/feature/${DOC_PV}/"
663 -SNAP_URIBASE="mirror://gnu/non-gnu/cvs/source/nightly-snapshots/feature/"
664 -SRC_URI="
665 - ${FEAT_URIBASE}/${P}.tar.bz2
666 - ${SNAP_URIBASE}/${P}.tar.bz2
667 - doc? (
668 - ${DOC_URIBASE}/cederqvist-${DOC_PV}.html.tar.bz2
669 - ${DOC_URIBASE}/cederqvist-${DOC_PV}.pdf
670 - ${DOC_URIBASE}/cederqvist-${DOC_PV}.ps
671 - )"
672 -
673 -LICENSE="GPL-2 LGPL-2"
674 -SLOT="0"
675 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
676 -
677 -IUSE="crypt doc kerberos nls pam server"
678 -
679 -DEPEND=">=sys-libs/zlib-1.1.4
680 - kerberos? ( virtual/krb5 )
681 - pam? ( virtual/pam )"
682 -
683 -src_unpack() {
684 - unpack ${P}.tar.bz2
685 - use doc && unpack cederqvist-${DOC_PV}.html.tar.bz2
686 -}
687 -
688 -src_prepare() {
689 - epatch "${FILESDIR}"/${PN}-1.12.12-cvsbug-tmpfix.patch
690 - epatch "${FILESDIR}"/${PN}-1.12.12-install-sh.patch
691 - epatch "${FILESDIR}"/${PN}-1.12.13.1-block-requests.patch
692 - epatch "${FILESDIR}"/${PN}-1.12.13.1-hash-nameclash.patch # for AIX
693 - epatch "${FILESDIR}"/${PN}-1.12.13.1-gl-mempcpy.patch # for AIX
694 - # Applied by upstream:
695 - #epatch "${FILESDIR}"/${PN}-1.12.13-openat.patch
696 - #epatch "${FILESDIR}"/${PN}-1.12.13-zlib.patch
697 -
698 - # this testcase was not updated
699 - #sed -i.orig -e '/unrecognized keyword.*BogusOption/s,98,73,g' \
700 - # ${S}/src/sanity.sh
701 - # this one fails when the testpath path contains '.'
702 - sed -i.orig \
703 - -e '/newfile config3/s,a-z,a-z.,g' \
704 - "${S}"/src/sanity.sh
705 -
706 - elog "If you want any CVS server functionality, you MUST emerge with USE=server!"
707 -}
708 -
709 -src_configure() {
710 - local myconf
711 - # the tests need the server and proxy
712 - if use test; then
713 - use server || \
714 - ewarn "The server and proxy code are enabled as they are required for tests."
715 - myconf="--enable-server --enable-proxy"
716 - fi
717 - if tc-is-cross-compiler ; then
718 - # Sane defaults when cross-compiling (as these tests want to
719 - # try and execute code).
720 - export cvs_cv_func_printf_ptr="yes"
721 - fi
722 - econf \
723 - --with-external-zlib \
724 - --with-tmpdir=/tmp \
725 - $(use_enable crypt encryption) \
726 - $(use_with kerberos gssapi) \
727 - $(use_enable nls) \
728 - $(use_enable pam) \
729 - $(use_enable server) \
730 - $(use_enable server proxy) \
731 - ${myconf}
732 -}
733 -
734 -src_install() {
735 - emake install DESTDIR="${D}" || die
736 -
737 - if use server; then
738 - insinto /etc/xinetd.d
739 - newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver || die "newins failed"
740 - fi
741 -
742 - dodoc BUGS ChangeLog* DEVEL* FAQ HACKING \
743 - MINOR* NEWS PROJECTS README* TESTS TODO
744 -
745 - # Not installed into emacs site-lisp because it clobbers the normal C
746 - # indentations.
747 - dodoc cvs-format.el || die "dodoc failed"
748 -
749 - use server && newdoc "${FILESDIR}"/${PN}-1.12.12-cvs-custom.c cvs-custom.c
750 -
751 - if use doc; then
752 - dodoc "${DISTDIR}"/cederqvist-${DOC_PV}.pdf
753 - dodoc "${DISTDIR}"/cederqvist-${DOC_PV}.ps
754 - dohtml -r "${WORKDIR}"/cederqvist-${DOC_PV}.html/
755 - dosym cvs.html /usr/share/doc/${PF}/html/index.html
756 - fi
757 -
758 - newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs
759 -}
760 -
761 -_run_one_test() {
762 - mode="$1" ; shift
763 - einfo "Starting ${mode} test"
764 - cd "${S}"/src
765 - export TESTDIR="${T}/tests-${mode}"
766 - rm -rf "$TESTDIR" # Clean up from any previous test passes
767 - mkdir -p "$TESTDIR"
768 - emake -j1 ${mode}check || die "Some ${mode} test failed."
769 - mv -f check.log check.log-${mode}
770 - einfo "${mode} test completed successfully, log is check.log-${mode}"
771 -}
772 -
773 -src_test() {
774 - einfo "If you want to see realtime status, or check out a failure,"
775 - einfo "please look at ${S}/src/check.log*"
776 -
777 - if [ "$TEST_REMOTE_AND_PROXY" == "1" ]; then
778 - einfo "local, remote, and proxy tests enabled."
779 - else
780 - einfo "Only testing local mode. Please see ebuild for other modes."
781 - fi
782 -
783 - # we only do the local tests by default
784 - _run_one_test local
785 -
786 - # if you want to test the remote and proxy modes, things get a little bit
787 - # complicated. You need to set up a SSH config file at ~portage/.ssh/config
788 - # that allows the portage user to login without any authentication, and also
789 - # set up the ~portage/.ssh/known_hosts file for your machine.
790 - # We do not do this by default, as it is unsafe from a security point of
791 - # view, and requires root level ssh changes.
792 - # Note that this also requires having a real shell for the portage user, so make
793 - # sure that su -c 'ssh portage@mybox' portage works first!
794 - # (It uses the local ip, not loopback)
795 - if [ "$TEST_REMOTE_AND_PROXY" == "1" ]; then
796 - _run_one_test remote
797 - _run_one_test proxy
798 - fi
799 -}
800
801 diff --git a/dev-vcs/cvs/files/cvs-1.12.13-openat.patch b/dev-vcs/cvs/files/cvs-1.12.13-openat.patch
802 deleted file mode 100644
803 index 762924a..0000000
804 --- a/dev-vcs/cvs/files/cvs-1.12.13-openat.patch
805 +++ /dev/null
806 @@ -1,21 +0,0 @@
807 -Index: cvs-1.12.13/lib/openat.c
808 -===================================================================
809 ---- cvs-1.12.13.orig/lib/openat.c
810 -+++ cvs-1.12.13/lib/openat.c
811 -@@ -55,9 +55,13 @@ rpl_openat (int fd, char const *filename
812 - va_list arg;
813 - va_start (arg, flags);
814 -
815 -- /* Assume that mode_t is passed compatibly with mode_t's type
816 -- after argument promotion. */
817 -- mode = va_arg (arg, mode_t);
818 -+ /* If mode_t is narrower than int, use the promoted type (int),
819 -+ not mode_t. Use sizeof to guess whether mode_t is nerrower;
820 -+ we don't know of any practical counterexamples. */
821 -+ if (sizeof (mode_t) < sizeof (int))
822 -+ mode = va_arg (arg, int);
823 -+ else
824 -+ mode = va_arg (arg, mode_t);
825 -
826 - va_end (arg);
827 - }
828
829 diff --git a/dev-vcs/cvs/files/cvs-1.12.13-zlib.patch b/dev-vcs/cvs/files/cvs-1.12.13-zlib.patch
830 deleted file mode 100644
831 index a4b4b1e..0000000
832 --- a/dev-vcs/cvs/files/cvs-1.12.13-zlib.patch
833 +++ /dev/null
834 @@ -1,31 +0,0 @@
835 -Index: src/zlib.c
836 -===================================================================
837 -RCS file: /sources/cvs/ccvs/src/zlib.c,v
838 -retrieving revision 1.31
839 -retrieving revision 1.32
840 -diff -u -r1.31 -r1.32
841 ---- src/zlib.c 3 Jun 2005 18:26:09 -0000 1.31
842 -+++ src/zlib.c 28 Oct 2005 14:10:59 -0000 1.32
843 -@@ -221,15 +221,14 @@
844 - point. */
845 - assert (bd->size == 0);
846 -
847 -- /* This will work well in the server, because this call will
848 -- do an unblocked read and fetch all the available data. In
849 -- the client, this will read a single byte from the stdio
850 -- stream, which will cause us to call inflate once per byte.
851 -- It would be more efficient if we could make a call which
852 -- would fetch all the available bytes, and at least one byte. */
853 --
854 -+ /* On the server, this will do an unblocking read of as much data as is
855 -+ * available. On the client, with a blocking input descriptor and the
856 -+ * current fd_buffer implementation, this should read as much data as
857 -+ * is currently available, and at least 1 byte (or EOF), from the
858 -+ * underlying buffer.
859 -+ */
860 - status = (*cb->buf->input) (cb->buf->closure, bd->text,
861 -- need, BUFFER_DATA_SIZE, &nread);
862 -+ need ? 1 : 0, BUFFER_DATA_SIZE, &nread);
863 -
864 - if (status == -2)
865 - /* Don't try to recover from memory allcoation errors. */
866
867 diff --git a/dev-vcs/cvs/files/cvs-1.12.13.1-block-requests.patch b/dev-vcs/cvs/files/cvs-1.12.13.1-block-requests.patch
868 deleted file mode 100644
869 index 216336f..0000000
870 --- a/dev-vcs/cvs/files/cvs-1.12.13.1-block-requests.patch
871 +++ /dev/null
872 @@ -1,101 +0,0 @@
873 -Author: Robin H. Johnson <robbat2@g.o>
874 -Original-Date: 2006-08-09
875 -Forward-Port-Date: 2007-12-06
876 -
877 -This patch allows a CVS server to deny usage of specific commands, based on
878 -input in the environment.
879 -
880 -Just set the CVS_BLOCK_REQUESTS env var with all of the commands you want,
881 -seperated by spaces. Eg:
882 -CVS_BLOCK_REQUESTS="Gzip-stream gzip-file-contents"
883 -would block ALL usage of compression.
884 -
885 -Please see the array 'struct request requests[]' in src/server.c for a full
886 -list of commands.
887 -
888 -Please note that if you block any commands marked as RQ_ESSENTIAL, CVS clients
889 -may fail! (This includes 'ci'!).
890 -
891 -See the companion cvs-custom.c for a wrapper that can enforce the environment variable for pserver setups.
892 -
893 -Signed-off-by: Robin H. Johnson <robbat2@g.o>
894 -
895 -diff -Nuar cvs-1.12.13.1.orig/src/server.c cvs-1.12.13.1/src/server.c
896 ---- cvs-1.12.13.1.orig/src/server.c 2006-06-21 11:55:21.000000000 -0700
897 -+++ cvs-1.12.13.1/src/server.c 2007-12-06 16:25:38.109309990 -0800
898 -@@ -6244,6 +6244,49 @@
899 - /*
900 - * This server request is not ignored by the secondary.
901 - */
902 -+
903 -+/* Hack by Robin H. Johnson <robbat2@g.o>.
904 -+ * Allow the server ENV to specify what request types are to be ignored.
905 -+ */
906 -+
907 -+static char blocked_requests[BUFSIZ] = " ";
908 -+
909 -+static void build_blocked_requests() {
910 -+ char *tmp = getenv("CVS_BLOCK_REQUESTS");
911 -+
912 -+ if (tmp != NULL && strlen(tmp) > 0) {
913 -+ // move to our custom buffer
914 -+ strncat(blocked_requests, tmp, sizeof(blocked_requests)-strlen(blocked_requests));
915 -+ //add a space on the end as well for searching
916 -+ strncat(blocked_requests, " ", sizeof(blocked_requests)-strlen(blocked_requests));
917 -+ }
918 -+
919 -+ // now blocked_requests contains the list of every request that we do not
920 -+ // want to serve
921 -+}
922 -+
923 -+// returns 0 if we should serve this request
924 -+// use as if(checker(FOO)) continue;
925 -+static int serve_valid_requests_checker(char *reqname) {
926 -+ char needle[BUFSIZ] = " ";
927 -+ char *tmp;
928 -+
929 -+ if(!blocked_requests || strlen(blocked_requests) < 2)
930 -+ return 0;
931 -+
932 -+ // we want to look for ' 'reqname' '
933 -+ snprintf(needle, sizeof(needle), " %s ", reqname);
934 -+
935 -+ // now do the search
936 -+ tmp = strstr(blocked_requests, needle);
937 -+
938 -+ if (tmp != NULL)
939 -+ return 1;
940 -+
941 -+ return 0;
942 -+
943 -+}
944 -+
945 - static void
946 - serve_valid_requests (char *arg)
947 - {
948 -@@ -6262,11 +6305,15 @@
949 - )
950 - return;
951 -
952 -+ build_blocked_requests();
953 -+
954 - buf_output0 (buf_to_net, "Valid-requests");
955 - for (rq = requests; rq->name != NULL; rq++)
956 - {
957 - if (rq->func != NULL)
958 - {
959 -+ if(serve_valid_requests_checker(rq->name))
960 -+ continue;
961 - buf_append_char (buf_to_net, ' ');
962 - buf_output0 (buf_to_net, rq->name);
963 - }
964 -@@ -6706,6 +6753,9 @@
965 - * "co".
966 - */
967 - continue;
968 -+ // Ignore commands that we are supposed to ignore.
969 -+ if(serve_valid_requests_checker(rq->name))
970 -+ continue;
971 -
972 - if (!(rq->flags & RQ_ROOTLESS)
973 - && current_parsed_root == NULL)
974
975 diff --git a/dev-vcs/cvs/files/cvs-1.12.13.1-fix-gnulib-SEGV-vasnprintf.patch b/dev-vcs/cvs/files/cvs-1.12.13.1-fix-gnulib-SEGV-vasnprintf.patch
976 deleted file mode 100644
977 index 1dbaa51..0000000
978 --- a/dev-vcs/cvs/files/cvs-1.12.13.1-fix-gnulib-SEGV-vasnprintf.patch
979 +++ /dev/null
980 @@ -1,42 +0,0 @@
981 -Attemt to use CVS leads to glibc crash:
982 -$ cvs up
983 - *** %n in writable segment detected ***
984 -
985 -Fixes: https://savannah.nongnu.org/bugs/?35432
986 -Upstream gnulib commit:
987 -
988 -From 913c09becd9df89dbd9b9f386e7f35c240d5efe8 Mon Sep 17 00:00:00 2001
989 -From: Bruno Haible <bruno@×××××.org>
990 -Date: Thu, 18 Oct 2007 23:50:42 +0000
991 -Subject: Don't use %n on glibc >= 2.3 systems.
992 -
993 ----
994 -(limited to 'lib/vasnprintf.c')
995 -
996 -diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
997 -index f563823..5d818aa 100644
998 ---- a/lib/vasnprintf.c
999 -+++ b/lib/vasnprintf.c
1000 -@@ -3386,8 +3386,20 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
1001 - *fbp = dp->conversion;
1002 - #if USE_SNPRINTF
1003 -+# if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3))
1004 - p[1] = '%';
1005 - p[2] = 'n';
1006 - p[3] = '\0';
1007 -+# else
1008 -+ /* On glibc2 systems from glibc >= 2.3 - probably also older
1009 -+ ones - we know that snprintf's returns value conforms to
1010 -+ ISO C 99: the gl_SNPRINTF_DIRECTIVE_N test passes.
1011 -+ Therefore we can avoid using %n in this situation.
1012 -+ On glibc2 systems from 2004-10-18 or newer, the use of %n
1013 -+ in format strings in writable memory may crash the program
1014 -+ (if compiled with _FORTIFY_SOURCE=2), so we should avoid it
1015 -+ in this situation. */
1016 -+ p[1] = '\0';
1017 -+# endif
1018 - #else
1019 - p[1] = '\0';
1020 - #endif
1021 ---
1022 -cgit v0.9.0.2
1023
1024 diff --git a/dev-vcs/cvs/files/cvs-1.12.13.1-gl-mempcpy.patch b/dev-vcs/cvs/files/cvs-1.12.13.1-gl-mempcpy.patch
1025 deleted file mode 100644
1026 index 7ad7533..0000000
1027 --- a/dev-vcs/cvs/files/cvs-1.12.13.1-gl-mempcpy.patch
1028 +++ /dev/null
1029 @@ -1,24 +0,0 @@
1030 -http://cvs.savannah.gnu.org/viewvc/cvs/ccvs/lib/mempcpy.c?r1=1.2&r2=1.3&pathrev=MAIN
1031 -fixed in cvs-HEAD after cvs-1.12.13a
1032 -
1033 ---- lib/mempcpy.c 2005/05/23 17:44:31 1.2
1034 -+++ lib/mempcpy.c 2007/08/22 12:48:42 1.3
1035 -@@ -1,5 +1,5 @@
1036 - /* Copy memory area and return pointer after last written byte.
1037 -- Copyright (C) 2003 Free Software Foundation, Inc.
1038 -+ Copyright (C) 2003, 2007 Free Software Foundation, Inc.
1039 -
1040 - This program is free software; you can redistribute it and/or modify
1041 - it under the terms of the GNU General Public License as published by
1042 -@@ -15,9 +15,9 @@
1043 - along with this program; if not, write to the Free Software Foundation,
1044 - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1045 -
1046 --/* Specification. */
1047 --#include "mempcpy.h"
1048 -+#include <config.h>
1049 -
1050 -+/* Specification. */
1051 - #include <string.h>
1052 -
1053 - /* Copy N bytes of SRC to DEST, return pointer to bytes after the
1054
1055 diff --git a/dev-vcs/cvs/files/cvs-1.12.13.1-hash-nameclash.patch b/dev-vcs/cvs/files/cvs-1.12.13.1-hash-nameclash.patch
1056 deleted file mode 100644
1057 index d9c3358..0000000
1058 --- a/dev-vcs/cvs/files/cvs-1.12.13.1-hash-nameclash.patch
1059 +++ /dev/null
1060 @@ -1,43 +0,0 @@
1061 -http://cvs.savannah.gnu.org/viewvc/cvs/ccvs/src/hash.h?r1=1.14.6.2&r2=1.14.6.3&pathrev=cvs1-11-x-branch
1062 -fixed in cvs-1.11.23, cvs-HEAD after cvs-1.12.13a
1063 -
1064 ---- src/hash.h.orig 2010-03-11 10:12:19 +0100
1065 -+++ src/hash.h 2010-03-11 10:12:40 +0100
1066 -@@ -32,27 +32,27 @@
1067 - };
1068 - typedef enum ntype Ntype;
1069 -
1070 --struct node
1071 -+struct hashnode
1072 - {
1073 - Ntype type;
1074 -- struct node *next;
1075 -- struct node *prev;
1076 -- struct node *hashnext;
1077 -- struct node *hashprev;
1078 -+ struct hashnode *next;
1079 -+ struct hashnode *prev;
1080 -+ struct hashnode *hashnext;
1081 -+ struct hashnode *hashprev;
1082 - char *key;
1083 - void *data;
1084 - size_t len; /* Length of DATA. */
1085 -- void (*delproc) (struct node *);
1086 -+ void (*delproc) (struct hashnode *);
1087 - };
1088 --typedef struct node Node;
1089 -+typedef struct hashnode Node;
1090 -
1091 --struct list
1092 -+struct hashlist
1093 - {
1094 - Node *list;
1095 - Node *hasharray[HASHSIZE];
1096 -- struct list *next;
1097 -+ struct hashlist *next;
1098 - };
1099 --typedef struct list List;
1100 -+typedef struct hashlist List;
1101 -
1102 - List *getlist (void);
1103 - Node *findnode (List *list, const char *key);
1104
1105 diff --git a/dev-vcs/cvs/files/cvs-1.12.13.1-use-include_next.patch b/dev-vcs/cvs/files/cvs-1.12.13.1-use-include_next.patch
1106 deleted file mode 100644
1107 index adaff55..0000000
1108 --- a/dev-vcs/cvs/files/cvs-1.12.13.1-use-include_next.patch
1109 +++ /dev/null
1110 @@ -1,30 +0,0 @@
1111 -Fix build failure on gentoo's gcc:
1112 -
1113 -In file included from ./inttypes.h:34:0,
1114 - from ./stdint.h:65,
1115 - from /usr/include/netinet/in.h:23,
1116 - from /usr/include/netdb.h:27,
1117 - from getaddrinfo.h:30,
1118 - from canon-host.c:27:
1119 - /usr/include/inttypes.h:297:1: error: unknown type name 'intmax_t'
1120 - /usr/include/inttypes.h:297:26: error: unknown type name 'intmax_t'
1121 - /usr/include/inttypes.h:300:27: error: unknown type name 'intmax_t'
1122 - /usr/include/inttypes.h:300:45: error: unknown type name 'intmax_t'
1123 -diff --git a/lib/stdint_.h b/lib/stdint_.h
1124 -index adab4d7..3a8db19 100644
1125 ---- a/lib/stdint_.h
1126 -+++ b/lib/stdint_.h
1127 -@@ -43,7 +43,12 @@
1128 - Include it before <inttypes.h>, since any "#include <stdint.h>"
1129 - in <inttypes.h> would reinclude us, skipping our contents because
1130 - _GL_STDINT_H is defined. */
1131 --# include @ABSOLUTE_STDINT_H@
1132 -+# include "config.h"
1133 -+# if HAVE_INCLUDE_NEXT
1134 -+# include_next <stdint.h>
1135 -+# else
1136 -+# include @ABSOLUTE_STDINT_H@
1137 -+# endif
1138 - #endif
1139 -
1140 - /* <sys/types.h> defines some of the stdint.h types as well, on glibc,