samba: => 3.6.25 [security]

(cherry picked from commit f7e3a04ecfe80cf7c53d0e0a5809ea468d60afa4)

Conflicts:

	net/samba/DETAILS

5 files changed, 12 insertions, 59 deletions

diff --git a/net/samba/CONFIGURE b/net/samba/CONFIGURE
index 22f87acf53..22fa42c627 100755
--- a/net/samba/CONFIGURE
+++ b/net/samba/CONFIGURE
@@ -15,7 +15,7 @@ config_query_option  SAMBA_QUOTA  "Enable disk-quota support?"       n  \
 
 message "Samba can use samba-vfs with a virus scanner,"               &&
 message "You will still have to select which scanner to use."        &&
-config_query  SAMBA_VSCAN  "Do you want to add support for on-acces virus scannning?" n &&
+config_query  SAMBA_VSCAN  "Do you want to add support for on-access virus scannning?" n &&
 
 # must be the last query
 if spell_ok tdb || spell_ok talloc; then
diff --git a/net/samba/DETAILS b/net/samba/DETAILS
index 6f5faec9d7..2800a732bc 100755
--- a/net/samba/DETAILS
+++ b/net/samba/DETAILS
@@ -1,12 +1,10 @@
            SPELL=samba
-         VERSION=3.6.24
-  SECURITY_PATCH=24
+         VERSION=3.6.25
+  SECURITY_PATCH=25
           SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://download.samba.org/samba/ftp/$SOURCE
-   SOURCE_URL[1]=ftp://de3.samba.org/pub/$SPELL/$SOURCE
-   SOURCE_URL[2]=http://us1.samba.org/samba/ftp/old-versions/$SOURCE
-     SOURCE_HASH=sha512:40f054ab0e1ef07fa4bb4934229c42eb0e484596c4d4b81edbf43951acd56e7b04b6efb17e6cb269b329f1a84d60cbe10a3ff04e86c1983ec603bdcf7fc7ecbb
+   SOURCE_URL[0]=https://download.samba.org/pub/$SPELL/stable/$SOURCE
+     SOURCE_HASH=sha512:25a5c56dae4517e82e196b59fa301b661ec75db57effbb0ede35fb23b018f78cdea6513e8760966caf58abc43335fcebda77fe5bf5bb9d4b27fd3ca6e5a3b626
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
 if [[ "$SAMBA_VSCAN" == "y" ]] ; then
    VSCAN_VERSION=0.3.6c-beta4
          SOURCE2=$SPELL-vscan-$VSCAN_VERSION.tar.gz
diff --git a/net/samba/HISTORY b/net/samba/HISTORY
index 2f3b7f86eb..5d6eb49b82 100644
--- a/net/samba/HISTORY
+++ b/net/samba/HISTORY
@@ -1,3 +1,9 @@
+2015-02-23 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: updated spell to 3.6.25; SECURITY_PATCH++ (CVE-2015-0240);
+	  updated source url; removed broken mirrors; quoting paths
+	* CONFIGURE: fixed a typo
+	* fsctl.patch: removed, fixed by upstream
+
 2015-02-09 Vlad Glagolev <stealth@sourcemage.org>
 	* DETAILS: SECURITY_PATCH++
 	* PRE_BUILD: apply patches
diff --git a/net/samba/PRE_BUILD b/net/samba/PRE_BUILD
index 3a97e5b530..62b7f2e19e 100755
--- a/net/samba/PRE_BUILD
+++ b/net/samba/PRE_BUILD
@@ -1,7 +1,6 @@
 default_pre_build      &&
 cd  $SOURCE_DIRECTORY  &&
 
-patch -p1 < "$SPELL_DIRECTORY/fsctl.patch" &&
 patch -p0 < "$SPELL_DIRECTORY/logs.patch" &&
 
 #sedit  's!libsmbclient.*\$(LIBDIR)!&/..!'  source/Makefile.in  &&
diff --git a/net/samba/fsctl.patch b/net/samba/fsctl.patch
deleted file mode 100644
index 594957f2df..0000000000
--- a/net/samba/fsctl.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 6e1ba4cf362165a2c8120874bd6951615aef4599 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Ji=C5=99=C3=AD=20=C5=A0a=C5=A1ek?= <jiri.sasek@oracle.com>
-Date: Mon, 15 Sep 2014 19:23:55 +0200
-Subject: [PATCH] CVE-2014-0178 patch for 3.6
-
-Samba 3.6.23 patch for:
-FSCTL_GET_SHADOW_COPY_DATA: Initialize output array to, zero
-...derived from Christof Schmitt <christof.schmitt@us.ibm.com>'s patch for Samba 4.0
-http://www.samba.org/samba/ftp/patches/security/samba-4.0.17-CVE-2014-0178-CVE-2014-0239.patch
-
-Bug: https://bugzilla.samba.org/show_bug.cgi?id=10549
-CVE-2014-0178: Malformed FSCTL_SRV_ENUMERATE_SNAPSHOTS response
----
- source3/smbd/nttrans.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
-index 4c145e0..b9a6620 100644
---- a/source3/smbd/nttrans.c
-+++ b/source3/smbd/nttrans.c
-@@ -2303,7 +2303,7 @@ NTSTATUS smb_fsctl(struct files_struct *fsp,
- 		if (!labels) {
- 			*out_len = 16;
- 		} else {
--			*out_len = 12 + labels_data_count + 4;
-+			*out_len = 12 + labels_data_count;
- 		}
- 
- 		if (max_out_len < *out_len) {
-@@ -2313,7 +2313,7 @@ NTSTATUS smb_fsctl(struct files_struct *fsp,
- 			return NT_STATUS_BUFFER_TOO_SMALL;
- 		}
- 
--		cur_pdata = talloc_array(ctx, char, *out_len);
-+		cur_pdata = talloc_zero_array(ctx, char, *out_len);
- 		if (cur_pdata == NULL) {
- 			TALLOC_FREE(shadow_data);
- 			return NT_STATUS_NO_MEMORY;
-@@ -2330,7 +2330,7 @@ NTSTATUS smb_fsctl(struct files_struct *fsp,
- 		}
- 
- 		/* needed_data_count 4 bytes */
--		SIVAL(cur_pdata, 8, labels_data_count + 4);
-+		SIVAL(cur_pdata, 8, labels_data_count);
- 
- 		cur_pdata += 12;
- 
--- 
-1.9.1
-