From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id ED23913873B for ; Sat, 1 Mar 2014 14:01:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9F6E8E0931; Sat, 1 Mar 2014 14:01:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EDEFFE07F0 for ; Sat, 1 Mar 2014 14:00:59 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ED4D933FB72 for ; Sat, 1 Mar 2014 14:00:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id CFBCC183B3 for ; Sat, 1 Mar 2014 14:00:56 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1393682553.a5cf550afea6ecddf56e36bd6003a94d0fc69bdd.blueness@gentoo> Subject: [gentoo-commits] proj/hardened-dev:musl commit in: sys-apps/findutils/files/, sys-apps/findutils/ X-VCS-Repository: proj/hardened-dev X-VCS-Files: sys-apps/findutils/files/findutils-4.5.12-gnulib-musl.patch sys-apps/findutils/findutils-4.5.12-r99.ebuild X-VCS-Directories: sys-apps/findutils/files/ sys-apps/findutils/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: a5cf550afea6ecddf56e36bd6003a94d0fc69bdd X-VCS-Branch: musl Date: Sat, 1 Mar 2014 14:00:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: df53cee7-a10b-4f38-aec2-491a7302c16a X-Archives-Hash: 661eaa2fcbef28fd4ec1a7796a2e2c1f commit: a5cf550afea6ecddf56e36bd6003a94d0fc69bdd Author: Anthony G. Basile gentoo org> AuthorDate: Sat Mar 1 13:44:38 2014 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Sat Mar 1 14:02:33 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=a5cf550a sys-apps/findutils: bump 4.5.12 for mips --- .../files/findutils-4.5.12-gnulib-musl.patch | 132 +++++++++++++++++++++ sys-apps/findutils/findutils-4.5.12-r99.ebuild | 51 ++++++++ 2 files changed, 183 insertions(+) diff --git a/sys-apps/findutils/files/findutils-4.5.12-gnulib-musl.patch b/sys-apps/findutils/files/findutils-4.5.12-gnulib-musl.patch new file mode 100644 index 0000000..b553801 --- /dev/null +++ b/sys-apps/findutils/files/findutils-4.5.12-gnulib-musl.patch @@ -0,0 +1,132 @@ +diff -Naur findutils-4.5.12.orig/gl/lib/fseeko.c findutils-4.5.12/gl/lib/fseeko.c +--- findutils-4.5.12.orig/gl/lib/fseeko.c 2013-09-22 15:27:42.000000000 +0000 ++++ findutils-4.5.12/gl/lib/fseeko.c 2014-03-01 13:35:14.718973449 +0000 +@@ -26,128 +26,6 @@ + + int + fseeko (FILE *fp, off_t offset, int whence) +-#undef fseeko +-#if !HAVE_FSEEKO +-# undef fseek +-# define fseeko fseek +-#endif +-#if _GL_WINDOWS_64_BIT_OFF_T +-# undef fseeko +-# if HAVE__FSEEKI64 /* msvc, mingw64 */ +-# define fseeko _fseeki64 +-# else /* mingw */ +-# define fseeko fseeko64 +-# endif +-#endif + { +-#if LSEEK_PIPE_BROKEN +- /* mingw gives bogus answers rather than failure on non-seekable files. */ +- if (lseek (fileno (fp), 0, SEEK_CUR) == -1) +- return EOF; +-#endif +- +- /* These tests are based on fpurge.c. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ +- if (fp->_IO_read_end == fp->_IO_read_ptr +- && fp->_IO_write_ptr == fp->_IO_write_base +- && fp->_IO_save_base == NULL) +-#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ +-# if defined __SL64 && defined __SCLE /* Cygwin */ +- if ((fp->_flags & __SL64) == 0) +- { +- /* Cygwin 1.5.0 through 1.5.24 failed to open stdin in 64-bit +- mode; but has an fseeko that requires 64-bit mode. */ +- FILE *tmp = fopen ("/dev/null", "r"); +- if (!tmp) +- return -1; +- fp->_flags |= __SL64; +- fp->_seek64 = tmp->_seek64; +- fclose (tmp); +- } +-# endif +- if (fp_->_p == fp_->_bf._base +- && fp_->_r == 0 +- && fp_->_w == ((fp_->_flags & (__SLBF | __SNBF | __SRD)) == 0 /* fully buffered and not currently reading? */ +- ? fp_->_bf._size +- : 0) +- && fp_ub._base == NULL) +-#elif defined __EMX__ /* emx+gcc */ +- if (fp->_ptr == fp->_buffer +- && fp->_rcount == 0 +- && fp->_wcount == 0 +- && fp->_ungetc_count == 0) +-#elif defined __minix /* Minix */ +- if (fp_->_ptr == fp_->_buf +- && (fp_->_ptr == NULL || fp_->_count == 0)) +-#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */ +- if (fp_->_ptr == fp_->_base +- && (fp_->_ptr == NULL || fp_->_cnt == 0)) +-#elif defined __UCLIBC__ /* uClibc */ +- if (((fp->__modeflags & __FLAG_WRITING) == 0 +- || fp->__bufpos == fp->__bufstart) +- && ((fp->__modeflags & (__FLAG_READONLY | __FLAG_READING)) == 0 +- || fp->__bufpos == fp->__bufread)) +-#elif defined __QNX__ /* QNX */ +- if ((fp->_Mode & 0x2000 /* _MWRITE */ ? fp->_Next == fp->_Buf : fp->_Next == fp->_Rend) +- && fp->_Rback == fp->_Back + sizeof (fp->_Back) +- && fp->_Rsave == NULL) +-#elif defined __MINT__ /* Atari FreeMiNT */ +- if (fp->__bufp == fp->__buffer +- && fp->__get_limit == fp->__bufp +- && fp->__put_limit == fp->__bufp +- && !fp->__pushed_back) +-#elif defined EPLAN9 /* Plan9 */ +- if (fp->rp == fp->buf +- && fp->wp == fp->buf) +-#else +- #error "Please port gnulib fseeko.c to your platform! Look at the code in fpurge.c, then report this to bug-gnulib." +-#endif +- { +- /* We get here when an fflush() call immediately preceded this one (or +- if ftell() has created buffers but no I/O has occurred on a +- newly-opened stream). We know there are no buffers. */ +- off_t pos = lseek (fileno (fp), offset, whence); +- if (pos == -1) +- { +-#if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ +- fp_->_flags &= ~__SOFF; +-#endif +- return -1; +- } +- +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ +- fp->_flags &= ~_IO_EOF_SEEN; +- fp->_offset = pos; +-#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ +-# if defined __CYGWIN__ +- /* fp_->_offset is typed as an integer. */ +- fp_->_offset = pos; +-# else +- /* fp_->_offset is an fpos_t. */ +- { +- /* Use a union, since on NetBSD, the compilation flags +- determine whether fpos_t is typedef'd to off_t or a struct +- containing a single off_t member. */ +- union +- { +- fpos_t f; +- off_t o; +- } u; +- u.o = pos; +- fp_->_offset = u.f; +- } +-# endif +- fp_->_flags |= __SOFF; +- fp_->_flags &= ~__SEOF; +-#elif defined __EMX__ /* emx+gcc */ +- fp->_flags &= ~_IOEOF; +-#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */ +- fp->_flag &= ~_IOEOF; +-#elif defined __MINT__ /* Atari FreeMiNT */ +- fp->__offset = pos; +- fp->__eof = 0; +-#endif +- return 0; +- } + return fseeko (fp, offset, whence); + } diff --git a/sys-apps/findutils/findutils-4.5.12-r99.ebuild b/sys-apps/findutils/findutils-4.5.12-r99.ebuild new file mode 100644 index 0000000..b275400 --- /dev/null +++ b/sys-apps/findutils/findutils-4.5.12-r99.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.5.12.ebuild,v 1.4 2014/01/18 03:28:44 vapier Exp $ + +EAPI="5" + +inherit eutils flag-o-matic toolchain-funcs multilib + +DESCRIPTION="GNU utilities for finding files" +HOMEPAGE="http://www.gnu.org/software/findutils/" +SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~mips ~x86" +IUSE="nls selinux static" + +RDEPEND="selinux? ( sys-libs/libselinux ) + nls? ( virtual/libintl )" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext )" + +src_prepare() { + epatch "${FILESDIR}"/${P}-gnulib-musl.patch + # Don't build or install locate because it conflicts with slocate, + # which is a secure version of locate. See bug 18729 + sed -i '/^SUBDIRS/s/locate//' Makefile.in +} + +src_configure() { + use static && append-ldflags -static + + program_prefix=$(usex userland_GNU '' g) + econf \ + --with-packager="Gentoo" \ + --with-packager-version="${PVR}" \ + --with-packager-bug-reports="http://bugs.gentoo.org/" \ + --program-prefix=${program_prefix} \ + $(use_enable nls) \ + $(use_with selinux) \ + --libexecdir='$(libdir)'/find +} + +src_install() { + emake DESTDIR="${D}" install + dodoc NEWS README TODO ChangeLog + + # We don't need this, so punt it. + rm "${ED}"/usr/bin/${program_prefix}oldfind \ + "${ED}"/usr/share/man/man1/${program_prefix}oldfind.1 || die +}