Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.61 grimoire by Vlad Glagolev (47ef044ec92ae76c585c7799be8215c571949d7a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to stable-0.61 grimoire by Vlad Glagolev (47ef044ec92ae76c585c7799be8215c571949d7a)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.61 grimoire by Vlad Glagolev (47ef044ec92ae76c585c7799be8215c571949d7a)
  • Date: Mon, 23 Feb 2015 14:09:17 -0600
GIT changes to stable-0.61 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

VERSION | 2 +-
net/samba/BUILD | 3 ++-
net/samba/CONFIGURE | 2 +-
net/samba/DEPENDS | 1 +
net/samba/DETAILS | 12 +++++-------
net/samba/HISTORY | 33 +++++++++++++++++++++++++++++++++
net/samba/PRE_BUILD | 2 ++
net/samba/logs.patch | 20 ++++++++++++++++++++
8 files changed, 65 insertions(+), 10 deletions(-)

New commits:
commit 47ef044ec92ae76c585c7799be8215c571949d7a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

VERSION: 0.61-23

commit c97ff7ba35a387002da90cd5e590381f78098e58
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

samba: => 3.6.25 [security]
(cherry picked from commit f7e3a04ecfe80cf7c53d0e0a5809ea468d60afa4)

Conflicts:

net/samba/DETAILS

commit 3de3ebe1f9647a63167cd98ce1c6cf459f97a8a0
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

samba: security+feature update
(cherry picked from commit 48b46c4d452e09d21b0eeb5e13ca8764ba2d7f8b)

Conflicts:

net/samba/HISTORY

commit 09d0767b8480d4d0167f8a47d087c40c125149d2
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

samba 3.6.24, SECURITY_PATCH=23, CVE-2014-0244 and CVE-2014-3493
(cherry picked from commit 932b701e4e6750bc0929ede7c024c0bddf7f8928)

commit 3461995c87fcad87093c06d42a70f5348815ba1e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

samba: => 3.6.23 [security]
(cherry picked from commit a9d0b4c3b41ed581a4b80a2bc6ab4dda116f921b)

commit 1e6e758edb5bd06d13d998c8f9227d5e79fa290c
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

samba 3.6.22, SECURITY_PATCH=21, CVE-2013-4408 and CVE-2012-6150
(cherry picked from commit 85b119a5d1c3be53fe83dd4781866bcfcfaca658)

commit 223fe77f48fa4299e2047ef2a53bc0296b9b17bf
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

samba 3.6.18, SECURITY_PATCH=20, CVE-2013-4124
(cherry picked from commit 3dcf719e781bdc144ff7674a0b54ef199d44e0fc)

commit d6c9204728ffbdb3b5294c1f61f7091a3155d808
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

samba: => 3.6.16
(cherry picked from commit 75b74849724fd847d5cd06722b4af9703d35cb3d)

commit 8a16f5cc60d2607b14922f77272d42e620fa2703
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

samba 3.6.13
(cherry picked from commit 0ebe831ceee8d79758d9769fba539a5e9d3c86c7)

diff --git a/VERSION b/VERSION
index 38ed76e..38150a0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.61-22
+0.61-23
diff --git a/net/samba/BUILD b/net/samba/BUILD
index 667bf34..e00bc74 100755
--- a/net/samba/BUILD
+++ b/net/samba/BUILD
@@ -3,10 +3,11 @@ OPTS="--with-swatdir=/usr/share/swat \
--with-automount \
--with-winbind \
--with-libsmbclient \
+ PKG_CONFIG="$INSTALL_ROOT/usr/bin/pkg-config" \
$SAMBA_QUOTA \
$OPTS" &&

-cd $SOURCE_DIRECTORY/source3 &&
+cd $SOURCE_DIRECTORY/source3 &&
default_build &&

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 &&

+patch -p0 < "$SPELL_DIRECTORY/logs.patch" &&
+
#sedit 's!libsmbclient.*\$(LIBDIR)!&/..!' source/Makefile.in &&

if [[ "$SAMBA_VSCAN" == "y" ]] ; then
diff --git a/net/samba/logs.patch b/net/samba/logs.patch
new file mode 100644
index 0000000..7e67e49
--- /dev/null
+++ b/net/samba/logs.patch
@@ -0,0 +1,20 @@
+--- source3/nmbd/nmbd.c.orig 2014-06-23 10:03:27.000000000 +0400
++++ source3/nmbd/nmbd.c 2015-02-09 20:41:38.801956179 +0400
+@@ -384,6 +384,8 @@
+ reload_nmbd_services( True );
+ }
+
++ reopen_logs();
++
+ return(ret);
+ }
+
+@@ -866,6 +868,8 @@
+ exit(1);
+ }
+
++ reopen_logs();
++
+ if (nmbd_messaging_context() == NULL) {
+ return 1;
+ }


  • [SM-Commit] GIT changes to stable-0.61 grimoire by Vlad Glagolev (47ef044ec92ae76c585c7799be8215c571949d7a), Vlad Glagolev, 02/23/2015

Archive powered by MHonArc 2.6.24.

Top of Page