[Pkg-samba-maint] r3454 - in branches/samba/experimental/debian: . po
bubulle at alioth.debian.org
bubulle at alioth.debian.org
Tue May 4 12:53:13 UTC 2010
tags 575958 pending
tags 573323 pending
tags 546874 pending
tags 576415 pending
tags 462169 pending
tags 566890 pending
tags 282751 pending
tags 572603 pending
tags 572126 pending
tags 566946 pending
tags 567554 pending
tags 538819 pending
tags 558453 pending
tags 550481 pending
thanks
Author: bubulle
Date: 2010-05-04 12:53:06 +0000 (Tue, 04 May 2010)
New Revision: 3454
Added:
branches/samba/experimental/debian/samba-common.lintian-overrides
branches/samba/experimental/debian/samba.if-up
branches/samba/experimental/debian/samba.lintian-overrides
branches/samba/experimental/debian/winbind.lintian-overrides
branches/samba/experimental/debian/winbind.pam-config
branches/samba/experimental/debian/winbind.prerm
Removed:
branches/samba/experimental/debian/mount.smbfs
branches/samba/experimental/debian/samba-common.lintian
branches/samba/experimental/debian/samba.lintian
branches/samba/experimental/debian/smbfs.TODO
branches/samba/experimental/debian/smbfs.dirs
branches/samba/experimental/debian/smbfs.files
branches/samba/experimental/debian/smbfs.links
branches/samba/experimental/debian/smbfs.lintian
branches/samba/experimental/debian/winbind.lintian
Modified:
branches/samba/experimental/debian/README.debian
branches/samba/experimental/debian/changelog
branches/samba/experimental/debian/control
branches/samba/experimental/debian/po/pt.po
branches/samba/experimental/debian/rules
branches/samba/experimental/debian/samba-common.config
branches/samba/experimental/debian/samba-common.dhcp
branches/samba/experimental/debian/samba-common.dirs
branches/samba/experimental/debian/samba.config
branches/samba/experimental/debian/samba.files
branches/samba/experimental/debian/samba.postinst
branches/samba/experimental/debian/winbind.files
branches/samba/experimental/debian/winbind.postinst
Log:
Resync changes with changes in trunk between 3:3.4.4~dfsg-1 and 2:3.4.7~dfsg-2
Modified: branches/samba/experimental/debian/README.debian
===================================================================
--- branches/samba/experimental/debian/README.debian 2010-05-04 12:16:37 UTC (rev 3453)
+++ branches/samba/experimental/debian/README.debian 2010-05-04 12:53:06 UTC (rev 3454)
@@ -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: branches/samba/experimental/debian/changelog
===================================================================
--- branches/samba/experimental/debian/changelog 2010-05-04 12:16:37 UTC (rev 3453)
+++ branches/samba/experimental/debian/changelog 2010-05-04 12:53:06 UTC (rev 3454)
@@ -1,3 +1,85 @@
+samba (2:3.5.2~dfsg-2) UNRELEASED-experimental; urgency=low
+
+ * Resync changes with changes in trunk between 3:3.4.4~dfsg-1 and
+ 2:3.4.7~dfsg-2
+
+ -- Christian Perrier <bubulle at debian.org> Tue, 04 May 2010 14:39:49 +0200
+
+samba (2:3.4.7~dfsg-2) unstable; urgency=low
+
+ [ Christian Perrier ]
+ * Drop smbfs package (now provided by cifs-utils as a dummy transition
+ package)
+
+ [ Debconf translations ]
+ * Portuguese (Miguel Figueiredo). Closes: #575958
+
+ [ Steve Langasek ]
+ * winbind.prerm: don't forget to remove the PAM profile on package
+ removal :/
+ * Fix winbind.pam-config to not interfere with password changes for
+ non-winbind accounts. Closes: #573323, LP: #546874.
+ * debian/samba.if-up, debian/rules: add an if-up.d script for samba to
+ try to start nmbd, if it's not running because /etc/init.d/samba ran
+ before the network was up at boot time. Closes: #576415, LP: #462169.
+ * debian/samba.if-up: allow "NetworkManager" as a recognized address
+ family... it's obviously /not/ an address family, but it's what gets
+ sent when using NM, so we'll cope for now.
+
+ -- Christian Perrier <bubulle at debian.org> Sat, 17 Apr 2010 07:49:49 +0200
+
+samba (2:3.4.7~dfsg-1) unstable; urgency=low
+
+ [ Steve Langasek ]
+ * Add a PAM profile for pam_winbind. Closes: #566890, LP: #282751.
+ * Add the correct versioned build dependency on libtalloc-dev as
+ we need 2.0.1 to build samba. Closes: #572603
+ * Add avr32 to arches with a build dependency on ctdb. Closes: #572126
+
+ [ Christian Perrier ]
+ * New upstream release. Security fix: all smbd processes inherited
+ CAP_DAC_OVERRIDE capabilities, allowing all file system access to be
+ allowed even when permissions should have denied access.
+
+ -- Christian Perrier <bubulle at debian.org> Tue, 09 Mar 2010 10:52:24 +0100
+
+samba (2:3.4.6~dfsg-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Christian Perrier <bubulle at debian.org> Fri, 26 Feb 2010 22:39:50 +0100
+
+samba (2:3.4.5~dfsg-2) unstable; urgency=low
+
+ [ Steve langasek ]
+ * Revert the "bashisms" fix from version 2:3.3.0~rc2-4; "local foo=bar"
+ is explicitly allowed by Policy now, and this change introduced a
+ syntax error. Closes: #566946.
+
+ [ Christian Perrier ]
+ * No longer maker (u)mount.cifs setuid root. Add a notice
+ about this in the package's NEWS.Debian file
+ Closes: #567554
+ * Use dh_lintian instead of manual install of lintian overrides
+ * Updated Standards to 3.8.4 (checked, no change)
+
+ -- Christian Perrier <bubulle at debian.org> Sat, 13 Feb 2010 14:36:33 +0100
+
+samba (2:3.4.5~dfsg-1) unstable; urgency=low
+
+ * New upstream release. Bugs fixed by this release:
+ - Memory leak in smbd. Closes: #538819, #558453
+ * Declare a versioned dependency of winbind and samba on libwbclient0
+ Closes: #550481
+ * A few lintian fixes:
+ * Drop /var/run/samba from samba-common. The directory is created
+ by init scripts when needed.
+ * No longer prepend a path to the mksmbpasswd call in samba.postinst.
+ This prevents the local administrator to use a replacement version
+ for some local reason.
+
+ -- Christian Perrier <bubulle at debian.org> Sat, 23 Jan 2010 12:16:42 +0100
+
samba (2:3.5.2~dfsg-1) experimental; urgency=low
* New upstream release
Modified: branches/samba/experimental/debian/control
===================================================================
--- branches/samba/experimental/debian/control 2010-05-04 12:16:37 UTC (rev 3453)
+++ branches/samba/experimental/debian/control 2010-05-04 12:53:06 UTC (rev 3454)
@@ -3,24 +3,25 @@
Priority: optional
Maintainer: Debian Samba Maintainers <pkg-samba-maint at lists.alioth.debian.org>
Uploaders: Steve Langasek <vorlon at debian.org>, Christian Perrier <bubulle at debian.org>, Noèl Köthe <noel at debian.org>, Jelmer Vernooij <jelmer at debian.org>
-Build-Depends: debhelper (>= 6.0.0), libpam0g-dev, libreadline-dev,
+Build-Depends: debhelper (>= 6.0.7~), libpam0g-dev, libreadline-dev,
libcups2-dev | libcupsys2-dev,
libacl1-dev [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
libkrb5-dev, libldap2-dev, po-debconf, libpopt-dev, uuid-dev,
- libtalloc-dev (>= 2.0.1),
+ libtalloc-dev (>= 2.0.1-1~bpo50+1),
libcap2-dev [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
libkeyutils-dev [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
- ctdb (>= 1.0.103) [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
+ ctdb (>= 1.0.103) [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
+ ctdb (>= 1.0.73) [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
pkg-config
Build-Conflicts: libfam-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Homepage: http://www.samba.org
Vcs-Browser: http://svn.debian.org/wsvn/pkg-samba/trunk/samba/
Vcs-Svn: svn://svn.debian.org/svn/pkg-samba/trunk/samba
Package: samba
Architecture: any
-Depends: samba-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 1.0.1-11), libpam-modules, lsb-base (>= 3.2-13), procps, update-inetd, adduser
+Depends: samba-common (= ${source:Version}), libwbclient0 (= ${binary:Version}),${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 1.0.1-11), libpam-modules, lsb-base (>= 3.2-13), procps, update-inetd, adduser
Recommends: logrotate
Suggests: openbsd-inetd | inet-superserver, smbldap-tools, ldb-tools, ctdb
Replaces: samba-common (<= 2.0.5a-2)
@@ -37,7 +38,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 +82,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 +91,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 +136,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
@@ -190,7 +176,7 @@
Section: net
Priority: optional
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, samba-common (= ${source:Version}), lsb-base (>= 3.0-6), adduser
+Depends: ${shlibs:Depends}, ${misc:Depends}, libwbclient0 (= ${binary:Version}), samba-common (= ${source:Version}), lsb-base (>= 3.0-6), adduser
Replaces: samba (<= 2.2.3-2)
Description: Samba nameservice integration server
Samba is an implementation of the SMB/CIFS protocol for Unix systems,
Deleted: branches/samba/experimental/debian/mount.smbfs
===================================================================
--- branches/samba/experimental/debian/mount.smbfs 2010-05-04 12:16:37 UTC (rev 3453)
+++ branches/samba/experimental/debian/mount.smbfs 2010-05-04 12:53:06 UTC (rev 3454)
@@ -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: branches/samba/experimental/debian/po/pt.po
===================================================================
--- branches/samba/experimental/debian/po/pt.po 2010-05-04 12:16:37 UTC (rev 3453)
+++ branches/samba/experimental/debian/po/pt.po 2010-05-04 12:53:06 UTC (rev 3454)
@@ -1,13 +1,13 @@
# translation of pt.po to Portuguese
# translation of samba Debian debconf template to Portuguese
-# Miguel Figueiredo <elmig at debianpt.org>, 2004, 2007
+# Miguel Figueiredo <elmig at debianpt.org>, 2004, 2007, 2010
#
msgid ""
msgstr ""
-"Project-Id-Version: samba 3.0.9-1\n"
+"Project-Id-Version: samba\n"
"Report-Msgid-Bugs-To: samba at packages.debian.org\n"
"POT-Creation-Date: 2009-01-02 12:18-0800\n"
-"PO-Revision-Date: 2006-08-14 07:42-0000\n"
+"PO-Revision-Date: 2010-03-30 21:36+0100\n"
"Last-Translator: Miguel Figueiredo <elmig at debian.org>\n"
"Language-Team: Portuguese <traduz at debianpt.org>\n"
"MIME-Version: 1.0\n"
@@ -67,9 +67,9 @@
"O resto da configuração do Samba trata de questões que afectam parâmetros "
"em /etc/samba/smb.conf, que é o ficheiro utilizado para configurar os "
"programas do Samba (nmbd e smbd). O seu actual smb.conf contém uma linha "
-"'include' ou uma opção que se espalha por várias linhas, a qual pode "
+"\"include\" ou uma opção que se espalha por várias linhas, a qual pode "
"confundir o processo de configuração automática e necessitar que você edite "
-"à mão o smb.conf par o ter novamente operacional."
+"à mão o smb.conf para o ter novamente operacional."
#. Type: boolean
#. Description
@@ -92,67 +92,57 @@
#. Type: string
#. Description
#: ../samba-common.templates:3001
-#, fuzzy
-#| msgid ""
-#| "Please specify the workgroup you want this server to appear to be in when "
-#| "queried by clients. Note that this parameter also controls the domain "
-#| "name used with the security=domain setting."
msgid ""
"Please specify the workgroup for this system. This setting controls which "
"workgroup the system will appear in when used as a server, the default "
"workgroup to be used when browsing with various frontends, and the domain "
"name used with the \"security=domain\" setting."
msgstr ""
-"Por favor especifique o grupo de trabalho em que quer que este servidor "
-"apareça quando questionado pelos clientes. Note que este parâmetro também "
-"controla o nome de Domínio utilizado com a configuração security=domain."
+"Por favor especifique o grupo de trabalho para este sistema. Esta "
+"configuração controla qual o grupo de trabalho que irá aparecer quando for "
+"utilizado como servidor, o grupo de trabalho predefinido a ser utilizado ao "
+"navegar com vários frontends, e o nome de domínio utilizado com a "
+"configuração \"security=domain\"."
#. Type: boolean
#. Description
#: ../samba-common.templates:4001
msgid "Use password encryption?"
-msgstr "Utilizar encriptação de passwords?"
+msgstr "Utilizar encriptação de palavras-passe?"
#. Type: boolean
#. Description
#: ../samba-common.templates:4001
-#, fuzzy
-#| msgid ""
-#| "All recent Windows clients communicate with SMB servers using encrypted "
-#| "passwords. If you want to use clear text passwords you will need to "
-#| "change a parameter in your Windows registry."
msgid ""
"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
"passwords. If you want to use clear text passwords you will need to change a "
"parameter in your Windows registry."
msgstr ""
-"Todos os clientes Windows recentes comunicam com servidores SMB utilizando "
-"passwords encriptadas. Se deseja utilizar passwords de texto puro você vai "
-"ter de alterar um parâmetro no registo do seu Windows."
+"Todos os clientes Windows recentes comunicam com servidores SMB/CIFS "
+"utilizando palavras-passe encriptadas. Se deseja utilizar palavras-passe de "
+"texto visível irá ter de alterar um parâmetro no registo do seu Windows."
#. Type: boolean
#. Description
#: ../samba-common.templates:4001
-#, fuzzy
-#| msgid ""
-#| "Enabling this option is highly recommended. If you do, make sure you have "
-#| "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#| "each user using the smbpasswd command."
msgid ""
"Enabling this option is highly recommended as support for plain text "
"passwords is no longer maintained in Microsoft Windows products. If you do, "
"make sure you have a valid /etc/samba/smbpasswd file and that you set "
"passwords in there for each user using the smbpasswd command."
msgstr ""
-"É altamente recomendado que escolha esta opção. Se o fizer, assegure-se que "
-"tem um ficheiro /etc/samba/smbpasswd válido e que define as passwords para "
-"cada utilizador utilizando o comando smbpasswd."
+"É altamente recomendado que escolha esta opção porque o suporte para "
+"palavras-passe com texto visível já não é mantido nos produtos Microsoft "
+"Windows. Se o fizer, assegure-se que tem um ficheiro /etc/samba/smbpasswd "
+"válido e que define as palavras-passe para cada utilizador utilizando o "
+"comando smbpasswd."
#. Type: boolean
#. Description
#: ../samba.templates:1001
msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
-msgstr "Criar base de dados de passwords samba, /var/lib/samba/passdb.tdb?"
+msgstr ""
+"Criar base de dados de palavras-passe samba, /var/lib/samba/passdb.tdb?"
#. Type: boolean
#. Description
@@ -164,12 +154,12 @@
"automatically, but the passwords must be added manually by running smbpasswd "
"and be kept up-to-date in the future."
msgstr ""
-"Para ser compatível com as omissões na maioria das versões do Windows, o "
-"Samba tem de ser configurado para utilizar passwords encriptadas. Isto faz "
-"com que as passwords dos utilizadores sejam guardadas noutro ficheiro "
-"separado do /etc/passwd. Este ficheiro pode ser criado automaticamente, mas "
-"as passwords têm de ser manualmente adicionadas correndo o smbpasswd e "
-"mantidas actualizadas no futuro."
+"Para ser compatível com as predefinições na maioria das versões do Windows, "
+"o Samba tem de ser configurado para utilizar palavras-passe encriptadas. "
+"Isto faz com que as passwords dos utilizadores sejam guardadas noutro "
+"ficheiro separado do /etc/passwd. Este ficheiro pode ser criado "
+"automaticamente, mas as palavras-passe têm de ser manualmente adicionadas "
+"correndo o smbpasswd e mantidas actualizadas no futuro."
#. Type: boolean
#. Description
@@ -178,8 +168,8 @@
"If you do not create it, you will have to reconfigure Samba (and probably "
"your client machines) to use plaintext passwords."
msgstr ""
-"Se não o criar, terá de reconfigurar o samba (e provavelmente as suas "
-"máquinas clientes) para utilizar passwords de texto puro."
+"Se não o criar, terá de reconfigurar o Samba (e provavelmente as suas "
+"máquinas clientes) para utilizar palavras-passe de texto visível."
#. Type: boolean
#. Description
Modified: branches/samba/experimental/debian/rules
===================================================================
--- branches/samba/experimental/debian/rules 2010-05-04 12:16:37 UTC (rev 3453)
+++ branches/samba/experimental/debian/rules 2010-05-04 12:53:06 UTC (rev 3454)
@@ -65,16 +65,13 @@
ifeq ($(DEB_HOST_ARCH_OS),linux)
conf_args += \
- --with-ctdb=/usr --with-cluster-support=yes \
- --with-cifsumount \
+ --with-ctdb --with-cluster-support=yes \
--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))
@@ -112,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
@@ -120,10 +117,6 @@
dh_clean
-ifeq ($(smbfs),no)
- DH_EXTRAS=-Nsmbfs
-endif
-
install: DH_OPTIONS=$(DH_EXTRAS)
install: build
dh_testdir
@@ -173,11 +166,8 @@
install -m 0755 source3/bin/smbconftort $(DESTDIR)/usr/bin/smbconftort
mkdir -p $(DESTDIR)/usr/share/pam-configs
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):
@@ -189,6 +179,8 @@
# correct place by dh_movefiles.
cp debian/gdbcommands $(DESTDIR)/etc/samba/
install -m755 debian/samba-common.dhcp $(DESTDIR)/etc/dhcp3/dhclient-enter-hooks.d/samba
+ mkdir -p $(DESTDIR)/etc/network/if-up.d
+ install -o root -g root debian/samba.if-up $(DESTDIR)/etc/network/if-up.d/samba
dh_movefiles
dh_installpam --name=samba
@@ -228,9 +220,7 @@
DH_OPTIONS= dh_installinit -psamba -- "defaults 20 19"
DH_OPTIONS= dh_installinit -pwinbind
dh_installcron
- for pkg in samba samba-common smbfs winbind; do \
- install -m 0644 -D debian/$$pkg.lintian debian/$$pkg/usr/share/lintian/overrides/$$pkg || exit; \
- done
+ dh_lintian
dh_installchangelogs -Nlibpam-smbpass
DH_OPTIONS= dh_installchangelogs -plibpam-smbpass source3/pam_smbpass/CHANGELOG
DH_OPTIONS= dh_strip -psamba -psmbclient -pwinbind -psamba-common-bin --dbg-package=samba-dbg
@@ -243,11 +233,6 @@
# it becomes executable
chmod a-x debian/libsmbclient-dev/usr/include/libsmbclient.h
-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-common/var/log/samba/
chown root:adm debian/samba-common/var/log/samba/
Modified: branches/samba/experimental/debian/samba-common.config
===================================================================
--- branches/samba/experimental/debian/samba-common.config 2010-05-04 12:16:37 UTC (rev 3453)
+++ branches/samba/experimental/debian/samba-common.config 2010-05-04 12:53:06 UTC (rev 3454)
@@ -10,8 +10,7 @@
fi
if [ -n "$2" ]; then
- local FILE
- FILE="$2"
+ local FILE="$2"
fi
if [ -z "$FILE" ]; then
Modified: branches/samba/experimental/debian/samba-common.dhcp
===================================================================
--- branches/samba/experimental/debian/samba-common.dhcp 2010-05-04 12:16:37 UTC (rev 3453)
+++ branches/samba/experimental/debian/samba-common.dhcp 2010-05-04 12:53:06 UTC (rev 3454)
@@ -15,10 +15,8 @@
umask 022
- local other_servers
- other_servers==""
- local serverlist
- serverlist==""
+ local other_servers=""
+ local serverlist=""
# the destination file won't exist yet on the first run after
# installing samba
Modified: branches/samba/experimental/debian/samba-common.dirs
===================================================================
--- branches/samba/experimental/debian/samba-common.dirs 2010-05-04 12:16:37 UTC (rev 3453)
+++ branches/samba/experimental/debian/samba-common.dirs 2010-05-04 12:53:06 UTC (rev 3454)
@@ -3,4 +3,3 @@
var/cache/samba
var/lib/samba
var/log/samba
-var/run/samba
Deleted: branches/samba/experimental/debian/samba-common.lintian
===================================================================
--- branches/samba/experimental/debian/samba-common.lintian 2010-05-04 12:16:37 UTC (rev 3453)
+++ branches/samba/experimental/debian/samba-common.lintian 2010-05-04 12:53:06 UTC (rev 3454)
@@ -1,2 +0,0 @@
-# This is on purpose to hide sensitive information
-samba-common: non-standard-dir-perm var/log/samba/ 0750 != 0755
Copied: branches/samba/experimental/debian/samba-common.lintian-overrides (from rev 3453, tags/samba/2:3.4.7~dfsg-2/debian/samba-common.lintian-overrides)
===================================================================
--- branches/samba/experimental/debian/samba-common.lintian-overrides (rev 0)
+++ branches/samba/experimental/debian/samba-common.lintian-overrides 2010-05-04 12:53:06 UTC (rev 3454)
@@ -0,0 +1,2 @@
+# This is on purpose to hide sensitive information
+samba-common: non-standard-dir-perm var/log/samba/ 0750 != 0755
Modified: branches/samba/experimental/debian/samba.config
===================================================================
--- branches/samba/experimental/debian/samba.config 2010-05-04 12:16:37 UTC (rev 3453)
+++ branches/samba/experimental/debian/samba.config 2010-05-04 12:53:06 UTC (rev 3454)
@@ -14,8 +14,7 @@
fi
if [ -n "$2" ]; then
- local FILE
- FILE="$2"
+ local FILE="$2"
fi
if [ -z "$FILE" ]; then
Modified: branches/samba/experimental/debian/samba.files
===================================================================
--- branches/samba/experimental/debian/samba.files 2010-05-04 12:16:37 UTC (rev 3453)
+++ branches/samba/experimental/debian/samba.files 2010-05-04 12:53:06 UTC (rev 3454)
@@ -17,3 +17,4 @@
usr/share/man/man8/mksmbpasswd.8
usr/share/man/man8/tdbbackup.8
usr/share/man/man8/eventlogadm.8
+etc/network/if-up.d/samba
Copied: branches/samba/experimental/debian/samba.if-up (from rev 3453, tags/samba/2:3.4.7~dfsg-2/debian/samba.if-up)
===================================================================
--- branches/samba/experimental/debian/samba.if-up (rev 0)
+++ branches/samba/experimental/debian/samba.if-up 2010-05-04 12:53:06 UTC (rev 3454)
@@ -0,0 +1,33 @@
+#!/bin/sh
+# Try to bring nmbd up when an interface comes up, if smbd is already running.
+
+# Don't bother to do anything for lo.
+if [ "$IFACE" = lo ]; then
+ exit 0
+fi
+
+# Only run from ifup.
+if [ "$MODE" != start ]; then
+ exit 0
+fi
+
+# Samba only cares about inet and inet6. Get thee gone, strange people
+# still using ipx.
+case $ADDRFAM in
+ inet|inet6|NetworkManager)
+ ;;
+ *)
+ exit 0
+ ;;
+esac
+
+status=$(/etc/init.d/samba status)
+
+# Really only necessary to do anything if nmbd is not already running
+if echo "$status" | grep -q 'smbd is running' \
+ && ! echo "$status" | grep -q 'nmbd is running'
+then
+ /etc/init.d/samba start
+fi
+
+exit 0
Deleted: branches/samba/experimental/debian/samba.lintian
===================================================================
--- branches/samba/experimental/debian/samba.lintian 2010-05-04 12:16:37 UTC (rev 3453)
+++ branches/samba/experimental/debian/samba.lintian 2010-05-04 12:53:06 UTC (rev 3454)
@@ -1 +0,0 @@
-samba: non-standard-dir-perm var/spool/samba/ 1777 != 0755
Copied: branches/samba/experimental/debian/samba.lintian-overrides (from rev 3453, tags/samba/2:3.4.7~dfsg-2/debian/samba.lintian-overrides)
===================================================================
--- branches/samba/experimental/debian/samba.lintian-overrides (rev 0)
+++ branches/samba/experimental/debian/samba.lintian-overrides 2010-05-04 12:53:06 UTC (rev 3454)
@@ -0,0 +1 @@
+samba: non-standard-dir-perm var/spool/samba/ 1777 != 0755
Modified: branches/samba/experimental/debian/samba.postinst
===================================================================
--- branches/samba/experimental/debian/samba.postinst 2010-05-04 12:16:37 UTC (rev 3453)
+++ branches/samba/experimental/debian/samba.postinst 2010-05-04 12:53:06 UTC (rev 3454)
@@ -75,7 +75,7 @@
# FIXME: we don't want to pass these through the smbpasswd backend,
# some of the faking can cause us problems!
if [ "${GENERATE_SMBPASSWD}" = "true" -a ! -e /var/lib/samba/passdb.tdb -a ! -e /etc/samba/smbpasswd ]; then
- getent passwd | /usr/sbin/mksmbpasswd > /etc/samba/smbpasswd
+ getent passwd | mksmbpasswd > /etc/samba/smbpasswd
pdbedit -i smbpasswd -e tdbsam
rm /etc/samba/smbpasswd
fi
Deleted: branches/samba/experimental/debian/smbfs.TODO
===================================================================
--- branches/samba/experimental/debian/smbfs.TODO 2010-05-04 12:16:37 UTC (rev 3453)
+++ branches/samba/experimental/debian/smbfs.TODO 2010-05-04 12:53:06 UTC (rev 3454)
@@ -1,7 +0,0 @@
-- There is concern about the setuid status of binaries in this package.
- The audit status of the concerned binaries is unclear. We should
- figure out whether it is reasonable to provide the flexible user mount
- capabilities or whether a more restricted setup is better, at least by
- default.
-
-Last change: 2006-01-25
Deleted: branches/samba/experimental/debian/smbfs.dirs
===================================================================
--- branches/samba/experimental/debian/smbfs.dirs 2010-05-04 12:16:37 UTC (rev 3453)
+++ branches/samba/experimental/debian/smbfs.dirs 2010-05-04 12:53:06 UTC (rev 3454)
@@ -1 +0,0 @@
-sbin
Deleted: branches/samba/experimental/debian/smbfs.files
===================================================================
--- branches/samba/experimental/debian/smbfs.files 2010-05-04 12:16:37 UTC (rev 3453)
+++ branches/samba/experimental/debian/smbfs.files 2010-05-04 12:53:06 UTC (rev 3454)
@@ -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: branches/samba/experimental/debian/smbfs.links
===================================================================
--- branches/samba/experimental/debian/smbfs.links 2010-05-04 12:16:37 UTC (rev 3453)
+++ branches/samba/experimental/debian/smbfs.links 2010-05-04 12:53:06 UTC (rev 3454)
@@ -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
Deleted: branches/samba/experimental/debian/smbfs.lintian
===================================================================
--- branches/samba/experimental/debian/smbfs.lintian 2010-05-04 12:16:37 UTC (rev 3453)
+++ branches/samba/experimental/debian/smbfs.lintian 2010-05-04 12:53:06 UTC (rev 3454)
@@ -1,2 +0,0 @@
-smbfs: setuid-binary sbin/mount.cifs 4755 root/root
-smbfs: setuid-binary sbin/umount.cifs 4755 root/root
Modified: branches/samba/experimental/debian/winbind.files
===================================================================
--- branches/samba/experimental/debian/winbind.files 2010-05-04 12:16:37 UTC (rev 3453)
+++ branches/samba/experimental/debian/winbind.files 2010-05-04 12:53:06 UTC (rev 3454)
@@ -20,5 +20,6 @@
usr/share/man/man8/idmap_adex.8
usr/share/man/man8/idmap_hash.8
lib/security/pam_winbind.so
+usr/share/pam-configs/winbind
lib/libnss_winbind.so.2
lib/libnss_wins.so.2
Deleted: branches/samba/experimental/debian/winbind.lintian
===================================================================
--- branches/samba/experimental/debian/winbind.lintian 2010-05-04 12:16:37 UTC (rev 3453)
+++ branches/samba/experimental/debian/winbind.lintian 2010-05-04 12:53:06 UTC (rev 3454)
@@ -1,5 +0,0 @@
-winbind: no-shlibs-control-file lib/libnss_winbind.so.2
-winbind: no-shlibs-control-file lib/libnss_wins.so.2
-winbind: postinst-must-call-ldconfig lib/libnss_wins.so.2
-winbind: postrm-should-call-ldconfig lib/libnss_wins.so.2
-winbind: package-name-doesnt-match-sonames libnss-winbind2 libnss-wins2
Copied: branches/samba/experimental/debian/winbind.lintian-overrides (from rev 3453, tags/samba/2:3.4.7~dfsg-2/debian/winbind.lintian-overrides)
===================================================================
--- branches/samba/experimental/debian/winbind.lintian-overrides (rev 0)
+++ branches/samba/experimental/debian/winbind.lintian-overrides 2010-05-04 12:53:06 UTC (rev 3454)
@@ -0,0 +1,5 @@
+winbind: no-shlibs-control-file lib/libnss_winbind.so.2
+winbind: no-shlibs-control-file lib/libnss_wins.so.2
+winbind: postinst-must-call-ldconfig lib/libnss_wins.so.2
+winbind: postrm-should-call-ldconfig lib/libnss_wins.so.2
+winbind: package-name-doesnt-match-sonames libnss-winbind2 libnss-wins2
Copied: branches/samba/experimental/debian/winbind.pam-config (from rev 3453, tags/samba/2:3.4.7~dfsg-2/debian/winbind.pam-config)
===================================================================
--- branches/samba/experimental/debian/winbind.pam-config (rev 0)
+++ branches/samba/experimental/debian/winbind.pam-config 2010-05-04 12:53:06 UTC (rev 3454)
@@ -0,0 +1,19 @@
+Name: Winbind NT/Active Directory authentication
+Default: yes
+Priority: 192
+Auth-Type: Primary
+Auth:
+ [success=end default=ignore] pam_winbind.so krb5_auth krb5_ccache_type=FILE cached_login try_first_pass
+Auth-Initial:
+ [success=end default=ignore] pam_winbind.so krb5_auth krb5_ccache_type=FILE cached_login
+Account-Type: Primary
+Account:
+ [success=end new_authtok_reqd=done default=ignore] pam_winbind.so
+Password-Type: Primary
+Password:
+ [success=end default=ignore] pam_winbind.so use_authtok try_first_pass
+Password-Initial:
+ [success=end default=ignore] pam_winbind.so
+Session-Type: Additional
+Session:
+ optional pam_winbind.so
Modified: branches/samba/experimental/debian/winbind.postinst
===================================================================
--- branches/samba/experimental/debian/winbind.postinst 2010-05-04 12:16:37 UTC (rev 3453)
+++ branches/samba/experimental/debian/winbind.postinst 2010-05-04 12:53:06 UTC (rev 3454)
@@ -13,4 +13,6 @@
mv /var/run/samba/idmap_cache.tdb /var/cache/samba/idmap_cache.tdb
fi
+pam-auth-update --package
+
#DEBHELPER#
Copied: branches/samba/experimental/debian/winbind.prerm (from rev 3453, tags/samba/2:3.4.7~dfsg-2/debian/winbind.prerm)
===================================================================
--- branches/samba/experimental/debian/winbind.prerm (rev 0)
+++ branches/samba/experimental/debian/winbind.prerm 2010-05-04 12:53:06 UTC (rev 3454)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = remove ]; then
+ pam-auth-update --package --remove winbind
+fi
+
+#DEBHELPER#
More information about the Pkg-samba-maint
mailing list