minor init script fix, oav support compile fix

4 files changed, 30 insertions, 28 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 9fef6882d503..9d5dc2d5e420 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-fs/samba
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.80 2004/06/15 02:31:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.81 2004/06/15 12:46:30 satya Exp $
+
+  15 Jun 2004; Christian Andreetta <satya@gentoo.org> samba-3.0.2a-r2.ebuild:
+  minor initscript fix (as per bug #53962), oav support fix (#52009, Alessandro
+  Pisani)
 
   14 Jun 2004; Aron Griffis <agriffis@gentoo.org> samba-3.0.4-r1.ebuild:
   Fix use invocation
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 7ff36a9b779b..954bcdc28850 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,34 +1,34 @@
 MD5 e9ac3af13220338fb08e63dd8d2ec34b samba-3.0.4-r1.ebuild 11049
 MD5 c59ae5e5ce4891972b2a6d61dd3fc455 samba-3.0.1-r1.ebuild 11338
-MD5 8dc040986a2a1db5e79dbfe3d2d72010 samba-3.0.2a-r2.ebuild 12185
+MD5 41f02f77b37cf255cdcb7a1861e35d6c samba-3.0.2a-r2.ebuild 12195
 MD5 2d1d56efa8cdec631b5a616630e366a1 ChangeLog 16519
 MD5 63bc25b07c7404f26d602e69ddad747e metadata.xml 458
-MD5 d95c7a841071087246ef23a1f72b890f files/winbind-init 491
+MD5 88b5abd8e04f84a7507ab35555f305b7 files/winbind-init 490
 MD5 fcebd975211fecf647f6cecf26ba5c96 files/samba-3.0.4.patch 8086
-MD5 ba636412fdffb621dcd28e79fb247d7c files/swat.xinetd 525
+MD5 d57ae3d7c51d488034f992de323e52b8 files/swat.xinetd 524
 MD5 20997c75e29fec20efbb2cd6695cd3a9 files/recycle.conf 776
-MD5 cf9aae0d1cf55f47d1434f6bf1cee52e files/smbldap_conf.pm 7093
+MD5 9e78d5e97b1c5f85d9c21636d1f234a4 files/smbldap_conf.pm 7092
 MD5 cbaa5a39d9bd67b13f8131b426a4256b files/samba-2.2.5-gp-reloc-fix.patch 431
-MD5 092f8dd0b4f6f5da13ce2daafb534978 files/nsswitch.conf-wins 390
+MD5 c78caa4193cd606b58c158c57b5adbd7 files/nsswitch.conf-wins 389
 MD5 341521b710d02d57a70acd49b1d4c06b files/samba-conf 1291
 MD5 d911202dbaf3b115b6a812cb8cda07ca files/samba-init 1098
 MD5 fd2382184b6a07e63cb07ff26b578fd2 files/config-svc-smbd+nmbd 784
 MD5 f402c2c4103f4c13ac3cc5fa165940db files/nonroot-bind.diff 757
 MD5 5d3129a0f6bcbec6ec91d217881a34e1 files/nsswitch.conf-winbind 298
-MD5 b610fd35d7a0a9de510e31d85345d14a files/lmhosts 124
+MD5 a41862c288faa798030dc2178787113a files/lmhosts 123
 MD5 516ca38dfc67b7cd7356f93ad2cf75b9 files/samba-3.0.0-python-setup.patch 767
-MD5 2a8e771c143fc19819c4b6bd022f12ed files/smb.conf.example 16181
-MD5 9faccd0fa1bfb58b4ffa0e9dd01e1ec6 files/samba-slapd-include.conf 497
+MD5 b1c06dac56317d21e489e1d57b676e7c files/smb.conf.example 16180
+MD5 06fd0037fa556fa476fcf51c9311c609 files/samba-slapd-include.conf 496
 MD5 60e527174c1b2c53126dbbedb3cae0f7 files/samba-2.2.8-statfs.patch 209
 MD5 f3a4b3b0a8162ae87779846d7e6adbbf files/digest-samba-3.0.1-r1 202
 MD5 a86336201c2eced7a6e5a5138514e2f7 files/digest-samba-3.0.4-r1 203
 MD5 8c1f1e3655e12b85102ce257f3efad62 files/smb.conf.example-samba3 20762
 MD5 9560b7e29d3a65db029fc1800e84abcc files/samba-pdb_ldap-exop.patch 3921
-MD5 3721b81198a029319546e6ef56e5c493 files/smbusers 202
-MD5 ce5400ed75143be061711d2c1d51a081 files/system-auth-winbind 867
+MD5 6f854f1d9edcfc32c4379c0f90c91c93 files/smbusers 201
+MD5 5b90f114bd4f12bee1e9e7db2c3a34f9 files/system-auth-winbind 866
 MD5 990fe15ff8a0e79f39069fff6475536d files/samba-3.0.2a-smbprint.patch 1224
-MD5 a4597c467bc5322bfba790e526867ae0 files/samba-svc 982
+MD5 d487b34533f59d3a1a1c38717d3d221e files/samba-svc 981
 MD5 b6cdc1468e45f92f19873e0c6c5b6e94 files/samba.pam 332
-MD5 89ef79072e3e08e4caada278e2c3b280 files/digest-samba-3.0.2a-r2 204
+MD5 81931e1d9764390841dec0d0f327a114 files/digest-samba-3.0.2a-r2 204
 MD5 de43ff30dd5f1431590fd62a997e71b4 files/samba-3.0.4-python-setup.patch 833
 MD5 8289eda694b35875eec6df5cc3f50c86 files/samba-2.2.6-libresolv.patch 540
diff --git a/net-fs/samba/files/digest-samba-3.0.2a-r2 b/net-fs/samba/files/digest-samba-3.0.2a-r2
index 87a8e61d1838..ba769c6c988e 100644
--- a/net-fs/samba/files/digest-samba-3.0.2a-r2
+++ b/net-fs/samba/files/digest-samba-3.0.2a-r2
@@ -1,3 +1,3 @@
 MD5 72979a30ac450c8b0567c1ac9886884a samba-3.0.2a.tar.bz2 9289178
-MD5 acbcb28cff080dcf2ee732b7f2c0f949 samba-vscan-0.3.4.tar.bz2 131027
+MD5 5f173d549014985d681478897135915b samba-vscan-0.3.5.tar.bz2 161982
 MD5 34ef159fc49a2c30ff27b481dc8e1215 smbldap-tools-0.8.4.tgz 286290
diff --git a/net-fs/samba/samba-3.0.2a-r2.ebuild b/net-fs/samba/samba-3.0.2a-r2.ebuild
index 9edbd5839fbc..d41c773bf3e2 100644
--- a/net-fs/samba/samba-3.0.2a-r2.ebuild
+++ b/net-fs/samba/samba-3.0.2a-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.2a-r2.ebuild,v 1.11 2004/06/10 19:48:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.2a-r2.ebuild,v 1.12 2004/06/15 12:46:30 satya Exp $
 
 inherit eutils
 
@@ -9,9 +9,9 @@ HOMEPAGE="http://www.samba.org/
 	http://www.openantivirus.org/projects.php"
 
 SMBLDAP_TOOLS_VER=0.8.4
-VSCAN_VER=0.3.4
-VSCAN_MODS=${VSCAN_MODS:=fprot mks openantivirus sophos trend icap clamav} #kapersky
+VSCAN_VER=0.3.5
 # To build the "kapersky" plugin, the kapersky lib must be installed.
+VSCAN_MODS="oav sophos fprotd fsav trend icap mksd kavp clamav nai"
 
 _CVS="-${PV/_/}"
 S=${WORKDIR}/${PN}${_CVS}
@@ -183,13 +183,8 @@ src_compile() {
 		cd ${S}/examples.bin/VFS/${PN}-vscan-${VSCAN_VER}
 		./configure
 		assert "bad ${PN}-vscan-${VSCAN_VER} ./configure"
-
-		for i in ${VSCAN_MODS}
-		do
-			cd ${S}/examples.bin/VFS/${PN}-vscan-${VSCAN_VER}/$i
-			make USE_INCLMKSDLIB=1 #needed for the mks build
-			assert "problem building $i vscan module"
-		done
+		# as per bug #52009
+		make ${VSCAN_MODS}
 	fi
 
 	# Build mkntpasswd from the smbldap-tools.
@@ -283,7 +278,7 @@ src_install() {
 	exeinto /usr/lib/samba/vfs
 	if use oav
 	then
-		doexe examples.bin/VFS/${PN}-vscan-${VSCAN_VER}/*/vscan-*.so
+		doexe examples.bin/VFS/${PN}-vscan-${VSCAN_VER}/vscan-*.so
 	fi
 	for i in audit cap default_quota extd_audit fake_perms \
 		netatalk readonly recycle
@@ -392,9 +387,12 @@ src_install() {
 	newins ${FILESDIR}/samba.pam samba
 	doins ${FILESDIR}/system-auth-winbind
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/samba-init samba
-	newexe ${FILESDIR}/winbind-init winbind
+	#2004-06-15: satya@gentoo.org: changed invocation method
+	#exeinto /etc/init.d
+	#newexe ${FILESDIR}/samba-init samba
+	#newexe ${FILESDIR}/winbind-init winbind
+	exeinto /etc/init.d; newexe ${FILESDIR}/samba-init samba
+	insinto /etc/conf.d; newins ${FILESDIR}/samba-conf samba
 
 	insinto /etc/xinetd.d
 	newins ${FILESDIR}/swat.xinetd swat