Updated: PKGBUILD

3 files changed, 27 insertions, 188 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f6189f720bd0..75a456960ffa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = freeipa
 	pkgdesc = The Identity, Policy and Audit system
 	pkgver = 4.8.6
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.freeipa.org/
 	arch = i686
 	arch = x86_64
@@ -13,37 +13,28 @@ pkgbase = freeipa
 	makedepends = gettext
 	makedepends = python
 	makedepends = python-setuptools
-	makedepends = python2
-	makedepends = python2-setuptools
 	makedepends = nspr
 	makedepends = nss
 	makedepends = openssl
 	makedepends = ding-libs
 	makedepends = libsasl
-	makedepends = python2-nss
-	makedepends = python2-pyasn1
-	makedepends = python2-pyasn1-modules
-	makedepends = python2-dnspython
-	makedepends = python2-six
 	makedepends = sssd>=1.13.0
-	makedepends = python2-cffi
 	makedepends = python-jinja
 	makedepends = python-pyasn1-modules
-	makedepends = python2-jinja
 	options = emptydirs
 	source = https://releases.pagure.org/freeipa/freeipa-4.8.6.tar.gz
 	source = 0001-platform-add-Arch-Linux-platform.patch
 	source = freeipa-client-update-sshd_config
 	source = freeipa-client-update-sshd_config.hook
 	sha256sums = 89df0d170e960d859512d2cdb601e99049bcb84423441d9b92a1cf47dd0a9d84
-	sha256sums = f30985cdc09070da6c935bc8e3b1f0d870f91766bf6ecdef41815386beccb369
+	sha256sums = 07571a3899e4403a404ffe2ad96816f9978dc4c8efc3204df9748784623f253b
 	sha256sums = 9fbac49fa4bc23afe0c4d575ea2795f1da435399289dbd04c5a3ac47580e2a0d
 	sha256sums = 1e73f394d276357dcd578df7a349b1f381c9edc7b1c053ecf65f7a9255c0490d
 
 pkgname = python-ipalib
 	pkgdesc = Python libraries used by IPA
 	arch = any
-	depends = freeipa-common=4.8.6-1
+	depends = freeipa-common=4.8.6-2
 	depends = python-gssapi>=1.2.0
 	depends = gnupg
 	depends = keyutils
@@ -64,55 +55,18 @@ pkgname = python-ipalib
 	depends = python-dnspython>=1.15
 	depends = python-netifaces>=0.10.4
 	depends = python-pyusb
-	provides = python-ipapython=4.8.6-1
-	provides = python-ipaplatform=4.8.6-1
+	provides = python-ipapython=4.8.6-2
+	provides = python-ipaplatform=4.8.6-2
 
 pkgname = python-ipaclient
 	pkgdesc = Python libraries used by IPA client
 	arch = any
-	depends = freeipa-client-common=4.8.6-1
-	depends = freeipa-common=4.8.6-1
-	depends = python-ipalib=4.8.6-1
+	depends = freeipa-client-common=4.8.6-2
+	depends = freeipa-common=4.8.6-2
+	depends = python-ipalib=4.8.6-2
 	depends = python-dnspython>=1.15
 	depends = python-jinja
 
-pkgname = python2-ipalib
-	pkgdesc = Python libraries used by IPA
-	arch = any
-	depends = freeipa-common=4.8.6-1
-	depends = python2-gssapi>=1.2.0
-	depends = gnupg
-	depends = keyutils
-	depends = python2>=2.7.9
-	depends = python2-nss>=0.16
-	depends = python2-cryptography>=1.4
-	depends = sssd
-	depends = python2-qrcode>=5.0.0
-	depends = python2-pyasn1
-	depends = python2-pyasn1-modules
-	depends = python2-dateutil
-	depends = python2-yubico>=1.2.3
-	depends = python2-dbus
-	depends = python2-setuptools
-	depends = python2-six
-	depends = python2-dnspython>=1.15
-	depends = python2-enum34
-	depends = python2-netifaces>=0.10.4
-	depends = python2-pyusb
-	provides = python2-ipapython=4.8.6-1
-	provides = python2-ipaplatform=4.8.6-1
-	conflicts = freeipa-python
-	replaces = freeipa-python
-
-pkgname = python2-ipaclient
-	pkgdesc = Python libraries used by IPA client
-	arch = any
-	depends = freeipa-client-common=4.8.6-1
-	depends = freeipa-common=4.8.6-1
-	depends = python2-ipalib=4.8.6-1
-	depends = python2-dnspython>=1.15
-	depends = python2-jinja
-
 pkgname = freeipa-common
 	pkgdesc = Common files used by IPA
 	arch = any
@@ -126,9 +80,9 @@ pkgname = freeipa-client-common
 pkgname = freeipa-client
 	pkgdesc = IPA authentication for use on clients
 	install = freeipa-client.install
-	depends = freeipa-client-common=4.8.6-1
-	depends = freeipa-common=4.8.6-1
-	depends = python2-ipaclient=4.8.6-1
+	depends = freeipa-client-common=4.8.6-2
+	depends = freeipa-common=4.8.6-2
+	depends = python-ipaclient=4.8.6-2
 	depends = python-augeas
 	depends = cyrus-sasl-gssapi
 	depends = ntp
@@ -142,7 +96,7 @@ pkgname = freeipa-client
 	depends = nss
 	depends = bind-tools
 	depends = oddjob
-	depends = python2-gssapi>=1.2.0
+	depends = python-gssapi>=1.2.0
 	depends = autofs
 	depends = nfsidmap
 	depends = nfs-utils
diff --git a/0001-platform-add-Arch-Linux-platform.patch b/0001-platform-add-Arch-Linux-platform.patch
index 420baecf153d..9b2f98282616 100644
--- a/0001-platform-add-Arch-Linux-platform.patch
+++ b/0001-platform-add-Arch-Linux-platform.patch
@@ -35,38 +35,28 @@ index 8b9989dec..2399250b1 100644
 +/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
-@@ -250,7 +250,7 @@ Files replaced if NTP is enabled:
- 
- /etc/ntp.conf
- .br
--/etc/sysconfig/ntpd
-+/etc/conf.d/ntpd.conf
- .br
- /etc/ntp/step\-tickers
- .TP
-@@ -272,7 +272,7 @@ Files updated, existing content is maintained:
+@@ -270,6 +270,6 @@ Files updated, existing content is maintained:
  .br
  /etc/krb5.keytab
  .br
 -/etc/sysconfig/network
 +/etc/hostname
- .SH "EXIT STATUS"
- 0 if the installation was successful
- 
+
+ .TP
 diff --git a/ipaplatform/arch/__init__.py b/ipaplatform/arch/__init__.py
 new file mode 100644
 index 000000000..9da42e7b4
@@ -197,4 +187,3 @@ index 501e2bc56..b47875164 100644
              "ipaplatform.fedora",
 -- 
 2.13.3
-
diff --git a/PKGBUILD b/PKGBUILD
index 0a729c49471f..b0bcd5a0a6f4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,16 @@
-# Maintainer: Jan Cholasta <grubber at grubber cz>
+# Maintainer: Felix Golatofski <contact@xdfr.de>
+# Contributor: EoleDev
+# Contributor: Jan Cholasta <grubber at grubber cz>
 # Contributor: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
 
 pkgbase=freeipa
 pkgname=(python-ipalib
          python-ipaclient
-         python2-ipalib
-         python2-ipaclient
          freeipa-common
          freeipa-client-common
          freeipa-client)
 pkgver=4.8.6
-pkgrel=1
+pkgrel=2
 pkgdesc='The Identity, Policy and Audit system'
 arch=('i686' 'x86_64')
 url='http://www.freeipa.org/'
@@ -22,30 +22,21 @@ makedepends=('openldap'
              'gettext'
              'python'
              'python-setuptools'
-             'python2'
-             'python2-setuptools'
              'nspr'
              'nss'
              'openssl'
              'ding-libs'
              'libsasl'
-             'python2-nss'
-             'python2-pyasn1'
-             'python2-pyasn1-modules'
-             'python2-dnspython'
-             'python2-six'
              'sssd>=1.13.0'
-             'python2-cffi'
              'python-jinja'
-             'python-pyasn1-modules'
-             'python2-jinja')
+             'python-pyasn1-modules')
 options=(emptydirs)
 source=("https://releases.pagure.org/freeipa/freeipa-${pkgver}.tar.gz"
         0001-platform-add-Arch-Linux-platform.patch
         freeipa-client-update-sshd_config
         freeipa-client-update-sshd_config.hook)
 sha256sums=('89df0d170e960d859512d2cdb601e99049bcb84423441d9b92a1cf47dd0a9d84'
-            'f30985cdc09070da6c935bc8e3b1f0d870f91766bf6ecdef41815386beccb369'
+            '07571a3899e4403a404ffe2ad96816f9978dc4c8efc3204df9748784623f253b'
             '9fbac49fa4bc23afe0c4d575ea2795f1da435399289dbd04c5a3ac47580e2a0d'
             '1e73f394d276357dcd578df7a349b1f381c9edc7b1c053ecf65f7a9255c0490d')
 
@@ -64,26 +55,6 @@ prepare() {
 build() {
     cd freeipa-${pkgver}
 
-    export PYTHON=/usr/bin/python2
-    # Workaround: make sure all shebangs are pointing to Python 2
-    # This should be solved properly using setuptools
-    # and this hack should be removed.
-    find \
-        ! -name '*.pyc' -a \
-        ! -name '*.pyo' -a \
-        -type f -exec grep -qsm1 '^#!.*\bpython' {} \; \
-        -exec sed -i -e '1 s|^#!.*\bpython[^ ]*|#!/usr/bin/python2|' {} \;
-    ./configure --prefix=/usr \
-                --sysconfdir=/etc \
-                --sbindir=/usr/bin \
-                --with-vendor-suffix=-arch-${pkgrel} \
-                --disable-server \
-                --without-ipatests \
-                --disable-pylint --without-jslint
-
-    make
-
-    pushd ../freeipa-${pkgver}-python3
     export PYTHON=/usr/bin/python3
     # Workaround: make sure all shebangs are pointing to Python 3
     # This should be solved properly using setuptools
@@ -100,8 +71,6 @@ build() {
                 --disable-server \
                 --without-ipatests \
                 --disable-pylint --without-jslint
-    popd
-
     mkdir -p ../install
 
     # Please put as much logic as possible into make install. It allows:
@@ -119,12 +88,10 @@ build() {
     # Python 3 installation needs to be done first. Subsequent Python 2 install
     # will overwrite /usr/bin/ipa and other scripts with variants using
     # python2 shebang.
-    pushd ../freeipa-${pkgver}-python3
     (cd ipaclient && make install DESTDIR=../../install)
     (cd ipalib && make install DESTDIR=../../install)
     (cd ipaplatform && make install DESTDIR=../../install)
     (cd ipapython && make install DESTDIR=../../install)
-    popd
 
     # Python 2 installation
     make install DESTDIR="$PWD"/../install
@@ -211,77 +178,6 @@ package_python-ipaclient() {
     done
 }
 
-package_python2-ipalib() {
-    pkgdesc='Python libraries used by IPA'
-    arch=('any')
-    depends=("freeipa-common=$pkgver-$pkgrel"
-             'python2-gssapi>=1.2.0'
-             'gnupg'
-             'keyutils'
-             'python2>=2.7.9'
-             'python2-nss>=0.16'
-             'python2-cryptography>=1.4'
-             'sssd'
-             'python2-qrcode>=5.0.0'
-             'python2-pyasn1'
-             'python2-pyasn1-modules'
-             'python2-dateutil'
-             'python2-yubico>=1.2.3'
-             'python2-dbus'
-             'python2-setuptools'
-             'python2-six'
-             'python2-dnspython>=1.15'
-             'python2-enum34'
-             'python2-netifaces>=0.10.4'
-             'python2-pyusb')
-    provides=("python2-ipapython=$pkgver-$pkgrel"
-              "python2-ipaplatform=$pkgver-$pkgrel")
-    conflicts=('freeipa-python')
-    replaces=('freeipa-python')
-
-    cd freeipa-${pkgver}
-
-    install -D -m644 -t"$pkgdir"/usr/share/doc/$pkgname README.md \
-                                                        Contributors.txt
-
-    local _file
-    for _file in ../install/usr/lib/python2.*/site-packages/ipapython \
-                 ../install/usr/lib/python2.*/site-packages/ipalib \
-                 ../install/usr/lib/python2.*/site-packages/ipaplatform \
-                 ../install/usr/lib/python2.*/site-packages/ipapython-*.egg-info \
-                 ../install/usr/lib/python2.*/site-packages/ipalib-*.egg-info \
-                 ../install/usr/lib/python2.*/site-packages/ipaplatform-*.egg-info
-    do
-        _file="${_file#../install/}"
-        mkdir -p "$pkgdir"/"${_file%/*}"
-        mv ../install/"$_file" "$pkgdir"/"$_file"
-    done
-}
-
-package_python2-ipaclient() {
-    pkgdesc='Python libraries used by IPA client'
-    arch=('any')
-    depends=("freeipa-client-common=$pkgver-$pkgrel"
-             "freeipa-common=$pkgver-$pkgrel"
-             "python2-ipalib=$pkgver-$pkgrel"
-             'python2-dnspython>=1.15'
-             'python2-jinja')
-
-    cd freeipa-${pkgver}
-
-    install -D -m644 -t"$pkgdir"/usr/share/doc/$pkgname README.md \
-                                                        Contributors.txt
-
-    local _file
-    for _file in ../install/usr/lib/python2.*/site-packages/ipaclient \
-                 ../install/usr/lib/python2.*/site-packages/ipaclient-*.egg-info
-    do
-        _file="${_file#../install/}"
-        mkdir -p "$pkgdir"/"${_file%/*}"
-        mv ../install/"$_file" "$pkgdir"/"$_file"
-    done
-}
-
 package_freeipa-common() {
     pkgdesc='Common files used by IPA'
     arch=('any')
@@ -328,7 +224,7 @@ package_freeipa-client() {
     pkgdesc='IPA authentication for use on clients'
     depends=("freeipa-client-common=$pkgver-$pkgrel"
              "freeipa-common=$pkgver-$pkgrel"
-             "python2-ipaclient=$pkgver-$pkgrel"
+             "python-ipaclient=$pkgver-$pkgrel"
              'python-augeas'
              'cyrus-sasl-gssapi'
              'ntp'
@@ -342,7 +238,7 @@ package_freeipa-client() {
              'nss'
              'bind-tools'
              'oddjob'
-             'python2-gssapi>=1.2.0'
+             'python-gssapi>=1.2.0'
              'autofs'
              'nfsidmap'
              'nfs-utils')