[Pkg-samba-maint] [samba] 01/01: Remove libpam-smbpasswd, which is broken and slated for removal upstream. Closes: #799840
Jelmer Vernooij
jelmer at moszumanska.debian.org
Thu Oct 1 21:40:51 UTC 2015
This is an automated email from the git hooks/post-receive script.
jelmer pushed a commit to branch experimental
in repository samba.
commit a2253a9df8b69358e29c22f2c879ed2b01ea24a4
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Oct 1 21:38:55 2015 +0000
Remove libpam-smbpasswd, which is broken and slated for removal upstream. Closes: #799840
---
debian/README.debian | 1 -
debian/changelog | 7 ++++
debian/control | 19 -----------
debian/libpam-smbpass.docs | 2 --
debian/libpam-smbpass.examples | 5 ---
debian/libpam-smbpass.install | 2 --
debian/libpam-smbpass.logcheck.ignore.server | 1 -
debian/libpam-smbpass.pam-config | 14 --------
debian/libpam-smbpass.postinst | 7 ----
debian/libpam-smbpass.preinst | 51 ----------------------------
debian/libpam-smbpass.prerm | 9 -----
debian/rules | 8 ++---
debian/samba-libs.preinst | 2 --
13 files changed, 10 insertions(+), 118 deletions(-)
diff --git a/debian/README.debian b/debian/README.debian
index 1185eb9..8c98fad 100644
--- a/debian/README.debian
+++ b/debian/README.debian
@@ -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.
diff --git a/debian/changelog b/debian/changelog
index f5ccd69..2054b38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 at debian.org> Thu, 01 Oct 2015 21:37:48 +0000
+
samba (2:4.3.0+dfsg-2) experimental; urgency=medium
* Re-enable cluster support.
diff --git a/debian/control b/debian/control
index 6f6e58d..3723af9 100644
--- a/debian/control
+++ b/debian/control
@@ -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
index 176ded4..0000000
--- a/debian/libpam-smbpass.docs
+++ /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
index 930f95c..0000000
--- a/debian/libpam-smbpass.examples
+++ /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
index 8c6ab85..0000000
--- a/debian/libpam-smbpass.install
+++ /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
index b761dca..0000000
--- a/debian/libpam-smbpass.logcheck.ignore.server
+++ /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
index c890180..0000000
--- a/debian/libpam-smbpass.pam-config
+++ /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
index 7e37590..0000000
--- a/debian/libpam-smbpass.postinst
+++ /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
index ba0b5f9..0000000
--- a/debian/libpam-smbpass.preinst
+++ /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
index f43195a..0000000
--- a/debian/libpam-smbpass.prerm
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "remove" ]; then
- pam-auth-update --package --remove smbpasswd-migrate
-fi
-
-#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index 475c72c..a0c83ed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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)))
diff --git a/debian/samba-libs.preinst b/debian/samba-libs.preinst
index 52f79899..5f419fe 100644
--- a/debian/samba-libs.preinst
+++ b/debian/samba-libs.preinst
@@ -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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git
More information about the Pkg-samba-maint
mailing list