- comment out smbw_lseek; proper LDFLAGS path

Changed files:
    samba-smbwrapper.patch -> 1.3

diff --git a/samba-smbwrapper.patch b/samba-smbwrapper.patch
index af093c79c6af8e54cfb63a3753edf010cee7cee2..a9f1875d504926c3116c62acc580e2b33782d0c6 100644 (file)
--- a/samba-smbwrapper.patch
+++ b/samba-smbwrapper.patch
@@ -1,5 +1,42 @@
---- samba-3.0.25a/examples/libsmbclient/smbwrapper/wrapper.c.orig      2006-01-25 00:46:42.000000000 +0100
-+++ samba-3.0.25a/examples/libsmbclient/smbwrapper/wrapper.c   2007-06-16 18:38:00.453640544 +0200
+diff -urN samba-3.0.25a.org/examples/libsmbclient/smbwrapper/Makefile samba-3.0.25a/examples/libsmbclient/smbwrapper/Makefile
+--- samba-3.0.25a.org/examples/libsmbclient/smbwrapper/Makefile        2006-01-25 00:46:42.000000000 +0100
++++ samba-3.0.25a/examples/libsmbclient/smbwrapper/Makefile    2007-06-17 17:43:30.088457851 +0200
+@@ -3,7 +3,7 @@
+ 
+ CFLAGS = -I$(SAMBA_INCL) $(EXTLIB_INCL)
+ 
+-LDFLAGS = -L/usr/local/samba/lib
++LDFLAGS = -L../../../source/bin
+ 
+ SMBINCLUDE = -I../../../source/include
+ CFLAGS= -fpic -g -O0 $(DEFS) $(SMBINCLUDE)
+diff -urN samba-3.0.25a.org/examples/libsmbclient/smbwrapper/smbw.c samba-3.0.25a/examples/libsmbclient/smbwrapper/smbw.c
+--- samba-3.0.25a.org/examples/libsmbclient/smbwrapper/smbw.c  2006-01-25 00:46:42.000000000 +0100
++++ samba-3.0.25a/examples/libsmbclient/smbwrapper/smbw.c      2007-06-17 17:38:36.620376591 +0200
+@@ -548,7 +548,7 @@
+ /***************************************************** 
+ a wrapper for readlink() - needed for correct errno setting
+ *******************************************************/
+-int smbw_readlink(const char *fname, char *buf, size_t bufsize)
++ssize_t smbw_readlink(const char *fname, char *buf, size_t bufsize)
+ {
+       struct SMBW_stat st;
+       int ret;
+diff -urN samba-3.0.25a.org/examples/libsmbclient/smbwrapper/smbw.h samba-3.0.25a/examples/libsmbclient/smbwrapper/smbw.h
+--- samba-3.0.25a.org/examples/libsmbclient/smbwrapper/smbw.h  2006-01-25 00:46:42.000000000 +0100
++++ samba-3.0.25a/examples/libsmbclient/smbwrapper/smbw.h      2007-06-17 17:38:36.620376591 +0200
+@@ -79,7 +79,7 @@
+ int smbw_close(int fd);
+ int smbw_fcntl(int fd, int cmd, long arg);
+ int smbw_access(const char *name, int mode);
+-int smbw_readlink(const char *path, char *buf, size_t bufsize);
++ssize_t smbw_readlink(const char *path, char *buf, size_t bufsize);
+ int smbw_unlink(const char *fname);
+ int smbw_rename(const char *oldname, const char *newname);
+ int smbw_utime(const char *fname, void *buf);
+diff -urN samba-3.0.25a.org/examples/libsmbclient/smbwrapper/wrapper.c samba-3.0.25a/examples/libsmbclient/smbwrapper/wrapper.c
+--- samba-3.0.25a.org/examples/libsmbclient/smbwrapper/wrapper.c       2006-01-25 00:46:42.000000000 +0100
++++ samba-3.0.25a/examples/libsmbclient/smbwrapper/wrapper.c   2007-06-17 17:39:16.085693163 +0200
 @@ -62,6 +62,7 @@
  #include <dirent.h>
  #include <signal.h>
@@ -16,7 +53,25 @@
  #include "wrapper.h"
  
  /*
-@@ -1109,7 +1111,7 @@ int utimes(const char *name, const struc
+@@ -488,7 +490,7 @@
+          * function and smbw.c et al.  Functions that return other than an
+          * integer value, however, MUST have their return value defined.
+          */
+-        off64_t         smbw_lseek();
++        /* off64_t         smbw_lseek(); */
+         
+         if (smbw_fd(fd)) {
+               return (off_t) smbw_lseek(fd, offset, whence);
+@@ -518,7 +520,7 @@
+          * function and smbw.c et al.  Functions that return other than an
+          * integer value, however, MUST have their return value defined.
+          */
+-        off64_t         smbw_lseek();
++        /* off64_t         smbw_lseek(); */
+         
+       if (smbw_fd(fd))
+               ret = smbw_lseek(fd, offset, whence);
+@@ -1109,7 +1111,7 @@
          return (* smbw_libc.utimes)((char *) name, (struct timeval *) tvp);
  }
  
@@ -25,20 +80,10 @@
  {
          check_init("readlink");
          
---- samba-3.0.25a/examples/libsmbclient/smbwrapper/smbw.c.orig 2006-01-25 00:46:42.000000000 +0100
-+++ samba-3.0.25a/examples/libsmbclient/smbwrapper/smbw.c      2007-06-16 18:38:16.791148140 +0200
-@@ -548,7 +548,7 @@ int smbw_access(const char *name, int mo
- /***************************************************** 
- a wrapper for readlink() - needed for correct errno setting
- *******************************************************/
--int smbw_readlink(const char *fname, char *buf, size_t bufsize)
-+ssize_t smbw_readlink(const char *fname, char *buf, size_t bufsize)
- {
-       struct SMBW_stat st;
-       int ret;
---- samba-3.0.25a/examples/libsmbclient/smbwrapper/wrapper.h.orig      2006-01-25 00:46:42.000000000 +0100
-+++ samba-3.0.25a/examples/libsmbclient/smbwrapper/wrapper.h   2007-06-16 18:38:36.022138015 +0200
-@@ -123,7 +123,7 @@ typedef struct SMBW_libc
+diff -urN samba-3.0.25a.org/examples/libsmbclient/smbwrapper/wrapper.h samba-3.0.25a/examples/libsmbclient/smbwrapper/wrapper.h
+--- samba-3.0.25a.org/examples/libsmbclient/smbwrapper/wrapper.h       2006-01-25 00:46:42.000000000 +0100
++++ samba-3.0.25a/examples/libsmbclient/smbwrapper/wrapper.h   2007-06-17 17:38:36.620376591 +0200
+@@ -123,7 +123,7 @@
          int (* unlink)(char *name);
          int (* utime)(char *name, struct utimbuf *tvp);
          int (* utimes)(char *name, struct timeval *tvp);
@@ -47,14 +92,3 @@
          int (* rename)(char *oldname, char *newname);
          int (* rmdir)(char *name);
          int (* symlink)(char *topath, char *frompath);
---- samba-3.0.25a/examples/libsmbclient/smbwrapper/smbw.h.orig 2006-01-25 00:46:42.000000000 +0100
-+++ samba-3.0.25a/examples/libsmbclient/smbwrapper/smbw.h      2007-06-16 18:38:49.349490680 +0200
-@@ -79,7 +79,7 @@ ssize_t smbw_pwrite(int fd, void *buf, s
- int smbw_close(int fd);
- int smbw_fcntl(int fd, int cmd, long arg);
- int smbw_access(const char *name, int mode);
--int smbw_readlink(const char *path, char *buf, size_t bufsize);
-+ssize_t smbw_readlink(const char *path, char *buf, size_t bufsize);
- int smbw_unlink(const char *fname);
- int smbw_rename(const char *oldname, const char *newname);
- int smbw_utime(const char *fname, void *buf);