[arch-commits] Commit in systemd/trunk (2 files)

[Christian Hesse]

    Date: Wednesday, April 21, 2021 @ 11:41:47
  Author: eworm
Revision: 412966

reenable SYSTEMD_URLIFY

Modified:
  systemd/trunk/PKGBUILD
Deleted:
  systemd/trunk/0002-Disable-SYSTEMD_URLIFY-by-default.patch

----------------------------------------------+
 0002-Disable-SYSTEMD_URLIFY-by-default.patch |   23 -----------------------
 PKGBUILD                                     |    5 -----
 2 files changed, 28 deletions(-)

Deleted: 0002-Disable-SYSTEMD_URLIFY-by-default.patch
===================================================================
--- 0002-Disable-SYSTEMD_URLIFY-by-default.patch	2021-04-21 11:23:55 UTC (rev 412965)
+++ 0002-Disable-SYSTEMD_URLIFY-by-default.patch	2021-04-21 11:41:47 UTC (rev 412966)
@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Mon, 29 Mar 2021 00:12:34 +0000
-Subject: [PATCH] Disable SYSTEMD_URLIFY by default
-
-Until https://github.com/gwsw/less/issues/140 is fixed.
----
- src/shared/pretty-print.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/shared/pretty-print.c b/src/shared/pretty-print.c
-index 0f02f32760..1d0f9901dd 100644
---- a/src/shared/pretty-print.c
-+++ b/src/shared/pretty-print.c
-@@ -28,7 +28,7 @@ bool urlify_enabled(void) {
-                 if (val >= 0)
-                         cached_urlify_enabled = val;
-                 else
--                        cached_urlify_enabled = colors_enabled();
-+                        cached_urlify_enabled = 0;
-         }
- 
-         return cached_urlify_enabled;

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-21 11:23:55 UTC (rev 412965)
+++ PKGBUILD	2021-04-21 11:41:47 UTC (rev 412966)
@@ -22,7 +22,6 @@
 source=("git+https://github.com/systemd/systemd-stable#tag=${_tag}?signed"
         "git+https://github.com/systemd/systemd#tag=v${_tag_name%.*}?signed"
         '0001-Use-Arch-Linux-device-access-groups.patch'
-        '0002-Disable-SYSTEMD_URLIFY-by-default.patch'
         '0003-PARTIAL-REVERT-commit-tree-wide-replace-strverscmp-and-str_verscmp-with-strverscmp_improved.patch'
         'initcpio-hook-udev'
         'initcpio-install-systemd'
@@ -44,7 +43,6 @@
 sha512sums=('SKIP'
             'SKIP'
             '882e486b6d88c8bafc50088845e41a49686e98981967f72ca1fb4ef07a01767400632f4b648fd31857d2a2a24a8fd65bcc2a8983284dd4fff2380732741d4c41'
-            '313f3d6cc3d88f718509007e029213a82d84b196afdadc6ef560580acf70ab480aaecd7622f51726cc1af7d7841c6ec5390f72890b055a54fc74722341395651'
             '34541f1967536524329867f9f341f8d9250d9d771c60dc3e6a22ccb82fc01f103cfd3f9903329777591ccbecd2446622a5d6b3804fa0411482b85c70593ee8ad'
             'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
             'f599e1a35cba2c4e83e37c2299fac23ae128d8f68081283e71e1729384975dee1c4b677787f31a17890aeb98c8d2fc90405a202644290708ef9c027315022b17'
@@ -89,9 +87,6 @@
   # Replace cdrom/dialout/tape groups with optical/uucp/storage
   patch -Np1 -i ../0001-Use-Arch-Linux-device-access-groups.patch
 
-  # https://github.com/gwsw/less/issues/140
-  patch -Np1 -i ../0002-Disable-SYSTEMD_URLIFY-by-default.patch
-
   # https://bugs.archlinux.org/task/70264
   # https://github.com/systemd/systemd/issues/19191
   patch -Np1 -i ../0003-PARTIAL-REVERT-commit-tree-wide-replace-strverscmp-and-str_verscmp-with-strverscmp_improved.patch