Gentoo Archives: gentoo-commits

From: Marek Szuba <marecki@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/htmltidy/, app-text/htmltidy/files/
Date: Mon, 04 Oct 2021 12:03:18
Message-Id: 1633348987.945e6972bd0a9ba9f533aa806e8bded164534cb6.marecki@gentoo
1 commit: 945e6972bd0a9ba9f533aa806e8bded164534cb6
2 Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 4 12:01:23 2021 +0000
4 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 4 12:03:07 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=945e6972
7
8 app-text/htmltidy: drop 0.99.0
9
10 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
11
12 app-text/htmltidy/Manifest | 2 -
13 .../files/htmltidy-0.99.0-CVE-2015-5522.patch | 34 ---------
14 .../files/htmltidy-0.99.0-strip-O2-flag.patch | 12 ----
15 .../htmltidy/files/htmltidy-0.99.0-tidyrc.patch | 31 ---------
16 app-text/htmltidy/htmltidy-0.99.0.ebuild | 80 ----------------------
17 5 files changed, 159 deletions(-)
18
19 diff --git a/app-text/htmltidy/Manifest b/app-text/htmltidy/Manifest
20 index bf1af04e9c9..4df9f10537d 100644
21 --- a/app-text/htmltidy/Manifest
22 +++ b/app-text/htmltidy/Manifest
23 @@ -1,3 +1 @@
24 DIST htmltidy-5.8.0.tar.gz 1015303 BLAKE2B e8e48cfdcfffb7c7ac494f71ba709361e21fcbe5cfbd56c29d9d67ffe11fcdc20aa03aace65e6dc5315988dc0dd1fc148be616549f4f84f37928e662633bd7ec SHA512 f352165bdda5d1fca7bba3365560b64d6f70a4e010821cd246cde43bed5c23cea3408d461d3f889110fd35ec9b68aa2b4e95412b07775eb852b7ee1745007a44
25 -DIST tidy-20090325-doc.tar.bz2 13319 BLAKE2B c55c5e10cdfbf0eb62685955cad24f628c21e612bd12c41018c139b3b93db95cc201888f6766d7f68f2d1c4d4cfb2cab25b668eff0d2d241462f4cf9b65e79e1 SHA512 0224d1f839f3829a9c879eba8a98ceee3b0c9f8bfe1721076859714428d534f492acd11e49992fccc2e45afd64d79067793c90f7af06d623ef89e7c16dfee35b
26 -DIST tidy-20090325.tar.bz2 382016 BLAKE2B 3373e94d54cfef866e701e2e258be821b8749dbbbc37b10e4e4e4ba6d7f5995676161ac11bc6a2497f5e02c3907f680fabe9ac6dec2f2365aeb39c03b9697e0a SHA512 daeab2c3dd7f1248a5dbc1585267a8fdb0be09a940b79c3e53c97051f692cf85ea9f0a267f37e1c877054b77efb836d422a1e7ff61b22b383a2d2ac08939b970
27
28 diff --git a/app-text/htmltidy/files/htmltidy-0.99.0-CVE-2015-5522.patch b/app-text/htmltidy/files/htmltidy-0.99.0-CVE-2015-5522.patch
29 deleted file mode 100644
30 index b4d6158ea04..00000000000
31 --- a/app-text/htmltidy/files/htmltidy-0.99.0-CVE-2015-5522.patch
32 +++ /dev/null
33 @@ -1,34 +0,0 @@
34 -From c18f27a58792f7fbd0b30a0ff50d6b40a82f940d Mon Sep 17 00:00:00 2001
35 -From: Geoff McLane <ubuntu@××××××××.info>
36 -Date: Wed, 3 Jun 2015 20:26:03 +0200
37 -Subject: [PATCH] Issue #217 - avoid len going negative, ever...
38 -
39 ----
40 - src/lexer.c | 8 +++++---
41 - 1 file changed, 5 insertions(+), 3 deletions(-)
42 -
43 -diff --git a/src/lexer.c b/src/lexer.c
44 -index 376a3d8..664f806 100644
45 ---- a/src/lexer.c
46 -+++ b/src/lexer.c
47 -@@ -3739,16 +3740,17 @@ static tmbstr ParseValue( TidyDocImpl* doc, ctmbstr name,
48 - /* and prompts attributes unless --literal-attributes is set to yes */
49 - /* #994841 - Whitespace is removed from value attributes */
50 -
51 -- if (munge &&
52 -+ /* Issue #217 - Also only if/while (len > 0) - MUST NEVER GO NEGATIVE! */
53 -+ if ((len > 0) && munge &&
54 - TY_(tmbstrcasecmp)(name, "alt") &&
55 - TY_(tmbstrcasecmp)(name, "title") &&
56 - TY_(tmbstrcasecmp)(name, "value") &&
57 - TY_(tmbstrcasecmp)(name, "prompt"))
58 - {
59 -- while (TY_(IsWhite)(lexer->lexbuf[start+len-1]))
60 -+ while (TY_(IsWhite)(lexer->lexbuf[start+len-1]) && (len > 0))
61 - --len;
62 -
63 -- while (TY_(IsWhite)(lexer->lexbuf[start]) && start < len)
64 -+ while (TY_(IsWhite)(lexer->lexbuf[start]) && (start < len) && (len > 0))
65 - {
66 - ++start;
67 - --len;
68
69 diff --git a/app-text/htmltidy/files/htmltidy-0.99.0-strip-O2-flag.patch b/app-text/htmltidy/files/htmltidy-0.99.0-strip-O2-flag.patch
70 deleted file mode 100644
71 index 4c805cf2226..00000000000
72 --- a/app-text/htmltidy/files/htmltidy-0.99.0-strip-O2-flag.patch
73 +++ /dev/null
74 @@ -1,12 +0,0 @@
75 -diff -urN tidy.old/configure.in tidy-26/configure.in
76 ---- tidy.old/configure.in 2006-02-13 17:17:49.000000000 +0100
77 -+++ tidy-26/configure.in 2006-02-13 17:17:20.000000000 +0100
78 -@@ -72,7 +72,7 @@
79 - if test $debug_build = yes; then
80 - CFLAGS="$save_cflags -g"
81 - else
82 -- CFLAGS="-O2 $save_cflags"
83 -+ CFLAGS="$save_cflags"
84 - fi
85 - #
86 - # =============================================
87
88 diff --git a/app-text/htmltidy/files/htmltidy-0.99.0-tidyrc.patch b/app-text/htmltidy/files/htmltidy-0.99.0-tidyrc.patch
89 deleted file mode 100644
90 index 942a61e1464..00000000000
91 --- a/app-text/htmltidy/files/htmltidy-0.99.0-tidyrc.patch
92 +++ /dev/null
93 @@ -1,31 +0,0 @@
94 -Index: tidy-20090325/include/platform.h
95 -===================================================================
96 ---- tidy-20090325.orig/include/platform.h
97 -+++ tidy-20090325/include/platform.h
98 -@@ -24,7 +24,7 @@ extern "C" {
99 - */
100 -
101 - /* #define TIDY_CONFIG_FILE "/etc/tidy_config.txt" */ /* original */
102 --/* #define TIDY_CONFIG_FILE "/etc/tidyrc" */
103 -+#define TIDY_CONFIG_FILE "/etc/tidyrc"
104 - /* #define TIDY_CONFIG_FILE "/etc/tidy.conf" */
105 -
106 - /*
107 -@@ -33,7 +33,7 @@ extern "C" {
108 - It enables tidy to find config files named ~/.tidyrc if
109 - the HTML_TIDY environment variable is not set.
110 - */
111 --/* #define TIDY_USER_CONFIG_FILE "~/.tidyrc" */
112 -+#define TIDY_USER_CONFIG_FILE "~/.tidyrc"
113 -
114 - /*
115 - Uncomment the following #define if your
116 -@@ -48,7 +48,7 @@ extern "C" {
117 - Contributed by Todd Lewis.
118 - */
119 -
120 --/* #define SUPPORT_GETPWNAM */
121 -+#define SUPPORT_GETPWNAM
122 -
123 -
124 - /* Enable/disable support for Big5 and Shift_JIS character encodings */
125
126 diff --git a/app-text/htmltidy/htmltidy-0.99.0.ebuild b/app-text/htmltidy/htmltidy-0.99.0.ebuild
127 deleted file mode 100644
128 index 8cacda80a2a..00000000000
129 --- a/app-text/htmltidy/htmltidy-0.99.0.ebuild
130 +++ /dev/null
131 @@ -1,80 +0,0 @@
132 -# Copyright 1999-2021 Gentoo Authors
133 -# Distributed under the terms of the GNU General Public License v2
134 -
135 -EAPI=5
136 -
137 -MY_PN="tidy"
138 -MY_PV="20090325"
139 -MY_P="${MY_PN}-${MY_PV}"
140 -
141 -inherit epatch autotools
142 -
143 -DESCRIPTION="Tidy the layout and correct errors in HTML and XML documents"
144 -HOMEPAGE="http://tidy.sourceforge.net/"
145 -SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
146 - mirror://gentoo/${MY_P}-doc.tar.bz2"
147 -
148 -LICENSE="GPL-2"
149 -SLOT="0"
150 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
151 -IUSE="debug doc static-libs"
152 -
153 -DEPEND="doc? ( app-doc/doxygen )"
154 -RDEPEND=""
155 -
156 -S="${WORKDIR}"/${MY_P}
157 -
158 -src_prepare() {
159 - # Required to setup the source dist for autotools
160 - einfo "Setting up autotools for source build"
161 - cp -R ./build/gnuauto/* . || die "could not prepare autotools environment"
162 -
163 - # Stop tidy from appending -O2 to our CFLAGS
164 - epatch "${FILESDIR}"/${P}-strip-O2-flag.patch
165 -
166 - # Define /etc/tidyrc for system wide config, bug 154834
167 - epatch "${FILESDIR}"/${P}-tidyrc.patch
168 -
169 - # Fix security bug 561452
170 - epatch "${FILESDIR}"/${P}-CVE-2015-5522.patch
171 -
172 - eautoreconf
173 -}
174 -
175 -src_compile() {
176 - default
177 -
178 - if use doc ; then
179 - doxygen htmldoc/doxygen.cfg || die "error making apidocs"
180 - fi
181 -}
182 -
183 -src_configure() {
184 - econf \
185 - $(use_enable debug) \
186 - $(use_enable static-libs static)
187 -}
188 -
189 -src_install() {
190 - default
191 -
192 - find "${ED}" -name '*.la' -exec rm -f {} +
193 -
194 - # Now the man page is provided as an xsl file, which
195 - # we can't use until htmltidy is merged.
196 - # I have generated the man page and quickref which is on
197 - # the mirrors. (bug #132429)
198 - doman "${WORKDIR}"/"${MY_P}"-doc/tidy.1
199 -
200 - # Fix name before installing
201 - mv "${WORKDIR}"/"${MY_P}"-doc/quickref-html \
202 - "${WORKDIR}"/"${MY_P}"-doc/quickref.html
203 -
204 - cd "${S}"/htmldoc
205 - # Install basic html documentation
206 - dohtml *.html *.css *.gif "${WORKDIR}"/"${MY_P}"-doc/quickref.html
207 -
208 - # If use 'doc' is set, then we also want to install the
209 - # api documentation
210 - use doc && dohtml -r api
211 -}