debian/changelog

 samba (2:4.9.1+dfsg-2) UNRELEASED; urgency=medium
 
+  [ Mathieu Parent ]
   * Enable --accel-aes=intelaesni on DEB_HOST_ARCH_CPU=amd64 instead of
     DEB_HOST_ARCH=amd64. This matches samba-libs.install and adds x32
   * Allow one to change password via passwd in default config
@@ -14,9 +15,12 @@ samba (2:4.9.1+dfsg-2) UNRELEASED; urgency=medium
   * README.source: use gbp pull --track-missing
   * Override library-not-linked-against-libc false positives (See #896012)
   * Fix wrong-path-for-interpreter for pidl and findsmb
-  * ctdb.postrm: Fix to disable_legacy (found by piuparts)
+  * ctdb.postrm: Fix to disable_legacy (found by piuparts) (Closes: #911530)
+
+  [ James Clarke ]
+  * Fix systemd-related build failures on non-Linux
 
- -- Mathieu Parent <sathieu@debian.org>  Tue, 09 Oct 2018 10:09:09 +0200
+ -- Mathieu Parent <sathieu@debian.org>  Mon, 29 Oct 2018 22:49:09 +0100
 
 samba (2:4.9.1+dfsg-1) experimental; urgency=medium
 

debian/ctdb.install

+#!/usr/bin/dh-exec --with-scripts=filter-arch
 ctdb/config/ctdb.conf etc/ctdb
 ctdb/config/ctdb.tunables etc/ctdb
 ctdb/config/script.options etc/ctdb
 etc/ctdb
 etc/sudoers.d
-lib/systemd/system/ctdb.service
+[linux-any] lib/systemd/system/ctdb.service
 usr/bin/ctdb
 usr/bin/ctdb_diagnostics
 usr/bin/ltdbtool

debian/gitlab-ci.yml

+# Warning! This file is autogenerated by salsa pipeline bot. Any change made
+# over this document will be lost. Customization and changes must be made over
+# the template yaml.
+variables:
+  DEBFULLNAME: "Salsa Pipeline"
+  DEBEMAIL: "<salsa-pipeline@debian.org>"
+  DEBIAN_FRONTEND: noninteractive
+  WORKING_DIR: ./debian/output
+
+stages:
+  - build
+  - test
+
+image: debian:unstable
+
+build package:
+  stage: build
+  image: registry.salsa.debian.org/salsa-ci-team/images/gbp
+  services:
+    - docker:dind
+  artifacts:
+    expire_in: 180 day
+    name: "$CI_BUILD_NAME"
+    paths:
+        - ${WORKING_DIR}/
+  script:
+    - gbp pull --ignore-branch --pristine-tar --track-missing
+    - gbp buildpackage --git-ignore-branch --git-export-dir=${WORKING_DIR} --git-builder='docker-build.sh registry.salsa.debian.org/salsa-ci-team/images/dockerbuilder'
+
+run autopkgtest:
+  stage: test
+  image: registry.salsa.debian.org/salsa-ci-team/images/autopkgtest
+  script:
+    - eatmydata autopkgtest -U ${WORKING_DIR}/*.deb -- null
+
+run lintian:
+  stage: test
+  image: registry.salsa.debian.org/salsa-ci-team/images/lintian
+  script:
+    - lintian -iI ${WORKING_DIR}/*.changes
+
+run reprotest:
+  stage: test
+  image: registry.salsa.debian.org/salsa-ci-team/images/reprotest
+  artifacts:
+    name: "$CI_BUILD_NAME"
+    expire_in: 180 day
+    paths:
+      - ./reprotest.log
+    when: always
+  script:
+    - apt-get update
+    - eatmydata apt-get build-dep -y .
+    - export DEB_BUILD_OPTIONS=nocheck
+    - eatmydata reprotest --no-diffoscope --min-cpus $(nproc --all) . -- null &> reprotest.log
+
+run piuparts:
+  stage: test
+  image: registry.salsa.debian.org/sathieu/images/piuparts
+  services:
+    - docker:dind
+  script:
+    - CHROOT_PATH=/tmp/debian-unstable
+    - CONTAINER_ID=$(docker run --rm -d debian:unstable sleep infinity)
+    - docker exec ${CONTAINER_ID} bash -c "apt-get update && apt-get install eatmydata -y"
+    - mkdir -p ${CHROOT_PATH}
+    - docker export ${CONTAINER_ID} | tar -C ${CHROOT_PATH} -xf -
+    - mknod -m 666 ${CHROOT_PATH}/dev/urandom c 1 9
+    - mkdir -p ${CHROOT_PATH}/etc-target/apt/sources.list.d ${CHROOT_PATH}/etc-target/apt/preferences.d
+    - cp -aTv /etc/apt/sources.list.d  ${CHROOT_PATH}/etc-target/apt/sources.list.d
+    - cp -aTv /etc/apt/preferences.d  ${CHROOT_PATH}/etc-target/apt/preferences.d
+    - piuparts --scriptsdir /etc/piuparts/scripts --allow-database --hard-link -e ${CHROOT_PATH} ${WORKING_DIR}/*.deb
+# End of include
+#################################### Below starts the local customization ###################################
+before_script:
+  - echo 'deb http://deb.debian.org/debian experimental main' > /etc/apt/sources.list.d/experimental.list
+  - "echo 'Package: ldb-tools libldb* python*-ldb*\nPin: release a=experimental\nPin-Priority: 500' > /etc/apt/preferences.d/experimental.pref"

debian/gitlab-ci.yml.tpl

+include: https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+
+# end of salsa pipeline bot parser
+before_script:
+  - echo 'deb http://deb.debian.org/debian experimental main' > /etc/apt/sources.list.d/experimental.list
+  - "echo 'Package: ldb-tools libldb* python*-ldb*\nPin: release a=experimental\nPin-Priority: 500' > /etc/apt/preferences.d/experimental.pref"

debian/rules

@@ -144,6 +144,7 @@ override_dh_auto_install:
 	rm $(DESTDIR)/usr/bin/ctdb_run_cluster_tests
 	rm -r $(DESTDIR)/usr/lib/*/ctdb/tests
 	rm -r $(DESTDIR)/usr/share/ctdb/tests
+ifeq ($(DEB_HOST_ARCH_OS), linux)
 	# Install systemd configs
 	mkdir -p $(DESTDIR)/lib/systemd/system/
 	install -m 0644 ctdb/config/ctdb.service $(DESTDIR)/lib/systemd/system/
@@ -160,6 +161,9 @@ override_dh_auto_install:
 	  $(DESTDIR)/lib/systemd/system/samba-ad-dc.service \
 	  $(DESTDIR)/lib/systemd/system/smbd.service \
 	  $(DESTDIR)/lib/systemd/system/winbind.service
+endif
+	# Harmless on systems without systemd-tmpfiles, and other consumers exist
+	# such as OpenRC's opentmpfiles
 	mkdir -p $(DESTDIR)/usr/lib/tmpfiles.d
 	echo "d /run/samba 0755 root root -" > $(DESTDIR)/usr/lib/tmpfiles.d/samba.conf
 

debian/samba.install

+#!/usr/bin/dh-exec --with-scripts=filter-arch
 etc/ufw/applications.d/samba
-lib/systemd/system/nmbd.service
-lib/systemd/system/samba-ad-dc.service
-lib/systemd/system/smbd.service
+[linux-any] lib/systemd/system/nmbd.service
+[linux-any] lib/systemd/system/samba-ad-dc.service
+[linux-any] lib/systemd/system/smbd.service
 usr/bin/mvxattr
 usr/bin/oLschema2ldif
 usr/bin/pdbedit

debian/winbind.install

-lib/systemd/system/winbind.service
+#!/usr/bin/dh-exec --with-scripts=filter-arch
+[linux-any] lib/systemd/system/winbind.service
 usr/bin/ntlm_auth
 usr/bin/wbinfo
 usr/lib/*/samba/idmap