Add support to build static lib, needed for new version of pam.

4 files changed, 121 insertions, 3 deletions

diff --git a/sys-libs/cracklib/Manifest b/sys-libs/cracklib/Manifest
index c754a3949829..d883da474d37 100644
--- a/sys-libs/cracklib/Manifest
+++ b/sys-libs/cracklib/Manifest
@@ -1,7 +1,6 @@
-MD5 c3ec1c8d637b0f85ad5f6b505436daab .cracklib-2.7-r8.ebuild.swp 12288
-MD5 162e9c291187e423fea184ed00d6d417 ChangeLog 4371
+MD5 4dc6c76fc27d02fb4f61809aca27895d ChangeLog 4584
 MD5 f2f55bc324a3b23ae5468f34b169be8f cracklib-2.7-r6.ebuild 1286
-MD5 d7163fe84ec7661662a166feea27c951 cracklib-2.7-r8.ebuild 1983
+MD5 0ee54715efddeb418e2eadc2ba30cd18 cracklib-2.7-r8.ebuild 1993
 MD5 2f9c35d664f2b3cec09022ae7d550edb cracklib-2.7-r7.ebuild 1723
 MD5 85783b83e5bfa51190033895cfaf803e files/cracklib-2.7-dec-alpha-compiler.diff 333
 MD5 954e8e0d53c6f878366e472a90917356 files/cracklib-2.7-redhat.patch 1224
diff --git a/sys-libs/cracklib/cracklib-2.7-r8.ebuild b/sys-libs/cracklib/cracklib-2.7-r8.ebuild
new file mode 100644
index 000000000000..40ffe4e24153
--- /dev/null
+++ b/sys-libs/cracklib/cracklib-2.7-r8.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.7-r8.ebuild,v 1.1 2003/11/09 22:48:37 azarah Exp $
+
+IUSE=""
+
+inherit flag-o-matic eutils
+
+filter-flags "-fstack-protector"
+
+MY_P=${P/-/,}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Password Checking Library"
+HOMEPAGE="http://www.crypticide.org/users/alecm/"
+SRC_URI="http://www.crypticide.org/users/alecm/security/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="CRACKLIB"
+KEYWORDS="~amd64 ~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm ~ia64"
+
+RDEPEND="sys-apps/miscfiles
+		>=sys-apps/portage-2.0.47-r10"
+DEPEND="${RDEPEND}
+	sys-devel/gcc-config"
+
+src_unpack() {
+	unpack ${A}
+	
+	cd ${S}
+	epatch ${FILESDIR}/${P}-redhat.patch
+	epatch ${FILESDIR}/${P}-gentoo-new.diff
+	epatch ${FILESDIR}/${P}-static-lib.patch
+	
+	[ "${ARCH}" = "alpha" -a "${CC}" = "ccc" ] && \
+		sed -i -e 's:CFLAGS += -g :CFLAGS += -g3 :' ${S}/cracklib/Makefile
+
+	# this is only needed for the transparent hgcc
+	if has_version 'sys-devel/hardened-gcc' && [ ${CC} == "gcc" ]
+	then
+		einfo "hardened-gcc: adding libgcc for propolice __guard symbol to cracklib"
+		sed -i "s:= ld:= ld $(gcc-config -L)/libgcc_s.so:" ${S}/cracklib/Makefile
+	fi
+}
+
+src_compile() {
+	# Parallel make does not work for 2.7
+	make all || die
+}
+
+src_install() {
+
+	dodir /usr/{lib,sbin,include}
+	keepdir /usr/share/cracklib
+
+	make DESTDIR=${D} install || die
+
+	# Needed by pam
+	if [ ! -f "${D}/usr/lib/libcrack.a" ]
+	then
+		eerror "Could not find libcrack.a which is needed by core components!"
+		die "Could not find libcrack.a which is needed by core components!"
+	fi
+
+	# This link is needed and not created. :| bug #9611
+	cd ${D}/usr/lib
+	dosym libcrack.so.2.7 /usr/lib/libcrack.so.2
+	cd ${S}
+
+	cp ${S}/cracklib/packer.h ${D}/usr/include
+	#fix the permissions on it as they may be wrong in some cases
+	fperms 644 usr/include/packer.h
+
+	preplib /usr/lib
+
+	dodoc HISTORY LICENCE MANIFEST POSTER README
+}
+
diff --git a/sys-libs/cracklib/files/cracklib-2.7-static-lib.patch b/sys-libs/cracklib/files/cracklib-2.7-static-lib.patch
new file mode 100644
index 000000000000..6ee6a7677167
--- /dev/null
+++ b/sys-libs/cracklib/files/cracklib-2.7-static-lib.patch
@@ -0,0 +1,41 @@
+--- cracklib-2.7/cracklib/Makefile	2003-11-09 23:01:29.405532640 +0200
++++ cracklib-2.7.static/cracklib/Makefile	2003-11-09 23:17:57.983245984 +0200
+@@ -6,21 +6,28 @@
+ # and upwards.
+ ###
+ 
+-LIB	= libcrack.so
++LIB	= libcrack
+ OBJ	= fascist.o packlib.o rules.o stringlib.o
+ CFLAGS += -g -I../cracklib -DIN_CRACKLIB -fPIC
+ LD	= ld
++AR	= ar
+ 
+-$(LIB):	$(OBJ) Makefile
+-	$(LD) -shared -soname $(LIB).$(MAJOR) -o $(LIB).$(VERSION) $(OBJ) -lc
+-	rm -f $(LIB).$(MAJOR) $(LIB)
+-	ln -s $(LIB).$(VERSION) $(LIB).$(MAJOR)
+-	ln -s $(LIB).$(MAJOR) $(LIB)
++all: $(LIB).so $(LIB).a
++
++$(LIB).so:	$(OBJ) Makefile
++	$(LD) -shared -soname $(LIB).so.$(MAJOR) -o $(LIB).so.$(VERSION) $(OBJ) -lc
++	rm -f $(LIB).so.$(MAJOR) $(LIB).so
++	ln -s $(LIB).so.$(VERSION) $(LIB).so.$(MAJOR)
++	ln -s $(LIB).so.$(MAJOR) $(LIB).so
++
++$(LIB).a:	$(OBJ) Makefile
++	$(AR) cru $(LIB).a $(OBJ)
+ 
+ clean:
+-	-rm -f $(OBJ) $(LIB) $(LIB).$(VERSION) *~
++	-rm -f $(OBJ) $(LIB).so $(LIB).a $(LIB).so.$(VERSION) *~
+ 
+-install: $(LIB) crack.h
+-	install -m 755 $(LIB).$(VERSION) $(DESTDIR)/usr/lib
+-	ln -sf $(LIB).$(VERSION) $(DESTDIR)/usr/lib/$(LIB)
++install: $(LIB).so $(LIB).a crack.h
++	install -m 755 $(LIB).so.$(VERSION) $(DESTDIR)/usr/lib
++	ln -sf $(LIB).so.$(VERSION) $(DESTDIR)/usr/lib/$(LIB).so
++	install -m 755 $(LIB).a $(DESTDIR)/usr/lib
+ 	install -m 644 crack.h $(DESTDIR)/usr/include
diff --git a/sys-libs/cracklib/files/digest-cracklib-2.7-r8 b/sys-libs/cracklib/files/digest-cracklib-2.7-r8
new file mode 100644
index 000000000000..12a9da188d95
--- /dev/null
+++ b/sys-libs/cracklib/files/digest-cracklib-2.7-r8
@@ -0,0 +1 @@
+MD5 0c84ad7413d9dd3e5c2eaa5f97d53c4a cracklib,2.7.tar.gz 21059