samba:

 * bump version to [https://www.samba.org/samba/history/samba-3.6.23.html 3.6.23]


git-svn-id: file:///var/svn/freetz/trunk@11906 149334a1-2f27-0410-a3b9-fc62619ac1e6

CHANGELOG

@@ -110,7 +110,7 @@ Latest changes:
     * pyOpenSSL 0.13.1
     * radvd 1.9.3
     * rsync 3.1.0
-    * samba 3.6.22
+    * samba 3.6.23
     * sane-backends 1.0.24
     * smartmontools 6.2
     * sqlite 3.8.4.1

make/samba/Config.in

@@ -15,7 +15,7 @@ choice
 			The binary with smbd and nmbd needs about 1033 kB (uncompressed).
 
 	config FREETZ_SAMBA_VERSION_3_6
-		bool "samba 3.6.22"
+		bool "samba 3.6.23"
 		help
 			The binary with smbd and nmbd needs about 1682 kB (uncompressed).
 endchoice

make/samba/patches/3.6.22/200-remove_printer_support.patch → make/samba/patches/3.6.23/200-remove_printer_support.patch

@@ -100,7 +100,7 @@
  	if (!param_format || !output_format1 || !p) {
  		return False;
  	}
-@@ -3358,6 +3366,10 @@ static bool api_RDosPrintJobDel(struct s
+@@ -3105,6 +3113,10 @@ static bool api_RDosPrintJobDel(struct s
  	struct spoolss_DevmodeContainer devmode_ctr;
  	enum spoolss_JobControl command;
 
@@ -111,7 +111,7 @@
  	if (!str1 || !str2 || !p) {
  		return False;
  	}
-@@ -3491,6 +3503,10 @@ static bool api_WPrintQueueCtrl(struct s
+@@ -3238,6 +3250,10 @@ static bool api_WPrintQueueCtrl(struct s
  	struct sec_desc_buf secdesc_ctr;
  	enum spoolss_PrinterControl command;
 
@@ -122,7 +122,7 @@
  	if (!str1 || !str2 || !QueueName) {
  		return False;
  	}
-@@ -3657,6 +3673,10 @@ static bool api_PrintJobInfo(struct smbd
+@@ -3404,6 +3420,10 @@ static bool api_PrintJobInfo(struct smbd
  	union spoolss_JobInfo info;
  	struct spoolss_SetJobInfo1 info1;
 
@@ -133,7 +133,7 @@
  	if (!str1 || !str2 || !p) {
  		return False;
  	}
-@@ -4800,6 +4820,10 @@ static bool api_WPrintJobGetInfo(struct
+@@ -4547,6 +4567,10 @@ static bool api_WPrintJobGetInfo(struct
  	struct spoolss_DevmodeContainer devmode_ctr;
  	union spoolss_JobInfo info;
 
@@ -144,7 +144,7 @@
  	if (!str1 || !str2 || !p) {
  		return False;
  	}
-@@ -4938,6 +4962,10 @@ static bool api_WPrintJobEnumerate(struc
+@@ -4685,6 +4709,10 @@ static bool api_WPrintJobEnumerate(struc
  	uint32_t count = 0;
  	union spoolss_JobInfo *info;
 
@@ -155,7 +155,7 @@
  	if (!str1 || !str2 || !p) {
  		return False;
  	}
-@@ -5143,6 +5171,10 @@ static bool api_WPrintDestGetInfo(struct
+@@ -4890,6 +4918,10 @@ static bool api_WPrintDestGetInfo(struct
  	struct spoolss_DevmodeContainer devmode_ctr;
  	union spoolss_PrinterInfo info;
 
@@ -166,7 +166,7 @@
  	if (!str1 || !str2 || !p) {
  		return False;
  	}
-@@ -5279,6 +5311,10 @@ static bool api_WPrintDestEnum(struct sm
+@@ -5026,6 +5058,10 @@ static bool api_WPrintDestEnum(struct sm
  	union spoolss_PrinterInfo *info;
  	uint32_t count;
 
@@ -177,7 +177,7 @@
  	if (!str1 || !str2 || !p) {
  		return False;
  	}
-@@ -5382,6 +5418,10 @@ static bool api_WPrintDriverEnum(struct
+@@ -5129,6 +5165,10 @@ static bool api_WPrintDriverEnum(struct
  	int succnt;
  	struct pack_desc desc;
 
@@ -188,7 +188,7 @@
  	if (!str1 || !str2 || !p) {
  		return False;
  	}
-@@ -5446,6 +5486,10 @@ static bool api_WPrintQProcEnum(struct s
+@@ -5193,6 +5233,10 @@ static bool api_WPrintQProcEnum(struct s
  	int succnt;
  	struct pack_desc desc;
 
@@ -199,7 +199,7 @@
  	if (!str1 || !str2 || !p) {
  		return False;
  	}
-@@ -5510,6 +5554,10 @@ static bool api_WPrintPortEnum(struct sm
+@@ -5257,6 +5301,10 @@ static bool api_WPrintPortEnum(struct sm
  	int succnt;
  	struct pack_desc desc;
 

make/samba/patches/3.6.22/260-remove_samr.patch → make/samba/patches/3.6.23/260-remove_samr.patch

@@ -120,18 +120,7 @@
  	if (!str1 || !str2 || !p) {
  		return False;
  	}
-@@ -2987,6 +2999,10 @@ static bool api_SetUserPassword(struct s
- 	int min_pwd_length;
- 	struct dcerpc_binding_handle *b = NULL;
-
-+#ifndef SAMR_SUPPORT
-+	return False;
-+#endif
-+
- 	/* Skip 2 strings. */
- 	p = skip_string(param,tpscnt,np);
- 	p = skip_string(param,tpscnt,p);
-@@ -3232,6 +3248,10 @@ static bool api_SamOEMChangePassword(str
+@@ -2979,6 +2991,10 @@ static bool api_SamOEMChangePassword(str
  	int bufsize;
  	struct dcerpc_binding_handle *b;
 
@@ -142,7 +131,7 @@
  	*rparam_len = 4;
  	*rparam = smb_realloc_limit(*rparam,*rparam_len);
  	if (!*rparam) {
-@@ -4273,6 +4293,10 @@ static bool api_RNetUserGetInfo(struct s
+@@ -4020,6 +4036,10 @@ static bool api_RNetUserGetInfo(struct s
  	union samr_UserInfo *info;
  	struct dcerpc_binding_handle *b = NULL;
 

make/samba/patches/3.6.22/280-strip_srvsvc.patch → make/samba/patches/3.6.23/280-strip_srvsvc.patch

@@ -11,7 +11,7 @@
  	if (!str1 || !str2 || !p) {
  		return False;
  	}
-@@ -3846,10 +3850,7 @@ static bool api_RNetServerGetInfo(struct
+@@ -3589,10 +3593,7 @@ static bool api_RNetServerGetInfo(struct
  	NTSTATUS status;
  	WERROR werr;
  	TALLOC_CTX *mem_ctx = talloc_tos();
@@ -22,7 +22,7 @@
 
  	if (!str1 || !str2 || !p) {
  		return False;
-@@ -3912,66 +3913,16 @@ static bool api_RNetServerGetInfo(struct
+@@ -3655,66 +3656,16 @@ static bool api_RNetServerGetInfo(struct
  	p = *rdata;
  	p2 = p + struct_len;
 
@@ -95,7 +95,7 @@
  	}
 
  	if (uLevel > 1) {
-@@ -5662,6 +5613,10 @@ static bool api_RNetSessionEnum(struct s
+@@ -5405,6 +5356,10 @@ static bool api_RNetSessionEnum(struct s
  	uint32_t totalentries, resume_handle = 0;
  	uint32_t count = 0;
 

make/samba/samba.mk

@@ -1,7 +1,7 @@
-$(call PKG_INIT_BIN, $(if $(FREETZ_SAMBA_VERSION_3_0),3.0.37,3.6.22))
+$(call PKG_INIT_BIN, $(if $(FREETZ_SAMBA_VERSION_3_0),3.0.37,3.6.23))
 $(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.gz
 $(PKG)_SOURCE_MD5_3.0.37:=11ed2bfef4090bd5736b194b43f67289
-$(PKG)_SOURCE_MD5_3.6.22:=59add4bb178ebc188d857bc13a508c0b
+$(PKG)_SOURCE_MD5_3.6.23:=2f7aee1dc5d31aefcb364600915b31dc
 $(PKG)_SOURCE_MD5:=$($(PKG)_SOURCE_MD5_$($(PKG)_VERSION))
 $(PKG)_SITE:=http://samba.org/samba/ftp/stable