Author: vorlon
Date: 2011-10-21 06:23:47 +0000 (Fri, 21 Oct 2011)
New Revision: 3938
Added:
trunk/samba/debian/libpam-winbind.install
trunk/samba/debian/libpam-winbind.lintian-overrides
trunk/samba/debian/libpam-winbind.postinst
trunk/samba/debian/libpam-winbind.prerm
Removed:
trunk/samba/debian/winbind.lintian-overrides
trunk/samba/debian/winbind.prerm
Modified:
trunk/samba/debian/changelog
trunk/samba/debian/control
trunk/samba/debian/winbind.install
trunk/samba/debian/winbind.postinst
Log:
Split winbind into separate packages, winbind and libpam-winbind,
with the latter marked Multi-Arch: same and the former marked
Multi-Arch: foreign, so that we can install multiple copies of the
pam module and nss modules on the same system.
Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog 2011-10-21 04:05:50 UTC (rev 3937)
+++ trunk/samba/debian/changelog 2011-10-21 06:23:47 UTC (rev 3938)
@@ -1,3 +1,12 @@
+samba (2:3.5.11~dfsg-3) UNRELEASED; urgency=low
+
+ * Split winbind into separate packages, winbind and libpam-winbind,
+ with the latter marked Multi-Arch: same and the former marked
+ Multi-Arch: foreign, so that we can install multiple copies of the
+ pam module and nss modules on the same system.
+
+ -- Steve Langasek <vorlon at debian.org> Thu, 20 Oct 2011 23:16:26 -0700
+
samba (2:3.5.11~dfsg-2) unstable; urgency=low
* Don't export DEB_HOST_ARCH_OS in debian/rules, this is only used locally.
Modified: trunk/samba/debian/control
===================================================================
--- trunk/samba/debian/control 2011-10-21 04:05:50 UTC (rev 3937)
+++ trunk/samba/debian/control 2011-10-21 06:23:47 UTC (rev 3938)
@@ -180,8 +180,9 @@
Section: net
Priority: optional
Architecture: any
-Pre-Depends: multiarch-support
-Depends: ${shlibs:Depends}, ${misc:Depends}, libwbclient0 (= ${binary:Version}), samba-common (= ${source:Version}), lsb-base (>= 3.0-6), adduser, libpam-runtime (>= 1.0.1-6), libpam0g (>= 1.1.3-2~)
+Multi-Arch: foreign
+Depends: ${shlibs:Depends}, ${misc:Depends}, libwbclient0 (= ${binary:Version}), samba-common (= ${source:Version}), lsb-base (>= 3.0-6), adduser
+Recommends: libpam-winbind
Replaces: samba (<= 2.2.3-2)
Description: Samba nameservice integration server
Samba is an implementation of the SMB/CIFS protocol for Unix systems,
@@ -196,6 +197,27 @@
/etc/nsswitch.conf, and authentication is integrated using the winbind
module for PAM.
+Package: libpam-winbind
+Section: net
+Priority: optional
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, winbind (= ${binary:Version}), libwbclient0 (= ${binary:Version}), samba-common (= ${source:Version}), libpam-runtime (>= 1.0.1-6), libpam0g (>= 1.1.3-2~)
+Breaks: winbind (<= 2:3.5.11~dfsg-3)
+Replaces: samba (<= 2.2.3-2), winbind (<= 2:3.5.11~dfsg-3)
+Description: Samba nameservice and authentication integration plugins
+ 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. Samba can also function
+ as an NT4-style domain controller, and can integrate with both NT4 domains
+ and Active Directory realms as a member server.
+ .
+ This package provides pam_winbind and nss_winbind, plugins that integrate
+ with a local winbindd server to provide Windows domain authentication and
+ user/group name lookups to the system; and nss_wins, which provides
+ hostname lookups via the WINS and NBNS protocols.
+
Package: samba-dbg
Section: debug
Priority: extra
Copied: trunk/samba/debian/libpam-winbind.install (from rev 3924, trunk/samba/debian/winbind.install)
===================================================================
--- trunk/samba/debian/libpam-winbind.install (rev 0)
+++ trunk/samba/debian/libpam-winbind.install 2011-10-21 06:23:47 UTC (rev 3938)
@@ -0,0 +1,5 @@
+usr/share/man/man8/pam_winbind.8
+lib/*/security/pam_winbind.so
+usr/share/pam-configs/winbind
+lib/*/libnss_winbind.so.2
+lib/*/libnss_wins.so.2
Copied: trunk/samba/debian/libpam-winbind.lintian-overrides (from rev 3924, trunk/samba/debian/winbind.lintian-overrides)
===================================================================
--- trunk/samba/debian/libpam-winbind.lintian-overrides (rev 0)
+++ trunk/samba/debian/libpam-winbind.lintian-overrides 2011-10-21 06:23:47 UTC (rev 3938)
@@ -0,0 +1,5 @@
+libpam-winbind: no-shlibs-control-file lib/*/libnss_winbind.so.2
+libpam-winbind: no-shlibs-control-file lib/*/libnss_wins.so.2
+libpam-winbind: postinst-must-call-ldconfig lib/*/libnss_wins.so.2
+libpam-winbind: postrm-should-call-ldconfig lib/*/libnss_wins.so.2
+libpam-winbind: package-name-doesnt-match-sonames libnss-winbind2 libnss-wins2
Added: trunk/samba/debian/libpam-winbind.postinst
===================================================================
--- trunk/samba/debian/libpam-winbind.postinst (rev 0)
+++ trunk/samba/debian/libpam-winbind.postinst 2011-10-21 06:23:47 UTC (rev 3938)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+pam-auth-update --package
+
+#DEBHELPER#
Copied: trunk/samba/debian/libpam-winbind.prerm (from rev 3924, trunk/samba/debian/winbind.prerm)
===================================================================
--- trunk/samba/debian/libpam-winbind.prerm (rev 0)
+++ trunk/samba/debian/libpam-winbind.prerm 2011-10-21 06:23:47 UTC (rev 3938)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = remove ]; then
+ pam-auth-update --package --remove winbind
+fi
+
+#DEBHELPER#
Modified: trunk/samba/debian/winbind.install
===================================================================
--- trunk/samba/debian/winbind.install 2011-10-21 04:05:50 UTC (rev 3937)
+++ trunk/samba/debian/winbind.install 2011-10-21 06:23:47 UTC (rev 3938)
@@ -9,7 +9,6 @@
usr/lib/samba/idmap/tdb2.so
usr/share/man/man1/wbinfo.1
usr/share/man/man1/ntlm_auth.1
-usr/share/man/man8/pam_winbind.8
usr/share/man/man8/winbindd.8
usr/share/man/man8/idmap_ad.8
usr/share/man/man8/idmap_ldap.8
@@ -19,7 +18,3 @@
usr/share/man/man8/idmap_tdb2.8
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: trunk/samba/debian/winbind.lintian-overrides
===================================================================
--- trunk/samba/debian/winbind.lintian-overrides 2011-10-21 04:05:50 UTC (rev 3937)
+++ trunk/samba/debian/winbind.lintian-overrides 2011-10-21 06:23:47 UTC (rev 3938)
@@ -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
Modified: trunk/samba/debian/winbind.postinst
===================================================================
--- trunk/samba/debian/winbind.postinst 2011-10-21 04:05:50 UTC (rev 3937)
+++ trunk/samba/debian/winbind.postinst 2011-10-21 06:23:47 UTC (rev 3938)
@@ -20,6 +20,4 @@
mv /etc/samba/idmap2.tdb /var/lib/samba/idmap2.tdb
fi
-pam-auth-update --package
-
#DEBHELPER#
Deleted: trunk/samba/debian/winbind.prerm
===================================================================
--- trunk/samba/debian/winbind.prerm 2011-10-21 04:05:50 UTC (rev 3937)
+++ trunk/samba/debian/winbind.prerm 2011-10-21 06:23:47 UTC (rev 3938)
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = remove ]; then
- pam-auth-update --package --remove winbind
-fi
-
-#DEBHELPER#