diff options
author | Paweł Hajdan <phajdan.jr@gentoo.org> | 2010-01-12 17:59:51 +0000 |
---|---|---|
committer | Paweł Hajdan <phajdan.jr@gentoo.org> | 2010-01-12 17:59:51 +0000 |
commit | 65fecbefdbc7f28c94335f2d26dc605e184ec1d5 (patch) | |
tree | f89db4863390ce92747e360ac8aeda9f4de75f31 /sys-auth | |
parent | Stable for HPPA (bug #290660). (diff) | |
download | gentoo-2-65fecbefdbc7f28c94335f2d26dc605e184ec1d5.tar.gz gentoo-2-65fecbefdbc7f28c94335f2d26dc605e184ec1d5.tar.bz2 gentoo-2-65fecbefdbc7f28c94335f2d26dc605e184ec1d5.zip |
Link with libxcrypt to satisfy runtime dependency (bug #298539). Remove
old, broken versions. Add myself as the maintainer.
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'sys-auth')
-rw-r--r-- | sys-auth/tcb/ChangeLog | 12 | ||||
-rw-r--r-- | sys-auth/tcb/files/tcb-1.0-build.patch | 53 | ||||
-rw-r--r-- | sys-auth/tcb/files/tcb-xcrypt.patch | 50 | ||||
-rw-r--r-- | sys-auth/tcb/metadata.xml | 6 | ||||
-rw-r--r-- | sys-auth/tcb/tcb-1.0-r1.ebuild | 40 | ||||
-rw-r--r-- | sys-auth/tcb/tcb-1.0.2.ebuild | 50 | ||||
-rw-r--r-- | sys-auth/tcb/tcb-1.0.3-r1.ebuild (renamed from sys-auth/tcb/tcb-1.0.3.ebuild) | 10 |
7 files changed, 71 insertions, 150 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/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 } |