Fixing cvs to work with gcc 4.3.3 which enables FORTIFY_SOURCES. Fixes #230849. Patch from Bruno Haible <bruno@clisp.org>, thanks to Magnus Granberg <zorry@ume.nu> for some hints and explanations.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 126 insertions, 3 deletions

diff --git a/dev-util/cvs/ChangeLog b/dev-util/cvs/ChangeLog
index add9bff93632..826ff7ea8865 100644
--- a/dev-util/cvs/ChangeLog
+++ b/dev-util/cvs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/cvs
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/ChangeLog,v 1.127 2008/06/16 18:14:45 robbat2 Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/ChangeLog,v 1.128 2009/02/01 18:04:45 patrick Exp $
+
+*cvs-1.12.12-r6 (01 Feb 2009)
+
+  01 Feb 2009; Patrick Lauer <patrick@gentoo.org>
+  +files/cvs-1.12.12-cvs-gnulib-vasnprintf.patch, +cvs-1.12.12-r6.ebuild:
+  Fixing cvs to work with gcc 4.3.3 which enables FORTIFY_SOURCES. Fixes
+  #230849. Patch from Bruno Haible <bruno@clisp.org>, thanks to Magnus
+  Granberg <zorry@ume.nu> for some hints and explanations.
 
 *cvs-1.12.12-r5 (16 Jun 2008)
 
diff --git a/dev-util/cvs/Manifest b/dev-util/cvs/Manifest
index 6412324cd482..e57b43b4310c 100644
--- a/dev-util/cvs/Manifest
+++ b/dev-util/cvs/Manifest
@@ -1,5 +1,6 @@
 AUX cvs-1.12.12-block-requests.patch 4006 RMD160 47be05434e53c25fc6dd1fa6848d25d155dc307a SHA1 a4e77d76457a3047c19945d53f3b2aca572d1da4 SHA256 70bbf745815d1e01582329160a10f5cdd9c11051e4e62d331686dd5124e01294
 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-install-sh.patch 495 RMD160 f5ada20250b2dea6979feb609077f57462aa0a21 SHA1 a6201f8d4f2343fe20214d0862fe0e710b61a4af SHA256 9c2fc03b42804f8edb3a5a6f9c9e80bd68924f265ce52d196c3b5c759ba42f8a
 AUX cvs-1.12.12-openat.patch 761 RMD160 05cfb679777b001633ace65e76f9a7a3d397a71a SHA1 23a3941ce449fb105c7b8cce1147a5d525a7753e SHA256 5b9fc46c2ee46d9136ddfc8d0baaac6087d8cae40fa5521815c3c2e372f25b9f
@@ -36,7 +37,8 @@ EBUILD cvs-1.12.12-r2.ebuild 1957 RMD160 651ac5b15443522e7d7ec40abc895def46ba5cb
 EBUILD cvs-1.12.12-r3.ebuild 2083 RMD160 fa07d30926b1988612357c5b21e4fc4fa7e603d8 SHA1 a04253c163b1335553e22fb91adbfa09542d5fd7 SHA256 f2ec676a6553cf75c99bc6c8bc7fa01b8471ef0c0ca3ddb8e6c7fa647fd829be
 EBUILD cvs-1.12.12-r4.ebuild 2390 RMD160 8cf24960136d2aac5b36abccc887ca63f7b05d56 SHA1 9ec607fdc5bc8156d96e036f76d192700b113756 SHA256 dcd0d28d66aa4218cee6d65554f97e8bb7aac214683cd5de91ee0af3d07b2f6a
 EBUILD cvs-1.12.12-r5.ebuild 2422 RMD160 06ea1afa9a4de041d5f11ed5390a1bf8f9d97c98 SHA1 17d8b3c3787a447e2a4a9a52917c3cfea40f2105 SHA256 0c73cede054615273de7c243273bffb6be6bdba51f0290f82564c1aacd7632e6
+EBUILD cvs-1.12.12-r6.ebuild 2477 RMD160 e11224b4ca437e56af79f0202b624a5f0ccbb242 SHA1 afad3bcf3c938425333e7118286728fe0b2f2ef3 SHA256 a9d7387a92811e5a69531dc7a77f00b9dbb8fb4c8b5a68bd1cf9803f2e357a1c
 EBUILD cvs-1.12.13-r1.ebuild 3982 RMD160 83a7c84eb1ddab91ac81fed1773e2e955ffbab97 SHA1 5252e96f5742b077aeeee6e4e91b8b92c682e30e SHA256 cc9af957ad66fe8e08ef329d28b24d75f58ee6a133c6926cf203fc5e9c1d1806
 EBUILD cvs-1.12.13.1.ebuild 4670 RMD160 420a61a5bc6b14da8eb121fab1b4cb5f44f04e8e SHA1 778a0ef935dc47a45fa75ce4887823fc3f127a82 SHA256 59ecb4b3933aa5b1d3274ffe1e2d72c1e76252d0f7a09f9fc5bb5abce2064f08
-MISC ChangeLog 16984 RMD160 3c49f966c4f6796ac25759b13744be13d8e93668 SHA1 3662457a655f94aed98bb775ea90f7ad4f7a9512 SHA256 f50caa2e4d033559dc8ab2be6d3dc9bb054e4258123b6188cd799d2533f06f1f
+MISC ChangeLog 17343 RMD160 8913c08ae9ebaca3092e6082bf6f678e30b3ce2d SHA1 0f30727bcb8b5b46c14d8b57ade2ba751d952fad SHA256 0809bf0f69009c8e45b96d11685faed53896e2878d46b8a6eb02948e1bb787d8
 MISC metadata.xml 234 RMD160 e17a8f89518ebdd332c220104e56f649096be1da SHA1 472e62beb27cdd753a0454194630c916f0600e0b SHA256 ce7beba20d6099be006550fb74bb9e74628a9d6967c7ceb096ab99959df47a02
diff --git a/dev-util/cvs/cvs-1.12.12-r6.ebuild b/dev-util/cvs/cvs-1.12.12-r6.ebuild
new file mode 100644
index 000000000000..65fe11d67d4d
--- /dev/null
+++ b/dev-util/cvs/cvs-1.12.12-r6.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2009 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-r6.ebuild,v 1.1 2009/02/01 18:04:45 patrick Exp $
+
+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 ~sparc-fbsd ~x86 ~x86-fbsd"
+
+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
+	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${P}-cvsbug-tmpfix.patch
+	epatch "${FILESDIR}"/${P}-openat.patch
+	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${P}-block-requests.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-cvs-gnulib-vasnprintf.patch
+	epatch "${FILESDIR}"/${P}-install-sh.patch
+	elog "If you want any CVS server functionality, you MUST emerge with USE=server!"
+}
+
+src_compile() {
+	econf \
+		--with-external-zlib \
+		--with-tmpdir=/tmp \
+		$(use_enable crypt encryption) \
+		$(use_with kerberos gssapi) \
+		$(use_enable nls) \
+		$(use_enable pam) \
+		$(use_enable server) \
+		|| die
+	emake || die "emake failed"
+}
+
+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/*
+		cd "${D}"/usr/share/doc/${PF}/html/
+		ln -s cvs.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-cvs-gnulib-vasnprintf.patch b/dev-util/cvs/files/cvs-1.12.12-cvs-gnulib-vasnprintf.patch
new file mode 100644
index 000000000000..d7d6e6bb8a65
--- /dev/null
+++ b/dev-util/cvs/files/cvs-1.12.12-cvs-gnulib-vasnprintf.patch
@@ -0,0 +1,34 @@
+http://bugs.gentoo.org/213833
+
+commit 913c09becd9df89dbd9b9f386e7f35c240d5efe8
+Author: Bruno Haible <bruno@clisp.org>
+Date:   Fri Oct 19 01:50:42 2007 +0200
+
+    Don't use %n on glibc >= 2.3 systems.
+
+diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
+index f563823..5d818aa 100644
+--- a/lib/vasnprintf.c
++++ b/lib/vasnprintf.c
+@@ -3385,9 +3385,21 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
+ #endif
+ 		  *p = 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