diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2014-02-21 12:59:05 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2014-02-21 12:59:05 +0000 |
| commit | 0b40041d7a23656bba2bef3567750fa124c726af (patch) | |
| tree | e60b3b7457edd4c2ad87ab4062382a2629aed8e1 /net-fs | |
| parent | sys-kernel/aufs-sources: Bump to latest genpatches and linux release (diff) | |
| download | gentoo-2-0b40041d7a23656bba2bef3567750fa124c726af.tar.gz gentoo-2-0b40041d7a23656bba2bef3567750fa124c726af.tar.bz2 gentoo-2-0b40041d7a23656bba2bef3567750fa124c726af.zip | |
Version bump. Removed old
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'net-fs')
| -rw-r--r-- | net-fs/samba/ChangeLog | 8 | ||||
| -rw-r--r-- | net-fs/samba/files/named.conf.dlz.patch | 15 | ||||
| -rw-r--r-- | net-fs/samba/samba-4.1.5.ebuild (renamed from net-fs/samba/samba-4.1.3.ebuild) | 9 |
3 files changed, 28 insertions, 4 deletions
diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog index 59fa64570c62..64080ede2fd7 100644 --- a/net-fs/samba/ChangeLog +++ b/net-fs/samba/ChangeLog @@ -1,6 +1,12 @@ # 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.651 2014/02/19 07:15:06 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.652 2014/02/21 12:59:05 polynomial-c Exp $ + +*samba-4.1.5 (21 Feb 2014) + + 21 Feb 2014; Lars Wendler <polynomial-c@gentoo.org> -samba-4.1.3.ebuild, + +samba-4.1.5.ebuild, +files/named.conf.dlz.patch: + Version bump. Removed old. *samba-4.0.15 (19 Feb 2014) diff --git a/net-fs/samba/files/named.conf.dlz.patch b/net-fs/samba/files/named.conf.dlz.patch new file mode 100644 index 000000000000..ad8486ce1c67 --- /dev/null +++ b/net-fs/samba/files/named.conf.dlz.patch @@ -0,0 +1,15 @@ +diff --git a/source4/setup/named.conf.dlz b/source4/setup/named.conf.dlz +index be20a57..d86f766 100644 +--- a/source4/setup/named.conf.dlz ++++ b/source4/setup/named.conf.dlz +@@ -11,9 +11,9 @@ + # + dlz "AD DNS Zone" { + # For BIND 9.8.0 +- database "dlopen ${MODULESDIR}/bind9/dlz_bind9.so"; ++ # database "dlopen ${MODULESDIR}/bind9/dlz_bind9.so"; + + # For BIND 9.9.0 +- # database "dlopen ${MODULESDIR}/bind9/dlz_bind9_9.so"; ++ database "dlopen ${MODULESDIR}/bind9/dlz_bind9_9.so"; + }; diff --git a/net-fs/samba/samba-4.1.3.ebuild b/net-fs/samba/samba-4.1.5.ebuild index 3cf93be69845..cad5f2751af0 100644 --- a/net-fs/samba/samba-4.1.3.ebuild +++ b/net-fs/samba/samba-4.1.5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# 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.3.ebuild,v 1.2 2013/12/11 07:15:47 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.5.ebuild,v 1.1 2014/02/21 12:59:05 polynomial-c Exp $ EAPI=5 PYTHON_COMPAT=( python2_{6,7} ) @@ -65,7 +65,10 @@ S="${WORKDIR}/${MY_P}" CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" # sys-apps/dmapi is an automagic dependency (see bug #474492) -PATCHES=( "${FILESDIR}/${PN}-4.1.0-remove-dmapi-automagic.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-4.1.0-remove-dmapi-automagic.patch" + "${FILESDIR}/named.conf.dlz.patch" +) WAF_BINARY="${S}/buildtools/bin/waf" |