Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/re2c/files/, dev-util/re2c/
Date: Sat, 10 Oct 2020 08:32:06
Message-Id: 1602318258.1833d6912b2b2d5c83e43ff17ae99c2bbc1d135a.slyfox@gentoo
1 commit: 1833d6912b2b2d5c83e43ff17ae99c2bbc1d135a
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 10 08:24:18 2020 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 10 08:24:18 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1833d691
7
8 dev-util/re2c: drop old
9
10 Package-Manager: Portage-3.0.8, Repoman-3.0.1
11 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
12
13 dev-util/re2c/Manifest | 1 -
14 dev-util/re2c/files/re2c-1.3-lexer-overflow.patch | 40 -----------------------
15 dev-util/re2c/re2c-1.3-r1.ebuild | 28 ----------------
16 3 files changed, 69 deletions(-)
17
18 diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest
19 index 73bb5e2abd5..59708a0ee97 100644
20 --- a/dev-util/re2c/Manifest
21 +++ b/dev-util/re2c/Manifest
22 @@ -1,2 +1 @@
23 -DIST re2c-1.3.tar.xz 1239280 BLAKE2B ae2a8fc323408dd31d39c352bd622d89d19178b7993618ea043bbfd32509fb7573d2b5b50663e100d24fc275fa479982cb1f66ed49638edca61f551fb653176d SHA512 c7084ab2399fb6b96cef74c1393715d90830f43b82b96af46feb71ef008c0215381c3dbea0b003ff810d869db6021e28001b9d588ad55c616642244b2da09c0e
24 DIST re2c-2.0.3.tar.xz 1288996 BLAKE2B 76913a79ad9c237843ccbe86dd05db755da19fc89351b64d6ece6a9a8d53860f1cc12493748fca5b7391cddff4f4668295fb2613c257c128870ea2e7163811ed SHA512 893c533e9847a6236d55ae65e413ddc48b7531b89f5552a3ad79beeac079317ceca4c35710f3c2d88a6de5a3c0a5070a24a8cffb1b4277578a41697ea0e3bf8c
25
26 diff --git a/dev-util/re2c/files/re2c-1.3-lexer-overflow.patch b/dev-util/re2c/files/re2c-1.3-lexer-overflow.patch
27 deleted file mode 100644
28 index 4222ef430c3..00000000000
29 --- a/dev-util/re2c/files/re2c-1.3-lexer-overflow.patch
30 +++ /dev/null
31 @@ -1,40 +0,0 @@
32 -https://bugs.gentoo.org/718350
33 -
34 -From c4603ba5ce229db83a2a4fb93e6d4b4e3ec3776a Mon Sep 17 00:00:00 2001
35 -From: Ulya Trofimovich <skvadrik@×××××.com>
36 -Date: Fri, 17 Apr 2020 22:47:14 +0100
37 -Subject: [PATCH] Fix crash in lexer refill (reported by Agostino Sarubbo).
38 -
39 -The crash happened in a rare case of a very long lexeme that doen't fit
40 -into the buffer, forcing buffer reallocation.
41 -
42 -The crash was caused by an incorrect calculation of the shift offset
43 -(it was smaller than necessary). As a consequence, the data from buffer
44 -start and up to the beginning of the current lexeme was not discarded
45 -(as it should have been), resulting in less free space for new data than
46 -expected.
47 ----
48 - src/parse/scanner.cc | 3 ++-
49 - 1 file changed, 2 insertions(+), 1 deletion(-)
50 -
51 ---- a/src/parse/scanner.cc
52 -+++ b/src/parse/scanner.cc
53 -@@ -155,13 +155,14 @@ bool Scanner::fill(size_t need)
54 - if (!buf) fatal("out of memory");
55 -
56 - memmove(buf, tok, copy);
57 -- shift_ptrs_and_fpos(buf - bot);
58 -+ shift_ptrs_and_fpos(buf - tok);
59 - delete [] bot;
60 - bot = buf;
61 -
62 - free = BSIZE - copy;
63 - }
64 -
65 -+ DASSERT(lim + free <= bot + BSIZE);
66 - if (!read(free)) {
67 - eof = lim;
68 - memset(lim, 0, YYMAXFILL);
69 ---
70 -2.26.1
71 -
72
73 diff --git a/dev-util/re2c/re2c-1.3-r1.ebuild b/dev-util/re2c/re2c-1.3-r1.ebuild
74 deleted file mode 100644
75 index d90e052b521..00000000000
76 --- a/dev-util/re2c/re2c-1.3-r1.ebuild
77 +++ /dev/null
78 @@ -1,28 +0,0 @@
79 -# Copyright 1999-2020 Gentoo Authors
80 -# Distributed under the terms of the GNU General Public License v2
81 -
82 -EAPI=7
83 -
84 -DESCRIPTION="tool for generating C-based recognizers from regular expressions"
85 -HOMEPAGE="http://re2c.org/"
86 -SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.xz"
87 -
88 -LICENSE="public-domain"
89 -SLOT="0"
90 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
91 -IUSE="debug"
92 -
93 -PATCHES=("${FILESDIR}"/${P}-lexer-overflow.patch)
94 -
95 -src_configure() {
96 - econf \
97 - ac_cv_path_BISON="no" \
98 - $(use_enable debug)
99 -}
100 -
101 -src_install() {
102 - default
103 -
104 - docompress -x /usr/share/doc/${PF}/examples
105 - dodoc -r README.md CHANGELOG examples
106 -}