[depends] samba-gplv3: refresh samba_off64_t.patch

author: Rechi <Rechi@users.noreply.github.com> 2017-07-12 15:23:00 +0200
committer: Rechi <Rechi@users.noreply.github.com> 2017-07-12 15:23:00 +0200
commit: f3e7fd8dd204bb5227e4465ff28ee13ee8f3927e (patch)
tree: 90d47781b4362312224e74df96ef971cb099a277 /tools/depends
parent: 816e2c8301433c514321e1f9a2799db16266c7f4 (diff)
1 files changed, 76 insertions, 86 deletions
diff --git a/tools/depends/target/samba-gplv3/samba_off64_t.patch b/tools/depends/target/samba-gplv3/samba_off64_t.patch
index 6dca7a22f3..859eca811f 100644
--- a/tools/depends/target/samba-gplv3/samba_off64_t.patch
+++ b/tools/depends/target/samba-gplv3/samba_off64_t.patch
@@ -1,18 +1,6 @@
-diff -pur samba-3.6.12/lib/util/util.c arm-linux-androideabi-21/lib/util/util.c
---- samba-3.6.12/lib/util/util.c	2013-01-29 09:49:31.000000000 +0100
-+++ arm-linux-androideabi-21/lib/util/util.c	2016-07-27 20:01:54.128052081 +0200
-@@ -383,7 +383,7 @@ _PUBLIC_ bool process_exists_by_pid(pid_
-  is dealt with in posix.c
- **/
- 
--_PUBLIC_ bool fcntl_lock(int fd, int op, off_t offset, off_t count, int type)
-+_PUBLIC_ bool fcntl_lock(int fd, int op, off64_t offset, off64_t count, int type)
- {
- 	struct flock lock;
- 	int ret;
 --- a/lib/util/samba_util.h
 +++ b/lib/util/samba_util.h
-@@ -680,7 +680,7 @@ _PUBLIC_ bool process_exists_by_pid(pid_
+@@ -680,7 +680,7 @@
   Simple routine to do POSIX file locking. Cruft in NFS and 64->32 bit mapping
   is dealt with in posix.c
  **/
@@ -21,10 +9,20 @@ diff -pur samba-3.6.12/lib/util/util.c arm-linux-androideabi-21/lib/util/util.c
  
  /**
   * Write dump of binary data to a callback
-diff -pur samba-3.6.12/source3/include/libsmb_internal.h arm-linux-androideabi-21/source3/include/libsmb_internal.h
---- samba-3.6.12/source3/include/libsmb_internal.h	2013-01-29 09:49:31.000000000 +0100
-+++ arm-linux-androideabi-21/source3/include/libsmb_internal.h	2016-07-27 20:07:42.306136381 +0200
-@@ -311,14 +311,14 @@ int
+--- a/lib/util/util.c
++++ b/lib/util/util.c
+@@ -383,7 +383,7 @@
+  is dealt with in posix.c
+ **/
+ 
+-_PUBLIC_ bool fcntl_lock(int fd, int op, off_t offset, off_t count, int type)
++_PUBLIC_ bool fcntl_lock(int fd, int op, off64_t offset, off64_t count, int type)
+ {
+ 	struct flock lock;
+ 	int ret;
+--- a/source3/include/libsmb_internal.h
++++ b/source3/include/libsmb_internal.h
+@@ -311,14 +311,14 @@
  SMBC_rmdir_ctx(SMBCCTX *context,
                 const char *fname);
  
@@ -41,7 +39,7 @@ diff -pur samba-3.6.12/source3/include/libsmb_internal.h arm-linux-androideabi-2
  
  int
  SMBC_fstatdir_ctx(SMBCCTX *context,
-@@ -394,16 +394,16 @@ SMBC_setatr(SMBCCTX * context, SMBCSRV *
+@@ -394,16 +394,16 @@
              time_t change_time,
              uint16 mode);
  
@@ -61,10 +59,9 @@ diff -pur samba-3.6.12/source3/include/libsmb_internal.h arm-linux-androideabi-2
  
  
  /* Functions in libsmb_misc.c */
-diff -pur samba-3.6.12/source3/include/libsmbclient.h arm-linux-androideabi-21/source3/include/libsmbclient.h
---- samba-3.6.12/source3/include/libsmbclient.h	2013-01-29 09:49:31.000000000 +0100
-+++ arm-linux-androideabi-21/source3/include/libsmbclient.h	2016-07-28 10:21:20.267305706 +0200
-@@ -884,9 +884,9 @@ typedef int (*smbc_rename_fn)(SMBCCTX *o
+--- a/source3/include/libsmbclient.h
++++ b/source3/include/libsmbclient.h
+@@ -884,9 +884,9 @@
  smbc_rename_fn smbc_getFunctionRename(SMBCCTX *c);
  void smbc_setFunctionRename(SMBCCTX *c, smbc_rename_fn fn);
  
@@ -76,7 +73,7 @@ diff -pur samba-3.6.12/source3/include/libsmbclient.h arm-linux-androideabi-21/s
                                 int whence);
  smbc_lseek_fn smbc_getFunctionLseek(SMBCCTX *c);
  void smbc_setFunctionLseek(SMBCCTX *c, smbc_lseek_fn fn);
-@@ -917,7 +917,7 @@ void smbc_setFunctionFstatVFS(SMBCCTX *c
+@@ -917,7 +917,7 @@
  
  typedef int (*smbc_ftruncate_fn)(SMBCCTX *c,
                                   SMBCFILE *f,
@@ -85,7 +82,7 @@ diff -pur samba-3.6.12/source3/include/libsmbclient.h arm-linux-androideabi-21/s
  smbc_ftruncate_fn smbc_getFunctionFtruncate(SMBCCTX *c);
  void smbc_setFunctionFtruncate(SMBCCTX *c, smbc_ftruncate_fn fn);
  
-@@ -967,14 +967,14 @@ typedef int (*smbc_rmdir_fn)(SMBCCTX *c,
+@@ -967,14 +967,14 @@
  smbc_rmdir_fn smbc_getFunctionRmdir(SMBCCTX *c);
  void smbc_setFunctionRmdir(SMBCCTX *c, smbc_rmdir_fn fn);
  
@@ -102,7 +99,7 @@ diff -pur samba-3.6.12/source3/include/libsmbclient.h arm-linux-androideabi-21/s
  smbc_lseekdir_fn smbc_getFunctionLseekdir(SMBCCTX *c);
  void smbc_setFunctionLseekdir(SMBCCTX *c, smbc_lseekdir_fn fn);
  
-@@ -1346,7 +1346,7 @@ ssize_t smbc_write(int fd, const void *b
+@@ -1346,7 +1346,7 @@
   * @return          Upon successful completion, lseek returns the
   *                  resulting offset location as measured in bytes
   *                  from the beginning  of the file. Otherwise, a value
@@ -111,7 +108,7 @@ diff -pur samba-3.6.12/source3/include/libsmbclient.h arm-linux-androideabi-21/s
   *                  indicate the error:
   *                  - EBADF  Fildes is not an open file descriptor.
   *                  - EINVAL Whence is not a proper value or smbc_init
-@@ -1356,7 +1356,7 @@ ssize_t smbc_write(int fd, const void *b
+@@ -1356,7 +1356,7 @@
   *
   * @todo Are errno values complete and correct?
   */
@@ -120,7 +117,7 @@ diff -pur samba-3.6.12/source3/include/libsmbclient.h arm-linux-androideabi-21/s
  
  
  /**@ingroup file
-@@ -1540,7 +1540,7 @@ struct smbc_dirent* smbc_readdir(unsigne
+@@ -1540,7 +1540,7 @@
   * @see             smbc_readdir()
   *
   */
@@ -129,7 +126,7 @@ diff -pur samba-3.6.12/source3/include/libsmbclient.h arm-linux-androideabi-21/s
  
  
  /**@ingroup directory
-@@ -1565,7 +1565,7 @@ off_t smbc_telldir(int dh);
+@@ -1565,7 +1565,7 @@
   *
   * @todo In what does the reture and errno values mean?
   */
@@ -138,7 +135,7 @@ diff -pur samba-3.6.12/source3/include/libsmbclient.h arm-linux-androideabi-21/s
  
  /**@ingroup directory
   * Create a directory.
-@@ -1722,7 +1722,7 @@ smbc_fstatvfs(int fd,
+@@ -1722,7 +1722,7 @@
   * @see             , Unix ftruncate()
   *
   */
@@ -158,10 +155,9 @@ diff -pur samba-3.6.12/source3/include/libsmbclient.h arm-linux-androideabi-21/s
  bool fcntl_getlock(int fd, off_t *poffset, off_t *pcount, int *ptype, pid_t *ppid);
  bool is_myname(const char *s);
  void ra_lanman_string( const char *native_lanman );
-diff -pur samba-3.6.12/source3/libsmb/clireadwrite.c arm-linux-androideabi-21/source3/libsmb/clireadwrite.c
---- samba-3.6.12/source3/libsmb/clireadwrite.c	2013-01-29 09:49:31.000000000 +0100
-+++ arm-linux-androideabi-21/source3/libsmb/clireadwrite.c	2016-07-27 20:08:06.134279334 +0200
-@@ -125,7 +125,7 @@ static void cli_read_andx_done(struct te
+--- a/source3/libsmb/clireadwrite.c
++++ b/source3/libsmb/clireadwrite.c
+@@ -125,7 +125,7 @@
  struct tevent_req *cli_read_andx_create(TALLOC_CTX *mem_ctx,
  					struct tevent_context *ev,
  					struct cli_state *cli, uint16_t fnum,
@@ -170,7 +166,7 @@ diff -pur samba-3.6.12/source3/libsmb/clireadwrite.c arm-linux-androideabi-21/so
  					struct tevent_req **psmbreq)
  {
  	struct tevent_req *req, *subreq;
-@@ -176,7 +176,7 @@ struct tevent_req *cli_read_andx_create(
+@@ -176,7 +176,7 @@
  struct tevent_req *cli_read_andx_send(TALLOC_CTX *mem_ctx,
  				      struct tevent_context *ev,
  				      struct cli_state *cli, uint16_t fnum,
@@ -179,7 +175,7 @@ diff -pur samba-3.6.12/source3/libsmb/clireadwrite.c arm-linux-androideabi-21/so
  {
  	struct tevent_req *req, *subreq;
  	NTSTATUS status;
-@@ -275,7 +275,7 @@ struct cli_pull_state {
+@@ -275,7 +275,7 @@
  	struct tevent_context *ev;
  	struct cli_state *cli;
  	uint16_t fnum;
@@ -188,7 +184,7 @@ diff -pur samba-3.6.12/source3/libsmb/clireadwrite.c arm-linux-androideabi-21/so
  	off_t size;
  
  	NTSTATUS (*sink)(char *buf, size_t n, void *priv);
-@@ -330,7 +330,7 @@ static void cli_pull_read_done(struct te
+@@ -330,7 +330,7 @@
  struct tevent_req *cli_pull_send(TALLOC_CTX *mem_ctx,
  				 struct tevent_context *ev,
  				 struct cli_state *cli,
@@ -197,7 +193,7 @@ diff -pur samba-3.6.12/source3/libsmb/clireadwrite.c arm-linux-androideabi-21/so
  				 off_t size, size_t window_size,
  				 NTSTATUS (*sink)(char *buf, size_t n,
  						  void *priv),
-@@ -660,7 +660,7 @@ NTSTATUS cli_pull_recv(struct tevent_req
+@@ -660,7 +660,7 @@
  }
  
  NTSTATUS cli_pull(struct cli_state *cli, uint16_t fnum,
@@ -206,7 +202,7 @@ diff -pur samba-3.6.12/source3/libsmb/clireadwrite.c arm-linux-androideabi-21/so
  		  NTSTATUS (*sink)(char *buf, size_t n, void *priv),
  		  void *priv, off_t *received)
  {
-@@ -710,7 +710,7 @@ static NTSTATUS cli_read_sink(char *buf,
+@@ -710,7 +710,7 @@
  }
  
  NTSTATUS cli_read(struct cli_state *cli, uint16_t fnum,
@@ -215,7 +211,7 @@ diff -pur samba-3.6.12/source3/libsmb/clireadwrite.c arm-linux-androideabi-21/so
  		 size_t *nread)
  {
  	NTSTATUS status;
-@@ -734,7 +734,7 @@ ssize_t cli_read(struct cli_state *cli,
+@@ -734,7 +734,7 @@
  ****************************************************************************/
  
  NTSTATUS cli_smbwrite(struct cli_state *cli, uint16_t fnum, char *buf,
@@ -224,7 +220,7 @@ diff -pur samba-3.6.12/source3/libsmb/clireadwrite.c arm-linux-androideabi-21/so
  {
  	uint8_t *bytes;
  	ssize_t total = 0;
-@@ -815,7 +815,7 @@ struct tevent_req *cli_write_andx_create
+@@ -815,7 +815,7 @@
  					 struct tevent_context *ev,
  					 struct cli_state *cli, uint16_t fnum,
  					 uint16_t mode, const uint8_t *buf,
@@ -233,7 +229,7 @@ diff -pur samba-3.6.12/source3/libsmb/clireadwrite.c arm-linux-androideabi-21/so
  					 struct tevent_req **reqs_before,
  					 int num_reqs_before,
  					 struct tevent_req **psmbreq)
-@@ -878,7 +878,7 @@ struct tevent_req *cli_write_andx_send(T
+@@ -878,7 +878,7 @@
  				       struct tevent_context *ev,
  				       struct cli_state *cli, uint16_t fnum,
  				       uint16_t mode, const uint8_t *buf,
@@ -242,7 +238,7 @@ diff -pur samba-3.6.12/source3/libsmb/clireadwrite.c arm-linux-androideabi-21/so
  {
  	struct tevent_req *req, *subreq;
  	NTSTATUS status;
-@@ -950,7 +950,7 @@ struct cli_writeall_state {
+@@ -950,7 +950,7 @@
  	uint16_t fnum;
  	uint16_t mode;
  	const uint8_t *buf;
@@ -251,7 +247,7 @@ diff -pur samba-3.6.12/source3/libsmb/clireadwrite.c arm-linux-androideabi-21/so
  	size_t size;
  	size_t written;
  };
-@@ -963,7 +963,7 @@ static struct tevent_req *cli_writeall_s
+@@ -963,7 +963,7 @@
  					    uint16_t fnum,
  					    uint16_t mode,
  					    const uint8_t *buf,
@@ -260,7 +256,7 @@ diff -pur samba-3.6.12/source3/libsmb/clireadwrite.c arm-linux-androideabi-21/so
  {
  	struct tevent_req *req, *subreq;
  	struct cli_writeall_state *state;
-@@ -1047,7 +1047,7 @@ static NTSTATUS cli_writeall_recv(struct
+@@ -1047,7 +1047,7 @@
  }
  
  NTSTATUS cli_writeall(struct cli_state *cli, uint16_t fnum, uint16_t mode,
@@ -269,7 +265,7 @@ diff -pur samba-3.6.12/source3/libsmb/clireadwrite.c arm-linux-androideabi-21/so
  		      size_t *pwritten)
  {
  	TALLOC_CTX *frame = talloc_stackframe();
-@@ -1097,7 +1097,7 @@ struct cli_push_state {
+@@ -1097,7 +1097,7 @@
  	struct cli_state *cli;
  	uint16_t fnum;
  	uint16_t mode;
@@ -278,7 +274,7 @@ diff -pur samba-3.6.12/source3/libsmb/clireadwrite.c arm-linux-androideabi-21/so
  
  	size_t (*source)(uint8_t *buf, size_t n, void *priv);
  	void *priv;
-@@ -1105,7 +1105,7 @@ struct cli_push_state {
+@@ -1105,7 +1105,7 @@
  	bool eof;
  
  	size_t chunk_size;
@@ -287,7 +283,7 @@ diff -pur samba-3.6.12/source3/libsmb/clireadwrite.c arm-linux-androideabi-21/so
  
  	/*
  	 * Outstanding requests
-@@ -1139,7 +1139,7 @@ static bool cli_push_write_setup(struct
+@@ -1139,7 +1139,7 @@
  struct tevent_req *cli_push_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
  				 struct cli_state *cli,
  				 uint16_t fnum, uint16_t mode,
@@ -296,7 +292,7 @@ diff -pur samba-3.6.12/source3/libsmb/clireadwrite.c arm-linux-androideabi-21/so
  				 size_t (*source)(uint8_t *buf, size_t n,
  						  void *priv),
  				 void *priv)
-@@ -1405,7 +1405,7 @@ NTSTATUS cli_push_recv(struct tevent_req
+@@ -1405,7 +1405,7 @@
  }
  
  NTSTATUS cli_push(struct cli_state *cli, uint16_t fnum, uint16_t mode,
@@ -305,10 +301,9 @@ diff -pur samba-3.6.12/source3/libsmb/clireadwrite.c arm-linux-androideabi-21/so
  		  size_t (*source)(uint8_t *buf, size_t n, void *priv),
  		  void *priv)
  {
-diff -pur samba-3.6.12/source3/libsmb/libsmb_compat.c arm-linux-androideabi-21/source3/libsmb/libsmb_compat.c
---- samba-3.6.12/source3/libsmb/libsmb_compat.c	2013-01-29 09:49:31.000000000 +0100
-+++ arm-linux-androideabi-21/source3/libsmb/libsmb_compat.c	2016-07-27 20:03:05.636479317 +0200
-@@ -213,9 +213,9 @@ smbc_write(int fd,
+--- a/source3/libsmb/libsmb_compat.c
++++ b/source3/libsmb/libsmb_compat.c
+@@ -213,9 +213,9 @@
          return smbc_getFunctionWrite(statcont)(statcont, file, buf, bufsize);
  }
  
@@ -320,7 +315,7 @@ diff -pur samba-3.6.12/source3/libsmb/libsmb_compat.c arm-linux-androideabi-21/s
             int whence)
  {
  	SMBCFILE * file = find_fd(fd);
-@@ -285,7 +285,7 @@ smbc_readdir(unsigned int dh)
+@@ -285,7 +285,7 @@
          return smbc_getFunctionReaddir(statcont)(statcont, file);
  }
  
@@ -329,7 +324,7 @@ diff -pur samba-3.6.12/source3/libsmb/libsmb_compat.c arm-linux-androideabi-21/s
  smbc_telldir(int dh)
  {
  	SMBCFILE * file = find_fd(dh);
-@@ -294,7 +294,7 @@ smbc_telldir(int dh)
+@@ -294,7 +294,7 @@
  
  int
  smbc_lseekdir(int fd,
@@ -338,7 +333,7 @@ diff -pur samba-3.6.12/source3/libsmb/libsmb_compat.c arm-linux-androideabi-21/s
  {
  	SMBCFILE * file = find_fd(fd);
          return smbc_getFunctionLseekdir(statcont)(statcont, file, offset);
-@@ -345,7 +345,7 @@ smbc_fstatvfs(int fd,
+@@ -345,7 +345,7 @@
  
  int
  smbc_ftruncate(int fd,
@@ -347,10 +342,9 @@ diff -pur samba-3.6.12/source3/libsmb/libsmb_compat.c arm-linux-androideabi-21/s
  {
  	SMBCFILE * file = find_fd(fd);
          return smbc_getFunctionFtruncate(statcont)(statcont, file, size);
-diff -pur samba-3.6.12/source3/libsmb/libsmb_dir.c arm-linux-androideabi-21/source3/libsmb/libsmb_dir.c
---- samba-3.6.12/source3/libsmb/libsmb_dir.c	2013-01-29 09:49:31.000000000 +0100
-+++ arm-linux-androideabi-21/source3/libsmb/libsmb_dir.c	2016-07-27 20:08:51.646552457 +0200
-@@ -1392,7 +1392,7 @@ SMBC_rmdir_ctx(SMBCCTX *context,
+--- a/source3/libsmb/libsmb_dir.c
++++ b/source3/libsmb/libsmb_dir.c
+@@ -1392,7 +1392,7 @@
   * Routine to return the current directory position
   */
  
@@ -359,7 +353,7 @@ diff -pur samba-3.6.12/source3/libsmb/libsmb_dir.c arm-linux-androideabi-21/sour
  SMBC_telldir_ctx(SMBCCTX *context,
                   SMBCFILE *dir)
  {
-@@ -1433,7 +1433,7 @@ SMBC_telldir_ctx(SMBCCTX *context,
+@@ -1433,7 +1433,7 @@
  	 * We return the pointer here as the offset
  	 */
  	TALLOC_FREE(frame);
@@ -368,7 +362,7 @@ diff -pur samba-3.6.12/source3/libsmb/libsmb_dir.c arm-linux-androideabi-21/sour
  }
  
  /*
-@@ -1474,7 +1474,7 @@ check_dir_ent(struct smbc_dir_list *list
+@@ -1474,7 +1474,7 @@
  int
  SMBC_lseekdir_ctx(SMBCCTX *context,
                    SMBCFILE *dir,
@@ -377,10 +371,9 @@ diff -pur samba-3.6.12/source3/libsmb/libsmb_dir.c arm-linux-androideabi-21/sour
  {
  	long int l_offset = offset;  /* Handle problems of size */
  	struct smbc_dirent *dirent = (struct smbc_dirent *)l_offset;
-diff -pur samba-3.6.12/source3/libsmb/libsmb_file.c arm-linux-androideabi-21/source3/libsmb/libsmb_file.c
---- samba-3.6.12/source3/libsmb/libsmb_file.c	2013-01-29 09:49:31.000000000 +0100
-+++ arm-linux-androideabi-21/source3/libsmb/libsmb_file.c	2016-07-27 20:09:06.190639760 +0200
-@@ -243,12 +243,12 @@ SMBC_read_ctx(SMBCCTX *context,
+--- a/source3/libsmb/libsmb_file.c
++++ b/source3/libsmb/libsmb_file.c
+@@ -243,12 +243,12 @@
           * offset:
           *
           * Compiler bug (possibly) -- gcc (GCC) 3.3.5 (Debian 1:3.3.5-2) --
@@ -396,7 +389,7 @@ diff -pur samba-3.6.12/source3/libsmb/libsmb_file.c arm-linux-androideabi-21/sou
  
  	if (!context || !context->internal->initialized) {
  		errno = EINVAL;
-@@ -300,7 +300,7 @@ SMBC_write_ctx(SMBCCTX *context,
+@@ -300,7 +300,7 @@
                 const void *buf,
                 size_t count)
  {
@@ -405,7 +398,7 @@ diff -pur samba-3.6.12/source3/libsmb/libsmb_file.c arm-linux-androideabi-21/sou
  	TALLOC_CTX *frame = talloc_stackframe();
  	NTSTATUS status;
  
-@@ -605,10 +605,10 @@ SMBC_setatr(SMBCCTX * context, SMBCSRV *
+@@ -605,10 +605,10 @@
   * A routine to lseek() a file
   */
  
@@ -418,7 +411,7 @@ diff -pur samba-3.6.12/source3/libsmb/libsmb_file.c arm-linux-androideabi-21/sou
                 int whence)
  {
  	off_t size;
-@@ -672,7 +672,7 @@ SMBC_lseek_ctx(SMBCCTX *context,
+@@ -672,7 +672,7 @@
  int
  SMBC_ftruncate_ctx(SMBCCTX *context,
                     SMBCFILE *file,
@@ -426,11 +419,10 @@ diff -pur samba-3.6.12/source3/libsmb/libsmb_file.c arm-linux-androideabi-21/sou
 +                   off64_t length)
  {
  	off_t size = length;
-	TALLOC_CTX *frame = talloc_stackframe();
-diff -pur samba-3.6.12/source3/libsmb/proto.h arm-linux-androideabi-21/source3/libsmb/proto.h
---- samba-3.6.12/source3/libsmb/proto.h	2013-01-29 09:49:31.000000000 +0100
-+++ arm-linux-androideabi-21/source3/libsmb/proto.h	2016-07-27 20:08:33.766445144 +0200
-@@ -758,37 +758,37 @@ NTSTATUS cli_set_fs_quota_info(struct cl
+ 	TALLOC_CTX *frame = talloc_stackframe();
+--- a/source3/libsmb/proto.h
++++ b/source3/libsmb/proto.h
+@@ -758,37 +758,37 @@
  struct tevent_req *cli_read_andx_create(TALLOC_CTX *mem_ctx,
  					struct tevent_context *ev,
  					struct cli_state *cli, uint16_t fnum,
@@ -475,7 +467,7 @@ diff -pur samba-3.6.12/source3/libsmb/proto.h arm-linux-androideabi-21/source3/l
  					 struct tevent_req **reqs_before,
  					 int num_reqs_before,
  					 struct tevent_req **psmbreq);
-@@ -796,23 +796,23 @@ struct tevent_req *cli_write_andx_send(T
+@@ -796,23 +796,23 @@
  				       struct tevent_context *ev,
  				       struct cli_state *cli, uint16_t fnum,
  				       uint16_t mode, const uint8_t *buf,
@@ -514,10 +506,9 @@ diff -pur samba-3.6.12/source3/libsmb/proto.h arm-linux-androideabi-21/source3/l
  {
  	bool ret;
  
-diff -pur samba-3.6.12/source3/registry/regfio.c arm-linux-androideabi-21/source3/registry/regfio.c
---- samba-3.6.12/source3/registry/regfio.c	2013-01-29 09:49:31.000000000 +0100
-+++ arm-linux-androideabi-21/source3/registry/regfio.c	2016-07-27 20:09:31.246790183 +0200
-@@ -493,7 +493,7 @@ static bool read_regf_block( REGF_FILE *
+--- a/source3/registry/regfio.c
++++ b/source3/registry/regfio.c
+@@ -493,7 +493,7 @@
  /*******************************************************************
  *******************************************************************/
  
@@ -526,10 +517,9 @@ diff -pur samba-3.6.12/source3/registry/regfio.c arm-linux-androideabi-21/source
  {
  	REGF_HBIN *hbin;
  	uint32 record_size, curr_off, block_size, header;
-diff -pur samba-3.6.12/source3/utils/smbget.c arm-linux-androideabi-21/source3/utils/smbget.c
---- samba-3.6.12/source3/utils/smbget.c	2013-01-29 09:49:31.000000000 +0100
-+++ arm-linux-androideabi-21/source3/utils/smbget.c	2016-07-27 20:09:47.194885943 +0200
-@@ -36,7 +36,7 @@ static char *outputfile;
+--- a/source3/utils/smbget.c
++++ b/source3/utils/smbget.c
+@@ -36,7 +36,7 @@
  
  
  static time_t total_start_time = 0;
@@ -538,7 +528,7 @@ diff -pur samba-3.6.12/source3/utils/smbget.c arm-linux-androideabi-21/source3/u
  
  #define SMB_MAXPATHLEN MAXPATHLEN
  
-@@ -75,7 +75,7 @@ static void change_columns(int sig)
+@@ -75,7 +75,7 @@
  	columns = get_num_cols();
  }
  
@@ -547,7 +537,7 @@ diff -pur samba-3.6.12/source3/utils/smbget.c arm-linux-androideabi-21/source3/u
  {
  	if (s > 1024 * 1024 * 1024) {
  		snprintf(buffer, l, "%.2fGB", 1.0 * s / (1024 * 1024 * 1024));
-@@ -238,7 +238,7 @@ static char *print_time(long t)
+@@ -238,7 +238,7 @@
  	return buffer;
  }
  
@@ -556,7 +546,7 @@ diff -pur samba-3.6.12/source3/utils/smbget.c arm-linux-androideabi-21/source3/u
  {
  	double avg = 0.0;
  	long  eta = -1; 
-@@ -286,7 +286,7 @@ static int smb_download_file(const char
+@@ -286,7 +286,7 @@
  	char path[SMB_MAXPATHLEN];
  	char checkbuf[2][RESUME_CHECK_SIZE];
  	char *readbuf = NULL;
@@ -565,7 +555,7 @@ diff -pur samba-3.6.12/source3/utils/smbget.c arm-linux-androideabi-21/source3/u
  	struct stat localstat, remotestat;
  
  	snprintf(path, SMB_MAXPATHLEN-1, "%s%s%s", base, (*base && *name && name[0] != '/' && base[strlen(base)-1] != '/')?"/":"", name);
-@@ -394,7 +394,7 @@ static int smb_download_file(const char
+@@ -394,7 +394,7 @@
  		}
  
  		if(offset_check) {
author	Rechi <Rechi@users.noreply.github.com>	2017-07-12 15:23:00 +0200
committer	Rechi <Rechi@users.noreply.github.com>	2017-07-12 15:23:00 +0200
commit	f3e7fd8dd204bb5227e4465ff28ee13ee8f3927e (patch)
tree	90d47781b4362312224e74df96ef971cb099a277 /tools/depends
parent	816e2c8301433c514321e1f9a2799db16266c7f4 (diff)