[Pkg-sssd-devel] sssd: Changes to 'ubuntu'
Timo Aaltonen
tjaalton at moszumanska.debian.org
Sun Mar 5 11:42:14 UTC 2017
Rebased ref, commits from common ancestor:
commit ec00ec7f8a4b5c667353c27651197fa79de180f9
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Sun Mar 5 13:30:59 2017 +0200
releasing package sssd version 1.15.0-3ubuntu4
diff --git a/debian/changelog b/debian/changelog
index a573332..b188180 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sssd (1.15.0-3ubuntu4) zesty; urgency=medium
+
+ * Rebuild against new samba/libldb. (LP: #1664785)
+
+ -- Timo Aaltonen <tjaalton at debian.org> Sun, 05 Mar 2017 13:30:40 +0200
+
sssd (1.15.0-3ubuntu3) zesty; urgency=medium
* d/p/restart_providers_on_timeshift.patch: Use SIGUSR2 after watchdog
commit edc36438e7ddb7c3bf6f954b220c421059758da2
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Sun Mar 5 13:14:46 2017 +0200
Import changes from 1.15.0-3ubuntu3
diff --git a/debian/changelog b/debian/changelog
index 4ac67c9..a573332 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,32 @@
+sssd (1.15.0-3ubuntu3) zesty; urgency=medium
+
+ * d/p/restart_providers_on_timeshift.patch: Use SIGUSR2 after watchdog
+ detects time shift to execute pending scheduled tasks that could
+ be stuck (LP: #1641875)
+
+ -- Victor Tapia <victor.tapia at canonical.com> Wed, 15 Feb 2017 17:05:05 +0100
+
+sssd (1.15.0-3ubuntu2) zesty; urgency=medium
+
+ * Demote sssd-ad Recommends to Suggests. This fixes a component mismatch in
+ Ubuntu, but also we believe in LP 1590471 that it shouldn't be required for
+ full functionality of sssd-ad anyway. This has also been done in Debian VCS
+ in commit d26fd6b.
+
+ -- Robie Basak <robie.basak at ubuntu.com> Thu, 09 Feb 2017 13:34:01 +0000
+
+sssd (1.15.0-3ubuntu1) zesty; urgency=medium
+
+ * Build without the secrets service as libhttp-parser2.1 is in universe. An
+ MIR is pending in LP 1638957; when this is complete, we can revert this.
+ - Configure with --without-secrets.
+ - Drop build depends on libhttp-parser-dev and libjansson-dev. These are
+ only needed for the "secrets service".
+ - Remove secrets service -related files from d/sssd-common.install and in
+ d/rules.
+
+ -- Robie Basak <robie.basak at ubuntu.com> Tue, 07 Feb 2017 19:37:45 +0000
+
sssd (1.15.0-3) unstable; urgency=medium
* rules, install: Remove responder service and socket files for now, the
diff --git a/debian/control b/debian/control
index ea5f673..42bfe48 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
Source: sssd
Section: utils
Priority: extra
-Maintainer: Debian SSSD Team <pkg-sssd-devel at lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian SSSD Team <pkg-sssd-devel at lists.alioth.debian.org>
Uploaders: Timo Aaltonen <tjaalton at debian.org>
Build-Depends:
autopoint,
@@ -24,9 +25,7 @@ Build-Depends:
libdbus-1-dev,
libdhash-dev,
libglib2.0-dev,
- libhttp-parser-dev,
libini-config-dev,
- libjansson-dev,
libkeyutils-dev [linux-any],
libkrb5-dev (>= 1.12),
libldap2-dev,
@@ -121,7 +120,7 @@ Depends:
sssd-krb5-common (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
-Recommends:
+Suggests:
adcli,
Breaks: sssd (<< 1.10.0~beta2-1)
Replaces: sssd (<< 1.10.0~beta2-1)
diff --git a/debian/patches/ipa-terminate-if-view-name-fails.diff b/debian/patches/ipa-terminate-if-view-name-fails.diff
new file mode 100644
index 0000000..b5df1e1
--- /dev/null
+++ b/debian/patches/ipa-terminate-if-view-name-fails.diff
@@ -0,0 +1,37 @@
+From 1e052649e15f5830ffbc6ba0dc4a78c49a3a95ba Mon Sep 17 00:00:00 2001
+From: Sumit Bose <sbose at redhat.com>
+Date: Tue, 19 Apr 2016 15:07:18 +0200
+Subject: [PATCH] IPA: terminate properly if view name lookup fails
+
+Since commit 5a5f1e1053415efaa99bb4d5bc7ce7ac0a95b757 the view name
+lookup is the last step in the subdomain lookup request. In case of an
+error the request should be finished and no previous step should be
+called again.
+
+Resolves https://fedorahosted.org/sssd/ticket/2993
+---
+ src/providers/ipa/ipa_subdomains.c | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/src/providers/ipa/ipa_subdomains.c b/src/providers/ipa/ipa_subdomains.c
+index bcc6347fa0c53939bb60cff2e903e1db6e2bb6b6..bfe770be6f8c94478baecd1bb88cedc222586187 100644
+--- a/src/providers/ipa/ipa_subdomains.c
++++ b/src/providers/ipa/ipa_subdomains.c
+@@ -840,13 +840,7 @@ static void ipa_get_view_name_done(struct tevent_req *req)
+ if (ret == EOPNOTSUPP || ret == EIO) {
+ DEBUG(SSSDBG_TRACE_FUNC, "get_view_name request failed, looks " \
+ "like server does not support views.\n");
+- ret = ipa_check_master(ctx);
+- if (ret == EAGAIN) {
+- return;
+- } else if (ret != EOK) {
+- goto done;
+- }
+-
++ ret = EOK;
+ } else {
+ DEBUG(SSSDBG_OP_FAILURE, "get_view_name request failed.\n");
+ }
+--
+2.1.0
+
diff --git a/debian/patches/series b/debian/patches/series
index a82d1b4..f081ceb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
#placeholder
+restart_providers_on_timeshift.patch
diff --git a/debian/rules b/debian/rules
index f0945d3..0025ce2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,8 @@ override_dh_auto_configure:
--with-autofs \
--with-ssh \
--with-initscript=systemd --with-systemdunitdir=/lib/systemd/system \
- --with-sudo
+ --with-sudo \
+ --without-secrets
override_dh_auto_test:
export CK_TIMEOUT_MULTIPLIER=10
@@ -67,6 +68,10 @@ override_dh_install:
find $(CURDIR)/debian/tmp/ -name '*.egg-info' -exec rm '{}' ';'
rm -f $(CURDIR)/debian/tmp/etc/rc.d/init.d/sssd
+ # secrets service disabled by Ubuntu delta
+ rm -f $(CURDIR)/debian/tmp/lib/systemd/system/sssd-secrets.service
+ rm -f $(CURDIR)/debian/tmp/lib/systemd/system/sssd-secrets.socket
+
# we don't need a default config, yet anyway
rm -f $(CURDIR)/debian/tmp/usr/lib/*/sssd/conf/sssd.conf
rm -f $(CURDIR)/debian/tmp/etc/pam.d/sssd-shadowutils
diff --git a/debian/sssd-common.install b/debian/sssd-common.install
index 7ac7d89..d1bc185 100644
--- a/debian/sssd-common.install
+++ b/debian/sssd-common.install
@@ -1,6 +1,4 @@
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
@@ -37,7 +35,6 @@ usr/lib/*/sssd/sssd_autofs
usr/lib/*/sssd/sssd_be
usr/lib/*/sssd/sssd_nss
usr/lib/*/sssd/sssd_pam
-usr/lib/*/sssd/sssd_secrets
usr/lib/*/sssd/sssd_ssh
usr/lib/*/sssd/sssd_sudo
usr/sbin/sssd
@@ -45,7 +42,6 @@ usr/share/locale/*/LC_MESSAGES/*
usr/share/man/man1/sss_ssh_authorizedkeys.1*
usr/share/man/man1/sss_ssh_knownhostsproxy.1*
usr/share/man/man5/sss_rpcidmapd.5*
-usr/share/man/man5/sssd-secrets.5*
usr/share/man/man5/sssd-simple.5*
usr/share/man/man5/sssd-sudo.5*
usr/share/man/man5/sssd.conf.5*
diff --git a/debian/sssd-common.sssd.upstart.in b/debian/sssd-common.sssd.upstart.in
new file mode 100644
index 0000000..aae8470
--- /dev/null
+++ b/debian/sssd-common.sssd.upstart.in
@@ -0,0 +1,29 @@
+# sssd - System Security Services Daemon
+#
+# Provides a set of daemons to manage access to remote directories and
+# authentication mechanisms. It provides an NSS and PAM interface toward
+# the system and a pluggable backend system to connect to multiple different
+# account sources.
+
+description "System Security Services Daemon"
+
+start on (filesystem and net-device-up)
+stop on runlevel [06]
+
+expect fork
+respawn
+
+env DEFAULTFILE=/etc/default/sssd
+
+pre-start script
+ test -f /etc/sssd/sssd.conf || { stop; exit 0; }
+ /lib/init/apparmor-profile-load usr.sbin.sssd
+end script
+
+script
+ if [ -f "$DEFAULTFILE" ]; then
+ . "$DEFAULTFILE"
+ fi
+
+ exec sssd $DAEMON_OPTS
+end script
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
commit c8ce06169ec113092ede3c054d9b5998ad488d41
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Thu Jan 26 21:30:15 2017 +0200
releasing package sssd version 1.15.0-2
diff --git a/debian/changelog b/debian/changelog
index b8b68aa..28b5a95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-sssd (1.15.0-2) UNRELEASED; urgency=medium
+sssd (1.15.0-2) unstable; urgency=medium
* import-daemon-opts.diff, sssd.default: Drop the patch modifying sssd
service file, and revert the daemon options for sysvinit.
/etc/default/sssd is now only for the initscript (Closes: #852719)
- -- Timo Aaltonen <tjaalton at debian.org> Thu, 26 Jan 2017 21:29:25 +0200
+ -- Timo Aaltonen <tjaalton at debian.org> Thu, 26 Jan 2017 21:29:58 +0200
sssd (1.15.0-1) unstable; urgency=medium
commit 8d53a0389aada34480ff5b8c6c034ade1b8bd949
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Thu Jan 26 21:29:55 2017 +0200
import-daemon-opts.diff, sssd.default: Drop the patch modifying sssd service file, and revert the daemon options for sysvinit. /etc/default/sssd is now only for the initscript (Closes: #852719)
diff --git a/debian/changelog b/debian/changelog
index d3abd47..b8b68aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+sssd (1.15.0-2) UNRELEASED; urgency=medium
+
+ * import-daemon-opts.diff, sssd.default: Drop the patch modifying sssd
+ service file, and revert the daemon options for sysvinit.
+ /etc/default/sssd is now only for the initscript (Closes: #852719)
+
+ -- Timo Aaltonen <tjaalton at debian.org> Thu, 26 Jan 2017 21:29:25 +0200
+
sssd (1.15.0-1) unstable; urgency=medium
* New upstream release. (Closes: #852450) (LP: #1566508)
diff --git a/debian/patches/import-daemon-opts.diff b/debian/patches/import-daemon-opts.diff
deleted file mode 100644
index 4da0245..0000000
--- a/debian/patches/import-daemon-opts.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/sysv/systemd/sssd.service.in
-+++ b/src/sysv/systemd/sssd.service.in
-@@ -6,7 +6,7 @@ Wants=nss-user-lookup.target
-
- [Service]
- EnvironmentFile=- at environment_file@
--ExecStart=@sbindir@/sssd -i -f
-+ExecStart=@sbindir@/sssd $DAEMON_OPTS
- Type=notify
- NotifyAccess=main
-
diff --git a/debian/patches/series b/debian/patches/series
index cc7844f..a82d1b4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-import-daemon-opts.diff
+#placeholder
diff --git a/debian/sssd-common.sssd.default b/debian/sssd-common.sssd.default
index 87d862e..aee5563 100644
--- a/debian/sssd-common.sssd.default
+++ b/debian/sssd-common.sssd.default
@@ -1,4 +1,5 @@
# Defaults for sssd, installed at /etc/default/sssd by the maintainer scripts
+# This is only used for /etc/init.d/sssd
# Additional options that are passed to the Daemon.
-DAEMON_OPTS="-i -f"
+DAEMON_OPTS="-D -f"
commit ecafbcc83ebf1fd18518993eb27be3a948220c54
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Wed Jan 25 22:53:04 2017 +0200
releasing package sssd version 1.15.0-1
diff --git a/debian/changelog b/debian/changelog
index 7430dc4..d3abd47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-sssd (1.15.0-1) UNRELEASED; urgency=medium
+sssd (1.15.0-1) unstable; urgency=medium
* New upstream release. (Closes: #852450) (LP: #1566508)
* Drop upstreamed patches.
@@ -8,7 +8,7 @@ sssd (1.15.0-1) UNRELEASED; urgency=medium
* sssd-{ad,common,dbus}.install: Add systemd service and socket files
for pac, sudo, ssh, autofs, pam, nss and ifp responders.
- -- Timo Aaltonen <tjaalton at debian.org> Tue, 17 Jan 2017 16:48:41 +0200
+ -- Timo Aaltonen <tjaalton at debian.org> Wed, 25 Jan 2017 22:46:02 +0200
sssd (1.14.2-2.1) unstable; urgency=low
commit 7fcdfe3c20e0ceb218be3d2eba615e829c706f0c
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Wed Jan 25 22:45:56 2017 +0200
ack NMU
diff --git a/debian/changelog b/debian/changelog
index 529a741..7430dc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,14 @@ sssd (1.15.0-1) UNRELEASED; urgency=medium
-- Timo Aaltonen <tjaalton at debian.org> Tue, 17 Jan 2017 16:48:41 +0200
+sssd (1.14.2-2.1) unstable; urgency=low
+
+ * Non-maintainer upload with maintainer approval.
+ * ldap-blocking.diff: Fix ldaps connections by removing NON_BLOCKING from
+ socket options (Closes: 849756). Patch from upstream pull request #67.
+
+ -- Petter Reinholdtsen <pere at debian.org> Tue, 24 Jan 2017 22:26:17 +0000
+
sssd (1.14.2-2) unstable; urgency=medium
* fix-prefix-substitution.diff: Fix IFP service file path substitution.
commit f79e0cb2b570ae77117a76056331842f8951e5f8
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Wed Jan 25 22:38:36 2017 +0200
sssd-{ad,common,dbus}.install: Add systemd service and socket files for pac, sudo, ssh, autofs, pam, nss and ifp responders.
diff --git a/debian/changelog b/debian/changelog
index c344d3c..529a741 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ sssd (1.15.0-1) UNRELEASED; urgency=medium
* sssd-common.sssd.default, import-daemon-opts.diff: Change default
daemon options to match current upstream.
* sssd-dbus.install: Drop libsss_config, which was removed.
+ * sssd-{ad,common,dbus}.install: Add systemd service and socket files
+ for pac, sudo, ssh, autofs, pam, nss and ifp responders.
-- Timo Aaltonen <tjaalton at debian.org> Tue, 17 Jan 2017 16:48:41 +0200
diff --git a/debian/sssd-ad-common.install b/debian/sssd-ad-common.install
index bc5c06b..6c34fc6 100644
--- a/debian/sssd-ad-common.install
+++ b/debian/sssd-ad-common.install
@@ -1 +1,3 @@
+lib/systemd/system/sssd-pac.service
+lib/systemd/system/sssd-pac.socket
usr/lib/*/sssd/sssd_pac
diff --git a/debian/sssd-common.install b/debian/sssd-common.install
index 81e789f..db46578 100644
--- a/debian/sssd-common.install
+++ b/debian/sssd-common.install
@@ -1,6 +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
usr/bin/sss_ssh_authorizedkeys
usr/bin/sss_ssh_knownhostsproxy
usr/lib/*/cifs-utils/cifs_idmap_sss.so
diff --git a/debian/sssd-dbus.install b/debian/sssd-dbus.install
index ba3aaea..57b9066 100644
--- a/debian/sssd-dbus.install
+++ b/debian/sssd-dbus.install
@@ -1,4 +1,5 @@
etc/dbus-1/system.d/org.freedesktop.sssd.infopipe.conf
+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
commit c6aba7f5cab75ae37e1dd73b3f3c7d7793c9dbf3
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Wed Jan 25 22:26:39 2017 +0200
sssd-dbus.install: Drop libsss_config, which was removed.
diff --git a/debian/changelog b/debian/changelog
index e295435..c344d3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ sssd (1.15.0-1) UNRELEASED; urgency=medium
* Drop upstreamed patches.
* sssd-common.sssd.default, import-daemon-opts.diff: Change default
daemon options to match current upstream.
+ * sssd-dbus.install: Drop libsss_config, which was removed.
-- Timo Aaltonen <tjaalton at debian.org> Tue, 17 Jan 2017 16:48:41 +0200
diff --git a/debian/sssd-dbus.install b/debian/sssd-dbus.install
index c6942b6..ba3aaea 100644
--- a/debian/sssd-dbus.install
+++ b/debian/sssd-dbus.install
@@ -1,5 +1,4 @@
etc/dbus-1/system.d/org.freedesktop.sssd.infopipe.conf
-usr/lib/*/sssd/libsss_config.so
usr/lib/*/sssd/sssd_ifp
usr/share/dbus-1/system-services/org.freedesktop.sssd.infopipe.service
usr/share/man/man5/sssd-ifp.5
commit 2f674b98b56513e220e27264285a3d6fdb7ae7df
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Wed Jan 25 22:23:07 2017 +0200
sssd-common.sssd.default, import-daemon-opts.diff: Change default daemon options to match current upstream.
diff --git a/debian/changelog b/debian/changelog
index f98ece2..e295435 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ sssd (1.15.0-1) UNRELEASED; urgency=medium
* New upstream release. (Closes: #852450) (LP: #1566508)
* Drop upstreamed patches.
+ * sssd-common.sssd.default, import-daemon-opts.diff: Change default
+ daemon options to match current upstream.
-- Timo Aaltonen <tjaalton at debian.org> Tue, 17 Jan 2017 16:48:41 +0200
diff --git a/debian/patches/import-daemon-opts.diff b/debian/patches/import-daemon-opts.diff
index 25e86c9..4da0245 100644
--- a/debian/patches/import-daemon-opts.diff
+++ b/debian/patches/import-daemon-opts.diff
@@ -1,13 +1,11 @@
-diff --git a/src/sysv/systemd/sssd.service.in b/src/sysv/systemd/sssd.service.in
-index a4f9125..8a18af1 100644
--- a/src/sysv/systemd/sssd.service.in
+++ b/src/sysv/systemd/sssd.service.in
@@ -6,7 +6,7 @@ Wants=nss-user-lookup.target
[Service]
EnvironmentFile=- at environment_file@
--ExecStart=@sbindir@/sssd -D -f
+-ExecStart=@sbindir@/sssd -i -f
+ExecStart=@sbindir@/sssd $DAEMON_OPTS
- # These two should be used with traditional UNIX forking daemons
- # consult systemd.service(5) for more details
- Type=forking
+ Type=notify
+ NotifyAccess=main
+
diff --git a/debian/sssd-common.sssd.default b/debian/sssd-common.sssd.default
index 9e7f629..87d862e 100644
--- a/debian/sssd-common.sssd.default
+++ b/debian/sssd-common.sssd.default
@@ -1,4 +1,4 @@
# Defaults for sssd, installed at /etc/default/sssd by the maintainer scripts
# Additional options that are passed to the Daemon.
-DAEMON_OPTS="-D -f"
+DAEMON_OPTS="-i -f"
commit 6cfa750681ef1fe6f40156ed3e7c918f232f7bbf
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Wed Jan 25 22:03:59 2017 +0200
Drop upstreamed patches.
diff --git a/debian/changelog b/debian/changelog
index fad95e3..f98ece2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
sssd (1.15.0-1) UNRELEASED; urgency=medium
* New upstream release. (Closes: #852450) (LP: #1566508)
+ * Drop upstreamed patches.
-- Timo Aaltonen <tjaalton at debian.org> Tue, 17 Jan 2017 16:48:41 +0200
diff --git a/debian/patches/accept-krb5-1.15.diff b/debian/patches/accept-krb5-1.15.diff
deleted file mode 100644
index ab791e4..0000000
--- a/debian/patches/accept-krb5-1.15.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 6a96323fb511565908a5a7ce7b1d6e0d40aa647d
-Author: Lukas Slebodnik <lslebodn at redhat.com>
-Date: Mon Oct 24 10:03:32 2016 +0000
-
- BUILD: Accept krb5 1.15 for building the PAC plugin
-
- Reviewed-by: Sumit Bose <sbose at redhat.com>
- (cherry picked from commit 11d2a1183d7017f3d453d0a7046004b6968fefb5)
-
-diff --git a/src/external/pac_responder.m4 b/src/external/pac_responder.m4
-index 928b1d2..6b400d4 100644
---- a/src/external/pac_responder.m4
-+++ b/src/external/pac_responder.m4
-@@ -16,7 +16,8 @@ then
- Kerberos\ 5\ release\ 1.11* | \
- Kerberos\ 5\ release\ 1.12* | \
- Kerberos\ 5\ release\ 1.13* | \
-- Kerberos\ 5\ release\ 1.14*)
-+ Kerberos\ 5\ release\ 1.14* | \
-+ Kerberos\ 5\ release\ 1.15*)
- krb5_version_ok=yes
- AC_MSG_RESULT([yes])
- ;;
diff --git a/debian/patches/fix-prefix-substitution.diff b/debian/patches/fix-prefix-substitution.diff
deleted file mode 100644
index 6f13e75..0000000
--- a/debian/patches/fix-prefix-substitution.diff
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -3948,12 +3948,17 @@ replace_script = \
- mv $@.tmp $@
-
- EXTRA_DIST += \
-+ src/responder/ifp/org.freedesktop.sssd.infopipe.service.in \
- src/sysv/systemd/sssd.service.in \
- src/sysv/systemd/journal.conf.in \
- src/sysv/systemd/sssd-secrets.socket.in \
- src/sysv/systemd/sssd-secrets.service.in \
- $(NULL)
-
-+src/responder/ifp/org.freedesktop.sssd.infopipe.service: src/responder/ifp/org.freedesktop.sssd.infopipe.service.in Makefile
-+ @$(MKDIR_P) src/responder/ifp/
-+ $(replace_script)
-+
- src/sysv/systemd/sssd.service: src/sysv/systemd/sssd.service.in Makefile
- @$(MKDIR_P) src/sysv/systemd/
- $(replace_script)
-@@ -4184,6 +4189,7 @@ endif
- rm -Rf $$doc; \
- done;
- rm -Rf ldb_mod_test_dir
-+ rm -f $(builddir)/src/responder/ifp/org.freedesktop.sssd.infopipe.service
- rm -f $(builddir)/src/sysv/systemd/sssd.service
- rm -f $(builddir)/src/sysv/systemd/sssd-secrets.socket
- rm -f $(builddir)/src/sysv/systemd/sssd-secrets.service
---- a/configure.ac
-+++ b/configure.ac
-@@ -464,7 +464,6 @@ AC_CONFIG_FILES([Makefile contrib/sssd.s
- src/lib/sifp/sss_simpleifp.pc
- src/lib/sifp/sss_simpleifp.doxy
- src/config/setup.py
-- src/responder/ifp/org.freedesktop.sssd.infopipe.service
- src/systemtap/sssd.stp
- src/config/SSSDConfig/__init__.py])
- AC_OUTPUT
diff --git a/debian/patches/series b/debian/patches/series
index f7a2939..cc7844f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-fix-prefix-substitution.diff
import-daemon-opts.diff
-accept-krb5-1.15.diff
commit 4ce497af15e2a2d2c905b9f81d9c7cb53f5ed0f5
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Wed Jan 25 22:01:35 2017 +0200
update the changelog
diff --git a/debian/changelog b/debian/changelog
index 5d9f33e..fad95e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sssd (1.15.0-1) UNRELEASED; urgency=medium
+
+ * New upstream release. (Closes: #852450) (LP: #1566508)
+
+ -- Timo Aaltonen <tjaalton at debian.org> Tue, 17 Jan 2017 16:48:41 +0200
+
sssd (1.14.2-2) unstable; urgency=medium
* fix-prefix-substitution.diff: Fix IFP service file path substitution.
commit 885a47df000e83b360434b139c1c3841aeeb8a85
Author: Jakub Hrozek <jhrozek at redhat.com>
Date: Wed Jan 25 16:39:16 2017 +0100
Updating the version for the 1.15.0 release
diff --git a/version.m4 b/version.m4
index 37df62a..5ff77ba 100644
--- a/version.m4
+++ b/version.m4
@@ -1,5 +1,5 @@
# Primary version number
-m4_define([VERSION_NUMBER], [1.14.90])
+m4_define([VERSION_NUMBER], [1.15.0])
# If the PRERELEASE_VERSION_NUMBER is set, we'll append
# it to the release tag when creating an RPM or SRPM
commit 36b56482ca1e53d832accef0354124fd79711172
Author: Jakub Hrozek <jhrozek at redhat.com>
Date: Wed Jan 25 16:35:17 2017 +0100
Updating the translations for the 1.15.0 release
diff --git a/po/bg.po b/po/bg.po
index 8c1bf39..f8fb813 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: sssd-devel at lists.fedorahosted.org\n"
-"POT-Creation-Date: 2016-10-19 20:58+0200\n"
+"POT-Creation-Date: 2017-01-25 16:28+0100\n"
"PO-Revision-Date: 2014-12-14 11:44-0500\n"
"Last-Translator: Copied by Zanata <copied-by-zanata at zanata.org>\n"
"Language-Team: Bulgarian (http://www.transifex.com/projects/p/sssd/language/"
@@ -18,7 +18,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.9.5\n"
+"X-Generator: Zanata 3.9.6\n"
#: src/config/SSSDConfig/__init__.py.in:43
#: src/config/SSSDConfig/__init__.py.in:44
@@ -58,137 +58,141 @@ msgstr ""
msgid "Idle time before automatic disconnection of a client"
msgstr ""
-#: src/config/SSSDConfig/__init__.py.in:55
+#: src/config/SSSDConfig/__init__.py.in:53
+msgid "Idle time before automatic shutdown of the responder"
+msgstr ""
+
+#: src/config/SSSDConfig/__init__.py.in:56
msgid "SSSD Services to start"
msgstr "SSSD услуги за стартиране"
-#: src/config/SSSDConfig/__init__.py.in:56
+#: src/config/SSSDConfig/__init__.py.in:57
msgid "SSSD Domains to start"
msgstr "SSSD домейни за стартиране"
-#: src/config/SSSDConfig/__init__.py.in:57
+#: src/config/SSSDConfig/__init__.py.in:58
msgid "Timeout for messages sent over the SBUS"
msgstr "Изчакване за съобщения, изпратени през SBUS"
-#: src/config/SSSDConfig/__init__.py.in:58
-#: src/config/SSSDConfig/__init__.py.in:179
+#: src/config/SSSDConfig/__init__.py.in:59
+#: src/config/SSSDConfig/__init__.py.in:182
msgid "Regex to parse username and domain"
msgstr "Regex за намиране на потребителско име и домейн"
-#: src/config/SSSDConfig/__init__.py.in:59
-#: src/config/SSSDConfig/__init__.py.in:178
+#: src/config/SSSDConfig/__init__.py.in:60
+#: src/config/SSSDConfig/__init__.py.in:181
msgid "Printf-compatible format for displaying fully-qualified names"
msgstr "Printf-съвместим формат за изобразяване на пълно-квалифицирани имена"
-#: src/config/SSSDConfig/__init__.py.in:60
+#: src/config/SSSDConfig/__init__.py.in:61
msgid ""
"Directory on the filesystem where SSSD should store Kerberos replay cache "
"files."
msgstr ""
-#: src/config/SSSDConfig/__init__.py.in:61
+#: src/config/SSSDConfig/__init__.py.in:62
msgid "Domain to add to names without a domain component."
msgstr ""
-#: src/config/SSSDConfig/__init__.py.in:62
+#: src/config/SSSDConfig/__init__.py.in:63
msgid "The user to drop privileges to"
msgstr ""
-#: src/config/SSSDConfig/__init__.py.in:63
+#: src/config/SSSDConfig/__init__.py.in:64
#, fuzzy
msgid "Tune certificate verification"
msgstr "Изисква TLS проверка на сертификат"
-#: src/config/SSSDConfig/__init__.py.in:64
+#: src/config/SSSDConfig/__init__.py.in:65
msgid "All spaces in group or user names will be replaced with this character"
msgstr ""
-#: src/config/SSSDConfig/__init__.py.in:65
+#: src/config/SSSDConfig/__init__.py.in:66
msgid "Tune sssd to honor or ignore netlink state changes"
msgstr ""
-#: src/config/SSSDConfig/__init__.py.in:68
+#: src/config/SSSDConfig/__init__.py.in:69
msgid "Enumeration cache timeout length (seconds)"
msgstr ""
-#: src/config/SSSDConfig/__init__.py.in:69
+#: src/config/SSSDConfig/__init__.py.in:70
msgid "Entry cache background update timeout length (seconds)"
msgstr ""
-#: src/config/SSSDConfig/__init__.py.in:70
-#: src/config/SSSDConfig/__init__.py.in:106
+#: src/config/SSSDConfig/__init__.py.in:71
+#: src/config/SSSDConfig/__init__.py.in:108
msgid "Negative cache timeout length (seconds)"
msgstr ""
-#: src/config/SSSDConfig/__init__.py.in:71
+#: src/config/SSSDConfig/__init__.py.in:72
msgid "Files negative cache timeout length (seconds)"
msgstr ""
-#: src/config/SSSDConfig/__init__.py.in:72
+#: src/config/SSSDConfig/__init__.py.in:73
msgid "Users that SSSD should explicitly ignore"
msgstr "Потребители, които SSSD изрично трябва да игнорира"
-#: src/config/SSSDConfig/__init__.py.in:73
+#: src/config/SSSDConfig/__init__.py.in:74
msgid "Groups that SSSD should explicitly ignore"
msgstr "Групи, които SSSD изрично трябва да игнорира"
More information about the Pkg-sssd-devel
mailing list