diff options
| author |   Seemant Kulleen <seemant@gentoo.org> | 2005-08-03 13:30:42 +0000 |
|---|---|---|
| committer | Seemant Kulleen <seemant@gentoo.org> | 2005-08-03 13:30:42 +0000 |
| commit | 76b3698411e1a018f61ddb532ed9e454e5ec7033 (patch) | |
| tree | 7b7717a13982485ac2c318da9f9896076dbea6cc | |
| parent | Stable on amd64. (diff) | |
| download | gentoo-2-76b3698411e1a018f61ddb532ed9e454e5ec7033.tar.gz gentoo-2-76b3698411e1a018f61ddb532ed9e454e5ec7033.tar.bz2 gentoo-2-76b3698411e1a018f61ddb532ed9e454e5ec7033.zip | |
do not install a blank smb.conf. Fixes bug #70686
(Portage version: 2.0.51.22-r2)
| -rw-r--r-- | net-fs/samba/ChangeLog | 5 | ||||
| -rw-r--r-- | net-fs/samba/samba-3.0.14a-r2.ebuild | 9 |
2 files changed, 10 insertions, 4 deletions
diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog index 8bc5d86f5c88..d6af5da5c2cf 100644 --- a/net-fs/samba/ChangeLog +++ b/net-fs/samba/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-fs/samba # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.186 2005/08/01 15:25:56 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.187 2005/08/03 13:30:42 seemant Exp $ + + 03 Aug 2005; Seemant Kulleen <seemant@gentoo.org> samba-3.0.14a-r2.ebuild: + do not install a blank smb.conf. Fixes bug #70686 01 Aug 2005; Joseph Jezak <josejx@gentoo.org> samba-3.0.14a-r2.ebuild: Marked ppc stable for bug #95327. diff --git a/net-fs/samba/samba-3.0.14a-r2.ebuild b/net-fs/samba/samba-3.0.14a-r2.ebuild index 8c6d6be80c22..8dc98a3aeaff 100644 --- a/net-fs/samba/samba-3.0.14a-r2.ebuild +++ b/net-fs/samba/samba-3.0.14a-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.14a-r2.ebuild,v 1.6 2005/08/01 15:25:56 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.14a-r2.ebuild,v 1.7 2005/08/03 13:30:42 seemant Exp $ inherit eutils versionator @@ -24,7 +24,7 @@ SRC_URI="mirror://samba/${MY_P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86" +KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" RDEPEND="dev-libs/popt acl? ( sys-apps/acl ) @@ -202,7 +202,6 @@ src_install() { # General config files insinto /etc/samba - touch ${D}/etc/samba/smb.conf doins ${FILESDIR}/smbusers newins ${FILESDIR}/smb.conf.example-samba3.gz smb.conf.example.gz doins ${FILESDIR}/lmhosts @@ -263,6 +262,10 @@ pkg_preinst() { cp -af ${ROOT}/${PRIVATE_SRC}/* ${IMAGE}/${PRIVATE_DST}/ eend $? fi + + if [[ ! -f "${ROOT}/etc/samba/smb.conf" ]]; then + cp "${ROOT}/etc/samba/smb.conf.example" "${ROOT}/etc/samba/smb.conf" + fi } pkg_postinst() { |