From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Tue, 9 Apr 2019 16:37:46 +0000 (+0200)
Subject: Update UEFI URLs (#12260)
X-Git-Tag: v242~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=55a37d7117bf01f5245dfab2db86adb59b8daf9e;p=thirdparty%2Fsystemd.git

Update UEFI URLs (#12260)

* Use more secure https://www.uefi.org

http://www.uefi.org directs to https://uefi.org/, so this saves one
redirect.

    $ curl -I http://www.uefi.org
    HTTP/1.1 302 Found
    Server: nginx
    Date: Tue, 09 Apr 2019 14:54:46 GMT
    Content-Type: text/html; charset=iso-8859-1
    Connection: keep-alive
    X-Content-Type-Options: nosniff
    Location: https://uefi.org/
    Cache-Control: max-age=1209600
    Expires: Tue, 23 Apr 2019 14:54:46 GMT

Run the command below to update all occurrences.

    git grep -l http://www.uefi.org | xargs sed -i 's,http://www.uefi.org,https://www.uefi.org,'

* Use https://uefi.org to save redirect

Save one redirect by using the target location.

    $ curl -I https://www.uefi.org
    HTTP/1.1 301 Moved Permanently
    Server: nginx
    Date: Tue, 09 Apr 2019 14:55:42 GMT
    Content-Type: text/html; charset=iso-8859-1
    Connection: keep-alive
    X-Content-Type-Options: nosniff
    Location: https://uefi.org/
    Cache-Control: max-age=1209600
    Expires: Tue, 23 Apr 2019 14:55:42 GMT

Run the command below to update all occurrences.

    git grep -l https://www.uefi.org | xargs sed -i 's,https://www.uefi.org,https://uefi.org,'
---

diff --git a/hwdb/20-acpi-vendor.hwdb b/hwdb/20-acpi-vendor.hwdb
index 96282077209..bd6c106f8a5 100644
--- a/hwdb/20-acpi-vendor.hwdb
+++ b/hwdb/20-acpi-vendor.hwdb
@@ -1,8 +1,8 @@
 # This file is part of systemd.
 #
 # Data imported from:
-#     http://www.uefi.org/uefi-pnp-export
-#     http://www.uefi.org/uefi-acpi-export
+#     https://uefi.org/uefi-pnp-export
+#     https://uefi.org/uefi-acpi-export
 #
 # With various additions from other sources
 
diff --git a/hwdb/20-acpi-vendor.hwdb.patch b/hwdb/20-acpi-vendor.hwdb.patch
index 8371f5295b9..fdd9efcf39a 100644
--- a/hwdb/20-acpi-vendor.hwdb.patch
+++ b/hwdb/20-acpi-vendor.hwdb.patch
@@ -2,8 +2,8 @@
 +++ 20-acpi-vendor.hwdb	2019-04-08 11:36:50.735757868 +0200
 @@ -3,6 +3,8 @@
  # Data imported from:
- #     http://www.uefi.org/uefi-pnp-export
- #     http://www.uefi.org/uefi-acpi-export
+ #     https://uefi.org/uefi-pnp-export
+ #     https://uefi.org/uefi-acpi-export
 +#
 +# With various additions from other sources
  
diff --git a/hwdb/acpi-update.py b/hwdb/acpi-update.py
index 2c23b057fb2..7bdd3f93d87 100755
--- a/hwdb/acpi-update.py
+++ b/hwdb/acpi-update.py
@@ -72,8 +72,8 @@ b = open("pnp_id_registry.html")
 print('# This file is part of systemd.\n'
       '#\n'
       '# Data imported from:\n'
-      '#     http://www.uefi.org/uefi-pnp-export\n'
-      '#     http://www.uefi.org/uefi-acpi-export')
+      '#     https://uefi.org/uefi-pnp-export\n'
+      '#     https://uefi.org/uefi-acpi-export')
 
 read_table(a)
 read_table(b)
diff --git a/man/systemd-gpt-auto-generator.xml b/man/systemd-gpt-auto-generator.xml
index 352575f1f26..0d6d4e307e3 100644
--- a/man/systemd-gpt-auto-generator.xml
+++ b/man/systemd-gpt-auto-generator.xml
@@ -35,7 +35,7 @@
     root, <filename>/home/</filename>, <filename>/srv/</filename>, the EFI System Partition, the Extended
     Boot Loader Partition and swap partitions and creates mount and swap units for them, based on the
     partition type GUIDs of GUID partition tables (GPT), see <ulink
-    url="http://www.uefi.org/specifications">UEFI Specification</ulink>, chapter 5.  It implements the <ulink
+    url="https://uefi.org/specifications">UEFI Specification</ulink>, chapter 5.  It implements the <ulink
     url="https://www.freedesktop.org/wiki/Specifications/DiscoverablePartitionsSpec/">Discoverable Partitions
     Specification</ulink>. Note that this generator has no effect on non-GPT systems, and on specific mount
     points that are directories already containing files. Also, on systems where the units are explicitly
diff --git a/tools/meson-hwdb-update.sh b/tools/meson-hwdb-update.sh
index f9ef2417197..8bdc58ac7f6 100755
--- a/tools/meson-hwdb-update.sh
+++ b/tools/meson-hwdb-update.sh
@@ -20,8 +20,8 @@ if [ "${2:-}" != "-n" ]; then (
         curl -L -o ma-large.txt 'http://standards-oui.ieee.org/oui/oui.txt'
         curl -L -o ma-medium.txt 'http://standards-oui.ieee.org/oui28/mam.txt'
         curl -L -o ma-small.txt 'http://standards-oui.ieee.org/oui36/oui36.txt'
-        curl -L -o pnp_id_registry.html 'http://www.uefi.org/uefi-pnp-export'
-        curl -L -o acpi_id_registry.html 'http://www.uefi.org/uefi-acpi-export'
+        curl -L -o pnp_id_registry.html 'https://uefi.org/uefi-pnp-export'
+        curl -L -o acpi_id_registry.html 'https://uefi.org/uefi-acpi-export'
 ) fi
 
 set -x