Commit 8e1e3e58 authored by Hans-Christian Egtvedt's avatar Hans-Christian Egtvedt
Browse files

samba: bump version to 3.2.7 and refresh patches against this version 

This patch bumps the Samba version to 3.2.7 and refreshes the patches. It also
fixes two minor issues by introducing two new small patches.
parent b9a79cd8

package/samba/samba-add-check-for-__use_bsd.patch

+6 −6
Original line number Diff line number Diff line 
--- a/source/client/mount.cifs.c

+++ b/source/client/mount.cifs.c

@@ -91,6 +91,7 @@ char * prefixpath = NULL;

@@ -96,6 +96,7 @@ char * prefixpath = NULL;

 

 /* glibc doesn't have strlcpy, strlcat. Ensure we do. JRA. We

  * don't link to libreplace so need them here. */
@@ -8,11 +8,11 @@ 
 

 /* like strncpy but does not 0 fill the buffer and always null

  *    terminates. bufsize is the size of the destination buffer */

@@ -126,6 +127,7 @@ static size_t strlcat(char *d, const cha

 	}

 	return ret;

@@ -177,6 +178,7 @@ static void mount_cifs_usage(void)

 	SAFE_FREE(mountpassword);

 	exit(EX_USAGE);

 }

+#endif /* __GLIBC__ && !(__UCLIBC__ && __USE_BSD) */

 

 /* BB finish BB

 
 /* caller frees username if necessary */

 static char * getusername(void) {

package/samba/samba-do-not-check-glibc-version.patch

+2 −2
Original line number Diff line number Diff line 
--- a/source/configure

+++ b/source/configure

@@ -40770,85 +40770,8 @@ fi

@@ -41016,85 +41016,8 @@ fi

 

 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -88,7 +88,7 @@ 
 

 for ac_func in getgrouplist

 do

@@ -40943,8 +40866,6 @@ _ACEOF

@@ -41189,8 +41112,6 @@ _ACEOF

 fi

 done

package/samba/samba-fix-client-mtab.patch

0 → 100644
+11 −0
Original line number Diff line number Diff line 
--- a/source/client/mtab.c

+++ b/source/client/mtab.c

@@ -31,6 +31,8 @@

 #include <unistd.h>

 #include <errno.h>

 #include <stdio.h>

+#include <sys/types.h>

+#include <sys/stat.h>

 #include <sys/time.h>

 #include <time.h>

 #include <fcntl.h>

package/samba/samba-fix-mount.cifs.patch

0 → 100644
+40 −0
Original line number Diff line number Diff line 
--- a/source/client/mount.cifs.c

+++ b/source/client/mount.cifs.c

@@ -16,6 +16,10 @@

    You should have received a copy of the GNU General Public License

    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 

+#ifdef _SAMBA_BUILD_

+#include "include/config.h"

+#endif

+

 #ifndef _GNU_SOURCE

 #define _GNU_SOURCE

 #endif

@@ -57,10 +61,6 @@

  #endif /* _SAMBA_BUILD_ */

 #endif /* MOUNT_CIFS_VENDOR_SUFFIX */

 

-#ifdef _SAMBA_BUILD_

-#include "include/config.h"

-#endif

-

 #ifndef MS_MOVE 

 #define MS_MOVE 8192 

 #endif 

@@ -138,6 +138,7 @@ static size_t strlcat(char *d, const cha

 	return ret;

 }

 #endif

+#endif /* __GLIBC__ && !(__UCLIBC__ && __USE_BSD) */

 

 /* BB finish BB

 

@@ -178,7 +179,6 @@ static void mount_cifs_usage(void)

 	SAFE_FREE(mountpassword);

 	exit(EX_USAGE);

 }

-#endif /* __GLIBC__ && !(__UCLIBC__ && __USE_BSD) */

 

 /* caller frees username if necessary */

 static char * getusername(void) {

package/samba/samba-getgrouplist.patch

+1 −1
Original line number Diff line number Diff line 
--- a/source/configure.in

+++ b/source/configure.in

@@ -1182,38 +1182,6 @@ AC_TRY_COMPILE([

@@ -1199,38 +1199,6 @@ AC_TRY_COMPILE([

 AC_DEFINE(HAVE_PRCTL, 1, [Whether prctl is available]),[])

 

 #