From b813540e02f7f0bd06fef394515850577969ac98 Mon Sep 17 00:00:00 2001 From: Timo Aaltonen Date: Wed, 15 Dec 2021 16:32:08 +0200 Subject: [PATCH] Build only the client, in order to be able to backport to bullseye. (Closes: #996946) --- debian/changelog | 2 + debian/control | 194 ----------------------------------------------- debian/rules | 8 +- 3 files changed, 6 insertions(+), 198 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5bc67e10b..9a404f60d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ freeipa (4.9.8-1) UNRELEASED; urgency=medium * New upstream release. * patches: Drop upstreamed patch. * server.install: Updated. + * Build only the client, in order to be able to backport to bullseye. + (Closes: #996946) -- Timo Aaltonen Fri, 26 Nov 2021 09:53:25 +0200 diff --git a/debian/control b/debian/control index 36a340f22..a0e0f8ff9 100644 --- a/debian/control +++ b/debian/control @@ -50,20 +50,6 @@ Build-Depends: python3-yubico, systemd, uuid-dev, - 389-ds-base-dev (>= 1.4.4.16), - libpwquality-dev, - libsss-idmap-dev, - libsss-certmap-dev, - libsss-nss-idmap-dev (>= 1.14.0), - libtevent-dev, - libunistring-dev, - libverto-dev, - nodejs [amd64 arm64 armhf i386 mips mips64el mipsel ppc64 ppc64el s390x], - pki-base (>= 10.10.6~), - python3-lesscpy, - python3-pkg-resources, - python3-rjsmin, - samba-dev, Package: freeipa-common Architecture: all @@ -213,183 +199,3 @@ Description: FreeIPA centralized identity framework -- shared Python3 modules . This Python3 module is used by other FreeIPA packages. - -Package: freeipa-server -Architecture: amd64 arm64 armhf i386 mips mips64el mipsel ppc64 ppc64el s390x -Breaks: freeipa-server-trust-ad (<< 4.3.0-1) -Replaces: freeipa-server-trust-ad (<< 4.3.0-1) -Depends: - 389-ds-base (>= 1.4.4.16), - acl, - adduser, - apache2 (>= 2.4.41-4ubuntu2), - certmonger (>= 0.79.5-2), - chrony, - fonts-font-awesome, - fonts-open-sans, - freeipa-client (= ${binary:Version}), - freeipa-common (= ${source:Version}), - gssproxy (>= 0.8.2-2), - krb5-admin-server, - krb5-kdc (>= 1.18), - krb5-kdc-ldap, - krb5-otp, - krb5-pkinit, - ldap-utils, - libapache2-mod-auth-gssapi (>= 1.5.0), - libapache2-mod-lookup-identity (>= 1.0.0), - libapache2-mod-wsgi-py3, - libjs-dojo-core, - libjs-jquery, - libjs-scriptaculous, - libnss3-tools, - libsasl2-modules-gssapi-mit, - oddjob (>= 0.34.3-2), - p11-kit, - pki-ca (>= 10.10.6~), - pki-kra (>= 10.10.6~), - python3-dateutil, - python3-ipaserver (= ${source:Version}), - python3-gssapi, - python3-ldap (>= 2.4.22), - python3-systemd, - slapi-nis (>= 0.56.1), - ssl-cert, - sssd-dbus, - systemd-sysv, - ${misc:Depends}, - ${python3:Depends}, - ${shlibs:Depends} -Recommends: - freeipa-server-dns, -Description: FreeIPA centralized identity framework -- server - FreeIPA is an integrated solution to provide centrally managed Identity - (machine, user, virtual machines, groups, authentication credentials), Policy - (configuration settings, access control information) and Audit (events, - logs, analysis thereof). - . - This is the server package. - -Package: freeipa-server-dns -Architecture: all -Breaks: freeipa-server (<< 4.3.0-1) -Replaces: freeipa-server (<< 4.3.0-1) -Depends: - freeipa-server (>= ${source:Version}), - bind9 (>= 1:9.16), - bind9-dyndb-ldap (>= 11.4), - libengine-pkcs11-openssl, - opendnssec (>= 1:2.1.5), - softhsm2, - ${misc:Depends}, - ${python3:Depends}, - ${shlibs:Depends} -Description: FreeIPA centralized identity framework -- IPA DNS integration - FreeIPA is an integrated solution to provide centrally managed Identity - (machine, user, virtual machines, groups, authentication credentials), Policy - (configuration settings, access control information) and Audit (events, - logs, analysis thereof). - . - This package adds DNS integration with BIND 9. - -Package: freeipa-server-trust-ad -Architecture: amd64 arm64 armhf i386 mips mips64el mipsel ppc64 ppc64el s390x -Depends: - freeipa-common (= ${source:Version}), - freeipa-server (= ${binary:Version}), - python3-ipaserver (= ${source:Version}), - python3-samba, - samba, - winbind, - ${misc:Depends}, - ${python3:Depends}, - ${shlibs:Depends} -Multi-Arch: same -Description: FreeIPA centralized identity framework -- AD trust installer - FreeIPA is an integrated solution to provide centrally managed Identity - (machine, user, virtual machines, groups, authentication credentials), Policy - (configuration settings, access control information) and Audit (events, - logs, analysis thereof). - . - Cross-realm trusts with Active Directory in IPA require working Samba 4 - installation. This package is provided for convenience to install all required - dependencies at once. - -Package: freeipa-tests -Architecture: all -Depends: - python3-ipalib (>= ${source:Version}), - python3-ipatests (>= ${source:Version}), - python3-pytest, - ${misc:Depends}, - ${python3:Depends} -Recommends: python3-yaml -Description: FreeIPA centralized identity framework -- tests - FreeIPA is an integrated solution to provide centrally managed Identity - (machine, user, virtual machines, groups, authentication credentials), Policy - (configuration settings, access control information) and Audit (events, - logs, analysis thereof). - . - This package contains tests that verify IPA functionality. - -Package: python3-ipaserver -Architecture: all -Section: python -Breaks: freeipa-server (<< 4.3.0-1), - freeipa-server-trust-ad (<< 4.4.4-1), -Replaces: freeipa-server (<< 4.3.0-1), - freeipa-server-trust-ad (<< 4.4.4-1), -Depends: - freeipa-common (= ${binary:Version}), - pki-tools (>= 10.2.6-3), - python3-dbus, - python3-dnspython, - python3-gssapi, - python3-ipaclient (= ${binary:Version}), - python3-ipalib (>= ${source:Version}), - python3-jwcrypto, - python3-kdcproxy, - python3-ldap (>= 2.4.22), - python3-libsss-nss-idmap, - python3-pki-base, - python3-pyasn1, - python3-sss, - samba-common, - zip, - ${misc:Depends}, - ${python3:Depends}, -Description: FreeIPA centralized identity framework -- Python3 modules for server - FreeIPA is an integrated solution to provide centrally managed Identity - (machine, user, virtual machines, groups, authentication credentials), Policy - (configuration settings, access control information) and Audit (events, - logs, analysis thereof). - . - This Python3 module is used by FreeIPA server. - -Package: python3-ipatests -Architecture: all -Section: python -Breaks: freeipa-tests (<< 4.3.0-1) -Replaces: freeipa-tests (<< 4.3.0-1) -Depends: - libnss3-tools, - python3-ipalib (>= ${source:Version}), - python3-mock, - python3-paramiko, - python3-paste, - python3-polib, - python3-pytest-multihost, - python3-pytest-sourceorder, - python3-sss, - xz-utils, - ${misc:Depends}, - ${python3:Depends} -Recommends: python3-yaml -Description: FreeIPA centralized identity framework -- Python3 modules for tests - FreeIPA is an integrated solution to provide centrally managed Identity - (machine, user, virtual machines, groups, authentication credentials), Policy - (configuration settings, access control information) and Audit (events, - logs, analysis thereof). - . - This Python3 module is used by FreeIPA tests. - diff --git a/debian/rules b/debian/rules index 04eb68c98..32db0fa53 100755 --- a/debian/rules +++ b/debian/rules @@ -9,11 +9,11 @@ include /usr/share/dpkg/pkg-info.mk CFLAGS += -D_FORTIFY_SOURCE=2 # build server only where nodejs is available -ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armhf i386 mips mips64el mipsel ppc64 ppc64el s390x)) - ONLY_CLIENT=0 -else +#ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armhf i386 mips mips64el mipsel ppc64 ppc64el s390x)) +# ONLY_CLIENT=0 +#else ONLY_CLIENT=1 -endif +#endif DESTDIR=$(CURDIR)/debian/tmp