From 87fb080ce8cb96a23ad4015eda5b607a608191ce Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 25 Mar 2007 18:04:11 +0000 Subject: [PATCH] Grab patch from upstream for non-portable regex flag #172146. Package-Manager: portage-2.1.2.2 --- sys-apps/file/ChangeLog | 5 ++++- sys-apps/file/Manifest | 29 ++++++++++++++-------------- sys-apps/file/file-4.20.ebuild | 7 +++++-- sys-apps/file/files/digest-file-4.20 | 3 +++ 4 files changed, 27 insertions(+), 17 deletions(-) diff --git a/sys-apps/file/ChangeLog b/sys-apps/file/ChangeLog index 8f5b115ec3e7..697812d1b2e9 100644 --- a/sys-apps/file/ChangeLog +++ b/sys-apps/file/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/file # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.134 2007/03/23 18:44:16 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.135 2007/03/25 18:04:11 vapier Exp $ + + 25 Mar 2007; Mike Frysinger file-4.20.ebuild: + Grab patch from upstream for non-portable regex flag #172146. 23 Mar 2007; Tobias Scherbaum file-4.20.ebuild: Stable on ppc wrt bug #171452. diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest index 19097440b18a..6cdb376d0b10 100644 --- a/sys-apps/file/Manifest +++ b/sys-apps/file/Manifest @@ -27,6 +27,7 @@ RMD160 047771fe06c524610e832fbb11a97e2c4915376b files/misc.magic 71 SHA256 d1eae7e2b67739581d9aa5cc57ea78368b9c82f02cf07422ab1ce2ad575b03b7 files/misc.magic 71 DIST file-4.19.tar.gz 546805 RMD160 d8dbf2686eaef5bb1cb9467198acd3a4c5735ca7 SHA1 035c2ddf46e1a80e8ddec8e74601d9d2ee4f6ce3 SHA256 697250abdbcaf850728791a475a917d84287f7e2d67bab90021775db600c4d85 DIST file-4.20.tar.gz 548393 RMD160 ff4f1a677a6377df3d7925ab4e36fec71dd3ebe7 SHA1 af5878e3c61c725a82ff185fcef5b631ad8468ab SHA256 c0810fb3ddb6cb73c9ff045965e542af6e3eaa7f2995b3037181766d26d5e6e7 +DIST patch-4.20-REG_STARTEND 1119 RMD160 30ca934188bafe6fbe3967c1aee980bd7710b0b1 SHA1 4470ba5651e7a41ce8b30114a750a4479b6efe66 SHA256 add836395ad07c2b60697eb5f9b24a2dbf26746c7b4b18330afe4ca147b759e2 EBUILD file-4.19-r1.ebuild 1487 RMD160 26580dbe4c84f24e07691dd34e6984c39f232b55 SHA1 7871720547c6506aa0b38f2a130a5eb7eb38b39c SHA256 dcd64813e988219d2899139bd4562e189fe8100e0d893ad43d46d24f09119817 MD5 68d41b148d77487ceb2fcfff0444787e file-4.19-r1.ebuild 1487 RMD160 26580dbe4c84f24e07691dd34e6984c39f232b55 file-4.19-r1.ebuild 1487 @@ -35,14 +36,14 @@ EBUILD file-4.19.ebuild 1368 RMD160 afe96926cb31b625d77f0b155655e7ff0278573b SHA MD5 31608bb46cc53c56cdf3ed6eac024359 file-4.19.ebuild 1368 RMD160 afe96926cb31b625d77f0b155655e7ff0278573b file-4.19.ebuild 1368 SHA256 103654e856a1d0564ac1073601a2da420116cfd42b7d1b17403f79dc845aa242 file-4.19.ebuild 1368 -EBUILD file-4.20.ebuild 1611 RMD160 ffee01741ab914176a44c99cc4010c279e06b78c SHA1 1c7803d7860e8fcf7f5a8344efe23196ed3b1f57 SHA256 f3a1e7104ac98ed1b89329a0107ad260d1d0a36ffdf565ca20aaa5294b3e2ef6 -MD5 529e23d34ee36e64cfb246f31efc8af5 file-4.20.ebuild 1611 -RMD160 ffee01741ab914176a44c99cc4010c279e06b78c file-4.20.ebuild 1611 -SHA256 f3a1e7104ac98ed1b89329a0107ad260d1d0a36ffdf565ca20aaa5294b3e2ef6 file-4.20.ebuild 1611 -MISC ChangeLog 15972 RMD160 a9e0de31e2723a270484773747545c5a7b9a81d7 SHA1 a4731bc10468fdd055ccfd85ba19b74179d25184 SHA256 5bf0a5954d9896ef4704df9d930926fda6fc99d7f88ab848fa2eed1053d062f9 -MD5 d6b19772a1353393d9d22d0613aea440 ChangeLog 15972 -RMD160 a9e0de31e2723a270484773747545c5a7b9a81d7 ChangeLog 15972 -SHA256 5bf0a5954d9896ef4704df9d930926fda6fc99d7f88ab848fa2eed1053d062f9 ChangeLog 15972 +EBUILD file-4.20.ebuild 1735 RMD160 ec4734e74299aed97e4708e5d41f31938a789812 SHA1 0812c3f2ad9c981e41754cd4d51d6a31799f12bb SHA256 a69cf3ccda3132726963d2c2febbad3824b04106b8956d74e59c3f3f3e7d67c9 +MD5 8f84503f8daadd3f4fe266309a1a1ac2 file-4.20.ebuild 1735 +RMD160 ec4734e74299aed97e4708e5d41f31938a789812 file-4.20.ebuild 1735 +SHA256 a69cf3ccda3132726963d2c2febbad3824b04106b8956d74e59c3f3f3e7d67c9 file-4.20.ebuild 1735 +MISC ChangeLog 16101 RMD160 8b07226bdecdd0ceab9457deef9df4842dc340a6 SHA1 0c472516cd68ab6e3abf9ba37780907b9d6aee71 SHA256 0298fe694900e23f81d823346a50294120977a20ef5e38f909a7f459b002b5a2 +MD5 8713db8164c1d830c002659253c5656b ChangeLog 16101 +RMD160 8b07226bdecdd0ceab9457deef9df4842dc340a6 ChangeLog 16101 +SHA256 0298fe694900e23f81d823346a50294120977a20ef5e38f909a7f459b002b5a2 ChangeLog 16101 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 @@ -53,13 +54,13 @@ SHA256 03615d11f17c1aa0b2abbe73afd5788082368c641678e2b36e320aecb4c90313 files/di MD5 448defd1880eceee616ce2ec9cc867c1 files/digest-file-4.19-r1 229 RMD160 d3860786831538a1c89e86dd98b75115afe865f2 files/digest-file-4.19-r1 229 SHA256 03615d11f17c1aa0b2abbe73afd5788082368c641678e2b36e320aecb4c90313 files/digest-file-4.19-r1 229 -MD5 9eb6e4ad25ffbe88af2d54292b684abe files/digest-file-4.20 229 -RMD160 22829b39ba38d0237cb8192dff0d982fc099ce73 files/digest-file-4.20 229 -SHA256 0cf6bc7938457159ed5b48f89844eef62b8100e1331455cd0953fb96f4ad1dd2 files/digest-file-4.20 229 +MD5 9c2718a04b0e390a5c07b0a04b0d8302 files/digest-file-4.20 473 +RMD160 8b41b9719c079c8a152ba589448066766c881cee files/digest-file-4.20 473 +SHA256 84f57e5b1daeada3ebfe1d7f6722ed6980119222741f01257d494354d62d1d82 files/digest-file-4.20 473 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFGBZn88bi6rjpTunYRAtHNAJ4gOH/0annqZCBaH/xqkUelH6p7HwCcDxzs -3sWFQ6yBWpzOVpFnD6UPh0Q= -=HZd0 +iD8DBQFGBrnB8bi6rjpTunYRAnBhAJ91u2h9zPXptnkxK6kLHARefWk9HQCgzz7A +2JLIGx5o3ETVfn/JtgSOLN8= +=4lmf -----END PGP SIGNATURE----- diff --git a/sys-apps/file/file-4.20.ebuild b/sys-apps/file/file-4.20.ebuild index 7a42a4a88acb..459c64c68f38 100644 --- a/sys-apps/file/file-4.20.ebuild +++ b/sys-apps/file/file-4.20.ebuild @@ -1,13 +1,14 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.20.ebuild,v 1.10 2007/03/24 21:36:24 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.20.ebuild,v 1.11 2007/03/25 18:04:11 vapier Exp $ inherit eutils distutils libtool flag-o-matic DESCRIPTION="identify a file's format by scanning binary data for patterns" HOMEPAGE="ftp://ftp.astron.com/pub/file/" SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz - ftp://ftp.gw.com/mirrors/pub/unix/file/${P}.tar.gz" + ftp://ftp.gw.com/mirrors/pub/unix/file/${P}.tar.gz + ftp://ftp.gw.com/mirrors/pub/unix/file/patch-4.20-REG_STARTEND" LICENSE="as-is" SLOT="0" @@ -19,6 +20,8 @@ DEPEND="" src_unpack() { unpack ${P}.tar.gz + cd "${S}"/src + epatch "${DISTDIR}"/patch-4.20-REG_STARTEND cd "${S}" epatch "${FILESDIR}"/${PN}-4.15-libtool.patch #99593 diff --git a/sys-apps/file/files/digest-file-4.20 b/sys-apps/file/files/digest-file-4.20 index c0c8e001ad85..8ecf19e146e2 100644 --- a/sys-apps/file/files/digest-file-4.20 +++ b/sys-apps/file/files/digest-file-4.20 @@ -1,3 +1,6 @@ MD5 402bdb26356791bd5d277099adacc006 file-4.20.tar.gz 548393 RMD160 ff4f1a677a6377df3d7925ab4e36fec71dd3ebe7 file-4.20.tar.gz 548393 SHA256 c0810fb3ddb6cb73c9ff045965e542af6e3eaa7f2995b3037181766d26d5e6e7 file-4.20.tar.gz 548393 +MD5 119b5fd6c60eede06ef909aa13fd65d2 patch-4.20-REG_STARTEND 1119 +RMD160 30ca934188bafe6fbe3967c1aee980bd7710b0b1 patch-4.20-REG_STARTEND 1119 +SHA256 add836395ad07c2b60697eb5f9b24a2dbf26746c7b4b18330afe4ca147b759e2 patch-4.20-REG_STARTEND 1119 -- 2.26.2