* [gentoo-commits] repo/gentoo:master commit in: app-text/convertlit/, app-text/convertlit/files/
@ 2016-08-02 14:46 Michael Orlitzky
0 siblings, 0 replies; 3+ messages in thread
From: Michael Orlitzky @ 2016-08-02 14:46 UTC (permalink / raw
To: gentoo-commits
commit: ece7f4be67e6d3cd3c75bee6ca1db73b12efd232
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 2 14:43:37 2016 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Aug 2 14:43:53 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ece7f4be
app-text/convertlit: new revision fixing -Wformat-security warnings.
Gentoo-Bug: 521246
Package-Manager: portage-2.2.28
app-text/convertlit/convertlit-1.8-r2.ebuild | 44 ++++++++++++++++++++++
.../files/convertlit-1.8-respectflags-r1.patch | 28 ++++++++++++++
.../files/fix-Wformat-security-warnings.patch | 34 +++++++++++++++++
3 files changed, 106 insertions(+)
diff --git a/app-text/convertlit/convertlit-1.8-r2.ebuild b/app-text/convertlit/convertlit-1.8-r2.ebuild
new file mode 100644
index 0000000..29ada51
--- /dev/null
+++ b/app-text/convertlit/convertlit-1.8-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs
+
+MY_P="clit${PV//./}"
+
+DESCRIPTION="CLit converts MS ebook .lit files to .opf (xml+html+png+jpg)"
+HOMEPAGE="http://www.convertlit.com/"
+SRC_URI="http://www.convertlit.com/${MY_P}src.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND=">=dev-libs/libtommath-0.36-r1"
+
+DEPEND="${RDEPEND}
+ app-arch/unzip"
+
+S="${WORKDIR}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-respectflags-r1.patch"
+ "${FILESDIR}/fix-Wformat-security-warnings.patch"
+)
+
+src_compile() {
+ tc-export CC
+
+ cd "${S}/lib" || die "failed to change into ${S}/lib directory"
+ emake
+ cd "${S}/${MY_P}" || die "failed to change into ${S}/${MY_P} directory"
+ emake
+}
+
+src_install() {
+ einstalldocs
+ dobin "${MY_P}/clit"
+}
diff --git a/app-text/convertlit/files/convertlit-1.8-respectflags-r1.patch b/app-text/convertlit/files/convertlit-1.8-respectflags-r1.patch
new file mode 100644
index 0000000..faedfa0
--- /dev/null
+++ b/app-text/convertlit/files/convertlit-1.8-respectflags-r1.patch
@@ -0,0 +1,28 @@
+Index: clit18/Makefile
+===================================================================
+--- a/clit18/Makefile
++++ b/clit18/Makefile
+@@ -1,9 +1,9 @@
+ all: clit
+
+-CFLAGS=-funsigned-char -Wall -O2 -I ../libtommath-0.30/ -I ../lib -I ../lib/des -I .
++CFLAGS+=-funsigned-char -I ../lib -I ../lib/des -I .
+ clean:
+ rm -f *.o clit
+
+ clit: clit.o hexdump.o drm5.o explode.o transmute.o display.o utils.o manifest.o ../lib/openclit.a
+- gcc -o clit $^ ../libtommath-0.30/libtommath.a
++ $(CC) $(LDFLAGS) -o clit $^ -ltommath
+
+Index: lib/Makefile
+===================================================================
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -1,6 +1,6 @@
+ all: openclit.a
+
+-CFLAGS=-O3 -Wall -Ides -Isha -Inewlzx -I.
++CFLAGS+=-Ides -Isha -Inewlzx -I.
+ clean:
+ rm -f *.o openclit.a des/*.o lzx/*.o sha/*.o
+
diff --git a/app-text/convertlit/files/fix-Wformat-security-warnings.patch b/app-text/convertlit/files/fix-Wformat-security-warnings.patch
new file mode 100644
index 0000000..78410a9
--- /dev/null
+++ b/app-text/convertlit/files/fix-Wformat-security-warnings.patch
@@ -0,0 +1,34 @@
+From 79ab07db8d91b6c6e0c36358c8030893c28510ba Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Tue, 2 Aug 2016 10:32:53 -0400
+Subject: [PATCH 1/1] clit.c: fix -Wformat-security warnings.
+
+Two uses of printf() in clit.c were triggering -Wformat-security
+warnings due to a missing "%s" format string. This was causing
+compilation to fail with -Werror=format-security, so they have
+been fixed.
+
+Gentoo-Bug: 521246
+---
+ clit18/clit.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/clit18/clit.c b/clit18/clit.c
+index c13a75d..48b749f 100644
+--- a/clit18/clit.c
++++ b/clit18/clit.c
+@@ -125,9 +125,9 @@ int main(int argc, char ** argv)
+ dir_program[i+1] = '\0'; break;
+ }
+ }
+- printf(sTitle);
++ printf("%s", sTitle);
+ if (argc < 3) {
+- printf(sUsage);
++ printf("%s", sUsage);
+ return -1;
+ }
+ base = 1;
+--
+2.7.3
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/convertlit/, app-text/convertlit/files/
@ 2016-08-30 1:20 Michael Orlitzky
0 siblings, 0 replies; 3+ messages in thread
From: Michael Orlitzky @ 2016-08-30 1:20 UTC (permalink / raw
To: gentoo-commits
commit: 5e2e67e846e51ab61001df89d3d9233f9f2d7231
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 01:18:18 2016 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 01:18:18 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e2e67e8
app-text/convertlit: new revision supporting $(AR).
This new revision adds a trivial patch replacing "ar" in one of the
Makefiles with $(AR), which defaults to "ar" anyway.
Gentoo-Bug: 571874
Package-Manager: portage-2.2.28
.../{convertlit-1.8-r2.ebuild => convertlit-1.8-r3.ebuild} | 1 +
app-text/convertlit/files/support-ar-variable.patch | 11 +++++++++++
2 files changed, 12 insertions(+)
diff --git a/app-text/convertlit/convertlit-1.8-r2.ebuild b/app-text/convertlit/convertlit-1.8-r3.ebuild
similarity index 95%
rename from app-text/convertlit/convertlit-1.8-r2.ebuild
rename to app-text/convertlit/convertlit-1.8-r3.ebuild
index 29ada51..e984d02 100644
--- a/app-text/convertlit/convertlit-1.8-r2.ebuild
+++ b/app-text/convertlit/convertlit-1.8-r3.ebuild
@@ -27,6 +27,7 @@ S="${WORKDIR}"
PATCHES=(
"${FILESDIR}/${P}-respectflags-r1.patch"
"${FILESDIR}/fix-Wformat-security-warnings.patch"
+ "${FILESDIR}/support-ar-variable.patch"
)
src_compile() {
diff --git a/app-text/convertlit/files/support-ar-variable.patch b/app-text/convertlit/files/support-ar-variable.patch
new file mode 100644
index 00000000..4bd3e82
--- /dev/null
+++ b/app-text/convertlit/files/support-ar-variable.patch
@@ -0,0 +1,11 @@
+diff --git a/lib/Makefile b/lib/Makefile
+index 9104f27..0c8b197 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -6,5 +6,5 @@ clean:
+
+ openclit.a: litatom.o litdrm.o litlib.o litembiggen.o littags.o litmetatags.o litmanifest.o litdirectory.o litsections.o litheaders.o litutil.o sha/mssha1.o des/des.o newlzx/lzxglue.o newlzx/lzxd.o
+ -rm -f openclit.a
+- ar rv openclit.a $^
++ $(AR) rv openclit.a $^
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/convertlit/, app-text/convertlit/files/
@ 2022-10-06 1:46 Ionen Wolkens
0 siblings, 0 replies; 3+ messages in thread
From: Ionen Wolkens @ 2022-10-06 1:46 UTC (permalink / raw
To: gentoo-commits
commit: 5e40797ab258028edcec122eef526fd7f5e7cbe5
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 6 01:44:00 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Oct 6 01:45:43 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e40797a
app-text/convertlit: fix build with upcoming clang16
(revbumped in previous commit at same time for other compilers)
Closes: https://bugs.gentoo.org/870946
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
app-text/convertlit/convertlit-1.8-r4.ebuild | 1 +
.../convertlit/files/convertlit-1.8-clang16.patch | 49 ++++++++++++++++++++++
2 files changed, 50 insertions(+)
diff --git a/app-text/convertlit/convertlit-1.8-r4.ebuild b/app-text/convertlit/convertlit-1.8-r4.ebuild
index 2f2dc3f48f30..552a931c5197 100644
--- a/app-text/convertlit/convertlit-1.8-r4.ebuild
+++ b/app-text/convertlit/convertlit-1.8-r4.ebuild
@@ -24,6 +24,7 @@ PATCHES=(
"${FILESDIR}"/${P}-respectflags-r1.patch
"${FILESDIR}"/fix-Wformat-security-warnings.patch
"${FILESDIR}"/support-ar-variable.patch
+ "${FILESDIR}"/${P}-clang16.patch
)
src_compile() {
diff --git a/app-text/convertlit/files/convertlit-1.8-clang16.patch b/app-text/convertlit/files/convertlit-1.8-clang16.patch
new file mode 100644
index 000000000000..13d5786c13f9
--- /dev/null
+++ b/app-text/convertlit/files/convertlit-1.8-clang16.patch
@@ -0,0 +1,49 @@
+https://bugs.gentoo.org/870946
+--- a/clit18/display.c
++++ b/clit18/display.c
+@@ -24,2 +24,3 @@
+ #include <stdlib.h>
++#include <string.h>
+ #include "litlib.h"
+--- a/clit18/drm5.c
++++ b/clit18/drm5.c
+@@ -32,2 +32,3 @@
+ #include <string.h>
++#include <ctype.h>
+ #include <assert.h>
+--- a/clit18/explode.c
++++ b/clit18/explode.c
+@@ -26,2 +26,3 @@
+ #include <string.h>
++#include <sys/stat.h>
+ #include "clit.h"
+--- a/clit18/hexdump.c
++++ b/clit18/hexdump.c
+@@ -18,2 +18,3 @@
+ #include <stdlib.h>
++#include <string.h>
+
+--- a/clit18/manifest.c
++++ b/clit18/manifest.c
+@@ -25,2 +25,3 @@
+ #include <stdlib.h>
++#include <string.h>
+ #include "litlib.h"
+--- a/clit18/transmute.c
++++ b/clit18/transmute.c
+@@ -24,2 +24,3 @@
+ #include <stdlib.h>
++#include <string.h>
+ #include "litlib.h"
+--- a/lib/litsections.c
++++ b/lib/litsections.c
+@@ -33,2 +33,3 @@
+ #include "litinternal.h"
++#include "lzx/lzx.h"
+ #include "lzx.h"
+--- a/lib/newlzx/lzxglue.c
++++ b/lib/newlzx/lzxglue.c
+@@ -30,2 +30,3 @@
+ #include <stdlib.h>
++#include <string.h>
+ #include "litlib.h"
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-10-06 1:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-02 14:46 [gentoo-commits] repo/gentoo:master commit in: app-text/convertlit/, app-text/convertlit/files/ Michael Orlitzky
-- strict thread matches above, loose matches on Subject: below --
2016-08-30 1:20 Michael Orlitzky
2022-10-06 1:46 Ionen Wolkens
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox