Grab update from upstream to fix building mod_php #85698.

Package-Manager: portage-2.0.51.19

5 files changed, 106 insertions, 7 deletions

diff --git a/sys-libs/cracklib/ChangeLog b/sys-libs/cracklib/ChangeLog
index c5054ad69a5a..dd450d2eaea6 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.67 2005/04/12 03:07:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.68 2005/04/16 05:41:42 vapier Exp $
+
+*cracklib-2.8.3-r1 (16 Apr 2005)
+
+  16 Apr 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/cracklib-2.8.3-packer-defines.patch, +cracklib-2.8.3-r1.ebuild:
+  Grab update from upstream to fix building mod_php #85698.
 
 *cracklib-2.8.3 (12 Apr 2005)
 
diff --git a/sys-libs/cracklib/Manifest b/sys-libs/cracklib/Manifest
index a53668fc1f39..f2df3d148dfd 100644
--- a/sys-libs/cracklib/Manifest
+++ b/sys-libs/cracklib/Manifest
@@ -1,19 +1,17 @@
-MD5 7c5c93c8167410f009de27d88e6bf148 ChangeLog 9266
-MD5 efece55d254deb0db93c367f3075f73c cracklib-2.8.2.ebuild 1430
+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 a54af604f5d697d11af4fadda71f3e9f cracklib-2.8.3.ebuild 1427
 MD5 85783b83e5bfa51190033895cfaf803e files/cracklib-2.7-dec-alpha-compiler.diff 333
 MD5 57ed4f94412bd475a0774c8e0db99712 files/cracklib-2.7-gentoo-new.diff 4235
 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 6ca09259ccdbc8451d989211ca46e757 files/cracklib-2.8_pre1-dictname.patch 500
 MD5 336ab4f8ce8e3a3955ec8722d32076b4 files/cracklib-2.7-gzip.patch 521
-MD5 e00f36f63e3879e2da10580921e484b6 files/digest-cracklib-2.8.3 66
 MD5 ee8b4f377188b6bb5001fc6e8b81e614 files/cracklib-2.7-libdir.patch 1211
 MD5 e9edfa4c3852810514a42e43e4f66b4e files/cracklib-2.7-parallel-make.patch 1066
-MD5 99beb882b68a8e9143a9ccee492e84cb files/digest-cracklib-2.8.2 66
+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 f078a8fa2074250986d685cac2b0b271 files/cracklib-2.8.3-dictname.patch 528
+MD5 6b7b4e9536a1420eed242b648d5a7aa7 files/cracklib-2.8.3-packer-defines.patch 891
diff --git a/sys-libs/cracklib/cracklib-2.8.3-r1.ebuild b/sys-libs/cracklib/cracklib-2.8.3-r1.ebuild
new file mode 100644
index 000000000000..c3ba24a651e9
--- /dev/null
+++ b/sys-libs/cracklib/cracklib-2.8.3-r1.ebuild
@@ -0,0 +1,54 @@
+# 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-r1.ebuild,v 1.1 2005/04/16 05:41:42 vapier 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=""
+
+DEPEND=""
+
+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
+}
+
+src_compile() {
+	econf --disable-dependency-tracking || 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-defines.patch b/sys-libs/cracklib/files/cracklib-2.8.3-packer-defines.patch
new file mode 100644
index 000000000000..0ead02629076
--- /dev/null
+++ b/sys-libs/cracklib/files/cracklib-2.8.3-packer-defines.patch
@@ -0,0 +1,40 @@
+Index: lib/packer.h
+===================================================================
+RCS file: /cvsroot/cracklib/cracklib/lib/packer.h,v
+retrieving revision 1.4
+retrieving revision 1.5
+diff -u -r1.4 -r1.5
+--- lib/packer.h	19 Mar 2005 00:21:02 -0000	1.4
++++ lib/packer.h	15 Apr 2005 22:32:18 -0000	1.5
+@@ -9,6 +9,16 @@
+ #ifndef CRACKLIB_PACKER_H
+ #define CRACKLIB_PACKER_H
+ 
++/* Moved here cause needed by mod_php */
++#define STRINGSIZE	1024
++#define TRUNCSTRINGSIZE	(STRINGSIZE/4)
++
++#ifndef NUMWORDS
++#define NUMWORDS 	16
++#endif
++#define MAXWORDLEN	32
++#define MAXBLOCKLEN 	(MAXWORDLEN * NUMWORDS)
++
+ #ifdef IN_CRACKLIB
+ 
+ #include <stdio.h>
+@@ -26,14 +36,6 @@
+ #endif
+ #endif
+ 
+-#define STRINGSIZE	1024
+-#define TRUNCSTRINGSIZE	(STRINGSIZE/4)
+-
+-#ifndef NUMWORDS
+-#define NUMWORDS 	16
+-#endif
+-#define MAXWORDLEN	32
+-#define MAXBLOCKLEN 	(MAXWORDLEN * NUMWORDS)
+ 
+ struct pi_header
+ {
diff --git a/sys-libs/cracklib/files/digest-cracklib-2.8.3-r1 b/sys-libs/cracklib/files/digest-cracklib-2.8.3-r1
new file mode 100644
index 000000000000..438a526b528d
--- /dev/null
+++ b/sys-libs/cracklib/files/digest-cracklib-2.8.3-r1
@@ -0,0 +1 @@
+MD5 13f82f75b892cbd0ba7cb9069e307006 cracklib-2.8.3.tar.gz 480439