Compare commits

...
Sign in to create a new pull request.

19 commits

Author SHA1 Message Date
Fedora Release Engineering
46f37f9dd5 Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild 2026-07-17 08:40:12 +00:00
Yaakov Selkowitz
2bbf1d869d Rebuilt for openssl 4.0 2026-06-12 20:04:01 -04:00
Fedora Release Engineering
6f0ae0ac94 Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-17 20:05:55 +00:00
Fedora Release Engineering
98dfe958b9 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 20:16:06 +00:00
a32e92339b Work around C23 build failures using C17 2025-02-10 01:17:42 +01:00
f862205f8a Remove support for Red Hat Enterprise Linux 7 2025-02-10 01:17:13 +01:00
Fedora Release Engineering
25b4141d2c Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 14:42:29 +00:00
Miroslav Suchý
512d63af97 Migrate to SPDX license
See https://gitlab.com/fedora/legal/fedora-license-data/-/issues/135
The other option is not include unicode license at all as character mapping is not licensable.

This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4

If there will be no comments in two weeks, I will merge this.
2024-09-09 06:46:42 +00:00
Fedora Release Engineering
271418d363 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-20 09:05:03 +00:00
c06276848c Added upstream patch to fix out-of-bounds access due to multiple backspaces to address incomplete fix for CVE-2022-38223 (#2222775, #2222780, #2255207) 2024-03-18 20:50:46 +01:00
Fedora Release Engineering
45ffe69c9f Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-27 08:19:21 +00:00
Fedora Release Engineering
c1b531e6fe Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-22 17:56:06 +00:00
15d15eb37b Upload source, too 2023-01-22 22:25:51 +01:00
0d98bdae0e Rebase to latest upstream gitrev 20230121 (#2163003) 2023-01-22 21:26:51 +01:00
Fedora Release Engineering
4689695f21 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-21 06:33:49 +00:00
Jitka Plesnikova
7dc9ecb867 Remove perl(MODULE_COMPAT), it will be replaced by generators 2023-01-13 21:18:22 +01:00
5ec42bd278 Added upstream patch to address CVE-2022-38223 (#2126270) 2022-12-23 17:06:25 +01:00
Fedora Release Engineering
c548308372 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-23 12:10:13 +00:00
Jitka Plesnikova
45c8fc7a4e Perl 5.36 rebuild 2022-05-30 19:58:31 +02:00
3 changed files with 106 additions and 20 deletions

View file

@ -1 +1 @@
SHA512 (w3m-0.5.3+git20220429.tar.gz) = 0f29d6a1f311c3f417ca041fe3788c94946d238b618eca923cd62a6e5e598aefd898fb8a54999876179011bf37d492a989872e38375ea96ac59914b244f1517e
SHA512 (w3m-0.5.3+git20230121.tar.gz) = f220aabf69cf11ca7560c1519a971bdb1cc0baa443b1b46cd8fca2a4defb614653dd9ba637afbf9315f3b63a349f972436348c2f93d06665573057e4232eab1c

View file

@ -0,0 +1,55 @@
From edc602651c506aeeb60544b55534dd1722a340d3 Mon Sep 17 00:00:00 2001
From: Rene Kita <mail@rkta.de>
Date: Thu, 13 Jul 2023 07:50:26 +0200
Subject: [PATCH] Fix OOB access due to multiple backspaces
Commit 419ca82d57 (Fix m17n backspace handling causes out-of-bounds
write in checkType) introduced an incomplete fix.
In function checkType we store the length of the previous multi-char
character in a buffer plens_buffer with pointer plens pointing to the
current position inside the buffer. When encountering a backspace plens
is set to the previous position without a bounds check. This will lead
to plens being out of bounds if we get more backspaces than we have
processed multi-char characters before.
If we are at the beginning of the buffer do not decrement and set plen
(the current length) to 0.
This also fixes GH Issue #270 [BUG] Out of bound read in Strnew_size ,
Str.c:61
If the above explanation does sound weird it's because I didn't fully
grok that function. :-)
---
etc.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/etc.c b/etc.c
index 128717b18..b56615136 100644
--- a/etc.c
+++ b/etc.c
@@ -393,7 +393,10 @@ checkType(Str s, Lineprop **oprop, Linecolor **ocolor)
if (color)
color -= plen;
#endif
- plen = *(--plens);
+ if (plens == plens_buffer)
+ plen = 0;
+ else
+ plen = *(--plens);
str += 2;
}
}
@@ -419,7 +422,10 @@ checkType(Str s, Lineprop **oprop, Linecolor **ocolor)
if (color)
color -= plen;
#endif
- plen = *(--plens);
+ if (plens == plens_buffer)
+ plen = 0;
+ else
+ plen = *(--plens);
str++;
}
#else

View file

@ -1,25 +1,19 @@
# These are the build option passed to ./configure command
%global build_options --enable-m17n --enable-unicode --enable-nls --with-editor=/bin/vi --with-mailer="gnome-open mailto:%s" --with-browser=gnome-open --with-charset=UTF-8 --with-gc --with-termlib=ncurses --enable-nntp --enable-gopher --enable-image=x11,fb --with-imagelib=gtk2 --enable-keymap=w3m
%global gitdate 20220429
%global gitdate 20230121
%{?perl_default_filter}
%global __requires_exclude perl\\(w3mhelp-
Name: w3m
Version: 0.5.3
Release: 55.git%{gitdate}%{?dist}
# UCD is added for EastAsianWidth.txt source
License: MIT and UCD
Release: 69.git%{gitdate}%{?dist}
# Unicode-DFS-2015 is added for EastAsianWidth.txt source
License: MIT AND Unicode-DFS-2015
URL: http://w3m.sourceforge.net/
BuildRequires: ncurses-devel
%if 0%{?fedora} || 0%{?rhel} > 7
BuildRequires: openssl-devel
%else
BuildRequires: openssl11-devel
# -Wnull-dereference requires GCC >= 6
BuildRequires: devtoolset-8-toolchain
%endif
BuildRequires: perl-generators
BuildRequires: pkgconfig
BuildRequires: gettext-devel
@ -33,12 +27,13 @@ BuildRequires: gcc-c++
BuildRequires: make
# This is needed for perl files
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires: perl(NKF)
Source0: https://github.com/tats/%{name}/archive/v%{version}+git%{gitdate}/%{name}-%{version}+git%{gitdate}.tar.gz
Source1: w3mconfig
Patch0: https://github.com/tats/w3m/pull/273/commits/edc602651c506aeeb60544b55534dd1722a340d3.patch#/w3m-0.5.3-fix-oob-access.patch
Summary: Pager with Web browsing abilities
Provides: webclient
Provides: text-www-browser
@ -58,9 +53,7 @@ w3m-img package as well.
%package img
Summary: Helper program to display the inline images for w3m
BuildRequires: gtk2-devel
%if 0%{?fedora} || 0%{?rhel} > 7
BuildRequires: gdk-pixbuf2-xlib-devel
%endif
Requires: ImageMagick
Requires: %{name}%{?_isa} = %{version}-%{release}
@ -73,12 +66,7 @@ linux framebuffer.
%autosetup -n %{name}-%{version}-git%{gitdate} -p1
%build
%if 0%{?rhel} == 7
. /opt/rh/devtoolset-8/enable
export SSL_CFLAGS="$(pkg-config --cflags-only-I openssl11)"
export SSL_LIBS="$(pkg-config --libs-only-L openssl11)"
%endif
export CFLAGS="$CFLAGS -std=gnu17"
%configure %{build_options}
%make_build
@ -110,6 +98,49 @@ rm -f doc*/w3m.1
%{_libexecdir}/w3m/w3mimgdisplay
%changelog
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-69.git20230121
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Sat Jun 13 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 0.5.3-68.git20230121
- Rebuilt for openssl 4.0
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-67.git20230121
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-66.git20230121
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-65.git20230121
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-64.git20230121
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Mon Mar 18 2024 Robert Scheck <robert@fedoraproject.org> - 0.5.3-63.git20230121
- Added upstream patch to fix out-of-bounds access due to multiple backspaces
to address incomplete fix for CVE-2022-38223 (#2222775, #2222780, #2255207)
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-62.git20230121
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-61.git20230121
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sun Jan 22 2023 Robert Scheck <robert@fedoraproject.org> - 0.5.3-60.git20230121
- Rebase to latest upstream gitrev 20230121 (#2163003)
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-59.git20220429
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Fri Dec 23 2022 Robert Scheck <robert@fedoraproject.org> - 0.5.3-58.git20220429
- Added upstream patch to address CVE-2022-38223 (#2126270)
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-57.git20220429
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon May 30 2022 Jitka Plesnikova <jplesnik@redhat.com> - 0.5.3-56.git20220429
- Perl 5.36 rebuild
* Sun May 01 2022 Robert Scheck <robert@fedoraproject.org> - 0.5.3-55.git20220429
- Rebase to latest upstream gitrev 20220429 (#2080136)