[Pkg-samba-maint] r3410 - in trunk/samba/debian: . patches
bubulle at alioth.debian.org
bubulle at alioth.debian.org
Wed Mar 24 21:10:14 UTC 2010
Author: bubulle
Date: 2010-03-24 21:10:12 +0000 (Wed, 24 Mar 2010)
New Revision: 3410
Removed:
trunk/samba/debian/mount.smbfs
trunk/samba/debian/smbfs.NEWS
trunk/samba/debian/smbfs.dirs
trunk/samba/debian/smbfs.files
trunk/samba/debian/smbfs.links
Modified:
trunk/samba/debian/README.debian
trunk/samba/debian/changelog
trunk/samba/debian/control
trunk/samba/debian/patches/fix-manpages-warnings.patch
trunk/samba/debian/rules
Log:
No longer build the smbfs package
Modified: trunk/samba/debian/README.debian
===================================================================
--- trunk/samba/debian/README.debian 2010-03-14 17:36:37 UTC (rev 3409)
+++ trunk/samba/debian/README.debian 2010-03-24 21:10:12 UTC (rev 3410)
@@ -28,7 +28,6 @@
swat: Samba Web Administration Tool
samba-doc: Samba documentation.
samba-doc-pdf: Samba documentation (PDF format).
-smbfs: Mount and umount commands for cifs (smbfs is removed)
samba-tools: Tools provided by the Samba suite
libpam-smbpass: pluggable authentication module for SMB password database.
libsmbclient: Shared library that allows applications to talk to SMB servers.
Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog 2010-03-14 17:36:37 UTC (rev 3409)
+++ trunk/samba/debian/changelog 2010-03-24 21:10:12 UTC (rev 3410)
@@ -1,3 +1,10 @@
+samba (2:3.4.7~dfsg-2) UNRELEASED; urgency=low
+
+ * Drop smbfs package (now provided by cifs-utils as a dummy transition
+ package)
+
+ -- Christian Perrier <bubulle at debian.org> Wed, 24 Mar 2010 22:02:25 +0100
+
samba (2:3.4.7~dfsg-1) unstable; urgency=low
[ Steve Langasek ]
Modified: trunk/samba/debian/control
===================================================================
--- trunk/samba/debian/control 2010-03-14 17:36:37 UTC (rev 3409)
+++ trunk/samba/debian/control 2010-03-24 21:10:12 UTC (rev 3410)
@@ -37,7 +37,7 @@
Directory realm, you will also need the winbind package.
.
This package is not required for connecting to existing SMB/CIFS servers
- (see smbclient) or for mounting remote filesystems (see smbfs).
+ (see smbclient) or for mounting remote filesystems (see cifs-utils).
Package: samba-common-bin
Architecture: any
@@ -81,7 +81,7 @@
Depends: samba-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
Replaces: samba (<< 2.999+3.0.alpha21-4), smbget
Provides: samba-client
-Suggests: smbfs
+Suggests: cifs-utils
Conflicts: samba4-clients
Description: command-line SMB/CIFS clients for Unix
Samba is an implementation of the SMB/CIFS protocol for Unix systems,
@@ -90,7 +90,8 @@
.
This package contains command-line utilities for accessing Microsoft
Windows and Samba servers, including smbclient, smbtar, and smbspool.
- Utilities for mounting shares locally are found in the package smbfs.
+ Utilities for mounting shares locally are found in the package
+ cifs-utils.
Package: swat
Architecture: any
@@ -134,22 +135,6 @@
.
This package contains all the PDF documentation for the Samba suite.
-Package: smbfs
-Section: otherosfs
-Priority: optional
-Architecture: any
-Depends: netbase (>= 2.02), samba-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
-Suggests: smbclient
-Replaces: smbfsx
-Description: Samba file system utilities
- Samba is an implementation of the SMB/CIFS protocol for Unix systems,
- providing support for cross-platform file and printer sharing with
- Microsoft Windows, OS X, and other Unix systems.
- .
- This package provides utilities for mounting and unmounting cifs network
- file systems. Other command-line utilities such as smbclient, smbtar
- and smbspool are in the package smbclient.
-
Package: libpam-smbpass
Section: admin
Priority: extra
Deleted: trunk/samba/debian/mount.smbfs
===================================================================
--- trunk/samba/debian/mount.smbfs 2010-03-14 17:36:37 UTC (rev 3409)
+++ trunk/samba/debian/mount.smbfs 2010-03-24 21:10:12 UTC (rev 3410)
@@ -1,115 +0,0 @@
-#!/bin/bash
-# Debian mount.smbfs compatibility wrapper
-# Copyright 2007, Steve Langasek <vorlon at debian.org>
-# Licensed under the GNU General Public License, version 2. See the
-# file /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-
-# This script accepts all documented mount options for mount.smbfs,
-# passing through those that are also recognized by mount.cifs,
-# converting those that are not recognized but map to available cifs
-# options, and warning about the use of options for which no equivalent
-# exists.
-
-# known bugs: quoted spaces in arguments are not passed intact
-
-set -e
-
-# reverse the order of username and password in a "username" parameter,
-# taking care to leave any "%password" bit intact
-
-reverse_username_workgroup() {
- local workgroup password username
-
- username="$1"
- case "$username" in
- *%*) password="${username#*%}"
- username="${username%%%*}"
- ;;
- *) ;;
- esac
- case "$username" in
- */*) workgroup="${username#*/}"
- username="${username%%/*}"
- ;;
- *) ;;
- esac
- if [ -n "$workgroup" ]; then
- username="$workgroup\\$username"
- fi
- if [ -n "$password" ]; then
- username="$username%$password"
- fi
- echo "$username"
-}
-
-
-# parse out the mount options that have been specified using -o, and if
-# necessary, convert them for use by mount.cifs
-
-parse_mount_options () {
- local OLD_IFS IFS options option username
- OLD_IFS="$IFS"
- IFS=","
- options=""
- workgroup=""
- password=""
-
- for option in $@; do
- case "$option" in
- sockopt=* | scope=* | codepage=* | ttl=* | debug=*)
- echo "Warning: ignoring deprecated smbfs option '$option'" >&2
- ;;
-
- krb)
- options="$options${options:+,}sec=krb5"
- ;;
-
- guest)
- echo "Warning: mapping 'guest' to 'guest,sec=none'" >&2
- options="$options${options:+,}guest,sec=none"
- ;;
-
- # username and workgroup are reversed in username= arguments,
- # so need to be parsed out
- username=*/*)
- IFS="$OLD_IFS"
- username="${option#username=}"
- username="$(reverse_username_workgroup "$username")"
- IFS=","
- options="$options${options:+,}username=$username"
- ;;
-
- *)
- options="$options${options:+,}$option"
- ;;
- esac
- done
- IFS="$OLD_IFS"
- echo $options
-}
-
-args=()
-while [ "$#" -gt 0 ]; do
- case "$1" in
- -o*)
- arg=${1#-o}
- shift
- if [ -z "$arg" ]; then
- arg=$1
- shift
- fi
- arg="$(parse_mount_options "$arg")"
- if [ -n "$arg" ]; then
- args=("${args[@]}" "-o" "$arg")
- fi
- ;;
- *)
- args=("${args[@]}" "$1")
- shift
- ;;
- esac
-done
-
-USER="$(reverse_username_workgroup "$USER")"
-
-exec /sbin/mount.cifs "${args[@]}"
Modified: trunk/samba/debian/patches/fix-manpages-warnings.patch
===================================================================
--- trunk/samba/debian/patches/fix-manpages-warnings.patch 2010-03-14 17:36:37 UTC (rev 3409)
+++ trunk/samba/debian/patches/fix-manpages-warnings.patch 2010-03-24 21:10:12 UTC (rev 3410)
@@ -2,34 +2,6 @@
Lintian report non-existing macros in manpages.
Author: Christian Perrier <bubulle at debian.org>
-Index: b/docs/manpages/cifs.upcall.8
-===================================================================
---- a/docs/manpages/cifs.upcall.8 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/cifs.upcall.8 2009-11-08 15:55:36.000000000 +0100
-@@ -33,7 +33,6 @@
- .\" SH - level-one heading that works better for non-TTY output
- .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- .de1 SH
--.\" put an extra blank line of space above the head in non-TTY output
- .if t \{\
- .sp 1
- .\}
-@@ -48,7 +47,6 @@
- .it 1 an-trap
- .nr an-no-space-flag 1
- .nr an-break-flag 1
--\." make the size of the head bigger
- .ps +3
- .ft B
- .ne (2v + 1u)
-@@ -82,7 +80,6 @@
- .nr an-no-space-flag 1
- .nr an-break-flag 1
- .ps \\n[PS-SS]u
--\." make the size of the head bigger
- .ps +2
- .ft B
- .ne (2v + 1u)
Index: b/docs/manpages/eventlogadm.8
===================================================================
--- a/docs/manpages/eventlogadm.8 2009-11-08 15:54:26.000000000 +0100
@@ -562,34 +534,6 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/mount.cifs.8
-===================================================================
---- a/docs/manpages/mount.cifs.8 2009-11-08 15:54:27.000000000 +0100
-+++ b/docs/manpages/mount.cifs.8 2009-11-08 15:55:36.000000000 +0100
-@@ -33,7 +33,6 @@
- .\" SH - level-one heading that works better for non-TTY output
- .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- .de1 SH
--.\" put an extra blank line of space above the head in non-TTY output
- .if t \{\
- .sp 1
- .\}
-@@ -48,7 +47,6 @@
- .it 1 an-trap
- .nr an-no-space-flag 1
- .nr an-break-flag 1
--\." make the size of the head bigger
- .ps +3
- .ft B
- .ne (2v + 1u)
-@@ -82,7 +80,6 @@
- .nr an-no-space-flag 1
- .nr an-break-flag 1
- .ps \\n[PS-SS]u
--\." make the size of the head bigger
- .ps +2
- .ft B
- .ne (2v + 1u)
Index: b/docs/manpages/net.8
===================================================================
--- a/docs/manpages/net.8 2009-11-08 15:55:35.000000000 +0100
@@ -1374,34 +1318,6 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: b/docs/manpages/umount.cifs.8
-===================================================================
---- a/docs/manpages/umount.cifs.8 2009-11-08 15:54:26.000000000 +0100
-+++ b/docs/manpages/umount.cifs.8 2009-11-08 15:55:36.000000000 +0100
-@@ -33,7 +33,6 @@
- .\" SH - level-one heading that works better for non-TTY output
- .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- .de1 SH
--.\" put an extra blank line of space above the head in non-TTY output
- .if t \{\
- .sp 1
- .\}
-@@ -48,7 +47,6 @@
- .it 1 an-trap
- .nr an-no-space-flag 1
- .nr an-break-flag 1
--\." make the size of the head bigger
- .ps +3
- .ft B
- .ne (2v + 1u)
-@@ -82,7 +80,6 @@
- .nr an-no-space-flag 1
- .nr an-break-flag 1
- .ps \\n[PS-SS]u
--\." make the size of the head bigger
- .ps +2
- .ft B
- .ne (2v + 1u)
Index: b/docs/manpages/vfs_audit.8
===================================================================
--- a/docs/manpages/vfs_audit.8 2009-11-08 15:54:26.000000000 +0100
Modified: trunk/samba/debian/rules
===================================================================
--- trunk/samba/debian/rules 2010-03-14 17:36:37 UTC (rev 3409)
+++ trunk/samba/debian/rules 2010-03-24 21:10:12 UTC (rev 3410)
@@ -66,16 +66,12 @@
ifeq ($(DEB_HOST_ARCH_OS),linux)
conf_args += \
--with-ctdb --with-cluster-support=yes \
- --with-cifsmount \
- --with-cifsupcall \
--with-acl-support \
- --with-quotas
- mount_cifs = yes
- smbfs = yes
-else
+ --with-quotas \
+ --without-cifsmount \
+ --without-cifsupcall
+ else
conf_args += --without-quotas --without-cifsmount
- mount_cifs = no
- smbfs = no
endif
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
@@ -113,7 +109,7 @@
[ ! -f source3/Makefile ] || $(MAKE) -C source3 distclean
# Delete stuff left after a build that is not deleted by 'make clean'
- rm -f source3/bin/cifs.upcall source3/pkgconfig/*.pc \
+ rm -f source3/pkgconfig/*.pc \
source3/exports/libsmbclient.syms \
source3/exports/libsmbsharemodes.syms
@@ -121,10 +117,6 @@
dh_clean
-ifeq ($(smbfs),no)
- DH_EXTRAS=-Nsmbfs
-endif
-
install: DH_OPTIONS=$(DH_EXTRAS)
install: build
dh_testdir
@@ -176,10 +168,6 @@
install -m 0644 debian/libpam-smbpass.pam-config $(DESTDIR)/usr/share/pam-configs/smbpasswd-migrate
install -m 0644 debian/winbind.pam-config $(DESTDIR)/usr/share/pam-configs/winbind
-ifeq ($(mount_cifs),yes)
- install -m 0755 debian/mount.smbfs $(DESTDIR)/sbin/mount.smbfs
-endif
-
# For CUPS to support printing to samba printers, it's necessary
# to make the following symlink (according to
# Erich Schubert <debian at vitavonni.de> in #109509):
Deleted: trunk/samba/debian/smbfs.NEWS
===================================================================
--- trunk/samba/debian/smbfs.NEWS 2010-03-14 17:36:37 UTC (rev 3409)
+++ trunk/samba/debian/smbfs.NEWS 2010-03-24 21:10:12 UTC (rev 3410)
@@ -1,10 +0,0 @@
-smbfs (2:3.4.5~dfsg-2) unstable; urgency=low
-
- * As of this version, the mount.cifs binary is no longer setuid.
- Upstream has always been increasingly unsupportive of this
- configuration over time. For instance, in bugs like
- https://bugzilla.samba.org/show_bug.cgi?id=6853, it is clearly
- mentioned that having it setuid root is discouraged.
-
- -- Christian Perrier <bubulle at debian.org> Sat, 06 Feb 2010 15:09:00 +0100
-
\ No newline at end of file
Deleted: trunk/samba/debian/smbfs.dirs
===================================================================
--- trunk/samba/debian/smbfs.dirs 2010-03-14 17:36:37 UTC (rev 3409)
+++ trunk/samba/debian/smbfs.dirs 2010-03-24 21:10:12 UTC (rev 3410)
@@ -1 +0,0 @@
-sbin
Deleted: trunk/samba/debian/smbfs.files
===================================================================
--- trunk/samba/debian/smbfs.files 2010-03-14 17:36:37 UTC (rev 3409)
+++ trunk/samba/debian/smbfs.files 2010-03-24 21:10:12 UTC (rev 3410)
@@ -1,7 +0,0 @@
-sbin/mount.smbfs
-sbin/mount.cifs
-sbin/umount.cifs
-usr/sbin/cifs.upcall
-usr/share/man/man8/mount.cifs.8
-usr/share/man/man8/umount.cifs.8
-usr/share/man/man8/cifs.upcall.8
Deleted: trunk/samba/debian/smbfs.links
===================================================================
--- trunk/samba/debian/smbfs.links 2010-03-14 17:36:37 UTC (rev 3409)
+++ trunk/samba/debian/smbfs.links 2010-03-24 21:10:12 UTC (rev 3410)
@@ -1,5 +0,0 @@
-sbin/mount.smbfs usr/bin/smbmount
-sbin/umount.cifs usr/bin/smbumount
-usr/share/man/man8/umount.cifs.8 usr/share/man/man8/smbumount.8
-usr/share/man/man8/mount.cifs.8 usr/share/man/man8/smbmount.8
-usr/share/man/man8/mount.cifs.8 usr/share/man/man8/mount.smbfs.8
More information about the Pkg-samba-maint
mailing list