[Freeipa-devel] [bind-dyndb-ldap PR#1] [WIP] Port bind-dyndb-ldap to BIND 9.11 (synchronize)
LIBDNS_VERSION_MAJOR < 140 */ -#if LIBDNS_VERSION_MAJOR >= 140 rpz_attach, rpz_ready, -#endif /* LIBDNS_VERSION_MAJOR >= 140 */ -#if LIBDNS_VERSION_MAJOR >= 90 findnodeext, findext, -#endif /* LIBDNS_VERSION_MAJOR >= 90 */ -#if LIBDNS_VERSION_MAJOR >= 140 setcachestats, hashsize -#endif /* LIBDNS_VERSION_MAJOR >= 140 */ }; isc_result_t ATTR_NONNULLS From 958b759234b00123328c8eb7c2efdc4b684121d6 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Mon, 15 Aug 2016 18:13:15 +0200 Subject: [PATCH 2/9] BIND 9.11: Add wrapper for new DB API method nodefullname. --- src/ldap_driver.c | 13 - 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/ldap_driver.c b/src/ldap_driver.c index 930489e..5d67cda 100644 --- a/src/ldap_driver.c +++ b/src/ldap_driver.c @@ -809,6 +809,16 @@ hashsize(dns_db_t *db) return dns_db_hashsize(ldapdb->rbtdb); } +isc_result_t +nodefullname(dns_db_t *db, dns_dbnode_t *node, dns_name_t *name) +{ + ldapdb_t *ldapdb = (ldapdb_t *) db; + + REQUIRE(VALID_LDAPDB(ldapdb)); + + return dns_db_nodefullname(ldapdb->rbtdb, node, name); +} + static dns_dbmethods_t ldapdb_methods = { attach, detach, @@ -852,7 +862,8 @@ static dns_dbmethods_t ldapdb_methods = { findnodeext, findext, setcachestats, - hashsize + hashsize, + nodefullname }; isc_result_t ATTR_NONNULLS From 5e9b5665013f7f8c1227d747cf184d2957eea21c Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Mon, 15 Aug 2016 19:18:11 +0200 Subject: [PATCH 3/9] BIND 9.11: Port to new dyndb API. This is first step which allows the plugin to run. It requires configuration in format dyndb { {option1 value} {option2 value} }; This will be improved in another patch. --- README | 28 +++ configure.ac| 2 +- src/Makefile.am | 2 - src/ldap_driver.c | 135 -- src/ldap_driver.h | 8 +- src/ldap_helper.c | 98 +++-- src/ldap_helper.h | 6 +- src/settings.c | 6 +- src/settings.h | 2 +- src/syncrepl.c | 28 +++ src/syncrepl.h | 2 +- src/types.h | 2 +- src/zone_manager.c | 205 src/zone_manager.h | 29 src/zone_register.c | 11 +-- 15 files changed, 180 insertions(+), 384 deletions(-) delete mode 100644 src/zone_manager.c delete mode 100644 src/zone_manager.h diff --git a/README b/README index 2fd09b5..e90fc26 100644 --- a/README +++ b/README @@ -2,15 +2,9 @@ === The dynamic LDAP back-end is a plug-in for BIND that provides an LDAP -database back-end capabilities. For now, it requires that BIND is patched -to support dynamic loading of database back-ends. You can get a patch -for your version here: +database back-end capabilities. It requires dyndb interface which is present +in BIND versions >= 9.11.0rc1. - https://github.com/pspacek/bind-dynamic_db - -Hopefully, the patch will once be included in the official BIND release. - -BIND >= 9.9.0 is required. 2. Features === @@ -309,19 +303,17 @@ Attributes: 5. Configuration -To configure dynamic loading of back-end, you must put a "dynamic-db" +To configure dynamic loading of back-end, you must put a "dyndb" clause into your named.conf. The clause must then be followed by a -string denoting the name. The name is not that much important, it is -passed to the plug-in and might be used for example, for logging -purposes. Following after that is a set of options enclosed between -curly brackets. +string denoting the name of the instance and path to dyndb library. -The most important option here is "library". It names a shared object -file that will be opened and loaded. The "arg" option specifies a string -that is passed directly to the plugin. You can specify multiple "arg" -options. The LDAP back-end follows the convention that the first word of -this string is the name of the setting and the rest is the value. +The name is not that much important, it is passed to the plug-in +and is used for logging purposes and for naming working directories. +Library path must point to a shared object file that will be opened and loaded. + +Name and library path have to be followed by set of options enclosed between +curly brackets. 5.1 Configuration options - diff --git a/configure.ac b/configure.ac index 9b26058..0311560 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_INIT([bind-dyndb-ldap], [10.1], [freeipa-devel@redhat.com]) AM_INIT_AUTOMAKE([-Wall foreign dist-bzip2]) -AC_CONFIG_SRCDIR([src/zone_manager.h]) +AC_CONFIG_SRCDIR([src/ldap_driver.c]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/src/Makefile.am b/src/Makefile.am index c5de9ce..e1e3968 100644 --- a/src/Makefile.am +++ b/src/Makefile.a
[Freeipa-devel] [bind-dyndb-ldap PR#1] Port bind-dyndb-ldap to BIND 9.11 (edited)
pspacek's pull request #1: "Port bind-dyndb-ldap to BIND 9.11" was edited See the full pull-request at https://github.com/freeipa/bind-dyndb-ldap/pull/1 ... or pull the PR as Git branch: git remote add ghbind-dyndb-ldap https://github.com/freeipa/bind-dyndb-ldap git fetch ghbind-dyndb-ldap pull/1/head:pr1 git checkout pr1 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [bind-dyndb-ldap PR#1] [WIP] Port bind-dyndb-ldap to BIND 9.11 (synchronize)
LIBDNS_VERSION_MAJOR < 140 */ -#if LIBDNS_VERSION_MAJOR >= 140 rpz_attach, rpz_ready, -#endif /* LIBDNS_VERSION_MAJOR >= 140 */ -#if LIBDNS_VERSION_MAJOR >= 90 findnodeext, findext, -#endif /* LIBDNS_VERSION_MAJOR >= 90 */ -#if LIBDNS_VERSION_MAJOR >= 140 setcachestats, hashsize -#endif /* LIBDNS_VERSION_MAJOR >= 140 */ }; isc_result_t ATTR_NONNULLS From 958b759234b00123328c8eb7c2efdc4b684121d6 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Mon, 15 Aug 2016 18:13:15 +0200 Subject: [PATCH 2/8] BIND 9.11: Add wrapper for new DB API method nodefullname. --- src/ldap_driver.c | 13 - 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/ldap_driver.c b/src/ldap_driver.c index 930489e..5d67cda 100644 --- a/src/ldap_driver.c +++ b/src/ldap_driver.c @@ -809,6 +809,16 @@ hashsize(dns_db_t *db) return dns_db_hashsize(ldapdb->rbtdb); } +isc_result_t +nodefullname(dns_db_t *db, dns_dbnode_t *node, dns_name_t *name) +{ + ldapdb_t *ldapdb = (ldapdb_t *) db; + + REQUIRE(VALID_LDAPDB(ldapdb)); + + return dns_db_nodefullname(ldapdb->rbtdb, node, name); +} + static dns_dbmethods_t ldapdb_methods = { attach, detach, @@ -852,7 +862,8 @@ static dns_dbmethods_t ldapdb_methods = { findnodeext, findext, setcachestats, - hashsize + hashsize, + nodefullname }; isc_result_t ATTR_NONNULLS From 5e9b5665013f7f8c1227d747cf184d2957eea21c Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Mon, 15 Aug 2016 19:18:11 +0200 Subject: [PATCH 3/8] BIND 9.11: Port to new dyndb API. This is first step which allows the plugin to run. It requires configuration in format dyndb { {option1 value} {option2 value} }; This will be improved in another patch. --- README | 28 +++ configure.ac| 2 +- src/Makefile.am | 2 - src/ldap_driver.c | 135 -- src/ldap_driver.h | 8 +- src/ldap_helper.c | 98 +++-- src/ldap_helper.h | 6 +- src/settings.c | 6 +- src/settings.h | 2 +- src/syncrepl.c | 28 +++ src/syncrepl.h | 2 +- src/types.h | 2 +- src/zone_manager.c | 205 src/zone_manager.h | 29 src/zone_register.c | 11 +-- 15 files changed, 180 insertions(+), 384 deletions(-) delete mode 100644 src/zone_manager.c delete mode 100644 src/zone_manager.h diff --git a/README b/README index 2fd09b5..e90fc26 100644 --- a/README +++ b/README @@ -2,15 +2,9 @@ === The dynamic LDAP back-end is a plug-in for BIND that provides an LDAP -database back-end capabilities. For now, it requires that BIND is patched -to support dynamic loading of database back-ends. You can get a patch -for your version here: +database back-end capabilities. It requires dyndb interface which is present +in BIND versions >= 9.11.0rc1. - https://github.com/pspacek/bind-dynamic_db - -Hopefully, the patch will once be included in the official BIND release. - -BIND >= 9.9.0 is required. 2. Features === @@ -309,19 +303,17 @@ Attributes: 5. Configuration -To configure dynamic loading of back-end, you must put a "dynamic-db" +To configure dynamic loading of back-end, you must put a "dyndb" clause into your named.conf. The clause must then be followed by a -string denoting the name. The name is not that much important, it is -passed to the plug-in and might be used for example, for logging -purposes. Following after that is a set of options enclosed between -curly brackets. +string denoting the name of the instance and path to dyndb library. -The most important option here is "library". It names a shared object -file that will be opened and loaded. The "arg" option specifies a string -that is passed directly to the plugin. You can specify multiple "arg" -options. The LDAP back-end follows the convention that the first word of -this string is the name of the setting and the rest is the value. +The name is not that much important, it is passed to the plug-in +and is used for logging purposes and for naming working directories. +Library path must point to a shared object file that will be opened and loaded. + +Name and library path have to be followed by set of options enclosed between +curly brackets. 5.1 Configuration options - diff --git a/configure.ac b/configure.ac index 9b26058..0311560 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_INIT([bind-dyndb-ldap], [10.1], [freeipa-devel@redhat.com]) AM_INIT_AUTOMAKE([-Wall foreign dist-bzip2]) -AC_CONFIG_SRCDIR([src/zone_manager.h]) +AC_CONFIG_SRCDIR([src/ldap_driver.c]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/src/Makefile.am b/src/Makefile.am index c5de9ce..e1e3968 100644 --- a/src/Makefile.am +++ b/src/Makefile.a
[Freeipa-devel] [freeipa PR#36] Fix tests for forward zones (opened)
pspacek's pull request #36: "Fix tests for forward zones" was opened PR body: """ """ See the full pull-request at https://github.com/freeipa/freeipa/pull/36 ... or pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/36/head:pr36 git checkout pr36 freeipa-pr-36.patch Description: application/text/diff -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#25] Added install check before executing ipa-* command (comment)
pspacek commented on a pull request """ All this is consequence of nonsensical defaults in ipalib.constants module. I would say that this needs to be fixed in a systematic way and not by scattering ifs around. IMHO we need to drop nonsensical defaults form ipalib.constants module and handle missing values in API initialization. We should throw out exception if API cannot be initialized because of missing values (and/or failing auto-detection, depending on parameters in constructor) instead of scattering ifs around. For example: Right now the only way to trigger server auto-selection using DNS SRV record is to delete server= definition from default.conf. Of course, it is broken and it tries localhost first and fallbacks to auto-detected server after that, but it works somehow. If we scatter ifs around it will break in some other interesting way. I'm still waiting for branching ipa-4-4. After that I can send my patch which removes some of crazy defaults from ipalib.constants. """ See the full comment at https://github.com/freeipa/freeipa/pull/25#issuecomment-243374973 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#111][+ack] Prompt for forwarder in dnsforwardzone-add
URL: https://github.com/freeipa/freeipa/pull/111 Title: #111: Prompt for forwarder in dnsforwardzone-add Label: +ack -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#113][opened] ipalib.constants: Remove default domain, realm, basedn, xmlrpc_uri, ldap_uri
URL: https://github.com/freeipa/freeipa/pull/113 Author: pspacek Title: #113: ipalib.constants: Remove default domain, realm, basedn, xmlrpc_uri, ldap_uri Action: opened PR body: """ Domain, realm, basedn, xmlrpc_uri, ldap_uri do not have any reasonable default. This patch removes hardcoded default so the so the code which depends on these values blows up early and does not do crazy stuff with default values instead of real ones. This should help to uncover issues caused by improper ipalib initialization. It will surely break something but right now, at the beginning of devel cycle, is IMHO the right time to do change like this and to remove some old cruft. """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/113/head:pr113 git checkout pr113 From c00bdcbfcb64753397b8b33b1973072602ac9700 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Tue, 10 May 2016 14:20:15 +0200 Subject: [PATCH] ipalib.constants: Remove default domain, realm, basedn, xmlrpc_uri, ldap_uri Domain, realm, basedn, xmlrpc_uri, ldap_uri do not have any reasonable default. This patch removes hardcoded default so the so the code which depends on these values blows up early and does not do crazy stuff with default values instead of real ones. This should help to uncover issues caused by improper ipalib initialization. --- ipalib/constants.py | 16 +++- makeaci | 3 +++ makeapi | 6 ++ 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/ipalib/constants.py b/ipalib/constants.py index c423117..aab903d 100644 --- a/ipalib/constants.py +++ b/ipalib/constants.py @@ -71,9 +71,12 @@ ('version', VERSION), # Domain, realm, basedn: -('domain', 'example.com'), -('realm', 'EXAMPLE.COM'), -('basedn', DN(('dc', 'example'), ('dc', 'com'))), +# Following values do not have any reasonable default. +# Do not initialize them so the code which depends on them blows up early +# and does not do crazy stuff with default values instead of real ones. +# ('domain', 'example.com'), +# ('realm', 'EXAMPLE.COM'), +# ('basedn', DN(('dc', 'example'), ('dc', 'com'))), # LDAP containers: ('container_accounts', DN(('cn', 'accounts'))), @@ -127,9 +130,12 @@ ('container_custodia', DN(('cn', 'custodia'), ('cn', 'ipa'), ('cn', 'etc'))), # Ports, hosts, and URIs: -('xmlrpc_uri', 'http://localhost:/ipa/xml'), +# Following values do not have any reasonable default. +# Do not initialize them so the code which depends on them blows up early +# and does not do crazy stuff with default values instead of real ones. +# ('xmlrpc_uri', 'http://localhost:/ipa/xml'), # jsonrpc_uri is set in Env._finalize_core() -('ldap_uri', 'ldap://localhost:389'), +# ('ldap_uri', 'ldap://localhost:389'), ('rpc_protocol', 'jsonrpc'), diff --git a/makeaci b/makeaci index 6673112..758dd67 100755 --- a/makeaci +++ b/makeaci @@ -96,6 +96,9 @@ def main(options): plugins_on_demand=False, basedn=DN('dc=ipa,dc=example'), realm='IPA.EXAMPLE', +domain="example.com", +xmlrpc_uri="http://localhost:/ipa/xml;, +ldap_uri="ldap://localhost:389;, ) from ipaserver.install.plugins import update_managed_permissions diff --git a/makeapi b/makeapi index 515dd6e..e2820b2 100755 --- a/makeapi +++ b/makeapi @@ -37,6 +37,7 @@ from ipalib.parameters import Param from ipalib.output import Output from ipalib.text import Gettext, NGettext, ConcatenatedLazyText from ipalib.capabilities import capabilities +from ipapython.dn import DN API_FILE='API.txt' @@ -510,6 +511,11 @@ def main(): enable_ra=True, mode='developer', plugins_on_demand=False, +basedn=DN(('dc', 'example'), ('dc', 'com')), +realm="EXAMPLE.COM", +domain="example.com", +xmlrpc_uri="http://localhost:/ipa/xml;, +ldap_uri="ldap://localhost:389;, ) api.bootstrap(**cfg) -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#114][opened] Raise errors from service.py:_ldap_mod() by default
URL: https://github.com/freeipa/freeipa/pull/114 Author: pspacek Title: #114: Raise errors from service.py:_ldap_mod() by default Action: opened PR body: """ This is to prevent situations when installer prints CRITICAL Failed to load ldif and continues just to crash later on because of non-existing LDAP container or so on. Beginning of devel cycle is the right time to fix this so we have time to uncover potential regressions and fix long hidden bugs. """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/114/head:pr114 git checkout pr114 From a19729603deee5a5b015cd82fb060ac814812120 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Tue, 26 Apr 2016 19:42:00 +0200 Subject: [PATCH] Raise errors from service.py:_ldap_mod() by default This is to prevent situations when installer prints CRITICAL Failed to load ldif and continues just to crash later on because of non-existing LDAP container or so on. --- ipaserver/install/service.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ipaserver/install/service.py b/ipaserver/install/service.py index 057cd3d..88332aa 100644 --- a/ipaserver/install/service.py +++ b/ipaserver/install/service.py @@ -185,7 +185,7 @@ def ldap_disconnect(self): self.admin_conn.unbind() self.admin_conn = None -def _ldap_mod(self, ldif, sub_dict=None, raise_on_err=False): +def _ldap_mod(self, ldif, sub_dict=None, raise_on_err=True): pw_name = None fd = None path = ipautil.SHARE_DIR + ldif @@ -229,9 +229,9 @@ def _ldap_mod(self, ldif, sub_dict=None, raise_on_err=False): try: ipautil.run(args, nolog=nologlist) except ipautil.CalledProcessError as e: +root_logger.critical("Failed to load %s: %s" % (ldif, str(e))) if raise_on_err: raise -root_logger.critical("Failed to load %s: %s" % (ldif, str(e))) finally: if pw_name: os.remove(pw_name) -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#98][+ack] Make server uninstaller exit with non-zero exit status during failed validation
URL: https://github.com/freeipa/freeipa/pull/98 Title: #98: Make server uninstaller exit with non-zero exit status during failed validation Label: +ack -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#98][comment] Make server uninstaller exit with non-zero exit status during failed validation
URL: https://github.com/freeipa/freeipa/pull/98 Title: #98: Make server uninstaller exit with non-zero exit status during failed validation pspacek commented: """ Works for me! """ See the full comment at https://github.com/freeipa/freeipa/pull/98#issuecomment-249383672 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#138][+ack] Fix ipa-cacert-manage man page
URL: https://github.com/freeipa/freeipa/pull/138 Title: #138: Fix ipa-cacert-manage man page Label: +ack -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#25][comment] Added install check before executing ipa-* command
URL: https://github.com/freeipa/freeipa/pull/25 Title: #25: Added install check before executing ipa-* command pspacek commented: """ Let's wait for https://github.com/freeipa/freeipa/pull/113 . We will see if it improves things or not. """ See the full comment at https://github.com/freeipa/freeipa/pull/25#issuecomment-251720756 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#134][synchronized] DNS URI support
URL: https://github.com/freeipa/freeipa/pull/134 Author: pspacek Title: #134: DNS URI support Action: synchronized To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/134/head:pr134 git checkout pr134 From f0a86bd9885128a169834fcf9085dbc23727c1bf Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Wed, 28 Sep 2016 15:20:43 +0200 Subject: [PATCH 1/3] DNS: Support URI resource record type https://fedorahosted.org/freeipa/ticket/6344 --- ACI.txt | 4 +- API.txt | 19 +-- install/share/60ipadns.ldif | 3 +- install/share/dns.ldif | 2 +- install/ui/src/freeipa/dns.js | 15 +- ipaserver/plugins/dns.py| 51 +-- ipatests/test_xmlrpc/test_dns_plugin.py | 89 + 7 files changed, 171 insertions(+), 12 deletions(-) diff --git a/ACI.txt b/ACI.txt index fddd598..0b47489 100644 --- a/ACI.txt +++ b/ACI.txt @@ -73,13 +73,13 @@ aci: (targetattr = "ipaprivatekey || ipapublickey || ipasecretkey || ipasecretke dn: dc=ipa,dc=example aci: (targetattr = "cn || idnssecalgorithm || idnsseckeyactivate || idnsseckeycreated || idnsseckeydelete || idnsseckeyinactive || idnsseckeypublish || idnsseckeyref || idnsseckeyrevoke || idnsseckeysep || idnsseckeyzone || objectclass")(target = "ldap:///cn=dns,dc=ipa,dc=example;)(targetfilter = "(objectclass=idnsSecKey)")(version 3.0;acl "permission:System: Manage DNSSEC metadata";allow (all) groupdn = "ldap:///cn=System: Manage DNSSEC metadata,cn=permissions,cn=pbac,dc=ipa,dc=example";) dn: dc=ipa,dc=example -aci: (targetattr = "a6record || record || afsdbrecord || aplrecord || arecord || certrecord || cn || cnamerecord || createtimestamp || dhcidrecord || dlvrecord || dnamerecord || dnsclass || dnsdefaultttl || dnsttl || dsrecord || entryusn || hinforecord || hiprecord || idnsallowdynupdate || idnsallowquery || idnsallowsyncptr || idnsallowtransfer || idnsforwarders || idnsforwardpolicy || idnsname || idnssecinlinesigning || idnssoaexpire || idnssoaminimum || idnssoamname || idnssoarefresh || idnssoaretry || idnssoarname || idnssoaserial || idnstemplateattribute || idnsupdatepolicy || idnszoneactive || ipseckeyrecord || keyrecord || kxrecord || locrecord || managedby || mdrecord || minforecord || modifytimestamp || mxrecord || naptrrecord || nsec3paramrecord || nsecrecord || nsrecord || nxtrecord || objectclass || ptrrecord || rprecord || rrsigrecord || sigrecord || spfrecord || srvrecord || sshfprecord || tlsarecord || txtrecord || unknownrecord")(target = "ldap:///idnsname=*,cn=dns,dc=ipa,dc=example;)(version 3.0;acl "permission:System: Read DNS Entries";allow (compare,read,search) groupdn = "ldap:///cn=System: Read DNS Entries,cn=permissions,cn=pbac,dc=ipa,dc=example";) +aci: (targetattr = "a6record || record || afsdbrecord || aplrecord || arecord || certrecord || cn || cnamerecord || createtimestamp || dhcidrecord || dlvrecord || dnamerecord || dnsclass || dnsdefaultttl || dnsttl || dsrecord || entryusn || hinforecord || hiprecord || idnsallowdynupdate || idnsallowquery || idnsallowsyncptr || idnsallowtransfer || idnsforwarders || idnsforwardpolicy || idnsname || idnssecinlinesigning || idnssoaexpire || idnssoaminimum || idnssoamname || idnssoarefresh || idnssoaretry || idnssoarname || idnssoaserial || idnstemplateattribute || idnsupdatepolicy || idnszoneactive || ipseckeyrecord || keyrecord || kxrecord || locrecord || managedby || mdrecord || minforecord || modifytimestamp || mxrecord || naptrrecord || nsec3paramrecord || nsecrecord || nsrecord || nxtrecord || objectclass || ptrrecord || rprecord || rrsigrecord || sigrecord || spfrecord || srvrecord || sshfprecord || tlsarecord || txtrecord || unknownrecord || urirecord")(target = "ldap:///idnsname=*,cn=dns,dc=ipa,dc=example;)(version 3.0;acl "permission:System: Read DNS Entries";allow (compare,read,search) groupdn = "ldap:///cn=System: Read DNS Entries,cn=permissions,cn=pbac,dc=ipa,dc=example";) dn: dc=ipa,dc=example aci: (targetattr = "cn || createtimestamp || entryusn || idnssecalgorithm || idnsseckeyactivate || idnsseckeycreated || idnsseckeydelete || idnsseckeyinactive || idnsseckeypublish || idnsseckeyref || idnsseckeyrevoke || idnsseckeysep || idnsseckeyzone || modifytimestamp || objectclass")(target = "ldap:///cn=dns,dc=ipa,dc=example;)(targetfilter = "(objectclass=idnsSecKey)")(version 3.0;acl "permission:System: Read DNSSEC metadata";allow (compare,read,search) groupdn = "ldap:///cn=System: Read DNSSEC metadata,cn=permissions,cn=pbac,dc=ipa,dc=example";) dn: dc=ipa,dc=example aci: (target = "ldap:///idnsname=*,cn=dns,dc=ipa,dc=example;)(version 3.0;acl "permission:System:
[Freeipa-devel] [freeipa PR#134][synchronized] DNS URI support
URL: https://github.com/freeipa/freeipa/pull/134 Author: pspacek Title: #134: DNS URI support Action: synchronized To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/134/head:pr134 git checkout pr134 From f0a86bd9885128a169834fcf9085dbc23727c1bf Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Wed, 28 Sep 2016 15:20:43 +0200 Subject: [PATCH 1/3] DNS: Support URI resource record type https://fedorahosted.org/freeipa/ticket/6344 --- ACI.txt | 4 +- API.txt | 19 +-- install/share/60ipadns.ldif | 3 +- install/share/dns.ldif | 2 +- install/ui/src/freeipa/dns.js | 15 +- ipaserver/plugins/dns.py| 51 +-- ipatests/test_xmlrpc/test_dns_plugin.py | 89 + 7 files changed, 171 insertions(+), 12 deletions(-) diff --git a/ACI.txt b/ACI.txt index fddd598..0b47489 100644 --- a/ACI.txt +++ b/ACI.txt @@ -73,13 +73,13 @@ aci: (targetattr = "ipaprivatekey || ipapublickey || ipasecretkey || ipasecretke dn: dc=ipa,dc=example aci: (targetattr = "cn || idnssecalgorithm || idnsseckeyactivate || idnsseckeycreated || idnsseckeydelete || idnsseckeyinactive || idnsseckeypublish || idnsseckeyref || idnsseckeyrevoke || idnsseckeysep || idnsseckeyzone || objectclass")(target = "ldap:///cn=dns,dc=ipa,dc=example;)(targetfilter = "(objectclass=idnsSecKey)")(version 3.0;acl "permission:System: Manage DNSSEC metadata";allow (all) groupdn = "ldap:///cn=System: Manage DNSSEC metadata,cn=permissions,cn=pbac,dc=ipa,dc=example";) dn: dc=ipa,dc=example -aci: (targetattr = "a6record || record || afsdbrecord || aplrecord || arecord || certrecord || cn || cnamerecord || createtimestamp || dhcidrecord || dlvrecord || dnamerecord || dnsclass || dnsdefaultttl || dnsttl || dsrecord || entryusn || hinforecord || hiprecord || idnsallowdynupdate || idnsallowquery || idnsallowsyncptr || idnsallowtransfer || idnsforwarders || idnsforwardpolicy || idnsname || idnssecinlinesigning || idnssoaexpire || idnssoaminimum || idnssoamname || idnssoarefresh || idnssoaretry || idnssoarname || idnssoaserial || idnstemplateattribute || idnsupdatepolicy || idnszoneactive || ipseckeyrecord || keyrecord || kxrecord || locrecord || managedby || mdrecord || minforecord || modifytimestamp || mxrecord || naptrrecord || nsec3paramrecord || nsecrecord || nsrecord || nxtrecord || objectclass || ptrrecord || rprecord || rrsigrecord || sigrecord || spfrecord || srvrecord || sshfprecord || tlsarecord || txtrecord || unknownrecord")(target = "ldap:///idnsname=*,cn=dns,dc=ipa,dc=example;)(version 3.0;acl "permission:System: Read DNS Entries";allow (compare,read,search) groupdn = "ldap:///cn=System: Read DNS Entries,cn=permissions,cn=pbac,dc=ipa,dc=example";) +aci: (targetattr = "a6record || record || afsdbrecord || aplrecord || arecord || certrecord || cn || cnamerecord || createtimestamp || dhcidrecord || dlvrecord || dnamerecord || dnsclass || dnsdefaultttl || dnsttl || dsrecord || entryusn || hinforecord || hiprecord || idnsallowdynupdate || idnsallowquery || idnsallowsyncptr || idnsallowtransfer || idnsforwarders || idnsforwardpolicy || idnsname || idnssecinlinesigning || idnssoaexpire || idnssoaminimum || idnssoamname || idnssoarefresh || idnssoaretry || idnssoarname || idnssoaserial || idnstemplateattribute || idnsupdatepolicy || idnszoneactive || ipseckeyrecord || keyrecord || kxrecord || locrecord || managedby || mdrecord || minforecord || modifytimestamp || mxrecord || naptrrecord || nsec3paramrecord || nsecrecord || nsrecord || nxtrecord || objectclass || ptrrecord || rprecord || rrsigrecord || sigrecord || spfrecord || srvrecord || sshfprecord || tlsarecord || txtrecord || unknownrecord || urirecord")(target = "ldap:///idnsname=*,cn=dns,dc=ipa,dc=example;)(version 3.0;acl "permission:System: Read DNS Entries";allow (compare,read,search) groupdn = "ldap:///cn=System: Read DNS Entries,cn=permissions,cn=pbac,dc=ipa,dc=example";) dn: dc=ipa,dc=example aci: (targetattr = "cn || createtimestamp || entryusn || idnssecalgorithm || idnsseckeyactivate || idnsseckeycreated || idnsseckeydelete || idnsseckeyinactive || idnsseckeypublish || idnsseckeyref || idnsseckeyrevoke || idnsseckeysep || idnsseckeyzone || modifytimestamp || objectclass")(target = "ldap:///cn=dns,dc=ipa,dc=example;)(targetfilter = "(objectclass=idnsSecKey)")(version 3.0;acl "permission:System: Read DNSSEC metadata";allow (compare,read,search) groupdn = "ldap:///cn=System: Read DNSSEC metadata,cn=permissions,cn=pbac,dc=ipa,dc=example";) dn: dc=ipa,dc=example aci: (target = "ldap:///idnsname=*,cn=dns,dc=ipa,dc=example;)(version 3.0;acl "permission:System:
[Freeipa-devel] [freeipa PR#134][synchronized] DNS URI support
URL: https://github.com/freeipa/freeipa/pull/134 Author: pspacek Title: #134: DNS URI support Action: synchronized To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/134/head:pr134 git checkout pr134 From a35fe8f72d3c905d6338bce8a7f682b8f3e228e7 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Wed, 28 Sep 2016 15:20:43 +0200 Subject: [PATCH 1/3] DNS: Support URI resource record type https://fedorahosted.org/freeipa/ticket/6344 --- ACI.txt | 4 +- API.txt | 19 +-- install/share/60ipadns.ldif | 3 +- install/share/dns.ldif | 2 +- install/ui/src/freeipa/dns.js | 15 +- install/updates/40-dns.update | 3 +- ipaserver/plugins/dns.py| 50 -- ipatests/test_xmlrpc/test_dns_plugin.py | 89 + 8 files changed, 172 insertions(+), 13 deletions(-) diff --git a/ACI.txt b/ACI.txt index fddd598..0b47489 100644 --- a/ACI.txt +++ b/ACI.txt @@ -73,13 +73,13 @@ aci: (targetattr = "ipaprivatekey || ipapublickey || ipasecretkey || ipasecretke dn: dc=ipa,dc=example aci: (targetattr = "cn || idnssecalgorithm || idnsseckeyactivate || idnsseckeycreated || idnsseckeydelete || idnsseckeyinactive || idnsseckeypublish || idnsseckeyref || idnsseckeyrevoke || idnsseckeysep || idnsseckeyzone || objectclass")(target = "ldap:///cn=dns,dc=ipa,dc=example;)(targetfilter = "(objectclass=idnsSecKey)")(version 3.0;acl "permission:System: Manage DNSSEC metadata";allow (all) groupdn = "ldap:///cn=System: Manage DNSSEC metadata,cn=permissions,cn=pbac,dc=ipa,dc=example";) dn: dc=ipa,dc=example -aci: (targetattr = "a6record || record || afsdbrecord || aplrecord || arecord || certrecord || cn || cnamerecord || createtimestamp || dhcidrecord || dlvrecord || dnamerecord || dnsclass || dnsdefaultttl || dnsttl || dsrecord || entryusn || hinforecord || hiprecord || idnsallowdynupdate || idnsallowquery || idnsallowsyncptr || idnsallowtransfer || idnsforwarders || idnsforwardpolicy || idnsname || idnssecinlinesigning || idnssoaexpire || idnssoaminimum || idnssoamname || idnssoarefresh || idnssoaretry || idnssoarname || idnssoaserial || idnstemplateattribute || idnsupdatepolicy || idnszoneactive || ipseckeyrecord || keyrecord || kxrecord || locrecord || managedby || mdrecord || minforecord || modifytimestamp || mxrecord || naptrrecord || nsec3paramrecord || nsecrecord || nsrecord || nxtrecord || objectclass || ptrrecord || rprecord || rrsigrecord || sigrecord || spfrecord || srvrecord || sshfprecord || tlsarecord || txtrecord || unknownrecord")(target = "ldap:///idnsname=*,cn=dns,dc=ipa,dc=example;)(version 3.0;acl "permission:System: Read DNS Entries";allow (compare,read,search) groupdn = "ldap:///cn=System: Read DNS Entries,cn=permissions,cn=pbac,dc=ipa,dc=example";) +aci: (targetattr = "a6record || record || afsdbrecord || aplrecord || arecord || certrecord || cn || cnamerecord || createtimestamp || dhcidrecord || dlvrecord || dnamerecord || dnsclass || dnsdefaultttl || dnsttl || dsrecord || entryusn || hinforecord || hiprecord || idnsallowdynupdate || idnsallowquery || idnsallowsyncptr || idnsallowtransfer || idnsforwarders || idnsforwardpolicy || idnsname || idnssecinlinesigning || idnssoaexpire || idnssoaminimum || idnssoamname || idnssoarefresh || idnssoaretry || idnssoarname || idnssoaserial || idnstemplateattribute || idnsupdatepolicy || idnszoneactive || ipseckeyrecord || keyrecord || kxrecord || locrecord || managedby || mdrecord || minforecord || modifytimestamp || mxrecord || naptrrecord || nsec3paramrecord || nsecrecord || nsrecord || nxtrecord || objectclass || ptrrecord || rprecord || rrsigrecord || sigrecord || spfrecord || srvrecord || sshfprecord || tlsarecord || txtrecord || unknownrecord || urirecord")(target = "ldap:///idnsname=*,cn=dns,dc=ipa,dc=example;)(version 3.0;acl "permission:System: Read DNS Entries";allow (compare,read,search) groupdn = "ldap:///cn=System: Read DNS Entries,cn=permissions,cn=pbac,dc=ipa,dc=example";) dn: dc=ipa,dc=example aci: (targetattr = "cn || createtimestamp || entryusn || idnssecalgorithm || idnsseckeyactivate || idnsseckeycreated || idnsseckeydelete || idnsseckeyinactive || idnsseckeypublish || idnsseckeyref || idnsseckeyrevoke || idnsseckeysep || idnsseckeyzone || modifytimestamp || objectclass")(target = "ldap:///cn=dns,dc=ipa,dc=example;)(targetfilter = "(objectclass=idnsSecKey)")(version 3.0;acl "permission:System: Read DNSSEC metadata";allow (compare,read,search) groupdn = "ldap:///cn=System: Read DNSSEC metadata,cn=permissions,cn=pbac,dc=ipa,dc=example";) dn: dc=ipa,dc=example aci: (target = "ldap:///idnsname=*,cn=dns,dc=ipa,dc=examp
[Freeipa-devel] [freeipa PR#134][synchronized] DNS URI support
URL: https://github.com/freeipa/freeipa/pull/134 Author: pspacek Title: #134: DNS URI support Action: synchronized To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/134/head:pr134 git checkout pr134 From 4b7b8cc128e6a1b1f7485550c65974ff9b952cdf Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Wed, 28 Sep 2016 15:20:43 +0200 Subject: [PATCH 1/3] DNS: Support URI resource record type https://fedorahosted.org/freeipa/ticket/6344 --- ACI.txt | 4 +- API.txt | 19 +-- install/share/60ipadns.ldif | 3 +- install/share/dns.ldif | 2 +- install/ui/src/freeipa/dns.js | 15 +- ipaserver/plugins/dns.py| 50 -- ipatests/test_xmlrpc/test_dns_plugin.py | 89 + 7 files changed, 170 insertions(+), 12 deletions(-) diff --git a/ACI.txt b/ACI.txt index fddd598..0b47489 100644 --- a/ACI.txt +++ b/ACI.txt @@ -73,13 +73,13 @@ aci: (targetattr = "ipaprivatekey || ipapublickey || ipasecretkey || ipasecretke dn: dc=ipa,dc=example aci: (targetattr = "cn || idnssecalgorithm || idnsseckeyactivate || idnsseckeycreated || idnsseckeydelete || idnsseckeyinactive || idnsseckeypublish || idnsseckeyref || idnsseckeyrevoke || idnsseckeysep || idnsseckeyzone || objectclass")(target = "ldap:///cn=dns,dc=ipa,dc=example;)(targetfilter = "(objectclass=idnsSecKey)")(version 3.0;acl "permission:System: Manage DNSSEC metadata";allow (all) groupdn = "ldap:///cn=System: Manage DNSSEC metadata,cn=permissions,cn=pbac,dc=ipa,dc=example";) dn: dc=ipa,dc=example -aci: (targetattr = "a6record || record || afsdbrecord || aplrecord || arecord || certrecord || cn || cnamerecord || createtimestamp || dhcidrecord || dlvrecord || dnamerecord || dnsclass || dnsdefaultttl || dnsttl || dsrecord || entryusn || hinforecord || hiprecord || idnsallowdynupdate || idnsallowquery || idnsallowsyncptr || idnsallowtransfer || idnsforwarders || idnsforwardpolicy || idnsname || idnssecinlinesigning || idnssoaexpire || idnssoaminimum || idnssoamname || idnssoarefresh || idnssoaretry || idnssoarname || idnssoaserial || idnstemplateattribute || idnsupdatepolicy || idnszoneactive || ipseckeyrecord || keyrecord || kxrecord || locrecord || managedby || mdrecord || minforecord || modifytimestamp || mxrecord || naptrrecord || nsec3paramrecord || nsecrecord || nsrecord || nxtrecord || objectclass || ptrrecord || rprecord || rrsigrecord || sigrecord || spfrecord || srvrecord || sshfprecord || tlsarecord || txtrecord || unknownrecord")(target = "ldap:///idnsname=*,cn=dns,dc=ipa,dc=example;)(version 3.0;acl "permission:System: Read DNS Entries";allow (compare,read,search) groupdn = "ldap:///cn=System: Read DNS Entries,cn=permissions,cn=pbac,dc=ipa,dc=example";) +aci: (targetattr = "a6record || record || afsdbrecord || aplrecord || arecord || certrecord || cn || cnamerecord || createtimestamp || dhcidrecord || dlvrecord || dnamerecord || dnsclass || dnsdefaultttl || dnsttl || dsrecord || entryusn || hinforecord || hiprecord || idnsallowdynupdate || idnsallowquery || idnsallowsyncptr || idnsallowtransfer || idnsforwarders || idnsforwardpolicy || idnsname || idnssecinlinesigning || idnssoaexpire || idnssoaminimum || idnssoamname || idnssoarefresh || idnssoaretry || idnssoarname || idnssoaserial || idnstemplateattribute || idnsupdatepolicy || idnszoneactive || ipseckeyrecord || keyrecord || kxrecord || locrecord || managedby || mdrecord || minforecord || modifytimestamp || mxrecord || naptrrecord || nsec3paramrecord || nsecrecord || nsrecord || nxtrecord || objectclass || ptrrecord || rprecord || rrsigrecord || sigrecord || spfrecord || srvrecord || sshfprecord || tlsarecord || txtrecord || unknownrecord || urirecord")(target = "ldap:///idnsname=*,cn=dns,dc=ipa,dc=example;)(version 3.0;acl "permission:System: Read DNS Entries";allow (compare,read,search) groupdn = "ldap:///cn=System: Read DNS Entries,cn=permissions,cn=pbac,dc=ipa,dc=example";) dn: dc=ipa,dc=example aci: (targetattr = "cn || createtimestamp || entryusn || idnssecalgorithm || idnsseckeyactivate || idnsseckeycreated || idnsseckeydelete || idnsseckeyinactive || idnsseckeypublish || idnsseckeyref || idnsseckeyrevoke || idnsseckeysep || idnsseckeyzone || modifytimestamp || objectclass")(target = "ldap:///cn=dns,dc=ipa,dc=example;)(targetfilter = "(objectclass=idnsSecKey)")(version 3.0;acl "permission:System: Read DNSSEC metadata";allow (compare,read,search) groupdn = "ldap:///cn=System: Read DNSSEC metadata,cn=permissions,cn=pbac,dc=ipa,dc=example";) dn: dc=ipa,dc=example aci: (target = "ldap:///idnsname=*,cn=dns,dc=ipa,dc=example;)(version 3.0;acl "permission:System:
[Freeipa-devel] [freeipa PR#133][opened] Tests: print what was expected from exceptions and callables in xmlrpc_tests
URL: https://github.com/freeipa/freeipa/pull/133 Author: pspacek Title: #133: Tests: print what was expected from exceptions and callables in xmlrpc_tests Action: opened PR body: """ """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/133/head:pr133 git checkout pr133 From c00dd3e2ff614e9548de116d76b606fd828b8c4b Mon Sep 17 00:00:00 2001 From: root <r...@vm-058-218.abc.idm.lab.eng.brq.redhat.com> Date: Fri, 30 Sep 2016 09:48:14 +0200 Subject: [PATCH] Tests: print what was expected from callables in xmlrpc_tests --- ipatests/test_xmlrpc/xmlrpc_test.py | 36 ++-- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/ipatests/test_xmlrpc/xmlrpc_test.py b/ipatests/test_xmlrpc/xmlrpc_test.py index 78d9638..0ce1245 100644 --- a/ipatests/test_xmlrpc/xmlrpc_test.py +++ b/ipatests/test_xmlrpc/xmlrpc_test.py @@ -23,6 +23,7 @@ from __future__ import print_function import datetime +import inspect import nose import contextlib @@ -237,7 +238,8 @@ def failsafe_del(cls, obj, pk): UNEXPECTED = """Expected %r to raise %s, but caught different. args = %r options = %r - %s: %s""" + expected = %s: %s + got = %s: %s""" KWARGS = """Command %r raised %s with wrong kwargs. @@ -329,19 +331,20 @@ def check(self, nice, desc, command, expected, extra_check=None): def check_exception(self, nice, cmd, args, options, expected): klass = expected.__class__ -name = klass.__name__ +expected_name = klass.__name__ try: output = api.Command[cmd](*args, **options) except Exception as e: -exception = e +got = e else: raise AssertionError( -EXPECTED % (cmd, name, args, options, output) +EXPECTED % (cmd, expected_name, args, options, output) ) -if not isinstance(exception, klass): +if not isinstance(got, klass): raise AssertionError( -UNEXPECTED % (cmd, name, args, options, - exception.__class__.__name__, exception) +UNEXPECTED % (cmd, expected_name, args, options, + expected_name, expected, + got.__class__.__name__, got) ) # FIXME: the XML-RPC transport doesn't allow us to return structured # information through the exception, so we can't test the kw on the @@ -349,21 +352,26 @@ def check_exception(self, nice, cmd, args, options, expected): # transport, the exception is a free-form data structure (dict). # For now just compare the strings # pylint: disable=no-member -assert_deepequal(expected.strerror, exception.strerror) +assert_deepequal(expected.strerror, got.strerror) # pylint: enable=no-member def check_callable(self, nice, cmd, args, options, expected): -name = expected.__class__.__name__ +expected_name = expected.__class__.__name__ +try: +expected_text = inspect.getsource(expected).strip() +except TypeError: +expected_text = str(expected) output = dict() -exception = None +got = None try: output = api.Command[cmd](*args, **options) except Exception as e: -exception = e -if not expected(exception, output): +got = e +if not expected(got, output): raise AssertionError( -UNEXPECTED % (cmd, name, args, options, - type(exception).__name__, exception) +UNEXPECTED % (cmd, expected_name, args, options, + expected_name, expected_text, + got.__class__.__name__, got) ) def check_output(self, nice, cmd, args, options, expected, extra_check): -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#133][synchronized] Tests: print what was expected from exceptions and callables in xmlrpc_tests
URL: https://github.com/freeipa/freeipa/pull/133 Author: pspacek Title: #133: Tests: print what was expected from exceptions and callables in xmlrpc_tests Action: synchronized To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/133/head:pr133 git checkout pr133 From 5fff40983557934fa69fb699a5b9212849515cca Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Fri, 7 Oct 2016 09:34:54 +0200 Subject: [PATCH] Tests: print what was expected from callables in xmlrpc_tests --- ipatests/test_xmlrpc/xmlrpc_test.py | 36 ++-- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/ipatests/test_xmlrpc/xmlrpc_test.py b/ipatests/test_xmlrpc/xmlrpc_test.py index 78d9638..0ce1245 100644 --- a/ipatests/test_xmlrpc/xmlrpc_test.py +++ b/ipatests/test_xmlrpc/xmlrpc_test.py @@ -23,6 +23,7 @@ from __future__ import print_function import datetime +import inspect import nose import contextlib @@ -237,7 +238,8 @@ def failsafe_del(cls, obj, pk): UNEXPECTED = """Expected %r to raise %s, but caught different. args = %r options = %r - %s: %s""" + expected = %s: %s + got = %s: %s""" KWARGS = """Command %r raised %s with wrong kwargs. @@ -329,19 +331,20 @@ def check(self, nice, desc, command, expected, extra_check=None): def check_exception(self, nice, cmd, args, options, expected): klass = expected.__class__ -name = klass.__name__ +expected_name = klass.__name__ try: output = api.Command[cmd](*args, **options) except Exception as e: -exception = e +got = e else: raise AssertionError( -EXPECTED % (cmd, name, args, options, output) +EXPECTED % (cmd, expected_name, args, options, output) ) -if not isinstance(exception, klass): +if not isinstance(got, klass): raise AssertionError( -UNEXPECTED % (cmd, name, args, options, - exception.__class__.__name__, exception) +UNEXPECTED % (cmd, expected_name, args, options, + expected_name, expected, + got.__class__.__name__, got) ) # FIXME: the XML-RPC transport doesn't allow us to return structured # information through the exception, so we can't test the kw on the @@ -349,21 +352,26 @@ def check_exception(self, nice, cmd, args, options, expected): # transport, the exception is a free-form data structure (dict). # For now just compare the strings # pylint: disable=no-member -assert_deepequal(expected.strerror, exception.strerror) +assert_deepequal(expected.strerror, got.strerror) # pylint: enable=no-member def check_callable(self, nice, cmd, args, options, expected): -name = expected.__class__.__name__ +expected_name = expected.__class__.__name__ +try: +expected_text = inspect.getsource(expected).strip() +except TypeError: +expected_text = str(expected) output = dict() -exception = None +got = None try: output = api.Command[cmd](*args, **options) except Exception as e: -exception = e -if not expected(exception, output): +got = e +if not expected(got, output): raise AssertionError( -UNEXPECTED % (cmd, name, args, options, - type(exception).__name__, exception) +UNEXPECTED % (cmd, expected_name, args, options, + expected_name, expected_text, + got.__class__.__name__, got) ) def check_output(self, nice, cmd, args, options, expected, extra_check): -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#134][comment] DNS URI support
URL: https://github.com/freeipa/freeipa/pull/134 Title: #134: DNS URI support pspacek commented: """ I was playing with an idea of automatic escaping but it cannot be done with current record format: There is no way to distinguish alredy escaped text from a text which needs escaping. This totally breaks web UI edit workflow because it reads text from LDAP, fills text field with it and then double-escapes it during save. For this reason I've given up attempts to automatically escape things, which is no different from e.g. TXT records. Call it consistency if you want ;-) """ See the full comment at https://github.com/freeipa/freeipa/pull/134#issuecomment-251949022 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#134][opened] DNS URI support
URL: https://github.com/freeipa/freeipa/pull/134 Author: pspacek Title: #134: DNS URI support Action: opened PR body: """ """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/134/head:pr134 git checkout pr134 From 4c1e3f92885d94dae0987e1922df56d27fb6b0a8 Mon Sep 17 00:00:00 2001 From: Stanislav Laznicka <slazn...@redhat.com> Date: Thu, 22 Sep 2016 08:12:45 +0200 Subject: [PATCH 1/3] Pretty-print structures in assert_deepequal By default, ipa-run-tests will now pretty-print structures compared in the assert_deepequal function. This behaviour can be turned off by the --no-pretty-print option. https://fedorahosted.org/freeipa/ticket/6212 --- ipatests/pytest.ini | 1 + ipatests/pytest_plugins/additional_config.py | 8 +++ ipatests/util.py | 35 ++-- 3 files changed, 37 insertions(+), 7 deletions(-) create mode 100644 ipatests/pytest_plugins/additional_config.py diff --git a/ipatests/pytest.ini b/ipatests/pytest.ini index 233cf43..5b89942 100644 --- a/ipatests/pytest.ini +++ b/ipatests/pytest.ini @@ -12,6 +12,7 @@ addopts = --doctest-modules -p ipatests.pytest_plugins.declarative -p ipatests.pytest_plugins.integration -p ipatests.pytest_plugins.beakerlib + -p ipatests.pytest_plugins.additional_config # Ignore files for doc tests. # TODO: ideally, these should all use __name__=='__main__' guards --ignore=setup.py diff --git a/ipatests/pytest_plugins/additional_config.py b/ipatests/pytest_plugins/additional_config.py new file mode 100644 index 000..06ae970 --- /dev/null +++ b/ipatests/pytest_plugins/additional_config.py @@ -0,0 +1,8 @@ +# +# Copyright (C) 2016 FreeIPA Contributors see COPYING for license +# + + +def pytest_addoption(parser): +parser.addoption("--no-pretty-print", action="store_false", + dest="pretty_print", help="Don't pretty-print structures") diff --git a/ipatests/util.py b/ipatests/util.py index 0b50f85..38a3f4b 100644 --- a/ipatests/util.py +++ b/ipatests/util.py @@ -28,7 +28,9 @@ import shutil import re import uuid +import pytest from contextlib import contextmanager +from pprint import pformat import six import ldap @@ -273,18 +275,29 @@ def __ne__(self, other): %s len(expected) = %r len(got) = %r - expected = %r - got = %r + expected = %s + got = %s path = %r""" KEYS = """assert_deepequal: dict keys mismatch. %s missing keys = %r extra keys = %r - expected = %r - got = %r + expected = %s + got = %s path = %r""" +EXPECTED_LEN = len(' expected = ') +GOT_LEN = len(' got = ') + + +def struct_to_string(struct, indent=1): +""" +Function to pretty-format a structure and optionally indent its lines +so they match the visual indention of the first line +""" +return pformat(struct).replace('\n', '\n' + ' ' * indent) + def assert_deepequal(expected, got, doc='', stack=tuple()): """ @@ -315,6 +328,13 @@ def assert_deepequal(expected, got, doc='', stack=tuple()): Note that lists and tuples are considered equivalent, and the order of their elements does not matter. """ +if pytest.config.getoption("pretty_print"): # pylint: disable=no-member +expected_str = struct_to_string(expected, EXPECTED_LEN) +got_str = struct_to_string(got, GOT_LEN) +else: +expected_str = repr(expected) +got_str = repr(got) + if isinstance(expected, tuple): expected = list(expected) if isinstance(got, tuple): @@ -329,7 +349,8 @@ def assert_deepequal(expected, got, doc='', stack=tuple()): if isinstance(expected, (list, tuple)): if len(expected) != len(got): raise AssertionError( -LEN % (doc, len(expected), len(got), expected, got, stack) +LEN % (doc, len(expected), len(got), expected_str, got_str, + stack) ) # Sort list elements, unless they are dictionaries if expected and isinstance(expected[0], dict): @@ -352,8 +373,8 @@ def assert_deepequal(expected, got, doc='', stack=tuple()): extra = set(got).difference(expected) if missing or extra: raise AssertionError(KEYS % ( -doc, sorted(missing), sorted(extra), expected, got, stack -) +doc, sorted(missing), sorted(extra), expected_str, got_str, +stack) ) for key in sorted(expected): e_sub = expected[key] From 14b2722c69769e9b604a05dcd4640d323455f198 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: W
[Freeipa-devel] [freeipa PR#134][synchronized] DNS URI support
URL: https://github.com/freeipa/freeipa/pull/134 Author: pspacek Title: #134: DNS URI support Action: synchronized To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/134/head:pr134 git checkout pr134 From 8d887aa1b1b9f0e7612edf4c82fdce4a9ee1b843 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Wed, 28 Sep 2016 15:20:43 +0200 Subject: [PATCH 1/2] DNS: Support URI resource record type https://fedorahosted.org/freeipa/ticket/6344 --- ACI.txt | 4 +- API.txt | 19 +-- install/share/60ipadns.ldif | 3 +- install/share/dns.ldif | 2 +- install/ui/src/freeipa/dns.js | 18 ++- ipaserver/plugins/dns.py| 51 +-- ipatests/test_xmlrpc/test_dns_plugin.py | 89 + 7 files changed, 173 insertions(+), 13 deletions(-) diff --git a/ACI.txt b/ACI.txt index fddd598..0b47489 100644 --- a/ACI.txt +++ b/ACI.txt @@ -73,13 +73,13 @@ aci: (targetattr = "ipaprivatekey || ipapublickey || ipasecretkey || ipasecretke dn: dc=ipa,dc=example aci: (targetattr = "cn || idnssecalgorithm || idnsseckeyactivate || idnsseckeycreated || idnsseckeydelete || idnsseckeyinactive || idnsseckeypublish || idnsseckeyref || idnsseckeyrevoke || idnsseckeysep || idnsseckeyzone || objectclass")(target = "ldap:///cn=dns,dc=ipa,dc=example;)(targetfilter = "(objectclass=idnsSecKey)")(version 3.0;acl "permission:System: Manage DNSSEC metadata";allow (all) groupdn = "ldap:///cn=System: Manage DNSSEC metadata,cn=permissions,cn=pbac,dc=ipa,dc=example";) dn: dc=ipa,dc=example -aci: (targetattr = "a6record || record || afsdbrecord || aplrecord || arecord || certrecord || cn || cnamerecord || createtimestamp || dhcidrecord || dlvrecord || dnamerecord || dnsclass || dnsdefaultttl || dnsttl || dsrecord || entryusn || hinforecord || hiprecord || idnsallowdynupdate || idnsallowquery || idnsallowsyncptr || idnsallowtransfer || idnsforwarders || idnsforwardpolicy || idnsname || idnssecinlinesigning || idnssoaexpire || idnssoaminimum || idnssoamname || idnssoarefresh || idnssoaretry || idnssoarname || idnssoaserial || idnstemplateattribute || idnsupdatepolicy || idnszoneactive || ipseckeyrecord || keyrecord || kxrecord || locrecord || managedby || mdrecord || minforecord || modifytimestamp || mxrecord || naptrrecord || nsec3paramrecord || nsecrecord || nsrecord || nxtrecord || objectclass || ptrrecord || rprecord || rrsigrecord || sigrecord || spfrecord || srvrecord || sshfprecord || tlsarecord || txtrecord || unknownrecord")(target = "ldap:///idnsname=*,cn=dns,dc=ipa,dc=example;)(version 3.0;acl "permission:System: Read DNS Entries";allow (compare,read,search) groupdn = "ldap:///cn=System: Read DNS Entries,cn=permissions,cn=pbac,dc=ipa,dc=example";) +aci: (targetattr = "a6record || record || afsdbrecord || aplrecord || arecord || certrecord || cn || cnamerecord || createtimestamp || dhcidrecord || dlvrecord || dnamerecord || dnsclass || dnsdefaultttl || dnsttl || dsrecord || entryusn || hinforecord || hiprecord || idnsallowdynupdate || idnsallowquery || idnsallowsyncptr || idnsallowtransfer || idnsforwarders || idnsforwardpolicy || idnsname || idnssecinlinesigning || idnssoaexpire || idnssoaminimum || idnssoamname || idnssoarefresh || idnssoaretry || idnssoarname || idnssoaserial || idnstemplateattribute || idnsupdatepolicy || idnszoneactive || ipseckeyrecord || keyrecord || kxrecord || locrecord || managedby || mdrecord || minforecord || modifytimestamp || mxrecord || naptrrecord || nsec3paramrecord || nsecrecord || nsrecord || nxtrecord || objectclass || ptrrecord || rprecord || rrsigrecord || sigrecord || spfrecord || srvrecord || sshfprecord || tlsarecord || txtrecord || unknownrecord || urirecord")(target = "ldap:///idnsname=*,cn=dns,dc=ipa,dc=example;)(version 3.0;acl "permission:System: Read DNS Entries";allow (compare,read,search) groupdn = "ldap:///cn=System: Read DNS Entries,cn=permissions,cn=pbac,dc=ipa,dc=example";) dn: dc=ipa,dc=example aci: (targetattr = "cn || createtimestamp || entryusn || idnssecalgorithm || idnsseckeyactivate || idnsseckeycreated || idnsseckeydelete || idnsseckeyinactive || idnsseckeypublish || idnsseckeyref || idnsseckeyrevoke || idnsseckeysep || idnsseckeyzone || modifytimestamp || objectclass")(target = "ldap:///cn=dns,dc=ipa,dc=example;)(targetfilter = "(objectclass=idnsSecKey)")(version 3.0;acl "permission:System: Read DNSSEC metadata";allow (compare,read,search) groupdn = "ldap:///cn=System: Read DNSSEC metadata,cn=permissions,cn=pbac,dc=ipa,dc=example";) dn: dc=ipa,dc=example aci: (target = "ldap:///idnsname=*,cn=dns,dc=ipa,dc=example;)(version 3.0;acl "permission:System:
[Freeipa-devel] [freeipa PR#107][+ack] Update man/help for --server option
URL: https://github.com/freeipa/freeipa/pull/107 Title: #107: Update man/help for --server option Label: +ack -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [bind-dyndb-ldap PR#1] [WIP] Port bind-dyndb-ldap to BIND 9.11 (opened)
pspacek's pull request #1: "[WIP] Port bind-dyndb-ldap to BIND 9.11" was opened PR body: This is work in progress patch set, do not merge it yet. See the full pull-request at https://github.com/freeipa/bind-dyndb-ldap/pull/1 ... or pull the PR as Git branch: git remote add ghbind-dyndb-ldap https://github.com/freeipa/bind-dyndb-ldap git fetch ghbind-dyndb-ldap pull/1/head:pr1 git checkout pr1 bind-dyndb-ldap-pr-1.patch Description: application/text/diff -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#115][comment] Don't show traceback when ipa config file is not an absolute path
URL: https://github.com/freeipa/freeipa/pull/115 Title: #115: Don't show traceback when ipa config file is not an absolute path pspacek commented: """ Why the file must be absolute? I would rather remove this requirement and be done with it. `open()` the file and if it succeeds - use it. If it fails, print error returned from `open`. """ See the full comment at https://github.com/freeipa/freeipa/pull/115#issuecomment-249854141 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#189][comment] Create relative symbol links
URL: https://github.com/freeipa/freeipa/pull/189 Title: #189: Create relative symbol links pspacek commented: """ As I said several times already, all the SPEC file logic is going away. I'm going to reject this as we do not need to change code which is going away and force everybody to rebase. """ See the full comment at https://github.com/freeipa/freeipa/pull/189#issuecomment-256556124 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#189][+rejected] Create relative symbol links
URL: https://github.com/freeipa/freeipa/pull/189 Title: #189: Create relative symbol links Label: +rejected -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#188][comment] Move Python build artefacts to top level directory
URL: https://github.com/freeipa/freeipa/pull/188 Title: #188: Move Python build artefacts to top level directory pspacek commented: """ Why this change? It goes against the usual behavior where build artifacts are placed in the same directory as sources. Also, I intend to support ouf-of-source-tree builds (aka [VPATH](https://www.gnu.org/software/automake/manual/html_node/VPATH-Builds.html)) and I'm not sure it will work with your patch. I would reject this change if there is no strong need. """ See the full comment at https://github.com/freeipa/freeipa/pull/188#issuecomment-256555896 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#213][comment] Build system refactoring phase 3
URL: https://github.com/freeipa/freeipa/pull/213 Title: #213: Build system refactoring phase 3 pspacek commented: """ - This version supports lint target and all configuration options for linters listed in the design document. - Fixes in systemd-tmpfiles call from make install. - Updates .travis.yml to account for new method of RPM build. """ See the full comment at https://github.com/freeipa/freeipa/pull/213#issuecomment-259187271 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#213][edited] Build system refactoring phase 3
URL: https://github.com/freeipa/freeipa/pull/213 Author: pspacek Title: #213: Build system refactoring phase 3 Action: edited Changed field: body Original value: """ This monster patch-set refactors most of build system and moves most of the logic from SPEC file to build system. It is not yet complete, missing parts are: - [ ] Python 3 support - [ ] Linters are not executed at all - [ ] IPA_VERSION_IS_GIT_SNAPSHOT does not work These will be sorted out later on but the review of the patch set can begin. """ -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#213][comment] Build system refactoring phase 3
URL: https://github.com/freeipa/freeipa/pull/213 Title: #213: Build system refactoring phase 3 pspacek commented: """ @tiran > autoconf and automake files are not removed (Makefile.in, /config.sub ...) According to [Automake manual section 13 What Gets Cleaned](https://www.gnu.org/software/automake/manual/html_node/Clean.html) we must not remove files necessary for `./configure`. As far as I can tell from testing, make distclean + PR #220 leaves behind only files generated by `autoreconf` so we should not remove any of them. It would prevent users from running `configure` again. """ See the full comment at https://github.com/freeipa/freeipa/pull/213#issuecomment-259409721 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#220][opened] Build: fix make clean to remove build artifacts from top-level directory
URL: https://github.com/freeipa/freeipa/pull/220 Author: pspacek Title: #220: Build: fix make clean to remove build artifacts from top-level directory Action: opened PR body: """ make lint and make dist were generating files which were not removed by make clean. https://fedorahosted.org/freeipa/ticket/6418 This fixed some of missing checkboxes in #213. """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/220/head:pr220 git checkout pr220 From e2688d927ce136bef16a181a534989363e012747 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Wed, 9 Nov 2016 13:34:04 +0100 Subject: [PATCH] Build: fix make clean to remove build artifacts from top-level directory make lint and make dist were generating files which were not removed by make clean. https://fedorahosted.org/freeipa/ticket/6418 --- Makefile.am | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index ffa5de2..031aef4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,11 @@ SUBDIRS = asn1 util client contrib daemons init install ipaclient ipalib ipaplatform ipapython ipaserver ipatests po -MOSTLYCLEANFILES = ipasetup.pyc ipasetup.pyo +MOSTLYCLEANFILES = ipasetup.pyc ipasetup.pyo \ + ignore_import_errors.pyc ignore_import_errors.pyo \ + ipasetup.pyc ipasetup.pyo \ + lite-server.pyc lite-server.pyo \ + pylint_plugins.pyc pylint_plugins.pyo \ + $(TARBALL) # user-facing scripts dist_bin_SCRIPTS = ipa @@ -25,6 +30,11 @@ EXTRA_DIST = .mailmap \ pylintrc \ pytest.ini +clean-local: + rm -rf "$(RPMBUILD)" + rm -rf "$(top_builddir)/dist" + rm -rf "$(top_srcdir)/__pycache__" + # convenience targets for RPM build RPMBUILD ?= $(abs_builddir)/rpmbuild TARBALL = $(PACKAGE)-$(VERSION).tar.gz -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#213][comment] Build system refactoring phase 3
URL: https://github.com/freeipa/freeipa/pull/213 Title: #213: Build system refactoring phase 3 pspacek commented: """ @tiran > autoconf and automake files are not removed (Makefile.in, /config.sub ...) According to [Automake manual section 13 What Gets Cleaned](https://www.gnu.org/software/automake/manual/html_node/Clean.html) we must not remove files necessary for `./configure`. As far as I can tell from testing, make distclean + PR #220 leaves behind only files generated by `autoreconf` so we should not remove any of them. It would prevent users from running `configure` again. """ See the full comment at https://github.com/freeipa/freeipa/pull/213#issuecomment-259409721 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#213][comment] Build system refactoring phase 3
URL: https://github.com/freeipa/freeipa/pull/213 Title: #213: Build system refactoring phase 3 tiran commented: """ memo for me: - [ ] /freeipa*.tar.gz is not removed - [ ] ```MOSTLYCLEANFILES``` only cleans ipasetup.py[co] but keeps __pycache__ and other pyc/pyo. add ```clean-local: rm -rf *.pyc *.pyc __pycache__``` - [x] ```Makefile.python.am``` clean-local has ```-delete``` and ```-exec```. AFAIK only one action is supported. - [ ] neither clean nor distclean removes ```/dist``` and ```/rpmbuild``` - [ ] autoconf and automake files are not removed (Makefile.in, /config.sub ...) - [x] add ```ipasetup.py``` to ```dist_noinst_SCRIPTS``` ? """ See the full comment at https://github.com/freeipa/freeipa/pull/213#issuecomment-259371190 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#218][+ack] test_ipagetkeytab: use system-wide IPA CA cert location in tests
URL: https://github.com/freeipa/freeipa/pull/218 Title: #218: test_ipagetkeytab: use system-wide IPA CA cert location in tests Label: +ack -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#218][comment] test_ipagetkeytab: use system-wide IPA CA cert location in tests
URL: https://github.com/freeipa/freeipa/pull/218 Title: #218: test_ipagetkeytab: use system-wide IPA CA cert location in tests pspacek commented: """ Jenkins tests now pass. """ See the full comment at https://github.com/freeipa/freeipa/pull/218#issuecomment-259439106 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#213][comment] Build system refactoring phase 3
URL: https://github.com/freeipa/freeipa/pull/213 Title: #213: Build system refactoring phase 3 tiran commented: """ memo for me: - [ ] /freeipa*.tar.gz is not removed - [ ] ```MOSTLYCLEANFILES``` only cleans ipasetup.py[co] but keeps __pycache__ and other pyc/pyo. add ```clean-local: rm -rf *.pyc *.pyc __pycache__``` - [ ] ```Makefile.python.am``` clean-local has ```-delete``` and ```-exec```. AFAIK only one action is supported. - [ ] neither clean nor distclean removes ```/dist``` and ```/rpmbuild``` - [ ] autoconf and automake files are not removed (Makefile.in, /config.sub ...) - [x] add ```ipasetup.py``` to ```dist_noinst_SCRIPTS``` ? """ See the full comment at https://github.com/freeipa/freeipa/pull/213#issuecomment-259371190 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#213][comment] Build system refactoring phase 3
URL: https://github.com/freeipa/freeipa/pull/213 Title: #213: Build system refactoring phase 3 pspacek commented: """ @tiran > add ipasetup.py to dist_noinst_SCRIPTS ? `ipasetup.py` file is auto-generated from `ipasetup.py.in` so it should not be part of distibution tarball. I've marked this item as "done". """ See the full comment at https://github.com/freeipa/freeipa/pull/213#issuecomment-259391220 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#213][comment] Build system refactoring phase 3
URL: https://github.com/freeipa/freeipa/pull/213 Title: #213: Build system refactoring phase 3 pspacek commented: """ @tiran I've tested the find command and it works. The trick is `-o` which acts like OR and allows you to specify different conditions and associate different actions to them. I'm going to check the checkbox as well :-) """ See the full comment at https://github.com/freeipa/freeipa/pull/213#issuecomment-259392845 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#213][comment] Build system refactoring phase 3
URL: https://github.com/freeipa/freeipa/pull/213 Title: #213: Build system refactoring phase 3 tiran commented: """ memo for me: - [ ] /freeipa*.tar.gz is not removed - [ ] ```MOSTLYCLEANFILES``` only cleans ipasetup.py[co] but keeps __pycache__ and other pyc/pyo. add ```clean-local: rm -rf *.pyc *.pyc __pycache__``` - [x] ```Makefile.python.am``` clean-local has ```-delete``` and ```-exec```. AFAIK only one action is supported. - [ ] neither clean nor distclean removes ```/dist``` and ```/rpmbuild``` - [ ] autoconf and automake files are not removed (Makefile.in, /config.sub ...) - [x] add ```ipasetup.py``` to ```dist_noinst_SCRIPTS``` ? """ See the full comment at https://github.com/freeipa/freeipa/pull/213#issuecomment-259371190 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#221][+ack] gitignore: ignore tar ball
URL: https://github.com/freeipa/freeipa/pull/221 Title: #221: gitignore: ignore tar ball Label: +ack -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#226][synchronized] Build refactoring phase 5
URL: https://github.com/freeipa/freeipa/pull/226 Author: pspacek Title: #226: Build refactoring phase 5 Action: synchronized To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/226/head:pr226 git checkout pr226 From 426cb96d11776215fca9aea144482087e4bef244 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Wed, 9 Nov 2016 15:42:30 +0100 Subject: [PATCH 1/7] Build: remove unused and redundant code from configure.ac and po/Makefile.in https://fedorahosted.org/freeipa/ticket/6418 --- configure.ac | 4 po/Makefile.in | 1 - 2 files changed, 5 deletions(-) diff --git a/configure.ac b/configure.ac index 6e82c62..5646cb0 100644 --- a/configure.ac +++ b/configure.ac @@ -17,9 +17,6 @@ AC_HEADER_STDC AM_CONDITIONAL([HAVE_GCC], [test "$ac_cv_prog_gcc" = yes]) -AC_SUBST(VERSION) -AC_SUBST([INSTALL_DATA], ['$(INSTALL) -m 644 -p']) - dnl --- dnl - Check for NSPR/NSS dnl --- @@ -359,7 +356,6 @@ AC_ARG_WITH([vendor-suffix], [VENDOR_SUFFIX=${withval}], [VENDOR_SUFFIX=""]) -dnl TODO: IPA_VENDOR_RELEASE AC_SUBST([API_VERSION], [IPA_API_VERSION]) AC_SUBST([DATA_VERSION], [IPA_DATA_VERSION]) AC_SUBST([NUM_VERSION], [IPA_NUM_VERSION]) diff --git a/po/Makefile.in b/po/Makefile.in index b42d8fc..0ab449c 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -5,7 +5,6 @@ datadir = ${datarootdir} localedir = ${datarootdir}/locale INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL@ -m 644 AWK = @AWK@ SED = @SED@ MKDIR_P = @MKDIR_P@ From 30997f510be880339face8656343536705e5d359 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Wed, 9 Nov 2016 16:15:19 +0100 Subject: [PATCH 2/7] Build: IPA_VERSION_IS_GIT_SNAPSHOT checks if source directory is Git repo https://fedorahosted.org/freeipa/ticket/6418 --- configure.ac | 11 +++ 1 file changed, 11 insertions(+) diff --git a/configure.ac b/configure.ac index 5646cb0..1b672fb 100644 --- a/configure.ac +++ b/configure.ac @@ -350,6 +350,17 @@ AC_MSG_RESULT([${IPAPLATFORM}]) dnl --- dnl Version information from VERSION.m4 and command line dnl --- +dnl Are we in source tree? +AM_CONDITIONAL([IS_GIT_SNAPSHOT], [test "IPA_VERSION_IS_GIT_SNAPSHOT" == "yes"]) +AM_COND_IF([IS_GIT_SNAPSHOT], [ + AC_MSG_CHECKING([if source directory is a Git reposistory]) + if test ! -d "${srcdir}/.git"; then + AC_MSG_ERROR([Git reposistory is required by VERSION.m4 IPA_VERSION_IS_GIT_SNAPSHOT but not found]) + else + AC_MSG_RESULT([yes]) + fi +]) + AC_ARG_WITH([vendor-suffix], AS_HELP_STRING([--with-vendor-suffix=STRING], [Vendor string used by package system, e.g. "-1.fc24"]), From 4ad2581cbbd97f180cc19af8f746df378a595284 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Wed, 9 Nov 2016 16:21:51 +0100 Subject: [PATCH 3/7] Build: use POSIX 1003.1-1988 (ustar) file format for tar archives Default format used by Autotools limits length of paths to 99 characters. This is not enough for tarballs with Git snapshots. https://fedorahosted.org/freeipa/ticket/6418 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 1b672fb..53d5dab 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ AC_INIT([freeipa], AC_CONFIG_HEADERS([config.h]) -AM_INIT_AUTOMAKE([foreign]) +AM_INIT_AUTOMAKE([foreign 1.9 tar-ustar]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) AC_PROG_CC_C99 From 535bb2c18bc2b977d3b836743e88a8f6d80654c4 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Wed, 9 Nov 2016 16:16:45 +0100 Subject: [PATCH 4/7] Build: IPA_VERSION_IS_GIT_SNAPSHOT re-generates version number on RPM build This is a huge hack. rpms target will touch VERSION.m4 file. This change is then detected by automake Makefiles which subsequently re-execute configure and make. We have to workaround fact that variables in new make targets (executed after new configure) are different than original ones. Also, we have to 'bake-in' precise snapshot version from Git to VERSION.m4 inside of RPM tarball so the RPM does not depend on git anymore. All this magic slows build down a bit. Do not enable IPA_VERSION_IS_GIT_SNAPSHOT if you want fastest possible builds. The option IPA_VERSION_IS_GIT_SNAPSHOT is now enabled by default as it was before we started the build system refactoring effort. https://fedorahosted.org/freeipa/ticket/6418 --- .gitignore | 2 ++ Makefile.am | 51 +-- VERSION.m4 | 24 ++-- configure.ac |
[Freeipa-devel] [freeipa PR#233][opened] Build phase 6: %install cleanup
URL: https://github.com/freeipa/freeipa/pull/233 Author: pspacek Title: #233: Build phase 6: %install cleanup Action: opened PR body: """ This patch set is based on phase 5 - PR #226. Now all the installation steps (except Python2/3) are handled by make install. Python 2/3 support will deserve separate PR. """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/233/head:pr233 git checkout pr233 From 426cb96d11776215fca9aea144482087e4bef244 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Wed, 9 Nov 2016 15:42:30 +0100 Subject: [PATCH 01/11] Build: remove unused and redundant code from configure.ac and po/Makefile.in https://fedorahosted.org/freeipa/ticket/6418 --- configure.ac | 4 po/Makefile.in | 1 - 2 files changed, 5 deletions(-) diff --git a/configure.ac b/configure.ac index 6e82c62..5646cb0 100644 --- a/configure.ac +++ b/configure.ac @@ -17,9 +17,6 @@ AC_HEADER_STDC AM_CONDITIONAL([HAVE_GCC], [test "$ac_cv_prog_gcc" = yes]) -AC_SUBST(VERSION) -AC_SUBST([INSTALL_DATA], ['$(INSTALL) -m 644 -p']) - dnl --- dnl - Check for NSPR/NSS dnl --- @@ -359,7 +356,6 @@ AC_ARG_WITH([vendor-suffix], [VENDOR_SUFFIX=${withval}], [VENDOR_SUFFIX=""]) -dnl TODO: IPA_VENDOR_RELEASE AC_SUBST([API_VERSION], [IPA_API_VERSION]) AC_SUBST([DATA_VERSION], [IPA_DATA_VERSION]) AC_SUBST([NUM_VERSION], [IPA_NUM_VERSION]) diff --git a/po/Makefile.in b/po/Makefile.in index b42d8fc..0ab449c 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -5,7 +5,6 @@ datadir = ${datarootdir} localedir = ${datarootdir}/locale INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL@ -m 644 AWK = @AWK@ SED = @SED@ MKDIR_P = @MKDIR_P@ From 30997f510be880339face8656343536705e5d359 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Wed, 9 Nov 2016 16:15:19 +0100 Subject: [PATCH 02/11] Build: IPA_VERSION_IS_GIT_SNAPSHOT checks if source directory is Git repo https://fedorahosted.org/freeipa/ticket/6418 --- configure.ac | 11 +++ 1 file changed, 11 insertions(+) diff --git a/configure.ac b/configure.ac index 5646cb0..1b672fb 100644 --- a/configure.ac +++ b/configure.ac @@ -350,6 +350,17 @@ AC_MSG_RESULT([${IPAPLATFORM}]) dnl --- dnl Version information from VERSION.m4 and command line dnl --- +dnl Are we in source tree? +AM_CONDITIONAL([IS_GIT_SNAPSHOT], [test "IPA_VERSION_IS_GIT_SNAPSHOT" == "yes"]) +AM_COND_IF([IS_GIT_SNAPSHOT], [ + AC_MSG_CHECKING([if source directory is a Git reposistory]) + if test ! -d "${srcdir}/.git"; then + AC_MSG_ERROR([Git reposistory is required by VERSION.m4 IPA_VERSION_IS_GIT_SNAPSHOT but not found]) + else + AC_MSG_RESULT([yes]) + fi +]) + AC_ARG_WITH([vendor-suffix], AS_HELP_STRING([--with-vendor-suffix=STRING], [Vendor string used by package system, e.g. "-1.fc24"]), From 4ad2581cbbd97f180cc19af8f746df378a595284 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Wed, 9 Nov 2016 16:21:51 +0100 Subject: [PATCH 03/11] Build: use POSIX 1003.1-1988 (ustar) file format for tar archives Default format used by Autotools limits length of paths to 99 characters. This is not enough for tarballs with Git snapshots. https://fedorahosted.org/freeipa/ticket/6418 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 1b672fb..53d5dab 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ AC_INIT([freeipa], AC_CONFIG_HEADERS([config.h]) -AM_INIT_AUTOMAKE([foreign]) +AM_INIT_AUTOMAKE([foreign 1.9 tar-ustar]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) AC_PROG_CC_C99 From 535bb2c18bc2b977d3b836743e88a8f6d80654c4 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Wed, 9 Nov 2016 16:16:45 +0100 Subject: [PATCH 04/11] Build: IPA_VERSION_IS_GIT_SNAPSHOT re-generates version number on RPM build This is a huge hack. rpms target will touch VERSION.m4 file. This change is then detected by automake Makefiles which subsequently re-execute configure and make. We have to workaround fact that variables in new make targets (executed after new configure) are different than original ones. Also, we have to 'bake-in' precise snapshot version from Git to VERSION.m4 inside of RPM tarball so the RPM does not depend on git anymore. All this magic slows build down a bit. Do not enable IPA_VERSION_IS_GIT_SNAPSHOT if you want fastest possible builds. The option IPA_VERSION_IS_GIT_SNAPSHOT is now enabled by default as it was before we started the bui
[Freeipa-devel] [freeipa PR#233][synchronized] Build phase 6: %install cleanup
URL: https://github.com/freeipa/freeipa/pull/233 Author: pspacek Title: #233: Build phase 6: %install cleanup Action: synchronized To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/233/head:pr233 git checkout pr233 From 068652de356b6d69d13649da2920c870a97d82c5 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Thu, 10 Nov 2016 12:07:03 +0100 Subject: [PATCH 1/4] Build: move client directory handling from SPEC to Makefile.am This is next step towards fully functional make install. https://fedorahosted.org/freeipa/ticket/6418 --- client/Makefile.am | 3 +++ freeipa.spec.in| 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/Makefile.am b/client/Makefile.am index 0a451e5..45abdf6 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -122,3 +122,6 @@ MAINTAINERCLEANFILES = \ version.m4 \ $(NULL) +install-data-hook: + $(INSTALL) -d -D -m 755 $(DESTDIR)$(IPA_SYSCONF_DIR)/nssdb + $(INSTALL) -d -D -m 755 $(DESTDIR)$(localstatedir)/lib/ipa-client/sysrestore diff --git a/freeipa.spec.in b/freeipa.spec.in index 7dbbf87..4e39b3c 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -804,11 +804,8 @@ touch %{buildroot}%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa/backup %endif # ONLY_CLIENT -mkdir -p %{buildroot}%{_sysconfdir}/ipa/ /bin/touch %{buildroot}%{_sysconfdir}/ipa/default.conf /bin/touch %{buildroot}%{_sysconfdir}/ipa/ca.crt -mkdir -p %{buildroot}%{_sysconfdir}/ipa/nssdb -mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa-client/sysrestore %if ! %{ONLY_CLIENT} mkdir -p %{buildroot}%{_sysconfdir}/cron.d From 233f30612e34f76acded8e9d9c86e6425a3b6260 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Thu, 10 Nov 2016 12:45:26 +0100 Subject: [PATCH 2/4] Build: move server directory handling from SPEC to Makefile.am This is next step towards fully functional make install. https://fedorahosted.org/freeipa/ticket/6418 --- freeipa.spec.in | 8 install/Makefile.am | 4 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/freeipa.spec.in b/freeipa.spec.in index 4e39b3c..68fc2bc 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -741,8 +741,6 @@ sed -i -e'1s/python\(3\|$\)/python2/' %{buildroot}%{_bindir}/ipa %find_lang %{gettext_domain} -mkdir -p %{buildroot}%{_usr}/share/ipa - %if ! %{ONLY_CLIENT} # Remove .la files from libtool - we don't want to package # these files @@ -793,7 +791,6 @@ mkdir -p %{buildroot}%{_usr}/share/ipa/html/ /bin/touch %{buildroot}%{_usr}/share/ipa/html/krb.js /bin/touch %{buildroot}%{_usr}/share/ipa/html/krb5.ini /bin/touch %{buildroot}%{_usr}/share/ipa/html/krbrealm.con -mkdir -p %{buildroot}%{_initrddir} # Web UI plugin dir mkdir -p %{buildroot}%{_usr}/share/ipa/ui/js/plugins @@ -801,7 +798,6 @@ mkdir -p %{buildroot}%{_usr}/share/ipa/ui/js/plugins mkdir -p %{buildroot}%{_libdir}/krb5/plugins/libkrb5 touch %{buildroot}%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so -mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa/backup %endif # ONLY_CLIENT /bin/touch %{buildroot}%{_sysconfdir}/ipa/default.conf @@ -818,10 +814,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/cron.d sed -e 's,\.py.*$,.*,g' | sort -u | \ sed -e 's,\./,%%{python_sitelib}/ipatests/,g' ) >tests-python.list -mkdir -p %{buildroot}%{_sysconfdir}/ipa/custodia - -mkdir -p %{buildroot}%{_usr}/share/ipa/schema.d - %endif # ONLY_CLIENT diff --git a/install/Makefile.am b/install/Makefile.am index 2dcd927..58d67c6 100644 --- a/install/Makefile.am +++ b/install/Makefile.am @@ -19,6 +19,10 @@ SUBDIRS = \ $(NULL) install-exec-local: + mkdir -p $(DESTDIR)$(IPA_SYSCONF_DIR)/custodia + chmod 700 $(DESTDIR)$(IPA_SYSCONF_DIR)/custodia + mkdir -p $(DESTDIR)$(localstatedir)/lib/ipa/backup + chmod 700 $(DESTDIR)$(localstatedir)/lib/ipa/backup mkdir -p $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore chmod 700 $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore mkdir -p $(DESTDIR)$(localstatedir)/lib/ipa/sysupgrade From 9d45b4095d4f945efe8bf08f3899d2f14d9b2542 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Thu, 10 Nov 2016 14:39:59 +0100 Subject: [PATCH 3/4] Build: move web UI file installation from SPEC to Makefile.am This is next step towards fully functional make install. https://fedorahosted.org/freeipa/ticket/6418 --- freeipa.spec.in | 19 --- install/html/Makefile.am | 13 + install/ui/Makefile.am | 3 +++ 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/freeipa.spec.in b/freeipa.spec.in index 68fc2bc..45d2896 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -763,28 +763,12 @@ rm %{buildroot}/%{plugin_dir}/libtopology.la rm %{buildroot}/%{_libdir}/krb5/plugins/kdb/ipadb.la rm %{buildroot}/%{_libdir}/samba/pdb/ipasam.la -# Some user-
[Freeipa-devel] [freeipa PR#233][comment] Build phase 6: %install cleanup
URL: https://github.com/freeipa/freeipa/pull/233 Title: #233: Build phase 6: %install cleanup pspacek commented: """ Rebased on top of current master. """ See the full comment at https://github.com/freeipa/freeipa/pull/233#issuecomment-259937908 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#213][edited] Build system refactoring phase 3
URL: https://github.com/freeipa/freeipa/pull/213 Author: pspacek Title: #213: Build system refactoring phase 3 Action: edited Changed field: body Original value: """ This monster patch-set refactors most of build system and moves most of the logic from SPEC file to build system. It is not yet complete, missing parts are: - [ ] Python 3 support - [ ] Client-only build is not supported - [ ] IPA_VERSION_IS_GIT_SNAPSHOT does not work (fix in #226) These will be sorted out later on but the review of the patch set can begin. """ -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#233][comment] Build phase 6: %install cleanup
URL: https://github.com/freeipa/freeipa/pull/233 Title: #233: Build phase 6: %install cleanup pspacek commented: """ @tiran Please re-review and set review status accordingly. Thanks! """ See the full comment at https://github.com/freeipa/freeipa/pull/233#issuecomment-259955838 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#233][synchronized] Build phase 6: %install cleanup
URL: https://github.com/freeipa/freeipa/pull/233 Author: pspacek Title: #233: Build phase 6: %install cleanup Action: synchronized To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/233/head:pr233 git checkout pr233 From 66ce562f3146e7febddc8241ad2cf51986f3d6b3 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Thu, 10 Nov 2016 12:07:03 +0100 Subject: [PATCH 1/4] Build: move client directory handling from SPEC to Makefile.am This is next step towards fully functional make install. https://fedorahosted.org/freeipa/ticket/6418 --- client/Makefile.am | 3 +++ freeipa.spec.in| 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/Makefile.am b/client/Makefile.am index 0a451e5..45abdf6 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -122,3 +122,6 @@ MAINTAINERCLEANFILES = \ version.m4 \ $(NULL) +install-data-hook: + $(INSTALL) -d -D -m 755 $(DESTDIR)$(IPA_SYSCONF_DIR)/nssdb + $(INSTALL) -d -D -m 755 $(DESTDIR)$(localstatedir)/lib/ipa-client/sysrestore diff --git a/freeipa.spec.in b/freeipa.spec.in index 7dbbf87..4e39b3c 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -804,11 +804,8 @@ touch %{buildroot}%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa/backup %endif # ONLY_CLIENT -mkdir -p %{buildroot}%{_sysconfdir}/ipa/ /bin/touch %{buildroot}%{_sysconfdir}/ipa/default.conf /bin/touch %{buildroot}%{_sysconfdir}/ipa/ca.crt -mkdir -p %{buildroot}%{_sysconfdir}/ipa/nssdb -mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa-client/sysrestore %if ! %{ONLY_CLIENT} mkdir -p %{buildroot}%{_sysconfdir}/cron.d From 5bdde096b0d8443fd4c40b8d146530dbf06b63d1 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Thu, 10 Nov 2016 12:45:26 +0100 Subject: [PATCH 2/4] Build: move server directory handling from SPEC to Makefile.am This is next step towards fully functional make install. https://fedorahosted.org/freeipa/ticket/6418 --- freeipa.spec.in | 8 install/Makefile.am | 11 +-- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/freeipa.spec.in b/freeipa.spec.in index 4e39b3c..68fc2bc 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -741,8 +741,6 @@ sed -i -e'1s/python\(3\|$\)/python2/' %{buildroot}%{_bindir}/ipa %find_lang %{gettext_domain} -mkdir -p %{buildroot}%{_usr}/share/ipa - %if ! %{ONLY_CLIENT} # Remove .la files from libtool - we don't want to package # these files @@ -793,7 +791,6 @@ mkdir -p %{buildroot}%{_usr}/share/ipa/html/ /bin/touch %{buildroot}%{_usr}/share/ipa/html/krb.js /bin/touch %{buildroot}%{_usr}/share/ipa/html/krb5.ini /bin/touch %{buildroot}%{_usr}/share/ipa/html/krbrealm.con -mkdir -p %{buildroot}%{_initrddir} # Web UI plugin dir mkdir -p %{buildroot}%{_usr}/share/ipa/ui/js/plugins @@ -801,7 +798,6 @@ mkdir -p %{buildroot}%{_usr}/share/ipa/ui/js/plugins mkdir -p %{buildroot}%{_libdir}/krb5/plugins/libkrb5 touch %{buildroot}%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so -mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa/backup %endif # ONLY_CLIENT /bin/touch %{buildroot}%{_sysconfdir}/ipa/default.conf @@ -818,10 +814,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/cron.d sed -e 's,\.py.*$,.*,g' | sort -u | \ sed -e 's,\./,%%{python_sitelib}/ipatests/,g' ) >tests-python.list -mkdir -p %{buildroot}%{_sysconfdir}/ipa/custodia - -mkdir -p %{buildroot}%{_usr}/share/ipa/schema.d - %endif # ONLY_CLIENT diff --git a/install/Makefile.am b/install/Makefile.am index 2dcd927..0dca193 100644 --- a/install/Makefile.am +++ b/install/Makefile.am @@ -19,12 +19,11 @@ SUBDIRS = \ $(NULL) install-exec-local: - mkdir -p $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore - chmod 700 $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore - mkdir -p $(DESTDIR)$(localstatedir)/lib/ipa/sysupgrade - chmod 700 $(DESTDIR)$(localstatedir)/lib/ipa/sysupgrade - mkdir -p $(DESTDIR)$(localstatedir)/lib/ipa/pki-ca - chmod 755 $(DESTDIR)$(localstatedir)/lib/ipa/pki-ca + $(INSTALL) -d -D -m 700 $(DESTDIR)$(IPA_SYSCONF_DIR)/custodia + $(INSTALL) -d -D -m 700 $(DESTDIR)$(localstatedir)/lib/ipa/backup + $(INSTALL) -d -D -m 700 $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore + $(INSTALL) -d -D -m 700 $(DESTDIR)$(localstatedir)/lib/ipa/sysupgrade + $(INSTALL) -d -D -m 755 $(DESTDIR)$(localstatedir)/lib/ipa/pki-ca uninstall-local: -rmdir $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore From 6d1f25c8ddb4cf25970205e507181bcd2240be4e Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Thu, 10 Nov 2016 14:39:59 +0100 Subject: [PATCH 3/4] Build: move web UI file installation from SPEC to Makefile.am This is next step towards fully functional make install. https://fedorahosted.org/freeipa/ticket/6418 --- freeipa.spec.in | 19 --- install/html/Makefile.am | 14 ++ install/
[Freeipa-devel] [freeipa PR#233][synchronized] Build phase 6: %install cleanup
URL: https://github.com/freeipa/freeipa/pull/233 Author: pspacek Title: #233: Build phase 6: %install cleanup Action: synchronized To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/233/head:pr233 git checkout pr233 From 66ce562f3146e7febddc8241ad2cf51986f3d6b3 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Thu, 10 Nov 2016 12:07:03 +0100 Subject: [PATCH 1/4] Build: move client directory handling from SPEC to Makefile.am This is next step towards fully functional make install. https://fedorahosted.org/freeipa/ticket/6418 --- client/Makefile.am | 3 +++ freeipa.spec.in| 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/Makefile.am b/client/Makefile.am index 0a451e5..45abdf6 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -122,3 +122,6 @@ MAINTAINERCLEANFILES = \ version.m4 \ $(NULL) +install-data-hook: + $(INSTALL) -d -D -m 755 $(DESTDIR)$(IPA_SYSCONF_DIR)/nssdb + $(INSTALL) -d -D -m 755 $(DESTDIR)$(localstatedir)/lib/ipa-client/sysrestore diff --git a/freeipa.spec.in b/freeipa.spec.in index 7dbbf87..4e39b3c 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -804,11 +804,8 @@ touch %{buildroot}%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa/backup %endif # ONLY_CLIENT -mkdir -p %{buildroot}%{_sysconfdir}/ipa/ /bin/touch %{buildroot}%{_sysconfdir}/ipa/default.conf /bin/touch %{buildroot}%{_sysconfdir}/ipa/ca.crt -mkdir -p %{buildroot}%{_sysconfdir}/ipa/nssdb -mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa-client/sysrestore %if ! %{ONLY_CLIENT} mkdir -p %{buildroot}%{_sysconfdir}/cron.d From 5bdde096b0d8443fd4c40b8d146530dbf06b63d1 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Thu, 10 Nov 2016 12:45:26 +0100 Subject: [PATCH 2/4] Build: move server directory handling from SPEC to Makefile.am This is next step towards fully functional make install. https://fedorahosted.org/freeipa/ticket/6418 --- freeipa.spec.in | 8 install/Makefile.am | 11 +-- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/freeipa.spec.in b/freeipa.spec.in index 4e39b3c..68fc2bc 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -741,8 +741,6 @@ sed -i -e'1s/python\(3\|$\)/python2/' %{buildroot}%{_bindir}/ipa %find_lang %{gettext_domain} -mkdir -p %{buildroot}%{_usr}/share/ipa - %if ! %{ONLY_CLIENT} # Remove .la files from libtool - we don't want to package # these files @@ -793,7 +791,6 @@ mkdir -p %{buildroot}%{_usr}/share/ipa/html/ /bin/touch %{buildroot}%{_usr}/share/ipa/html/krb.js /bin/touch %{buildroot}%{_usr}/share/ipa/html/krb5.ini /bin/touch %{buildroot}%{_usr}/share/ipa/html/krbrealm.con -mkdir -p %{buildroot}%{_initrddir} # Web UI plugin dir mkdir -p %{buildroot}%{_usr}/share/ipa/ui/js/plugins @@ -801,7 +798,6 @@ mkdir -p %{buildroot}%{_usr}/share/ipa/ui/js/plugins mkdir -p %{buildroot}%{_libdir}/krb5/plugins/libkrb5 touch %{buildroot}%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so -mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa/backup %endif # ONLY_CLIENT /bin/touch %{buildroot}%{_sysconfdir}/ipa/default.conf @@ -818,10 +814,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/cron.d sed -e 's,\.py.*$,.*,g' | sort -u | \ sed -e 's,\./,%%{python_sitelib}/ipatests/,g' ) >tests-python.list -mkdir -p %{buildroot}%{_sysconfdir}/ipa/custodia - -mkdir -p %{buildroot}%{_usr}/share/ipa/schema.d - %endif # ONLY_CLIENT diff --git a/install/Makefile.am b/install/Makefile.am index 2dcd927..0dca193 100644 --- a/install/Makefile.am +++ b/install/Makefile.am @@ -19,12 +19,11 @@ SUBDIRS = \ $(NULL) install-exec-local: - mkdir -p $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore - chmod 700 $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore - mkdir -p $(DESTDIR)$(localstatedir)/lib/ipa/sysupgrade - chmod 700 $(DESTDIR)$(localstatedir)/lib/ipa/sysupgrade - mkdir -p $(DESTDIR)$(localstatedir)/lib/ipa/pki-ca - chmod 755 $(DESTDIR)$(localstatedir)/lib/ipa/pki-ca + $(INSTALL) -d -D -m 700 $(DESTDIR)$(IPA_SYSCONF_DIR)/custodia + $(INSTALL) -d -D -m 700 $(DESTDIR)$(localstatedir)/lib/ipa/backup + $(INSTALL) -d -D -m 700 $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore + $(INSTALL) -d -D -m 700 $(DESTDIR)$(localstatedir)/lib/ipa/sysupgrade + $(INSTALL) -d -D -m 755 $(DESTDIR)$(localstatedir)/lib/ipa/pki-ca uninstall-local: -rmdir $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore From 88ed0655561efd8852f4c842a47182ae3b16515c Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Thu, 10 Nov 2016 14:39:59 +0100 Subject: [PATCH 3/4] Build: move web UI file installation from SPEC to Makefile.am This is next step towards fully functional make install. https://fedorahosted.org/freeipa/ticket/6418 --- freeipa.spec.in | 19 --- install/html/Makefile.am | 14 ++ install/
[Freeipa-devel] [freeipa PR#233][synchronized] Build phase 6: %install cleanup
URL: https://github.com/freeipa/freeipa/pull/233 Author: pspacek Title: #233: Build phase 6: %install cleanup Action: synchronized To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/233/head:pr233 git checkout pr233 From c26ff5d4de8eaef7430382f5aacc9bc2df39b43c Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Thu, 10 Nov 2016 12:07:03 +0100 Subject: [PATCH 1/4] Build: move client directory handling from SPEC to Makefile.am This is next step towards fully functional make install. https://fedorahosted.org/freeipa/ticket/6418 --- client/Makefile.am | 3 +++ freeipa.spec.in| 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/Makefile.am b/client/Makefile.am index 0a451e5..4c29ee7 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -122,3 +122,6 @@ MAINTAINERCLEANFILES = \ version.m4 \ $(NULL) +install-data-hook: + $(INSTALL) -d -m 755 $(DESTDIR)$(IPA_SYSCONF_DIR)/nssdb + $(INSTALL) -d -m 755 $(DESTDIR)$(localstatedir)/lib/ipa-client/sysrestore diff --git a/freeipa.spec.in b/freeipa.spec.in index 7dbbf87..4e39b3c 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -804,11 +804,8 @@ touch %{buildroot}%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa/backup %endif # ONLY_CLIENT -mkdir -p %{buildroot}%{_sysconfdir}/ipa/ /bin/touch %{buildroot}%{_sysconfdir}/ipa/default.conf /bin/touch %{buildroot}%{_sysconfdir}/ipa/ca.crt -mkdir -p %{buildroot}%{_sysconfdir}/ipa/nssdb -mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa-client/sysrestore %if ! %{ONLY_CLIENT} mkdir -p %{buildroot}%{_sysconfdir}/cron.d From efa9861cd95ff213f083db09cd68e16a16b01db3 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Thu, 10 Nov 2016 12:45:26 +0100 Subject: [PATCH 2/4] Build: move server directory handling from SPEC to Makefile.am This is next step towards fully functional make install. https://fedorahosted.org/freeipa/ticket/6418 --- freeipa.spec.in | 8 install/Makefile.am | 11 +-- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/freeipa.spec.in b/freeipa.spec.in index 4e39b3c..68fc2bc 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -741,8 +741,6 @@ sed -i -e'1s/python\(3\|$\)/python2/' %{buildroot}%{_bindir}/ipa %find_lang %{gettext_domain} -mkdir -p %{buildroot}%{_usr}/share/ipa - %if ! %{ONLY_CLIENT} # Remove .la files from libtool - we don't want to package # these files @@ -793,7 +791,6 @@ mkdir -p %{buildroot}%{_usr}/share/ipa/html/ /bin/touch %{buildroot}%{_usr}/share/ipa/html/krb.js /bin/touch %{buildroot}%{_usr}/share/ipa/html/krb5.ini /bin/touch %{buildroot}%{_usr}/share/ipa/html/krbrealm.con -mkdir -p %{buildroot}%{_initrddir} # Web UI plugin dir mkdir -p %{buildroot}%{_usr}/share/ipa/ui/js/plugins @@ -801,7 +798,6 @@ mkdir -p %{buildroot}%{_usr}/share/ipa/ui/js/plugins mkdir -p %{buildroot}%{_libdir}/krb5/plugins/libkrb5 touch %{buildroot}%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so -mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa/backup %endif # ONLY_CLIENT /bin/touch %{buildroot}%{_sysconfdir}/ipa/default.conf @@ -818,10 +814,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/cron.d sed -e 's,\.py.*$,.*,g' | sort -u | \ sed -e 's,\./,%%{python_sitelib}/ipatests/,g' ) >tests-python.list -mkdir -p %{buildroot}%{_sysconfdir}/ipa/custodia - -mkdir -p %{buildroot}%{_usr}/share/ipa/schema.d - %endif # ONLY_CLIENT diff --git a/install/Makefile.am b/install/Makefile.am index 2dcd927..64219c5 100644 --- a/install/Makefile.am +++ b/install/Makefile.am @@ -19,12 +19,11 @@ SUBDIRS = \ $(NULL) install-exec-local: - mkdir -p $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore - chmod 700 $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore - mkdir -p $(DESTDIR)$(localstatedir)/lib/ipa/sysupgrade - chmod 700 $(DESTDIR)$(localstatedir)/lib/ipa/sysupgrade - mkdir -p $(DESTDIR)$(localstatedir)/lib/ipa/pki-ca - chmod 755 $(DESTDIR)$(localstatedir)/lib/ipa/pki-ca + $(INSTALL) -d -m 700 $(DESTDIR)$(IPA_SYSCONF_DIR)/custodia + $(INSTALL) -d -m 700 $(DESTDIR)$(localstatedir)/lib/ipa/backup + $(INSTALL) -d -m 700 $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore + $(INSTALL) -d -m 700 $(DESTDIR)$(localstatedir)/lib/ipa/sysupgrade + $(INSTALL) -d -m 755 $(DESTDIR)$(localstatedir)/lib/ipa/pki-ca uninstall-local: -rmdir $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore From 68449e46ab7adb899161c107d16aa5d0f5145b4a Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Thu, 10 Nov 2016 14:39:59 +0100 Subject: [PATCH 3/4] Build: move web UI file installation from SPEC to Makefile.am This is next step towards fully functional make install. https://fedorahosted.org/freeipa/ticket/6418 --- freeipa.spec.in | 19 --- install/html/Makefile.am | 14 ++ install/ui/Makefile.am | 3
[Freeipa-devel] [freeipa PR#233][comment] Build phase 6: %install cleanup
URL: https://github.com/freeipa/freeipa/pull/233 Title: #233: Build phase 6: %install cleanup pspacek commented: """ I've fixed incorrect use of `-D` in `install` calls above. """ See the full comment at https://github.com/freeipa/freeipa/pull/233#issuecomment-259960522 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#233][comment] Build phase 6: %install cleanup
URL: https://github.com/freeipa/freeipa/pull/233 Title: #233: Build phase 6: %install cleanup pspacek commented: """ > Failed to open: 'freeipa.spec.in', not a valid spec file. Damn it! I added the last commit with comment in SPEC file and did not run tests on that. Surprise surprise, RPM is PARSIN TEXT INSIDE COMMENTS and if you put %install into comment, guess what: It will blow up! G. (Another joke is that DNF builddep is throwing away error descrption from RPM SPEC file parser.) """ See the full comment at https://github.com/freeipa/freeipa/pull/233#issuecomment-259949443 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#233][comment] Build phase 6: %install cleanup
URL: https://github.com/freeipa/freeipa/pull/233 Title: #233: Build phase 6: %install cleanup pspacek commented: """ This version fixes the fixable issues, i.e. everything mentioned above except changing file ownership. """ See the full comment at https://github.com/freeipa/freeipa/pull/233#issuecomment-259952399 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#236][opened] Build phase 7: cleanup
URL: https://github.com/freeipa/freeipa/pull/236 Author: pspacek Title: #236: Build phase 7: cleanup Action: opened PR body: """ Depends on PR #233. - Clean-up ancient leftovers and clean minor bugs here and there. - Support --enable-silent-rules and V=0 variable for make to make the build less verbose and warnings more visible. """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/236/head:pr236 git checkout pr236 From c26ff5d4de8eaef7430382f5aacc9bc2df39b43c Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Thu, 10 Nov 2016 12:07:03 +0100 Subject: [PATCH 01/11] Build: move client directory handling from SPEC to Makefile.am This is next step towards fully functional make install. https://fedorahosted.org/freeipa/ticket/6418 --- client/Makefile.am | 3 +++ freeipa.spec.in| 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/Makefile.am b/client/Makefile.am index 0a451e5..4c29ee7 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -122,3 +122,6 @@ MAINTAINERCLEANFILES = \ version.m4 \ $(NULL) +install-data-hook: + $(INSTALL) -d -m 755 $(DESTDIR)$(IPA_SYSCONF_DIR)/nssdb + $(INSTALL) -d -m 755 $(DESTDIR)$(localstatedir)/lib/ipa-client/sysrestore diff --git a/freeipa.spec.in b/freeipa.spec.in index 7dbbf87..4e39b3c 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -804,11 +804,8 @@ touch %{buildroot}%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa/backup %endif # ONLY_CLIENT -mkdir -p %{buildroot}%{_sysconfdir}/ipa/ /bin/touch %{buildroot}%{_sysconfdir}/ipa/default.conf /bin/touch %{buildroot}%{_sysconfdir}/ipa/ca.crt -mkdir -p %{buildroot}%{_sysconfdir}/ipa/nssdb -mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa-client/sysrestore %if ! %{ONLY_CLIENT} mkdir -p %{buildroot}%{_sysconfdir}/cron.d From efa9861cd95ff213f083db09cd68e16a16b01db3 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Thu, 10 Nov 2016 12:45:26 +0100 Subject: [PATCH 02/11] Build: move server directory handling from SPEC to Makefile.am This is next step towards fully functional make install. https://fedorahosted.org/freeipa/ticket/6418 --- freeipa.spec.in | 8 install/Makefile.am | 11 +-- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/freeipa.spec.in b/freeipa.spec.in index 4e39b3c..68fc2bc 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -741,8 +741,6 @@ sed -i -e'1s/python\(3\|$\)/python2/' %{buildroot}%{_bindir}/ipa %find_lang %{gettext_domain} -mkdir -p %{buildroot}%{_usr}/share/ipa - %if ! %{ONLY_CLIENT} # Remove .la files from libtool - we don't want to package # these files @@ -793,7 +791,6 @@ mkdir -p %{buildroot}%{_usr}/share/ipa/html/ /bin/touch %{buildroot}%{_usr}/share/ipa/html/krb.js /bin/touch %{buildroot}%{_usr}/share/ipa/html/krb5.ini /bin/touch %{buildroot}%{_usr}/share/ipa/html/krbrealm.con -mkdir -p %{buildroot}%{_initrddir} # Web UI plugin dir mkdir -p %{buildroot}%{_usr}/share/ipa/ui/js/plugins @@ -801,7 +798,6 @@ mkdir -p %{buildroot}%{_usr}/share/ipa/ui/js/plugins mkdir -p %{buildroot}%{_libdir}/krb5/plugins/libkrb5 touch %{buildroot}%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so -mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa/backup %endif # ONLY_CLIENT /bin/touch %{buildroot}%{_sysconfdir}/ipa/default.conf @@ -818,10 +814,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/cron.d sed -e 's,\.py.*$,.*,g' | sort -u | \ sed -e 's,\./,%%{python_sitelib}/ipatests/,g' ) >tests-python.list -mkdir -p %{buildroot}%{_sysconfdir}/ipa/custodia - -mkdir -p %{buildroot}%{_usr}/share/ipa/schema.d - %endif # ONLY_CLIENT diff --git a/install/Makefile.am b/install/Makefile.am index 2dcd927..64219c5 100644 --- a/install/Makefile.am +++ b/install/Makefile.am @@ -19,12 +19,11 @@ SUBDIRS = \ $(NULL) install-exec-local: - mkdir -p $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore - chmod 700 $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore - mkdir -p $(DESTDIR)$(localstatedir)/lib/ipa/sysupgrade - chmod 700 $(DESTDIR)$(localstatedir)/lib/ipa/sysupgrade - mkdir -p $(DESTDIR)$(localstatedir)/lib/ipa/pki-ca - chmod 755 $(DESTDIR)$(localstatedir)/lib/ipa/pki-ca + $(INSTALL) -d -m 700 $(DESTDIR)$(IPA_SYSCONF_DIR)/custodia + $(INSTALL) -d -m 700 $(DESTDIR)$(localstatedir)/lib/ipa/backup + $(INSTALL) -d -m 700 $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore + $(INSTALL) -d -m 700 $(DESTDIR)$(localstatedir)/lib/ipa/sysupgrade + $(INSTALL) -d -m 755 $(DESTDIR)$(localstatedir)/lib/ipa/pki-ca uninstall-local: -rmdir $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore From 68449e46ab7adb899161c107d16aa5d0f5145b4a Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Thu, 10 Nov 2016 14:39:59 +0100 Subject: [PATCH 03/11] Build: move web UI file installation from SPEC to Make
[Freeipa-devel] [freeipa PR#213][comment] Build system refactoring phase 3
URL: https://github.com/freeipa/freeipa/pull/213 Title: #213: Build system refactoring phase 3 tiran commented: """ memo for me: - [ ] /freeipa*.tar.gz is not removed - [ ] ```MOSTLYCLEANFILES``` only cleans ipasetup.py[co] but keeps __pycache__ and other pyc/pyo. add ```clean-local: rm -rf *.pyc *.pyc __pycache__``` - [x] ```Makefile.python.am``` clean-local has ```-delete``` and ```-exec```. AFAIK only one action is supported. - [ ] neither clean nor distclean removes ```/dist``` and ```/rpmbuild``` - [x] autoconf and automake files are not removed (Makefile.in, /config.sub ...) - [x] add ```ipasetup.py``` to ```dist_noinst_SCRIPTS``` ? """ See the full comment at https://github.com/freeipa/freeipa/pull/213#issuecomment-259371190 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#226][synchronized] Build refactoring phase 5
URL: https://github.com/freeipa/freeipa/pull/226 Author: pspacek Title: #226: Build refactoring phase 5 Action: synchronized To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/226/head:pr226 git checkout pr226 From 74b3f612e34cea48c66cfb536a7ff9da18442f30 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Wed, 9 Nov 2016 15:42:30 +0100 Subject: [PATCH 1/7] Build: remove unused and redundant code from configure.ac and po/Makefile.in https://fedorahosted.org/freeipa/ticket/6418 --- configure.ac | 4 po/Makefile.in | 1 - 2 files changed, 5 deletions(-) diff --git a/configure.ac b/configure.ac index 6e82c62..5646cb0 100644 --- a/configure.ac +++ b/configure.ac @@ -17,9 +17,6 @@ AC_HEADER_STDC AM_CONDITIONAL([HAVE_GCC], [test "$ac_cv_prog_gcc" = yes]) -AC_SUBST(VERSION) -AC_SUBST([INSTALL_DATA], ['$(INSTALL) -m 644 -p']) - dnl --- dnl - Check for NSPR/NSS dnl --- @@ -359,7 +356,6 @@ AC_ARG_WITH([vendor-suffix], [VENDOR_SUFFIX=${withval}], [VENDOR_SUFFIX=""]) -dnl TODO: IPA_VENDOR_RELEASE AC_SUBST([API_VERSION], [IPA_API_VERSION]) AC_SUBST([DATA_VERSION], [IPA_DATA_VERSION]) AC_SUBST([NUM_VERSION], [IPA_NUM_VERSION]) diff --git a/po/Makefile.in b/po/Makefile.in index b42d8fc..0ab449c 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -5,7 +5,6 @@ datadir = ${datarootdir} localedir = ${datarootdir}/locale INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL@ -m 644 AWK = @AWK@ SED = @SED@ MKDIR_P = @MKDIR_P@ From 14fc15929512ee5e3554c1b397e8845d59de839e Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Wed, 9 Nov 2016 16:15:19 +0100 Subject: [PATCH 2/7] Build: IPA_VERSION_IS_GIT_SNAPSHOT checks if source directory is Git repo https://fedorahosted.org/freeipa/ticket/6418 --- configure.ac | 11 +++ 1 file changed, 11 insertions(+) diff --git a/configure.ac b/configure.ac index 5646cb0..1b672fb 100644 --- a/configure.ac +++ b/configure.ac @@ -350,6 +350,17 @@ AC_MSG_RESULT([${IPAPLATFORM}]) dnl --- dnl Version information from VERSION.m4 and command line dnl --- +dnl Are we in source tree? +AM_CONDITIONAL([IS_GIT_SNAPSHOT], [test "IPA_VERSION_IS_GIT_SNAPSHOT" == "yes"]) +AM_COND_IF([IS_GIT_SNAPSHOT], [ + AC_MSG_CHECKING([if source directory is a Git reposistory]) + if test ! -d "${srcdir}/.git"; then + AC_MSG_ERROR([Git reposistory is required by VERSION.m4 IPA_VERSION_IS_GIT_SNAPSHOT but not found]) + else + AC_MSG_RESULT([yes]) + fi +]) + AC_ARG_WITH([vendor-suffix], AS_HELP_STRING([--with-vendor-suffix=STRING], [Vendor string used by package system, e.g. "-1.fc24"]), From 65dda782d50191b85979668294b79d409f77bbb0 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Wed, 9 Nov 2016 16:21:51 +0100 Subject: [PATCH 3/7] Build: use POSIX 1003.1-1988 (ustar) file format for tar archives Default format used by Autotools limits length of paths to 99 characters. This is not enough for tarballs with Git snapshots. https://fedorahosted.org/freeipa/ticket/6418 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 1b672fb..53d5dab 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ AC_INIT([freeipa], AC_CONFIG_HEADERS([config.h]) -AM_INIT_AUTOMAKE([foreign]) +AM_INIT_AUTOMAKE([foreign 1.9 tar-ustar]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) AC_PROG_CC_C99 From 424f3505a55e28d0045f3ef35b64caad84da81e4 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Wed, 9 Nov 2016 16:16:45 +0100 Subject: [PATCH 4/7] Build: IPA_VERSION_IS_GIT_SNAPSHOT re-generates version number on RPM build This is a huge hack. rpms target will touch VERSION.m4 file. This change is then detected by automake Makefiles which subsequently re-execute configure and make. We have to workaround fact that variables in new make targets (executed after new configure) are different than original ones. Also, we have to 'bake-in' precise snapshot version from Git to VERSION.m4 inside of RPM tarball so the RPM does not depend on git anymore. All this magic slows build down. If you want quick builds, do not enable IPA_VERSION_IS_GIT_SNAPSHOT. https://fedorahosted.org/freeipa/ticket/6418 --- .gitignore | 2 ++ Makefile.am | 46 ++ VERSION.m4 | 22 +- configure.ac | 1 + 4 files changed, 58 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index e1a42d6..de61aff 100644 --- a/.gitignore +++ b/.gitig
[Freeipa-devel] [freeipa PR#226][synchronized] Build refactoring phase 5
URL: https://github.com/freeipa/freeipa/pull/226 Author: pspacek Title: #226: Build refactoring phase 5 Action: synchronized To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/226/head:pr226 git checkout pr226 From 212d059cc208a1bba32255867c6d7b8deaad8b6c Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Wed, 9 Nov 2016 13:34:04 +0100 Subject: [PATCH 1/8] Build: fix make clean to remove build artifacts from top-level directory make lint and make dist were generating files which were not removed by make clean. https://fedorahosted.org/freeipa/ticket/6418 --- Makefile.am | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index ffa5de2..031aef4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,11 @@ SUBDIRS = asn1 util client contrib daemons init install ipaclient ipalib ipaplatform ipapython ipaserver ipatests po -MOSTLYCLEANFILES = ipasetup.pyc ipasetup.pyo +MOSTLYCLEANFILES = ipasetup.pyc ipasetup.pyo \ + ignore_import_errors.pyc ignore_import_errors.pyo \ + ipasetup.pyc ipasetup.pyo \ + lite-server.pyc lite-server.pyo \ + pylint_plugins.pyc pylint_plugins.pyo \ + $(TARBALL) # user-facing scripts dist_bin_SCRIPTS = ipa @@ -25,6 +30,11 @@ EXTRA_DIST = .mailmap \ pylintrc \ pytest.ini +clean-local: + rm -rf "$(RPMBUILD)" + rm -rf "$(top_builddir)/dist" + rm -rf "$(top_srcdir)/__pycache__" + # convenience targets for RPM build RPMBUILD ?= $(abs_builddir)/rpmbuild TARBALL = $(PACKAGE)-$(VERSION).tar.gz From cb2084eba47bc7608375c2060716a2a8fbf06c29 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Wed, 9 Nov 2016 15:42:30 +0100 Subject: [PATCH 2/8] Build: remove unused and redundant code from configure.ac and po/Makefile.in https://fedorahosted.org/freeipa/ticket/6418 --- configure.ac | 4 po/Makefile.in | 1 - 2 files changed, 5 deletions(-) diff --git a/configure.ac b/configure.ac index 6e82c62..5646cb0 100644 --- a/configure.ac +++ b/configure.ac @@ -17,9 +17,6 @@ AC_HEADER_STDC AM_CONDITIONAL([HAVE_GCC], [test "$ac_cv_prog_gcc" = yes]) -AC_SUBST(VERSION) -AC_SUBST([INSTALL_DATA], ['$(INSTALL) -m 644 -p']) - dnl --- dnl - Check for NSPR/NSS dnl --- @@ -359,7 +356,6 @@ AC_ARG_WITH([vendor-suffix], [VENDOR_SUFFIX=${withval}], [VENDOR_SUFFIX=""]) -dnl TODO: IPA_VENDOR_RELEASE AC_SUBST([API_VERSION], [IPA_API_VERSION]) AC_SUBST([DATA_VERSION], [IPA_DATA_VERSION]) AC_SUBST([NUM_VERSION], [IPA_NUM_VERSION]) diff --git a/po/Makefile.in b/po/Makefile.in index b42d8fc..0ab449c 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -5,7 +5,6 @@ datadir = ${datarootdir} localedir = ${datarootdir}/locale INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL@ -m 644 AWK = @AWK@ SED = @SED@ MKDIR_P = @MKDIR_P@ From 3347f58b656b86a5a22150fd8198d831867d5bbc Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Wed, 9 Nov 2016 16:15:19 +0100 Subject: [PATCH 3/8] Build: IPA_VERSION_IS_GIT_SNAPSHOT checks if source directory is Git repo https://fedorahosted.org/freeipa/ticket/6418 --- configure.ac | 11 +++ 1 file changed, 11 insertions(+) diff --git a/configure.ac b/configure.ac index 5646cb0..1b672fb 100644 --- a/configure.ac +++ b/configure.ac @@ -350,6 +350,17 @@ AC_MSG_RESULT([${IPAPLATFORM}]) dnl --- dnl Version information from VERSION.m4 and command line dnl --- +dnl Are we in source tree? +AM_CONDITIONAL([IS_GIT_SNAPSHOT], [test "IPA_VERSION_IS_GIT_SNAPSHOT" == "yes"]) +AM_COND_IF([IS_GIT_SNAPSHOT], [ + AC_MSG_CHECKING([if source directory is a Git reposistory]) + if test ! -d "${srcdir}/.git"; then + AC_MSG_ERROR([Git reposistory is required by VERSION.m4 IPA_VERSION_IS_GIT_SNAPSHOT but not found]) + else + AC_MSG_RESULT([yes]) + fi +]) + AC_ARG_WITH([vendor-suffix], AS_HELP_STRING([--with-vendor-suffix=STRING], [Vendor string used by package system, e.g. "-1.fc24"]), From e21452024c91dacfa5ea9aa6e1e9a5b56710cc0b Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Wed, 9 Nov 2016 16:21:51 +0100 Subject: [PATCH 4/8] Build: use POSIX 1003.1-1988 (ustar) file format for tar archives Default format used by Autotools limits length of paths to 99 characters. This is not enough for tarballs with Git snapshots. https://fedorahosted.org/freeipa/ticket/6418 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 1b672fb..53d5
[Freeipa-devel] [freeipa PR#226][comment] Build refactoring phase 5
URL: https://github.com/freeipa/freeipa/pull/226 Title: #226: Build refactoring phase 5 pspacek commented: """ I've added missing files to .gitignore. """ See the full comment at https://github.com/freeipa/freeipa/pull/226#issuecomment-259694249 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#226][comment] Build refactoring phase 5
URL: https://github.com/freeipa/freeipa/pull/226 Title: #226: Build refactoring phase 5 pspacek commented: """ Rebased on top of current master. """ See the full comment at https://github.com/freeipa/freeipa/pull/226#issuecomment-259695270 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#213][edited] Build system refactoring phase 3
URL: https://github.com/freeipa/freeipa/pull/213 Author: pspacek Title: #213: Build system refactoring phase 3 Action: edited Changed field: body Original value: """ This monster patch-set refactors most of build system and moves most of the logic from SPEC file to build system. It is not yet complete, missing parts are: - [ ] Python 3 support - [ ] Client-only build is not supported - [ ] IPA_VERSION_IS_GIT_SNAPSHOT does not work These will be sorted out later on but the review of the patch set can begin. """ -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#226][opened] Build refactoring phase 5
URL: https://github.com/freeipa/freeipa/pull/226 Author: pspacek Title: #226: Build refactoring phase 5 Action: opened PR body: """ This PR fixes IPA_VERSION_IS_GIT_SNAPSHOT option and vendor version passing from SPEC to configure. At also contains minor cleanup and srpm target which is used by Coverity. """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/226/head:pr226 git checkout pr226 From e701748b2eaf5f15803229d450a082a48f22560e Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Wed, 9 Nov 2016 13:34:04 +0100 Subject: [PATCH 1/8] Build: fix make clean to remove build artifacts from top-level directory make lint and make dist were generating files which were not removed by make clean. https://fedorahosted.org/freeipa/ticket/6418 --- Makefile.am | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index ffa5de2..031aef4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,11 @@ SUBDIRS = asn1 util client contrib daemons init install ipaclient ipalib ipaplatform ipapython ipaserver ipatests po -MOSTLYCLEANFILES = ipasetup.pyc ipasetup.pyo +MOSTLYCLEANFILES = ipasetup.pyc ipasetup.pyo \ + ignore_import_errors.pyc ignore_import_errors.pyo \ + ipasetup.pyc ipasetup.pyo \ + lite-server.pyc lite-server.pyo \ + pylint_plugins.pyc pylint_plugins.pyo \ + $(TARBALL) # user-facing scripts dist_bin_SCRIPTS = ipa @@ -25,6 +30,11 @@ EXTRA_DIST = .mailmap \ pylintrc \ pytest.ini +clean-local: + rm -rf "$(RPMBUILD)" + rm -rf "$(top_builddir)/dist" + rm -rf "$(top_srcdir)/__pycache__" + # convenience targets for RPM build RPMBUILD ?= $(abs_builddir)/rpmbuild TARBALL = $(PACKAGE)-$(VERSION).tar.gz From 814cae9b122c96304e16cf67f90a42f0659e2174 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Wed, 9 Nov 2016 15:42:30 +0100 Subject: [PATCH 2/8] Build: remove unused and redundant code from configure.ac and po/Makefile.in https://fedorahosted.org/freeipa/ticket/6418 --- configure.ac | 4 po/Makefile.in | 1 - 2 files changed, 5 deletions(-) diff --git a/configure.ac b/configure.ac index 6e82c62..5646cb0 100644 --- a/configure.ac +++ b/configure.ac @@ -17,9 +17,6 @@ AC_HEADER_STDC AM_CONDITIONAL([HAVE_GCC], [test "$ac_cv_prog_gcc" = yes]) -AC_SUBST(VERSION) -AC_SUBST([INSTALL_DATA], ['$(INSTALL) -m 644 -p']) - dnl --- dnl - Check for NSPR/NSS dnl --- @@ -359,7 +356,6 @@ AC_ARG_WITH([vendor-suffix], [VENDOR_SUFFIX=${withval}], [VENDOR_SUFFIX=""]) -dnl TODO: IPA_VENDOR_RELEASE AC_SUBST([API_VERSION], [IPA_API_VERSION]) AC_SUBST([DATA_VERSION], [IPA_DATA_VERSION]) AC_SUBST([NUM_VERSION], [IPA_NUM_VERSION]) diff --git a/po/Makefile.in b/po/Makefile.in index b42d8fc..0ab449c 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -5,7 +5,6 @@ datadir = ${datarootdir} localedir = ${datarootdir}/locale INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL@ -m 644 AWK = @AWK@ SED = @SED@ MKDIR_P = @MKDIR_P@ From a5673d0ff2307b0cc289f47698bf4452d9a625f0 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Wed, 9 Nov 2016 16:15:19 +0100 Subject: [PATCH 3/8] Build: IPA_VERSION_IS_GIT_SNAPSHOT checks if source directory is Git repo https://fedorahosted.org/freeipa/ticket/6418 --- configure.ac | 11 +++ 1 file changed, 11 insertions(+) diff --git a/configure.ac b/configure.ac index 5646cb0..1b672fb 100644 --- a/configure.ac +++ b/configure.ac @@ -350,6 +350,17 @@ AC_MSG_RESULT([${IPAPLATFORM}]) dnl --- dnl Version information from VERSION.m4 and command line dnl --- +dnl Are we in source tree? +AM_CONDITIONAL([IS_GIT_SNAPSHOT], [test "IPA_VERSION_IS_GIT_SNAPSHOT" == "yes"]) +AM_COND_IF([IS_GIT_SNAPSHOT], [ + AC_MSG_CHECKING([if source directory is a Git reposistory]) + if test ! -d "${srcdir}/.git"; then + AC_MSG_ERROR([Git reposistory is required by VERSION.m4 IPA_VERSION_IS_GIT_SNAPSHOT but not found]) + else + AC_MSG_RESULT([yes]) + fi +]) + AC_ARG_WITH([vendor-suffix], AS_HELP_STRING([--with-vendor-suffix=STRING], [Vendor string used by package system, e.g. "-1.fc24"]), From 398e1e222e89e4a82b2a52ced9548fa14fe580e7 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Wed, 9 Nov 2016 16:21:51 +0100 Subject: [PATCH 4/8] Build: use POSIX 1003.1-1988 (ustar) file format for tar archives Default format used by Autotools limits length of paths to 99 characters. This is not enough for
[Freeipa-devel] [freeipa PR#169][comment] Replace ipaplatform's symlinks with a meta importer
URL: https://github.com/freeipa/freeipa/pull/169 Title: #169: Replace ipaplatform's symlinks with a meta importer pspacek commented: """ NACK freeipa-server-4.4.90.201610190959GITf8012c0-0.fc24.x86_64 it broke following call which is used in RPM `%post client` scriptlet: ~~~ $ python2 -c 'from ipapython.certdb import update_ipa_nssdb; update_ipa_nssdb()' Traceback (most recent call last): File "", line 1, in File "/usr/lib/python2.7/site-packages/ipapython/certdb.py", line 28, in from ipaplatform.paths import paths ImportError: No module named paths ~~~ """ See the full comment at https://github.com/freeipa/freeipa/pull/169#issuecomment-254783841 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#169][comment] Replace ipaplatform's symlinks with a meta importer
URL: https://github.com/freeipa/freeipa/pull/169 Title: #169: Replace ipaplatform's symlinks with a meta importer pspacek commented: """ Uh, it is quite a lot of code to get rid of few symlinks. Is it worth? @jcholast @mbasti-rh @martbab @tomaskrizek and others? """ See the full comment at https://github.com/freeipa/freeipa/pull/169#issuecomment-254427160 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#170][closed] Mark all phony Makefile targets as .PHONY
URL: https://github.com/freeipa/freeipa/pull/170 Author: tiran Title: #170: Mark all phony Makefile targets as .PHONY Action: closed To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/170/head:pr170 git checkout pr170 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#170][comment] Mark all phony Makefile targets as .PHONY
URL: https://github.com/freeipa/freeipa/pull/170 Title: #170: Mark all phony Makefile targets as .PHONY pspacek commented: """ Hand-made Makefile is completely going away and will be auto-generated, so we do not need to spend more time on this version. """ See the full comment at https://github.com/freeipa/freeipa/pull/170#issuecomment-254463481 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#170][+rejected] Mark all phony Makefile targets as .PHONY
URL: https://github.com/freeipa/freeipa/pull/170 Title: #170: Mark all phony Makefile targets as .PHONY Label: +rejected -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#169][+ack] Replace ipaplatform's symlinks with __path__
URL: https://github.com/freeipa/freeipa/pull/169 Title: #169: Replace ipaplatform's symlinks with __path__ Label: +ack -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#171][comment] Build system cleanup phase 2
URL: https://github.com/freeipa/freeipa/pull/171 Title: #171: Build system cleanup phase 2 pspacek commented: """ @lslebodn Decision if we need client_only build is still open. We may drop it so reimplementing it would be busy work. """ See the full comment at https://github.com/freeipa/freeipa/pull/171#issuecomment-255023841 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#171][comment] Build system cleanup phase 2
URL: https://github.com/freeipa/freeipa/pull/171 Title: #171: Build system cleanup phase 2 pspacek commented: """ I consider CURL topic to be just bikesheding. Ad POPT: RHEL is going to require explicit configuration as designed in http://www.freeipa.org/page/V4/Build_system_refactoring because you have to explicitly disable missing checks etc. anyway. At the same time you can provide correct POPT flags. If RHEL packager disagrees we can use some auto-magic but I would rather avoid it whenever possible. For reasons above, I think that upstream version should use pkgconfig as it is preferred way for library auto-detection. """ See the full comment at https://github.com/freeipa/freeipa/pull/171#issuecomment-254802857 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#171][comment] Build system cleanup phase 2
URL: https://github.com/freeipa/freeipa/pull/171 Title: #171: Build system cleanup phase 2 pspacek commented: """ @lslebodn If you read the pull request description you will notice that client-only build will be solved later on. """ See the full comment at https://github.com/freeipa/freeipa/pull/171#issuecomment-254803410 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#171][comment] Build system cleanup phase 2
URL: https://github.com/freeipa/freeipa/pull/171 Title: #171: Build system cleanup phase 2 pspacek commented: """ Justification is above, please push. """ See the full comment at https://github.com/freeipa/freeipa/pull/171#issuecomment-254800046 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#159][comment] spec file: clean up BuildRequires
URL: https://github.com/freeipa/freeipa/pull/159 Title: #159: spec file: clean up BuildRequires pspacek commented: """ Commit 6256e8014aa3d68dc46e6c878be813473bffd1ac breaks pylint because it is not compatible with ipaplatform implementation introduced in 8f98fa1bd5f1da207fab6f89b75e0cdc19d00797. I do not care which part will be changed but we need to fix this first. (Either change ipaplatform to not confuse pylint or improve pylint plugin.) """ See the full comment at https://github.com/freeipa/freeipa/pull/159#issuecomment-255073461 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#171][comment] Build system cleanup phase 2
URL: https://github.com/freeipa/freeipa/pull/171 Title: #171: Build system cleanup phase 2 pspacek commented: """ @lslebodn Please discuss this matter on freeipa-devel list to gethigher visibility. Please note that current client-only build is quite broken and requires heavy machinery in downstream spec file so it is hard to speak about any reusage. """ See the full comment at https://github.com/freeipa/freeipa/pull/171#issuecomment-255038213 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#159][comment] spec file: clean up BuildRequires
URL: https://github.com/freeipa/freeipa/pull/159 Title: #159: spec file: clean up BuildRequires pspacek commented: """ Version rebased on top of current master (without PR 171) is available from https://github.com/pspacek/freeipa/tree/pr159-rebase . """ See the full comment at https://github.com/freeipa/freeipa/pull/159#issuecomment-255041910 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#171][comment] Build system cleanup phase 2
URL: https://github.com/freeipa/freeipa/pull/171 Title: #171: Build system cleanup phase 2 pspacek commented: """ This version replaces ipaplatform magic with symlinks generated by configure. It should work with jcholast's PR 159. """ See the full comment at https://github.com/freeipa/freeipa/pull/171#issuecomment-255116485 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [bind-dyndb-ldap PR#2][comment] fix ldif syntax and add idnsTemplateAttribute
URL: https://github.com/freeipa/bind-dyndb-ldap/pull/2 Title: #2: fix ldif syntax and add idnsTemplateAttribute pspacek commented: """ Thanks! I've commited the fix as 17711141882aca3847a5daba2292bcbcc471ec63. """ See the full comment at https://github.com/freeipa/bind-dyndb-ldap/pull/2#issuecomment-253770929 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [bind-dyndb-ldap PR#2][closed] fix ldif syntax and add idnsTemplateAttribute
URL: https://github.com/freeipa/bind-dyndb-ldap/pull/2 Author: stutiredboy Title: #2: fix ldif syntax and add idnsTemplateAttribute Action: closed To pull the PR as Git branch: git remote add ghbind-dyndb-ldap https://github.com/freeipa/bind-dyndb-ldap git fetch ghbind-dyndb-ldap pull/2/head:pr2 git checkout pr2 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#132][+ack] Port all setup.py files to setuptools
URL: https://github.com/freeipa/freeipa/pull/132 Title: #132: Port all setup.py files to setuptools Label: +ack -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#132][comment] Port all setup.py files to setuptools
URL: https://github.com/freeipa/freeipa/pull/132 Title: #132: Port all setup.py files to setuptools pspacek commented: """ Jenkins does not complain. ACK. """ See the full comment at https://github.com/freeipa/freeipa/pull/132#issuecomment-255142707 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#171][comment] Build system cleanup phase 2
URL: https://github.com/freeipa/freeipa/pull/171 Title: #171: Build system cleanup phase 2 pspacek commented: """ @lslebodn I'm really trying to explain this but I'm still not able to get the point across. > My concerns are related purely to C-code. Please understand that IPA client consists of components in C as well from components in Python, and also non-programatic components like translation machinery etc. We certainly can create m4 include maze and force maintainer to always use `grep` before he finds particular part in the build system. Unfortunatlly, even the m4 maze will not solve the problem that client-only build of C binaries simply do not constitute working IPA client. Integration with other Python components is necessary to get the client to work. The end goal is to fold all of hand-made Makefile and SPEC file scripts to the build system, so in the end, it should help with porting to other arches - there will be just one place where changes need to be done, instead of three. I hope that it clears up why it is not useful to insist on keeping current pieces as they were before. The design document was sent to freeipa-devel mailing list in this thread: https://www.redhat.com/archives/freeipa-devel/2016-October/msg00134.html Please discuss conceptual questions on the mailing list so we can get attention of other FreeIPA developers and avoid need to point people one by one to this PR. Thank you for understanding. """ See the full comment at https://github.com/freeipa/freeipa/pull/171#issuecomment-255172783 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [bind-dyndb-ldap PR#2][+ack] fix ldif syntax and add idnsTemplateAttribute
URL: https://github.com/freeipa/bind-dyndb-ldap/pull/2 Title: #2: fix ldif syntax and add idnsTemplateAttribute Label: +ack -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] WARNING: MERGED [bind-dyndb-ldap PR#3][closed] spec: Add libuuid-devel to BuildRequires
*WARNING: this pull request has been merged!* This is only mirrored repo thus any changes will be erased. Please push commit(s) to authoritative repository. URL: https://github.com/freeipa/bind-dyndb-ldap/pull/3 Author: sgallagher Title: #3: spec: Add libuuid-devel to BuildRequires Action: closed To pull the PR as Git branch: git remote add ghbind-dyndb-ldap https://github.com/freeipa/bind-dyndb-ldap git fetch ghbind-dyndb-ldap pull/3/head:pr3 git checkout pr3 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [bind-dyndb-ldap PR#3][+ack] spec: Add libuuid-devel to BuildRequires
URL: https://github.com/freeipa/bind-dyndb-ldap/pull/3 Title: #3: spec: Add libuuid-devel to BuildRequires Label: +ack -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [bind-dyndb-ldap PR#3][reopened] spec: Add libuuid-devel to BuildRequires
URL: https://github.com/freeipa/bind-dyndb-ldap/pull/3 Author: sgallagher Title: #3: spec: Add libuuid-devel to BuildRequires Action: reopened To pull the PR as Git branch: git remote add ghbind-dyndb-ldap https://github.com/freeipa/bind-dyndb-ldap git fetch ghbind-dyndb-ldap pull/3/head:pr3 git checkout pr3 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#159][comment] spec file: clean up BuildRequires
URL: https://github.com/freeipa/freeipa/pull/159 Title: #159: spec file: clean up BuildRequires pspacek commented: """ - python2-dateutil and python2-sss-murmur packages are missing in with_lint condition. - the message from import error was confusing to me: > ipaserver/plugins/dogtag.py:244: No module named backports_abc > ipaserver/plugins/dogtag.py:244: No module named backports_abc In person, we were talking about some changes in the message. I would try something like this: > argv[0]: ipaserver/plugins/dogtag.py:244: No module named backports_abc. > Ignoring missing module. It might be required only for lint or only > conditionally. """ See the full comment at https://github.com/freeipa/freeipa/pull/159#issuecomment-254487503 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#171][comment] Build system cleanup phase 2
URL: https://github.com/freeipa/freeipa/pull/171 Title: #171: Build system cleanup phase 2 pspacek commented: """ This version fixes minor problems in error reporing and should have no other visible effect. """ See the full comment at https://github.com/freeipa/freeipa/pull/171#issuecomment-254550722 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#159][comment] spec file: clean up BuildRequires
URL: https://github.com/freeipa/freeipa/pull/159 Title: #159: spec file: clean up BuildRequires pspacek commented: """ This pull request was (again) rebased on top of PR#171. PR#171 changes ipaplatform handling to symlinks so the issue caused by `__path__` trick should go away. I.e. the rebased version is functional only with PR#171. """ See the full comment at https://github.com/freeipa/freeipa/pull/159#issuecomment-255178754 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#159][comment] spec file: clean up BuildRequires
URL: https://github.com/freeipa/freeipa/pull/159 Title: #159: spec file: clean up BuildRequires pspacek commented: """ This pull request was (again) rebased on top of PR#171. PR#171 changes ipaplatform handling to symlinks so the issue caused by `__path__` trick should go away. I.e. the rebased version is functional only with PR#171. The code is again available from https://github.com/pspacek/freeipa/tree/pr159-rebase """ See the full comment at https://github.com/freeipa/freeipa/pull/159#issuecomment-255178754 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#171][comment] Build system cleanup phase 2
URL: https://github.com/freeipa/freeipa/pull/171 Title: #171: Build system cleanup phase 2 pspacek commented: """ This PR including additional patches on top have passed build + all XMLRPC tests in Jenkins: job/build_refactoring-build-f24build_refactoring/18/ Additional commits can be found on https://github.com/pspacek/freeipa/commits/pr159-rebase The test included everything up to e33e00bdc17dc164a1c143d8cba85f5df6de9d7e """ See the full comment at https://github.com/freeipa/freeipa/pull/171#issuecomment-255180087 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#171][comment] Build system cleanup phase 2
URL: https://github.com/freeipa/freeipa/pull/171 Title: #171: Build system cleanup phase 2 pspacek commented: """ Re-adding ACK which was removed while we were "resolving" our disagreement with Lukas. """ See the full comment at https://github.com/freeipa/freeipa/pull/171#issuecomment-255408029 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#171][+ack] Build system cleanup phase 2
URL: https://github.com/freeipa/freeipa/pull/171 Title: #171: Build system cleanup phase 2 Label: +ack -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#183][comment] Add __name__ == __main__ guards to setup.pys
URL: https://github.com/freeipa/freeipa/pull/183 Title: #183: Add __name__ == __main__ guards to setup.pys pspacek commented: """ @tiran PEP8 errors need to be fixed first: ~~~ ./ipaclient/setup.py:28:80: E501 line too long (80 > 79 characters) ./ipalib/setup.py:28:80: E501 line too long (80 > 79 characters) ./ipaplatform/setup.py:28:80: E501 line too long (80 > 79 characters) ./ipaserver/setup.py:30:80: E501 line too long (80 > 79 characters) ./ipatests/setup.py:29:80: E501 line too long (80 > 79 characters) ~~~ Other than that, functional ACK. """ See the full comment at https://github.com/freeipa/freeipa/pull/183#issuecomment-255772205 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#175][comment] Remove ipapython/ipa.conf
URL: https://github.com/freeipa/freeipa/pull/175 Title: #175: Remove ipapython/ipa.conf pspacek commented: """ Sorry for the confusing here. Marking as rejected so it does not pop out in reports. """ See the full comment at https://github.com/freeipa/freeipa/pull/175#issuecomment-255103443 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#175][comment] Remove ipapython/ipa.conf
URL: https://github.com/freeipa/freeipa/pull/175 Title: #175: Remove ipapython/ipa.conf pspacek commented: """ Sorry for the confusing here. Marking as rejected so it does not pop out in reports. """ See the full comment at https://github.com/freeipa/freeipa/pull/175#issuecomment-255103443 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#175][+rejected] Remove ipapython/ipa.conf
URL: https://github.com/freeipa/freeipa/pull/175 Title: #175: Remove ipapython/ipa.conf Label: +rejected -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#155][synchronized] Build system cleanup
URL: https://github.com/freeipa/freeipa/pull/155 Author: pspacek Title: #155: Build system cleanup Action: synchronized To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/155/head:pr155 git checkout pr155 From fe402329de4a8658d1b6a52d69d3268ade730fbc Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Wed, 12 Oct 2016 10:52:43 +0200 Subject: [PATCH 1/7] Build: add missing KRB5_LIBS to daemons/ipa-otpd It was working accidentally because krb5 libs are part of OPENLDAP_LIBS. --- daemons/ipa-otpd/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/daemons/ipa-otpd/Makefile.am b/daemons/ipa-otpd/Makefile.am index d2e1679..9ba6237 100644 --- a/daemons/ipa-otpd/Makefile.am +++ b/daemons/ipa-otpd/Makefile.am @@ -1,5 +1,5 @@ -AM_CFLAGS := @LDAP_CFLAGS@ @LIBVERTO_CFLAGS@ -AM_LDFLAGS := @LDAP_LIBS@ @LIBVERTO_LIBS@ @KRAD_LIBS@ +AM_CFLAGS := @LDAP_CFLAGS@ @LIBVERTO_CFLAGS@ @KRB5_CFLAGS@ +AM_LDFLAGS := @LDAP_LIBS@ @LIBVERTO_LIBS@ @KRAD_LIBS@ @KRB5_LIBS@ noinst_HEADERS = internal.h appdir = $(libexecdir)/ipa/ From 16461cdd21b1b5e30dd4af544217b32090638627 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Wed, 12 Oct 2016 10:57:57 +0200 Subject: [PATCH 2/7] Build: modernize Kerberos library detection Use package config instead of checking headers. Package config is faster because it does not invoke compiler and guarantees proper linking flags because these are provided by package maintainer instead of hardcoded into build system. libkrad does not have package config file so we keep the old way here. --- daemons/configure.ac | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/daemons/configure.ac b/daemons/configure.ac index 5c5a104..1d0209d 100644 --- a/daemons/configure.ac +++ b/daemons/configure.ac @@ -54,15 +54,11 @@ dnl --- dnl - Check for KRB5 dnl --- -AC_CHECK_HEADER(krb5.h, [], [AC_MSG_ERROR([krb5.h not found])]) +PKG_CHECK_MODULES([KRB5], [krb5], [], [AC_MSG_ERROR([libkrb5 not found])]) AC_CHECK_HEADER(krad.h, [], [AC_MSG_ERROR([krad.h not found])]) -AC_CHECK_LIB(krb5, main, [], [AC_MSG_ERROR([libkrb5 not found])]) -AC_CHECK_LIB(k5crypto, main, [krb5crypto=k5crypto], [krb5crypto=crypto]) AC_CHECK_LIB(krad, main, [], [AC_MSG_ERROR([libkrad not found])]) -KRB5_LIBS="-lkrb5 -l$krb5crypto -lcom_err" KRAD_LIBS="-lkrad" krb5rundir="${localstatedir}/run/krb5kdc" -AC_SUBST(KRB5_LIBS) AC_SUBST(KRAD_LIBS) AC_SUBST(krb5rundir) From 57de80d66ec45567060fe7e7b077a1573ea6b5d0 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Wed, 12 Oct 2016 10:58:22 +0200 Subject: [PATCH 3/7] Build: modernize UUID library detection Use package config instead of checking headers. Package config is faster because it does not invoke compiler and guarantees proper linking flags because these are provided by package maintainer instead of hardcoded into build system. --- daemons/configure.ac | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/daemons/configure.ac b/daemons/configure.ac index 1d0209d..34773f9 100644 --- a/daemons/configure.ac +++ b/daemons/configure.ac @@ -135,10 +135,7 @@ AC_SUBST(SSL_LIBS) dnl --- dnl - Check for UUID library dnl --- -AC_CHECK_HEADERS(uuid/uuid.h,,[AC_MSG_ERROR([uuid/uuid.h not found])]) - -AC_CHECK_LIB(uuid, uuid_generate_time, [UUID_LIBS="-luuid"]) -AC_SUBST(UUID_LIBS) +PKG_CHECK_MODULES([UUID], [uuid], [], [AC_MSG_ERROR([libuuid not found])]) dnl --- dnl - Check for Python From c104827ff61c25f878685edf1ceaa22cc7ef2e61 Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Wed, 12 Oct 2016 11:01:02 +0200 Subject: [PATCH 4/7] Build: modernize crypto library detection Use package config instead of checking headers. Package config is faster because it does not invoke compiler and guarantees proper linking flags because these are provided by package maintainer instead of hardcoded into build system. --- daemons/configure.ac| 9 ++--- daemons/ipa-sam/Makefile.am | 3 ++- daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am | 4 ++-- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/daemons/configure.ac b/daemons/configure.ac index 34773f9..958f01c 100644 --- a/daemons/configure.ac +++ b/daemons/configure.ac @@ -125,12 +125,7 @@ AC_SUBST(LDAP_LIBS) dnl
[Freeipa-devel] [freeipa PR#236][comment] Build phase 7: cleanup
URL: https://github.com/freeipa/freeipa/pull/236 Title: #236: Build phase 7: cleanup pspacek commented: """ Hi Lukas. Given there is no technical justification to have it I'm going to remove these. Simple is better than complex. """ See the full comment at https://github.com/freeipa/freeipa/pull/236#issuecomment-260280943 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#237][synchronized] Update man page for ipa-adtrust-install by removing --no-msdcs option
URL: https://github.com/freeipa/freeipa/pull/237 Author: pspacek Title: #237: Update man page for ipa-adtrust-install by removing --no-msdcs option Action: synchronized To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/237/head:pr237 git checkout pr237 From 7e9e99f98a4a68345de45d26d6bc1318e62d5bef Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Mon, 14 Nov 2016 08:55:52 +0100 Subject: [PATCH] Update man page for ipa-adtrust-install by removing --no-msdcs option https://fedorahosted.org/freeipa/ticket/6480 --- install/tools/man/ipa-adtrust-install.1 | 27 --- 1 file changed, 27 deletions(-) diff --git a/install/tools/man/ipa-adtrust-install.1 b/install/tools/man/ipa-adtrust-install.1 index fbf430a..6e8438b 100644 --- a/install/tools/man/ipa-adtrust-install.1 +++ b/install/tools/man/ipa-adtrust-install.1 @@ -75,33 +75,6 @@ ipa\-adtrust\-install for a second time with a different NetBIOS name will change the name. Please note that changing the NetBIOS name might break existing trust relationships to other domains. .TP -\fB\-\-no\-msdcs\fR -Do not create DNS service records for Windows in managed DNS server. Since those -DNS service records are the only way to discover domain controllers of other -domains they must be added manually to a different DNS server to allow trust -realationships work properly. All needed service records are listed when -ipa\-adtrust\-install finishes and either \-\-no\-msdcs was given or no IPA DNS -service is configured. Typically service records for the following service names -are needed for the IPA domain which should point to all IPA servers: -.IP -\(bu _ldap._tcp -.IP -\(bu _kerberos._tcp -.IP -\(bu _kerberos._udp -.IP -\(bu _ldap._tcp.dc._msdcs -.IP -\(bu _kerberos._tcp.dc._msdcs -.IP -\(bu _kerberos._udp.dc._msdcs -.IP -\(bu _ldap._tcp.Default-First-Site-Name._sites.dc._msdcs -.IP -\(bu _kerberos._tcp.Default-First-Site-Name._sites.dc._msdcs -.IP -\(bu _kerberos._udp.Default-First-Site-Name._sites.dc._msdcs -.TP \fB\-\-add\-sids\fR Add SIDs to existing users and groups as on of final steps of the ipa\-adtrust\-install run. If there a many existing users and groups and a -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#237][comment] Update man page for ipa-adtrust-install by removing --no-msdcs option
URL: https://github.com/freeipa/freeipa/pull/237 Title: #237: Update man page for ipa-adtrust-install by removing --no-msdcs option pspacek commented: """ Here you go. """ See the full comment at https://github.com/freeipa/freeipa/pull/237#issuecomment-260280769 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#237][opened] Update man page for ipa-adtrust-install by removing --no-msdcs option
URL: https://github.com/freeipa/freeipa/pull/237 Author: pspacek Title: #237: Update man page for ipa-adtrust-install by removing --no-msdcs option Action: opened PR body: """ https://bugzilla.redhat.com/show_bug.cgi?id=1392778 """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/237/head:pr237 git checkout pr237 From f9e5691800b5077ffb419674d9c941c758d5352f Mon Sep 17 00:00:00 2001 From: Petr Spacek <pspa...@redhat.com> Date: Mon, 14 Nov 2016 08:55:52 +0100 Subject: [PATCH] Update man page for ipa-adtrust-install by removing --no-msdcs option https://bugzilla.redhat.com/show_bug.cgi?id=1392778 --- install/tools/man/ipa-adtrust-install.1 | 27 --- 1 file changed, 27 deletions(-) diff --git a/install/tools/man/ipa-adtrust-install.1 b/install/tools/man/ipa-adtrust-install.1 index fbf430a..6e8438b 100644 --- a/install/tools/man/ipa-adtrust-install.1 +++ b/install/tools/man/ipa-adtrust-install.1 @@ -75,33 +75,6 @@ ipa\-adtrust\-install for a second time with a different NetBIOS name will change the name. Please note that changing the NetBIOS name might break existing trust relationships to other domains. .TP -\fB\-\-no\-msdcs\fR -Do not create DNS service records for Windows in managed DNS server. Since those -DNS service records are the only way to discover domain controllers of other -domains they must be added manually to a different DNS server to allow trust -realationships work properly. All needed service records are listed when -ipa\-adtrust\-install finishes and either \-\-no\-msdcs was given or no IPA DNS -service is configured. Typically service records for the following service names -are needed for the IPA domain which should point to all IPA servers: -.IP -\(bu _ldap._tcp -.IP -\(bu _kerberos._tcp -.IP -\(bu _kerberos._udp -.IP -\(bu _ldap._tcp.dc._msdcs -.IP -\(bu _kerberos._tcp.dc._msdcs -.IP -\(bu _kerberos._udp.dc._msdcs -.IP -\(bu _ldap._tcp.Default-First-Site-Name._sites.dc._msdcs -.IP -\(bu _kerberos._tcp.Default-First-Site-Name._sites.dc._msdcs -.IP -\(bu _kerberos._udp.Default-First-Site-Name._sites.dc._msdcs -.TP \fB\-\-add\-sids\fR Add SIDs to existing users and groups as on of final steps of the ipa\-adtrust\-install run. If there a many existing users and groups and a -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
[Freeipa-devel] [freeipa PR#237][reopened] Update man page for ipa-adtrust-install by removing --no-msdcs option
URL: https://github.com/freeipa/freeipa/pull/237 Author: pspacek Title: #237: Update man page for ipa-adtrust-install by removing --no-msdcs option Action: reopened To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/237/head:pr237 git checkout pr237 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code