[Pkg-samba-maint] r2621 - trunk/samba/debian

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2009-03-01 03:31:17 +0000 (Sun, 01 Mar 2009)
New Revision: 2621

Added:
   trunk/samba/debian/libpam-smbpass.pam-config
   trunk/samba/debian/libpam-smbpass.postinst
   trunk/samba/debian/libpam-smbpass.prerm
Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/control
   trunk/samba/debian/libpam-smbpass.files
   trunk/samba/debian/rules
Log:
* debian/libpam-smbpass.pam-config, debian/libpam-smbpass.postinst,
  debian/libpam-smbpass.files, debian/rules: provide a config block
  for the new PAM framework, allowing this PAM module to
  auto-configure itself
* debian/control: make libpam-smbpass depend on
  libpam-runtime (>= 1.0.1-2ubuntu1) for the above

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2009-03-01 03:19:04 UTC (rev 2620)
+++ trunk/samba/debian/changelog	2009-03-01 03:31:17 UTC (rev 2621)
@@ -15,6 +15,12 @@
   * When populating the sambashare group, it's not an error if the user
     simply doesn't exist; test for this case and let the install continue
     instead of aborting.  LP: #206036.
+  * debian/libpam-smbpass.pam-config, debian/libpam-smbpass.postinst,
+    debian/libpam-smbpass.files, debian/rules: provide a config block
+    for the new PAM framework, allowing this PAM module to
+    auto-configure itself
+  * debian/control: make libpam-smbpass depend on
+    libpam-runtime (>= 1.0.1-2ubuntu1) for the above
 
  -- Christian Perrier <bubulle at debian.org>  Wed, 25 Feb 2009 17:34:26 +0100
 

Modified: trunk/samba/debian/control
===================================================================
--- trunk/samba/debian/control	2009-03-01 03:19:04 UTC (rev 2620)
+++ trunk/samba/debian/control	2009-03-01 03:31:17 UTC (rev 2621)
@@ -132,7 +132,8 @@
 Section: admin
 Priority: extra
 Architecture: any
-Depends: ${shlibs:Depends}, samba-common (= ${binary:Version}), ${misc:Depends}
+Depends: ${shlibs:Depends}, samba-common (= ${binary:Version}), ${misc:Depends},
+	 libpam-runtime (>= 1.0.1-2ubuntu1)
 Suggests: samba
 Description: pluggable authentication module for Samba
  This is a module for PAM that enables a system administrator to migrate

Modified: trunk/samba/debian/libpam-smbpass.files
===================================================================
--- trunk/samba/debian/libpam-smbpass.files	2009-03-01 03:19:04 UTC (rev 2620)
+++ trunk/samba/debian/libpam-smbpass.files	2009-03-01 03:31:17 UTC (rev 2621)
@@ -1 +1,2 @@
 lib/security/pam_smbpass.so
+usr/share/pam-configs/smbpasswd-migrate

Added: trunk/samba/debian/libpam-smbpass.pam-config
===================================================================
--- trunk/samba/debian/libpam-smbpass.pam-config	                        (rev 0)
+++ trunk/samba/debian/libpam-smbpass.pam-config	2009-03-01 03:31:17 UTC (rev 2621)
@@ -0,0 +1,14 @@
+Name: SMB password synchronization
+Default: yes
+Priority: 0
+Conflicts: smbpasswd-auth
+Auth-Type: Additional
+Auth-Initial:
+	optional			pam_smbpass.so migrate
+Auth-Final:
+	optional			pam_smbpass.so migrate
+Password-Type: Additional
+Password-Initial:
+	optional			pam_smbpass.so nullok use_authtok use_first_pass
+Password-Final:
+	optional			pam_smbpass.so nullok use_authtok use_first_pass

Added: trunk/samba/debian/libpam-smbpass.postinst
===================================================================
--- trunk/samba/debian/libpam-smbpass.postinst	                        (rev 0)
+++ trunk/samba/debian/libpam-smbpass.postinst	2009-03-01 03:31:17 UTC (rev 2621)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+pam-auth-update --package
+
+#DEBHELPER#

Added: trunk/samba/debian/libpam-smbpass.prerm
===================================================================
--- trunk/samba/debian/libpam-smbpass.prerm	                        (rev 0)
+++ trunk/samba/debian/libpam-smbpass.prerm	2009-03-01 03:31:17 UTC (rev 2621)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "remove" ]; then
+	pam-auth-update --package --remove smbpasswd-migrate
+fi

Modified: trunk/samba/debian/rules
===================================================================
--- trunk/samba/debian/rules	2009-03-01 03:19:04 UTC (rev 2620)
+++ trunk/samba/debian/rules	2009-03-01 03:31:17 UTC (rev 2621)
@@ -178,6 +178,8 @@
 	install -m 0755 source/bin/replacetort $(DESTDIR)/usr/bin/replacetort
 	install -m 0755 source/bin/tdbtorture $(DESTDIR)/usr/bin/tdbtorture
 	install -m 0755 source/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
 
 ifeq ($(mount_cifs),yes)
 	install -m 0755 debian/mount.smbfs $(DESTDIR)/sbin/mount.smbfs