summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Tilley <lv@gentoo.org>2004-09-01 12:26:31 +0000
committerTravis Tilley <lv@gentoo.org>2004-09-01 12:26:31 +0000
commitbffbd084f7a750352c65ed8e5b52bc6d37934421 (patch)
treee7c2396d7cbe67dd7477201453524c9a38b39e05 /sys-libs
parentMarked stable (Manifest recommit) (diff)
downloadgentoo-2-bffbd084f7a750352c65ed8e5b52bc6d37934421.tar.gz
gentoo-2-bffbd084f7a750352c65ed8e5b52bc6d37934421.tar.bz2
gentoo-2-bffbd084f7a750352c65ed8e5b52bc6d37934421.zip
added a patch that makes cracklib lib64/lib32 aware. marked stable on amd64
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/cracklib/ChangeLog6
-rw-r--r--sys-libs/cracklib/cracklib-2.7-r10.ebuild21
-rw-r--r--sys-libs/cracklib/files/cracklib-2.7-libdir.patch15
3 files changed, 31 insertions, 11 deletions
diff --git a/sys-libs/cracklib/ChangeLog b/sys-libs/cracklib/ChangeLog
index d9476dd61d62..5d6054eee167 100644
--- a/sys-libs/cracklib/ChangeLog
+++ b/sys-libs/cracklib/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-libs/cracklib
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.51 2004/08/24 04:07:01 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.52 2004/09/01 12:26:31 lv Exp $
+
+ 01 Sep 2004; Travis Tilley <lv@gentoo.org> +files/cracklib-2.7-libdir.patch,
+ cracklib-2.7-r10.ebuild:
+ added a patch that makes cracklib lib64/lib32 aware. marked stable on amd64
24 Aug 2004; Sven Wegener <swegener@gentoo.org> cracklib-2.7-r7.ebuild,
cracklib-2.7-r8.ebuild:
diff --git a/sys-libs/cracklib/cracklib-2.7-r10.ebuild b/sys-libs/cracklib/cracklib-2.7-r10.ebuild
index 6cfc0892143a..2a73715dc936 100644
--- a/sys-libs/cracklib/cracklib-2.7-r10.ebuild
+++ b/sys-libs/cracklib/cracklib-2.7-r10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.7-r10.ebuild,v 1.1 2004/08/12 08:10:18 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.7-r10.ebuild,v 1.2 2004/09/01 12:26:31 lv Exp $
inherit flag-o-matic eutils
@@ -11,7 +11,7 @@ SRC_URI="http://www.crypticide.org/users/alecm/security/${MY_P}.tar.gz"
LICENSE="CRACKLIB"
SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa amd64 ~ia64 ~ppc64 ~s390"
IUSE="pam uclibc"
RDEPEND="sys-apps/miscfiles
@@ -29,6 +29,7 @@ src_unpack() {
epatch ${FILESDIR}/${P}-redhat.patch
epatch ${FILESDIR}/${P}-gentoo-new.diff
epatch ${FILESDIR}/${P}-static-lib.patch
+ epatch ${FILESDIR}/${P}-libdir.patch
# add compressed dict support, taken from shadow-4.0.4.1
use uclibc && epatch ${FILESDIR}/${PN}-${PV}-gzip.patch
@@ -50,27 +51,27 @@ src_compile() {
}
src_install() {
- dodir /usr/{lib,sbin,include} /lib
+ dodir /usr/{$(get_libdir),sbin,include,lib} /$(get_libdir)
keepdir /usr/share/cracklib
- make DESTDIR="${D}" install || die "make install failed"
+ make DESTDIR="${D}" install LIBDIR=/usr/$(get_libdir) || die "make install failed"
# Needed by pam
- if [ ! -f "${D}/usr/lib/libcrack.a" ] && use pam
+ if [ ! -f "${D}/usr/$(get_libdir)/libcrack.a" ] && use pam
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
# correct permissions on static lib
- [ -x ${D}/usr/lib/libcrack.a ] && fperms 644 usr/lib/libcrack.a
+ [ -x ${D}/usr/$(get_libdir)/libcrack.a ] && fperms 644 usr/$(get_libdir)/libcrack.a
# put libcrack.so.2.7 in /lib for cases where /usr isn't available yet
- mv ${D}/usr/lib/libcrack.so* ${D}/lib
+ mv ${D}/usr/$(get_libdir)/libcrack.so* ${D}/$(get_libdir)
# This link is needed and not created. :| bug #9611
- cd ${D}/lib
- dosym libcrack.so.2.7 /lib/libcrack.so.2
+ cd ${D}/$(get_libdir)
+ dosym libcrack.so.2.7 /$(get_libdir)/libcrack.so.2
## remove it, if not needed
##use pam || rm -f ${D}/usr/lib/libcrack.a
@@ -84,7 +85,7 @@ src_install() {
#fix the permissions on it as they may be wrong in some cases
fperms 644 usr/include/packer.h
- preplib /usr/lib /lib
+ preplib /usr/$(get_libdir) /$(get_libdir)
dodoc HISTORY LICENCE MANIFEST POSTER README
}
diff --git a/sys-libs/cracklib/files/cracklib-2.7-libdir.patch b/sys-libs/cracklib/files/cracklib-2.7-libdir.patch
new file mode 100644
index 000000000000..d0b80365692c
--- /dev/null
+++ b/sys-libs/cracklib/files/cracklib-2.7-libdir.patch
@@ -0,0 +1,15 @@
+diff -Nru cracklib,2.7.old/cracklib/Makefile cracklib,2.7/cracklib/Makefile
+--- cracklib,2.7.old/cracklib/Makefile 2004-09-01 08:05:36.149998376 -0400
++++ cracklib,2.7/cracklib/Makefile 2004-09-01 08:10:57.108205312 -0400
+@@ -27,7 +27,8 @@
+ -rm -f $(OBJ) $(LIB).so $(LIB).a $(LIB).so.$(VERSION) *~
+
+ 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 $(LIB).so $(DESTDIR)/$(LIBDIR)
++ install -m 755 $(LIB).so.$(VERSION) $(DESTDIR)/$(LIBDIR)
++ ln -sf $(LIB).so.$(VERSION) $(DESTDIR)/$(LIBDIR)/$(LIB).so
++ install -m 755 $(LIB).a $(DESTDIR)/$(LIBDIR)
+ install -m 644 crack.h $(DESTDIR)/usr/include