[Pkg-samba-maint] r974 - trunk

[Peter Eisentraut]

Author: petere
Date: 2006-01-22 03:12:49 +0000 (Sun, 22 Jan 2006)
New Revision: 974

Modified:
   trunk/changelog
   trunk/rules
   trunk/smbfs.files
Log:
* Add umount.cifs. Closes: #340967
* Really make mount.cifs and umount.cifs suid root. Closes: #340966


Modified: trunk/changelog
===================================================================
--- trunk/changelog	2006-01-22 02:10:12 UTC (rev 973)
+++ trunk/changelog	2006-01-22 03:12:49 UTC (rev 974)
@@ -1,9 +1,14 @@
 samba (3.0.21a-3) unstable; urgency=low
 
+  [ Christian Perrier ]
   * Add Build-Depends on quilt (>= 0.40 as we use quilt.make)
 
- -- Christian Perrier <bubulle at debian.org>  Sat, 21 Jan 2006 23:02:32 +0100
+  [ Peter Eisentraut ]
+  * Add umount.cifs. Closes: #340967
+  * Really make mount.cifs and umount.cifs suid root. Closes: #340966
 
+ -- Peter Eisentraut <petere at debian.org>  Sun, 22 Jan 2006 03:52:17 +0100
+
 samba (3.0.21a-2) unstable; urgency=low
 
   [ Christian Perrier ]

Modified: trunk/rules
===================================================================
--- trunk/rules	2006-01-22 02:10:12 UTC (rev 973)
+++ trunk/rules	2006-01-22 03:12:49 UTC (rev 974)
@@ -100,7 +100,7 @@
 	$(MAKE) -C source headers
 	$(MAKE) -C source all nsswitch/libnss_wins.so python_ext
 ifeq ($(mount_cifs),yes)
-	$(MAKE) -C source client/mount.cifs
+	$(MAKE) -C source client/mount.cifs client/umount.cifs
 endif
 
 	touch build-stamp
@@ -117,7 +117,8 @@
 
 	# Delete stuff left after a build that is not deleted by 'make clean'
 	rm -f source/bin/wbinfo source/bin/winbindd source/bin/debug2html \
-		source/bin/libsmbclient.a source/client/mount.cifs \
+		source/bin/libsmbclient.a \
+		source/client/mount.cifs source/client/umount.cifs \
 		source/include/stamp-h
 
 	sed -e "s/@libacl@/`type-handling any linux-gnu`/g" \
@@ -186,9 +187,8 @@
 endif
 
 ifeq ($(mount_cifs),yes)
-	# Install mount.cifs and its man page
-	install -m 04755 source/client/mount.cifs $(DESTDIR)/sbin/
-	install -m 0644 docs/manpages/mount.cifs.8 $(DESTDIR)/usr/share/man/man8/
+	install -m 0755 source/client/mount.cifs $(DESTDIR)/sbin/
+	install -m 0755 source/client/umount.cifs $(DESTDIR)/sbin/
 endif
 
 	# For CUPS to support printing to samba printers, it's necessary
@@ -290,8 +290,8 @@
 	# it becomes executable
 	chmod a-x debian/libsmbclient-dev/usr/include/libsmbclient.h
 
+	# You may want to make some executables suid here.
 ifeq ($(smbfs),yes)
-	# You may want to make some executables suid here.
 	# The smbmnt and smbumount binaries should be setuid-root. This
 	#	has security implications because these programs haven't had
 	#	a thorough security audit. smbmount _does not_ have to have
@@ -299,6 +299,10 @@
 	chmod u+s debian/smbfs/usr/bin/smbmnt
 	chmod u+s debian/smbfs/usr/bin/smbumount
 endif
+ifeq ($(mount_cifs),yes)
+	chmod u+s debian/smbfs/sbin/mount.cifs
+	chmod u+s debian/smbfs/sbin/umount.cifs
+endif
 
 	# Set some reasonable default perms for the samba logdir.
 	chmod 0750 debian/samba/var/log/samba/

Modified: trunk/smbfs.files
===================================================================
--- trunk/smbfs.files	2006-01-22 02:10:12 UTC (rev 973)
+++ trunk/smbfs.files	2006-01-22 03:12:49 UTC (rev 974)
@@ -1,6 +1,7 @@
 sbin/mount.smbfs
 sbin/mount.smb
 sbin/mount.cifs
+sbin/umount.cifs
 usr/bin/smbmount
 usr/bin/smbumount
 usr/bin/smbmnt