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 | d710db461eed4e2e71c0431019485832e0314a42 (patch) | |
| tree | 6a3a71a0e8d2ca01911bbb32b62a59f1c7716161 /sys-libs | |
| parent | Stable on sparc wrt security bug #74443. (diff) | |
| download | historical-d710db461eed4e2e71c0431019485832e0314a42.tar.gz historical-d710db461eed4e2e71c0431019485832e0314a42.tar.bz2 historical-d710db461eed4e2e71c0431019485832e0314a42.zip | |
Make sure the dict files respect $(get_libdir) #74553.
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/cracklib/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/cracklib/Manifest | 12 | ||||
| -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 |
4 files changed, 30 insertions, 10 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/Manifest b/sys-libs/cracklib/Manifest index 941a20fcdfe2..4d077b4b4d95 100644 --- a/sys-libs/cracklib/Manifest +++ b/sys-libs/cracklib/Manifest @@ -1,9 +1,9 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 ed745a2759035f4922967b3b287dc48a ChangeLog 8081 +MD5 94195d85c66a4e162da33810b7770a57 ChangeLog 8246 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 -MD5 0f7dd7a2fc4289edbdff4a11309585d5 cracklib-2.7-r10.ebuild 2859 +MD5 a08a4a45ffc3ea664b5d87b1ba300974 cracklib-2.7-r10.ebuild 2855 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 @@ -11,12 +11,12 @@ 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 f27fad03a3939b6e405193b419b645a4 files/digest-cracklib-2.7-r10 63 -MD5 70692d376ebaca787743b7e54d7dd49e files/cracklib-2.7-libdir.patch 762 +MD5 ee8b4f377188b6bb5001fc6e8b81e614 files/cracklib-2.7-libdir.patch 1211 MD5 e9edfa4c3852810514a42e43e4f66b4e files/cracklib-2.7-parallel-make.patch 1066 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.9.10 (GNU/Linux) -iD8DBQFBt1DuroRuSHgZdywRAnV9AJ9p852DjcAJK+RBYps54nbE9U0GtgCgk/JQ -PnoEyy9ZMtiOQU5GvP+Hc8o= -=6iWa +iD8DBQFBwPFRroRuSHgZdywRAsAnAJ0eD5Yldaooj+aeY8X3cRtMrohFEQCgjKYb +2KUGwdf4PgdWCcHwskQElec= +=n4sq -----END PGP SIGNATURE----- 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. |