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 ec4fdae..5f43934 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]=https://download.samba.org/samba/ftp/$SOURCE
- SOURCE_URL[1]=ftp://de3.samba.org/pub/$SPELL/$SOURCE
- SOURCE_URL[2]=https://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 f27375c..0dd7e89 100644
--- a/net/samba/HISTORY
+++ b/net/samba/HISTORY
@@ -1,3 +1,9 @@
+2015-02-23 Vlad Glagolev <stealth AT 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 AT sourcemage.org>
* DETAILS: SECURITY_PATCH++
* PRE_BUILD: apply patches
diff --git a/net/samba/PRE_BUILD b/net/samba/PRE_BUILD
index 3a97e5b..62b7f2e 100755
--- a/net/samba/PRE_BUILD
+++ b/net/samba/PRE_BUILD
@@ -1,7 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&