diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2013-01-23 19:05:17 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2013-01-23 19:05:17 +0000 |
commit | fa319cabc635c7a6f3ffcbb836850a780be60ddc (patch) | |
tree | b4ab8e8bf2b2cef2121654be9750dd3072846bff /sys-fs | |
parent | Version bump. Bug #436136 (diff) | |
download | gentoo-2-fa319cabc635c7a6f3ffcbb836850a780be60ddc.tar.gz gentoo-2-fa319cabc635c7a6f3ffcbb836850a780be60ddc.tar.bz2 gentoo-2-fa319cabc635c7a6f3ffcbb836850a780be60ddc.zip |
old
(Portage version: 2.2.0_alpha155/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'sys-fs')
-rw-r--r-- | sys-fs/dosfstools/ChangeLog | 9 | ||||
-rw-r--r-- | sys-fs/dosfstools/dosfstools-3.0.10.ebuild | 34 | ||||
-rw-r--r-- | sys-fs/dosfstools/dosfstools-3.0.11.ebuild | 35 | ||||
-rw-r--r-- | sys-fs/dosfstools/dosfstools-3.0.9.ebuild | 34 | ||||
-rw-r--r-- | sys-fs/dosfstools/files/dosfstools-3.0.11-name-ext.patch | 29 |
5 files changed, 7 insertions, 134 deletions
diff --git a/sys-fs/dosfstools/ChangeLog b/sys-fs/dosfstools/ChangeLog index 80f37e452610..503bc8f8e540 100644 --- a/sys-fs/dosfstools/ChangeLog +++ b/sys-fs/dosfstools/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-fs/dosfstools -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/ChangeLog,v 1.96 2012/10/05 17:57:47 ranger Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/ChangeLog,v 1.97 2013/01/23 19:05:16 ssuominen Exp $ + + 23 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> -dosfstools-3.0.9.ebuild, + -dosfstools-3.0.10.ebuild, -dosfstools-3.0.11.ebuild, + -files/dosfstools-3.0.11-name-ext.patch: + old 05 Oct 2012; Brent Baude <ranger@gentoo.org> dosfstools-3.0.12.ebuild: Marking dosfstools-3.0.12 ppc64 for bug 432330 diff --git a/sys-fs/dosfstools/dosfstools-3.0.10.ebuild b/sys-fs/dosfstools/dosfstools-3.0.10.ebuild deleted file mode 100644 index 78e9189d74a9..000000000000 --- a/sys-fs/dosfstools/dosfstools-3.0.10.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/dosfstools-3.0.10.ebuild,v 1.1 2010/09/20 02:06:08 jer 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() { - sed -i \ - -e '/^PREFIX/s:/local::' \ - -e '/^OPTFLAGS/s:=.*:=:' \ - Makefile || die "sed Makefile" - 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/dosfstools-3.0.11.ebuild b/sys-fs/dosfstools/dosfstools-3.0.11.ebuild deleted file mode 100644 index ebf70bef51d7..000000000000 --- a/sys-fs/dosfstools/dosfstools-3.0.11.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2012 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.4 2012/05/24 02:46:57 vapier Exp $ - -EAPI="3" - -inherit toolchain-funcs flag-o-matic eutils - -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 ~x86-linux" -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}" PREFIX="${EPREFIX}/usr" install || die - dodir /sbin - mv "${ED}"/usr/sbin/*fsck* "${ED}"/sbin/ || die - mv "${ED}"/usr/share/doc/{${PN},${PF}} || die - prepalldocs -} diff --git a/sys-fs/dosfstools/dosfstools-3.0.9.ebuild b/sys-fs/dosfstools/dosfstools-3.0.9.ebuild deleted file mode 100644 index 4d079af61189..000000000000 --- a/sys-fs/dosfstools/dosfstools-3.0.9.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/dosfstools-3.0.9.ebuild,v 1.8 2010/10/12 17:12:56 armin76 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() { - sed -i \ - -e '/^PREFIX/s:/local::' \ - -e '/^OPTFLAGS/s:=.*:=:' \ - Makefile || die "sed Makefile" - 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 deleted file mode 100644 index 153b3a7ee856..000000000000 --- a/sys-fs/dosfstools/files/dosfstools-3.0.11-name-ext.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 */ |