set urlify to be disabled by default
(cherry picked from commit 9f01e630a91bb3acf70f9d769752d5ce9316b670)
This commit is contained in:
parent
aa69d1a617
commit
0f40fea4da
63
backport-Add-meson-option-to-disable-urlify.patch
Normal file
63
backport-Add-meson-option-to-disable-urlify.patch
Normal file
@ -0,0 +1,63 @@
|
|||||||
|
From e5d86ebed5624ef62342c820a5868b1075deb300 Mon Sep 17 00:00:00 2001
|
||||||
|
From: James Hilliard <james.hilliard1@gmail.com>
|
||||||
|
Date: Sun, 11 Jul 2021 04:39:33 -0600
|
||||||
|
Subject: [PATCH] Add meson option to disable urlify.
|
||||||
|
|
||||||
|
Useful for systems that don't use a version of less with hyperlink
|
||||||
|
support.
|
||||||
|
---
|
||||||
|
meson.build | 1 +
|
||||||
|
meson_options.txt | 2 ++
|
||||||
|
src/shared/pretty-print.c | 4 ++++
|
||||||
|
3 files changed, 7 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/meson.build b/meson.build
|
||||||
|
index 5735cfc7ad..a2ee15bf32 100644
|
||||||
|
--- a/meson.build
|
||||||
|
+++ b/meson.build
|
||||||
|
@@ -278,6 +278,7 @@ conf.set_quoted('USER_PRESET_DIR', userpresetdir)
|
||||||
|
conf.set_quoted('VENDOR_KEYRING_PATH', join_paths(rootlibexecdir, 'import-pubring.gpg'))
|
||||||
|
|
||||||
|
conf.set('ANSI_OK_COLOR', 'ANSI_' + get_option('ok-color').underscorify().to_upper())
|
||||||
|
+conf.set10('ENABLE_URLIFY', get_option('urlify'))
|
||||||
|
conf.set10('ENABLE_FEXECVE', get_option('fexecve'))
|
||||||
|
conf.set10('MEMORY_ACCOUNTING_DEFAULT', memory_accounting_default)
|
||||||
|
conf.set('STATUS_UNIT_FORMAT_DEFAULT', 'STATUS_UNIT_FORMAT_' + status_unit_format_default.to_upper())
|
||||||
|
diff --git a/meson_options.txt b/meson_options.txt
|
||||||
|
index 163c8df87d..b60261ac24 100644
|
||||||
|
--- a/meson_options.txt
|
||||||
|
+++ b/meson_options.txt
|
||||||
|
@@ -444,6 +444,8 @@ option('ok-color', type : 'combo',
|
||||||
|
'highlight-cyan', 'highlight-white'],
|
||||||
|
value : 'green',
|
||||||
|
description: 'color of the "OK" status message')
|
||||||
|
+option('urlify', type : 'boolean', value : 'true',
|
||||||
|
+ description : 'enable pager Hyperlink ANSI sequence support')
|
||||||
|
option('fexecve', type : 'boolean', value : 'false',
|
||||||
|
description : 'use fexecve() to spawn children')
|
||||||
|
|
||||||
|
diff --git a/src/shared/pretty-print.c b/src/shared/pretty-print.c
|
||||||
|
index 137ba77b3a..7983c0a33a 100644
|
||||||
|
--- a/src/shared/pretty-print.c
|
||||||
|
+++ b/src/shared/pretty-print.c
|
||||||
|
@@ -19,6 +19,7 @@
|
||||||
|
#include "util.h"
|
||||||
|
|
||||||
|
bool urlify_enabled(void) {
|
||||||
|
+#if ENABLE_URLIFY
|
||||||
|
static int cached_urlify_enabled = -1;
|
||||||
|
|
||||||
|
if (cached_urlify_enabled < 0) {
|
||||||
|
@@ -32,6 +33,9 @@ bool urlify_enabled(void) {
|
||||||
|
}
|
||||||
|
|
||||||
|
return cached_urlify_enabled;
|
||||||
|
+#else
|
||||||
|
+ return 0;
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
int terminal_urlify(const char *url, const char *text, char **ret) {
|
||||||
|
--
|
||||||
|
2.27.0
|
||||||
|
|
||||||
@ -20,7 +20,7 @@
|
|||||||
Name: systemd
|
Name: systemd
|
||||||
Url: https://www.freedesktop.org/wiki/Software/systemd
|
Url: https://www.freedesktop.org/wiki/Software/systemd
|
||||||
Version: 249
|
Version: 249
|
||||||
Release: 17
|
Release: 18
|
||||||
License: MIT and LGPLv2+ and GPLv2+
|
License: MIT and LGPLv2+ and GPLv2+
|
||||||
Summary: System and Service Manager
|
Summary: System and Service Manager
|
||||||
|
|
||||||
@ -96,6 +96,7 @@ Patch6021: backport-udev-fix-potential-memleak.patch
|
|||||||
Patch6022: backport-journalctl-never-fail-at-flushing-when-the-flushed-f.patch
|
Patch6022: backport-journalctl-never-fail-at-flushing-when-the-flushed-f.patch
|
||||||
Patch6023: backport-core-fix-SIGABRT-on-empty-exec-command-argv.patch
|
Patch6023: backport-core-fix-SIGABRT-on-empty-exec-command-argv.patch
|
||||||
Patch6024: backport-core-service-also-check-path-in-exec-commands.patch
|
Patch6024: backport-core-service-also-check-path-in-exec-commands.patch
|
||||||
|
Patch6025: backport-Add-meson-option-to-disable-urlify.patch
|
||||||
|
|
||||||
BuildRequires: gcc, gcc-c++
|
BuildRequires: gcc, gcc-c++
|
||||||
BuildRequires: libcap-devel, libmount-devel, pam-devel, libselinux-devel
|
BuildRequires: libcap-devel, libmount-devel, pam-devel, libselinux-devel
|
||||||
@ -364,6 +365,7 @@ CONFIGURE_OPTS=(
|
|||||||
-Duserdb=false
|
-Duserdb=false
|
||||||
-Dtime-epoch=0
|
-Dtime-epoch=0
|
||||||
-Dmode=release
|
-Dmode=release
|
||||||
|
-Durlify=false
|
||||||
)
|
)
|
||||||
|
|
||||||
%meson "${CONFIGURE_OPTS[@]}"
|
%meson "${CONFIGURE_OPTS[@]}"
|
||||||
@ -1497,6 +1499,9 @@ fi
|
|||||||
%{_libdir}/security/pam_systemd.so
|
%{_libdir}/security/pam_systemd.so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Apr 2 2022 xujing <xujing99@huawei.com> - 249-18
|
||||||
|
- set urlify to be disabled by default
|
||||||
|
|
||||||
* Thu Mar 31 2022 xujing <xujing99@huawei.com> - 249-17
|
* Thu Mar 31 2022 xujing <xujing99@huawei.com> - 249-17
|
||||||
- set DEFAULT_TASKS_MAX to 80% and set mode to release
|
- set DEFAULT_TASKS_MAX to 80% and set mode to release
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user