diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-01-07 20:34:40 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-01-07 20:34:40 +0000 |
| commit | ecfba8043883f663693ba48a65b34de40e0539d0 (patch) | |
| tree | fa211421e6163980c086e7071efb1e4fbc84896f | |
| parent | old (diff) | |
| download | gentoo-2-ecfba8043883f663693ba48a65b34de40e0539d0.tar.gz gentoo-2-ecfba8043883f663693ba48a65b34de40e0539d0.tar.bz2 gentoo-2-ecfba8043883f663693ba48a65b34de40e0539d0.zip | |
Version bump.
(Portage version: 2.2.0_alpha13/cvs/Linux x86_64)
| -rw-r--r-- | sys-fs/dosfstools/ChangeLog | 10 | ||||
| -rw-r--r-- | sys-fs/dosfstools/dosfstools-3.0.11.ebuild | 35 | ||||
| -rw-r--r-- | sys-fs/dosfstools/files/dosfstools-3.0.11-name-ext.patch | 29 |
3 files changed, 72 insertions, 2 deletions
diff --git a/sys-fs/dosfstools/ChangeLog b/sys-fs/dosfstools/ChangeLog index 82c8a05a4a6b..936b9364b88b 100644 --- a/sys-fs/dosfstools/ChangeLog +++ b/sys-fs/dosfstools/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-fs/dosfstools -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/ChangeLog,v 1.79 2010/10/12 17:12:56 armin76 Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/ChangeLog,v 1.80 2011/01/07 20:34:40 vapier Exp $ + +*dosfstools-3.0.11 (07 Jan 2011) + + 07 Jan 2011; Mike Frysinger <vapier@gentoo.org> +dosfstools-3.0.11.ebuild, + +files/dosfstools-3.0.11-name-ext.patch: + Version bump. 12 Oct 2010; Raúl Porcel <armin76@gentoo.org> dosfstools-3.0.9.ebuild: alpha/ia64/s390/sh/sparc stable wrt #338103 diff --git a/sys-fs/dosfstools/dosfstools-3.0.11.ebuild b/sys-fs/dosfstools/dosfstools-3.0.11.ebuild new file mode 100644 index 000000000000..63ffffc4783a --- /dev/null +++ b/sys-fs/dosfstools/dosfstools-3.0.11.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/dosfstools-3.0.11.ebuild,v 1.1 2011/01/07 20:34:40 vapier Exp $ + +EAPI="2" + +inherit toolchain-funcs flag-o-matic + +DESCRIPTION="DOS filesystem tools - provides mkdosfs, mkfs.msdos, mkfs.vfat" +HOMEPAGE="http://www.daniel-baumann.ch/software/dosfstools/" +SRC_URI="http://www.daniel-baumann.ch/software/dosfstools/${P}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="" +RESTRICT="test" # there is no test target #239071 + +src_prepare() { + epatch "${FILESDIR}"/${PN}-3.0.11-name-ext.patch + sed -i \ + -e '/^PREFIX/s:/local::' \ + -e '/^OPTFLAGS/s:=.*:=:' \ + Makefile || die + append-lfs-flags + tc-export CC +} + +src_install() { + emake DESTDIR="${D}" install || die + dodir /sbin + mv "${D}"/usr/sbin/*fsck* "${D}"/sbin/ || die + mv "${D}"/usr/share/doc/{${PN},${PF}} || die + prepalldocs +} diff --git a/sys-fs/dosfstools/files/dosfstools-3.0.11-name-ext.patch b/sys-fs/dosfstools/files/dosfstools-3.0.11-name-ext.patch new file mode 100644 index 000000000000..153b3a7ee856 --- /dev/null +++ b/sys-fs/dosfstools/files/dosfstools-3.0.11-name-ext.patch @@ -0,0 +1,29 @@ +avoid fortify warnings about going beyond array bounds as the strcmp +assumes name[8] and ext[3] are together + +--- src/check.c ++++ src/check.c +@@ -257,7 +257,7 @@ + { + int i, spc, suspicious = 0; + char *bad_chars = atari_format ? "*?\\/:" : "*?<>|\"\\/:"; +- unsigned char *name = file->dir_ent.name; ++ unsigned char *name = file->dir_ent.name_ext; + + /* Do not complain about (and auto-correct) the extended attribute files + * of OS/2. */ +--- src/dosfsck.h ++++ src/dosfsck.h +@@ -139,7 +139,12 @@ + }; + + typedef struct { ++ union { ++ struct { + __u8 name[8],ext[3]; /* name and extension */ ++ }; ++ __u8 name_ext[11]; ++ }; + __u8 attr; /* attribute bits */ + __u8 lcase; /* Case for base and extension */ + __u8 ctime_ms; /* Creation time, milliseconds */ |