[Pkg-sssd-devel] sssd: Changes to 'master'
Timo Aaltonen
tjaalton at moszumanska.debian.org
Sat Oct 3 08:31:43 UTC 2015
Makefile.am | 825 +
README | 2
Vagrantfile | 77
configure.ac | 85
contrib/ci/configure.sh | 7
contrib/ci/deps.sh | 15
contrib/ci/run | 9
contrib/ci/sssd.supp | 18
contrib/fedora/bashrc_sssd | 3
contrib/sssd.spec.in | 265
contrib/vagrant/bootstrap.sh | 21
debian/changelog | 24
debian/control | 69
debian/patches/fix-python-modules.diff | 35
debian/patches/libsystemd.diff | 32
debian/patches/series | 2
debian/python-libipa-hbac.install | 2
debian/python-libsss-nss-idmap.install | 2
debian/python-sss.install | 6
debian/python3-libipa-hbac.install | 1
debian/python3-libsss-nss-idmap.install | 1
debian/python3-sss.install | 3
debian/rules | 11
debian/sssd-ad.install | 1
debian/sssd-common.install | 3
debian/sssd-common.postinst | 26
debian/sssd-common.postrm | 3
debian/sssd-ipa.dirs | 1
debian/sssd-ipa.postinst | 16
debian/sssd-krb5-common.install | 1
debian/sssd-krb5-common.postinst | 14
debian/sssd-proxy.postinst | 13
debian/sssd-tools.install | 2
po/bg.po | 679 -
po/ca.po | 1141 -
po/de.po | 690 -
po/es.po | 681 -
po/eu.po | 678 -
po/fr.po | 725 -
po/hu.po | 679 -
po/id.po | 678 -
po/it.po | 679 -
po/ja.po | 688 -
po/nb.po | 666 -
po/nl.po | 690 -
po/pl.po | 741 -
po/pt.po | 679 -
po/ru.po | 679 -
po/sssd.pot | 664 -
po/sv.po | 690 -
po/tg.po | 672 -
po/tr.po | 666 -
po/uk.po | 708 -
po/zh-CN.po | 1899 --
po/zh-TW.po | 1898 --
po/zh_CN.po | 666 -
po/zh_TW.po | 672 -
src/conf_macros.m4 | 91
src/confdb/confdb.c | 112
src/confdb/confdb.h | 44
src/confdb/confdb_setup.c | 48
src/config/SSSDConfig/__init__.py.in | 19
src/config/SSSDConfig/sssd_upgrade_config.py | 3
src/config/SSSDConfigTest.py | 46
src/config/SSSDConfigTest.py2.sh | 5
src/config/SSSDConfigTest.py3.sh | 5
src/config/etc/sssd.api.conf | 6
src/config/etc/sssd.api.d/sssd-ad.conf | 3
src/config/etc/sssd.api.d/sssd-ipa.conf | 4
src/config/etc/sssd.api.d/sssd-ldap.conf | 3
src/db/sysdb.c | 7
src/db/sysdb.h | 94
src/db/sysdb_gpo.c | 75
src/db/sysdb_ops.c | 232
src/db/sysdb_private.h | 22
src/db/sysdb_search.c | 199
src/db/sysdb_subdomains.c | 282
src/db/sysdb_upgrade.c | 59
src/db/sysdb_views.c | 17
src/external/cwrap.m4 | 7
src/external/glib.m4 | 4
src/external/intgcheck.m4 | 32
src/external/ldap.m4 | 4
src/external/libcares.m4 | 14
src/external/pac_responder.m4 | 2
src/external/pkg.m4 | 6
src/external/python.m4 | 124
src/external/systemd.m4 | 40
src/krb5_plugin/sssd_krb5_localauth_plugin.c | 5
src/krb5_plugin/sssd_krb5_locator_plugin.c | 1
src/man/Makefile.am | 8
src/man/include/debug_levels.xml | 19
src/man/po/br.po | 2476 ++-
src/man/po/ca.po | 2654 ++--
src/man/po/cs.po | 2460 ++-
src/man/po/de.po | 2744 ++--
src/man/po/es.po | 2706 ++--
src/man/po/eu.po | 2450 ++-
src/man/po/fr.po | 2847 ++--
src/man/po/ja.po | 2704 ++--
src/man/po/lv.po | 2464 ++-
src/man/po/nl.po | 2493 ++-
src/man/po/po4a.cfg | 1
src/man/po/pt.po | 2530 ++-
src/man/po/ru.po | 2456 ++-
src/man/po/sssd-docs.pot | 2379 ++-
src/man/po/tg.po | 2456 ++-
src/man/po/uk.po | 3010 ++--
src/man/po/zh-CN.po |10227 ----------------
src/man/po/zh_CN.po | 2464 ++-
src/man/sss_override.8.xml | 212
src/man/sssd-ad.5.xml | 76
src/man/sssd-ifp.5.xml | 15
src/man/sssd-ipa.5.xml | 75
src/man/sssd-krb5.5.xml | 8
src/man/sssd-ldap.5.xml | 98
src/man/sssd-simple.5.xml | 6
src/man/sssd.conf.5.xml | 115
src/monitor/monitor.c | 59
src/monitor/monitor_iface_generated.c | 57
src/monitor/monitor_sbus.c | 8
src/p11_child/p11_child_nss.c | 639
src/providers/ad/ad_common.c | 109
src/providers/ad/ad_common.h | 15
src/providers/ad/ad_dyndns.c | 1
src/providers/ad/ad_gpo.c | 524
src/providers/ad/ad_gpo.h | 7
src/providers/ad/ad_gpo_child.c | 40
src/providers/ad/ad_id.c | 93
src/providers/ad/ad_init.c | 42
src/providers/ad/ad_opts.h | 10
src/providers/ad/ad_srv.c | 12
src/providers/ad/ad_subdomains.c | 87
src/providers/data_provider.h | 23
src/providers/data_provider_be.c | 129
src/providers/data_provider_fo.c | 49
src/providers/data_provider_iface_generated.c | 57
src/providers/data_provider_req.c | 58
src/providers/data_provider_req.h | 51
src/providers/dp_backend.h | 17
src/providers/dp_dyndns.c | 429
src/providers/dp_dyndns.h | 29
src/providers/dp_pam_data_util.c | 25
src/providers/dp_refresh.c | 98
src/providers/fail_over.c | 32
src/providers/fail_over.h | 2
src/providers/ipa/hbac_evaluator.c | 1
src/providers/ipa/ipa_access.c | 14
src/providers/ipa/ipa_access.h | 1
src/providers/ipa/ipa_auth.c | 20
src/providers/ipa/ipa_common.h | 1
src/providers/ipa/ipa_dyndns.c | 16
src/providers/ipa/ipa_dyndns.h | 7
src/providers/ipa/ipa_hbac_common.c | 49
src/providers/ipa/ipa_hbac_rules.c | 29
src/providers/ipa/ipa_hbac_rules.h | 1
src/providers/ipa/ipa_id.c | 11
src/providers/ipa/ipa_id.h | 9
src/providers/ipa/ipa_init.c | 72
src/providers/ipa/ipa_netgroups.c | 29
src/providers/ipa/ipa_opts.h | 6
src/providers/ipa/ipa_s2n_exop.c | 55
src/providers/ipa/ipa_selinux.c | 6
src/providers/ipa/ipa_subdomains.c | 642 -
src/providers/ipa/ipa_subdomains.h | 54
src/providers/ipa/ipa_subdomains_ext_groups.c | 7
src/providers/ipa/ipa_subdomains_id.c | 243
src/providers/ipa/ipa_subdomains_server.c | 1114 +
src/providers/ipa/ipa_subdomains_utils.c | 100
src/providers/ipa/ipa_views.c | 2
src/providers/ipa/selinux_child.c | 6
src/providers/krb5/krb5_auth.c | 103
src/providers/krb5/krb5_auth.h | 19
src/providers/krb5/krb5_ccache.c | 5
src/providers/krb5/krb5_child.c | 355
src/providers/krb5/krb5_child_handler.c | 14
src/providers/krb5/krb5_common.c | 23
src/providers/krb5/krb5_common.h | 3
src/providers/krb5/krb5_delayed_online_authentication.c | 11
src/providers/krb5/krb5_keytab.c | 5
src/providers/krb5/krb5_renew_tgt.c | 6
src/providers/krb5/krb5_wait_queue.c | 184
src/providers/ldap/ldap_auth.c | 54
src/providers/ldap/ldap_child.c | 31
src/providers/ldap/ldap_common.c | 19
src/providers/ldap/ldap_common.h | 14
src/providers/ldap/ldap_id.c | 160
src/providers/ldap/ldap_id_cleanup.c | 79
src/providers/ldap/ldap_id_enum.c | 20
src/providers/ldap/ldap_options.c | 63
src/providers/ldap/ldap_opts.h | 6
src/providers/ldap/sdap.c | 122
src/providers/ldap/sdap.h | 20
src/providers/ldap/sdap_access.c | 51
src/providers/ldap/sdap_async.c | 349
src/providers/ldap/sdap_async.h | 48
src/providers/ldap/sdap_async_connection.c | 44
src/providers/ldap/sdap_async_enum.c | 9
src/providers/ldap/sdap_async_groups.c | 89
src/providers/ldap/sdap_async_initgroups.c | 6
src/providers/ldap/sdap_async_initgroups_ad.c | 2
src/providers/ldap/sdap_async_users.c | 78
src/providers/ldap/sdap_child_helpers.c | 41
src/providers/ldap/sdap_dyndns.c | 239
src/providers/ldap/sdap_dyndns.h | 1
src/providers/ldap/sdap_fd_events.c | 4
src/providers/ldap/sdap_id_op.c | 2
src/providers/ldap/sdap_utils.c | 11
src/providers/proxy/proxy_auth.c | 6
src/providers/proxy/proxy_child.c | 8
src/providers/proxy/proxy_id.c | 4
src/providers/proxy/proxy_init.c | 11
src/python/pyhbac.c | 30
src/resolv/ares/ares_data.c | 140
src/resolv/ares/ares_data.h | 68
src/resolv/ares/ares_dns.h | 91
src/resolv/ares/ares_parse_srv_reply.c | 183
src/resolv/ares/ares_parse_srv_reply.h | 35
src/resolv/ares/ares_parse_txt_reply.c | 204
src/resolv/ares/ares_parse_txt_reply.h | 33
src/resolv/async_resolv.c | 19
src/resolv/async_resolv.h | 6
src/responder/autofs/autofssrv.c | 2
src/responder/common/negcache.c | 105
src/responder/common/negcache.h | 21
src/responder/common/responder.h | 9
src/responder/common/responder_cache_req.c | 1191 +
src/responder/common/responder_cache_req.h | 168
src/responder/common/responder_common.c | 38
src/responder/common/responder_dp.c | 26
src/responder/common/responder_get_domains.c | 42
src/responder/ifp/ifp_cache.c | 344
src/responder/ifp/ifp_cache.h | 59
src/responder/ifp/ifp_components.c | 81
src/responder/ifp/ifp_components.h | 6
src/responder/ifp/ifp_domains.c | 22
src/responder/ifp/ifp_domains.h | 4
src/responder/ifp/ifp_groups.c | 949 +
src/responder/ifp/ifp_groups.h | 97
src/responder/ifp/ifp_iface.c | 178
src/responder/ifp/ifp_iface.xml | 107
src/responder/ifp/ifp_iface_generated.c | 1188 +
src/responder/ifp/ifp_iface_generated.h | 315
src/responder/ifp/ifp_iface_nodes.c | 129
src/responder/ifp/ifp_private.h | 50
src/responder/ifp/ifp_users.c | 984 +
src/responder/ifp/ifp_users.h | 116
src/responder/ifp/ifpsrv.c | 122
src/responder/ifp/ifpsrv_cmd.c | 391
src/responder/ifp/ifpsrv_util.c | 326
src/responder/ifp/org.freedesktop.sssd.infopipe.conf | 6
src/responder/nss/nsssrv.c | 22
src/responder/nss/nsssrv.h | 1
src/responder/nss/nsssrv_cmd.c | 300
src/responder/nss/nsssrv_mmap_cache.c | 83
src/responder/nss/nsssrv_mmap_cache.h | 10
src/responder/nss/nsssrv_private.h | 3
src/responder/pac/pacsrv.c | 2
src/responder/pac/pacsrv_cmd.c | 17
src/responder/pac/pacsrv_utils.c | 35
src/responder/pam/pam_helpers.c | 1
src/responder/pam/pam_helpers.h | 4
src/responder/pam/pamsrv.c | 36
src/responder/pam/pamsrv.h | 25
src/responder/pam/pamsrv_cmd.c | 636
src/responder/pam/pamsrv_dp.c | 8
src/responder/pam/pamsrv_p11.c | 527
src/responder/ssh/sshsrv.c | 11
src/responder/ssh/sshsrv_cmd.c | 77
src/responder/ssh/sshsrv_private.h | 1
src/responder/sudo/sudosrv.c | 13
src/responder/sudo/sudosrv_get_sudorules.c | 54
src/responder/sudo/sudosrv_private.h | 1
src/sbus/sbus_codegen | 167
src/sbus/sssd_dbus.h | 143
src/sbus/sssd_dbus_common_signals.c | 91
src/sbus/sssd_dbus_connection.c | 408
src/sbus/sssd_dbus_errors.h | 29
src/sbus/sssd_dbus_interface.c | 1116 +
src/sbus/sssd_dbus_introspect.c | 510
src/sbus/sssd_dbus_invokers.c | 583
src/sbus/sssd_dbus_invokers.h | 124
src/sbus/sssd_dbus_meta.h | 15
src/sbus/sssd_dbus_private.h | 58
src/sbus/sssd_dbus_properties.c | 553
src/sbus/sssd_dbus_request.c | 196
src/sbus/sssd_dbus_signals.c | 292
src/sss_client/common.c | 22
src/sss_client/libwbclient/wbc_pwd_sssd.c | 12
src/sss_client/libwbclient/wbc_sid_common.c | 2
src/sss_client/nss_group.c | 93
src/sss_client/nss_mc.h | 5
src/sss_client/nss_mc_common.c | 8
src/sss_client/nss_mc_group.c | 19
src/sss_client/nss_mc_initgr.c | 165
src/sss_client/nss_mc_passwd.c | 20
src/sss_client/nss_passwd.c | 42
src/sss_client/pam_message.c | 179
src/sss_client/pam_message.h | 66
src/sss_client/pam_sss.c | 509
src/sss_client/ssh/sss_ssh_client.c | 12
src/sss_client/sss_cli.h | 29
src/sss_client/sssd_pac.c | 4
src/sysv/gentoo/sssd.in | 2
src/tests/auth-tests.c | 2
src/tests/cmocka/common_mock_be.c | 39
src/tests/cmocka/common_mock_be.h | 30
src/tests/cmocka/common_mock_krb5.c | 103
src/tests/cmocka/common_mock_krb5.h | 47
src/tests/cmocka/common_mock_resp.h | 2
src/tests/cmocka/common_mock_resp_dp.c | 2
src/tests/cmocka/common_mock_sdap.c | 19
src/tests/cmocka/common_mock_sdap.h | 11
src/tests/cmocka/dummy_child.c | 29
src/tests/cmocka/p11_nssdb/cert9.db |binary
src/tests/cmocka/p11_nssdb/key4.db |binary
src/tests/cmocka/test_ad_common.c | 262
src/tests/cmocka/test_authtok.c | 329
src/tests/cmocka/test_be_ptask.c | 8
src/tests/cmocka/test_cert_utils.c | 427
src/tests/cmocka/test_child_common.c | 302
src/tests/cmocka/test_copy_keytab.c | 56
src/tests/cmocka/test_data_provider_be.c | 258
src/tests/cmocka/test_dp_opts.c | 7
src/tests/cmocka/test_dyndns.c | 328
src/tests/cmocka/test_expire_common.c | 131
src/tests/cmocka/test_expire_common.h | 39
src/tests/cmocka/test_fo_srv.c | 188
src/tests/cmocka/test_fqnames.c | 2
src/tests/cmocka/test_ifp.c | 113
src/tests/cmocka/test_io.c | 2
src/tests/cmocka/test_ipa_subdomains_server.c | 958 +
src/tests/cmocka/test_ipa_subdomains_utils.c | 227
src/tests/cmocka/test_krb5_wait_queue.c | 365
src/tests/cmocka/test_ldap_auth.c | 102
src/tests/cmocka/test_ldap_id_cleanup.c | 316
src/tests/cmocka/test_negcache.c | 275
src/tests/cmocka/test_nested_groups.c | 208
src/tests/cmocka/test_nss_srv.c | 346
src/tests/cmocka/test_pam_srv.c | 1499 ++
src/tests/cmocka/test_resolv_fake.c | 22
src/tests/cmocka/test_responder_cache_req.c | 1972 +++
src/tests/cmocka/test_responder_common.c | 48
src/tests/cmocka/test_sbus_opath.c | 310
src/tests/cmocka/test_sdap.c | 210
src/tests/cmocka/test_sdap_access.c | 74
src/tests/cmocka/test_string_utils.c | 28
src/tests/cmocka/test_sysdb_subdomains.c | 573
src/tests/cmocka/test_sysdb_utils.c | 10
src/tests/cmocka/test_sysdb_views.c | 566
src/tests/cmocka/test_utils.c | 309
src/tests/cmocka/test_utils.h | 1
src/tests/common.c | 12
src/tests/common.h | 25
src/tests/common_dom.c | 395
src/tests/common_tev.c | 6
src/tests/cwrap/Makefile.am | 3
src/tests/cwrap/test_server.c | 11
src/tests/debug-tests.c | 12
src/tests/dlopen-tests.c | 14
src/tests/intg/.config/screenrc | 23
src/tests/intg/Makefile.am | 63
src/tests/intg/config.py.m4 | 13
src/tests/intg/ds.py | 62
src/tests/intg/ds_openldap.py | 281
src/tests/intg/ent.py | 508
src/tests/intg/ent_test.py | 438
src/tests/intg/ldap_ent.py | 106
src/tests/intg/ldap_test.py | 368
src/tests/intg/sssd_id.py | 119
src/tests/intg/test_memory_cache.py | 745 +
src/tests/intg/util.py | 66
src/tests/krb5_proxy_check_test_data.conf | 8
src/tests/krb5_utils-tests.c | 16
src/tests/pyhbac-test.py | 23
src/tests/pyhbac-test.py2.sh | 5
src/tests/pyhbac-test.py3.sh | 5
src/tests/pysss_murmur-test.py | 22
src/tests/pysss_murmur-test.py2.sh | 5
src/tests/pysss_murmur-test.py3.sh | 5
src/tests/sbus_codegen_tests.c | 216
src/tests/sbus_codegen_tests.xml | 8
src/tests/sbus_codegen_tests_generated.c | 870 -
src/tests/sbus_codegen_tests_generated.h | 63
src/tests/sbus_tests.c | 73
src/tests/simple_access-tests.c | 6
src/tests/sysdb-tests.c | 257
src/tests/sysdb_ssh-tests.c | 2
src/tests/util-tests.c | 58
src/tests/whitespace_test | 32
src/tools/common/sss_colondb.c | 305
src/tools/common/sss_colondb.h | 73
src/tools/common/sss_tools.c | 423
src/tools/common/sss_tools.h | 91
src/tools/sss_groupshow.c | 8
src/tools/sss_override.c | 1502 ++
src/tools/tools_mc_util.c | 48
src/util/authtok-utils.c | 74
src/util/authtok-utils.h | 70
src/util/authtok.c | 245
src/util/authtok.h | 85
src/util/cert.h | 51
src/util/cert/cert_common.c | 154
src/util/cert/libcrypto/cert.c | 261
src/util/cert/nss/cert.c | 342
src/util/check_and_open.c | 8
src/util/child_common.c | 76
src/util/child_common.h | 13
src/util/debug.c | 11
src/util/dlinklist.h | 20
src/util/domain_info_utils.c | 158
src/util/mmap_cache.h | 15
src/util/nscd.c | 2
src/util/signal.c | 8
src/util/sss_cli_cmd.c | 238
src/util/sss_cli_cmd.h | 28
src/util/sss_krb5.c | 62
src/util/sss_krb5.h | 7
src/util/sss_ldap.c | 4
src/util/sss_python.c | 47
src/util/sss_python.h | 27
src/util/string_utils.c | 17
src/util/usertools.c | 11
src/util/util.c | 179
src/util/util.h | 58
src/util/util_errors.c | 14
src/util/util_errors.h | 10
version.m4 | 2
428 files changed, 71391 insertions(+), 46868 deletions(-)
New commits:
commit e1cc392d939acd3b0fd7185f24e7831cbf824f1e
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Sat Oct 3 08:38:46 2015 +0300
releasing package sssd version 1.13.1-1
diff --git a/debian/changelog b/debian/changelog
index 3b1bdff..34ae13a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-sssd (1.13.1-1) UNRELEASED; urgency=medium
+sssd (1.13.1-1) unstable; urgency=medium
* New upstream release.
* {common,ipa,krb5,proxy}.postinst: Create a sssd system user & group,
@@ -20,7 +20,7 @@ sssd (1.13.1-1) UNRELEASED; urgency=medium
instead mangle them in post-dh_installdeb.
* common: Add depends on adduser.
- -- Timo Aaltonen <tjaalton at debian.org> Wed, 30 Sep 2015 08:46:31 +0300
+ -- Timo Aaltonen <tjaalton at debian.org> Sat, 03 Oct 2015 08:38:29 +0300
sssd (1.12.5-3) unstable; urgency=medium
commit aea425ec0b1ef33788bb7dc86e383aef7bb30027
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Sat Oct 3 08:38:14 2015 +0300
sssd.conf must be owned by root:root
diff --git a/debian/sssd-common.postinst b/debian/sssd-common.postinst
index ccffead..f47be0e 100644
--- a/debian/sssd-common.postinst
+++ b/debian/sssd-common.postinst
@@ -42,7 +42,7 @@ case "$1" in
chmod 711 /etc/sssd
chmod 700 $HOME/db $HOME/pipes/private
if [ -f /etc/sssd/sssd.conf ]; then
- chown sssd:sssd /etc/sssd/sssd.conf
+ chown root:root /etc/sssd/sssd.conf
chmod 0600 /etc/sssd/sssd.conf
fi
;;
commit b8696e7069bdb0d36f82fffe3f7a4c9bb6809922
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Thu Oct 1 13:03:57 2015 +0300
common: Add depends on adduser.
diff --git a/debian/changelog b/debian/changelog
index 688e7f5..3b1bdff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ sssd (1.13.1-1) UNRELEASED; urgency=medium
rename the built modules instead.
* rules, postinst: Avoid running dpkg-architecture in postinst and
instead mangle them in post-dh_installdeb.
+ * common: Add depends on adduser.
-- Timo Aaltonen <tjaalton at debian.org> Wed, 30 Sep 2015 08:46:31 +0300
diff --git a/debian/control b/debian/control
index 58495ce..a76a29f 100644
--- a/debian/control
+++ b/debian/control
@@ -92,7 +92,8 @@ Description: System Security Services Daemon -- metapackage
Package: sssd-common
Architecture: any
-Depends: python, python-sss, ${misc:Depends}, ${shlibs:Depends}
+Depends: python, python-sss, ${misc:Depends}, ${shlibs:Depends},
+ adduser,
Recommends: bind9-host, libnss-sss, libpam-sss, libsss-sudo
Suggests: apparmor, sssd-tools
Breaks: sssd (<< 1.10.0~beta2-1),
commit 3f7f23e049a7b19e0f4b88d46657577628cac789
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Thu Oct 1 13:03:15 2015 +0300
common: remove sssd user on postinst
diff --git a/debian/sssd-common.postrm b/debian/sssd-common.postrm
index 340c460..c31e446 100644
--- a/debian/sssd-common.postrm
+++ b/debian/sssd-common.postrm
@@ -26,6 +26,9 @@ case "$1" in
rmdir --ignore-fail-on-non-empty /etc/sssd/
fi
rm -rf /var/log/sssd/
+ if getent group dirsrv > /dev/null; then
+ deluser --system sssd
+ fi
;;
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
;;
commit dfed907af4399be1628fca18b9fda1d4b2610611
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Thu Oct 1 12:37:48 2015 +0300
postinst: various fixes
fix a typo in adduser arguments
drop -f from chmod/chown
handle sssd.conf separately, it's not available by default
diff --git a/debian/sssd-common.postinst b/debian/sssd-common.postinst
index c95d259..ccffead 100644
--- a/debian/sssd-common.postinst
+++ b/debian/sssd-common.postinst
@@ -26,22 +26,25 @@ case "$1" in
if ! getent passwd sssd > $OUT; then
echo "Creating SSSD system user & group..."
adduser --quiet --system --home $HOME \
- --disabled-password -- group \
+ --disabled-password --group \
--gecos "SSSD system user" \
sssd > $OUT
fi
- chown -f sssd:sssd \
+ chown sssd:sssd \
$HOME/db $HOME/mc $HOME/pipes $HOME/pipes/private \
- $HOME/pubconf /etc/sssd /etc/sssd/sssd.conf \
+ $HOME/pubconf /etc/sssd \
/var/log/sssd
- chown -f root:sssd $LIBDIR/p11_child
+ chown root:sssd $LIBDIR/p11_child
- chmod -f 4754 $LIBDIR/p11_child
- chmod -f 755 $HOME/mc $HOME/pipes $HOME/pubconf
- chmod -f 750 /var/log/sssd
- chmod -f 711 /etc/sssd
- chmod -f 700 $HOME/db $HOME/pipes/private
- chmod -f 0600 /etc/sssd/sssd.conf
+ chmod 4754 $LIBDIR/p11_child
+ chmod 755 $HOME/mc $HOME/pipes $HOME/pubconf
+ chmod 750 /var/log/sssd
+ chmod 711 /etc/sssd
+ chmod 700 $HOME/db $HOME/pipes/private
+ if [ -f /etc/sssd/sssd.conf ]; then
+ chown sssd:sssd /etc/sssd/sssd.conf
+ chmod 0600 /etc/sssd/sssd.conf
+ fi
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/sssd-ipa.postinst b/debian/sssd-ipa.postinst
index 203df66..c1997db 100644
--- a/debian/sssd-ipa.postinst
+++ b/debian/sssd-ipa.postinst
@@ -5,10 +5,10 @@ LIBDIR=/usr/lib/@TRIPLET@/sssd
case "$1" in
configure)
- chown -f root:sssd $LIBDIR/selinux_child
- chmod -f 4754 $LIBDIR/selinux_child
- chown -f sssd:sssd /var/lib/sss/keytabs
- chmod -f 700 /var/lib/sss/keytabs
+ chown root:sssd $LIBDIR/selinux_child
+ chmod 4754 $LIBDIR/selinux_child
+ chown sssd:sssd /var/lib/sss/keytabs
+ chmod 700 /var/lib/sss/keytabs
;;
esac
diff --git a/debian/sssd-krb5-common.postinst b/debian/sssd-krb5-common.postinst
index f81d3be..4d018ee 100644
--- a/debian/sssd-krb5-common.postinst
+++ b/debian/sssd-krb5-common.postinst
@@ -5,8 +5,8 @@ LIBDIR=/usr/lib/@TRIPLET@/sssd
case "$1" in
configure)
- chown -f root:sssd $LIBDIR/proxy_child
- chmod -f 4754 $LIBDIR/proxy_child
+ chown root:sssd $LIBDIR/proxy_child
+ chmod 4754 $LIBDIR/proxy_child
;;
esac
diff --git a/debian/sssd-proxy.postinst b/debian/sssd-proxy.postinst
index 557141d..6098bc9 100644
--- a/debian/sssd-proxy.postinst
+++ b/debian/sssd-proxy.postinst
@@ -5,8 +5,8 @@ LIBDIR=/usr/lib/@TRIPLET@/sssd
case "$1" in
configure)
- chown -f root:sssd $LIBDIR/ldap_child $LIBDIR/krb5_child
- chmod -f 4754 $LIBDIR/ldap_child $LIBDIR/krb5_child
+ chown root:sssd $LIBDIR/ldap_child $LIBDIR/krb5_child
+ chmod 4754 $LIBDIR/ldap_child $LIBDIR/krb5_child
;;
esac
commit 6e595db2160810f931c731052e7cf5b9a1602183
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Thu Oct 1 12:09:29 2015 +0300
rules, postinst: Avoid running dpkg-architecture in postinst and instead mangle them in post-dh_installdeb.
diff --git a/debian/changelog b/debian/changelog
index e776313..688e7f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ sssd (1.13.1-1) UNRELEASED; urgency=medium
* libsystemd.diff: Dropped, fixed upstream.
* fix-python-modules.diff: Don't add symlinks to python modules,
rename the built modules instead.
+ * rules, postinst: Avoid running dpkg-architecture in postinst and
+ instead mangle them in post-dh_installdeb.
-- Timo Aaltonen <tjaalton at debian.org> Wed, 30 Sep 2015 08:46:31 +0300
diff --git a/debian/rules b/debian/rules
index 27aa790..4ba4129 100755
--- a/debian/rules
+++ b/debian/rules
@@ -82,6 +82,13 @@ override_dh_installinit:
dh_apparmor -psssd-common --profile-name=usr.sbin.sssd
dh_installinit --name sssd --error-handler=invoke_failure
+override_dh_installdeb:
+ dh_installdeb
+ for pkg in sssd-common sssd-ipa sssd-krb5-common sssd-proxy; do \
+ sed -i 's/@TRIPLET@/${DEB_HOST_MULTIARCH}/' \
+ $(CURDIR)/debian/$$pkg/DEBIAN/postinst; \
+ done
+
override_dh_auto_clean:
dh_auto_clean
rm -f $(CURDIR)/debian/sssd-common.$(INIT)
diff --git a/debian/sssd-common.postinst b/debian/sssd-common.postinst
index 79766a9..c95d259 100644
--- a/debian/sssd-common.postinst
+++ b/debian/sssd-common.postinst
@@ -19,8 +19,7 @@ set -e
OUT=/dev/null
HOME=/var/lib/sss
-MA=`dpkg-architecture -q DEB_HOST_MULTIARCH`
-LIBDIR=/usr/lib/$MA/sssd
+LIBDIR=/usr/lib/@TRIPLET@/sssd
case "$1" in
configure)
diff --git a/debian/sssd-ipa.postinst b/debian/sssd-ipa.postinst
index 83f27d1..203df66 100644
--- a/debian/sssd-ipa.postinst
+++ b/debian/sssd-ipa.postinst
@@ -1,8 +1,7 @@
#!/bin/sh
set -e
-MA=`dpkg-architecture -q DEB_HOST_MULTIARCH`
-LIBDIR=/usr/lib/$MA/sssd
+LIBDIR=/usr/lib/@TRIPLET@/sssd
case "$1" in
configure)
diff --git a/debian/sssd-krb5-common.postinst b/debian/sssd-krb5-common.postinst
index 897a28d..f81d3be 100644
--- a/debian/sssd-krb5-common.postinst
+++ b/debian/sssd-krb5-common.postinst
@@ -1,8 +1,7 @@
#!/bin/sh
set -e
-MA=`dpkg-architecture -q DEB_HOST_MULTIARCH`
-LIBDIR=/usr/lib/$MA/sssd
+LIBDIR=/usr/lib/@TRIPLET@/sssd
case "$1" in
configure)
diff --git a/debian/sssd-proxy.postinst b/debian/sssd-proxy.postinst
index 426d36b..557141d 100644
--- a/debian/sssd-proxy.postinst
+++ b/debian/sssd-proxy.postinst
@@ -1,8 +1,7 @@
#!/bin/sh
set -e
-MA=`dpkg-architecture -q DEB_HOST_MULTIARCH`
-LIBDIR=/usr/lib/$MA/sssd
+LIBDIR=/usr/lib/@TRIPLET@/sssd
case "$1" in
configure)
commit 3eca0c8719f3fce7e4955b380d7e6dfe0a282d44
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Thu Oct 1 11:42:36 2015 +0300
fix-python-modules.diff: Don't add symlinks to python modules, rename the built modules instead.
diff --git a/debian/changelog b/debian/changelog
index f1c02ac..e776313 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ sssd (1.13.1-1) UNRELEASED; urgency=medium
* common: Move libsss_krb5_common here from sssd-krb5-common to satisfy
libsss_ldap_common depending on it.
* libsystemd.diff: Dropped, fixed upstream.
+ * fix-python-modules.diff: Don't add symlinks to python modules,
+ rename the built modules instead.
-- Timo Aaltonen <tjaalton at debian.org> Wed, 30 Sep 2015 08:46:31 +0300
diff --git a/debian/patches/fix-python-modules.diff b/debian/patches/fix-python-modules.diff
new file mode 100644
index 0000000..275b4d6
--- /dev/null
+++ b/debian/patches/fix-python-modules.diff
@@ -0,0 +1,35 @@
+diff --git a/Makefile.am b/Makefile.am
+index aae123c..0ad94fc 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -3523,10 +3523,10 @@ if BUILD_PYTHON2_BINDINGS
+ --record=$(abs_builddir)/src/config/.files2 --root=$(DESTDIR); \
+ fi
+ cd $(DESTDIR)$(py2execdir) && \
+- $(LN_S) -f _py2sss.so pysss.so ; \
+- $(LN_S) -f _py2hbac.so pyhbac.so ; \
+- $(LN_S) -f _py2sss_murmur.so pysss_murmur.so ; \
+- $(LN_S) -f _py2sss_nss_idmap.so pysss_nss_idmap.so
++ mv -f _py2sss.so pysss.so ; \
++ mv -f _py2hbac.so pyhbac.so ; \
++ mv -f _py2sss_murmur.so pysss_murmur.so ; \
++ mv -f _py2sss_nss_idmap.so pysss_nss_idmap.so
+ endif
+ if BUILD_PYTHON3_BINDINGS
+ if [ "$(DESTDIR)" = "" ]; then \
+@@ -3541,10 +3541,10 @@ if BUILD_PYTHON3_BINDINGS
+ --record=$(abs_builddir)/src/config/.files3 --root=$(DESTDIR); \
+ fi
+ cd $(DESTDIR)$(py3execdir) && \
+- $(LN_S) -f _py3sss.so pysss.so ; \
+- $(LN_S) -f _py3hbac.so pyhbac.so ; \
+- $(LN_S) -f _py3sss_murmur.so pysss_murmur.so ; \
+- $(LN_S) -f _py3sss_nss_idmap.so pysss_nss_idmap.so
++ mv -f _py3sss.so pysss.so ; \
++ mv -f _py3hbac.so pyhbac.so ; \
++ mv -f _py3sss_murmur.so pysss_murmur.so ; \
++ mv -f _py3sss_nss_idmap.so pysss_nss_idmap.so
+ endif
+ for doc in $(SSSD_DOCS); do \
+ $(MKDIR_P) $$doc $(DESTDIR)/$(docdir); \
+
diff --git a/debian/patches/series b/debian/patches/series
index 9e41f28..03a5a4d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
fix-obsolete-target.diff
+fix-python-modules.diff
diff --git a/debian/python-libipa-hbac.install b/debian/python-libipa-hbac.install
index 1a4b442..1688818 100644
--- a/debian/python-libipa-hbac.install
+++ b/debian/python-libipa-hbac.install
@@ -1,2 +1 @@
usr/lib/python2*/dist-packages/pyhbac.so
-usr/lib/python2*/dist-packages/_py2hbac.so
diff --git a/debian/python-libsss-nss-idmap.install b/debian/python-libsss-nss-idmap.install
index 0bb5235..8b8b52d 100644
--- a/debian/python-libsss-nss-idmap.install
+++ b/debian/python-libsss-nss-idmap.install
@@ -1,2 +1 @@
usr/lib/python2*/dist-packages/pysss_nss_idmap.so
-usr/lib/python2*/dist-packages/_py2sss_nss_idmap.so
diff --git a/debian/python-sss.install b/debian/python-sss.install
index 4581cbc..1758fe2 100644
--- a/debian/python-sss.install
+++ b/debian/python-sss.install
@@ -1,5 +1,3 @@
usr/lib/python2*/dist-packages/SSSDConfig/*.py
usr/lib/python2*/dist-packages/pysss.so
-usr/lib/python2*/dist-packages/_py2sss.so
usr/lib/python2*/dist-packages/pysss_murmur.so
-usr/lib/python2*/dist-packages/_py2sss_murmur.so
diff --git a/debian/python3-libipa-hbac.install b/debian/python3-libipa-hbac.install
index 19ed064..7d3cf99 100644
--- a/debian/python3-libipa-hbac.install
+++ b/debian/python3-libipa-hbac.install
@@ -1,2 +1 @@
usr/lib/python3*/site-packages/pyhbac.so
-usr/lib/python3*/site-packages/_py3hbac.so
diff --git a/debian/python3-libsss-nss-idmap.install b/debian/python3-libsss-nss-idmap.install
index c57f5bb..b2339ca 100644
--- a/debian/python3-libsss-nss-idmap.install
+++ b/debian/python3-libsss-nss-idmap.install
@@ -1,2 +1 @@
usr/lib/python3*/site-packages/pysss_nss_idmap.so
-usr/lib/python3*/site-packages/_py3sss_nss_idmap.so
diff --git a/debian/python3-sss.install b/debian/python3-sss.install
index f7a2fbb..f9b99df 100644
--- a/debian/python3-sss.install
+++ b/debian/python3-sss.install
@@ -1,5 +1,3 @@
usr/lib/python3*/dist-packages/SSSDConfig/*.py
usr/lib/python3*/site-packages/pysss.so
-usr/lib/python3*/site-packages/_py3sss.so
usr/lib/python3*/site-packages/pysss_murmur.so
-usr/lib/python3*/site-packages/_py3sss_murmur.so
commit 7a151f27ca712a12240e00f261a133dc8ee3dec3
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Thu Oct 1 10:40:09 2015 +0300
libsystemd.diff: Dropped, fixed upstream.
diff --git a/debian/changelog b/debian/changelog
index 4231882..f1c02ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ sssd (1.13.1-1) UNRELEASED; urgency=medium
anymore.
* common: Move libsss_krb5_common here from sssd-krb5-common to satisfy
libsss_ldap_common depending on it.
+ * libsystemd.diff: Dropped, fixed upstream.
-- Timo Aaltonen <tjaalton at debian.org> Wed, 30 Sep 2015 08:46:31 +0300
diff --git a/debian/patches/libsystemd.diff b/debian/patches/libsystemd.diff
deleted file mode 100644
index 790daed..0000000
--- a/debian/patches/libsystemd.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/src/external/systemd.m4 b/src/external/systemd.m4
-index dbced0d..92b9c99 100644
---- a/src/external/systemd.m4
-+++ b/src/external/systemd.m4
-@@ -8,16 +8,21 @@ AC_DEFUN([AM_CHECK_SYSTEMD],
- ])
-
- AM_COND_IF([HAVE_SYSTEMD],
-- [PKG_CHECK_MODULES([SYSTEMD_LOGIN], [libsystemd-login],
-- [AC_DEFINE_UNQUOTED(HAVE_SYSTEMD_LOGIN, 1, [Build with libsystemdlogin support])],
-- [AC_MSG_NOTICE([Build without libsystemd-login support])])])
-+ [PKG_CHECK_MODULES([SYSTEMD_LOGIN], [libsystemd],
-+ [AC_DEFINE_UNQUOTED(HAVE_SYSTEMD_LOGIN, 1, [Build with libsystemd login support])],
-+ [PKG_CHECK_MODULES([SYSTEMD_LOGIN], [libsystemd-login],
-+ [AC_DEFINE_UNQUOTED(HAVE_SYSTEMD_LOGIN, 1, [Build with libsystemd login support])],
-+ [AC_MSG_NOTICE([Build without libsystemd-login support])])])])
-
- dnl A macro to check presence of journald on the system
- AC_DEFUN([AM_CHECK_JOURNALD],
- [
-- PKG_CHECK_MODULES(JOURNALD,
-- libsystemd-journal,
-- [AC_DEFINE_UNQUOTED([WITH_JOURNALD], 1, [journald is available])])
-+ PKG_CHECK_MODULES([JOURNALD],
-+ [libsystemd],
-+ [AC_DEFINE_UNQUOTED([WITH_JOURNALD], 1, [journald is available])]
-+ [PKG_CHECK_MODULES([JOURNALD],
-+ [libsystemd-journal],
-+ [AC_DEFINE_UNQUOTED([WITH_JOURNALD], 1, [journald is available])])])
- dnl Some older versions of pkg-config might not set these automatically
- dnl while setting CFLAGS and LIBS manually twice doesn't hurt.
- AC_SUBST([JOURNALD_CFLAGS])
diff --git a/debian/patches/series b/debian/patches/series
index 82d02dd..9e41f28 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
fix-obsolete-target.diff
-libsystemd.diff
commit 4b66b22f6fac4f103bfe4cbe409d34330e79a2ff
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Thu Oct 1 10:35:26 2015 +0300
common: Move libsss_krb5_common here from sssd-krb5-common to satisfy libsss_ldap_common depending on it.
diff --git a/debian/changelog b/debian/changelog
index c85d3aa..4231882 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ sssd (1.13.1-1) UNRELEASED; urgency=medium
* common: Add p11_child.
* ad: Drop libsss_ad_common, it was for tests only and not shipped
anymore.
+ * common: Move libsss_krb5_common here from sssd-krb5-common to satisfy
+ libsss_ldap_common depending on it.
-- Timo Aaltonen <tjaalton at debian.org> Wed, 30 Sep 2015 08:46:31 +0300
diff --git a/debian/control b/debian/control
index f1b1544..58495ce 100644
--- a/debian/control
+++ b/debian/control
@@ -95,8 +95,10 @@ Architecture: any
Depends: python, python-sss, ${misc:Depends}, ${shlibs:Depends}
Recommends: bind9-host, libnss-sss, libpam-sss, libsss-sudo
Suggests: apparmor, sssd-tools
-Breaks: sssd (<< 1.10.0~beta2-1)
-Replaces: sssd (<< 1.10.0~beta2-1)
+Breaks: sssd (<< 1.10.0~beta2-1),
+ sssd-krb5-common (<< 1.13.1-1),
+Replaces: sssd (<< 1.10.0~beta2-1),
+ sssd-krb5-common (<< 1.13.1-1),
Description: System Security Services Daemon -- common files
Provides a set of daemons to manage access to remote directories and
authentication mechanisms. It provides an NSS and PAM interface toward
diff --git a/debian/sssd-common.install b/debian/sssd-common.install
index 3d501f5..58cf10f 100644
--- a/debian/sssd-common.install
+++ b/debian/sssd-common.install
@@ -10,6 +10,7 @@ usr/lib/*/sssd/libsss_cert.so
usr/lib/*/sssd/libsss_child.so
usr/lib/*/sssd/libsss_crypt.so
usr/lib/*/sssd/libsss_debug.so
+usr/lib/*/sssd/libsss_krb5_common.so
usr/lib/*/sssd/libsss_ldap_common.so
usr/lib/*/sssd/libsss_semanage.so
usr/lib/*/sssd/libsss_simple.so
diff --git a/debian/sssd-krb5-common.install b/debian/sssd-krb5-common.install
index 1be0cb4..4ceddc0 100644
--- a/debian/sssd-krb5-common.install
+++ b/debian/sssd-krb5-common.install
@@ -1,3 +1,2 @@
usr/lib/*/sssd/krb5_child
usr/lib/*/sssd/ldap_child
-usr/lib/*/sssd/libsss_krb5_common.so
commit fa5b97c1ec861073bda268198ea90bc123cc3d6f
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Thu Oct 1 10:24:51 2015 +0300
ad: Drop libsss_ad_common, it was for tests only and not shipped anymore.
diff --git a/debian/changelog b/debian/changelog
index c764259..c85d3aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ sssd (1.13.1-1) UNRELEASED; urgency=medium
* Add support for python3 modules.
* tools: Add sss_override.
* common: Add p11_child.
+ * ad: Drop libsss_ad_common, it was for tests only and not shipped
+ anymore.
-- Timo Aaltonen <tjaalton at debian.org> Wed, 30 Sep 2015 08:46:31 +0300
diff --git a/debian/sssd-ad.install b/debian/sssd-ad.install
index e322572..764498f 100644
--- a/debian/sssd-ad.install
+++ b/debian/sssd-ad.install
@@ -1,4 +1,3 @@
usr/lib/*/sssd/gpo_child
usr/lib/*/sssd/libsss_ad.so
-usr/lib/*/sssd/libsss_ad_common.so
usr/share/man/man5/sssd-ad.5*
commit 2db0d2fcec5a0d20c32dcd57713e2d9b746d22bd
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Thu Oct 1 10:22:59 2015 +0300
common: Add p11_child.
diff --git a/debian/changelog b/debian/changelog
index 6ff8c6d..c764259 100644
--- a/debian/changelog
More information about the Pkg-sssd-devel
mailing list