debian/changelog

+freeipa (4.7.1-3) unstable; urgency=medium
+
+  * control: Replace libsvrcore-dev build-dep with 389-ds-base-dev.
+  * tests: Install only the packages which are used for testing.
+  * rules: Don't run git on clean. (Closes: #912202)
+  * control: Nodejs is not available on all archs, build server packages
+    only where it is.
+  * control: Add systemd to python-ipalib depends. (Closes: #851158)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 06 Dec 2018 02:22:35 +0200
+
+freeipa (4.7.1-2) unstable; urgency=medium
+
+  * control: Change python-nose to -mock on python-ipatests Depends.
+  * fix-oddjobd-conf.diff: Fix path to org.freeipa.server.conncheck.
+  * server.postinst: Fix a typo.
+  * fix-fontawesome-path.diff: Fix upgrade.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 18 Oct 2018 14:30:44 +0300
+
 freeipa (4.7.1-1) unstable; urgency=medium
 
   * New upstream release.

debian/control.common

@@ -108,6 +108,7 @@ Depends:
  python-six,
  python-usb (>= 1.0.0~b2),
  python-yubico,
+ systemd,
  ${misc:Depends},
  ${python:Depends},
  ${shlibs:Depends},

debian/control.server

 Package: freeipa-server
-Architecture: any
+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:
@@ -76,7 +76,7 @@ Description: FreeIPA centralized identity framework -- IPA DNS integration
  This package adds DNS integration with BIND 9.
 
 Package: freeipa-server-trust-ad
-Architecture: any
+Architecture: amd64 arm64 armhf i386 mips mips64el mipsel ppc64 ppc64el s390x
 Depends:
  freeipa-common (= ${source:Version}),
  freeipa-server (= ${binary:Version}),
@@ -157,7 +157,7 @@ Depends:
  libnss3-tools,
  python-coverage,
  python-ipalib (>= ${source:Version}),
- python-nose,
+ python-mock,
  python-paramiko,
  python-paste,
  python-polib,

debian/control.stub

@@ -23,13 +23,12 @@ Build-Depends:
  libsss-idmap-dev,
  libsss-certmap-dev,
  libsss-nss-idmap-dev (>= 1.14.0),
- libsvrcore-dev,
  libtalloc-dev,
  libtevent-dev,
  libunistring-dev,
  libverto-dev,
  libxmlrpc-core-c3-dev (>= 1.33.06),
- nodejs,
+ nodejs [amd64 arm64 armhf i386 mips mips64el mipsel ppc64 ppc64el s390x],
  node-uglify,
  pki-base (>= 10.6.0~),
  python-all-dev,
@@ -60,7 +59,8 @@ Build-Depends:
  python3-pkg-resources,
  samba-dev,
  systemd,
- uuid-dev
+ uuid-dev,
+ 389-ds-base-dev,
 Standards-Version: 4.1.5
 Vcs-Git: https://salsa.debian.org/freeipa-team/freeipa.git
 Vcs-Browser: https://salsa.debian.org/freeipa-team/freeipa

debian/freeipa-server.postinst

@@ -24,7 +24,7 @@ if [ "$1" = configure ]; then
             . /usr/share/apache2/apache2-maintscript-helper
             apache2_invoke dismod nss || exit $?
             # and if that's not enough, just remove the links to be sure
-            rm /etc/apache2/mods-enabled/nss.load rm /etc/apache2/mods-enabled/nss.conf
+            rm /etc/apache2/mods-enabled/nss.load /etc/apache2/mods-enabled/nss.conf
         fi
 
         # this is new in tmpfiles.d/ipa.conf, need to create it here

debian/patches/fix-fontawesome-path.diff

@@ -39,3 +39,13 @@
              GSSAPI_SESSION_KEY=paths.GSSAPI_SESSION_KEY,
              IPA_CUSTODIA_SOCKET=paths.IPA_CUSTODIA_SOCKET,
              IPA_CCACHES=paths.IPA_CCACHES,
+--- a/ipaserver/install/server/upgrade.py
++++ b/ipaserver/install/server/upgrade.py
+@@ -1773,6 +1773,7 @@ def upgrade_configuration():
+         WSGI_PROCESSES=constants.WSGI_PROCESSES,
+         GSSAPI_SESSION_KEY=paths.GSSAPI_SESSION_KEY,
+         FONTS_DIR=paths.FONTS_DIR,
++        FONT_AWESOME_DIR=paths.FONT_AWESOME_DIR,
+         IPA_CCACHES=paths.IPA_CCACHES,
+         IPA_CUSTODIA_SOCKET=paths.IPA_CUSTODIA_SOCKET
+     )

debian/patches/fix-oddjobd-conf.diff

+--- a/install/oddjob/etc/oddjobd.conf.d/ipa-server.conf
++++ b/install/oddjob/etc/oddjobd.conf.d/ipa-server.conf
+@@ -6,7 +6,7 @@
+     <object name="/">
+       <interface name="org.freeipa.server">
+         <method name="conncheck">
+-          <helper exec="/usr/libexec/ipa/oddjob/org.freeipa.server.conncheck"
++          <helper exec="/usr/lib/ipa/oddjob/org.freeipa.server.conncheck"
+                   arguments="1"
+                   prepend_user_name="no"
+                   argument_passing_method="cmdline"/>

debian/patches/series

@@ -11,3 +11,4 @@ fix-krb5kdc-cert-path.diff
 fix-gzip-path.diff
 fix-py3-lesscpy-name.diff
 dont-migrate-to-authselect.diff
+fix-oddjobd-conf.diff

debian/rules

@@ -5,7 +5,13 @@
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
+# 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
+  ONLY_CLIENT=1
+endif
+
 DESTDIR=$(CURDIR)/debian/tmp
 
 export PYTHON=python
@@ -47,9 +53,6 @@ endif
 
 override_dh_clean: gencontrol
 	dh_clean
-	if [ -f /usr/bin/git ]; then \
-	    git checkout -- po; \
-	fi
 	rm -f po/*.gmo po/Makefile.hack po/POTFILES.in po/ipa.pot po/stamp-po
 	rm -rf contrib/completion/ipa.bash_completion daemons/ipa-version.h \
 	       install/ui/src/libs/loader.js m4

debian/tests/control

 Tests: server-install
 Depends:
- @,
+ freeipa-server, freeipa-client, freeipa-server-dns, freeipa-admintools,
 Restrictions:
  allow-stderr,
  isolation-container,