Remove libpam-smbpasswd, which is broken and slated for removal upstream. Closes...
authorJelmer Vernooij <jelmer@samba.org>
Thu, 1 Oct 2015 21:38:55 +0000 (21:38 +0000)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 1 Oct 2015 21:38:55 +0000 (21:38 +0000)
13 files changed:
debian/README.debian
debian/changelog
debian/control
debian/libpam-smbpass.docs [deleted file]
debian/libpam-smbpass.examples [deleted file]
debian/libpam-smbpass.install [deleted file]
debian/libpam-smbpass.logcheck.ignore.server [deleted file]
debian/libpam-smbpass.pam-config [deleted file]
debian/libpam-smbpass.postinst [deleted file]
debian/libpam-smbpass.preinst [deleted file]
debian/libpam-smbpass.prerm [deleted file]
debian/rules
debian/samba-libs.preinst

index 1185eb9fee1d39ef0a619b9f6de0929134372897..8c98fadd082726297a119903cbd6ad830b29e8aa 100644 (file)
@@ -29,7 +29,6 @@ swat:         Samba Web Administration Tool
 samba-doc:     Samba documentation.
 samba-doc-pdf: Samba documentation (PDF format).
 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.
 libsmbclient-dev: libsmbclient shared libraries.
 winbind:       Service to resolve user and group information from a Windows NT server.
index f5ccd69f0e6874d59d6fbbf3b7ef08596666d2e5..2054b388ee3afce6918ea69e13972e2c352c7fdc 100644 (file)
@@ -1,3 +1,10 @@
+samba (2:4.3.0+dfsg-3) UNRELEASED; urgency=medium
+
+  * Remove libpam-smbpasswd, which is broken and slated for removal
+    upstream. Closes: #799840
+
+ -- Jelmer Vernooij <jelmer@debian.org>  Thu, 01 Oct 2015 21:37:48 +0000
+
 samba (2:4.3.0+dfsg-2) experimental; urgency=medium
 
   * Re-enable cluster support.
index 6f6e58d02ae75b5a39313b587077b74c9ea905c5..3723af9481a6978ef401042b92f3404ed81d333c 100644 (file)
@@ -394,25 +394,6 @@ Description: Samba Virtual FileSystem plugins
  .
  This package contains plugins for the Samba server Virtual FileSystem.
 
-Package: libpam-smbpass
-Section: admin
-Priority: extra
-Architecture: any
-Multi-Arch: same
-Depends: libpam-runtime (>= 1.0.1-6),
-         samba-common (= ${source:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Pre-Depends: dpkg (>= 1.15.6~)
-Suggests: samba
-Description: pluggable authentication module for Samba
- This is a module for PAM that enables a system administrator to migrate
- user passwords from the Unix password database to the SMB password
- database as used by Samba, and to subsequently keep the two databases in
- sync.  Unlike other solutions, it does this without needing users to log
- in to Samba using cleartext passwords, or requiring them to change their
- existing passwords.
-
 Package: libsmbclient
 Section: libs
 Priority: optional
diff --git a/debian/libpam-smbpass.docs b/debian/libpam-smbpass.docs
deleted file mode 100644 (file)
index 176ded4..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-source3/pam_smbpass/README 
-source3/pam_smbpass/TODO
diff --git a/debian/libpam-smbpass.examples b/debian/libpam-smbpass.examples
deleted file mode 100644 (file)
index 930f95c..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-source3/pam_smbpass/samples/README
-source3/pam_smbpass/samples/kdc-pdc
-source3/pam_smbpass/samples/password-mature
-source3/pam_smbpass/samples/password-migration
-source3/pam_smbpass/samples/password-sync
diff --git a/debian/libpam-smbpass.install b/debian/libpam-smbpass.install
deleted file mode 100644 (file)
index 8c6ab85..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-lib/*/security/pam_smbpass.so
-usr/share/pam-configs/smbpasswd-migrate
diff --git a/debian/libpam-smbpass.logcheck.ignore.server b/debian/libpam-smbpass.logcheck.ignore.server
deleted file mode 100644 (file)
index b761dca..0000000
+++ /dev/null
@@ -1 +0,0 @@
-^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ PAM_smbpass\[[[:digit:]]+\]: username \[[^]]+\] obtained$
diff --git a/debian/libpam-smbpass.pam-config b/debian/libpam-smbpass.pam-config
deleted file mode 100644 (file)
index c890180..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-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
diff --git a/debian/libpam-smbpass.postinst b/debian/libpam-smbpass.postinst
deleted file mode 100644 (file)
index 7e37590..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -e
-
-pam-auth-update --package
-
-#DEBHELPER#
diff --git a/debian/libpam-smbpass.preinst b/debian/libpam-smbpass.preinst
deleted file mode 100644 (file)
index ba0b5f9..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-#
-#
-
-set -e
-
-# this code is identical to the code in samba-libs.preinst
-# it is here to make sure that libpam-smbpass isn't upgraded in cases where
-# the samba-libs preinst would fail
-# if this code fails, the old version of libpam-smbpass will stay on the
-# system, and keep working (the 3.6 version of libpam-smbpass was
-# self-contained and doesn't need any shared libraries from other samba
-# packages)
-if [ "$1" = "upgrade" ]
-then
-       for file in passdb.tdb secrets.tdb schannel_store.tdb idmap2.tdb
-       do
-               if [ -e /var/lib/samba/$file ]
-               then
-                       if [ -e /var/lib/samba/private/$file ] &&
-                               [ ! /var/lib/samba/$file -ef /var/lib/samba/private/$file ]
-                       then
-                               echo $file exists in /var/lib/samba and /var/lib/samba/private, aborting libpam-smbpass preinst
-                               echo rename one of them to allow the install/upgrade to continue
-                               echo http://bugs.debian.org/726472
-                               ls -al /var/lib/samba /var/lib/samba/private
-                               exit 1
-                       fi
-               fi
-       done
-       for file in passdb.tdb secrets.tdb schannel_store.tdb idmap2.tdb
-       do
-               if [ -e /var/lib/samba/$file ]
-               then
-                       if ! [ -e /var/lib/samba/private/$file ]
-                       then
-                               if [ ! -d /var/lib/samba/private ]
-                               then
-                                       mkdir /var/lib/samba/private
-                               fi
-                               mv /var/lib/samba/$file /var/lib/samba/private/$file
-                               ln /var/lib/samba/private/$file /var/lib/samba/$file
-                       fi
-               fi
-       done
-fi
-
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/libpam-smbpass.prerm b/debian/libpam-smbpass.prerm
deleted file mode 100644 (file)
index f43195a..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "remove" ]; then
-       pam-auth-update --package --remove smbpasswd-migrate
-fi
-
-#DEBHELPER#
index 475c72cfb027334af17a10e0616ec00cab41149f..a0c83ed6cfb1ebeea819cb2b5a8a11162c5cf42b 100755 (executable)
@@ -130,7 +130,6 @@ override_dh_install:
        ln -sf ../../../samba/ldb $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/ldb/modules/ldb/samba
        # pam stuff
        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
        mv $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/libnss_* $(DESTDIR)/lib/$(DEB_HOST_MULTIARCH)/
        # we don't ship the symlinks
@@ -171,6 +170,8 @@ override_dh_install:
        rm $(DESTDIR)/usr/bin/ctdb_run_cluster_tests
        rm -rf $(DESTDIR)/usr/lib/*/ctdb-tests
        rm -rf $(DESTDIR)/usr/share/ctdb-tests
+       # Remove libpam-smbpass, which is broken and slated for removal upstream.
+       rm -f $(DESTDIR)/lib/*/security/pam_smbpass.so
        # Install ctdb conffiles
        mkdir -p $(DESTDIR)/lib/systemd/system/
        install -m 0644 ctdb/config/ctdb.service $(DESTDIR)/lib/systemd/system/
@@ -186,10 +187,7 @@ get-packaged-orig-source:
        ./debian/build-orig.sh
 
 override_dh_installchangelogs:
-       dh_installchangelogs -Nlibpam-smbpass
-ifneq (,$(filter libpam-smbpass, $(shell dh_listpackages)))
-       dh_installchangelogs -plibpam-smbpass source3/pam_smbpass/CHANGELOG
-endif
+       dh_installchangelogs
 
 override_dh_installinit:
 ifneq (,$(filter samba, $(shell dh_listpackages)))
index 52f7989975b4e474e526da67536dd9657a67c57a..5f419fedc20ef58a37ec3410891cba08e0a5ecb6 100644 (file)
@@ -5,8 +5,6 @@
 set -e
 
 # Move files to private subdir now fhs patch is finally gone
-# this code is also present in libpam-smbpass.preinst (and should be kept in
-# sync)
 if [ "$1" = "install" ]
 then
        for file in passdb.tdb secrets.tdb schannel_store.tdb idmap2.tdb