* [gentoo-commits] repo/gentoo:master commit in: dev-util/re2c/files/, dev-util/re2c/
@ 2020-10-10 8:32 Sergei Trofimovich
0 siblings, 0 replies; 2+ messages in thread
From: Sergei Trofimovich @ 2020-10-10 8:32 UTC (permalink / raw
To: gentoo-commits
commit: 1833d6912b2b2d5c83e43ff17ae99c2bbc1d135a
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 10 08:24:18 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Oct 10 08:24:18 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1833d691
dev-util/re2c: drop old
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
dev-util/re2c/Manifest | 1 -
dev-util/re2c/files/re2c-1.3-lexer-overflow.patch | 40 -----------------------
dev-util/re2c/re2c-1.3-r1.ebuild | 28 ----------------
3 files changed, 69 deletions(-)
diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest
index 73bb5e2abd5..59708a0ee97 100644
--- a/dev-util/re2c/Manifest
+++ b/dev-util/re2c/Manifest
@@ -1,2 +1 @@
-DIST re2c-1.3.tar.xz 1239280 BLAKE2B ae2a8fc323408dd31d39c352bd622d89d19178b7993618ea043bbfd32509fb7573d2b5b50663e100d24fc275fa479982cb1f66ed49638edca61f551fb653176d SHA512 c7084ab2399fb6b96cef74c1393715d90830f43b82b96af46feb71ef008c0215381c3dbea0b003ff810d869db6021e28001b9d588ad55c616642244b2da09c0e
DIST re2c-2.0.3.tar.xz 1288996 BLAKE2B 76913a79ad9c237843ccbe86dd05db755da19fc89351b64d6ece6a9a8d53860f1cc12493748fca5b7391cddff4f4668295fb2613c257c128870ea2e7163811ed SHA512 893c533e9847a6236d55ae65e413ddc48b7531b89f5552a3ad79beeac079317ceca4c35710f3c2d88a6de5a3c0a5070a24a8cffb1b4277578a41697ea0e3bf8c
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 4222ef430c3..00000000000
--- 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 <skvadrik@gmail.com>
-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 d90e052b521..00000000000
--- 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
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/re2c/files/, dev-util/re2c/
@ 2021-03-30 7:37 Sergei Trofimovich
0 siblings, 0 replies; 2+ messages in thread
From: Sergei Trofimovich @ 2021-03-30 7:37 UTC (permalink / raw
To: gentoo-commits
commit: f046a2ab06555b7cdfd47f03cf12337b18effa5e
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 30 07:36:38 2021 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Mar 30 07:37:01 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f046a2ab
dev-util/re2c: tweak ./configure for dash
Matt noticed errors when running ./configure on dash:
./configure: 5339: test: x: unexpected operator
./configure: 5386: test: x: unexpected operator
The change is to use POSIX '=' comparison instead of bash-specific ==.
Patch-by: Matt Whitlock
Bug: https://bugs.gentoo.org/779187
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
dev-util/re2c/files/re2c-2.1.1-sh.patch | 48 +++++++++++++++++++++++++++++++++
dev-util/re2c/re2c-2.1.1-r1.ebuild | 29 ++++++++++++++++++++
2 files changed, 77 insertions(+)
diff --git a/dev-util/re2c/files/re2c-2.1.1-sh.patch b/dev-util/re2c/files/re2c-2.1.1-sh.patch
new file mode 100644
index 00000000000..7caa5d7d1a0
--- /dev/null
+++ b/dev-util/re2c/files/re2c-2.1.1-sh.patch
@@ -0,0 +1,48 @@
+Matt noticed errors when running ./configure on dash:
+ ./configure: 5339: test: x: unexpected operator
+ ./configure: 5386: test: x: unexpected operator
+
+The change is to use POSIX '=' comparison instead of bash-specific ==.
+
+Patch-by: Matt Whitlock
+https://bugs.gentoo.org/779187
+--- a/configure.ac 2021-03-27 18:25:24.000000000 +0000
++++ b/configure.ac 2021-03-30 01:34:01.993467424 +0000
+@@ -65,7 +65,7 @@
+ # --enable-benchmarks
+ AC_ARG_ENABLE([benchmarks], [AS_HELP_STRING([--enable-benchmarks],
+ [build benchmarks])])
+-AM_CONDITIONAL([WITH_BENCHMARKS], [test "x$enable_benchmarks" == "xyes"])
++AM_CONDITIONAL([WITH_BENCHMARKS], [test "x$enable_benchmarks" = "xyes"])
+ AM_COND_IF([WITH_BENCHMARKS], [
+ AC_LANG_PUSH([C++])
+ AC_CHECK_HEADERS([benchmark/benchmark.h], [],
+@@ -79,7 +79,7 @@
+ [AS_HELP_STRING([--enable-benchmarks-regenerate],
+ [regenerate C code for benchmarks])])
+ AM_CONDITIONAL([REGEN_BENCHMARKS],
+- [test "x$enable_benchmarks_regenerate" == "xyes"])
++ [test "x$enable_benchmarks_regenerate" = "xyes"])
+
+
+ # checks for programs
+--- a/configure
++++ b/configure
+@@ -5336,7 +5336,7 @@ if test "${enable_benchmarks+set}" = set; then :
+ enableval=$enable_benchmarks;
+ fi
+
+- if test "x$enable_benchmarks" == "xyes"; then
++ if test "x$enable_benchmarks" = "xyes"; then
+ WITH_BENCHMARKS_TRUE=
+ WITH_BENCHMARKS_FALSE='#'
+ else
+@@ -5383,7 +5383,7 @@ if test "${enable_benchmarks_regenerate+set}" = set; then :
+ enableval=$enable_benchmarks_regenerate;
+ fi
+
+- if test "x$enable_benchmarks_regenerate" == "xyes"; then
++ if test "x$enable_benchmarks_regenerate" = "xyes"; then
+ REGEN_BENCHMARKS_TRUE=
+ REGEN_BENCHMARKS_FALSE='#'
+ else
diff --git a/dev-util/re2c/re2c-2.1.1-r1.ebuild b/dev-util/re2c/re2c-2.1.1-r1.ebuild
new file mode 100644
index 00000000000..76f85099676
--- /dev/null
+++ b/dev-util/re2c/re2c-2.1.1-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug"
+
+PATCHES=("${FILESDIR}"/${P}-sh.patch)
+
+src_configure() {
+ econf \
+ --enable-golang \
+ ac_cv_path_BISON="no" \
+ $(use_enable debug)
+}
+
+src_install() {
+ default
+
+ docompress -x /usr/share/doc/${PF}/examples
+ dodoc -r README.md CHANGELOG examples
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-03-30 7:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-30 7:37 [gentoo-commits] repo/gentoo:master commit in: dev-util/re2c/files/, dev-util/re2c/ Sergei Trofimovich
-- strict thread matches above, loose matches on Subject: below --
2020-10-10 8:32 Sergei Trofimovich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox