diff options
| author | Vlad Glagolev | 2014-04-08 18:52:11 +0400 |
|---|---|---|
| committer | Vlad Glagolev | 2015-02-23 23:03:32 +0300 |
| commit | 3461995c87fcad87093c06d42a70f5348815ba1e (patch) | |
| tree | 4443c94304f3f52a0a78c1031a0d233e9a22a343 | |
| parent | 1e6e758edb5bd06d13d998c8f9227d5e79fa290c (diff) | |
samba: => 3.6.23 [security]
(cherry picked from commit a9d0b4c3b41ed581a4b80a2bc6ab4dda116f921b)
| -rwxr-xr-x | net/samba/BUILD | 3 | ||||
| -rwxr-xr-x | net/samba/DEPENDS | 1 | ||||
| -rwxr-xr-x | net/samba/DETAILS | 6 | ||||
| -rw-r--r-- | net/samba/HISTORY | 5 |
4 files changed, 11 insertions, 4 deletions
diff --git a/net/samba/BUILD b/net/samba/BUILD index 667bf34659..e00bc748b9 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/DEPENDS b/net/samba/DEPENDS index 48e457eff1..95378a3b7b2 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 ab142f0902..c6544eacc3 100755 --- a/net/samba/DETAILS +++ b/net/samba/DETAILS @@ -1,12 +1,12 @@ SPELL=samba - VERSION=3.6.22 - SECURITY_PATCH=21 + VERSION=3.6.23 + SECURITY_PATCH=22 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:13b7d4c7ee24434626cf7e835e302252a281f00dfff1b83fd3c28f8264c1ce7afa0aa6ad237c28015fd2a39a38954189a140b36c27d8b0434a48b46d56936981 + SOURCE_HASH=sha512:54189079a4f65f1e9c818f9edc9d862c4261c3a4925146f3ab19603052d2c08d32b59ddc243422683338dc4f1192b22f02acaa719e11aa44146c5d3bb11fdcb0 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 2db1eaaa69..9c3c15d2a4 100644 --- a/net/samba/HISTORY +++ b/net/samba/HISTORY @@ -1,3 +1,8 @@ +2014-04-08 Vlad Glagolev <stealth@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@vabo.cz> * DETAILS: 3.6.22, SECURITY_PATCH=21, CVE-2013-4408 and CVE-2012-6150 |