Cleanup build #161554 and #161556 by ph.

Package-Manager: portage-2.1.2_rc4-r7

diff --git a/sys-apps/tcb/ChangeLog b/sys-apps/tcb/ChangeLog
index 169416fd6a630dd2875003f716a03253b8293d98..9e4fcdd0fccf6766e7ed131b489c6883351da548 100644 (file)
--- a/sys-apps/tcb/ChangeLog
+++ b/sys-apps/tcb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/tcb
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcb/ChangeLog,v 1.10 2006/04/27 22:41:53 antarus Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcb/ChangeLog,v 1.11 2007/01/12 03:13:39 vapier Exp $
+
+*tcb-1.0-r1 (12 Jan 2007)
+
+  12 Jan 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/tcb-1.0-build.patch, +tcb-1.0-r1.ebuild:
+  Cleanup build #161554 and #161556 by ph.
 
   27 Apr 2006; Alec Warner <antarus@gentoo.org> files/digest-tcb-0.9.8.7,
   Manifest:

diff --git a/sys-apps/tcb/Manifest b/sys-apps/tcb/Manifest
index 8a37c9c5d4274b80f45b8f8c843ad86cf59b0869..c592b361a3b049e23d28fc2449d6c43f1fcca6f0 100644 (file)
--- a/sys-apps/tcb/Manifest
+++ b/sys-apps/tcb/Manifest
@@ -1,32 +1,30 @@
-DIST tcb-0.9.8.7.tar.gz 36561 RMD160 50f508a726ba3a815d93411794f58263cf9b949b SHA256 18d5050ce986366d06defbad8f870f1eb7408d5d4da0a96d29996a738f4337e7 size 36561
-DIST tcb-0.9.8.8.tar.gz 36660 RMD160 87104d4a822dbd4e709e3c098af8e922a9f5d789 SHA256 2db728c2bfabdf96a8d84110af9c59424e0865e63bb97e9d83c7783172a860ea size 36660
-DIST tcb-1.0.tar.gz 40355 RMD160 1dbe92cbc583f66b687526ced87c6ab03d8dadbf SHA256 6565f076f72bc709b5eece037e9c45f0a0f60530e9213dda3ddbb14416bdfbaa size 40355
-EBUILD tcb-0.9.8.7.ebuild 879 RMD160 0842c75c7295f4ff0540f3d5295c785fde0259f1 SHA1 4aa8f8850a91dc467cd403d444592fce05055008 SHA256 3c9676a5e3842bac694e220d2beaae03fc11af338ccaf739a2feaa5212601580 size 879
-MD5 d0919623162be8eedd96bfbdd7e500ec tcb-0.9.8.7.ebuild 879
-RMD160 0842c75c7295f4ff0540f3d5295c785fde0259f1 tcb-0.9.8.7.ebuild 879
-SHA256 3c9676a5e3842bac694e220d2beaae03fc11af338ccaf739a2feaa5212601580 tcb-0.9.8.7.ebuild 879
-EBUILD tcb-0.9.8.8.ebuild 887 RMD160 e24f8754d9bd3335dcd8c1aa20a80e11eb807bb4 SHA1 bb9b6913b22eaf53b00fc1dc45b4a0a68a91f0a8 SHA256 c9af2b0e6139cbd462a7f87d3e6d20f9326c65498405bce428af8b8b5f98abe6 size 887
-MD5 deea5336c7a0b79bb68d29d32370b956 tcb-0.9.8.8.ebuild 887
-RMD160 e24f8754d9bd3335dcd8c1aa20a80e11eb807bb4 tcb-0.9.8.8.ebuild 887
-SHA256 c9af2b0e6139cbd462a7f87d3e6d20f9326c65498405bce428af8b8b5f98abe6 tcb-0.9.8.8.ebuild 887
-EBUILD tcb-1.0.ebuild 917 RMD160 70dc94f8d47614155b7d5f0125d3ca851702eeca SHA1 2befe19d34d35531d5faa3bc27a406a54434ce8d SHA256 44ef12c8c518dce65ae2e6ed30e333806e7be045be2a53c5b09cbb056fecde37 size 917
-MD5 08b0760410b6bcf6e24eb392f189fd49 tcb-1.0.ebuild 917
-RMD160 70dc94f8d47614155b7d5f0125d3ca851702eeca tcb-1.0.ebuild 917
-SHA256 44ef12c8c518dce65ae2e6ed30e333806e7be045be2a53c5b09cbb056fecde37 tcb-1.0.ebuild 917
-MISC ChangeLog 1247 RMD160 b62bb424d0aa8d5efc0c19d5e81a83e4d47047c9 SHA1 3f02bef2886a10b3f7249764d64a94e38398d4f5 SHA256 e8167a3290f2312fd8a3c555641b52a464a61b0d1827af028ad46802eaf92285 size 1247
-MD5 33025f0a59a0f9d2d48bb9db76654a5c ChangeLog 1247
-RMD160 b62bb424d0aa8d5efc0c19d5e81a83e4d47047c9 ChangeLog 1247
-SHA256 e8167a3290f2312fd8a3c555641b52a464a61b0d1827af028ad46802eaf92285 ChangeLog 1247
-MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 size 164
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX tcb-1.0-build.patch 1406 RMD160 9179ad188825ca433e5cd954b14f9a515ed36138 SHA1 a80d6d8aabdd1406424081820c3518d40edeb36c SHA256 3b798990692de9574bfce53fd99e4ccb521e76af0ceaaf7237a7d27168d7d0aa
+MD5 2ee224449e71c2be8f739d52d56d6438 files/tcb-1.0-build.patch 1406
+RMD160 9179ad188825ca433e5cd954b14f9a515ed36138 files/tcb-1.0-build.patch 1406
+SHA256 3b798990692de9574bfce53fd99e4ccb521e76af0ceaaf7237a7d27168d7d0aa files/tcb-1.0-build.patch 1406
+DIST tcb-1.0.tar.gz 40355 RMD160 1dbe92cbc583f66b687526ced87c6ab03d8dadbf SHA1 aba4b0e8e4d437798550ba33c29abaef7006e930 SHA256 6565f076f72bc709b5eece037e9c45f0a0f60530e9213dda3ddbb14416bdfbaa
+EBUILD tcb-1.0-r1.ebuild 1022 RMD160 89f9b2835761675a203364db0f18eb9fd5923159 SHA1 a4c51f29a74746c3718ff3c7ccfb27cf0039bee2 SHA256 f380c1f5dd66232ee07ed3736d478a837661084f25006af73ca9120cc17c8eb1
+MD5 e43a029d25abdde69e76b1d105e33f96 tcb-1.0-r1.ebuild 1022
+RMD160 89f9b2835761675a203364db0f18eb9fd5923159 tcb-1.0-r1.ebuild 1022
+SHA256 f380c1f5dd66232ee07ed3736d478a837661084f25006af73ca9120cc17c8eb1 tcb-1.0-r1.ebuild 1022
+MISC ChangeLog 1417 RMD160 983931a86a3829e25339792c5420f6a763184900 SHA1 85584eee07b7eab6b134f6efb791cd85161ee1b6 SHA256 2786b0baf799586ceeaadb4f8ae3e78010c8e3733ef4085ea193f7e6cd4a1b43
+MD5 f05c96c08fb2aa9fc7648a1a7f2df3a4 ChangeLog 1417
+RMD160 983931a86a3829e25339792c5420f6a763184900 ChangeLog 1417
+SHA256 2786b0baf799586ceeaadb4f8ae3e78010c8e3733ef4085ea193f7e6cd4a1b43 ChangeLog 1417
+MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
-MD5 de35ebc380a8fa0cca9bd027b2ea91a3 files/digest-tcb-0.9.8.7 232
-RMD160 86db65b068b6a1c9ae76227463c6a6f095f7cd90 files/digest-tcb-0.9.8.7 232
-SHA256 c860232ee244089e8ceaeb1dbf1cca9277f5ef2dd9d80e7d93ecc4c7d51db5cd files/digest-tcb-0.9.8.7 232
-MD5 e4b333ef7e94c3ad5a81f729a9f4f0b8 files/digest-tcb-0.9.8.8 232
-RMD160 16cebbbdf80f5edbc966542843272c401a952f5d files/digest-tcb-0.9.8.8 232
-SHA256 0cd7512eccd512ed2cdd69daf5263084da42e527532120d7b9d7bef8ce20ad2e files/digest-tcb-0.9.8.8 232
-MD5 914a7baa675b42c35b56bc5367c69d89 files/digest-tcb-1.0 220
-RMD160 b1f81d429fe2cd6d90f413570adc54541d5231b4 files/digest-tcb-1.0 220
-SHA256 1315044e8eba27aff29a8147f24e4206ac69eed02ddbc9a7a0d482a5b6070cde files/digest-tcb-1.0 220
+MD5 914a7baa675b42c35b56bc5367c69d89 files/digest-tcb-1.0-r1 220
+RMD160 b1f81d429fe2cd6d90f413570adc54541d5231b4 files/digest-tcb-1.0-r1 220
+SHA256 1315044e8eba27aff29a8147f24e4206ac69eed02ddbc9a7a0d482a5b6070cde files/digest-tcb-1.0-r1 220
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFFpvzz8bi6rjpTunYRAiURAJ9OrF4uEK1GowrVw8dzC7RosrXtqgCgmo1n
+0nuO/jsoLncQQuqXnXwMrWY=
+=yoWr
+-----END PGP SIGNATURE-----

diff --git a/sys-apps/tcb/files/digest-tcb-1.0-r1 b/sys-apps/tcb/files/digest-tcb-1.0-r1
new file mode 100644 (file)
index 0000000..a7f3549
--- /dev/null
+++ b/sys-apps/tcb/files/digest-tcb-1.0-r1
@@ -0,0 +1,3 @@
+MD5 9cf36b80cafdae41e644000a6e3b88fc tcb-1.0.tar.gz 40355
+RMD160 1dbe92cbc583f66b687526ced87c6ab03d8dadbf tcb-1.0.tar.gz 40355
+SHA256 6565f076f72bc709b5eece037e9c45f0a0f60530e9213dda3ddbb14416bdfbaa tcb-1.0.tar.gz 40355

diff --git a/sys-apps/tcb/files/tcb-1.0-build.patch b/sys-apps/tcb/files/tcb-1.0-build.patch
new file mode 100644 (file)
index 0000000..07082f6
--- /dev/null
+++ b/sys-apps/tcb/files/tcb-1.0-build.patch
@@ -0,0 +1,53 @@
+--- 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-apps/tcb/tcb-1.0-r1.ebuild b/sys-apps/tcb/tcb-1.0-r1.ebuild
new file mode 100644 (file)
index 0000000..ac52ef1
--- /dev/null
+++ b/sys-apps/tcb/tcb-1.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcb/tcb-1.0-r1.ebuild,v 1.1 2007/01/12 03:13:39 vapier 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"
+}