diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-06-05 20:46:31 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-06-05 20:46:31 +0000 |
| commit | 2736f6f2a8a0dc1e8f2a9ee78e706877816d5650 (patch) | |
| tree | c27aee42f7de3ce48d8d27f28152e792a431cb3a /sys-libs/cracklib | |
| parent | Worked on tilde handling and duplicate line handling (diff) | |
| download | gentoo-2-2736f6f2a8a0dc1e8f2a9ee78e706877816d5650.tar.gz gentoo-2-2736f6f2a8a0dc1e8f2a9ee78e706877816d5650.tar.bz2 gentoo-2-2736f6f2a8a0dc1e8f2a9ee78e706877816d5650.zip | |
Fix building on uClibc systems w/out nls support.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs/cracklib')
| -rw-r--r-- | sys-libs/cracklib/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/cracklib/cracklib-2.8.15.ebuild | 3 | ||||
| -rw-r--r-- | sys-libs/cracklib/cracklib-2.8.16.ebuild | 5 | ||||
| -rw-r--r-- | sys-libs/cracklib/files/cracklib-2.8.15-no-nls.patch | 15 |
4 files changed, 25 insertions, 4 deletions
diff --git a/sys-libs/cracklib/ChangeLog b/sys-libs/cracklib/ChangeLog index a60f1679dcb2..5b0633d44d17 100644 --- a/sys-libs/cracklib/ChangeLog +++ b/sys-libs/cracklib/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/cracklib # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.146 2010/06/03 20:13:55 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.147 2010/06/05 20:46:31 vapier Exp $ + + 05 Jun 2010; Mike Frysinger <vapier@gentoo.org> cracklib-2.8.15.ebuild, + +files/cracklib-2.8.15-no-nls.patch, cracklib-2.8.16.ebuild: + Fix building on uClibc systems w/out nls support. 03 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> cracklib-2.8.16.ebuild: diff --git a/sys-libs/cracklib/cracklib-2.8.15.ebuild b/sys-libs/cracklib/cracklib-2.8.15.ebuild index dcbc89f54a81..678f8352cc40 100644 --- a/sys-libs/cracklib/cracklib-2.8.15.ebuild +++ b/sys-libs/cracklib/cracklib-2.8.15.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.8.15.ebuild,v 1.9 2010/04/01 17:24:35 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.8.15.ebuild,v 1.10 2010/06/05 20:46:31 vapier Exp $ inherit eutils toolchain-funcs multilib libtool @@ -31,6 +31,7 @@ src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}"/${PN}-2.8.13-python-linkage.patch #246747 + epatch "${FILESDIR}"/${P}-no-nls.patch sed -i '/PYTHON/s:\(print\) \([^"]*\):\1(\2):' configure #302908 elibtoolize #269003 } diff --git a/sys-libs/cracklib/cracklib-2.8.16.ebuild b/sys-libs/cracklib/cracklib-2.8.16.ebuild index 959cb0850c83..15a9368b74d3 100644 --- a/sys-libs/cracklib/cracklib-2.8.16.ebuild +++ b/sys-libs/cracklib/cracklib-2.8.16.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.8.16.ebuild,v 1.3 2010/06/03 20:17:34 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.8.16.ebuild,v 1.4 2010/06/05 20:46:31 vapier Exp $ EAPI="3" PYTHON_DEPEND="python? 2" SUPPORT_PYTHON_ABIS="1" RESTRICT_PYTHON_ABIS="3.*" -inherit distutils libtool toolchain-funcs +inherit eutils distutils libtool toolchain-funcs MY_P=${P/_} DESCRIPTION="Password Checking Library" @@ -39,6 +39,7 @@ pkg_setup() { } src_prepare() { + epatch "${FILESDIR}"/${PN}-2.8.15-no-nls.patch elibtoolize #269003 if use python; then diff --git a/sys-libs/cracklib/files/cracklib-2.8.15-no-nls.patch b/sys-libs/cracklib/files/cracklib-2.8.15-no-nls.patch new file mode 100644 index 000000000000..80f5d40a563e --- /dev/null +++ b/sys-libs/cracklib/files/cracklib-2.8.15-no-nls.patch @@ -0,0 +1,15 @@ +fix building on uclibc when nls is disabled + +--- util/check.c ++++ util/check.c +@@ -21,8 +21,10 @@ + const char *why; + int i; + ++#ifdef ENABLE_NLS + setlocale(LC_ALL, ""); + textdomain(PACKAGE); ++#endif + + while (fgets(buf, sizeof(buf), stdin) != NULL) { + while (((i = strlen(buf)) > 0) && (i > 0)) { |