From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- dev-util/re2c/Manifest | 5 +-- dev-util/re2c/files/re2c-1.3-lexer-overflow.patch | 40 ----------------------- dev-util/re2c/re2c-1.3-r1.ebuild | 28 ---------------- dev-util/re2c/re2c-2.0.3.ebuild | 2 +- 4 files changed, 2 insertions(+), 73 deletions(-) delete mode 100644 dev-util/re2c/files/re2c-1.3-lexer-overflow.patch delete mode 100644 dev-util/re2c/re2c-1.3-r1.ebuild (limited to 'dev-util/re2c') diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest index 18113c832a29..75f1424b4aaf 100644 --- a/dev-util/re2c/Manifest +++ b/dev-util/re2c/Manifest @@ -1,6 +1,3 @@ -AUX re2c-1.3-lexer-overflow.patch 1244 BLAKE2B d9f51ea520ca437f4a1cb9c9f788d0c5c76d48358ee2c9d8a821c40c53d7df8e34f97cfda0ccd17e4220600043349afb9d737a2444d58ece8d381f1d30807855 SHA512 19a9011c58107c136ef49a51a712125274f841f884ca76c5f2e25464b24c3a6477ff45752df20c5f508e21a2a55c7f4ce19bc6c7d9b7baecc07fced76ce87de1 -DIST re2c-1.3.tar.xz 1239280 BLAKE2B ae2a8fc323408dd31d39c352bd622d89d19178b7993618ea043bbfd32509fb7573d2b5b50663e100d24fc275fa479982cb1f66ed49638edca61f551fb653176d SHA512 c7084ab2399fb6b96cef74c1393715d90830f43b82b96af46feb71ef008c0215381c3dbea0b003ff810d869db6021e28001b9d588ad55c616642244b2da09c0e DIST re2c-2.0.3.tar.xz 1288996 BLAKE2B 76913a79ad9c237843ccbe86dd05db755da19fc89351b64d6ece6a9a8d53860f1cc12493748fca5b7391cddff4f4668295fb2613c257c128870ea2e7163811ed SHA512 893c533e9847a6236d55ae65e413ddc48b7531b89f5552a3ad79beeac079317ceca4c35710f3c2d88a6de5a3c0a5070a24a8cffb1b4277578a41697ea0e3bf8c -EBUILD re2c-1.3-r1.ebuild 772 BLAKE2B 9a1c3ec7e9b1ab137802f9e95003820792cf7da85eca0d9ab46f30afd7d2883ca15ef070691d4364b151247295fea16e702d01fb1209e1346787613491e44a3e SHA512 0e26075418517031ee56bc22909db4968e1c15c1fb8417a510cd43803257c5363ef6c574b3ee9dd34cc6985bd294e0202a6de4164ecc90e080015a3eb1180755 -EBUILD re2c-2.0.3.ebuild 777 BLAKE2B 902099d5c0d1b9ddcf5824c5485a5f1db3bbf458c5054a8985c366b5c932304ff608506470fb2dcbe52574e408e0bd21e5e37ae13af0204e0e14ec6bf1f42978 SHA512 20637a4dd995ca88cc0325706e0b9daf84af791db322eaa71ba445f68ad62be74b78db6ea4c1337600cf23716301dd0280eb2b081eb3317924665c68ff46c437 +EBUILD re2c-2.0.3.ebuild 773 BLAKE2B fcf5a6abb8c8cc2f660f66c8ffde26869b3083ee0e4d194d8f789d123c8dbc9134b3b0fa24f568b27ef08db2043395aeff3e6eb0291587c7e8c4934c50e09da4 SHA512 2f36266f0db7c19e75bf10ac7c92a0da6568b64db782afe13cee0852fed1733b7e66d0189ed4eb8cabe7449c3f91b83144c648e52df39569b0c1f450bff12d8c MISC metadata.xml 476 BLAKE2B b2dad245e1cdcbb73e8b6e53442f7e9ec41337746c50f026c0fda68d57ebe10fb6193a26fcf9fca11e23570f44b104bd40d22fa1283fa91034f7cb792d436463 SHA512 e3018ee81606a018d66169cd142a17a34248587b77deb4baeb6daae6aca2d9a70095fb5dc2180d146043030631172f6fa17b3c8ddd5bebe85eebf6f3be79f9ab diff --git a/dev-util/re2c/files/re2c-1.3-lexer-overflow.patch b/dev-util/re2c/files/re2c-1.3-lexer-overflow.patch deleted file mode 100644 index 4222ef430c32..000000000000 --- a/dev-util/re2c/files/re2c-1.3-lexer-overflow.patch +++ /dev/null @@ -1,40 +0,0 @@ -https://bugs.gentoo.org/718350 - -From c4603ba5ce229db83a2a4fb93e6d4b4e3ec3776a Mon Sep 17 00:00:00 2001 -From: Ulya Trofimovich -Date: Fri, 17 Apr 2020 22:47:14 +0100 -Subject: [PATCH] Fix crash in lexer refill (reported by Agostino Sarubbo). - -The crash happened in a rare case of a very long lexeme that doen't fit -into the buffer, forcing buffer reallocation. - -The crash was caused by an incorrect calculation of the shift offset -(it was smaller than necessary). As a consequence, the data from buffer -start and up to the beginning of the current lexeme was not discarded -(as it should have been), resulting in less free space for new data than -expected. ---- - src/parse/scanner.cc | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/src/parse/scanner.cc -+++ b/src/parse/scanner.cc -@@ -155,13 +155,14 @@ bool Scanner::fill(size_t need) - if (!buf) fatal("out of memory"); - - memmove(buf, tok, copy); -- shift_ptrs_and_fpos(buf - bot); -+ shift_ptrs_and_fpos(buf - tok); - delete [] bot; - bot = buf; - - free = BSIZE - copy; - } - -+ DASSERT(lim + free <= bot + BSIZE); - if (!read(free)) { - eof = lim; - memset(lim, 0, YYMAXFILL); --- -2.26.1 - diff --git a/dev-util/re2c/re2c-1.3-r1.ebuild b/dev-util/re2c/re2c-1.3-r1.ebuild deleted file mode 100644 index d90e052b5214..000000000000 --- a/dev-util/re2c/re2c-1.3-r1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="tool for generating C-based recognizers from regular expressions" -HOMEPAGE="http://re2c.org/" -SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.xz" - -LICENSE="public-domain" -SLOT="0" -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" -IUSE="debug" - -PATCHES=("${FILESDIR}"/${P}-lexer-overflow.patch) - -src_configure() { - econf \ - ac_cv_path_BISON="no" \ - $(use_enable debug) -} - -src_install() { - default - - docompress -x /usr/share/doc/${PF}/examples - dodoc -r README.md CHANGELOG examples -} diff --git a/dev-util/re2c/re2c-2.0.3.ebuild b/dev-util/re2c/re2c-2.0.3.ebuild index d421fae7440c..aba4c616a4d6 100644 --- a/dev-util/re2c/re2c-2.0.3.ebuild +++ b/dev-util/re2c/re2c-2.0.3.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.xz" LICENSE="public-domain" SLOT="0" -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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="debug" src_configure() { -- cgit v1.2.3