if [[ "$SAMBA_VSCAN" == "y" ]] ; then
diff --git a/net/samba/CONFIGURE b/net/samba/CONFIGURE
index 22f87ac..22fa42c 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/DEPENDS b/net/samba/DEPENDS
index 48e457e..95378a3 100755
--- a/net/samba/DEPENDS
+++ b/net/samba/DEPENDS
@@ -1,5 +1,6 @@
depends e2fsprogs &&
depends popt "--without-included-popt" &&
+depends pkgconfig &&
if [[ "$SAMBA_AD" == "y" ]]; then
depends openldap "--with-ldap" &&
diff --git a/net/samba/DETAILS b/net/samba/DETAILS
index 84c5952..2800a73 100755
--- a/net/samba/DETAILS
+++ b/net/samba/DETAILS
@@ -1,12 +1,10 @@
SPELL=samba
- VERSION=3.6.12
- SECURITY_PATCH=19
+ 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:06a7b8883a18b802de5aeced2e7dcf97147351b621736ab2383c6e4f22d5fb14e2b1ce88c8137a2fa9571b25357c766b0fb2b31352009b8a7137b20e2e9c3416
+ 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 ad2ae87..5d6eb49 100644
--- a/net/samba/HISTORY
+++ b/net/samba/HISTORY
@@ -1,3 +1,36 @@
+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
+ * fsctl.patch: added, to fix CVE-2014-0178
+ * logs.patch: added, to fix log rotation for nmbd, backported official
+ patch (a7df00c82049547129f063a40a842b156c8aead4)
+
+2014-06-23 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.6.24, SECURITY_PATCH=23, CVE-2014-0244 and CVE-2014-3493
+
+2014-04-08 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.6.23; SECURITY_PATCH++ (CVE-2013-4496)
+ * DEPENDS: depends pkgconfig
+ * BUILD: pass pkg-config script's path to properly locate tdb and
talloc
+
+2013-12-12 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.6.22, SECURITY_PATCH=21, CVE-2013-4408 and CVE-2012-6150
+
+2013-08-15 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.6.18, SECURITY_PATCH=20, CVE-2013-4124
+
+2013-06-19 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.6.16
+
+2013-03-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.6.13
+
2013-02-02 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.6.12; SECURITY_PATCH++
* CONFLICTS, CONFIGURE, DEPENDS: both samba and tdb/talloc install
diff --git a/net/samba/PRE_BUILD b/net/samba/PRE_BUILD
index 585cc74..62b7f2e 100755
--- a/net/samba/PRE_BUILD
+++ b/net/samba/PRE_BUILD
@@ -1,6 +1,8 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&