bug #71334: automatically copy of old privatedir to new location

4 files changed, 27 insertions, 7 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index c5824e15a192..c29bbd3e68a5 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.130 2004/11/15 10:12:30 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.131 2004/11/18 12:10:10 satya Exp $
+
+  18 Nov 2004; Christian Andreetta <satya@gentoo.org> samba-3.0.8-r1.ebuild,
+  samba-3.0.8.ebuild:
+  bug #71334: automatically copy of old privatedir to new location
 
 *samba-3.0.8-r1 (15 Nov 2004)
 
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index be42504f7e8e..f72c476c4297 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -2,10 +2,10 @@ MD5 3a0e5f78e38031ab57be3863a456d514 samba-3.0.7.ebuild 13924
 MD5 9b192ecc1db0a52318a676e8c03d4ac2 samba-3.0.7-r1.ebuild 15395
 MD5 cd9f3589a14d50054a0b1e4e129602af samba-3.0.6-r4.ebuild 14203
 MD5 fc36819e4e02fa146e936aa31947ad27 samba-3.0.6-r3.ebuild 14226
-MD5 a43f837ad8303a534ca76ea81bf66d53 samba-3.0.8.ebuild 16488
+MD5 e91f40a0a3eee1c42541c7fe22302e87 samba-3.0.8.ebuild 16813
 MD5 62d9d0090688c993002a60808e680e07 ChangeLog 23934
 MD5 41299f246433a1a55c8fccc77ccd709e metadata.xml 491
-MD5 016874bb1d14c198e3bfde6cff28e4a4 samba-3.0.8-r1.ebuild 16511
+MD5 5485e31d70208d469d68decd610dc628 samba-3.0.8-r1.ebuild 16863
 MD5 fcebd975211fecf647f6cecf26ba5c96 files/samba-3.0.4.patch 8086
 MD5 e89b19f1e62e257cbaa23a44a0362a58 files/swat.xinetd 527
 MD5 a7cc90ba23d86b1d90f65645826dde19 files/smbldap_conf.pm 7095
diff --git a/net-fs/samba/samba-3.0.8-r1.ebuild b/net-fs/samba/samba-3.0.8-r1.ebuild
index d13d90b0ac37..c9d32a151429 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.1 2004/11/15 10:12:30 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.8-r1.ebuild,v 1.2 2004/11/18 12:10:10 satya Exp $
 
 inherit eutils flag-o-matic
 #---------------------------------------------------------------------------
@@ -54,6 +54,7 @@ pkg_setup() {
 	ewarn "    quotas:    now disabled by default"
 	ewarn "    winbind:   now disabled by default"
 	ewarn "    libclamav: (oav) don't use clamav daemon, just load libraries when needed"
+	ewarn "/etc/samba/private moved to /var/lib/samba/private"
 	ebeep
 	epause
 }
@@ -318,8 +319,9 @@ src_install() {
 	fi
 	# dirs -----------------------------------------------------------------
 	diropts -m0700
-	dodir /var/lib/samba/private
-	touch ${D}/var/lib/samba/private/.keep
+	local PRIVATE_DST=/var/lib/samba/private
+	dodir ${PRIVATE_DST}
+	touch ${D}${PRIVATE_DST}/.keep
 	diropts -m1777
 	dodir /var/spool/samba
 	touch ${D}/var/spool/samba/.keep
@@ -365,6 +367,13 @@ 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:"
diff --git a/net-fs/samba/samba-3.0.8.ebuild b/net-fs/samba/samba-3.0.8.ebuild
index 571230c03c08..308290173345 100644
--- a/net-fs/samba/samba-3.0.8.ebuild
+++ b/net-fs/samba/samba-3.0.8.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.ebuild,v 1.10 2004/11/10 19:40:37 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.8.ebuild,v 1.11 2004/11/18 12:10:10 satya Exp $
 
 inherit eutils flag-o-matic
 #---------------------------------------------------------------------------
@@ -54,6 +54,7 @@ pkg_setup() {
 	ewarn "    quotas:    now disabled by default"
 	ewarn "    winbind:   now disabled by default"
 	ewarn "    libclamav: (oav) don't use clamav daemon, just load libraries when needed"
+	ewarn "/etc/samba/private moved to /var/lib/samba/private"
 	ebeep
 	epause
 }
@@ -365,6 +366,12 @@ pkg_postinst() {
 	# touch /etc/samba/smb.conf so that people installing samba just
 	# 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"