diff options
4 files changed, 77 insertions, 51 deletions
diff --git a/libre/systemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch b/libre/systemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch index 786c6370f..df5e4ca52 100644 --- a/libre/systemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch +++ b/libre/systemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch @@ -84,19 +84,6 @@ index c834bde292..fdd2261fe9 100644 project='man-pages'><refentrytitle>errno</refentrytitle><manvolnum>3</manvolnum></citerefentry>) to D-Bus errors and back. For example, the error <constant>EUCLEAN</constant> is mapped to -diff --git a/man/sd-login.xml b/man/sd-login.xml -index 83ef0b7307..93fd9ea782 100644 ---- a/man/sd-login.xml -+++ b/man/sd-login.xml -@@ -244,7 +244,7 @@ - - <para> - <ulink url="https://www.freedesktop.org/wiki/Software/systemd/multiseat">Multi-Seat on Linux</ulink> -- for an introduction to multi-seat support on Linux and the background for this set of APIs. -+ for an introduction to multi-seat support on GNU/Linux and the background for this set of APIs. - </para> - </refsect1> - diff --git a/man/sd_bus_error_add_map.xml b/man/sd_bus_error_add_map.xml index 3eacbab660..b4b3b1bd17 100644 --- a/man/sd_bus_error_add_map.xml @@ -111,18 +98,18 @@ index 3eacbab660..b4b3b1bd17 100644 <citerefentry><refentrytitle>sd_bus_error_set</refentrytitle><manvolnum>3</manvolnum></citerefentry> or diff --git a/man/sd_uid_get_state.xml b/man/sd_uid_get_state.xml -index 02670e1bce..6f4ff77130 100644 +index 2d6fb0c8a3..58586018d6 100644 --- a/man/sd_uid_get_state.xml +++ b/man/sd_uid_get_state.xml @@ -163,7 +163,7 @@ - <listitem><para>An input parameter was invalid (out of range, or NULL, where that is not - accepted). This is also returned if the passed user ID is <constant>0xFFFF</constant> or -- <constant>0xFFFFFFFF</constant>, which are undefined on Linux.</para></listitem> -+ <constant>0xFFFFFFFF</constant>, which are undefined on GNU/Linux.</para></listitem> + <listitem><para>An input parameter was invalid (out of range, or <constant>NULL</constant>, + where that is not accepted). This is also returned if the passed user ID is +- <constant>0xFFFF</constant> or <constant>0xFFFFFFFF</constant>, which are undefined on Linux. ++ <constant>0xFFFF</constant> or <constant>0xFFFFFFFF</constant>, which are undefined on GNU/Linux. + </para></listitem> </varlistentry> - <varlistentry> diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml index c4763fd561..54bba23666 100644 --- a/man/systemd-detect-virt.xml @@ -200,18 +187,18 @@ index 3bd790b485..a532b74a6e 100644 url="https://systemd.io/USER_NAMES">User/Group Name Syntax</ulink>.</para> diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml -index 19c2ca9907..5fd6c1598f 100644 +index 520a906249..e4ce5b843b 100644 --- a/man/systemd.socket.xml +++ b/man/systemd.socket.xml -@@ -280,7 +280,7 @@ - <listitem><para>Specifies a POSIX message queue name to listen - on. This expects a valid message queue name (i.e. beginning - with /). Behavior otherwise is very similar to the -- <varname>ListenFIFO=</varname> directive above. On Linux -+ <varname>ListenFIFO=</varname> directive above. On GNU/Linux - message queue descriptors are actually file descriptors and - can be inherited between processes.</para></listitem> +@@ -288,7 +288,7 @@ + project='man-pages'><refentrytitle>mq_overview</refentrytitle><manvolnum>7</manvolnum></citerefentry> + for details). This expects a valid message queue name (i.e. beginning with + <literal>/</literal>). Behavior otherwise is very similar to the <varname>ListenFIFO=</varname> +- directive above. On Linux message queue descriptors are actually file descriptors and can be ++ directive above. On GNU/Linux message queue descriptors are actually file descriptors and can be + inherited between processes.</para></listitem> </varlistentry> + diff --git a/man/systemd.xml b/man/systemd.xml index 28bf49e131..5cfd0de31a 100644 --- a/man/systemd.xml diff --git a/libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch b/libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch index c1b06119f..d14058763 100644 --- a/libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch +++ b/libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch @@ -137,19 +137,10 @@ index 272258b4e1..6cea40cb99 100644 <refsect1> diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml -index 69558ac85c..a561fe9eb0 100644 +index 588924ee61..34ff6a7e96 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml -@@ -1,7 +1,7 @@ - <?xml version='1.0'?> - <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" - "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ --<!ENTITY fedora_latest_version "32"> -+<!ENTITY blag_latest_version "140"> - <!ENTITY fedora_cloud_release "1.6"> - ]> - <!-- SPDX-License-Identifier: LGPL-2.1+ --> -@@ -1415,11 +1415,12 @@ +@@ -1461,11 +1461,12 @@ <refsect1> <title>Examples</title> @@ -163,7 +154,7 @@ index 69558ac85c..a561fe9eb0 100644 https://download.fedoraproject.org/pub/fedora/linux/releases/&fedora_latest_version;/Cloud/x86_64/images/Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86_64.raw.xz \ Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86-64 # systemd-nspawn -M Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86-64</programlisting> -@@ -1428,37 +1429,36 @@ +@@ -1474,37 +1475,36 @@ <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry> and opens a shell in it.</para> </example> @@ -212,11 +203,11 @@ index 69558ac85c..a561fe9eb0 100644 - <ulink url="https://www.debian.org">Debian</ulink>, - <ulink url="https://www.ubuntu.com">Ubuntu</ulink>, - and <ulink url="https://www.tanglu.org">Tanglu</ulink> -+ <ulink url="https://www.debian.org">gNewSense</ulink> ++ <ulink url="http://www.gnewsense.org">gNewSense</ulink> out of the box, so the same command can be used to install any of those. For other distributions from the Debian family, a mirror has to be specified, see <citerefentry project='die-net'><refentrytitle>debootstrap</refentrytitle><manvolnum>8</manvolnum></citerefentry>. -@@ -1467,29 +1467,31 @@ +@@ -1513,29 +1513,31 @@ <example> <title>Boot a minimal @@ -256,6 +247,43 @@ index 69558ac85c..a561fe9eb0 100644 <example> <title>Boot into an ephemeral snapshot of the host system</title> +diff --git a/man/custom-entities.ent.in b/man/custom-entities.ent.in +index 9963322fc9..4b71a4ab8f 100644 +--- a/man/custom-entities.ent.in ++++ b/man/custom-entities.ent.in +@@ -11,5 +11,4 @@ + <!ENTITY KILL_USER_PROCESSES @KILL_USER_PROCESSES_YES_NO@> + <!ENTITY DEBUGTTY @DEBUGTTY@> + <!ENTITY RC_LOCAL_PATH @RC_LOCAL_PATH@> +-<!ENTITY fedora_latest_version "33"> +-<!ENTITY fedora_cloud_release "1.2"> ++<!ENTITY blag_latest_version "140"> +diff --git a/man/machinectl.xml b/man/machinectl.xml +index 9026849559..7b3b130763 100644 +--- a/man/machinectl.xml ++++ b/man/machinectl.xml +@@ -940,11 +940,12 @@ + to open a shell in it.</para> + </example> + ++<!-- TODO: This example needs switched to an FSDG OS; but I'm not sure of a good machinectl-compatible image to use. + <example> + <title>Download a Fedora image, set a root password in it, start + it as a service</title> + +- <programlisting># machinectl pull-raw --verify=no \ ++ <programlisting># machinectl pull-raw -&2D;verify=no \ + https://download.fedoraproject.org/pub/fedora/linux/releases/&fedora_latest_version;/Cloud/x86_64/images/Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86_64.raw.xz \ + Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86-64 + # systemd-nspawn -M Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86-64 +@@ -959,6 +960,7 @@ + the machine started as system service. With the last command a + login prompt into the container is requested.</para> + </example> ++--> + + <example> + <title>Exports a container image as tar file</title> -- 2.18.0 diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD index 3f109cc08..e6dc69af1 100644 --- a/libre/systemd/PKGBUILD +++ b/libre/systemd/PKGBUILD @@ -11,8 +11,8 @@ pkgname+=('systemd-common' 'systemd-udev') # We split Arch's systemd-libs into systemd-$X, for the following $X: _systemd_libs=('libsystemd' 'libudev' 'nss-systemd' 'nss-myhostname' 'nss-mymachines' 'nss-resolve') pkgname+=("${_systemd_libs[@]/#/systemd-}") -_tag='27d60e13ed5db2194cac14ad4cc86ad06d753805' # git rev-parse v${pkgver} -pkgver=246.6 +_tag='8dff57da7abcb15e69936a8af9780475eb961a73' # git rev-parse v${pkgver} +pkgver=247.2 pkgrel=1 pkgrel+=.parabola1 arch=('x86_64') @@ -61,7 +61,7 @@ sha512sums=('SKIP' 'SKIP' 'e38c7c422c82953f9c2476a5ab8009d614cbec839e4088bff5db7698ddc84e3d8ed64f32ed323f57b1913c5c9703546f794996cb415ed7cdda930b627962a3c4' 'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73' - 'f1f0bc599eb73b96f81e5413a55617ab82978d057dc0cabf226d225bb836a967fe13b84c4f24f64c074b6568026ab81d457512ff20a5918892c47a3a603eaa6e' + '8e76f8334b95ce7fee9190f4a1016b16109f3a75b68635fc227b2b4791cf8179ef09b532b66b4ed885ddf98ed76befed3106f3c3088f1819ed8cdf4c13e0805a' 'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a' '70b3f1d6aaa9cd4b6b34055a587554770c34194100b17b2ef3aaf4f16f68da0865f6b3ae443b3252d395e80efabd412b763259ffb76c902b60e23b6b522e3cc8' '6c6f579644ea2ebb6b46ee274ab15110718b0de40def8c30173ba8480b045d403f2aedd15b50ad9b96453f4ad56920d1350ff76563755bb9a80b10fa7f64f1d9' @@ -78,15 +78,23 @@ sha512sums=('SKIP' 'da7a97d5d3701c70dd5388b0440da39006ee4991ce174777931fea2aa8c90846a622b2b911f02ae4d5fffb92680d9a7e211c308f0f99c04896278e2ee0d9a4dc' '5aa475f37d35752a95e73417c38c4d3bc4d15d5f1052e95d75b4c4144b74c79af94da1d1e954be536339f9829a1ceb3a1bc5c6adceb187df7a8e5f5a83e4a850' '825b9dd0167c072ba62cabe0677e7cd20f2b4b850328022540f122689d8b25315005fa98ce867cf6e7460b2b26df16b88bb3b5c9ebf721746dce4e2271af7b97' - 'e94ac3884237bd95b3e2b183b71e7aae4fdbacce043368d32deee9f6da15d9d61b57a78bc889ef1b69f85499bfaec9f4121adb3f81a01a28571e7905be96231b' + 'e963859d9958e527802f118a5ac5f2051343a2ee987f60cae256fc4e8c71f5fe16439375a5d1caf0338f1156775ad087eaab9e8bf9d18633e62ea4d32e713e7f' '3536a497e4d6cfae76296be7bf903c7645d6a85f96f57256196282f91d3845876d74ca121efeb81df8d524ec3c53f614157a90d213a5d3c4bb14958be701fff9' 'fd0df3d365892d4d461a78bb0b728201e81c1269af07a38e134fadfc0ffb29aade7642142d128abcf88803b86494d7629ff5990359ef067feea3d476c7238a67' 'e9e884015a40dc796fd8cbd8f79b3b9eebc7e48a332b22d52104c21c492be9982b35b7dd30bc29f2c2d274707ffd043eda059659844a4cd50eb433b8a3f7648c' '0d6b894149ec8d0612d1be1dee5daa1768345232e450435ddc750e36a8309dd96782a92f0220169c69103b1c4632af708e4a737cb7ba817944c92dcb61379a30' - '49ee2af68a256d523143c830e7efcea8b75265b39c06880a53acaf178125b644baa39bc71b7217ea54dd0c31d8fa1fce9328a7169c9ca24fe6c0e37faab50464' + '34acbb7c47b5ccd14adb6982b734cd718d478e3caf3b7f4e15795c3ba39f3c3f03b0a3f8f5a0c29b4342cd923f892daf55dd22598392900946ea8d185c706c78' '28a5b3fc9e2c5cec9267bb96725c73ee77788514f140c0cf8df765af64bc8130dd02f4863d9128ac45d54256b2ab4f2b06d1a3f65660ce1dfba5727618cd1839') _backports=( + # set: introduce set_strjoin() + '4dbce717873000cff7b56f89266d1d2fe53f9284' + # sd-device: use set_strjoin() + '6f3ac0d51766b0b9101676cefe5c4ba81feba436' + # sd-device: keep escaped strings in DEVLINK= property + '31063db0b4842a452c6eadde5b969aaee2a0516a' + # test: add tests for device_new_from_nulstr() + 'e6f882871568e4a331ac473871ee8a884f6e48d6' ) _reverts=( @@ -142,6 +150,7 @@ build() { local _meson_options=( -Dversion-tag="${pkgver}-${pkgrel}-parabola" + -Dmode=release -Dima=false -Dlibidn2=true @@ -240,11 +249,13 @@ package_systemd() { 'curl: machinectl pull-tar and pull-raw') backup=(etc/pam.d/systemd-user etc/systemd/coredump.conf + etc/systemd/homed.conf etc/systemd/journald.conf etc/systemd/journal-remote.conf etc/systemd/journal-upload.conf etc/systemd/logind.conf etc/systemd/networkd.conf + etc/systemd/pstore.conf etc/systemd/resolved.conf etc/systemd/sleep.conf etc/systemd/system.conf @@ -304,7 +315,7 @@ package_systemd-common() { license=('LGPL2.1') depends=('acl' 'libacl.so' 'cryptsetup' 'libcryptsetup.so' 'libdbus' 'glibc' 'iptables' 'libcap' 'libcap.so' - 'libgcrypt' 'libxcrypt' 'libcrypt.so' 'libidn2' 'libidn2.so' 'libseccomp' 'libseccomp.so' 'libsystemd.so' + 'libgcrypt' 'libxcrypt' 'libcrypt.so' 'libidn2' 'libseccomp' 'libseccomp.so' 'libsystemd.so' 'libudev.so' 'libblkid.so' 'libmount.so' 'libuuid.so' 'lz4' 'xz' 'audit' 'libaudit.so' 'libp11-kit' 'libp11-kit.so' 'openssl') diff --git a/libre/systemd/initcpio-install-systemd b/libre/systemd/initcpio-install-systemd index 9e23070dd..18846528c 100644 --- a/libre/systemd/initcpio-install-systemd +++ b/libre/systemd/initcpio-install-systemd @@ -106,11 +106,11 @@ add_systemd_drop_in() { build() { local rules unit - # from base - add_binary /bin/mount add_binary /usr/bin/kmod /usr/bin/modprobe - add_binary /usr/lib/systemd/systemd /init + add_binary /usr/bin/mount add_binary /usr/bin/sulogin + add_binary /usr/bin/umount + add_binary /usr/lib/systemd/systemd /init map add_binary \ /usr/bin/journalctl \ |