diffstat for systemd-242 systemd-242 changelog | 35 +++++++++++++ control | 13 +++-- patches/progress-linux/0001-agetty-nohostname.patch | 51 ++++++++++++++++++++ patches/progress-linux/0002-proc-hidepid.patch | 27 ++++++++++ patches/progress-linux/0003-logind-noautovts.patch | 15 +++++ patches/progress-linux/0004-logind-reservevt.patch | 15 +++++ patches/series | 4 + rules | 7 +- 8 files changed, 161 insertions(+), 6 deletions(-) diff -Nru systemd-242/debian/changelog systemd-242/debian/changelog --- systemd-242/debian/changelog 2019-06-07 20:41:50.000000000 +0000 +++ systemd-242/debian/changelog 2019-06-08 05:13:48.000000000 +0000 @@ -1,3 +1,21 @@ +systemd (242-2~progress5+u1) engywuck-backports; urgency=medium + + * Uploading to engywuck-backports, remaining changes: + - Updating maintainer field. + - Updating uploaders field. + - Updating bugs field. + - Updating vcs fields. + - Updating ntp servers for Progress Linux. + - Updating support url for Progress Linux. + - Starting agetty with --nohostname option. + - Mounting /proc with hidepid=2 option. + - Disabling ctrl-alt-del.target. + - Enabling 10 automatic virtual terminals in logind. + - Reserving virtual terminal on position 2 in logind. + * Merging debian version 242-2. + + -- Daniel Baumann Sat, 08 Jun 2019 07:13:48 +0200 + systemd (242-2) experimental; urgency=medium [ Michael Biebl ] @@ -19,6 +37,23 @@ -- Michael Biebl Fri, 07 Jun 2019 22:41:50 +0200 +systemd (242-1~progress5+u1) engywuck-backports; urgency=medium + + * Initial upload to engywuck-backports. + * Updating maintainer field. + * Updating uploaders field. + * Updating bugs field. + * Updating vcs fields. + * Updating ntp servers for Progress Linux. + * Updating support url for Progress Linux. + * Starting agetty with --nohostname option. + * Mounting /proc with hidepid=2 option. + * Disabling ctrl-alt-del.target. + * Enabling 10 automatic virtual terminals in logind. + * Reserving virtual terminal on position 2 in logind. + + -- Daniel Baumann Wed, 08 May 2019 19:45:12 +0200 + systemd (242-1) experimental; urgency=medium * New upstream version 242 diff -Nru systemd-242/debian/control systemd-242/debian/control --- systemd-242/debian/control 2019-06-07 20:41:50.000000000 +0000 +++ systemd-242/debian/control 2019-06-08 05:13:48.000000000 +0000 @@ -1,16 +1,21 @@ Source: systemd Section: admin Priority: optional -Maintainer: Debian systemd Maintainers -Uploaders: Michael Biebl , +Maintainer: Progress Linux Maintainers +XSBC-Uploaders: Daniel Baumann +XSBC-Original-Maintainer: Debian systemd Maintainers +XSBC-Original-Uploaders: Michael Biebl , Marco d'Itri , Sjoerd Simons , Martin Pitt , Felipe Sateler +Bugs: mailto:maintainers@lists.progress-linux.org Standards-Version: 4.3.0 Rules-Requires-Root: no -Vcs-Git: https://salsa.debian.org/systemd-team/systemd.git -Vcs-Browser: https://salsa.debian.org/systemd-team/systemd +Vcs-Browser: https://git.progress-linux.org/distributions/engywuck-backports/packages/systemd +Vcs-Git: https://git.progress-linux.org/distributions/engywuck-backports/packages/systemd +XSBC-Original-Vcs-Browser: https://salsa.debian.org/systemd-team/systemd +XSBC-Original-Vcs-Git: https://salsa.debian.org/systemd-team/systemd.git Homepage: https://www.freedesktop.org/wiki/Software/systemd Build-Depends: debhelper (>= 10.4~), pkg-config, diff -Nru systemd-242/debian/patches/progress-linux/0001-agetty-nohostname.patch systemd-242/debian/patches/progress-linux/0001-agetty-nohostname.patch --- systemd-242/debian/patches/progress-linux/0001-agetty-nohostname.patch 1970-01-01 00:00:00.000000000 +0000 +++ systemd-242/debian/patches/progress-linux/0001-agetty-nohostname.patch 2019-06-08 05:13:48.000000000 +0000 @@ -0,0 +1,51 @@ +Author: Daniel Baumann +Description: Starting agetty with --nohostname option. + +diff -Naurp systemd.orig/units/console-getty.service.m4 systemd/units/console-getty.service.m4 +--- systemd.orig/units/console-getty.service.m4 ++++ systemd/units/console-getty.service.m4 +@@ -23,7 +23,7 @@ ConditionPathExists=/dev/console + # The '-o' option value tells agetty to replace 'login' arguments with an + # option to preserve environment (-p), followed by '--' for safety, and then + # the entered username. +-ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud console 115200,38400,9600 $TERM ++ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --nohostname --keep-baud console 115200,38400,9600 $TERM + Type=idle + Restart=always + UtmpIdentifier=cons +diff -Naurp systemd.orig/units/container-getty@.service.m4 systemd/units/container-getty@.service.m4 +--- systemd.orig/units/container-getty@.service.m4 ++++ systemd/units/container-getty@.service.m4 +@@ -28,7 +28,7 @@ Before=rescue.service + # The '-o' option value tells agetty to replace 'login' arguments with an + # option to preserve environment (-p), followed by '--' for safety, and then + # the entered username. +-ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud pts/%I 115200,38400,9600 $TERM ++ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --nohostname --keep-baud pts/%I 115200,38400,9600 $TERM + Type=idle + Restart=always + RestartSec=0 +diff -Naurp systemd.orig/units/getty@.service.m4 systemd/units/getty@.service.m4 +--- systemd.orig/units/getty@.service.m4 ++++ systemd/units/getty@.service.m4 +@@ -38,7 +38,7 @@ ConditionPathExists=/dev/tty0 + # The '-o' option value tells agetty to replace 'login' arguments with an + # option to preserve environment (-p), followed by '--' for safety, and then + # the entered username. +-ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear %I $TERM ++ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --nohostname %I $TERM + Type=idle + Restart=always + RestartSec=0 +diff -Naurp systemd.orig/units/serial-getty@.service.m4 systemd/units/serial-getty@.service.m4 +--- systemd.orig/units/serial-getty@.service.m4 ++++ systemd/units/serial-getty@.service.m4 +@@ -33,7 +33,7 @@ Before=rescue.service + # The '-o' option value tells agetty to replace 'login' arguments with an + # option to preserve environment (-p), followed by '--' for safety, and then + # the entered username. +-ExecStart=-/sbin/agetty -o '-p -- \\u' --keep-baud 115200,38400,9600 %I $TERM ++ExecStart=-/sbin/agetty -o '-p -- \\u' --nohostname --keep-baud 115200,38400,9600 %I $TERM + Type=idle + Restart=always + UtmpIdentifier=%I diff -Nru systemd-242/debian/patches/progress-linux/0002-proc-hidepid.patch systemd-242/debian/patches/progress-linux/0002-proc-hidepid.patch --- systemd-242/debian/patches/progress-linux/0002-proc-hidepid.patch 1970-01-01 00:00:00.000000000 +0000 +++ systemd-242/debian/patches/progress-linux/0002-proc-hidepid.patch 2019-06-08 05:13:48.000000000 +0000 @@ -0,0 +1,27 @@ +Author: Daniel Baumann +Description: Mounting /proc with hidepid=2 option. + +diff -Naurp systemd.orig/src/core/mount-setup.c systemd/src/core/mount-setup.c +--- systemd.orig/src/core/mount-setup.c ++++ systemd/src/core/mount-setup.c +@@ -61,7 +61,7 @@ typedef struct MountPoint { + static const MountPoint mount_table[] = { + { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, + NULL, MNT_FATAL|MNT_IN_CONTAINER }, +- { "proc", "/proc", "proc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ { "proc", "/proc", "proc", "hidepid=2", MS_NOSUID|MS_NOEXEC|MS_NODEV, + NULL, MNT_FATAL|MNT_IN_CONTAINER }, + { "devtmpfs", "/dev", "devtmpfs", "mode=755", MS_NOSUID|MS_STRICTATIME, + NULL, MNT_FATAL|MNT_IN_CONTAINER }, +diff -Naurp systemd.orig/src/nspawn/nspawn-mount.c systemd/src/nspawn/nspawn-mount.c +--- systemd.orig/src/nspawn/nspawn-mount.c ++++ systemd/src/nspawn/nspawn-mount.c +@@ -512,7 +512,7 @@ int mount_all(const char *dest, + + static const MountPoint mount_table[] = { + /* First we list inner child mounts (i.e. mounts applied *after* entering user namespacing) */ +- { "proc", "/proc", "proc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, ++ { "proc", "/proc", "proc", "hidepid=2", MS_NOSUID|MS_NOEXEC|MS_NODEV, + MOUNT_FATAL|MOUNT_IN_USERNS }, + + { "/proc/sys", "/proc/sys", NULL, NULL, MS_BIND, diff -Nru systemd-242/debian/patches/progress-linux/0003-logind-noautovts.patch systemd-242/debian/patches/progress-linux/0003-logind-noautovts.patch --- systemd-242/debian/patches/progress-linux/0003-logind-noautovts.patch 1970-01-01 00:00:00.000000000 +0000 +++ systemd-242/debian/patches/progress-linux/0003-logind-noautovts.patch 2019-06-08 05:13:48.000000000 +0000 @@ -0,0 +1,15 @@ +Author: Daniel Baumann +Description: Enabling 10 automatic virtual terminals in logind. + +diff -Naurp systemd.orig/src/login/logind.conf.in systemd/src/login/logind.conf.in +--- systemd.orig/src/login/logind.conf.in ++++ systemd/src/login/logind.conf.in +@@ -12,7 +12,7 @@ + # See logind.conf(5) for details. + + [Login] +-#NAutoVTs=6 ++NAutoVTs=10 + #ReserveVT=6 + #KillUserProcesses=@KILL_USER_PROCESSES@ + #KillOnlyUsers= diff -Nru systemd-242/debian/patches/progress-linux/0004-logind-reservevt.patch systemd-242/debian/patches/progress-linux/0004-logind-reservevt.patch --- systemd-242/debian/patches/progress-linux/0004-logind-reservevt.patch 1970-01-01 00:00:00.000000000 +0000 +++ systemd-242/debian/patches/progress-linux/0004-logind-reservevt.patch 2019-06-08 05:13:48.000000000 +0000 @@ -0,0 +1,15 @@ +Author: Daniel Baumann +Description: Reserving virtual terminal on position 2 in logind. + +diff -Naurp systemd.orig/src/login/logind.conf.in systemd/src/login/logind.conf.in +--- systemd.orig/src/login/logind.conf.in ++++ systemd/src/login/logind.conf.in +@@ -13,7 +13,7 @@ + + [Login] + NAutoVTs=10 +-#ReserveVT=6 ++ReserveVT=2 + #KillUserProcesses=@KILL_USER_PROCESSES@ + #KillOnlyUsers= + #KillExcludeUsers=root diff -Nru systemd-242/debian/patches/series systemd-242/debian/patches/series --- systemd-242/debian/patches/series 2019-06-07 20:41:50.000000000 +0000 +++ systemd-242/debian/patches/series 2019-06-08 05:13:48.000000000 +0000 @@ -17,3 +17,7 @@ debian/Let-graphical-session-pre.target-be-manually-started.patch debian/Add-env-variable-for-machine-ID-path.patch debian/Drop-seccomp-system-call-filter-for-udev.patch +progress-linux/0001-agetty-nohostname.patch +progress-linux/0002-proc-hidepid.patch +progress-linux/0003-logind-noautovts.patch +progress-linux/0004-logind-reservevt.patch diff -Nru systemd-242/debian/rules systemd-242/debian/rules --- systemd-242/debian/rules 2019-06-07 20:41:50.000000000 +0000 +++ systemd-242/debian/rules 2019-06-08 05:13:48.000000000 +0000 @@ -12,8 +12,8 @@ SUPPORT_URL = http://www.ubuntu.com/support CONFFLAGS_DISTRO = else - DEFAULT_NTP_SERVERS = 0.debian.pool.ntp.org 1.debian.pool.ntp.org 2.debian.pool.ntp.org 3.debian.pool.ntp.org - SUPPORT_URL = https://www.debian.org/support + DEFAULT_NTP_SERVERS = 0.progress.pool.ntp.org 1.progress.pool.ntp.org 2.progress.pool.ntp.org 3.progress.pool.ntp.org + SUPPORT_URL = https://support.progress-linux.org CONFFLAGS_DISTRO = endif @@ -239,6 +239,9 @@ printf '\n[Install]\nWantedBy=local-fs.target\n' >> debian/systemd/usr/share/systemd/tmp.mount rm debian/systemd/lib/systemd/system/local-fs.target.wants/tmp.mount + # disable ctrl-alt-del.target + rm debian/systemd/lib/systemd/system/ctrl-alt-del.target + # files shipped by cryptsetup ifeq (, $(filter stage1, $(DEB_BUILD_PROFILES))) rm debian/systemd/usr/share/man/man5/crypttab.5