Fix for bug #314791 with revbump.

Package-Manager: portage-2.2_rc67/cvs/FreeBSD i386

4 files changed, 113 insertions, 2 deletions

diff --git a/dev-util/cvs/ChangeLog b/dev-util/cvs/ChangeLog
index 4eeaa462ada9..32ca8794e4da 100644
--- a/dev-util/cvs/ChangeLog
+++ b/dev-util/cvs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/cvs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/ChangeLog,v 1.140 2010/03/11 10:32:40 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/ChangeLog,v 1.141 2010/04/15 09:55:18 the_paya Exp $
+
+*cvs-1.12.12-r8 (15 Apr 2010)
+
+  15 Apr 2010; Javier Villavicencio <the_paya@gentoo.org>
+  +cvs-1.12.12-r8.ebuild, +files/cvs-1.12.12-getdelim.patch:
+  Fix for bug #314791, with revbump as requested by robbat2.
 
   11 Mar 2010; Michael Haubenwallner <haubi@gentoo.org>
   cvs-1.11.22.1-r1.ebuild, +files/cvs-1.11.22.1-hash-nameclash.patch,
diff --git a/dev-util/cvs/Manifest b/dev-util/cvs/Manifest
index 87ca248e5c77..a8f0ead19fe0 100644
--- a/dev-util/cvs/Manifest
+++ b/dev-util/cvs/Manifest
@@ -3,6 +3,7 @@ AUX cvs-1.12.12-block-requests.patch 4006 RMD160 47be05434e53c25fc6dd1fa6848d25d
 AUX cvs-1.12.12-cvs-custom.c 1735 RMD160 c4c1dea5b3656061a2eb0678acaa95c1b58b2e87 SHA1 409184599eb9b311a91066d75b2833ee455bbd4d SHA256 bd288a9484c4c26569a44e71f0935cf310e4b02e25e7e9ba564c9fc3f5121054
 AUX cvs-1.12.12-cvs-gnulib-vasnprintf.patch 1092 RMD160 1ec01dbfca6cbc8b933f1331b1e020430494273d SHA1 9edfd35bff01a05a9b1936f33f4645a57fb818d7 SHA256 f38e6bbb0fd8b783b654ac775183a1cb24e3987698fdbd706a8d5fa59a45f945
 AUX cvs-1.12.12-cvsbug-tmpfix.patch 624 RMD160 c580f653ef9f294676aa4d766decaac50298b3c5 SHA1 bb00a168e604940bdbc38baf10f0a8c1e3f5d862 SHA256 061c26d140e1195200f1cc76217b2e7c2ff7f0c4dcbbb31124b386e8e756938e
+AUX cvs-1.12.12-getdelim.patch 559 RMD160 404b5775c3267158dd064c48ce130f08217653cc SHA1 3548cba01c4fd047d4aa0e19b4a4921cdcd5a962 SHA256 cc02f345d7347349df7b6fa826ef314871e5049df48e9c892db0175dbfe16cf4
 AUX cvs-1.12.12-hash-nameclash.patch 1015 RMD160 616f50fc9e7faa7c0b2ac34f5d526b40db433517 SHA1 43675b3334a7343db2fd213c9c1f1673f9e193c4 SHA256 3a6a5bf6bd419bb8a4440f3f4f5dba770db1d06e33e0ab6d249ace490010edb4
 AUX cvs-1.12.12-install-sh.patch 495 RMD160 f5ada20250b2dea6979feb609077f57462aa0a21 SHA1 a6201f8d4f2343fe20214d0862fe0e710b61a4af SHA256 9c2fc03b42804f8edb3a5a6f9c9e80bd68924f265ce52d196c3b5c759ba42f8a
 AUX cvs-1.12.12-openat.patch 761 RMD160 05cfb679777b001633ace65e76f9a7a3d397a71a SHA1 23a3941ce449fb105c7b8cce1147a5d525a7753e SHA256 5b9fc46c2ee46d9136ddfc8d0baaac6087d8cae40fa5521815c3c2e372f25b9f
@@ -45,7 +46,8 @@ EBUILD cvs-1.12.12-r4.ebuild 2390 RMD160 8cf24960136d2aac5b36abccc887ca63f7b05d5
 EBUILD cvs-1.12.12-r5.ebuild 2422 RMD160 06ea1afa9a4de041d5f11ed5390a1bf8f9d97c98 SHA1 17d8b3c3787a447e2a4a9a52917c3cfea40f2105 SHA256 0c73cede054615273de7c243273bffb6be6bdba51f0290f82564c1aacd7632e6
 EBUILD cvs-1.12.12-r6.ebuild 2464 RMD160 5c11d1fc110086def5eba42d8cd67ce6eed2e84c SHA1 3fbe0e6644ce71fb04b6fea0c5a2ef60fd9ed21f SHA256 da5ea464d88243146bcf17dba48f92f608b361db73ec21d74b56c8bc8ad45fe4
 EBUILD cvs-1.12.12-r7.ebuild 2571 RMD160 043f4316718c18da28236d0848cc85272b511216 SHA1 a532121d9624a7af3240d0e377b1e110ed6d3cb1 SHA256 5c38002864c77a38e0f8076c2487f7a76d6912354062ec2f7c41961c46863624
+EBUILD cvs-1.12.12-r8.ebuild 2625 RMD160 b38aefa48f0b8dfdb7bfaf92b68b6660057a52d4 SHA1 af1a9fdac0f4890e07682b73e4d6863bf6d933cc SHA256 af6b7704c505325e8943f01c62fc66ffa1b53129adff92a003982bf45f2fa849
 EBUILD cvs-1.12.13-r1.ebuild 4003 RMD160 5e2bf9ff59a53be71ea3ce5f67a1d0601313883b SHA1 42a49a2ca0eddb66dd6f80e2b3de61fdddd957d9 SHA256 5fb15273826e7a9a320eefbcc7e8e70d5ca712e11987d6332a2b1cd1eb397d64
 EBUILD cvs-1.12.13.1.ebuild 4765 RMD160 61692e3e7330be057ec48302eaa91dfd06e9320c SHA1 62389cd67132892b2dd6de97362db647dfcb9f05 SHA256 85f4cdbd19d4e6f109f3dcd26294cdbd84a3ecf8c6979101a3feb288e6d7568d
-MISC ChangeLog 19321 RMD160 c3a0a5cfaf766fcdea6ab568d579791ad632ffbd SHA1 7956cacc1c65637b611acfef4b18ce4b113236a7 SHA256 43592b24301898314f68b11b74b4202c6778e9157c08eb15374a62182abe3a4e
+MISC ChangeLog 19536 RMD160 5a9c47f9b098cd51a292b5a3167c773591ae52f0 SHA1 58463eda5231f8678631d4818f31c192eff4473b SHA256 546b6c3834fb2fa7c71603c4fb64b89a58f348ef8f2e24ab698996bb28aa283b
 MISC metadata.xml 234 RMD160 e17a8f89518ebdd332c220104e56f649096be1da SHA1 472e62beb27cdd753a0454194630c916f0600e0b SHA256 ce7beba20d6099be006550fb74bb9e74628a9d6967c7ceb096ab99959df47a02
diff --git a/dev-util/cvs/cvs-1.12.12-r8.ebuild b/dev-util/cvs/cvs-1.12.12-r8.ebuild
new file mode 100644
index 000000000000..62de2c2e24e3
--- /dev/null
+++ b/dev-util/cvs/cvs-1.12.12-r8.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.12.12-r8.ebuild,v 1.1 2010/04/15 09:55:18 the_paya Exp $
+
+EAPI=3
+
+inherit eutils pam
+
+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 ~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-${PV}.html.tar.bz2
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cvsbug-tmpfix.patch
+	epatch "${FILESDIR}"/${P}-openat.patch
+	epatch "${FILESDIR}"/${P}-block-requests.patch
+	epatch "${FILESDIR}"/${P}-cvs-gnulib-vasnprintf.patch
+	epatch "${FILESDIR}"/${P}-install-sh.patch
+	epatch "${FILESDIR}"/${P}-hash-nameclash.patch # for AIX
+	epatch "${FILESDIR}"/${P}-getdelim.patch # 314791
+	elog "If you want any CVS server functionality, you MUST emerge with USE=server!"
+}
+
+src_configure() {
+	econf \
+		--with-external-zlib \
+		--with-tmpdir=/tmp \
+		$(use_enable crypt encryption) \
+		$(use_with kerberos gssapi) \
+		$(use_enable nls) \
+		$(use_enable pam) \
+		$(use_enable server)
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver || die "newins failed"
+
+	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}"/cvs-1.12.12-cvs-custom.c cvs-custom.c
+
+	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 "FEATURES=\"maketest\" has been disabled for dev-util/cvs"
+}
diff --git a/dev-util/cvs/files/cvs-1.12.12-getdelim.patch b/dev-util/cvs/files/cvs-1.12.12-getdelim.patch
new file mode 100644
index 000000000000..d27bcc04a681
--- /dev/null
+++ b/dev-util/cvs/files/cvs-1.12.12-getdelim.patch
@@ -0,0 +1,21 @@
+The function getdelim() behaves slightly different on FreeBSD,
+only appending to the *line buffer if line_size is 0.
+
+See: 
+http://savannah.nongnu.org/bugs/?29466
+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
+@@ -213,7 +213,7 @@
+ mydbm_load_file (FILE *fp, List *list, char *filename)
+ {
+     char *line = NULL;
+-    size_t line_size;
++    size_t line_size = 0;
+     char *value;
+     size_t value_allocated;
+     char *cp, *vp;