diff options
| author | André Klitzing <aklitzing@gmail.com> | 2017-03-29 08:55:28 +0200 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2017-03-29 12:48:21 +0200 |
| commit | cbf60dfc4f933dce87abde32c10520d4012c03a9 (patch) | |
| tree | b14abd0fa190a75b9aad347b807a970f919ae4f2 /main/ntfs-3g | |
| parent | a73ecfc233bc38c7297e1feea5c3f47c53933958 (diff) | |
| download | aports-cbf60dfc4f933dce87abde32c10520d4012c03a9.tar.bz2 aports-cbf60dfc4f933dce87abde32c10520d4012c03a9.tar.xz | |
main/ntfs-3g: upgrade to 2017.3.23 and remove merged patches
Diffstat (limited to 'main/ntfs-3g')
| -rw-r--r-- | main/ntfs-3g/APKBUILD | 19 | ||||
| -rw-r--r-- | main/ntfs-3g/cve-2017-0358.patch | 36 | ||||
| -rw-r--r-- | main/ntfs-3g/musl-fixes.patch | 20 |
3 files changed, 4 insertions, 71 deletions
diff --git a/main/ntfs-3g/APKBUILD b/main/ntfs-3g/APKBUILD index 6236eadb37..9f77bfb789 100644 --- a/main/ntfs-3g/APKBUILD +++ b/main/ntfs-3g/APKBUILD @@ -3,8 +3,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ntfs-3g _pkgreal=ntfs-3g_ntfsprogs -pkgver=2016.2.22 -pkgrel=1 +pkgver=2017.3.23 +pkgrel=0 pkgdesc="Stable, full-featured, read-write NTFS" url="http://www.tuxera.com/community/ntfs-3g-download/" arch="all" @@ -12,10 +12,7 @@ license="GPL" depends= makedepends="attr-dev util-linux-dev linux-headers" subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-progs" -source="http://tuxera.com/opensource/$_pkgreal-$pkgver.tgz - musl-fixes.patch - cve-2017-0358.patch - " +source="http://tuxera.com/opensource/$_pkgreal-$pkgver.tgz" builddir="$srcdir/$_pkgreal-$pkgver" build() { @@ -46,12 +43,4 @@ progs() { rm -fr "$subpkgdir"/lib "$subpkgdir"/usr/lib } -md5sums="ccbe8672d0f757bd0c975b50aa4c512e ntfs-3g_ntfsprogs-2016.2.22.tgz -cdfca9f0d20ef96ec60e072ffe4fd061 musl-fixes.patch -044e19e0f7c1bc26244f87ac08a784e9 cve-2017-0358.patch" -sha256sums="d7b72c05e4b3493e6095be789a760c9f5f2b141812d5b885f3190c98802f1ea0 ntfs-3g_ntfsprogs-2016.2.22.tgz -f60f15b5650ada189d880ffea0e199869b3d5e855913d353cab8b0b7ebc47ae4 musl-fixes.patch -2b864502d1a762a67e5c839249b800245d1eaa173de68f44eb98e4a6f89206bd cve-2017-0358.patch" -sha512sums="dbd36fadd2881db1d17fdbf5d2b4e50bbe11dc9dd0ad4917e7f8bc4032c2287346143756ce8754df0d46ce9209f2c0c41b626cad929d76a9bc881712c7101c15 ntfs-3g_ntfsprogs-2016.2.22.tgz -5b4680956f11c75ee3122923f36b840e2a0a38e6cebecbe7be4a02f4423746f8b7d7a89b16d7a9bea62e64534d20e87503beb582273af38d458b946387e85a02 musl-fixes.patch -56f1f88483637df6cbc9b20a6a02d445d107374d8cbdd759ff7a9f40263ccd56b1e8e8494fb7e34b3ff9f001bc746d3a17dcf3b941fc1623011305a82fa4b692 cve-2017-0358.patch" +sha512sums="3a607f0d7be35204c992d8931de0404fbc52032c13b4240d2c5e6f285c318a28eb2a385d7cf5ac4cd445876aee5baa5753bb636ada0d870d84a9d3fdbce794ef ntfs-3g_ntfsprogs-2017.3.23.tgz" diff --git a/main/ntfs-3g/cve-2017-0358.patch b/main/ntfs-3g/cve-2017-0358.patch deleted file mode 100644 index ee7ff1ef1b..0000000000 --- a/main/ntfs-3g/cve-2017-0358.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- ntfs-3g/src/lowntfs-3g.c.ref 2016-12-31 08:56:59.011749600 +0100 -+++ ntfs-3g/src/lowntfs-3g.c 2017-01-05 14:41:52.041473700 +0100 -@@ -3827,13 +3827,14 @@ - struct stat st; - pid_t pid; - const char *cmd = "/sbin/modprobe"; -+ char *env = (char*)NULL; - struct timespec req = { 0, 100000000 }; /* 100 msec */ - fuse_fstype fstype; - - if (!stat(cmd, &st) && !geteuid()) { - pid = fork(); - if (!pid) { -- execl(cmd, cmd, "fuse", NULL); -+ execle(cmd, cmd, "fuse", NULL, &env); - _exit(1); - } else if (pid != -1) - waitpid(pid, NULL, 0); ---- ntfs-3g/src/ntfs-3g.c.ref 2016-12-31 08:56:59.022518700 +0100 -+++ ntfs-3g/src/ntfs-3g.c 2017-01-05 15:45:45.912499400 +0100 -@@ -3612,13 +3612,14 @@ - struct stat st; - pid_t pid; - const char *cmd = "/sbin/modprobe"; -+ char *env = (char*)NULL; - struct timespec req = { 0, 100000000 }; /* 100 msec */ - fuse_fstype fstype; - - if (!stat(cmd, &st) && !geteuid()) { - pid = fork(); - if (!pid) { -- execl(cmd, cmd, "fuse", NULL); -+ execle(cmd, cmd, "fuse", NULL, &env); - _exit(1); - } else if (pid != -1) - waitpid(pid, NULL, 0); diff --git a/main/ntfs-3g/musl-fixes.patch b/main/ntfs-3g/musl-fixes.patch deleted file mode 100644 index 258588c7ce..0000000000 --- a/main/ntfs-3g/musl-fixes.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ntfs-3g_ntfsprogs-2013.1.13.orig/libfuse-lite/fusermount.c -+++ ntfs-3g_ntfsprogs-2013.1.13/libfuse-lite/fusermount.c -@@ -18,6 +18,7 @@ - #include <getopt.h> - #include <errno.h> - #include <fcntl.h> -+#include <paths.h> - #include <pwd.h> - - #ifdef __SOLARIS__ ---- ntfs-3g_ntfsprogs-2013.1.13.orig/libfuse-lite/mount_util.c -+++ ntfs-3g_ntfsprogs-2013.1.13/libfuse-lite/mount_util.c -@@ -14,6 +14,7 @@ - #include <string.h> - #include <dirent.h> - #include <errno.h> -+#include <paths.h> - #include <limits.h> - #include <sys/stat.h> - #include <sys/wait.h> |