diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2004-12-16 02:21:57 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2004-12-16 02:21:57 +0000 |
| commit | 5de247bf357548c471be36882cd17100c338f63e (patch) | |
| tree | 8fc91129b1aab2d23e5a9522ff867fab892c96cf /sys-libs/cracklib | |
| parent | Stable on sparc wrt security bug #74443. (Manifest recommit) (diff) | |
| download | gentoo-2-5de247bf357548c471be36882cd17100c338f63e.tar.gz gentoo-2-5de247bf357548c471be36882cd17100c338f63e.tar.bz2 gentoo-2-5de247bf357548c471be36882cd17100c338f63e.zip | |
Make sure the dict files respect $(get_libdir) #74553.
Diffstat (limited to 'sys-libs/cracklib')
| -rw-r--r-- | sys-libs/cracklib/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/cracklib/cracklib-2.7-r10.ebuild | 5 | ||||
| -rw-r--r-- | sys-libs/cracklib/files/cracklib-2.7-libdir.patch | 17 |
3 files changed, 24 insertions, 4 deletions
diff --git a/sys-libs/cracklib/ChangeLog b/sys-libs/cracklib/ChangeLog index 4346148718aa..f8641fb96cb1 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.60 2004/12/07 09:46:11 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.61 2004/12/16 02:21:57 vapier Exp $ + + 15 Dec 2004; Mike Frysinger <vapier@gentoo.org> + files/cracklib-2.7-libdir.patch, cracklib-2.7-r10.ebuild: + Make sure the dict files respect $(get_libdir) #74553. 07 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org> +files/cracklib-2.7-parallel-make.patch, cracklib-2.7-r10.ebuild: diff --git a/sys-libs/cracklib/cracklib-2.7-r10.ebuild b/sys-libs/cracklib/cracklib-2.7-r10.ebuild index 25e1cf8c1f43..43fd6cd22b3a 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.10 2004/12/08 02:28:33 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.7-r10.ebuild,v 1.11 2004/12/16 02:21:57 vapier Exp $ inherit flag-o-matic eutils toolchain-funcs @@ -58,8 +58,7 @@ src_install() { dodir /usr/{$(get_libdir),sbin,include,lib} /$(get_libdir) keepdir /usr/share/cracklib - make DESTDIR="${D}" install LIBDIR="/usr/$(get_libdir)" \ - || die "make install failed" + make DESTDIR="${D}" install LIBDIR="/usr/$(get_libdir)" || die "make install failed" # Needed by pam if [ ! -f "${D}/usr/$(get_libdir)/libcrack.a" ] && use pam ; then diff --git a/sys-libs/cracklib/files/cracklib-2.7-libdir.patch b/sys-libs/cracklib/files/cracklib-2.7-libdir.patch index d0b80365692c..4cd47449a111 100644 --- a/sys-libs/cracklib/files/cracklib-2.7-libdir.patch +++ b/sys-libs/cracklib/files/cracklib-2.7-libdir.patch @@ -13,3 +13,20 @@ diff -Nru cracklib,2.7.old/cracklib/Makefile cracklib,2.7/cracklib/Makefile + ln -sf $(LIB).so.$(VERSION) $(DESTDIR)/$(LIBDIR)/$(LIB).so + install -m 755 $(LIB).a $(DESTDIR)/$(LIBDIR) install -m 644 crack.h $(DESTDIR)/usr/include +--- cracklib,2.7.old/Makefile 2004-12-15 21:06:24.890087088 -0500 ++++ cracklib,2.7/Makefile 2004-12-15 21:07:21.674454552 -0500 +@@ -14,9 +14,13 @@ + export MAJOR MINOR VERSION + ++### ++# Where do we stick libraries ++LIBDIR=/usr/lib ++ + ### + # set this to the absolute path (less extn) of compressed dict. + +-DICTPATH="/usr/lib/cracklib_dict" ++DICTPATH="$(LIBDIR)/cracklib_dict" + + ### + # Set this to the path of one or more files continaing wordlists. |