[gentoo-commits] repo/gentoo:master commit in: dev-tex/tex4ht/files/, dev-tex/tex4ht/

["Ulrich Müller" <ulm@gentoo.org>]

commit:     448881c0e55667abc563f6b78058ea1a489a24ba
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 24 10:12:20 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 24 10:43:38 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=448881c0

dev-tex/tex4ht: Fix compilation with format-security.

Closes: https://bugs.gentoo.org/554636
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 dev-tex/tex4ht/files/tex4ht-format-security.patch | 22 ++++++++++++++++++++++
 dev-tex/tex4ht/tex4ht-20090611_p1038-r10.ebuild   |  3 ++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/dev-tex/tex4ht/files/tex4ht-format-security.patch b/dev-tex/tex4ht/files/tex4ht-format-security.patch
new file mode 100644
index 00000000000..fde075ce33d
--- /dev/null
+++ b/dev-tex/tex4ht/files/tex4ht-format-security.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/554636
+
+--- a/src/htcmd.c
++++ b/src/htcmd.c
+@@ -418,7 +418,7 @@
+ #undef SEP
+ #endif
+ {  (IGNORED) fprintf(stderr,"--- error --- ");
+-   (IGNORED) fprintf(stderr, warn_err_mssg[n]);
++   (IGNORED) fprintf(stderr, "%s", warn_err_mssg[n]);
+    exit(EXIT_FAILURE);
+ }
+ 
+@@ -439,7 +439,7 @@
+ #undef SEP
+ #endif
+ {  (IGNORED) fprintf(stderr,"--- error --- ");
+-   (IGNORED) fprintf(stderr, warn_err_mssg[n]);
++   (IGNORED) fprintf(stderr, "%s", warn_err_mssg[n]);
+    exit(EXIT_FAILURE);
+ }
+ 

diff --git a/dev-tex/tex4ht/tex4ht-20090611_p1038-r10.ebuild b/dev-tex/tex4ht/tex4ht-20090611_p1038-r10.ebuild
index e3b343dc41e..73b16a84d59 100644
--- a/dev-tex/tex4ht/tex4ht-20090611_p1038-r10.ebuild
+++ b/dev-tex/tex4ht/tex4ht-20090611_p1038-r10.ebuild
@@ -33,10 +33,11 @@ BDEPEND="virtual/pkgconfig
 	java? ( >=virtual/jdk-1.5 )"
 
 S="${WORKDIR}/${MY_P}"
+PATCHES=("${FILESDIR}"/${PN}-format-security.patch)
 
 src_prepare() {
 	cp -a "${WORKDIR}/texmf-dist/"* texmf/ || die
-	eapply_user
+	default
 	cd "${S}/texmf/tex4ht/base/unix" || die
 	sed -i \
 		-e "s#~/tex4ht.dir#${EPREFIX}/usr/share#" \