Fix from upstream for detection of block devices with -s #108287 by Preston Crow.

Package-Manager: portage-2.0.53_rc4

diff --git a/sys-apps/file/ChangeLog b/sys-apps/file/ChangeLog
index d73f14c085ff81c79a0a230975adc75045ecc455..582cfd4b5ade5c72c49845051dd60c49afab35a2 100644 (file)
--- a/sys-apps/file/ChangeLog
+++ b/sys-apps/file/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/file
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.90 2005/09/17 08:13:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.91 2005/10/08 16:16:21 vapier Exp $
+
+*file-4.15-r1 (08 Oct 2005)
+
+  08 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/file-4.15-cracklib-magic.patch, +file-4.15-r1.ebuild:
+  Fix from upstream for detection of block devices with -s #108287 by Preston
+  Crow.
 
   17 Sep 2005; Mike Frysinger <vapier@gentoo.org>
   +files/file-4.15-empty-mime-buffer.patch, file-4.15.ebuild:

diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 10b9b24c869de5b2dd3f2cc0b3971d900e02ac89..fbd510bf0e88bdeac3edb6af2b0860ca8453902b 100644 (file)
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,26 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 2bd4b86f2bf7e6f99952ae5339ea8183 ChangeLog 11595
 MD5 c6073a11ea3fcb5cc0d1625a54aad8d4 file-4.12.ebuild 2081
-MD5 d46373392481ffa4240b13570efa88dd file-4.15.ebuild 1449
 MD5 213bc8ded7a22b2fcb129f4ee60e892c file-4.13.ebuild 2226
-MD5 fb6809aab87e2eba25ea6e5d3128dacc ChangeLog 11366
-MD5 f856a50dada76a4ca5cee58fbd04e76b files/file-4.13-cross-compile.patch 964
-MD5 a952f0eca26a046e4b815529d2b734ef files/misc.magic 71
-MD5 cbb2d6e5512eb5f33299107848ca9e30 files/file-4.15-empty-mime-buffer.patch 708
+MD5 7b53e1d21af2cb92d83127a3765386bf file-4.15-r1.ebuild 1508
+MD5 d46373392481ffa4240b13570efa88dd file-4.15.ebuild 1449
+MD5 f0f2d2181cac822f0c4d4675fb1ff38c files/cracklib.magic 360
+MD5 d336b3490362624aec2e30679c44a198 files/digest-file-4.12 61
 MD5 407c20e1fb3186144d6c7d2788714163 files/digest-file-4.13 61
+MD5 56c4aa931e56a129d1c631c52a3b6d67 files/digest-file-4.15 61
+MD5 56c4aa931e56a129d1c631c52a3b6d67 files/digest-file-4.15-r1 61
+MD5 f856a50dada76a4ca5cee58fbd04e76b files/file-4.13-cross-compile.patch 964
 MD5 7a96e5548d52493366ab39f1c6ae9237 files/file-4.13-ia64.patch 530
 MD5 13c1a487996e5e26560f9feaae56e811 files/file-4.14-gcc2.patch 494
-MD5 56c4aa931e56a129d1c631c52a3b6d67 files/digest-file-4.15 61
-MD5 d336b3490362624aec2e30679c44a198 files/digest-file-4.12 61
-MD5 f0f2d2181cac822f0c4d4675fb1ff38c files/cracklib.magic 360
+MD5 26e3155407a33adebfc7ed7d06a59988 files/file-4.15-cracklib-magic.patch 352
+MD5 cbb2d6e5512eb5f33299107848ca9e30 files/file-4.15-empty-mime-buffer.patch 708
 MD5 26f26c3f7caf28f0bdb9dbb6fe83c254 files/file-4.15-libtool.patch 561
 MD5 66df8eecd30769daeb3f643dc6432db3 files/file-4.xx-mips-gentoo.patch 5578
+MD5 a952f0eca26a046e4b815529d2b734ef files/misc.magic 71
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDK9AwgIKl8Uu19MoRAlMyAJoCWz5sQzWzJNT1BzqbIDdVlbBJ8ACfQBt8
-xi5Ppbv9Xp4sCVmU2BK9kAk=
-=ddtK
+iD8DBQFDR/FJgIKl8Uu19MoRApwLAJ9XPxhlMyMz9DcZQ69H7XGnoWgFsACfago+
+TlkiXctfABjA5CF517mU2tY=
+=14P9
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/file/file-4.15-r1.ebuild b/sys-apps/file/file-4.15-r1.ebuild
new file mode 100644 (file)
index 0000000..e7ef58a
--- /dev/null
+++ b/sys-apps/file/file-4.15-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.15-r1.ebuild,v 1.1 2005/10/08 16:16:21 vapier Exp $
+
+inherit distutils libtool
+
+DESCRIPTION="identify a file's format by scanning binary data for patterns"
+HOMEPAGE="ftp://ftp.astron.com/pub/file/"
+SRC_URI="ftp://ftp.gw.com/mirrors/pub/unix/file/${P}.tar.gz
+       ftp://ftp.astron.com/pub/file/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="python build"
+
+DEPEND=""
+
+src_unpack() {
+       unpack ${P}.tar.gz
+       cd "${S}"
+
+       epatch "${FILESDIR}"/${P}-empty-mime-buffer.patch #106152
+       epatch "${FILESDIR}"/${P}-libtool.patch #99593
+       epatch "${FILESDIR}"/${P}-cracklib-magic.patch #108287
+       elibtoolize
+
+       # make sure python links against the current libmagic #54401
+       sed -i "/library_dirs/s:'\.\./src':'../src/.libs':" python/setup.py
+
+       # dont let python README kill main README #60043
+       mv python/README{,.python}
+}
+
+src_compile() {
+       econf --datadir=/usr/share/misc || die
+       emake || die "emake failed"
+
+       use build && return 0
+       use python && cd python && distutils_src_compile
+}
+
+src_install() {
+       make DESTDIR="${D}" install || die "make install failed"
+
+       if ! use build ; then
+               dodoc ChangeLog MAINT README
+               use python && cd python && distutils_src_install
+       fi
+}
+
+pkg_postinst() {
+       use python && distutils_pkg_postinst
+}
+
+pkg_postrm() {
+       use python && distutils_pkg_postrm
+}

diff --git a/sys-apps/file/files/digest-file-4.15-r1 b/sys-apps/file/files/digest-file-4.15-r1
new file mode 100644 (file)
index 0000000..e534cb0
--- /dev/null
+++ b/sys-apps/file/files/digest-file-4.15-r1
@@ -0,0 +1 @@
+MD5 09a6603dadbe06e577e98a2547201fab file-4.15.tar.gz 546522

diff --git a/sys-apps/file/files/file-4.15-cracklib-magic.patch b/sys-apps/file/files/file-4.15-cracklib-magic.patch
new file mode 100644 (file)
index 0000000..38a74d4
--- /dev/null
+++ b/sys-apps/file/files/file-4.15-cracklib-magic.patch
@@ -0,0 +1,10 @@
+--- magic/Magdir/cracklib
++++ magic/Magdir/cracklib
+@@ -8,6 +8,5 @@
+ >>8   long    >-1             (%i words)
+ 0     belong  0x70775631      Cracklib password index, big endian
+ >4    belong  >-1             (%i words)
+-0     long    0
+->4    belong  0x70775631      Cracklib password index, big endian ("64-bit")
++4     belong  0x70775631      Cracklib password index, big endian ("64-bit")
+ >12   belong  >0              (%i words)