old private config saved in pkg_setup (no more post_install: bug #72235)

4 files changed, 57 insertions, 48 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index d276d13b13e6..3991d9bcc626 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-fs/samba
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.133 2004/11/21 20:58:01 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.134 2004/11/23 15:28:22 satya Exp $
+
+  23 Nov 2004; Christian Andreetta <satya@gentoo.org> samba-3.0.8-r1.ebuild,
+  samba-3.0.9.ebuild:
+  old private config saved in pkg_setup (no more post_install: bug #72235)
 
   21 Nov 2004; Jason Wever <weeve@gentoo.org> samba-3.0.9.ebuild:
   Added ~sparc keyword as it was not carried over in the version bump.
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 43f51c19fdec..f4ecfca0c71b 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,51 +1,51 @@
-MD5 093f90f383987fa27d09710b76f1b33d ChangeLog 24429
-MD5 41299f246433a1a55c8fccc77ccd709e metadata.xml 491
+MD5 3a0e5f78e38031ab57be3863a456d514 samba-3.0.7.ebuild 13924
 MD5 9b192ecc1db0a52318a676e8c03d4ac2 samba-3.0.7-r1.ebuild 15395
-MD5 826ef7c1a083b2b7f564dc5198072698 samba-3.0.8.ebuild 16812
-MD5 83218e8fea710adb8dd0ec2eb454c915 samba-3.0.8-r1.ebuild 16865
-MD5 c15738712be21e41e28117fa7071596a samba-3.0.9.ebuild 16141
-MD5 fc36819e4e02fa146e936aa31947ad27 samba-3.0.6-r3.ebuild 14226
 MD5 cd9f3589a14d50054a0b1e4e129602af samba-3.0.6-r4.ebuild 14203
-MD5 3a0e5f78e38031ab57be3863a456d514 samba-3.0.7.ebuild 13924
-MD5 fd2382184b6a07e63cb07ff26b578fd2 files/config-svc-smbd+nmbd 784
-MD5 a6cb7ea67d2a4fa00cb2d5dba0710cc3 files/digest-samba-3.0.7-r1 203
-MD5 de43ff30dd5f1431590fd62a997e71b4 files/samba-3.0.4-python-setup.patch 833
-MD5 b836e258befae9d6c66cb3f158769b25 files/samba-3.0.x-libdirsymlink.patch 592
+MD5 fecf7e13fdcc612c14670b98fd6b8f68 samba-3.0.9.ebuild 16136
+MD5 fc36819e4e02fa146e936aa31947ad27 samba-3.0.6-r3.ebuild 14226
+MD5 826ef7c1a083b2b7f564dc5198072698 samba-3.0.8.ebuild 16812
+MD5 093f90f383987fa27d09710b76f1b33d ChangeLog 24429
+MD5 41299f246433a1a55c8fccc77ccd709e metadata.xml 491
+MD5 fc7205d5b61ffd583ee810417ed28a77 samba-3.0.8-r1.ebuild 17126
 MD5 fcebd975211fecf647f6cecf26ba5c96 files/samba-3.0.4.patch 8086
-MD5 519576a9448b86f1a7baab18204533a5 files/lmhosts 126
+MD5 e89b19f1e62e257cbaa23a44a0362a58 files/swat.xinetd 527
+MD5 a7cc90ba23d86b1d90f65645826dde19 files/smbldap_conf.pm 7095
+MD5 cbaa5a39d9bd67b13f8131b426a4256b files/samba-2.2.5-gp-reloc-fix.patch 431
+MD5 e17a1638ad9f30f2e39db4c8981a2fcd files/vscan-0.3.5-libclamav.patch 523
+MD5 7ee5edc70bf80888c776f5808f865996 files/nsswitch.conf-wins 392
+MD5 341521b710d02d57a70acd49b1d4c06b files/samba-conf 1291
+MD5 f1bd70937bb822e70fcd5a81efba02d2 files/samba-init 1090
+MD5 b836e258befae9d6c66cb3f158769b25 files/samba-3.0.x-libdirsymlink.patch 592
+MD5 fd2382184b6a07e63cb07ff26b578fd2 files/config-svc-smbd+nmbd 784
+MD5 e5dbea6345ee39a97bc8783f5772bf49 files/samba-3.0.6-winbind_getpwnam_v1.patch 2521
 MD5 f402c2c4103f4c13ac3cc5fa165940db files/nonroot-bind.diff 757
 MD5 5d3129a0f6bcbec6ec91d217881a34e1 files/nsswitch.conf-winbind 298
-MD5 7ee5edc70bf80888c776f5808f865996 files/nsswitch.conf-wins 392
-MD5 cbaa5a39d9bd67b13f8131b426a4256b files/samba-2.2.5-gp-reloc-fix.patch 431
-MD5 8289eda694b35875eec6df5cc3f50c86 files/samba-2.2.6-libresolv.patch 540
-MD5 60e527174c1b2c53126dbbedb3cae0f7 files/samba-2.2.8-statfs.patch 209
+MD5 519576a9448b86f1a7baab18204533a5 files/lmhosts 126
 MD5 516ca38dfc67b7cd7356f93ad2cf75b9 files/samba-3.0.0-python-setup.patch 767
-MD5 f1bd70937bb822e70fcd5a81efba02d2 files/samba-init 1090
-MD5 9560b7e29d3a65db029fc1800e84abcc files/samba-pdb_ldap-exop.patch 3921
-MD5 6b6683448cdc01d013bd2c61b4ed8e1e files/samba-slapd-include.conf 499
-MD5 6acf6a5e92ff2cfc5f09b88f5d01b63e files/samba-svc 975
-MD5 b6cdc1468e45f92f19873e0c6c5b6e94 files/samba.pam 332
+MD5 e75c2316eced1d80cb2161848581c6a3 files/samba-3.0.x-python-setup.patch 1094
 MD5 1eec486ab39a239e25a76b16a6fcd460 files/smb.conf.example 16183
+MD5 6b6683448cdc01d013bd2c61b4ed8e1e files/samba-slapd-include.conf 499
+MD5 60e527174c1b2c53126dbbedb3cae0f7 files/samba-2.2.8-statfs.patch 209
+MD5 a6cb7ea67d2a4fa00cb2d5dba0710cc3 files/digest-samba-3.0.7 203
 MD5 66e68bb6d3ceb275479b3c68e7becf9d files/digest-samba-3.0.8 203
-MD5 a7cc90ba23d86b1d90f65645826dde19 files/smbldap_conf.pm 7095
-MD5 3685eadb817d185b06476eca6c0c15c4 files/smbusers 204
-MD5 e89b19f1e62e257cbaa23a44a0362a58 files/swat.xinetd 527
-MD5 09195dd8ab25ce77ac51c0c05b4ab93c files/system-auth-winbind 869
-MD5 341521b710d02d57a70acd49b1d4c06b files/samba-conf 1291
-MD5 990fe15ff8a0e79f39069fff6475536d files/samba-3.0.2a-smbprint.patch 1224
-MD5 e17a1638ad9f30f2e39db4c8981a2fcd files/vscan-0.3.5-libclamav.patch 523
-MD5 94d8eb813ea041a79ee00914c5052b3f files/digest-samba-3.0.8-r1 205
-MD5 e75c2316eced1d80cb2161848581c6a3 files/samba-3.0.x-python-setup.patch 1094
-MD5 8ea7b443dd580aaaaf7e9e896eba54f2 files/samba-3.0.x-smbumount-uid32.patch 425
-MD5 fcebd975211fecf647f6cecf26ba5c96 files/samba-3.0.x.patch 8086
-MD5 4b541de7c65bbbb129d2522d821b4609 files/samba-3.0.8-lanman.patch 472
 MD5 afb788b7b2370ba7045b8d7d7ba8b11a files/digest-samba-3.0.9 205
+MD5 8ea7b443dd580aaaaf7e9e896eba54f2 files/samba-3.0.x-smbumount-uid32.patch 425
 MD5 bf268fdddc8ef677b6fa78661a094eac files/samba.schema 16044
-MD5 8c114eb3ebe56e7adb7db9381bea62db files/digest-samba-3.0.6-r3 203
-MD5 579303048a39e504238ff8e658413452 files/samba-3.0.6-homes-reuse_v2.patch 2411
+MD5 239ef0e21552896faeef21c685561245 files/smb.conf.example-samba3.gz 7808
 MD5 bf268fdddc8ef677b6fa78661a094eac files/samba-3.0.6-samba.schema 16044
-MD5 e5dbea6345ee39a97bc8783f5772bf49 files/samba-3.0.6-winbind_getpwnam_v1.patch 2521
+MD5 8c114eb3ebe56e7adb7db9381bea62db files/digest-samba-3.0.6-r3 203
 MD5 8c114eb3ebe56e7adb7db9381bea62db files/digest-samba-3.0.6-r4 203
+MD5 a6cb7ea67d2a4fa00cb2d5dba0710cc3 files/digest-samba-3.0.7-r1 203
+MD5 94d8eb813ea041a79ee00914c5052b3f files/digest-samba-3.0.8-r1 205
+MD5 9560b7e29d3a65db029fc1800e84abcc files/samba-pdb_ldap-exop.patch 3921
+MD5 3685eadb817d185b06476eca6c0c15c4 files/smbusers 204
+MD5 09195dd8ab25ce77ac51c0c05b4ab93c files/system-auth-winbind 869
+MD5 4b541de7c65bbbb129d2522d821b4609 files/samba-3.0.8-lanman.patch 472
+MD5 579303048a39e504238ff8e658413452 files/samba-3.0.6-homes-reuse_v2.patch 2411
+MD5 990fe15ff8a0e79f39069fff6475536d files/samba-3.0.2a-smbprint.patch 1224
 MD5 b836e258befae9d6c66cb3f158769b25 files/samba-3.0.6-libdirsymlink.patch 592
-MD5 239ef0e21552896faeef21c685561245 files/smb.conf.example-samba3.gz 7808
-MD5 a6cb7ea67d2a4fa00cb2d5dba0710cc3 files/digest-samba-3.0.7 203
+MD5 6acf6a5e92ff2cfc5f09b88f5d01b63e files/samba-svc 975
+MD5 b6cdc1468e45f92f19873e0c6c5b6e94 files/samba.pam 332
+MD5 de43ff30dd5f1431590fd62a997e71b4 files/samba-3.0.4-python-setup.patch 833
+MD5 fcebd975211fecf647f6cecf26ba5c96 files/samba-3.0.x.patch 8086
+MD5 8289eda694b35875eec6df5cc3f50c86 files/samba-2.2.6-libresolv.patch 540
diff --git a/net-fs/samba/samba-3.0.8-r1.ebuild b/net-fs/samba/samba-3.0.8-r1.ebuild
index 18b330f5ae16..446b0827280e 100644
--- a/net-fs/samba/samba-3.0.8-r1.ebuild
+++ b/net-fs/samba/samba-3.0.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.8-r1.ebuild,v 1.3 2004/11/20 15:11:07 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.8-r1.ebuild,v 1.4 2004/11/23 15:28:22 satya Exp $
 
 inherit eutils flag-o-matic
 #---------------------------------------------------------------------------
@@ -57,6 +57,12 @@ pkg_setup() {
 	ewarn "/etc/samba/private moved to /var/lib/samba/private"
 	ebeep
 	epause
+	local PRIVATEDIR=/var/lib/samba/private
+	local PRIVATE_SRC=/etc/samba/private
+	if [[ ! -r ${PRIVATEDIR}/secrets.tdb && -r ${PRIVATE_SRC}/secrets.tdb ]]; then
+		einfo "Copying ${PRIVATE_SRC}/* to ${PRIVATEDIR}/"
+		cp -af ${PRIVATE_SRC}/* ${D}${PRIVATEDIR}/
+	fi
 }
 #===========================================================================
 src_unpack() {
diff --git a/net-fs/samba/samba-3.0.9.ebuild b/net-fs/samba/samba-3.0.9.ebuild
index 6220d136fe6c..55be40eeebd3 100644
--- a/net-fs/samba/samba-3.0.9.ebuild
+++ b/net-fs/samba/samba-3.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.9.ebuild,v 1.2 2004/11/21 20:58:01 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.9.ebuild,v 1.3 2004/11/23 15:28:22 satya Exp $
 
 inherit eutils flag-o-matic
 #---------------------------------------------------------------------------
@@ -57,6 +57,12 @@ pkg_setup() {
 	ewarn "/etc/samba/private moved to /var/lib/samba/private"
 	ebeep
 	epause
+	local PRIVATEDIR=/var/lib/samba/private
+	local PRIVATE_SRC=/etc/samba/private
+	if [[ ! -r ${PRIVATEDIR}/secrets.tdb && -r ${PRIVATE_SRC}/secrets.tdb ]]; then
+		einfo "Copying ${PRIVATE_SRC}/* to ${PRIVATEDIR}/"
+		cp -af ${PRIVATE_SRC}/* ${D}${PRIVATEDIR}/
+	fi
 }
 #===========================================================================
 src_unpack() {
@@ -362,13 +368,6 @@ pkg_postinst() {
 	# to mount smb shares don't get annoying warnings all the time..
 	#[ ! -e ${ROOT}/etc/samba/smb.conf ] && touch ${ROOT}/etc/samba/smb.conf
 
-	local PRIVATE_DST=/var/lib/samba/private
-	local PRIVATE_SRC=/etc/samba/private
-	if [[ ! -r ${PRIVATE_DST}/secrets.tdb && -r ${PRIVATE_SRC}/secrets.tdb ]]; then
-		einfo "Copying ${PRIVATE_SRC}/* to ${PRIVATE_DST}/"
-		cp -af ${PRIVATE_SRC}/* ${D}${PRIVATE_DST}/
-	fi
-
 	ewarn ""
 	ewarn "If you are upgrading from a Samba version prior to 3.0.2, and you"
 	ewarn "use Samba's password database, you must run the following command:"