From 7bacd6e13d1bc074b0a402fb137cfc8e60c88701 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 4 Mar 2009 07:15:25 +0000 Subject: Add fix from upstream for #253119 by Gilles Dartiguelongue and a change to hopefully fix #253570 by Barbu Eros Iulian. Package-Manager: portage-2.2_rc23/cvs/Linux x86_64 --- sys-apps/findutils/ChangeLog | 12 ++++- sys-apps/findutils/Manifest | 13 +++-- .../findutils/files/findutils-4.5.3-curdepth.patch | 25 ++++++++++ .../files/findutils-4.5.3-fts-assert.patch | 20 ++++++++ sys-apps/findutils/findutils-4.5.3-r1.ebuild | 58 ++++++++++++++++++++++ 5 files changed, 121 insertions(+), 7 deletions(-) create mode 100644 sys-apps/findutils/files/findutils-4.5.3-curdepth.patch create mode 100644 sys-apps/findutils/files/findutils-4.5.3-fts-assert.patch create mode 100644 sys-apps/findutils/findutils-4.5.3-r1.ebuild (limited to 'sys-apps') diff --git a/sys-apps/findutils/ChangeLog b/sys-apps/findutils/ChangeLog index 133cbf078ba6..1acc7e380a6f 100644 --- a/sys-apps/findutils/ChangeLog +++ b/sys-apps/findutils/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sys-apps/findutils -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/ChangeLog,v 1.177 2008/12/25 21:30:53 vapier Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/ChangeLog,v 1.178 2009/03/04 07:15:25 vapier Exp $ + +*findutils-4.5.3-r1 (04 Mar 2009) + + 04 Mar 2009; Mike Frysinger + +files/findutils-4.5.3-curdepth.patch, + +files/findutils-4.5.3-fts-assert.patch, +findutils-4.5.3-r1.ebuild: + Add fix from upstream for #253119 by Gilles Dartiguelongue and a change to + hopefully fix #253570 by Barbu Eros Iulian. *findutils-4.5.3 (25 Dec 2008) diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest index c52d8cf90561..85f149523333 100644 --- a/sys-apps/findutils/Manifest +++ b/sys-apps/findutils/Manifest @@ -2,18 +2,21 @@ Hash: SHA1 AUX findutils-4.3.12-selinux.diff 15641 RMD160 36948882affd7e80a9a2e8052a79fe84b04ec113 SHA1 e0d37e0bfadb7dbb87a9eb136c14d816b34895dd SHA256 211686a97ebfae840f83ce4b6d21dc8c47157128adaf3fd60787dcdfe0ff5f66 +AUX findutils-4.5.3-curdepth.patch 841 RMD160 5ba2849e578227d62eb286962582d791cbc0f002 SHA1 41b4838c67980745c472622e2578398e75e92e88 SHA256 a24353c2286a0badb660d9b9042c682d71abf4fba7a3716fa3bf29f0cd8d7f40 +AUX findutils-4.5.3-fts-assert.patch 597 RMD160 d90999eb3c5728a189a401abdf31d8cc830f3608 SHA1 05b4d66c4011a4f0acd1b20c92e71cc0f44a53ad SHA256 bddcafb6630fcae25ed9d494b9054ee1abfbe461d9e078db2441a66e38bcb0d6 DIST findutils-4.4.0.tar.gz 2029809 RMD160 0ea2b03f4d49902b64c2028abfba3a870c892420 SHA1 25e3d4dec40cec0165ffeff50acc4d4523ec3e07 SHA256 fb108c2959f17baf3559da9b3854495b9bb69fb13309fdd05576c66feb661ea9 DIST findutils-4.5.2.tar.gz 2109947 RMD160 411fae22e0e0cd000809916525f5994decf976e9 SHA1 ca1bcb988d1cb36f1e2ba039282c0579cbc1b4ad SHA256 18785897642d962eebbeb9dba602df2020b6687da459c67ee21c2323ab758440 DIST findutils-4.5.3.tar.gz 2199630 RMD160 ed46edffafe5ab6a9641074b1cad5d8faa5fab70 SHA1 da902815347c15bf1ebba345672b2549dc871299 SHA256 24c0970b7c421361c0a1344ee4b7ae3940c1fa0912c57d02924e6c27e6f8ec16 EBUILD findutils-4.4.0.ebuild 1501 RMD160 14f26d92d950710fd28ac8ef83ff3b33cbf44a4b SHA1 8a6a0cc94f24b1ba4cd4f18540ea269ea5d3c257 SHA256 ded2614d45e8924e0ec8987110055bdbb5f6752ca54f5660ab546374c0fa481f EBUILD findutils-4.5.2.ebuild 1514 RMD160 a335d25661620e9eea12a86c5c39f173ff3ccc1b SHA1 374ef7f6b26f8d21b9888be2820792d14b50bec1 SHA256 5401a4a2ff85e5d94eb31aa1b1221d1d693d745c430b1261fa5b116e633520b9 +EBUILD findutils-4.5.3-r1.ebuild 1619 RMD160 7d464aa293c6a064fd81a6eb5e469ed79dc055d7 SHA1 8c48a3b145390573e31700e7b0a4fc6979ce276c SHA256 a281af9e88162929d1ce0253070abcae3a701a6615553113797c4e9793dc51ce EBUILD findutils-4.5.3.ebuild 1514 RMD160 e2072df3635a3244849e2f54137d75de83e2559d SHA1 c97e42384f637f33e0d1e62e157a77027be5bae9 SHA256 96a209ed7e0612e30efde7dab4dc51992285561e53f78d3c44f850882461b5bc -MISC ChangeLog 24534 RMD160 18c1cb6019df080dcaa5d8dd71ab86b4d17c1a88 SHA1 fe1dc765f10a7ce3af48cd7310ce46946f23d259 SHA256 e32229253a7fdc5220ef517867f5ee953177009b40f491e5e4255870e1d6fd97 +MISC ChangeLog 24855 RMD160 702877a05f02085e2410540a8116a124ff42fc91 SHA1 7dcc4db20cb4e5d191ce8ed733b66c0a27e2cc50 SHA256 0e973d66d4e96d48d4c1a992aba9253588a0f3179dca36d56dfcb0cee8252637 MISC metadata.xml 165 RMD160 84307ea324cd4f0f46d52f2fa096a1873e2fbe53 SHA1 c7b83ef947fe7e8273cc512fee9bba06586a58f9 SHA256 23a8851c12bd4cf7cf0528250ad5605be6b0780bbec0c51331d6d2c618c13f6a -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.9 (GNU/Linux) +Version: GnuPG v2.0.10 (GNU/Linux) -iEYEARECAAYFAklT+5MACgkQn/5bYzqsSmFmnwCfXzHDl/hsX+1UafonKS/noKwF -AwgAoI5LeeqTvHfKK94Y4RV10sFfN82s -=1uz4 +iEYEARECAAYFAkmuKpIACgkQn/5bYzqsSmEgeACgkuLWRlmPFbLyU1M5St6bB0Yd +aNsAoIsbQ4a2OET27ylFZms3Xy2FWnFh +=J1Jj -----END PGP SIGNATURE----- diff --git a/sys-apps/findutils/files/findutils-4.5.3-curdepth.patch b/sys-apps/findutils/files/findutils-4.5.3-curdepth.patch new file mode 100644 index 000000000000..6bffd896cb7d --- /dev/null +++ b/sys-apps/findutils/files/findutils-4.5.3-curdepth.patch @@ -0,0 +1,25 @@ +http://bugs.gentoo.org/253119 +http://savannah.gnu.org/bugs/index.php?25359 +http://git.savannah.gnu.org/cgit/findutils.git/commit/?id=b445af98c22cd2d13673e2699a77ab728a7073b0 + +--- a/find/ftsfind.c ++++ b/find/ftsfind.c +@@ -227,7 +227,6 @@ visit(FTS *p, FTSENT *ent, struct stat *pstat) + { + struct predicate *eval_tree; + +- state.curdepth = ent->fts_level; + state.have_stat = (ent->fts_info != FTS_NS) && (ent->fts_info != FTS_NSOK); + state.rel_pathname = ent->fts_accpath; + state.cwd_dir_fd = p->fts_cwd_fd; +@@ -490,6 +489,10 @@ consider_visiting(FTS *p, FTSENT *ent) + } + } + ++ /* update state.curdepth before calling digest_mode(), because digest_mode ++ * may call following_links(). ++ */ ++ state.curdepth = ent->fts_level; + if (mode) + { + if (!digest_mode(mode, ent->fts_path, ent->fts_name, &statbuf, 0)) diff --git a/sys-apps/findutils/files/findutils-4.5.3-fts-assert.patch b/sys-apps/findutils/files/findutils-4.5.3-fts-assert.patch new file mode 100644 index 000000000000..cf26dd538ef7 --- /dev/null +++ b/sys-apps/findutils/files/findutils-4.5.3-fts-assert.patch @@ -0,0 +1,20 @@ +hopefully address: +http://bugs.gentoo.org/253570 +http://savannah.gnu.org/bugs/?25294 + +upstream commit e3bcac430a07a05ba2ac66587d168a842ba8c0ea which was done for +unrelated reasons ... + +diff --git a/find/ftsfind.c b/find/ftsfind.c +index 4a33059..765221b 100644 +--- a/find/ftsfind.c ++++ b/find/ftsfind.c +@@ -472,7 +472,7 @@ consider_visiting(FTS *p, FTSENT *ent) + || ent->fts_info == FTS_NS /* e.g. symlink loop */) + { + assert (!state.have_stat); +- assert (state.type != 0); ++ assert (ent->fts_info == FTS_NSOK || state.type != 0); + mode = state.type; + } + else diff --git a/sys-apps/findutils/findutils-4.5.3-r1.ebuild b/sys-apps/findutils/findutils-4.5.3-r1.ebuild new file mode 100644 index 000000000000..22b9cfa45f63 --- /dev/null +++ b/sys-apps/findutils/findutils-4.5.3-r1.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.5.3-r1.ebuild,v 1.1 2009/03/04 07:15:25 vapier Exp $ + +inherit eutils flag-o-matic toolchain-funcs multilib + +SELINUX_PATCH="findutils-4.3.12-selinux.diff" + +DESCRIPTION="GNU utilities for finding files" +HOMEPAGE="http://www.gnu.org/software/findutils/" +SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz + mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="nls selinux static" + +RDEPEND="selinux? ( sys-libs/libselinux ) + nls? ( virtual/libintl )" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext )" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-curdepth.patch #253119 + epatch "${FILESDIR}"/${P}-fts-assert.patch #253570 + + # 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 + + use selinux && epatch "${FILESDIR}/${SELINUX_PATCH}" +} + +src_compile() { + use static && append-ldflags -static + + local myconf + use userland_GNU || myconf=" --program-prefix=g" + + if echo "#include " | $(tc-getCPP) > /dev/null ; then + myconf="${myconf} --without-included-regex" + fi + + econf \ + $(use_enable nls) \ + --libexecdir=/usr/$(get_libdir)/find \ + ${myconf} \ + || die "configure failed" + emake AR="$(tc-getAR)" || die "make failed" +} + +src_install() { + emake DESTDIR="${D}" install || die + dodoc NEWS README TODO ChangeLog +} -- cgit v1.2.3-65-gdbad