* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/cvs/, dev-vcs/cvs/files/
@ 2016-06-27 22:11 Robin H. Johnson
0 siblings, 0 replies; 3+ messages in thread
From: Robin H. Johnson @ 2016-06-27 22:11 UTC (permalink / raw
To: gentoo-commits
commit: 6869b19cce09eb397f7e46add3e4e37a7d4677b3
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 27 22:05:59 2016 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jun 27 22:11:22 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6869b19c
dev-vcs/cvs: Drop broken cvs-12.13 per bug #124733.
Package-Manager: portage-2.2.28
dev-vcs/cvs/Manifest | 5 -
dev-vcs/cvs/cvs-1.12.13-r1.ebuild | 131 -----------------
dev-vcs/cvs/cvs-1.12.13-r2.ebuild | 132 ------------------
dev-vcs/cvs/cvs-1.12.13.1-r1.ebuild | 154 --------------------
dev-vcs/cvs/cvs-1.12.13.1-r2.ebuild | 155 ---------------------
dev-vcs/cvs/cvs-1.12.13.1.ebuild | 151 --------------------
dev-vcs/cvs/files/cvs-1.12.13-openat.patch | 21 ---
dev-vcs/cvs/files/cvs-1.12.13-zlib.patch | 31 -----
.../cvs/files/cvs-1.12.13.1-block-requests.patch | 101 --------------
.../cvs-1.12.13.1-fix-gnulib-SEGV-vasnprintf.patch | 42 ------
dev-vcs/cvs/files/cvs-1.12.13.1-gl-mempcpy.patch | 24 ----
.../cvs/files/cvs-1.12.13.1-hash-nameclash.patch | 43 ------
.../cvs/files/cvs-1.12.13.1-use-include_next.patch | 30 ----
13 files changed, 1020 deletions(-)
diff --git a/dev-vcs/cvs/Manifest b/dev-vcs/cvs/Manifest
index bda243d..a6876db 100644
--- a/dev-vcs/cvs/Manifest
+++ b/dev-vcs/cvs/Manifest
@@ -4,10 +4,5 @@ DIST cederqvist-1.11.23.ps 1129600 SHA256 6b35cbeecd6fa069e59743716f2766f5bfffe3
DIST cederqvist-1.12.12.html.tar.bz2 137581 SHA256 6bdd66581ec363e05313a14db27cd3c201b547cdfc9ea2f8edde74e78301f0f6 SHA512 c4f6bdc294b719c1c9f6e8b7d1d4faa9e2aafccd37924e9d4772f8d802da3e7f5ae1778b295989db256b23bb1d0914023db7237adaf07833caaee499ae6b6fa3 WHIRLPOOL 41dd1e0d944a02eeca10539b87b5cfcadbf4fd5923c872aa86e5673bb6a98f774d5378e8b4f1c2e6c6a62e6dc6a4d02c69b5e51ad03da899903070effd62adc9
DIST cederqvist-1.12.12.pdf 1252423 SHA256 211c5792d24bfd5694f23bc217a161d880bfb2447c41016fab6f657168b041ce SHA512 aa90b76664ca103cf41831a5595d5e99df9fd87633aa5a500569f43854ca6e409a26b655f02ed59cde1c37ce88c40e06f3b3376ad71fdc9487032c3f0898706a WHIRLPOOL 88d015117c05716df6d0cdc763f16dc488f0641624475e9bd33478485dd32e36a7ee5c49a1789ebdd173e665ae5963e75975342d7308e8e453adb65dd31ec6c5
DIST cederqvist-1.12.12.ps 1262208 SHA256 0e14189614e2c5ead49bfe0ecd187239f8adc3e66371b49d52163be821e44cab SHA512 9a061ef90c664fbb4f882644f72c4f80ffbe0233b6b364511b1c7f18f0a53383980a6ddda326b6df1f2fe1899aed3225de89b55a65a1d9101ba81d1c10c067e2 WHIRLPOOL fb1616ca734e51a626713e7e78786ecbff18378966c2c131f6992df248096d38e850123449d3a5a6aa111ee209f90ef48848da7366b21cb6befeccf07ce54ab6
-DIST cederqvist-1.12.13.html.tar.bz2 140382 SHA256 1a9a34e07c00de5102224b48cbc53384992aea197c91c20b6140dd6885b5ae87 SHA512 4305b5b5d6ec75288e8be0f818815898523de465bd2dc1f55dc277a423815608e619e6fb50d47d29c378249db53f7dba2cc6b4e996f8cd2c1eecf5b9db5957c3 WHIRLPOOL 8b72d282e466b85ad2e898c52a934df55af530a458c39171e4de31a71e1d7c0dbf85674387021f0bc4d87b480a3ff32084574294425923b64c10998e0716abdc
-DIST cederqvist-1.12.13.pdf 1297631 SHA256 4f24b2ac3b81c97798cad42cba8ffe6cc65405f13e5a58a4b063aa9fffc4a7bc SHA512 56ff658265a4e08df6bcd59b1bcb046cbcb92d4107fd4fc54a35601e379af048fdab720500207a4ea6b757058bb52973c7723a02f43b5de8c9fee7f09379ba1f WHIRLPOOL 5ca68dbc70dfbf98a61700f696c4b197a8943f3122d419e2ae2a1f085c589b02c3e90bdadfa657351e51dfbf4a40781babcc47319e157aede3f67be8edf08493
-DIST cederqvist-1.12.13.ps 1280573 SHA256 a955722b89155e390635b1220fa67a096c97141d83ac53a7840323c01d13aa91 SHA512 7a6e9605c82b4d105d37663b12ce9fc89eb8e9153897ceeb6d4fd18da07947180b96167f67cd04df0ec2682d431bbb6840c8c87ccd97ddb596dd2efd31bbf1e4 WHIRLPOOL 2b6249d9cba0d08b76e9d8ae24828cfbfae71c2f109e35ca425c0122a79dc3a66a52ec9506971eab031d730743ed3bc5c01b583e3e9a538f067e22e6d78a6c0f
DIST cvs-1.11.23.tar.bz2 2942652 SHA256 400f51b59d85116e79b844f2d5dbbad4759442a789b401a94aa5052c3d7a4aa9 SHA512 d84360b51b966f19ac3f1728265ff25e46d3a3ce6d9e7e30b154f0975bb10ce4f82f5ca3f308d2ff169c2b5dd97b0243e910d2e8ad59a5857aef7a70b9026b19 WHIRLPOOL 0f4a14989c29ee76a911edcbcb9b946f3710d1015391e7a219c841bf3cd03678994d572f23a66975030e9ca2eb64abc7f7665a535203bc81653d754491039252
DIST cvs-1.12.12.tar.bz2 3197171 SHA256 9fb9176d268b9019768fc57dedc2920c28fbeda5ba224c2348550d4f25043edc SHA512 31c679b77b887e02d9c8c381b0dfb42f1207ef4ca806cd92843638eb2126ed032e99bda70a3e20ea2a029670ff39c40088a43435632e381739e6c2f978e6f4bb WHIRLPOOL 74257976cdb957e86fb9fb7e54fc8c0b7210f72136ce05327203d935195e7a3bdda0c1d616dc04cb1d6495cb038ca7275e88488eddb5d936c1cfceb94583278c
-DIST cvs-1.12.13.1.tar.bz2 4075630 SHA256 de7f374d8c4ac414c04e8d44ce9a5d3da919825a6a332d747e299dc7a80c2218 SHA512 db318c0c70b47283bd469d792bdfe5335e5375e3b25beb79a7aea8435209b944cfa7ba51bdef9935f708e3a26a06b72defdb698974f2951cc9afd615f970986b WHIRLPOOL 3369e59e9f598cf6de28577302d62d3f6b00f705a0a5729c7ebf7b956d899e85afaaa160be2c4f7a4c710c1dd8860301ad1855c874229e39dbe60a5acc91a884
-DIST cvs-1.12.13.tar.bz2 3911104 SHA256 78853613b9a6873a30e1cc2417f738c330e75f887afdaf7b3d0800cb19ca515e SHA512 7d10f808de62190b18d4f706d2d03ab218a508bfb52047ff3e830e293ec40c5e8bf6cc743ef72a5c24be5aa867c9e4892d7d475a026a98b296a3764b4bd0f4d8 WHIRLPOOL 0662c898e05dfe9e45ee1615cfc86bdf664dfc74ddcbea8833e0f98b22e5ea65920d401d3f9a674d5e567eb10f94a29631487a2f8e43a49685888ca94f98ab62
diff --git a/dev-vcs/cvs/cvs-1.12.13-r1.ebuild b/dev-vcs/cvs/cvs-1.12.13-r1.ebuild
deleted file mode 100644
index a96af96..0000000
--- a/dev-vcs/cvs/cvs-1.12.13-r1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-inherit eutils pam toolchain-funcs
-
-DESCRIPTION="Concurrent Versions System - source code revision control tools"
-HOMEPAGE="http://www.nongnu.org/cvs/"
-
-SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2
- doc? ( mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.html.tar.bz2
- mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.pdf
- mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.ps )"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-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"
-
-IUSE="crypt doc emacs kerberos nls pam server"
-
-DEPEND=">=sys-libs/zlib-1.1.4
- kerberos? ( virtual/krb5 )
- pam? ( virtual/pam )"
-
-src_unpack() {
- unpack ${P}.tar.bz2
- use doc && unpack cederqvist-${PV}.html.tar.bz2
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.12.12-cvsbug-tmpfix.patch
- epatch "${FILESDIR}"/${P}-openat.patch
- epatch "${FILESDIR}"/${P}-zlib.patch
- epatch "${FILESDIR}"/${PN}-1.12.12-install-sh.patch
- # this testcase was not updated
- #sed -i.orig -e '/unrecognized keyword.*BogusOption/s,98,73,g' \
- # ${S}/src/sanity.sh
- # this one fails when the testpath path contains '.'
- sed -i.orig -e '/newfile config3/s,a-z,a-z.,g' \
- "${S}"/src/sanity.sh
-}
-
-src_configure() {
- local myconf
- # the tests need the server and proxy
- if use test; then
- use server || \
- ewarn "The server and proxy code are enabled as they are required for tests."
- myconf="--enable-server --enable-proxy"
- fi
- if tc-is-cross-compiler ; then
- # Sane defaults when cross-compiling (as these tests want to
- # try and execute code).
- export cvs_cv_func_printf_ptr="yes"
- fi
- econf \
- --with-external-zlib \
- --with-tmpdir=/tmp \
- $(use_enable crypt encryption) \
- $(use_with kerberos gssapi) \
- $(use_enable nls) \
- $(use_enable pam) \
- $(use_enable server) \
- $(use_enable server proxy)
-}
-
-src_install() {
- einstall || die
-
- if use server; then
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver || die "newins failed"
- fi
-
- dodoc BUGS ChangeLog* DEVEL* FAQ HACKING \
- MINOR* NEWS PROJECTS README* TESTS TODO
-
- if use emacs; then
- insinto /usr/share/emacs/site-lisp
- doins cvs-format.el || die "doins failed"
- fi
-
- if use doc; then
- dodoc "${DISTDIR}"/cederqvist-${PV}.pdf
- dodoc "${DISTDIR}"/cederqvist-${PV}.ps
- tar xjf "${DISTDIR}"/cederqvist-${PV}.html.tar.bz2
- dohtml -r cederqvist-${PV}.html/*
- dosym cvs.html /usr/share/doc/${PF}/html/index.html
- fi
-
- newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs
-}
-
-src_test() {
- einfo "If you want to see realtime status, or check out a failure,"
- einfo "please look at ${S}/src/check.log*"
- if [ -n "$TEST_REMOTE_AND_PROXY" ]; then
- einfo "local, remote, and proxy tests enabled."
- else
- einfo "Only testing local mode. Please see ebuild for other modes."
- fi
-
- cd "${S}"/src
- export TESTDIR="${T}/tests-local"
- mkdir -p "$TESTDIR"
- # we only do the local tests by default
- make localcheck || die "Some local test failed."
- mv -f check.log check.log-local
-
- # if you want to test the remote and proxy modes, things get a little bit
- # complicated. You need to set up a SSH config file at ~portage/.ssh/config
- # that allows the portage user to login without any authentication, and also
- # set up the ~portage/.ssh/known_hosts file for your machine.
- # We do not do this by default, as it is unsafe from a security point of
- # view, and requires root level ssh changes.
- if [ -n "$TEST_REMOTE_AND_PROXY" ]; then
- cd "${S}"/src
- export TESTDIR="${T}/tests-remote"
- mkdir -p "$TESTDIR"
- make remotecheck || die "Some remote test failed."
- mv -f check.log check.log-remote
-
- cd "${S}"/src
- export TESTDIR="${T}/tests-proxy"
- mkdir -p "$TESTDIR"
- make proxycheck || die "Some proxy test failed."
- mv -f check.log check.log-proxy
- fi
-}
diff --git a/dev-vcs/cvs/cvs-1.12.13-r2.ebuild b/dev-vcs/cvs/cvs-1.12.13-r2.ebuild
deleted file mode 100644
index de3d18d..0000000
--- a/dev-vcs/cvs/cvs-1.12.13-r2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-inherit eutils pam toolchain-funcs
-
-DESCRIPTION="Concurrent Versions System - source code revision control tools"
-HOMEPAGE="http://www.nongnu.org/cvs/"
-
-SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2
- doc? ( mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.html.tar.bz2
- mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.pdf
- mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.ps )"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-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"
-
-IUSE="crypt doc emacs kerberos nls pam server"
-
-DEPEND=">=sys-libs/zlib-1.1.4
- kerberos? ( virtual/krb5 )
- pam? ( virtual/pam )"
-
-src_unpack() {
- unpack ${P}.tar.bz2
- use doc && unpack cederqvist-${PV}.html.tar.bz2
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.12.12-cvsbug-tmpfix.patch
- epatch "${FILESDIR}"/${P}-openat.patch
- epatch "${FILESDIR}"/${P}-zlib.patch
- epatch "${FILESDIR}"/${PN}-1.12.12-install-sh.patch
- epatch "${FILESDIR}"/${PN}-1.12.12-fix-massive-leak.patch
- # this testcase was not updated
- #sed -i.orig -e '/unrecognized keyword.*BogusOption/s,98,73,g' \
- # ${S}/src/sanity.sh
- # this one fails when the testpath path contains '.'
- sed -i.orig -e '/newfile config3/s,a-z,a-z.,g' \
- "${S}"/src/sanity.sh
-}
-
-src_configure() {
- local myconf
- # the tests need the server and proxy
- if use test; then
- use server || \
- ewarn "The server and proxy code are enabled as they are required for tests."
- myconf="--enable-server --enable-proxy"
- fi
- if tc-is-cross-compiler ; then
- # Sane defaults when cross-compiling (as these tests want to
- # try and execute code).
- export cvs_cv_func_printf_ptr="yes"
- fi
- econf \
- --with-external-zlib \
- --with-tmpdir=/tmp \
- $(use_enable crypt encryption) \
- $(use_with kerberos gssapi) \
- $(use_enable nls) \
- $(use_enable pam) \
- $(use_enable server) \
- $(use_enable server proxy)
-}
-
-src_install() {
- einstall || die
-
- if use server; then
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver || die "newins failed"
- fi
-
- dodoc BUGS ChangeLog* DEVEL* FAQ HACKING \
- MINOR* NEWS PROJECTS README* TESTS TODO
-
- if use emacs; then
- insinto /usr/share/emacs/site-lisp
- doins cvs-format.el || die "doins failed"
- fi
-
- if use doc; then
- dodoc "${DISTDIR}"/cederqvist-${PV}.pdf
- dodoc "${DISTDIR}"/cederqvist-${PV}.ps
- tar xjf "${DISTDIR}"/cederqvist-${PV}.html.tar.bz2
- dohtml -r cederqvist-${PV}.html/*
- dosym cvs.html /usr/share/doc/${PF}/html/index.html
- fi
-
- newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs
-}
-
-src_test() {
- einfo "If you want to see realtime status, or check out a failure,"
- einfo "please look at ${S}/src/check.log*"
- if [ -n "$TEST_REMOTE_AND_PROXY" ]; then
- einfo "local, remote, and proxy tests enabled."
- else
- einfo "Only testing local mode. Please see ebuild for other modes."
- fi
-
- cd "${S}"/src
- export TESTDIR="${T}/tests-local"
- mkdir -p "$TESTDIR"
- # we only do the local tests by default
- make localcheck || die "Some local test failed."
- mv -f check.log check.log-local
-
- # if you want to test the remote and proxy modes, things get a little bit
- # complicated. You need to set up a SSH config file at ~portage/.ssh/config
- # that allows the portage user to login without any authentication, and also
- # set up the ~portage/.ssh/known_hosts file for your machine.
- # We do not do this by default, as it is unsafe from a security point of
- # view, and requires root level ssh changes.
- if [ -n "$TEST_REMOTE_AND_PROXY" ]; then
- cd "${S}"/src
- export TESTDIR="${T}/tests-remote"
- mkdir -p "$TESTDIR"
- make remotecheck || die "Some remote test failed."
- mv -f check.log check.log-remote
-
- cd "${S}"/src
- export TESTDIR="${T}/tests-proxy"
- mkdir -p "$TESTDIR"
- make proxycheck || die "Some proxy test failed."
- mv -f check.log check.log-proxy
- fi
-}
diff --git a/dev-vcs/cvs/cvs-1.12.13.1-r1.ebuild b/dev-vcs/cvs/cvs-1.12.13.1-r1.ebuild
deleted file mode 100644
index 8c06d88..0000000
--- a/dev-vcs/cvs/cvs-1.12.13.1-r1.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-inherit eutils pam toolchain-funcs versionator
-
-DESCRIPTION="Concurrent Versions System - source code revision control tools"
-HOMEPAGE="http://www.nongnu.org/cvs/"
-
-DOC_PV="$(get_version_component_range 1-3)"
-FEAT_URIBASE="mirror://gnu/non-gnu/cvs/source/feature/${PV}/"
-DOC_URIBASE="mirror://gnu/non-gnu/cvs/source/feature/${DOC_PV}/"
-SNAP_URIBASE="mirror://gnu/non-gnu/cvs/source/nightly-snapshots/feature/"
-SRC_URI="
- ${FEAT_URIBASE}/${P}.tar.bz2
- ${SNAP_URIBASE}/${P}.tar.bz2
- doc? (
- ${DOC_URIBASE}/cederqvist-${DOC_PV}.html.tar.bz2
- ${DOC_URIBASE}/cederqvist-${DOC_PV}.pdf
- ${DOC_URIBASE}/cederqvist-${DOC_PV}.ps
- )"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-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"
-
-IUSE="crypt doc kerberos nls pam server"
-
-RDEPEND=">=sys-libs/zlib-1.1.4
- kerberos? ( virtual/krb5 )
- pam? ( virtual/pam )"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
- unpack ${P}.tar.bz2
- use doc && unpack cederqvist-${DOC_PV}.html.tar.bz2
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.12.12-cvsbug-tmpfix.patch
- epatch "${FILESDIR}"/${PN}-1.12.12-install-sh.patch
- epatch "${FILESDIR}"/${PN}-1.12.13.1-block-requests.patch
- epatch "${FILESDIR}"/${PN}-1.12.13.1-hash-nameclash.patch # for AIX
- epatch "${FILESDIR}"/${PN}-1.12.13.1-gl-mempcpy.patch # for AIX
- epatch "${FILESDIR}"/${PN}-1.12.12-fix-massive-leak.patch
- epatch "${FILESDIR}"/${PN}-1.12.13.1-use-include_next.patch
- # Applied by upstream:
- #epatch "${FILESDIR}"/${PN}-1.12.13-openat.patch
- #epatch "${FILESDIR}"/${PN}-1.12.13-zlib.patch
-
- # this testcase was not updated
- #sed -i.orig -e '/unrecognized keyword.*BogusOption/s,98,73,g' \
- # ${S}/src/sanity.sh
- # this one fails when the testpath path contains '.'
- sed -i.orig \
- -e '/newfile config3/s,a-z,a-z.,g' \
- "${S}"/src/sanity.sh
-
- elog "If you want any CVS server functionality, you MUST emerge with USE=server!"
-}
-
-src_configure() {
- local myconf
- # the tests need the server and proxy
- if use test; then
- use server || \
- ewarn "The server and proxy code are enabled as they are required for tests."
- myconf="--enable-server --enable-proxy"
- fi
- if tc-is-cross-compiler ; then
- # Sane defaults when cross-compiling (as these tests want to
- # try and execute code).
- export cvs_cv_func_printf_ptr="yes"
- fi
- econf \
- --with-external-zlib \
- --with-tmpdir=/tmp \
- $(use_enable crypt encryption) \
- $(use_with kerberos gssapi) \
- $(use_enable nls) \
- $(use_enable pam) \
- $(use_enable server) \
- $(use_enable server proxy) \
- ${myconf}
-}
-
-src_install() {
- emake install DESTDIR="${D}" || die
-
- if use server; then
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver || die "newins failed"
- fi
-
- dodoc BUGS ChangeLog* DEVEL* FAQ HACKING \
- MINOR* NEWS PROJECTS README* TESTS TODO
-
- # Not installed into emacs site-lisp because it clobbers the normal C
- # indentations.
- dodoc cvs-format.el || die "dodoc failed"
-
- use server && newdoc "${FILESDIR}"/${PN}-1.12.12-cvs-custom.c cvs-custom.c
-
- if use doc; then
- dodoc "${DISTDIR}"/cederqvist-${DOC_PV}.pdf
- dodoc "${DISTDIR}"/cederqvist-${DOC_PV}.ps
- dohtml -r "${WORKDIR}"/cederqvist-${DOC_PV}.html/
- dosym cvs.html /usr/share/doc/${PF}/html/index.html
- fi
-
- newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs
-}
-
-_run_one_test() {
- mode="$1" ; shift
- einfo "Starting ${mode} test"
- cd "${S}"/src
- export TESTDIR="${T}/tests-${mode}"
- rm -rf "$TESTDIR" # Clean up from any previous test passes
- mkdir -p "$TESTDIR"
- emake -j1 ${mode}check || die "Some ${mode} test failed."
- mv -f check.log check.log-${mode}
- einfo "${mode} test completed successfully, log is check.log-${mode}"
-}
-
-src_test() {
- einfo "If you want to see realtime status, or check out a failure,"
- einfo "please look at ${S}/src/check.log*"
-
- if [ "$TEST_REMOTE_AND_PROXY" == "1" ]; then
- einfo "local, remote, and proxy tests enabled."
- else
- einfo "Only testing local mode. Please see ebuild for other modes."
- fi
-
- # we only do the local tests by default
- _run_one_test local
-
- # if you want to test the remote and proxy modes, things get a little bit
- # complicated. You need to set up a SSH config file at ~portage/.ssh/config
- # that allows the portage user to login without any authentication, and also
- # set up the ~portage/.ssh/known_hosts file for your machine.
- # We do not do this by default, as it is unsafe from a security point of
- # view, and requires root level ssh changes.
- # Note that this also requires having a real shell for the portage user, so make
- # sure that su -c 'ssh portage@mybox' portage works first!
- # (It uses the local ip, not loopback)
- if [ "$TEST_REMOTE_AND_PROXY" == "1" ]; then
- _run_one_test remote
- _run_one_test proxy
- fi
-}
diff --git a/dev-vcs/cvs/cvs-1.12.13.1-r2.ebuild b/dev-vcs/cvs/cvs-1.12.13.1-r2.ebuild
deleted file mode 100644
index 912f17e..0000000
--- a/dev-vcs/cvs/cvs-1.12.13.1-r2.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-inherit eutils pam toolchain-funcs versionator
-
-DESCRIPTION="Concurrent Versions System - source code revision control tools"
-HOMEPAGE="http://www.nongnu.org/cvs/"
-
-DOC_PV="$(get_version_component_range 1-3)"
-FEAT_URIBASE="mirror://gnu/non-gnu/cvs/source/feature/${PV}/"
-DOC_URIBASE="mirror://gnu/non-gnu/cvs/source/feature/${DOC_PV}/"
-SNAP_URIBASE="mirror://gnu/non-gnu/cvs/source/nightly-snapshots/feature/"
-SRC_URI="
- ${FEAT_URIBASE}/${P}.tar.bz2
- ${SNAP_URIBASE}/${P}.tar.bz2
- doc? (
- ${DOC_URIBASE}/cederqvist-${DOC_PV}.html.tar.bz2
- ${DOC_URIBASE}/cederqvist-${DOC_PV}.pdf
- ${DOC_URIBASE}/cederqvist-${DOC_PV}.ps
- )"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-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"
-
-IUSE="crypt doc kerberos nls pam server"
-
-RDEPEND=">=sys-libs/zlib-1.1.4
- kerberos? ( virtual/krb5 )
- pam? ( virtual/pam )"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
- unpack ${P}.tar.bz2
- use doc && unpack cederqvist-${DOC_PV}.html.tar.bz2
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.12.12-cvsbug-tmpfix.patch
- epatch "${FILESDIR}"/${PN}-1.12.12-install-sh.patch
- epatch "${FILESDIR}"/${PN}-1.12.13.1-block-requests.patch
- epatch "${FILESDIR}"/${PN}-1.12.13.1-hash-nameclash.patch # for AIX
- epatch "${FILESDIR}"/${PN}-1.12.13.1-gl-mempcpy.patch # for AIX
- epatch "${FILESDIR}"/${PN}-1.12.12-fix-massive-leak.patch
- epatch "${FILESDIR}"/${PN}-1.12.13.1-use-include_next.patch
- epatch "${FILESDIR}"/${PN}-1.12.13.1-fix-gnulib-SEGV-vasnprintf.patch
- # Applied by upstream:
- #epatch "${FILESDIR}"/${PN}-1.12.13-openat.patch
- #epatch "${FILESDIR}"/${PN}-1.12.13-zlib.patch
-
- # this testcase was not updated
- #sed -i.orig -e '/unrecognized keyword.*BogusOption/s,98,73,g' \
- # ${S}/src/sanity.sh
- # this one fails when the testpath path contains '.'
- sed -i.orig \
- -e '/newfile config3/s,a-z,a-z.,g' \
- "${S}"/src/sanity.sh
-
- elog "If you want any CVS server functionality, you MUST emerge with USE=server!"
-}
-
-src_configure() {
- local myconf
- # the tests need the server and proxy
- if use test; then
- use server || \
- ewarn "The server and proxy code are enabled as they are required for tests."
- myconf="--enable-server --enable-proxy"
- fi
- if tc-is-cross-compiler ; then
- # Sane defaults when cross-compiling (as these tests want to
- # try and execute code).
- export cvs_cv_func_printf_ptr="yes"
- fi
- econf \
- --with-external-zlib \
- --with-tmpdir=/tmp \
- $(use_enable crypt encryption) \
- $(use_with kerberos gssapi) \
- $(use_enable nls) \
- $(use_enable pam) \
- $(use_enable server) \
- $(use_enable server proxy) \
- ${myconf}
-}
-
-src_install() {
- emake install DESTDIR="${D}" || die
-
- if use server; then
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver || die "newins failed"
- fi
-
- dodoc BUGS ChangeLog* DEVEL* FAQ HACKING \
- MINOR* NEWS PROJECTS README* TESTS TODO
-
- # Not installed into emacs site-lisp because it clobbers the normal C
- # indentations.
- dodoc cvs-format.el || die "dodoc failed"
-
- use server && newdoc "${FILESDIR}"/${PN}-1.12.12-cvs-custom.c cvs-custom.c
-
- if use doc; then
- dodoc "${DISTDIR}"/cederqvist-${DOC_PV}.pdf
- dodoc "${DISTDIR}"/cederqvist-${DOC_PV}.ps
- dohtml -r "${WORKDIR}"/cederqvist-${DOC_PV}.html/
- dosym cvs.html /usr/share/doc/${PF}/html/index.html
- fi
-
- newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs
-}
-
-_run_one_test() {
- mode="$1" ; shift
- einfo "Starting ${mode} test"
- cd "${S}"/src
- export TESTDIR="${T}/tests-${mode}"
- rm -rf "$TESTDIR" # Clean up from any previous test passes
- mkdir -p "$TESTDIR"
- emake -j1 ${mode}check || die "Some ${mode} test failed."
- mv -f check.log check.log-${mode}
- einfo "${mode} test completed successfully, log is check.log-${mode}"
-}
-
-src_test() {
- einfo "If you want to see realtime status, or check out a failure,"
- einfo "please look at ${S}/src/check.log*"
-
- if [ "$TEST_REMOTE_AND_PROXY" == "1" ]; then
- einfo "local, remote, and proxy tests enabled."
- else
- einfo "Only testing local mode. Please see ebuild for other modes."
- fi
-
- # we only do the local tests by default
- _run_one_test local
-
- # if you want to test the remote and proxy modes, things get a little bit
- # complicated. You need to set up a SSH config file at ~portage/.ssh/config
- # that allows the portage user to login without any authentication, and also
- # set up the ~portage/.ssh/known_hosts file for your machine.
- # We do not do this by default, as it is unsafe from a security point of
- # view, and requires root level ssh changes.
- # Note that this also requires having a real shell for the portage user, so make
- # sure that su -c 'ssh portage@mybox' portage works first!
- # (It uses the local ip, not loopback)
- if [ "$TEST_REMOTE_AND_PROXY" == "1" ]; then
- _run_one_test remote
- _run_one_test proxy
- fi
-}
diff --git a/dev-vcs/cvs/cvs-1.12.13.1.ebuild b/dev-vcs/cvs/cvs-1.12.13.1.ebuild
deleted file mode 100644
index 2422d3a..0000000
--- a/dev-vcs/cvs/cvs-1.12.13.1.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-inherit eutils pam toolchain-funcs versionator
-
-DESCRIPTION="Concurrent Versions System - source code revision control tools"
-HOMEPAGE="http://www.nongnu.org/cvs/"
-
-DOC_PV="$(get_version_component_range 1-3)"
-FEAT_URIBASE="mirror://gnu/non-gnu/cvs/source/feature/${PV}/"
-DOC_URIBASE="mirror://gnu/non-gnu/cvs/source/feature/${DOC_PV}/"
-SNAP_URIBASE="mirror://gnu/non-gnu/cvs/source/nightly-snapshots/feature/"
-SRC_URI="
- ${FEAT_URIBASE}/${P}.tar.bz2
- ${SNAP_URIBASE}/${P}.tar.bz2
- doc? (
- ${DOC_URIBASE}/cederqvist-${DOC_PV}.html.tar.bz2
- ${DOC_URIBASE}/cederqvist-${DOC_PV}.pdf
- ${DOC_URIBASE}/cederqvist-${DOC_PV}.ps
- )"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-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"
-
-IUSE="crypt doc kerberos nls pam server"
-
-DEPEND=">=sys-libs/zlib-1.1.4
- kerberos? ( virtual/krb5 )
- pam? ( virtual/pam )"
-
-src_unpack() {
- unpack ${P}.tar.bz2
- use doc && unpack cederqvist-${DOC_PV}.html.tar.bz2
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.12.12-cvsbug-tmpfix.patch
- epatch "${FILESDIR}"/${PN}-1.12.12-install-sh.patch
- epatch "${FILESDIR}"/${PN}-1.12.13.1-block-requests.patch
- epatch "${FILESDIR}"/${PN}-1.12.13.1-hash-nameclash.patch # for AIX
- epatch "${FILESDIR}"/${PN}-1.12.13.1-gl-mempcpy.patch # for AIX
- # Applied by upstream:
- #epatch "${FILESDIR}"/${PN}-1.12.13-openat.patch
- #epatch "${FILESDIR}"/${PN}-1.12.13-zlib.patch
-
- # this testcase was not updated
- #sed -i.orig -e '/unrecognized keyword.*BogusOption/s,98,73,g' \
- # ${S}/src/sanity.sh
- # this one fails when the testpath path contains '.'
- sed -i.orig \
- -e '/newfile config3/s,a-z,a-z.,g' \
- "${S}"/src/sanity.sh
-
- elog "If you want any CVS server functionality, you MUST emerge with USE=server!"
-}
-
-src_configure() {
- local myconf
- # the tests need the server and proxy
- if use test; then
- use server || \
- ewarn "The server and proxy code are enabled as they are required for tests."
- myconf="--enable-server --enable-proxy"
- fi
- if tc-is-cross-compiler ; then
- # Sane defaults when cross-compiling (as these tests want to
- # try and execute code).
- export cvs_cv_func_printf_ptr="yes"
- fi
- econf \
- --with-external-zlib \
- --with-tmpdir=/tmp \
- $(use_enable crypt encryption) \
- $(use_with kerberos gssapi) \
- $(use_enable nls) \
- $(use_enable pam) \
- $(use_enable server) \
- $(use_enable server proxy) \
- ${myconf}
-}
-
-src_install() {
- emake install DESTDIR="${D}" || die
-
- if use server; then
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver || die "newins failed"
- fi
-
- dodoc BUGS ChangeLog* DEVEL* FAQ HACKING \
- MINOR* NEWS PROJECTS README* TESTS TODO
-
- # Not installed into emacs site-lisp because it clobbers the normal C
- # indentations.
- dodoc cvs-format.el || die "dodoc failed"
-
- use server && newdoc "${FILESDIR}"/${PN}-1.12.12-cvs-custom.c cvs-custom.c
-
- if use doc; then
- dodoc "${DISTDIR}"/cederqvist-${DOC_PV}.pdf
- dodoc "${DISTDIR}"/cederqvist-${DOC_PV}.ps
- dohtml -r "${WORKDIR}"/cederqvist-${DOC_PV}.html/
- dosym cvs.html /usr/share/doc/${PF}/html/index.html
- fi
-
- newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs
-}
-
-_run_one_test() {
- mode="$1" ; shift
- einfo "Starting ${mode} test"
- cd "${S}"/src
- export TESTDIR="${T}/tests-${mode}"
- rm -rf "$TESTDIR" # Clean up from any previous test passes
- mkdir -p "$TESTDIR"
- emake -j1 ${mode}check || die "Some ${mode} test failed."
- mv -f check.log check.log-${mode}
- einfo "${mode} test completed successfully, log is check.log-${mode}"
-}
-
-src_test() {
- einfo "If you want to see realtime status, or check out a failure,"
- einfo "please look at ${S}/src/check.log*"
-
- if [ "$TEST_REMOTE_AND_PROXY" == "1" ]; then
- einfo "local, remote, and proxy tests enabled."
- else
- einfo "Only testing local mode. Please see ebuild for other modes."
- fi
-
- # we only do the local tests by default
- _run_one_test local
-
- # if you want to test the remote and proxy modes, things get a little bit
- # complicated. You need to set up a SSH config file at ~portage/.ssh/config
- # that allows the portage user to login without any authentication, and also
- # set up the ~portage/.ssh/known_hosts file for your machine.
- # We do not do this by default, as it is unsafe from a security point of
- # view, and requires root level ssh changes.
- # Note that this also requires having a real shell for the portage user, so make
- # sure that su -c 'ssh portage@mybox' portage works first!
- # (It uses the local ip, not loopback)
- if [ "$TEST_REMOTE_AND_PROXY" == "1" ]; then
- _run_one_test remote
- _run_one_test proxy
- fi
-}
diff --git a/dev-vcs/cvs/files/cvs-1.12.13-openat.patch b/dev-vcs/cvs/files/cvs-1.12.13-openat.patch
deleted file mode 100644
index 762924a..0000000
--- a/dev-vcs/cvs/files/cvs-1.12.13-openat.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: cvs-1.12.13/lib/openat.c
-===================================================================
---- cvs-1.12.13.orig/lib/openat.c
-+++ cvs-1.12.13/lib/openat.c
-@@ -55,9 +55,13 @@ rpl_openat (int fd, char const *filename
- va_list arg;
- va_start (arg, flags);
-
-- /* Assume that mode_t is passed compatibly with mode_t's type
-- after argument promotion. */
-- mode = va_arg (arg, mode_t);
-+ /* If mode_t is narrower than int, use the promoted type (int),
-+ not mode_t. Use sizeof to guess whether mode_t is nerrower;
-+ we don't know of any practical counterexamples. */
-+ if (sizeof (mode_t) < sizeof (int))
-+ mode = va_arg (arg, int);
-+ else
-+ mode = va_arg (arg, mode_t);
-
- va_end (arg);
- }
diff --git a/dev-vcs/cvs/files/cvs-1.12.13-zlib.patch b/dev-vcs/cvs/files/cvs-1.12.13-zlib.patch
deleted file mode 100644
index a4b4b1e..0000000
--- a/dev-vcs/cvs/files/cvs-1.12.13-zlib.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: src/zlib.c
-===================================================================
-RCS file: /sources/cvs/ccvs/src/zlib.c,v
-retrieving revision 1.31
-retrieving revision 1.32
-diff -u -r1.31 -r1.32
---- src/zlib.c 3 Jun 2005 18:26:09 -0000 1.31
-+++ src/zlib.c 28 Oct 2005 14:10:59 -0000 1.32
-@@ -221,15 +221,14 @@
- point. */
- assert (bd->size == 0);
-
-- /* This will work well in the server, because this call will
-- do an unblocked read and fetch all the available data. In
-- the client, this will read a single byte from the stdio
-- stream, which will cause us to call inflate once per byte.
-- It would be more efficient if we could make a call which
-- would fetch all the available bytes, and at least one byte. */
--
-+ /* On the server, this will do an unblocking read of as much data as is
-+ * available. On the client, with a blocking input descriptor and the
-+ * current fd_buffer implementation, this should read as much data as
-+ * is currently available, and at least 1 byte (or EOF), from the
-+ * underlying buffer.
-+ */
- status = (*cb->buf->input) (cb->buf->closure, bd->text,
-- need, BUFFER_DATA_SIZE, &nread);
-+ need ? 1 : 0, BUFFER_DATA_SIZE, &nread);
-
- if (status == -2)
- /* Don't try to recover from memory allcoation errors. */
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
deleted file mode 100644
index 216336f..0000000
--- a/dev-vcs/cvs/files/cvs-1.12.13.1-block-requests.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-Author: Robin H. Johnson <robbat2@gentoo.org>
-Original-Date: 2006-08-09
-Forward-Port-Date: 2007-12-06
-
-This patch allows a CVS server to deny usage of specific commands, based on
-input in the environment.
-
-Just set the CVS_BLOCK_REQUESTS env var with all of the commands you want,
-seperated by spaces. Eg:
-CVS_BLOCK_REQUESTS="Gzip-stream gzip-file-contents"
-would block ALL usage of compression.
-
-Please see the array 'struct request requests[]' in src/server.c for a full
-list of commands.
-
-Please note that if you block any commands marked as RQ_ESSENTIAL, CVS clients
-may fail! (This includes 'ci'!).
-
-See the companion cvs-custom.c for a wrapper that can enforce the environment variable for pserver setups.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar cvs-1.12.13.1.orig/src/server.c cvs-1.12.13.1/src/server.c
---- cvs-1.12.13.1.orig/src/server.c 2006-06-21 11:55:21.000000000 -0700
-+++ cvs-1.12.13.1/src/server.c 2007-12-06 16:25:38.109309990 -0800
-@@ -6244,6 +6244,49 @@
- /*
- * This server request is not ignored by the secondary.
- */
-+
-+/* Hack by Robin H. Johnson <robbat2@gentoo.org>.
-+ * Allow the server ENV to specify what request types are to be ignored.
-+ */
-+
-+static char blocked_requests[BUFSIZ] = " ";
-+
-+static void build_blocked_requests() {
-+ char *tmp = getenv("CVS_BLOCK_REQUESTS");
-+
-+ if (tmp != NULL && strlen(tmp) > 0) {
-+ // move to our custom buffer
-+ strncat(blocked_requests, tmp, sizeof(blocked_requests)-strlen(blocked_requests));
-+ //add a space on the end as well for searching
-+ strncat(blocked_requests, " ", sizeof(blocked_requests)-strlen(blocked_requests));
-+ }
-+
-+ // now blocked_requests contains the list of every request that we do not
-+ // want to serve
-+}
-+
-+// returns 0 if we should serve this request
-+// use as if(checker(FOO)) continue;
-+static int serve_valid_requests_checker(char *reqname) {
-+ char needle[BUFSIZ] = " ";
-+ char *tmp;
-+
-+ if(!blocked_requests || strlen(blocked_requests) < 2)
-+ return 0;
-+
-+ // we want to look for ' 'reqname' '
-+ snprintf(needle, sizeof(needle), " %s ", reqname);
-+
-+ // now do the search
-+ tmp = strstr(blocked_requests, needle);
-+
-+ if (tmp != NULL)
-+ return 1;
-+
-+ return 0;
-+
-+}
-+
- static void
- serve_valid_requests (char *arg)
- {
-@@ -6262,11 +6305,15 @@
- )
- return;
-
-+ build_blocked_requests();
-+
- buf_output0 (buf_to_net, "Valid-requests");
- for (rq = requests; rq->name != NULL; rq++)
- {
- if (rq->func != NULL)
- {
-+ if(serve_valid_requests_checker(rq->name))
-+ continue;
- buf_append_char (buf_to_net, ' ');
- buf_output0 (buf_to_net, rq->name);
- }
-@@ -6706,6 +6753,9 @@
- * "co".
- */
- continue;
-+ // Ignore commands that we are supposed to ignore.
-+ if(serve_valid_requests_checker(rq->name))
-+ continue;
-
- if (!(rq->flags & RQ_ROOTLESS)
- && current_parsed_root == NULL)
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
deleted file mode 100644
index 1dbaa51..0000000
--- a/dev-vcs/cvs/files/cvs-1.12.13.1-fix-gnulib-SEGV-vasnprintf.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Attemt to use CVS leads to glibc crash:
-$ cvs up
- *** %n in writable segment detected ***
-
-Fixes: https://savannah.nongnu.org/bugs/?35432
-Upstream gnulib commit:
-
-From 913c09becd9df89dbd9b9f386e7f35c240d5efe8 Mon Sep 17 00:00:00 2001
-From: Bruno Haible <bruno@clisp.org>
-Date: Thu, 18 Oct 2007 23:50:42 +0000
-Subject: Don't use %n on glibc >= 2.3 systems.
-
----
-(limited to 'lib/vasnprintf.c')
-
-diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
-index f563823..5d818aa 100644
---- a/lib/vasnprintf.c
-+++ b/lib/vasnprintf.c
-@@ -3386,8 +3386,20 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
- *fbp = dp->conversion;
- #if USE_SNPRINTF
-+# if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3))
- p[1] = '%';
- p[2] = 'n';
- p[3] = '\0';
-+# else
-+ /* On glibc2 systems from glibc >= 2.3 - probably also older
-+ ones - we know that snprintf's returns value conforms to
-+ ISO C 99: the gl_SNPRINTF_DIRECTIVE_N test passes.
-+ Therefore we can avoid using %n in this situation.
-+ On glibc2 systems from 2004-10-18 or newer, the use of %n
-+ in format strings in writable memory may crash the program
-+ (if compiled with _FORTIFY_SOURCE=2), so we should avoid it
-+ in this situation. */
-+ p[1] = '\0';
-+# endif
- #else
- p[1] = '\0';
- #endif
---
-cgit v0.9.0.2
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
deleted file mode 100644
index 7ad7533..0000000
--- a/dev-vcs/cvs/files/cvs-1.12.13.1-gl-mempcpy.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-http://cvs.savannah.gnu.org/viewvc/cvs/ccvs/lib/mempcpy.c?r1=1.2&r2=1.3&pathrev=MAIN
-fixed in cvs-HEAD after cvs-1.12.13a
-
---- lib/mempcpy.c 2005/05/23 17:44:31 1.2
-+++ lib/mempcpy.c 2007/08/22 12:48:42 1.3
-@@ -1,5 +1,5 @@
- /* Copy memory area and return pointer after last written byte.
-- Copyright (C) 2003 Free Software Foundation, Inc.
-+ Copyright (C) 2003, 2007 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
-@@ -15,9 +15,9 @@
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-
--/* Specification. */
--#include "mempcpy.h"
-+#include <config.h>
-
-+/* Specification. */
- #include <string.h>
-
- /* Copy N bytes of SRC to DEST, return pointer to bytes after the
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
deleted file mode 100644
index d9c3358..0000000
--- a/dev-vcs/cvs/files/cvs-1.12.13.1-hash-nameclash.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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
-fixed in cvs-1.11.23, cvs-HEAD after cvs-1.12.13a
-
---- src/hash.h.orig 2010-03-11 10:12:19 +0100
-+++ src/hash.h 2010-03-11 10:12:40 +0100
-@@ -32,27 +32,27 @@
- };
- typedef enum ntype Ntype;
-
--struct node
-+struct hashnode
- {
- Ntype type;
-- struct node *next;
-- struct node *prev;
-- struct node *hashnext;
-- struct node *hashprev;
-+ struct hashnode *next;
-+ struct hashnode *prev;
-+ struct hashnode *hashnext;
-+ struct hashnode *hashprev;
- char *key;
- void *data;
- size_t len; /* Length of DATA. */
-- void (*delproc) (struct node *);
-+ void (*delproc) (struct hashnode *);
- };
--typedef struct node Node;
-+typedef struct hashnode Node;
-
--struct list
-+struct hashlist
- {
- Node *list;
- Node *hasharray[HASHSIZE];
-- struct list *next;
-+ struct hashlist *next;
- };
--typedef struct list List;
-+typedef struct hashlist List;
-
- List *getlist (void);
- Node *findnode (List *list, const char *key);
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
deleted file mode 100644
index adaff55..0000000
--- a/dev-vcs/cvs/files/cvs-1.12.13.1-use-include_next.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Fix build failure on gentoo's gcc:
-
-In file included from ./inttypes.h:34:0,
- from ./stdint.h:65,
- from /usr/include/netinet/in.h:23,
- from /usr/include/netdb.h:27,
- from getaddrinfo.h:30,
- from canon-host.c:27:
- /usr/include/inttypes.h:297:1: error: unknown type name 'intmax_t'
- /usr/include/inttypes.h:297:26: error: unknown type name 'intmax_t'
- /usr/include/inttypes.h:300:27: error: unknown type name 'intmax_t'
- /usr/include/inttypes.h:300:45: error: unknown type name 'intmax_t'
-diff --git a/lib/stdint_.h b/lib/stdint_.h
-index adab4d7..3a8db19 100644
---- a/lib/stdint_.h
-+++ b/lib/stdint_.h
-@@ -43,7 +43,12 @@
- Include it before <inttypes.h>, since any "#include <stdint.h>"
- in <inttypes.h> would reinclude us, skipping our contents because
- _GL_STDINT_H is defined. */
--# include @ABSOLUTE_STDINT_H@
-+# include "config.h"
-+# if HAVE_INCLUDE_NEXT
-+# include_next <stdint.h>
-+# else
-+# include @ABSOLUTE_STDINT_H@
-+# endif
- #endif
-
- /* <sys/types.h> defines some of the stdint.h types as well, on glibc,
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/cvs/, dev-vcs/cvs/files/
@ 2016-11-19 18:55 Robin H. Johnson
0 siblings, 0 replies; 3+ messages in thread
From: Robin H. Johnson @ 2016-11-19 18:55 UTC (permalink / raw
To: gentoo-commits
commit: a06f6c599f999a9ae9b1e7ca448712ebfb31ad5f
Author: Felix Janda <felix.janda <AT> posteo <DOT> de>
AuthorDate: Sat Oct 22 00:17:27 2016 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Oct 23 00:05:16 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a06f6c59
dev-vcs/cvs: security fix, QA fix and musl compilation fix
* add patch for CVE-2012-0804 (#402593)
* respect AR (#440270)
* fix format-security (#520508)
* fix compilation with musl libc
* modernize ebuild
Gentoo-Bug: https://bugs.gentoo.org/402593
Gentoo-Bug: https://bugs.gentoo.org/440270
Gentoo-Bug: https://bugs.gentoo.org/520508
dev-vcs/cvs/cvs-1.12.12-r11.ebuild | 104 +++++++++++++++++++++
dev-vcs/cvs/files/cvs-1.12.12-CVE-2012-0804.patch | 30 ++++++
.../cvs/files/cvs-1.12.12-format-security.patch | 22 +++++
dev-vcs/cvs/files/cvs-1.12.12-getdelim.patch | 4 +-
dev-vcs/cvs/files/cvs-1.12.12-hash-nameclash.patch | 4 +-
.../cvs/files/cvs-1.12.12-mktime-configure.patch | 4 +-
dev-vcs/cvs/files/cvs-1.12.12-musl.patch | 13 +++
.../cvs/files/cvs-1.12.12-rcs2log-coreutils.patch | 6 +-
8 files changed, 178 insertions(+), 9 deletions(-)
diff --git a/dev-vcs/cvs/cvs-1.12.12-r11.ebuild b/dev-vcs/cvs/cvs-1.12.12-r11.ebuild
new file mode 100644
index 00000000..860cd3f
--- /dev/null
+++ b/dev-vcs/cvs/cvs-1.12.12-r11.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit pam toolchain-funcs
+
+DESCRIPTION="Concurrent Versions System - source code revision control tools"
+HOMEPAGE="http://cvs.nongnu.org/"
+
+SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2
+ doc? ( mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.html.tar.bz2
+ mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.pdf
+ mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.ps )"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
+ ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+ ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint
+ ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="crypt doc kerberos nls pam server"
+RESTRICT="test"
+
+DEPEND=">=sys-libs/zlib-1.1.4
+ kerberos? ( virtual/krb5 )
+ pam? ( virtual/pam )"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+ unpack ${P}.tar.bz2
+ use doc && unpack cederqvist-${PV}.html.tar.bz2
+}
+
+PATCHES=(
+ "${FILESDIR}"/${P}-cvsbug-tmpfix.patch
+ "${FILESDIR}"/${P}-openat.patch
+ "${FILESDIR}"/${P}-block-requests.patch
+ "${FILESDIR}"/${P}-cvs-gnulib-vasnprintf.patch
+ "${FILESDIR}"/${P}-install-sh.patch
+ "${FILESDIR}"/${P}-hash-nameclash.patch # for AIX
+ "${FILESDIR}"/${P}-getdelim.patch # 314791
+ "${FILESDIR}"/${PN}-1.12.12-rcs2log-coreutils.patch # 144114
+ "${FILESDIR}"/${P}-mktime-x32.patch # 395641
+ "${FILESDIR}"/${P}-fix-massive-leak.patch
+ "${FILESDIR}"/${P}-mktime-configure.patch #220040 #570208
+ "${FILESDIR}"/${P}-CVE-2012-0804.patch
+ "${FILESDIR}"/${P}-format-security.patch
+ "${FILESDIR}"/${P}-musl.patch
+ )
+DOCS=( BUGS ChangeLog{,.zoo} DEVEL-CVS FAQ HACKING MINOR-BUGS NEWS \
+ PROJECTS README TESTS TODO )
+
+src_prepare() {
+ default
+
+ sed -i "/^AR/s/ar/$(tc-getAR)/" diff/Makefile.in lib/Makefile.in || die
+}
+
+src_configure() {
+ if tc-is-cross-compiler ; then
+ # Sane defaults when cross-compiling (as these tests want to
+ # try and execute code).
+ export cvs_cv_func_printf_ptr="yes"
+ fi
+ econf \
+ --with-external-zlib \
+ --with-tmpdir=${EPREFIX%/}/tmp \
+ $(use_enable crypt encryption) \
+ $(use_with kerberos gssapi) \
+ $(use_enable nls) \
+ $(use_enable pam) \
+ $(use_enable server)
+}
+
+src_install() {
+ # Not installed into emacs site-lisp because it clobbers the normal C
+ # indentations.
+ DOCS+=( cvs-format.el )
+
+ if use doc; then
+ DOCS+=( "${DISTDIR}"/cederqvist-${PV}.{pdf,ps} )
+ HTML_DOCS=( ../cederqvist-${PV}.html/. )
+ fi
+
+ default
+
+ use doc && dosym cvs.html /usr/share/doc/${PF}/html/index.html
+
+ if use server; then
+ newdoc "${FILESDIR}"/cvs-1.12.12-cvs-custom.c cvs-custom.c
+ insinto /etc/xinetd.d
+ newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver
+ newenvd "${FILESDIR}"/01-cvs-env.d 01cvs
+ fi
+
+ newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs
+}
+
+pkg_postinst() {
+ use server || elog "If you want any CVS server functionality, you MUST emerge with USE=server!"
+}
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-CVE-2012-0804.patch b/dev-vcs/cvs/files/cvs-1.12.12-CVE-2012-0804.patch
new file mode 100644
index 00000000..107c3ea
--- /dev/null
+++ b/dev-vcs/cvs/files/cvs-1.12.12-CVE-2012-0804.patch
@@ -0,0 +1,30 @@
+[CVE-2012-0804] Fix proxy response parser
+
+If proxy sends overlong HTTP vesion string, the string will be copied
+to unallocatd space (write_buf) causing heap overflow.
+
+This patch fixes it by ignoring the HTTP version string and checking
+the response line has been parsed correctly.
+
+See <https://bugzilla.redhat.com/show_bug.cgi?id=773699> for more
+details.
+
+Index: src/client.c
+===================================================================
+RCS file: /sources/cvs/ccvs/src/client.c,v
+retrieving revision 1.483
+diff -u -r1.483 client.c
+--- a/src/client.c 18 Nov 2008 22:59:02 -0000 1.483
++++ b/src/client.c 26 Jan 2012 16:32:25 -0000
+@@ -4339,9 +4339,9 @@
+ * code.
+ */
+ read_line_via (from_server, to_server, &read_buf);
+- sscanf (read_buf, "%s %d", write_buf, &codenum);
++ count = sscanf (read_buf, "%*s %d", &codenum);
+
+- if ((codenum / 100) != 2)
++ if (count != 1 || (codenum / 100) != 2)
+ error (1, 0, "proxy server %s:%d does not support http tunnelling",
+ root->proxy_hostname, proxy_port_number);
+ free (read_buf);
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-format-security.patch b/dev-vcs/cvs/files/cvs-1.12.12-format-security.patch
new file mode 100644
index 00000000..d710a90
--- /dev/null
+++ b/dev-vcs/cvs/files/cvs-1.12.12-format-security.patch
@@ -0,0 +1,22 @@
+--- a/diff/diff3.c
++++ b/diff/diff3.c
+@@ -1503,7 +1503,7 @@
+ line = 0;
+ do
+ {
+- printf_output (line_prefix);
++ printf_output ("%s", line_prefix);
+ cp = D_RELNUM (ptr, realfile, line);
+ length = D_RELLEN (ptr, realfile, line);
+ write_output (cp, length);
+--- a/src/main.c
++++ b/src/main.c
+@@ -1375,7 +1375,7 @@
+ {
+ (void) fprintf (stderr, *cpp++, program_name, cvs_cmd_name);
+ for (; *cpp; cpp++)
+- (void) fprintf (stderr, *cpp);
++ (void) fprintf (stderr, "%s", *cpp);
+ exit (EXIT_FAILURE);
+ }
+
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-getdelim.patch b/dev-vcs/cvs/files/cvs-1.12.12-getdelim.patch
index 04eb03a..837d440 100644
--- a/dev-vcs/cvs/files/cvs-1.12.12-getdelim.patch
+++ b/dev-vcs/cvs/files/cvs-1.12.12-getdelim.patch
@@ -8,8 +8,8 @@ http://bugs.gentoo.org/314791
Already comitted upstream:
http://cvs.savannah.gnu.org/viewvc/ccvs/src/myndbm.c?root=cvs&r1=1.38&r2=1.39
---- src/myndbm.c.orig
-+++ src/myndbm.c
+--- a/src/myndbm.c.orig
++++ b/src/myndbm.c
@@ -213,7 +213,7 @@
mydbm_load_file (FILE *fp, List *list, char *filename)
{
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-hash-nameclash.patch b/dev-vcs/cvs/files/cvs-1.12.12-hash-nameclash.patch
index 0a33eea..95fd61e 100644
--- a/dev-vcs/cvs/files/cvs-1.12.12-hash-nameclash.patch
+++ b/dev-vcs/cvs/files/cvs-1.12.12-hash-nameclash.patch
@@ -1,8 +1,8 @@
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
fixed in cvs-1.11.23, cvs-HEAD after cvs-1.12.13a
---- src/hash.h.orig 2005-02-01 22:56:48 +0100
-+++ src/hash.h 2010-03-10 19:00:11 +0100
+--- a/src/hash.h.orig 2005-02-01 22:56:48 +0100
++++ b/src/hash.h 2010-03-10 19:00:11 +0100
@@ -27,26 +27,26 @@
};
typedef enum ntype Ntype;
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-mktime-configure.patch b/dev-vcs/cvs/files/cvs-1.12.12-mktime-configure.patch
index 1a9c47b..03d7f35 100644
--- a/dev-vcs/cvs/files/cvs-1.12.12-mktime-configure.patch
+++ b/dev-vcs/cvs/files/cvs-1.12.12-mktime-configure.patch
@@ -3,8 +3,8 @@ https://bugs.gentoo.org/570208
update mktime check to latest autoconf version which is less buggy
---- configure
-+++ configure
+--- a/configure
++++ b/configure
@@ -5299,26 +6059,25 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-musl.patch b/dev-vcs/cvs/files/cvs-1.12.12-musl.patch
new file mode 100644
index 00000000..e426cf5
--- /dev/null
+++ b/dev-vcs/cvs/files/cvs-1.12.12-musl.patch
@@ -0,0 +1,13 @@
+http://gcc.gnu.org/ml/gcc/2003-04/msg00518.html
+
+--- a/lib/regex.c
++++ b/lib/regex.c
+@@ -8184,7 +8184,7 @@
+ if (msg_size > errbuf_size)
+ {
+ #if defined HAVE_MEMPCPY || defined _LIBC
+- *((char *) __mempcpy (errbuf, msg, errbuf_size - 1)) = '\0';
++ *((char *) mempcpy (errbuf, msg, errbuf_size - 1)) = '\0';
+ #else
+ memcpy (errbuf, msg, errbuf_size - 1);
+ errbuf[errbuf_size - 1] = 0;
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-rcs2log-coreutils.patch b/dev-vcs/cvs/files/cvs-1.12.12-rcs2log-coreutils.patch
index 0fb4c6c..7dda3f0 100644
--- a/dev-vcs/cvs/files/cvs-1.12.12-rcs2log-coreutils.patch
+++ b/dev-vcs/cvs/files/cvs-1.12.12-rcs2log-coreutils.patch
@@ -1,8 +1,8 @@
X-Gentoo-bug: 144114
-diff -Nuar cvs-1.12.12.orig//contrib/rcs2log.sh cvs-1.12.12//contrib/rcs2log.sh
---- cvs-1.12.12.orig//contrib/rcs2log.sh 2003-02-25 21:32:51.000000000 +0000
-+++ cvs-1.12.12//contrib/rcs2log.sh 2010-12-06 21:14:33.831532212 +0000
+diff -Nuar cvs-1.12.12.orig/contrib/rcs2log.sh cvs-1.12.12/contrib/rcs2log.sh
+--- cvs-1.12.12.orig/contrib/rcs2log.sh 2003-02-25 21:32:51.000000000 +0000
++++ cvs-1.12.12/contrib/rcs2log.sh 2010-12-06 21:14:33.831532212 +0000
@@ -620,7 +620,7 @@
# Sort the log entries, first by date+time (in reverse order),
# then by author, then by log entry, and finally by file name and revision
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/cvs/, dev-vcs/cvs/files/
@ 2024-05-20 21:58 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2024-05-20 21:58 UTC (permalink / raw
To: gentoo-commits
commit: ef52b34d6d49b9b4d41d19dd6df290da5b7179eb
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Mon May 20 02:02:09 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 20 21:56:54 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef52b34d
dev-vcs/cvs: fix all kinds of Modern C issues
This package release is an extra-vintage 2005 with extra gnulib on top.
Among numerous other issues, the broken autoconf standard macros managed
to break the STDC_HEADERS check, resulting in cvs thinking that there
are no available standard headers, and not bothering to include them.
Ouch!
To fix this, we:
- fix a broken AM_GNU_GETTEXT_VERSION macro to stop autopoint erroring
- rerun eautoreconf, to fix various standard macros with c99 fixes
- add some m4 patches that partially backport gnulib fixes (I think hope
and pray, since I stopped looking at them after a bit due to the
inability to backport)
Also, while we are at it, throw in a broken shell quoting fix.
Closes: https://bugs.gentoo.org/898782
Closes: https://bugs.gentoo.org/882225
Closes: https://bugs.gentoo.org/870835
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-vcs/cvs/cvs-1.12.12-r15.ebuild | 109 ++++++++++++++++++
...uoting-around-potentially-empty-shell-var.patch | 30 +++++
dev-vcs/cvs/files/0001-gettext-autoreconf.patch | 25 +++++
dev-vcs/cvs/files/c99-roundup.patch | 122 +++++++++++++++++++++
4 files changed, 286 insertions(+)
diff --git a/dev-vcs/cvs/cvs-1.12.12-r15.ebuild b/dev-vcs/cvs/cvs-1.12.12-r15.ebuild
new file mode 100644
index 000000000000..9c2f93c9e910
--- /dev/null
+++ b/dev-vcs/cvs/cvs-1.12.12-r15.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools pam toolchain-funcs
+
+DESCRIPTION="Concurrent Versions System - source code revision control tools"
+HOMEPAGE="https://cvs.nongnu.org/"
+
+SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2
+ doc? ( mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.html.tar.bz2
+ mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.pdf
+ mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.ps )"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+
+IUSE="crypt doc kerberos nls pam selinux server"
+RESTRICT="test"
+
+DEPEND="
+ >=sys-libs/zlib-1.1.4
+ kerberos? ( virtual/krb5 )
+ pam? ( sys-libs/pam )
+ server? ( virtual/libcrypt:= )
+"
+RDEPEND="
+ ${DEPEND}
+ selinux? ( sec-policy/selinux-cvs )
+"
+
+src_unpack() {
+ unpack ${P}.tar.bz2
+ use doc && unpack cederqvist-${PV}.html.tar.bz2
+}
+
+PATCHES=(
+ "${FILESDIR}"/${P}-cvsbug-tmpfix.patch
+ "${FILESDIR}"/${P}-openat.patch
+ "${FILESDIR}"/${P}-block-requests.patch
+ "${FILESDIR}"/${P}-cvs-gnulib-vasnprintf.patch
+ "${FILESDIR}"/${P}-install-sh.patch
+ "${FILESDIR}"/${P}-hash-nameclash.patch # for AIX
+ "${FILESDIR}"/${P}-getdelim.patch # 314791
+ "${FILESDIR}"/${PN}-1.12.12-rcs2log-coreutils.patch # 144114
+ "${FILESDIR}"/${P}-mktime-x32.patch # 395641
+ "${FILESDIR}"/${P}-fix-massive-leak.patch
+ "${FILESDIR}"/${P}-mktime-configure-m4.patch #220040 #570208
+ "${FILESDIR}"/${P}-CVE-2012-0804.patch
+ "${FILESDIR}"/${P}-format-security.patch
+ "${FILESDIR}"/${P}-musl.patch
+ "${FILESDIR}"/${P}-CVE-2017-12836-commandinjection.patch
+ "${FILESDIR}"/0001-gettext-autoreconf.patch
+ "${FILESDIR}"/0001-fix-quoting-around-potentially-empty-shell-var.patch
+ "${FILESDIR}"/c99-roundup.patch
+ )
+DOCS=( BUGS ChangeLog{,.zoo} DEVEL-CVS FAQ HACKING MINOR-BUGS NEWS \
+ PROJECTS README TESTS TODO )
+
+src_prepare() {
+ export CONFIG_SHELL=${BASH} # configure fails without
+ default
+ eautoreconf
+ sed -i "/^AR/s:ar:$(tc-getAR):" diff/Makefile.in lib/Makefile.in || die
+}
+
+src_configure() {
+ if tc-is-cross-compiler ; then
+ # Sane defaults when cross-compiling (as these tests want to
+ # try and execute code).
+ export cvs_cv_func_printf_ptr="yes"
+ fi
+ econf \
+ --with-external-zlib \
+ --with-tmpdir="${EPREFIX}"/tmp \
+ $(use_enable crypt encryption) \
+ $(use_with kerberos gssapi) \
+ $(use_enable nls) \
+ $(use_enable pam) \
+ $(use_enable server)
+}
+
+src_install() {
+ # Not installed into emacs site-lisp because it clobbers the normal C
+ # indentations.
+ DOCS+=( cvs-format.el )
+
+ if use doc; then
+ DOCS+=( "${DISTDIR}"/cederqvist-${PV}.{pdf,ps} )
+ HTML_DOCS=( ../cederqvist-${PV}.html/. )
+ fi
+
+ default
+
+ use doc && dosym cvs.html /usr/share/doc/${PF}/html/index.html
+
+ if use server; then
+ newdoc "${FILESDIR}"/cvs-1.12.12-cvs-custom.c cvs-custom.c
+ insinto /etc/xinetd.d
+ newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver
+ newenvd "${FILESDIR}"/01-cvs-env.d 01cvs
+ fi
+
+ if use pam; then
+ newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs
+ fi
+}
diff --git a/dev-vcs/cvs/files/0001-fix-quoting-around-potentially-empty-shell-var.patch b/dev-vcs/cvs/files/0001-fix-quoting-around-potentially-empty-shell-var.patch
new file mode 100644
index 000000000000..74041583e835
--- /dev/null
+++ b/dev-vcs/cvs/files/0001-fix-quoting-around-potentially-empty-shell-var.patch
@@ -0,0 +1,30 @@
+From 6054eb157a25b4b46427baa6eb53b5e18135019a Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Sun, 19 May 2024 21:15:34 -0400
+Subject: [PATCH 1/2] fix quoting around potentially empty shell var
+
+required to handle POSIX `test` command
+
+ * QA Notice: Broken syntax in configure script
+ *
+ * ./configure: line 8046: test: =: unary operator expected
+---
+ configure.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index d4f3a44..2a9b0ff 100644
+--- a/configure.in
++++ b/configure.in
+@@ -179,7 +179,7 @@ AC_CHECK_MEMBERS([struct stat.st_blksize])
+ AC_CHECK_MEMBERS([struct stat.st_rdev])
+
+ AC_FUNC_FSEEKO
+-if test $ac_cv_func_fseeko = no; then
++if test "$ac_cv_func_fseeko" = no; then
+ AC_LIBOBJ(fseeko)
+ AC_LIBOBJ(ftello)
+ fi
+--
+2.44.1
+
diff --git a/dev-vcs/cvs/files/0001-gettext-autoreconf.patch b/dev-vcs/cvs/files/0001-gettext-autoreconf.patch
new file mode 100644
index 000000000000..b091fb6b4175
--- /dev/null
+++ b/dev-vcs/cvs/files/0001-gettext-autoreconf.patch
@@ -0,0 +1,25 @@
+From dafaeefa2d81034333ec73594b8209caebb69b23 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Sun, 19 May 2024 19:48:33 -0400
+Subject: [PATCH] gettext autoreconf
+
+---
+ configure.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index ada8454..d4f3a44 100644
+--- a/configure.in
++++ b/configure.in
+@@ -206,7 +206,7 @@ gl_INIT
+ dnl For one reason or another, the autogenerated m4/gnulib.m4 wants
+ dnl AM_GNU_GETTEXT([external]) called directly from here.
+ AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION dnl work around for autoconf-2.57 bug.
++AM_GNU_GETTEXT_VERSION(0.22.4)
+ # The error module still poses merge problems.
+ AC_FUNC_STRERROR_R
+ dnl The following macros can be called by other GNULIB macros but are also
+--
+2.44.1
+
diff --git a/dev-vcs/cvs/files/c99-roundup.patch b/dev-vcs/cvs/files/c99-roundup.patch
new file mode 100644
index 000000000000..7c8ad479117d
--- /dev/null
+++ b/dev-vcs/cvs/files/c99-roundup.patch
@@ -0,0 +1,122 @@
+From 4df675986524d0e8e76530a3e1bd7860aef9973d Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Sun, 19 May 2024 21:27:38 -0400
+Subject: [PATCH 1/2] m4: fix various missing includes of headers for feature
+ test funcs
+
+---
+ m4/cvs_func_printf_ptr.m4 | 1 +
+ m4/mkdir-slash.m4 | 6 +++++-
+ m4/nanosleep.m4 | 1 +
+ m4/regex.m4 | 1 +
+ m4/rename.m4 | 1 +
+ 5 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/m4/cvs_func_printf_ptr.m4 b/m4/cvs_func_printf_ptr.m4
+index 4348e29..f04c135 100644
+--- a/m4/cvs_func_printf_ptr.m4
++++ b/m4/cvs_func_printf_ptr.m4
+@@ -24,6 +24,7 @@ AC_DEFUN([CVS_FUNC_PRINTF_PTR],
+ [AC_CACHE_CHECK(whether printf supports %p,
+ cvs_cv_func_printf_ptr,
+ [AC_TRY_RUN([#include <stdio.h>
++#include <stdlib.h>
+ /* If printf supports %p, exit 0. */
+ int
+ main ()
+diff --git a/m4/mkdir-slash.m4 b/m4/mkdir-slash.m4
+index c1e595b..0ca9a91 100644
+--- a/m4/mkdir-slash.m4
++++ b/m4/mkdir-slash.m4
+@@ -1,4 +1,4 @@
+-#serial 4
++#serial 5
+
+ # Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
+ # This file is free software; the Free Software Foundation
+@@ -10,6 +10,7 @@
+ # trailing slashes.
+ AC_DEFUN([gl_FUNC_MKDIR_TRAILING_SLASH],
+ [dnl
++ AC_CHECK_HEADERS_ONCE(unistd.h)
+ AC_CACHE_CHECK([whether mkdir fails due to a trailing slash],
+ gl_cv_func_mkdir_trailing_slash_bug,
+ [
+@@ -19,6 +20,9 @@ AC_DEFUN([gl_FUNC_MKDIR_TRAILING_SLASH],
+ # include <sys/types.h>
+ # include <sys/stat.h>
+ # include <stdlib.h>
++# ifdef HAVE_UNISTD_H
++# include <unistd.h>
++# endif
+ int main ()
+ {
+ rmdir ("confdir-slash");
+diff --git a/m4/nanosleep.m4 b/m4/nanosleep.m4
+index 5590b9b..035e440 100644
+--- a/m4/nanosleep.m4
++++ b/m4/nanosleep.m4
+@@ -39,6 +39,7 @@ AC_DEFUN([gl_FUNC_NANOSLEEP],
+ # include <time.h>
+ # endif
+ # endif
++# include <stdlib.h>
+
+ int
+ main ()
+diff --git a/m4/regex.m4 b/m4/regex.m4
+index 34435de..5988f68 100644
+--- a/m4/regex.m4
++++ b/m4/regex.m4
+@@ -36,6 +36,7 @@ AC_DEFUN([gl_INCLUDED_REGEX],
+ [#include <stdio.h>
+ #include <string.h>
+ #include <regex.h>
++#include <stdlib.h>
+ int
+ main ()
+ {
+diff --git a/m4/rename.m4 b/m4/rename.m4
+index 7d59160..362fdd4 100644
+--- a/m4/rename.m4
++++ b/m4/rename.m4
+@@ -23,6 +23,7 @@ AC_DEFUN([vb_FUNC_RENAME],
+ AC_MSG_ERROR([cannot create temporary directory])
+ AC_TRY_RUN([
+ # include <stdio.h>
++# include <stdlib.h>
+ int
+ main ()
+ {
+--
+2.44.1
+
+
+From f6e7556c404e1cb3ddb088fab480aa39a9ad0306 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Sun, 19 May 2024 21:47:06 -0400
+Subject: [PATCH 2/2] fix missing config.h includes preventing functions from
+ being found
+
+_GNU_SOURCE needs to be defined by config.h, so that fputs_unlocked is
+provided by stdio.h (as used by gnulib's unlocked-io module).
+---
+ src/add.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/add.c b/src/add.c
+index 7f94e2b..025cfc9 100644
+--- a/src/add.c
++++ b/src/add.c
+@@ -29,6 +29,8 @@
+ * file to be resurrected.
+ */
+
++#include <config.h>
++
+ #include <assert.h>
+ #include "cvs.h"
+ #include "save-cwd.h"
+--
+2.44.1
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-05-20 21:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-19 18:55 [gentoo-commits] repo/gentoo:master commit in: dev-vcs/cvs/, dev-vcs/cvs/files/ Robin H. Johnson
-- strict thread matches above, loose matches on Subject: below --
2024-05-20 21:58 Sam James
2016-06-27 22:11 Robin H. Johnson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox