Fixed bug #121820 and bug #124260.

(Portage version: 2.1_pre4-r1)

5 files changed, 187 insertions, 11 deletions

diff --git a/dev-util/cvs/ChangeLog b/dev-util/cvs/ChangeLog
index 81f0c1f53c0d..d1d66708a51e 100644
--- a/dev-util/cvs/ChangeLog
+++ b/dev-util/cvs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/cvs
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/ChangeLog,v 1.99 2006/01/13 21:04:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/ChangeLog,v 1.100 2006/03/01 16:03:53 pylon Exp $
+
+*cvs-1.12.12-r3 (01 Mar 2006)
+
+  01 Mar 2006; Lars Weiler <pylon@gentoo.org>
+  +files/cvs-1.12.12-openat.patch, +cvs-1.12.12-r3.ebuild:
+  Fixed bug #121820 and bug #124260.
 
   13 Jan 2006; Diego Pettenò <flameeyes@gentoo.org> cvs-1.12.12-r2.ebuild:
   "Disable" NLS support; CVS is not using NLS support, and by leaving it to
diff --git a/dev-util/cvs/Manifest b/dev-util/cvs/Manifest
index fda139af112c..ccc91d18b1c0 100644
--- a/dev-util/cvs/Manifest
+++ b/dev-util/cvs/Manifest
@@ -1,43 +1,108 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 08474e5ef538ba6b27235cc422df8dd3 ChangeLog 12022
+RMD160 ca1e516255b70add6acc1934339a883db60e8e43 ChangeLog 12022
+SHA256 7130ece8c0965bf66c292718cac207b7d4e2748ddaead8eecc73578f379d4054 ChangeLog 12022
 MD5 a3e041898daf24fb40cce19270eed884 cvs-1.11.17.ebuild 1533
+RMD160 d707044e8ba034690bbd35b2a15c4d7badf1e701 cvs-1.11.17.ebuild 1533
+SHA256 045e19ad67af8dd06cfd9da2824ed9c5f9bfe3d6de9baafd31a165238ebec9ec cvs-1.11.17.ebuild 1533
 MD5 a1cfe189b1d00f3c051e1dcdd8377c56 cvs-1.11.18-r1.ebuild 1632
+RMD160 5902b11d4490ed2f2abc2365fa881cb737a5a850 cvs-1.11.18-r1.ebuild 1632
+SHA256 8ac689e020f2d797cbaad490df1d961c995b1ab88657bda89f4bfd96d890e252 cvs-1.11.18-r1.ebuild 1632
 MD5 9cdc57174771018a08d7d3b8066e4ebd cvs-1.11.18.ebuild 1531
+RMD160 9536454e5bebd622d0e0d68593a4f84cd4b61470 cvs-1.11.18.ebuild 1531
+SHA256 f3fd65132274298c991b75db2453645cc3a78a26ba51e6e42812e25de30f07d1 cvs-1.11.18.ebuild 1531
 MD5 564712f52275d437bf8157808acc0599 cvs-1.11.19.ebuild 1542
+RMD160 2925ec24040d42d24f02547b049d99c4caf00965 cvs-1.11.19.ebuild 1542
+SHA256 a33389f15a4af01b7587c77e4dded50e48daa5efa7a40018596d0feb4271cde1 cvs-1.11.19.ebuild 1542
 MD5 e007c9685e363504d93b0a25ee00a12e cvs-1.11.20.ebuild 1519
+RMD160 c089652f52f090df29e06e024a971d0d3bd31ccf cvs-1.11.20.ebuild 1519
+SHA256 6c76f56db0c976bb870fa8a903550f850faadb5a49bfbb15393d8a83228d4bac cvs-1.11.20.ebuild 1519
 MD5 33a7e30d11aa6acd3ec97af48d434231 cvs-1.12.10.ebuild 1815
+RMD160 822705879c353cdd2ed036438c8a96e3d9acf0b5 cvs-1.12.10.ebuild 1815
+SHA256 2a8684457d38b8ef2b14f288b7714792ac7bd65798133fa96ed29dedccb79a20 cvs-1.12.10.ebuild 1815
 MD5 1a25e890502fbe808b734421f2cb080f cvs-1.12.11-r1.ebuild 1920
+RMD160 91ec6263deea7bb940155eb212cabb8cd08075ad cvs-1.12.11-r1.ebuild 1920
+SHA256 c15b0f47c640833a6df542dc33c705a900759dfaf5a2b3cea11aee0a6462178f cvs-1.12.11-r1.ebuild 1920
 MD5 38a8d2c12313066d0beac1f55938e6b8 cvs-1.12.11.ebuild 1815
+RMD160 db4ec778a419ce3227d0fced591aaee293bea2cd cvs-1.12.11.ebuild 1815
+SHA256 2757daf55402fa0c05302619b6a38aeec050ec445de146124233e127781e1922 cvs-1.12.11.ebuild 1815
 MD5 9c5aea1b3f3b21114695147346e22f3f cvs-1.12.12-r1.ebuild 1768
+RMD160 5c3dbe04d9fa0cde2b1060e078e7ba2a73e494e5 cvs-1.12.12-r1.ebuild 1768
+SHA256 29e7794952bae8072c8f1108193dd60dd8eb0e3b62a215609910f7ee7e25b4bf cvs-1.12.12-r1.ebuild 1768
 MD5 6c8ef40bb324cdbd552f4d400c139b0e cvs-1.12.12-r2.ebuild 1959
+RMD160 478234b15cc73c04ef870728344e08862e8bc9e4 cvs-1.12.12-r2.ebuild 1959
+SHA256 f899e2ab9829e0870124d226d8158861d7544a1c712ac0a30ff7d5f26de64ebd cvs-1.12.12-r2.ebuild 1959
+MD5 c12351ef803d8165b423db5149783401 cvs-1.12.12-r3.ebuild 2024
+RMD160 b42a973008850e12e17d71d9ba5ccb1848b38866 cvs-1.12.12-r3.ebuild 2024
+SHA256 263feee154909f91a8fb7ae5bbce6e829f5b16b0b88d37e43fb0befca3def6f4 cvs-1.12.12-r3.ebuild 2024
 MD5 50f1e42f28ed65dba7d2f7d1f37c1b65 cvs-1.12.12.ebuild 1813
+RMD160 e983969920331286fa6c07ef5a5375aad19b242a cvs-1.12.12.ebuild 1813
+SHA256 5435a6b483ed18ed406cffe056861d2dccd593211dd6494bb88afeaab00c3133 cvs-1.12.12.ebuild 1813
 MD5 a87570259fad7192265d4bb554a87280 cvs-1.12.9.ebuild 1814
+RMD160 04edd18f986a50898580cb475cff0dad51b91fa9 cvs-1.12.9.ebuild 1814
+SHA256 9d27d5a73e907e919b1c87f3f6722cb5e5b57544d1e689f288fe54f016a51a48 cvs-1.12.9.ebuild 1814
 MD5 095478e305f4d67487e546a1038fe354 files/cvs-1.11.18-klocwork.patch 2987
+RMD160 9c2078f3f98fa9ee5a3db9c7308141dc7ff05d11 files/cvs-1.11.18-klocwork.patch 2987
+SHA256 39e409b72a0dfe58babae2d9b2ecbdc3e94d65f72ffce46274a302fe7b3bfd5b files/cvs-1.11.18-klocwork.patch 2987
 MD5 29a53f7939c0d2ea2b7457d59daee7c0 files/cvs-1.12.11-klocwork.patch 2824
+RMD160 56024a942dcf0a9709f141c40e3846d675871708 files/cvs-1.12.11-klocwork.patch 2824
+SHA256 8f0127cd0587eb361c42771506b13616f92240b3a28b8a822242a71432986a65 files/cvs-1.12.11-klocwork.patch 2824
 MD5 6b8fde892bfbca3d39d848430e5f4012 files/cvs-1.12.12-cvsbug-tmpfix.patch 624
+RMD160 c580f653ef9f294676aa4d766decaac50298b3c5 files/cvs-1.12.12-cvsbug-tmpfix.patch 624
+SHA256 061c26d140e1195200f1cc76217b2e7c2ff7f0c4dcbbb31124b386e8e756938e files/cvs-1.12.12-cvsbug-tmpfix.patch 624
+MD5 b26ebb506de6b402dd35deb6bb946c36 files/cvs-1.12.12-openat.patch 761
+RMD160 05cfb679777b001633ace65e76f9a7a3d397a71a files/cvs-1.12.12-openat.patch 761
+SHA256 5b9fc46c2ee46d9136ddfc8d0baaac6087d8cae40fa5521815c3c2e372f25b9f files/cvs-1.12.12-openat.patch 761
 MD5 2d50778e9aededb1c08b84c8e8b62ad3 files/cvs.pam 124
+RMD160 877aa7e1f52ab40254e1f6d9a87ee162e3a3bc49 files/cvs.pam 124
+SHA256 c34322946c6712fe54e8c4b14550f06948e7ed06493e9f14800675de412e9e14 files/cvs.pam 124
 MD5 9112219b7250bf9ab2f36fcc4bd7d030 files/cvs.pam-include 74
+RMD160 e70fd173ee8d6280834eade45d23d19133d6fb2a files/cvs.pam-include 74
+SHA256 6f120f2484e4fb1c1a09bbdcc9eed2d702c0b4ebeffe56e7ccf387669ab6ae68 files/cvs.pam-include 74
 MD5 26c3d16a62b7f7508d27695bc843f461 files/cvs.pam-include-1.12.12 106
+RMD160 8c056262a6cf2b9f94c1762c7cebed02e72ef722 files/cvs.pam-include-1.12.12 106
+SHA256 8291f84c2d76269e7be6487ae1db7212e67ee7313d35e6b0cebcd01e30d155af files/cvs.pam-include-1.12.12 106
 MD5 a156ed2cb03477a919f3a5faa80cb2a4 files/cvspserver.xinetd.d 282
+RMD160 83fe38b4f55eaf7784d1672c73415410b389479b files/cvspserver.xinetd.d 282
+SHA256 71b62c4f278ed17bf3cac8eacb2bfb17b6125bfe77f83b46fa5742395b74ef5f files/cvspserver.xinetd.d 282
 MD5 0c0c93104720c2efffe1046ec8db290f files/digest-cvs-1.11.17 276
+RMD160 403bbc21fe1fde07f8b40193933b7a9d8b9cb716 files/digest-cvs-1.11.17 276
+SHA256 1a1a970518179f2329c0e3593879a1f293b4b45d3efaf6dabb394ad721c7f953 files/digest-cvs-1.11.17 276
 MD5 f508ce9e581877cbd33e11fbac72fc59 files/digest-cvs-1.11.18 276
+RMD160 4384065562ff6955cd5cbba6a49712372d3e713b files/digest-cvs-1.11.18 276
+SHA256 5653796e6dc70b074347c2d1232cba73a329a53e30aef54fe543c3c96a5ec44c files/digest-cvs-1.11.18 276
 MD5 f508ce9e581877cbd33e11fbac72fc59 files/digest-cvs-1.11.18-r1 276
+RMD160 4384065562ff6955cd5cbba6a49712372d3e713b files/digest-cvs-1.11.18-r1 276
+SHA256 5653796e6dc70b074347c2d1232cba73a329a53e30aef54fe543c3c96a5ec44c files/digest-cvs-1.11.18-r1 276
 MD5 a3b61b72d72962b0f4149a53c5d44671 files/digest-cvs-1.11.19 276
+RMD160 e7eaca7c4699eb852df1dbc47522778bf1d9d52e files/digest-cvs-1.11.19 276
+SHA256 1f02f4b814684c4bde065d91c2693626d8f97f1a2563781fe8279f0d462e9000 files/digest-cvs-1.11.19 276
 MD5 83e03809d3fb9f761545745bc7118817 files/digest-cvs-1.11.20 276
+RMD160 9bbc416ae81de885b08681e7e5f77838ce1ef980 files/digest-cvs-1.11.20 276
+SHA256 2ee573dd735e035a556ab1ef40a9d68585b2cc3dd1c928c38d1c684454e11e5f files/digest-cvs-1.11.20 276
 MD5 b20f44a825bed58f0e28635b827cb7fd files/digest-cvs-1.12.10 276
+RMD160 0070c767c0165abf071b47a34b5814cc5f1d0886 files/digest-cvs-1.12.10 276
+SHA256 16045d13149d102da6a58921f545fb9e41b2e051385d69bcaa020404df4deebe files/digest-cvs-1.12.10 276
 MD5 2d7e539e53af2be97ecf96f0ba454a18 files/digest-cvs-1.12.11 276
+RMD160 e0d63e29e7d1b7d35901ff6eed7037518039f8e0 files/digest-cvs-1.12.11 276
+SHA256 e912f4101522019b46a53b8917161330a4ad88f7e1f5ab2f8079033db60169f8 files/digest-cvs-1.12.11 276
 MD5 2d7e539e53af2be97ecf96f0ba454a18 files/digest-cvs-1.12.11-r1 276
+RMD160 e0d63e29e7d1b7d35901ff6eed7037518039f8e0 files/digest-cvs-1.12.11-r1 276
+SHA256 e912f4101522019b46a53b8917161330a4ad88f7e1f5ab2f8079033db60169f8 files/digest-cvs-1.12.11-r1 276
 MD5 d504b65b8baabd743f81c957fa2666e7 files/digest-cvs-1.12.12 276
+RMD160 52ba109e264182e9dd03f8e5f9319a06537c6ad7 files/digest-cvs-1.12.12 276
+SHA256 d4fb393ba1dbdd4e1c89b8885ddca2d68b3eaab3018842b6fbb1db3a5c0889dd files/digest-cvs-1.12.12 276
 MD5 d504b65b8baabd743f81c957fa2666e7 files/digest-cvs-1.12.12-r1 276
+RMD160 52ba109e264182e9dd03f8e5f9319a06537c6ad7 files/digest-cvs-1.12.12-r1 276
+SHA256 d4fb393ba1dbdd4e1c89b8885ddca2d68b3eaab3018842b6fbb1db3a5c0889dd files/digest-cvs-1.12.12-r1 276
 MD5 d504b65b8baabd743f81c957fa2666e7 files/digest-cvs-1.12.12-r2 276
+RMD160 52ba109e264182e9dd03f8e5f9319a06537c6ad7 files/digest-cvs-1.12.12-r2 276
+SHA256 d4fb393ba1dbdd4e1c89b8885ddca2d68b3eaab3018842b6fbb1db3a5c0889dd files/digest-cvs-1.12.12-r2 276
+MD5 e96995d8fd572022d1c89868163a901a files/digest-cvs-1.12.12-r3 1012
+RMD160 c5b3a89dce9319a981e2a07f55e9df095ebea7a1 files/digest-cvs-1.12.12-r3 1012
+SHA256 688739cfb729212f81a739675ceb1be468c3a19ed19ce6b1c1d20d59f9e47872 files/digest-cvs-1.12.12-r3 1012
 MD5 cc3afaf974475188ce0d80b0b919f611 files/digest-cvs-1.12.9 272
+RMD160 d77eccd86aa16c6a4f4f9f1a5630353529f30d50 files/digest-cvs-1.12.9 272
+SHA256 e3ffae49a622c252bbf393e16b20810a7153ff82f3f351341f993a2b5465c395 files/digest-cvs-1.12.9 272
 MD5 5013179b1f3eab5b3127de8372c57a1a metadata.xml 162
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDyBXZAiZjviIA2XgRAsXdAKCJW5w/HFdEsbYTO4az7PF3ThgnawCfdNJh
-bd16L6A3optJFr1I2U0WSFM=
-=QRuQ
------END PGP SIGNATURE-----
+RMD160 4860626303bc1113a855a556455d3bdc9f21db79 metadata.xml 162
+SHA256 932a0c3bfb1ea371074cdf017dae98bb229959e68e98d4d19378564db2cfa3d3 metadata.xml 162
diff --git a/dev-util/cvs/cvs-1.12.12-r3.ebuild b/dev-util/cvs/cvs-1.12.12-r3.ebuild
new file mode 100644
index 000000000000..2e2031607cf3
--- /dev/null
+++ b/dev-util/cvs/cvs-1.12.12-r3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2006 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-r3.ebuild,v 1.1 2006/03/01 16:03:53 pylon Exp $
+
+inherit eutils pam
+
+DESCRIPTION="Concurrent Versions System - source code revision control tools"
+HOMEPAGE="http://www.nongnu.org/cvs/"
+
+SRC_URI="http://ftp.gnu.org/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2
+	doc? ( http://ftp.gnu.org/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.html.tar.bz2
+		http://ftp.gnu.org/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.pdf
+		http://ftp.gnu.org/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"
+
+IUSE="crypt doc emacs kerberos pam"
+
+DEPEND="virtual/libc
+	>=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
+}
+
+src_compile() {
+	econf \
+		--with-external-zlib \
+		--with-tmpdir=/tmp \
+		--disable-nls \
+		`use_enable crypt encryption` \
+		`use_enable pam` \
+		|| die
+	emake || die "emake failed"
+}
+
+src_install() {
+	einstall || 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
+
+	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/*
+		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-openat.patch b/dev-util/cvs/files/cvs-1.12.12-openat.patch
new file mode 100644
index 000000000000..fdb406a45e4f
--- /dev/null
+++ b/dev-util/cvs/files/cvs-1.12.12-openat.patch
@@ -0,0 +1,21 @@
+Index: cvs-1.12.12/lib/openat.c
+===================================================================
+--- cvs-1.12.12.orig/lib/openat.c
++++ cvs-1.12.12/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-util/cvs/files/digest-cvs-1.12.12-r3 b/dev-util/cvs/files/digest-cvs-1.12.12-r3
new file mode 100644
index 000000000000..50aa76954e41
--- /dev/null
+++ b/dev-util/cvs/files/digest-cvs-1.12.12-r3
@@ -0,0 +1,12 @@
+MD5 320f956b8f079587f938955cc34b03bc cederqvist-1.12.12.html.tar.bz2 137581
+RMD160 4b98b01dce9554dc5191f82c5df54e784934dd2b cederqvist-1.12.12.html.tar.bz2 137581
+SHA256 6bdd66581ec363e05313a14db27cd3c201b547cdfc9ea2f8edde74e78301f0f6 cederqvist-1.12.12.html.tar.bz2 137581
+MD5 642cf710f7f57f448a5d92abf1f712f5 cederqvist-1.12.12.pdf 1252423
+RMD160 61b82c41cc365c03ee3a483cb7200a6dce2c9ffc cederqvist-1.12.12.pdf 1252423
+SHA256 211c5792d24bfd5694f23bc217a161d880bfb2447c41016fab6f657168b041ce cederqvist-1.12.12.pdf 1252423
+MD5 75eca4292b58b711f995386ed1eb4efb cederqvist-1.12.12.ps 1262208
+RMD160 49fc79c627cd4b590381a6b0f609f55495546df8 cederqvist-1.12.12.ps 1262208
+SHA256 0e14189614e2c5ead49bfe0ecd187239f8adc3e66371b49d52163be821e44cab cederqvist-1.12.12.ps 1262208
+MD5 e930ce9a6e75c06555cadb13796d04c4 cvs-1.12.12.tar.bz2 3197171
+RMD160 7275686576957e016b4f671ad5d52d8961d2d7d2 cvs-1.12.12.tar.bz2 3197171
+SHA256 9fb9176d268b9019768fc57dedc2920c28fbeda5ba224c2348550d4f25043edc cvs-1.12.12.tar.bz2 3197171