diff options
Diffstat (limited to 'sys-apps/less')
| -rw-r--r-- | sys-apps/less/Manifest | 2 | ||||
| -rw-r--r-- | sys-apps/less/files/less-608-CVE-2022-46663.patch | 22 | ||||
| -rw-r--r-- | sys-apps/less/files/less-608-procfs.patch | 45 |
3 files changed, 0 insertions, 69 deletions
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest index d577c9330868..ac94eeb8b60d 100644 --- a/sys-apps/less/Manifest +++ b/sys-apps/less/Manifest @@ -1,5 +1,3 @@ -AUX less-608-CVE-2022-46663.patch 696 BLAKE2B 3f4ddff375321ec410b12b9dac457536c98a9a3f123e0715dc40cbd0fe85e4b59676767ea6819688338d6280158ae7f04f93bbf283d8616da5021816f4125fa3 SHA512 417c06b1dd7ff764b58b4cc4c93df2d44d224780b5799ecaad50348b4654bd26f181082539855203d9f1e6a928908cdf650269c9998dbd6dab31e5e912d41cfc -AUX less-608-procfs.patch 1669 BLAKE2B b44ca75d76df10eb65e73230a68d3d8566121f60d0c60ef454bf96d0af9300b0a47aa633860802bfa548c014e2767c1f0cf14b29eff1719d81a6042b0255db28 SHA512 7a08a8935530326edc645ec2db5c089b7989a94cef2bba90da201173089621a1fcbdb333fd519e1ef49b6ebe82a8f725e361b33520bcd9efd3d55d4732d00668 AUX less-643-lesstest-pkg-config.patch 1483 BLAKE2B 2c0fb65721c2b1c5af74a4fd516d9255059e9aeba7eb91de8aff9d6b35fe708fe275bdde9df6047b6bf4c79534c8410cb946be436a35fe21ce254c87235c6908 SHA512 b6d9911efb20da00f28ceebd922c7f97f7957f964ccb2c50187a52019b35dffaa1e2a7a76cf846ca9f76100af5b2fa38468fb5d49bab9a6b6b02747da2c8f76b AUX less.envd 47 BLAKE2B 4ebc9242c96918c6942b05f67a9be541c6c535c23072e89e36c376e690cb7df9528e1734514092a6afdd3d4f47db45c6186a8cce5d9eb18ca7c73a01800f35fc SHA512 261b25887b08b3255e412b36130d014fc37ffc7de75dce3b5ba2521d94a1b0be4c584808b9698c30a8dafea70c62fae2cd0642d0983f96cdb418c3c501433674 AUX lesspipe-r1.sh 8135 BLAKE2B f11727136a5235f07ad86c1811c5ef8489a48fc3d032b8840bc67eda70e1800f03505a534870a0ba73aa62e4df4315444c76fe8aa89ab47c8b2f1e08fab5b6e2 SHA512 e7820d0c925da4d217214e093c671d6c2da51da00dcec98bed80fe3e6d664cfd3baf1b850eb711e9ccf9a1d09f943e2fc2efc3e8061bbfa45724c5b623dafe94 diff --git a/sys-apps/less/files/less-608-CVE-2022-46663.patch b/sys-apps/less/files/less-608-CVE-2022-46663.patch deleted file mode 100644 index a358dd6f1a77..000000000000 --- a/sys-apps/less/files/less-608-CVE-2022-46663.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://bugs.gentoo.org/893530 -https://github.com/gwsw/less/commit/a78e1351113cef564d790a730d657a321624d79c - -From a78e1351113cef564d790a730d657a321624d79c Mon Sep 17 00:00:00 2001 -From: Mark Nudelman <markn@greenwoodsoftware.com> -Date: Fri, 7 Oct 2022 19:25:46 -0700 -Subject: [PATCH] End OSC8 hyperlink on invalid embedded escape sequence. - ---- a/line.c -+++ b/line.c -@@ -633,8 +633,8 @@ ansi_step(pansi, ch) - /* Hyperlink ends with \7 or ESC-backslash. */ - if (ch == '\7') - return ANSI_END; -- if (pansi->prev_esc && ch == '\\') -- return ANSI_END; -+ if (pansi->prev_esc) -+ return (ch == '\\') ? ANSI_END : ANSI_ERR; - pansi->prev_esc = (ch == ESC); - return ANSI_MID; - } - diff --git a/sys-apps/less/files/less-608-procfs.patch b/sys-apps/less/files/less-608-procfs.patch deleted file mode 100644 index 4f66322b8123..000000000000 --- a/sys-apps/less/files/less-608-procfs.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 03f011f219a6d6068c4ccd07dbd8dcd50641ff10 Mon Sep 17 00:00:00 2001 -From: Mark Nudelman <markn@greenwoodsoftware.com> -Date: Tue, 20 Sep 2022 12:32:30 -0700 -Subject: [PATCH] Fix reading procfs files on Linux: bad detection of - HAVE_PROCFS. - -diff --git a/ch.c b/ch.c -index bfad09c7..fcf136b9 100644 ---- a/ch.c -+++ b/ch.c -@@ -28,6 +28,9 @@ extern ino_t curr_ino; - - #if HAVE_PROCFS - #include <sys/statfs.h> -+#if HAVE_LINUX_MAGIC_H -+#include <linux/magic.h> -+#endif - #endif - - typedef POSITION BLOCKNUM; -diff --git a/configure.ac b/configure.ac -index f7c64814..b10adce9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -37,7 +37,7 @@ AC_SEARCH_LIBS([regcmp], [gen intl PW]) - - # Checks for header files. - AC_HEADER_STDC --AC_CHECK_HEADERS([ctype.h errno.h fcntl.h limits.h stdio.h stdlib.h string.h termcap.h termio.h termios.h time.h unistd.h values.h sys/ioctl.h sys/stream.h wctype.h]) -+AC_CHECK_HEADERS([ctype.h errno.h fcntl.h limits.h stdio.h stdlib.h string.h termcap.h termio.h termios.h time.h unistd.h values.h linux/magic.h sys/ioctl.h sys/stream.h wctype.h]) - - # Checks for typedefs, structures, and compiler characteristics. - AC_HEADER_STAT -@@ -271,7 +271,10 @@ AC_TRY_COMPILE([#include <sys/types.h> - [struct stat s; dev_t dev = s.st_dev; ino_t ino = s.st_ino;], - [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_STAT_INO)], [AC_MSG_RESULT(no)]) - AC_MSG_CHECKING(for procfs) --AC_TRY_COMPILE([#include <sys/statfs.h>], -+AC_TRY_COMPILE([#include <sys/statfs.h> -+#if HAVE_LINUX_MAGIC_H -+#include <linux/magic.h> -+#endif], - [struct statfs s; s.f_type = PROC_SUPER_MAGIC; (void) fstatfs(0,&s); ], - [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_PROCFS)], [AC_MSG_RESULT(no)]) - |