do not install a blank smb.conf. Fixes bug #70686

Package-Manager: portage-2.0.51.22-r2

3 files changed, 25 insertions, 29 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/Manifest b/net-fs/samba/Manifest
index 8461dca7bfbe..fd45125ca640 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,37 +1,27 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6bfe76c8816fe7ab2f3ad1c31ea4e266 ChangeLog 32958
-MD5 640f25d1da6364e934a26b3ccd504d90 samba-3.0.10.ebuild 16686
 MD5 41299f246433a1a55c8fccc77ccd709e metadata.xml 491
+MD5 ea646590dde34d9b64513d1b4feba49d ChangeLog 33090
 MD5 c0db762241c44be0cdf52c7c4e870d97 samba-3.0.14a-r1.ebuild 8920
+MD5 957a48d442fb56c39630bfb0333fe418 samba-3.0.14a-r2.ebuild 9012
+MD5 640f25d1da6364e934a26b3ccd504d90 samba-3.0.10.ebuild 16686
 MD5 5b9c636d2f1fc770a26082261df91333 samba-3.0.11.ebuild 8918
-MD5 65bf619aa46d01f276d636e397c5b414 samba-3.0.14a-r2.ebuild 8917
-MD5 519576a9448b86f1a7baab18204533a5 files/lmhosts 126
-MD5 d4e9a54f480d846b5b5ba84b4f29c17c files/digest-samba-3.0.14a-r2 216
-MD5 e89b19f1e62e257cbaa23a44a0362a58 files/swat.xinetd 527
-MD5 3685eadb817d185b06476eca6c0c15c4 files/smbusers 204
-MD5 239ef0e21552896faeef21c685561245 files/smb.conf.example-samba3.gz 7808
+MD5 fa1dcd2c95a81c22c2ad68de6698a85e files/digest-samba-3.0.10 206
 MD5 def157a63ec14450df82373617c7dc4b files/samba-3.0.11-gcc4.patch 485
-MD5 0c0364e7f0bc4cc48d8f9b103e606a93 files/samba-2.2.8-statfs.patch 239
+MD5 519576a9448b86f1a7baab18204533a5 files/lmhosts 126
+MD5 12df1953c039c5a93939497b0bc0ffba files/nsswitch.conf-winbind 403
 MD5 7ee5edc70bf80888c776f5808f865996 files/nsswitch.conf-wins 392
-MD5 8ea7b443dd580aaaaf7e9e896eba54f2 files/samba-3.0.x-smbumount-uid32.patch 425
+MD5 0c0364e7f0bc4cc48d8f9b103e606a93 files/samba-2.2.8-statfs.patch 239
 MD5 3cff882704d5ba84a75a76fc4262b3d3 files/digest-samba-3.0.14a-r1 216
-MD5 a1bbdaf99b7a3819a219a9450fa3dd0a files/samba-init 1104
 MD5 498babc5e33f61369f42201f25eb35c0 files/digest-samba-3.0.11 215
-MD5 09195dd8ab25ce77ac51c0c05b4ab93c files/system-auth-winbind 869
+MD5 d4e9a54f480d846b5b5ba84b4f29c17c files/digest-samba-3.0.14a-r2 216
 MD5 b836e258befae9d6c66cb3f158769b25 files/samba-3.0.x-libdirsymlink.patch 592
-MD5 fa1dcd2c95a81c22c2ad68de6698a85e files/digest-samba-3.0.10 206
 MD5 e75c2316eced1d80cb2161848581c6a3 files/samba-3.0.x-python-setup.patch 1094
-MD5 12df1953c039c5a93939497b0bc0ffba files/nsswitch.conf-winbind 403
-MD5 9f9da063cb02079a8f205bc365426170 files/samba.pam 513
+MD5 8ea7b443dd580aaaaf7e9e896eba54f2 files/samba-3.0.x-smbumount-uid32.patch 425
 MD5 341521b710d02d57a70acd49b1d4c06b files/samba-conf 1291
+MD5 a1bbdaf99b7a3819a219a9450fa3dd0a files/samba-init 1104
+MD5 9f9da063cb02079a8f205bc365426170 files/samba.pam 513
 MD5 bf268fdddc8ef677b6fa78661a094eac files/samba.schema 16044
+MD5 239ef0e21552896faeef21c685561245 files/smb.conf.example-samba3.gz 7808
+MD5 3685eadb817d185b06476eca6c0c15c4 files/smbusers 204
+MD5 e89b19f1e62e257cbaa23a44a0362a58 files/swat.xinetd 527
+MD5 09195dd8ab25ce77ac51c0c05b4ab93c files/system-auth-winbind 869
 MD5 e17a1638ad9f30f2e39db4c8981a2fcd files/vscan-0.3.5-libclamav.patch 523
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC7kSEcsIHjyDViGQRAiUiAKCqCvBpMvHOEL4kaCWMhoMhiyvZ5ACg1bOk
-UYTaZLW8EEiO5j0kg0r9r7g=
-=SMSv
------END PGP SIGNATURE-----
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() {