Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-tex/tex4ht/files/, dev-tex/tex4ht/
Date: Tue, 30 Jun 2020 07:43:13
Message-Id: 1593502924.8cd24f5270cf032aeb4b5310298762996e8bbc08.ulm@gentoo
1 commit: 8cd24f5270cf032aeb4b5310298762996e8bbc08
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jun 30 07:42:04 2020 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 30 07:42:04 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cd24f52
7
8 dev-tex/tex4ht: Do not install the htcmd binary.
9
10 Bug: https://puszcza.gnu.org.ua/bugs/?472#comment2
11 Package-Manager: Portage-2.3.103, Repoman-2.3.23
12 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
13
14 dev-tex/tex4ht/files/tex4ht-format-security.patch | 22 ----------------------
15 ...r10.ebuild => tex4ht-20090611_p1038-r11.ebuild} | 5 ++---
16 2 files changed, 2 insertions(+), 25 deletions(-)
17
18 diff --git a/dev-tex/tex4ht/files/tex4ht-format-security.patch b/dev-tex/tex4ht/files/tex4ht-format-security.patch
19 deleted file mode 100644
20 index fde075ce33d..00000000000
21 --- a/dev-tex/tex4ht/files/tex4ht-format-security.patch
22 +++ /dev/null
23 @@ -1,22 +0,0 @@
24 -https://bugs.gentoo.org/554636
25 -
26 ---- a/src/htcmd.c
27 -+++ b/src/htcmd.c
28 -@@ -418,7 +418,7 @@
29 - #undef SEP
30 - #endif
31 - { (IGNORED) fprintf(stderr,"--- error --- ");
32 -- (IGNORED) fprintf(stderr, warn_err_mssg[n]);
33 -+ (IGNORED) fprintf(stderr, "%s", warn_err_mssg[n]);
34 - exit(EXIT_FAILURE);
35 - }
36 -
37 -@@ -439,7 +439,7 @@
38 - #undef SEP
39 - #endif
40 - { (IGNORED) fprintf(stderr,"--- error --- ");
41 -- (IGNORED) fprintf(stderr, warn_err_mssg[n]);
42 -+ (IGNORED) fprintf(stderr, "%s", warn_err_mssg[n]);
43 - exit(EXIT_FAILURE);
44 - }
45 -
46
47 diff --git a/dev-tex/tex4ht/tex4ht-20090611_p1038-r10.ebuild b/dev-tex/tex4ht/tex4ht-20090611_p1038-r11.ebuild
48 similarity index 96%
49 rename from dev-tex/tex4ht/tex4ht-20090611_p1038-r10.ebuild
50 rename to dev-tex/tex4ht/tex4ht-20090611_p1038-r11.ebuild
51 index b74f2800061..1249e8194ee 100644
52 --- a/dev-tex/tex4ht/tex4ht-20090611_p1038-r10.ebuild
53 +++ b/dev-tex/tex4ht/tex4ht-20090611_p1038-r11.ebuild
54 @@ -33,7 +33,6 @@ BDEPEND="virtual/pkgconfig
55 java? ( >=virtual/jdk-1.5 )"
56
57 S="${WORKDIR}/${MY_P}"
58 -PATCHES=("${FILESDIR}"/${PN}-format-security.patch)
59
60 src_prepare() {
61 cp -a "${WORKDIR}/texmf-dist/"* texmf/ || die
62 @@ -57,7 +56,7 @@ src_compile() {
63
64 cd "${S}/src" || die
65 einfo "Compiling postprocessor sources..."
66 - for f in tex4ht t4ht htcmd ; do
67 + for f in tex4ht t4ht; do
68 $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o $f $f.c \
69 -DENVFILE="\"${EPREFIX}${TEXMF}/tex4ht/base/tex4ht.env\"" \
70 -DHAVE_DIRENT_H -DKPATHSEA -lkpathsea \
71 @@ -75,7 +74,7 @@ src_compile() {
72
73 src_install() {
74 # install the binaries
75 - dobin "${S}/src/tex4ht" "${S}/src/t4ht" "${S}/src/htcmd"
76 + dobin "${S}/src/tex4ht" "${S}/src/t4ht"
77 # install the scripts
78 if ! use java; then
79 rm -f "${S}"/bin/unix/oo*