[Pkg-freeipa-devel] freeipa: Changes to 'master-next'

Timo Aaltonen tjaalton at moszumanska.debian.org
Thu Jan 7 22:50:06 UTC 2016


 .gitignore                                                           |    5 
 .mailmap                                                             |    3 
 ACI.txt                                                              |   94 
 API.txt                                                              | 1391 
 BUILD.txt                                                            |   35 
 Contributors.txt                                                     |   18 
 Makefile                                                             |   19 
 VERSION                                                              |    8 
 checks/check-ra.py                                                   |   20 
 contrib/RHEL4/ipa-client-setup                                       |    4 
 contrib/RHEL4/ipachangeconf.py                                       |   10 
 daemons/configure.ac                                                 |    1 
 daemons/dnssec/ipa-dnskeysync-replica                                |   25 
 daemons/dnssec/ipa-dnskeysyncd                                       |   40 
 daemons/dnssec/ipa-ods-exporter                                      |  395 
 daemons/ipa-kdb/Makefile.am                                          |    6 
 daemons/ipa-kdb/README.s4u2proxy.txt                                 |   16 
 daemons/ipa-kdb/ipa_kdb.c                                            |  103 
 daemons/ipa-kdb/ipa_kdb.h                                            |   13 
 daemons/ipa-kdb/ipa_kdb_mspac.c                                      |  232 
 daemons/ipa-kdb/ipa_kdb_mspac_private.h                              |   57 
 daemons/ipa-kdb/ipa_kdb_passwords.c                                  |   16 
 daemons/ipa-kdb/ipa_kdb_principals.c                                 |  160 
 daemons/ipa-kdb/ipa_kdb_pwdpolicy.c                                  |    8 
 daemons/ipa-kdb/tests/ipa_kdb_tests.c                                |  451 
 daemons/ipa-otpd/test.py                                             |    5 
 daemons/ipa-sam/ipa_sam.c                                            |  115 
 daemons/ipa-slapi-plugins/Makefile.am                                |    1 
 daemons/ipa-slapi-plugins/ipa-cldap/ipa_cldap_tests.c                |    6 
 daemons/ipa-slapi-plugins/ipa-dns/ipa_dns.c                          |    2 
 daemons/ipa-slapi-plugins/ipa-extdom-extop/Makefile.am               |   20 
 daemons/ipa-slapi-plugins/ipa-extdom-extop/ipa_extdom.h              |   18 
 daemons/ipa-slapi-plugins/ipa-extdom-extop/ipa_extdom_cmocka_tests.c |  240 
 daemons/ipa-slapi-plugins/ipa-extdom-extop/ipa_extdom_common.c       |  107 
 daemons/ipa-slapi-plugins/ipa-extdom-extop/ipa_extdom_extop.c        |    7 
 daemons/ipa-slapi-plugins/ipa-extdom-extop/ipa_extdom_tests.c        |  203 
 daemons/ipa-slapi-plugins/ipa-extdom-extop/test_data/group           | 1000 
 daemons/ipa-slapi-plugins/ipa-lockout/ipa_lockout.c                  |    4 
 daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c              |    4 
 daemons/ipa-slapi-plugins/ipa-pwd-extop/prepost.c                    |   48 
 daemons/ipa-slapi-plugins/ipa-sidgen/ipa_sidgen.c                    |    2 
 daemons/ipa-slapi-plugins/ipa-uuid/ipa_uuid.c                        |   16 
 daemons/ipa-slapi-plugins/libotp/otp_token.c                         |   12 
 daemons/ipa-slapi-plugins/topology/Makefile.am                       |   51 
 daemons/ipa-slapi-plugins/topology/ipa-topology-conf.ldif            |   21 
 daemons/ipa-slapi-plugins/topology/topology.h                        |  315 
 daemons/ipa-slapi-plugins/topology/topology_agmt.c                   |  315 
 daemons/ipa-slapi-plugins/topology/topology_cfg.c                    |  883 
 daemons/ipa-slapi-plugins/topology/topology_init.c                   |  328 
 daemons/ipa-slapi-plugins/topology/topology_post.c                   |  289 
 daemons/ipa-slapi-plugins/topology/topology_pre.c                    |  607 
 daemons/ipa-slapi-plugins/topology/topology_util.c                   | 1912 +
 debian/changelog                                                     |   55 
 debian/control                                                       |  202 
 debian/freeipa-admintools.install                                    |    2 
 debian/freeipa-client.install                                        |    1 
 debian/freeipa-common.install                                        |    1 
 debian/freeipa-server-dns.dirs                                       |    2 
 debian/freeipa-server-dns.install                                    |    3 
 debian/freeipa-server-dns.lintian-overrides                          |    3 
 debian/freeipa-server-dns.postinst                                   |    8 
 debian/freeipa-server-trust-ad.install                               |    5 
 debian/freeipa-server.dirs                                           |    2 
 debian/freeipa-server.install                                        |   52 
 debian/freeipa-server.postinst                                       |   25 
 debian/freeipa-server.postrm                                         |    5 
 debian/freeipa-server.prerm                                          |    3 
 debian/freeipa-server.tmpfile                                        |    3 
 debian/freeipa-tests.install                                         |    2 
 debian/freeipa-tests.lintian-overrides                               |    3 
 debian/generate-rndc-key.sh                                          |    2 
 debian/patches/add-debian-platform.diff                              |  466 
 debian/patches/fix-certmonger-script-install.diff                    |   60 
 debian/patches/fix-hyphen-used-as-minus-sign.patch                   |   77 
 debian/patches/fix-ipa-conf.diff                                     |   41 
 debian/patches/fix-ipa-otpd-install.diff                             |   12 
 debian/patches/fix-kdcproxy-paths.diff                               |   45 
 debian/patches/fix-manpage-has-errors-from-man.patch                 |   96 
 debian/patches/fix-match-hostname.diff                               |   11 
 debian/patches/fix-pykerberos-api.diff                               |   12 
 debian/patches/fix-typo.patch                                        |   14 
 debian/patches/no-test-lang.diff                                     |    2 
 debian/patches/port-ipa-client-automount.diff                        |   11 
 debian/patches/prefix.patch                                          |   44 
 debian/patches/revert-pykerberos-api-change.diff                     |   24 
 debian/patches/series                                                |   17 
 debian/patches/work-around-apache-fail.diff                          |   52 
 debian/python-freeipa.install                                        |    9 
 debian/python-ipaclient.install                                      |    1 
 debian/python-ipalib.install                                         |   11 
 debian/python-ipaserver.install                                      |    1 
 debian/python-ipatests.install                                       |    2 
 debian/python-ipatests.lintian-overrides                             |    2 
 debian/rules                                                         |   34 
 dev/null                                                             |binary
 doc/examples/examples.py                                             |    6 
 doc/examples/python-api.py                                           |    8 
 doc/guide/guide.org                                                  |    2 
 doc/guide/wsgi.py.txt                                                |    2 
 freeipa.spec.in                                                      |  865 
 init/systemd/httpd.service                                           |    7 
 init/systemd/ipa-custodia.service                                    |   13 
 init/systemd/ipa.conf.tmpfiles                                       |    3 
 install/Makefile.am                                                  |    1 
 install/certmonger/dogtag-ipa-ca-renew-agent-submit                  |   38 
 install/certmonger/ipa-server-guard                                  |   22 
 install/conf/Makefile.am                                             |    1 
 install/conf/ipa-kdc-proxy.conf.template                             |   30 
 install/conf/ipa-pki-proxy.conf                                      |   22 
 install/conf/ipa.conf                                                |   48 
 install/configure.ac                                                 |    2 
 install/html/browserconfig.html                                      |   25 
 install/html/ffconfig_page.js                                        |   24 
 install/html/ssbrowser.html                                          |  125 
 install/migration/migration.py                                       |   39 
 install/oddjob/Makefile.am                                           |   31 
 install/oddjob/com.redhat.idm.trust-fetch-domains                    |  202 
 install/oddjob/etc/dbus-1/system.d/oddjob-ipa-trust.conf             |   40 
 install/oddjob/etc/dbus-1/system.d/org.freeipa.server.conf           |   21 
 install/oddjob/etc/oddjobd.conf.d/ipa-server.conf                    |   20 
 install/oddjob/etc/oddjobd.conf.d/oddjobd-ipa-trust.conf             |   21 
 install/oddjob/org.freeipa.server.conncheck                          |    2 
 install/po/Makefile.in                                               |    9 
 install/po/bn_IN.po                                                  |   15 
 install/po/ca.po                                                     |  148 
 install/po/cs.po                                                     |  116 
 install/po/de.po                                                     | 1949 +
 install/po/es.po                                                     |  343 
 install/po/eu.po                                                     |  127 
 install/po/fr.po                                                     | 8596 +++--
 install/po/hi.po                                                     |   13 
 install/po/hu.po                                                     |   25 
 install/po/id.po                                                     |   23 
 install/po/ipa.pot                                                   |16628 ++++++----
 install/po/ja.po                                                     |   13 
 install/po/kn.po                                                     |  127 
 install/po/nl.po                                                     |   13 
 install/po/pl.po                                                     |  220 
 install/po/pygettext.py                                              |  819 
 install/po/ru.po                                                     | 1205 
 install/po/tg.po                                                     |   93 
 install/po/uk.po                                                     | 3920 +-
 install/po/zh_CN.po                                                  |  136 
 install/restart_scripts/Makefile.am                                  |    1 
 install/restart_scripts/renew_ca_cert                                |   45 
 install/restart_scripts/renew_ra_cert                                |   19 
 install/restart_scripts/renew_ra_cert_pre                            |   18 
 install/restart_scripts/restart_dirsrv                               |    2 
 install/restart_scripts/restart_httpd                                |    2 
 install/restart_scripts/stop_pkicad                                  |    9 
 install/share/60basev3.ldif                                          |   10 
 install/share/60certificate-profiles.ldif                            |    8 
 install/share/60ipadns.ldif                                          |    9 
 install/share/60kerberos.ldif                                        |   14 
 install/share/70topology.ldif                                        |   15 
 install/share/72domainlevels.ldif                                    |    6 
 install/share/Makefile.am                                            |   14 
 install/share/bootstrap-template.ldif                                |   35 
 install/share/ca-topology.uldif                                      |   14 
 install/share/copy-schema-to-ca.py                                   |   33 
 install/share/custodia.conf.template                                 |   28 
 install/share/default-aci.ldif                                       |   12 
 install/share/delegation.ldif                                        |   16 
 install/share/disable-betxn.ldif                                     |   61 
 install/share/dns.ldif                                               |    2 
 install/share/domainlevel.ldif                                       |    7 
 install/share/indices.ldif                                           |   35 
 install/share/kdcproxy-disable.uldif                                 |    3 
 install/share/kdcproxy-enable.uldif                                  |    6 
 install/share/kdcproxy.conf                                          |    4 
 install/share/master-entry.ldif                                      |    6 
 install/share/opendnssec_kasp.template                               |   79 
 install/share/preferences.html.template                              |   90 
 install/share/profiles/IECUserRoles.cfg                              |  114 
 install/share/profiles/Makefile.am                                   |   15 
 install/share/profiles/caIPAserviceCert.cfg                          |  109 
 install/share/replica-acis.ldif                                      |    6 
 install/share/schema_compat.uldif                                    |   58 
 install/share/topology-entries.ldif                                  |   16 
 install/share/unique-attributes.ldif                                 |   44 
 install/share/vault.ldif                                             |   29 
 install/share/wsgi.py                                                |    2 
 install/tools/Makefile.am                                            |    8 
 install/tools/ipa-adtrust-install                                    |  281 
 install/tools/ipa-ca-install                                         |  451 
 install/tools/ipa-compat-manage                                      |   64 
 install/tools/ipa-csreplica-manage                                   |  128 
 install/tools/ipa-dns-install                                        |  196 
 install/tools/ipa-httpd-kdcproxy                                     |  216 
 install/tools/ipa-kra-install                                        |   23 
 install/tools/ipa-managed-entries                                    |   55 
 install/tools/ipa-nis-manage                                         |   42 
 install/tools/ipa-replica-conncheck                                  |  260 
 install/tools/ipa-replica-install                                    |  782 
 install/tools/ipa-replica-manage                                     |  634 
 install/tools/ipa-server-install                                     | 1388 
 install/tools/ipa-server-upgrade                                     |   12 
 install/tools/ipa-upgradeconfig                                      | 1473 
 install/tools/ipa-winsync-migrate                                    |   23 
 install/tools/ipactl                                                 |  143 
 install/tools/man/Makefile.am                                        |    3 
 install/tools/man/ipa-adtrust-install.1                              |   45 
 install/tools/man/ipa-csreplica-manage.1                             |   17 
 install/tools/man/ipa-dns-install.1                                  |   28 
 install/tools/man/ipa-kra-install.1                                  |   56 
 install/tools/man/ipa-ldap-updater.1                                 |   49 
 install/tools/man/ipa-replica-conncheck.1                            |    6 
 install/tools/man/ipa-replica-install.1                              |   78 
 install/tools/man/ipa-replica-manage.1                               |   15 
 install/tools/man/ipa-server-install.1                               |   29 
 install/tools/man/ipa-server-upgrade.1                               |   46 
 install/tools/man/ipa-winsync-migrate.1                              |   52 
 install/tools/man/ipactl.8                                           |    8 
 install/ui/README-LICENSE.txt                                        |   35 
 install/ui/css/Makefile.am                                           |    1 
 install/ui/css/bootstrap-datepicker3.min.css                         |    8 
 install/ui/css/patternfly.css                                        |    4 
 install/ui/doc/categories.json                                       |   23 
 install/ui/images/Makefile.am                                        |    2 
 install/ui/index.html                                                |   13 
 install/ui/ipa.css                                                   |   10 
 install/ui/jsl.conf                                                  |    2 
 install/ui/less/patternfly.less                                      |   19 
 install/ui/less/widgets.less                                         |  100 
 install/ui/src/freeipa/Application_controller.js                     |   95 
 install/ui/src/freeipa/_base/Builder.js                              |   42 
 install/ui/src/freeipa/_base/Singleton_registry.js                   |   38 
 install/ui/src/freeipa/app.js                                        |    5 
 install/ui/src/freeipa/app_container.js                              |   18 
 install/ui/src/freeipa/association.js                                |   24 
 install/ui/src/freeipa/automember.js                                 |    5 
 install/ui/src/freeipa/certificate.js                                |  246 
 install/ui/src/freeipa/details.js                                    |   84 
 install/ui/src/freeipa/dialog.js                                     |  218 
 install/ui/src/freeipa/dialogs/password.js                           |  201 
 install/ui/src/freeipa/dns.js                                        |    2 
 install/ui/src/freeipa/entity.js                                     |   55 
 install/ui/src/freeipa/facet.js                                      |  675 
 install/ui/src/freeipa/facets/ActionMixin.js                         |   49 
 install/ui/src/freeipa/facets/Facet.js                               |   11 
 install/ui/src/freeipa/facets/HeaderMixin.js                         |  259 
 install/ui/src/freeipa/field.js                                      |   40 
 install/ui/src/freeipa/group.js                                      |   10 
 install/ui/src/freeipa/host.js                                       |   19 
 install/ui/src/freeipa/ipa.js                                        |   29 
 install/ui/src/freeipa/navigation.js                                 |    4 
 install/ui/src/freeipa/navigation/Menu.js                            |   21 
 install/ui/src/freeipa/navigation/Router.js                          |    2 
 install/ui/src/freeipa/navigation/menu_spec.js                       |   72 
 install/ui/src/freeipa/navigation/routing.js                         |    4 
 install/ui/src/freeipa/otptoken.js                                   |    6 
 install/ui/src/freeipa/plugins/api_browser.js                        |  106 
 install/ui/src/freeipa/plugins/caacl.js                              |  379 
 install/ui/src/freeipa/plugins/certprofile.js                        |   84 
 install/ui/src/freeipa/rpc.js                                        |   21 
 install/ui/src/freeipa/search.js                                     |   47 
 install/ui/src/freeipa/serverconfig.js                               |    6 
 install/ui/src/freeipa/service.js                                    |   28 
 install/ui/src/freeipa/stageuser.js                                  |  384 
 install/ui/src/freeipa/topology.js                                   |  964 
 install/ui/src/freeipa/topology_graph.js                             |  380 
 install/ui/src/freeipa/trust.js                                      |   13 
 install/ui/src/freeipa/user.js                                       |  270 
 install/ui/src/freeipa/widget.js                                     |  294 
 install/ui/src/freeipa/widgets/APIBrowserWidget.js                   |  383 
 install/ui/src/freeipa/widgets/ActionDropdownWidget.js               |    6 
 install/ui/src/freeipa/widgets/ListViewWidget.js                     |  233 
 install/ui/src/freeipa/widgets/LoginScreen.js                        |    2 
 install/ui/src/freeipa/widgets/browser_widgets.js                    |  503 
 install/ui/src/libs/Makefile.am                                      |    3 
 install/ui/src/libs/bootstrap-datepicker.js                          |    8 
 install/ui/src/libs/d3.js                                            |    5 
 install/ui/src/libs/jquery.ordered-map.js                            |   18 
 install/ui/src/libs/patternfly.js                                    |    1 
 install/ui/test/data/ipa_init.json                                   |   58 
 install/ui/test/data/ipa_init_commands.json                          |    6 
 install/ui/test/data/ipa_init_objects.json                           |    6 
 install/ui/test/data/json_metadata.json                              |    4 
 install/ui/test/ordered_map_tests.js                                 |    5 
 install/ui/util/make-ui.sh                                           |    2 
 install/updates/05-pre_upgrade_plugins.update                        |   10 
 install/updates/10-config.update                                     |    4 
 install/updates/10-schema_compat.update                              |   78 
 install/updates/10-uniqueness.update                                 |   56 
 install/updates/19-managed-entries.update                            |    2 
 install/updates/20-aci.update                                        |  111 
 install/updates/20-dna.update                                        |    1 
 install/updates/20-indices.update                                    |  117 
 install/updates/20-ipaservers_hostgroup.update                       |   13 
 install/updates/20-replication.update                                |   59 
 install/updates/20-syncrepl.update                                   |   12 
 install/updates/20-winsync_index.update                              |    6 
 install/updates/25-referint.update                                   |    3 
 install/updates/30-provisioning.update                               |   49 
 install/updates/40-automember.update                                 |    2 
 install/updates/40-certprofile.update                                |    9 
 install/updates/40-delegation.update                                 |   75 
 install/updates/40-dns.update                                        |   18 
 install/updates/40-otp.update                                        |   22 
 install/updates/40-replication.update                                |    6 
 install/updates/40-vault.update                                      |   24 
 install/updates/41-caacl.update                                      |    4 
 install/updates/45-roles.update                                      |   35 
 install/updates/50-dogtag10-migration.update                         |   15 
 install/updates/50-lockout-policy.update                             |    4 
 install/updates/50-nis.update                                        |   24 
 install/updates/55-pbacmemberof.update                               |    4 
 install/updates/60-trusts.update                                     |   13 
 install/updates/61-trusts-s4u2proxy.update                           |    2 
 install/updates/72-domainlevels.update                               |   14 
 install/updates/73-custodia.update                                   |    4 
 install/updates/73-winsync.update                                    |    3 
 install/updates/90-post_upgrade_plugins.update                       |   21 
 install/updates/Makefile.am                                          |   11 
 install/wsgi/plugins.py                                              |    8 
 ipa-client/Makefile.am                                               |   24 
 ipa-client/configure.ac                                              |   28 
 ipa-client/ipa-client.spec.in                                        |    2 
 ipa-client/ipa-getkeytab.c                                           |   95 
 ipa-client/ipa-install/ipa-client-automount                          |  176 
 ipa-client/ipa-install/ipa-client-install                            |  834 
 ipa-client/ipaclient/ipa_certupdate.py                               |   26 
 ipa-client/ipaclient/ipachangeconf.py                                |   43 
 ipa-client/ipaclient/ipadiscovery.py                                 |   12 
 ipa-client/ipaclient/ntpconf.py                                      |   18 
 ipa-client/man/default.conf.5                                        |   16 
 ipa-client/man/ipa-client-install.1                                  |   71 
 ipa-client/man/ipa-getkeytab.1                                       |   12 
 ipalib/Makefile                                                      |   25 
 ipalib/__init__.py                                                   |   47 
 ipalib/aci.py                                                        |   58 
 ipalib/backend.py                                                    |   21 
 ipalib/base.py                                                       |   11 
 ipalib/certstore.py                                                  |    4 
 ipalib/cli.py                                                        |  122 
 ipalib/config.py                                                     |   33 
 ipalib/constants.py                                                  |   46 
 ipalib/crud.py                                                       |    8 
 ipalib/errors.py                                                     |   40 
 ipalib/frontend.py                                                   |  139 
 ipalib/krb_utils.py                                                  |  342 
 ipalib/messages.py                                                   |  135 
 ipalib/output.py                                                     |   16 
 ipalib/parameters.py                                                 |  136 
 ipalib/pkcs10.py                                                     |   31 
 ipalib/plugable.py                                                   |  640 
 ipalib/plugins/aci.py                                                |   23 
 ipalib/plugins/automember.py                                         |    4 
 ipalib/plugins/automount.py                                          |   13 
 ipalib/plugins/baseldap.py                                           |  364 
 ipalib/plugins/baseuser.py                                           |  652 
 ipalib/plugins/batch.py                                              |    9 
 ipalib/plugins/caacl.py                                              |  562 
 ipalib/plugins/cert.py                                               |  284 
 ipalib/plugins/certprofile.py                                        |  349 
 ipalib/plugins/config.py                                             |   29 
 ipalib/plugins/dns.py                                                |  600 
 ipalib/plugins/domainlevel.py                                        |  138 
 ipalib/plugins/group.py                                              |   19 
 ipalib/plugins/hbacrule.py                                           |    2 
 ipalib/plugins/hbactest.py                                           |   20 
 ipalib/plugins/host.py                                               |  195 
 ipalib/plugins/hostgroup.py                                          |   32 
 ipalib/plugins/idrange.py                                            |   57 
 ipalib/plugins/idviews.py                                            |  231 
 ipalib/plugins/internal.py                                           |   60 
 ipalib/plugins/kerberos.py                                           |  125 
 ipalib/plugins/migration.py                                          |  109 
 ipalib/plugins/misc.py                                               |    7 
 ipalib/plugins/netgroup.py                                           |    8 
 ipalib/plugins/otptoken.py                                           |   84 
 ipalib/plugins/otptoken_yubikey.py                                   |    4 
 ipalib/plugins/passwd.py                                             |    6 
 ipalib/plugins/permission.py                                         |   57 
 ipalib/plugins/privilege.py                                          |   51 
 ipalib/plugins/pwpolicy.py                                           |   24 
 ipalib/plugins/radiusproxy.py                                        |    2 
 ipalib/plugins/realmdomains.py                                       |  176 
 ipalib/plugins/role.py                                               |    8 
 ipalib/plugins/selinuxusermap.py                                     |    2 
 ipalib/plugins/server.py                                             |  258 
 ipalib/plugins/service.py                                            |  227 
 ipalib/plugins/servicedelegation.py                                  |  542 
 ipalib/plugins/session.py                                            |   33 
 ipalib/plugins/stageuser.py                                          |  728 
 ipalib/plugins/sudorule.py                                           |   15 
 ipalib/plugins/topology.py                                           |  538 
 ipalib/plugins/trust.py                                              |  403 
 ipalib/plugins/user.py                                               |  928 
 ipalib/plugins/vault.py                                              | 2115 +
 ipalib/plugins/virtual.py                                            |    2 
 ipalib/request.py                                                    |    9 
 ipalib/rpc.py                                                        |  355 
 ipalib/session.py                                                    |   69 
 ipalib/setup.py.in                                                   |   73 
 ipalib/text.py                                                       |   42 
 ipalib/util.py                                                       |  402 
 ipalib/x509.py                                                       |   35 
 ipaplatform/__init__.py                                              |   22 
 ipaplatform/__init__.py.in                                           |   12 
 ipaplatform/base/constants.py                                        |   19 
 ipaplatform/base/paths.py                                            |   79 
 ipaplatform/base/services.py                                         |   81 
 ipaplatform/base/tasks.py                                            |   34 
 ipaplatform/fedora/constants.py                                      |   16 
 ipaplatform/redhat/authconfig.py                                     |   18 
 ipaplatform/redhat/constants.py                                      |   17 
 ipaplatform/redhat/services.py                                       |   66 
 ipaplatform/redhat/tasks.py                                          |  105 
 ipaplatform/rhel/constants.py                                        |   16 
 ipaplatform/setup.py.in                                              |    2 
 ipapython/Makefile                                                   |   21 
 ipapython/admintool.py                                               |    8 
 ipapython/certdb.py                                                  |   50 
 ipapython/certmonger.py                                              |  165 
 ipapython/config.py                                                  |   25 
 ipapython/cookie.py                                                  |   23 
 ipapython/dn.py                                                      |  855 
 ipapython/dnssec/abshsm.py                                           |   19 
 ipapython/dnssec/bindmgr.py                                          |   10 
 ipapython/dnssec/keysyncer.py                                        |    9 
 ipapython/dnssec/ldapkeydb.py                                        |   12 
 ipapython/dnssec/localhsm.py                                         |   66 
 ipapython/dnssec/odsmgr.py                                           |    5 
 ipapython/dnssec/syncrepl.py                                         |    1 
 ipapython/dnssec/temp.py                                             |    1 
 ipapython/dnsutil.py                                                 |   24 
 ipapython/dogtag.py                                                  |  188 
 ipapython/errors.py                                                  |    2 
 ipapython/graph.py                                                   |   80 
 ipapython/install/__init__.py                                        |    7 
 ipapython/install/cli.py                                             |  360 
 ipapython/install/common.py                                          |  115 
 ipapython/install/core.py                                            |  580 
 ipapython/install/util.py                                            |  164 
 ipapython/ipa_log_manager.py                                         |    6 
 ipapython/ipaldap.py                                                 | 1218 
 ipapython/ipap11helper/Makefile                                      |   11 
 ipapython/ipap11helper/p11helper.c                                   |  282 
 ipapython/ipap11helper/setup.py                                      |    2 
 ipapython/ipautil.py                                                 |  612 
 ipapython/kernel_keyring.py                                          |   58 
 ipapython/log_manager.py                                             |   41 
 ipapython/nsslib.py                                                  |  134 
 ipapython/p11helper.py                                               |    3 
 ipapython/py_default_encoding/Makefile                               |   21 
 ipapython/secrets/client.py                                          |  103 
 ipapython/secrets/common.py                                          |   45 
 ipapython/secrets/kem.py                                             |  204 
 ipapython/secrets/store.py                                           |  198 
 ipapython/setup.py.in                                                |    7 
 ipapython/ssh.py                                                     |   22 
 ipapython/sysrestore.py                                              |   58 
 ipaserver/advise/base.py                                             |   88 
 ipaserver/advise/plugins/fedora_authconfig.py                        |    9 
 ipaserver/advise/plugins/legacy_clients.py                           |   41 
 ipaserver/dcerpc.py                                                  |  298 
 ipaserver/install/Makefile.am                                        |   27 
 ipaserver/install/adtrustinstance.py                                 |  139 
 ipaserver/install/bindinstance.py                                    |  436 
 ipaserver/install/ca.py                                              |  251 
 ipaserver/install/cainstance.py                                      | 1663 -
 ipaserver/install/certs.py                                           |   58 
 ipaserver/install/custodiainstance.py                                |  172 
 ipaserver/install/dns.py                                             |  406 
 ipaserver/install/dnskeysyncinstance.py                              |   77 
 ipaserver/install/dogtaginstance.py                                  |  501 
 ipaserver/install/dsinstance.py                                      |  494 
 ipaserver/install/httpinstance.py                                    |  230 
 ipaserver/install/installutils.py                                    |  660 
 ipaserver/install/ipa_backup.py                                      |  200 
 ipaserver/install/ipa_cacert_manage.py                               |   74 
 ipaserver/install/ipa_kra_install.py                                 |  225 
 ipaserver/install/ipa_ldap_updater.py                                |  147 
 ipaserver/install/ipa_otptoken_import.py                             |   34 
 ipaserver/install/ipa_replica_prepare.py                             |  114 
 ipaserver/install/ipa_restore.py                                     |  175 
 ipaserver/install/ipa_server_certinstall.py                          |   15 
 ipaserver/install/ipa_server_upgrade.py                              |   58 
 ipaserver/install/ipa_winsync_migrate.py                             |  382 
 ipaserver/install/kra.py                                             |  114 
 ipaserver/install/krainstance.py                                     |  445 
 ipaserver/install/krbinstance.py                                     |  154 
 ipaserver/install/ldapupdate.py                                      |  733 
 ipaserver/install/memcacheinstance.py                                |    2 
 ipaserver/install/ntpinstance.py                                     |   35 
 ipaserver/install/odsexporterinstance.py                             |   62 
 ipaserver/install/opendnssecinstance.py                              |  169 
 ipaserver/install/otpdinstance.py                                    |    2 
 ipaserver/install/plugins/Makefile.am                                |   25 
 ipaserver/install/plugins/__init__.py                                |    7 
 ipaserver/install/plugins/adtrust.py                                 |   84 
 ipaserver/install/plugins/baseupdate.py                              |   89 
 ipaserver/install/plugins/ca_renewal_master.py                       |   34 
 ipaserver/install/plugins/dns.py                                     |  102 
 ipaserver/install/plugins/fix_replica_agreements.py                  |   22 
 ipaserver/install/plugins/rename_managed.py                          |   92 
 ipaserver/install/plugins/update_ca_topology.py                      |   33 
 ipaserver/install/plugins/update_idranges.py                         |   47 
 ipaserver/install/plugins/update_managed_permissions.py              |   64 
 ipaserver/install/plugins/update_pacs.py                             |   15 
 ipaserver/install/plugins/update_passsync.py                         |   32 
 ipaserver/install/plugins/update_referint.py                         |   21 
 ipaserver/install/plugins/update_services.py                         |   26 
 ipaserver/install/plugins/update_uniqueness.py                       |  267 
 ipaserver/install/plugins/updateclient.py                            |  160 
 ipaserver/install/plugins/upload_cacrt.py                            |   14 
 ipaserver/install/replication.py                                     |  601 
 ipaserver/install/schemaupdate.py                                    |   26 
 ipaserver/install/server/__init__.py                                 |    8 
 ipaserver/install/server/common.py                                   |  498 
 ipaserver/install/server/install.py                                  | 1470 
 ipaserver/install/server/replicainstall.py                           | 1557 
 ipaserver/install/server/upgrade.py                                  | 1679 +
 ipaserver/install/service.py                                         |  106 
 ipaserver/install/sysupgrade.py                                      |    7 
 ipaserver/install/upgradeinstance.py                                 |  215 
 ipaserver/plugins/dogtag.py                                          |  495 
 ipaserver/plugins/join.py                                            |   14 
 ipaserver/plugins/ldap2.py                                           |  309 
 ipaserver/plugins/rabase.py                                          |    7 
 ipaserver/rpcserver.py                                               |  179 
 ipatests/beakerlib_plugin.py                                         |  285 
 ipatests/data.py                                                     |    8 
 ipatests/i18n.py                                                     |   64 
 ipatests/ipa-run-tests                                               |   56 
 ipatests/ipa-test-config                                             |    9 
 ipatests/ipa-test-task                                               |   28 
 ipatests/man/ipa-test-config.1                                       |    4 
 ipatests/man/ipa-test-task.1                                         |    2 
 ipatests/order_plugin.py                                             |  106 
 ipatests/pytest.ini                                                  |   28 
 ipatests/pytest_plugins/beakerlib.py                                 |   57 
 ipatests/pytest_plugins/declarative.py                               |   47 
 ipatests/pytest_plugins/integration.py                               |  237 
 ipatests/pytest_plugins/nose_compat.py                               |   73 
 ipatests/setup.py.in                                                 |    8 
 ipatests/test_cmdline/__init__.py                                    |    3 
 ipatests/test_cmdline/cmdline.py                                     |   28 
 ipatests/test_cmdline/test_cli.py                                    |  122 
 ipatests/test_cmdline/test_help.py                                   |   12 
 ipatests/test_cmdline/test_ipagetkeytab.py                           |   42 
 ipatests/test_install/test_updates.py                                |    5 
 ipatests/test_integration/base.py                                    |   83 
 ipatests/test_integration/config.py                                  |  428 
 ipatests/test_integration/env_config.py                              |  364 
 ipatests/test_integration/host.py                                    |  238 
 ipatests/test_integration/tasks.py                                   |  328 
 ipatests/test_integration/test_advise.py                             |   10 
 ipatests/test_integration/test_backup_and_restore.py                 |  209 
 ipatests/test_integration/test_caless.py                             |   55 
 ipatests/test_integration/test_customized_ds_config_install.py       |   94 
 ipatests/test_integration/test_dnssec.py                             |  542 
 ipatests/test_integration/test_forced_client_reenrollment.py         |   49 
 ipatests/test_integration/test_installation.py                       |  200 
 ipatests/test_integration/test_legacy_clients.py                     |   54 
 ipatests/test_integration/test_ordering.py                           |   54 
 ipatests/test_integration/test_replication_layouts.py                |   87 
 ipatests/test_integration/test_simple_replication.py                 |    4 
 ipatests/test_integration/test_sudo.py                               |   40 
 ipatests/test_integration/test_testconfig.py                         |   17 
 ipatests/test_integration/test_topology.py                           |  154 
 ipatests/test_integration/test_trust.py                              |    4 
 ipatests/test_integration/test_vault.py                              |  200 
 ipatests/test_integration/transport.py                               |  443 
 ipatests/test_integration/util.py                                    |   27 
 ipatests/test_ipalib/test_aci.py                                     |   23 
 ipatests/test_ipalib/test_backend.py                                 |   62 
 ipatests/test_ipalib/test_base.py                                    |   25 
 ipatests/test_ipalib/test_capabilities.py                            |    3 
 ipatests/test_ipalib/test_cli.py                                     |    8 
 ipatests/test_ipalib/test_config.py                                  |   19 
 ipatests/test_ipalib/test_crud.py                                    |   12 
 ipatests/test_ipalib/test_errors.py                                  |   45 
 ipatests/test_ipalib/test_frontend.py                                |  278 
 ipatests/test_ipalib/test_messages.py                                |    5 
 ipatests/test_ipalib/test_output.py                                  |    7 
 ipatests/test_ipalib/test_parameters.py                              |  105 
 ipatests/test_ipalib/test_plugable.py                                |  300 
 ipatests/test_ipalib/test_rpc.py                                     |   81 
 ipatests/test_ipalib/test_text.py                                    |   16 
 ipatests/test_ipalib/test_x509.py                                    |   25 
 ipatests/test_ipapython/test_cookie.py                               |    4 
 ipatests/test_ipapython/test_dn.py                                   | 2662 -
 ipatests/test_ipapython/test_ipap11helper.py                         |  277 
 ipatests/test_ipapython/test_ipautil.py                              |  140 
 ipatests/test_ipapython/test_ipavalidate.py                          |    9 
 ipatests/test_ipapython/test_keyring.py                              |   29 
 ipatests/test_ipapython/test_secrets.py                              |   55 
 ipatests/test_ipapython/test_ssh.py                                  |   41 
 ipatests/test_ipaserver/httptest.py                                  |   14 
 ipatests/test_ipaserver/test_changepw.py                             |   15 
 ipatests/test_ipaserver/test_install/test_adtrustinstance.py         |    8 
 ipatests/test_ipaserver/test_install/test_service.py                 |    2 
 ipatests/test_ipaserver/test_ldap.py                                 |   48 
 ipatests/test_ipaserver/test_otptoken_import.py                      |   11 
 ipatests/test_ipaserver/test_rpcserver.py                            |   29 
 ipatests/test_ipaserver/test_topology_plugin.py                      |   75 
 ipatests/test_pkcs10/test_pkcs10.py                                  |   17 
 ipatests/test_util.py                                                |   21 
 ipatests/test_webui/test_automember.py                               |    3 
 ipatests/test_webui/test_automount.py                                |    2 
 ipatests/test_webui/test_cert.py                                     |    6 
 ipatests/test_webui/test_config.py                                   |    2 
 ipatests/test_webui/test_delegation.py                               |    2 
 ipatests/test_webui/test_dns.py                                      |    6 
 ipatests/test_webui/test_group.py                                    |    2 
 ipatests/test_webui/test_hbac.py                                     |    2 
 ipatests/test_webui/test_host.py                                     |    7 
 ipatests/test_webui/test_hostgroup.py                                |    8 
 ipatests/test_webui/test_krbtpolicy.py                               |    2 
 ipatests/test_webui/test_navigation.py                               |    2 
 ipatests/test_webui/test_netgroup.py                                 |    5 
 ipatests/test_webui/test_pwpolicy.py                                 |    2 
 ipatests/test_webui/test_range.py                                    |    2 
 ipatests/test_webui/test_rbac.py                                     |    2 
 ipatests/test_webui/test_realmdomains.py                             |    6 
 ipatests/test_webui/test_selfservice.py                              |    2 
 ipatests/test_webui/test_selinuxusermap.py                           |    5 
 ipatests/test_webui/test_service.py                                  |    3 
 ipatests/test_webui/test_sudo.py                                     |    5 
 ipatests/test_webui/test_trust.py                                    |   11 
 ipatests/test_webui/test_user.py                                     |    2 
 ipatests/test_webui/ui_driver.py                                     |   51 
 ipatests/test_xmlrpc/data/caIPAserviceCert.xml.tmpl                  |  619 
 ipatests/test_xmlrpc/data/caIPAserviceCert_mal.cfg.tmpl              |  109 
 ipatests/test_xmlrpc/data/caIPAserviceCert_mod.cfg.tmpl              |  109 
 ipatests/test_xmlrpc/data/caIPAserviceCert_mod_mal.cfg.tmpl          |  109 
 ipatests/test_xmlrpc/data/smime-mod.cfg.tmpl                         |  108 
 ipatests/test_xmlrpc/data/smime.cfg.tmpl                             |  108 
 ipatests/test_xmlrpc/data/usercert-priv-key.pem                      |   27 
 ipatests/test_xmlrpc/data/usercert.conf.tmpl                         |   13 
 ipatests/test_xmlrpc/objectclasses.py                                |   21 
 ipatests/test_xmlrpc/test_add_remove_cert_cmd.py                     |  354 
 ipatests/test_xmlrpc/test_attr.py                                    |    5 
 ipatests/test_xmlrpc/test_automember_plugin.py                       |    7 
 ipatests/test_xmlrpc/test_automount_plugin.py                        |   25 
 ipatests/test_xmlrpc/test_baseldap_plugin.py                         |   35 
 ipatests/test_xmlrpc/test_batch_plugin.py                            |    5 
 ipatests/test_xmlrpc/test_caacl_plugin.py                            |  141 
 ipatests/test_xmlrpc/test_caacl_profile_enforcement.py               |  240 
 ipatests/test_xmlrpc/test_cert_plugin.py                             |   33 
 ipatests/test_xmlrpc/test_certprofile_plugin.py                      |  221 
 ipatests/test_xmlrpc/test_config_plugin.py                           |    6 
 ipatests/test_xmlrpc/test_delegation_plugin.py                       |    6 
 ipatests/test_xmlrpc/test_dns_plugin.py                              |  844 
 ipatests/test_xmlrpc/test_dns_realmdomains_integration.py            |    9 
 ipatests/test_xmlrpc/test_external_members.py                        |    9 
 ipatests/test_xmlrpc/test_group_plugin.py                            |   86 
 ipatests/test_xmlrpc/test_hbac_plugin.py                             |    5 
 ipatests/test_xmlrpc/test_hbacsvcgroup_plugin.py                     |    2 
 ipatests/test_xmlrpc/test_hbactest_plugin.py                         |    9 
 ipatests/test_xmlrpc/test_host_plugin.py                             | 2507 -
 ipatests/test_xmlrpc/test_hostgroup_plugin.py                        |    2 
 ipatests/test_xmlrpc/test_idviews_plugin.py                          |  182 
 ipatests/test_xmlrpc/test_krbtpolicy.py                              |    7 
 ipatests/test_xmlrpc/test_nesting.py                                 |    5 
 ipatests/test_xmlrpc/test_netgroup_plugin.py                         |   15 
 ipatests/test_xmlrpc/test_old_permission_plugin.py                   |   14 
 ipatests/test_xmlrpc/test_passwd_plugin.py                           |    4 
 ipatests/test_xmlrpc/test_permission_plugin.py                       |   39 
 ipatests/test_xmlrpc/test_ping_plugin.py                             |    4 
 ipatests/test_xmlrpc/test_privilege_plugin.py                        |    5 
 ipatests/test_xmlrpc/test_pwpolicy_plugin.py                         |    5 
 ipatests/test_xmlrpc/test_radiusproxy_plugin.py                      |    7 
 ipatests/test_xmlrpc/test_range_plugin.py                            |   51 
 ipatests/test_xmlrpc/test_realmdomains_plugin.py                     |   83 
 ipatests/test_xmlrpc/test_replace.py                                 |    4 
 ipatests/test_xmlrpc/test_role_plugin.py                             |    6 
 ipatests/test_xmlrpc/test_selfservice_plugin.py                      |    6 
 ipatests/test_xmlrpc/test_selinuxusermap_plugin.py                   |    5 
 ipatests/test_xmlrpc/test_service_plugin.py                          |   31 
 ipatests/test_xmlrpc/test_servicedelegation_plugin.py                |  593 
 ipatests/test_xmlrpc/test_stageuser_plugin.py                        |  675 
 ipatests/test_xmlrpc/test_sudocmd_plugin.py                          |    2 
 ipatests/test_xmlrpc/test_sudocmdgroup_plugin.py                     |    6 
 ipatests/test_xmlrpc/test_sudorule_plugin.py                         |   11 
 ipatests/test_xmlrpc/test_trust_plugin.py                            |   17 
 ipatests/test_xmlrpc/test_user_plugin.py                             |   26 
 ipatests/test_xmlrpc/test_vault_plugin.py                            | 1001 
 ipatests/test_xmlrpc/testcert.py                                     |   30 
 ipatests/test_xmlrpc/tracker/base.py                                 |  289 
 ipatests/test_xmlrpc/tracker/caacl_plugin.py                         |  367 
 ipatests/test_xmlrpc/tracker/certprofile_plugin.py                   |  133 
 ipatests/test_xmlrpc/tracker/group_plugin.py                         |  196 
 ipatests/test_xmlrpc/tracker/host_plugin.py                          |  154 
 ipatests/test_xmlrpc/tracker/stageuser_plugin.py                     |  267 
 ipatests/test_xmlrpc/tracker/user_plugin.py                          |  345 
 ipatests/test_xmlrpc/xmlrpc_test.py                                  |  132 
 ipatests/util.py                                                     |  124 
 lite-server.py                                                       |   16 
 make-lint                                                            |   85 
 make-test                                                            |   63 
 makeaci                                                              |   28 
 makeapi                                                              |   96 
 pytest.ini                                                           |    1 
 setup.py                                                             |    6 
 util/ipa_krb5.c                                                      |  144 
 util/ipa_krb5.h                                                      |    2 
 zanata.xml                                                           |   31 
 700 files changed, 85763 insertions(+), 34789 deletions(-)

New commits:
commit 21fa99c07203e08bf6b45ac93f18b4cb2ea7c49c
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Fri Jan 8 00:49:30 2016 +0200

    control: Bump server dep on certmonger.

diff --git a/debian/control b/debian/control
index 6e31b68..3e8852f 100644
--- a/debian/control
+++ b/debian/control
@@ -72,7 +72,7 @@ Depends:
  389-ds-base (>= 1.3.4.0),
  acl,
  apache2,
- certmonger (>= 0.78),
+ certmonger (>= 0.78.5-2),
  custodia,
  fonts-font-awesome,
  freeipa-admintools (= ${source:Version}),

commit 979d5b6f7674dc4ce6e2f0f8da6c4f8824d97745
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Fri Jan 8 00:39:24 2016 +0200

    fix-certmonger-script-install.diff: Install certmonger scripts under /usr/lib/ipa instead of multiarch path.

diff --git a/debian/changelog b/debian/changelog
index f6a50d2..4cd761c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,6 +48,8 @@ freeipa (4.3.0-1) UNRELEASED; urgency=medium
     multiarch path to avoid hacking the code too much.
   * fix-ipa-otpd-install.diff, rules, server.install: Put ipa-otpd in
     /usr/lib/ipa instead of directly under multiarch lib path.
+  * fix-certmonger-script-install.diff: Install certmonger scripts under
+    /usr/lib/ipa instead of multiarch path.
 
  -- Timo Aaltonen <tjaalton at debian.org>  Sat, 03 Oct 2015 08:56:31 +0300
 
diff --git a/debian/patches/add-debian-platform.diff b/debian/patches/add-debian-platform.diff
index 32b2a46..5674411 100644
--- a/debian/patches/add-debian-platform.diff
+++ b/debian/patches/add-debian-platform.diff
@@ -188,7 +188,7 @@ Date:   Fri Mar 1 12:21:00 2013 +0200
 +#   TMP_CA_P12 = "/tmp/ca.p12"
 +#   TMP_KRB5CC = "/tmp/krb5cc_%d"
 +#   USR_DIR = "/usr"
-+#   CERTMONGER_COMMAND_TEMPLATE = "/usr/%s/ipa/certmonger/%s"
++    CERTMONGER_COMMAND_TEMPLATE = "/usr/lib/ipa/certmonger/%s"
 +#   PKCS12EXPORT = "/usr/bin/PKCS12Export"
 +#   CERTUTIL = "/usr/bin/certutil"
 +#   CHROMIUM_BROWSER = "/usr/bin/chromium-browser"
diff --git a/debian/patches/fix-certmonger-script-install.diff b/debian/patches/fix-certmonger-script-install.diff
new file mode 100644
index 0000000..5c28df1
--- /dev/null
+++ b/debian/patches/fix-certmonger-script-install.diff
@@ -0,0 +1,60 @@
+--- a/install/restart_scripts/Makefile.am
++++ b/install/restart_scripts/Makefile.am
+@@ -1,6 +1,6 @@
+ NULL =
+ 
+-appdir = $(libdir)/ipa/certmonger
++appdir = $(libexecdir)/ipa/certmonger
+ app_DATA =                              \
+ 	restart_dirsrv			\
+ 	restart_httpd			\
+--- a/ipapython/certmonger.py
++++ b/ipapython/certmonger.py
+@@ -492,19 +492,11 @@ def dogtag_start_tracking(ca, nickname,
+         params['KEY_PIN_FILE'] = os.path.abspath(pinfile)
+     if pre_command:
+         if not os.path.isabs(pre_command):
+-            if sys.maxsize > 2**32:
+-                libpath = 'lib64'
+-            else:
+-                libpath = 'lib'
+-            pre_command = certmonger_cmd_template % (libpath, pre_command)
++            pre_command = certmonger_cmd_template % (pre_command)
+         params['cert-presave-command'] = pre_command
+     if post_command:
+         if not os.path.isabs(post_command):
+-            if sys.maxsize > 2**32:
+-                libpath = 'lib64'
+-            else:
+-                libpath = 'lib'
+-            post_command = certmonger_cmd_template % (libpath, post_command)
++            post_command = certmonger_cmd_template % (post_command)
+         params['cert-postsave-command'] = post_command
+     if profile:
+         params['ca-profile'] = profile
+--- a/ipaplatform/base/paths.py
++++ b/ipaplatform/base/paths.py
+@@ -149,7 +149,7 @@ class BasePathNamespace(object):
+     TMP_CA_P12 = "/tmp/ca.p12"
+     TMP_KRB5CC = "/tmp/krb5cc_%d"
+     USR_DIR = "/usr"
+-    CERTMONGER_COMMAND_TEMPLATE = "/usr/%s/ipa/certmonger/%s"
++    CERTMONGER_COMMAND_TEMPLATE = "/usr/libexec/ipa/certmonger/%s"
+     PKCS12EXPORT = "/usr/bin/PKCS12Export"
+     CERTUTIL = "/usr/bin/certutil"
+     CHROMIUM_BROWSER = "/usr/bin/chromium-browser"
+--- a/ipaserver/install/certs.py
++++ b/ipaserver/install/certs.py
+@@ -297,11 +297,7 @@ class CertDB(object):
+         /usr/lib[64]/ipa/certmonger.
+         """
+         if command is not None and not os.path.isabs(command):
+-            if sys.maxsize > 2**32:
+-                libpath = 'lib64'
+-            else:
+-                libpath = 'lib'
+-            command = paths.CERTMONGER_COMMAND_TEMPLATE % (libpath, command)
++            command = paths.CERTMONGER_COMMAND_TEMPLATE % (command)
+         try:
+             request_id = certmonger.start_tracking(nickname, self.secdir, password_file, command)
+         except RuntimeError as e:
diff --git a/debian/patches/series b/debian/patches/series
index 674b82a..dfb3893 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ add-debian-platform.diff
 fix-ipa-conf.diff
 fix-kdcproxy-paths.diff
 fix-ipa-otpd-install.diff
+fix-certmonger-script-install.diff
diff --git a/debian/rules b/debian/rules
index d463e59..7b9679b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -63,8 +63,7 @@ ifneq ($(ONLY_CLIENT), 1)
 	make $(PLATFORM) IPA_VERSION_IS_GIT_SNAPSHOT=no install DESTDIR=$(DESTDIR)
 	cd ..
 
-	mv $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/ipa/certmonger $(DESTDIR)/usr/lib/ipa
-	chmod 755 $(DESTDIR)/usr/lib/*/ipa/certmonger/*
+	chmod 755 $(DESTDIR)/usr/lib/ipa/certmonger/*
 
 	mkdir -p $(DESTDIR)/usr/share/bash-completion/completions \
 		 $(DESTDIR)/etc/default \

commit 14ceaf4ed0a539feac10ed44a3314f8bc305b459
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Fri Jan 8 00:09:48 2016 +0200

    fix-ipa-otpd-install.diff, rules, server.install: Put ipa-otpd in /usr/lib/ipa instead of directly under multiarch lib path.

diff --git a/debian/changelog b/debian/changelog
index 1bb196b..f6a50d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -46,6 +46,8 @@ freeipa (4.3.0-1) UNRELEASED; urgency=medium
     comment out ones we don't modify.
   * rules, server.install: Install scripts under /usr/lib instead of
     multiarch path to avoid hacking the code too much.
+  * fix-ipa-otpd-install.diff, rules, server.install: Put ipa-otpd in
+    /usr/lib/ipa instead of directly under multiarch lib path.
 
  -- Timo Aaltonen <tjaalton at debian.org>  Sat, 03 Oct 2015 08:56:31 +0300
 
diff --git a/debian/freeipa-server.install b/debian/freeipa-server.install
index 7e6e586..94ec414 100644
--- a/debian/freeipa-server.install
+++ b/debian/freeipa-server.install
@@ -17,13 +17,13 @@ usr/lib/*/dirsrv/plugins/libipa_repl_version.so
 usr/lib/*/dirsrv/plugins/libipa_uuid.so
 usr/lib/*/dirsrv/plugins/libipa_winsync.so
 usr/lib/*/dirsrv/plugins/libtopology.so
-usr/lib/*/ipa-otpd
 usr/lib/*/krb5/plugins/kdb/*.so
 usr/lib/certmonger/dogtag-ipa-ca-renew-agent-submit
 usr/lib/certmonger/ipa-server-guard
 usr/lib/ipa/certmonger/*
 usr/lib/ipa/generate-rndc-key.sh
 usr/lib/ipa/ipa-httpd-kdcproxy
+usr/lib/ipa/ipa-otpd
 usr/lib/ipa/oddjob/org.freeipa.server.conncheck
 usr/sbin/ipa-advise
 usr/sbin/ipa-backup
diff --git a/debian/patches/fix-ipa-otpd-install.diff b/debian/patches/fix-ipa-otpd-install.diff
new file mode 100644
index 0000000..d0a0710
--- /dev/null
+++ b/debian/patches/fix-ipa-otpd-install.diff
@@ -0,0 +1,12 @@
+--- a/daemons/ipa-otpd/Makefile.am
++++ b/daemons/ipa-otpd/Makefile.am
+@@ -2,7 +2,8 @@ AM_CFLAGS := @LDAP_CFLAGS@ @LIBVERTO_CFL
+ AM_LDFLAGS := @LDAP_LIBS@ @LIBVERTO_LIBS@ @KRAD_LIBS@
+ 
+ noinst_HEADERS = internal.h
+-libexec_PROGRAMS = ipa-otpd
++appdir = $(libexecdir)/ipa/
++app_PROGRAMS = ipa-otpd
+ dist_noinst_DATA = ipa-otpd.socket.in ipa-otpd at .service.in test.py
+ systemdsystemunit_DATA = ipa-otpd.socket ipa-otpd at .service
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 6129baa..674b82a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ no-test-lang.diff
 add-debian-platform.diff
 fix-ipa-conf.diff
 fix-kdcproxy-paths.diff
+fix-ipa-otpd-install.diff

commit fad0074d9c3e14550cbc7b1f34f4ebe1fee820fc
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Thu Jan 7 19:45:02 2016 +0200

    rules, server.install: Install scripts under /usr/lib instead of multiarch path to avoid hacking the code too much.

diff --git a/debian/changelog b/debian/changelog
index e547bd1..1bb196b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,6 +44,8 @@ freeipa (4.3.0-1) UNRELEASED; urgency=medium
   * fix-kdcproxy-paths.diff: Fix paths in kdcproxy configs.
   * add-debian-platform.diff: Update paths.py to include all variables,
     comment out ones we don't modify.
+  * rules, server.install: Install scripts under /usr/lib instead of
+    multiarch path to avoid hacking the code too much.
 
  -- Timo Aaltonen <tjaalton at debian.org>  Sat, 03 Oct 2015 08:56:31 +0300
 
diff --git a/debian/freeipa-server-trust-ad.install b/debian/freeipa-server-trust-ad.install
index f844ea2..09b659f 100644
--- a/debian/freeipa-server-trust-ad.install
+++ b/debian/freeipa-server-trust-ad.install
@@ -3,8 +3,8 @@ etc/oddjobd.conf.d/oddjobd-ipa-trust.conf
 usr/lib/*/dirsrv/plugins/libipa_extdom_extop.so
 usr/lib/*/dirsrv/plugins/libipa_sidgen.so
 usr/lib/*/dirsrv/plugins/libipa_sidgen_task.so
-usr/lib/*/ipa/oddjob/com.redhat.idm.trust-fetch-domains
 usr/lib/*/samba/pdb/ipasam.so
+usr/lib/ipa/oddjob/com.redhat.idm.trust-fetch-domains
 usr/sbin/ipa-adtrust-install
 usr/share/ipa/smb.conf.empty
 usr/share/man/man1/ipa-adtrust-install.1*
diff --git a/debian/freeipa-server.install b/debian/freeipa-server.install
index 9b14936..7e6e586 100644
--- a/debian/freeipa-server.install
+++ b/debian/freeipa-server.install
@@ -4,8 +4,6 @@ etc/ipa/kdcproxy
 etc/dbus-1/system.d/org.freeipa.server.conf
 etc/oddjobd.conf.d/ipa-server.conf
 lib/systemd/system/*
-usr/lib/*/certmonger/dogtag-ipa-ca-renew-agent-submit
-usr/lib/*/certmonger/ipa-server-guard
 usr/lib/*/dirsrv/plugins/libipa_cldap.so
 usr/lib/*/dirsrv/plugins/libipa_dns.so
 usr/lib/*/dirsrv/plugins/libipa_enrollment_extop.so
@@ -20,10 +18,13 @@ usr/lib/*/dirsrv/plugins/libipa_uuid.so
 usr/lib/*/dirsrv/plugins/libipa_winsync.so
 usr/lib/*/dirsrv/plugins/libtopology.so
 usr/lib/*/ipa-otpd
-usr/lib/*/ipa/ipa-httpd-kdcproxy
-usr/lib/*/ipa/certmonger/*
-usr/lib/*/ipa/oddjob/org.freeipa.server.conncheck
 usr/lib/*/krb5/plugins/kdb/*.so
+usr/lib/certmonger/dogtag-ipa-ca-renew-agent-submit
+usr/lib/certmonger/ipa-server-guard
+usr/lib/ipa/certmonger/*
+usr/lib/ipa/generate-rndc-key.sh
+usr/lib/ipa/ipa-httpd-kdcproxy
+usr/lib/ipa/oddjob/org.freeipa.server.conncheck
 usr/sbin/ipa-advise
 usr/sbin/ipa-backup
 usr/sbin/ipa-ca-install
@@ -52,7 +53,6 @@ usr/share/ipa/*.uldif
 usr/share/ipa/advise/legacy/*.template
 usr/share/ipa/copy-schema-to-ca.py
 usr/share/ipa/ffextension/*
-usr/share/ipa/generate-rndc-key.sh
 usr/share/ipa/html/*
 usr/share/ipa/ipa-pki-proxy.conf
 usr/share/ipa/ipa-rewrite.conf
diff --git a/debian/rules b/debian/rules
index 6a5b820..d463e59 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,10 +37,12 @@ override_dh_auto_configure:
 	dh_auto_configure -Dipa-client
 ifneq ($(ONLY_CLIENT), 1)
 	dh_auto_configure -Ddaemons -- \
+		--libexecdir=/usr/lib \
 		--with-openldap \
 		--with-systemdsystemunitdir=/lib/systemd/system
 
-	dh_auto_configure -Dinstall
+	dh_auto_configure -Dinstall -- \
+		--libexecdir=/usr/lib
 endif
 
 override_dh_auto_build:



More information about the Pkg-freeipa-devel mailing list