Date: Saturday, February 4, 2017 @ 22:40:55
Author: anthraxx
Revision: 288054
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
ntfs-3g/repos/extra-i686/CVE-2017-0358.patch
(from rev 288053, ntfs-3g/trunk/CVE-2017-0358.patch)
ntfs-3g/repos/extra-i686/PKGBUILD
(from rev 288053, ntfs-3g/trunk/PKGBUILD)
ntfs-3g/repos/extra-x86_64/CVE-2017-0358.patch
(from rev 288053, ntfs-3g/trunk/CVE-2017-0358.patch)
ntfs-3g/repos/extra-x86_64/PKGBUILD
(from rev 288053, ntfs-3g/trunk/PKGBUILD)
Deleted:
ntfs-3g/repos/extra-i686/PKGBUILD
ntfs-3g/repos/extra-x86_64/PKGBUILD
----------------------------------+
/PKGBUILD | 100 +++++++++++++++++++++++++++++++++++++
extra-i686/CVE-2017-0358.patch | 36 +++++++++++++
extra-i686/PKGBUILD | 47 -----------------
extra-x86_64/CVE-2017-0358.patch | 36 +++++++++++++
extra-x86_64/PKGBUILD | 47 -----------------
5 files changed, 172 insertions(+), 94 deletions(-)
Copied: ntfs-3g/repos/extra-i686/CVE-2017-0358.patch (from rev 288053,
ntfs-3g/trunk/CVE-2017-0358.patch)
===================================================================
--- extra-i686/CVE-2017-0358.patch (rev 0)
+++ extra-i686/CVE-2017-0358.patch 2017-02-04 22:40:55 UTC (rev 288054)
@@ -0,0 +1,36 @@
+--- ntfs-3g/src/lowntfs-3g.c 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 2017-02-04 23:30:23.825889593 +0100
++++ ntfs-3g/src/nfts-3g.c 2017-02-04 23:30:42.572542756 +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);
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-02-04 22:40:39 UTC (rev 288053)
+++ extra-i686/PKGBUILD 2017-02-04 22:40:55 UTC (rev 288054)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bis...@archlinux.org>
-# Contributor: Tom Gundersen <t...@jklm.no>
-# Contributor: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Thomas B�chler <thomas.archlinux.org>
-
-pkgname=ntfs-3g
-_pkgname=ntfs-3g_ntfsprogs
-pkgver=2016.2.22
-pkgrel=1
-pkgdesc='NTFS filesystem driver and utilities'
-url='http://www.tuxera.com/community/open-source-ntfs-3g/'
-arch=('i686' 'x86_64')
-license=('GPL2')
-depends=('util-linux' 'fuse')
-source=("http://tuxera.com/opensource/${_pkgname}-${pkgver}.tgz";)
-sha1sums=('382df40c366711003cf24d2342033c23e2580b42')
-
-conflicts=('ntfsprogs')
-provides=('ntfsprogs')
-replaces=('ntfsprogs')
-
-prepare() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
- sed 's|$(DESTDIR)/sbin|$(DESTDIR)/usr/bin|' -i
{ntfsprogs,src}/Makefile.in
-}
-
-build() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
- ./configure \
- --prefix=/usr \
- --sbin=/usr/bin \
- --mandir=/usr/share/man \
- --disable-ldconfig \
- --disable-static \
- --with-fuse=external \
- --enable-posix-acls \
- --enable-extras \
-
- make
-}
-
-package_ntfs-3g() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" rootbindir=/usr/bin rootsbindir=/usr/bin
rootlibdir=/usr/lib install
- ln -s /usr/bin/ntfs-3g "${pkgdir}/usr/bin/mount.ntfs"
-}
Copied: ntfs-3g/repos/extra-i686/PKGBUILD (from rev 288053,
ntfs-3g/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-02-04 22:40:55 UTC (rev 288054)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bis...@archlinux.org>
+# Contributor: Tom Gundersen <t...@jklm.no>
+# Contributor: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Thomas B�chler <thomas.archlinux.org>
+
+pkgname=ntfs-3g
+_pkgname=ntfs-3g_ntfsprogs
+pkgver=2016.2.22
+pkgrel=2
+pkgdesc='NTFS filesystem driver and utilities'
+url='https://www.tuxera.com/community/open-source-ntfs-3g/'
+arch=('i686' 'x86_64')
+license=('GPL2')
+depends=('util-linux' 'fuse2')
+source=("https://tuxera.com/opensource/${_pkgname}-${pkgver}.tgz";
+ CVE-2017-0358.patch)
+sha1sums=('382df40c366711003cf24d2342033c23e2580b42'
+ '1949f21fc8115b3ea7e1197cf3d562ea6f97f1db')
+
+conflicts=('ntfsprogs')
+provides=('ntfsprogs')
+replaces=('ntfsprogs')
+
+prepare() {
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+ sed 's|$(DESTDIR)/sbin|$(DESTDIR)/usr/bin|' -i
{ntfsprogs,src}/Makefile.in
+ patch -p1 < "${srcdir}/CVE-2017-0358.patch"
+}
+
+build() {
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+ ./configure \
+ --prefix=/usr \
+ --sbin=/usr/bin \
+ --mandir=/usr/share/man \
+ --disable-ldconfig \
+ --disable-static \
+ --with-fuse=external \
+ --enable-posix-acls \
+ --enable-extras \
+
+ make
+}
+
+package_ntfs-3g() {
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" rootbindir=/usr/bin rootsbindir=/usr/bin
rootlibdir=/usr/lib install
+ ln -s /usr/bin/ntfs-3g "${pkgdir}/usr/bin/mount.ntfs"
+}
Copied: ntfs-3g/repos/extra-x86_64/CVE-2017-0358.patch (from rev 288053,
ntfs-3g/trunk/CVE-2017-0358.patch)
===================================================================
--- extra-x86_64/CVE-2017-0358.patch (rev 0)
+++ extra-x86_64/CVE-2017-0358.patch 2017-02-04 22:40:55 UTC (rev 288054)
@@ -0,0 +1,36 @@
+--- ntfs-3g/src/lowntfs-3g.c 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 2017-02-04 23:30:23.825889593 +0100
++++ ntfs-3g/src/nfts-3g.c 2017-02-04 23:30:42.572542756 +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);
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-02-04 22:40:39 UTC (rev 288053)
+++ extra-x86_64/PKGBUILD 2017-02-04 22:40:55 UTC (rev 288054)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bis...@archlinux.org>
-# Contributor: Tom Gundersen <t...@jklm.no>
-# Contributor: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Thomas B�chler <thomas.archlinux.org>
-
-pkgname=ntfs-3g
-_pkgname=ntfs-3g_ntfsprogs
-pkgver=2016.2.22
-pkgrel=1
-pkgdesc='NTFS filesystem driver and utilities'
-url='http://www.tuxera.com/community/open-source-ntfs-3g/'
-arch=('i686' 'x86_64')
-license=('GPL2')
-depends=('util-linux' 'fuse')
-source=("http://tuxera.com/opensource/${_pkgname}-${pkgver}.tgz";)
-sha1sums=('382df40c366711003cf24d2342033c23e2580b42')
-
-conflicts=('ntfsprogs')
-provides=('ntfsprogs')
-replaces=('ntfsprogs')
-
-prepare() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
- sed 's|$(DESTDIR)/sbin|$(DESTDIR)/usr/bin|' -i
{ntfsprogs,src}/Makefile.in
-}
-
-build() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
- ./configure \
- --prefix=/usr \
- --sbin=/usr/bin \
- --mandir=/usr/share/man \
- --disable-ldconfig \
- --disable-static \
- --with-fuse=external \
- --enable-posix-acls \
- --enable-extras \
-
- make
-}
-
-package_ntfs-3g() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" rootbindir=/usr/bin rootsbindir=/usr/bin
rootlibdir=/usr/lib install
- ln -s /usr/bin/ntfs-3g "${pkgdir}/usr/bin/mount.ntfs"
-}
Copied: ntfs-3g/repos/extra-x86_64/PKGBUILD (from rev 288053,
ntfs-3g/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-02-04 22:40:55 UTC (rev 288054)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bis...@archlinux.org>
+# Contributor: Tom Gundersen <t...@jklm.no>
+# Contributor: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Thomas B�chler <thomas.archlinux.org>
+
+pkgname=ntfs-3g
+_pkgname=ntfs-3g_ntfsprogs
+pkgver=2016.2.22
+pkgrel=2
+pkgdesc='NTFS filesystem driver and utilities'
+url='https://www.tuxera.com/community/open-source-ntfs-3g/'
+arch=('i686' 'x86_64')
+license=('GPL2')
+depends=('util-linux' 'fuse2')
+source=("https://tuxera.com/opensource/${_pkgname}-${pkgver}.tgz";
+ CVE-2017-0358.patch)
+sha1sums=('382df40c366711003cf24d2342033c23e2580b42'
+ '1949f21fc8115b3ea7e1197cf3d562ea6f97f1db')
+
+conflicts=('ntfsprogs')
+provides=('ntfsprogs')
+replaces=('ntfsprogs')
+
+prepare() {
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+ sed 's|$(DESTDIR)/sbin|$(DESTDIR)/usr/bin|' -i
{ntfsprogs,src}/Makefile.in
+ patch -p1 < "${srcdir}/CVE-2017-0358.patch"
+}
+
+build() {
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+ ./configure \
+ --prefix=/usr \
+ --sbin=/usr/bin \
+ --mandir=/usr/share/man \
+ --disable-ldconfig \
+ --disable-static \
+ --with-fuse=external \
+ --enable-posix-acls \
+ --enable-extras \
+
+ make
+}
+
+package_ntfs-3g() {
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" rootbindir=/usr/bin rootsbindir=/usr/bin
rootlibdir=/usr/lib install
+ ln -s /usr/bin/ntfs-3g "${pkgdir}/usr/bin/mount.ntfs"
+}
