[gentoo-commits] repo/gentoo:master commit in: app-text/wv/files/, app-text/wv/

[David Seifert]

commit: 18230444f274cd1f4d0c004d33b5004995e95d93
Author: David Seifert  gentoo  org>
AuthorDate: Sun Oct  2 19:56:54 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Oct  2 19:56:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18230444

app-text/wv: fix missing C99 prototypes

Closes: https://bugs.gentoo.org/871066
Signed-off-by: David Seifert  gentoo.org>

 app-text/wv/files/wv-1.2.9-C99-decls.patch | 101 +
 app-text/wv/wv-1.2.9-r3.ebuild |   5 +-
 2 files changed, 105 insertions(+), 1 deletion(-)

diff --git a/app-text/wv/files/wv-1.2.9-C99-decls.patch 
b/app-text/wv/files/wv-1.2.9-C99-decls.patch
new file mode 100644
index ..b200055cf5b8
--- /dev/null
+++ b/app-text/wv/files/wv-1.2.9-C99-decls.patch
@@ -0,0 +1,101 @@
+--- a/field.c
 b/field.c
+@@ -25,6 +25,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ 
+ #include "wv.h"
+--- a/md5.c
 b/md5.c
+@@ -57,7 +57,7 @@
+ #include "md5.h"
+ 
+ /* forward declaration */
+-static void Transform ();
++static void Transform (UINT4 *buf, UINT4 *in);
+ 
+ static unsigned char PADDING[64] = {
+ 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+@@ -103,8 +103,7 @@
+   }
+ 
+ void
+-wvMD5Init (mdContext)
+- wvMD5_CTX *mdContext;
++wvMD5Init (wvMD5_CTX *mdContext)
+ {
+ mdContext->i[0] = mdContext->i[1] = (UINT4) 0;
+ 
+@@ -117,10 +116,7 @@
+ }
+ 
+ void
+-wvMD5Update (mdContext, inBuf, inLen)
+- wvMD5_CTX *mdContext;
+- unsigned char *inBuf;
+- unsigned int inLen;
++wvMD5Update (wvMD5_CTX *mdContext, unsigned char *inBuf, unsigned int inLen)
+ {
+ UINT4 in[16];
+ int mdi;
+@@ -155,8 +151,7 @@
+ }
+ 
+ void
+-wvMD5Final (mdContext)
+- wvMD5_CTX *mdContext;
++wvMD5Final (wvMD5_CTX *mdContext)
+ {
+ UINT4 in[16];
+ int mdi;
+@@ -198,9 +193,7 @@
+ /* Basic MD5 step. Transform buf based on in.
+  */
+ static void
+-Transform (buf, in)
+- UINT4 *buf;
+- UINT4 *in;
++Transform (UINT4 *buf, UINT4 *in)
+ {
+ UINT4 a = buf[0], b = buf[1], c = buf[2], d = buf[3];
+ 
+--- a/md5.h
 b/md5.h
+@@ -48,9 +48,9 @@
+ unsigned char digest[16]; /* actual digest after MD5Final call */
+ } wvMD5_CTX;
+ 
+-void wvMD5Init ();
+-void wvMD5Update ();
+-void wvMD5Final ();
++void wvMD5Init (wvMD5_CTX *mdContext);
++void wvMD5Update (wvMD5_CTX *mdContext, unsigned char *inBuf, unsigned int 
inLen);
++void wvMD5Final (wvMD5_CTX *mdContext);
+ 
+ /*
+  **
+--- a/wvConfig.c
 b/wvConfig.c
+@@ -24,6 +24,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include "wv.h"
+--- a/wvparse.c
 b/wvparse.c
+@@ -35,6 +35,9 @@
+ #include 
+ #include 
+ 
++int wvOLEDecode_gsf (wvParseStruct * ps, GsfInput *path, wvStream ** mainfd, 
wvStream ** tablefd0,
++  wvStream ** tablefd1, wvStream ** data, wvStream ** summary);
++
+ int
+ wvInit (void)
+ {

diff --git a/app-text/wv/wv-1.2.9-r3.ebuild b/app-text/wv/wv-1.2.9-r3.ebuild
index 4876a095e7fd..cf99d1c2a144 100644
--- a/app-text/wv/wv-1.2.9-r3.ebuild
+++ b/app-text/wv/wv-1.2.9-r3.ebuild
@@ -28,7 +28,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}"/${P}-format-security.patch )
+PATCHES=(
+   "${FILESDIR}"/${P}-format-security.patch
+   "${FILESDIR}"/${P}-C99-decls.patch
+)
 
 src_prepare() {
default

[gentoo-commits] repo/gentoo:master commit in: app-text/wv/files/, app-text/wv/

[Pacho Ramos]

commit: f45759d228b0c96c7a5a238694394893cf490b8b
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Sep 17 11:28:16 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Sep 17 11:28:16 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f45759d2

app-text/wv: Don't build static libs, drop .la files, eapi bump, clean ebuild a 
bit and fix dependencies

Package-Manager: portage-2.3.0

 app-text/wv/files/wv-1.2.9-format-security.patch | 11 +
 app-text/wv/wv-1.2.9-r2.ebuild   | 63 
 2 files changed, 74 insertions(+)

diff --git a/app-text/wv/files/wv-1.2.9-format-security.patch 
b/app-text/wv/files/wv-1.2.9-format-security.patch
new file mode 100644
index ..0bb7ac2
--- /dev/null
+++ b/app-text/wv/files/wv-1.2.9-format-security.patch
@@ -0,0 +1,11 @@
+--- wv-1.2.9/wvRTF.c.orig  2013-12-12 17:03:41.635612853 -0500
 wv-1.2.9/wvRTF.c   2013-12-12 17:04:05.528003832 -0500
+@@ -192,7 +192,7 @@
+ rtf_output_char ('{');
+ 
+ /* font color */
+-rtf_output (rtfColors[ud->cCol]);
++rtf_output ("%s", rtfColors[ud->cCol]);
+ 
+ /* font face */
+ rtf_output ("\\f%d", ud->cFont);

diff --git a/app-text/wv/wv-1.2.9-r2.ebuild b/app-text/wv/wv-1.2.9-r2.ebuild
new file mode 100644
index ..7d85466
--- /dev/null
+++ b/app-text/wv/wv-1.2.9-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils autotools
+
+DESCRIPTION="Tool for conversion of MSWord doc and rtf files to something 
readable"
+SRC_URI="http://abiword.org/downloads/${PN}/${PV}/${P}.tar.gz;
+HOMEPAGE="http://wvware.sourceforge.net/;
+
+IUSE="tools wmf"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+SLOT="0"
+LICENSE="GPL-2"
+
+RDEPEND="
+   >=dev-libs/glib-2:2
+   >=gnome-extra/libgsf-1.13:=
+   sys-libs/zlib
+   media-libs/libpng:0=
+   dev-libs/libxml2:2
+   tools? ( app-text/texlive-core
+dev-texlive/texlive-latex )
+   wmf? ( >=media-libs/libwmf-0.2.2 )
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/${P}-format-security.patch" )
+
+src_prepare() {
+   default
+
+   if ! use tools; then
+   sed -i -e '/bin_/d' GNUmakefile.am || die
+   sed -i -e '/SUBDIRS/d' GNUmakefile.am || die
+   sed -i -e '/\/GNUmakefile/d' configure.ac || die
+   sed -i -e '/wv[[:upper:]]/d' configure.ac || die
+
+   # automake-1.13 fix, bug #467620
+   sed -i -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' configure.ac 
|| die
+
+   eautoreconf
+   fi
+}
+
+src_configure() {
+   econf \
+   --disable-static \
+   $(use_with wmf libwmf)
+}
+
+src_install () {
+   default
+   prune_libtool_files
+
+   rm -f "${ED}"/usr/share/man/man1/wvConvert.1
+   if use tools; then
+   dosym  /usr/share/man/man1/wvWare.1 
/usr/share/man/man1/wvConvert.1 || die
+   fi
+}