[Pkg-sssd-devel] sssd: Changes to 'master'
Timo Aaltonen
tjaalton at moszumanska.debian.org
Thu Jan 4 08:14:05 UTC 2018
debian/changelog | 6 ++++++
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, 20 insertions(+), 100 deletions(-)
New commits:
commit f100e28fb9036289a41e1c0efd6632655810592e
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Thu Jan 4 10:01:42 2018 +0200
releasing package sssd version 1.16.0-3
diff --git a/debian/changelog b/debian/changelog
index da0ae63..ee80726 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-sssd (1.16.0-3) UNRELEASED; urgency=medium
+sssd (1.16.0-3) unstable; urgency=medium
* Install responder service and socket files again.
- -- Timo Aaltonen <tjaalton at debian.org> Thu, 04 Jan 2018 09:52:28 +0200
+ -- Timo Aaltonen <tjaalton at debian.org> Thu, 04 Jan 2018 09:55:41 +0200
sssd (1.16.0-2) unstable; urgency=medium
commit c9343619274e4d79eeaec912341dc9e91602e9da
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Thu Jan 4 09:52:38 2018 +0200
Install responder service and socket files again.
diff --git a/debian/changelog b/debian/changelog
index d1bcd2b..da0ae63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sssd (1.16.0-3) UNRELEASED; urgency=medium
+
+ * Install responder service and socket files again.
+
+ -- Timo Aaltonen <tjaalton at debian.org> Thu, 04 Jan 2018 09:52:28 +0200
+
sssd (1.16.0-2) unstable; urgency=medium
* Enable default config. (Closes: #858968)
diff --git a/debian/rules b/debian/rules
index d7c7cd4..d281c4a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -71,11 +71,6 @@ 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
override_dh_missing:
diff --git a/debian/sssd-ad-common.install b/debian/sssd-ad-common.install
index fdaaf91..6c34fc6 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
deleted file mode 100644
index 509bb6c..0000000
--- a/debian/sssd-ad-common.postinst
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/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 e1cac15..bd36716 100644
--- a/debian/sssd-common.install
+++ b/debian/sssd-common.install
@@ -2,17 +2,17 @@ etc/pam.d/sssd-shadowutils
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 4b2caec..47d0884 100644
--- a/debian/sssd-common.postinst
+++ b/debian/sssd-common.postinst
@@ -50,33 +50,6 @@ 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 0ef7673..57b9066 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
deleted file mode 100644
index 267655d..0000000
--- a/debian/sssd-dbus.postinst
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/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