ntfs-3g: bump to 2014.2.15 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF...

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
[remove all the commented lines and the unused patch]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 40581

diff --git a/utils/ntfs-3g/Makefile b/utils/ntfs-3g/Makefile
index 446c8d02eee9a4f037391e38fbf4b8191d0f12b1..6d95a4f6c6962cb54e765771d3b946d70dc6560e 100644 (file)
--- a/utils/ntfs-3g/Makefile
+++ b/utils/ntfs-3g/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2010 OpenWrt.org
+# Copyright (C) 2007-2014 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -10,32 +10,10 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=ntfs-3g
 PKG_RELEASE:=1
 
-# 2011.4.12 integrates ntfsprogs and changed srcfile name
-PKG_VERSION:=2011.4.12
-# disable next line and do _not_ select ntfsprogs_ntfs-3g to build an older version
+PKG_VERSION:=2014.2.15
 PKG_SOURCE:=$(PKG_NAME)_ntfsprogs-$(PKG_VERSION).tgz
-
-## 2010.3.6 needs a recent uclibc 0.9.30.2 or greater
-## this has been fixed in 2010.5.16, keeping this in case this happens again
-#PKG_UCLIBC_VERSION:=$(call qstrip,$(CONFIG_UCLIBC_VERSION))
-#ifneq (,$(or $(findstring !0.9.29,!$(PKG_UCLIBC_VERSION)),$(findstring !0.9.30.1!,!$(PKG_UCLIBC_VERSION)!) ))
-#      PKG_VERSION:=2010.1.16
-#endif
-
-PATCH_DIR:=./patches-$(PKG_VERSION)
-
-PKG_SOURCE?=$(PKG_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=http://www.tuxera.com/opensource/
-
-PKG_MD5SUM_2010.1.16:=e104c914e8d7d29ee83e63d46afbba25
-PKG_MD5SUM_2010.3.6:=12ce21aa044c6068a4df6e8cbd3c5cfa
-PKG_MD5SUM_2010.5.16:=aeff7659a4943c9223d79116f051a863
-PKG_MD5SUM_2010.5.22:=caa08c73220a7106c76f697b7a7915ec
-PKG_MD5SUM_2010.8.8:=6c109746c2708f679725a2ea441c61c6
-PKG_MD5SUM_2010.10.2:=91405690f25822142cdcb43d03e62d3f
-PKG_MD5SUM_2011.1.15:=15a5cf5752012269fa168c24191f00e2
-PKG_MD5SUM_2011.4.12:=9c4ce318373b15332239a77a9d2a39fe
-PKG_MD5SUM:=$(PKG_MD5SUM_$(PKG_VERSION))
+PKG_MD5SUM:=f11d563816249d730a00498983485f3a
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1

diff --git a/utils/ntfs-3g/patches-2011.4.12/001-options.patch b/utils/ntfs-3g/patches-2011.4.12/001-options.patch
deleted file mode 100644 (file)
index e0d7ac8..0000000
--- a/utils/ntfs-3g/patches-2011.4.12/001-options.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/ntfs-3g_common.c.ref 2011-04-23 08:25:28.000000000 +0200
-+++ b/src/ntfs-3g_common.c     2011-04-23 08:32:16.000000000 +0200
-@@ -58,8 +58,6 @@
- 
- static const char nf_ns_alt_xattr_efsinfo[] = "user.ntfs.efsinfo";
- 
--#ifdef HAVE_SETXATTR
--
- static const char def_opts[] = "allow_other,nonempty,";
- 
-       /*
-@@ -573,6 +571,8 @@
-       return 0;
- }
- 
-+#ifdef HAVE_SETXATTR
-+
- int ntfs_fuse_listxattr_common(ntfs_inode *ni, ntfs_attr_search_ctx *actx,
-                       char *list, size_t size, BOOL prefixing)
- {