Security bump (bug #518766). Removed old

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

3 files changed, 14 insertions, 6 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 3362cfaa775a..07fc01d7467d 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.677 2014/07/28 13:48:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.678 2014/08/01 23:30:20 polynomial-c Exp $
+
+*samba-4.1.11 (01 Aug 2014)
+*samba-4.0.21 (01 Aug 2014)
+
+  01 Aug 2014; Lars Wendler <polynomial-c@gentoo.org> -samba-4.0.18.ebuild,
+  +samba-4.0.21.ebuild, -samba-4.1.8.ebuild, +samba-4.1.11.ebuild:
+  Security bump (bug #518766). Removed old.
 
   28 Jul 2014; Agostino Sarubbo <ago@gentoo.org> samba-3.6.23-r1.ebuild:
   Stable for ppc, wrt bug #512012
diff --git a/net-fs/samba/samba-4.0.18.ebuild b/net-fs/samba/samba-4.0.21.ebuild
index d803bb266281..9f560571fe1e 100644
--- a/net-fs/samba/samba-4.0.18.ebuild
+++ b/net-fs/samba/samba-4.0.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.18.ebuild,v 1.1 2014/05/28 07:31:51 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.21.ebuild,v 1.1 2014/08/01 23:30:20 polynomial-c Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_{6,7} )
@@ -29,12 +29,10 @@ IUSE="acl addns ads aio avahi client cluster cups dmapi fam gnutls iprint
 ldap quota selinux swat syslog test winbind"
 
 # sys-apps/attr is an automagic dependency (see bug #489748)
-# dev-libs/libaio is an automagic dependency (see bug #489764)
 # sys-libs/pam is an automagic dependency (see bug #489770)
 CDEPEND="${PYTHON_DEPS}
 	>=app-crypt/heimdal-1.5[-ssl]
 	dev-libs/iniparser
-	dev-libs/libaio
 	dev-libs/popt
 	sys-libs/readline
 	virtual/libiconv
@@ -49,6 +47,7 @@ CDEPEND="${PYTHON_DEPS}
 	virtual/pam
 	acl? ( virtual/acl )
 	addns? ( net-dns/bind-tools[gssapi] )
+	aio? ( dev-libs/libaio )
 	cluster? ( >=dev-db/ctdb-1.0.114_p1 )
 	cups? ( net-print/cups )
 	dmapi? ( sys-apps/dmapi )
@@ -74,6 +73,7 @@ CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
 PATCHES=(
 	"${FILESDIR}/${PN}-4.1.0-remove-dmapi-automagic.patch"
 	"${FILESDIR}/named.conf.dlz.patch"
+	"${FILESDIR}/${PN}-4.0.19-automagic_aio_fix.patch"
 )
 
 WAF_BINARY="${S}/buildtools/bin/waf"
diff --git a/net-fs/samba/samba-4.1.8.ebuild b/net-fs/samba/samba-4.1.11.ebuild
index 82a3c9bbd305..97f64ccd4b66 100644
--- a/net-fs/samba/samba-4.1.8.ebuild
+++ b/net-fs/samba/samba-4.1.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.8.ebuild,v 1.1 2014/06/04 06:51:23 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.11.ebuild,v 1.1 2014/08/01 23:30:20 polynomial-c Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_{6,7} )
@@ -28,7 +28,6 @@ ldap quota selinux syslog test winbind"
 CDEPEND="${PYTHON_DEPS}
 	>=app-crypt/heimdal-1.5[-ssl]
 	dev-libs/iniparser
-	dev-libs/libaio
 	dev-libs/popt
 	sys-libs/readline
 	virtual/libiconv
@@ -44,6 +43,7 @@ CDEPEND="${PYTHON_DEPS}
 	virtual/pam
 	acl? ( virtual/acl )
 	addns? ( net-dns/bind-tools[gssapi] )
+	aio? ( dev-libs/libaio )
 	cluster? ( >=dev-db/ctdb-1.0.114_p1 )
 	cups? ( net-print/cups )
 	dmapi? ( sys-apps/dmapi )
@@ -69,6 +69,7 @@ CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
 PATCHES=(
 	"${FILESDIR}/${PN}-4.1.0-remove-dmapi-automagic.patch"
 	"${FILESDIR}/named.conf.dlz.patch"
+	"${FILESDIR}/${PN}-4.0.19-automagic_aio_fix.patch"
 )
 
 WAF_BINARY="${S}/buildtools/bin/waf"