Update version.

3 files changed, 20 insertions, 79 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3a3ac2389ea9..4becc68aa93a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = freeipa
 	pkgdesc = The Identity, Policy and Audit system
-	pkgver = 4.9.8
+	pkgver = 4.9.9
 	pkgrel = 1
 	url = http://www.freeipa.org/
 	arch = i686
@@ -22,15 +22,12 @@ pkgbase = freeipa
 	makedepends = python-jinja
 	makedepends = python-pyasn1-modules
 	options = emptydirs
-	source = https://releases.pagure.org/freeipa/freeipa-4.9.8.tar.gz
-	source = platform.patch
+	source = https://releases.pagure.org/freeipa/freeipa-4.9.9.tar.gz
 	source = freeipa-client-update-sshd_config
 	source = freeipa-client-update-sshd_config.hook
 	source = nis-domainname.service
 	source = ipaplatform.tar.gz
-	validpgpkeys = 0E63D716D76AC080A4A33513F40800B6298EB963
-	sha256sums = 2fddaf6de41dfe244e25a3211f756491ffa8e657595b74388249d2287a601782
-	sha256sums = 4b3629f2733182f68b3d28c28f782773103b814c486cf4fdb15336163b08c82e
+	sha256sums = 4209b5e1cf99d2096dd002cc18f86ff951a941ac88e914d4bd18d567b61d10ab
 	sha256sums = 09894b521258983da988b6d78ed8d5370669ffb7d6a6e3cfbf0c0b8eda67f11b
 	sha256sums = 1e73f394d276357dcd578df7a349b1f381c9edc7b1c053ecf65f7a9255c0490d
 	sha256sums = 74a394af693e3677146eff18a770a4271fba961b2af93b15b8ae26157af1760a
@@ -39,7 +36,7 @@ pkgbase = freeipa
 pkgname = python-ipalib
 	pkgdesc = Python libraries used by IPA
 	arch = any
-	depends = freeipa-common=4.9.8-1
+	depends = freeipa-common=4.9.9-1
 	depends = python-gssapi>=1.2.0
 	depends = gnupg
 	depends = keyutils
@@ -59,15 +56,15 @@ pkgname = python-ipalib
 	depends = python-dnspython>=1.15
 	depends = python-netifaces>=0.10.4
 	depends = python-pyusb
-	provides = python-ipapython=4.9.8-1
-	provides = python-ipaplatform=4.9.8-1
+	provides = python-ipapython=4.9.9-1
+	provides = python-ipaplatform=4.9.9-1
 
 pkgname = python-ipaclient
 	pkgdesc = Python libraries used by IPA client
 	arch = any
-	depends = freeipa-client-common=4.9.8-1
-	depends = freeipa-common=4.9.8-1
-	depends = python-ipalib=4.9.8-1
+	depends = freeipa-client-common=4.9.9-1
+	depends = freeipa-common=4.9.9-1
+	depends = python-ipalib=4.9.9-1
 	depends = python-dnspython>=1.15
 	depends = python-jinja
 	optdepends = oddjob: mkhomedir support
@@ -85,9 +82,9 @@ pkgname = freeipa-client-common
 pkgname = freeipa-client
 	pkgdesc = IPA authentication for use on clients
 	install = freeipa-client.install
-	depends = freeipa-client-common=4.9.8-1
-	depends = freeipa-common=4.9.8-1
-	depends = python-ipaclient=4.9.8-1
+	depends = freeipa-client-common=4.9.9-1
+	depends = freeipa-common=4.9.9-1
+	depends = python-ipaclient=4.9.9-1
 	depends = python-augeas
 	depends = cyrus-sasl-gssapi
 	depends = ntp
diff --git a/PKGBUILD b/PKGBUILD
index a05c7503086e..1662e015a251 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@ pkgname=(python-ipalib
          freeipa-common
          freeipa-client-common
          freeipa-client)
-pkgver=4.9.8
+pkgver=4.9.9
 pkgrel=1
 pkgdesc='The Identity, Policy and Audit system'
 arch=('i686' 'x86_64')
@@ -33,15 +33,13 @@ makedepends=('openldap'
              'python-jinja'
              'python-pyasn1-modules')
 options=(emptydirs)
-validpgpkeys=('0E63D716D76AC080A4A33513F40800B6298EB963')
+#validpgpkeys=('0E63D716D76AC080A4A33513F40800B6298EB963')
 source=("https://releases.pagure.org/freeipa/freeipa-${pkgver}.tar.gz"
-        platform.patch
         freeipa-client-update-sshd_config
         freeipa-client-update-sshd_config.hook
         nis-domainname.service
         ipaplatform.tar.gz)
-sha256sums=('2fddaf6de41dfe244e25a3211f756491ffa8e657595b74388249d2287a601782'
-            '4b3629f2733182f68b3d28c28f782773103b814c486cf4fdb15336163b08c82e'
+sha256sums=('4209b5e1cf99d2096dd002cc18f86ff951a941ac88e914d4bd18d567b61d10ab'
             '09894b521258983da988b6d78ed8d5370669ffb7d6a6e3cfbf0c0b8eda67f11b'
             '1e73f394d276357dcd578df7a349b1f381c9edc7b1c053ecf65f7a9255c0490d'
             '74a394af693e3677146eff18a770a4271fba961b2af93b15b8ae26157af1760a'
@@ -52,7 +50,11 @@ prepare() {
 
     rm -rf ipaplatform/arch
 
-    patch -p1 -i "${srcdir}/platform.patch"
+    sed -i 's|/etc/sysconfig/autofs|/etc/autofs/autofs.conf|' 'client/man/ipa-client-automount.1'
+    sed -i 's|/etc/pki/ca-trust/source/ipa.p11-kit|/etc/ca-certificates/trust-source/ipa.p11-kit|' 'client/man/ipa-client-install.1'
+    sed -i 's|/etc/sysconfig/network|/etc/hostname\n.br\n/etc/conf.d/network|' 'client/man/ipa-client-install.1'
+    sed -i '/"ipaplatform.base"/a "ipaplatform.arch",' 'ipaplatform/setup.py'
+    
     tar xf "${srcdir}/ipaplatform.tar.gz"
 
     # Workaround: We want to build Python things twice. To be sure we do not mess
diff --git a/platform.patch b/platform.patch
deleted file mode 100644
index 4954c3f3c17e..000000000000
--- a/platform.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-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",