* [gentoo-commits] proj/musl:master commit in: sys-fs/xfsprogs/files/, sys-fs/xfsprogs/
@ 2017-01-08 22:03 Aric Belsito
0 siblings, 0 replies; 5+ messages in thread
From: Aric Belsito @ 2017-01-08 22:03 UTC (permalink / raw
To: gentoo-commits
commit: 066c70e3c99ccd778b66f112b692f1c691257a48
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Sun Jan 8 22:03:13 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Sun Jan 8 22:03:13 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=066c70e3
sys-fs/xfsprogs: Version bump to 4.9.0
sys-fs/xfsprogs/Manifest | 7 +-
sys-fs/xfsprogs/files/xfsprogs-4.7.0-musl.patch | 132 -------------------
.../files/xfsprogs-4.9.0-cross-compile.patch | 143 +++++++++++++++++++++
sys-fs/xfsprogs/files/xfsprogs-4.9.0-musl.patch | 71 ++++++++++
...xfsprogs-4.7.0.ebuild => xfsprogs-4.9.0.ebuild} | 12 +-
5 files changed, 224 insertions(+), 141 deletions(-)
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 1644488..aeb20cd 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -3,10 +3,11 @@ AUX xfsprogs-4.3.0-musl.patch 3543 SHA256 afe6ea3f95d88abc0b2c276e1c88dd8acc3bdb
AUX xfsprogs-4.3.0-sharedlibs.patch 2310 SHA256 23bf3127cd1eab6e96055d2a5f3ae61f417a8d4ae52d5c421be2bbb05576bb46 SHA512 6d7ad2bc8b74390f81ecfa3774c837d083dc7e3332bd2e5450c4d67805d54f9727afeace39755e5d1185a230abcc9644bf2eb1544708d81b4f93a419aad8fdf4 WHIRLPOOL 5adb3dbffcd788e27e228d9d04a5991a20fd4ae9b8c7e32996b33fe71451ce2a468299f5abb40ff416b8abff399a7c0f7b4d3102b10f4e6bd830b3d0b57768c8
AUX xfsprogs-4.5.0-linguas.patch 967 SHA256 79c3b0b1faacd8ec52d060f05dcf0e72b83d5892e96ab01c4e6821394e2344de SHA512 6d812dce622a3d38fe2b23e47c8f188012522dee3eaa6f002080f2b2ba8e50dc31ed8fc56d9e10b13d4f0dc54d6377b77d8a3823494176e843480e5226e79679 WHIRLPOOL 2a3de6cf5ed3463bc8299600c6c1a00dfe995d089034ae15a0a07c46e7f24507a3a98cb28641bb29a4e5193338deca1c18fa11c0bc9084b97786938ec2c19778
AUX xfsprogs-4.7.0-libxcmd-link.patch 880 SHA256 06cced4aeeb9a2d8c90e6d6fd1ff6571020122dbfe62140513f52bd82bf9abe8 SHA512 4484570c4bb387b6dfde5f31d8527f2222d33e120c365e3cbc6f488403b9e9d969d3f2a883ffcb145a11d57ace70c76fb1ba4a8ed75533f2089a197d463c8dd9 WHIRLPOOL c975535bbf431b86ee82806ce6dbfc0196d7c175d13b00aeccd747820a817169aa1d4958b62f97fb4c36a24f964692ef3ea1d3e0ff11c5cfbd04ba60ce2317df
-AUX xfsprogs-4.7.0-musl.patch 3379 SHA256 14888da03cd10f0c332bdd2868e55adad0e06f4c19de57bd88263302089e15ad SHA512 75412a92f29c62fac24c699874f27ef9e5308f549f96ad8b1062c96cfa203e817be322caa3d2afa5a6f46988bf7e930d80dbf92b7f8b0ba266bf6d7312a08a22 WHIRLPOOL de9068d3715fe971ad2f400e260376742f408782930a917fd3bdd4a8f18ca5b73521e092ae044ed477e2a489d5a7849fb0656c977363de3ebfb5793168838347
AUX xfsprogs-4.7.0-sharedlibs.patch 2355 SHA256 983b08b2a4a4ee91be21f14063167a3752554b41fd78aead6dfd6ac38702a5a7 SHA512 f0006ec0a987e44a1e60d642f9938d35c14ccb765c6a040c80e483a0e073e54608571b53793b7d4c2b9eb1f5c4e2f077fb713dfab9abaa99022d24d8a17443fe WHIRLPOOL 939841084292f598c32aa3be784d6235b6803abd86062790191b7959be73d9f8afc31cbb0d330abaee253c141dcbe0d4a4e20ae76ba64146d41acfbf7f3e0fa4
+AUX xfsprogs-4.9.0-cross-compile.patch 3640 SHA256 0686bb76b6ab822c8e733c3c1a97d7e5252274087c2435cfb8f6709f006ea746 SHA512 86d08e60bff1ea27c7692d90a1ba8b204aeb6df58afa14558ad5b429beada78bea8a526353548797e44e9959715394cdd4e53a1cd9272d32ce6bcad95cfadbe1 WHIRLPOOL 0cf805fb14e71933ad4f0e471a5a5a9232d9aaa98d9e98ce9697daafa08ad8a9ed7fef208828c5d975a6514e739b95f0ed5f5b3b0efbcf01fd6e2a0a54ac668e
+AUX xfsprogs-4.9.0-musl.patch 1844 SHA256 9b73a3147b5d54ca9ae9a79cab7cd70c410ca1c307ae45c3ffcc10ae5a3d0005 SHA512 bf5de1b5e1906cdecda64c77c83410c32ce79a494959f905861b8b8de5676ab9d30aaa1c85a8188f36f8a46d07ba3f5bef862d65d0d56d8467eb7f05c6173765 WHIRLPOOL 3cb3f97d5eac7dca57099da99bd3434764534273dc03ad58fd4cd4099dacbc05fccab53d8ac5055b860c87ca41f32a051585bb6c06c41da1d0ceb32dd23dcd4f
DIST xfsprogs-4.5.0.tar.gz 1524382 SHA256 e49beb314984efbd0d758abb5c6137db3bb60a88e59e1e94c00defb536cf89f8 SHA512 19c95551dc91ec46916f9a7e3d7976907664d32dd5fdc26af0ca62ca74c4b3c10f9e843aac8214ea9d1c0bf140c9f4e321d059808af01a623abedd5067011314 WHIRLPOOL 54d742635df024a63181da76c3220671610068363af85be2677521f20342595a5cebb2fd169945572351901ee2c9384f79f54a381ab3620dde22d863aa66d469
-DIST xfsprogs-4.7.0.tar.gz 1534909 SHA256 88580bb3e6847c3edef436703a4fae403fc19b20739db4c31166ee4b256178d7 SHA512 5184f1dbc3989f3c1f1b103d5cbd70462db107cfe113424166581ebcfaad4041c9c78f5d038f4bd4728ff99a2f9705219582ba9bfd10745354a1cab0b7dfe613 WHIRLPOOL 8157b2e8df5946acacc22ed761e38b382ef464f4984971148069b2f215418f4e23ac142721394439c041c236cbd460e0b56ff071d1c10e343070147709f42af3
+DIST xfsprogs-4.9.0.tar.xz 1087940 SHA256 f1e60a9a54583dba82fa506dd9b59bdec110a968f80f507bf5f93b263af7a4df SHA512 990946f0a34381f57afb39bcda0ff539e18af4de2ecc19c833ffd4fb7c22c25b501091c1f0953db103a62204d952c9eecba21f22f3c5910286456da65fb09fa7 WHIRLPOOL a9b582a42967ce1e314cd0ac3518792c2e10f7bb1370151a68a09a8e21e40cc6818b9778dfdd248961c3a1a08a70424f0150219488a18bc5d60e5669702c472f
EBUILD xfsprogs-4.5.0.ebuild 2943 SHA256 f4ffec8f7b659a4f6c0915fa545e946399884b6ac4c9407d81ab905a129d88d1 SHA512 2e7698b5d3b37203643c5e1bbba776f8d871fcd1c770c7aa09a61d785177751040abe2da372b7a7d4bb76d48ca1c85bd6641f7ca98feb489142534822da09f97 WHIRLPOOL c299f388ef6da99135ba26403fab96036fb9b7b1731a10207762c959b16e485791eb8418ba932f5974d69ee282ed58ab9fe6dbdfbc833bf5bb75b71d2b08db00
-EBUILD xfsprogs-4.7.0.ebuild 2795 SHA256 e374eceff3c654d90c8b185d67edd81148ad9e0c752c4daeb0cb7b4bd6939ab4 SHA512 9f471d22be91a3ff32454c942342b9b5ec7c012006d9d723275b907f1dbfc54e61499ad9d2cee7fc6e861991dc0a1774d1726ecdb1fc14337c941eae3661f057 WHIRLPOOL 39736443b5c9274443663b3fa26d9f7d902918247baf7361b46d104166ac9bf924d983fd75becb9e5da1076a7b8a83b145542bb33198e0af364c701ff8ef4673
+EBUILD xfsprogs-4.9.0.ebuild 2748 SHA256 005052e978b234249b8b2a97deb2c50e4e7706dbde121cfa8d8fb80c6003366d SHA512 71273d2f4f65eda1b8370b5e62ad7398b467701fceb63b13d55e2fa5e442967e4d22d08287a70a8a5f172a0429977f3557b9488c361c95da75acfb2ecbc130b4 WHIRLPOOL 313bd0e0369d6e5037e257bf1f9ff028639f7e1a522b78bffb95142d3863ba7353483d0c763378bbf2b1564cee92bff271d1dae4cef6e8f0bdfebf8f913a7282
MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.7.0-musl.patch b/sys-fs/xfsprogs/files/xfsprogs-4.7.0-musl.patch
deleted file mode 100644
index 0346907..0000000
--- a/sys-fs/xfsprogs/files/xfsprogs-4.7.0-musl.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff -Naur xfsprogs-4.7.0.orig/fsr/xfs_fsr.c xfsprogs-4.7.0/fsr/xfs_fsr.c
---- xfsprogs-4.7.0.orig/fsr/xfs_fsr.c 2016-08-09 12:15:13.030533264 -0700
-+++ xfsprogs-4.7.0/fsr/xfs_fsr.c 2016-08-09 12:16:06.079242655 -0700
-@@ -36,6 +36,9 @@
- #define _PATH_FSRLAST "/var/tmp/.fsrlast_xfs"
- #define _PATH_PROC_MOUNTS "/proc/mounts"
-
-+#ifndef _PATH_MOUNTED
-+#define _PATH_MOUNTED MOUNTED
-+#endif
-
- char *progname;
-
-diff -Naur xfsprogs-4.7.0.orig/include/linux.h xfsprogs-4.7.0/include/linux.h
---- xfsprogs-4.7.0.orig/include/linux.h 2016-08-09 12:15:13.033533304 -0700
-+++ xfsprogs-4.7.0/include/linux.h 2016-08-09 12:17:26.447317100 -0700
-@@ -33,6 +33,35 @@
- #include <asm/types.h>
- #include <mntent.h>
- #include <linux/fs.h> /* fsxattr defintion for new kernels */
-+#include <fcntl.h>
-+#include <stdio.h>
-+
-+#ifndef __uint8_t
-+# define __uint8_t uint8_t
-+#endif
-+#ifndef __uint16_t
-+# define __uint16_t uint16_t
-+#endif
-+#ifndef __uint32_t
-+# define __uint32_t uint32_t
-+#endif
-+#ifndef __uint64_t
-+# define __uint64_t uint64_t
-+#endif
-+
-+#ifndef __int8_t
-+# define __int8_t int8_t
-+#endif
-+#ifndef __int16_t
-+# define __int16_t int16_t
-+#endif
-+#ifndef __int32_t
-+# define __int32_t int32_t
-+#endif
-+#ifndef __int64_t
-+# define __int64_t int64_t
-+#endif
-+
-
- static __inline__ int xfsctl(const char *path, int fd, int cmd, void *p)
- {
-diff -Naur xfsprogs-4.7.0.orig/io/readdir.c xfsprogs-4.7.0/io/readdir.c
---- xfsprogs-4.7.0.orig/io/readdir.c 2016-08-09 12:15:13.038533371 -0700
-+++ xfsprogs-4.7.0/io/readdir.c 2016-08-09 12:18:16.185982058 -0700
-@@ -24,6 +24,18 @@
- #include <sys/types.h>
- #include <dirent.h>
-
-+#if defined (__linux__)
-+# ifndef _DIRENT_HAVE_D_OFF
-+# define _DIRENT_HAVE_D_OFF
-+# endif
-+# ifndef _DIRENT_HAVE_D_RECLEN
-+# define _DIRENT_HAVE_D_RECLEN
-+# endif
-+# ifndef _DIRENT_HAVE_D_TYPE
-+# define _DIRENT_HAVE_D_TYPE
-+# endif
-+#endif
-+
- static struct cmdinfo readdir_cmd;
-
- const char *d_type_str(unsigned int type)
-diff -Naur xfsprogs-4.7.0.orig/libxfs/linux.c xfsprogs-4.7.0/libxfs/linux.c
---- xfsprogs-4.7.0.orig/libxfs/linux.c 2016-08-09 12:15:13.043533438 -0700
-+++ xfsprogs-4.7.0/libxfs/linux.c 2016-08-09 12:23:08.978520714 -0700
-@@ -16,11 +16,8 @@
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
--#define ustat __kernel_ustat
- #include <mntent.h>
- #include <sys/stat.h>
--#undef ustat
--#include <sys/ustat.h>
- #include <sys/mount.h>
- #include <sys/ioctl.h>
- #include <sys/sysinfo.h>
-@@ -51,9 +48,12 @@
- int
- platform_check_ismounted(char *name, char *block, struct stat64 *s, int verbose)
- {
-- /* Pad ust; pre-2.6.28 linux copies out too much in 32bit compat mode */
-- struct ustat ust[2];
- struct stat64 st;
-+ FILE *f;
-+ struct stat64 mst;
-+ struct mntent *mnt;
-+ char mounts[MAXPATHLEN];
-+ int ismounted = 0;
-
- if (!s) {
- if (stat64(block, &st) < 0)
-@@ -63,14 +63,24 @@
- s = &st;
- }
-
-- if (ustat(s->st_rdev, ust) >= 0) {
-+ strcpy(mounts, (!access(PROC_MOUNTED, R_OK)) ? PROC_MOUNTED : MOUNTED);
-+ if ((f = setmntent(mounts, "r")) == NULL)
-+ return 0;
-+
-+ while ((mnt = getmntent(f)) != NULL) {
-+ if (stat64(mnt->mnt_dir, &mst) < 0)
-+ continue;
-+ if (mst.st_dev != s->st_rdev)
-+ continue;
- if (verbose)
- fprintf(stderr,
- _("%s: %s contains a mounted filesystem\n"),
- progname, name);
-- return 1;
-+ ismounted = 1;
-+ break;
- }
-- return 0;
-+ endmntent(f);
-+ return ismounted;
- }
-
- int
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.9.0-cross-compile.patch b/sys-fs/xfsprogs/files/xfsprogs-4.9.0-cross-compile.patch
new file mode 100644
index 0000000..f4232b3
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-4.9.0-cross-compile.patch
@@ -0,0 +1,143 @@
+--- xfsprogs-4.9.0/configure
++++ xfsprogs-4.9.0/configure
+@@ -861,6 +861,7 @@
+ enable_blkid
+ enable_gettext
+ enable_shared
++BUILD_CFLAGS
+ BUILD_CC
+ CPP
+ OTOOL64
+@@ -960,7 +961,9 @@
+ LDFLAGS
+ LIBS
+ CPPFLAGS
+-CPP'
++CPP
++BUILD_CC
++BUILD_CFLAGS'
+
+
+ # Initialize some variables set by options.
+@@ -1616,6 +1619,9 @@
+ CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+ you have headers in a nonstandard directory <include dir>
+ CPP C preprocessor
++ BUILD_CC C compiler for build tools
++ BUILD_CFLAGS
++ C compiler flags for build tools
+
+ Use these variables to override the choices made by `configure' or to help
+ it to find libraries and programs with nonstandard names/locations.
+@@ -11116,11 +11122,12 @@
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+-if test $cross_compiling = no; then
+- BUILD_CC="$CC"
+
+-else
+- for ac_prog in gcc cc
++if test "${BUILD_CC+set}" != "set"; then
++ if test $cross_compiling = no; then
++ BUILD_CC="$CC"
++ else
++ for ac_prog in gcc cc
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+@@ -11162,6 +11169,15 @@
+ test -n "$BUILD_CC" && break
+ done
+
++ fi
++fi
++
++if test "${BUILD_CFLAGS+set}" != "set"; then
++ if test $cross_compiling = no; then
++ BUILD_CFLAGS="$CFLAGS"
++ else
++ BUILD_CFLAGS="-g -O2"
++ fi
+ fi
+
+ # Check whether --enable-shared was given.
+--- xfsprogs-4.9.0/configure.ac
++++ xfsprogs-4.9.0/configure.ac
+@@ -9,11 +9,21 @@
+ AC_PROG_LIBTOOL
+
+ AC_PROG_CC
+-if test $cross_compiling = no; then
+- BUILD_CC="$CC"
+- AC_SUBST(BUILD_CC)
+-else
+- AC_CHECK_PROGS(BUILD_CC, gcc cc)
++AC_ARG_VAR(BUILD_CC, [C compiler for build tools])
++if test "${BUILD_CC+set}" != "set"; then
++ if test $cross_compiling = no; then
++ BUILD_CC="$CC"
++ else
++ AC_CHECK_PROGS(BUILD_CC, gcc cc)
++ fi
++fi
++AC_ARG_VAR(BUILD_CFLAGS, [C compiler flags for build tools])
++if test "${BUILD_CFLAGS+set}" != "set"; then
++ if test $cross_compiling = no; then
++ BUILD_CFLAGS="$CFLAGS"
++ else
++ BUILD_CFLAGS="-g -O2"
++ fi
+ fi
+
+ AC_ARG_ENABLE(shared,
+--- xfsprogs-4.9.0/include/builddefs.in
++++ xfsprogs-4.9.0/include/builddefs.in
+@@ -26,6 +26,7 @@
+ LOADERFLAGS = @LDFLAGS@
+ LTLDFLAGS = @LDFLAGS@
+ CFLAGS = @CFLAGS@ -D_FILE_OFFSET_BITS=64
++BUILD_CFLAGS = @BUILD_CFLAGS@
+
+ LIBRT = @librt@
+ LIBUUID = @libuuid@
+@@ -154,7 +155,7 @@
+ endif
+
+
+-GCFLAGS = $(OPTIMIZER) $(DEBUG) \
++GCFLAGS = $(DEBUG) \
+ -DVERSION=\"$(PKG_VERSION)\" -DLOCALEDIR=\"$(PKG_LOCALE_DIR)\" \
+ -DPACKAGE=\"$(PKG_NAME)\" -I$(TOPDIR)/include -I$(TOPDIR)/libxfs
+
+@@ -162,8 +163,9 @@
+ GCFLAGS += -DENABLE_GETTEXT
+ endif
+
++BUILD_CFLAGS += $(GCFLAGS) $(PCFLAGS)
+ # First, Global, Platform, Local CFLAGS
+-CFLAGS += $(FCFLAGS) $(GCFLAGS) $(PCFLAGS) $(LCFLAGS)
++CFLAGS += $(FCFLAGS) $(OPTIMIZER) $(GCFLAGS) $(PCFLAGS) $(LCFLAGS)
+
+ include $(TOPDIR)/include/buildmacros
+
+--- xfsprogs-4.9.0/libxfs/Makefile
++++ xfsprogs-4.9.0/libxfs/Makefile
+@@ -124,7 +124,7 @@
+
+ crc32table.h: gen_crc32table.c
+ @echo " [CC] gen_crc32table"
+- $(Q) $(BUILD_CC) $(CFLAGS) -o gen_crc32table $<
++ $(Q) $(BUILD_CC) $(BUILD_CFLAGS) -o gen_crc32table $<
+ @echo " [GENERATE] $@"
+ $(Q) ./gen_crc32table > crc32table.h
+
+@@ -135,7 +135,7 @@
+ # disk.
+ crc32selftest: gen_crc32table.c crc32table.h crc32.c
+ @echo " [TEST] CRC32"
+- $(Q) $(BUILD_CC) $(CFLAGS) -D CRC32_SELFTEST=1 crc32.c -o $@
++ $(Q) $(BUILD_CC) $(BUILD_CFLAGS) -D CRC32_SELFTEST=1 crc32.c -o $@
+ $(Q) ./$@
+
+ # set up include/xfs header directory
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.9.0-musl.patch b/sys-fs/xfsprogs/files/xfsprogs-4.9.0-musl.patch
new file mode 100644
index 0000000..cbe6911
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-4.9.0-musl.patch
@@ -0,0 +1,71 @@
+diff -Naur xfsprogs-4.9.0.orig/fsr/xfs_fsr.c xfsprogs-4.9.0/fsr/xfs_fsr.c
+--- xfsprogs-4.9.0.orig/fsr/xfs_fsr.c 2017-01-08 13:58:12.354784273 -0800
++++ xfsprogs-4.9.0/fsr/xfs_fsr.c 2017-01-08 13:58:45.262063929 -0800
+@@ -36,6 +36,9 @@
+ #define _PATH_FSRLAST "/var/tmp/.fsrlast_xfs"
+ #define _PATH_PROC_MOUNTS "/proc/mounts"
+
++#ifndef _PATH_MOUNTED
++#define _PATH_MOUNTED MOUNTED
++#endif
+
+ char *progname;
+
+diff -Naur xfsprogs-4.9.0.orig/include/linux.h xfsprogs-4.9.0/include/linux.h
+--- xfsprogs-4.9.0.orig/include/linux.h 2017-01-08 13:58:12.335784111 -0800
++++ xfsprogs-4.9.0/include/linux.h 2017-01-08 13:59:38.554516824 -0800
+@@ -40,6 +40,32 @@
+ # undef fsxattr
+ #endif
+
++#ifndef __uint8_t
++# define __uint8_t uint8_t
++#endif
++#ifndef __uint16_t
++# define __uint16_t uint16_t
++#endif
++#ifndef __uint32_t
++# define __uint32_t uint32_t
++#endif
++#ifndef __uint64_t
++# define __uint64_t uint64_t
++#endif
++
++#ifndef __int8_t
++# define __int8_t int8_t
++#endif
++#ifndef __int16_t
++# define __int16_t int16_t
++#endif
++#ifndef __int32_t
++# define __int32_t int32_t
++#endif
++#ifndef __int64_t
++# define __int64_t int64_t
++#endif
++
+ static __inline__ int xfsctl(const char *path, int fd, int cmd, void *p)
+ {
+ return ioctl(fd, cmd, p);
+diff -Naur xfsprogs-4.9.0.orig/io/readdir.c xfsprogs-4.9.0/io/readdir.c
+--- xfsprogs-4.9.0.orig/io/readdir.c 2017-01-08 13:58:12.357784298 -0800
++++ xfsprogs-4.9.0/io/readdir.c 2017-01-08 14:00:04.662738699 -0800
+@@ -24,6 +24,18 @@
+ #include <sys/types.h>
+ #include <dirent.h>
+
++#if defined (__linux__)
++# ifndef _DIRENT_HAVE_D_OFF
++# define _DIRENT_HAVE_D_OFF
++# endif
++# ifndef _DIRENT_HAVE_D_RECLEN
++# define _DIRENT_HAVE_D_RECLEN
++# endif
++# ifndef _DIRENT_HAVE_D_TYPE
++# define _DIRENT_HAVE_D_TYPE
++# endif
++#endif
++
+ static struct cmdinfo readdir_cmd;
+
+ const char *d_type_str(unsigned int type)
diff --git a/sys-fs/xfsprogs/xfsprogs-4.7.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild
similarity index 90%
rename from sys-fs/xfsprogs/xfsprogs-4.7.0.ebuild
rename to sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild
index 1db7e11..6e7b991 100644
--- a/sys-fs/xfsprogs/xfsprogs-4.7.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI="5"
+EAPI=5
inherit eutils toolchain-funcs multilib
DESCRIPTION="xfs filesystem utilities"
HOMEPAGE="http://oss.sgi.com/projects/xfs/"
-SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
- ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/${P}.tar.gz"
+SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0"
@@ -31,8 +31,8 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-4.7.0-sharedlibs.patch
"${FILESDIR}"/${PN}-4.7.0-libxcmd-link.patch
- "${FILESDIR}"/${PN}-4.3.0-cross-compile.patch
- "${FILESDIR}"/${PN}-4.7.0-musl.patch
+ "${FILESDIR}"/${PN}-4.9.0-cross-compile.patch
+ "${FILESDIR}"/${PN}-4.9.0-musl.patch
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-fs/xfsprogs/files/, sys-fs/xfsprogs/
@ 2017-07-25 18:52 Jory Pratt
0 siblings, 0 replies; 5+ messages in thread
From: Jory Pratt @ 2017-07-25 18:52 UTC (permalink / raw
To: gentoo-commits
commit: 5add06bbc9793015b5139dde6dc07e6575ea9cd1
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 25 18:52:16 2017 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Tue Jul 25 18:52:16 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=5add06bb
sys-fs/xfsprogs: Apply upstream patch to fix sdtout definition of
read-only variable
sys-fs/xfsprogs/Manifest | 3 +-
.../xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch | 118 +++++++++++++++++++++
sys-fs/xfsprogs/xfsprogs-4.12.0.ebuild | 1 +
3 files changed, 121 insertions(+), 1 deletion(-)
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 4efd970..d2f8665 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -1,4 +1,5 @@
AUX xfsprogs-4.11.0-musl.patch 1835 SHA256 1387eebcf9e61ab50fea70e11f7d6873ae47e26f3fba99b8df2d17d6a2db1619 SHA512 dcfafb16d31c50c6c16ee2a778eda6c946646e129e6c9c96efeb518f7935534dcd7063aded186c5d874ffd07b6eaa31f3ff0e06e0cdca9876565056c727a5494 WHIRLPOOL 68b03ec3ccc1258e667e883910dfeaa65945ffdc893da5c752baea1ec6d7c859be85b8287392c951cf60315aee356dd463410d287ff673a2b70dfe9684a56bb9
+AUX xfsprogs-4.12.0-fix_musl.patch 3134 SHA256 a76aadd93aa62c7f942c2bc5d65db771075a00961ee422e9fd1f3abf67bfab93 SHA512 90aed5c33bfae13c89ffa26f076bd4c75f6562ec7bd87607238daa0e19e108e7de5f41025880d8314677c31ba54dd9acd4646e44bef139b7256033406427f30e WHIRLPOOL 24e7ffbe1ad68688dabd4be1a1c7af60ea849a73ff78dc80b3a93e0b31bcc8a978da6f6e48bbcd7f1e8de7e37d061b87e4cec2c931c21d42eb8827d97c626df2
AUX xfsprogs-4.12.0-sharedlibs.patch 2361 SHA256 4f10b622e8b7c8654a5dc79356343515ef203742ba4781b97a6f02f23e99555a SHA512 bbf802c54d2c8a2a524a9d4ae0ca66a18bf6b099a00fcc248abee04f84371bd35fc07a2dcc0c1d99c297b474c1f98d92927aa5ca16df5e6caef3abe386f31eba WHIRLPOOL 72e00337e46700ee2a16597bb8188fff229c019c46a39f60598a6d802b8ba094c6e5da8377aad60fee6afd9f491c577d2c84ace3f78a00438268ccbc1832368a
AUX xfsprogs-4.3.0-cross-compile.patch 5112 SHA256 5654447555115bce22e443623f6fc17b767681741f043a9dc5e6887967a27db9 SHA512 2d6303b7c89b3e1ca2ba1d95a4477d0d1c2360ed68bf9c9d3630f990081be98ace9b9c164729635fa582cc5c8bd418e1824e35f613512d43cc6116fcda379582 WHIRLPOOL 1fee9f56739d13c1b04b2d0d190b193c97a846902fce8ccba0210cbce6a61bcd2cab118a2c59fb66cd89a957e32e714c3f1dc534697819165a505a8eb8f225b6
AUX xfsprogs-4.3.0-musl.patch 3543 SHA256 afe6ea3f95d88abc0b2c276e1c88dd8acc3bdbf10cf93cba54cae9d1de6e1e67 SHA512 7c86c402bda6630699e63b55389931d8a43c9ed6489c248bf090ca724516c56d4b2b3204dd07272a2e84e11abda8f0aa0735851c3f66330f6be258390a8dafe6 WHIRLPOOL 8fb46034afbea1b78c23e931d36920228ee401c0a72b4496eb40771b245c8a0f9800eb8794631362937ad0192fe959c1789fcee5a98d1788035c19219365cce7
@@ -11,6 +12,6 @@ DIST xfsprogs-4.11.0.tar.xz 1113480 SHA256 c3a6d87b564d7738243c507df82276bed9822
DIST xfsprogs-4.12.0.tar.xz 1128400 SHA256 b330ad8d737f4152ae511580102e2fc49212bb51dfb4b614084344abae46d0df SHA512 1dc4a0a5f40baf1d6398c8f07b4cb3ab796cf052c34b811d60b08c60a4700c2ced8d4d1adb878f8b85ba58cf3e1276db1477109de538fd427d3e359a52f59d4a WHIRLPOOL c18d3c9dfab8ccb877eb6fa9fa05be3c614a587c6cb616a9f18b52debb8ecacbd22056cb397ff9e69407c66e105d034458b41f0ba4275352f31398e64d303c02
DIST xfsprogs-4.5.0.tar.gz 1524382 SHA256 e49beb314984efbd0d758abb5c6137db3bb60a88e59e1e94c00defb536cf89f8 SHA512 19c95551dc91ec46916f9a7e3d7976907664d32dd5fdc26af0ca62ca74c4b3c10f9e843aac8214ea9d1c0bf140c9f4e321d059808af01a623abedd5067011314 WHIRLPOOL 54d742635df024a63181da76c3220671610068363af85be2677521f20342595a5cebb2fd169945572351901ee2c9384f79f54a381ab3620dde22d863aa66d469
EBUILD xfsprogs-4.11.0.ebuild 2750 SHA256 de77973986d0e862e0179e74fdd619cf99d54218d282b47324a4dd45c8e86398 SHA512 7113861301c0e1437133e813a6fb3d1653419d63385f7ba1040953cced4596ac091bc75bee991c82d17b7f4764634a5334a09100f8f9a5b6954154d357d8ee5e WHIRLPOOL e2c3ea570f178bccf6b0b2bcbb65638af7905931301d87b90ddefa0a469a6c266afec0e5bc370b0dd6a9ee318e376ce270b19fc21ae5687c5f5295101e051d48
-EBUILD xfsprogs-4.12.0.ebuild 2729 SHA256 9336a0592b2d2642938ba1661c962a14b5ad277b0978846584ad11f0f5a60ac4 SHA512 f910da3fed6bd41ac3a0d3500f4bc4da7e7644e9864f08a1ad3fe174d1ca79d7f738508145a866f138ef3d370c50414f90d0c2577f3357862fb5a72253b45a78 WHIRLPOOL a8c44865d9c4540541782f8188803f2f374c721e454a33eeee577c83321d84ef8d93f95c51f32faa3cfe6f565cadfb99cdc1b660afb86b4a67f613275be01ced
+EBUILD xfsprogs-4.12.0.ebuild 2772 SHA256 04ca2d3cd42b3dc50ec559a82780253cc87d3302deaf9c1872c4be7cf698d4d3 SHA512 ce7afb45c259c606e01de7f916b4663df2ff583635f38159b6dd9136856bc66bf4d4ccca89748665f5541bcf904f7066b5d7677c0292fdd9b54be6172845e7c4 WHIRLPOOL 5b8440386b011db2cf71fbdc76bac6faec1766b6ef3dc5c02d37f6a7549531dd7edc6cf8ea6be548ad4f5fec5592d492923ef133064ba556a02f3d36240fc5c7
EBUILD xfsprogs-4.5.0.ebuild 2936 SHA256 f4faccf78a63237359239504ba56946817e6c604ebf5836e2c094b0bb1255ff5 SHA512 7363f71ab6ba657735394682e38cdf4cf21db032c34167435a9d37f74db52f8e25319d172f3d007db2b64973b3bde28abd602b1d64a544122d28654cc3605054 WHIRLPOOL 17d12153e5cd04828ac71c41e2e59b32ed21e19af9e0d83f40b93619f800f85ae89f4c272496a7f59268b386e72e97b6a17bb46a370586cda957e3bcadf94616
MISC metadata.xml 257 SHA256 c1d4bdabe699c6d9fcdf3b7794a13b45f69e3826b814b422e4ca7e6893b99012 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1 WHIRLPOOL 4afcbc79dd61237c778735b39060b3e294fdc07da5b0da6f7b40db92649ac71febddd7a0265502e102d8eec9664fd5af2071fff9428bfcb0a6bf06cf70c68a3d
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch b/sys-fs/xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch
new file mode 100644
index 0000000..de647d9
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch
@@ -0,0 +1,118 @@
+From 21253610f9ef87db8e2a75b863b7fcfbd0cdb421 Mon Sep 17 00:00:00 2001
+From: "Darrick J. Wong" <darrick.wong@oracle.com>
+Date: Tue, 25 Jul 2017 13:45:01 -0500
+Subject: [PATCH] In patch 4944defad4 ("xfs_db: redirect printfs when
+ metadumping to stdout"), we solved the problem of xfs_db printfs ending up in
+ the metadump stream by reassigning stdout for the duration of a stdout
+ metadump. Unfortunately, musl doesn't allow stdout to be reassigned (in
+ their view "extern FILE *stdout" means "extern FILE * const stdout"), so we
+ abandon the old approach in favor of playing games with dup() to switch the
+ raw file descriptors.
+
+While we're at it, fix a regression where an unconverted outf test
+allows progress info to end up in the metadump stream.
+
+Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
+---
+ db/metadump.c | 47 ++++++++++++++++++++++++++++++++++++-----------
+ 1 file changed, 36 insertions(+), 11 deletions(-)
+
+diff --git a/db/metadump.c b/db/metadump.c
+index 96641e0..4e2f648 100644
+--- a/db/metadump.c
++++ b/db/metadump.c
+@@ -78,6 +78,7 @@ static int obfuscate = 1;
+ static int zero_stale_data = 1;
+ static int show_warnings = 0;
+ static int progress_since_warning = 0;
++static bool stdout_metadump;
+
+ void
+ metadump_init(void)
+@@ -137,7 +138,7 @@ print_progress(const char *fmt, ...)
+ va_end(ap);
+ buf[sizeof(buf)-1] = '\0';
+
+- f = (outf == stdout) ? stderr : stdout;
++ f = stdout_metadump ? stderr : stdout;
+ fprintf(f, "\r%-59s", buf);
+ fflush(f);
+ progress_since_warning = 1;
+@@ -2750,7 +2751,8 @@ metadump_f(
+ xfs_agnumber_t agno;
+ int c;
+ int start_iocur_sp;
+- bool stdout_metadump = false;
++ int outfd = -1;
++ int ret;
+ char *p;
+
+ exitcode = 1;
+@@ -2870,16 +2872,35 @@ metadump_f(
+ * metadump operation so that dbprintf and other messages
+ * are sent to the console instead of polluting the
+ * metadump stream.
++ *
++ * We get to do this the hard way because musl doesn't
++ * allow reassignment of stdout.
+ */
+- outf = stdout;
+- stdout = stderr;
++ fflush(stdout);
++ outfd = dup(STDOUT_FILENO);
++ if (outfd < 0) {
++ perror("opening dump stream");
++ goto out;
++ }
++ ret = dup2(STDERR_FILENO, STDOUT_FILENO);
++ if (ret < 0) {
++ perror("redirecting stdout");
++ close(outfd);
++ goto out;
++ }
++ outf = fdopen(outfd, "a");
++ if (outf == NULL) {
++ fprintf(stderr, "cannot create dump stream\n");
++ dup2(outfd, 1);
++ close(outfd);
++ goto out;
++ }
+ stdout_metadump = true;
+ } else {
+ outf = fopen(argv[optind], "wb");
+ if (outf == NULL) {
+ print_warning("cannot create dump file");
+- free(metablock);
+- return 0;
++ goto out;
+ }
+ }
+
+@@ -2907,15 +2928,19 @@ metadump_f(
+ if (progress_since_warning)
+ fputc('\n', stdout_metadump ? stderr : stdout);
+
+- if (stdout_metadump)
+- stdout = outf;
+- else
+- fclose(outf);
++ if (stdout_metadump) {
++ fflush(outf);
++ fflush(stdout);
++ ret = dup2(outfd, STDOUT_FILENO);
++ if (ret < 0)
++ perror("un-redirecting stdout");
++ }
++ fclose(outf);
+
+ /* cleanup iocur stack */
+ while (iocur_sp > start_iocur_sp)
+ pop_cur();
+-
++out:
+ free(metablock);
+
+ return 0;
+--
+2.13.3
+
diff --git a/sys-fs/xfsprogs/xfsprogs-4.12.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.12.0.ebuild
index 772f842..730f86c 100644
--- a/sys-fs/xfsprogs/xfsprogs-4.12.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-4.12.0.ebuild
@@ -32,6 +32,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-4.7.0-libxcmd-link.patch
"${FILESDIR}"/${PN}-4.9.0-underlinking.patch
"${FILESDIR}"/${PN}-4.11.0-musl.patch
+ "${FILESDIR}"/${PN}-4.12.0-fix_musl.patch
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-fs/xfsprogs/files/, sys-fs/xfsprogs/
@ 2018-03-16 13:21 Anthony G. Basile
0 siblings, 0 replies; 5+ messages in thread
From: Anthony G. Basile @ 2018-03-16 13:21 UTC (permalink / raw
To: gentoo-commits
commit: 2b8ff64eab59a5a9e6408301e914b7e781105192
Author: stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Fri Mar 9 11:06:12 2018 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Mar 16 13:20:13 2018 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=2b8ff64e
sys-fs/xfsprogs: all relevant bugs fixed upstream with 4.14, which is stable on all musl arches
sys-fs/xfsprogs/Manifest | 4 -
sys-fs/xfsprogs/files/xfsprogs-4.11.0-musl.patch | 71 --------
.../xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch | 117 -------------
.../files/xfsprogs-4.12.0-sharedlibs.patch | 81 ---------
.../files/xfsprogs-4.3.0-cross-compile.patch | 181 ---------------------
sys-fs/xfsprogs/files/xfsprogs-4.3.0-musl.patch | 131 ---------------
.../xfsprogs/files/xfsprogs-4.3.0-sharedlibs.patch | 80 ---------
sys-fs/xfsprogs/files/xfsprogs-4.5.0-linguas.patch | 32 ----
.../files/xfsprogs-4.7.0-libxcmd-link.patch | 30 ----
.../xfsprogs/files/xfsprogs-4.7.0-sharedlibs.patch | 81 ---------
.../files/xfsprogs-4.9.0-cross-compile.patch | 143 ----------------
sys-fs/xfsprogs/files/xfsprogs-4.9.0-musl.patch | 71 --------
.../files/xfsprogs-4.9.0-underlinking.patch | 30 ----
sys-fs/xfsprogs/metadata.xml | 8 -
sys-fs/xfsprogs/xfsprogs-4.12.0.ebuild | 97 -----------
sys-fs/xfsprogs/xfsprogs-4.13.1.ebuild | 96 -----------
sys-fs/xfsprogs/xfsprogs-4.5.0.ebuild | 104 ------------
sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild | 97 -----------
18 files changed, 1454 deletions(-)
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
deleted file mode 100644
index bb002f7..0000000
--- a/sys-fs/xfsprogs/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST xfsprogs-4.12.0.tar.xz 1128400 SHA256 b330ad8d737f4152ae511580102e2fc49212bb51dfb4b614084344abae46d0df SHA512 1dc4a0a5f40baf1d6398c8f07b4cb3ab796cf052c34b811d60b08c60a4700c2ced8d4d1adb878f8b85ba58cf3e1276db1477109de538fd427d3e359a52f59d4a WHIRLPOOL c18d3c9dfab8ccb877eb6fa9fa05be3c614a587c6cb616a9f18b52debb8ecacbd22056cb397ff9e69407c66e105d034458b41f0ba4275352f31398e64d303c02
-DIST xfsprogs-4.13.1.tar.xz 1133556 SHA256 8c64d349d191e24c84eeb1611be767e4a11b81016bd5b73f3a20a0bf39dd3536 SHA512 6c234a6c22aa3cabe0ea698c11175dca6c19d803989127ccb13b526ff6d34dcef9dd6e19ff0c4fb3903078f24210a8cfcd0508dac29d52fbee4dfed37d5888f3 WHIRLPOOL 89a84ce7b59fa52cd245493a28c6ad7f6e114dfe8044b2dad57b2cc626308ad1187ef812ace618085a083745acd3c37538903a6e2f935d9cd351c923559d9732
-DIST xfsprogs-4.5.0.tar.gz 1524382 SHA256 e49beb314984efbd0d758abb5c6137db3bb60a88e59e1e94c00defb536cf89f8 SHA512 19c95551dc91ec46916f9a7e3d7976907664d32dd5fdc26af0ca62ca74c4b3c10f9e843aac8214ea9d1c0bf140c9f4e321d059808af01a623abedd5067011314 WHIRLPOOL 54d742635df024a63181da76c3220671610068363af85be2677521f20342595a5cebb2fd169945572351901ee2c9384f79f54a381ab3620dde22d863aa66d469
-DIST xfsprogs-4.9.0.tar.xz 1087940 SHA256 f1e60a9a54583dba82fa506dd9b59bdec110a968f80f507bf5f93b263af7a4df SHA512 990946f0a34381f57afb39bcda0ff539e18af4de2ecc19c833ffd4fb7c22c25b501091c1f0953db103a62204d952c9eecba21f22f3c5910286456da65fb09fa7 WHIRLPOOL a9b582a42967ce1e314cd0ac3518792c2e10f7bb1370151a68a09a8e21e40cc6818b9778dfdd248961c3a1a08a70424f0150219488a18bc5d60e5669702c472f
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.11.0-musl.patch b/sys-fs/xfsprogs/files/xfsprogs-4.11.0-musl.patch
deleted file mode 100644
index 6db6c65..0000000
--- a/sys-fs/xfsprogs/files/xfsprogs-4.11.0-musl.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -Naur xfsprogs-4.11.0.orig/fsr/xfs_fsr.c xfsprogs-4.11.0/fsr/xfs_fsr.c
---- xfsprogs-4.11.0.orig/fsr/xfs_fsr.c 2017-05-05 11:47:11.000000000 -0700
-+++ xfsprogs-4.11.0/fsr/xfs_fsr.c 2017-05-19 09:33:36.408832645 -0700
-@@ -36,6 +36,9 @@
- #define _PATH_FSRLAST "/var/tmp/.fsrlast_xfs"
- #define _PATH_PROC_MOUNTS "/proc/mounts"
-
-+#ifndef _PATH_MOUNTED
-+#define _PATH_MOUNTED MOUNTED
-+#endif
-
- char *progname;
-
-diff -Naur xfsprogs-4.11.0.orig/include/linux.h xfsprogs-4.11.0/include/linux.h
---- xfsprogs-4.11.0.orig/include/linux.h 2017-05-05 11:47:11.000000000 -0700
-+++ xfsprogs-4.11.0/include/linux.h 2017-05-19 09:33:36.409832654 -0700
-@@ -40,6 +40,32 @@
- # undef fsxattr
- #endif
-
-+#ifndef __uint8_t
-+# define __uint8_t uint8_t
-+#endif
-+#ifndef __uint16_t
-+# define __uint16_t uint16_t
-+#endif
-+#ifndef __uint32_t
-+# define __uint32_t uint32_t
-+#endif
-+#ifndef __uint64_t
-+# define __uint64_t uint64_t
-+#endif
-+
-+#ifndef __int8_t
-+# define __int8_t int8_t
-+#endif
-+#ifndef __int16_t
-+# define __int16_t int16_t
-+#endif
-+#ifndef __int32_t
-+# define __int32_t int32_t
-+#endif
-+#ifndef __int64_t
-+# define __int64_t int64_t
-+#endif
-+
- static __inline__ int xfsctl(const char *path, int fd, int cmd, void *p)
- {
- return ioctl(fd, cmd, p);
-diff -Naur xfsprogs-4.11.0.orig/io/readdir.c xfsprogs-4.11.0/io/readdir.c
---- xfsprogs-4.11.0.orig/io/readdir.c 2017-05-05 11:47:11.000000000 -0700
-+++ xfsprogs-4.11.0/io/readdir.c 2017-05-19 09:34:45.156466211 -0700
-@@ -24,6 +24,18 @@
- #include <sys/types.h>
- #include <dirent.h>
-
-+#if defined (__linux__)
-+# ifndef _DIRENT_HAVE_D_OFF
-+# define _DIRENT_HAVE_D_OFF
-+# endif
-+# ifndef _DIRENT_HAVE_D_RECLEN
-+# define _DIRENT_HAVE_D_RECLEN
-+# endif
-+# ifndef _DIRENT_HAVE_D_TYPE
-+# define _DIRENT_HAVE_D_TYPE
-+# endif
-+#endif
-+
- #ifndef _DIRENT_HAVE_D_RECLEN
- #include <string.h>
- #endif
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch b/sys-fs/xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch
deleted file mode 100644
index efc57e4..0000000
--- a/sys-fs/xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From 21253610f9ef87db8e2a75b863b7fcfbd0cdb421 Mon Sep 17 00:00:00 2001
-From: "Darrick J. Wong" <darrick.wong@oracle.com>
-Date: Tue, 25 Jul 2017 13:45:01 -0500
-Subject: [PATCH] In patch 4944defad4 ("xfs_db: redirect printfs when
- metadumping to stdout"), we solved the problem of xfs_db printfs ending up in
- the metadump stream by reassigning stdout for the duration of a stdout
- metadump. Unfortunately, musl doesn't allow stdout to be reassigned (in
- their view "extern FILE *stdout" means "extern FILE * const stdout"), so we
- abandon the old approach in favor of playing games with dup() to switch the
- raw file descriptors.
-
-While we're at it, fix a regression where an unconverted outf test
-allows progress info to end up in the metadump stream.
-
-Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
----
- db/metadump.c | 47 ++++++++++++++++++++++++++++++++++++-----------
- 1 file changed, 36 insertions(+), 11 deletions(-)
-
-diff --git a/db/metadump.c b/db/metadump.c
-index 96641e0..4e2f648 100644
---- a/db/metadump.c
-+++ b/db/metadump.c
-@@ -78,6 +78,7 @@ static int obfuscate = 1;
- static int zero_stale_data = 1;
- static int show_warnings = 0;
- static int progress_since_warning = 0;
-+static bool stdout_metadump;
-
- void
- metadump_init(void)
-@@ -137,7 +138,7 @@ print_progress(const char *fmt, ...)
- va_end(ap);
- buf[sizeof(buf)-1] = '\0';
-
-- f = (outf == stdout) ? stderr : stdout;
-+ f = stdout_metadump ? stderr : stdout;
- fprintf(f, "\r%-59s", buf);
- fflush(f);
- progress_since_warning = 1;
-@@ -2750,7 +2751,8 @@ metadump_f(
- xfs_agnumber_t agno;
- int c;
- int start_iocur_sp;
-- bool stdout_metadump = false;
-+ int outfd = -1;
-+ int ret;
- char *p;
-
- exitcode = 1;
-@@ -2870,16 +2872,35 @@ metadump_f(
- * metadump operation so that dbprintf and other messages
- * are sent to the console instead of polluting the
- * metadump stream.
-+ *
-+ * We get to do this the hard way because musl doesn't
-+ * allow reassignment of stdout.
- */
-- outf = stdout;
-- stdout = stderr;
-+ fflush(stdout);
-+ outfd = dup(STDOUT_FILENO);
-+ if (outfd < 0) {
-+ perror("opening dump stream");
-+ goto out;
-+ }
-+ ret = dup2(STDERR_FILENO, STDOUT_FILENO);
-+ if (ret < 0) {
-+ perror("redirecting stdout");
-+ close(outfd);
-+ goto out;
-+ }
-+ outf = fdopen(outfd, "a");
-+ if (outf == NULL) {
-+ fprintf(stderr, "cannot create dump stream\n");
-+ dup2(outfd, 1);
-+ close(outfd);
-+ goto out;
-+ }
- stdout_metadump = true;
- } else {
- outf = fopen(argv[optind], "wb");
- if (outf == NULL) {
- print_warning("cannot create dump file");
-- free(metablock);
-- return 0;
-+ goto out;
- }
- }
-
-@@ -2907,15 +2928,19 @@ metadump_f(
- if (progress_since_warning)
- fputc('\n', stdout_metadump ? stderr : stdout);
-
-- if (stdout_metadump)
-- stdout = outf;
-- else
-- fclose(outf);
-+ if (stdout_metadump) {
-+ fflush(outf);
-+ fflush(stdout);
-+ ret = dup2(outfd, STDOUT_FILENO);
-+ if (ret < 0)
-+ perror("un-redirecting stdout");
-+ }
-+ fclose(outf);
-
- /* cleanup iocur stack */
- while (iocur_sp > start_iocur_sp)
- pop_cur();
--
-+out:
- free(metablock);
-
- return 0;
---
-2.13.3
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.12.0-sharedlibs.patch b/sys-fs/xfsprogs/files/xfsprogs-4.12.0-sharedlibs.patch
deleted file mode 100644
index cb59d44..0000000
--- a/sys-fs/xfsprogs/files/xfsprogs-4.12.0-sharedlibs.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- xfsprogs-4.12.0/include/buildmacros
-+++ xfsprogs-4.12.0/include/buildmacros
-@@ -70,18 +70,9 @@
- # /usr/lib.
- ifeq ($(ENABLE_SHARED),yes)
- INSTALL_LTLIB_DEV = \
-- cd $(TOPDIR)/$(LIBNAME)/.libs; \
-- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \
-- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
-- ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
-- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
-- if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \
-- "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))" ]; then \
-- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
-- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
-- ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \
-- fi
-+ set -e; cd $(TOPDIR)/$(LIBNAME); \
-+ $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-+ env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la
- else
- INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
- endif
---- xfsprogs-4.12.0/libhandle/Makefile
-+++ xfsprogs-4.12.0/libhandle/Makefile
-@@ -24,7 +24,6 @@
- include $(BUILDRULES)
-
- install: default
-- $(INSTALL_LTLIB)
-
- install-dev: default
- $(INSTALL_LTLIB_DEV)
---- xfsprogs-4.12.0/libxcmd/Makefile
-+++ xfsprogs-4.12.0/libxcmd/Makefile
-@@ -34,6 +34,9 @@
-
- include $(BUILDRULES)
-
--install install-dev: default
-+install: default
-+
-+install-dev: default
-+ $(INSTALL_LTLIB_DEV)
-
- -include .ltdep
---- xfsprogs-4.12.0/libxfs/Makefile
-+++ xfsprogs-4.12.0/libxfs/Makefile
-@@ -151,6 +151,7 @@
-
- install-dev: install
- $(INSTALL) -m 644 $(PKGHFILES) $(PKG_INC_DIR)
-+ $(INSTALL_LTLIB_DEV)
-
- # We need to install the headers before building the dependencies. If we
- # include the .ltdep file, the makefile decides that it needs to build the
---- xfsprogs-4.12.0/libxlog/Makefile
-+++ xfsprogs-4.12.0/libxlog/Makefile
-@@ -19,6 +19,9 @@
-
- include $(BUILDRULES)
-
--install install-dev: default
-+install: default
-+
-+install-dev: default
-+ $(INSTALL_LTLIB_DEV)
-
- -include .ltdep
---- xfsprogs-4.12.0/Makefile
-+++ xfsprogs-4.12.0/Makefile
-@@ -89,6 +89,8 @@
- copy: libxlog
- mkfs: libxcmd
- spaceman: libxcmd
-+libxlog: libxfs
-+libxlog-install-dev: libxfs-install-dev
-
- ifeq ($(HAVE_BUILDDEFS), yes)
- include $(BUILDRULES)
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.3.0-cross-compile.patch b/sys-fs/xfsprogs/files/xfsprogs-4.3.0-cross-compile.patch
deleted file mode 100644
index c545664..0000000
--- a/sys-fs/xfsprogs/files/xfsprogs-4.3.0-cross-compile.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-From 1a366eedc0eb4da46da48e9f6e2da27c7b5d2076 Mon Sep 17 00:00:00 2001
-From: Gwendal Grignou <gwendal@chromium.org>
-Date: Fri, 3 Jun 2016 09:17:28 -0700
-Subject: [PATCH] Allow compiling xfsprogs in a cross compile environment.
-
-Without this patch, we are using the same compiler and options for the host
-compiler (BUILD_CC) and the target compiler (CC), and we would get error
-messages at compilation:
-x86_64-pc-linux-gnu-gcc -O2 -O2 -pipe -march=armv7-a -mtune=cortex-a15 ...
-x86_64-pc-linux-gnu-gcc.real: error: unrecognized command line option
-'-mfpu=neon'
-'-mfloat-abi=hard'
-'-clang-syntax'
-'-mfpu=neon'
-'-mfloat-abi=hard'
-'-clang-syntax'
-
-Add BUILD_CC and BUILD_CFLAGS as precious variables to allow setting it up
-from the ebuild.
-
-Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
----
- configure | 26 +++++++++++++++++++++-----
- configure.ac | 20 +++++++++++++++-----
- include/builddefs.in | 6 ++++--
- libxfs/Makefile | 4 ++--
- 4 files changed, 42 insertions(+), 14 deletions(-)
-
-diff --git a/configure b/configure
-index 325081f..863a447 100755
---- a/configure
-+++ b/configure
-@@ -700,6 +700,7 @@ libreadline
- enable_blkid
- enable_gettext
- enable_shared
-+BUILD_CFLAGS
- BUILD_CC
- CPP
- LT_SYS_LIBRARY_PATH
-@@ -806,7 +807,9 @@ LDFLAGS
- LIBS
- CPPFLAGS
- LT_SYS_LIBRARY_PATH
--CPP'
-+CPP
-+BUILD_CC
-+BUILD_CFLAGS'
-
-
- # Initialize some variables set by options.
-@@ -1456,6 +1459,9 @@ Some influential environment variables:
- LT_SYS_LIBRARY_PATH
- User-defined run-time library search path.
- CPP C preprocessor
-+ BUILD_CC C compiler for build tools
-+ BUILD_CFLAGS
-+ C compiler flags for build tools
-
- Use these variables to override the choices made by `configure' or to help
- it to find libraries and programs with nonstandard names/locations.
-@@ -11957,11 +11963,12 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
--if test $cross_compiling = no; then
-- BUILD_CC="$CC"
-
--else
-- for ac_prog in gcc cc
-+if test "${BUILD_CC+set}" != "set"; then
-+ if test $cross_compiling = no; then
-+ BUILD_CC="$CC"
-+ else
-+ for ac_prog in gcc cc
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
-@@ -12003,6 +12010,15 @@ fi
- test -n "$BUILD_CC" && break
- done
-
-+ fi
-+fi
-+
-+if test "${BUILD_CFLAGS+set}" != "set"; then
-+ if test $cross_compiling = no; then
-+ BUILD_CFLAGS="$CFLAGS"
-+ else
-+ BUILD_CFLAGS="-g -O2"
-+ fi
- fi
-
- # Check whether --enable-shared was given.
-diff --git a/configure.ac b/configure.ac
-index d44438f..fc286b3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -9,11 +9,21 @@ AC_PREFIX_DEFAULT(/usr)
- AC_PROG_LIBTOOL
-
- AC_PROG_CC
--if test $cross_compiling = no; then
-- BUILD_CC="$CC"
-- AC_SUBST(BUILD_CC)
--else
-- AC_CHECK_PROGS(BUILD_CC, gcc cc)
-+AC_ARG_VAR(BUILD_CC, [C compiler for build tools])
-+if test "${BUILD_CC+set}" != "set"; then
-+ if test $cross_compiling = no; then
-+ BUILD_CC="$CC"
-+ else
-+ AC_CHECK_PROGS(BUILD_CC, gcc cc)
-+ fi
-+fi
-+AC_ARG_VAR(BUILD_CFLAGS, [C compiler flags for build tools])
-+if test "${BUILD_CFLAGS+set}" != "set"; then
-+ if test $cross_compiling = no; then
-+ BUILD_CFLAGS="$CFLAGS"
-+ else
-+ BUILD_CFLAGS="-g -O2"
-+ fi
- fi
-
- AC_ARG_ENABLE(shared,
-diff --git a/include/builddefs.in b/include/builddefs.in
-index c2ca4cb..9ca57a6 100644
---- a/include/builddefs.in
-+++ b/include/builddefs.in
-@@ -27,6 +27,7 @@ MALLOCLIB = @malloc_lib@
- LOADERFLAGS = @LDFLAGS@
- LTLDFLAGS = @LDFLAGS@
- CFLAGS = @CFLAGS@
-+BUILD_CFLAGS = @BUILD_CFLAGS@
-
- LIBRT = @librt@
- LIBUUID = @libuuid@
-@@ -150,7 +151,7 @@ PCFLAGS+= -DENABLE_BLKID
- endif
-
-
--GCFLAGS = $(OPTIMIZER) $(DEBUG) \
-+GCFLAGS = $(DEBUG) \
- -DVERSION=\"$(PKG_VERSION)\" -DLOCALEDIR=\"$(PKG_LOCALE_DIR)\" \
- -DPACKAGE=\"$(PKG_NAME)\" -I$(TOPDIR)/include -I$(TOPDIR)/libxfs
-
-@@ -158,8 +159,9 @@ ifeq ($(ENABLE_GETTEXT),yes)
- GCFLAGS += -DENABLE_GETTEXT
- endif
-
-+BUILD_CFLAGS += $(GCFLAGS) $(PCFLAGS)
- # First, Global, Platform, Local CFLAGS
--CFLAGS += $(FCFLAGS) $(GCFLAGS) $(PCFLAGS) $(LCFLAGS)
-+CFLAGS += $(FCFLAGS) $(OPTIMIZER) $(GCFLAGS) $(PCFLAGS) $(LCFLAGS)
-
- include $(TOPDIR)/include/buildmacros
-
-diff --git a/libxfs/Makefile b/libxfs/Makefile
-index 873d4ec..8d728c0 100644
---- a/libxfs/Makefile
-+++ b/libxfs/Makefile
-@@ -111,7 +111,7 @@ default: crc32selftest ltdepend $(LTLIBRARY)
-
- crc32table.h: gen_crc32table.c
- @echo " [CC] gen_crc32table"
-- $(Q) $(BUILD_CC) $(CFLAGS) -o gen_crc32table $<
-+ $(Q) $(BUILD_CC) $(BUILD_CFLAGS) -o gen_crc32table $<
- @echo " [GENERATE] $@"
- $(Q) ./gen_crc32table > crc32table.h
-
-@@ -122,7 +122,7 @@ crc32table.h: gen_crc32table.c
- # disk.
- crc32selftest: gen_crc32table.c crc32table.h crc32.c
- @echo " [TEST] CRC32"
-- $(Q) $(BUILD_CC) $(CFLAGS) -D CRC32_SELFTEST=1 crc32.c -o $@
-+ $(Q) $(BUILD_CC) $(BUILD_CFLAGS) -D CRC32_SELFTEST=1 crc32.c -o $@
- $(Q) ./$@
-
- # set up include/xfs header directory
---
-2.8.0.rc3.226.g39d4020
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.3.0-musl.patch b/sys-fs/xfsprogs/files/xfsprogs-4.3.0-musl.patch
deleted file mode 100644
index f9c9a5d..0000000
--- a/sys-fs/xfsprogs/files/xfsprogs-4.3.0-musl.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-diff -Naurw xfsprogs-4.3.0.orig/fsr/xfs_fsr.c xfsprogs-4.3.0/fsr/xfs_fsr.c
---- xfsprogs-4.3.0.orig/fsr/xfs_fsr.c 2015-11-22 20:24:24.000000000 -0800
-+++ xfsprogs-4.3.0/fsr/xfs_fsr.c 2015-11-24 13:41:38.876680281 -0800
-@@ -39,6 +39,9 @@
- #define _PATH_FSRLAST "/var/tmp/.fsrlast_xfs"
- #define _PATH_PROC_MOUNTS "/proc/mounts"
-
-+#ifndef _PATH_MOUNTED
-+# define _PATH_MOUNTED MOUNTED
-+#endif
-
- char *progname;
-
-diff -Naurw xfsprogs-4.3.0.orig/include/linux.h xfsprogs-4.3.0/include/linux.h
---- xfsprogs-4.3.0.orig/include/linux.h 2015-11-10 11:54:46.000000000 -0800
-+++ xfsprogs-4.3.0/include/linux.h 2015-11-24 14:16:02.070075093 -0800
-@@ -31,6 +31,34 @@
- #include <stdbool.h>
- #include <asm/types.h>
- #include <mntent.h>
-+#include <fcntl.h>
-+#include <stdio.h>
-+
-+#ifndef __uint8_t
-+# define __uint8_t uint8_t
-+#endif
-+#ifndef __uint16_t
-+# define __uint16_t uint16_t
-+#endif
-+#ifndef __uint32_t
-+# define __uint32_t uint32_t
-+#endif
-+#ifndef __uint64_t
-+# define __uint64_t uint64_t
-+#endif
-+
-+#ifndef __int8_t
-+# define __int8_t int8_t
-+#endif
-+#ifndef __int16_t
-+# define __int16_t int16_t
-+#endif
-+#ifndef __int32_t
-+# define __int32_t int32_t
-+#endif
-+#ifndef __int64_t
-+# define __int64_t int64_t
-+#endif
-
- static __inline__ int xfsctl(const char *path, int fd, int cmd, void *p)
- {
-diff -Naurw xfsprogs-4.3.0.orig/io/readdir.c xfsprogs-4.3.0/io/readdir.c
---- xfsprogs-4.3.0.orig/io/readdir.c 2015-08-23 16:14:11.000000000 -0700
-+++ xfsprogs-4.3.0/io/readdir.c 2015-11-24 13:44:06.086684668 -0800
-@@ -24,6 +24,18 @@
- #include <sys/types.h>
- #include <dirent.h>
-
-+#if defined (__linux__)
-+# ifndef _DIRENT_HAVE_D_OFF
-+# define _DIRENT_HAVE_D_OFF
-+# endif
-+# ifndef _DIRENT_HAVE_D_RECLEN
-+# define _DIRENT_HAVE_D_RECLEN
-+# endif
-+# ifndef _DIRENT_HAVE_D_TYPE
-+# define _DIRENT_HAVE_D_TYPE
-+# endif
-+#endif
-+
- static struct cmdinfo readdir_cmd;
-
- const char *d_type_str(unsigned int type)
-diff -Naurw xfsprogs-4.3.0.orig/libxfs/linux.c xfsprogs-4.3.0/libxfs/linux.c
---- xfsprogs-4.3.0.orig/libxfs/linux.c 2015-08-02 17:39:42.000000000 -0700
-+++ xfsprogs-4.3.0/libxfs/linux.c 2015-11-24 13:51:06.340030523 -0800
-@@ -16,11 +16,8 @@
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
--#define ustat __kernel_ustat
- #include <mntent.h>
- #include <sys/stat.h>
--#undef ustat
--#include <sys/ustat.h>
- #include <sys/mount.h>
- #include <sys/ioctl.h>
- #include <sys/sysinfo.h>
-@@ -51,9 +48,12 @@
- int
- platform_check_ismounted(char *name, char *block, struct stat64 *s, int verbose)
- {
-- /* Pad ust; pre-2.6.28 linux copies out too much in 32bit compat mode */
-- struct ustat ust[2];
- struct stat64 st;
-+ FILE *f;
-+ struct stat64 mst;
-+ struct mntent *mnt;
-+ char mounts[MAXPATHLEN];
-+ int ismounted = 0;
-
- if (!s) {
- if (stat64(block, &st) < 0)
-@@ -63,14 +63,24 @@
- s = &st;
- }
-
-- if (ustat(s->st_rdev, ust) >= 0) {
-+ strcpy(mounts, (!access(PROC_MOUNTED, R_OK)) ? PROC_MOUNTED : MOUNTED);
-+ if ((f = setmntent(mounts, "r")) == NULL)
-+ return 0;
-+
-+ while ((mnt = getmntent(f)) != NULL) {
-+ if (stat64(mnt->mnt_dir, &mst) < 0)
-+ continue;
-+ if (mst.st_dev != s->st_rdev)
-+ continue;
- if (verbose)
- fprintf(stderr,
- _("%s: %s contains a mounted filesystem\n"),
- progname, name);
-- return 1;
-+ ismounted = 1;
-+ break;
- }
-- return 0;
-+ endmntent(f);
-+ return ismounted;
- }
-
- int
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.3.0-sharedlibs.patch b/sys-fs/xfsprogs/files/xfsprogs-4.3.0-sharedlibs.patch
deleted file mode 100644
index a39af0d..0000000
--- a/sys-fs/xfsprogs/files/xfsprogs-4.3.0-sharedlibs.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- xfsprogs-4.3.0/include/buildmacros
-+++ xfsprogs-4.3.0/include/buildmacros
-@@ -70,18 +70,9 @@
- # /usr/lib.
- ifeq ($(ENABLE_SHARED),yes)
- INSTALL_LTLIB_DEV = \
-- cd $(TOPDIR)/$(LIBNAME)/.libs; \
-- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \
-- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
-- ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
-- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
-- if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \
-- "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))" ]; then \
-- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
-- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
-- ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \
-- fi
-+ set -e; cd $(TOPDIR)/$(LIBNAME); \
-+ $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-+ env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la
- else
- INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
- endif
---- xfsprogs-4.3.0/libxcmd/Makefile
-+++ xfsprogs-4.3.0/libxcmd/Makefile
-@@ -34,6 +34,9 @@
-
- include $(BUILDRULES)
-
--install install-dev: default
-+install: default
-+
-+install-dev: default
-+ $(INSTALL_LTLIB_DEV)
-
- -include .ltdep
---- xfsprogs-4.3.0/libxfs/Makefile
-+++ xfsprogs-4.3.0/libxfs/Makefile
-@@ -138,6 +138,7 @@
-
- install-dev: install
- $(INSTALL) -m 644 $(PKGHFILES) $(PKG_INC_DIR)
-+ $(INSTALL_LTLIB_DEV)
-
- # We need to install the headers before building the dependencies. If we
- # include the .ltdep file, the makefile decides that it needs to build the
---- xfsprogs-4.3.0/libxlog/Makefile
-+++ xfsprogs-4.3.0/libxlog/Makefile
-@@ -12,6 +12,8 @@
-
- CFILES = xfs_log_recover.c util.c
-
-+LTLIBS = $(LIBUUID) $(LIBXFS)
-+
- # don't want to link xfs_repair with a debug libxlog.
- DEBUG = -DNDEBUG
-
-@@ -19,6 +21,9 @@
-
- include $(BUILDRULES)
-
--install install-dev: default
-+install: default
-+
-+install-dev: default
-+ $(INSTALL_LTLIB_DEV)
-
- -include .ltdep
---- xfsprogs-4.3.0/Makefile
-+++ xfsprogs-4.3.0/Makefile
-@@ -82,6 +82,8 @@
- quota: libxcmd
- repair: libxlog
- copy: libxlog
-+libxlog: libxfs
-+libxlog-install-dev: libxfs-install-dev
-
- ifeq ($(HAVE_BUILDDEFS), yes)
- include $(BUILDRULES)
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.5.0-linguas.patch b/sys-fs/xfsprogs/files/xfsprogs-4.5.0-linguas.patch
deleted file mode 100644
index 9912e49..0000000
--- a/sys-fs/xfsprogs/files/xfsprogs-4.5.0-linguas.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 2212e8bb59e7c3930d49da2ec5f4f0a9ceb086c7 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 8 Apr 2016 16:41:31 -0400
-Subject: [PATCH] po: respect LINGUAS build setting
-
-It is common gettext practice to limit the translations a particular
-package will include by setting the LINGUAS environment variable.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- po/Makefile | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/po/Makefile b/po/Makefile
-index edf92ad..a5250b3 100644
---- a/po/Makefile
-+++ b/po/Makefile
-@@ -6,7 +6,10 @@ TOPDIR = ..
- include $(TOPDIR)/include/builddefs
-
- POTHEAD = $(PKG_NAME).pot
--LINGUAS = de pl
-+# If the user has requested a specific set of translations, only build those.
-+SUPPORTED_LINGUAS = $(patsubst %.po,%,$(wildcard *.po))
-+LINGUAS ?= $(SUPPORTED_LINGUAS)
-+LINGUAS := $(filter $(SUPPORTED_LINGUAS),$(LINGUAS))
- LSRCFILES = $(LINGUAS:%=%.po)
- LDIRT = $(POTHEAD)
-
---
-2.7.4
-
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.7.0-libxcmd-link.patch b/sys-fs/xfsprogs/files/xfsprogs-4.7.0-libxcmd-link.patch
deleted file mode 100644
index 77ded53..0000000
--- a/sys-fs/xfsprogs/files/xfsprogs-4.7.0-libxcmd-link.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From d01d3689fd512811b9d860598ddf26089bb5955c Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 9 Aug 2016 22:37:45 +0800
-Subject: [PATCH xfsprogs] libxcmd: link against used libs
-
-Since this lib uses symbols from libxfs (platform_findsizes) and many
-symbols from libblkid, link against both. Otherwise, the resulting
-shared lib has missing symbols which makes linking against annoying.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- libxcmd/Makefile | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/libxcmd/Makefile b/libxcmd/Makefile
-index aab8d6d63624..46ba138a37e2 100644
---- a/libxcmd/Makefile
-+++ b/libxcmd/Makefile
-@@ -12,6 +12,8 @@ LT_AGE = 0
-
- CFILES = command.c input.c paths.c projects.c help.c quit.c topology.c
-
-+LTLIBS = $(LIBXFS) $(LIBBLKID)
-+
- ifeq ($(HAVE_GETMNTENT),yes)
- LCFLAGS += -DHAVE_GETMNTENT
- endif
---
-2.9.0
-
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.7.0-sharedlibs.patch b/sys-fs/xfsprogs/files/xfsprogs-4.7.0-sharedlibs.patch
deleted file mode 100644
index b5395ff..0000000
--- a/sys-fs/xfsprogs/files/xfsprogs-4.7.0-sharedlibs.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- xfsprogs-4.7.0/include/buildmacros
-+++ xfsprogs-4.7.0/include/buildmacros
-@@ -70,18 +70,9 @@
- # /usr/lib.
- ifeq ($(ENABLE_SHARED),yes)
- INSTALL_LTLIB_DEV = \
-- cd $(TOPDIR)/$(LIBNAME)/.libs; \
-- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \
-- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
-- ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
-- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
-- if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \
-- "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))" ]; then \
-- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
-- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
-- ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \
-- fi
-+ set -e; cd $(TOPDIR)/$(LIBNAME); \
-+ $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-+ env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la
- else
- INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
- endif
---- xfsprogs-4.7.0/libhandle/Makefile
-+++ xfsprogs-4.7.0/libhandle/Makefile
-@@ -24,7 +24,6 @@
- include $(BUILDRULES)
-
- install: default
-- $(INSTALL_LTLIB)
-
- install-dev: default
- $(INSTALL_LTLIB_DEV)
---- xfsprogs-4.7.0/libxcmd/Makefile
-+++ xfsprogs-4.7.0/libxcmd/Makefile
-@@ -34,6 +34,9 @@
-
- include $(BUILDRULES)
-
--install install-dev: default
-+install: default
-+
-+install-dev: default
-+ $(INSTALL_LTLIB_DEV)
-
- -include .ltdep
---- xfsprogs-4.7.0/libxfs/Makefile
-+++ xfsprogs-4.7.0/libxfs/Makefile
-@@ -138,6 +138,7 @@
-
- install-dev: install
- $(INSTALL) -m 644 $(PKGHFILES) $(PKG_INC_DIR)
-+ $(INSTALL_LTLIB_DEV)
-
- # We need to install the headers before building the dependencies. If we
- # include the .ltdep file, the makefile decides that it needs to build the
---- xfsprogs-4.7.0/libxlog/Makefile
-+++ xfsprogs-4.7.0/libxlog/Makefile
-@@ -19,6 +21,9 @@
-
- include $(BUILDRULES)
-
--install install-dev: default
-+install: default
-+
-+install-dev: default
-+ $(INSTALL_LTLIB_DEV)
-
- -include .ltdep
---- xfsprogs-4.7.0/Makefile
-+++ xfsprogs-4.7.0/Makefile
-@@ -83,6 +83,8 @@
- repair: libxlog libxcmd
- copy: libxlog
- mkfs: libxcmd
-+libxlog: libxfs
-+libxlog-install-dev: libxfs-install-dev
-
- ifeq ($(HAVE_BUILDDEFS), yes)
- include $(BUILDRULES)
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.9.0-cross-compile.patch b/sys-fs/xfsprogs/files/xfsprogs-4.9.0-cross-compile.patch
deleted file mode 100644
index fade102..0000000
--- a/sys-fs/xfsprogs/files/xfsprogs-4.9.0-cross-compile.patch
+++ /dev/null
@@ -1,143 +0,0 @@
---- xfsprogs-4.9.0/configure
-+++ xfsprogs-4.9.0/configure
-@@ -861,6 +861,7 @@
- enable_blkid
- enable_gettext
- enable_shared
-+BUILD_CFLAGS
- BUILD_CC
- CPP
- OTOOL64
-@@ -960,7 +961,9 @@
- LDFLAGS
- LIBS
- CPPFLAGS
--CPP'
-+CPP
-+BUILD_CC
-+BUILD_CFLAGS'
-
-
- # Initialize some variables set by options.
-@@ -1616,6 +1619,9 @@
- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
- you have headers in a nonstandard directory <include dir>
- CPP C preprocessor
-+ BUILD_CC C compiler for build tools
-+ BUILD_CFLAGS
-+ C compiler flags for build tools
-
- Use these variables to override the choices made by `configure' or to help
- it to find libraries and programs with nonstandard names/locations.
-@@ -11116,11 +11122,12 @@
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
--if test $cross_compiling = no; then
-- BUILD_CC="$CC"
-
--else
-- for ac_prog in gcc cc
-+if test "${BUILD_CC+set}" != "set"; then
-+ if test $cross_compiling = no; then
-+ BUILD_CC="$CC"
-+ else
-+ for ac_prog in gcc cc
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
-@@ -11162,6 +11169,15 @@
- test -n "$BUILD_CC" && break
- done
-
-+ fi
-+fi
-+
-+if test "${BUILD_CFLAGS+set}" != "set"; then
-+ if test $cross_compiling = no; then
-+ BUILD_CFLAGS="$CFLAGS"
-+ else
-+ BUILD_CFLAGS="-g -O2"
-+ fi
- fi
-
- # Check whether --enable-shared was given.
---- xfsprogs-4.9.0/configure.ac
-+++ xfsprogs-4.9.0/configure.ac
-@@ -9,11 +9,21 @@
- AC_PROG_LIBTOOL
-
- AC_PROG_CC
--if test $cross_compiling = no; then
-- BUILD_CC="$CC"
-- AC_SUBST(BUILD_CC)
--else
-- AC_CHECK_PROGS(BUILD_CC, gcc cc)
-+AC_ARG_VAR(BUILD_CC, [C compiler for build tools])
-+if test "${BUILD_CC+set}" != "set"; then
-+ if test $cross_compiling = no; then
-+ BUILD_CC="$CC"
-+ else
-+ AC_CHECK_PROGS(BUILD_CC, gcc cc)
-+ fi
-+fi
-+AC_ARG_VAR(BUILD_CFLAGS, [C compiler flags for build tools])
-+if test "${BUILD_CFLAGS+set}" != "set"; then
-+ if test $cross_compiling = no; then
-+ BUILD_CFLAGS="$CFLAGS"
-+ else
-+ BUILD_CFLAGS="-g -O2"
-+ fi
- fi
-
- AC_ARG_ENABLE(shared,
---- xfsprogs-4.9.0/include/builddefs.in
-+++ xfsprogs-4.9.0/include/builddefs.in
-@@ -26,6 +26,7 @@
- LOADERFLAGS = @LDFLAGS@
- LTLDFLAGS = @LDFLAGS@
- CFLAGS = @CFLAGS@ -D_FILE_OFFSET_BITS=64
-+BUILD_CFLAGS = @BUILD_CFLAGS@ -D_FILE_OFFSET_BITS=64
-
- LIBRT = @librt@
- LIBUUID = @libuuid@
-@@ -154,7 +155,7 @@
- endif
-
-
--GCFLAGS = $(OPTIMIZER) $(DEBUG) \
-+GCFLAGS = $(DEBUG) \
- -DVERSION=\"$(PKG_VERSION)\" -DLOCALEDIR=\"$(PKG_LOCALE_DIR)\" \
- -DPACKAGE=\"$(PKG_NAME)\" -I$(TOPDIR)/include -I$(TOPDIR)/libxfs
-
-@@ -162,8 +163,9 @@
- GCFLAGS += -DENABLE_GETTEXT
- endif
-
-+BUILD_CFLAGS += $(GCFLAGS) $(PCFLAGS)
- # First, Global, Platform, Local CFLAGS
--CFLAGS += $(FCFLAGS) $(GCFLAGS) $(PCFLAGS) $(LCFLAGS)
-+CFLAGS += $(FCFLAGS) $(OPTIMIZER) $(GCFLAGS) $(PCFLAGS) $(LCFLAGS)
-
- include $(TOPDIR)/include/buildmacros
-
---- xfsprogs-4.9.0/libxfs/Makefile
-+++ xfsprogs-4.9.0/libxfs/Makefile
-@@ -124,7 +124,7 @@
-
- crc32table.h: gen_crc32table.c
- @echo " [CC] gen_crc32table"
-- $(Q) $(BUILD_CC) $(CFLAGS) -o gen_crc32table $<
-+ $(Q) $(BUILD_CC) $(BUILD_CFLAGS) -o gen_crc32table $<
- @echo " [GENERATE] $@"
- $(Q) ./gen_crc32table > crc32table.h
-
-@@ -135,7 +135,7 @@
- # disk.
- crc32selftest: gen_crc32table.c crc32table.h crc32.c
- @echo " [TEST] CRC32"
-- $(Q) $(BUILD_CC) $(CFLAGS) -D CRC32_SELFTEST=1 crc32.c -o $@
-+ $(Q) $(BUILD_CC) $(BUILD_CFLAGS) -D CRC32_SELFTEST=1 crc32.c -o $@
- $(Q) ./$@
-
- # set up include/xfs header directory
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.9.0-musl.patch b/sys-fs/xfsprogs/files/xfsprogs-4.9.0-musl.patch
deleted file mode 100644
index cbe6911..0000000
--- a/sys-fs/xfsprogs/files/xfsprogs-4.9.0-musl.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -Naur xfsprogs-4.9.0.orig/fsr/xfs_fsr.c xfsprogs-4.9.0/fsr/xfs_fsr.c
---- xfsprogs-4.9.0.orig/fsr/xfs_fsr.c 2017-01-08 13:58:12.354784273 -0800
-+++ xfsprogs-4.9.0/fsr/xfs_fsr.c 2017-01-08 13:58:45.262063929 -0800
-@@ -36,6 +36,9 @@
- #define _PATH_FSRLAST "/var/tmp/.fsrlast_xfs"
- #define _PATH_PROC_MOUNTS "/proc/mounts"
-
-+#ifndef _PATH_MOUNTED
-+#define _PATH_MOUNTED MOUNTED
-+#endif
-
- char *progname;
-
-diff -Naur xfsprogs-4.9.0.orig/include/linux.h xfsprogs-4.9.0/include/linux.h
---- xfsprogs-4.9.0.orig/include/linux.h 2017-01-08 13:58:12.335784111 -0800
-+++ xfsprogs-4.9.0/include/linux.h 2017-01-08 13:59:38.554516824 -0800
-@@ -40,6 +40,32 @@
- # undef fsxattr
- #endif
-
-+#ifndef __uint8_t
-+# define __uint8_t uint8_t
-+#endif
-+#ifndef __uint16_t
-+# define __uint16_t uint16_t
-+#endif
-+#ifndef __uint32_t
-+# define __uint32_t uint32_t
-+#endif
-+#ifndef __uint64_t
-+# define __uint64_t uint64_t
-+#endif
-+
-+#ifndef __int8_t
-+# define __int8_t int8_t
-+#endif
-+#ifndef __int16_t
-+# define __int16_t int16_t
-+#endif
-+#ifndef __int32_t
-+# define __int32_t int32_t
-+#endif
-+#ifndef __int64_t
-+# define __int64_t int64_t
-+#endif
-+
- static __inline__ int xfsctl(const char *path, int fd, int cmd, void *p)
- {
- return ioctl(fd, cmd, p);
-diff -Naur xfsprogs-4.9.0.orig/io/readdir.c xfsprogs-4.9.0/io/readdir.c
---- xfsprogs-4.9.0.orig/io/readdir.c 2017-01-08 13:58:12.357784298 -0800
-+++ xfsprogs-4.9.0/io/readdir.c 2017-01-08 14:00:04.662738699 -0800
-@@ -24,6 +24,18 @@
- #include <sys/types.h>
- #include <dirent.h>
-
-+#if defined (__linux__)
-+# ifndef _DIRENT_HAVE_D_OFF
-+# define _DIRENT_HAVE_D_OFF
-+# endif
-+# ifndef _DIRENT_HAVE_D_RECLEN
-+# define _DIRENT_HAVE_D_RECLEN
-+# endif
-+# ifndef _DIRENT_HAVE_D_TYPE
-+# define _DIRENT_HAVE_D_TYPE
-+# endif
-+#endif
-+
- static struct cmdinfo readdir_cmd;
-
- const char *d_type_str(unsigned int type)
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.9.0-underlinking.patch b/sys-fs/xfsprogs/files/xfsprogs-4.9.0-underlinking.patch
deleted file mode 100644
index e6904a5..0000000
--- a/sys-fs/xfsprogs/files/xfsprogs-4.9.0-underlinking.patch
+++ /dev/null
@@ -1,30 +0,0 @@
- libxfs/Makefile | 2 +-
- libxlog/Makefile | 2 ++
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/libxfs/Makefile b/libxfs/Makefile
-index 6499731..00447c4 100644
---- a/libxfs/Makefile
-+++ b/libxfs/Makefile
-@@ -113,7 +113,7 @@ LSRCFILES += gen_crc32table.c
-
- FCFLAGS = -I.
-
--LTLIBS = $(LIBPTHREAD) $(LIBRT)
-+LTLIBS = $(LIBPTHREAD) $(LIBRT) $(LIBUUID)
-
- # don't try linking xfs_repair with a debug libxfs.
- DEBUG = -DNDEBUG
-diff --git a/libxlog/Makefile b/libxlog/Makefile
-index 3417eed..fda1343 100644
---- a/libxlog/Makefile
-+++ b/libxlog/Makefile
-@@ -12,6 +12,8 @@ LT_AGE = 0
-
- CFILES = xfs_log_recover.c util.c
-
-+LTLIBS = $(LIBUUID)
-+
- # don't want to link xfs_repair with a debug libxlog.
- DEBUG = -DNDEBUG
-
diff --git a/sys-fs/xfsprogs/metadata.xml b/sys-fs/xfsprogs/metadata.xml
deleted file mode 100644
index 4eb20a0..0000000
--- a/sys-fs/xfsprogs/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>base-system@gentoo.org</email>
- <name>Gentoo Base System</name>
- </maintainer>
-</pkgmetadata>
diff --git a/sys-fs/xfsprogs/xfsprogs-4.12.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.12.0.ebuild
deleted file mode 100644
index e270e75..0000000
--- a/sys-fs/xfsprogs/xfsprogs-4.12.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="xfs filesystem utilities"
-HOMEPAGE="http://oss.sgi.com/projects/xfs/"
-SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~sh ~sparc ~x86"
-IUSE="libedit nls readline static static-libs"
-REQUIRED_USE="static? ( static-libs )"
-
-LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
- readline? ( sys-libs/readline:0=[static-libs(+)] )
- !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- !<sys-fs/xfsdump-3"
-DEPEND="${RDEPEND}
- static? (
- ${LIB_DEPEND}
- readline? ( sys-libs/ncurses:0=[static-libs] )
- )
- nls? ( sys-devel/gettext )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.12.0-sharedlibs.patch
- "${FILESDIR}"/${PN}-4.7.0-libxcmd-link.patch
- "${FILESDIR}"/${PN}-4.9.0-underlinking.patch
- "${FILESDIR}"/${PN}-4.11.0-musl.patch
- "${FILESDIR}"/${PN}-4.12.0-fix_musl.patch
-)
-
-pkg_setup() {
- if use readline && use libedit ; then
- ewarn "You have USE='readline libedit' but these are exclusive."
- ewarn "Defaulting to readline; please disable this USE flag if you want libedit."
- fi
-}
-
-src_prepare() {
- epatch "${PATCHES[@]}"
-
- # LLDFLAGS is used for programs, so apply -all-static when USE=static is enabled.
- # Clear out -static from all flags since we want to link against dynamic xfs libs.
- sed -i \
- -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
- -e "1iLLDFLAGS += $(usex static '-all-static' '')" \
- include/builddefs.in || die
- find -name Makefile -exec \
- sed -i -r -e '/^LLDFLAGS [+]?= -static(-libtool-libs)?$/d' {} +
-
- # TODO: Write a patch for configure.ac to use pkg-config for the uuid-part.
- if use static && use readline ; then
- sed -i \
- -e 's|-lreadline|& -lncurses|' \
- -e 's|-lblkid|& -luuid|' \
- configure || die
- fi
-}
-
-src_configure() {
- export DEBUG=-DNDEBUG
- export OPTIMIZER=${CFLAGS}
- unset PLATFORM # if set in user env, this breaks configure
-
- local myconf
- if use static || use static-libs ; then
- myconf+=" --enable-static"
- else
- myconf+=" --disable-static"
- fi
-
- econf \
- --enable-lib64=no \
- $(use_enable nls gettext) \
- $(use_enable readline) \
- $(usex readline --disable-editline $(use_enable libedit editline)) \
- ${myconf}
-
- MAKEOPTS+=" V=1"
-}
-
-src_install() {
- emake DIST_ROOT="${ED}" install
- # parallel install fails on this target for >=xfsprogs-3.2.0
- emake -j1 DIST_ROOT="${ED}" install-dev
-
- # handle is for xfsdump, the rest for xfsprogs
- gen_usr_ldscript -a handle xcmd xfs xlog
- # removing unnecessary .la files if not needed
- use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/sys-fs/xfsprogs/xfsprogs-4.13.1.ebuild b/sys-fs/xfsprogs/xfsprogs-4.13.1.ebuild
deleted file mode 100644
index f19f14f..0000000
--- a/sys-fs/xfsprogs/xfsprogs-4.13.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs multilib
-
-DESCRIPTION="xfs filesystem utilities"
-HOMEPAGE="http://oss.sgi.com/projects/xfs/"
-SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~sh ~sparc ~x86"
-IUSE="libedit nls readline static static-libs"
-REQUIRED_USE="static? ( static-libs )"
-
-LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
- readline? ( sys-libs/readline:0=[static-libs(+)] )
- !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- !<sys-fs/xfsdump-3"
-DEPEND="${RDEPEND}
- static? (
- ${LIB_DEPEND}
- readline? ( sys-libs/ncurses:0=[static-libs] )
- )
- nls? ( sys-devel/gettext )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.12.0-sharedlibs.patch
- "${FILESDIR}"/${PN}-4.7.0-libxcmd-link.patch
- "${FILESDIR}"/${PN}-4.9.0-underlinking.patch
- "${FILESDIR}"/${PN}-4.11.0-musl.patch
-)
-
-pkg_setup() {
- if use readline && use libedit ; then
- ewarn "You have USE='readline libedit' but these are exclusive."
- ewarn "Defaulting to readline; please disable this USE flag if you want libedit."
- fi
-}
-
-src_prepare() {
- default
-
- # LLDFLAGS is used for programs, so apply -all-static when USE=static is enabled.
- # Clear out -static from all flags since we want to link against dynamic xfs libs.
- sed -i \
- -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
- -e "1iLLDFLAGS += $(usex static '-all-static' '')" \
- include/builddefs.in || die
- find -name Makefile -exec \
- sed -i -r -e '/^LLDFLAGS [+]?= -static(-libtool-libs)?$/d' {} +
-
- # TODO: Write a patch for configure.ac to use pkg-config for the uuid-part.
- if use static && use readline ; then
- sed -i \
- -e 's|-lreadline|& -lncurses|' \
- -e 's|-lblkid|& -luuid|' \
- configure || die
- fi
-}
-
-src_configure() {
- export DEBUG=-DNDEBUG
- export OPTIMIZER=${CFLAGS}
- unset PLATFORM # if set in user env, this breaks configure
-
- local myconf=(
- --enable-lib64=no
- $(use_enable nls gettext)
- $(use_enable readline)
- $(usex readline --disable-editline $(use_enable libedit editline))
- )
- if use static || use static-libs ; then
- myconf+=( --enable-static )
- else
- myconf+=( --disable-static )
- fi
-
- econf "${myconf[@]}"
-
- MAKEOPTS+=" V=1"
-}
-
-src_install() {
- emake DIST_ROOT="${ED}" install
- # parallel install fails on this target for >=xfsprogs-3.2.0
- emake -j1 DIST_ROOT="${ED}" install-dev
-
- # handle is for xfsdump, the rest for xfsprogs
- gen_usr_ldscript -a handle xcmd xfs xlog
- # removing unnecessary .la files if not needed
- use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/sys-fs/xfsprogs/xfsprogs-4.5.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.5.0.ebuild
deleted file mode 100644
index 67e0e35..0000000
--- a/sys-fs/xfsprogs/xfsprogs-4.5.0.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="xfs filesystem utilities"
-HOMEPAGE="http://oss.sgi.com/projects/xfs/"
-SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
- ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm ia64 ~mips ppc sh sparc x86"
-IUSE="libedit nls readline static static-libs"
-REQUIRED_USE="static? ( static-libs )"
-
-LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
- readline? ( sys-libs/readline:0=[static-libs(+)] )
- !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- !<sys-fs/xfsdump-3"
-DEPEND="${RDEPEND}
- static? (
- ${LIB_DEPEND}
- readline? ( sys-libs/ncurses:0=[static-libs] )
- )
- nls? ( sys-devel/gettext )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.3.0-sharedlibs.patch
- "${FILESDIR}"/${PN}-4.5.0-linguas.patch
- "${FILESDIR}"/${PN}-4.3.0-cross-compile.patch
- "${FILESDIR}"/${PN}-4.3.0-musl.patch
-)
-
-pkg_setup() {
- if use readline && use libedit ; then
- ewarn "You have USE='readline libedit' but these are exclusive."
- ewarn "Defaulting to readline; please disable this USE flag if you want libedit."
- fi
-}
-
-src_prepare() {
- epatch "${PATCHES[@]}"
-
- # LLDFLAGS is used for programs, so apply -all-static when USE=static is enabled.
- # Clear out -static from all flags since we want to link against dynamic xfs libs.
- sed -i \
- -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
- -e "1iLLDFLAGS += $(usex static '-all-static' '')" \
- include/builddefs.in || die
- find -name Makefile -exec \
- sed -i -r -e '/^LLDFLAGS [+]?= -static(-libtool-libs)?$/d' {} +
-
- # libdisk has broken blkid conditional checking
- sed -i \
- -e '/LIB_SUBDIRS/s:libdisk::' \
- Makefile || die
-
- # TODO: write a patch for configure.in to use pkg-config for the uuid-part
- if use static && use readline ; then
- sed -i \
- -e 's|-lreadline|\0 -lncurses|' \
- -e 's|-lblkid|\0 -luuid|' \
- configure || die
- fi
-}
-
-src_configure() {
- export DEBUG=-DNDEBUG
- export OPTIMIZER=${CFLAGS}
- unset PLATFORM # if set in user env, this breaks configure
-
- local myconf
- if use static || use static-libs ; then
- myconf+=" --enable-static"
- else
- myconf+=" --disable-static"
- fi
-
- econf \
- --bindir=/usr/bin \
- --libexecdir=/usr/$(get_libdir) \
- --enable-lib64=no \
- $(use_enable nls gettext) \
- $(use_enable readline) \
- $(usex readline --disable-editline $(use_enable libedit editline)) \
- ${myconf}
-
- MAKEOPTS+=" V=1"
-}
-
-src_install() {
- emake DIST_ROOT="${ED}" install
- # parallel install fails on this target for >=xfsprogs-3.2.0
- emake -j1 DIST_ROOT="${ED}" install-dev
-
- # handle is for xfsdump, the rest for xfsprogs
- gen_usr_ldscript -a xfs xlog
- # removing unnecessary .la files if not needed
- use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild
deleted file mode 100644
index 70a7600..0000000
--- a/sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="xfs filesystem utilities"
-HOMEPAGE="http://oss.sgi.com/projects/xfs/"
-SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm ia64 ~mips ppc ~sh sparc x86"
-IUSE="libedit nls readline static static-libs"
-REQUIRED_USE="static? ( static-libs )"
-
-LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
- readline? ( sys-libs/readline:0=[static-libs(+)] )
- !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- !<sys-fs/xfsdump-3"
-DEPEND="${RDEPEND}
- static? (
- ${LIB_DEPEND}
- readline? ( sys-libs/ncurses:0=[static-libs] )
- )
- nls? ( sys-devel/gettext )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.7.0-sharedlibs.patch
- "${FILESDIR}"/${PN}-4.7.0-libxcmd-link.patch
- "${FILESDIR}"/${PN}-4.9.0-cross-compile.patch
- "${FILESDIR}"/${P}-underlinking.patch
- "${FILESDIR}"/${PN}-4.9.0-musl.patch
-)
-
-pkg_setup() {
- if use readline && use libedit ; then
- ewarn "You have USE='readline libedit' but these are exclusive."
- ewarn "Defaulting to readline; please disable this USE flag if you want libedit."
- fi
-}
-
-src_prepare() {
- epatch "${PATCHES[@]}"
-
- # LLDFLAGS is used for programs, so apply -all-static when USE=static is enabled.
- # Clear out -static from all flags since we want to link against dynamic xfs libs.
- sed -i \
- -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
- -e "1iLLDFLAGS += $(usex static '-all-static' '')" \
- include/builddefs.in || die
- find -name Makefile -exec \
- sed -i -r -e '/^LLDFLAGS [+]?= -static(-libtool-libs)?$/d' {} +
-
- # TODO: Write a patch for configure.ac to use pkg-config for the uuid-part.
- if use static && use readline ; then
- sed -i \
- -e 's|-lreadline|& -lncurses|' \
- -e 's|-lblkid|& -luuid|' \
- configure || die
- fi
-}
-
-src_configure() {
- export DEBUG=-DNDEBUG
- export OPTIMIZER=${CFLAGS}
- unset PLATFORM # if set in user env, this breaks configure
-
- local myconf
- if use static || use static-libs ; then
- myconf+=" --enable-static"
- else
- myconf+=" --disable-static"
- fi
-
- econf \
- --enable-lib64=no \
- $(use_enable nls gettext) \
- $(use_enable readline) \
- $(usex readline --disable-editline $(use_enable libedit editline)) \
- ${myconf}
-
- MAKEOPTS+=" V=1"
-}
-
-src_install() {
- emake DIST_ROOT="${ED}" install
- # parallel install fails on this target for >=xfsprogs-3.2.0
- emake -j1 DIST_ROOT="${ED}" install-dev
-
- # handle is for xfsdump, the rest for xfsprogs
- gen_usr_ldscript -a handle xcmd xfs xlog
- # removing unnecessary .la files if not needed
- use static-libs || find "${ED}" -name '*.la' -delete
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-fs/xfsprogs/files/, sys-fs/xfsprogs/
@ 2018-04-09 16:11 Jory Pratt
0 siblings, 0 replies; 5+ messages in thread
From: Jory Pratt @ 2018-04-09 16:11 UTC (permalink / raw
To: gentoo-commits
commit: 8ff13e2e9a08aa1c2881194e4a1b0cb81a79a0a7
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 9 16:10:06 2018 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon Apr 9 16:10:06 2018 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=8ff13e2e
sys-fs/xfsprogs - Fix missing headers support
sys-fs/xfsprogs/Manifest | 1 +
sys-fs/xfsprogs/files/xfsprogs-4.15.0-docdir.patch | 11 ++
.../files/xfsprogs-4.15.0-missing_includes.patch | 39 +++++++
.../files/xfsprogs-4.15.0-sharedlibs.patch | 114 +++++++++++++++++++++
.../files/xfsprogs-4.9.0-underlinking.patch | 30 ++++++
sys-fs/xfsprogs/metadata.xml | 8 ++
sys-fs/xfsprogs/xfsprogs-4.15.1.ebuild | 97 ++++++++++++++++++
7 files changed, 300 insertions(+)
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
new file mode 100644
index 0000000..26b7912
--- /dev/null
+++ b/sys-fs/xfsprogs/Manifest
@@ -0,0 +1 @@
+DIST xfsprogs-4.15.1.tar.xz 1188964 BLAKE2B 7b4d1d2f71a0678f9246045e576262d6f3b3c59322e0b33b37dc46d84cdf5407a4b2fd6f2b99dd7647e9bfe9fe312fefe8162013dec9162f3a071421323aa52d SHA512 4ec3f0438f33322f0ff6e5acb27cbb554ab48df3ae0ef11071992b085016f84b49ca7bdbaf3a6859427877ea9c419bcd37ac3058914d67409ba2d65e586508ee
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.15.0-docdir.patch b/sys-fs/xfsprogs/files/xfsprogs-4.15.0-docdir.patch
new file mode 100644
index 0000000..53ba3ec
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-4.15.0-docdir.patch
@@ -0,0 +1,11 @@
+--- xfsprogs-4.15.0/scrub/Makefile
++++ xfsprogs-4.15.0/scrub/Makefile
+@@ -25,7 +25,7 @@
+ CRONTABS = xfs_scrub_all.cron
+ OPTIONAL_TARGETS += $(CRONTABS)
+ # Don't enable the crontab by default for now
+-CROND_DIR = $(PKG_LIB_DIR)/$(PKG_NAME)
++CROND_DIR = $(PKG_DOC_DIR)
+ endif
+
+ endif # scrub_prereqs
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.15.0-missing_includes.patch b/sys-fs/xfsprogs/files/xfsprogs-4.15.0-missing_includes.patch
new file mode 100644
index 0000000..5fe2776
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-4.15.0-missing_includes.patch
@@ -0,0 +1,39 @@
+From b354707a4acae9a09264e40195ba1c3b88b562b1 Mon Sep 17 00:00:00 2001
+From: "Jory A. Pratt" <anarchy@gentoo.org>
+Date: Mon, 9 Apr 2018 11:04:54 -0500
+Subject: [PATCH] Add support for missing includes
+
+Signed-off-by: Jory A. Pratt <anarchy@gentoo.org>
+---
+ include/workqueue.h | 2 ++
+ scrub/xfs_scrub.c | 1 +
+ 2 files changed, 3 insertions(+)
+
+diff --git a/include/workqueue.h b/include/workqueue.h
+index b4b3541..edb2f8a 100644
+--- a/include/workqueue.h
++++ b/include/workqueue.h
+@@ -22,6 +22,8 @@
+ #ifndef _WORKQUEUE_H_
+ #define _WORKQUEUE_H_
+
++#include <pthread.h>
++
+ struct workqueue;
+
+ typedef void workqueue_func_t(struct workqueue *wq, uint32_t index, void *arg);
+diff --git a/scrub/xfs_scrub.c b/scrub/xfs_scrub.c
+index ab26e63..9f33bdc 100644
+--- a/scrub/xfs_scrub.c
++++ b/scrub/xfs_scrub.c
+@@ -18,6 +18,7 @@
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+ #include <stdio.h>
++#include <paths.h>
+ #include <pthread.h>
+ #include <stdbool.h>
+ #include <stdlib.h>
+--
+2.17.0
+
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.15.0-sharedlibs.patch b/sys-fs/xfsprogs/files/xfsprogs-4.15.0-sharedlibs.patch
new file mode 100644
index 0000000..1080e44
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-4.15.0-sharedlibs.patch
@@ -0,0 +1,114 @@
+--- xfsprogs-4.15.0/include/buildmacros
++++ xfsprogs-4.15.0/include/buildmacros
+@@ -70,18 +70,9 @@
+ # /usr/lib.
+ ifeq ($(ENABLE_SHARED),yes)
+ INSTALL_LTLIB_DEV = \
+- cd $(TOPDIR)/$(LIBNAME)/.libs; \
+- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
+- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \
+- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
+- ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
+- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
+- if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \
+- "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))" ]; then \
+- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
+- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
+- ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \
+- fi
++ set -e; cd $(TOPDIR)/$(LIBNAME); \
++ $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
++ env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la
+ else
+ INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
+ endif
+--- xfsprogs-4.15.0/libfrog/Makefile
++++ xfsprogs-4.15.0/libfrog/Makefile
+@@ -5,6 +5,8 @@
+ TOPDIR = ..
+ include $(TOPDIR)/include/builddefs
+
++LTLIBS = $(LIBXFS) $(LIBBLKID)
++
+ LTLIBRARY = libfrog.la
+ LT_CURRENT = 0
+ LT_REVISION = 0
+@@ -34,6 +36,9 @@
+
+ include $(BUILDRULES)
+
+-install install-dev: default
++install: default
++
++install-dev: default
++ $(INSTALL_LTLIB_DEV)
+
+ -include .ltdep
+--- xfsprogs-4.15.0/libhandle/Makefile
++++ xfsprogs-4.15.0/libhandle/Makefile
+@@ -24,7 +24,6 @@
+ include $(BUILDRULES)
+
+ install: default
+- $(INSTALL_LTLIB)
+
+ install-dev: default
+ $(INSTALL_LTLIB_DEV)
+--- xfsprogs-4.15.0/libxcmd/Makefile
++++ xfsprogs-4.15.0/libxcmd/Makefile
+@@ -12,6 +12,8 @@
+
+ CFILES = command.c input.c help.c quit.c
+
++LTLIBS = $(LIBXFS) $(LIBBLKID)
++
+ ifeq ($(ENABLE_READLINE),yes)
+ LCFLAGS += -DENABLE_READLINE
+ LTLIBS += $(LIBREADLINE) $(LIBTERMCAP)
+@@ -26,6 +28,9 @@
+
+ include $(BUILDRULES)
+
+-install install-dev: default
++install: default
++
++install-dev: default
++ $(INSTALL_LTLIB_DEV)
+
+ -include .ltdep
+--- xfsprogs-4.15.0/libxfs/Makefile
++++ xfsprogs-4.15.0/libxfs/Makefile
+@@ -151,6 +151,7 @@
+
+ install-dev: install
+ $(INSTALL) -m 644 $(PKGHFILES) $(PKG_INC_DIR)
++ $(INSTALL_LTLIB_DEV)
+
+ # We need to install the headers before building the dependencies. If we
+ # include the .ltdep file, the makefile decides that it needs to build the
+--- xfsprogs-4.15.0/libxlog/Makefile
++++ xfsprogs-4.15.0/libxlog/Makefile
+@@ -19,6 +19,9 @@
+
+ include $(BUILDRULES)
+
+-install install-dev: default
++install: default
++
++install-dev: default
++ $(INSTALL_LTLIB_DEV)
+
+ -include .ltdep
+--- xfsprogs-4.15.0/Makefile
++++ xfsprogs-4.15.0/Makefile
+@@ -92,6 +92,10 @@
+ mkfs: libxcmd
+ spaceman: libxcmd
+ scrub: libhandle libxcmd
++libfrog: libxfs
++libfrog-install-dev: libxfs-install-dev
++libxlog: libxfs
++libxlog-install-dev: libxfs-install-dev
+
+ ifeq ($(HAVE_BUILDDEFS), yes)
+ include $(BUILDRULES)
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.9.0-underlinking.patch b/sys-fs/xfsprogs/files/xfsprogs-4.9.0-underlinking.patch
new file mode 100644
index 0000000..e6904a5
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-4.9.0-underlinking.patch
@@ -0,0 +1,30 @@
+ libxfs/Makefile | 2 +-
+ libxlog/Makefile | 2 ++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/libxfs/Makefile b/libxfs/Makefile
+index 6499731..00447c4 100644
+--- a/libxfs/Makefile
++++ b/libxfs/Makefile
+@@ -113,7 +113,7 @@ LSRCFILES += gen_crc32table.c
+
+ FCFLAGS = -I.
+
+-LTLIBS = $(LIBPTHREAD) $(LIBRT)
++LTLIBS = $(LIBPTHREAD) $(LIBRT) $(LIBUUID)
+
+ # don't try linking xfs_repair with a debug libxfs.
+ DEBUG = -DNDEBUG
+diff --git a/libxlog/Makefile b/libxlog/Makefile
+index 3417eed..fda1343 100644
+--- a/libxlog/Makefile
++++ b/libxlog/Makefile
+@@ -12,6 +12,8 @@ LT_AGE = 0
+
+ CFILES = xfs_log_recover.c util.c
+
++LTLIBS = $(LIBUUID)
++
+ # don't want to link xfs_repair with a debug libxlog.
+ DEBUG = -DNDEBUG
+
diff --git a/sys-fs/xfsprogs/metadata.xml b/sys-fs/xfsprogs/metadata.xml
new file mode 100644
index 0000000..4eb20a0
--- /dev/null
+++ b/sys-fs/xfsprogs/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/sys-fs/xfsprogs/xfsprogs-4.15.1.ebuild b/sys-fs/xfsprogs/xfsprogs-4.15.1.ebuild
new file mode 100644
index 0000000..9eafaa2
--- /dev/null
+++ b/sys-fs/xfsprogs/xfsprogs-4.15.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs multilib systemd
+
+DESCRIPTION="xfs filesystem utilities"
+HOMEPAGE="http://oss.sgi.com/projects/xfs/"
+SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="libedit nls readline static static-libs"
+REQUIRED_USE="static? ( static-libs )"
+
+LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
+ readline? ( sys-libs/readline:0=[static-libs(+)] )
+ !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+ !<sys-fs/xfsdump-3"
+DEPEND="${RDEPEND}
+ static? (
+ ${LIB_DEPEND}
+ readline? ( sys-libs/ncurses:0=[static-libs] )
+ )
+ nls? ( sys-devel/gettext )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.9.0-underlinking.patch
+ "${FILESDIR}"/${PN}-4.15.0-sharedlibs.patch
+ "${FILESDIR}"/${PN}-4.15.0-docdir.patch
+ "${FILESDIR}"/${PN}-4.15.0-missing_includes.patch
+)
+
+pkg_setup() {
+ if use readline && use libedit ; then
+ ewarn "You have USE='readline libedit' but these are exclusive."
+ ewarn "Defaulting to readline; please disable this USE flag if you want libedit."
+ fi
+}
+
+src_prepare() {
+ default
+
+ # LLDFLAGS is used for programs, so apply -all-static when USE=static is enabled.
+ # Clear out -static from all flags since we want to link against dynamic xfs libs.
+ sed -i \
+ -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
+ -e "1iLLDFLAGS += $(usex static '-all-static' '')" \
+ include/builddefs.in || die
+ find -name Makefile -exec \
+ sed -i -r -e '/^LLDFLAGS [+]?= -static(-libtool-libs)?$/d' {} +
+
+ # TODO: Write a patch for configure.ac to use pkg-config for the uuid-part.
+ if use static && use readline ; then
+ sed -i \
+ -e 's|-lreadline|& -lncurses|' \
+ -e 's|-lblkid|& -luuid|' \
+ configure || die
+ fi
+}
+
+src_configure() {
+ export DEBUG=-DNDEBUG
+ export OPTIMIZER=${CFLAGS}
+ unset PLATFORM # if set in user env, this breaks configure
+
+ local myconf=(
+ --with-crond-dir="${EPREFIX}/etc/cron.d"
+ --with-systemd-unit-dir="$(systemd_get_systemunitdir)"
+ $(use_enable nls gettext)
+ $(use_enable readline)
+ $(usex readline --disable-editline $(use_enable libedit editline))
+ )
+ if use static || use static-libs ; then
+ myconf+=( --enable-static )
+ else
+ myconf+=( --disable-static )
+ fi
+
+ econf "${myconf[@]}"
+
+ MAKEOPTS+=" V=1"
+}
+
+src_install() {
+ emake DIST_ROOT="${ED}" install
+ # parallel install fails on this target for >=xfsprogs-3.2.0
+ emake -j1 DIST_ROOT="${ED}" install-dev
+
+ # handle is for xfsdump, the rest for xfsprogs
+ gen_usr_ldscript -a handle xcmd xfs xlog frog
+ # removing unnecessary .la files if not needed
+ use static-libs || find "${ED}" -name '*.la' -delete
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-fs/xfsprogs/files/, sys-fs/xfsprogs/
@ 2018-12-29 20:19 Anthony G. Basile
0 siblings, 0 replies; 5+ messages in thread
From: Anthony G. Basile @ 2018-12-29 20:19 UTC (permalink / raw
To: gentoo-commits
commit: b38ac76db3440169aed9356f735bdf268acaa5ea
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 29 20:19:11 2018 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Dec 29 20:19:11 2018 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=b38ac76d
sys-fs/xfsprogs: in tree version works
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
sys-fs/xfsprogs/Manifest | 1 -
sys-fs/xfsprogs/files/xfsprogs-4.15.0-docdir.patch | 11 --
.../files/xfsprogs-4.15.0-missing_includes.patch | 39 -------
.../files/xfsprogs-4.15.0-sharedlibs.patch | 114 ---------------------
.../files/xfsprogs-4.9.0-underlinking.patch | 30 ------
sys-fs/xfsprogs/metadata.xml | 8 --
sys-fs/xfsprogs/xfsprogs-4.15.1.ebuild | 97 ------------------
7 files changed, 300 deletions(-)
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
deleted file mode 100644
index 26b7912..0000000
--- a/sys-fs/xfsprogs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xfsprogs-4.15.1.tar.xz 1188964 BLAKE2B 7b4d1d2f71a0678f9246045e576262d6f3b3c59322e0b33b37dc46d84cdf5407a4b2fd6f2b99dd7647e9bfe9fe312fefe8162013dec9162f3a071421323aa52d SHA512 4ec3f0438f33322f0ff6e5acb27cbb554ab48df3ae0ef11071992b085016f84b49ca7bdbaf3a6859427877ea9c419bcd37ac3058914d67409ba2d65e586508ee
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.15.0-docdir.patch b/sys-fs/xfsprogs/files/xfsprogs-4.15.0-docdir.patch
deleted file mode 100644
index 53ba3ec..0000000
--- a/sys-fs/xfsprogs/files/xfsprogs-4.15.0-docdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xfsprogs-4.15.0/scrub/Makefile
-+++ xfsprogs-4.15.0/scrub/Makefile
-@@ -25,7 +25,7 @@
- CRONTABS = xfs_scrub_all.cron
- OPTIONAL_TARGETS += $(CRONTABS)
- # Don't enable the crontab by default for now
--CROND_DIR = $(PKG_LIB_DIR)/$(PKG_NAME)
-+CROND_DIR = $(PKG_DOC_DIR)
- endif
-
- endif # scrub_prereqs
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.15.0-missing_includes.patch b/sys-fs/xfsprogs/files/xfsprogs-4.15.0-missing_includes.patch
deleted file mode 100644
index 5fe2776..0000000
--- a/sys-fs/xfsprogs/files/xfsprogs-4.15.0-missing_includes.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From b354707a4acae9a09264e40195ba1c3b88b562b1 Mon Sep 17 00:00:00 2001
-From: "Jory A. Pratt" <anarchy@gentoo.org>
-Date: Mon, 9 Apr 2018 11:04:54 -0500
-Subject: [PATCH] Add support for missing includes
-
-Signed-off-by: Jory A. Pratt <anarchy@gentoo.org>
----
- include/workqueue.h | 2 ++
- scrub/xfs_scrub.c | 1 +
- 2 files changed, 3 insertions(+)
-
-diff --git a/include/workqueue.h b/include/workqueue.h
-index b4b3541..edb2f8a 100644
---- a/include/workqueue.h
-+++ b/include/workqueue.h
-@@ -22,6 +22,8 @@
- #ifndef _WORKQUEUE_H_
- #define _WORKQUEUE_H_
-
-+#include <pthread.h>
-+
- struct workqueue;
-
- typedef void workqueue_func_t(struct workqueue *wq, uint32_t index, void *arg);
-diff --git a/scrub/xfs_scrub.c b/scrub/xfs_scrub.c
-index ab26e63..9f33bdc 100644
---- a/scrub/xfs_scrub.c
-+++ b/scrub/xfs_scrub.c
-@@ -18,6 +18,7 @@
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
- */
- #include <stdio.h>
-+#include <paths.h>
- #include <pthread.h>
- #include <stdbool.h>
- #include <stdlib.h>
---
-2.17.0
-
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.15.0-sharedlibs.patch b/sys-fs/xfsprogs/files/xfsprogs-4.15.0-sharedlibs.patch
deleted file mode 100644
index 1080e44..0000000
--- a/sys-fs/xfsprogs/files/xfsprogs-4.15.0-sharedlibs.patch
+++ /dev/null
@@ -1,114 +0,0 @@
---- xfsprogs-4.15.0/include/buildmacros
-+++ xfsprogs-4.15.0/include/buildmacros
-@@ -70,18 +70,9 @@
- # /usr/lib.
- ifeq ($(ENABLE_SHARED),yes)
- INSTALL_LTLIB_DEV = \
-- cd $(TOPDIR)/$(LIBNAME)/.libs; \
-- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \
-- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
-- ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
-- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
-- if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \
-- "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))" ]; then \
-- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
-- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
-- ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \
-- fi
-+ set -e; cd $(TOPDIR)/$(LIBNAME); \
-+ $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-+ env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la
- else
- INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
- endif
---- xfsprogs-4.15.0/libfrog/Makefile
-+++ xfsprogs-4.15.0/libfrog/Makefile
-@@ -5,6 +5,8 @@
- TOPDIR = ..
- include $(TOPDIR)/include/builddefs
-
-+LTLIBS = $(LIBXFS) $(LIBBLKID)
-+
- LTLIBRARY = libfrog.la
- LT_CURRENT = 0
- LT_REVISION = 0
-@@ -34,6 +36,9 @@
-
- include $(BUILDRULES)
-
--install install-dev: default
-+install: default
-+
-+install-dev: default
-+ $(INSTALL_LTLIB_DEV)
-
- -include .ltdep
---- xfsprogs-4.15.0/libhandle/Makefile
-+++ xfsprogs-4.15.0/libhandle/Makefile
-@@ -24,7 +24,6 @@
- include $(BUILDRULES)
-
- install: default
-- $(INSTALL_LTLIB)
-
- install-dev: default
- $(INSTALL_LTLIB_DEV)
---- xfsprogs-4.15.0/libxcmd/Makefile
-+++ xfsprogs-4.15.0/libxcmd/Makefile
-@@ -12,6 +12,8 @@
-
- CFILES = command.c input.c help.c quit.c
-
-+LTLIBS = $(LIBXFS) $(LIBBLKID)
-+
- ifeq ($(ENABLE_READLINE),yes)
- LCFLAGS += -DENABLE_READLINE
- LTLIBS += $(LIBREADLINE) $(LIBTERMCAP)
-@@ -26,6 +28,9 @@
-
- include $(BUILDRULES)
-
--install install-dev: default
-+install: default
-+
-+install-dev: default
-+ $(INSTALL_LTLIB_DEV)
-
- -include .ltdep
---- xfsprogs-4.15.0/libxfs/Makefile
-+++ xfsprogs-4.15.0/libxfs/Makefile
-@@ -151,6 +151,7 @@
-
- install-dev: install
- $(INSTALL) -m 644 $(PKGHFILES) $(PKG_INC_DIR)
-+ $(INSTALL_LTLIB_DEV)
-
- # We need to install the headers before building the dependencies. If we
- # include the .ltdep file, the makefile decides that it needs to build the
---- xfsprogs-4.15.0/libxlog/Makefile
-+++ xfsprogs-4.15.0/libxlog/Makefile
-@@ -19,6 +19,9 @@
-
- include $(BUILDRULES)
-
--install install-dev: default
-+install: default
-+
-+install-dev: default
-+ $(INSTALL_LTLIB_DEV)
-
- -include .ltdep
---- xfsprogs-4.15.0/Makefile
-+++ xfsprogs-4.15.0/Makefile
-@@ -92,6 +92,10 @@
- mkfs: libxcmd
- spaceman: libxcmd
- scrub: libhandle libxcmd
-+libfrog: libxfs
-+libfrog-install-dev: libxfs-install-dev
-+libxlog: libxfs
-+libxlog-install-dev: libxfs-install-dev
-
- ifeq ($(HAVE_BUILDDEFS), yes)
- include $(BUILDRULES)
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.9.0-underlinking.patch b/sys-fs/xfsprogs/files/xfsprogs-4.9.0-underlinking.patch
deleted file mode 100644
index e6904a5..0000000
--- a/sys-fs/xfsprogs/files/xfsprogs-4.9.0-underlinking.patch
+++ /dev/null
@@ -1,30 +0,0 @@
- libxfs/Makefile | 2 +-
- libxlog/Makefile | 2 ++
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/libxfs/Makefile b/libxfs/Makefile
-index 6499731..00447c4 100644
---- a/libxfs/Makefile
-+++ b/libxfs/Makefile
-@@ -113,7 +113,7 @@ LSRCFILES += gen_crc32table.c
-
- FCFLAGS = -I.
-
--LTLIBS = $(LIBPTHREAD) $(LIBRT)
-+LTLIBS = $(LIBPTHREAD) $(LIBRT) $(LIBUUID)
-
- # don't try linking xfs_repair with a debug libxfs.
- DEBUG = -DNDEBUG
-diff --git a/libxlog/Makefile b/libxlog/Makefile
-index 3417eed..fda1343 100644
---- a/libxlog/Makefile
-+++ b/libxlog/Makefile
-@@ -12,6 +12,8 @@ LT_AGE = 0
-
- CFILES = xfs_log_recover.c util.c
-
-+LTLIBS = $(LIBUUID)
-+
- # don't want to link xfs_repair with a debug libxlog.
- DEBUG = -DNDEBUG
-
diff --git a/sys-fs/xfsprogs/metadata.xml b/sys-fs/xfsprogs/metadata.xml
deleted file mode 100644
index 4eb20a0..0000000
--- a/sys-fs/xfsprogs/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>base-system@gentoo.org</email>
- <name>Gentoo Base System</name>
- </maintainer>
-</pkgmetadata>
diff --git a/sys-fs/xfsprogs/xfsprogs-4.15.1.ebuild b/sys-fs/xfsprogs/xfsprogs-4.15.1.ebuild
deleted file mode 100644
index 9eafaa2..0000000
--- a/sys-fs/xfsprogs/xfsprogs-4.15.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs multilib systemd
-
-DESCRIPTION="xfs filesystem utilities"
-HOMEPAGE="http://oss.sgi.com/projects/xfs/"
-SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="libedit nls readline static static-libs"
-REQUIRED_USE="static? ( static-libs )"
-
-LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
- readline? ( sys-libs/readline:0=[static-libs(+)] )
- !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- !<sys-fs/xfsdump-3"
-DEPEND="${RDEPEND}
- static? (
- ${LIB_DEPEND}
- readline? ( sys-libs/ncurses:0=[static-libs] )
- )
- nls? ( sys-devel/gettext )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.9.0-underlinking.patch
- "${FILESDIR}"/${PN}-4.15.0-sharedlibs.patch
- "${FILESDIR}"/${PN}-4.15.0-docdir.patch
- "${FILESDIR}"/${PN}-4.15.0-missing_includes.patch
-)
-
-pkg_setup() {
- if use readline && use libedit ; then
- ewarn "You have USE='readline libedit' but these are exclusive."
- ewarn "Defaulting to readline; please disable this USE flag if you want libedit."
- fi
-}
-
-src_prepare() {
- default
-
- # LLDFLAGS is used for programs, so apply -all-static when USE=static is enabled.
- # Clear out -static from all flags since we want to link against dynamic xfs libs.
- sed -i \
- -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
- -e "1iLLDFLAGS += $(usex static '-all-static' '')" \
- include/builddefs.in || die
- find -name Makefile -exec \
- sed -i -r -e '/^LLDFLAGS [+]?= -static(-libtool-libs)?$/d' {} +
-
- # TODO: Write a patch for configure.ac to use pkg-config for the uuid-part.
- if use static && use readline ; then
- sed -i \
- -e 's|-lreadline|& -lncurses|' \
- -e 's|-lblkid|& -luuid|' \
- configure || die
- fi
-}
-
-src_configure() {
- export DEBUG=-DNDEBUG
- export OPTIMIZER=${CFLAGS}
- unset PLATFORM # if set in user env, this breaks configure
-
- local myconf=(
- --with-crond-dir="${EPREFIX}/etc/cron.d"
- --with-systemd-unit-dir="$(systemd_get_systemunitdir)"
- $(use_enable nls gettext)
- $(use_enable readline)
- $(usex readline --disable-editline $(use_enable libedit editline))
- )
- if use static || use static-libs ; then
- myconf+=( --enable-static )
- else
- myconf+=( --disable-static )
- fi
-
- econf "${myconf[@]}"
-
- MAKEOPTS+=" V=1"
-}
-
-src_install() {
- emake DIST_ROOT="${ED}" install
- # parallel install fails on this target for >=xfsprogs-3.2.0
- emake -j1 DIST_ROOT="${ED}" install-dev
-
- # handle is for xfsdump, the rest for xfsprogs
- gen_usr_ldscript -a handle xcmd xfs xlog frog
- # removing unnecessary .la files if not needed
- use static-libs || find "${ED}" -name '*.la' -delete
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-12-29 20:19 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-12-29 20:19 [gentoo-commits] proj/musl:master commit in: sys-fs/xfsprogs/files/, sys-fs/xfsprogs/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2018-04-09 16:11 Jory Pratt
2018-03-16 13:21 Anthony G. Basile
2017-07-25 18:52 Jory Pratt
2017-01-08 22:03 Aric Belsito
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox