diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2017-11-30 08:10:01 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-11-30 08:10:56 +0000 |
commit | a88ff3652b1dd9c7cf3cee0d7a43b4e9297120a3 (patch) | |
tree | c977d45c23ff3bfc34bb67b16192f4fb0ce2c04a | |
parent | 86563770727dd2b567ccb74be1c9737ddec79f68 (diff) | |
download | alpine_aports-a88ff3652b1dd9c7cf3cee0d7a43b4e9297120a3.tar.bz2 alpine_aports-a88ff3652b1dd9c7cf3cee0d7a43b4e9297120a3.tar.xz alpine_aports-a88ff3652b1dd9c7cf3cee0d7a43b4e9297120a3.zip |
main/xfsprogs: upgrade to 4.14.0
-rw-r--r-- | main/xfsprogs/APKBUILD | 8 | ||||
-rw-r--r-- | main/xfsprogs/musl-fixes.patch | 126 |
2 files changed, 3 insertions, 131 deletions
diff --git a/main/xfsprogs/APKBUILD b/main/xfsprogs/APKBUILD index 5863cf6059..ef66499a0f 100644 --- a/main/xfsprogs/APKBUILD +++ b/main/xfsprogs/APKBUILD | |||
@@ -1,8 +1,8 @@ | |||
1 | # Contributor: Valery Kartel <valery.kartel@gmail.com> | 1 | # Contributor: Valery Kartel <valery.kartel@gmail.com> |
2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
3 | pkgname=xfsprogs | 3 | pkgname=xfsprogs |
4 | pkgver=4.5.0 | 4 | pkgver=4.14.0 |
5 | pkgrel=2 | 5 | pkgrel=0 |
6 | pkgdesc="XFS filesystem utilities" | 6 | pkgdesc="XFS filesystem utilities" |
7 | url="http://xfs.org/index.php/Main_Page" | 7 | url="http://xfs.org/index.php/Main_Page" |
8 | arch="all" | 8 | arch="all" |
@@ -11,7 +11,6 @@ makedepends="linux-headers util-linux-dev bash gzip" | |||
11 | options="!check" # no test suite | 11 | options="!check" # no test suite |
12 | subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-extra" | 12 | subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-extra" |
13 | source="https://www.kernel.org/pub/linux/utils/fs/xfs/$pkgname/$pkgname-$pkgver.tar.gz | 13 | source="https://www.kernel.org/pub/linux/utils/fs/xfs/$pkgname/$pkgname-$pkgver.tar.gz |
14 | musl-fixes.patch | ||
15 | " | 14 | " |
16 | 15 | ||
17 | builddir="$srcdir/$pkgname-$pkgver" | 16 | builddir="$srcdir/$pkgname-$pkgver" |
@@ -49,5 +48,4 @@ extra() { | |||
49 | mv "$pkgdir"/usr "$subpkgdir"/ | 48 | mv "$pkgdir"/usr "$subpkgdir"/ |
50 | } | 49 | } |
51 | 50 | ||
52 | sha512sums="71ccb13fbbe09410b6ea116bbce9e6beb189246b29a7542e5f268649229aa0c156f197338573c17fc58e943a98b658fc38ceb21712d3c99af27f86a21eca7dca xfsprogs-4.5.0.tar.gz | 51 | sha512sums="6b8e5e12aa5c4d197feb7c464495a1da163cf7a61416a5b9960dbae9456d776d815d5bb2f60850027274bd8d2cd4409f0fa8d572117043ba38ecc5c785f24967 xfsprogs-4.14.0.tar.gz" |
53 | 52d7ff52e19a5f351f3a97bb20c9f5a063b344ca2e18250a5ee3e15a1693461f95825aa8b7c3c9149d2ce3696c64772d092f679810eccf996321ea93b0770596 musl-fixes.patch" | ||
diff --git a/main/xfsprogs/musl-fixes.patch b/main/xfsprogs/musl-fixes.patch deleted file mode 100644 index 6fe69a11bf..0000000000 --- a/main/xfsprogs/musl-fixes.patch +++ /dev/null | |||
@@ -1,126 +0,0 @@ | |||
1 | diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c | ||
2 | index 6f00b41..5b4af53 100644 | ||
3 | --- a/fsr/xfs_fsr.c | ||
4 | +++ b/fsr/xfs_fsr.c | ||
5 | @@ -44,6 +44,10 @@ | ||
6 | #define _PATH_FSRLAST "/var/tmp/.fsrlast_xfs" | ||
7 | #define _PATH_PROC_MOUNTS "/proc/mounts" | ||
8 | |||
9 | +#ifndef _PATH_MOUNTED | ||
10 | +#define _PATH_MOUNTED MOUNTED | ||
11 | +#endif | ||
12 | + | ||
13 | |||
14 | char *progname; | ||
15 | |||
16 | diff --git a/libxfs/linux.c b/libxfs/linux.c | ||
17 | index 2e07d54..4075786 100644 | ||
18 | --- a/libxfs/linux.c | ||
19 | +++ b/libxfs/linux.c | ||
20 | @@ -16,11 +16,8 @@ | ||
21 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
22 | */ | ||
23 | |||
24 | -#define ustat __kernel_ustat | ||
25 | #include <mntent.h> | ||
26 | #include <sys/stat.h> | ||
27 | -#undef ustat | ||
28 | -#include <sys/ustat.h> | ||
29 | #include <sys/mount.h> | ||
30 | #include <sys/ioctl.h> | ||
31 | #include <sys/sysinfo.h> | ||
32 | @@ -51,9 +48,12 @@ | ||
33 | int | ||
34 | platform_check_ismounted(char *name, char *block, struct stat64 *s, int verbose) | ||
35 | { | ||
36 | - /* Pad ust; pre-2.6.28 linux copies out too much in 32bit compat mode */ | ||
37 | - struct ustat ust[2]; | ||
38 | struct stat64 st; | ||
39 | + FILE *f; | ||
40 | + struct stat64 mst; | ||
41 | + struct mntent *mnt; | ||
42 | + char mounts[MAXPATHLEN]; | ||
43 | + int ismounted = 0; | ||
44 | |||
45 | if (!s) { | ||
46 | if (stat64(block, &st) < 0) | ||
47 | @@ -63,14 +63,25 @@ | ||
48 | s = &st; | ||
49 | } | ||
50 | |||
51 | - if (ustat(s->st_rdev, ust) >= 0) { | ||
52 | + strcpy(mounts, (!access(PROC_MOUNTED, R_OK)) ? PROC_MOUNTED : MOUNTED); | ||
53 | + if ((f = setmntent(mounts, "r")) == NULL) | ||
54 | + return 0; | ||
55 | + | ||
56 | + while ((mnt = getmntent(f)) != NULL) { | ||
57 | + if (stat64(mnt->mnt_dir, &mst) < 0) | ||
58 | + continue; | ||
59 | + if (mst.st_dev != s->st_rdev) | ||
60 | + continue; | ||
61 | + | ||
62 | if (verbose) | ||
63 | fprintf(stderr, | ||
64 | _("%s: %s contains a mounted filesystem\n"), | ||
65 | progname, name); | ||
66 | - return 1; | ||
67 | + ismounted = 1; | ||
68 | + break; | ||
69 | } | ||
70 | - return 0; | ||
71 | + endmntent(f); | ||
72 | + return ismounted; | ||
73 | } | ||
74 | |||
75 | int | ||
76 | --- old/io/readdir.c | ||
77 | +++ new/io/readdir.c | ||
78 | @@ -23,6 +23,9 @@ | ||
79 | |||
80 | #include <sys/types.h> | ||
81 | #include <dirent.h> | ||
82 | +#define _DIRENT_HAVE_D_OFF | ||
83 | +#define _DIRENT_HAVE_D_RECLEN | ||
84 | +#define _DIRENT_HAVE_D_TYPE | ||
85 | |||
86 | static struct cmdinfo readdir_cmd; | ||
87 | |||
88 | --- old/include/linux.h | ||
89 | +++ new/include/linux.h | ||
90 | @@ -31,6 +31,36 @@ | ||
91 | #include <stdbool.h> | ||
92 | #include <asm/types.h> | ||
93 | #include <mntent.h> | ||
94 | +#include <stdio.h> | ||
95 | + | ||
96 | +#ifndef loff_t | ||
97 | +#define loff_t off_t | ||
98 | +#endif | ||
99 | +#ifndef __uint8_t | ||
100 | +#define __uint8_t uint8_t | ||
101 | +#endif | ||
102 | +#ifndef __uint16_t | ||
103 | +#define __uint16_t uint16_t | ||
104 | +#endif | ||
105 | +#ifndef __uint32_t | ||
106 | +#define __uint32_t uint32_t | ||
107 | +#endif | ||
108 | +#ifndef __uint64_t | ||
109 | +#define __uint64_t uint64_t | ||
110 | +#endif | ||
111 | + | ||
112 | +#ifndef __int8_t | ||
113 | +#define __int8_t int8_t | ||
114 | +#endif | ||
115 | +#ifndef __int16_t | ||
116 | +#define __int16_t int16_t | ||
117 | +#endif | ||
118 | +#ifndef __int32_t | ||
119 | +#define __int32_t int32_t | ||
120 | +#endif | ||
121 | +#ifndef __int64_t | ||
122 | +#define __int64_t int64_t | ||
123 | +#endif | ||
124 | |||
125 | static __inline__ int xfsctl(const char *path, int fd, int cmd, void *p) | ||
126 | { | ||