URL: https://github.com/freeipa/freeipa/pull/916 Author: MartinBasti Title: #916: Py3 adtrust Action: opened
PR body: """ """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/916/head:pr916 git checkout pr916
From ac8b251b9b0c60f300ebd1afcd04b5adf8cbf55a Mon Sep 17 00:00:00 2001 From: Martin Basti <mba...@redhat.com> Date: Wed, 12 Jul 2017 17:29:30 +0200 Subject: [PATCH 1/2] py3: set samba dependencies Set proper python3 dependencies for samba package https://pagure.io/freeipa/issue/4985 --- freeipa.spec.in | 14 +++++++++++--- ipaserver/dcerpc.py | 3 --- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/freeipa.spec.in b/freeipa.spec.in index 72ce4ccc2c..0a56a038e6 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -208,8 +208,7 @@ BuildRequires: python2-jinja2 BuildRequires: python2-augeas %if 0%{?with_python3} -# FIXME: this depedency is missing - server will not work -#BuildRequires: python3-samba +BuildRequires: python3-samba # 1.6: x509.Name.rdns (https://github.com/pyca/cryptography/issues/3199) BuildRequires: python3-cryptography >= 1.6 BuildRequires: python3-gssapi >= 1.2.0 @@ -470,12 +469,21 @@ Summary: Virtual package to install packages required for Active Directory trust Group: System Environment/Base Requires: %{name}-server = %{version}-%{release} Requires: %{name}-common = %{version}-%{release} -Requires: samba-python + Requires: samba >= %{samba_version} Requires: samba-winbind Requires: libsss_idmap + +%if 0%{?with_python3} +Requires: python3-samba +Requires: python3-libsss_nss_idmap +Requires: python3-sss +%endif # with_python3 +# FIXME: put else here when py3 porting is done +Requires: samba-python Requires: python-libsss_nss_idmap Requires: python-sss + # We use alternatives to divert winbind_krb5_locator.so plugin to libkrb5 # on the installes where server-trust-ad subpackage is installed because # IPA AD trusts cannot be used at the same time with the locator plugin diff --git a/ipaserver/dcerpc.py b/ipaserver/dcerpc.py index d684a17cab..8b259ea595 100644 --- a/ipaserver/dcerpc.py +++ b/ipaserver/dcerpc.py @@ -37,8 +37,6 @@ import struct import random -# TODO: Remove pylint disable when Python 3 bindings are available. -# pylint: disable=import-error from samba import param from samba import credentials from samba.dcerpc import security, lsa, drsblobs, nbt, netlogon @@ -46,7 +44,6 @@ from samba import net from samba import arcfour_encrypt import samba -# pylint: enable=import-error import ldap as _ldap from ipapython import ipaldap From 0ca6e06952c3dc1ddc16b4d02c603525a069251e Mon Sep 17 00:00:00 2001 From: Martin Basti <mba...@redhat.com> Date: Thu, 13 Jul 2017 13:02:30 +0200 Subject: [PATCH 2/2] py3: ipa-adtrust-install under py3 by default ipa-adtrust-install works under py3 https://pagure.io/freeipa/issue/4985 --- freeipa.spec.in | 1 + 1 file changed, 1 insertion(+) diff --git a/freeipa.spec.in b/freeipa.spec.in index 0a56a038e6..2e92166a1b 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -878,6 +878,7 @@ find \ # TODO: workaround: some scripts are copied over, so the are always py2. # We have to explicitly set python3 here for ported files here PY3_SUBST_PATHS=' +install/tools/ipa-adtrust-install install/tools/ipa-backup install/tools/ipa-compat-manage install/tools/ipa-dns-install
_______________________________________________ FreeIPA-devel mailing list -- freeipa-devel@lists.fedorahosted.org To unsubscribe send an email to freeipa-devel-le...@lists.fedorahosted.org
