diff options
author | Seemant Kulleen <seemant@gentoo.org> | 2005-08-03 14:20:49 +0000 |
---|---|---|
committer | Seemant Kulleen <seemant@gentoo.org> | 2005-08-03 14:20:49 +0000 |
commit | e082824a1a01c4b6a5013482af83bd1d828bf243 (patch) | |
tree | 2d30da1f706294ea98c6e08a2fce4a9bb9574bdb /net-fs | |
parent | Version bump (diff) | |
download | historical-e082824a1a01c4b6a5013482af83bd1d828bf243.tar.gz historical-e082824a1a01c4b6a5013482af83bd1d828bf243.tar.bz2 historical-e082824a1a01c4b6a5013482af83bd1d828bf243.zip |
only install smb.conf (blank) if none is currently present in the live filesystem
Package-Manager: portage-2.0.51.22-r2
Diffstat (limited to 'net-fs')
-rw-r--r-- | net-fs/samba/ChangeLog | 6 | ||||
-rw-r--r-- | net-fs/samba/Manifest | 32 | ||||
-rw-r--r-- | net-fs/samba/samba-3.0.14a-r2.ebuild | 4 |
3 files changed, 23 insertions, 19 deletions
diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog index d6af5da5c2cf..cd59a5b55849 100644 --- a/net-fs/samba/ChangeLog +++ b/net-fs/samba/ChangeLog @@ -1,6 +1,10 @@ # 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.187 2005/08/03 13:30:42 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.188 2005/08/03 14:20:49 seemant Exp $ + + 03 Aug 2005; Seemant Kulleen <seemant@gentoo.org> samba-3.0.14a-r2.ebuild: + only install smb.conf (blank) if none is currently present in the live + filesystem 03 Aug 2005; Seemant Kulleen <seemant@gentoo.org> samba-3.0.14a-r2.ebuild: do not install a blank smb.conf. Fixes bug #70686 diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest index 650f02834e25..6f4fcdaae296 100644 --- a/net-fs/samba/Manifest +++ b/net-fs/samba/Manifest @@ -1,27 +1,27 @@ -MD5 def58cafa80db83422102057ccdad3cf samba-3.0.11.ebuild 9076 -MD5 97844aa955e81548824ea448d22da7d0 samba-3.0.14a-r2.ebuild 9168 -MD5 7b05dc99e54f0b8f7ac5e128f2090f87 samba-3.0.10.ebuild 16844 -MD5 d16c09b4e8ef3e2758d13d409823a102 samba-3.0.14a-r1.ebuild 9078 -MD5 ea646590dde34d9b64513d1b4feba49d ChangeLog 33090 MD5 41299f246433a1a55c8fccc77ccd709e metadata.xml 491 +MD5 6c29133852e4c0deb1e0774f9fe5f932 ChangeLog 33254 +MD5 d16c09b4e8ef3e2758d13d409823a102 samba-3.0.14a-r1.ebuild 9078 +MD5 68b3132a56538a90b245f3a2fc6d74bf samba-3.0.14a-r2.ebuild 9135 +MD5 7b05dc99e54f0b8f7ac5e128f2090f87 samba-3.0.10.ebuild 16844 +MD5 def58cafa80db83422102057ccdad3cf samba-3.0.11.ebuild 9076 MD5 fa1dcd2c95a81c22c2ad68de6698a85e files/digest-samba-3.0.10 206 -MD5 498babc5e33f61369f42201f25eb35c0 files/digest-samba-3.0.11 215 -MD5 e89b19f1e62e257cbaa23a44a0362a58 files/swat.xinetd 527 MD5 def157a63ec14450df82373617c7dc4b files/samba-3.0.11-gcc4.patch 485 -MD5 e17a1638ad9f30f2e39db4c8981a2fcd files/vscan-0.3.5-libclamav.patch 523 -MD5 7ee5edc70bf80888c776f5808f865996 files/nsswitch.conf-wins 392 -MD5 341521b710d02d57a70acd49b1d4c06b files/samba-conf 1291 -MD5 a1bbdaf99b7a3819a219a9450fa3dd0a files/samba-init 1104 -MD5 b836e258befae9d6c66cb3f158769b25 files/samba-3.0.x-libdirsymlink.patch 592 -MD5 12df1953c039c5a93939497b0bc0ffba files/nsswitch.conf-winbind 403 MD5 519576a9448b86f1a7baab18204533a5 files/lmhosts 126 -MD5 e75c2316eced1d80cb2161848581c6a3 files/samba-3.0.x-python-setup.patch 1094 +MD5 12df1953c039c5a93939497b0bc0ffba files/nsswitch.conf-winbind 403 +MD5 7ee5edc70bf80888c776f5808f865996 files/nsswitch.conf-wins 392 +MD5 0c0364e7f0bc4cc48d8f9b103e606a93 files/samba-2.2.8-statfs.patch 239 MD5 3cff882704d5ba84a75a76fc4262b3d3 files/digest-samba-3.0.14a-r1 216 +MD5 498babc5e33f61369f42201f25eb35c0 files/digest-samba-3.0.11 215 MD5 d4e9a54f480d846b5b5ba84b4f29c17c files/digest-samba-3.0.14a-r2 216 -MD5 0c0364e7f0bc4cc48d8f9b103e606a93 files/samba-2.2.8-statfs.patch 239 +MD5 b836e258befae9d6c66cb3f158769b25 files/samba-3.0.x-libdirsymlink.patch 592 +MD5 e75c2316eced1d80cb2161848581c6a3 files/samba-3.0.x-python-setup.patch 1094 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 9f9da063cb02079a8f205bc365426170 files/samba.pam 513 +MD5 e17a1638ad9f30f2e39db4c8981a2fcd files/vscan-0.3.5-libclamav.patch 523 diff --git a/net-fs/samba/samba-3.0.14a-r2.ebuild b/net-fs/samba/samba-3.0.14a-r2.ebuild index a7368ad791da..7ee61f46733d 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.8 2005/08/03 14:02:15 satya Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.14a-r2.ebuild,v 1.9 2005/08/03 14:20:49 seemant Exp $ inherit eutils versionator @@ -264,7 +264,7 @@ pkg_preinst() { fi if [[ ! -f "${ROOT}/etc/samba/smb.conf" ]]; then - cp "${ROOT}/etc/samba/smb.conf.example" "${ROOT}/etc/samba/smb.conf" + touch ${IMAGE}/etc/samba/smb.conf fi } |