diffstat of debian/ for systemd_240-4 systemd_240-4~bpo9+0tails1 changelog | 95 ++++++++++ control | 7 extra/rules/70-debian-uaccess.rules | 22 ++ extra/units/systemd-timesyncd.service.d/disable-with-time-daemon.conf | 6 gbp.conf | 2 patches/debian/Revert-build-sys-require-libmount-2.30-6795.patch | 44 ++++ patches/series | 1 rules | 1 8 files changed, 173 insertions(+), 5 deletions(-) diff -Nru systemd-240/debian/changelog systemd-240/debian/changelog --- systemd-240/debian/changelog 2019-01-12 20:49:44.000000000 +0000 +++ systemd-240/debian/changelog 2019-01-13 09:52:04.000000000 +0000 @@ -1,3 +1,12 @@ +systemd (240-4~bpo9+0tails1) bugfix-16352-16184-systemd-v240-force-all-tests; urgency=medium + + * Non-maintainer upload. + * Rebuild for stretch-backports. + * Point the Vcs-* control fields to tails-team's repo. + * Adjust gbp.conf to use DEP-14 branch name for derivative. + + -- intrigeri Sun, 13 Jan 2019 09:52:04 +0000 + systemd (240-4) unstable; urgency=medium [ Benjamin Drung ] @@ -21,6 +30,12 @@ -- Michael Biebl Sat, 12 Jan 2019 21:49:44 +0100 +systemd (240-3~bpo9+0tails1) bugfix-16097-memory-erasure-on-shutdown; urgency=medium + + * Rebuild for stretch-backports. + + -- intrigeri Thu, 10 Jan 2019 08:30:02 +0000 + systemd (240-3) unstable; urgency=medium * udev.init: Trigger add events for subsystems. @@ -145,6 +160,12 @@ -- Michael Biebl Sun, 02 Dec 2018 01:00:01 +0100 +systemd (239-13~bpo9+1) stretch-backports; urgency=medium + + * Rebuild for stretch-backports + + -- Michael Biebl Tue, 20 Nov 2018 20:04:53 +0100 + systemd (239-13) unstable; urgency=medium * autopktest: Add e2fsprogs dependency to upstream test. @@ -163,6 +184,12 @@ -- Michael Biebl Tue, 20 Nov 2018 19:44:39 +0100 +systemd (239-12~bpo9+1) stretch-backports; urgency=medium + + * Rebuild for stretch-backports + + -- Michael Biebl Sat, 17 Nov 2018 23:08:07 +0100 + systemd (239-12) unstable; urgency=high [ Martin Pitt ] @@ -200,6 +227,12 @@ -- Michael Biebl Sat, 17 Nov 2018 18:39:21 +0100 +systemd (239-11~bpo9+1) stretch-backports; urgency=medium + + * Rebuild for stretch-backports + + -- Michael Biebl Sun, 28 Oct 2018 21:49:54 +0100 + systemd (239-11) unstable; urgency=high [ Michael Biebl ] @@ -289,6 +322,17 @@ -- Michael Biebl Fri, 07 Sep 2018 08:41:12 +0200 +systemd (239-7~bpo9+1) stretch-backports; urgency=medium + + * Rebuild for stretch-backports. + * Rebase patches + * Disable MemoryAccounting= by default. + The new upstream default is to turn memory accounting on. This is only + recommended for Linux kernels 4.14 or higher though as with older + kernels, like the one from Stretch, it introduces significant overhead. + + -- Michael Biebl Tue, 09 Oct 2018 08:11:11 +0200 + systemd (239-7) unstable; urgency=medium * autopkgtest: Add iputils-ping dependency to root-unittests. @@ -572,6 +616,18 @@ -- Michael Biebl Wed, 28 Feb 2018 19:18:34 +0100 +systemd (237-3~bpo9+1) stretch-backports; urgency=medium + + * Rebuild for stretch-backports + * Rebase patches + * Revert "Add Build-Depends on python3-evdev " + This package is not availabe in stretch or stretch-backports. + * Revert "Drop debian/extra/rules/70-debian-uaccess.rules" + There is no libu2f-udev package in stretch or stretch-backports shipping + the udev rules for U2F devices. + + -- Michael Biebl Sun, 25 Feb 2018 18:22:14 +0100 + systemd (237-3) unstable; urgency=medium [ Martin Pitt ] @@ -635,6 +691,12 @@ -- Michael Biebl Sun, 28 Jan 2018 22:29:32 +0100 +systemd (236-3~bpo9+1) stretch-backports; urgency=medium + + * Rebuild for stretch-backports. + + -- Michael Biebl Fri, 12 Jan 2018 10:39:46 +0100 + systemd (236-3) unstable; urgency=medium * Revert "core/execute: RuntimeDirectory= or friends requires mount @@ -644,6 +706,21 @@ -- Michael Biebl Thu, 11 Jan 2018 16:46:04 +0100 +systemd (236-2~bpo9+1) stretch-backports; urgency=medium + + * Rebuild for stretch-backports. + * Revert "Don't rely on the debhelper meson build system support" + There is now a recent enough backport of debhelper available for + stretch. + * Revert "Bump Build-Depends on libmount-dev to (>= 2.30)" + The newest version shipped in stretch is 2.29 and we don't strictly need + the fixes provided by libmount 2.30. + Or put differently, we don't introduce any regressions compared to + what's currently in stretch if we revert the upstream commit which + bumped the libmount version. + + -- Michael Biebl Sat, 06 Jan 2018 16:16:17 +0100 + systemd (236-2) unstable; urgency=medium * Downgrade priority of libudev1 to optional. @@ -792,6 +869,15 @@ -- Michael Biebl Tue, 10 Oct 2017 18:29:28 +0200 +systemd (234-3~bpo9+1) stretch-backports; urgency=medium + + * Rebuild for stretch-backports. + * Revert "Drop systemd-timesyncd.service.d/disable-with-time-daemon.conf" + It's still required in stretch as the NTP implementations were only + fixed in buster. + + -- Michael Biebl Sun, 10 Sep 2017 00:27:07 +0200 + systemd (234-3) unstable; urgency=medium [ Martin Pitt ] @@ -863,6 +949,15 @@ -- Cyril Brulebois Wed, 23 Aug 2017 20:41:33 +0200 +systemd (234-2~bpo9+1) stretch-backports; urgency=medium + + * Rebuild for stretch-backports. + * Switch debian-branch to stretch-backports + * Don't rely on the debhelper meson build system support. + This requires a newer debhelper which is not availabe in stretch (yet). + + -- Michael Biebl Tue, 08 Aug 2017 23:44:17 +0200 + systemd (234-2) unstable; urgency=medium [ Martin Pitt ] diff -Nru systemd-240/debian/control systemd-240/debian/control --- systemd-240/debian/control 2019-01-12 20:49:44.000000000 +0000 +++ systemd-240/debian/control 2019-01-13 09:52:04.000000000 +0000 @@ -9,8 +9,8 @@ Felipe Sateler Standards-Version: 4.2.1 Rules-Requires-Root: no -Vcs-Git: https://salsa.debian.org/systemd-team/systemd.git -Vcs-Browser: https://salsa.debian.org/systemd-team/systemd +Vcs-Git: https://salsa.debian.org/tails-team/systemd.git +Vcs-Browser: https://salsa.debian.org/tails-team/systemd Homepage: https://www.freedesktop.org/wiki/Software/systemd Build-Depends: debhelper (>= 10.4~), pkg-config, @@ -43,7 +43,7 @@ libgcrypt20-dev, libkmod-dev (>= 15), libblkid-dev (>= 2.24), - libmount-dev (>= 2.30), + libmount-dev (>= 2.27.1), libseccomp-dev (>= 2.3.1) [amd64 arm64 armel armhf i386 mips mipsel mips64 mips64el x32 powerpc ppc64 ppc64el s390x], libdw-dev (>= 0.158) , libpolkit-gobject-1-dev , @@ -52,7 +52,6 @@ python3:native, python3-lxml:native, python3-pyparsing , - python3-evdev , tzdata , libcap2-bin , iproute2 , diff -Nru systemd-240/debian/extra/rules/70-debian-uaccess.rules systemd-240/debian/extra/rules/70-debian-uaccess.rules --- systemd-240/debian/extra/rules/70-debian-uaccess.rules 1970-01-01 00:00:00.000000000 +0000 +++ systemd-240/debian/extra/rules/70-debian-uaccess.rules 2019-01-13 09:52:04.000000000 +0000 @@ -0,0 +1,22 @@ +# this udev file should be used with udev 188 and newer +ACTION!="add|change", GOTO="u2f_end" + +# Yubico YubiKey +KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1050", ATTRS{idProduct}=="0113|0114|0115|0116|0120|0402|0403|0406|0407|0410", TAG+="uaccess" + +# Happlink (formerly Plug-Up) Security KEY +KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="2581", ATTRS{idProduct}=="f1d0", TAG+="uaccess" + +# Neowave Keydo and Keydo AES +KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1e0d", ATTRS{idProduct}=="f1d0|f1ae", TAG+="uaccess" + +# HyperSecu HyperFIDO +KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="096e|2ccf", ATTRS{idProduct}=="0880", TAG+="uaccess" + +# Feitian ePass FIDO +KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="096e", ATTRS{idProduct}=="0850", TAG+="uaccess" + +# JaCarta U2F +KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="24dc", ATTRS{idProduct}=="0101", TAG+="uaccess" + +LABEL="u2f_end" diff -Nru systemd-240/debian/extra/units/systemd-timesyncd.service.d/disable-with-time-daemon.conf systemd-240/debian/extra/units/systemd-timesyncd.service.d/disable-with-time-daemon.conf --- systemd-240/debian/extra/units/systemd-timesyncd.service.d/disable-with-time-daemon.conf 1970-01-01 00:00:00.000000000 +0000 +++ systemd-240/debian/extra/units/systemd-timesyncd.service.d/disable-with-time-daemon.conf 2019-01-13 09:52:04.000000000 +0000 @@ -0,0 +1,6 @@ +[Unit] +# don't run timesyncd if we have another NTP daemon installed +ConditionFileIsExecutable=!/usr/sbin/ntpd +ConditionFileIsExecutable=!/usr/sbin/openntpd +ConditionFileIsExecutable=!/usr/sbin/chronyd +ConditionFileIsExecutable=!/usr/sbin/VBoxService diff -Nru systemd-240/debian/gbp.conf systemd-240/debian/gbp.conf --- systemd-240/debian/gbp.conf 2019-01-12 20:49:44.000000000 +0000 +++ systemd-240/debian/gbp.conf 2019-01-13 09:52:04.000000000 +0000 @@ -1,7 +1,7 @@ [DEFAULT] pristine-tar = False patch-numbers = False -debian-branch = master +debian-branch = tails/stretch [dch] full = True diff -Nru systemd-240/debian/patches/debian/Revert-build-sys-require-libmount-2.30-6795.patch systemd-240/debian/patches/debian/Revert-build-sys-require-libmount-2.30-6795.patch --- systemd-240/debian/patches/debian/Revert-build-sys-require-libmount-2.30-6795.patch 1970-01-01 00:00:00.000000000 +0000 +++ systemd-240/debian/patches/debian/Revert-build-sys-require-libmount-2.30-6795.patch 2019-01-13 09:52:04.000000000 +0000 @@ -0,0 +1,44 @@ +From: Michael Biebl +Date: Sat, 6 Jan 2018 15:48:07 +0100 +Subject: Revert "build-sys: require libmount >= 2.30 (#6795)" + +This reverts commit d6e8096669fef4aa5132843fb488fa35de349901. + +The newest version shipped in stretch is 2.29 and we don't strictly need +the fixes provided by libmount 2.30. +Or put differently, we don't introduce any regressions if we revert +this commit. +--- + README | 5 +++-- + meson.build | 2 +- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/README b/README +index 2cde08c..eb6f5df 100644 +--- a/README ++++ b/README +@@ -137,8 +137,9 @@ REQUIREMENTS: + + glibc >= 2.16 + libcap +- libmount >= 2.30 (from util-linux) +- (util-linux *must* be built without --enable-libmount-support-mtab) ++ libmount >= 2.27.1 (from util-linux) ++ (util-linux < 2.29 *must* be built with --enable-libmount-force-mountinfo, ++ and later versions without --enable-libmount-support-mtab.) + libseccomp >= 2.3.1 (optional) + libblkid >= 2.24 (from util-linux) (optional) + libkmod >= 15 (optional) +diff --git a/meson.build b/meson.build +index 7d3fa6a..d8f4cdb 100644 +--- a/meson.build ++++ b/meson.build +@@ -792,7 +792,7 @@ if not libcap.found() + endif + + libmount = dependency('mount', +- version : fuzzer_build ? '>= 0' : '>= 2.30') ++ version : fuzzer_build ? '>= 0' : '>= 2.27') + + want_seccomp = get_option('seccomp') + if want_seccomp != 'false' and not fuzzer_build diff -Nru systemd-240/debian/patches/series systemd-240/debian/patches/series --- systemd-240/debian/patches/series 2019-01-12 20:49:44.000000000 +0000 +++ systemd-240/debian/patches/series 2019-01-13 09:52:04.000000000 +0000 @@ -56,3 +56,4 @@ debian/Add-env-variable-for-machine-ID-path.patch debian/Revert-udev-rules-Permission-changes-for-dev-dri-renderD.patch debian/Drop-seccomp-system-call-filter-for-udev.patch +debian/Revert-build-sys-require-libmount-2.30-6795.patch diff -Nru systemd-240/debian/rules systemd-240/debian/rules --- systemd-240/debian/rules 2019-01-12 20:49:44.000000000 +0000 +++ systemd-240/debian/rules 2019-01-13 09:52:04.000000000 +0000 @@ -67,6 +67,7 @@ -Dwheel-group=false \ -Dntp-servers="$(DEFAULT_NTP_SERVERS)" \ -Dlink-udev-shared=false \ + -Dmemory-accounting-default=false \ -Dsystem-uid-max=999 \ -Dsystem-gid-max=999 \ -Dnobody-user=nobody \