Link with libxcrypt to satisfy runtime dependency (bug #298539). Remove

old, broken versions. Add myself as the maintainer.
Package-Manager: portage-2.1.6.13/cvs/Linux i686

8 files changed, 75 insertions, 158 deletions

diff --git a/sys-auth/tcb/ChangeLog b/sys-auth/tcb/ChangeLog
index 3a2a0df92e88..87b1e77407b5 100644
--- a/sys-auth/tcb/ChangeLog
+++ b/sys-auth/tcb/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-auth/tcb
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/tcb/ChangeLog,v 1.3 2009/12/29 11:03:39 phajdan.jr Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/tcb/ChangeLog,v 1.4 2010/01/12 17:59:48 phajdan.jr Exp $
+
+*tcb-1.0.3-r1 (12 Jan 2010)
+
+  12 Jan 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> -tcb-1.0-r1.ebuild,
+  -tcb-1.0.2.ebuild, -tcb-1.0.3.ebuild, +tcb-1.0.3-r1.ebuild,
+  -files/tcb-1.0-build.patch, +files/tcb-xcrypt.patch, metadata.xml:
+  Link with libxcrypt to satisfy runtime dependency (bug #298539). Remove
+  old, broken versions. Add myself as the maintainer.
 
 *tcb-1.0.3 (29 Dec 2009)
 
diff --git a/sys-auth/tcb/Manifest b/sys-auth/tcb/Manifest
index 1215af2e2840..a123f0dbf418 100644
--- a/sys-auth/tcb/Manifest
+++ b/sys-auth/tcb/Manifest
@@ -1,10 +1,6 @@
-AUX tcb-1.0-build.patch 1406 RMD160 9179ad188825ca433e5cd954b14f9a515ed36138 SHA1 a80d6d8aabdd1406424081820c3518d40edeb36c SHA256 3b798990692de9574bfce53fd99e4ccb521e76af0ceaaf7237a7d27168d7d0aa
 AUX tcb-1.0.2-build.patch 1081 RMD160 917878dd969089e7a02bb445ff738a2cf8394ef2 SHA1 1b17e86931f86a093a70073011606ebf20602966 SHA256 6cc786725d46dc83a041249d958e31f57ebffe38f84ff9b75c0143bcb8e6ccd5
-DIST tcb-1.0.2.tar.gz 40531 RMD160 e5abb7bedc7ebd8ef36363b07be98f92444fea5d SHA1 3d3cc47c1a0da732bea3c6e9189ac3e3c632f37e SHA256 6e19a1b68dcb34653f09fb514b43dfad76df487f5ce0089656d1b334cd37c30e
+AUX tcb-xcrypt.patch 1512 RMD160 a470ebc0493f0b68165cbef9f3d19fb2cdd83234 SHA1 140f955f612f959dc8a9fab8278a75f17b7b5a68 SHA256 a28a41cf5ae153538c28f1eecb39659d31e6856e2f24cb2fa664af544ba8eefa
 DIST tcb-1.0.3.tar.gz 40573 RMD160 997896ee0d6ec4deaccff63351a0d976acdc17de SHA1 76284af350338d5f76ca3c0fa96def45af59b6e2 SHA256 3eda3953c5e8d3c0c6cbc0941a2bb9f6fe5a862b4cfbd01c23acf64ccbd73373
-DIST tcb-1.0.tar.gz 40355 RMD160 1dbe92cbc583f66b687526ced87c6ab03d8dadbf SHA1 aba4b0e8e4d437798550ba33c29abaef7006e930 SHA256 6565f076f72bc709b5eece037e9c45f0a0f60530e9213dda3ddbb14416bdfbaa
-EBUILD tcb-1.0-r1.ebuild 1025 RMD160 60fafce4c273c0e3ee9e5c9149d4cd93fc624369 SHA1 3c8f39e1df4aa99e4142bb6602887250d4380a92 SHA256 10e566617be7e03a80d7d744e5524292f979b51c105852d0fd8b144e46647c69
-EBUILD tcb-1.0.2.ebuild 1165 RMD160 3285ba477083827167e99e1737755e0447c24732 SHA1 5a1a8697ac73d4a8b563e3c7caeda913569533fb SHA256 6792eba37d63fdd28a56a0d31013341c395035c8d1244cab48e6efc5257bec1d
-EBUILD tcb-1.0.3.ebuild 1193 RMD160 40337876f63f64d71ad7ff9fbe5b894482df454c SHA1 874dd5ce8f75a97cfe26d882bf30cfd4b055b5a7 SHA256 407bc9d343e9f45446dc864a262ccdb934e5230a9fd34dd8077e2206ba7cbd53
-MISC ChangeLog 1995 RMD160 8185a677d54ac2cffcf4eaa87d1285f249e85314 SHA1 a119f386d3a90543f0bced0b39c242b586430ae5 SHA256 2805e1945605917a06bcea0dcfa37484a52f60c5cdef14bc1ce2e75964888e86
-MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+EBUILD tcb-1.0.3-r1.ebuild 1258 RMD160 cf5d8448e3315b9395377ec3502ca871c6d911aa SHA1 3aef3020870d94ab06fe568229247ba174e2495a SHA256 b7c7c545c0c0ddec11a20c5b8cdc6ee75fc43eda03a5f8275c47b5f4188fadcc
+MISC ChangeLog 2359 RMD160 0267c91fcf5cdf7276156062563a53b05316b91e SHA1 dff38d3b8fcfc6913bf5c0d91b441c80473b0c8e SHA256 1ae9700a9b6ac1e9062cfb848968ba6cdd51ed12781eb8d533363a1f8f5804a5
+MISC metadata.xml 264 RMD160 810ddb750010a91dd4396d8026577db947322856 SHA1 149b97dabb0453fff291f29c02f067b2677e19aa SHA256 28d63d15fc99d3fa478f0e1e43398d35be201ca9b56db207687631a02a315652
diff --git a/sys-auth/tcb/files/tcb-1.0-build.patch b/sys-auth/tcb/files/tcb-1.0-build.patch
deleted file mode 100644
index 07082f6022dd..000000000000
--- a/sys-auth/tcb/files/tcb-1.0-build.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- tcb-1.0/libs/Makefile
-+++ tcb-1.0/libs/Makefile
-@@ -17,13 +17,13 @@
- 	$(CC) $(CFLAGS) $(DBGFLAG) -c $< -o $@
- 
- $(LIBTCB_LONG): libtcb.o $(LIB_MAP)
--	$(CC) $(DBGFLAG) -shared -o $@ -Wl,-soname,$(LIBTCB) \
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(DBGFLAG) -shared -o $@ -Wl,-soname,$(LIBTCB) \
- 		-Wl,--version-script=$(LIB_MAP) $< -lc
- 	ln -sf $@ $(LIBTCB)
- 	ln -sf $(LIBTCB) libtcb.so
- 
- $(LIBNSS): nss.o $(NSS_MAP) $(LIBTCB_LONG)
--	$(CC) $(DBGFLAG) -shared -o $@ -Wl,--version-script=$(NSS_MAP) \
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(DBGFLAG) -shared -o $@ -Wl,-soname,$@ -Wl,--version-script=$(NSS_MAP) \
- 		$< -L. $(LIBNSL) -ltcb
- 
- .c.o:
---- tcb-1.0/Make.defs
-+++ tcb-1.0/Make.defs
-@@ -8,9 +8,9 @@
- LDFLAGS += $(DBGFLAG) -L../libs
- 
- SBINDIR = /sbin
--SLIBDIR = /lib
--LIBDIR = /usr/lib
--LIBEXECDIR = /usr/libexec
--MANDIR = /usr/man
-+SLIBDIR = /@GENTOO_LIBDIR@
-+LIBDIR = /usr/@GENTOO_LIBDIR@
-+LIBEXECDIR = $(LIBDIR)/misc
-+MANDIR = /usr/share/man
- 
- SHLIBMODE = 755
---- tcb-1.0/progs/Makefile
-+++ tcb-1.0/progs/Makefile
-@@ -7,13 +7,13 @@
- all: $(CONVERT) $(UNCONVERT) $(CHKPWD)
- 
- $(CONVERT): $(CONVERT).o
--	$(CC) -o $@ $<
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
- 
- $(UNCONVERT): $(UNCONVERT).o
--	$(CC) -o $@ $< -L../libs -ltcb
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -L../libs -ltcb
- 
- $(CHKPWD): $(CHKPWD).o
--	$(CC) -o $@ $< -lcrypt
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lcrypt
- 
- .c.o:
- 	$(CC) $(CFLAGS) -c $< -o $@
diff --git a/sys-auth/tcb/files/tcb-xcrypt.patch b/sys-auth/tcb/files/tcb-xcrypt.patch
new file mode 100644
index 000000000000..ec7f08c0b37b
--- /dev/null
+++ b/sys-auth/tcb/files/tcb-xcrypt.patch
@@ -0,0 +1,50 @@
+--- pam_tcb/support.c.orig	2009-12-27 16:33:28.000000000 +0100
++++ pam_tcb/support.c	2009-12-27 16:34:03.000000000 +0100
+@@ -10,7 +10,7 @@
+ #include <signal.h>
+ #include <pwd.h>
+ #include <shadow.h>
+-#include <crypt.h>
++#include <xcrypt.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ #include <rpcsvc/ypclnt.h>
+@@ -481,11 +481,11 @@
+ 
+ 	/* This exists because of timing attacks. */
+ 	memset(input, 0x55, sizeof(input));
+-	fake_salt = crypt_gensalt_ra(pam_unix_param.crypt_prefix,
++	fake_salt = xcrypt_gensalt_ra(pam_unix_param.crypt_prefix,
+ 	    pam_unix_param.count, input, sizeof(input));
+ 
+ 	if (!fake_salt) {
+-		pam_syslog(pamh, LOG_CRIT, "crypt_gensalt_ra: %m");
++		pam_syslog(pamh, LOG_CRIT, "xcrypt_gensalt_ra: %m");
+ 		return PAM_BUF_ERR;
+ 	}
+ 
+@@ -823,11 +823,11 @@
+ 	void *data = NULL;
+ 	int size = 0;
+ 
+-	retval = crypt_ra(key, salt, &data, &size);
++	retval = xcrypt_ra(key, salt, &data, &size);
+ 	if (retval)
+ 		retval = strdup(retval); /* we return NULL if strdup fails */
+ 	else
+-		pam_syslog(pamh, LOG_CRIT, "crypt_ra: %m");
++		pam_syslog(pamh, LOG_CRIT, "xcrypt_ra: %m");
+ 	if (data) {
+ 		memset(data, 0, size);
+ 		free(data);
+--- pam_tcb/Makefile.orig	2009-12-27 16:38:53.000000000 +0100
++++ pam_tcb/Makefile	2009-12-27 16:39:10.000000000 +0100
+@@ -13,7 +13,7 @@
+ 
+ $(PAM_TCB): $(LIBOBJ) $(PAM_MAP)
+ 	$(CC) $(LDFLAGS) -shared -o $@ -Wl,--version-script=$(PAM_MAP) \
+-		$(LIBOBJ) -lnsl -lcrypt -lpam -ltcb
++		$(LIBOBJ) -lnsl -lxcrypt -lpam -ltcb
+ 
+ .c.o:
+ 	$(CC) $(CFLAGS) -fPIC -c $< -o $@
diff --git a/sys-auth/tcb/metadata.xml b/sys-auth/tcb/metadata.xml
index 96a2d586367d..fd8833aba702 100644
--- a/sys-auth/tcb/metadata.xml
+++ b/sys-auth/tcb/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+	<herd>base-system</herd>
+	<maintainer>
+		<email>phajdan.jr@gentoo.org</email>
+		<name>Pawel Hajdan jr</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-auth/tcb/tcb-1.0-r1.ebuild b/sys-auth/tcb/tcb-1.0-r1.ebuild
deleted file mode 100644
index b94b70448e80..000000000000
--- a/sys-auth/tcb/tcb-1.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/tcb/tcb-1.0-r1.ebuild,v 1.1 2008/03/27 14:45:01 flameeyes Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="Libraries and tools implementing the tcb password shadowing scheme"
-HOMEPAGE="http://www.openwall.com/tcb/"
-SRC_URI="ftp://ftp.openwall.com/pub/projects/tcb/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="pam"
-
-DEPEND="pam? ( >=sys-libs/pam-0.75 )"
-
-pkg_setup() {
-	for group in auth chkpwd shadow ; do
-		enewgroup ${group}
-	done
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-build.patch
-	sed -i "s:@GENTOO_LIBDIR@:$(get_libdir):" Make.defs
-	use pam || sed -i '/pam/d' Makefile
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ChangeLog
-}
-
-pkg_postinst() {
-	einfo "You must now run /sbin/tcb_convert to convert your shadow to tcb"
-	einfo "To remove this you must first run /sbin/tcp_unconvert and then unmerge"
-}
diff --git a/sys-auth/tcb/tcb-1.0.2.ebuild b/sys-auth/tcb/tcb-1.0.2.ebuild
deleted file mode 100644
index 39879980ddf4..000000000000
--- a/sys-auth/tcb/tcb-1.0.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/tcb/tcb-1.0.2.ebuild,v 1.1 2008/03/27 14:45:01 flameeyes Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="Libraries and tools implementing the tcb password shadowing scheme"
-HOMEPAGE="http://www.openwall.com/tcb/"
-SRC_URI="ftp://ftp.openwall.com/pub/projects/tcb/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="pam"
-
-DEPEND="pam? ( >=sys-libs/pam-0.75 )"
-
-pkg_setup() {
-	for group in auth chkpwd shadow ; do
-		enewgroup ${group}
-	done
-
-	mymakeopts="
-		SLIBDIR=/$(get_libdir)
-		LIBDIR=/usr/$(get_libdir)
-		MANDIR=/usr/share/man
-		DESTDIR='${D}'"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-build.patch
-	use pam || sed -i '/pam/d' Makefile
-}
-
-src_compile() {
-	emake $mymakeopts || die "emake failed"
-}
-
-src_install() {
-	emake $mymakeopts install || die "emake install failed"
-	dodoc ChangeLog
-}
-
-pkg_postinst() {
-	einfo "You must now run /sbin/tcb_convert to convert your shadow to tcb"
-	einfo "To remove this you must first run /sbin/tcp_unconvert and then unmerge"
-}
diff --git a/sys-auth/tcb/tcb-1.0.3.ebuild b/sys-auth/tcb/tcb-1.0.3-r1.ebuild
index 72a767941204..51c9ec111320 100644
--- a/sys-auth/tcb/tcb-1.0.3.ebuild
+++ b/sys-auth/tcb/tcb-1.0.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/tcb/tcb-1.0.3.ebuild,v 1.1 2009/12/29 11:03:39 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/tcb/tcb-1.0.3-r1.ebuild,v 1.1 2010/01/12 17:59:48 phajdan.jr Exp $
 
 inherit eutils multilib
 
@@ -10,10 +10,11 @@ SRC_URI="ftp://ftp.openwall.com/pub/projects/tcb/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="pam"
 
-DEPEND="pam? ( >=sys-libs/pam-0.75 )"
+DEPEND=">=sys-libs/libxcrypt-2.4
+	pam? ( >=sys-libs/pam-0.75 )"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
@@ -33,6 +34,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${PN}-1.0.2-build.patch
+	epatch "${FILESDIR}"/${PN}-xcrypt.patch
 	use pam || sed -i '/pam/d' Makefile
 }