[Pkg-sssd-devel] sssd: Changes to 'master'
Timo Aaltonen
tjaalton at moszumanska.debian.org
Sat Feb 4 16:34:57 UTC 2017
debian/changelog | 8 ++++++++
debian/rules | 5 +++++
debian/sssd-ad-common.install | 4 ++--
debian/sssd-ad-common.postinst | 28 ++++++++++++++++++++++++++++
debian/sssd-common.install | 22 +++++++++++-----------
debian/sssd-common.postinst | 27 +++++++++++++++++++++++++++
debian/sssd-dbus.install | 2 +-
debian/sssd-dbus.postinst | 26 ++++++++++++++++++++++++++
8 files changed, 108 insertions(+), 14 deletions(-)
New commits:
commit baea1e8d5c08f45186e10f77145d29e23e9ec315
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Sat Feb 4 18:34:24 2017 +0200
releasing package sssd version 1.15.0-3
diff --git a/debian/changelog b/debian/changelog
index 4e1a58b..4ac67c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-sssd (1.15.0-3) UNRELEASED; urgency=medium
+sssd (1.15.0-3) unstable; urgency=medium
* rules, install: Remove responder service and socket files for now, the
sockets weren't supposed to be enabled anyway and can cause issues.
(Closes: #854048)
- -- Timo Aaltonen <tjaalton at debian.org> Fri, 03 Feb 2017 14:15:55 +0200
+ -- Timo Aaltonen <tjaalton at debian.org> Sat, 04 Feb 2017 18:34:06 +0200
sssd (1.15.0-2) unstable; urgency=medium
commit 2497ffef1c01ceab6dad4e9a5c9fb8c95163e928
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Sat Feb 4 18:34:05 2017 +0200
rules, install: Remove responder service and socket files for now, the sockets weren't supposed to be enabled anyway and can cause issues. (Closes: #854048)
diff --git a/debian/changelog b/debian/changelog
index 28b5a95..4e1a58b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+sssd (1.15.0-3) UNRELEASED; urgency=medium
+
+ * rules, install: Remove responder service and socket files for now, the
+ sockets weren't supposed to be enabled anyway and can cause issues.
+ (Closes: #854048)
+
+ -- Timo Aaltonen <tjaalton at debian.org> Fri, 03 Feb 2017 14:15:55 +0200
+
sssd (1.15.0-2) unstable; urgency=medium
* import-daemon-opts.diff, sssd.default: Drop the patch modifying sssd
diff --git a/debian/rules b/debian/rules
index 21da8aa..f0945d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -74,6 +74,11 @@ override_dh_install:
# match nn/nn/nnnn, replace with the date from changelog
sed -i 's/[0-1][0-9]\/[0-3][0-9]\/[0-9][0-9][0-9][0-9]/${PKGDATE}/g' $(CURDIR)/debian/tmp/usr/share/man/man*/*
+ for responder in autofs ifp nss pac pam-priv pam ssh sudo; do \
+ rm -f $(CURDIR)/debian/tmp/lib/systemd/system/sssd-$$responder.service \
+ $(CURDIR)/debian/tmp/lib/systemd/system/sssd-$$responder.socket; \
+ done
+
dh_install --fail-missing
override_dh_python2:
diff --git a/debian/sssd-ad-common.install b/debian/sssd-ad-common.install
index 6c34fc6..fdaaf91 100644
--- a/debian/sssd-ad-common.install
+++ b/debian/sssd-ad-common.install
@@ -1,3 +1,3 @@
-lib/systemd/system/sssd-pac.service
-lib/systemd/system/sssd-pac.socket
+#lib/systemd/system/sssd-pac.service
+#lib/systemd/system/sssd-pac.socket
usr/lib/*/sssd/sssd_pac
diff --git a/debian/sssd-ad-common.postinst b/debian/sssd-ad-common.postinst
new file mode 100644
index 0000000..509bb6c
--- /dev/null
+++ b/debian/sssd-ad-common.postinst
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+ configure)
+ if dpkg --compare-versions "$2" lt-nl "1.15.0-3"; then
+ if [ -x "/usr/bin/deb-systemd-helper" ]; then
+ deb-systemd-helper purge sssd-pac.service >/dev/null
+ deb-systemd-helper unmask sssd-pac.service >/dev/null
+ deb-systemd-helper purge sssd-pac.socket >/dev/null
+ deb-systemd-helper unmask sssd-pac.socket >/dev/null
+ fi
+ fi
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/sssd-common.install b/debian/sssd-common.install
index db46578..7ac7d89 100644
--- a/debian/sssd-common.install
+++ b/debian/sssd-common.install
@@ -1,17 +1,17 @@
lib/systemd/system/sssd.service
lib/systemd/system/sssd-secrets.service
lib/systemd/system/sssd-secrets.socket
-lib/systemd/system/sssd-sudo.service
-lib/systemd/system/sssd-sudo.socket
-lib/systemd/system/sssd-ssh.service
-lib/systemd/system/sssd-ssh.socket
-lib/systemd/system/sssd-autofs.service
-lib/systemd/system/sssd-autofs.socket
-lib/systemd/system/sssd-pam.service
-lib/systemd/system/sssd-pam.socket
-lib/systemd/system/sssd-pam-priv.socket
-lib/systemd/system/sssd-nss.service
-lib/systemd/system/sssd-nss.socket
+#lib/systemd/system/sssd-sudo.service
+#lib/systemd/system/sssd-sudo.socket
+#lib/systemd/system/sssd-ssh.service
+#lib/systemd/system/sssd-ssh.socket
+#lib/systemd/system/sssd-autofs.service
+#lib/systemd/system/sssd-autofs.socket
+#lib/systemd/system/sssd-pam.service
+#lib/systemd/system/sssd-pam.socket
+#lib/systemd/system/sssd-pam-priv.socket
+#lib/systemd/system/sssd-nss.service
+#lib/systemd/system/sssd-nss.socket
usr/bin/sss_ssh_authorizedkeys
usr/bin/sss_ssh_knownhostsproxy
usr/lib/*/cifs-utils/cifs_idmap_sss.so
diff --git a/debian/sssd-common.postinst b/debian/sssd-common.postinst
index 47d0884..4b2caec 100644
--- a/debian/sssd-common.postinst
+++ b/debian/sssd-common.postinst
@@ -50,6 +50,33 @@ case "$1" in
chown root:root /etc/sssd/sssd.conf
chmod 0600 /etc/sssd/sssd.conf
fi
+
+ if dpkg --compare-versions "$2" lt-nl "1.15.0-3"; then
+ if [ -x "/usr/bin/deb-systemd-helper" ]; then
+ deb-systemd-helper purge sssd-autofs.service >/dev/null
+ deb-systemd-helper unmask sssd-autofs.service >/dev/null
+ deb-systemd-helper purge sssd-autofs.socket >/dev/null
+ deb-systemd-helper unmask sssd-autofs.socket >/dev/null
+ deb-systemd-helper purge sssd-nss.service >/dev/null
+ deb-systemd-helper unmask sssd-nss.service >/dev/null
+ deb-systemd-helper purge sssd-nss.socket >/dev/null
+ deb-systemd-helper unmask sssd-nss.socket >/dev/null
+ deb-systemd-helper purge sssd-pam.service >/dev/null
+ deb-systemd-helper unmask sssd-pam.service >/dev/null
+ deb-systemd-helper purge sssd-pam.socket >/dev/null
+ deb-systemd-helper unmask sssd-pam.socket >/dev/null
+ deb-systemd-helper purge sssd-pam-priv.socket >/dev/null
+ deb-systemd-helper unmask sssd-pam-priv.socket >/dev/null
+ deb-systemd-helper purge sssd-sudo.service >/dev/null
+ deb-systemd-helper unmask sssd-sudo.service >/dev/null
+ deb-systemd-helper purge sssd-sudo.socket >/dev/null
+ deb-systemd-helper unmask sssd-sudo.socket >/dev/null
+ deb-systemd-helper purge sssd-ssh.service >/dev/null
+ deb-systemd-helper unmask sssd-ssh.service >/dev/null
+ deb-systemd-helper purge sssd-ssh.socket >/dev/null
+ deb-systemd-helper unmask sssd-ssh.socket >/dev/null
+ fi
+ fi
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/sssd-dbus.install b/debian/sssd-dbus.install
index 57b9066..0ef7673 100644
--- a/debian/sssd-dbus.install
+++ b/debian/sssd-dbus.install
@@ -1,5 +1,5 @@
etc/dbus-1/system.d/org.freedesktop.sssd.infopipe.conf
-lib/systemd/system/sssd-ifp.service
+#lib/systemd/system/sssd-ifp.service
usr/lib/*/sssd/sssd_ifp
usr/share/dbus-1/system-services/org.freedesktop.sssd.infopipe.service
usr/share/man/man5/sssd-ifp.5
diff --git a/debian/sssd-dbus.postinst b/debian/sssd-dbus.postinst
new file mode 100644
index 0000000..267655d
--- /dev/null
+++ b/debian/sssd-dbus.postinst
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+ configure)
+ if dpkg --compare-versions "$2" lt-nl "1.15.0-3"; then
+ if [ -x "/usr/bin/deb-systemd-helper" ]; then
+ deb-systemd-helper purge sssd-ifp.service >/dev/null
+ deb-systemd-helper unmask sssd-ifp.service >/dev/null
+ fi
+ fi
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
More information about the Pkg-sssd-devel
mailing list