extra-repos/systemd/postmarketos-base-systemd/APKBUILD

 # Maintainer: Oliver Smith <ollipearanoid@postmarketos.org>
 # pmbootstrap installs this, if systemd is selected in "pmbootstrap init".
 pkgname=postmarketos-base-systemd
-pkgver=4
+pkgver=5
 pkgrel=0
 pkgdesc="Meta package for running postmarketOS with systemd"
 url="https://postmarketos.org"
@@ -61,7 +61,7 @@ fbaa33425e507062a454f11bda48508f261c2144e5c23a20f567dc1cef14ce1dec57f8d934f418f5
 2faac294bb632762e247b850f09ff4b544ccff6c462efd8d4faca71ba30bdfa9c460377a0dc88e92c5dbbe251017d164064a56ac0e0410f224b45d4f5f81866c  rootfs-etc-systemd-logind.conf
 208f53c1d142151277cfcf0a95df839919ce8cb15ec888d50890dc6b3631a994335bfa12194cec856b649f97cfd7c80019c595cc0ea2c5ee96498a3e76a9950b  rootfs-etc-ssh-sshd_config.d-usepam.conf
 15423bfda57c90ab62fe69865ca4072a0aeb83bf77d9c278257e346f4da81843d010b41003c91ae9f3fcb1c67447645e7c19078eea2bf11312051e6ad7523ad1  rootfs-usr-share-mkinitfs-files-01-initramfs-base-systemd.files
-7c1908e02a4b79b4b92c05708e8f619a06a98c71384d3c3bc0af8e694d3bc0c2257dbcd761ea3dfe5f0251245e1b3cd5eaa5f8400ab9a7db8549af5d5ba6eaf7  rootfs-usr-lib-systemd-system-preset-90-base.preset
+e050b14e044993b3c7a6370a92149b5cd2249119570425d91160178dea28df795c24deb230396977b842c6f0ccdc2a0c43e27011162b56cb8de9a64f7ff7157b  rootfs-usr-lib-systemd-system-preset-90-base.preset
 9b3b9abdb3d3541038d37d6870baed81f20be7f5b80874bd142eeb686b08958180b4d4a293912c9760e4353a58d6a5dea43e155002f224d14a157f7a082cde60  rootfs-usr-lib-systemd-user-preset-90-base.preset
 605df1f004783d2e0ec5dd99a688bca27502c8c24bc05fb4dc26589b2070b0fbd1cf9bd56e6861d7cda2f8ac8147e7eb040acfd886185c01c8cf9de8b1ce2dcd  rootfs-usr-bin-setup-timezone
 "

extra-repos/systemd/postmarketos-base-systemd/rootfs-usr-lib-systemd-system-preset-90-base.preset

@@ -19,6 +19,7 @@ enable nftables.service
 enable postmarketos-tweakd.service
 enable sshd.service
 enable systemd-rfkill.service
+enable udisks2.service
 
 # Note: technically these two shouldn't be enabled at the same time, but
 # pmos-base-wifi provides should make sure that only one is installed at the

extra-repos/systemd/systemd-services/APKBUILD

@@ -6,7 +6,7 @@
 # How to add a new service file (5 steps):
 pkgname=systemd-services
 # 1. bump pkgver
-pkgver=16
+pkgver=21
 pkgrel=0
 pkgdesc="Systemd service files"
 url="https://postmarketos.org"
@@ -24,12 +24,15 @@ subpackages="
 	bluez-systemd:_service
 	dconf-systemd:_service
 	eg25-manager-systemd:_service
+	evolution-data-server-systemd:_service
 	flatpak-systemd:_service
 	geoclue-systemd:_service
 	gnome-clocks-systemd:_service
 	hexagonrpcd-systemd:_service
 	iio-sensor-proxy-systemd:_service
 	iwd-systemd:_service
+	lxc-systemd:_service
+	kded-systemd:_service
 	mmsd-tng-systemd:_service
 	modemmanager-systemd:_service
 	nftables-systemd:_service
@@ -43,6 +46,7 @@ subpackages="
 	rtkit-systemd:_service
 	sleep-inhibitor-systemd:_service
 	tqftpserv-systemd:_service
+	udisks2-systemd:_service
 	wireplumber-systemd:_service
 	wpa_supplicant-systemd:_service
 	xdg-desktop-portal-systemd:_service
@@ -63,12 +67,20 @@ _bluez_sources="
 " # From bluez build with --enable-systemd
 _dconf_sources="user/dconf.service"
 _eg25_manager_sources="system/eg25-manager.service" # From https://gitlab.com/mobian1/eg25-manager/-/blob/master/data/eg25-manager.service.in
+_evolution_data_server_sources="
+	user/evolution-addressbook-factory.service
+	user/evolution-calendar-factory.service
+	user/evolution-source-registry.service
+	user/evolution-user-prompter.service
+" # From https://gitlab.gnome.org/GNOME/evolution-data-server/-/blob/master/src/services
 _flatpak_sources="system/flatpak-system-helper.service user/flatpak-session-helper.service user/flatpak-portal.service"
 _geoclue_sources="system/geoclue.service" # From https://gitlab.freedesktop.org/geoclue/geoclue/-/blob/master/data/geoclue.service.in
 _gnome_clocks_sources="user/gnome-clocks.service"
 _hexagonrpcd_sources="system/hexagonrpcd-sdsp.service system/iio-sensor-proxy.d/hexagonrpcd.conf"
 _iio_sensor_proxy_sources="system/iio-sensor-proxy.service"
 _iwd_sources="system/iwd.service" # From https://git.kernel.org/pub/scm/network/wireless/iwd.git/tree/src/iwd.service.in
+_lxc_sources="system/lxc@.service"
+_kded_sources="user/kded.service" # From https://invent.kde.org/frameworks/kded/-/blob/master/src/plasma-kded6.service.in
 _mmsd_tng_sources="user/mmsd-tng.service"
 _modemmanager_sources="system/ModemManager.service"
 _nftables_sources="system/nftables.service"
@@ -82,6 +94,7 @@ _rmtfs_sources="system/rmtfs.service"
 _rtkit_sources="system/rtkit-daemon.service"
 _sleep_inhibitor_sources="system/sleep-inhibitor.service"
 _tqftpserv_sources="system/tqftpserv.service"
+_udisks2_sources="system/udisks2.service" # From https://github.com/storaged-project/udisks/blob/master/data/udisks2.service.in
 _wireplumber_sources="user/wireplumber.service"  # https://gitlab.freedesktop.org/pipewire/wireplumber/-/blob/master/src/systemd/user
 _wpa_supplicant_sources="system/wpa_supplicant.service"
 _xdg_desktop_portal_sources="
@@ -108,12 +121,15 @@ source="$(flatpath \
 	$_bluez_sources \
 	$_dconf_sources \
 	$_eg25_manager_sources \
+	$_evolution_data_server_sources \
 	$_flatpak_sources \
 	$_geoclue_sources \
 	$_gnome_clocks_sources \
 	$_hexagonrpcd_sources \
 	$_iio_sensor_proxy_sources \
 	$_iwd_sources \
+	$_lxc_sources \
+	$_kded_sources \
 	$_mmsd_tng_sources \
 	$_modemmanager_sources \
 	$_nftables_sources \
@@ -127,6 +143,7 @@ source="$(flatpath \
 	$_rtkit_sources \
 	$_sleep_inhibitor_sources \
 	$_tqftpserv_sources \
+	$_udisks2_sources \
 	$_wireplumber_sources \
 	$_wpa_supplicant_sources \
 	$_xdg_desktop_portal_sources \
@@ -157,6 +174,7 @@ _rmtfs_system_presets="rmtfs.service"
 _rtkit_system_presets="rtkit-deamon.service"
 _sleep_inhibitor_system_presets="sleep-inhibitor.service"
 _tqftpserv_system_presets="tqftpserv.service"
+_udisks2_system_presets="udisks2.service"
 _wireplumber_user_presets="wireplumber.service"
 _wpa_supplicant_system_presets="wpa_supplicant.service"
 _xdg_desktop_portal_user_presets="xdg-desktop-portal-rewrite-launchers.service"
@@ -205,6 +223,10 @@ de133c35cf95d7c833368c9010264668e72657400ad4e5259ef046321c878507f36ef73fa7b4759f
 5ad5f8adcc89759e5c935a2e55803fac52a9681af3a28f5c8d46f693717afcf7c8c6394f85dd5dbc1ddb575b909b0f6feee2e9973ee177e6445d375136b932ee  user-obex.service
 e4de73d12abd046c8683e3be6e3aab40a5db3f5d6246cedbb3ff099bcc8037a167b23ac957d30f1118db571b69cb10c042272ac2b54dacf83fa6a3e9dad13a87  user-dconf.service
 780912dbfdc7e9a350e934d46022b043edda86a393a7c107d0c855e9580240e4bce791428fdadef0a45adc6cfa24fb5d58981b6ccd80e3dad99da3e5fa3dc7b8  system-eg25-manager.service
+73e1839cec077e35ed985891f5274a09816115cc083e7a6e7e1fd98c88f4a114d7353492dee5808a28c47bf06bca32d9a6a7cc833cf4f21e501774955e93b321  user-evolution-addressbook-factory.service
+c648760e50e0c47970cce8fdd1972864af74bbc979ed4366973bf1c923ee624779bea95cf1e54260c55fa8a069090a367ceabe9b240842e20959bca42f2f8043  user-evolution-calendar-factory.service
+0e5d1d1cd0e7c9942dcc0c0742beb85f0c1c61338f0b637835f347579601ff7fe93214041306b69db2162aafb677a1d7111130c0f7dab646e5b5cd9f2dda3b33  user-evolution-source-registry.service
+fda84bb8dc10fa613790ff3ac9d50a03f21fb32f793ba3641740be93136800f0f07ba53d6e4843d0912f802955cc26719333d1dc2877610eff12354e8538ad5b  user-evolution-user-prompter.service
 0cfef56afeea103ca487b36f13665021bb349b8c890f023135a93c47d45cb58dd39ffe76212fb780546b1aaed8174e40345a961d7125f7d7ace5921e1dcc7ba9  system-flatpak-system-helper.service
 815a3072c211c85ff475ac7f2fb9c280b567b98777c0f7bf7fea4575b5eaa3b9a4003a08eb3b8cb5b2d7f9fb6525e04491e8d87013e2539ae3a574db647f97b1  user-flatpak-session-helper.service
 7a17986c0f0554f0b27a5933b3e04657323edb23047878616727863fdc748cb8d8fea978f43895341037e2d1512bbd492bdbc19c40419cd3e109345614645388  user-flatpak-portal.service
@@ -214,9 +236,11 @@ b009a1494f84705dcbea664823e24fb18f326ca84017d9c470ef55c0225d519993aacacf76b24c89
 af0e416f78ab317fe09813de58b446e5178457992ea4a2da2eb128811045201087d847e1b7ac0447a59c20129a736135e5d76b113262aa1f76b994e77b9c6b42  system-iio-sensor-proxy.d-hexagonrpcd.conf
 d12ebe6e7db2a8e34baab640dd4e2ea9cd01bc19054adf32d55528a6b27f71c2006ac2d65a58c98e21ed598e9cc66bfe79e197d20ed9d13f866a5a6cd3e247d5  system-iio-sensor-proxy.service
 df3388cb7b9d035e54b34d8f8a6594be89c3015f979fe3bdc199fb7db1ab0bef821d6b306eecdf978eb227454d5e50aab29ac02d9722b1b075ec0ce4705e3518  system-iwd.service
+f6fb4c890cbf72e344ca7a22e7f033fb4c32ce9f5edc27c03ccc5c21424d6a0ef871d79e8a89a502a707bdceb3bfbd7a5b3c8e16b1cd30e149bf2fdf8cccea9e  system-lxc@.service
+b0ecd5d413a2010d3f36285c2d35523119c29007e1e4162e51dfc746cc105f990a82a2a2d6037a8b906628c0a4f606729290525c7a53dbcfbc8147244fa403a7  user-kded.service
 873b53592786a978659bda8d32de5ed9a9f163ca298c4f4112f10bf635a8170c4060cc15b57ff72b3afd50075cd1c5dbc10030f00b166e2540397da9e1c5e46b  user-mmsd-tng.service
 5eab6a59c81232b188df45482e325b2d1cb9e038ca147a1b6983c1c095d8194fba804793c5e291b201a820976c8f506aadd2daf7c52fe573a3af708fc9984641  system-ModemManager.service
-d41d0aa1d4d577cd718185399c95055c0511d4aeb902c771ccec13655354aafc85c3f270431fd3debc7e05f0a8cbdb90f1969b673ae7e5310c1f46cb8120e3f2  system-nftables.service
+12bb9aa2a2ab8d4b21c72a785b41057eb16a27eca5718cd03a987a50b77d669fe90abafae48c68b41616f31b1953853b3b4a74db4bc3cdeccacc00df113de204  system-nftables.service
 fa445c4a53214524baed4e9c52a5463592a074f88a5a286eacb60d0907c0545f725afde23abd68cf611067add80c2ccb289a381fc5ff6a5f654ea49c81f02fe8  system-sshd.service
 c0badea3905c1d53d213fbfe11d25b556a2e484fe77eb50e9f4d42e25b67b56a0804e7d8e1b7731cd280cbb3525b4c60311817609381e2308d9f2dfb7c0d7072  system-sshdgenkeys.service
 0bed9a8a719661609ad84d1c6fcdf2fe9213e741682b7ddebad82d9744f137c593788ed522868f10b95b599d81743d07ec3212630a7e99d333261dfa1bf1cc11  system-pd-mapper.service
@@ -228,6 +252,7 @@ e12d8e98e28a795f879aebcceb32a991ee4abcb3bc5ec458aa5378bb52ff86cf39be04bc4a196925
 1a0958e4fe232967946e9f2b17a13434b137236ba5d18442175d648b084d82df3a9fc5723c1621be899ee290b99777ac3c0ee6ad733e72d8e70f63b37ad00036  system-rtkit-daemon.service
 be9df5e3fd9c88ec1a8db4aa2d9e8075d74ee3d2670aa3cfc611df3cff4d4041ac888a0338c9d5f134bbc69aa32eb52ac40eb3e0981813afa18389cba14d3818  system-sleep-inhibitor.service
 c569b27925297672c479e12a6425abdf5791886fff77c2c2b67b7aa9277eb0a22e7b95b52dbc225870c97460d0988a4dae18ed864e19096c704c0895de55b699  system-tqftpserv.service
+c7ea2b18c9d8f82306fbaca6d07b7019de3819d7898c3f50c3d0aceef4da4d311ed3bf31385e2f8998b8e3e326b1eb13309ffd44cf1b2d9db9b40bca00222c16  system-udisks2.service
 210a7610acfcaee642ac34abe80e77f492e7e2411a9226d26578675893a125b8333a26c2756cf4376745e32fb99a2b7851d737e4df3b2c7d923f730d8ae33e9d  user-wireplumber.service
 d55edea6983ad73b1817dfac3e6d418113c8e0fbd6cb2835dedcad2e5c76c8889c09348a184ed4ab38397d7d539831ef6a7ce08037e12c7ab6dc274519dc5812  system-wpa_supplicant.service
 9a3620d3df53540a91efa48df322288d96ec887415f538877a979be40eb5239b95917b9ac57fda2c699fe3f1c6500f7de09a4ce6625b0818f5786e125713552f  user-xdg-desktop-portal.service

extra-repos/systemd/systemd-services/system-lxc@.service

+[Unit]
+Description=%i LXC
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/lxc-start -d -n %i -p /run/lxc-%i.pid
+PIDFile=/run/lxc-%i.pid
+ExecStop=/usr/bin/lxc-stop -n %i
+Delegate=true
+TasksMax=32768
+
+[Install]
+WantedBy=multi-user.target

extra-repos/systemd/systemd-services/system-nftables.service

@@ -8,7 +8,7 @@ Type=oneshot
 ExecStart=/usr/sbin/nft -f "/etc/nftables.nft"
 ExecReload=/usr/sbin/nft -f "/etc/nftables.nft"
 ExecStop=/usr/sbin/nft flush ruleset
-Type=simple
+RemainAfterExit=yes
 
 [Install]
 WantedBy=multi-user.target

extra-repos/systemd/systemd-services/system-udisks2.service

+[Unit]
+Description=Disk Manager
+Documentation=man:udisks(8)
+
+[Service]
+Type=dbus
+BusName=org.freedesktop.UDisks2
+ExecStart=/usr/libexec/udisks2/udisksd
+KillSignal=SIGINT
+
+[Install]
+WantedBy=graphical.target

extra-repos/systemd/systemd-services/user-evolution-addressbook-factory.service

+[Unit]
+Description=Evolution address book service
+
+[Service]
+Type=dbus
+# Bus name from: https://gitlab.gnome.org/GNOME/evolution-data-server/-/blob/master/CMakeLists.txt
+BusName=org.gnome.evolution.dataserver.AddressBook10
+ExecStart=/usr/libexec/evolution-addressbook-factory

extra-repos/systemd/systemd-services/user-evolution-calendar-factory.service

+[Unit]
+Description=Evolution calendar service
+
+[Service]
+Type=dbus
+# Bus name from: https://gitlab.gnome.org/GNOME/evolution-data-server/-/blob/master/CMakeLists.txt
+BusName=org.gnome.evolution.dataserver.Calendar8
+ExecStart=/usr/libexec/evolution-calendar-factory

extra-repos/systemd/systemd-services/user-evolution-source-registry.service

+[Unit]
+Description=Evolution source registry
+
+[Service]
+Type=dbus
+# Bus name from: https://gitlab.gnome.org/GNOME/evolution-data-server/-/blob/master/CMakeLists.txt
+BusName=org.gnome.evolution.dataserver.Sources5
+ExecStart=/usr/libexec/evolution-source-registry

extra-repos/systemd/systemd-services/user-evolution-user-prompter.service

+[Unit]
+Description=Evolution user prompter
+
+[Service]
+Type=dbus
+# Bus name from: https://gitlab.gnome.org/GNOME/evolution-data-server/-/blob/master/CMakeLists.txt
+BusName=org.gnome.evolution.dataserver.UserPrompter0
+ExecStart=/usr/libexec/evolution-user-prompter

extra-repos/systemd/systemd-services/user-kded.service

+[Unit]
+Description=KDE Daemon 6
+PartOf=graphical-session.target
+After=plasma-kcminit.service
+
+[Service]
+ExecStart=/usr/bin/kded6
+BusName=org.kde.kded6
+Slice=session.slice
+TimeoutStopSec=5sec