diff --git a/.gitignore b/.gitignore
index 5a98fc1..eb27ffd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/freeipa-4.8.4.tar.gz
+SOURCES/freeipa-4.8.7.tar.gz
diff --git a/.ipa.metadata b/.ipa.metadata
index 8d08b2e..f2e66c8 100644
--- a/.ipa.metadata
+++ b/.ipa.metadata
@@ -1 +1 @@
-72c91f01b2039795223417dc6761edf8ee0f36ee SOURCES/freeipa-4.8.4.tar.gz
+0099d799a77a757eeb4a95a69a38bdec24e45026 SOURCES/freeipa-4.8.7.tar.gz
diff --git a/README.debrand b/README.debrand
deleted file mode 100644
index 01c46d2..0000000
--- a/README.debrand
+++ /dev/null
@@ -1,2 +0,0 @@
-Warning: This package was configured for automatic debranding, but the changes
-failed to apply.
diff --git a/SOURCES/0001-DNS-install-check-Fix-overlapping-DNS-zone-from-the-master-itself_2c2cef7_rhbz#1784003.patch b/SOURCES/0001-DNS-install-check-Fix-overlapping-DNS-zone-from-the-master-itself_2c2cef7_rhbz#1784003.patch
deleted file mode 100644
index 9fba237..0000000
--- a/SOURCES/0001-DNS-install-check-Fix-overlapping-DNS-zone-from-the-master-itself_2c2cef7_rhbz#1784003.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 2c2cef7063315766d893b275185b422be3f3c019 Mon Sep 17 00:00:00 2001
-From: Thomas Woerner <twoerner@redhat.com>
-Date: Dec 16 2019 20:37:17 +0000
-Subject: DNS install check: Fix overlapping DNS zone from the master itself
-
-
-The change to allow overlapping zone to be from the master itself has
-introduced two issues: The check for the master itself should only executed
-if options.force and options.allow_zone_overlap are both false and the
-reverse zone check later on was still handling ValueError instead of
-dnsutil.DNSZoneAlreadyExists.
-
-Both issues have been fixed and the deployment with existing name servers
-is properly working again.
-
-Fixes: https://pagure.io/freeipa/issue/8150
-Signed-off-by: Thomas Woerner <twoerner@redhat.com>
-Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
-
----
-
-diff --git a/ipaserver/install/dns.py b/ipaserver/install/dns.py
-index 36ba6f8..9f08e86 100644
---- a/ipaserver/install/dns.py
-+++ b/ipaserver/install/dns.py
-@@ -135,15 +135,15 @@ def install_check(standalone, api, replica, options, hostname):
- logger.warning("%s Please make sure that the domain is "
- "properly delegated to this IPA server.",
- e)
--
-- hst = dnsutil.DNSName(hostname).make_absolute().to_text()
-- if hst not in e.kwargs['ns']:
-- raise ValueError(str(e))
-+ else:
-+ hst = dnsutil.DNSName(hostname).make_absolute().to_text()
-+ if hst not in e.kwargs['ns']:
-+ raise ValueError(str(e))
-
- for reverse_zone in options.reverse_zones:
- try:
- dnsutil.check_zone_overlap(reverse_zone)
-- except ValueError as e:
-+ except dnsutil.DNSZoneAlreadyExists as e:
- if options.force or options.allow_zone_overlap:
- logger.warning('%s', str(e))
- else:
-
diff --git a/SOURCES/0001-WebUI-Fix-IPA-Error-3007-RequirmentError-while-addin_rhbz#1757045.patch b/SOURCES/0001-WebUI-Fix-IPA-Error-3007-RequirmentError-while-addin_rhbz#1757045.patch
new file mode 100644
index 0000000..0f0d3a5
--- /dev/null
+++ b/SOURCES/0001-WebUI-Fix-IPA-Error-3007-RequirmentError-while-addin_rhbz#1757045.patch
@@ -0,0 +1,293 @@
+From c2ba333b9681d008d9c528a79dbdd76ce11a3ecd Mon Sep 17 00:00:00 2001
+From: Serhii Tsymbaliuk <stsymbal@redhat.com>
+Date: Thu, 28 May 2020 08:47:49 +0200
+Subject: [PATCH 01/22] WebUI: Fix "IPA Error 3007: RequirmentError" while
+ adding idoverrideuser association
+
+Add builder for association adder dialog which allows to override behavior of the component.
+Replace default implementation with a custom one for idoverrideuser.
+Replace text filter with 'ID view' select box in the idoverrideuser dialog.
+
+Ticket: https://pagure.io/freeipa/issue/8335
+
+Signed-off-by: Serhii Tsymbaliuk <stsymbal@redhat.com>
+Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
+---
+ install/ui/src/freeipa/association.js | 13 ++++-
+ install/ui/src/freeipa/dialog.js | 73 ++++++++++++++++-----------
+ install/ui/src/freeipa/group.js | 14 +++++
+ install/ui/src/freeipa/idviews.js | 58 +++++++++++++++++++++
+ ipaserver/plugins/internal.py | 6 +++
+ 5 files changed, 133 insertions(+), 31 deletions(-)
+
+diff --git a/install/ui/src/freeipa/association.js b/install/ui/src/freeipa/association.js
+index f10ccb2a5..b083a79f9 100644
+--- a/install/ui/src/freeipa/association.js
++++ b/install/ui/src/freeipa/association.js
+@@ -25,6 +25,7 @@
+ define([
+ 'dojo/_base/lang',
+ 'dojo/Deferred',
++ './builder',
+ './metadata',
+ './ipa',
+ './jquery',
+@@ -38,7 +39,7 @@ define([
+ './facet',
+ './search',
+ './dialog'],
+- function(lang, Deferred, metadata_provider, IPA, $, metadata,
++ function(lang, Deferred, builder, metadata_provider, IPA, $, metadata,
+ navigation, phases, reg, rpc, su, text) {
+
+ /**
+@@ -1209,7 +1210,8 @@ exp.association_facet = IPA.association_facet = function (spec, no_init) {
+
+ var pkeys = that.data.result.result[that.get_attribute_name()];
+
+- var dialog = IPA.association_adder_dialog({
++ var dialog = builder.build('association_adder_dialog', {
++ $type: that.other_entity.name,
+ title: title,
+ entity: that.entity,
+ pkey: pkey,
+@@ -1675,6 +1677,13 @@ IPA.attr_read_only_evaluator = function(spec) {
+ return that;
+ };
+
++// Create a registry for adder dialogs where key is name of 'other entity'.
++// It allows to override dialogs for some specific cases of association
++// creation.
++var dialog_builder = builder.get('association_adder_dialog');
++dialog_builder.factory = IPA.association_adder_dialog;
++reg.set('association_adder_dialog', dialog_builder.registry);
++
+ phases.on('registration', function() {
+ var w = reg.widget;
+ var f = reg.field;
+diff --git a/install/ui/src/freeipa/dialog.js b/install/ui/src/freeipa/dialog.js
+index c153120df..d67d63b6d 100644
+--- a/install/ui/src/freeipa/dialog.js
++++ b/install/ui/src/freeipa/dialog.js
+@@ -919,35 +919,7 @@ IPA.adder_dialog = function(spec) {
+ 'class': 'input-group col-md-12 adder-dialog-top'
+ }).appendTo(container);
+
+- var filter_placeholder = text.get('@i18n:association.filter_placeholder');
+- filter_placeholder = filter_placeholder.replace('${other_entity}',
+- that.other_entity.metadata.label);
+-
+- that.filter_field = $('<input/>', {
+- type: 'text',
+- name: 'filter',
+- 'class': 'form-control',
+- 'placeholder': filter_placeholder,
+- keyup: function(event) {
+- if (event.keyCode === keys.ENTER) {
+- that.search();
+- return false;
+- }
+- }
+- }).appendTo(input_group);
+-
+- var input_group_btn = $('<div/>', {
+- 'class': 'input-group-btn'
+- }).appendTo(input_group);
+-
+- that.find_button = IPA.button({
+- name: 'find',
+- label: '@i18n:buttons.filter',
+- click: function() {
+- that.search();
+- return false;
+- }
+- }).appendTo(input_group_btn);
++ that.filter_field = that.get_filter_field(input_group);
+
+ var row = $('<div/>', { 'class': 'row adder-dialog-main'}).appendTo(container);
+ //
+@@ -1132,6 +1104,49 @@ IPA.adder_dialog = function(spec) {
+ return that.filter_field.val();
+ };
+
++ /**
++ * Return field for filtering available items
++ *
++ * Default implementation returns text input + "Filter" button.
++ * It can be overridden.
++ *
++ * @param {HTMLElement} input_group - container for a filter field
++ * @return {HTMLElement}
++ */
++ that.get_filter_field = function(input_group) {
++ var filter_placeholder = text.get(
++ '@i18n:association.filter_placeholder'
++ ).replace('${other_entity}', that.other_entity.metadata.label);
++
++ var filter_field = $('<input/>', {
++ type: 'text',
++ name: 'filter',
++ 'class': 'form-control',
++ 'placeholder': filter_placeholder,
++ keyup: function(event) {
++ if (event.keyCode === keys.ENTER) {
++ that.search();
++ return false;
++ }
++ }
++ }).appendTo(input_group);
++
++ var input_group_btn = $('<div/>', {
++ 'class': 'input-group-btn'
++ }).appendTo(input_group);
++
++ that.find_button = IPA.button({
++ name: 'find',
++ label: '@i18n:buttons.filter',
++ click: function() {
++ that.search();
++ return false;
++ }
++ }).appendTo(input_group_btn);
++
++ return filter_field;
++ };
++
+ /**
+ * Clear rows in available table
+ */
+diff --git a/install/ui/src/freeipa/group.js b/install/ui/src/freeipa/group.js
+index e46d8c7e3..2984bd4b2 100644
+--- a/install/ui/src/freeipa/group.js
++++ b/install/ui/src/freeipa/group.js
+@@ -205,6 +205,20 @@ return {
+ add_title: '@i18n:objects.group.add_into_sudo',
+ remove_method: 'remove_user',
+ remove_title: '@i18n:objects.group.remove_from_sudo'
++ },
++ {
++ $type: 'association',
++ name: 'member_idoverrideuser',
++ associator: IPA.serial_associator,
++ add_title: '@i18n:objects.group.add_idoverride_user',
++ remove_title: '@i18n:objects.group.remove_idoverride_users',
++ columns: [
++ {
++ name: 'ipaanchoruuid',
++ label: '@i18n:objects.idoverrideuser.anchor_label',
++ link: false
++ }
++ ]
+ }
+ ],
+ standard_association_facets: true,
+diff --git a/install/ui/src/freeipa/idviews.js b/install/ui/src/freeipa/idviews.js
+index 35dc998c8..a4fca6205 100644
+--- a/install/ui/src/freeipa/idviews.js
++++ b/install/ui/src/freeipa/idviews.js
+@@ -966,6 +966,58 @@ idviews.unapply_action = function(spec) {
+ return that;
+ };
+
++idviews.idoverrideuser_adder_dialog = function(spec) {
++
++ spec = spec || {};
++
++ var that = IPA.association_adder_dialog(spec);
++
++ that.base_search = that.search;
++
++ that.search = function() {
++ // Search for users only in case a ID view is selected
++ if (that.get_filter()) {
++ that.base_search();
++ }
++ };
++
++ /**
++ * Replace default text filter with a select box for filtering by ID view
++ */
++ that.get_filter_field = function(input_group) {
++
++ var filter_field = $('<select/>', {
++ name: 'filter',
++ 'class': 'form-control',
++ change: function(event) {
++ that.search();
++ }
++ }).appendTo(input_group);
++
++ rpc.command({
++ entity: 'idview',
++ method: 'find',
++ on_success: function(data) {
++ var results = data.result;
++
++ for (var i=0; i<results.count; i++) {
++ var result = results.result[i];
++ $('<option/>', {
++ text: result.cn[0],
++ value: result.cn[0]
++ }).appendTo(filter_field);
++ }
++
++ that.search();
++ }
++ }).execute();
++
++ return filter_field;
++ };
++
++ return that;
++};
++
+ /**
+ * ID View entity specification object
+ * @member idviews
+@@ -993,6 +1045,7 @@ idviews.register = function() {
+ var f = reg.facet;
+ var a = reg.action;
+ var w = reg.widget;
++ var ad = reg.association_adder_dialog;
+
+ e.register({type: 'idview', spec: idviews.spec});
+ e.register({
+@@ -1012,6 +1065,11 @@ idviews.register = function() {
+
+ w.register('idviews_certs', idviews.idviews_certs_widget);
+ w.register('cert_textarea', idviews.cert_textarea_widget);
++
++ ad.register({
++ type: 'idoverrideuser',
++ factory: idviews.idoverrideuser_adder_dialog
++ });
+ };
+
+ phases.on('registration', idviews.register);
+diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py
+index 5f2b1fdc2..7622e65dc 100644
+--- a/ipaserver/plugins/internal.py
++++ b/ipaserver/plugins/internal.py
+@@ -835,6 +835,9 @@ class i18n_messages(Command):
+ "Remove users from member managers for user group "
+ "'${primary_key}'"
+ ),
++ "add_idoverride_user": _(
++ "Add user ID override into user group '${primary_key}'"
++ ),
+ "details": _("Group Settings"),
+ "external": _("External"),
+ "groups": _("Groups"),
+@@ -868,6 +871,9 @@ class i18n_messages(Command):
+ "remove_users": _(
+ "Remove users from user group '${primary_key}'"
+ ),
++ "remove_idoverride_users": _(
++ "Remove user ID overrides from user group '${primary_key}'"
++ ),
+ "type": _("Group Type"),
+ "user_groups": _("User Groups"),
+ },
+--
+2.26.2
+
diff --git a/SOURCES/0002-EPN-does-not-ship-its-default-configuration_rhbz#1847999.patch b/SOURCES/0002-EPN-does-not-ship-its-default-configuration_rhbz#1847999.patch
new file mode 100644
index 0000000..eec611f
--- /dev/null
+++ b/SOURCES/0002-EPN-does-not-ship-its-default-configuration_rhbz#1847999.patch
@@ -0,0 +1,601 @@
+From 77fae8c48bbe0f4499f4d8ed91b268568c64cd7c Mon Sep 17 00:00:00 2001
+From: Christian Heimes <cheimes@redhat.com>
+Date: Thu, 11 Jun 2020 11:17:25 +0200
+Subject: [PATCH] Move ipa-epn systemd files and run RPM hooks
+
+The init/systemd directory is for server only and not part of
+CLIENT_ONLY builds.
+
+It's necesary to run pre/post installation hooks to make systemd aware
+of new files.
+
+Fixes: https://pagure.io/freeipa/issue/8367
+Signed-off-by: Christian Heimes <cheimes@redhat.com>
+Reviewed-By: Rob Crittenden <rcritten@redhat.com>
+Reviewed-By: Francois Cami <fcami@redhat.com>
+---
+ .gitignore | 4 +--
+ client/Makefile.am | 1 +
+ client/share/Makefile.am | 5 ++++
+ {install => client}/share/expire_msg.template | 0
+ client/systemd/Makefile.am | 27 +++++++++++++++++++
+ {init => client}/systemd/ipa-epn.service.in | 0
+ {init => client}/systemd/ipa-epn.timer.in | 0
+ configure.ac | 24 +++++++++++++++--
+ freeipa.spec.in | 15 +++++++++++
+ init/systemd/Makefile.am | 8 +++---
+ install/share/Makefile.am | 5 ----
+ server.m4 | 19 -------------
+ 12 files changed, 76 insertions(+), 32 deletions(-)
+ rename {install => client}/share/expire_msg.template (100%)
+ create mode 100644 client/systemd/Makefile.am
+ rename {init => client}/systemd/ipa-epn.service.in (100%)
+ rename {init => client}/systemd/ipa-epn.timer.in (100%)
+
+#diff --git a/.gitignore b/.gitignore
+#index 6584c3b4f..4cedb1ff2 100644
+#--- a/.gitignore
+#+++ b/.gitignore
+#@@ -94,8 +94,6 @@ freeipa2-dev-doc
+# /init/ipa_memcached
+# /init/systemd/ipa-custodia.service
+# /init/systemd/ipa.service
+#-/init/systemd/ipa-epn.service
+#-/init/systemd/ipa-epn.timer
+# /init/tmpfilesd/ipa.conf
+#
+# !/install/ui/doc/Makefile.in
+#@@ -116,6 +114,8 @@ freeipa2-dev-doc
+# /client/ipa-getkeytab
+# /client/ipa-join
+# /client/ipa-rmkeytab
+#+/client/systemd/ipa-epn.service
+#+/client/systemd/ipa-epn.timer
+#
+# /ipaplatform/override.py
+# /ipapython/version.py
+diff --git a/client/Makefile.am b/client/Makefile.am
+index 858a9369e..87da87fcd 100644
+--- a/client/Makefile.am
++++ b/client/Makefile.am
+@@ -95,6 +95,7 @@ SUBDIRS = \
+ share \
+ man \
+ sysconfig \
++ systemd \
+ $(NULL)
+ # init
+
+diff --git a/client/share/Makefile.am b/client/share/Makefile.am
+index 6d4a62d5e..1402a3a9d 100644
+--- a/client/share/Makefile.am
++++ b/client/share/Makefile.am
+@@ -4,3 +4,8 @@ appdir = $(IPA_DATA_DIR)/client
+ dist_app_DATA = \
+ freeipa.template \
+ $(NULL)
++
++epnconfdir = $(IPA_SYSCONF_DIR)/epn
++dist_epnconf_DATA = \
++ expire_msg.template \
++ $(NULL)
+diff --git a/install/share/expire_msg.template b/client/share/expire_msg.template
+similarity index 100%
+rename from install/share/expire_msg.template
+rename to client/share/expire_msg.template
+diff --git a/client/systemd/Makefile.am b/client/systemd/Makefile.am
+new file mode 100644
+index 000000000..1f591be83
+--- /dev/null
++++ b/client/systemd/Makefile.am
+@@ -0,0 +1,27 @@
++# This file will be processed with automake-1.7 to create Makefile.in
++#
++AUTOMAKE_OPTIONS = 1.7
++
++NULL =
++
++dist_noinst_DATA = \
++ ipa-epn.service.in \
++ ipa-epn.timer.in \
++ $(NULL)
++
++systemdsystemunit_DATA = \
++ ipa-epn.service \
++ ipa-epn.timer \
++ $(NULL)
++
++CLEANFILES = $(systemdsystemunit_DATA)
++
++%: %.in Makefile
++ sed \
++ -e 's|@bindir[@]|$(bindir)|g' \
++ -e 's|@IPA_SYSCONF_DIR[@]|$(IPA_SYSCONF_DIR)|g' \
++ -e 's|@localstatedir[@]|$(localstatedir)|g' \
++ -e 's|@sbindir[@]|$(sbindir)|g' \
++ -e 's|@libexecdir[@]|$(libexecdir)|g' \
++ -e 's|@sysconfenvdir[@]|$(sysconfenvdir)|g' \
++ '$(srcdir)/$@.in' >$@
+diff --git a/init/systemd/ipa-epn.service.in b/client/systemd/ipa-epn.service.in
+similarity index 100%
+rename from init/systemd/ipa-epn.service.in
+rename to client/systemd/ipa-epn.service.in
+diff --git a/init/systemd/ipa-epn.timer.in b/client/systemd/ipa-epn.timer.in
+similarity index 100%
+rename from init/systemd/ipa-epn.timer.in
+rename to client/systemd/ipa-epn.timer.in
+diff --git a/configure.ac b/configure.ac
+index 5ec529088..586b2532a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -220,6 +220,25 @@ AC_ARG_WITH([runstatedir],
+ [runstatedir="/run"])
+ AC_SUBST([runstatedir])
+
++dnl ---------------------------------------------------------------------------
++dnl - Check for systemd directories
++dnl ---------------------------------------------------------------------------
++
++PKG_CHECK_EXISTS([systemd], [], [AC_MSG_ERROR([systemd not found])])
++AC_ARG_WITH([systemdsystemunitdir],
++ AS_HELP_STRING([--with-systemdsystemunitdir=DIR],
++ [Directory for systemd service files]),
++ [systemdsystemunitdir=$with_systemdsystemunitdir],
++ [systemdsystemunitdir=$($PKG_CONFIG --define-variable=prefix='${prefix}' --variable=systemdsystemunitdir systemd)])
++AC_SUBST([systemdsystemunitdir])
++
++AC_ARG_WITH([systemdtmpfilesdir],
++ AS_HELP_STRING([--with-systemdtmpfilesdir=DIR],
++ [Directory for systemd-tmpfiles configuration files]),
++ [systemdtmpfilesdir=$with_systemdtmpfilesdir],
++ [systemdtmpfilesdir=$($PKG_CONFIG --define-variable=prefix='${prefix}' --variable=tmpfilesdir systemd)])
++AC_SUBST([systemdtmpfilesdir])
++
+ dnl ---------------------------------------------------------------------------
+ dnl - Server-only configuration
+ dnl ---------------------------------------------------------------------------
+@@ -544,6 +563,7 @@ AC_CONFIG_FILES([
+ client/share/Makefile
+ client/man/Makefile
+ client/sysconfig/Makefile
++ client/systemd/Makefile
+ contrib/completion/Makefile
+ contrib/Makefile
+ daemons/dnssec/Makefile
+@@ -637,13 +657,13 @@ echo "
+ jslint: ${JSLINT}
+ LDAP libs: ${LDAP_LIBS}
+ OpenSSL crypto libs: ${CRYPTO_LIBS}
+- KRB5 libs: ${KRB5_LIBS}"
++ KRB5 libs: ${KRB5_LIBS}
++ systemdsystemunitdir: ${systemdsystemunitdir}"
+
+ AM_COND_IF([ENABLE_SERVER], [
+ echo "\
+ KRAD libs: ${KRAD_LIBS}
+ krb5rundir: ${krb5rundir}
+- systemdsystemunitdir: ${systemdsystemunitdir}
+ systemdtmpfilesdir: ${systemdtmpfilesdir}
+ build mode: server & client"
+ ], [
+diff --git a/freeipa.spec.in b/freeipa.spec.in
+index cec57e64e..1d8f4e6aa 100755
+--- a/freeipa.spec.in
++++ b/freeipa.spec.in
+@@ -586,6 +586,10 @@ on the machine enrolled into a FreeIPA environment
+ %package client-epn
+ Summary: Tools to configure Expiring Password Notification in IPA
+ Group: System Environment/Base
++Requires: systemd-units
++Requires(post): systemd-units
++Requires(preun): systemd-units
++Requires(postun): systemd-units
+ Requires: %{name}-client = %{version}-%{release}
+
+ %description client-epn
+@@ -1003,6 +1007,17 @@ fi
+ # ONLY_CLIENT
+ %endif
+
++%preun client-epn
++%systemd_preun ipa-epn.service
++%systemd_preun ipa-epn.timer
++
++%postun client-epn
++%systemd_postun ipa-epn.service
++%systemd_postun ipa-epn.timer
++
++%post client-epn
++%systemd_post ipa-epn.service
++%systemd_post ipa-epn.timer
+
+ %post client
+ if [ $1 -gt 1 ] ; then
+diff --git a/init/systemd/Makefile.am b/init/systemd/Makefile.am
+index 5053dbff6..175178787 100644
+--- a/init/systemd/Makefile.am
++++ b/init/systemd/Makefile.am
+@@ -2,17 +2,17 @@
+ #
+ AUTOMAKE_OPTIONS = 1.7
+
++NULL =
++
+ dist_noinst_DATA = \
+ ipa-custodia.service.in \
+ ipa.service.in \
+- ipa-epn.service.in \
+- ipa-epn.timer.in
++ $(NULL)
+
+ systemdsystemunit_DATA = \
+ ipa-custodia.service \
+ ipa.service \
+- ipa-epn.service \
+- ipa-epn.timer
++ $(NULL)
+
+ CLEANFILES = $(systemdsystemunit_DATA)
+
+diff --git a/install/share/Makefile.am b/install/share/Makefile.am
+index 496e81288..e95796dfb 100644
+--- a/install/share/Makefile.am
++++ b/install/share/Makefile.am
+@@ -106,8 +106,3 @@ dist_app_DATA = \
+ kdcproxyconfdir = $(IPA_SYSCONF_DIR)/kdcproxy
+ dist_kdcproxyconf_DATA = \
+ kdcproxy.conf
+-
+-epnconfdir = $(IPA_SYSCONF_DIR)/epn
+-dist_epnconf_DATA = \
+- expire_msg.template \
+- $(NULL)
+diff --git a/server.m4 b/server.m4
+index d35823e80..842d599d2 100644
+--- a/server.m4
++++ b/server.m4
+@@ -153,22 +153,3 @@ dnl Check for libverto
+ dnl ---------------------------------------------------------------------------
+
+ PKG_CHECK_MODULES([LIBVERTO], [libverto])
+-
+-dnl ---------------------------------------------------------------------------
+-dnl - Check for systemd directories
+-dnl ---------------------------------------------------------------------------
+-
+-PKG_CHECK_EXISTS([systemd], [], [AC_MSG_ERROR([systemd not found])])
+-AC_ARG_WITH([systemdsystemunitdir],
+- AS_HELP_STRING([--with-systemdsystemunitdir=DIR],
+- [Directory for systemd service files]),
+- [systemdsystemunitdir=$with_systemdsystemunitdir],
+- [systemdsystemunitdir=$($PKG_CONFIG --define-variable=prefix='${prefix}' --variable=systemdsystemunitdir systemd)])
+-AC_SUBST([systemdsystemunitdir])
+-
+-AC_ARG_WITH([systemdtmpfilesdir],
+- AS_HELP_STRING([--with-systemdtmpfilesdir=DIR],
+- [Directory for systemd-tmpfiles configuration files]),
+- [systemdtmpfilesdir=$with_systemdtmpfilesdir],
+- [systemdtmpfilesdir=$($PKG_CONFIG --define-variable=prefix='${prefix}' --variable=tmpfilesdir systemd)])
+-AC_SUBST([systemdtmpfilesdir])
+--
+2.26.2
+
+From 23e2935e5c5cb402dd4f6f44eaa4b013e6a8188a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fran=C3=A7ois=20Cami?= <fcami@redhat.com>
+Date: Mon, 22 Jun 2020 16:39:02 +0200
+Subject: [PATCH] EPN: ship the configuration file.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Ship and install /etc/ipa/epn.conf.
+Minor fixes to the associated man page.
+
+Fixes: https://pagure.io/freeipa/issue/8374
+Signed-off-by: François Cami <fcami@redhat.com>
+Reviewed-By: Alexander Bokovoy <abbra@users.noreply.github.com>
+Reviewed-By: Rob Crittenden <rcritten@redhat.com>
+Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
+Reviewed-By: Rob Crittenden <rcritten@redhat.com>
+---
+ client/man/epn.conf.5 | 5 ++--
+ client/share/Makefile.am | 7 +++++-
+ client/share/epn.conf | 54 ++++++++++++++++++++++++++++++++++++++++
+ freeipa.spec.in | 4 ++-
+ 4 files changed, 65 insertions(+), 5 deletions(-)
+ create mode 100644 client/share/epn.conf
+
+diff --git a/client/man/epn.conf.5 b/client/man/epn.conf.5
+index 38e99e25d..14f5dbb75 100644
+--- a/client/man/epn.conf.5
++++ b/client/man/epn.conf.5
+@@ -71,11 +71,10 @@ Specifies the From e-mail address value in the e-mails sent. The default is
+ root@localhost. Bounces will be sent here.
+ .TP
+ .B smtp_delay <milliseconds>
+-Time to wait, in milliseconds, between each e-mail sent to try to avoid overloading the mail queue.
++Time to wait, in milliseconds, between each e-mail sent to try to avoid overloading the mail queue. The default is 0.
+ .TP
+ .B mail_from <address>
+-Specifies the From: e-mal address value in the e-mails sent. The default is
+-noreply@ipadefaultemaildomain. This value can be found by running
++Specifies the From: e-mail address value in the e-mails sent. The default is noreply@ipadefaultemaildomain. This value can be found by running
+ .I ipa config-show
+ .TP
+ .B notify_ttls <list of days>
+diff --git a/client/share/Makefile.am b/client/share/Makefile.am
+index 1402a3a9d..472242e62 100644
+--- a/client/share/Makefile.am
++++ b/client/share/Makefile.am
+@@ -5,7 +5,12 @@ dist_app_DATA = \
+ freeipa.template \
+ $(NULL)
+
+-epnconfdir = $(IPA_SYSCONF_DIR)/epn
++epnconfdir = $(IPA_SYSCONF_DIR)
+ dist_epnconf_DATA = \
++ epn.conf \
++ $(NULL)
++
++epntemplatedir = $(IPA_SYSCONF_DIR)/epn
++dist_epntemplate_DATA = \
+ expire_msg.template \
+ $(NULL)
+diff --git a/client/share/epn.conf b/client/share/epn.conf
+new file mode 100644
+index 000000000..0e590dfc3
+--- /dev/null
++++ b/client/share/epn.conf
+@@ -0,0 +1,54 @@
++# Global IPA-EPN [0] configuration file.
++# For a complete explanation of each parameter, see the epn.conf(5)
++# manual page.
++# For best results, change no more than a single parameter at a time,
++# and test if ipa-epn(1) still works as intended, using --dry-run when
++# it makes sense.
++#
++# [0] https://github.com/freeipa/freeipa/blob/master/doc/designs/expiring-password-notification.md
++
++[global]
++
++# Specifies the SMTP server to use.
++smtp_server = localhost
++
++# Specifies the SMTP port.
++smtp_port = 25
++
++# Specifies the id of the user to authenticate with the SMTP server.
++# Default None (empty value).
++# smtp_user =
++
++# Specifies the password for the authorized user.
++# Default None (empty value).
++# smtp_password =
++
++# pecifies the number of seconds to wait for SMTP to respond.
++smtp_timeout = 60
++
++# Specifies the type of secure connection to make. Options are: none,
++# starttls and ssl.
++smtp_security = none
++
++# Specifies the From e-mail address value in the e-mails sent. Bounces will
++# be sent here.
++smtp_admin = root@localhost
++
++# Time to wait, in milliseconds, between each e-mail sent to try to avoid
++# overloading the mail queue.
++smtp_delay = 0
++
++# Specifies the From: e-mail address value in the e-mails sent.
++# The default when unset is noreply@ipadefaultemaildomain.
++# This value can be found by running ipa config-show.
++# mail_from =
++
++# The list of days before a password expiration when ipa-epn should notify
++# a user that their password will soon require a reset.
++notify_ttls = 28, 14, 7, 3, 1
++
++# Set the character set of the message.
++msg_charset = utf8
++
++# Set the message's MIME sub-content type.
++msg_subtype = plain
+diff --git a/freeipa.spec.in b/freeipa.spec.in
+index 5bce6f118..8cca99697 100755
+--- a/freeipa.spec.in
++++ b/freeipa.spec.in
+@@ -1387,13 +1387,15 @@ fi
+
+ %files client-epn
+ %doc README.md Contributors.txt
++%dir %{_sysconfdir}/ipa/epn
+ %license COPYING
+ %{_sbindir}/ipa-epn
+ %{_mandir}/man1/ipa-epn.1*
+ %{_mandir}/man5/epn.conf.5*
+ %attr(644,root,root) %{_unitdir}/ipa-epn.service
+ %attr(644,root,root) %{_unitdir}/ipa-epn.timer
+-%attr(644,root,root) %{_sysconfdir}/ipa/epn/expire_msg.template
++%attr(600,root,root) %config(noreplace) %{_sysconfdir}/ipa/epn.conf
++%attr(644,root,root) %config(noreplace) %{_sysconfdir}/ipa/epn/expire_msg.template
+
+ %files -n python3-ipaclient
+ %doc README.md Contributors.txt
+--
+2.26.2
+
+From 3b43950d35f78b28d4edde4fda475b5aa84f4587 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fran=C3=A7ois=20Cami?= <fcami@redhat.com>
+Date: Tue, 23 Jun 2020 09:39:02 +0200
+Subject: [PATCH] man pages: fix epn.conf.5 and ipa-epn.1 formatting
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fix formatting issues found with mandoc.
+
+Signed-off-by: François Cami <fcami@redhat.com>
+Reviewed-By: Alexander Bokovoy <abbra@users.noreply.github.com>
+Reviewed-By: Rob Crittenden <rcritten@redhat.com>
+Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
+Reviewed-By: Rob Crittenden <rcritten@redhat.com>
+---
+ client/man/epn.conf.5 | 2 +-
+ client/man/ipa-epn.1 | 8 ++++----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/client/man/epn.conf.5 b/client/man/epn.conf.5
+index 14f5dbb75..df1f0156c 100644
+--- a/client/man/epn.conf.5
++++ b/client/man/epn.conf.5
+@@ -16,7 +16,7 @@
+ .\"
+ .\" Author: Rob Crittenden <rcritten@@redhat.com>
+ .\"
+-.TH "epn.conf" "5" "Apr 28 2020" "FreeIPA" "FreeIPA Manual Pages"
++.TH "EPN.CONF" "5" "April 28, 2020" "FreeIPA" "FreeIPA Manual Pages"
+ .SH "NAME"
+ epn.conf \- Expiring Password Notification configuration file
+ .SH "SYNOPSIS"
+diff --git a/client/man/ipa-epn.1 b/client/man/ipa-epn.1
+index 9999ea8ca..124fd4536 100644
+--- a/client/man/ipa-epn.1
++++ b/client/man/ipa-epn.1
+@@ -15,14 +15,14 @@
+ .\" along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .\"
+ .\"
+-.TH "ipa-epn" "1" "Apr 24 2020" "FreeIPA" "FreeIPA Manual Pages"
++.TH "IPA-EPN" "1" "April 24, 2020" "FreeIPA" "FreeIPA Manual Pages"
+ .SH "NAME"
+ ipa\-epn \- Send expiring password nofications
+ .SH "SYNOPSIS"
+-ipa\-epn \[options\]
++ipa\-epn \fR[options\fR]
+
+ .SH "DESCRIPTION"
+-ipa\-epn provides a method to warn users via email that their IPA account password is about to expire.
++ipa\-epn provides a method to warn users via email that their IPA account password is about to expire.
+
+ It can be used in dry\-run mode which is recommmended during setup. The output is always JSON in this case.
+
+@@ -38,7 +38,7 @@ The \-\-to\-nbdays CLI option can be used to determine the number of notificatio
+
+ If \fB\-\-from\-nbdays\fR is not specified, ipa\-epn will look within a 24\-hour long time range in <number of days> days.
+
+-if \fB\-\-from\-nbdays\fR is specified, the date range starts at \fB\-\-from\-nbdays\fR days in the future and ends at \fB\-\-to\-nbdays\fR in the future.
++if \fB\-\-from\-nbdays\fR is specified, the date range starts at \fB\-\-from\-nbdays\fR days in the future and ends at \fB\-\-to\-nbdays\fR in the future.
+
+ Together, these two CLI options can be used to determine how many emails would be sent in a specific time in the future.
+
+--
+2.26.2
+
+From 2648c218467792e907435eaa5267a0f3457f634f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fran=C3=A7ois=20Cami?= <fcami@redhat.com>
+Date: Tue, 23 Jun 2020 13:50:02 +0200
+Subject: [PATCH] ipatests: check that EPN's configuration file is installed.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes: https://pagure.io/freeipa/issue/8374
+Signed-off-by: François Cami <fcami@redhat.com>
+Reviewed-By: Alexander Bokovoy <abbra@users.noreply.github.com>
+Reviewed-By: Rob Crittenden <rcritten@redhat.com>
+Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
+Reviewed-By: Rob Crittenden <rcritten@redhat.com>
+---
+ ipatests/test_integration/test_epn.py | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/ipatests/test_integration/test_epn.py b/ipatests/test_integration/test_epn.py
+index 7f56d4bc0..409d588d5 100644
+--- a/ipatests/test_integration/test_epn.py
++++ b/ipatests/test_integration/test_epn.py
+@@ -209,6 +209,20 @@ class TestEPN(IntegrationTest):
+ cls.master.run_command(r'rm -f /etc/pki/tls/private/postfix.key')
+ cls.master.run_command(r'rm -f /etc/pki/tls/certs/postfix.pem')
+
++ @pytest.mark.xfail(reason='pr-ci issue 378', strict=True)
++ def test_EPN_config_file(self):
++ """Check that the EPN configuration file is installed.
++ https://pagure.io/freeipa/issue/8374
++ """
++ epn_conf = "/etc/ipa/epn.conf"
++ epn_template = "/etc/ipa/epn/expire_msg.template"
++ cmd1 = self.master.run_command(["rpm", "-qc", "freeipa-client-epn"])
++ assert epn_conf in cmd1.stdout_text
++ assert epn_template in cmd1.stdout_text
++ cmd2 = self.master.run_command(["sha256sum", epn_conf])
++ ck = "4c207b5c9c760c36db0d3b2b93da50ea49edcc4002d6d1e7383601f0ec30b957"
++ assert cmd2.stdout_text.find(ck) == 0
++
+ def test_EPN_smoketest_1(self):
+ """No users except admin. Check --dry-run output.
+ With the default configuration, the result should be an empty list.
+--
+2.26.2
+
+From 06accac8906f66ebbb31849d6528b39ae006b124 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fran=C3=A7ois=20Cami?= <fcami@redhat.com>
+Date: Wed, 24 Jun 2020 23:24:36 +0200
+Subject: [PATCH] ipatests: ipa_epn: uninstall/reinstall ipa-client-epn
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Due to https://github.com/freeipa/freeipa-pr-ci/issues/378
+the installed version of freeipa-client-epn is not the built
+one. Temporarily force uninstall/reinstall of this package
+before running the test.
+
+Fixes: https://pagure.io/freeipa/issue/8374
+Signed-off-by: François Cami <fcami@redhat.com>
+Reviewed-By: Alexander Bokovoy <abbra@users.noreply.github.com>
+Reviewed-By: Rob Crittenden <rcritten@redhat.com>
+Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
+Reviewed-By: Rob Crittenden <rcritten@redhat.com>
+---
+ ipatests/test_integration/test_epn.py | 20 +++++++++++++++++++-
+ 1 file changed, 19 insertions(+), 1 deletion(-)
+
+diff --git a/ipatests/test_integration/test_epn.py b/ipatests/test_integration/test_epn.py
+index 409d588d5..9a9fb17b9 100644
+--- a/ipatests/test_integration/test_epn.py
++++ b/ipatests/test_integration/test_epn.py
+@@ -209,11 +209,29 @@ class TestEPN(IntegrationTest):
+ cls.master.run_command(r'rm -f /etc/pki/tls/private/postfix.key')
+ cls.master.run_command(r'rm -f /etc/pki/tls/certs/postfix.pem')
+
+- @pytest.mark.xfail(reason='pr-ci issue 378', strict=True)
++ @pytest.mark.skip_if_platform(
++ "debian", reason="Cannot check installed packages using RPM"
++ )
+ def test_EPN_config_file(self):
+ """Check that the EPN configuration file is installed.
+ https://pagure.io/freeipa/issue/8374
+ """
++ # workaround for https://github.com/freeipa/freeipa-pr-ci/issues/378
++ rpm_q_cmds = [
++ ["rpm", "-qi", "freeipa-client"],
++ ["rpm", "-qi", "freeipa-client-epn"],
++ ["rpm", "-qc", "freeipa-client-epn"],
++ ["rpm", "-V", "freeipa-client-epn"],
++ ["rpm", "-qvc", "freeipa-client-epn"],
++ ["ls", "-l", "/etc/ipa", "/etc/ipa/epn"],
++ ]
++ for cmd in rpm_q_cmds:
++ self.master.run_command(cmd, raiseonerr=False)
++ tasks.uninstall_packages(self.master, ["*ipa-client-epn"])
++ tasks.install_packages(self.master, ["*ipa-client-epn"])
++ for cmd in rpm_q_cmds:
++ self.master.run_command(cmd, raiseonerr=False)
++ # end workaround
+ epn_conf = "/etc/ipa/epn.conf"
+ epn_template = "/etc/ipa/epn/expire_msg.template"
+ cmd1 = self.master.run_command(["rpm", "-qc", "freeipa-client-epn"])
+--
+2.26.2
+
diff --git a/SOURCES/0003-Use-256-bit-AJP-secret_rhbz#1849914.patch b/SOURCES/0003-Use-256-bit-AJP-secret_rhbz#1849914.patch
new file mode 100644
index 0000000..f011db3
--- /dev/null
+++ b/SOURCES/0003-Use-256-bit-AJP-secret_rhbz#1849914.patch
@@ -0,0 +1,147 @@
+From be48983558a560dadad410a70a4a1684565ed481 Mon Sep 17 00:00:00 2001
+From: Alexander Scheel <ascheel@redhat.com>
+Date: Mon, 15 Jun 2020 18:38:35 -0400
+Subject: [PATCH] Clarify AJP connector creation process
+
+We do two things:
+
+ 1. Fix the xpath for AJP connector verification. An AJP connector is
+ one which has protocol="AJP/1.3", NOT one that has port="8009". An
+ AJP connector can exist on any port and port 8009 can have any
+ protocol. Secrets only make sense on AJP connectors, so make the
+ xpath match the existing comment.
+
+ 2. Add some background in-line documentation about AJP secret
+ provisioning. This should help future developers understand why this
+ was added to IPA and what limitations there are in what PKI or IPA
+ can do. Most notably, explain why Dogtag can't upgrade the AJP
+ connector to have a secret in the general case.
+
+Signed-off-by: Alexander Scheel <ascheel@redhat.com>
+Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
+---
+ ipaserver/install/dogtaginstance.py | 20 +++++++++++++++++---
+ 1 file changed, 17 insertions(+), 3 deletions(-)
+
+diff --git a/ipaserver/install/dogtaginstance.py b/ipaserver/install/dogtaginstance.py
+index 42c9db3fb..aa3baeb7c 100644
+--- a/ipaserver/install/dogtaginstance.py
++++ b/ipaserver/install/dogtaginstance.py
+@@ -308,11 +308,12 @@ class DogtagInstance(service.Service):
+ doc = server_xml.getroot()
+
+ # no AJP connector means no need to update anything
+- connectors = doc.xpath('//Connector[@port="8009"]')
++ connectors = doc.xpath('//Connector[@protocol="AJP/1.3"]')
+ if len(connectors) == 0:
+ return
+
+- # AJP connector is set on port 8009. Use non-greedy search to find it
++ # AJP protocol is at version 1.3. Assume there is only one as
++ # Dogtag only provisions one.
+ connector = connectors[0]
+
+ # Detect tomcat version and choose the right option name
+@@ -331,11 +332,24 @@ class DogtagInstance(service.Service):
+ rewrite = False
+ else:
+ if oldattr in connector.attrib:
++ # Sufficiently new Dogtag versions (10.9.0-a2) handle the
++ # upgrade for us; we need only to ensure that we're not both
++ # attempting to upgrade server.xml at the same time.
++ # Hopefully this is guaranteed for us.
+ self.ajp_secret = connector.attrib[oldattr]
+ connector.attrib[secretattr] = self.ajp_secret
+ del connector.attrib[oldattr]
+ else:
+- # Generate password, don't use special chars to not break XML
++ # Generate password, don't use special chars to not break XML.
++ #
++ # If we hit this case, pkispawn was run on an older Dogtag
++ # version and we're stuck migrating, choosing a password
++ # ourselves. Dogtag can't generate one randomly because a
++ # Dogtag administrator might've configured AJP and might
++ # not be using IPA.
++ #
++ # Newer Dogtag versions will generate a random password
++ # during pkispawn.
+ self.ajp_secret = ipautil.ipa_generate_password(special=None)
+ connector.attrib[secretattr] = self.ajp_secret
+
+--
+2.26.2
+
+From 1e804bf19da4ee274e735fd49452d4df5d73a002 Mon Sep 17 00:00:00 2001
+From: Alexander Scheel <ascheel@redhat.com>
+Date: Wed, 17 Jun 2020 16:00:25 -0400
+Subject: [PATCH] Configure PKI AJP Secret with 256-bit secret
+
+By default, PKI's AJP secret is generated as a 75-bit password. By
+generating it in IPA, we can guarantee the strength of the AJP secret.
+It makes sense to use a stronger AJP secret because it typically
+isn't rotated; access to AJP allows an attacker to impersonate an admin
+while talking to PKI.
+
+Fixes: https://pagure.io/freeipa/issue/8372
+Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1849146
+Related: https://bugzilla.redhat.com/show_bug.cgi?id=1845447
+Related: https://github.com/dogtagpki/pki/pull/437
+
+Signed-off-by: Alexander Scheel <ascheel@redhat.com>
+Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
+---
+ install/share/ipaca_customize.ini | 1 +
+ install/share/ipaca_default.ini | 2 ++
+ ipaserver/install/dogtaginstance.py | 4 +++-
+ 3 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/install/share/ipaca_customize.ini b/install/share/ipaca_customize.ini
+index 6d58579af..948734241 100644
+--- a/install/share/ipaca_customize.ini
++++ b/install/share/ipaca_customize.ini
+@@ -12,6 +12,7 @@
+ #
+ # Predefined variables
+ # - ipa_ca_subject
++# - ipa_ajp_secret
+ # - ipa_fqdn
+ # - ipa_subject_base
+ # - pki_admin_password
+diff --git a/install/share/ipaca_default.ini b/install/share/ipaca_default.ini
+index 2b9900286..a51256116 100644
+--- a/install/share/ipaca_default.ini
++++ b/install/share/ipaca_default.ini
+@@ -12,6 +12,7 @@ ipa_ca_pem_file=/etc/ipa/ca.crt
+
+ ## dynamic values
+ # ipa_ca_subject=
++# ipa_ajp_secret=
+ # ipa_subject_base=
+ # ipa_fqdn=
+ # ipa_ocsp_uri=
+@@ -66,6 +67,7 @@ pki_issuing_ca=%(pki_issuing_ca_uri)s
+ pki_replication_password=
+
+ pki_enable_proxy=True
++pki_ajp_secret=%(ipa_ajp_secret)s
+ pki_restart_configured_instance=False
+ pki_security_domain_hostname=%(ipa_fqdn)s
+ pki_security_domain_https_port=443
+diff --git a/ipaserver/install/dogtaginstance.py b/ipaserver/install/dogtaginstance.py
+index aa3baeb7c..361d80a8c 100644
+--- a/ipaserver/install/dogtaginstance.py
++++ b/ipaserver/install/dogtaginstance.py
+@@ -840,7 +840,9 @@ class PKIIniLoader:
+ pki_subsystem_type=subsystem.lower(),
+ home_dir=os.path.expanduser("~"),
+ # for softhsm2 testing
+- softhsm2_so=paths.LIBSOFTHSM2_SO
++ softhsm2_so=paths.LIBSOFTHSM2_SO,
++ # Configure a more secure AJP password by default
++ ipa_ajp_secret=ipautil.ipa_generate_password(special=None)
+ )
+
+ @classmethod
+--
+2.26.2
+
diff --git a/SOURCES/0004-baseuser-fix-ipanthomedirectorydrive-option-name_rhbz#1851411.patch b/SOURCES/0004-baseuser-fix-ipanthomedirectorydrive-option-name_rhbz#1851411.patch
new file mode 100644
index 0000000..f87b301
--- /dev/null
+++ b/SOURCES/0004-baseuser-fix-ipanthomedirectorydrive-option-name_rhbz#1851411.patch
@@ -0,0 +1,167 @@
+From a090b429fda35c5a9c3cfb672ab42a5985d00ff9 Mon Sep 17 00:00:00 2001
+From: Petr Vobornik <pvoborni@redhat.com>
+Date: Mon, 8 Jun 2020 19:27:30 +0200
+Subject: [PATCH] baseuser: fix ipanthomedirectorydrive option name
+
+It should be ipanthomedirectorydrive and not ipanthomedirectoryrive.
+
+This fixes showing the field in Web UI and also should fix CLI as it
+probably never worked.
+
+Signed-off-by: Petr Vobornik <pvoborni@redhat.com>
+Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
+---
+ API.txt | 8 ++++----
+ ipaserver/plugins/baseuser.py | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/API.txt b/API.txt
+index 5354a33a0..300b3d9b1 100644
+--- a/API.txt
++++ b/API.txt
+@@ -5085,7 +5085,7 @@ option: Str('in_role*', cli_name='in_roles')
+ option: Str('in_sudorule*', cli_name='in_sudorules')
+ option: Str('initials?', autofill=False)
+ option: Str('ipanthomedirectory?', autofill=False, cli_name='smb_home_dir')
+-option: StrEnum('ipanthomedirectoryrive?', autofill=False, cli_name='smb_home_drive', values=[u'A:', u'B:', u'C:', u'D:', u'E:', u'F:', u'G:', u'H:', u'I:', u'J:', u'K:', u'L:', u'M:', u'N:', u'O:', u'P:', u'Q:', u'R:', u'S:', u'T:', u'U:', u'V:', u'W:', u'X:', u'Y:', u'Z:'])
++option: StrEnum('ipanthomedirectorydrive?', autofill=False, cli_name='smb_home_drive', values=[u'A:', u'B:', u'C:', u'D:', u'E:', u'F:', u'G:', u'H:', u'I:', u'J:', u'K:', u'L:', u'M:', u'N:', u'O:', u'P:', u'Q:', u'R:', u'S:', u'T:', u'U:', u'V:', u'W:', u'X:', u'Y:', u'Z:'])
+ option: Str('ipantlogonscript?', autofill=False, cli_name='smb_logon_script')
+ option: Str('ipantprofilepath?', autofill=False, cli_name='smb_profile_path')
+ option: Str('ipatokenradiusconfiglink?', autofill=False, cli_name='radius')
+@@ -5147,7 +5147,7 @@ option: Str('givenname?', autofill=False, cli_name='first')
+ option: Str('homedirectory?', autofill=False, cli_name='homedir')
+ option: Str('initials?', autofill=False)
+ option: Str('ipanthomedirectory?', autofill=False, cli_name='smb_home_dir')
+-option: StrEnum('ipanthomedirectoryrive?', autofill=False, cli_name='smb_home_drive', values=[u'A:', u'B:', u'C:', u'D:', u'E:', u'F:', u'G:', u'H:', u'I:', u'J:', u'K:', u'L:', u'M:', u'N:', u'O:', u'P:', u'Q:', u'R:', u'S:', u'T:', u'U:', u'V:', u'W:', u'X:', u'Y:', u'Z:'])
++option: StrEnum('ipanthomedirectorydrive?', autofill=False, cli_name='smb_home_drive', values=[u'A:', u'B:', u'C:', u'D:', u'E:', u'F:', u'G:', u'H:', u'I:', u'J:', u'K:', u'L:', u'M:', u'N:', u'O:', u'P:', u'Q:', u'R:', u'S:', u'T:', u'U:', u'V:', u'W:', u'X:', u'Y:', u'Z:'])
+ option: Str('ipantlogonscript?', autofill=False, cli_name='smb_logon_script')
+ option: Str('ipantprofilepath?', autofill=False, cli_name='smb_profile_path')
+ option: Str('ipasshpubkey*', autofill=False, cli_name='sshpubkey')
+@@ -6185,7 +6185,7 @@ option: Str('in_role*', cli_name='in_roles')
+ option: Str('in_sudorule*', cli_name='in_sudorules')
+ option: Str('initials?', autofill=False)
+ option: Str('ipanthomedirectory?', autofill=False, cli_name='smb_home_dir')
+-option: StrEnum('ipanthomedirectoryrive?', autofill=False, cli_name='smb_home_drive', values=[u'A:', u'B:', u'C:', u'D:', u'E:', u'F:', u'G:', u'H:', u'I:', u'J:', u'K:', u'L:', u'M:', u'N:', u'O:', u'P:', u'Q:', u'R:', u'S:', u'T:', u'U:', u'V:', u'W:', u'X:', u'Y:', u'Z:'])
++option: StrEnum('ipanthomedirectorydrive?', autofill=False, cli_name='smb_home_drive', values=[u'A:', u'B:', u'C:', u'D:', u'E:', u'F:', u'G:', u'H:', u'I:', u'J:', u'K:', u'L:', u'M:', u'N:', u'O:', u'P:', u'Q:', u'R:', u'S:', u'T:', u'U:', u'V:', u'W:', u'X:', u'Y:', u'Z:'])
+ option: Str('ipantlogonscript?', autofill=False, cli_name='smb_logon_script')
+ option: Str('ipantprofilepath?', autofill=False, cli_name='smb_profile_path')
+ option: Str('ipatokenradiusconfiglink?', autofill=False, cli_name='radius')
+@@ -6250,7 +6250,7 @@ option: Str('givenname?', autofill=False, cli_name='first')
+ option: Str('homedirectory?', autofill=False, cli_name='homedir')
+ option: Str('initials?', autofill=False)
+ option: Str('ipanthomedirectory?', autofill=False, cli_name='smb_home_dir')
+-option: StrEnum('ipanthomedirectoryrive?', autofill=False, cli_name='smb_home_drive', values=[u'A:', u'B:', u'C:', u'D:', u'E:', u'F:', u'G:', u'H:', u'I:', u'J:', u'K:', u'L:', u'M:', u'N:', u'O:', u'P:', u'Q:', u'R:', u'S:', u'T:', u'U:', u'V:', u'W:', u'X:', u'Y:', u'Z:'])
++option: StrEnum('ipanthomedirectorydrive?', autofill=False, cli_name='smb_home_drive', values=[u'A:', u'B:', u'C:', u'D:', u'E:', u'F:', u'G:', u'H:', u'I:', u'J:', u'K:', u'L:', u'M:', u'N:', u'O:', u'P:', u'Q:', u'R:', u'S:', u'T:', u'U:', u'V:', u'W:', u'X:', u'Y:', u'Z:'])
+ option: Str('ipantlogonscript?', autofill=False, cli_name='smb_logon_script')
+ option: Str('ipantprofilepath?', autofill=False, cli_name='smb_profile_path')
+ option: Str('ipasshpubkey*', autofill=False, cli_name='sshpubkey')
+diff --git a/ipaserver/plugins/baseuser.py b/ipaserver/plugins/baseuser.py
+index a0ed65874..e1b7763f0 100644
+--- a/ipaserver/plugins/baseuser.py
++++ b/ipaserver/plugins/baseuser.py
+@@ -420,7 +420,7 @@ class baseuser(LDAPObject):
+ label=_('SMB Home Directory'),
+ flags=['no_create'],
+ ),
+- StrEnum('ipanthomedirectoryrive?',
++ StrEnum('ipanthomedirectorydrive?',
+ cli_name='smb_home_drive',
+ label=_('SMB Home Directory Drive'),
+ flags=['no_create'],
+--
+2.26.2
+
+From 691b3cddb275821630f443f22706fa75e7c7a5c8 Mon Sep 17 00:00:00 2001
+From: Petr Vobornik <pvoborni@redhat.com>
+Date: Mon, 8 Jun 2020 19:11:33 +0200
+Subject: [PATCH] webui: hide user attributes for SMB services section if empty
+
+This section should be hidded if user object hasn't ipantuserattrs
+object class. I.e. when trusts are not enabled.
+
+Web UI framework already supports hidding of sections if the
+section contains no visible field. So to achieve it we simply needs
+to hide the fields. Given that attributelevelrights
+contains rights only for attributes of current object classes, all
+of these are regarded as not writable.
+
+We can leverage feature of input_widget that it gets hidden
+when the attribute is not writable and has no value and widget's
+"hidden_if_empty" is set to true. Thus doing it here.
+
+For this to work, it is also required to fix an issue with
+"ipanthomedirectorydrive" which is optional (in API) but Web UI
+doesn't offer "empty" ("") value. Adding it here.
+
+fixes: https://pagure.io/freeipa/issue/8336
+
+Signed-off-by: Petr Vobornik <pvoborni@redhat.com>
+Reviewed-By: Serhii Tsymbaliuk <stsymbal@redhat.com>
+Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
+---
+ install/ui/src/freeipa/user.js | 20 +++++++++++---------
+ 1 file changed, 11 insertions(+), 9 deletions(-)
+
+diff --git a/install/ui/src/freeipa/user.js b/install/ui/src/freeipa/user.js
+index fb626f2a1..8f1f5cd85 100644
+--- a/install/ui/src/freeipa/user.js
++++ b/install/ui/src/freeipa/user.js
+@@ -367,36 +367,39 @@ return {
+ {
+ name: 'smb_attributes',
+ label: '@i18n:objects.smb_attributes.title',
+- show_cond: ['oc_ipantuserattrs'],
+ fields: [{
+ name: 'ipantlogonscript',
+ tooltip: {
+ title: '@i18n:objects.smb_attributes.ipantlogonscript_tooltip'
+- }
++ },
++ hidden_if_empty: true
+ },
+ {
+ name: 'ipantprofilepath',
+ tooltip: {
+ title: '@i18n:objects.smb_attributes.ipantprofilepath_tooltip'
+- }
++ },
++ hidden_if_empty: true
+ },
+ {
+ name: 'ipanthomedirectory',
+ tooltip: {
+ title: '@i18n:objects.smb_attributes.ipanthomedirectory_tooltip'
+- }
++ },
++ hidden_if_empty: true
+ },
+ {
+ name: 'ipanthomedirectorydrive',
+ $type: 'select',
+ options: IPA.create_options([
+- 'A:', 'B:', 'C:', 'D:', 'E:', 'F:', 'G:', 'H:', 'I:',
+- 'J:', 'K:', 'L:', 'M:', 'N:', 'O:', 'P:', 'Q:', 'R:',
+- 'S:', 'T:', 'U:', 'V:', 'W:', 'X:', 'Y:', 'Z:'
++ '', 'A:', 'B:', 'C:', 'D:', 'E:', 'F:', 'G:', 'H:',
++ 'I:', 'J:', 'K:', 'L:', 'M:', 'N:', 'O:', 'P:', 'Q:',
++ 'R:', 'S:', 'T:', 'U:', 'V:', 'W:', 'X:', 'Y:', 'Z:'
+ ]),
+ tooltip: {
+ title: '@i18n:objects.smb_attributes.ipanthomedirectorydrive_tooltip'
+- }
++ },
++ hidden_if_empty: true
+ }
+ ]
+ }
+@@ -482,7 +485,6 @@ return {
+ IPA.user.self_service_other_user_evaluator,
+ IPA.user.preserved_user_evaluator,
+ IPA.user.is_locked_evaluator,
+- IPA.object_class_evaluator,
+ IPA.cert.certificate_evaluator
+ ],
+ summary_conditions: [
+--
+2.26.2
+
diff --git a/SOURCES/1001-Change-branding-to-IPA-and-Identity-Management.patch b/SOURCES/1001-Change-branding-to-IPA-and-Identity-Management.patch
index be93e35..b252f00 100644
--- a/SOURCES/1001-Change-branding-to-IPA-and-Identity-Management.patch
+++ b/SOURCES/1001-Change-branding-to-IPA-and-Identity-Management.patch
@@ -1,7 +1,7 @@
-From a98b0595fce7dea121c743455ac5d44a2e282e80 Mon Sep 17 00:00:00 2001
+From f40f42dd9b8c5da54a872ef6a7de46e5ae3ba341 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:39 +0300
-Subject: [PATCH 01/71] client/man/default.conf.5: Change branding to IPA and
+Subject: [PATCH 01/78] client/man/default.conf.5: Change branding to IPA and
Identity Management
---
@@ -9,7 +9,7 @@ Subject: [PATCH 01/71] client/man/default.conf.5: Change branding to IPA and
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/client/man/default.conf.5 b/client/man/default.conf.5
-index 728fc08..6ec8616 100644
+index 728fc0871..6ec8616bc 100644
--- a/client/man/default.conf.5
+++ b/client/man/default.conf.5
@@ -16,7 +16,7 @@
@@ -22,13 +22,12 @@ index 728fc08..6ec8616 100644
default.conf \- IPA configuration file
.SH "SYNOPSIS"
--
-2.21.0
+2.21.1
-
-From 67d0b5bf5b4ce068d3d5a89a36fca44589ba7040 Mon Sep 17 00:00:00 2001
+From ddf6ddd9a6b0482d01fce2df102f25d719adfa79 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:39 +0300
-Subject: [PATCH 02/71] client/man/ipa-certupdate.1: Change branding to IPA and
+Subject: [PATCH 02/78] client/man/ipa-certupdate.1: Change branding to IPA and
Identity Management
---
@@ -36,7 +35,7 @@ Subject: [PATCH 02/71] client/man/ipa-certupdate.1: Change branding to IPA and
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/client/man/ipa-certupdate.1 b/client/man/ipa-certupdate.1
-index d95790a..431b395 100644
+index d95790a36..431b395a9 100644
--- a/client/man/ipa-certupdate.1
+++ b/client/man/ipa-certupdate.1
@@ -16,7 +16,7 @@
@@ -49,13 +48,12 @@ index d95790a..431b395 100644
ipa\-certupdate \- Update local IPA certificate databases with certificates from the server
.SH "SYNOPSIS"
--
-2.21.0
-
+2.21.1
-From 84addd7681276f065e6c974997127d394133d51c Mon Sep 17 00:00:00 2001
+From 100af01bbb2838c4c43159f4eaa925c57113baec Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:39 +0300
-Subject: [PATCH 03/71] client/man/ipa-client-automount.1: Change branding to
+Subject: [PATCH 03/78] client/man/ipa-client-automount.1: Change branding to
IPA and Identity Management
---
@@ -63,7 +61,7 @@ Subject: [PATCH 03/71] client/man/ipa-client-automount.1: Change branding to
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/client/man/ipa-client-automount.1 b/client/man/ipa-client-automount.1
-index 4c3caee..3f6edab 100644
+index 4c3caee93..3f6edabd0 100644
--- a/client/man/ipa-client-automount.1
+++ b/client/man/ipa-client-automount.1
@@ -16,7 +16,7 @@
@@ -76,13 +74,12 @@ index 4c3caee..3f6edab 100644
ipa\-client\-automount \- Configure automount and NFS for IPA
.SH "SYNOPSIS"
--
-2.21.0
-
+2.21.1
-From d63e2ce893f3fb8a3fcf0ec91893847f942380f6 Mon Sep 17 00:00:00 2001
+From 497a46243f09fa8d8a295f61710065c675a91800 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:39 +0300
-Subject: [PATCH 04/71] client/man/ipa-client-install.1: Change branding to IPA
+Subject: [PATCH 04/78] client/man/ipa-client-install.1: Change branding to IPA
and Identity Management
---
@@ -90,7 +87,7 @@ Subject: [PATCH 04/71] client/man/ipa-client-install.1: Change branding to IPA
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/client/man/ipa-client-install.1 b/client/man/ipa-client-install.1
-index 94b4b04..743fa6a 100644
+index 2d031fb2c..64ab1bff0 100644
--- a/client/man/ipa-client-install.1
+++ b/client/man/ipa-client-install.1
@@ -1,7 +1,7 @@
@@ -103,13 +100,12 @@ index 94b4b04..743fa6a 100644
ipa\-client\-install \- Configure an IPA client
.SH "SYNOPSIS"
--
-2.21.0
+2.21.1
-
-From 959face241f87ba6c703b7ae4aa71ff9da60d175 Mon Sep 17 00:00:00 2001
+From 5d13b4528df055dee11ddd07c10a073b8ddd0065 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:39 +0300
-Subject: [PATCH 05/71] client/man/ipa-getkeytab.1: Change branding to IPA and
+Subject: [PATCH 05/78] client/man/ipa-getkeytab.1: Change branding to IPA and
Identity Management
---
@@ -117,7 +113,7 @@ Subject: [PATCH 05/71] client/man/ipa-getkeytab.1: Change branding to IPA and
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/client/man/ipa-getkeytab.1 b/client/man/ipa-getkeytab.1
-index f06fcd9..01a2618 100644
+index f06fcd910..01a2618ef 100644
--- a/client/man/ipa-getkeytab.1
+++ b/client/man/ipa-getkeytab.1
@@ -17,7 +17,7 @@
@@ -139,13 +135,12 @@ index f06fcd9..01a2618 100644
.SH "EXAMPLES"
Add and retrieve a keytab for the NFS service principal on
--
-2.21.0
-
+2.21.1
-From f6a2e0baebd1969de46a0ea92b68bb0742459235 Mon Sep 17 00:00:00 2001
+From c89ccf3e9cf8868c19e12716dcff110b0cc040fc Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:39 +0300
-Subject: [PATCH 06/71] client/man/ipa-join.1: Change branding to IPA and
+Subject: [PATCH 06/78] client/man/ipa-join.1: Change branding to IPA and
Identity Management
---
@@ -153,7 +148,7 @@ Subject: [PATCH 06/71] client/man/ipa-join.1: Change branding to IPA and
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/client/man/ipa-join.1 b/client/man/ipa-join.1
-index d881607..30b6675 100644
+index d88160784..30b667558 100644
--- a/client/man/ipa-join.1
+++ b/client/man/ipa-join.1
@@ -16,7 +16,7 @@
@@ -166,13 +161,12 @@ index d881607..30b6675 100644
ipa\-join \- Join a machine to an IPA realm and get a keytab for the host service principal
.SH "SYNOPSIS"
--
-2.21.0
+2.21.1
-
-From fcf92b11295321a8df6eb27babcc959926a59fe3 Mon Sep 17 00:00:00 2001
+From e691f8e132a0d7f12049015cf728e6ed1f3ca18b Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:39 +0300
-Subject: [PATCH 07/71] client/man/ipa-rmkeytab.1: Change branding to IPA and
+Subject: [PATCH 07/78] client/man/ipa-rmkeytab.1: Change branding to IPA and
Identity Management
---
@@ -180,7 +174,7 @@ Subject: [PATCH 07/71] client/man/ipa-rmkeytab.1: Change branding to IPA and
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/client/man/ipa-rmkeytab.1 b/client/man/ipa-rmkeytab.1
-index 53f7754..2c8218c 100644
+index 53f775439..2c8218c94 100644
--- a/client/man/ipa-rmkeytab.1
+++ b/client/man/ipa-rmkeytab.1
@@ -17,7 +17,7 @@
@@ -193,13 +187,12 @@ index 53f7754..2c8218c 100644
ipa\-rmkeytab \- Remove a kerberos principal from a keytab
.SH "SYNOPSIS"
--
-2.21.0
-
+2.21.1
-From 8978dadb62b23014d5d82547e16c07c575c7cf56 Mon Sep 17 00:00:00 2001
+From 5bfab52a3246268a063d16700bf7063da56f3fa4 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:39 +0300
-Subject: [PATCH 08/71] client/man/ipa.1: Change branding to IPA and Identity
+Subject: [PATCH 08/78] client/man/ipa.1: Change branding to IPA and Identity
Management
---
@@ -207,7 +200,7 @@ Subject: [PATCH 08/71] client/man/ipa.1: Change branding to IPA and Identity
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/client/man/ipa.1 b/client/man/ipa.1
-index f9fae7c..2fb21b5 100644
+index f9fae7c0d..2fb21b52d 100644
--- a/client/man/ipa.1
+++ b/client/man/ipa.1
@@ -16,7 +16,7 @@
@@ -220,13 +213,12 @@ index f9fae7c..2fb21b5 100644
ipa \- IPA command\-line interface
.SH "SYNOPSIS"
--
-2.21.0
+2.21.1
-
-From d2a614533c0d7c1203d9251dc557871bc8962efd Mon Sep 17 00:00:00 2001
+From e2387735f5a4b37cec1c850ac2725ed8ddf59322 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:39 +0300
-Subject: [PATCH 09/71] install/html/ssbrowser.html: Change branding to IPA and
+Subject: [PATCH 09/78] install/html/ssbrowser.html: Change branding to IPA and
Identity Management
---
@@ -234,7 +226,7 @@ Subject: [PATCH 09/71] install/html/ssbrowser.html: Change branding to IPA and
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/install/html/ssbrowser.html b/install/html/ssbrowser.html
-index faa7e65..89ada7c 100644
+index a48a24511..f934dbb40 100644
--- a/install/html/ssbrowser.html
+++ b/install/html/ssbrowser.html
@@ -2,7 +2,7 @@
@@ -256,13 +248,12 @@ index faa7e65..89ada7c 100644
</nav>
--
-2.21.0
-
+2.21.1
-From 199f34178cd8dfff0fd5edd37472787bbd3b4320 Mon Sep 17 00:00:00 2001
+From 10b4195ec2820ddbb67bcdb6a74a8f4aa20c12fe Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:39 +0300
-Subject: [PATCH 10/71] install/html/unauthorized.html: Change branding to IPA
+Subject: [PATCH 10/78] install/html/unauthorized.html: Change branding to IPA
and Identity Management
---
@@ -270,7 +261,7 @@ Subject: [PATCH 10/71] install/html/unauthorized.html: Change branding to IPA
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/install/html/unauthorized.html b/install/html/unauthorized.html
-index 630982d..b8c64d6 100644
+index 630982da8..b8c64d69d 100644
--- a/install/html/unauthorized.html
+++ b/install/html/unauthorized.html
@@ -2,7 +2,7 @@
@@ -292,13 +283,12 @@ index 630982d..b8c64d6 100644
</nav>
--
-2.21.0
+2.21.1
-
-From 116e40f79a289aa4817cee7d8fbb4935b6346997 Mon Sep 17 00:00:00 2001
+From 8293605a01b9b45d4ab87d7fd9342b9e832ba3ce Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:39 +0300
-Subject: [PATCH 11/71] install/migration/index.html: Change branding to IPA
+Subject: [PATCH 11/78] install/migration/index.html: Change branding to IPA
and Identity Management
---
@@ -306,7 +296,7 @@ Subject: [PATCH 11/71] install/migration/index.html: Change branding to IPA
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/install/migration/index.html b/install/migration/index.html
-index fca517c..b5ac1f6 100644
+index fca517cdc..b5ac1f6df 100644
--- a/install/migration/index.html
+++ b/install/migration/index.html
@@ -2,7 +2,7 @@
@@ -319,13 +309,12 @@ index fca517c..b5ac1f6 100644
<!--[if IE]>
<meta id="ie-detector">
--
-2.21.0
-
+2.21.1
-From 15bcd44695d9f0920c0df57f1a32f3cfaf5a4247 Mon Sep 17 00:00:00 2001
+From 6a479bab8581f2960a628d309a705d42ef9dfdbf Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:39 +0300
-Subject: [PATCH 12/71] install/share/schema.d/README: Change branding to IPA
+Subject: [PATCH 12/78] install/share/schema.d/README: Change branding to IPA
and Identity Management
---
@@ -333,7 +322,7 @@ Subject: [PATCH 12/71] install/share/schema.d/README: Change branding to IPA
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/install/share/schema.d/README b/install/share/schema.d/README
-index 19e3e68..2a92ec6 100644
+index 19e3e6832..2a92ec6ae 100644
--- a/install/share/schema.d/README
+++ b/install/share/schema.d/README
@@ -7,8 +7,8 @@ schema files during the run of ipa-server-upgrade utility. Therefore, they are
@@ -348,13 +337,12 @@ index 19e3e68..2a92ec6 100644
You may place your schema files in a subdirectory too, the code that loads
schema files processes recursively all subdirectories of schema.d.
--
-2.21.0
-
+2.21.1
-From 96ab352b2c46c6387d4deed7a06649def48e2351 Mon Sep 17 00:00:00 2001
+From c52b451a88bc8d18d1e08f237e5bcf648861c650 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:39 +0300
-Subject: [PATCH 13/71] install/tools/ipa-adtrust-install.in: Change branding
+Subject: [PATCH 13/78] install/tools/ipa-adtrust-install.in: Change branding
to IPA and Identity Management
---
@@ -362,7 +350,7 @@ Subject: [PATCH 13/71] install/tools/ipa-adtrust-install.in: Change branding
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/install/tools/ipa-adtrust-install.in b/install/tools/ipa-adtrust-install.in
-index 1abfea9..04510a5 100644
+index 7d94b718e..80f5d27a7 100644
--- a/install/tools/ipa-adtrust-install.in
+++ b/install/tools/ipa-adtrust-install.in
@@ -141,11 +141,11 @@ def main():
@@ -380,13 +368,12 @@ index 1abfea9..04510a5 100644
# print " * Add a SID to all users and Posix groups"
print("")
--
-2.21.0
+2.21.1
-
-From d1479121c7bbb1ab74e62ffb2b5b6ccac0d82ff9 Mon Sep 17 00:00:00 2001
+From 7213f732557deb560aede21286abd2404a0e6f9e Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:39 +0300
-Subject: [PATCH 14/71] install/tools/ipa-replica-conncheck.in: Change branding
+Subject: [PATCH 14/78] install/tools/ipa-replica-conncheck.in: Change branding
to IPA and Identity Management
---
@@ -394,7 +381,7 @@ Subject: [PATCH 14/71] install/tools/ipa-replica-conncheck.in: Change branding
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/install/tools/ipa-replica-conncheck.in b/install/tools/ipa-replica-conncheck.in
-index b22db11..b86ce45 100644
+index b22db1139..b86ce4569 100644
--- a/install/tools/ipa-replica-conncheck.in
+++ b/install/tools/ipa-replica-conncheck.in
@@ -290,7 +290,7 @@ class PortResponder(threading.Thread):
@@ -407,13 +394,12 @@ index b22db11..b86ce45 100644
self.ports_open_cond = threading.Condition()
--
-2.21.0
-
+2.21.1
-From 3ea319693045808c59bb43055e0b9d511cbc1ef8 Mon Sep 17 00:00:00 2001
+From 1f2a34a5fcb88b3ca94949a513523eb3862e99c1 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:39 +0300
-Subject: [PATCH 15/71] install/tools/man/ipa-adtrust-install.1: Change
+Subject: [PATCH 15/78] install/tools/man/ipa-adtrust-install.1: Change
branding to IPA and Identity Management
---
@@ -421,7 +407,7 @@ Subject: [PATCH 15/71] install/tools/man/ipa-adtrust-install.1: Change
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/install/tools/man/ipa-adtrust-install.1 b/install/tools/man/ipa-adtrust-install.1
-index b110658..f70f316 100644
+index b11065806..f70f316f6 100644
--- a/install/tools/man/ipa-adtrust-install.1
+++ b/install/tools/man/ipa-adtrust-install.1
@@ -16,7 +16,7 @@
@@ -443,13 +429,12 @@ index b110658..f70f316 100644
to the list automatically as restart of the LDAP service on each of them
is required. The host where ipa\-adtrust\-install is being run is added
--
-2.21.0
+2.21.1
-
-From c12d0550c227a625a1a04ed11781a3c0ffae05f9 Mon Sep 17 00:00:00 2001
+From 5742d0b0fa19dc744f81aeed6727c472d2e5505f Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:39 +0300
-Subject: [PATCH 16/71] install/tools/man/ipa-advise.1: Change branding to IPA
+Subject: [PATCH 16/78] install/tools/man/ipa-advise.1: Change branding to IPA
and Identity Management
---
@@ -457,7 +442,7 @@ Subject: [PATCH 16/71] install/tools/man/ipa-advise.1: Change branding to IPA
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/install/tools/man/ipa-advise.1 b/install/tools/man/ipa-advise.1
-index 4c494aa..515bbdd 100644
+index 4c494aab9..515bbddbe 100644
--- a/install/tools/man/ipa-advise.1
+++ b/install/tools/man/ipa-advise.1
@@ -16,7 +16,7 @@
@@ -477,13 +462,12 @@ index 4c494aa..515bbdd 100644
\ No newline at end of file
+1 if an error occurred
--
-2.21.0
-
+2.21.1
-From 24b7c7cd888abd3d044b7a7c7fba8fe6f6fe2d44 Mon Sep 17 00:00:00 2001
+From 650e5f89bb097c559b52a961866296380f3f94d5 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
-Subject: [PATCH 17/71] install/tools/man/ipa-backup.1: Change branding to IPA
+Subject: [PATCH 17/78] install/tools/man/ipa-backup.1: Change branding to IPA
and Identity Management
---
@@ -491,7 +475,7 @@ Subject: [PATCH 17/71] install/tools/man/ipa-backup.1: Change branding to IPA
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/install/tools/man/ipa-backup.1 b/install/tools/man/ipa-backup.1
-index 77081b6..8f3f712 100644
+index 2f0bc9e6a..77d5d7caa 100644
--- a/install/tools/man/ipa-backup.1
+++ b/install/tools/man/ipa-backup.1
@@ -16,7 +16,7 @@
@@ -504,13 +488,12 @@ index 77081b6..8f3f712 100644
ipa\-backup \- Back up an IPA master
.SH "SYNOPSIS"
--
-2.21.0
+2.21.1
-
-From 6f811a93085b8422bd75d540dd9b9a58d7b75f86 Mon Sep 17 00:00:00 2001
+From f8849ddf92e83d23b0c317b1c5f59ad9af1e3e1c Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
-Subject: [PATCH 18/71] install/tools/man/ipa-ca-install.1: Change branding to
+Subject: [PATCH 18/78] install/tools/man/ipa-ca-install.1: Change branding to
IPA and Identity Management
---
@@ -518,7 +501,7 @@ Subject: [PATCH 18/71] install/tools/man/ipa-ca-install.1: Change branding to
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/install/tools/man/ipa-ca-install.1 b/install/tools/man/ipa-ca-install.1
-index 3ebe32c..8e57c00 100644
+index 3ebe32c0a..8e57c0092 100644
--- a/install/tools/man/ipa-ca-install.1
+++ b/install/tools/man/ipa-ca-install.1
@@ -16,7 +16,7 @@
@@ -531,13 +514,12 @@ index 3ebe32c..8e57c00 100644
ipa\-ca\-install \- Install a CA on a server
.SH "SYNOPSIS"
--
-2.21.0
-
+2.21.1
-From bb7f2fab05d96e97a845f074e9aeb2c2dab52f20 Mon Sep 17 00:00:00 2001
+From 625ae452bc457003c9f4559884abb9afa2bb41ca Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
-Subject: [PATCH 19/71] install/tools/man/ipa-cacert-manage.1: Change branding
+Subject: [PATCH 19/78] install/tools/man/ipa-cacert-manage.1: Change branding
to IPA and Identity Management
---
@@ -545,7 +527,7 @@ Subject: [PATCH 19/71] install/tools/man/ipa-cacert-manage.1: Change branding
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/install/tools/man/ipa-cacert-manage.1 b/install/tools/man/ipa-cacert-manage.1
-index 0cd34ee..84fbc1a 100644
+index b76ee1816..4359b12e3 100644
--- a/install/tools/man/ipa-cacert-manage.1
+++ b/install/tools/man/ipa-cacert-manage.1
@@ -16,7 +16,7 @@
@@ -558,13 +540,12 @@ index 0cd34ee..84fbc1a 100644
ipa\-cacert\-manage \- Manage CA certificates in IPA
.SH "SYNOPSIS"
--
-2.21.0
+2.21.1
-
-From 5203f09b581b3cd385d2f022b100e854b65c71db Mon Sep 17 00:00:00 2001
+From 13ebf098b64a5aefd39aac7a1eef1367170bc284 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
-Subject: [PATCH 20/71] install/tools/man/ipa-compat-manage.1: Change branding
+Subject: [PATCH 20/78] install/tools/man/ipa-compat-manage.1: Change branding
to IPA and Identity Management
---
@@ -572,7 +553,7 @@ Subject: [PATCH 20/71] install/tools/man/ipa-compat-manage.1: Change branding
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/install/tools/man/ipa-compat-manage.1 b/install/tools/man/ipa-compat-manage.1
-index f22b174..2647033 100644
+index f22b1743e..26470331a 100644
--- a/install/tools/man/ipa-compat-manage.1
+++ b/install/tools/man/ipa-compat-manage.1
@@ -16,7 +16,7 @@
@@ -585,13 +566,12 @@ index f22b174..2647033 100644
ipa\-compat\-manage \- Enables or disables the schema compatibility plugin
.SH "SYNOPSIS"
--
-2.21.0
-
+2.21.1
-From 118a4b5d5a7782fa2f98194ca940ddd68f17116c Mon Sep 17 00:00:00 2001
+From 2dfc9079680b04f286eeed4f65ce4f02914c55b7 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
-Subject: [PATCH 21/71] install/tools/man/ipa-csreplica-manage.1: Change
+Subject: [PATCH 21/78] install/tools/man/ipa-csreplica-manage.1: Change
branding to IPA and Identity Management
---
@@ -599,7 +579,7 @@ Subject: [PATCH 21/71] install/tools/man/ipa-csreplica-manage.1: Change
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/install/tools/man/ipa-csreplica-manage.1 b/install/tools/man/ipa-csreplica-manage.1
-index ab5bfdd..6d03975 100644
+index ab5bfddd8..6d039751e 100644
--- a/install/tools/man/ipa-csreplica-manage.1
+++ b/install/tools/man/ipa-csreplica-manage.1
@@ -16,7 +16,7 @@
@@ -612,13 +592,12 @@ index ab5bfdd..6d03975 100644
ipa\-csreplica\-manage \- Manage an IPA CS replica
.SH "SYNOPSIS"
--
-2.21.0
-
+2.21.1
-From 07aee8049471294f114d3953c0af762fd0ce7dfc Mon Sep 17 00:00:00 2001
+From 4858e90ba2b7aca2af1e2375b2442b3fa5c30f9c Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
-Subject: [PATCH 22/71] install/tools/man/ipa-dns-install.1: Change branding to
+Subject: [PATCH 22/78] install/tools/man/ipa-dns-install.1: Change branding to
IPA and Identity Management
---
@@ -626,7 +605,7 @@ Subject: [PATCH 22/71] install/tools/man/ipa-dns-install.1: Change branding to
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/install/tools/man/ipa-dns-install.1 b/install/tools/man/ipa-dns-install.1
-index 14e4cd5..029001e 100644
+index 14e4cd51f..029001eca 100644
--- a/install/tools/man/ipa-dns-install.1
+++ b/install/tools/man/ipa-dns-install.1
@@ -1,7 +1,7 @@
@@ -648,13 +627,12 @@ index 14e4cd5..029001e 100644
This command requires that an IPA server is already installed and configured.
--
-2.21.0
+2.21.1
-
-From fd0616fde2690c1d1e69556d0d15c711585b24e7 Mon Sep 17 00:00:00 2001
+From aeb6e9ae2e4ebf5d627e80f0a495a45589c0455f Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
-Subject: [PATCH 23/71] install/tools/man/ipa-kra-install.1: Change branding to
+Subject: [PATCH 23/78] install/tools/man/ipa-kra-install.1: Change branding to
IPA and Identity Management
---
@@ -662,7 +640,7 @@ Subject: [PATCH 23/71] install/tools/man/ipa-kra-install.1: Change branding to
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/install/tools/man/ipa-kra-install.1 b/install/tools/man/ipa-kra-install.1
-index 6c8523a..5476a4e 100644
+index 6c8523aa0..5476a4e71 100644
--- a/install/tools/man/ipa-kra-install.1
+++ b/install/tools/man/ipa-kra-install.1
@@ -16,7 +16,7 @@
@@ -675,13 +653,12 @@ index 6c8523a..5476a4e 100644
ipa\-kra\-install \- Install a KRA on a server
.SH "SYNOPSIS"
--
-2.21.0
-
+2.21.1
-From d8236fb3826f400d828cfe56c83cb8af65645071 Mon Sep 17 00:00:00 2001
+From d71a89b2b1ebe588672e76f04c7edd6d7a287837 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
-Subject: [PATCH 24/71] install/tools/man/ipa-ldap-updater.1: Change branding
+Subject: [PATCH 24/78] install/tools/man/ipa-ldap-updater.1: Change branding
to IPA and Identity Management
---
@@ -689,7 +666,7 @@ Subject: [PATCH 24/71] install/tools/man/ipa-ldap-updater.1: Change branding
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/install/tools/man/ipa-ldap-updater.1 b/install/tools/man/ipa-ldap-updater.1
-index 4893802..7ead55b 100644
+index 4893802c2..7ead55bd9 100644
--- a/install/tools/man/ipa-ldap-updater.1
+++ b/install/tools/man/ipa-ldap-updater.1
@@ -16,7 +16,7 @@
@@ -702,13 +679,12 @@ index 4893802..7ead55b 100644
ipa\-ldap\-updater \- Update the IPA LDAP configuration
.SH "SYNOPSIS"
--
-2.21.0
+2.21.1
-
-From 7164d61f04d6eb4369c3d1743e46f38d17dedc46 Mon Sep 17 00:00:00 2001
+From acdf99fd7afbfd614b2db75bddf647ad12d2767f Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
-Subject: [PATCH 25/71] install/tools/man/ipa-managed-entries.1: Change
+Subject: [PATCH 25/78] install/tools/man/ipa-managed-entries.1: Change
branding to IPA and Identity Management
---
@@ -716,7 +692,7 @@ Subject: [PATCH 25/71] install/tools/man/ipa-managed-entries.1: Change
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/install/tools/man/ipa-managed-entries.1 b/install/tools/man/ipa-managed-entries.1
-index 3d5ca22..edaa0a9 100644
+index 3d5ca22b8..edaa0a90d 100644
--- a/install/tools/man/ipa-managed-entries.1
+++ b/install/tools/man/ipa-managed-entries.1
@@ -16,7 +16,7 @@
@@ -729,13 +705,12 @@ index 3d5ca22..edaa0a9 100644
ipa\-managed\-entries \- Enables or disables the schema Managed Entry plugins
.SH "SYNOPSIS"
--
-2.21.0
-
+2.21.1
-From bde20076f4f7b5c519313e0890fcfaf0cfea04f8 Mon Sep 17 00:00:00 2001
+From 2cbdc087d8f18733d36e60788faddef5a914821a Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
-Subject: [PATCH 26/71] install/tools/man/ipa-nis-manage.1: Change branding to
+Subject: [PATCH 26/78] install/tools/man/ipa-nis-manage.1: Change branding to
IPA and Identity Management
---
@@ -743,7 +718,7 @@ Subject: [PATCH 26/71] install/tools/man/ipa-nis-manage.1: Change branding to
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/install/tools/man/ipa-nis-manage.1 b/install/tools/man/ipa-nis-manage.1
-index 9327848..1107b77 100644
+index 93278487c..1107b7790 100644
--- a/install/tools/man/ipa-nis-manage.1
+++ b/install/tools/man/ipa-nis-manage.1
@@ -16,7 +16,7 @@
@@ -756,13 +731,12 @@ index 9327848..1107b77 100644
ipa\-nis\-manage \- Enables or disables the NIS listener plugin
.SH "SYNOPSIS"
--
-2.21.0
+2.21.1
-
-From d58f69b6c65de144e4d4413a2572f92fb32d269a Mon Sep 17 00:00:00 2001
+From 3af61d4b26532726492bc7d121ec8b39bb68dce6 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
-Subject: [PATCH 27/71] install/tools/man/ipa-otptoken-import.1: Change
+Subject: [PATCH 27/78] install/tools/man/ipa-otptoken-import.1: Change
branding to IPA and Identity Management
---
@@ -770,7 +744,7 @@ Subject: [PATCH 27/71] install/tools/man/ipa-otptoken-import.1: Change
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/install/tools/man/ipa-otptoken-import.1 b/install/tools/man/ipa-otptoken-import.1
-index 920a08c..fe91040 100644
+index 920a08ca2..fe91040fa 100644
--- a/install/tools/man/ipa-otptoken-import.1
+++ b/install/tools/man/ipa-otptoken-import.1
@@ -16,7 +16,7 @@
@@ -783,13 +757,12 @@ index 920a08c..fe91040 100644
ipa\-otptoken\-import \- Imports OTP tokens from RFC 6030 XML file
.SH "SYNOPSIS"
--
-2.21.0
-
+2.21.1
-From 317f15595001171dc6c0dc9eba0b54294a1b78ce Mon Sep 17 00:00:00 2001
+From 426c1370d990dcd44612427abc75f8b21178f279 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
-Subject: [PATCH 28/71] install/tools/man/ipa-pkinit-manage.1: Change branding
+Subject: [PATCH 28/78] install/tools/man/ipa-pkinit-manage.1: Change branding
to IPA and Identity Management
---
@@ -797,7 +770,7 @@ Subject: [PATCH 28/71] install/tools/man/ipa-pkinit-manage.1: Change branding
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/install/tools/man/ipa-pkinit-manage.1 b/install/tools/man/ipa-pkinit-manage.1
-index 5018ce8..50d63e9 100644
+index 5018ce8aa..50d63e921 100644
--- a/install/tools/man/ipa-pkinit-manage.1
+++ b/install/tools/man/ipa-pkinit-manage.1
@@ -1,7 +1,7 @@
@@ -810,13 +783,12 @@ index 5018ce8..50d63e9 100644
ipa\-pkinit\-manage \- Enables or disables PKINIT
.SH "SYNOPSIS"
--
-2.21.0
+2.21.1
-
-From fda0cc19e2575fbeec92e3f9baa53cec8a3a5837 Mon Sep 17 00:00:00 2001
+From 7553161cbb48d42e76babe540ae878d328cb462b Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
-Subject: [PATCH 29/71] install/tools/man/ipa-replica-conncheck.1: Change
+Subject: [PATCH 29/78] install/tools/man/ipa-replica-conncheck.1: Change
branding to IPA and Identity Management
---
@@ -824,7 +796,7 @@ Subject: [PATCH 29/71] install/tools/man/ipa-replica-conncheck.1: Change
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/install/tools/man/ipa-replica-conncheck.1 b/install/tools/man/ipa-replica-conncheck.1
-index 6451f35..ed441e3 100644
+index 6451f3545..ed441e3be 100644
--- a/install/tools/man/ipa-replica-conncheck.1
+++ b/install/tools/man/ipa-replica-conncheck.1
@@ -16,7 +16,7 @@
@@ -837,13 +809,12 @@ index 6451f35..ed441e3 100644
ipa\-replica\-conncheck \- Check a replica\-master network connection before installation
.SH "SYNOPSIS"
--
-2.21.0
-
+2.21.1
-From 96be660cba85a4358bd90549a8c26cd10310cdf7 Mon Sep 17 00:00:00 2001
+From 3676e1a1040aa6ae858134828cfcd7b35e74d4f5 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
-Subject: [PATCH 30/71] install/tools/man/ipa-replica-install.1: Change
+Subject: [PATCH 30/78] install/tools/man/ipa-replica-install.1: Change
branding to IPA and Identity Management
---
@@ -851,7 +822,7 @@ Subject: [PATCH 30/71] install/tools/man/ipa-replica-install.1: Change
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/install/tools/man/ipa-replica-install.1 b/install/tools/man/ipa-replica-install.1
-index 19d1d91..44fce10 100644
+index 19d1d9110..44fce10ba 100644
--- a/install/tools/man/ipa-replica-install.1
+++ b/install/tools/man/ipa-replica-install.1
@@ -1,7 +1,7 @@
@@ -882,13 +853,12 @@ index 19d1d91..44fce10 100644
to the list automatically as restart of the LDAP service on each of them
is required. The host where ipa\-adtrust\-install is being run is added
--
-2.21.0
+2.21.1
-
-From d83e2fc2480d12404056de5a7cd4ea7ff1eb936c Mon Sep 17 00:00:00 2001
+From 139ddf89255aa4423499208d5b4191dbc7b829dd Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
-Subject: [PATCH 31/71] install/tools/man/ipa-replica-manage.1: Change branding
+Subject: [PATCH 31/78] install/tools/man/ipa-replica-manage.1: Change branding
to IPA and Identity Management
---
@@ -896,7 +866,7 @@ Subject: [PATCH 31/71] install/tools/man/ipa-replica-manage.1: Change branding
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/install/tools/man/ipa-replica-manage.1 b/install/tools/man/ipa-replica-manage.1
-index 239f159..2c94278 100644
+index 239f1591c..2c94278ca 100644
--- a/install/tools/man/ipa-replica-manage.1
+++ b/install/tools/man/ipa-replica-manage.1
@@ -16,7 +16,7 @@
@@ -909,13 +879,12 @@ index 239f159..2c94278 100644
ipa\-replica\-manage \- Manage an IPA replica
.SH "SYNOPSIS"
--
-2.21.0
-
+2.21.1
-From 61cd4587092d982c7e9bd56ae82f59a3859e5739 Mon Sep 17 00:00:00 2001
+From 773bf31555e662f24f807e4b69b8dcf1f88e3f83 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
-Subject: [PATCH 32/71] install/tools/man/ipa-restore.1: Change branding to IPA
+Subject: [PATCH 32/78] install/tools/man/ipa-restore.1: Change branding to IPA
and Identity Management
---
@@ -923,7 +892,7 @@ Subject: [PATCH 32/71] install/tools/man/ipa-restore.1: Change branding to IPA
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/install/tools/man/ipa-restore.1 b/install/tools/man/ipa-restore.1
-index 5843d55..bc0755b 100644
+index 5843d5546..bc0755baa 100644
--- a/install/tools/man/ipa-restore.1
+++ b/install/tools/man/ipa-restore.1
@@ -16,7 +16,7 @@
@@ -936,13 +905,12 @@ index 5843d55..bc0755b 100644
ipa\-restore \- Restore an IPA master
.SH "SYNOPSIS"
--
-2.21.0
+2.21.1
-
-From 00ba3a4744ec9df96213461af3a0e72129765540 Mon Sep 17 00:00:00 2001
+From c00d47be96e91102bf3eeecf0a2363cf21f260eb Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
-Subject: [PATCH 33/71] install/tools/man/ipa-server-certinstall.1: Change
+Subject: [PATCH 33/78] install/tools/man/ipa-server-certinstall.1: Change
branding to IPA and Identity Management
---
@@ -950,7 +918,7 @@ Subject: [PATCH 33/71] install/tools/man/ipa-server-certinstall.1: Change
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/install/tools/man/ipa-server-certinstall.1 b/install/tools/man/ipa-server-certinstall.1
-index 79bd7c8..3f12a5a 100644
+index 79bd7c885..3f12a5af2 100644
--- a/install/tools/man/ipa-server-certinstall.1
+++ b/install/tools/man/ipa-server-certinstall.1
@@ -16,7 +16,7 @@
@@ -963,13 +931,12 @@ index 79bd7c8..3f12a5a 100644
ipa\-server\-certinstall \- Install new SSL server certificates
.SH "SYNOPSIS"
--
-2.21.0
-
+2.21.1
-From 9efb599bef9a8129876d946e2d1f4e901663acd7 Mon Sep 17 00:00:00 2001
+From b95e2315685e4142b7f0d5ea1fdaa7b4a1b2a9d7 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
-Subject: [PATCH 34/71] install/tools/man/ipa-server-install.1: Change branding
+Subject: [PATCH 34/78] install/tools/man/ipa-server-install.1: Change branding
to IPA and Identity Management
---
@@ -977,7 +944,7 @@ Subject: [PATCH 34/71] install/tools/man/ipa-server-install.1: Change branding
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/install/tools/man/ipa-server-install.1 b/install/tools/man/ipa-server-install.1
-index 1a4d2f6..fdb0f4c 100644
+index 1a4d2f658..fdb0f4cb3 100644
--- a/install/tools/man/ipa-server-install.1
+++ b/install/tools/man/ipa-server-install.1
@@ -1,7 +1,7 @@
@@ -999,13 +966,12 @@ index 1a4d2f6..fdb0f4c 100644
.TP
\fB\-\-setup\-dns\fR
--
-2.21.0
+2.21.1
-
-From e42dae0ed616406b8c99efba2d4fb76e5f643040 Mon Sep 17 00:00:00 2001
+From e63c333515020e37c3be9a9e2a3f67304badad2e Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
-Subject: [PATCH 35/71] install/tools/man/ipa-server-upgrade.1: Change branding
+Subject: [PATCH 35/78] install/tools/man/ipa-server-upgrade.1: Change branding
to IPA and Identity Management
---
@@ -1013,7 +979,7 @@ Subject: [PATCH 35/71] install/tools/man/ipa-server-upgrade.1: Change branding
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/install/tools/man/ipa-server-upgrade.1 b/install/tools/man/ipa-server-upgrade.1
-index cbbdc59..3db19b0 100644
+index cbbdc5901..3db19b0f1 100644
--- a/install/tools/man/ipa-server-upgrade.1
+++ b/install/tools/man/ipa-server-upgrade.1
@@ -2,7 +2,7 @@
@@ -1026,13 +992,12 @@ index cbbdc59..3db19b0 100644
ipa\-server\-upgrade \- upgrade IPA server
.SH "SYNOPSIS"
--
-2.21.0
-
+2.21.1
-From 43b77f8ad6fc8cc931d85eeeab05c8b7ba8fa086 Mon Sep 17 00:00:00 2001
+From 7dfbdf73de322616cc6235db57bd8f3fd0805ac5 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
-Subject: [PATCH 36/71] install/tools/man/ipa-winsync-migrate.1: Change
+Subject: [PATCH 36/78] install/tools/man/ipa-winsync-migrate.1: Change
branding to IPA and Identity Management
---
@@ -1040,7 +1005,7 @@ Subject: [PATCH 36/71] install/tools/man/ipa-winsync-migrate.1: Change
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/install/tools/man/ipa-winsync-migrate.1 b/install/tools/man/ipa-winsync-migrate.1
-index 88702ba..1812f63 100644
+index 88702bad6..1812f6348 100644
--- a/install/tools/man/ipa-winsync-migrate.1
+++ b/install/tools/man/ipa-winsync-migrate.1
@@ -16,7 +16,7 @@
@@ -1053,13 +1018,12 @@ index 88702ba..1812f63 100644
ipa\-winsync\-migrate \- Seamless migration of AD users created by winsync to native AD users.
.SH "SYNOPSIS"
--
-2.21.0
+2.21.1
-
-From 74a61bfd749da6c4ab1b35c5d61906433b591414 Mon Sep 17 00:00:00 2001
+From 79d8cc19a6a65a00006ded393bc7b1716522bca1 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
-Subject: [PATCH 37/71] install/tools/man/ipactl.8: Change branding to IPA and
+Subject: [PATCH 37/78] install/tools/man/ipactl.8: Change branding to IPA and
Identity Management
---
@@ -1067,7 +1031,7 @@ Subject: [PATCH 37/71] install/tools/man/ipactl.8: Change branding to IPA and
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/install/tools/man/ipactl.8 b/install/tools/man/ipactl.8
-index fb533aa..d7aaaf8 100644
+index fb533aae2..d7aaaf8ed 100644
--- a/install/tools/man/ipactl.8
+++ b/install/tools/man/ipactl.8
@@ -16,7 +16,7 @@
@@ -1080,13 +1044,12 @@ index fb533aa..d7aaaf8 100644
ipactl \- IPA Server Control Interface
.SH "SYNOPSIS"
--
-2.21.0
-
+2.21.1
-From eaf3a578fc370e95dbc55365e12db238fd7feff2 Mon Sep 17 00:00:00 2001
+From a4ee86f8c53ebb9dbec7ffd75a40f06c8104ad9a Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
-Subject: [PATCH 38/71] install/ui/css/patternfly.css: Change branding to IPA
+Subject: [PATCH 38/78] install/ui/css/patternfly.css: Change branding to IPA
and Identity Management
---
@@ -1094,7 +1057,7 @@ Subject: [PATCH 38/71] install/ui/css/patternfly.css: Change branding to IPA
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/install/ui/css/patternfly.css b/install/ui/css/patternfly.css
-index ee92053..de574a8 100644
+index ee920530b..de574a84c 100644
--- a/install/ui/css/patternfly.css
+++ b/install/ui/css/patternfly.css
@@ -4,4 +4,4 @@
@@ -1106,13 +1069,12 @@ index ee92053..de574a8 100644
+ */.bootstrap-select.btn-group,.bootstrap-select.btn-group[class*=span]{float:none;display:inline-block;margin-bottom:10px;margin-left:0}.form-horizontal .bootstrap-select.btn-group,.form-inline .bootstrap-select.btn-group,.form-search .bootstrap-select.btn-group{margin-bottom:0}.bootstrap-select.form-control{margin-bottom:0;padding:0;border:none}.bootstrap-select.btn-group.pull-right,.bootstrap-select.btn-group[class*=span].pull-right,.row-fluid .bootstrap-select.btn-group[class*=span].pull-right{float:right}.input-append .bootstrap-select.btn-group{margin-left:-1px}.input-prepend .bootstrap-select.btn-group{margin-right:-1px}.bootstrap-select:not([class*=span]):not([class*=col-]):not([class*=form-control]){width:220px}.bootstrap-select{width:220px\9}.bootstrap-select.form-control:not([class*=span]){width:100%}.bootstrap-select>.btn{width:100%}.error .bootstrap-select .btn{border:1px solid #b94a48}.dropdown-menu{z-index:2000}.bootstrap-select.show-menu-arrow.open>.btn{z-index:2051}.bootstrap-select .btn:focus{outline:thin dotted #333!important;outline:5px auto -webkit-focus-ring-color!important;outline-offset:-2px}.bootstrap-select.btn-group .btn .filter-option{overflow:hidden;position:absolute;left:12px;right:25px;text-align:left}.bootstrap-select.btn-group .btn .caret{position:absolute;top:50%;right:12px;margin-top:-2px;vertical-align:middle}.bootstrap-select.btn-group .dropdown-menu li.disabled>a,.bootstrap-select.btn-group>.disabled{cursor:not-allowed}.bootstrap-select.btn-group>.disabled:focus{outline:0!important}.bootstrap-select.btn-group[class*=span] .btn{width:100%}.bootstrap-select.btn-group .dropdown-menu{min-width:100%;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.bootstrap-select.btn-group .dropdown-menu.inner{position:static;border:0;padding:0;margin:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.bootstrap-select.btn-group .dropdown-menu dt{display:block;padding:3px 20px;cursor:default}.bootstrap-select.btn-group .div-contain{overflow:hidden}.bootstrap-select.btn-group .dropdown-menu li{position:relative}.bootstrap-select.btn-group .dropdown-menu li>a.opt{position:relative;padding-left:35px}.bootstrap-select.btn-group .dropdown-menu li>a{cursor:pointer}.bootstrap-select.btn-group .dropdown-menu li>dt small{font-weight:400}.bootstrap-select.btn-group.show-tick .dropdown-menu li.selected a i.check-mark{display:inline-block;position:absolute;right:15px;margin-top:2.5px}.bootstrap-select.btn-group .dropdown-menu li a i.check-mark{display:none}.bootstrap-select.btn-group.show-tick .dropdown-menu li a span.text{margin-right:34px}.bootstrap-select.btn-group .dropdown-menu li small{padding-left:.5em}.bootstrap-select.btn-group .dropdown-menu li.active:not(.disabled)>a small,.bootstrap-select.btn-group .dropdown-menu li:not(.disabled)>a:focus small,.bootstrap-select.btn-group .dropdown-menu li:not(.disabled)>a:hover small{color:#64b1d8;color:rgba(255,255,255,.4)}.bootstrap-select.btn-group .dropdown-menu li>dt small{font-weight:400}.bootstrap-select.show-menu-arrow .dropdown-toggle:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #CCC;border-bottom-color:rgba(0,0,0,.2);position:absolute;bottom:-4px;left:9px;display:none}.bootstrap-select.show-menu-arrow .dropdown-toggle:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;position:absolute;bottom:-4px;left:10px;display:none}.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle:before{bottom:auto;top:-3px;border-top:7px solid #ccc;border-bottom:0;border-top-color:rgba(0,0,0,.2)}.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle:after{bottom:auto;top:-3px;border-top:6px solid #fff;border-bottom:0}.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle:before{right:12px;left:auto}.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle:after{right:13px;left:auto}.bootstrap-select.show-menu-arrow.open>.dropdown-toggle:after,.bootstrap-select.show-menu-arrow.open>.dropdown-toggle:before{display:block}.bootstrap-select.btn-group .no-results{padding:3px;background:#f5f5f5;margin:0 5px}.mobile-device{position:absolute;top:0;left:0;display:block!important;width:100%;height:100%!important;opacity:0}.bootstrap-select.fit-width{width:auto!important}.bootstrap-select.btn-group.fit-width .btn .filter-option{position:static}.bootstrap-select.btn-group.fit-width .btn .caret{position:static;top:auto;margin-top:-1px}.control-group.error .bootstrap-select .dropdown-toggle{border-color:#b94a48}.bootstrap-select-searchbox{padding:4px 8px}.bootstrap-select-searchbox input{margin-bottom:0}.alert{border-width:1px;padding-left:47px;padding-right:14px;position:relative}.alert .alert-link{color:#0088ce}.alert .alert-link:hover{color:#00659c}.alert>.btn.pull-right{margin-top:-3px}.alert>.pficon{font-size:22px;position:absolute;left:13px;top:10px}.alert .close{opacity:.85;filter:alpha(opacity=85)}.alert .close:focus,.alert .close:hover{opacity:1;filter:alpha(opacity=100)}.alert .pficon-info{color:#4d5258}.alert-dismissable{padding-right:28px}.alert-dismissable .close{right:-13px;top:1px}.badge{margin-left:6px}.nav-pills>li>a>.badge{margin-left:6px}.bootstrap-select.btn-group.form-control{margin-bottom:0}.bootstrap-select.btn-group .btn{-webkit-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.bootstrap-select.btn-group .btn:hover{border-color:#7dc3e8}.bootstrap-select.btn-group .btn .caret{margin-top:-4px}.bootstrap-select.btn-group .btn:focus{border-color:#0088ce;outline:0!important;-webkit-box-shadow:inset 0 1px 1px rgba(3,3,3,.075),0 0 8px rgba(0,136,206,.6);box-shadow:inset 0 1px 1px rgba(3,3,3,.075),0 0 8px rgba(0,136,206,.6)}.has-error .bootstrap-select.btn-group .btn{border-color:#c00}.has-error .bootstrap-select.btn-group .btn:focus{border-color:#900;-webkit-box-shadow:inset 0 1px 1px rgba(3,3,3,.075),0 0 6px #f33;box-shadow:inset 0 1px 1px rgba(3,3,3,.075),0 0 6px #f33}.has-success .bootstrap-select.btn-group .btn{border-color:#3c763d}.has-success .bootstrap-select.btn-group .btn:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(3,3,3,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(3,3,3,.075),0 0 6px #67b168}.has-warning .bootstrap-select.btn-group .btn{border-color:#ec7a08}.has-warning .bootstrap-select.btn-group .btn:focus{border-color:#bb6106;-webkit-box-shadow:inset 0 1px 1px rgba(3,3,3,.075),0 0 6px #faad60;box-shadow:inset 0 1px 1px rgba(3,3,3,.075),0 0 6px #faad60}.bootstrap-select.btn-group .dropdown-menu>.active>a,.bootstrap-select.btn-group .dropdown-menu>.active>a:active{background-color:#def3ff!important;border-color:#bee1f4!important;color:#363636!important}.bootstrap-select.btn-group .dropdown-menu>.active>a small,.bootstrap-select.btn-group .dropdown-menu>.active>a:active small{color:#9c9c9c!important}.bootstrap-select.btn-group .dropdown-menu>.disabled>a{color:#9c9c9c!important}.bootstrap-select.btn-group .dropdown-menu>.selected>a{background-color:#0088ce!important;border-color:#0088ce!important;color:#fff!important}.bootstrap-select.btn-group .dropdown-menu>.selected>a small{color:rgba(255,255,255,.5)!important}.bootstrap-select.btn-group .dropdown-menu .divider{background:#ededed!important;margin:4px 1px!important}.bootstrap-select.btn-group .dropdown-menu dt{color:#8b8d8f;font-weight:400;padding:1px 10px}.bootstrap-select.btn-group .dropdown-menu li>a.opt{padding:1px 10px}.bootstrap-select.btn-group .dropdown-menu li a:active small{color:rgba(255,255,255,.5)!important}.bootstrap-select.btn-group .dropdown-menu li a:focus small,.bootstrap-select.btn-group .dropdown-menu li a:hover small{color:#9c9c9c}.bootstrap-select.btn-group .dropdown-menu li:not(.disabled) a:focus small,.bootstrap-select.btn-group .dropdown-menu li:not(.disabled) a:hover small{color:#9c9c9c}.combobox-container.combobox-selected .glyphicon-remove{display:inline-block}.combobox-container .caret{margin-left:0}.combobox-container .combobox::-ms-clear{display:none}.combobox-container .dropdown-menu{margin-top:-1px;width:100%}.combobox-container .glyphicon-remove{display:none;top:auto;width:12px}.combobox-container .glyphicon-remove:before{content:"\e60b";font-family:PatternFlyIcons-webfont}.combobox-container .input-group-addon{background-color:#f1f1f1;background-image:-webkit-linear-gradient(top,#fafafa 0,#ededed 100%);background-image:-o-linear-gradient(top,#fafafa 0,#ededed 100%);background-image:linear-gradient(to bottom,#fafafa 0,#ededed 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffededed', GradientType=0);border-color:#bbb;color:#4d5258;position:relative}.combobox-container .input-group-addon.active,.combobox-container .input-group-addon:active,.combobox-container .input-group-addon:focus,.combobox-container .input-group-addon:hover,.open .dropdown-toggle.combobox-container .input-group-addon{background-color:#f1f1f1;background-image:none;border-color:#bbb;color:#4d5258}.combobox-container .input-group-addon.active,.combobox-container .input-group-addon:active,.open .dropdown-toggle.combobox-container .input-group-addon{background-image:none}.combobox-container .input-group-addon.active.focus,.combobox-container .input-group-addon.active:focus,.combobox-container .input-group-addon.active:hover,.combobox-container .input-group-addon:active.focus,.combobox-container .input-group-addon:active:focus,.combobox-container .input-group-addon:active:hover,.open .dropdown-toggle.combobox-container .input-group-addon.focus,.open .dropdown-toggle.combobox-container .input-group-addon:focus,.open .dropdown-toggle.combobox-container .input-group-addon:hover{background-color:#e5e5e5;border-color:#a9a9a9}.combobox-container .input-group-addon.disabled,.combobox-container .input-group-addon.disabled.active,.combobox-container .input-group-addon.disabled:active,.combobox-container .input-group-addon.disabled:focus,.combobox-container .input-group-addon.disabled:hover,.combobox-container .input-group-addon[disabled],.combobox-container .input-group-addon[disabled].active,.combobox-container .input-group-addon[disabled]:active,.combobox-container .input-group-addon[disabled]:focus,.combobox-container .input-group-addon[disabled]:hover,fieldset[disabled] .combobox-container .input-group-addon,fieldset[disabled] .combobox-container .input-group-addon.active,fieldset[disabled] .combobox-container .input-group-addon:active,fieldset[disabled] .combobox-container .input-group-addon:focus,fieldset[disabled] .combobox-container .input-group-addon:hover{background-color:#f1f1f1;border-color:#bbb}.combobox-container .input-group-addon:active{-webkit-box-shadow:inset 0 2px 8px rgba(3,3,3,.2);box-shadow:inset 0 2px 8px rgba(3,3,3,.2)}.treeview .list-group{border-top:0}.treeview .list-group-item{background:0 0;border-bottom:1px solid transparent!important;border-top:1px solid transparent!important;margin-bottom:0;padding:0 10px}.treeview .list-group-item:hover{background:#def3ff!important;border-color:#bee1f4!important}.treeview .list-group-item.node-selected{background:#0088ce!important;border-color:#0088ce!important;color:#fff!important}.treeview span.icon{display:inline-block;font-size:13px;min-width:10px;text-align:center}.treeview span.icon>[class*=fa-angle]{font-size:15px}.treeview span.indent{margin-right:5px}.breadcrumb{padding-left:0}.breadcrumb>.active strong{font-weight:600}.breadcrumb>li{display:inline}.breadcrumb>li+li:before{color:#9c9c9c;content:"\f101";font-family:FontAwesome;font-size:11px;padding:0 9px 0 7px}.btn{-webkit-box-shadow:0 2px 3px rgba(3,3,3,.1);box-shadow:0 2px 3px rgba(3,3,3,.1)}.btn:active{-webkit-box-shadow:inset 0 2px 8px rgba(3,3,3,.2);box-shadow:inset 0 2px 8px rgba(3,3,3,.2)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{background-color:#fafafa!important;background-image:none!important;border-color:#d1d1d1!important;color:#8b8d8f!important;opacity:1}.btn.disabled:active,.btn[disabled]:active,fieldset[disabled] .btn:active{-webkit-box-shadow:none;box-shadow:none}.btn.disabled.btn-link,.btn[disabled].btn-link,fieldset[disabled] .btn.btn-link{background-color:transparent!important;border:0}.btn-danger{background-color:#a30000;background-image:-webkit-linear-gradient(top,#c00 0,#a30000 100%);background-image:-o-linear-gradient(top,#c00 0,#a30000 100%);background-image:linear-gradient(to bottom,#c00 0,#a30000 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffcc0000', endColorstr='#ffa30000', GradientType=0);border-color:#8b0000;color:#fff}.btn-danger.active,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open .dropdown-toggle.btn-danger{background-color:#a30000;background-image:none;border-color:#8b0000;color:#fff}.btn-danger.active,.btn-danger:active,.open .dropdown-toggle.btn-danger{background-image:none}.btn-danger.active.focus,.btn-danger.active:focus,.btn-danger.active:hover,.btn-danger:active.focus,.btn-danger:active:focus,.btn-danger:active:hover,.open .dropdown-toggle.btn-danger.focus,.open .dropdown-toggle.btn-danger:focus,.open .dropdown-toggle.btn-danger:hover{background-color:#8a0000;border-color:#670000}.btn-danger.disabled,.btn-danger.disabled.active,.btn-danger.disabled:active,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled],.btn-danger[disabled].active,.btn-danger[disabled]:active,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger,fieldset[disabled] .btn-danger.active,fieldset[disabled] .btn-danger:active,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#a30000;border-color:#8b0000}.btn-default{background-color:#f1f1f1;background-image:-webkit-linear-gradient(top,#fafafa 0,#ededed 100%);background-image:-o-linear-gradient(top,#fafafa 0,#ededed 100%);background-image:linear-gradient(to bottom,#fafafa 0,#ededed 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffededed', GradientType=0);border-color:#bbb;color:#4d5258}.btn-default.active,.btn-default:active,.btn-default:focus,.btn-default:hover,.open .dropdown-toggle.btn-default{background-color:#f1f1f1;background-image:none;border-color:#bbb;color:#4d5258}.btn-default.active,.btn-default:active,.open .dropdown-toggle.btn-default{background-image:none}.btn-default.active.focus,.btn-default.active:focus,.btn-default.active:hover,.btn-default:active.focus,.btn-default:active:focus,.btn-default:active:hover,.open .dropdown-toggle.btn-default.focus,.open .dropdown-toggle.btn-default:focus,.open .dropdown-toggle.btn-default:hover{background-color:#e5e5e5;border-color:#a9a9a9}.btn-default.disabled,.btn-default.disabled.active,.btn-default.disabled:active,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled],.btn-default[disabled].active,.btn-default[disabled]:active,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default,fieldset[disabled] .btn-default.active,fieldset[disabled] .btn-default:active,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#f1f1f1;border-color:#bbb}.btn-link,.btn-link:active{-webkit-box-shadow:none;box-shadow:none}.btn-primary{background-color:#0088ce;background-image:-webkit-linear-gradient(top,#39a5dc 0,#0088ce 100%);background-image:-o-linear-gradient(top,#39a5dc 0,#0088ce 100%);background-image:linear-gradient(to bottom,#39a5dc 0,#0088ce 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff39a5dc', endColorstr='#ff0088ce', GradientType=0);border-color:#00659c;color:#fff}.btn-primary.active,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{background-color:#0088ce;background-image:none;border-color:#00659c;color:#fff}.btn-primary.active,.btn-primary:active,.open .dropdown-toggle.btn-primary{background-image:none}.btn-primary.active.focus,.btn-primary.active:focus,.btn-primary.active:hover,.btn-primary:active.focus,.btn-primary:active:focus,.btn-primary:active:hover,.open .dropdown-toggle.btn-primary.focus,.open .dropdown-toggle.btn-primary:focus,.open .dropdown-toggle.btn-primary:hover{background-color:#0077b5;border-color:#004e78}.btn-primary.disabled,.btn-primary.disabled.active,.btn-primary.disabled:active,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled],.btn-primary[disabled].active,.btn-primary[disabled]:active,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-primary.active,fieldset[disabled] .btn-primary:active,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#0088ce;border-color:#00659c}.btn-group-xs .btn,.btn-group-xs>.btn,.btn-xs{font-weight:400}.close{text-shadow:none;opacity:.6;filter:alpha(opacity=60)}.close:focus,.close:hover{opacity:.9;filter:alpha(opacity=90)}.ColVis_Button:active:focus{outline:0}.ColVis_catcher{position:absolute;z-index:999}.ColVis_collection{background-color:#fff;border:1px solid #bbb;border-radius:1px;-webkit-box-shadow:0 6px 12px rgba(3,3,3,.175);box-shadow:0 6px 12px rgba(3,3,3,.175);background-clip:padding-box;list-style:none;margin:-1px 0 0 0;padding:5px 10px;width:150px;z-index:1000}.ColVis_collection label{font-weight:400;margin-bottom:5px;margin-top:5px;padding-left:20px}.ColVis_collectionBackground{background-color:#fff;height:100%;left:0;position:fixed;top:0;width:100%;z-index:998}.dataTables_header{background-color:#f5f5f5;border:1px solid #d1d1d1;border-bottom:none;padding:5px;position:relative;text-align:center}.dataTables_header .btn{-webkit-box-shadow:none;box-shadow:none}.dataTables_header .ColVis{position:absolute;right:5px;text-align:left;top:5px}.dataTables_header .ColVis+.dataTables_info{padding-right:30px}.dataTables_header .dataTables_filter{position:absolute}.dataTables_header .dataTables_filter input{border:1px solid #bbb;height:24px}@media (max-width:767px){.dataTables_header .dataTables_filter input{width:100px}}.dataTables_header .dataTables_info{padding:2px 0}@media (max-width:480px){.dataTables_header .dataTables_info{text-align:right}}.dataTables_header .dataTables_info b{font-weight:700}.dataTables_footer{background-color:#fff;border:1px solid #d1d1d1;border-top:none;overflow:hidden}.dataTables_paginate{background:#fafafa;float:right;margin:0}.dataTables_paginate .pagination{float:left;margin:0}.dataTables_paginate .pagination>li>span{border-color:#fff #d1d1d1 #f5f5f5;border-width:0 1px;font-size:16px;font-weight:400;padding:0;text-align:center;width:31px}.dataTables_paginate .pagination>li>span:focus,.dataTables_paginate .pagination>li>span:hover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.dataTables_paginate .pagination>li.last>span{border-right:none}.dataTables_paginate .pagination>li.disabled>span{background:#f5f5f5;border-left-color:#ededed;border-right-color:#ededed;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.dataTables_paginate .pagination-input{float:left;font-size:12px;line-height:1em;padding:4px 15px 0;text-align:right}.dataTables_paginate .pagination-input .paginate_input{border:1px solid #d1d1d1;-webkit-box-shadow:inset 0 1px 1px rgba(3,3,3,.075);box-shadow:inset 0 1px 1px rgba(3,3,3,.075);font-size:12px;font-weight:600;height:19px;margin-right:8px;padding-right:3px;text-align:right;width:30px}.dataTables_paginate .pagination-input .paginate_of{position:relative}.dataTables_paginate .pagination-input .paginate_of b{margin-left:3px}.dataTables_wrapper{margin:20px 0}@media (max-width:767px){.dataTables_wrapper .table-responsive{margin-bottom:0}}.DTCR_clonedTable{background-color:rgba(255,255,255,.7);z-index:202}.DTCR_pointer{background-color:#0088ce;width:1px;z-index:201}table.datatable{margin-bottom:0;max-width:none!important}table.datatable thead .sorting,table.datatable thead .sorting_asc,table.datatable thead .sorting_asc_disabled,table.datatable thead .sorting_desc,table.datatable thead .sorting_desc_disabled{cursor:pointer}table.datatable thead .sorting_asc,table.datatable thead .sorting_desc{color:#0088ce!important;position:relative}table.datatable thead .sorting_asc:after,table.datatable thead .sorting_desc:after{content:"\f107";font-family:FontAwesome;font-size:10px;font-weight:400;height:9px;left:7px;line-height:12px;position:relative;top:2px;vertical-align:baseline;width:12px}table.datatable thead .sorting_asc:before,table.datatable thead .sorting_desc:before{background:#0088ce;content:'';height:2px;position:absolute;left:0;top:0;width:100%}table.datatable thead .sorting_asc:after{content:"\f106";top:-3px}table.datatable th:active{outline:0}.caret{font-family:FontAwesome;font-weight:400;height:9px;position:relative;vertical-align:baseline;width:12px}.caret:before{bottom:0;content:"\f107";left:0;line-height:12px;position:absolute;text-align:center;top:-1px;right:0}.dropup .caret:before{content:"\f106"}.dropdown-menu .divider{background-color:#ededed;height:1px;margin:4px 1px;overflow:hidden}.dropdown-menu>li>a{border-color:transparent;border-style:solid;border-width:1px 0;padding:1px 10px}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{border-color:#bee1f4;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.dropdown-menu>li>a:active{background-color:#0088ce;border-color:#0088ce;color:#fff!important;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{background-color:#0088ce!important;border-color:#0088ce!important;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{border-color:transparent}.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{border-color:transparent}.dropdown-header{padding-left:10px;padding-right:10px;text-transform:uppercase}.btn-group>.dropdown-menu,.dropdown>.dropdown-menu,.input-group-btn>.dropdown-menu{margin-top:-1px}.dropup .dropdown-menu{margin-bottom:-1px}.dropdown-submenu{position:relative}.dropdown-submenu:hover>a{background-color:#def3ff;border-color:#bee1f4}.dropdown-submenu:hover>.dropdown-menu{display:block}.dropdown-submenu.pull-left{float:none!important}.dropdown-submenu.pull-left>.dropdown-menu{left:auto;margin-left:10px;right:100%}.dropdown-submenu>a{padding-right:20px!important}.dropdown-submenu>a:after{content:"\f105";font-family:FontAwesome;display:block;position:absolute;right:10px;top:2px}.dropdown-submenu>.dropdown-menu{left:100%;margin-top:0;top:-6px}.dropup .dropdown-submenu>.dropdown-menu{bottom:-5px;top:auto}.open .dropdown-submenu.active>.dropdown-menu{display:block}.dropdown-kebab-pf .btn-link{color:#252525;font-size:16px;line-height:1;padding:4px 0}.dropdown-kebab-pf .btn-link:active,.dropdown-kebab-pf .btn-link:focus,.dropdown-kebab-pf .btn-link:hover{color:#0088ce}.dropdown-kebab-pf .dropdown-menu{left:-15px;margin-top:11px}.dropdown-kebab-pf .dropdown-menu.dropdown-menu-right{left:auto;right:-15px}.dropdown-kebab-pf .dropdown-menu.dropdown-menu-right:after,.dropdown-kebab-pf .dropdown-menu.dropdown-menu-right:before{left:auto;right:6px}.dropdown-kebab-pf .dropdown-menu:after,.dropdown-kebab-pf .dropdown-menu:before{border-bottom-color:#bbb;border-bottom-style:solid;border-bottom-width:10px;border-left:10px solid transparent;border-right:10px solid transparent;content:"";display:inline-block;left:6px;position:absolute;top:-11px}.dropdown-kebab-pf .dropdown-menu:after{border-bottom-color:#fff;top:-10px}.dropdown-kebab-pf.dropup .dropdown-menu{margin-bottom:11px;margin-top:0}.dropdown-kebab-pf.dropup .dropdown-menu:after,.dropdown-kebab-pf.dropup .dropdown-menu:before{border-bottom:none;border-top-color:#bbb;border-top-style:solid;border-top-width:10px;bottom:-11px;top:auto}.dropdown-kebab-pf.dropup .dropdown-menu:after{border-top-color:#fff;bottom:-10px}@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:local('Open Sans'),local('OpenSans'),url(../fonts/open-sans/OpenSans-Regular.ttf) format('truetype')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:300;src:local('OpenSans-Light'),local('Open Sans Light'),url(../fonts/open-sans/OpenSans-Light.ttf) format('truetype')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:600;src:local('Open Sans Semibold'),local('OpenSans-Semibold'),url(../fonts/open-sans/OpenSans-Semibold.ttf) format('truetype')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:700;src:local('Open Sans Bold'),local('OpenSans-Bold'),url(../fonts/open-sans/OpenSans-Bold.ttf) format('truetype')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:800;src:local('Open Sans Extrabold'),local('OpenSans-Extrabold'),url(../fonts/open-sans/OpenSans-ExtraBold.ttf) format('truetype')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:300;src:local('Open Sans Light Italic'),local('OpenSansLight-Italic'),url(../fonts/open-sans/OpenSans-LightItalic.ttf) format('truetype')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:400;src:local('Open Sans Italic'),local('OpenSans-Italic'),url(../fonts/open-sans/OpenSans-Italic.ttf) format('truetype')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:600;src:local('Open Sans Semibold Italic'),local('OpenSans-SemiboldItalic'),url(../fonts/open-sans/OpenSans-SemiboldItalic.ttf) format('truetype')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:700;src:local('Open Sans Bold Italic'),local('OpenSans-BoldItalic'),url(../fonts/open-sans/OpenSans-BoldItalic.ttf) format('truetype')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:800;src:local('Open Sans Extrabold Italic'),local('OpenSans-ExtraboldItalic'),url(../fonts/open-sans/OpenSans-ExtraBoldItalic.ttf) format('truetype')}.chars-remaining-pf span{font-weight:600;padding-right:5px}.chars-warn-remaining-pf{color:#c00}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{-webkit-box-shadow:none;box-shadow:none;color:#8b8d8f}.form-control[disabled]:hover,.form-control[readonly]:hover,fieldset[disabled] .form-control:hover{border-color:#bbb}.form-control:hover{border-color:#7dc3e8}.has-error .form-control:hover{border-color:#900}.has-success .form-control:hover{border-color:#2b542c}.has-warning .form-control:hover{border-color:#bb6106}.has-error .checkbox,.has-error .checkbox-inline,.has-error .control-label,.has-error .radio,.has-error .radio-inline,.has-error.checkbox label,.has-error.checkbox-inline label,.has-error.radio label,.has-error.radio-inline label,.has-success .checkbox,.has-success .checkbox-inline,.has-success .control-label,.has-success .radio,.has-success .radio-inline,.has-success.checkbox label,.has-success.checkbox-inline label,.has-success.radio label,.has-success.radio-inline label,.has-warning .checkbox,.has-warning .checkbox-inline,.has-warning .control-label,.has-warning .radio,.has-warning .radio-inline,.has-warning.checkbox label,.has-warning.checkbox-inline label,.has-warning.radio label,.has-warning.radio-inline label{color:#363636}.help-block{margin-bottom:0}.input-group .input-group-btn .btn{-webkit-box-shadow:none;box-shadow:none}label{font-weight:600}.navbar-nav>li>.dropdown-menu.infotip{border-top-width:1px!important;margin-top:10px}@media (max-width:767px){.navbar-pf .navbar-nav .open .dropdown-menu.infotip{background-color:#fff!important;margin-top:0}}.infotip{min-width:235px;padding:0}.infotip .list-group{border-top:0;margin:0;padding:8px 0}.infotip .list-group .list-group-item{border:none;margin:0 15px 0 34px;padding:5px 0}.infotip .list-group .list-group-item>.i{color:#4d5258;font-size:13px;left:-20px;position:absolute;top:8px}.infotip .list-group .list-group-item>a{color:#4d5258;line-height:13px}.infotip .list-group .list-group-item>.close{float:right}.infotip .footer{background-color:#f5f5f5;padding:6px 15px}.infotip .footer a:hover{color:#0088ce}.infotip .arrow,.infotip .arrow:after{border-color:transparent;border-style:solid;display:block;height:0;position:absolute;width:0}.infotip .arrow{border-width:11px}.infotip .arrow:after{border-width:10px;content:""}.infotip.bottom .arrow,.infotip.bottom-left .arrow,.infotip.bottom-right .arrow{border-bottom-color:#999;border-bottom-color:#bbb;border-top-width:0;left:50%;margin-left:-11px;top:-11px}.infotip.bottom .arrow:after,.infotip.bottom-left .arrow:after,.infotip.bottom-right .arrow:after{border-top-width:0;border-bottom-color:#fff;content:" ";margin-left:-10px;top:1px}.infotip.bottom-left .arrow{left:20%}.infotip.bottom-right .arrow{left:80%}.infotip.top .arrow{border-bottom-width:0;border-top-color:#999;border-top-color:#bbb;bottom:-11px;left:50%;margin-left:-11px}.infotip.top .arrow:after{border-bottom-width:0;border-top-color:#f5f5f5;bottom:1px;content:" ";margin-left:-10px}.infotip.right .arrow{border-left-width:0;border-right-color:#999;border-right-color:#bbb;left:-11px;margin-top:-11px;top:50%}.infotip.right .arrow:after{bottom:-10px;border-left-width:0;border-right-color:#fff;content:" ";left:1px}.infotip.left .arrow{border-left-color:#999;border-left-color:#bbb;border-right-width:0;margin-top:-11px;right:-11px;top:50%}.infotip.left .arrow:after{border-left-color:#fff;border-right-width:0;bottom:-10px;content:" ";right:1px}.label{border-radius:0;font-size:100%;font-weight:600}h1 .label,h2 .label,h3 .label,h4 .label,h5 .label,h6 .label{font-size:75%}.list-group{border-top:1px solid #ededed}.list-group .list-group-item:first-child{border-top:0}.list-group-item{border-top:0;border-left:0;border-right:0;margin-bottom:0}.list-group-item-heading{font-weight:600}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{border-top:solid 1px #39a5dc;margin-top:-1px;z-index:auto}.list-group-item.active:first-child{border-top:1px solid #39a5dc!important;margin-top:-1px}.login-pf{height:100%}.login-pf #brand{position:relative;top:-70px}.login-pf #brand img{display:block;height:18px;margin:0 auto;max-width:100%}@media (min-width:768px){.login-pf #brand img{margin:0;text-align:left}}.login-pf #badge{display:block;margin:20px auto 70px;position:relative;text-align:center}@media (min-width:768px){.login-pf #badge{float:right;margin-right:64px;margin-top:50px}}.login-pf body{background:#1a1a1a url(../img/bg-login.jpg) repeat-x 50% 0;background-size:auto}@media (min-width:768px){.login-pf body{background-size:100% auto}}.login-pf .container{background-color:transparent;clear:right;color:#fff;padding-bottom:40px;padding-top:20px;width:auto}@media (min-width:768px){.login-pf .container{bottom:13%;padding-left:80px;position:absolute;width:100%}}.login-pf .container [class^=alert]{background:0 0;color:#fff}.login-pf .container .details p:first-child{border-top:1px solid rgba(255,255,255,.3);padding-top:25px;margin-top:25px}@media (min-width:768px){.login-pf .container .details{border-left:1px solid rgba(255,255,255,.3);padding-left:40px}.login-pf .container .details p:first-child{border-top:0;padding-top:0;margin-top:0}}.login-pf .container .details p{margin-bottom:2px}.login-pf .container .form-horizontal .control-label{font-size:13px;font-weight:400;text-align:left}.login-pf .container .form-horizontal .form-group:last-child,.login-pf .container .form-horizontal .form-group:last-child .help-block:last-child{margin-bottom:0}.login-pf .container .help-block{color:#fff}@media (min-width:768px){.login-pf .container .login{padding-right:40px}}.login-pf .container .submit{text-align:right}.modal-header{background-color:#f5f5f5;border-bottom:none;padding:10px 18px}.modal-header .close{margin-top:2px}.modal-title{font-size:13px;font-weight:700}.modal-footer{border-top:none;margin-top:15px;padding:14px 15px 15px}.modal-footer>.btn{padding-left:10px;padding-right:10px}.modal-footer>.btn>.fa-angle-left{margin-right:5px}.modal-footer>.btn>.fa-angle-right{margin-left:5px}.navbar-pf{background:#393F45;border:0;border-radius:0;border-top:3px solid #c00;margin-bottom:0;min-height:0}.navbar-pf .navbar-brand{color:#fff;height:auto;padding:12px 0;margin:0 0 0 20px}.navbar-pf .navbar-brand img{display:block}.navbar-pf .navbar-collapse{border-top:0;-webkit-box-shadow:none;box-shadow:none;padding:0}.navbar-pf .navbar-header{border-bottom:1px solid #53565b;float:none}.navbar-pf .navbar-nav{margin:0}.navbar-pf .navbar-nav>.active>a,.navbar-pf .navbar-nav>.active>a:focus,.navbar-pf .navbar-nav>.active>a:hover{background-color:#454C53;color:#fff}.navbar-pf .navbar-nav>li>a{color:#dbdada;line-height:1;padding:10px 20px;text-shadow:none}.navbar-pf .navbar-nav>li>a:focus,.navbar-pf .navbar-nav>li>a:hover{color:#fff}.navbar-pf .navbar-nav>.open>a,.navbar-pf .navbar-nav>.open>a:focus,.navbar-pf .navbar-nav>.open>a:hover{background-color:#454C53;color:#fff}@media (max-width:767px){.navbar-pf .navbar-nav .active .dropdown-menu,.navbar-pf .navbar-nav .active .navbar-persistent,.navbar-pf .navbar-nav .open .dropdown-menu{background-color:#3c434a!important;margin-left:0;padding-bottom:0;padding-top:0}.navbar-pf .navbar-nav .active .dropdown-menu .dropdown-submenu.open>a,.navbar-pf .navbar-nav .active .dropdown-menu .dropdown-submenu.open>a:focus,.navbar-pf .navbar-nav .active .dropdown-menu .dropdown-submenu.open>a:hover,.navbar-pf .navbar-nav .active .dropdown-menu>.active>a,.navbar-pf .navbar-nav .active .dropdown-menu>.active>a:focus,.navbar-pf .navbar-nav .active .dropdown-menu>.active>a:hover,.navbar-pf .navbar-nav .active .navbar-persistent .dropdown-submenu.open>a,.navbar-pf .navbar-nav .active .navbar-persistent .dropdown-submenu.open>a:focus,.navbar-pf .navbar-nav .active .navbar-persistent .dropdown-submenu.open>a:hover,.navbar-pf .navbar-nav .active .navbar-persistent>.active>a,.navbar-pf .navbar-nav .active .navbar-persistent>.active>a:focus,.navbar-pf .navbar-nav .active .navbar-persistent>.active>a:hover,.navbar-pf .navbar-nav .open .dropdown-menu .dropdown-submenu.open>a,.navbar-pf .navbar-nav .open .dropdown-menu .dropdown-submenu.open>a:focus,.navbar-pf .navbar-nav .open .dropdown-menu .dropdown-submenu.open>a:hover,.navbar-pf .navbar-nav .open .dropdown-menu>.active>a,.navbar-pf .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-pf .navbar-nav .open .dropdown-menu>.active>a:hover{background-color:#424950!important;color:#fff}.navbar-pf .navbar-nav .active .dropdown-menu>li>a,.navbar-pf .navbar-nav .active .navbar-persistent>li>a,.navbar-pf .navbar-nav .open .dropdown-menu>li>a{background-color:transparent;border:0;color:#dbdada;outline:0;padding-left:30px}.navbar-pf .navbar-nav .active .dropdown-menu>li>a:hover,.navbar-pf .navbar-nav .active .navbar-persistent>li>a:hover,.navbar-pf .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff}.navbar-pf .navbar-nav .active .dropdown-menu .divider,.navbar-pf .navbar-nav .active .navbar-persistent .divider,.navbar-pf .navbar-nav .open .dropdown-menu .divider{background-color:#53565b;margin:0 1px}.navbar-pf .navbar-nav .active .dropdown-menu .dropdown-header,.navbar-pf .navbar-nav .active .navbar-persistent .dropdown-header,.navbar-pf .navbar-nav .open .dropdown-menu .dropdown-header{padding-bottom:0;padding-left:30px}.navbar-pf .navbar-nav .active .dropdown-menu .dropdown-submenu.open .dropdown-toggle,.navbar-pf .navbar-nav .active .navbar-persistent .dropdown-submenu.open .dropdown-toggle,.navbar-pf .navbar-nav .open .dropdown-menu .dropdown-submenu.open .dropdown-toggle{color:#fff}.navbar-pf .navbar-nav .active .dropdown-menu .dropdown-submenu.pull-left,.navbar-pf .navbar-nav .active .navbar-persistent .dropdown-submenu.pull-left,.navbar-pf .navbar-nav .open .dropdown-menu .dropdown-submenu.pull-left{float:none!important}.navbar-pf .navbar-nav .active .dropdown-menu .dropdown-submenu>a:after,.navbar-pf .navbar-nav .active .navbar-persistent .dropdown-submenu>a:after,.navbar-pf .navbar-nav .open .dropdown-menu .dropdown-submenu>a:after{display:none}.navbar-pf .navbar-nav .active .dropdown-menu .dropdown-submenu .dropdown-header,.navbar-pf .navbar-nav .active .navbar-persistent .dropdown-submenu .dropdown-header,.navbar-pf .navbar-nav .open .dropdown-menu .dropdown-submenu .dropdown-header{padding-left:45px}.navbar-pf .navbar-nav .active .dropdown-menu .dropdown-submenu .dropdown-menu,.navbar-pf .navbar-nav .active .navbar-persistent .dropdown-submenu .dropdown-menu,.navbar-pf .navbar-nav .open .dropdown-menu .dropdown-submenu .dropdown-menu{border:0;bottom:auto;-webkit-box-shadow:none;box-shadow:none;display:block;float:none;margin:0;min-width:0;padding:0;position:relative;left:auto;right:auto;top:auto}.navbar-pf .navbar-nav .active .dropdown-menu .dropdown-submenu .dropdown-menu>li>a,.navbar-pf .navbar-nav .active .navbar-persistent .dropdown-submenu .dropdown-menu>li>a,.navbar-pf .navbar-nav .open .dropdown-menu .dropdown-submenu .dropdown-menu>li>a{padding:5px 15px 5px 45px;line-height:20px}.navbar-pf .navbar-nav .active .dropdown-menu .dropdown-submenu .dropdown-menu .dropdown-menu>li>a,.navbar-pf .navbar-nav .active .navbar-persistent .dropdown-submenu .dropdown-menu .dropdown-menu>li>a,.navbar-pf .navbar-nav .open .dropdown-menu .dropdown-submenu .dropdown-menu .dropdown-menu>li>a{padding-left:60px}.navbar-pf .navbar-nav .active .navbar-persistent .dropdown-submenu.open .dropdown-menu{display:block}.navbar-pf .navbar-nav .active .navbar-persistent .dropdown-submenu>a:after{display:inline-block!important;position:relative;right:auto;top:1px}.navbar-pf .navbar-nav .active .navbar-persistent .dropdown-submenu .dropdown-menu{display:none}.navbar-pf .navbar-nav .active .navbar-persistent .dropdown-submenu .dropdown-submenu>a:after{display:none!important}.navbar-pf .navbar-nav .context-bootstrap-select .open>.dropdown-menu{background-color:#fff!important}.navbar-pf .navbar-nav .context-bootstrap-select .open>.dropdown-menu>.active>a,.navbar-pf .navbar-nav .context-bootstrap-select .open>.dropdown-menu>.active>a:active{background-color:#def3ff!important;border-color:#bee1f4!important;color:#363636!important}.navbar-pf .navbar-nav .context-bootstrap-select .open>.dropdown-menu>.active>a small,.navbar-pf .navbar-nav .context-bootstrap-select .open>.dropdown-menu>.active>a:active small{color:#9c9c9c!important}.navbar-pf .navbar-nav .context-bootstrap-select .open>.dropdown-menu>.disabled>a{color:#9c9c9c!important}.navbar-pf .navbar-nav .context-bootstrap-select .open>.dropdown-menu>.selected>a,.navbar-pf .navbar-nav .context-bootstrap-select .open>.dropdown-menu>.selected>a:active{background-color:#0088ce!important;border-color:#0088ce!important;color:#fff!important}.navbar-pf .navbar-nav .context-bootstrap-select .open>.dropdown-menu>.selected>a small,.navbar-pf .navbar-nav .context-bootstrap-select .open>.dropdown-menu>.selected>a:active small{color:rgba(255,255,255,.5)!important}.navbar-pf .navbar-nav .context-bootstrap-select .open>.dropdown-menu li>a.opt{border-bottom:1px solid transparent;border-top:1px solid transparent;color:#363636;padding-left:10px;padding-right:10px}.navbar-pf .navbar-nav .context-bootstrap-select .open>.dropdown-menu li a:active small{color:rgba(255,255,255,.5)!important}.navbar-pf .navbar-nav .context-bootstrap-select .open>.dropdown-menu li a:focus small,.navbar-pf .navbar-nav .context-bootstrap-select .open>.dropdown-menu li a:hover small{color:#9c9c9c}.navbar-pf .navbar-nav .context-bootstrap-select>.open>.dropdown-menu{padding-bottom:5px;padding-top:5px}}.navbar-pf .navbar-persistent{display:none}.navbar-pf .active>.navbar-persistent{display:block}.navbar-pf .navbar-primary{float:none}.navbar-pf .navbar-primary .context{border-bottom:1px solid #53565b}.navbar-pf .navbar-primary .context.context-bootstrap-select .bootstrap-select.btn-group,.navbar-pf .navbar-primary .context.context-bootstrap-select .bootstrap-select.btn-group[class*=span]{margin:8px 20px 9px;width:auto}.navbar-pf .navbar-primary>li>.navbar-persistent>.dropdown-submenu>a{position:relative}.navbar-pf .navbar-primary>li>.navbar-persistent>.dropdown-submenu>a:after{content:"\f107";display:inline-block;font-family:FontAwesome;font-weight:400}@media (max-width:767px){.navbar-pf .navbar-primary>li>.navbar-persistent>.dropdown-submenu>a:after{height:10px;margin-left:4px;vertical-align:baseline}}.navbar-pf .navbar-toggle{border:0;margin:0;padding:10px 20px}.navbar-pf .navbar-toggle:focus,.navbar-pf .navbar-toggle:hover{background-color:transparent;outline:0}.navbar-pf .navbar-toggle:focus .icon-bar,.navbar-pf .navbar-toggle:hover .icon-bar{-webkit-box-shadow:0 0 3px #fff;box-shadow:0 0 3px #fff}.navbar-pf .navbar-toggle .icon-bar{background-color:#fff}.navbar-pf .navbar-utility{border-bottom:1px solid #53565b}.navbar-pf .navbar-utility li.dropdown>.dropdown-toggle{padding-left:36px;position:relative}.navbar-pf .navbar-utility li.dropdown>.dropdown-toggle .pficon-user{left:20px;position:absolute;top:10px}@media (max-width:767px){.navbar-pf .navbar-utility>li+li{border-top:1px solid #53565b}}@media (min-width:768px){.navbar-pf .navbar-brand{padding:7px 0 8px}.navbar-pf .navbar-nav>li>a{padding-bottom:14px;padding-top:14px}.navbar-pf .navbar-persistent{font-size:14px}.navbar-pf .navbar-primary{font-size:14px;background-image:-webkit-linear-gradient(top,#474c50 0,#383f43 100%);background-image:-o-linear-gradient(top,#474c50 0,#383f43 100%);background-image:linear-gradient(to bottom,#474c50 0,#383f43 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff474c50', endColorstr='#ff383f43', GradientType=0)}.navbar-pf .navbar-primary.persistent-secondary .context .dropdown-menu{top:auto}.navbar-pf .navbar-primary.persistent-secondary .dropup .dropdown-menu{bottom:-5px;top:auto}.navbar-pf .navbar-primary.persistent-secondary>li{position:static}.navbar-pf .navbar-primary.persistent-secondary>li.active{margin-bottom:32px}.navbar-pf .navbar-primary.persistent-secondary>li.active>.navbar-persistent{display:block;left:0;position:absolute}.navbar-pf .navbar-primary.persistent-secondary>li>.navbar-persistent{background:#f6f6f6;border-bottom:1px solid #cecdcd;padding:0;width:100%}.navbar-pf .navbar-primary.persistent-secondary>li>.navbar-persistent a{text-decoration:none!important}.navbar-pf .navbar-primary.persistent-secondary>li>.navbar-persistent>li.active:before,.navbar-pf .navbar-primary.persistent-secondary>li>.navbar-persistent>li.active:hover:before{background:#0088ce;bottom:-1px;content:'';display:block;height:2px;left:20px;position:absolute;right:20px}.navbar-pf .navbar-primary.persistent-secondary>li>.navbar-persistent>li.active:hover>a,.navbar-pf .navbar-primary.persistent-secondary>li>.navbar-persistent>li.active>a,.navbar-pf .navbar-primary.persistent-secondary>li>.navbar-persistent>li.active>a:hover{color:#0088ce!important}.navbar-pf .navbar-primary.persistent-secondary>li>.navbar-persistent>li.active .active>a{color:#fff}.navbar-pf .navbar-primary.persistent-secondary>li>.navbar-persistent>li.dropdown-submenu:hover>.dropdown-menu{display:none}.navbar-pf .navbar-primary.persistent-secondary>li>.navbar-persistent>li.dropdown-submenu.open>.dropdown-menu{display:block;left:20px;margin-top:1px;top:100%}.navbar-pf .navbar-primary.persistent-secondary>li>.navbar-persistent>li.dropdown-submenu.open>.dropdown-toggle{color:#252525}.navbar-pf .navbar-primary.persistent-secondary>li>.navbar-persistent>li.dropdown-submenu.open>.dropdown-toggle:after{border-top-color:#252525}.navbar-pf .navbar-primary.persistent-secondary>li>.navbar-persistent>li.dropdown-submenu>.dropdown-toggle{padding-right:35px!important}.navbar-pf .navbar-primary.persistent-secondary>li>.navbar-persistent>li.dropdown-submenu>.dropdown-toggle:after{position:absolute;right:20px;top:10px}.navbar-pf .navbar-primary.persistent-secondary>li>.navbar-persistent>li.open:before,.navbar-pf .navbar-primary.persistent-secondary>li>.navbar-persistent>li:hover:before{background:#bbb;bottom:-1px;content:'';display:block;height:2px;left:20px;position:absolute;right:20px}.navbar-pf .navbar-primary.persistent-secondary>li>.navbar-persistent>li.open>a,.navbar-pf .navbar-primary.persistent-secondary>li>.navbar-persistent>li:hover>a{color:#252525}.navbar-pf .navbar-primary.persistent-secondary>li>.navbar-persistent>li.open>a:after,.navbar-pf .navbar-primary.persistent-secondary>li>.navbar-persistent>li:hover>a:after{border-top-color:#252525}.navbar-pf .navbar-primary.persistent-secondary>li>.navbar-persistent>li>a{background-color:transparent;display:block;line-height:1;padding:9px 20px}.navbar-pf .navbar-primary.persistent-secondary>li>.navbar-persistent>li>a.dropdown-toggle{padding-right:35px}.navbar-pf .navbar-primary.persistent-secondary>li>.navbar-persistent>li>a.dropdown-toggle:after{font-size:15px;position:absolute;right:20px;top:9px}.navbar-pf .navbar-primary.persistent-secondary>li>.navbar-persistent>li>a:hover{color:#252525}.navbar-pf .navbar-primary.persistent-secondary>li>.navbar-persistent>li a{color:#4d5258}.navbar-pf .navbar-primary>li>a{border-bottom:1px solid transparent;border-top:1px solid transparent;position:relative;margin:-1px 0 0}.navbar-pf .navbar-primary>li>a:hover{background-color:#4b5053;border-top-color:#949699;color:#dbdada;background-image:-webkit-linear-gradient(top,#5c6165 0,#4b5053 100%);background-image:-o-linear-gradient(top,#5c6165 0,#4b5053 100%);background-image:linear-gradient(to bottom,#5c6165 0,#4b5053 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5c6165', endColorstr='#ff4b5053', GradientType=0)}.navbar-pf .navbar-primary>.active>a,.navbar-pf .navbar-primary>.active>a:focus,.navbar-pf .navbar-primary>.active>a:hover,.navbar-pf .navbar-primary>.open>a,.navbar-pf .navbar-primary>.open>a:focus,.navbar-pf .navbar-primary>.open>a:hover{background-color:#64686c;border-bottom-color:#64686c;border-top-color:#949699;-webkit-box-shadow:none;box-shadow:none;color:#fff;background-image:-webkit-linear-gradient(top,#72757a 0,#64686c 100%);background-image:-o-linear-gradient(top,#72757a 0,#64686c 100%);background-image:linear-gradient(to bottom,#72757a 0,#64686c 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff72757a', endColorstr='#ff64686c', GradientType=0)}.navbar-pf .navbar-primary li.context.context-bootstrap-select .filter-option{max-width:160px;text-overflow:ellipsis}.navbar-pf .navbar-primary li.context.dropdown{border-bottom:0}.navbar-pf .navbar-primary li.context.context-bootstrap-select,.navbar-pf .navbar-primary li.context>a{background-color:#505458;border-bottom-color:#65696d;border-right:1px solid #65696d;border-top-color:#64696d;font-weight:600;background-image:-webkit-linear-gradient(top,#585d61 0,#505458 100%);background-image:-o-linear-gradient(top,#585d61 0,#505458 100%);background-image:linear-gradient(to bottom,#585d61 0,#505458 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff585d61', endColorstr='#ff505458', GradientType=0)}.navbar-pf .navbar-primary li.context.context-bootstrap-select:hover,.navbar-pf .navbar-primary li.context>a:hover{background-color:#5a5e62;border-bottom-color:#6e7276;border-right-color:#6e7276;border-top-color:#6c7276;background-image:-webkit-linear-gradient(top,#62676b 0,#5a5e62 100%);background-image:-o-linear-gradient(top,#62676b 0,#5a5e62 100%);background-image:linear-gradient(to bottom,#62676b 0,#5a5e62 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62676b', endColorstr='#ff5a5e62', GradientType=0)}.navbar-pf .navbar-primary li.context.open>a{background-color:#65696d;border-bottom-color:#6e7276;border-right-color:#777a7e;border-top-color:#767a7e;background-image:-webkit-linear-gradient(top,#6b7175 0,#65696d 100%);background-image:-o-linear-gradient(top,#6b7175 0,#65696d 100%);background-image:linear-gradient(to bottom,#6b7175 0,#65696d 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff6b7175', endColorstr='#ff65696d', GradientType=0)}.navbar-pf .navbar-utility{border-bottom:0;font-size:11px;position:absolute;right:0;top:0}.navbar-pf .navbar-utility>.active>a,.navbar-pf .navbar-utility>.active>a:focus,.navbar-pf .navbar-utility>.active>a:hover,.navbar-pf .navbar-utility>.open>a,.navbar-pf .navbar-utility>.open>a:focus,.navbar-pf .navbar-utility>.open>a:hover{background:#5b6165;color:#fff}.navbar-pf .navbar-utility>li>a{border-left:1px solid #53565b;color:#fff!important;padding:7px 10px}.navbar-pf .navbar-utility>li>a:hover{background:#4a5053;border-left-color:#636466}.navbar-pf .navbar-utility>li.open>a{border-left-color:#6c6e70;color:#fff!important}.navbar-pf .navbar-utility li.dropdown>.dropdown-toggle{padding-left:26px}.navbar-pf .navbar-utility li.dropdown>.dropdown-toggle .pficon-user{left:10px;top:7px}.navbar-pf .navbar-utility .open .dropdown-menu{left:auto;right:0}.navbar-pf .navbar-utility .open .dropdown-menu .dropdown-menu{left:auto;right:100%}.navbar-pf .navbar-utility .open .dropdown-menu{border-top-width:0}.navbar-pf .open .dropdown-submenu>.dropdown-menu,.navbar-pf .open.bootstrap-select .dropdown-menu{border-top-width:1px!important}}@media (max-width:360px){.navbar-pf .navbar-brand{margin-left:10px;width:75%}.navbar-pf .navbar-brand img{height:auto;max-width:100%}.navbar-pf .navbar-toggle{padding-left:0}}.drawer-pf{background-color:#fafafa;border:1px solid #d1d1d1;-webkit-box-shadow:0 6px 12px rgba(3,3,3,.175);box-shadow:0 6px 12px rgba(3,3,3,.175);overflow-y:auto;position:absolute;right:0;width:320px;z-index:2}.drawer-pf .panel{border-bottom:none;border-left:none;border-right:none}.drawer-pf .panel-group .panel-heading+.panel-collapse .panel-body{border-top:none;border-bottom:1px solid #d1d1d1;padding:0}.drawer-pf .panel-counter{display:block;font-style:italic;line-height:1.2;padding-left:18px;padding-top:5px}.drawer-pf .panel-heading{border-bottom:1px solid #d1d1d1}.drawer-pf .panel-group{bottom:0;margin-bottom:0;position:absolute;top:25px;width:100%}.drawer-pf .panel-title a{cursor:pointer;display:block}.drawer-pf.drawer-pf-expanded{left:270px;width:inherit}.drawer-pf.drawer-pf-expanded .drawer-pf-toggle-expand:before{content:"\f101"}.drawer-pf-toggle-expand{color:inherit;cursor:pointer;left:0;padding:2px 5px;position:absolute}.drawer-pf-toggle-expand:before{content:"\f100";font-family:FontAwesome}.drawer-pf-toggle-expand:focus,.drawer-pf-toggle-expand:hover{color:inherit;text-decoration:none}.drawer-pf-action .btn-link{color:#0088ce;padding:10px 0}.drawer-pf-action .btn-link:hover{color:#00659c}.drawer-pf-loading{color:#4d5258;font-size:14px;padding:20px 15px}.drawer-pf-notification{border-bottom:1px solid #d1d1d1;padding:15px}.drawer-pf-notification .date{border-right:1px solid #aaa;display:inline-block;line-height:1;margin-right:5px;padding-right:9px}.drawer-pf-notification .pficon{font-size:14px;margin-top:3px}.drawer-pf-notification:last-of-type{border-bottom:none}.drawer-pf-notification:hover{background-color:#def3ff}.drawer-pf-notification.unread .drawer-pf-notification-message{font-weight:700}.drawer-pf-notification.expanded-notification .date{border-right:none;padding-right:0}.drawer-pf-notification-info,.drawer-pf-notification-message{display:block;padding-left:27px;padding-right:19px}.expanded-notification .drawer-pf-notification-info,.expanded-notification .drawer-pf-notification-message{display:inline-block}.drawer-pf-notifications-non-clickable .drawer-pf-notification:hover{background-color:#fff}.drawer-pf-title{background-color:#fafafa;border-bottom:1px solid #d1d1d1;position:absolute;width:318px}.drawer-pf-title h3{font-size:12px;margin:0;padding:6px 15px}.navbar-pf-vertical .drawer-pf{height:calc(100vh - 80px);top:58px}.navbar-pf-vertical .nav .drawer-pf-trigger .drawer-pf-trigger-icon{border-left:1px solid #53565b;border-right:1px solid #53565b;padding-left:15px;padding-right:15px}.navbar-pf-vertical .nav .drawer-pf-trigger.open .drawer-pf-trigger-icon{background-color:#4a5053}.navbar-pf .drawer-pf{height:calc(100vh - 46px);top:26px}.navbar-pf .drawer-pf-trigger-icon{cursor:pointer}.pager li>a,.pager li>span{background-color:#f1f1f1;background-image:-webkit-linear-gradient(top,#fafafa 0,#ededed 100%);background-image:-o-linear-gradient(top,#fafafa 0,#ededed 100%);background-image:linear-gradient(to bottom,#fafafa 0,#ededed 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffededed', GradientType=0);border-color:#bbb;color:#4d5258;font-weight:600;line-height:22px;padding:2px 14px}.open .dropdown-toggle.pager li>a,.open .dropdown-toggle.pager li>span,.pager li>a.active,.pager li>a:active,.pager li>a:focus,.pager li>a:hover,.pager li>span.active,.pager li>span:active,.pager li>span:focus,.pager li>span:hover{background-color:#f1f1f1;background-image:none;border-color:#bbb;color:#4d5258}.open .dropdown-toggle.pager li>a,.open .dropdown-toggle.pager li>span,.pager li>a.active,.pager li>a:active,.pager li>span.active,.pager li>span:active{background-image:none}.open .dropdown-toggle.pager li>a.focus,.open .dropdown-toggle.pager li>a:focus,.open .dropdown-toggle.pager li>a:hover,.open .dropdown-toggle.pager li>span.focus,.open .dropdown-toggle.pager li>span:focus,.open .dropdown-toggle.pager li>span:hover,.pager li>a.active.focus,.pager li>a.active:focus,.pager li>a.active:hover,.pager li>a:active.focus,.pager li>a:active:focus,.pager li>a:active:hover,.pager li>span.active.focus,.pager li>span.active:focus,.pager li>span.active:hover,.pager li>span:active.focus,.pager li>span:active:focus,.pager li>span:active:hover{background-color:#e5e5e5;border-color:#a9a9a9}.pager li>a.disabled,.pager li>a.disabled.active,.pager li>a.disabled:active,.pager li>a.disabled:focus,.pager li>a.disabled:hover,.pager li>a[disabled],.pager li>a[disabled].active,.pager li>a[disabled]:active,.pager li>a[disabled]:focus,.pager li>a[disabled]:hover,.pager li>span.disabled,.pager li>span.disabled.active,.pager li>span.disabled:active,.pager li>span.disabled:focus,.pager li>span.disabled:hover,.pager li>span[disabled],.pager li>span[disabled].active,.pager li>span[disabled]:active,.pager li>span[disabled]:focus,.pager li>span[disabled]:hover,fieldset[disabled] .pager li>a,fieldset[disabled] .pager li>a.active,fieldset[disabled] .pager li>a:active,fieldset[disabled] .pager li>a:focus,fieldset[disabled] .pager li>a:hover,fieldset[disabled] .pager li>span,fieldset[disabled] .pager li>span.active,fieldset[disabled] .pager li>span:active,fieldset[disabled] .pager li>span:focus,fieldset[disabled] .pager li>span:hover{background-color:#f1f1f1;border-color:#bbb}.pager li>a>.i,.pager li>span>.i{font-size:18px;vertical-align:top;margin:2px 0}.pager li>a:hover>a:focus{color:#4d5258}.pager li a:active{background-image:none;-webkit-box-shadow:inset 0 3px 5px rgba(3,3,3,.125);box-shadow:inset 0 3px 5px rgba(3,3,3,.125);outline:0}.pager .disabled>a,.pager .disabled>a:active,.pager .disabled>a:focus,.pager .disabled>a:hover,.pager .disabled>span{background:#f5f5f5;-webkit-box-shadow:none;box-shadow:none;color:#8b8d8f;cursor:default}.pager .next>a>.i,.pager .next>span>.i{margin-left:5px}.pager .previous>a>.i,.pager .previous>span>.i{margin-right:5px}.pager-sm li>a,.pager-sm li>span{font-weight:400;line-height:16px;padding:1px 10px}.pager-sm li>a>.i,.pager-sm li>span>.i{font-size:12px}.pagination>li>a,.pagination>li>span{background-color:#f1f1f1;background-image:-webkit-linear-gradient(top,#fafafa 0,#ededed 100%);background-image:-o-linear-gradient(top,#fafafa 0,#ededed 100%);background-image:linear-gradient(to bottom,#fafafa 0,#ededed 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffededed', GradientType=0);border-color:#bbb;color:#4d5258;cursor:default;font-weight:600;padding:2px 10px}.open .dropdown-toggle.pagination>li>a,.open .dropdown-toggle.pagination>li>span,.pagination>li>a.active,.pagination>li>a:active,.pagination>li>a:focus,.pagination>li>a:hover,.pagination>li>span.active,.pagination>li>span:active,.pagination>li>span:focus,.pagination>li>span:hover{background-color:#f1f1f1;background-image:none;border-color:#bbb;color:#4d5258}.open .dropdown-toggle.pagination>li>a,.open .dropdown-toggle.pagination>li>span,.pagination>li>a.active,.pagination>li>a:active,.pagination>li>span.active,.pagination>li>span:active{background-image:none}.open .dropdown-toggle.pagination>li>a.focus,.open .dropdown-toggle.pagination>li>a:focus,.open .dropdown-toggle.pagination>li>a:hover,.open .dropdown-toggle.pagination>li>span.focus,.open .dropdown-toggle.pagination>li>span:focus,.open .dropdown-toggle.pagination>li>span:hover,.pagination>li>a.active.focus,.pagination>li>a.active:focus,.pagination>li>a.active:hover,.pagination>li>a:active.focus,.pagination>li>a:active:focus,.pagination>li>a:active:hover,.pagination>li>span.active.focus,.pagination>li>span.active:focus,.pagination>li>span.active:hover,.pagination>li>span:active.focus,.pagination>li>span:active:focus,.pagination>li>span:active:hover{background-color:#e5e5e5;border-color:#a9a9a9}.pagination>li>a.disabled,.pagination>li>a.disabled.active,.pagination>li>a.disabled:active,.pagination>li>a.disabled:focus,.pagination>li>a.disabled:hover,.pagination>li>a[disabled],.pagination>li>a[disabled].active,.pagination>li>a[disabled]:active,.pagination>li>a[disabled]:focus,.pagination>li>a[disabled]:hover,.pagination>li>span.disabled,.pagination>li>span.disabled.active,.pagination>li>span.disabled:active,.pagination>li>span.disabled:focus,.pagination>li>span.disabled:hover,.pagination>li>span[disabled],.pagination>li>span[disabled].active,.pagination>li>span[disabled]:active,.pagination>li>span[disabled]:focus,.pagination>li>span[disabled]:hover,fieldset[disabled] .pagination>li>a,fieldset[disabled] .pagination>li>a.active,fieldset[disabled] .pagination>li>a:active,fieldset[disabled] .pagination>li>a:focus,fieldset[disabled] .pagination>li>a:hover,fieldset[disabled] .pagination>li>span,fieldset[disabled] .pagination>li>span.active,fieldset[disabled] .pagination>li>span:active,fieldset[disabled] .pagination>li>span:focus,fieldset[disabled] .pagination>li>span:hover{background-color:#f1f1f1;border-color:#bbb}.pagination>li>a>.i,.pagination>li>span>.i{font-size:15px;vertical-align:top;margin:2px 0}.pagination>li>a:active,.pagination>li>span:active{-webkit-box-shadow:inset 0 2px 8px rgba(3,3,3,.2);box-shadow:inset 0 2px 8px rgba(3,3,3,.2)}.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{background-color:#f1f1f1;border-color:#bbb;-webkit-box-shadow:inset 0 2px 8px rgba(3,3,3,.2);box-shadow:inset 0 2px 8px rgba(3,3,3,.2);color:#4d5258;background-image:-webkit-linear-gradient(top,#fafafa 0,#ededed 100%);background-image:-o-linear-gradient(top,#fafafa 0,#ededed 100%);background-image:linear-gradient(to bottom,#fafafa 0,#ededed 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffededed', GradientType=0)}.pagination>.disabled>a,.pagination>.disabled>a:focus,.pagination>.disabled>a:hover,.pagination>.disabled>span,.pagination>.disabled>span:focus,.pagination>.disabled>span:hover{-webkit-box-shadow:none;box-shadow:none;cursor:default;background-image:-webkit-linear-gradient(top,#fafafa 0,#ededed 100%);background-image:-o-linear-gradient(top,#fafafa 0,#ededed 100%);background-image:linear-gradient(to bottom,#fafafa 0,#ededed 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffededed', GradientType=0)}.pagination-sm>li>a,.pagination-sm>li>span{padding:2px 6px;font-size:11px;line-height:1.5}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-bottom-left-radius:1px;border-top-left-radius:1px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-bottom-right-radius:1px;border-top-right-radius:1px}.pagination-sm>li>a,.pagination-sm>li>span{font-weight:400}.pagination-sm>li>a>.i,.pagination-sm>li>span>.i{font-size:12px;margin-top:2px}.panel-title{font-weight:700}.panel-group .panel{color:#4d5258}.panel-group .panel+.panel{margin-top:-1px}.panel-group .panel-default{border-color:#bbb;border-top-color:#bbb}.panel-group .panel-heading{background-image:-webkit-linear-gradient(top,#fafafa 0,#ededed 100%);background-image:-o-linear-gradient(top,#fafafa 0,#ededed 100%);background-image:linear-gradient(to bottom,#fafafa 0,#ededed 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffededed', GradientType=0)}.panel-group .panel-heading+.panel-collapse .panel-body{border-top:1px solid #d1d1d1}.panel-group .panel-title{font-weight:500;line-height:1}.panel-group .panel-title>a{color:#4d5258;font-weight:600}.panel-group .panel-title>a:before{content:"\f107";display:inline-block;font-family:FontAwesome;font-size:13px;margin-right:5px;text-align:center;vertical-align:0;width:8px}.panel-group .panel-title>a:focus{outline:0;text-decoration:none}.panel-group .panel-title>a:hover{text-decoration:none}.panel-group .panel-title>a.collapsed:before{content:"\f105"}.popover{-webkit-box-shadow:0 2px 2px rgba(3,3,3,.08);box-shadow:0 2px 2px rgba(3,3,3,.08);padding:0}.popover-content{color:#4d5258;line-height:18px;padding:10px 14px}.popover-title{border-bottom:none;border-radius:0;color:#4d5258;font-size:13px;font-weight:700;min-height:34px}.popover-title .close{height:22px;position:absolute;right:8px;top:6px}.popover-title.closable{padding-right:30px}@-webkit-keyframes progress-bar-stripes{from{background-position:0 0}to{background-position:40px 0}}@keyframes progress-bar-stripes{from{background-position:0 0}to{background-position:40px 0}}.progress{-webkit-box-shadow:inset 0 0 1px rgba(3,3,3,.25);box-shadow:inset 0 0 1px rgba(3,3,3,.25)}.progress.progress-label-left,.progress.progress-label-top-right{overflow:visible;position:relative}.progress.progress-label-left{margin-left:40px}.progress.progress-sm{height:14px;margin-bottom:14px}.progress.progress-xs{height:6px;margin-bottom:6px}td>.progress:first-child:last-child{margin-bottom:0;margin-top:3px}.progress-bar{box-shadow:none}.progress-label-left .progress-bar span,.progress-label-right .progress-bar span,.progress-label-top-right .progress-bar span{color:#363636;position:absolute;text-align:right}.progress-label-left .progress-bar span{font-size:14px;left:-40px;top:0;width:35px}.progress-label-right .progress-bar span,.progress-label-top-right .progress-bar span{font-size:11px;overflow:hidden;right:0;text-overflow:ellipsis;white-space:nowrap}.progress-label-right .progress-bar span strong,.progress-label-top-right .progress-bar span strong{font-weight:600}.progress-label-right .progress-bar span{max-width:85px;top:0}.progress-label-top-right .progress-bar span{max-width:47%;top:-30px}.progress-label-left.progress-sm .progress-bar span,.progress-label-top-right.progress-sm .progress-bar span{font-size:12px}.progress-sm .progress-bar{line-height:14px}.progress-xs .progress-bar{line-height:6px}.progress-bar-remaining{background:0 0}.progress-container{position:relative}.progress-container.progress-description-left{padding-left:90px}.progress-container.progress-label-right{padding-right:90px}.progress-description{margin-bottom:10px;max-width:52%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.progress-description .count{font-size:20px;font-weight:300;line-height:1;margin-right:5px}.progress-description .fa,.progress-description .pficon{font-size:14px;margin-right:3px}.progress-description-left .progress-description{left:0;margin-bottom:0;max-width:85px;position:absolute;top:0}.progress-description .tooltip{white-space:normal}.search-pf.has-button{border-collapse:separate;display:table}.search-pf.has-button .form-group{display:table-cell;width:100%}.search-pf.has-button .form-group .btn{-webkit-box-shadow:none;box-shadow:none;float:left;margin-left:-1px}.search-pf.has-button .form-group .btn.btn-lg{font-size:14.5px}.search-pf.has-button .form-group .btn.btn-sm{font-size:10.7px}.search-pf.has-button .form-group .form-control{float:left}.search-pf .has-clear .clear{background:0 0;background:rgba(255,255,255,0);border:0;height:25px;line-height:1;padding:0;position:absolute;right:1px;top:1px;width:28px}.search-pf .has-clear .clear:focus{outline:0}.search-pf .has-clear .form-control{padding-right:30px}.search-pf .has-clear .form-control::-ms-clear{display:none}.search-pf .has-clear .input-lg+.clear{height:31px;width:28px}.search-pf .has-clear .input-sm+.clear{height:20px;width:28px}.search-pf .has-clear .input-sm+.clear span{font-size:10px}.search-pf .has-clear .search-pf-input-group{position:relative}.sidebar-header{border-bottom:1px solid #ececec;padding-bottom:11px;margin:50px 0 20px}.sidebar-header .actions{margin-top:-2px}.sidebar-pf .sidebar-header+.list-group{border-top:0;margin-top:-10px}.sidebar-pf .sidebar-header+.list-group .list-group-item{background:0 0;border-color:#ececec;padding-left:0}.sidebar-pf .sidebar-header+.list-group .list-group-item-heading{font-size:12px}.sidebar-pf .nav-category h2{color:#9c9c9c;font-size:12px;font-weight:400;line-height:21px;margin:0;padding:8px 0}.sidebar-pf .nav-category+.nav-category{margin-top:10px}.sidebar-pf .nav-pills>li.active>a{background:#0088ce!important;border-color:#0088ce!important;color:#fff}@media (min-width:768px){.sidebar-pf .nav-pills>li.active>a:after{content:"\f105";font-family:FontAwesome;display:block;position:absolute;right:10px;top:1px}}.sidebar-pf .nav-pills>li.active>a .fa{color:#fff}.sidebar-pf .nav-pills>li>a{border-bottom:1px solid transparent;border-radius:0;border-top:1px solid transparent;color:#363636;font-size:13px;line-height:21px;padding:1px 20px}.sidebar-pf .nav-pills>li>a:hover{background:#def3ff;border-color:#bee1f4}.sidebar-pf .nav-pills>li>a .fa{color:#6a7079;font-size:15px;margin-right:10px;text-align:center;vertical-align:middle;width:15px}.sidebar-pf .nav-stacked{margin-left:-20px;margin-right:-20px}.sidebar-pf .nav-stacked li+li{margin-top:0}.sidebar-pf .panel{background:0 0}.sidebar-pf .panel-body{padding:6px 20px}.sidebar-pf .panel-body .nav-pills>li>a{padding-left:37px}.sidebar-pf .panel-heading{padding:9px 20px}.sidebar-pf .panel-title{font-size:12px}.sidebar-pf .panel-title>a:before{display:inline-block;margin-left:1px;margin-right:4px;width:9px}.sidebar-pf .panel-title>a.collapsed:before{margin-left:3px;margin-right:2px}@media (min-width:767px){.sidebar-header-bleed-left{margin-left:-20px}.sidebar-header-bleed-left>h2{margin-left:20px}.sidebar-header-bleed-right{margin-right:-20px}.sidebar-header-bleed-right .actions{margin-right:20px}.sidebar-header-bleed-right>h2{margin-right:20px}.sidebar-header-bleed-right+.list-group{margin-right:-20px}.sidebar-pf .panel-group .panel-default,.sidebar-pf .treeview{border-left:0;border-right:0;margin-left:-20px;margin-right:-20px}.sidebar-pf .treeview{margin-top:5px}.sidebar-pf .treeview .list-group-item{padding-left:20px;padding-right:20px}.sidebar-pf .treeview .list-group-item.node-selected:after{content:"\f105";font-family:FontAwesome;display:block;position:absolute;right:10px;top:1px}}@media (min-width:768px){.sidebar-pf{background:#fafafa}.sidebar-pf.sidebar-pf-left{border-right:1px solid #d1d1d1}.sidebar-pf.sidebar-pf-right{border-left:1px solid #d1d1d1}.sidebar-pf>.nav-category,.sidebar-pf>.nav-stacked{margin-top:5px}}@-webkit-keyframes rotation{from{-webkit-transform:rotate(0)}to{-webkit-transform:rotate(359deg)}}@keyframes rotation{from{transform:rotate(0)}to{transform:rotate(359deg)}}.spinner{-webkit-animation:rotation .6s infinite linear;animation:rotation .6s infinite linear;border-bottom:4px solid rgba(3,3,3,.25);border-left:4px solid rgba(3,3,3,.25);border-right:4px solid rgba(3,3,3,.25);border-radius:100%;border-top:4px solid rgba(3,3,3,.75);height:24px;margin:0 auto;position:relative;width:24px}.spinner.spinner-inline{display:inline-block;margin-right:3px}.spinner.spinner-lg{border-width:5px;height:30px;width:30px}.spinner.spinner-sm{border-width:3px;height:18px;width:18px}.spinner.spinner-xs{border-width:2px;height:12px;width:12px}.spinner.spinner-inverse{border-bottom-color:rgba(255,255,255,.25);border-left-color:rgba(255,255,255,.25);border-right-color:rgba(255,255,255,.25);border-top-color:rgba(255,255,255,.75)}.ie9 .spinner{background:url(../img/spinner.gif) no-repeat;border:0}.ie9 .spinner.spinner-inverse{background-image:url(../img/spinner-inverse.gif)}.ie9 .spinner.spinner-inverse-lg{background-image:url(../img/spinner-inverse-lg.gif)}.ie9 .spinner.spinner-inverse-sm{background-image:url(../img/spinner-inverse-sm.gif)}.ie9 .spinner.spinner-inverse-xs{background-image:url(../img/spinner-inverse-xs.gif)}.ie9 .spinner.spinner-lg{background-image:url(../img/spinner-lg.gif)}.ie9 .spinner.spinner-sm{background-image:url(../img/spinner-sm.gif)}.ie9 .spinner.spinner-xs{background-image:url(../img/spinner-xs.gif)}.prettyprint .atn,.prettyprint .com,.prettyprint .fun,.prettyprint .var{color:#3f9c35}.prettyprint .atv,.prettyprint .str{color:#a30000}.prettyprint .clo,.prettyprint .dec,.prettyprint .kwd,.prettyprint .opn,.prettyprint .pln,.prettyprint .pun{color:#363636}.prettyprint .lit,.prettyprint .tag,.prettyprint .typ{color:#00659c}.prettyprint ol.linenums{margin-bottom:0}.table>tbody>tr>td,.table>tbody>tr>th,.table>tfoot>tr>td,.table>tfoot>tr>th,.table>thead>tr>td,.table>thead>tr>th{padding:2px 10px 3px}.table>tbody>tr>td>a:hover,.table>tbody>tr>th>a:hover,.table>tfoot>tr>td>a:hover,.table>tfoot>tr>th>a:hover,.table>thead>tr>td>a:hover,.table>thead>tr>th>a:hover{text-decoration:none}.table>tbody>tr>th,.table>tfoot>tr>th,.table>thead>tr>th{font-family:'Open Sans';font-style:normal;font-weight:600}.table>thead{background-clip:padding-box;background-color:#f5f5f5;background-image:-webkit-linear-gradient(top,#fafafa 0,#ededed 100%);background-image:-o-linear-gradient(top,#fafafa 0,#ededed 100%);background-image:linear-gradient(to bottom,#fafafa 0,#ededed 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffededed', GradientType=0)}.table-bordered{border:1px solid #d1d1d1}.table-bordered>tbody>tr>td,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>td,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border:1px solid #d1d1d1}.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border-bottom-width:1px}.table-striped>tbody>tr:nth-of-type(even){background-color:#f5f5f5}.table-striped>tbody>tr:nth-of-type(odd){background-color:transparent}.table-hover>tbody>tr:hover>td,.table-hover>tbody>tr:hover>th{background-color:#def3ff;border-bottom-color:#7dc3e8}.table-treegrid span.indent{margin-left:10px;margin-right:10px}.table-treegrid span.icon{display:inline-block;font-size:13px;margin-right:5px;min-width:10px;text-align:center}.table-treegrid span.collapse-icon,.table-treegrid span.expand-icon{cursor:pointer}.table-treegrid>tbody>tr.odd{background-color:#f5f5f5}.nav-tabs{font-size:14px}.nav-tabs>li>a{color:#4d5258;margin-right:-1px;padding-bottom:5px;padding-top:5px}.nav-tabs>li>a:active,.nav-tabs>li>a:focus,.nav-tabs>li>a:hover{background:0 0;border-color:#ededed;color:#252525}.nav-tabs>li>.dropdown-menu{border-top:0;border-color:#ededed}.nav-tabs>li>.dropdown-menu.pull-right{right:-1px}.nav-tabs+.nav-tabs-pf{font-size:12px}.nav-tabs+.nav-tabs-pf>li:first-child>a{padding-left:15px}.nav-tabs+.nav-tabs-pf>li:first-child>a:before{left:15px!important}.nav-tabs .open>a,.nav-tabs .open>a:focus,.nav-tabs .open>a:hover{background-color:transparent;border-color:#ededed}@media (min-width:768px){.nav-tabs-pf.nav-justified{border-bottom:1px solid #ededed}}.nav-tabs-pf.nav-justified>li:first-child>a{padding-left:15px}.nav-tabs-pf.nav-justified>li>a{border-bottom:0}.nav-tabs-pf.nav-justified>li>a:before{left:0!important;right:0!important}.nav-tabs-pf>li{margin-bottom:0}.nav-tabs-pf>li.active>a:before{background:#0088ce;bottom:-1px;content:'';display:block;height:2px;left:15px;position:absolute;right:15px}.nav-tabs-pf>li.active>a,.nav-tabs-pf>li.active>a:active,.nav-tabs-pf>li.active>a:focus,.nav-tabs-pf>li.active>a:hover{background-color:transparent;border:0!important;color:#0088ce}.nav-tabs-pf>li.active>a:active:before,.nav-tabs-pf>li.active>a:before,.nav-tabs-pf>li.active>a:focus:before,.nav-tabs-pf>li.active>a:hover:before{background:#0088ce}.nav-tabs-pf>li:first-child>a{padding-left:0}.nav-tabs-pf>li:first-child>a:before{left:0!important}.nav-tabs-pf>li>a{border:0;line-height:1;margin-right:0;padding-bottom:10px;padding-top:10px}.nav-tabs-pf>li>a:active:before,.nav-tabs-pf>li>a:focus:before,.nav-tabs-pf>li>a:hover:before{background:#bbb;bottom:-1px;content:'';display:block;height:2px;left:15px;position:absolute;right:15px}.nav-tabs-pf>li>.dropdown-menu{left:15px;margin-top:1px}.nav-tabs-pf>li>.dropdown-menu.pull-right{left:auto;right:15px}.nav-tabs-pf .open>a,.nav-tabs-pf .open>a:focus,.nav-tabs-pf .open>a:hover{background-color:transparent}.tooltip{font-size:12px;line-height:1.4}.tooltip-inner{padding:7px 12px;text-align:left}.h1,.h2,h1,h2{font-weight:300}.page-header .actions{margin-top:8px}.page-header .actions a>.pficon{margin-right:4px}@media (min-width:767px){.page-header-bleed-left{margin-left:-20px}.page-header-bleed-right{margin-right:-20px}.page-header-bleed-right .actions{margin-right:20px}}
\ No newline at end of file
--
-2.21.0
-
+2.21.1
-From 6b3de20bbf50a2ca035793bf0625103a58b2d705 Mon Sep 17 00:00:00 2001
+From 751cb8d5cb432bcb9d5c7ada7c365a12ca6a95ee Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
-Subject: [PATCH 39/71] install/ui/index.html: Change branding to IPA and
+Subject: [PATCH 39/78] install/ui/index.html: Change branding to IPA and
Identity Management
---
@@ -1120,7 +1082,7 @@ Subject: [PATCH 39/71] install/ui/index.html: Change branding to IPA and
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/install/ui/index.html b/install/ui/index.html
-index bc0f0cd..d1eacaf 100644
+index bc0f0cd1e..d1eacaf53 100644
--- a/install/ui/index.html
+++ b/install/ui/index.html
@@ -2,7 +2,7 @@
@@ -1133,13 +1095,12 @@ index bc0f0cd..d1eacaf 100644
<!--[if IE]>
<meta id="ie-detector">
--
-2.21.0
+2.21.1
-
-From 9d19e7d9bb2ebd3d130ed0e3718c1be32a3a119b Mon Sep 17 00:00:00 2001
+From 8a4169a5d81b3c2376081d61a3beaf6601e318cf Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
-Subject: [PATCH 40/71] install/ui/less/brand.less: Change branding to IPA and
+Subject: [PATCH 40/78] install/ui/less/brand.less: Change branding to IPA and
Identity Management
---
@@ -1147,7 +1108,7 @@ Subject: [PATCH 40/71] install/ui/less/brand.less: Change branding to IPA and
1 file changed, 50 insertions(+), 53 deletions(-)
diff --git a/install/ui/less/brand.less b/install/ui/less/brand.less
-index c9030bb..7488eaf 100644
+index c9030bb0b..7488eaf91 100644
--- a/install/ui/less/brand.less
+++ b/install/ui/less/brand.less
@@ -20,58 +20,55 @@
@@ -1261,13 +1222,12 @@ index c9030bb..7488eaf 100644
}
\ No newline at end of file
--
-2.21.0
-
+2.21.1
-From 78cc2843205bcadcfd27a0e9d8d4a03a2e14d29d Mon Sep 17 00:00:00 2001
+From 2946405ea45ea7163c520c367f764808f112d7f2 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
-Subject: [PATCH 41/71] install/ui/less/patternfly.less: Change branding to IPA
+Subject: [PATCH 41/78] install/ui/less/patternfly.less: Change branding to IPA
and Identity Management
---
@@ -1275,7 +1235,7 @@ Subject: [PATCH 41/71] install/ui/less/patternfly.less: Change branding to IPA
1 file changed, 48 insertions(+)
diff --git a/install/ui/less/patternfly.less b/install/ui/less/patternfly.less
-index a2e30c8..97a8d5c 100644
+index a2e30c85b..97a8d5c26 100644
--- a/install/ui/less/patternfly.less
+++ b/install/ui/less/patternfly.less
@@ -129,3 +129,51 @@
@@ -1331,13 +1291,12 @@ index a2e30c8..97a8d5c 100644
+@navbar-pf-navbar-utility-open-bg-color: #5b6165;
+@navbar-pf-navbar-utility-open-border-color: #6c6e70;
--
-2.21.0
+2.21.1
-
-From 996fe9454f57fb4adc4ab72345511f2d207f7d46 Mon Sep 17 00:00:00 2001
+From beb52f0f27401d439755107be31e74210343e784 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
-Subject: [PATCH 42/71] install/ui/reset_password.html: Change branding to IPA
+Subject: [PATCH 42/78] install/ui/reset_password.html: Change branding to IPA
and Identity Management
---
@@ -1345,7 +1304,7 @@ Subject: [PATCH 42/71] install/ui/reset_password.html: Change branding to IPA
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/install/ui/reset_password.html b/install/ui/reset_password.html
-index e5700c9..a4ea1ce 100644
+index e5700c964..a4ea1ce0e 100644
--- a/install/ui/reset_password.html
+++ b/install/ui/reset_password.html
@@ -2,7 +2,7 @@
@@ -1358,13 +1317,12 @@ index e5700c9..a4ea1ce 100644
<!--[if IE]>
<meta id="ie-detector">
--
-2.21.0
-
+2.21.1
-From 2bdd0bcb746361b391aa6e53aaa1e1d6e57dbfe6 Mon Sep 17 00:00:00 2001
+From 288607c7080be4f35a00b853f3de9fdd0752376d Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
-Subject: [PATCH 43/71] install/ui/src/freeipa/widgets/App.js: Change branding
+Subject: [PATCH 43/78] install/ui/src/freeipa/widgets/App.js: Change branding
to IPA and Identity Management
---
@@ -1372,7 +1330,7 @@ Subject: [PATCH 43/71] install/ui/src/freeipa/widgets/App.js: Change branding
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/install/ui/src/freeipa/widgets/App.js b/install/ui/src/freeipa/widgets/App.js
-index 3a13955..b0f7588 100644
+index 3a139555a..b0f75885d 100644
--- a/install/ui/src/freeipa/widgets/App.js
+++ b/install/ui/src/freeipa/widgets/App.js
@@ -187,7 +187,7 @@ define(['dojo/_base/declare',
@@ -1385,13 +1343,12 @@ index 3a13955..b0f7588 100644
return this.brand_node;
--
-2.21.0
+2.21.1
-
-From 01f8e875fd670d71d3ff8e6c0929a304c451bfaa Mon Sep 17 00:00:00 2001
+From 5573b887c32228f2c404413fd58560da95ef954d Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
-Subject: [PATCH 44/71] install/ui/sync_otp.html: Change branding to IPA and
+Subject: [PATCH 44/78] install/ui/sync_otp.html: Change branding to IPA and
Identity Management
---
@@ -1399,7 +1356,7 @@ Subject: [PATCH 44/71] install/ui/sync_otp.html: Change branding to IPA and
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/install/ui/sync_otp.html b/install/ui/sync_otp.html
-index 5814b6c..36a51ca 100644
+index 5814b6c57..36a51ca62 100644
--- a/install/ui/sync_otp.html
+++ b/install/ui/sync_otp.html
@@ -2,7 +2,7 @@
@@ -1412,13 +1369,12 @@ index 5814b6c..36a51ca 100644
<!--[if IE]>
<meta id="ie-detector">
--
-2.21.0
-
+2.21.1
-From ab6ee26de48cffbf3916dd8a2e15f18527b5f8f6 Mon Sep 17 00:00:00 2001
+From 86d40a59a18f9b1439387bf8d5794437be0fb8b9 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
-Subject: [PATCH 45/71] install/ui/test/data/ipa_init_commands.json: Change
+Subject: [PATCH 45/78] install/ui/test/data/ipa_init_commands.json: Change
branding to IPA and Identity Management
---
@@ -1426,7 +1382,7 @@ Subject: [PATCH 45/71] install/ui/test/data/ipa_init_commands.json: Change
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/install/ui/test/data/ipa_init_commands.json b/install/ui/test/data/ipa_init_commands.json
-index c35946b..6d36674 100644
+index c35946b34..6d3667473 100644
--- a/install/ui/test/data/ipa_init_commands.json
+++ b/install/ui/test/data/ipa_init_commands.json
@@ -8689,7 +8689,7 @@
@@ -1448,13 +1404,12 @@ index c35946b..6d36674 100644
"no_update"
],
--
-2.21.0
+2.21.1
-
-From 8a439a32134ed2b8a4ab11c6637e7379be4bb4cc Mon Sep 17 00:00:00 2001
+From 7e027d4836251b4f824b5e420e8ef6cfa8bb4505 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
-Subject: [PATCH 46/71] install/ui/test/data/ipa_init_objects.json: Change
+Subject: [PATCH 46/78] install/ui/test/data/ipa_init_objects.json: Change
branding to IPA and Identity Management
---
@@ -1462,7 +1417,7 @@ Subject: [PATCH 46/71] install/ui/test/data/ipa_init_objects.json: Change
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/install/ui/test/data/ipa_init_objects.json b/install/ui/test/data/ipa_init_objects.json
-index 6f9b13e..08aaafd 100644
+index 6f9b13e92..08aaafd61 100644
--- a/install/ui/test/data/ipa_init_objects.json
+++ b/install/ui/test/data/ipa_init_objects.json
@@ -21190,7 +21190,7 @@
@@ -1475,13 +1430,12 @@ index 6f9b13e..08aaafd 100644
"cli_metavar" : "INT",
"default" : 0,
--
-2.21.0
-
+2.21.1
-From 84fac58baf86da0536afb6e01f33cff5007bb4e7 Mon Sep 17 00:00:00 2001
+From 799fc53a7d6503d76452617998da0a936527116c Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
-Subject: [PATCH 47/71] ipaclient/install/client.py: Change branding to IPA and
+Subject: [PATCH 47/78] ipaclient/install/client.py: Change branding to IPA and
Identity Management
---
@@ -1489,10 +1443,10 @@ Subject: [PATCH 47/71] ipaclient/install/client.py: Change branding to IPA and
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ipaclient/install/client.py b/ipaclient/install/client.py
-index cc830f1..070b14d 100644
+index 34b2d1a6e..d3bffb05f 100644
--- a/ipaclient/install/client.py
+++ b/ipaclient/install/client.py
-@@ -2034,7 +2034,7 @@ def install_check(options):
+@@ -2033,7 +2033,7 @@ def install_check(options):
global client_domain
global cli_basedn
@@ -1502,13 +1456,12 @@ index cc830f1..070b14d 100644
print("")
--
-2.21.0
-
+2.21.1
-From f72a60a224057254d9b213b9b6b451d8e4a408a5 Mon Sep 17 00:00:00 2001
+From 2c5f5f196ec959eed754b0966fc80daa1d1b6ff7 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:40 +0300
-Subject: [PATCH 48/71] ipaclient/remote_plugins/2_114/otptoken.py: Change
+Subject: [PATCH 48/78] ipaclient/remote_plugins/2_114/otptoken.py: Change
branding to IPA and Identity Management
---
@@ -1516,7 +1469,7 @@ Subject: [PATCH 48/71] ipaclient/remote_plugins/2_114/otptoken.py: Change
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ipaclient/remote_plugins/2_114/otptoken.py b/ipaclient/remote_plugins/2_114/otptoken.py
-index 632c97e..d3edb58 100644
+index 632c97ea2..d3edb589d 100644
--- a/ipaclient/remote_plugins/2_114/otptoken.py
+++ b/ipaclient/remote_plugins/2_114/otptoken.py
@@ -132,7 +132,7 @@ class otptoken(Object):
@@ -1547,13 +1500,12 @@ index 632c97e..d3edb58 100644
),
parameters.Int(
--
-2.21.0
+2.21.1
-
-From ef8b9e9e9028202d0018ac6d36e5110cfc64763f Mon Sep 17 00:00:00 2001
+From 521d5c9ebee2fe4df8650ebdc53b91d25232d631 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
-Subject: [PATCH 49/71] ipaclient/remote_plugins/2_156/otptoken.py: Change
+Subject: [PATCH 49/78] ipaclient/remote_plugins/2_156/otptoken.py: Change
branding to IPA and Identity Management
---
@@ -1561,7 +1513,7 @@ Subject: [PATCH 49/71] ipaclient/remote_plugins/2_156/otptoken.py: Change
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ipaclient/remote_plugins/2_156/otptoken.py b/ipaclient/remote_plugins/2_156/otptoken.py
-index 0b2b54c..e674d46 100644
+index 0b2b54c6e..e674d465d 100644
--- a/ipaclient/remote_plugins/2_156/otptoken.py
+++ b/ipaclient/remote_plugins/2_156/otptoken.py
@@ -132,7 +132,7 @@ class otptoken(Object):
@@ -1592,13 +1544,12 @@ index 0b2b54c..e674d46 100644
),
parameters.Int(
--
-2.21.0
-
+2.21.1
-From bc987f5b22040e2941e4a6f146929f53d20c54d2 Mon Sep 17 00:00:00 2001
+From 0a29cb7c05dfc8a75afdbdadcb9c7a67e9e90b50 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
-Subject: [PATCH 50/71] ipaclient/remote_plugins/2_164/otptoken.py: Change
+Subject: [PATCH 50/78] ipaclient/remote_plugins/2_164/otptoken.py: Change
branding to IPA and Identity Management
---
@@ -1606,7 +1557,7 @@ Subject: [PATCH 50/71] ipaclient/remote_plugins/2_164/otptoken.py: Change
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ipaclient/remote_plugins/2_164/otptoken.py b/ipaclient/remote_plugins/2_164/otptoken.py
-index 0b2b54c..e674d46 100644
+index 0b2b54c6e..e674d465d 100644
--- a/ipaclient/remote_plugins/2_164/otptoken.py
+++ b/ipaclient/remote_plugins/2_164/otptoken.py
@@ -132,7 +132,7 @@ class otptoken(Object):
@@ -1637,13 +1588,12 @@ index 0b2b54c..e674d46 100644
),
parameters.Int(
--
-2.21.0
+2.21.1
-
-From 5b4bebe15eb2604e63a02c90258423560e47791e Mon Sep 17 00:00:00 2001
+From fec6eff7f15ff4ae4bf28d816ca4b231f77b15ca Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
-Subject: [PATCH 51/71] ipalib/pkcs10.py: Change branding to IPA and Identity
+Subject: [PATCH 51/78] ipalib/pkcs10.py: Change branding to IPA and Identity
Management
---
@@ -1651,7 +1601,7 @@ Subject: [PATCH 51/71] ipalib/pkcs10.py: Change branding to IPA and Identity
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ipalib/pkcs10.py b/ipalib/pkcs10.py
-index 2756c85..590ce07 100644
+index 2756c8568..590ce0757 100644
--- a/ipalib/pkcs10.py
+++ b/ipalib/pkcs10.py
@@ -2,7 +2,7 @@ from __future__ import print_function
@@ -1664,13 +1614,12 @@ index 2756c85..590ce07 100644
file=sys.stderr
)
--
-2.21.0
-
+2.21.1
-From 4157915ff75752341ddca82bef5f2eefbf4b1d24 Mon Sep 17 00:00:00 2001
+From e364a5187b1a49ea81653f5282825485a58827df Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
-Subject: [PATCH 52/71] ipalib/rpc.py: Change branding to IPA and Identity
+Subject: [PATCH 52/78] ipalib/rpc.py: Change branding to IPA and Identity
Management
---
@@ -1678,7 +1627,7 @@ Subject: [PATCH 52/71] ipalib/rpc.py: Change branding to IPA and Identity
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ipalib/rpc.py b/ipalib/rpc.py
-index 1ef0f5e..f1be905 100644
+index 1ef0f5e95..f1be90522 100644
--- a/ipalib/rpc.py
+++ b/ipalib/rpc.py
@@ -284,7 +284,7 @@ class _JSONPrimer(dict):
@@ -1691,13 +1640,12 @@ index 1ef0f5e..f1be905 100644
The primer uses a couple of tricks to archive maximum performance:
--
-2.21.0
+2.21.1
-
-From 6f853361b23d986c0048d9e7e60460732484dbd0 Mon Sep 17 00:00:00 2001
+From e1367d8a71cd5d1aa0f57793238577fa69324594 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
-Subject: [PATCH 53/71] ipalib/util.py: Change branding to IPA and Identity
+Subject: [PATCH 53/78] ipalib/util.py: Change branding to IPA and Identity
Management
---
@@ -1705,7 +1653,7 @@ Subject: [PATCH 53/71] ipalib/util.py: Change branding to IPA and Identity
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ipalib/util.py b/ipalib/util.py
-index fd08d89..62577d7 100644
+index e0c658c51..3378db043 100644
--- a/ipalib/util.py
+++ b/ipalib/util.py
@@ -236,7 +236,7 @@ def normalize_zone(zone):
@@ -1718,13 +1666,12 @@ index fd08d89..62577d7 100644
`ipalib.constants: TLS_VERSIONS, TLS_VERSION_MINIMAL`).
--
-2.21.0
-
+2.21.1
-From 61578b07480f2ba73e5c5e73b270ba69115319e9 Mon Sep 17 00:00:00 2001
+From e980e233c6c48fe2ebc8d10f5bd18db5dea6ff94 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
-Subject: [PATCH 54/71] ipalib/x509.py: Change branding to IPA and Identity
+Subject: [PATCH 54/78] ipalib/x509.py: Change branding to IPA and Identity
Management
---
@@ -1732,7 +1679,7 @@ Subject: [PATCH 54/71] ipalib/x509.py: Change branding to IPA and Identity
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ipalib/x509.py b/ipalib/x509.py
-index 1f612a3..dfe66e1 100644
+index 1f612a379..dfe66e1b4 100644
--- a/ipalib/x509.py
+++ b/ipalib/x509.py
@@ -88,7 +88,7 @@ SAN_KRB5PRINCIPALNAME = '1.3.6.1.5.2.2'
@@ -1745,13 +1692,12 @@ index 1f612a3..dfe66e1 100644
def __init__(self, cert, backend=None):
"""
--
-2.21.0
+2.21.1
-
-From cf108de27c35652d0678c6f3fbc8967be6a083d8 Mon Sep 17 00:00:00 2001
+From 38ca6711b3cb6c24c9ae16e172339a680613f2af Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
-Subject: [PATCH 55/71] ipaserver/advise/plugins/legacy_clients.py: Change
+Subject: [PATCH 55/78] ipaserver/advise/plugins/legacy_clients.py: Change
branding to IPA and Identity Management
---
@@ -1759,7 +1705,7 @@ Subject: [PATCH 55/71] ipaserver/advise/plugins/legacy_clients.py: Change
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/ipaserver/advise/plugins/legacy_clients.py b/ipaserver/advise/plugins/legacy_clients.py
-index 2a56922..0e322fe 100644
+index 2a56922b8..0e322fe96 100644
--- a/ipaserver/advise/plugins/legacy_clients.py
+++ b/ipaserver/advise/plugins/legacy_clients.py
@@ -94,7 +94,7 @@ class config_redhat_sssd_before_1_9(config_base_legacy_client):
@@ -1799,13 +1745,12 @@ index 2a56922..0e322fe 100644
'are all Red Hat based platforms.')
--
-2.21.0
-
+2.21.1
-From a8736b1b82bba093c72eb4a142c860c547a0e4b0 Mon Sep 17 00:00:00 2001
+From f6fa8b8edd7a4123cf3f409c169e4eee12a3ed3c Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
-Subject: [PATCH 56/71] ipaserver/advise/plugins/smart_card_auth.py: Change
+Subject: [PATCH 56/78] ipaserver/advise/plugins/smart_card_auth.py: Change
branding to IPA and Identity Management
---
@@ -1813,7 +1758,7 @@ Subject: [PATCH 56/71] ipaserver/advise/plugins/smart_card_auth.py: Change
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ipaserver/advise/plugins/smart_card_auth.py b/ipaserver/advise/plugins/smart_card_auth.py
-index c43c74e..ce50cec 100644
+index c43c74e5b..ce50cec83 100644
--- a/ipaserver/advise/plugins/smart_card_auth.py
+++ b/ipaserver/advise/plugins/smart_card_auth.py
@@ -97,7 +97,7 @@ class config_server_for_smart_card_auth(common_smart_card_auth_config):
@@ -1840,13 +1785,12 @@ index c43c74e..ce50cec 100644
"allow smart card logins to desktop")
--
-2.21.0
-
+2.21.1
-From 2f35de8549d671caa36cccdf037bcc1c6382c812 Mon Sep 17 00:00:00 2001
+From 4b528a73ed9d914997f8e7ed44076211e6fef239 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
-Subject: [PATCH 57/71] ipaserver/install/dns.py: Change branding to IPA and
+Subject: [PATCH 57/78] ipaserver/install/dns.py: Change branding to IPA and
Identity Management
---
@@ -1854,10 +1798,10 @@ Subject: [PATCH 57/71] ipaserver/install/dns.py: Change branding to IPA and
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ipaserver/install/dns.py b/ipaserver/install/dns.py
-index 40688dc..2a130ab 100644
+index 9f08e86f9..7d6d7fe7c 100644
--- a/ipaserver/install/dns.py
+++ b/ipaserver/install/dns.py
-@@ -149,7 +149,7 @@ def install_check(standalone, api, replica, options, hostname):
+@@ -151,7 +151,7 @@ def install_check(standalone, api, replica, options, hostname):
if standalone:
print("==============================================================================")
@@ -1867,13 +1811,12 @@ index 40688dc..2a130ab 100644
print("This includes:")
print(" * Configure DNS (bind)")
--
-2.21.0
+2.21.1
-
-From a45b1e44bb8307dba6bbf32e677f7b7424205830 Mon Sep 17 00:00:00 2001
+From b4bf196e8f7eb5193d5be111820b9b9d13b7c25c Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
-Subject: [PATCH 58/71] ipaserver/install/ipa_kra_install.py: Change branding
+Subject: [PATCH 58/78] ipaserver/install/ipa_kra_install.py: Change branding
to IPA and Identity Management
---
@@ -1881,7 +1824,7 @@ Subject: [PATCH 58/71] ipaserver/install/ipa_kra_install.py: Change branding
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ipaserver/install/ipa_kra_install.py b/ipaserver/install/ipa_kra_install.py
-index 2d6e4bf..076c206 100644
+index 2d6e4bf09..076c20666 100644
--- a/ipaserver/install/ipa_kra_install.py
+++ b/ipaserver/install/ipa_kra_install.py
@@ -93,7 +93,7 @@ class KRAInstall(admintool.AdminTool):
@@ -1903,13 +1846,12 @@ index 2d6e4bf..076c206 100644
'''
--
-2.21.0
-
+2.21.1
-From 29661374a56cc16c3d707aca0c3fbe01d7ad7dee Mon Sep 17 00:00:00 2001
+From 2831a3d84888547b38803681019f9f5bdfb34b2e Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
-Subject: [PATCH 59/71] ipaserver/install/plugins/dns.py: Change branding to
+Subject: [PATCH 59/78] ipaserver/install/plugins/dns.py: Change branding to
IPA and Identity Management
---
@@ -1917,7 +1859,7 @@ Subject: [PATCH 59/71] ipaserver/install/plugins/dns.py: Change branding to
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/ipaserver/install/plugins/dns.py b/ipaserver/install/plugins/dns.py
-index baa19c3..a7a1748 100644
+index baa19c38e..a7a1748d9 100644
--- a/ipaserver/install/plugins/dns.py
+++ b/ipaserver/install/plugins/dns.py
@@ -161,11 +161,11 @@ class update_ipaconfigstring_dnsversion_to_ipadnsversion(Updater):
@@ -1962,13 +1904,12 @@ index baa19c3..a7a1748 100644
"""
backup_filename = u'dns-forwarding-empty-zones-%Y-%m-%d-%H-%M-%S.ldif'
--
-2.21.0
+2.21.1
-
-From ed41c0d8c9d782e4610837f9dbacb9d64fbecc65 Mon Sep 17 00:00:00 2001
+From 76ae883950cbe20c50f456ddc7d24d209d78232e Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
-Subject: [PATCH 60/71] ipaserver/install/replication.py: Change branding to
+Subject: [PATCH 60/78] ipaserver/install/replication.py: Change branding to
IPA and Identity Management
---
@@ -1976,7 +1917,7 @@ Subject: [PATCH 60/71] ipaserver/install/replication.py: Change branding to
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py
-index 1fefe3e..87794b7 100644
+index 1fefe3ebf..87794b7f4 100644
--- a/ipaserver/install/replication.py
+++ b/ipaserver/install/replication.py
@@ -1760,7 +1760,7 @@ class ReplicationManager:
@@ -1989,13 +1930,12 @@ index 1fefe3e..87794b7 100644
"""
my_dn = DN(
--
-2.21.0
-
+2.21.1
-From 9289815fa14bfa2ff3ff0a57031b4c7588c6a2f2 Mon Sep 17 00:00:00 2001
+From 4324a4f3653d3322ef75406b0b9b2cd68fb17995 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
-Subject: [PATCH 61/71] ipaserver/install/server/install.py: Change branding to
+Subject: [PATCH 61/78] ipaserver/install/server/install.py: Change branding to
IPA and Identity Management
---
@@ -2003,10 +1943,10 @@ Subject: [PATCH 61/71] ipaserver/install/server/install.py: Change branding to
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ipaserver/install/server/install.py b/ipaserver/install/server/install.py
-index 7cdf2a5..f7e9f88 100644
+index afce0d73a..b62c08baa 100644
--- a/ipaserver/install/server/install.py
+++ b/ipaserver/install/server/install.py
-@@ -393,7 +393,7 @@ def install_check(installer):
+@@ -414,7 +414,7 @@ def install_check(installer):
print("======================================="
"=======================================")
@@ -2016,13 +1956,12 @@ index 7cdf2a5..f7e9f88 100644
print("")
print("This includes:")
--
-2.21.0
+2.21.1
-
-From 8c6d244de87c7c3bcfc4660921738efcdeaf17de Mon Sep 17 00:00:00 2001
+From 55b2630e53494d831fb65a0c520aabe1c895b13d Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
-Subject: [PATCH 62/71] ipaserver/install/server/replicainstall.py: Change
+Subject: [PATCH 62/78] ipaserver/install/server/replicainstall.py: Change
branding to IPA and Identity Management
---
@@ -2030,7 +1969,7 @@ Subject: [PATCH 62/71] ipaserver/install/server/replicainstall.py: Change
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py
-index 536f0db..3fb8b3f 100644
+index 71ea091a3..0ea48f18e 100644
--- a/ipaserver/install/server/replicainstall.py
+++ b/ipaserver/install/server/replicainstall.py
@@ -619,7 +619,7 @@ def check_domain_level_is_supported(current):
@@ -2043,13 +1982,12 @@ index 536f0db..3fb8b3f 100644
"this domain. The Domain Level needs to be "
"raised before installing a replica with "
--
-2.21.0
-
+2.21.1
-From a328d3c6e5ed88d6a5461448952672c4fb0d6956 Mon Sep 17 00:00:00 2001
+From 649e159570278e417922a68e23c2fc44ef6eeb44 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
-Subject: [PATCH 63/71] ipaserver/plugins/certmap.py: Change branding to IPA
+Subject: [PATCH 63/78] ipaserver/plugins/certmap.py: Change branding to IPA
and Identity Management
---
@@ -2057,7 +1995,7 @@ Subject: [PATCH 63/71] ipaserver/plugins/certmap.py: Change branding to IPA
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ipaserver/plugins/certmap.py b/ipaserver/plugins/certmap.py
-index ee8f0c1..cdbc38f 100644
+index ee8f0c15f..cdbc38f70 100644
--- a/ipaserver/plugins/certmap.py
+++ b/ipaserver/plugins/certmap.py
@@ -614,7 +614,7 @@ class certmap_match(Search):
@@ -2070,13 +2008,12 @@ index ee8f0c1..cdbc38f 100644
"""
sssd = _sssd()
--
-2.21.0
+2.21.1
-
-From 278276fed26cf350ffa81aea4abb46dc6c26b781 Mon Sep 17 00:00:00 2001
+From 926ce56e094b8b54c10d867d9c1150d73af088f5 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
-Subject: [PATCH 64/71] ipaserver/plugins/otptoken.py: Change branding to IPA
+Subject: [PATCH 64/78] ipaserver/plugins/otptoken.py: Change branding to IPA
and Identity Management
---
@@ -2084,7 +2021,7 @@ Subject: [PATCH 64/71] ipaserver/plugins/otptoken.py: Change branding to IPA
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ipaserver/plugins/otptoken.py b/ipaserver/plugins/otptoken.py
-index 72ed539..46e4d5e 100644
+index 72ed5393d..46e4d5e8d 100644
--- a/ipaserver/plugins/otptoken.py
+++ b/ipaserver/plugins/otptoken.py
@@ -245,7 +245,7 @@ class otptoken(LDAPObject):
@@ -2097,13 +2034,12 @@ index 72ed539..46e4d5e 100644
autofill=True,
flags=('no_update'),
--
-2.21.0
-
+2.21.1
-From a172851e990fee8b6749c7edbf8bc56be425b492 Mon Sep 17 00:00:00 2001
+From aaa3824fd7e96be447529183033aa37cad016264 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
-Subject: [PATCH 65/71] ipaserver/plugins/sudorule.py: Change branding to IPA
+Subject: [PATCH 65/78] ipaserver/plugins/sudorule.py: Change branding to IPA
and Identity Management
---
@@ -2111,7 +2047,7 @@ Subject: [PATCH 65/71] ipaserver/plugins/sudorule.py: Change branding to IPA
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ipaserver/plugins/sudorule.py b/ipaserver/plugins/sudorule.py
-index 6432159..68baa01 100644
+index 643215985..68baa0174 100644
--- a/ipaserver/plugins/sudorule.py
+++ b/ipaserver/plugins/sudorule.py
@@ -47,7 +47,7 @@ give certain users (or groups of users) the ability to run some (or all)
@@ -2133,13 +2069,12 @@ index 6432159..68baa01 100644
""") + _("""
To enable the binddn run the following command to set the password:
--
-2.21.0
+2.21.1
-
-From b6c8cfacbb786cd91dd025545cb142fb409e8d34 Mon Sep 17 00:00:00 2001
+From 4285adc257bfdf7eb836c4bfdb61a8e34aa0e87d Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
-Subject: [PATCH 66/71] po/de.po: Change branding to IPA and Identity
+Subject: [PATCH 66/78] po/de.po: Change branding to IPA and Identity
Management
---
@@ -2147,10 +2082,10 @@ Subject: [PATCH 66/71] po/de.po: Change branding to IPA and Identity
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/po/de.po b/po/de.po
-index 78b7cb6..5146ca4 100644
+index 8f9c2209b..95626fc68 100644
--- a/po/de.po
+++ b/po/de.po
-@@ -3672,7 +3672,7 @@ msgstr "TOTP Sychnronisierungsfenster"
+@@ -3668,7 +3668,7 @@ msgstr "TOTP Sychnronisierungsfenster"
msgid "TOTP authentication Window"
msgstr "TOTP Authentifizierungsfenster"
@@ -2160,13 +2095,12 @@ index 78b7cb6..5146ca4 100644
msgid "Target"
--
-2.21.0
-
+2.21.1
-From aa73ce7826017703a4b1737bd0b445d011827a8e Mon Sep 17 00:00:00 2001
+From 68b461d299352e515457ff2ef8a40d82afc35bc0 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
-Subject: [PATCH 67/71] po/es.po: Change branding to IPA and Identity
+Subject: [PATCH 67/78] po/es.po: Change branding to IPA and Identity
Management
---
@@ -2174,10 +2108,10 @@ Subject: [PATCH 67/71] po/es.po: Change branding to IPA and Identity
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/po/es.po b/po/es.po
-index bd7aa1f..31437e7 100644
+index b9e9fc126..6970d31f5 100644
--- a/po/es.po
+++ b/po/es.po
-@@ -3363,7 +3363,7 @@ msgid ""
+@@ -3101,7 +3101,7 @@ msgid ""
"The profile configuration format is the raw property-list format\n"
"used by Dogtag Certificate System. The XML format is not supported.\n"
"\n"
@@ -2186,7 +2120,7 @@ index bd7aa1f..31437e7 100644
"\n"
"- When importing a profile the \"profileId\" field, if present, must\n"
" match the ID given on the command line.\n"
-@@ -3421,7 +3421,7 @@ msgstr ""
+@@ -3159,7 +3159,7 @@ msgstr ""
"propiedad\n"
"usado por Dogtag Certificate System. No está soportado el formato XML.\n"
"\n"
@@ -2195,7 +2129,7 @@ index bd7aa1f..31437e7 100644
"restricciones:\n"
"\n"
"- Cuando se importa un perfil el campo \"profileId\", si está presente, debe "
-@@ -4988,7 +4988,7 @@ msgid ""
+@@ -4948,7 +4948,7 @@ msgid ""
"commands as root or another user while providing an audit trail of the\n"
"commands and their arguments.\n"
"\n"
@@ -2204,7 +2138,7 @@ index bd7aa1f..31437e7 100644
" Users: The user(s)/group(s) allowed to invoke Sudo.\n"
" Hosts: The host(s)/hostgroup(s) which the user is allowed to to invoke "
"Sudo.\n"
-@@ -5003,7 +5003,7 @@ msgid ""
+@@ -4963,7 +4963,7 @@ msgid ""
"are evaluated (if the client supports it). This order is an integer and\n"
"must be unique.\n"
"\n"
@@ -2213,7 +2147,7 @@ index bd7aa1f..31437e7 100644
"uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
"\n"
"To enable the binddn run the following command to set the password:\n"
-@@ -5011,7 +5011,7 @@ msgid ""
+@@ -4971,7 +4971,7 @@ msgid ""
"ZZ -D \"cn=Directory Manager\" uid=sudo,cn=sysaccounts,cn=etc,dc=example,"
"dc=com\n"
"\n"
@@ -2222,7 +2156,7 @@ index bd7aa1f..31437e7 100644
msgstr ""
"\n"
"Reglas Sudo\n"
-@@ -5024,7 +5024,7 @@ msgstr ""
+@@ -4984,7 +4984,7 @@ msgstr ""
"auditoria de\n"
" los comandos y sus argumentos.\n"
"\n"
@@ -2231,7 +2165,7 @@ index bd7aa1f..31437e7 100644
" Users: Los usuario(s)/grupos(s) que tienen permitido llamar a Sudo.\n"
" Hosts: Loshost(s)/grupo(s) de host a los que el usuario permite llamar a "
"Sudo.\n"
-@@ -5042,7 +5042,7 @@ msgstr ""
+@@ -5002,7 +5002,7 @@ msgstr ""
"será evaluada\n"
"(si el cliente lo soporta). Este orden es un entero y debe ser único.\n"
"\n"
@@ -2240,7 +2174,7 @@ index bd7aa1f..31437e7 100644
"uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
"\n"
"Para habilitar el binddn ejecute el siguiente comando para fijar la "
-@@ -5051,7 +5051,7 @@ msgstr ""
+@@ -5011,7 +5011,7 @@ msgstr ""
"ZZ -D \"cn=Directory Manager\" uid=sudo,cn=sysaccounts,cn=etc,dc=example,"
"dc=com\n"
"\n"
@@ -2249,7 +2183,7 @@ index bd7aa1f..31437e7 100644
msgid ""
"\n"
-@@ -12345,8 +12345,8 @@ msgstr "Variación del tiempo de autenticación TOTP (segundos)"
+@@ -12742,8 +12742,8 @@ msgstr "Variación del tiempo de autenticación TOTP (segundos)"
msgid "TOTP synchronization time variance (seconds)"
msgstr "Variación del tiempo de sincronización TOTP (segundos)"
@@ -2261,13 +2195,12 @@ index bd7aa1f..31437e7 100644
msgid "Take a revoked certificate off hold."
msgstr "Tomar un certificado revocado de espera."
--
-2.21.0
+2.21.1
-
-From b61cae363c082c6ef850c00753cc2475b71093c0 Mon Sep 17 00:00:00 2001
+From 1d49558b613ae9f1c763e3108166b47a59b743be Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
-Subject: [PATCH 68/71] po/fr.po: Change branding to IPA and Identity
+Subject: [PATCH 68/78] po/fr.po: Change branding to IPA and Identity
Management
---
@@ -2275,7 +2208,7 @@ Subject: [PATCH 68/71] po/fr.po: Change branding to IPA and Identity
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/po/fr.po b/po/fr.po
-index 1a4389b..e124a64 100644
+index 88253e172..23a4ba3ea 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2575,17 +2575,17 @@ msgstr ""
@@ -2326,7 +2259,7 @@ index 1a4389b..e124a64 100644
"\n"
"- Lors de l'import d'un profil, le champ « profileId » s'il est présent "
"doit\n"
-@@ -15663,8 +15663,8 @@ msgstr "Durée de la fenêtre d'authentification TOTP (secondes)"
+@@ -15658,8 +15658,8 @@ msgstr "Durée de la fenêtre d'authentification TOTP (secondes)"
msgid "TOTP synchronization time variance (seconds)"
msgstr "Variance temporelle de synchronisation TOTP (secondes)"
@@ -2338,13 +2271,12 @@ index 1a4389b..e124a64 100644
msgid "TSIG record"
msgstr "Enregistrement TSIG"
--
-2.21.0
-
+2.21.1
-From 1954de803b6616d885ef0f37530b78b8e6e5b490 Mon Sep 17 00:00:00 2001
+From 28d5217ccc838e037f60dbdfce72ae0eaa1fbdd8 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
-Subject: [PATCH 69/71] po/ru.po: Change branding to IPA and Identity
+Subject: [PATCH 69/78] po/ru.po: Change branding to IPA and Identity
Management
---
@@ -2352,10 +2284,10 @@ Subject: [PATCH 69/71] po/ru.po: Change branding to IPA and Identity
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/po/ru.po b/po/ru.po
-index 4bb68b8..560ead0 100644
+index 7d663a7a8..699979b74 100644
--- a/po/ru.po
+++ b/po/ru.po
-@@ -5310,17 +5310,17 @@ msgstr ""
+@@ -5308,17 +5308,17 @@ msgstr ""
msgid ""
"\n"
@@ -2376,7 +2308,7 @@ index 4bb68b8..560ead0 100644
" Users: The user(s)/group(s) allowed to invoke Sudo.\n"
" Hosts: The host(s)/hostgroup(s) which the user is allowed to to invoke "
"Sudo.\n"
-@@ -5332,7 +5332,7 @@ msgid ""
+@@ -5330,7 +5330,7 @@ msgid ""
" Options: The various Sudoers Options that can modify Sudo's behavior.\n"
msgstr ""
"\n"
@@ -2385,7 +2317,7 @@ index 4bb68b8..560ead0 100644
" Users: пользователь (пользователи) или группа (группы), которые могут "
"вызывать Sudo.\n"
" Hosts: узел (узлы) или группа (группы) узлов, пользователи которых могут "
-@@ -8770,7 +8770,7 @@ msgid ""
+@@ -7826,7 +7826,7 @@ msgid ""
"The profile configuration format is the raw property-list format\n"
"used by Dogtag Certificate System. The XML format is not supported.\n"
"\n"
@@ -2394,7 +2326,7 @@ index 4bb68b8..560ead0 100644
"\n"
"- When importing a profile the \"profileId\" field, if present, must\n"
" match the ID given on the command line.\n"
-@@ -8824,7 +8824,7 @@ msgstr ""
+@@ -7880,7 +7880,7 @@ msgstr ""
"свойств, который используется системой сертификации Dogtag Certificate "
"System. Поддержка формата XML не предусмотрена.\n"
"\n"
@@ -2403,7 +2335,7 @@ index 4bb68b8..560ead0 100644
"\n"
"- При импорте профиля значение поля \"profileId\", если это поле имеется, "
"должно совпадать с идентификатором, указанным в командной строке.\n"
-@@ -8880,7 +8880,7 @@ msgid ""
+@@ -7936,7 +7936,7 @@ msgid ""
"The profile configuration format is the raw property-list format\n"
"used by Dogtag Certificate System. The XML format is not supported.\n"
"\n"
@@ -2412,7 +2344,7 @@ index 4bb68b8..560ead0 100644
"\n"
"- When importing a profile the \"profileId\" field, if present, must\n"
" match the ID given on the command line.\n"
-@@ -8936,7 +8936,7 @@ msgstr ""
+@@ -7992,7 +7992,7 @@ msgstr ""
"свойств, который используется системой сертификации Dogtag Certificate "
"System. Поддержка формата XML не предусмотрена.\n"
"\n"
@@ -2421,7 +2353,7 @@ index 4bb68b8..560ead0 100644
"\n"
"- При импорте профиля значение поля \"profileId\", если это поле имеется, "
"должно совпадать с идентификатором, указанным в командной строке.\n"
-@@ -14207,7 +14207,7 @@ msgid ""
+@@ -13772,7 +13772,7 @@ msgid ""
"commands as root or another user while providing an audit trail of the\n"
"commands and their arguments.\n"
"\n"
@@ -2430,7 +2362,7 @@ index 4bb68b8..560ead0 100644
" Users: The user(s)/group(s) allowed to invoke Sudo.\n"
" Hosts: The host(s)/hostgroup(s) which the user is allowed to to invoke "
"Sudo.\n"
-@@ -14222,7 +14222,7 @@ msgid ""
+@@ -13787,7 +13787,7 @@ msgid ""
"are evaluated (if the client supports it). This order is an integer and\n"
"must be unique.\n"
"\n"
@@ -2439,7 +2371,7 @@ index 4bb68b8..560ead0 100644
"uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
"\n"
"To enable the binddn run the following command to set the password:\n"
-@@ -14260,7 +14260,7 @@ msgstr ""
+@@ -13825,7 +13825,7 @@ msgstr ""
"пользователя \"root\" или другого пользователя, вместе с тем предоставляя "
"журнал аудита команд и их аргументов.\n"
"\n"
@@ -2448,7 +2380,7 @@ index 4bb68b8..560ead0 100644
" Users: пользователь (пользователи) или группа (группы), которые могут "
"вызывать Sudo.\n"
" Hosts: узел (узлы) или группа (группы) узлов, пользователи которых могут "
-@@ -14281,7 +14281,7 @@ msgstr ""
+@@ -13846,7 +13846,7 @@ msgstr ""
"Порядок определяется числовым индексом (целое число), который не должен "
"повторяться.\n"
"\n"
@@ -2457,7 +2389,7 @@ index 4bb68b8..560ead0 100644
"Sudo:\n"
"uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
"\n"
-@@ -14322,7 +14322,7 @@ msgid ""
+@@ -13887,7 +13887,7 @@ msgid ""
"commands as root or another user while providing an audit trail of the\n"
"commands and their arguments.\n"
"\n"
@@ -2466,7 +2398,7 @@ index 4bb68b8..560ead0 100644
" Users: The user(s)/group(s) allowed to invoke Sudo.\n"
" Hosts: The host(s)/hostgroup(s) which the user is allowed to to invoke "
"Sudo.\n"
-@@ -14337,7 +14337,7 @@ msgid ""
+@@ -13902,7 +13902,7 @@ msgid ""
"are evaluated (if the client supports it). This order is an integer and\n"
"must be unique.\n"
"\n"
@@ -2475,7 +2407,7 @@ index 4bb68b8..560ead0 100644
"uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
"\n"
"To enable the binddn run the following command to set the password:\n"
-@@ -14345,7 +14345,7 @@ msgid ""
+@@ -13910,7 +13910,7 @@ msgid ""
"ZZ -D \"cn=Directory Manager\" uid=sudo,cn=sysaccounts,cn=etc,dc=example,"
"dc=com\n"
"\n"
@@ -2484,7 +2416,7 @@ index 4bb68b8..560ead0 100644
msgstr ""
"\n"
"Правила Sudo\n"
-@@ -14356,7 +14356,7 @@ msgstr ""
+@@ -13921,7 +13921,7 @@ msgstr ""
"пользователя \"root\" или другого пользователя, вместе с тем предоставляя "
"журнал аудита команд и их аргументов.\n"
"\n"
@@ -2493,7 +2425,7 @@ index 4bb68b8..560ead0 100644
" Users: пользователь (пользователи) или группа (группы), которые могут "
"вызывать Sudo.\n"
" Hosts: узел (узлы) или группа (группы) узлов, пользователи которых могут "
-@@ -14377,7 +14377,7 @@ msgstr ""
+@@ -13942,7 +13942,7 @@ msgstr ""
"Порядок определяется числовым индексом (целое число), который не должен "
"повторяться.\n"
"\n"
@@ -2502,7 +2434,7 @@ index 4bb68b8..560ead0 100644
"Sudo:\n"
"uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
"\n"
-@@ -14386,7 +14386,7 @@ msgstr ""
+@@ -13951,7 +13951,7 @@ msgstr ""
"ZZ -D \"cn=Directory Manager\" uid=sudo,cn=sysaccounts,cn=etc,dc=example,"
"dc=com\n"
"\n"
@@ -2511,7 +2443,7 @@ index 4bb68b8..560ead0 100644
msgid ""
"\n"
-@@ -27661,8 +27661,8 @@ msgstr "Отклонение по времени TOTP-аутентификаци
+@@ -27252,8 +27252,8 @@ msgstr "Отклонение по времени TOTP-аутентификаци
msgid "TOTP synchronization time variance (seconds)"
msgstr "Отклонение по времени TOTP-синхронизации (в секундах)"
@@ -2523,13 +2455,12 @@ index 4bb68b8..560ead0 100644
msgid "TSIG record"
msgstr "Запись TSIG"
--
-2.21.0
+2.21.1
-
-From ef68c0facb2efbef9a40d02ebb4d9bdc141d16db Mon Sep 17 00:00:00 2001
+From 41e8beb8aa6bcaf48de38b48939fdf40cf8819b5 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
-Subject: [PATCH 70/71] po/uk.po: Change branding to IPA and Identity
+Subject: [PATCH 70/78] po/uk.po: Change branding to IPA and Identity
Management
---
@@ -2537,7 +2468,7 @@ Subject: [PATCH 70/71] po/uk.po: Change branding to IPA and Identity
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/po/uk.po b/po/uk.po
-index 9845500..a1e7ce4 100644
+index a17396796..ca864c8a4 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5403,17 +5403,17 @@ msgstr ""
@@ -2570,7 +2501,7 @@ index 9845500..a1e7ce4 100644
" Users: користувачі або групи, які можуть викликати sudo.\n"
" Hosts: вузли або групи вузлів, користувачі якого можуть викликати sudo.\n"
" Allow Command: специфічні команди, які можна виконувати за допомогою "
-@@ -8915,7 +8915,7 @@ msgid ""
+@@ -7948,7 +7948,7 @@ msgid ""
"The profile configuration format is the raw property-list format\n"
"used by Dogtag Certificate System. The XML format is not supported.\n"
"\n"
@@ -2579,7 +2510,7 @@ index 9845500..a1e7ce4 100644
"\n"
"- When importing a profile the \"profileId\" field, if present, must\n"
" match the ID given on the command line.\n"
-@@ -8969,7 +8969,7 @@ msgstr ""
+@@ -8002,7 +8002,7 @@ msgstr ""
"властивостей, що використовується системою сертифікації Dogtag.\n"
"Підтримки формату XML не передбачено.\n"
"\n"
@@ -2588,7 +2519,7 @@ index 9845500..a1e7ce4 100644
"\n"
"- Під час імпортування профілю поле «profileId», якщо таке є, має\n"
" містити значення, що збігається з ідентифікатором, вказаним у рядку "
-@@ -9026,7 +9026,7 @@ msgid ""
+@@ -8059,7 +8059,7 @@ msgid ""
"The profile configuration format is the raw property-list format\n"
"used by Dogtag Certificate System. The XML format is not supported.\n"
"\n"
@@ -2597,7 +2528,7 @@ index 9845500..a1e7ce4 100644
"\n"
"- When importing a profile the \"profileId\" field, if present, must\n"
" match the ID given on the command line.\n"
-@@ -9081,7 +9081,7 @@ msgstr ""
+@@ -8114,7 +8114,7 @@ msgstr ""
"властивостей, що використовується системою сертифікації Dogtag.\n"
"Підтримки формату XML не передбачено.\n"
"\n"
@@ -2606,7 +2537,7 @@ index 9845500..a1e7ce4 100644
"\n"
"- Під час імпортування профілю поле «profileId», якщо таке є, має\n"
" містити значення, що збігається з ідентифікатором, вказаним у рядку "
-@@ -14469,7 +14469,7 @@ msgid ""
+@@ -13887,7 +13887,7 @@ msgid ""
"commands as root or another user while providing an audit trail of the\n"
"commands and their arguments.\n"
"\n"
@@ -2615,7 +2546,7 @@ index 9845500..a1e7ce4 100644
" Users: The user(s)/group(s) allowed to invoke Sudo.\n"
" Hosts: The host(s)/hostgroup(s) which the user is allowed to to invoke "
"Sudo.\n"
-@@ -14484,7 +14484,7 @@ msgid ""
+@@ -13902,7 +13902,7 @@ msgid ""
"are evaluated (if the client supports it). This order is an integer and\n"
"must be unique.\n"
"\n"
@@ -2624,7 +2555,7 @@ index 9845500..a1e7ce4 100644
"uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
"\n"
"To enable the binddn run the following command to set the password:\n"
-@@ -14522,7 +14522,7 @@ msgstr ""
+@@ -13940,7 +13940,7 @@ msgstr ""
"користувача, зберігаючи водночас журнал виконання команд та\n"
"аргументів.\n"
"\n"
@@ -2633,7 +2564,7 @@ index 9845500..a1e7ce4 100644
" Users: користувачі або групи, які можуть викликати sudo.\n"
" Hosts: вузли або групи вузлів, користувачі якого можуть викликати sudo.\n"
" Allow Command: специфічні команди, які можна виконувати за допомогою "
-@@ -14540,7 +14540,7 @@ msgstr ""
+@@ -13958,7 +13958,7 @@ msgstr ""
"обробки записів (якщо такий порядок передбачено на клієнтському боці).\n"
"Порядок визначається числовим індексом, який не повинен повторюватися.\n"
"\n"
@@ -2642,7 +2573,7 @@ index 9845500..a1e7ce4 100644
"розташовано у\n"
"uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
"\n"
-@@ -14580,7 +14580,7 @@ msgid ""
+@@ -13998,7 +13998,7 @@ msgid ""
"commands as root or another user while providing an audit trail of the\n"
"commands and their arguments.\n"
"\n"
@@ -2651,7 +2582,7 @@ index 9845500..a1e7ce4 100644
" Users: The user(s)/group(s) allowed to invoke Sudo.\n"
" Hosts: The host(s)/hostgroup(s) which the user is allowed to to invoke "
"Sudo.\n"
-@@ -14595,7 +14595,7 @@ msgid ""
+@@ -14013,7 +14013,7 @@ msgid ""
"are evaluated (if the client supports it). This order is an integer and\n"
"must be unique.\n"
"\n"
@@ -2660,7 +2591,7 @@ index 9845500..a1e7ce4 100644
"uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
"\n"
"To enable the binddn run the following command to set the password:\n"
-@@ -14603,7 +14603,7 @@ msgid ""
+@@ -14021,7 +14021,7 @@ msgid ""
"ZZ -D \"cn=Directory Manager\" uid=sudo,cn=sysaccounts,cn=etc,dc=example,"
"dc=com\n"
"\n"
@@ -2669,7 +2600,7 @@ index 9845500..a1e7ce4 100644
msgstr ""
"\n"
"Правила sudo\n"
-@@ -14614,7 +14614,7 @@ msgstr ""
+@@ -14032,7 +14032,7 @@ msgstr ""
"користувача, зберігаючи водночас журнал виконання команд та\n"
"аргументів.\n"
"\n"
@@ -2678,7 +2609,7 @@ index 9845500..a1e7ce4 100644
" Users: користувачі або групи, які можуть викликати sudo.\n"
" Hosts: вузли або групи вузлів, користувачі якого можуть викликати sudo.\n"
" Allow Command: специфічні команди, які можна виконувати за допомогою "
-@@ -14632,7 +14632,7 @@ msgstr ""
+@@ -14050,7 +14050,7 @@ msgstr ""
"обробки записів (якщо такий порядок передбачено на клієнтському боці).\n"
"Порядок визначається числовим індексом, який не повинен повторюватися.\n"
"\n"
@@ -2687,7 +2618,7 @@ index 9845500..a1e7ce4 100644
"розташовано у\n"
"uid=sudo,cn=sysaccounts,cn=etc,dc=example,dc=com\n"
"\n"
-@@ -14641,7 +14641,7 @@ msgstr ""
+@@ -14059,7 +14059,7 @@ msgstr ""
"ZZ -D \"cn=Directory Manager\" uid=sudo,cn=sysaccounts,cn=etc,dc=example,"
"dc=com\n"
"\n"
@@ -2696,7 +2627,7 @@ index 9845500..a1e7ce4 100644
msgid ""
"\n"
-@@ -27982,8 +27982,8 @@ msgstr "Відхилення часу розпізнавання TOTP (у сек
+@@ -27264,8 +27264,8 @@ msgstr "Відхилення часу розпізнавання TOTP (у сек
msgid "TOTP synchronization time variance (seconds)"
msgstr "Відхилення часу синхронізації TOTP (у секундах)"
@@ -2708,13 +2639,12 @@ index 9845500..a1e7ce4 100644
msgid "TSIG record"
msgstr "Запис TSIG"
--
-2.21.0
-
+2.21.1
-From a1cb6d13c461f4d67c1efe7f1927e47de5619097 Mon Sep 17 00:00:00 2001
+From 703f4aa1ba942db3f614190de1dc291216d20e86 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sun, 7 Oct 2018 12:25:41 +0300
-Subject: [PATCH 71/71] po/zh_CN.po: Change branding to IPA and Identity
+Subject: [PATCH 71/78] po/zh_CN.po: Change branding to IPA and Identity
Management
---
@@ -2722,7 +2652,7 @@ Subject: [PATCH 71/71] po/zh_CN.po: Change branding to IPA and Identity
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/po/zh_CN.po b/po/zh_CN.po
-index 30e707d..e9eabce 100644
+index dec79967d..bc2269701 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -298,7 +298,7 @@ msgstr ""
@@ -2743,7 +2673,7 @@ index 30e707d..e9eabce 100644
" 用户：用户/用户组允许调用Sudo。\n"
" 主机：主机/主机组上的用户允许调用Sudo。\n"
" 允许的命令：指定命令允许通过Sudo来运行。\n"
-@@ -9928,8 +9928,8 @@ msgstr "TOTP认证时间差异（秒）"
+@@ -9923,8 +9923,8 @@ msgstr "TOTP认证时间差异（秒）"
msgid "TOTP synchronization time variance (seconds)"
msgstr "TOTP同步时间差异（秒）"
@@ -2755,5 +2685,222 @@ index 30e707d..e9eabce 100644
msgid "TSIG record"
msgstr "TSIG记录"
--
-2.21.0
+2.21.1
+
+From 51756934d7214104a0da2a5a57d74194ecb054c9 Mon Sep 17 00:00:00 2001
+From: Thomas Woerner <twoerner@redhat.com>
+Date: Fri, 3 Apr 2020 14:27:35 +0200
+Subject: [PATCH 72/78] client/man/ipa-client-samba.1: Change branding to IPA
+ and Identity Management
+
+---
+ client/man/ipa-client-samba.1 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/client/man/ipa-client-samba.1 b/client/man/ipa-client-samba.1
+index ea83715ff..5ed6c7150 100644
+--- a/client/man/ipa-client-samba.1
++++ b/client/man/ipa-client-samba.1
+@@ -1,7 +1,7 @@
+ .\" A man page for ipa-client-samba
+ .\" Copyright (C) 2008-2016 FreeIPA Contributors see COPYING for license
+ .\"
+-.TH "ipa-client-samba" "1" "Jun 10 2019" "FreeIPA" "FreeIPA Manual Pages"
++.TH "ipa-client-samba" "1" "Jun 10 2019" "IPA" "IPA Manual Pages"
+ .SH "NAME"
+ ipa\-client\-samba \- Configure Samba file server on an IPA client
+ .SH "SYNOPSIS"
+@@ -39,7 +39,7 @@ The ipa\-client\-samba script assumes that the machine has alreaby been enrolled
+ .SS "IPA Master Requirements"
+ At least one IPA master must hold a \fBTrust Controller\fR role. This can be achieved by running ipa\-adtrust\-install on the IPA master. The utility will configure IPA master to be a domain controller for IPA domain.
+
+-IPA master holding a \fBTrust Controller\fR role has also to have support for a special service command to create SMB service, \fBipa service-add-smb\fR. This command is available with FreeIPA 4.8.0 or later release.
++IPA master holding a \fBTrust Controller\fR role has also to have support for a special service command to create SMB service, \fBipa service-add-smb\fR. This command is available with IPA 4.8.0 or later release.
+
+ .SH "OPTIONS"
+ .SS "BASIC OPTIONS"
+--
+2.21.1
+
+From 9cb31fd0f81511252170f539b354a67b2bd1e96a Mon Sep 17 00:00:00 2001
+From: Thomas Woerner <twoerner@redhat.com>
+Date: Fri, 3 Apr 2020 14:28:22 +0200
+Subject: [PATCH 73/78] contrib/lite-server.py: Change branding to IPA and
+ Identity Management
+
+---
+ contrib/lite-server.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/contrib/lite-server.py b/contrib/lite-server.py
+index bd73b0763..9feffdada 100755
+--- a/contrib/lite-server.py
++++ b/contrib/lite-server.py
+@@ -139,7 +139,7 @@ class StaticFilesMiddleware(SharedDataMiddleware):
+
+
+ def init_api(ccname):
+- """Initialize FreeIPA API from command line
++ """Initialize IPA API from command line
+ """
+ from ipalib import __file__ as ipalib_file
+ from ipalib import api
+--
+2.21.1
+
+From a8bc392551a963cb33e3e9748a771fd0f1201541 Mon Sep 17 00:00:00 2001
+From: Thomas Woerner <twoerner@redhat.com>
+Date: Fri, 3 Apr 2020 14:28:56 +0200
+Subject: [PATCH 74/78] ipaserver/dcerpc.py: Change branding to IPA and
+ Identity Management
+
+---
+ ipaserver/dcerpc.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ipaserver/dcerpc.py b/ipaserver/dcerpc.py
+index 27d075425..8d3384f12 100644
+--- a/ipaserver/dcerpc.py
++++ b/ipaserver/dcerpc.py
+@@ -1483,7 +1483,7 @@ def fetch_domains(api, mydomain, trustdomain, creds=None, server=None):
+ def communicate(td):
+ td.init_lsa_pipe(td.info['dc'])
+ netr_pipe = netlogon.netlogon(td.binding, td.parm, td.creds)
+- # Older FreeIPA versions used netr_DsrEnumerateDomainTrusts call
++ # Older IPA versions used netr_DsrEnumerateDomainTrusts call
+ # but it doesn't provide information about non-domain UPNs associated
+ # with the forest, thus we have to use netr_DsRGetForestTrustInformation
+ domains = netr_pipe.netr_DsRGetForestTrustInformation(td.info['dc'], None, 0)
+--
+2.21.1
+
+From 8bcae9d325453cae61cbc18b9114e9ba8b716993 Mon Sep 17 00:00:00 2001
+From: Thomas Woerner <twoerner@redhat.com>
+Date: Fri, 3 Apr 2020 14:29:21 +0200
+Subject: [PATCH 75/78] ipaserver/install/ipa_cert_fix.py: Change branding to
+ IPA and Identity Management
+
+---
+ ipaserver/install/ipa_cert_fix.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ipaserver/install/ipa_cert_fix.py b/ipaserver/install/ipa_cert_fix.py
+index 6b952d34f..e79d7ddc4 100644
+--- a/ipaserver/install/ipa_cert_fix.py
++++ b/ipaserver/install/ipa_cert_fix.py
+@@ -45,7 +45,7 @@ msg = """
+ WARNING
+
+ ipa-cert-fix is intended for recovery when expired certificates
+-prevent the normal operation of FreeIPA. It should ONLY be used
++prevent the normal operation of IPA. It should ONLY be used
+ in such scenarios, and backup of the system, especially certificates
+ and keys, is STRONGLY RECOMMENDED.
+
+--
+2.21.1
+
+From 8e3fb91139f51439164b38003cf0917af137158d Mon Sep 17 00:00:00 2001
+From: Thomas Woerner <twoerner@redhat.com>
+Date: Fri, 3 Apr 2020 14:29:43 +0200
+Subject: [PATCH 76/78] ipaserver/plugins/config.py: Change branding to IPA and
+ Identity Management
+
+---
+ ipaserver/plugins/config.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ipaserver/plugins/config.py b/ipaserver/plugins/config.py
+index e96e51971..ace66e589 100644
+--- a/ipaserver/plugins/config.py
++++ b/ipaserver/plugins/config.py
+@@ -462,7 +462,7 @@ class config(LDAPObject):
+
+ known_domains = self.gather_trusted_domains()
+
+- # add FreeIPA domain to the list of domains. This one is always enabled
++ # add IPA domain to the list of domains. This one is always enabled
+ known_domains.update({self.api.env.domain: True})
+
+ for domain in submitted_domains:
+--
+2.21.1
+
+From 65a663bd7fb5559316f1a8e5f04e0d4827bfb0b6 Mon Sep 17 00:00:00 2001
+From: Thomas Woerner <twoerner@redhat.com>
+Date: Fri, 3 Apr 2020 14:30:01 +0200
+Subject: [PATCH 77/78] ipaserver/plugins/certprofile.py: Change branding to
+ IPA and Identity Management
+
+---
+ ipaserver/plugins/certprofile.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ipaserver/plugins/certprofile.py b/ipaserver/plugins/certprofile.py
+index 6e2e91dc6..03fbe4d3e 100644
+--- a/ipaserver/plugins/certprofile.py
++++ b/ipaserver/plugins/certprofile.py
+@@ -57,7 +57,7 @@ PROFILE CONFIGURATION FORMAT:
+ The profile configuration format is the raw property-list format
+ used by Dogtag Certificate System. The XML format is not supported.
+
+-The following restrictions apply to profiles managed by FreeIPA:
++The following restrictions apply to profiles managed by IPA:
+
+ - When importing a profile the "profileId" field, if present, must
+ match the ID given on the command line.
+--
+2.21.1
+
+From 0801d5ad45d4fa9b64e0bfb4152af658ead0e514 Mon Sep 17 00:00:00 2001
+From: Thomas Woerner <twoerner@redhat.com>
+Date: Fri, 3 Apr 2020 14:30:20 +0200
+Subject: [PATCH 78/78] doc/designs/adtrust/samba-domain-member.md: Change
+ branding to IPA and Identity Management
+
+---
+ doc/designs/adtrust/samba-domain-member.md | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/doc/designs/adtrust/samba-domain-member.md b/doc/designs/adtrust/samba-domain-member.md
+index 95e3c014c..83e84ddb8 100644
+--- a/doc/designs/adtrust/samba-domain-member.md
++++ b/doc/designs/adtrust/samba-domain-member.md
+@@ -46,11 +46,11 @@ performing a remote authentication using Kerberos, a remote system has to
+ present a Kerberos ticket to the domain member's SMB service, like with any
+ other Kerberos services.
+
+-To operate as a domain member in a FreeIPA domain, thus, Samba needs a FreeIPA
+-master to be configured as a domain controller and a FreeIPA client needs to be
++To operate as a domain member in a IPA domain, thus, Samba needs a IPA
++master to be configured as a domain controller and a IPA client needs to be
+ configured in a specific way to allow Samba to talk to a domain controller.
+ This document overviews a set of implementation tasks to achieve the domain
+-member operation. Most of these tasks are related to FreeIPA components but
++member operation. Most of these tasks are related to IPA components but
+ some of changes required do belong to Samba itself.
+
+ ## Domain member configuration overview
+@@ -102,16 +102,16 @@ password rotation.
+
+ The knowledge of the machine account password is recorded in a special
+ database, `secrets.tdb`, during the process of a machine join to the domain.
+-For FreeIPA client the join process is different from the one Samba uses for
++For IPA client the join process is different from the one Samba uses for
+ Active Directory, thus we need to seed the machine account password separately
+-to enrolling FreeIPA client. Note that FreeIPA machine enrollment does not
++to enrolling IPA client. Note that IPA machine enrollment does not
+ allow to share clear text machine account password as it is not recorded
+ anywhere.
+
+ ## Domain controller side configuration overview
+
+ See [samba-domain-controller] for the details of how Samba domain controller is
+-set up and configured in FreeIPA.
++set up and configured in IPA.
+
+ ## Changes required on domain member
+
+--
+2.21.1
diff --git a/SOURCES/1003-Revert-WebUI-use-python3-rjsmin-to-minify-JavaScript.patch b/SOURCES/1003-Revert-WebUI-use-python3-rjsmin-to-minify-JavaScript.patch
new file mode 100644
index 0000000..981d18c
--- /dev/null
+++ b/SOURCES/1003-Revert-WebUI-use-python3-rjsmin-to-minify-JavaScript.patch
@@ -0,0 +1,134 @@
+From 2f8e87ce9ccaab51b32a395c6cf6c764434ed0e2 Mon Sep 17 00:00:00 2001
+From: Thomas Woerner <twoerner@redhat.com>
+Date: Thu, 11 Jun 2020 10:40:57 +0200
+Subject: [PATCH] Revert "WebUI: use python3-rjsmin to minify JavaScript files"
+
+This reverts commit d986e844bbd37ccc7a532175631a55acd315cda3.
+---
+ .lgtm.yml | 4 ++--
+ freeipa.spec.in | 2 +-
+ install/ui/build/freeipa/Makefile.am | 2 +-
+ install/ui/src/webui.profile.js | 4 ++--
+ install/ui/util/build/README | 4 ++--
+ install/ui/util/compile.sh | 8 ++++----
+ 6 files changed, 12 insertions(+), 12 deletions(-)
+
+#diff --git a/.lgtm.yml b/.lgtm.yml
+#index b3898116e..e63615918 100644
+#--- a/.lgtm.yml
+#+++ b/.lgtm.yml
+#@@ -39,7 +39,7 @@ extraction:
+# - python3-setuptools
+# - python3-wheel
+# - nodejs
+#- - python3-rjsmin
+#+ - uglifyjs
+# - systemd
+# - 389-ds-base-dev
+# - libssl-dev
+#@@ -79,7 +79,7 @@ extraction:
+# - python3-setuptools
+# - python3-wheel
+# - nodejs
+#- - python3-rjsmin
+#+ - uglifyjs
+# - systemd
+# - 389-ds-base-dev
+# - libssl-dev
+diff --git a/freeipa.spec.in b/freeipa.spec.in
+index b6eb79593..a4682497a 100755
+--- a/freeipa.spec.in
++++ b/freeipa.spec.in
+@@ -191,7 +191,7 @@ BuildRequires: libsss_idmap-devel
+ BuildRequires: libsss_certmap-devel
+ BuildRequires: libsss_nss_idmap-devel >= %{sssd_version}
+ BuildRequires: nodejs(abi)
+-BuildRequires: python3-rjsmin
++BuildRequires: uglify-js
+ BuildRequires: libverto-devel
+ BuildRequires: libunistring-devel
+ # 0.13.0: https://bugzilla.redhat.com/show_bug.cgi?id=1584773
+diff --git a/install/ui/build/freeipa/Makefile.am b/install/ui/build/freeipa/Makefile.am
+index f4d97819e..05e82f4da 100644
+--- a/install/ui/build/freeipa/Makefile.am
++++ b/install/ui/build/freeipa/Makefile.am
+@@ -18,6 +18,6 @@ widgets := $(wildcard ../../src/freeipa/widgets/*.js)
+ nav := $(wildcard ../../src/freeipa/navigation/*.js)
+
+ app.js: $(core) $(base) $(widgets) $(nav)
+- PYTHON=$(PYTHON) $(srcdir)/../../util/make-ui.sh
++ $(srcdir)/../../util/make-ui.sh
+
+ core.js: app.js
+diff --git a/install/ui/src/webui.profile.js b/install/ui/src/webui.profile.js
+index 2d4d691dc..1d7a6cc84 100644
+--- a/install/ui/src/webui.profile.js
++++ b/install/ui/src/webui.profile.js
+@@ -9,7 +9,7 @@ var profile = (function(){
+ releaseName: "lib",
+ action: "release",
+
+- // optimization done separately by python3-rjsmin
++ // optimization done separately by uglify.js
+ layerOptimize: false,
+ optimize: false,
+ cssOptimize: false,
+@@ -123,4 +123,4 @@ var profile = (function(){
+ }
+ }
+ };
+-})();
++})();
+\ No newline at end of file
+diff --git a/install/ui/util/build/README b/install/ui/util/build/README
+index 2c4e0ecac..0772532d4 100644
+--- a/install/ui/util/build/README
++++ b/install/ui/util/build/README
+@@ -1,5 +1,5 @@
+ build.js is builded dojo builder, with applied patches from 'patches' folder, by
+-itself and compiled using python3-rjsmin
++itself and compiled using uglify.js
+
+ _base/configRhino.js is unmodifed file from dojo/dojo. Required for a build to work.
+
+@@ -9,4 +9,4 @@ Available via Academic Free License >= 2.1 OR the modified BSD license.
+ see: http://dojotoolkit.org/license for details
+
+ = License =
+-Full Dojo license is in LICENSE file.
++Full Dojo license is in LICENSE file.
+\ No newline at end of file
+diff --git a/install/ui/util/compile.sh b/install/ui/util/compile.sh
+index 1516b815f..d14f90ab0 100755
+--- a/install/ui/util/compile.sh
++++ b/install/ui/util/compile.sh
+@@ -26,14 +26,14 @@ RDIR=$DIR/../release
+ usage() {
+ cat <<-__EOF__;
+ NAME
+- compile.sh - Compiles layer file of Dojo build using Python rjsmin.
++ compile.sh - Compiles layer file of Dojo build using uglify.js.
+ Deletes all other files.
+
+ SYNOPSIS
+ path/to/compile.sh [--help] --release RELEASE --layer NAME/NAME
+
+ DESCRIPTION
+- Compiles layer file of Dojo build output using Python rjsmin.
++ Compiles layer file of Dojo build output using uglify.js.
+ Deletes all other files.
+
+ OPTIONS
+@@ -105,7 +105,7 @@ if [[ ! $OUTPUT_FILE ]] ; then
+ OUTPUT_FILE=$RDIR/$RELEASE/$LAYER.js
+ fi
+
+-# compile using python rjsmin
++# compile using uglifyjs
+ echo "Minimizing: $RDIR/$RELEASE/$LAYER.js"
+ echo "Target file: $OUTPUT_FILE"
+-${PYTHON:-python3} -m rjsmin < $RDIR/$RELEASE/$LAYER.js > $OUTPUT_FILE
++uglifyjs $RDIR/$RELEASE/$LAYER.js > $OUTPUT_FILE
+--
+2.26.2
+
diff --git a/SOURCES/freeipa-4.8.4.tar.gz.asc b/SOURCES/freeipa-4.8.4.tar.gz.asc
deleted file mode 100644
index 6160d78..0000000
--- a/SOURCES/freeipa-4.8.4.tar.gz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEhAodHH8+xLL+UwQ1RxniuKu/YhoFAl302dsACgkQRxniuKu/
-Yhrd0RAAvUv30O5rSlww30kxqV3oQb5CIJYSGb/jpWMAhj1Nr+1Ye1P3rCyJLP4R
-+fVu23bgIywv8qkWPZdQxohkYCuiTZa8ogl3gXWJDRCp5f5oKWALzwU+Zlu8HlVj
-z8UAOFXEO1fYwvwpOPdr+gGiTS5pLq39EIBZSVjvuviXR0adwVcVvw0R2YXYmiLE
-x5uaM289YQ4hKY/V0rgqNn0nYiogFcFvSlhkM9oi4+JiKypocPqKTjM4n8EcdXv4
-rSJ6Zv6FgnyoREBITCZjKaTn8OTkhqhhzMOgMzWr8QSmNl44UKA9aq5ZIEJgEnMR
-N3vW6Br1f4TDJ3JyWeMoizQcNeTFyuoxN9HhGpvDotx+6g+j2yNfAK7ZZAtjULhm
-m13zb1svCbGtvRxB8QfIQe62l3drooimWRf5o9fgPVU0MIxgL7x7AulxrZekik6J
-NdwXiz75SKfbFZZWVdf9FjJkaBZ3CpJMJnDQiQyCs+xBWOpXYGYkz9a1NRoFgCdC
-y8bY9ErfzhLdcgjbZ3EE24FkWMBeUdW+BC4AYSChZlqUZ9CMTQIdyqPVSG/u5sc9
-2Rn1YasAfu0P3DJgRCI0BUcxkxFet5M8hfB0iuLE4OJTKnyhmmOUKmO2wUSw0QIr
-ogzzN9DF84wwXD1P4X6WFEzOOthCdLPUHyDo3u5fVIy4QWZZDlQ=
-=TTzs
------END PGP SIGNATURE-----
diff --git a/SOURCES/freeipa-4.8.7.tar.gz.asc b/SOURCES/freeipa-4.8.7.tar.gz.asc
new file mode 100644
index 0000000..0dae99e
--- /dev/null
+++ b/SOURCES/freeipa-4.8.7.tar.gz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEhAodHH8+xLL+UwQ1RxniuKu/YhoFAl7hNhYACgkQRxniuKu/
+Yhq2rxAAnK8YHbQtivjssWz6BBRiU5TKootA3fSqfvbhACYG14629/Dpc5IIkYZ1
+0AE4CUFA7Oi92emFbxrLJyeSuxuzTxSVmydJ5HW/OTkRRSnmjL5oeBg2D++B9OaO
+qVAXRZbi5YNfW5y//9BIRzCGw0RHpbR/QjZ1ipDymky6nr5IS+EhfZ0iHeEyiNXd
+OP3OJv538HSvRrv3mJvz52pKVfegw1OTd8yUnmuPEc9ClQfPQHjXqsOeFYCbR8fg
+59y0twMMrOc2J4eL0OkNE/By+o+1vAMUwEs736sCdbJJPigerfuK0e7ZxP+x98BP
+bmIBxv7eUf20Rn3An7+vTqQP60V4tS+FOnc2LD3OpHH4vy34ovWZfYZWVKbg0z1+
+5E/0TWifhlibbRZctDaxkZfFVchQnixHnO0Awv8wNxRzh/XvvsTPz1zJXk5kHk3r
+Ws2/GbeWTiJLe8sIXJz0MNTayWLnsDJG6BCRf+K0HwCdL80p4TG71dTwa9PW5HEy
+UklxW/zfr+chS1AszNgb8wJa6WtDHfQnktJwSSj7CkD3JdUVx+L/cJiOfbCM+WUi
+BRzhVhNUDX/FkpGUyvC4AYXX+wcwHph9BDChUDqcG886aIK28TAsie3Vwz/F7hKP
+TYpF1+YIImcRfUQ737pnbHL12o5yzfhkBfD2GMsojEd0x71B3PY=
+=B33Z
+-----END PGP SIGNATURE-----
diff --git a/SPECS/ipa.spec b/SPECS/ipa.spec
index 8fc3079..137df90 100644
--- a/SPECS/ipa.spec
+++ b/SPECS/ipa.spec
@@ -52,24 +52,33 @@
%global linter_options --disable-pylint --without-jslint
%endif
+# Include SELinux subpackage
+%if 0%{?fedora} >= 30 || 0%{?rhel} > 8
+ %global with_selinux 1
+ %global selinuxtype targeted
+ %global modulename ipa
+%endif
+
%if 0%{?rhel}
%global package_name ipa
%global alt_name freeipa
-%global krb5_version 1.17-12
-%global krb5_kdb_version 7.0
+%global krb5_version 1.18.2-2
+%global krb5_kdb_version 8.0
# 0.7.16: https://github.com/drkjam/netaddr/issues/71
%global python_netaddr_version 0.7.19
# Require 4.7.0 which brings Python 3 bindings
-%global samba_version 4.10.4-9
+%global samba_version 4.12.3-0
+%global slapi_nis_version 0.56.4
# Require 3.14.3-24 - Allow ipa_ods_exporter_t domain to read krb5_keytab files
-%global selinux_policy_version 3.14.3-24
+# SELinux context for /etc/named directory, RHBZ#1759495
+%global selinux_policy_version 3.14.3-43
%global slapi_nis_version 0.56.1-4
%global python_ldap_version 3.1.0-1
# python3-lib389
# Fix for "Installation fails: Replica Busy"
# https://pagure.io/389-ds-base/issue/49818
-# currently set to 1.4.1.3 until 389-ds rebases to 1.4.2
-%global ds_version 1.4.1.3
+%global ds_version 1.4.2.4-6
+%global httpd_version 2.4.6-31
%else
# Fedora
@@ -81,10 +90,14 @@
# 0.7.16: https://github.com/drkjam/netaddr/issues/71
%global python_netaddr_version 0.7.16
# Require 4.7.0 which brings Python 3 bindings
+# Require 4.12 which has DsRGetForestTrustInformation access rights fixes
+#global samba_version 2:4.12
%global samba_version 2:4.9.0
-# DNSSEC AVC violation, RHBZ#1537971
-%global selinux_policy_version 3.13.1-283.24
-%global slapi_nis_version 0.56.1
+# SELinux context for /etc/named directory, RHBZ#1759495
+#global selinux_policy_version 3.14.3-52
+%global selinux_policy_version 3.14.3-41
+#global slapi_nis_version 0.56.4
+%global slapi_nis_version 0.56.3
# fix for segfault in python3-ldap, https://pagure.io/freeipa/issue/7324
%global python_ldap_version 3.1.0-1
@@ -96,8 +109,8 @@
# Some packages don't provide new dist aliases.
# https://docs.fedoraproject.org/en-US/packaging-guidelines/Python/
%{?python_disable_dependency_generator}
-
-%endif # Fedora
+# Fedora
+%endif
# Require Dogtag PKI 10.6.8-3 (10.6.7 was never pushed to stable)
# 10.6.7 fixes UpdateNumberRange clone installation issue
@@ -113,11 +126,12 @@
%if 0%{?fedora} == 28
%global nss_version 3.41.0-3
%else
-%global nss_version 3.41.0-1
+%global nss_version 3.44.0-4
%endif
-%global sssd_version 2.2.0-19
+%global sssd_version 2.2.3-11
+%define krb5_base_version %(LC_ALL=C rpm -q --qf '%%{VERSION}' krb5-devel | grep -Eo '^[^.]+\.[^.]+')
%global kdcproxy_version 0.4-3
%global plugin_dir %{_libdir}/dirsrv/plugins
@@ -128,7 +142,7 @@
# Work-around fact that RPM SPEC parser does not accept
# "Version: @VERSION@" in freeipa.spec.in used for Autoconf string replacement
-%define IPA_VERSION 4.8.4
+%define IPA_VERSION 4.8.7
%define AT_SIGN @
# redefine IPA_VERSION only if its value matches the Autoconf placeholder
%if "%{IPA_VERSION}" == "%{AT_SIGN}VERSION%{AT_SIGN}"
@@ -137,7 +151,7 @@
Name: %{package_name}
Version: %{IPA_VERSION}
-Release: 2%{?dist}
+Release: 4%{?dist}
Summary: The Identity, Policy and Audit system
License: GPLv3+
@@ -152,9 +166,13 @@ Source1: https://releases.pagure.org/freeipa/freeipa-%{version}.tar.gz.as
# RHEL spec file only: END: Change branding to IPA and Identity Management
# RHEL spec file only: START
-Patch0001: 0001-DNS-install-check-Fix-overlapping-DNS-zone-from-the-master-itself_2c2cef7_rhbz#1784003.patch
+Patch0001: 0001-WebUI-Fix-IPA-Error-3007-RequirmentError-while-addin_rhbz#1757045.patch
+Patch0002: 0002-EPN-does-not-ship-its-default-configuration_rhbz#1847999.patch
+Patch0003: 0003-Use-256-bit-AJP-secret_rhbz#1849914.patch
+Patch0004: 0004-baseuser-fix-ipanthomedirectorydrive-option-name_rhbz#1851411.patch
Patch1001: 1001-Change-branding-to-IPA-and-Identity-Management.patch
Patch1002: 1002-4.8.0-Remove-csrgen.patch
+Patch1003: 1003-Revert-WebUI-use-python3-rjsmin-to-minify-JavaScript.patch
# RHEL spec file only: END
# For the timestamp trick in patch application
@@ -165,7 +183,7 @@ BuildRequires: openldap-devel
# will cause the build to fail due to unsatisfied dependencies.
# DAL version change may cause code crash or memory leaks, it is better to fail early.
BuildRequires: krb5-kdb-version = %{krb5_kdb_version}
-BuildRequires: krb5-devel >= %{krb5_version}
+BuildRequires: krb5-kdb-devel-version = %{krb5_kdb_version}
# 1.27.4: xmlrpc_curl_xportparms.gssapi_delegation
BuildRequires: xmlrpc-c-devel >= 1.27.4
BuildRequires: popt-devel
@@ -183,7 +201,6 @@ BuildRequires: systemd
# systemd-tmpfiles which is executed from make install requires apache user
BuildRequires: httpd
BuildRequires: nspr-devel
-BuildRequires: nss-devel >= %{nss_version}
BuildRequires: openssl-devel
BuildRequires: libini_config-devel
BuildRequires: cyrus-sasl-devel
@@ -204,7 +221,8 @@ BuildRequires: libunistring-devel
# 0.13.0: https://bugzilla.redhat.com/show_bug.cgi?id=1584773
# 0.13.0-2: fix for missing dependency on python-six
BuildRequires: python3-lesscpy >= 0.13.0-2
-%endif # ONLY_CLIENT
+# ONLY_CLIENT
+%endif
#
# Build dependencies for makeapi/makeaci
@@ -231,7 +249,8 @@ BuildRequires: python3-twine
BuildRequires: twine
%endif
BuildRequires: python3-wheel
-%endif # with_wheels
+# with_wheels
+%endif
#
# Build dependencies for lint and fastcheck
@@ -281,7 +300,8 @@ BuildRequires: python3-sss-murmur
BuildRequires: python3-sssdconfig >= %{sssd_version}
BuildRequires: python3-systemd
BuildRequires: python3-yubico
-%endif # with_lint
+# with_lint
+%endif
#
# Build dependencies for unit tests
@@ -289,8 +309,14 @@ BuildRequires: python3-yubico
%if ! %{ONLY_CLIENT}
BuildRequires: libcmocka-devel
# Required by ipa_kdb_tests
-BuildRequires: %{_libdir}/krb5/plugins/kdb/db2.so
-%endif # ONLY_CLIENT
+BuildRequires: krb5-server >= %{krb5_version}
+# ONLY_CLIENT
+%endif
+
+# Build dependencies for SELinux policy
+%if 0%{?with_selinux}
+BuildRequires: selinux-policy-devel >= %{selinux_policy_version}
+%endif
%description
IPA is an integrated solution to provide centrally managed Identity (users,
@@ -311,22 +337,21 @@ Requires: python3-ipaserver = %{version}-%{release}
Requires: python3-ldap >= %{python_ldap_version}
Requires: 389-ds-base >= %{ds_version}
Requires: openldap-clients > 2.4.35-4
-Requires: nss >= %{nss_version}
Requires: nss-tools >= %{nss_version}
Requires(post): krb5-server >= %{krb5_version}
Requires(post): krb5-kdb-version = %{krb5_kdb_version}
Requires: krb5-pkinit-openssl >= %{krb5_version}
Requires: cyrus-sasl-gssapi%{?_isa}
Requires: chrony
-Requires: httpd >= 2.4.6-31
+Requires: httpd >= %{httpd_version}
Requires(preun): python3
Requires(postun): python3
Requires: python3-gssapi >= 1.2.0-5
Requires: python3-systemd
Requires: python3-mod_wsgi
Requires: mod_auth_gssapi >= 1.5.0
-Requires: mod_ssl
-Requires: mod_session
+Requires: mod_ssl >= %{httpd_version}
+Requires: mod_session >= %{httpd_version}
# 0.9.9: https://github.com/adelton/mod_lookup_identity/pull/3
Requires: mod_lookup_identity >= 0.9.9
Requires: acl
@@ -420,7 +445,7 @@ If you are installing an IPA server, you need to install this package.
Summary: Common files used by IPA server
BuildArch: noarch
Requires: %{name}-client-common = %{version}-%{release}
-Requires: httpd >= 2.4.6-31
+Requires: httpd >= %{httpd_version}
Requires: systemd-units >= 38
Requires: custodia >= 0.3.1
%if 0%{?rhel} > 7
@@ -472,6 +497,7 @@ Requires: %{name}-common = %{version}-%{release}
Requires: samba >= %{samba_version}
Requires: samba-winbind
Requires: libsss_idmap
+Obsoletes: ipa-idoverride-memberof-plugin
Requires(post): python3
Requires: python3-samba
@@ -495,7 +521,8 @@ Cross-realm trusts with Active Directory in IPA require working Samba 4
installation. This package is provided for convenience to install all required
dependencies at once.
-%endif # ONLY_CLIENT
+# ONLY_CLIENT
+%endif
%package client
@@ -565,6 +592,17 @@ Requires: cifs-utils
This package provides command-line tools to deploy Samba domain member
on the machine enrolled into a FreeIPA environment
+%if ! %{ONLY_CLIENT}
+%package client-epn
+Summary: Tools to configure Expiring Password Notification in IPA
+Group: System Environment/Base
+Requires: %{name}-client = %{version}-%{release}
+
+%description client-epn
+This package provides a service to collect and send expiring password
+notifications via email (SMTP).
+%endif
+
%package -n python3-ipaclient
Summary: Python libraries used by IPA client
BuildArch: noarch
@@ -689,6 +727,13 @@ Obsoletes: %{alt_name}-common < %{version}
Conflicts: %{alt_name}-python < %{version}
+%if 0%{?with_selinux}
+# This ensures that the *-selinux package and all it’s dependencies are not
+# pulled into containers and other systems that do not use SELinux. The
+# policy defines types and file contexts for client and server.
+Requires: (%{name}-selinux if selinux-policy-%{selinuxtype})
+%endif
+
%description common
IPA is an integrated solution to provide centrally managed Identity (users,
hosts, services), Authentication (SSO, 2FA), and Authorization
@@ -711,12 +756,14 @@ Requires: ldns-utils
Requires: python3-coverage
Requires: python3-cryptography >= 1.6
Requires: python3-polib
-Requires: python3-pytest >= 2.6
+Requires: python3-pytest >= 3.9.1
Requires: python3-pytest-multihost >= 0.5
Requires: python3-pytest-sourceorder
Requires: python3-sssdconfig >= %{sssd_version}
Requires: tar
Requires: xz
+Requires: openssh-clients
+Requires: sshpass
%description -n python3-ipatests
IPA is an integrated solution to provide centrally managed Identity (users,
@@ -726,7 +773,23 @@ features for further integration with Linux based clients (SUDO, automount)
and integration with Active Directory based infrastructures (Trusts).
This package contains tests that verify IPA functionality under Python 3.
-%endif # with_ipatests
+# with_ipatests
+%endif
+
+
+%if 0%{?with_selinux}
+# SELinux subpackage
+%package selinux
+Summary: FreeIPA SELinux policy
+BuildArch: noarch
+Requires: selinux-policy-%{selinuxtype}
+Requires(post): selinux-policy-%{selinuxtype}
+%{?selinux_requires}
+
+%description selinux
+Custom SELinux policy module for FreeIPA
+# with_selinux
+%endif
%prep
@@ -863,15 +926,28 @@ mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d/
mkdir -p %{buildroot}%{_libdir}/krb5/plugins/libkrb5
touch %{buildroot}%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
-%endif # ONLY_CLIENT
+# ONLY_CLIENT
+%endif
/bin/touch %{buildroot}%{_sysconfdir}/ipa/default.conf
/bin/touch %{buildroot}%{_sysconfdir}/ipa/ca.crt
%if ! %{ONLY_CLIENT}
mkdir -p %{buildroot}%{_sysconfdir}/cron.d
-%endif # ONLY_CLIENT
+# ONLY_CLIENT
+%endif
+%if %{ONLY_CLIENT}
+# Remove ipa-epn parts as we don't have ipa-epn systemd integration generated
+# for client-only build
+rm %{buildroot}/%{_sbindir}/ipa-epn
+rm %{buildroot}/%{_sysconfdir}/ipa/epn.conf
+rm -rf %{buildroot}/%{_sysconfdir}/ipa/epn
+rm %{buildroot}/%{_mandir}/man1/ipa-epn.1*
+rm %{buildroot}/%{_mandir}/man5/epn.conf.5*
+rm %{buildroot}/%{_unitdir}/ipa-epn.service
+rm %{buildroot}/%{_unitdir}/ipa-epn.timer
+%endif
%if ! %{ONLY_CLIENT}
@@ -983,7 +1059,8 @@ if [ $1 -eq 0 ]; then
/bin/systemctl reload-or-try-restart oddjobd
fi
-%endif # ONLY_CLIENT
+# ONLY_CLIENT
+%endif
%post client
@@ -1021,6 +1098,28 @@ if [ $1 -gt 1 ] ; then
fi
+%if 0%{?with_selinux}
+# SELinux contexts are saved so that only affected files can be
+# relabeled after the policy module installation
+%pre selinux
+%selinux_relabel_pre -s %{selinuxtype}
+
+%post selinux
+semodule -d ipa_custodia &> /dev/null || true;
+%selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{selinuxtype}/%{modulename}.pp.bz2
+
+%postun selinux
+if [ $1 -eq 0 ]; then
+ %selinux_modules_uninstall -s %{selinuxtype} %{modulename}
+ semodule -e ipa_custodia &> /dev/null || true;
+fi
+
+%posttrans selinux
+%selinux_relabel_post -s %{selinuxtype}
+# with_selinux
+%endif
+
+
%triggerin client -- openssh-server
# Has the client been configured?
restore=0
@@ -1087,11 +1186,12 @@ fi
%{_sbindir}/ipa-cert-fix
%{_libexecdir}/certmonger/dogtag-ipa-ca-renew-agent-submit
%{_libexecdir}/certmonger/ipa-server-guard
-%{_libexecdir}/ipa/custodia/ipa-custodia-dmldap
-%{_libexecdir}/ipa/custodia/ipa-custodia-pki-tomcat
-%{_libexecdir}/ipa/custodia/ipa-custodia-pki-tomcat-wrapped
-%{_libexecdir}/ipa/custodia/ipa-custodia-ra-agent
%dir %{_libexecdir}/ipa
+%dir %{_libexecdir}/ipa/custodia
+%attr(755,root,root) %{_libexecdir}/ipa/custodia/ipa-custodia-dmldap
+%attr(755,root,root) %{_libexecdir}/ipa/custodia/ipa-custodia-pki-tomcat
+%attr(755,root,root) %{_libexecdir}/ipa/custodia/ipa-custodia-pki-tomcat-wrapped
+%attr(755,root,root) %{_libexecdir}/ipa/custodia/ipa-custodia-ra-agent
%{_libexecdir}/ipa/ipa-custodia
%{_libexecdir}/ipa/ipa-custodia-check
%{_libexecdir}/ipa/ipa-httpd-kdcproxy
@@ -1099,8 +1199,10 @@ fi
%{_libexecdir}/ipa/ipa-pki-retrieve-key
%{_libexecdir}/ipa/ipa-pki-wait-running
%{_libexecdir}/ipa/ipa-otpd
+%{_libexecdir}/ipa/ipa-print-pac
%dir %{_libexecdir}/ipa/oddjob
%attr(0755,root,root) %{_libexecdir}/ipa/oddjob/org.freeipa.server.conncheck
+%attr(0755,root,root) %{_libexecdir}/ipa/oddjob/org.freeipa.server.trust-enable-agent
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freeipa.server.conf
%config(noreplace) %{_sysconfdir}/oddjobd.conf.d/ipa-server.conf
%dir %{_libexecdir}/ipa/certmonger
@@ -1176,7 +1278,6 @@ fi
%{_usr}/share/ipa/*.ldif
%{_usr}/share/ipa/*.uldif
%{_usr}/share/ipa/*.template
-%{_usr}/share/ipa/bind.ipa-ext.conf
%dir %{_usr}/share/ipa/advise
%dir %{_usr}/share/ipa/advise/legacy
%{_usr}/share/ipa/advise/legacy/*.template
@@ -1217,16 +1318,17 @@ fi
%dir %{_sysconfdir}/ipa/html
%config(noreplace) %{_sysconfdir}/ipa/html/ssbrowser.html
%config(noreplace) %{_sysconfdir}/ipa/html/unauthorized.html
-%ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/httpd/conf.d/ipa-rewrite.conf
-%ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/httpd/conf.d/ipa.conf
-%ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/httpd/conf.d/ipa-kdc-proxy.conf
-%ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/httpd/conf.d/ipa-pki-proxy.conf
-%ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/kdcproxy/ipa-kdc-proxy.conf
-%ghost %attr(0644,root,apache) %config(noreplace) %{_usr}/share/ipa/html/ca.crt
+%ghost %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/httpd/conf.d/ipa-rewrite.conf
+%ghost %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/httpd/conf.d/ipa.conf
+%ghost %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/httpd/conf.d/ipa-kdc-proxy.conf
+%ghost %attr(0640,root,root) %config(noreplace) %{_sysconfdir}/httpd/conf.d/ipa-pki-proxy.conf
+%ghost %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ipa/kdcproxy/ipa-kdc-proxy.conf
+%ghost %attr(0644,root,root) %config(noreplace) %{_usr}/share/ipa/html/ca.crt
%ghost %attr(0640,root,named) %config(noreplace) %{_sysconfdir}/named/ipa-ext.conf
-%ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/krb.con
-%ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/krb5.ini
-%ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/krbrealm.con
+%ghost %attr(0640,root,named) %config(noreplace) %{_sysconfdir}/named/ipa-options-ext.conf
+%ghost %attr(0644,root,root) %{_usr}/share/ipa/html/krb.con
+%ghost %attr(0644,root,root) %{_usr}/share/ipa/html/krb5.ini
+%ghost %attr(0644,root,root) %{_usr}/share/ipa/html/krbrealm.con
%dir %{_usr}/share/ipa/updates/
%{_usr}/share/ipa/updates/*
%dir %{_localstatedir}/lib/ipa
@@ -1238,8 +1340,8 @@ fi
%attr(755,root,root) %dir %{_localstatedir}/lib/ipa/certs
%attr(700,root,root) %dir %{_localstatedir}/lib/ipa/private
%attr(700,root,root) %dir %{_localstatedir}/lib/ipa/passwds
-%ghost %{_localstatedir}/lib/ipa/pki-ca/publish
-%ghost %{_localstatedir}/named/dyndb-ldap/ipa
+%ghost %attr(775,root,pkiuser) %{_localstatedir}/lib/ipa/pki-ca/publish
+%ghost %attr(770,named,named) %{_localstatedir}/named/dyndb-ldap/ipa
%dir %attr(0700,root,root) %{_sysconfdir}/ipa/custodia
%dir %{_usr}/share/ipa/schema.d
%attr(0644,root,root) %{_usr}/share/ipa/schema.d/README
@@ -1271,9 +1373,10 @@ fi
%ghost %{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
%{_sysconfdir}/dbus-1/system.d/oddjob-ipa-trust.conf
%{_sysconfdir}/oddjobd.conf.d/oddjobd-ipa-trust.conf
-%%attr(755,root,root) %{_libexecdir}/ipa/oddjob/com.redhat.idm.trust-fetch-domains
+%attr(755,root,root) %{_libexecdir}/ipa/oddjob/com.redhat.idm.trust-fetch-domains
-%endif # ONLY_CLIENT
+# ONLY_CLIENT
+%endif
%files client
@@ -1302,6 +1405,20 @@ fi
%{_sbindir}/ipa-client-samba
%{_mandir}/man1/ipa-client-samba.1*
+%if ! %{ONLY_CLIENT}
+%files client-epn
+%doc README.md Contributors.txt
+%dir %{_sysconfdir}/ipa/epn
+%license COPYING
+%{_sbindir}/ipa-epn
+%{_mandir}/man1/ipa-epn.1*
+%{_mandir}/man5/epn.conf.5*
+%attr(644,root,root) %{_unitdir}/ipa-epn.service
+%attr(644,root,root) %{_unitdir}/ipa-epn.timer
+%attr(600,root,root) %config(noreplace) %{_sysconfdir}/ipa/epn.conf
+%attr(644,root,root) %config(noreplace) %{_sysconfdir}/ipa/epn/expire_msg.template
+%endif
+
%files -n python3-ipaclient
%doc README.md Contributors.txt
%license COPYING
@@ -1328,19 +1445,19 @@ fi
%doc README.md Contributors.txt
%license COPYING
%dir %attr(0755,root,root) %{_sysconfdir}/ipa/
-%ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/default.conf
-%ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/ca.crt
+%ghost %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ipa/default.conf
+%ghost %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ipa/ca.crt
%dir %attr(0755,root,root) %{_sysconfdir}/ipa/nssdb
# old dbm format
-%ghost %config(noreplace) %{_sysconfdir}/ipa/nssdb/cert8.db
-%ghost %config(noreplace) %{_sysconfdir}/ipa/nssdb/key3.db
-%ghost %config(noreplace) %{_sysconfdir}/ipa/nssdb/secmod.db
+%ghost %attr(644,root,root) %config(noreplace) %{_sysconfdir}/ipa/nssdb/cert8.db
+%ghost %attr(644,root,root) %config(noreplace) %{_sysconfdir}/ipa/nssdb/key3.db
+%ghost %attr(644,root,root) %config(noreplace) %{_sysconfdir}/ipa/nssdb/secmod.db
# new sql format
-%ghost %config(noreplace) %{_sysconfdir}/ipa/nssdb/cert9.db
-%ghost %config(noreplace) %{_sysconfdir}/ipa/nssdb/key4.db
-%ghost %config(noreplace) %{_sysconfdir}/ipa/nssdb/pkcs11.txt
-%ghost %config(noreplace) %{_sysconfdir}/ipa/nssdb/pwdfile.txt
-%ghost %config(noreplace) %{_sysconfdir}/pki/ca-trust/source/ipa.p11-kit
+%ghost %attr(644,root,root) %config(noreplace) %{_sysconfdir}/ipa/nssdb/cert9.db
+%ghost %attr(644,root,root) %config(noreplace) %{_sysconfdir}/ipa/nssdb/key4.db
+%ghost %attr(644,root,root) %config(noreplace) %{_sysconfdir}/ipa/nssdb/pkcs11.txt
+%ghost %attr(600,root,root) %config(noreplace) %{_sysconfdir}/ipa/nssdb/pwdfile.txt
+%ghost %attr(644,root,root) %config(noreplace) %{_sysconfdir}/pki/ca-trust/source/ipa.p11-kit
%dir %{_localstatedir}/lib/ipa-client
%dir %{_localstatedir}/lib/ipa-client/pki
%dir %{_localstatedir}/lib/ipa-client/sysrestore
@@ -1370,7 +1487,6 @@ fi
%{python3_sitelib}/ipapython-*.egg-info
%{python3_sitelib}/ipalib-*.egg-info
%{python3_sitelib}/ipaplatform-*.egg-info
-%{python3_sitelib}/ipaplatform-*-nspkg.pth
%if 0%{?with_ipatests}
@@ -1388,14 +1504,86 @@ fi
%{_mandir}/man1/ipa-test-config.1*
%{_mandir}/man1/ipa-test-task.1*
-%endif # with_ipatests
+# with_ipatests
+%endif
-%changelog
-* Tue Jan 21 2020 CentOS Sources <bugs@centos.org> - 4.8.4-2.el8.centos
-- Apply debranding changes
+%if 0%{?with_selinux}
+%files selinux
+%{_datadir}/selinux/packages/%{selinuxtype}/%{modulename}.pp.*
+%ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{modulename}
+# with_selinux
+%endif
+
-* Mon Dec 14 2019 Thomas Woerner <twoerner@redhat.com> - 4.8.4-2
+%changelog
+* Mon Jun 29 2020 Thomas Woerner <twoerner@redhat.com> - 4.8.7-4
+- Remove client-epn left over files for ONLY_CLIENT
+ Related: RHBZ#1847999
+
+* Mon Jun 29 2020 Thomas Woerner <twoerner@redhat.com> - 4.8.7-3
+- [WebUI] IPA Error 3007: RequirmentError" while adding members in
+ "User ID overrides" tab
+ Resolves: RHBZ#1757045
+- EPN does not ship its default configuration ( /etc/ipa/epn.conf ) in
+ freeipa-client-epn
+ Resolves: RHBZ#1847999
+- FreeIPA - Utilize 256-bit AJP connector passwords
+ Resolves: RHBZ#1849914
+- ipa: typo issue in ipanthomedirectoryrive deffinition
+ Resolves: RHBZ#1851411
+
+* Thu Jun 11 2020 Thomas Woerner <twoerner@redhat.com> - 4.8.7-2
+- Remove ipa-idoverride-memberof as superceded by ipa-server 4.8.7
+ Resolves: RHBZ#1846434
+
+* Thu Jun 11 2020 Thomas Woerner <twoerner@redhat.com> - 4.8.7-1
+- Upstream release FreeIPA 4.8.7
+- Require new samba build 4.12.3-0
+ Related: RHBZ#1818765
+- New client-epn sub package
+ Resolves: RHBZ#913799
+
+* Tue Jun 02 2020 Thomas Woerner <twoerner@redhat.com> - 4.8.6-2
+- Support krb5 1.18
+ Resolves: RHBZ#1817579
+
+* Tue Apr 28 2020 Thomas Woerner <twoerner@redhat.com> - 4.8.6-1
+- Upstream release FreeIPA 4.8.6
+- New SELinux sub package to provide own module
+- Depend on selinux-policy-devel 3.14.3-43 for build due to a makefile issue in
+ SELinux external policy support
+ Related: RHBZ#1818765
+
+* Mon Feb 17 2020 Thomas Woerner <twoerner@redhat.com> - 4.8.4-6
+- Allow an empty cookie in dogtag-ipa-ca-renew-agent-submit
+ Resolves: RHBZ#1790663
+
+* Mon Feb 17 2020 Thomas Woerner <twoerner@redhat.com> - 4.8.4-5
+- Fixed weekday in 4.8.4-2 changelog date
+ Related: RHBZ#1784003
+- adtrust: print DNS records for external DNS case after role is enabled
+ Resolves: RHBZ#1665051
+- AD user without override receive InternalServerError with API
+ Resolves: RHBZ#1782572
+- ipa-client-automount fails after repeated installation/uninstallation
+ Resolves: RHBZ#1790886
+- install/updates: move external members past schema compat update
+ Resolves: RHBZ#1803165
+- kdb: make sure audit_as_req callback signature change is preserved
+ Resolves: RHBZ#1803786
+
+* Wed Jan 29 2020 Thomas Woerner <twoerner@redhat.com> - 4.8.4-4
+- Update dependencies for samba, 389-ds and sssd
+ Resolves: RHBZ#1792848
+
+* Fri Jan 17 2020 Alexander Bokovoy <abokovoy@redhat.com> - 4.8.4-3
+- Depend on krb5-kdb-version-devel for BuildRequires
+- Update nss dependency to 3.44.0-4
+- Reset per-indicator Kebreros policy
+ Resolves: RHBZ#1784761
+
+* Sat Dec 14 2019 Thomas Woerner <twoerner@redhat.com> - 4.8.4-2
- DNS install check: Fix overlapping DNS zone from the master itself
Resolves: RHBZ#1784003