Bump version and fix issues.

- Fix missing client files in `/usr/share/ipa`.
- Fix some missing paths and constants.
- Add a nis-domainname service file.
- Put platform files into a tar instead of a patch file.
- Add missing chrony, authselect dependencies.
- Remove python-nss, authconfig dependencies.

8 files changed, 119 insertions, 235 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4e64dcce8bd9..5f8b3f33957a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = freeipa
 	pkgdesc = The Identity, Policy and Audit system
-	pkgver = 4.8.10
+	pkgver = 4.9.2
 	pkgrel = 1
 	url = http://www.freeipa.org/
 	arch = i686
@@ -22,26 +22,29 @@ pkgbase = freeipa
 	makedepends = python-jinja
 	makedepends = python-pyasn1-modules
 	options = emptydirs
-	source = https://releases.pagure.org/freeipa/freeipa-4.8.10.tar.gz
-	source = https://releases.pagure.org/freeipa/freeipa-4.8.10.tar.gz.asc
-	source = 0001-platform-add-Arch-Linux-platform.patch
+	source = https://releases.pagure.org/freeipa/freeipa-4.9.2.tar.gz
+	source = https://releases.pagure.org/freeipa/freeipa-4.9.2.tar.gz.asc
+	source = platform.patch
 	source = freeipa-client-update-sshd_config
 	source = freeipa-client-update-sshd_config.hook
+	source = nis-domainname.service
+	source = ipaplatform.tar.gz
 	validpgpkeys = 0E63D716D76AC080A4A33513F40800B6298EB963
-	sha256sums = 01e1d239e24c8841b1221c36d4fe50b7b4f165c022b888b8bdfb376fa55dc999
-	sha256sums = b3b9a8355c785ce7b9f24529aed3f39f297c0fb7bc8ed05b2d9bd3c6c9499a99
-	sha256sums = 07571a3899e4403a404ffe2ad96816f9978dc4c8efc3204df9748784623f253b
+	sha256sums = 66bc4f858d4b1b78ab1549c1188e8dbb4df53b86946ae531ca9feac35339092d
+	sha256sums = 11888ad2301dbea9080f1039868262a7d8807ccac89fa4dd1f5238c818f57d58
+	sha256sums = 4b3629f2733182f68b3d28c28f782773103b814c486cf4fdb15336163b08c82e
 	sha256sums = 9fbac49fa4bc23afe0c4d575ea2795f1da435399289dbd04c5a3ac47580e2a0d
 	sha256sums = 1e73f394d276357dcd578df7a349b1f381c9edc7b1c053ecf65f7a9255c0490d
+	sha256sums = 74a394af693e3677146eff18a770a4271fba961b2af93b15b8ae26157af1760a
+	sha256sums = 6362c8bae5b8c119d113e840914d284a706b33baa28741b61fef1048f3c37ed2
 
 pkgname = python-ipalib
 	pkgdesc = Python libraries used by IPA
 	arch = any
-	depends = freeipa-common=4.8.10-1
+	depends = freeipa-common=4.9.2-1
 	depends = python-gssapi>=1.2.0
 	depends = gnupg
 	depends = keyutils
-	depends = python-nss>=0.16
 	depends = python-cryptography>=1.4
 	depends = python-netaddr>=0.7.16
 	depends = sssd
@@ -58,15 +61,15 @@ pkgname = python-ipalib
 	depends = python-dnspython>=1.15
 	depends = python-netifaces>=0.10.4
 	depends = python-pyusb
-	provides = python-ipapython=4.8.10-1
-	provides = python-ipaplatform=4.8.10-1
+	provides = python-ipapython=4.9.2-1
+	provides = python-ipaplatform=4.9.2-1
 
 pkgname = python-ipaclient
 	pkgdesc = Python libraries used by IPA client
 	arch = any
-	depends = freeipa-client-common=4.8.10-1
-	depends = freeipa-common=4.8.10-1
-	depends = python-ipalib=4.8.10-1
+	depends = freeipa-client-common=4.9.2-1
+	depends = freeipa-common=4.9.2-1
+	depends = python-ipalib=4.9.2-1
 	depends = python-dnspython>=1.15
 	depends = python-jinja
 
@@ -83,14 +86,14 @@ pkgname = freeipa-client-common
 pkgname = freeipa-client
 	pkgdesc = IPA authentication for use on clients
 	install = freeipa-client.install
-	depends = freeipa-client-common=4.8.10-1
-	depends = freeipa-common=4.8.10-1
-	depends = python-ipaclient=4.8.10-1
+	depends = freeipa-client-common=4.9.2-1
+	depends = freeipa-common=4.9.2-1
+	depends = python-ipaclient=4.9.2-1
 	depends = python-augeas
 	depends = cyrus-sasl-gssapi
 	depends = ntp
 	depends = krb5
-	depends = authconfig
+	depends = authselect
 	depends = curl>=7.21.7
 	depends = yp-tools
 	depends = xmlrpc-c>=1.27.4
@@ -103,6 +106,7 @@ pkgname = freeipa-client
 	depends = autofs
 	depends = nfsidmap
 	depends = nfs-utils
+	depends = chrony
 	conflicts = freeipa-admintools
 	replaces = freeipa-admintools
 
diff --git a/.gitignore b/.gitignore
index c1a848b39cb9..72e8ffc0db8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1 @@
-/*.tar.gz
-/*.tar.xz
-/pkg/
-/src/
+*
diff --git a/0001-platform-add-Arch-Linux-platform.patch b/0001-platform-add-Arch-Linux-platform.patch
deleted file mode 100644
index 9b2f98282616..000000000000
--- a/0001-platform-add-Arch-Linux-platform.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-From 7af1f4b3c8d0130f6c6d61765d8396b2e8b7a508 Mon Sep 17 00:00:00 2001
-From: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
-Date: Wed, 16 Apr 2014 19:31:08 -0400
-Subject: [PATCH 2/2] platform: add Arch Linux platform
-
-This patch has been adapted from the patches provided with freeipa package
-in the Arch User Repository (AUR).
-
-Signed-off-by: Jan Cholasta <jcholast@redhat.com>
----
- client/man/ipa-client-automount.1 |  4 ++--
- client/man/ipa-client-install.1   |  4 ++--
- ipaplatform/arch/__init__.py      |  3 +++
- ipaplatform/arch/constants.py     | 12 ++++++++++++
- ipaplatform/arch/paths.py         | 22 ++++++++++++++++++++++
- ipaplatform/arch/services.py      | 30 ++++++++++++++++++++++++++++++
- ipaplatform/arch/tasks.py         | 19 +++++++++++++++++++
- ipaplatform/setup.py              |  1 +
- 8 files changed, 91 insertions(+), 4 deletions(-)
- create mode 100644 ipaplatform/arch/__init__.py
- create mode 100644 ipaplatform/arch/constants.py
- create mode 100644 ipaplatform/arch/paths.py
- create mode 100644 ipaplatform/arch/services.py
- create mode 100644 ipaplatform/arch/tasks.py
-
-diff --git a/client/man/ipa-client-automount.1 b/client/man/ipa-client-automount.1
-index 8b9989dec..2399250b1 100644
---- a/client/man/ipa-client-automount.1
-+++ b/client/man/ipa-client-automount.1
-@@ -29,7 +29,7 @@ The automount configuration consists of three files:
- .IP  o
- /etc/nsswitch.conf
- .IP  o
--/etc/sysconfig/autofs
-+/etc/conf.d/autofs
- .IP  o
- /etc/autofs_ldap_auth.conf
-
-@@ -79,7 +79,7 @@ Files that will be configured when SSSD is the automount client (default):
- .TP
- Files that will be configured when using the ldap automount client:
-
--/etc/sysconfig/autofs
-+/etc/conf.d/autofs
-
- /etc/autofs_ldap_auth.conf
-
-diff --git a/client/man/ipa-client-install.1 b/client/man/ipa-client-install.1
-index 319952cb6..d01ccec64 100644
---- a/client/man/ipa-client-install.1
-+++ b/client/man/ipa-client-install.1
-@@ -270,6 +270,6 @@ Files updated, existing content is maintained:
- .br
- /etc/krb5.keytab
- .br
--/etc/sysconfig/network
-+/etc/hostname
-
- .TP
-diff --git a/ipaplatform/arch/__init__.py b/ipaplatform/arch/__init__.py
-new file mode 100644
-index 000000000..9da42e7b4
---- /dev/null
-+++ b/ipaplatform/arch/__init__.py
-@@ -0,0 +1,3 @@
-+#
-+# Copyright (C) 2015  FreeIPA Contributors see COPYING for license
-+#
-diff --git a/ipaplatform/arch/constants.py b/ipaplatform/arch/constants.py
-new file mode 100644
-index 000000000..b4857aa7c
---- /dev/null
-+++ b/ipaplatform/arch/constants.py
-@@ -0,0 +1,12 @@
-+#
-+# Copyright (C) 2015  FreeIPA Contributors see COPYING for license
-+#
-+
-+from ipaplatform.redhat.constants import RedHatConstantsNamespace
-+
-+
-+class ArchConstantsNamespace(RedHatConstantsNamespace):
-+    pass
-+
-+
-+constants = ArchConstantsNamespace()
-diff --git a/ipaplatform/arch/paths.py b/ipaplatform/arch/paths.py
-new file mode 100644
-index 000000000..27721cf2f
---- /dev/null
-+++ b/ipaplatform/arch/paths.py
-@@ -0,0 +1,22 @@
-+#
-+# Copyright (C) 2015  FreeIPA Contributors see COPYING for license
-+#
-+
-+from ipaplatform.redhat.paths import RedHatPathNamespace
-+
-+
-+class ArchPathNamespace(RedHatPathNamespace):
-+    AUTOFS_LDAP_AUTH_CONF = "/etc/autofs/autofs_ldap_auth.conf"
-+    CERTMONGER_COMMAND_TEMPLATE = "/usr/lib/ipa/certmonger/%s"
-+    SYSCONFIG_NFS = "/etc/conf.d/nfs-common.conf"
-+    SYSCONFIG_NTPD = "/etc/conf.d/ntpd.conf"
-+    SYSCONFIG_AUTOFS = "/etc/default/autofs"
-+    DOGTAG_IPA_CA_RENEW_AGENT_SUBMIT = (
-+        "/usr/lib/certmonger/certmonger/dogtag-ipa-ca-renew-agent-submit")
-+    DOGTAG_IPA_RENEW_AGENT_SUBMIT = (
-+        "/usr/lib/certmonger/certmonger/dogtag-ipa-renew-agent-submit")
-+    IPA_SERVER_GUARD = "/usr/lib/certmonger/certmonger/ipa-server-guard"
-+    LIB64_FIREFOX = "/usr/lib/firefox"
-+
-+
-+paths = ArchPathNamespace()
-diff --git a/ipaplatform/arch/services.py b/ipaplatform/arch/services.py
-new file mode 100644
-index 000000000..4ddfb53c9
---- /dev/null
-+++ b/ipaplatform/arch/services.py
-@@ -0,0 +1,30 @@
-+#
-+# Copyright (C) 2015  FreeIPA Contributors see COPYING for license
-+#
-+
-+from ipaplatform.redhat import services as redhat_services
-+
-+arch_system_units = dict(redhat_services.redhat_system_units)
-+arch_system_units['messagebus'] = 'dbus.service'
-+arch_system_units['rpcgssd'] = 'rpc-gssd.service'
-+arch_system_units['rpcidmapd'] = 'rpc-idmapd.service'
-+
-+
-+class ArchService(redhat_services.RedHatService):
-+    system_units = arch_system_units
-+
-+
-+def arch_service_class_factory(name, api=None):
-+    if name in {'messagebus', 'rpcgssd', 'rpcidmapd'}:
-+        return ArchService(name, api)
-+    return redhat_services.redhat_service_class_factory(name, api)
-+
-+
-+class ArchServices(redhat_services.RedHatServices):
-+    def service_class_factory(self, name, api=None):
-+        return arch_service_class_factory(name, api)
-+
-+
-+timedate_services = redhat_services.timedate_services
-+service = arch_service_class_factory
-+knownservices = ArchServices()
-diff --git a/ipaplatform/arch/tasks.py b/ipaplatform/arch/tasks.py
-new file mode 100644
-index 000000000..58b837d79
---- /dev/null
-+++ b/ipaplatform/arch/tasks.py
-@@ -0,0 +1,19 @@
-+#
-+# Copyright (C) 2015  FreeIPA Contributors see COPYING for license
-+#
-+
-+from ipaplatform.arch.paths import paths
-+from ipaplatform.redhat.tasks import RedHatTaskNamespace
-+
-+
-+class ArchTaskNamespace(RedHatTaskNamespace):
-+    def restore_network_configuration(self, fstore, statestore):
-+        filepath = paths.ETC_HOSTNAME
-+        if fstore.has_file(filepath):
-+            fstore.restore_file(filepath)
-+
-+    def is_fips_enabled(self):
-+        return False
-+
-+
-+tasks = ArchTaskNamespace()
-diff --git a/ipaplatform/setup.py b/ipaplatform/setup.py
-index 501e2bc56..b47875164 100644
---- a/ipaplatform/setup.py
-+++ b/ipaplatform/setup.py
-@@ -34,6 +34,7 @@ if __name__ == '__main__':
-         package_dir={'ipaplatform': ''},
-         packages=[
-             "ipaplatform",
-+            "ipaplatform.arch",
-             "ipaplatform.base",
-             "ipaplatform.debian",
-             "ipaplatform.fedora",
--- 
-2.13.3
diff --git a/Makefile b/Makefile
deleted file mode 100644
index b7ff450d52fd..000000000000
--- a/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-all: .SRCINFO package
-
-clean:
-	rm -rf pkg src *.gem *.pkg.* *.tar.gz*
-
-.SRCINFO: PKGBUILD
-	makepkg --printsrcinfo > .SRCINFO
-
-package:
-	makepkg -s
diff --git a/PKGBUILD b/PKGBUILD
index 6378927ebcc8..636d6df4749e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer: Brad Ackerman <brad@facefault.org>
+# Maintainer: Patrick Northon <northon_patrick3@yahoo.ca>
+# Contributor: Brad Ackerman <brad@facefault.org>
 # Contributor: Felix Golatofski <contact@xdfr.de>
 # Contributor: EoleDev
 # Contributor: Jan Cholasta <grubber at grubber cz>
@@ -10,7 +11,7 @@ pkgname=(python-ipalib
          freeipa-common
          freeipa-client-common
          freeipa-client)
-pkgver=4.8.10
+pkgver=4.9.2
 pkgrel=1
 pkgdesc='The Identity, Policy and Audit system'
 arch=('i686' 'x86_64')
@@ -35,21 +36,26 @@ options=(emptydirs)
 validpgpkeys=('0E63D716D76AC080A4A33513F40800B6298EB963')
 source=("https://releases.pagure.org/freeipa/freeipa-${pkgver}.tar.gz"
         "https://releases.pagure.org/freeipa/freeipa-${pkgver}.tar.gz.asc"
-        0001-platform-add-Arch-Linux-platform.patch
+        platform.patch
         freeipa-client-update-sshd_config
-        freeipa-client-update-sshd_config.hook)
-sha256sums=('01e1d239e24c8841b1221c36d4fe50b7b4f165c022b888b8bdfb376fa55dc999'
-            'b3b9a8355c785ce7b9f24529aed3f39f297c0fb7bc8ed05b2d9bd3c6c9499a99'
-            '07571a3899e4403a404ffe2ad96816f9978dc4c8efc3204df9748784623f253b'
+        freeipa-client-update-sshd_config.hook
+        nis-domainname.service
+        ipaplatform.tar.gz)
+sha256sums=('66bc4f858d4b1b78ab1549c1188e8dbb4df53b86946ae531ca9feac35339092d'
+            '11888ad2301dbea9080f1039868262a7d8807ccac89fa4dd1f5238c818f57d58'
+            '4b3629f2733182f68b3d28c28f782773103b814c486cf4fdb15336163b08c82e'
             '9fbac49fa4bc23afe0c4d575ea2795f1da435399289dbd04c5a3ac47580e2a0d'
-            '1e73f394d276357dcd578df7a349b1f381c9edc7b1c053ecf65f7a9255c0490d')
+            '1e73f394d276357dcd578df7a349b1f381c9edc7b1c053ecf65f7a9255c0490d'
+            '74a394af693e3677146eff18a770a4271fba961b2af93b15b8ae26157af1760a'
+            '6362c8bae5b8c119d113e840914d284a706b33baa28741b61fef1048f3c37ed2')
 
 prepare() {
     cd freeipa-${pkgver}
 
     rm -rf ipaplatform/arch
 
-    patch -p1 -i"$srcdir"/0001-platform-add-Arch-Linux-platform.patch
+    patch -p1 -i "${srcdir}/platform.patch"
+    tar xf "${srcdir}/ipaplatform.tar.gz"
 
     # Workaround: We want to build Python things twice. To be sure we do not mess
     # up something, do two separate builds in separate directories.
@@ -88,7 +94,7 @@ build() {
     # (These are typically configuration files created by IPA installer.)
     # All other artifacts should be created by make install.
     #
-    # Exception to this rule are test programs which where want to install
+    # Exception to this rule are test programs which want to install
     # Python2/3 versions at the same time so we need to rename them. Yuck.
 
     # Python 3 installation needs to be done first. Subsequent Python 2 install
@@ -121,7 +127,6 @@ package_python-ipalib() {
              'python-gssapi>=1.2.0'
              'gnupg'
              'keyutils'
-             'python-nss>=0.16'
              'python-cryptography>=1.4'
              'python-netaddr>=0.7.16'
              'sssd'
@@ -217,13 +222,13 @@ package_freeipa-client-common() {
     for _file in ../install/etc/ipa/nssdb \
                  ../install/var/lib/ipa-client/pki \
                  ../install/var/lib/ipa-client/sysrestore \
+                 ../install/usr/share/ipa/client/* \
                  ../install/usr/share/man/man5/default.conf.5*
     do
         _file="${_file#../install/}"
         mkdir -p "$pkgdir"/"${_file%/*}"
         mv ../install/"$_file" "$pkgdir"/"$_file"
     done
-
 }
 
 package_freeipa-client() {
@@ -235,7 +240,7 @@ package_freeipa-client() {
              'cyrus-sasl-gssapi'
              'ntp'
              'krb5'
-             'authconfig'
+             'authselect'
              'curl>=7.21.7'
              'yp-tools'
              'xmlrpc-c>=1.27.4'
@@ -247,7 +252,8 @@ package_freeipa-client() {
              'python-gssapi>=1.2.0'
              'autofs'
              'nfsidmap'
-             'nfs-utils')
+             'nfs-utils'
+             'chrony')
     conflicts=('freeipa-admintools')
     replaces=('freeipa-admintools')
     install=freeipa-client.install
@@ -261,6 +267,9 @@ package_freeipa-client() {
 
     install -D -m644 -t"$pkgdir"/usr/share/doc/$pkgname README.md \
                                                         Contributors.txt
+                                                        
+    install -Dm644 "$srcdir/nis-domainname.service" -t "$pkgdir/usr/lib/systemd/system"
+    install -dm755 "$pkgdir/etc/krb5.conf.d"
 
     local _file
     for _file in ../install/etc/bash_completion.d \
diff --git a/ipaplatform.tar.gz b/ipaplatform.tar.gz
new file mode 100644
index 000000000000..bcac82146c7e
--- /dev/null
+++ b/ipaplatform.tar.gz
diff --git a/nis-domainname.service b/nis-domainname.service
new file mode 100644
index 000000000000..8771fed23b81
--- /dev/null
+++ b/nis-domainname.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Read and set NIS domainname from /etc/sysconfig/network
+Before=ypbind.service yppasswdd.service ypserv.service ypxfrd.service sysinit.target
+DefaultDependencies=no
+Conflicts=shutdown.target
+ConditionPathExists=/etc/sysconfig/network
+
+[Service]
+EnvironmentFile=/etc/sysconfig/network
+ExecStart=nisdomainname "${NISDOMAIN}"
+Type=oneshot
+RemainAfterExit=yes
+
+[Install]
+WantedBy=sysinit.target
diff --git a/platform.patch b/platform.patch
new file mode 100644
index 000000000000..4954c3f3c17e
--- /dev/null
+++ b/platform.patch
@@ -0,0 +1,58 @@
+diff --git a/client/man/ipa-client-automount.1 b/client/man/ipa-client-automount.1
+index 3f6edabd0..be7c40799 100644
+--- a/client/man/ipa-client-automount.1
++++ b/client/man/ipa-client-automount.1
+@@ -29,7 +29,7 @@ The automount configuration consists of three files:
+ .IP  o
+ /etc/nsswitch.conf
+ .IP  o
+-/etc/sysconfig/autofs
++/etc/conf.d/autofs
+ .IP  o
+ /etc/autofs_ldap_auth.conf
+ 
+@@ -82,7 +82,7 @@ Files that will be configured when SSSD is the automount client (default):
+ .TP
+ Files that will be configured when using the ldap automount client:
+ 
+-/etc/sysconfig/autofs
++/etc/conf.d/autofs
+ 
+ /etc/autofs_ldap_auth.conf
+ 
+diff --git a/client/man/ipa-client-install.1 b/client/man/ipa-client-install.1
+index 1db3445c0..a4cd2b168 100644
+--- a/client/man/ipa-client-install.1
++++ b/client/man/ipa-client-install.1
+@@ -264,7 +264,7 @@ Files always created (replacing existing content):
+ .br
+ /etc/openldap/ldap.conf
+ .br
+-/etc/pki/ca-trust/source/ipa.p11-kit
++/etc/ca-certificates/trust-source/ipa.p11-kit
+ .TP
+ Files updated, existing content is maintained:
+ 
+@@ -272,7 +272,9 @@ Files updated, existing content is maintained:
+ .br
+ /etc/krb5.keytab
+ .br
+-/etc/sysconfig/network
++/etc/hostname
++.br
++/etc/conf.d/network
+ 
+ .TP
+ File updated, existing content is maintained if ssh is configured (default):
+diff --git a/ipaplatform/setup.py b/ipaplatform/setup.py
+index 0d4bb380f..8a1efa509 100644
+--- a/ipaplatform/setup.py
++++ b/ipaplatform/setup.py
+@@ -33,6 +33,7 @@ if __name__ == '__main__':
+         package_dir={'ipaplatform': ''},
+         packages=[
+             "ipaplatform",
++            "ipaplatform.arch",
+             "ipaplatform.base",
+             "ipaplatform.debian",
+             "ipaplatform.fedora",