commit: b558b3736aba9f91abd8ece97286073a332f46e0 Author: stefson <herrtimson <AT> yahoo <DOT> de> AuthorDate: Sat Oct 15 13:42:02 2016 +0000 Commit: Felix Janda <felix.janda <AT> posteo <DOT> de> CommitDate: Sat Oct 15 17:37:47 2016 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=b558b373
sys-fs/dosfstools: sync with tree, add patch to fix path-max sys-fs/dosfstools/Manifest | 10 ++--- sys-fs/dosfstools/dosfstools-3.0.28-r99.ebuild | 29 ------------- sys-fs/dosfstools/dosfstools-4.0-r1.ebuild | 49 ++++++++++++++++++++++ ...tools-3.0.27-Fix-format-string-in-check.c.patch | 25 ----------- .../dosfstools-3.0.28-fix_build_with_musl.patch | 25 ----------- .../dosfstools-4.0-fix-path-max-with-musl.patch | 11 +++++ .../dosfstools/files/dosfstools-4.0-udevlibs.patch | 36 ++++++++++++++++ sys-fs/dosfstools/metadata.xml | 3 ++ 8 files changed, 104 insertions(+), 84 deletions(-) diff --git a/sys-fs/dosfstools/Manifest b/sys-fs/dosfstools/Manifest index 7ec6953..c18af4d 100644 --- a/sys-fs/dosfstools/Manifest +++ b/sys-fs/dosfstools/Manifest @@ -1,5 +1,5 @@ -AUX dosfstools-3.0.27-Fix-format-string-in-check.c.patch 886 SHA256 44f80903b89d69d51ec71fb0fb1a1a560c5e795c8c9a3a25e8d84ac81cf423fa SHA512 d278ba4fbf79bfd1490c1f693113da5e047a394b639e3ca29e13e98604dddecf61c860e9dc1a0ef9b84c97c1d467a05d61a9e9e8942d24ca8dfe39e05599bfb4 WHIRLPOOL fa2bd8339a3cab8787ada26ab2df54af5e27c980dd33761aa7d603d115053f8b756ff7252d8168280579d99d5287ae88c6e313c2f92a31c397f3014fb0d17e28 -AUX dosfstools-3.0.28-fix_build_with_musl.patch 815 SHA256 fb8cafac2fc31b726aa5a8a74b29554a6865a6b92fb8aacf01fafc630dcc18bd SHA512 f1bc61db4f28ceb70ec30be007ca1b67616b61ec44c82cb373d83803fa8a075cc051ae77a002ed487764f2623309db6d61b5bbb9a5764d48511feeaf2ef6fb54 WHIRLPOOL 1627ff041848a67f768ec6e706f22c7dded41992499694e073107d5cad745f5c452f2d69ec4e8d3be5d0231152e96fc52a3af088e8a0900ce01cf6d0b65a7409 -DIST dosfstools-3.0.28.tar.xz 82980 SHA256 ee95913044ecf2719b63ea11212917649709a6e53209a72d622135aaa8517ee2 SHA512 7325a9e05f51715b358cab0a8fa8f8096422b470f1a43eecfab2adbb954e1daf6a24003121be5b3a22de5fcb3e3adffbf1551e2158852b6663fd57a109f057ad WHIRLPOOL b584aa1dee4db96c04f19b6ac46b6322c533fcadbafb09546412e4d6a7568e23abe6985389dc446dacbe2d14f36dd7a8b52fc83b93ab1f5864b4b61f14f6ffd0 -EBUILD dosfstools-3.0.28-r99.ebuild 844 SHA256 2264bc8fe97438fb6e3e425d4dbf989c705bfe41eddf5ee42caa5011fe8bf6e2 SHA512 f038ca907284f5fd751789fa977e147f70091b2a55e2659feec61fb51ad239ed1d40438dfc77138663ad67f124f6f144b933aa3713feeccd3ac40a3d64f97c12 WHIRLPOOL 457728dbbcc04b5cfd1ebd71059ef8256e60bd9149a5a141c7d7c655d388fbd78205a4e233b26cf7d11c2ecf67aca571e9fac6274593ad21ac8e0db048e1912e -MISC metadata.xml 336 SHA256 3ade627f556b298b7ecbb4752b605e9293190a363bccf4d7a8a5b37e1bd011ca SHA512 9b4ff28a14cb214c99ee641b052685ae7557049e1489bcb7db3d237ba5f5d01583fb25d3e5b9830fbeac07935e7198b832c31355c06e9ab05fd6062025c6dffc WHIRLPOOL 78e62036184ef7a82fc4047073edc738bfac3fb4762095284df91a4bfb09937a66ca96fc31ff1d4914c024ef27dc5aebbe800bae219a7b47a56a74f91992e02e +AUX dosfstools-4.0-fix-path-max-with-musl.patch 164 SHA256 7076041b498d9d88b2bd652a7051def2fb5029a58051dfcf87fbe3df23ad1a61 SHA512 b9283f15dd56f465db08a4ad167f6c50a0b267a7f05caebbfadda0fb70e76bee043bb7158fd00a7c49c8fdb70f89064a7d5a0627608e37d90cccd47f1ffe350a WHIRLPOOL f4b9384cb0583cfe45b98b90fee21f41db160e84fbf51c3ffe350555f9d46e2e642a42404dadcff4ae934d6bbe91f3f0cbc47f10069c074b8f984301ad934b24 +AUX dosfstools-4.0-udevlibs.patch 1132 SHA256 5b06733ca41ef9def498cb75c1636f473b2624c6f8cb9334092cbb0c933b712a SHA512 0ae6fac866f4f634ed733279859c039f789d8420401217c039c06c995cd0be1fc697b24353135ee5c7abf04e4638c810726f0a310979251dd126e70c76739928 WHIRLPOOL d6bfebe17ec7741661409fe9e25a353059792d61f1a0698d01d5382062bcf8201833b1c6f642790adea1cd83c9cce45629002a8cf53eb7ac30cf09efe02e9b1e +DIST dosfstools-4.0.tar.xz 157564 SHA256 9037738953559d1efe04fc5408b6846216cc0138f7f9d32de80b6ec3c35e7daf SHA512 81acf54dc87e1a8b436848b0c8c596c8b9a2f334c5b3e5496547feb243b70ef320a621a9b5afaa8b054f45a5c2184fae9ae167019f2f83aba417a10954a23a58 WHIRLPOOL eb6de4523ff2fbc7161bd75e0983148faf85d700489647ad8792abd4fb41503b85b2b2b6feb684a14d37c0c04d0307a5d885f5010f8ba386037a8e9eea512f85 +EBUILD dosfstools-4.0-r1.ebuild 1197 SHA256 b2c36c32acf35c724fb2f60f7f8577ef609e1ebb8e485dda320df45042f45e26 SHA512 2aac5ba6e2797a32f4b187a03142c460662a90c670ada66734d2af04aebd04de803bb43daa3bf08318a8113d7062aae9f607a97c2c6c657eb1df7dea663f97ac WHIRLPOOL 679e670eebd8691b0e327dc01f9ff7ee0338a7a4bf6b3c2040ef35d53de38fff2f7b9275fab36b392c39e516f642143786a442ea4d6eb09dc2e00c242ea00b2f +MISC metadata.xml 424 SHA256 821cc5f833e124bfe1fae683127cd2276a69f49870ea3a9748227311aae6cd74 SHA512 d82795b70fc583b8154a2c3b14b6565cff36924b91fb3888cd2b6c36d8036614be6d67a0ea0fc96f2fa4bfa5516675b8aa74571e578ad8d42c06cb9f503c565d WHIRLPOOL 2555be401c8c866a5182345476c65b148f7b8c2d43c380dcbe3b003258895e82dc49741d773ee5613c0e398a91698c16780261b2839ee566a1cc02eb349053a3 diff --git a/sys-fs/dosfstools/dosfstools-3.0.28-r99.ebuild b/sys-fs/dosfstools/dosfstools-3.0.28-r99.ebuild deleted file mode 100644 index ca2f118..0000000 --- a/sys-fs/dosfstools/dosfstools-3.0.28-r99.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -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="https://github.com/dosfstools/dosfstools/releases/download/v${PV}/${P}.tar.xz"; - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm ~mips ~ppc ~x86" -RESTRICT="test" # there is no test target #239071 - -src_prepare() { - sed -i \ - -e "/^PREFIX/s:=.*:= ${EPREFIX}/usr:" \ - -e '/^OPTFLAGS/d' \ - -e '/^DEBUGFLAGS/d' \ - -e "/\$(DOCDIR)/s:${PN}:${PF}:" \ - Makefile || die - epatch "${FILESDIR}"/${PN}-3.0.27-Fix-format-string-in-check.c.patch - epatch "${FILESDIR}"/${PN}-3.0.28-fix_build_with_musl.patch - append-lfs-flags - tc-export CC -} diff --git a/sys-fs/dosfstools/dosfstools-4.0-r1.ebuild b/sys-fs/dosfstools/dosfstools-4.0-r1.ebuild new file mode 100644 index 0000000..4aac0ed --- /dev/null +++ b/sys-fs/dosfstools/dosfstools-4.0-r1.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit autotools toolchain-funcs flag-o-matic + +DESCRIPTION="DOS filesystem tools - provides mkdosfs, mkfs.msdos, mkfs.vfat" +HOMEPAGE="https://github.com/dosfstools/dosfstools"; +SRC_URI="https://github.com/dosfstools/dosfstools/releases/download/v${PV}/${P}.tar.xz"; + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" +IUSE="compat +udev" + +CDEPEND="udev? ( virtual/libudev )" +DEPEND="${CDEPEND} + udev? ( virtual/pkgconfig )" +RDEPEND="${CDEPEND}" + +RESTRICT="test" # there is no test target #239071 + +PATCHES=( + "${FILESDIR}/${P}-udevlibs.patch" + "${FILESDIR}/${PN}-4.0-fix-path-max-with-musl.patch" +) + +src_prepare() { + epatch "${PATCHES[@]}" + eautoreconf +} + +src_configure() { + econf \ + --docdir="${EPREFIX}"/usr/share/doc/${PF} \ + $(use_enable compat compat-symlinks) \ + $(use_with udev) +} + +src_install() { + default + if ! use compat; then + # Keep fsck -t vfat and mkfs -t vfat working, bug 584980. + dosym fsck.fat /usr/sbin/fsck.vfat + dosym mkfs.fat /usr/sbin/mkfs.vfat + fi +} diff --git a/sys-fs/dosfstools/files/dosfstools-3.0.27-Fix-format-string-in-check.c.patch b/sys-fs/dosfstools/files/dosfstools-3.0.27-Fix-format-string-in-check.c.patch deleted file mode 100644 index 8a5bbb6..0000000 --- a/sys-fs/dosfstools/files/dosfstools-3.0.27-Fix-format-string-in-check.c.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 04d5d990904df782a7a774827e0c860eac640272 Mon Sep 17 00:00:00 2001 -From: Hinnerk van Bruinehsen <[email protected]> -Date: Thu, 16 Apr 2015 14:19:57 +0000 -Subject: [PATCH 2/2] Fix format string in check.c - ---- - src/check.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/check.c b/src/check.c -index d8880a8..bb783e5 100644 ---- a/src/check.c -+++ b/src/check.c -@@ -582,7 +582,7 @@ static int check_file(DOS_FS * fs, DOS_FILE * file) - if (!(file->dir_ent.attr & ATTR_DIR) && le32toh(file->dir_ent.size) <= - (uint64_t)clusters * fs->cluster_size) { - printf -- ("%s\n File size is %u bytes, cluster chain length is > %lu " -+ ("%s\n File size is %u bytes, cluster chain length is > %llu " - "bytes.\n Truncating file to %u bytes.\n", path_name(file), - le32toh(file->dir_ent.size), - (uint64_t)clusters * fs->cluster_size, --- -2.3.5 - diff --git a/sys-fs/dosfstools/files/dosfstools-3.0.28-fix_build_with_musl.patch b/sys-fs/dosfstools/files/dosfstools-3.0.28-fix_build_with_musl.patch deleted file mode 100644 index b495378..0000000 --- a/sys-fs/dosfstools/files/dosfstools-3.0.28-fix_build_with_musl.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/Makefile b/Makefile -index f22a4c5..967defe 100644 ---- a/Makefile -+++ b/Makefile -@@ -30,7 +30,7 @@ MANDIR = $(PREFIX)/share/man - #OPTFLAGS = -O2 -fomit-frame-pointer -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 - #WARNFLAGS = -Wall -pedantic -std=c99 - WARNFLAGS = -Wall -Wextra -Wno-sign-compare -Wno-missing-field-initializers -Wmissing-prototypes -Wstrict-prototypes -Wwrite-strings --CFLAGS += $(OPTFLAGS) $(WARNFLAGS) $(DEBUGFLAGS) -+CFLAGS += $(OPTFLAGS) $(WARNFLAGS) $(DEBUGFLAGS) -D _GNU_SOURCE - - VPATH = src - -diff --git a/src/mkfs.fat.c b/src/mkfs.fat.c -index b38d116..7e6c996 100644 ---- a/src/mkfs.fat.c -+++ b/src/mkfs.fat.c -@@ -60,6 +60,7 @@ - #include <sys/ioctl.h> - #include <sys/stat.h> - #include <sys/time.h> -+#include <sys/types.h> - #include <unistd.h> - #include <time.h> - #include <errno.h> diff --git a/sys-fs/dosfstools/files/dosfstools-4.0-fix-path-max-with-musl.patch b/sys-fs/dosfstools/files/dosfstools-4.0-fix-path-max-with-musl.patch new file mode 100644 index 0000000..f1fbefa --- /dev/null +++ b/sys-fs/dosfstools/files/dosfstools-4.0-fix-path-max-with-musl.patch @@ -0,0 +1,11 @@ +--- src/device_info.c.orig ++++ src/device_info.c +@@ -17,6 +17,7 @@ + */ + + ++#include <limits.h> + #include <stdint.h> + #include <stdbool.h> + #include <sys/types.h> + diff --git a/sys-fs/dosfstools/files/dosfstools-4.0-udevlibs.patch b/sys-fs/dosfstools/files/dosfstools-4.0-udevlibs.patch new file mode 100644 index 0000000..2320477 --- /dev/null +++ b/sys-fs/dosfstools/files/dosfstools-4.0-udevlibs.patch @@ -0,0 +1,36 @@ +From 7538785afd751de509cd00740adf57fc6d730e33 Mon Sep 17 00:00:00 2001 +From: Lars Wendler <[email protected]> +Date: Tue, 10 May 2016 09:47:57 +0200 +Subject: [PATCH] Don't link to udev via LDFLAGS. There's LDADD for such a + task. + +See also: +https://www.gnu.org/software/automake/manual/html_node/Linking.html + +Signed-off-by: Lars Wendler <[email protected]> +--- + src/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 3d22ba7..a15e6e7 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -34,12 +34,12 @@ mkfs_common_sources = device_info.c device_info.h \ + mkfs_fat_SOURCES = mkfs.fat.c msdos_fs.h $(mkfs_common_sources) + mkfs_fat_CPPFLAGS = -I$(srcdir)/blkdev + mkfs_fat_CFLAGS = $(AM_CFLAGS) $(UDEV_CFLAGS) +-mkfs_fat_LDFLAGS = $(UDEV_LIBS) ++mkfs_fat_LDADD = $(UDEV_LIBS) + + testdevinfo_SOURCES = testdevinfo.c $(mkfs_common_sources) + testdevinfo_CPPFLAGS = -I$(srcdir)/blkdev + testdevinfo_CFLAGS = $(AM_CFLAGS) $(UDEV_CFLAGS) +-testdevinfo_LDFLAGS = $(UDEV_LIBS) ++testdevinfo_LDADD = $(UDEV_LIBS) + + + if COMPAT_SYMLINKS +-- +2.8.2 + diff --git a/sys-fs/dosfstools/metadata.xml b/sys-fs/dosfstools/metadata.xml index 7d74eb8..ffedbfb 100644 --- a/sys-fs/dosfstools/metadata.xml +++ b/sys-fs/dosfstools/metadata.xml @@ -8,4 +8,7 @@ <upstream> <remote-id type="github">dosfstools/dosfstools</remote-id> </upstream> +<use> + <flag name="compat">Install symlinks for legacy names of the tools</flag> +</use> </pkgmetadata>
