diff options
Diffstat (limited to 'main/ntfs-3g')
| -rw-r--r-- | main/ntfs-3g/APKBUILD | 30 | ||||
| -rw-r--r-- | main/ntfs-3g/CVE-2019-9755.patch | 62 |
2 files changed, 23 insertions, 69 deletions
diff --git a/main/ntfs-3g/APKBUILD b/main/ntfs-3g/APKBUILD index 4babd6b7acc..1be9d17c3db 100644 --- a/main/ntfs-3g/APKBUILD +++ b/main/ntfs-3g/APKBUILD @@ -3,21 +3,37 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ntfs-3g _pkgreal=ntfs-3g_ntfsprogs -pkgver=2017.3.23 +pkgver=2022.10.3 pkgrel=3 pkgdesc="Stable, full-featured, read-write NTFS" url="https://www.tuxera.com/company/open-source/" arch="all" -license="GPL-2.0-or-later AND LGPL-2.0-or-later" +license="GPL-2.0-only" options="!check" # No test suite makedepends="attr-dev util-linux-dev linux-headers" -subpackages="$pkgname-static $pkgname-doc $pkgname-dev $pkgname-libs $pkgname-progs" +subpackages=" + $pkgname-static + $pkgname-doc + $pkgname-dev + $pkgname-libs + $pkgname-progs + " source="https://tuxera.com/opensource/ntfs-3g_ntfsprogs-$pkgver.tgz - CVE-2019-9755.patch " builddir="$srcdir/$_pkgreal-$pkgver" # secfixes: +# 2022.10.3-r0: +# - CVE-2022-40284 +# 2022.5.17-r0: +# - CVE-2021-46790 +# - CVE-2022-30783 +# - CVE-2022-30784 +# - CVE-2022-30785 +# - CVE-2022-30786 +# - CVE-2022-30787 +# - CVE-2022-30788 +# - CVE-2022-30789 # 2017.3.23-r2: # - CVE-2019-9755 @@ -45,9 +61,9 @@ progs() { mkdir -p "$subpkgdir"/sbin mv "$pkgdir"/usr "$pkgdir"/lib "$subpkgdir"/ - mv "$pkgdir"/sbin/mkfs.ntfs "$subpkgdir"/sbin rm -fr "$subpkgdir"/lib "$subpkgdir"/usr/lib } -sha512sums="3a607f0d7be35204c992d8931de0404fbc52032c13b4240d2c5e6f285c318a28eb2a385d7cf5ac4cd445876aee5baa5753bb636ada0d870d84a9d3fdbce794ef ntfs-3g_ntfsprogs-2017.3.23.tgz -d071cf6c3ee38963df0286049196cb3bab050460e0b541f3cf5d217c874d247878cb6dcca2d6d68c562447f8956e0511dd93552c5647dda88b69be880b5cd9f8 CVE-2019-9755.patch" +sha512sums=" +891589483954423b19bef6e8a174fb4311ad92b6397a0db80f77c72b746bf18c2fa12457a571947f92755637a6bc784188920d4f017ae12a420819ab0d74af59 ntfs-3g_ntfsprogs-2022.10.3.tgz +" diff --git a/main/ntfs-3g/CVE-2019-9755.patch b/main/ntfs-3g/CVE-2019-9755.patch deleted file mode 100644 index 577f1686282..00000000000 --- a/main/ntfs-3g/CVE-2019-9755.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 85c1634a26faa572d3c558d4cf8aaaca5202d4e9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jean-Pierre=20Andr=C3=A9?= <jean-pierre.andre@wanadoo.fr> -Date: Wed, 19 Dec 2018 15:57:50 +0100 -Subject: [PATCH] Fixed reporting an error when failed to build the mountpoint - -The size check was inefficient because getcwd() uses an unsigned int -argument. ---- - src/lowntfs-3g.c | 6 +++++- - src/ntfs-3g.c | 6 +++++- - 2 files changed, 10 insertions(+), 2 deletions(-) - -diff --git a/src/lowntfs-3g.c b/src/lowntfs-3g.c -index 993867fa..0660439b 100644 ---- a/src/lowntfs-3g.c -+++ b/src/lowntfs-3g.c -@@ -4323,7 +4323,8 @@ - else { - ctx->abs_mnt_point = (char*)ntfs_malloc(PATH_MAX); - if (ctx->abs_mnt_point) { -- if (getcwd(ctx->abs_mnt_point, -+ if ((strlen(opts.mnt_point) < PATH_MAX) -+ && getcwd(ctx->abs_mnt_point, - PATH_MAX - strlen(opts.mnt_point) - 1)) { - strcat(ctx->abs_mnt_point, "/"); - strcat(ctx->abs_mnt_point, opts.mnt_point); -@@ -4331,6 +4332,9 @@ - /* Solaris also wants the absolute mount point */ - opts.mnt_point = ctx->abs_mnt_point; - #endif /* defined(__sun) && defined (__SVR4) */ -+ } else { -+ free(ctx->abs_mnt_point); -+ ctx->abs_mnt_point = (char*)NULL; - } - } - } -diff --git a/src/ntfs-3g.c b/src/ntfs-3g.c -index 6ce89fef..4e0912ae 100644 ---- a/src/ntfs-3g.c -+++ b/src/ntfs-3g.c -@@ -4123,7 +4123,8 @@ - else { - ctx->abs_mnt_point = (char*)ntfs_malloc(PATH_MAX); - if (ctx->abs_mnt_point) { -- if (getcwd(ctx->abs_mnt_point, -+ if ((strlen(opts.mnt_point) < PATH_MAX) -+ && getcwd(ctx->abs_mnt_point, - PATH_MAX - strlen(opts.mnt_point) - 1)) { - strcat(ctx->abs_mnt_point, "/"); - strcat(ctx->abs_mnt_point, opts.mnt_point); -@@ -4131,6 +4132,9 @@ - /* Solaris also wants the absolute mount point */ - opts.mnt_point = ctx->abs_mnt_point; - #endif /* defined(__sun) && defined (__SVR4) */ -+ } else { -+ free(ctx->abs_mnt_point); -+ ctx->abs_mnt_point = (char*)NULL; - } - } - } --- -2.22.0 |