- added epunt_cxx and fixed a uclibc error reported by psm

(Portage version: 2.0.51.21)

5 files changed, 131 insertions, 11 deletions

diff --git a/sys-libs/cracklib/ChangeLog b/sys-libs/cracklib/ChangeLog
index dd450d2eaea6..ae27937227fa 100644
--- a/sys-libs/cracklib/ChangeLog
+++ b/sys-libs/cracklib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/cracklib
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.68 2005/04/16 05:41:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.69 2005/05/02 21:45:44 solar Exp $
+
+*cracklib-2.8.3-r2 (02 May 2005)
+
+  02 May 2005; <solar@gentoo.org> +files/cracklib-2.8.3-packer-uint.patch,
+  +cracklib-2.8.3-r2.ebuild:
+  - added epunt_cxx and fixed a uclibc error reported by psm
 
 *cracklib-2.8.3-r1 (16 Apr 2005)
 
diff --git a/sys-libs/cracklib/Manifest b/sys-libs/cracklib/Manifest
index f2df3d148dfd..c76fad2f1cfe 100644
--- a/sys-libs/cracklib/Manifest
+++ b/sys-libs/cracklib/Manifest
@@ -1,17 +1,20 @@
-MD5 53e13e6a4435ba9591dff0719b0cf357 ChangeLog 9484
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 a9d5aa6295889479e73c5f86202ca1ec cracklib-2.8.3-r1.ebuild 1488
 MD5 f396f31efaeff34334e13c893b633c5b cracklib-2.7-r11.ebuild 2865
+MD5 89e28b390a90a993049812270cebef93 cracklib-2.8.3-r2.ebuild 1611
+MD5 bcd18ca54b0e9042752e2dc647752a85 ChangeLog 9684
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 6b7b4e9536a1420eed242b648d5a7aa7 files/cracklib-2.8.3-packer-defines.patch 891
+MD5 f27fad03a3939b6e405193b419b645a4 files/digest-cracklib-2.7-r11 63
+MD5 e00f36f63e3879e2da10580921e484b6 files/digest-cracklib-2.8.3-r1 66
+MD5 e00f36f63e3879e2da10580921e484b6 files/digest-cracklib-2.8.3-r2 66
 MD5 85783b83e5bfa51190033895cfaf803e files/cracklib-2.7-dec-alpha-compiler.diff 333
-MD5 57ed4f94412bd475a0774c8e0db99712 files/cracklib-2.7-gentoo-new.diff 4235
+MD5 a4987d412f1dc11c49fcfc7b603d09ad files/cracklib-2.8.3-packer-uint.patch 1082
+MD5 336ab4f8ce8e3a3955ec8722d32076b4 files/cracklib-2.7-gzip.patch 521
 MD5 954e8e0d53c6f878366e472a90917356 files/cracklib-2.7-redhat.patch 1224
 MD5 69aa6844bbf39d86cde364729ca9f9dd files/cracklib-2.7-static-lib.patch 1328
-MD5 efb1b540d35f2929768dcb3dcf723fee files/cracklib-2.7-cross-compile.patch 492
-MD5 336ab4f8ce8e3a3955ec8722d32076b4 files/cracklib-2.7-gzip.patch 521
-MD5 ee8b4f377188b6bb5001fc6e8b81e614 files/cracklib-2.7-libdir.patch 1211
 MD5 e9edfa4c3852810514a42e43e4f66b4e files/cracklib-2.7-parallel-make.patch 1066
-MD5 e00f36f63e3879e2da10580921e484b6 files/digest-cracklib-2.8.3-r1 66
-MD5 8a109d0d79bed1fb528d2f7c2e0bdbc0 files/cracklib-2.7-buffer-packer.patch 602
-MD5 f27fad03a3939b6e405193b419b645a4 files/digest-cracklib-2.7-r11 63
+MD5 57ed4f94412bd475a0774c8e0db99712 files/cracklib-2.7-gentoo-new.diff 4235
+MD5 efb1b540d35f2929768dcb3dcf723fee files/cracklib-2.7-cross-compile.patch 492
 MD5 f078a8fa2074250986d685cac2b0b271 files/cracklib-2.8.3-dictname.patch 528
-MD5 6b7b4e9536a1420eed242b648d5a7aa7 files/cracklib-2.8.3-packer-defines.patch 891
+MD5 8a109d0d79bed1fb528d2f7c2e0bdbc0 files/cracklib-2.7-buffer-packer.patch 602
+MD5 ee8b4f377188b6bb5001fc6e8b81e614 files/cracklib-2.7-libdir.patch 1211
diff --git a/sys-libs/cracklib/cracklib-2.8.3-r2.ebuild b/sys-libs/cracklib/cracklib-2.8.3-r2.ebuild
new file mode 100644
index 000000000000..d9e726b7f84d
--- /dev/null
+++ b/sys-libs/cracklib/cracklib-2.8.3-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.8.3-r2.ebuild,v 1.1 2005/05/02 21:45:44 solar Exp $
+
+inherit eutils toolchain-funcs
+
+MY_P=${P/_}
+DESCRIPTION="Password Checking Library"
+HOMEPAGE="http://sourceforge.net/projects/cracklib"
+SRC_URI="mirror://sourceforge/cracklib/${MY_P}.tar.gz"
+
+LICENSE="CRACKLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="uclibc"
+
+DEPEND=""
+RDEPEND="app-arch/gzip"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/cracklib-2.8.3-dictname.patch
+	epatch "${FILESDIR}"/cracklib-2.8.3-packer-defines.patch
+
+	use uclibc && epatch "${FILESDIR}"/cracklib-2.8.3-packer-uint.patch
+
+	epunt_cxx
+}
+
+src_compile() {
+	econf --disable-dependency-tracking --with-pic || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	rm -r "${D}"/usr/share/cracklib
+
+	insinto /usr/include
+	doins lib/packer.h || die "doins packer.h"
+
+	# move shared libs to /
+	dodir /$(get_libdir)
+	mv "${D}"/usr/$(get_libdir)/*.so* "${D}"/$(get_libdir)/ || die "could not move shared"
+	gen_usr_ldscript libcrack.so
+
+	insinto /usr/share/dict
+	doins dicts/cracklib-small || die "word dict"
+	tc-is-cross-compiler \
+		|| export PATH=${D}/usr/sbin:${PATH} LD_LIBRARY_PATH=${D}/$(get_libdir)
+	cracklib-format dicts/cracklib-small \
+		| cracklib-packer "${D}"/usr/$(get_libdir)/cracklib_dict \
+		|| die "couldnt create dict"
+
+	dodoc AUTHORS ChangeLog NEWS README*
+}
diff --git a/sys-libs/cracklib/files/cracklib-2.8.3-packer-uint.patch b/sys-libs/cracklib/files/cracklib-2.8.3-packer-uint.patch
new file mode 100644
index 000000000000..7372f15d1842
--- /dev/null
+++ b/sys-libs/cracklib/files/cracklib-2.8.3-packer-uint.patch
@@ -0,0 +1,51 @@
+--- cracklib-2.8.3.orig/lib/packer.h	2005-05-02 15:48:26.000000000 -0400
++++ cracklib-2.8.3/lib/packer.h	2005-05-02 15:20:01.000000000 -0400
+@@ -31,18 +31,18 @@
+ #if defined(HAVE_STDINT_H)
+ #include <stdint.h>
+ #else
+-typedef unsigned int uint32_t;
+-typedef unsigned short uint16_t;
++typedef unsigned int u_int32_t;
++typedef unsigned short u_int16_t;
+ #endif
+ #endif
+ 
+ 
+ struct pi_header
+ {
+-    uint32_t pih_magic;
+-    uint32_t pih_numwords;
+-    uint16_t pih_blocklen;
+-    uint16_t pih_pad;
++    u_int32_t pih_magic;
++    u_int32_t pih_numwords;
++    u_int16_t pih_blocklen;
++    u_int16_t pih_pad;
+ };
+ 
+ typedef struct
+@@ -51,12 +51,12 @@
+     FILE *dfp;
+     FILE *wfp;
+ 
+-    uint32_t flags;
++    u_int32_t flags;
+ #define PFOR_WRITE	0x0001
+ #define PFOR_FLUSH	0x0002
+ #define PFOR_USEHWMS	0x0004
+ 
+-    uint32_t hwms[256];
++    u_int32_t hwms[256];
+ 
+     struct pi_header header;
+ 
+@@ -68,7 +68,7 @@
+ #define PIH_MAGIC 0x70775631
+ 
+ /* Internal routines */
+-extern char *GetPW(PWDICT *pwp, uint32_t number);
++extern char *GetPW(PWDICT *pwp, u_int32_t number);
+ 
+ #else
+ 
diff --git a/sys-libs/cracklib/files/digest-cracklib-2.8.3-r2 b/sys-libs/cracklib/files/digest-cracklib-2.8.3-r2
new file mode 100644
index 000000000000..438a526b528d
--- /dev/null
+++ b/sys-libs/cracklib/files/digest-cracklib-2.8.3-r2
@@ -0,0 +1 @@
+MD5 13f82f75b892cbd0ba7cb9069e307006 cracklib-2.8.3.tar.gz 480439