summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2017-03-27 19:28:24 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2017-03-27 19:28:29 +0200
commitc26bc99715d56cb4b50d3557ac14855307746f7c (patch)
tree23639565de866c732ba266b6ba701f8a674a02b4
parentbc43d28e4272a13316716f87b23ef69b594a6306 (diff)
cifs-utils: update to 6.7
-rw-r--r--package/cifs-utils/Makefile4
-rw-r--r--package/cifs-utils/patches/patch-configure_ac6
-rw-r--r--package/cifs-utils/patches/patch-mount_cifs_c12
-rw-r--r--package/cifs-utils/patches/patch-mtab_c6
4 files changed, 18 insertions, 10 deletions
diff --git a/package/cifs-utils/Makefile b/package/cifs-utils/Makefile
index d2c0f698f..1ce067624 100644
--- a/package/cifs-utils/Makefile
+++ b/package/cifs-utils/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= cifs-utils
-PKG_VERSION:= 6.6
+PKG_VERSION:= 6.7
PKG_RELEASE:= 1
-PKG_HASH:= d07152a807de6840566bbcc69a97ff6fa17fca4e09ceb4641d74882a83e67125
+PKG_HASH:= b2f21612474ab012e75accd167aab607a0614ff67efb56ea0f36789fa785cfab
PKG_DESCR:= network filesystem utilities
PKG_SECTION:= net/fs
PKG_KDEPENDS:= cifs
diff --git a/package/cifs-utils/patches/patch-configure_ac b/package/cifs-utils/patches/patch-configure_ac
index bcda90f3c..7355a238c 100644
--- a/package/cifs-utils/patches/patch-configure_ac
+++ b/package/cifs-utils/patches/patch-configure_ac
@@ -1,6 +1,6 @@
---- cifs-utils-6.3.orig/configure.ac 2014-01-09 17:19:53.000000000 +0100
-+++ cifs-utils-6.3/configure.ac 2014-05-06 13:52:11.790306753 +0200
-@@ -87,13 +87,25 @@ AC_CHECK_TYPES([ptrdiff_t, ssize_t, uint
+--- cifs-utils-6.7.orig/configure.ac 2017-03-02 17:51:05.000000000 +0100
++++ cifs-utils-6.7/configure.ac 2017-03-27 01:54:09.082783577 +0200
+@@ -93,13 +93,25 @@ AC_CHECK_TYPES([ptrdiff_t, ssize_t, uint
# Checks for library functions.
AC_FUNC_GETMNTENT
diff --git a/package/cifs-utils/patches/patch-mount_cifs_c b/package/cifs-utils/patches/patch-mount_cifs_c
index f8bee3a4c..583514808 100644
--- a/package/cifs-utils/patches/patch-mount_cifs_c
+++ b/package/cifs-utils/patches/patch-mount_cifs_c
@@ -1,5 +1,5 @@
---- cifs-utils-6.1.orig/mount.cifs.c 2013-07-02 21:13:33.000000000 +0200
-+++ cifs-utils-6.1/mount.cifs.c 2013-10-28 07:33:27.000000000 +0100
+--- cifs-utils-6.7.orig/mount.cifs.c 2017-03-02 17:51:05.000000000 +0100
++++ cifs-utils-6.7/mount.cifs.c 2017-03-27 18:57:14.519371156 +0200
@@ -34,7 +34,13 @@
#include <sys/utsname.h>
#include <sys/socket.h>
@@ -14,3 +14,11 @@
#include <errno.h>
#include <netdb.h>
#include <string.h>
+@@ -61,7 +67,6 @@
+ #include "mount.h"
+ #include "util.h"
+ #include "resolve_host.h"
+-#include "data_blob.h"
+
+ #ifndef MS_MOVE
+ #define MS_MOVE 8192
diff --git a/package/cifs-utils/patches/patch-mtab_c b/package/cifs-utils/patches/patch-mtab_c
index 8aa1db2d3..90655935f 100644
--- a/package/cifs-utils/patches/patch-mtab_c
+++ b/package/cifs-utils/patches/patch-mtab_c
@@ -1,5 +1,5 @@
---- cifs-utils-6.1.orig/mtab.c 2013-07-02 21:13:33.000000000 +0200
-+++ cifs-utils-6.1/mtab.c 2013-10-28 07:33:27.000000000 +0100
+--- cifs-utils-6.7.orig/mtab.c 2017-03-02 17:51:05.000000000 +0100
++++ cifs-utils-6.7/mtab.c 2017-03-27 01:54:09.094784041 +0200
@@ -36,6 +36,7 @@
#include <time.h>
#include <fcntl.h>
@@ -7,4 +7,4 @@
+#include <paths.h>
#include <stdlib.h>
#include <signal.h>
- #include "mount.h"
+ #include <paths.h>