From 81afdd9259009bd8aad7d52ac857623bc7e44f9f Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Thu, 26 Oct 2017 16:27:57 +0200 Subject: [PATCH 01/17] use bootstrap --- freeipa.yaml | 149 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 149 insertions(+) create mode 100644 freeipa.yaml diff --git a/freeipa.yaml b/freeipa.yaml new file mode 100644 index 0000000..326d6d2 --- /dev/null +++ b/freeipa.yaml @@ -0,0 +1,149 @@ +document: modulemd +version: 1 +data: + summary: freeipa module + description: This freeipa module has been generated. + license: + module: + - MIT + dependencies: + buildrequires: + bootstrap: f27 + # platform: f27 + # 389-ds: 1.2 + # bind: 9 + # sssd: master + # python2: master + # #python2-ecosystem: master + # python3: master + # python3-ecosystem: master + requires: + platform: f27 + java: 8 + perl: master + 389-ds: 1.2 + bind: 9 + sssd: master + samba: 4.7 + pki: master + tomcat: master + resteasy: master + httpd: 2.4 + python2: master + python2-ecosystem: master + python3: master + python3-ecosystem: master + networking-base: f27 + fonts: f27 + references: + community: https://docs.pagure.org/modularity/ + documentation: https://github.com/modularity-modules/freeipa + tracker: https://github.com/modularity-modules/freeipa + api: + rpms: + - freeipa-client + - freeipa-client-common + - freeipa-common + - freeipa-desktop-profile + - freeipa-python-compat + - freeipa-server + - freeipa-server-common + - freeipa-server-dns + - freeipa-server-trust-ad + profiles: + default: + description: A generated profile based on top-lvl package list. + rpms: + - freeipa-client + - freeipa-client-common + - freeipa-common + - freeipa-desktop-profile + - freeipa-python-compat + - freeipa-server + - freeipa-server-common + - freeipa-server-dns + - freeipa-server-trust-ad + filter: + rpms: + # - openssl + # - openssl-libs + # - openssl-devel + # - openssl-perl + # - openssl-static + # - m2crypto + components: + rpms: + # gssntlmssp-0.7.0-5.fc27 + gssntlmssp: + rationale: Generated. + ref: 87f459994246e83eadc558fe609c03a6a3c67174 + buildorder: -5 + # python-lesscpy-0.10.1-10.fc27 + python-lesscpy: + rationale: Generated. + ref: 3e0beb47da9a8ab347d7596afce75f3045983e87 + buildorder: -5 + # python-ldap-2.4.25-6.fc27 + python-ldap: + rationale: Generated. + ref: 72a2bc613a8caa69d01b960e0241b99048beb582 + buildorder: -5 + # libica-3.2.0-1.fc27 + libica: + rationale: Generated. + ref: 6e8e9c427bf3321907fc07cbaf5ae3bab1de9402 + buildorder: -5 + arch: s390x + # autofs-5.1.3-4.fc27 + autofs: + rationale: Generated. + ref: aff40c61ff1f27a9d37bbb10c2b543eec8a179ec + # bind-dyndb-ldap-11.1-6.fc27 + bind-dyndb-ldap: + rationale: Generated. + ref: c385823d7570239556947b0a197d91001c2f4b92 + # certmonger-0.79.5-1.fc27 + certmonger: + rationale: Generated. + ref: 14252b49d5046a2bf9f7c0c54776a4fe4d6ca855 + # freeipa-4.6.1-3.fc27 + freeipa: + rationale: Generated. + ref: ce5ce37403a73a8063dc2788ba1f8f66c6365d4f + # freeipa-desktop-profile-0.0.6-1.fc27 + freeipa-desktop-profile: + rationale: Generated. + ref: 8744331820a1108eb56cfefda93632e71baeadf2 + # ldns-1.7.0-7.fc27 + ldns: + rationale: Generated. + ref: e2795563480951d174cb8bc6ef6329558217e1b6 + buildorder: -5 + # mod_auth_gssapi-1.5.1-3.fc27 + mod_auth_gssapi: + rationale: Generated. + ref: b721c11554816a2be4bfb031fd39b6962a59de95 + # mod_lookup_identity-1.0.0-4.fc27 + mod_lookup_identity: + rationale: Generated. + ref: a8f5998e590ff5eb741ed6f36ea711d92da18ca5 + # ntp-4.2.8p10-3.fc27 + ntp: + rationale: Generated. + ref: 71ae0271b61348f814b229a5f01a5bc16e8b6703 + # opencryptoki-3.7.0-3.fc27 + opencryptoki: + rationale: Generated. + ref: 1941e4a030e51d4bca2a1f16f73c0f16155bca22 + # opendnssec-1.4.9-7.fc27 + opendnssec: + rationale: Generated. + ref: c3e28a2a66e1e3f00f09837e090525dfa2b591f9 + # open-sans-fonts-1.10-6.fc27 + open-sans-fonts: + rationale: Generated. + ref: 10d8670646a2d68b45bc1946247720821b09e988 + # slapi-nis-0.56.1-4.fc27 + slapi-nis: + rationale: Generated. + ref: 314166f352ad983201c32ce734295ed1f2d328ee From 81de28958f9c08e0a051fb9768d80d47197d76a6 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Fri, 3 Nov 2017 16:46:52 -0400 Subject: [PATCH 02/17] Update 389-ds dependency to 1.3 Signed-off-by: Stephen Gallagher --- freeipa.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeipa.yaml b/freeipa.yaml index 326d6d2..6ea6da8 100644 --- a/freeipa.yaml +++ b/freeipa.yaml @@ -21,7 +21,7 @@ data: platform: f27 java: 8 perl: master - 389-ds: 1.2 + 389-ds: 1.3 bind: 9 sssd: master samba: 4.7 From fc0fc92f21bf4c91d9e84e86adbce457acf4751d Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Fri, 3 Nov 2017 21:01:04 -0400 Subject: [PATCH 03/17] Require runtime deps to build Signed-off-by: Stephen Gallagher --- freeipa.yaml | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/freeipa.yaml b/freeipa.yaml index 6ea6da8..0de5bfb 100644 --- a/freeipa.yaml +++ b/freeipa.yaml @@ -9,14 +9,23 @@ data: dependencies: buildrequires: bootstrap: f27 - # platform: f27 - # 389-ds: 1.2 - # bind: 9 - # sssd: master - # python2: master - # #python2-ecosystem: master - # python3: master - # python3-ecosystem: master + platform: f27 + java: 8 + perl: master + 389-ds: 1.3 + bind: 9 + sssd: master + samba: 4.7 + pki: master + tomcat: master + resteasy: master + httpd: 2.4 + python2: master + python2-ecosystem: master + python3: master + python3-ecosystem: master + networking-base: f27 + fonts: f27 requires: platform: f27 java: 8 From c6cf69c9184f464c3b3e15557cd55d43eeceaa4a Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Sat, 4 Nov 2017 14:28:58 -0400 Subject: [PATCH 04/17] Bumping to work around MBS bug Signed-off-by: Stephen Gallagher From 1fa14067f5e7b1300d60f32392a535ed9c91776b Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 7 Nov 2017 16:53:31 +0100 Subject: [PATCH 05/17] make sure that autofs doesn't use old coreutils provides Signed-off-by: Igor Gnatenko --- freeipa.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeipa.yaml b/freeipa.yaml index e44e3ae..6a82e6a 100644 --- a/freeipa.yaml +++ b/freeipa.yaml @@ -109,7 +109,7 @@ data: ref: f27 autofs: rationale: Generated. - ref: f27 + ref: 5ca46283b14bd68875495a8aec89d25a1e3dae04 autogen: rationale: Generated. ref: f27 From 327ff79c9f18964afb1800b818d2373cb54bd69c Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 7 Nov 2017 16:53:31 +0100 Subject: [PATCH 06/17] make sure that autofs doesn't use old coreutils provides Signed-off-by: Igor Gnatenko --- freeipa.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeipa.yaml b/freeipa.yaml index b85a3f2..96f0729 100644 --- a/freeipa.yaml +++ b/freeipa.yaml @@ -96,7 +96,7 @@ data: ref: f27 autofs: rationale: Generated. - ref: f27 + ref: master autogen: rationale: Generated. ref: f27 From d92c31e1753a7a882b53451566294bf1cfd4cfae Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Thu, 9 Nov 2017 11:24:27 +0100 Subject: [PATCH 07/17] add runtime dep fonts. filter python-ldap - in pki --- freeipa.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/freeipa.yaml b/freeipa.yaml index 96f0729..06496f9 100644 --- a/freeipa.yaml +++ b/freeipa.yaml @@ -33,6 +33,7 @@ data: python3: master python3-ecosystem: master libtom: master + fonts: master references: community: https://docs.pagure.org/modularity/ documentation: https://github.com/modularity-modules/freeipa @@ -69,6 +70,10 @@ data: # - openssl-perl # - openssl-static # - m2crypto + # build requirement, runtime python-ldap is in pki: + - python2-ldap + - python-ldap-debugsource + - python2-ldap-debuginfo components: rpms: gssntlmssp: From 73e4a74cc3dc42bf7271c155478c7f2a02f5c506 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Thu, 9 Nov 2017 11:54:44 +0100 Subject: [PATCH 08/17] filter python-ldap, in pki --- freeipa.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/freeipa.yaml b/freeipa.yaml index 6a82e6a..f93eb77 100644 --- a/freeipa.yaml +++ b/freeipa.yaml @@ -82,6 +82,11 @@ data: # - openssl-perl # - openssl-static # - m2crypto + # build requirement, runtime python-ldap is in pki: + - python2-ldap + - python-ldap-debugsource + - python2-ldap-debuginfo + components: rpms: gssntlmssp: From 6d22cb66fc2588929278e4b9585b59e809615f98 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Fri, 17 Nov 2017 16:00:36 +0100 Subject: [PATCH 09/17] add some profiles, remove fonts --- freeipa.yaml | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/freeipa.yaml b/freeipa.yaml index f93eb77..dee96bb 100644 --- a/freeipa.yaml +++ b/freeipa.yaml @@ -16,13 +16,13 @@ data: bind: 9 sssd: master samba: 4.7 - pki: master + pki: 10.4 tomcat: master resteasy: master httpd: 2.4 - python2: master + python2: 2.7 python2-ecosystem: master - python3: master + python3: 3.6 python3-ecosystem: master libtom: master networking-base: f27 @@ -35,7 +35,7 @@ data: bind: 9 sssd: master samba: 4.7 - pki: master + pki: 10.4 tomcat: master resteasy: master httpd: 2.4 @@ -74,6 +74,29 @@ data: - freeipa-server-common - freeipa-server-dns - freeipa-server-trust-ad + client: + description: FreeIPA Client + rpms: + - freeipa-client + - freeipa-client-common + - freeipa-common + domaincontroller: + description: FreeIPA Domain Controller + rpms: + - freeipa-common + - ntp + - bind-dyndb-ldap + - certmonger + dnsserver: + description: FreeIPA DNS Server + rpms: + - freeipa-common + - freeipa-server-dns + activedirectory: + description: FreeIPA Integration with Active Directory + rpms: + - freeipa-common + - freeipa-server-trust-ad filter: rpms: # - openssl @@ -130,9 +153,6 @@ data: custodia: rationale: Needed for dogtag ref: f27 - fontawesome-fonts: - rationale: Generated. - ref: f27 freeipa: rationale: Generated. ref: f27 @@ -172,9 +192,6 @@ data: # rationale: Generated. # ref: c914702332cf3be5ef4aff47068b00509cc092fc # buildorder: -5 - open-sans-fonts: - rationale: Generated. - ref: f27 python-jinja2: rationale: Generated. ref: f27 From 720b72bf207b962a216b1156a794a88c6d5ce255 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Mon, 20 Nov 2017 11:05:43 +0100 Subject: [PATCH 10/17] update module dependencies --- freeipa.yaml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/freeipa.yaml b/freeipa.yaml index dee96bb..e1d4c6e 100644 --- a/freeipa.yaml +++ b/freeipa.yaml @@ -11,39 +11,39 @@ data: bootstrap: f27 platform: f27 java: 8 - perl: master + perl: 5.26 389-ds: 1.3 bind: 9 sssd: master samba: 4.7 pki: 10.4 tomcat: master - resteasy: master + resteasy: 3.0 httpd: 2.4 python2: 2.7 - python2-ecosystem: master + python2-ecosystem: f27 python3: 3.6 - python3-ecosystem: master - libtom: master + python3-ecosystem: f27 + libtom: f27 networking-base: f27 fonts: f27 requires: platform: f27 java: 8 - perl: master + perl: 5.26 389-ds: 1.3 bind: 9 sssd: master samba: 4.7 pki: 10.4 tomcat: master - resteasy: master + resteasy: 3.0 httpd: 2.4 - python2: master - python2-ecosystem: master - python3: master - python3-ecosystem: master - libtom: master + python2: 2.7 + python2-ecosystem: f27 + python3: 3.6 + python3-ecosystem: f27 + libtom: f27 networking-base: f27 fonts: f27 references: From f62f32ac30127721923fda4ec1bd2754077ac5f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 27 Nov 2017 17:49:34 +0100 Subject: [PATCH 11/17] Port to platform:f27 All used modules must depepend on platform:f27. --- freeipa.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/freeipa.yaml b/freeipa.yaml index e1d4c6e..0a20753 100644 --- a/freeipa.yaml +++ b/freeipa.yaml @@ -14,10 +14,10 @@ data: perl: 5.26 389-ds: 1.3 bind: 9 - sssd: master + sssd: 1.16 samba: 4.7 pki: 10.4 - tomcat: master + tomcat: 8.0 resteasy: 3.0 httpd: 2.4 python2: 2.7 @@ -33,10 +33,10 @@ data: perl: 5.26 389-ds: 1.3 bind: 9 - sssd: master + sssd: 1.16 samba: 4.7 pki: 10.4 - tomcat: master + tomcat: 8.0 resteasy: 3.0 httpd: 2.4 python2: 2.7 From 982cc9ad2823dc9fa390e95b8291271a6f77f7a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Tue, 28 Nov 2017 09:02:00 +0100 Subject: [PATCH 12/17] Build freeipa-desktop-profile after freeipa --- freeipa.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/freeipa.yaml b/freeipa.yaml index 0a20753..88c0c20 100644 --- a/freeipa.yaml +++ b/freeipa.yaml @@ -156,9 +156,6 @@ data: freeipa: rationale: Generated. ref: f27 - freeipa-desktop-profile: - rationale: Generated. - ref: f27 hesiod: rationale: Generated. ref: f27 @@ -213,3 +210,8 @@ data: softhsm: rationale: Generated. ref: f27 + freeipa-desktop-profile: + rationale: Generated. + ref: f27 + # build-requires python3-ipaserver from freeipa component + buildorder: 1 From e9e986357a13ec81f342679d48b43a093402e212 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Fri, 17 Nov 2017 16:00:36 +0100 Subject: [PATCH 13/17] merge profiles from 4.6 branch --- freeipa.yaml | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/freeipa.yaml b/freeipa.yaml index 06496f9..b3e1f32 100644 --- a/freeipa.yaml +++ b/freeipa.yaml @@ -62,6 +62,29 @@ data: - freeipa-server-common - freeipa-server-dns - freeipa-server-trust-ad + client: + description: FreeIPA Client + rpms: + - freeipa-client + - freeipa-client-common + - freeipa-common + domaincontroller: + description: FreeIPA Domain Controller + rpms: + - freeipa-common + - ntp + - bind-dyndb-ldap + - certmonger + dnsserver: + description: FreeIPA DNS Server + rpms: + - freeipa-common + - freeipa-server-dns + activedirectory: + description: FreeIPA Integration with Active Directory + rpms: + - freeipa-common + - freeipa-server-trust-ad filter: rpms: # - openssl @@ -117,9 +140,6 @@ data: custodia: rationale: Needed for dogtag ref: f27 - fontawesome-fonts: - rationale: Generated. - ref: f27 freeipa: rationale: Generated. ref: f27 @@ -159,9 +179,6 @@ data: # rationale: Generated. # ref: c914702332cf3be5ef4aff47068b00509cc092fc # buildorder: -5 - open-sans-fonts: - rationale: Generated. - ref: f27 python-jinja2: rationale: Generated. ref: f27 From 6ddbed8010979044351d2c0f1a7b502284226135 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Tue, 28 Nov 2017 09:02:00 +0100 Subject: [PATCH 14/17] Build freeipa-desktop-profile after freeipa --- freeipa.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/freeipa.yaml b/freeipa.yaml index b3e1f32..636b5ca 100644 --- a/freeipa.yaml +++ b/freeipa.yaml @@ -143,9 +143,6 @@ data: freeipa: rationale: Generated. ref: f27 - freeipa-desktop-profile: - rationale: Generated. - ref: f27 hesiod: rationale: Generated. ref: f27 @@ -200,3 +197,8 @@ data: softhsm: rationale: Generated. ref: f27 + freeipa-desktop-profile: + rationale: Generated. + ref: f27 + # build-requires python3-ipaserver from freeipa component + buildorder: 1 From 8e9320d2b9bce3113bba0c5fdb66a304ea70094b Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Wed, 6 Dec 2017 13:42:55 +0100 Subject: [PATCH 15/17] cleanup, use master references --- freeipa.yaml | 67 ++++++++++++++++++++++------------------------------ 1 file changed, 28 insertions(+), 39 deletions(-) diff --git a/freeipa.yaml b/freeipa.yaml index 636b5ca..425372b 100644 --- a/freeipa.yaml +++ b/freeipa.yaml @@ -87,12 +87,6 @@ data: - freeipa-server-trust-ad filter: rpms: - # - openssl - # - openssl-libs - # - openssl-devel - # - openssl-perl - # - openssl-static - # - m2crypto # build requirement, runtime python-ldap is in pki: - python2-ldap - python-ldap-debugsource @@ -101,104 +95,99 @@ data: rpms: gssntlmssp: rationale: Build dependency. - ref: f27 + ref: master buildorder: -5 python-lesscpy: rationale: Build dependency. - ref: f27 + ref: master buildorder: -5 python-ldap: rationale: Build dependency. - ref: f27 + ref: master buildorder: -5 libica: rationale: Build dependency. - ref: f27 + ref: master buildorder: -5 pyusb: rationale: Build dependency. - ref: f27 + ref: master buildorder: -5 authconfig: rationale: Generated. - ref: f27 + ref: master autofs: rationale: Generated. ref: master autogen: rationale: Generated. - ref: f27 + ref: master babel: rationale: Generated. - ref: f27 + ref: master bind-dyndb-ldap: rationale: Generated. - ref: f27 + ref: master certmonger: rationale: Generated. - ref: f27 + ref: master custodia: rationale: Needed for dogtag - ref: f27 + ref: master freeipa: rationale: Generated. - ref: f27 + ref: master hesiod: rationale: Generated. - ref: f27 + ref: master ldns: rationale: Generated. - ref: f27 + ref: master buildorder: -5 m2crypto: - # Using master branch because f27 is FTBFS rationale: Generated. ref: master mod_auth_gssapi: rationale: Generated. - ref: f27 + ref: master mod_lookup_identity: rationale: Generated. - ref: f27 + ref: master ntp: rationale: Generated. - ref: f27 + ref: master oddjob: rationale: Generated. - ref: f27 + ref: master opencryptoki: rationale: Generated. - ref: f27 + ref: master opendnssec: rationale: Generated. - ref: f27 - # openssl: - # rationale: Generated. - # ref: c914702332cf3be5ef4aff47068b00509cc092fc - # buildorder: -5 + ref: master python-jinja2: rationale: Generated. - ref: f27 + ref: master python-markupsafe: rationale: Generated. - ref: f27 + ref: master python-yubico: rationale: Generated. - ref: f27 + ref: master pytz: rationale: Generated. - ref: f27 + ref: master rolekit: rationale: Needed for automated testing - ref: f27 + ref: master slapi-nis: rationale: Generated. - ref: f27 + ref: master softhsm: rationale: Generated. - ref: f27 + ref: master freeipa-desktop-profile: rationale: Generated. - ref: f27 + ref: master # build-requires python3-ipaserver from freeipa component buildorder: 1 From f0ef035f567dc593e1f91324426fb48de1fd7deb Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Wed, 6 Dec 2017 14:06:45 +0100 Subject: [PATCH 16/17] libica is available on s390x only --- freeipa.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/freeipa.yaml b/freeipa.yaml index 425372b..7e7e268 100644 --- a/freeipa.yaml +++ b/freeipa.yaml @@ -106,6 +106,7 @@ data: ref: master buildorder: -5 libica: + arch: s390x rationale: Build dependency. ref: master buildorder: -5 From 13605583a0bf47c644ddc600b1532a7781fe87e7 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Wed, 13 Dec 2017 16:26:58 +0100 Subject: [PATCH 17/17] replace arch: with arches: --- freeipa.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/freeipa.yaml b/freeipa.yaml index 7e7e268..cde893f 100644 --- a/freeipa.yaml +++ b/freeipa.yaml @@ -13,7 +13,7 @@ data: bind: master sssd: master python2: master - #python2-ecosystem: master + # python2-ecosystem: master python3: master python3-ecosystem: master requires: @@ -106,7 +106,7 @@ data: ref: master buildorder: -5 libica: - arch: s390x + arches: [ s390x ] rationale: Build dependency. ref: master buildorder: -5 @@ -133,7 +133,7 @@ data: rationale: Generated. ref: master custodia: - rationale: Needed for dogtag + rationale: Needed for dogtag. ref: master freeipa: rationale: Generated. @@ -179,7 +179,7 @@ data: rationale: Generated. ref: master rolekit: - rationale: Needed for automated testing + rationale: Needed for automated testing. ref: master slapi-nis: rationale: Generated.