move sclockadj compilation from postinst to systemd unit

to allow simplification of dependency resolution during release upgrade
Kicksecure · Oct 23, 2021 · 3986d42 · 3986d42
1 parent cb27e50
commit 3986d42
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/debian/sdwdate.postinst b/debian/sdwdate.postinst
@@ -60,8 +60,6 @@ case "$1" in
        ## Not possible here, because
        ## group systemd-journal might not exist yet during the build process.
        #addgroup sdwdate systemd-journal
-
-       gcc /usr/libexec/sdwdate/sclockadj.c -o /usr/libexec/sdwdate/sclockadj -ldl -D_GNU_SOURCE -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

diff --git a/lib/systemd/system/sdwdate-pre.service b/lib/systemd/system/sdwdate-pre.service
@@ -0,0 +1,19 @@
+## Copyright (C) 2012 - 2021 ENCRYPTED SUPPORT LP <adrelanos@whonix.org>
+## See the file COPYING for copying conditions.
+
+## similar file by package apparmor-profile-everything (AAE):
+## /lib/systemd/system/sdwdate-aae.service
+
+[Unit]
+Description=Secure Distributed Web Date - Pre
+Documentation=https://www.whonix.org/wiki/sdwdate
+
+Before=sdwdate.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/libexec/sdwdate/sdwdate-pre
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/lib/systemd/system/sdwdate.service b/lib/systemd/system/sdwdate.service
@@ -29,7 +29,6 @@ Conflicts=systemd-timesyncd.service
 Type=notify
 User=sdwdate
 Group=sdwdate
-ExecStartPre=+/usr/libexec/sdwdate/sdwdate-pre
 ExecStart=/usr/bin/sdwdate
 SuccessExitStatus=143
 TimeoutSec=30

diff --git a/usr/libexec/sdwdate/sdwdate-pre b/usr/libexec/sdwdate/sdwdate-pre
@@ -11,6 +11,6 @@ set -x
 ## cause ependency issues during the build process or distro morphing because
 ## package 'systemd' as well as package 'sdwdate' 'Provides: time-daemon'.
 ## 'addgroup' is a debianism.
-addgroup sdwdate systemd-journal
+addgroup sdwdate systemd-journal || true
 
-exit 0
+gcc /usr/libexec/sdwdate/sclockadj.c -o /usr/libexec/sdwdate/sclockadj -ldl -D_GNU_SOURCE -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now