libre/systemd: Split gnu+linux.patch into multiple patches, tidy them up.

I removed several instances of replacing "Linux" with "GNU/Linux" in man
pages where it was (correctly) referring to kernel, not the complete
operating system.

In the FSDG-distros patch, I added " (Spartakus)" to several BLAG examples,
as appropriate.  Also, some of the linebreaks were in bad locations with
the XML.

I also added a patch to systemd-resolved to have the default hostname be
"gnu-linux[.local]" instead of "linux[.local]".

1 files changed, 17 insertions, 7 deletions

diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD
index d474ad448..7a8dcd070 100644
--- a/libre/systemd/PKGBUILD
+++ b/libre/systemd/PKGBUILD
@@ -21,7 +21,12 @@ source=("git://github.com/systemd/systemd.git#tag=v$pkgver"
         'initcpio-install-udev'
         'parabola.conf'
         'loader.conf'
-        'gnu+linux.patch')
+        '0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch'
+        '0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch'
+        '0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.patch'
+        '0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch'
+        '0005-FSDG-systemd-resolved-Default-to-hostname-gnu-linux-.patch'
+        '0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch')
 md5sums=('SKIP'
          'f8253cd3c0f249591338fbb4c223d249'
          'SKIP'
@@ -30,7 +35,12 @@ md5sums=('SKIP'
          '1b3aa3a0551b08af9305d33f85b5c2fc'
          '36ee74767ac8734dede1cbd0f4f275d7'
          '9b9f4a58e4c4009bf5290c5b297600c3'
-         'd37895215ef74e172c594aebe1ba23cb')
+         '92a4bb5e527e1e956743c1ffa622adc7'
+         '35e9e89add0243f77f0b1c9be6f7bdcb'
+         'e592f6778c12627d46982ddfe0698361'
+         'c4c559f9916806f5162ccff3e7c433e8'
+         '5166fe700ef5991c2da3876206c699fb'
+         '166ce41b60d4eaa7738486f7aab5ebd8')
 validpgpkeys=('684D54A189305A9CC95446D36B888913DDB59515') # Márcio Silva
 
 prepare() {
@@ -48,11 +58,11 @@ prepare() {
   # revert "core: resolve specifier in config_parse_exec()"
   git cherry-pick -n bd1b973fb326e9b7587494fd6108e5ded46e9163
 
-  # Rename "Linux" -> "GNU/Linux"
-  patch -Np1 -i "$srcdir/gnu+linux.patch"
-  sed -i '\|os_name| s|Linux|GNU/Linux|' src/journal-remote/journal-gatewayd.c
-  sed -i '\|pretty_name| s|Linux|GNU/Linux|' src/analyze/analyze.c src/core/main.c src/firstboot/firstboot.c
-  sed -i '\|PRETTY_NAME| s|Linux|GNU/Linux|' src/kernel-install/90-loaderentry.install
+  # apply FSDG patches
+  local patchfile
+  for patchfile in "$srcdir"/*.patch; do
+    patch -Np1 -i "$patchfile"
+  done
 
   # Rename "Linux Boot Manager" -> "Systemd Boot Manager"
   sed -i 's|Linux Boot Manager|Systemd Boot Manager|' src/boot/bootctl.c