smbget for 3.0.4, mount.cifs for 3.0.2a

4 files changed, 18 insertions, 9 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 9d5dc2d5e420..58701736a3b5 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.81 2004/06/15 12:46:30 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.82 2004/06/18 10:08:52 satya Exp $
+
+  18 Jun 2004; Christian Andreetta <satya@gentoo.org> samba-3.0.2a-r2.ebuild,
+  samba-3.0.4-r1.ebuild:
+  closing bug #53236 (Jaco Kroon), #53082: smbget and mount.cifs
 
   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
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 57167bcdf404..4c6adc70e573 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,6 +1,6 @@
-MD5 e9ac3af13220338fb08e63dd8d2ec34b samba-3.0.4-r1.ebuild 11049
+MD5 dacab8b47894c739fb8f2f269fba5a2f samba-3.0.4-r1.ebuild 11043
 MD5 c59ae5e5ce4891972b2a6d61dd3fc455 samba-3.0.1-r1.ebuild 11338
-MD5 9da0b6f4977034fee1e0b7a8ba0587c8 samba-3.0.2a-r2.ebuild 12194
+MD5 891b576363505fdaca004e06279d3d19 samba-3.0.2a-r2.ebuild 12157
 MD5 4a5678fa52f145100cab07913d9bb0fd ChangeLog 16685
 MD5 63bc25b07c7404f26d602e69ddad747e metadata.xml 458
 MD5 88b5abd8e04f84a7507ab35555f305b7 files/winbind-init 490
diff --git a/net-fs/samba/samba-3.0.2a-r2.ebuild b/net-fs/samba/samba-3.0.2a-r2.ebuild
index d41c773bf3e2..b0ad73b09baa 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.12 2004/06/15 12:46:30 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.2a-r2.ebuild,v 1.13 2004/06/18 10:08:52 satya Exp $
 
 inherit eutils
 
@@ -368,6 +368,7 @@ src_install() {
 	# to work transparently with the standard 'mount' command..
 	dodir /sbin
 	dosym /usr/bin/smbmount /sbin/mount.smbfs
+	dosym /usr/bin/mount.cifs /sbin/mount.cifs #see bug #53236
 
 	# make the smb backend symlink for cups printing support..
 	if use cups; then
diff --git a/net-fs/samba/samba-3.0.4-r1.ebuild b/net-fs/samba/samba-3.0.4-r1.ebuild
index 4341d594a33b..88838ee55972 100644
--- a/net-fs/samba/samba-3.0.4-r1.ebuild
+++ b/net-fs/samba/samba-3.0.4-r1.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.4-r1.ebuild,v 1.2 2004/06/15 02:31:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.4-r1.ebuild,v 1.3 2004/06/18 10:08:52 satya Exp $
 
 inherit eutils
 
@@ -188,6 +188,8 @@ src_compile() {
 	cd ${S}/source
 	gcc ${CFLAGS} client/mount.cifs.c -o bin/mount.cifs
 	assert "mount.cifs compile problem"
+	# build smbget
+	make bin/smbget; assert "smbget compile error"
 
 	# Build selected samba-vscan plugins.
 	if use oav
@@ -212,7 +214,7 @@ src_compile() {
 }
 
 src_install() {
-	local extra_bins="debug2html smbfilter talloctort mount.cifs"
+	local extra_bins="debug2html smbfilter talloctort mount.cifs smbget"
 	#smbsh editreg
 	extra_bins="${extra_bins} smbtorture msgtest masktest locktest \
 		locktest2 nsstest vfstest rpctorture"
@@ -228,9 +230,11 @@ src_install() {
 		einfo "Extra binaries: ${i}"
 	done
 	# Installing these setuid-root allows users to (un)mount smbfs/cifs.
-	fperms 4111 /usr/bin/smbumount
-	fperms 4111 /usr/bin/smbmnt
-	fperms 4111 /usr/bin/mount.cifs
+	for i in /usr/bin/smbumount /usr/bin/smbmnt /usr/bin/mount.cifs
+	do
+		fperms 4111 ${i}
+		einfo "suid: ${i}"
+	done
 	# Nsswitch extensions. Make link for wins and winbind resolvers.
 	exeinto /lib
 	for i in wins winbind