From 22e696c7bb57718a729ed39a409b936026249bee82822f1f1bf07113e3877bf2 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 15 Jan 2007 23:41:34 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wv?expand=0&rev=1 --- .gitattributes | 23 ++++ .gitignore | 1 + ready | 0 wv-1.0.3-autoconf.patch | 52 +++++++ wv-1.0.3-overflow.patch | 67 +++++++++ wv-1.0.3-pc.patch | 10 ++ wv-1.0.3-s390.patch | 120 ++++++++++++++++ wv-1.0.3-wvText.patch | 120 ++++++++++++++++ wv-1.0.3.tar.bz2 | 3 + wv-libole2-readonly.patch | 29 ++++ wv.changes | 283 ++++++++++++++++++++++++++++++++++++++ wv.spec | 252 +++++++++++++++++++++++++++++++++ 12 files changed, 960 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 ready create mode 100644 wv-1.0.3-autoconf.patch create mode 100644 wv-1.0.3-overflow.patch create mode 100644 wv-1.0.3-pc.patch create mode 100644 wv-1.0.3-s390.patch create mode 100644 wv-1.0.3-wvText.patch create mode 100644 wv-1.0.3.tar.bz2 create mode 100644 wv-libole2-readonly.patch create mode 100644 wv.changes create mode 100644 wv.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/ready b/ready new file mode 100644 index 0000000..473a0f4 diff --git a/wv-1.0.3-autoconf.patch b/wv-1.0.3-autoconf.patch new file mode 100644 index 0000000..dd6597c --- /dev/null +++ b/wv-1.0.3-autoconf.patch @@ -0,0 +1,52 @@ +--- GNUmakefile.am ++++ GNUmakefile.am +@@ -26,6 +26,8 @@ + LIBEXPORTER = + endif + ++AUTOMAKE_OPTIONS=foreign ++ + DIST_SUBDIRS = xml help wingdingfont patterns glib-wv libole2 magick expat exporter . + + SUBDIRS = xml help wingdingfont patterns $(DIRGLIB) libole2 magick $(DIREXPAT) $(DIREXPORTER) . +@@ -37,7 +39,7 @@ + + CFLAGS = @CFLAGS@ @ANSI_CFLAGS@ + +-CPPFLAGS = @CPPFLAGS@ @WMF_CFLAGS@ @XML_CFLAGS@ @GLIB_CFLAGS@ @ICONV_CFLAGS@ @PNG_CFLAGS@ @ZLIB_CFLAGS@ ++CPPFLAGS = $(filter-out -I/usr/include,@CPPFLAGS@ @WMF_CFLAGS@ @XML_CFLAGS@ @GLIB_CFLAGS@ @ICONV_CFLAGS@ @PNG_CFLAGS@ @ZLIB_CFLAGS@) + + WVLIBS = @WMF_LIBS@ @XML_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ @PNG_LIBS@ @ZLIB_LIBS@ @LIBS@ -lm + +--- exporter/GNUmakefile.am ++++ exporter/GNUmakefile.am +@@ -6,7 +6,7 @@ + + INCLUDES = -I. -I$(top_builddir) -I$(srcdir) -I$(top_srcdir)/libole2 -I$(top_srcdir)/oledecod $(INCGLIB) + +-CPPFLAGS = @CPPFLAGS@ @GLIB_CFLAGS@ @ICONV_CFLAGS@ @ZLIB_CFLAGS@ ++AM_CPPFLAGS = @CPPFLAGS@ @GLIB_CFLAGS@ @ICONV_CFLAGS@ @ZLIB_CFLAGS@ + + wvhdrdir = $(includedir)/wv + +--- libole2/GNUmakefile.am ++++ libole2/GNUmakefile.am +@@ -6,7 +6,7 @@ + + INCLUDES = -I. -I$(top_builddir) -I$(top_srcdir) -I$(srcdir) -I$(top_srcdir)/libole2 -I$(top_srcdir)/oledecod $(INCGLIB) + +-CPPFLAGS = @CPPFLAGS@ @GLIB_CFLAGS@ @ICONV_CFLAGS@ @ZLIB_CFLAGS@ ++AM_CPPFLAGS = @CPPFLAGS@ @GLIB_CFLAGS@ @ICONV_CFLAGS@ @ZLIB_CFLAGS@ + + noinst_LTLIBRARIES = libole2.la + +--- magick/GNUmakefile.am ++++ magick/GNUmakefile.am +@@ -1,6 +1,6 @@ + INCLUDES = -I. -I$(top_builddir) -I$(srcdir) -I$(srcdir)/magick + +-CPPFLAGS = @CPPFLAGS@ @PNG_CFLAGS@ @ZLIB_CFLAGS@ ++AM_CPPFLAGS = @CPPFLAGS@ @PNG_CFLAGS@ @ZLIB_CFLAGS@ + + noinst_LTLIBRARIES = libmagick.la + diff --git a/wv-1.0.3-overflow.patch b/wv-1.0.3-overflow.patch new file mode 100644 index 0000000..732dfc1 --- /dev/null +++ b/wv-1.0.3-overflow.patch @@ -0,0 +1,67 @@ +--- lfo.c ++++ lfo.c +@@ -1,5 +1,6 @@ + #include + #include ++#include + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif +@@ -12,6 +13,16 @@ + followed by its corresponding LVL structure (if LFOLVL.fFormatting is set). + */ + ++static int ++multiplication_will_overflow(U32 a, U32 b) ++{ ++ if((a > 0) && (b > 0) && (UINT_MAX / a) >= b) { ++ return 0; ++ } ++ ++ return 1; ++} ++ + int + wvGetLFO_records (LFO ** lfo, LFOLVL ** lfolvl, LVL ** lvl, U32 * nolfo, + U32 * nooflvl, U32 offset, U32 len, wvStream * fd) +@@ -29,7 +40,9 @@ + wvTrace (("pos %x %d\n", wvStream_tell (fd), *nooflvl)); + wvTrace (("nolfo is %d nooflvl is %d\n", *nolfo, *nooflvl)); + +- if (*nooflvl == 0) ++ if ((*nooflvl == 0) || ++ multiplication_will_overflow(sizeof (LFOLVL), *nooflvl) || ++ multiplication_will_overflow(sizeof (LVL), *nooflvl)) + { + *lfolvl = NULL; + *lvl = NULL; +@@ -81,16 +94,22 @@ + *nolfo = read_32ubit (fd); + wvTrace (("%d\n", *nolfo)); + +- *lfo = (LFO *) wvMalloc (*nolfo * sizeof (LFO)); +- if (*lfo == NULL) +- { +- wvError ( +- ("NO MEM 1, failed to alloc %d bytes\n", ++ /* check for integer overflow */ ++ if (multiplication_will_overflow(*nolfo, sizeof(LFO))) { ++ wvError (("Malicious document!\n")); ++ *nolfo = 0; ++ return (1); ++ } else { ++ *lfo = (LFO *) wvMalloc (*nolfo * sizeof(LFO)); ++ if (*lfo == NULL) ++ { ++ wvError (("NO MEM 1, failed to alloc %d bytes\n", + *nolfo * sizeof (LFO))); + return (1); +- } +- for (i = 0; i < *nolfo; i++) ++ } ++ for (i = 0; i < *nolfo; i++) + wvGetLFO (&((*lfo)[i]), fd); ++ } + } + return (0); + } diff --git a/wv-1.0.3-pc.patch b/wv-1.0.3-pc.patch new file mode 100644 index 0000000..c62fd7e --- /dev/null +++ b/wv-1.0.3-pc.patch @@ -0,0 +1,10 @@ +--- wv-1.0.pc.in ++++ wv-1.0.pc.in +@@ -1,6 +1,6 @@ + prefix=@prefix@ + exec_prefix=${prefix} +-libdir=${exec_prefix}/lib ++libdir=@libdir@ + includedir=${prefix}/include + + Name: wvWare diff --git a/wv-1.0.3-s390.patch b/wv-1.0.3-s390.patch new file mode 100644 index 0000000..6a536e6 --- /dev/null +++ b/wv-1.0.3-s390.patch @@ -0,0 +1,120 @@ +--- configure.ac ++++ configure.ac +@@ -731,6 +731,102 @@ + #endif /* ! HAVE_WV_CONFIG_H */ + ]) + ++dnl ********************** ++dnl *** va_copy checks *** ++dnl ********************** ++dnl we currently check for all three va_copy possibilities, so we get ++dnl all results in config.log for bug reports. ++AC_MSG_CHECKING(for an implementation of va_copy()) ++AC_CACHE_VAL(glib_cv_va_copy,[ ++ AC_TRY_RUN([ ++ #include ++ void f (int i, ...) { ++ va_list args1, args2; ++ va_start (args1, i); ++ va_copy (args2, args1); ++ if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42) ++ exit (1); ++ va_end (args1); va_end (args2); ++ } ++ int main() { ++ f (0, 42); ++ return 0; ++ }], ++ glib_cv_va_copy=yes ++ , ++ glib_cv_va_copy=no ++ ,) ++]) ++AC_MSG_RESULT($glib_cv_va_copy) ++AC_MSG_CHECKING(for an implementation of __va_copy()) ++AC_CACHE_VAL(glib_cv___va_copy,[ ++ AC_TRY_RUN([ ++ #include ++ void f (int i, ...) { ++ va_list args1, args2; ++ va_start (args1, i); ++ __va_copy (args2, args1); ++ if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42) ++ exit (1); ++ va_end (args1); va_end (args2); ++ } ++ int main() { ++ f (0, 42); ++ return 0; ++ }], ++ glib_cv___va_copy=yes ++ , ++ glib_cv___va_copy=no ++ ,) ++]) ++AC_MSG_RESULT($glib_cv___va_copy) ++AC_MSG_CHECKING(whether va_lists can be copied by value) ++AC_CACHE_VAL(glib_cv_va_val_copy,[ ++ AC_TRY_RUN([ ++ #include ++ void f (int i, ...) { ++ va_list args1, args2; ++ va_start (args1, i); ++ args2 = args1; ++ if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42) ++ exit (1); ++ va_end (args1); va_end (args2); ++ } ++ int main() { ++ f (0, 42); ++ return 0; ++ }], ++ glib_cv_va_val_copy=yes ++ , ++ glib_cv_va_val_copy=no ++ ,) ++]) ++if test "x$glib_cv_va_copy" = "xyes"; then ++ AC_DEFINE([G_VA_COPY], va_copy, [va_copy]) ++else if test "x$glib_cv___va_copy" = "xyes"; then ++ AC_DEFINE([G_VA_COPY], __va_copy, [va_copy]) ++fi ++fi ++if test "x$glib_cv_va_val_copy" = "xno"; then ++ AC_DEFINE([G_VA_COPY_AS_ARRAY], 1, [VA_COPY_AS_ARRAY]) ++fi ++AC_MSG_RESULT($glib_cv_va_val_copy) ++ ++case xyes in ++x$glib_cv_va_copy) glib_vacopy='#define G_VA_COPY va_copy' ;; ++x$glib_cv___va_copy) glib_vacopy='#define G_VA_COPY __va_copy' ;; ++*) glib_vacopy='' ++esac ++ ++if test x$glib_cv_va_val_copy = xno; then ++ glib_vacopy="\$glib_vacopy ++#define G_VA_COPY_AS_ARRAY 1" ++fi ++ ++ ++ ++ ++ + AC_CONFIG_FILES([ + wvAbw + wvDVI +--- glib-wv/glib.h ++++ glib-wv/glib.h +@@ -27,6 +27,12 @@ + #ifndef __G_LIB_H__ + #define __G_LIB_H__ + ++ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ ++ + /* system specific config file glibconfig.h provides definitions for + * the extrema of many of the standard types. These are: + * diff --git a/wv-1.0.3-wvText.patch b/wv-1.0.3-wvText.patch new file mode 100644 index 0000000..d7873e8 --- /dev/null +++ b/wv-1.0.3-wvText.patch @@ -0,0 +1,120 @@ +--- wvText.in ++++ wvText.in +@@ -3,35 +3,49 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ + datadir=@datadir@ +-tmpdir=${TMPDIR:-/tmp} + + # argument checking +-if [ ${#} -ne "2" ]; then +- echo "Usage: ${0} " +- exit 1 ++if [ ${#} -eq "1" ]; then ++ o_file='-' ++elif [ ${#} -ne "2" ]; then ++ echo "Usage: ${0} " ++ exit 1 ++else ++ o_file=${2} ++fi ++ ++if [ "x$o_file" = "x-" ]; then ++ o_file=/dev/stdout + fi + + USE_DUMP=0 +-which elinks >/dev/null 2>&1 ++which w3m >/dev/null 2>&1 + if [ ${?} -eq "0" ]; then +- USE_DUMP=3 ++ USE_DUMP=4 + else +- which links >/dev/null 2>&1 ++ which elinks >/dev/null 2>&1 + if [ ${?} -eq "0" ]; then +- USE_DUMP=2 ++ USE_DUMP=3 + else +- which lynx >/dev/null 2>&1 ++ which links >/dev/null 2>&1 + if [ ${?} -eq "0" ]; then +- USE_DUMP=1 +- fi +- fi ++ USE_DUMP=2 ++ else ++ which lynx >/dev/null 2>&1 ++ if [ ${?} -eq "0" ]; then ++ USE_DUMP=1 ++ fi ++ fi ++ fi + fi + ++tmpdir=$(mktemp -d ${TMPDIR:-/tmp}/wvText.XXXXXXXX) || { echo "$0: can not create temporary directory" >& 2; exit 1; } ++ + if [ $USE_DUMP -eq "1" ]; then +- echo "Could not find required program 'elinks' or 'links'" ++ echo "Could not find required program 'w3m', 'elinks' or 'links'" + echo "Using lynx. Ouput will be pretty ugly." + elif [ $USE_DUMP -eq "0" ]; then +- echo "Could not find required program 'elinks', 'links', or even 'lynx'" ++ echo "Could not find required program 'w3m', 'elinks', 'links', or even 'lynx'" + echo "Using wvWare -x wvText.xml. Ouput will be pretty bad." + fi + +@@ -41,6 +55,7 @@ + which wvHtml >/dev/null 2>&1 + if [ ${?} -ne "0" ]; then + echo "Could not find required program 'wvHtml'" ++ rm -rf "${tmpdir}" + exit 1 + fi + +@@ -51,32 +66,36 @@ + wvHtml -1 "${1}" --targetdir="${tmpdir}" "${TMP_FILE}" >/dev/null 2>&1 + if [ ${?} -ne "0" ]; then + echo "Could not convert into HTML" ++ rm -rf "${tmpdir}" + exit 1 + fi + +- if [ $USE_DUMP -eq "3" ]; then ++ if [ $USE_DUMP -eq "4" ]; then ++ ++ w3m -dump -T text/html "${tmpdir}/${TMP_FILE}" > "$o_file" ++ elif [ $USE_DUMP -eq "3" ]; then + # elinks does the best +- elinks -dump -force-html "${tmpdir}/${TMP_FILE}" > "${2}" ++ elinks -dump -force-html "${tmpdir}/${TMP_FILE}" > "$o_file" + elif [ $USE_DUMP -eq "2" ]; then + # links does a pretty good job +- links -dump "${tmpdir}/${TMP_FILE}" > "${2}" ++ links -dump "${tmpdir}/${TMP_FILE}" > "$o_file" + else + # lynx sucks, but does better than wvText.xml +- TERM=vt100 lynx -dump -force_html "${tmpdir}/${TMP_FILE}" > "${2}" ++ TERM=vt100 lynx -dump -force_html "${tmpdir}/${TMP_FILE}" > "$o_file" + fi; + + if [ ${?} -ne "0" ]; then + echo "Could not convert into Text" +- rm -f "${tmpdir}/${TMP_FILE}" ++ rm -rf "${tmpdir}" + exit 1 + fi + +- # clean up +- rm -f "${tmpdir}/${TMP_FILE}" +- + else + # fall back onto our cruddy output + # this is, admittedly, better than running + # 'strings' on the word document though :) +- wvWare -x ${datadir}/wv/wvText.xml "${1}" > "${2}" ++ wvWare -x ${datadir}/wv/wvText.xml "${1}" > "$o_file" + fi ++ ++# clean up ++rm -rf "${tmpdir}" diff --git a/wv-1.0.3.tar.bz2 b/wv-1.0.3.tar.bz2 new file mode 100644 index 0000000..2d8e0f3 --- /dev/null +++ b/wv-1.0.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf074721c216b4e140409107672ce17fe700a4af7fe124b9f2ffe23128b41670 +size 666223 diff --git a/wv-libole2-readonly.patch b/wv-libole2-readonly.patch new file mode 100644 index 0000000..4411a62 --- /dev/null +++ b/wv-libole2-readonly.patch @@ -0,0 +1,29 @@ +--- libole2/ms-ole.c-old 2004-10-22 20:59:51.000000000 -0400 ++++ libole2/ms-ole.c 2005-08-03 10:06:14.000000000 -0400 +@@ -1723,7 +1723,7 @@ + gboolean try_mmap, + MsOleSysWrappers *wrappers) + { +- int prot = PROT_READ | PROT_WRITE; ++ int prot = PROT_READ; + MsOle *f; + MsOleHandleType file; + +@@ -1737,15 +1737,9 @@ + f = *fs = ms_ole_new (); + take_wrapper_functions (f, wrappers); + +- f->file_des = file = f->syswrap->open2 (name, O_RDWR, f->syswrap->closure); ++ f->file_des = file = f->syswrap->open2 (name, O_RDONLY, f->syswrap->closure); + f->ref_count = 0; +- f->mode = 'w'; +- +- if (file == BAD_MSOLE_HANDLE) { +- f->file_des = file = f->syswrap->open2 (name, O_RDONLY, f->syswrap->closure); +- f->mode = 'r'; +- prot &= ~PROT_WRITE; +- } ++ f->mode = 'r'; + + if ((file == BAD_MSOLE_HANDLE) || !(f->syswrap->isregfile (file, f->syswrap->closure))) { + g_warning ("No such file '%s'\n", name); diff --git a/wv.changes b/wv.changes new file mode 100644 index 0000000..a0f10c0 --- /dev/null +++ b/wv.changes @@ -0,0 +1,283 @@ +------------------------------------------------------------------- +Wed Nov 15 12:05:04 CET 2006 - prusnak@suse.cz + +- fixed VUL-0: overflow (overflow.patch) [#215612] + +------------------------------------------------------------------- +Sat Oct 21 23:23:40 CEST 2006 - dmueller@suse.de + +- build against system expat to reduce code size + +------------------------------------------------------------------- +Thu Jan 26 16:33:07 CET 2006 - nadvornik@suse.cz + +- fixed libdir in pkgconfig file [#115679] + +------------------------------------------------------------------- +Wed Jan 25 21:42:52 CET 2006 - mls@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Thu Jan 12 16:32:32 CET 2006 - nadvornik@suse.cz + +- compile with -fstack-protector + +------------------------------------------------------------------- +Thu Aug 4 00:00:33 CEST 2005 - gekker@suse.de + +- Fix to open files RO rather than RW + +------------------------------------------------------------------- +Mon Feb 07 12:58:14 CET 2005 - nadvornik@suse.cz + +- updated to 1.0.3 + +------------------------------------------------------------------- +Thu Nov 11 15:24:07 CET 2004 - sbrabec@suse.cz + +- Fixed buffer overflow in the wvHandleDateTimePicture function in wv + library: CAN-2004-0645 (#47767). + +------------------------------------------------------------------- +Tue Mar 30 17:02:11 CEST 2004 - nadvornik@suse.cz + +- prefer w3m in wvText as it handles UTF-8 output better +- better temp file handling in wvText + +------------------------------------------------------------------- +Fri Feb 13 13:55:22 CET 2004 - meissner@suse.de + +- fixed pkgconfig path. + +------------------------------------------------------------------- +Thu Feb 12 12:25:41 CET 2004 - ro@suse.de + +- added directory /usr/include/wv to devel filelist + +------------------------------------------------------------------- +Wed Feb 11 11:45:10 CET 2004 - nadvornik@suse.cz + +- updated to 1.0.0 +- compile with -fno-strict-aliasing + +------------------------------------------------------------------- +Sat Jan 10 15:24:02 CET 2004 - adrian@suse.de + +- add %run_ldconfig + +------------------------------------------------------------------- +Mon Jul 28 17:18:44 CEST 2003 - nadvornik@suse.cz + +- updated to 0.7.6 + +------------------------------------------------------------------- +Wed Jun 18 14:42:06 CEST 2003 - nadvornik@suse.cz + +- fixed to compile with new libwmf + +------------------------------------------------------------------- +Thu May 29 14:23:44 CEST 2003 - nadvornik@suse.cz + +- packaged wv.h + +------------------------------------------------------------------- +Wed Sep 11 21:51:34 CEST 2002 - ro@suse.de + +- fixed patch (my fault) + +------------------------------------------------------------------- +Wed Sep 11 17:00:21 CEST 2002 - pthomas@suse.de + +- Make wvText output to stdout on request. +- Add missing itmes to my last entry. + +------------------------------------------------------------------- +Wed Sep 11 16:38:08 CEST 2002 - ro@suse.de + +- fixed requires of devel-package + +------------------------------------------------------------------- +Tue Sep 10 21:20:07 CEST 2002 - pthomas@suse.de + +- Change wvText to use either w3m or lynx. +- wv-devel requires wv of same version. +- Require w3m +- Filter out /usr/include from CPPFLAGS. +- Don't patch config.h.in but instead call autoheader to + regenerate it. + +------------------------------------------------------------------- +Fri Jul 26 22:44:29 CEST 2002 - adrian@suse.de + +- fix neededforbuild + +------------------------------------------------------------------- +Thu Jun 20 13:36:35 CEST 2002 - nadvornik@suse.cz + +- update to 0.7.2 + +------------------------------------------------------------------- +Fri Apr 5 14:04:00 CEST 2002 - nadvornik@suse.cz + +- fixed instalation of manpages + +------------------------------------------------------------------- +Thu Apr 4 15:15:30 CEST 2002 - nadvornik@suse.cz + +- fixed to compile with new autoconf + +------------------------------------------------------------------- +Fri Mar 8 11:01:25 CET 2002 - nadvornik@suse.cz + +- fixed permissions and removed CVS dirs in doc directory + +------------------------------------------------------------------- +Thu Feb 7 11:14:05 CET 2002 - nadvornik@suse.cz + +- update to 0.7.1: + - built with shared library + +------------------------------------------------------------------- +Fri Feb 1 00:26:13 CET 2002 - ro@suse.de + +- changed neededforbuild to + +------------------------------------------------------------------- +Wed Nov 28 18:50:02 CET 2001 - nadvornik@suse.cz + +- update to 0.7.0: + - compiles with libwmf 0.2.2 + +------------------------------------------------------------------- +Thu Jun 28 15:13:28 CEST 2001 - nadvornik@suse.cz + +- update to 0.6.5 +- libwmf is now a separate package + +------------------------------------------------------------------- +Wed Jun 13 10:18:23 CEST 2001 - nadvornik@suse.cz + +- fixed to compile with new autoconf + +------------------------------------------------------------------- +Fri May 18 11:36:49 CEST 2001 - nadvornik@suse.cz + +- fixed cast warnings and include files for ia64 + +------------------------------------------------------------------- +Mon Apr 23 10:57:50 CEST 2001 - nadvornik@suse.cz + +- fixed to compile on s390 + +------------------------------------------------------------------- +Mon Mar 12 10:45:41 CET 2001 - nadvornik@suse.cz + +- libwmf compiled with -fPIC, now it can be linked to + ImageMagick module + +------------------------------------------------------------------- +Thu Feb 8 15:56:41 CET 2001 - nadvornik@suse.cz + +- update wv to 0.6.4, libwmf to 0.1.21 +- fixed bug #6165 + +------------------------------------------------------------------- +Wed Nov 22 10:49:25 CET 2000 - nadvornik@suse.cz + +- fixed docdir name + +------------------------------------------------------------------- +Tue Nov 21 19:05:23 CET 2000 - schwab@suse.de + +- Fix permissions. +- Remove all CVS directories. +- Avoid double slashes. + +------------------------------------------------------------------- +Fri Nov 10 11:10:39 CET 2000 - nadvornik@suse.cz + +- rename mswordvw -> wv +- mswordvd -> wv-devel +- update wv to 0.6.2, libwmf to 0.1.20 + +------------------------------------------------------------------- +Wed Nov 8 15:39:13 CET 2000 - ro@suse.de + +- fixed neededforbuild for ImageMagick + +------------------------------------------------------------------- +Mon Oct 9 09:20:58 CEST 2000 - nadvornik@suse.cz + +- fixed Copyright +- used bzip2 + +------------------------------------------------------------------- +Mon Sep 18 16:37:41 CEST 2000 - nadvornik@suse.cz + +- added magickd to neededforbuild +- fixed to compile + +------------------------------------------------------------------- +Mon Jun 19 08:41:22 CEST 2000 - nadvornik@suse.cz + +- update to 0.5.44 + +------------------------------------------------------------------- +Mon Jun 5 10:48:10 CEST 2000 - nadvornik@suse.cz + +- fixed to compile with ImageMagick-5.2.0 + +------------------------------------------------------------------- +Fri May 26 16:07:32 CEST 2000 - schwab@suse.de + +- Update config files. + +------------------------------------------------------------------- +Thu May 18 09:44:06 CEST 2000 - nadvornik@suse.cz + +- used %{_defaultdocdir} + +------------------------------------------------------------------- +Tue May 2 09:25:59 CEST 2000 - nadvornik@suse.cz + +- fixed to compile + +------------------------------------------------------------------- +Thu Apr 20 08:27:12 CEST 2000 - nadvornik@suse.cz + +- fixed filelist +- created development subpackage mswordvd + +------------------------------------------------------------------- +Tue Apr 18 09:19:32 CEST 2000 - nadvornik@suse.cz + +- update to 0.5.43, libwmf 0.1.17 +- added Buildroot + +------------------------------------------------------------------- +Mon Jan 31 19:42:22 CET 2000 - kukuk@suse.de + +- Update to 0.5.14-bw6 +- Fix spec file +- Move /usr/man -> /usr/share/man + +------------------------------------------------------------------- +Mon Sep 13 17:23:57 CEST 1999 - bs@suse.de + +- ran old prepare_spec on spec file to switch to new prepare_spec. + +------------------------------------------------------------------- +Wed Aug 4 16:52:13 MEST 1999 - uli@suse.de + +- added some missing files + +------------------------------------------------------------------- +Fri May 21 09:53:16 MEST 1999 - kukuk@suse.de + +- Update mswordview to 0.5.14 + +------------------------------------------------------------------- +Thu Apr 29 11:35:57 MEST 1999 - kukuk@suse.de + +- first initial version of mswordview 0.5.10 with libwmf 0.1.9 diff --git a/wv.spec b/wv.spec new file mode 100644 index 0000000..2ab5f9b --- /dev/null +++ b/wv.spec @@ -0,0 +1,252 @@ +# +# spec file for package wv (Version 1.0.3) +# +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# This file and all modifications and additions to the pristine +# package are under the same license as the package itself. +# +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +# norootforbuild + +Name: wv +BuildRequires: freetype2-devel libtiff-devel libwmf-devel libxml2-devel pkgconfig w3m +Obsoletes: mswordvw +Provides: mswordvw +License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) +Group: Productivity/Publishing/Word +Autoreqprov: on +Version: 1.0.3 +Release: 40 +Summary: Word 8 Converter for Unix +URL: http://wvWare.sourceforge.net/ +Source: http://www.csn.ul.ie/~caolan/publink/mswordview/wv-%{version}.tar.bz2 +Patch2: wv-%{version}-s390.patch +Patch4: wv-%{version}-autoconf.patch +Patch5: wv-%{version}-wvText.patch +Patch6: wv-libole2-readonly.patch +Patch7: wv-%{version}-pc.patch +Patch8: wv-%{version}-overflow.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +WV is a program that can understand the Microsoft Word 8 binary file +format (Office97). It currently converts Word into HTML, which can then +be read with a web browser. + + + +Authors: +-------- + Caolan McNamara + +%package devel +Requires: %{name} = %{version} w3m +Requires: libwmf-devel +Obsoletes: mswordvd +Provides: mswordvd +Summary: Static Libraries and Header Files for wv +Group: Development/Libraries/C and C++ +Autoreqprov: on + +%description devel +Static Libraries and Header Files for wv + + + +Authors: +-------- + Caolan McNamara + +%prep +%setup +%patch2 +%patch4 +%patch5 +%patch6 +%patch7 +%patch8 + +%build +autoreconf -f -i --verbose +%define warn_flags -Wall -Wstrict-prototypes -Wpointer-arith -Wformat -Wformat-security +CFLAGS="$RPM_OPT_FLAGS %{warn_flags} -fno-strict-aliasing -fstack-protector" \ + ./configure \ + --prefix=/usr --mandir=%{_mandir} --with-libwmf --with-expat \ + --libdir=%{_libdir} \ + --disable-dependency-tracking $RPM_ARCH-suse-linux +make + +%install +rm -rf $RPM_BUILD_ROOT +make DESTDIR=$RPM_BUILD_ROOT manonedir=%{_mandir}/man1 install + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +%run_ldconfig + +%postun +%run_ldconfig + +%files +%defattr(-,root,root) +/usr/bin/wvAbw +/usr/bin/wvCleanLatex +/usr/bin/wvConvert +/usr/bin/wvDVI +/usr/bin/wvHtml +/usr/bin/wvLatex +/usr/bin/wvMime +/usr/bin/wvPDF +/usr/bin/wvPS +/usr/bin/wvRTF +/usr/bin/wvSummary +/usr/bin/wvText +/usr/bin/wvVersion +/usr/bin/wvWare +/usr/bin/wvWml +/usr/bin/wvDocBook +/usr/share/wv +%{_libdir}/*.so.* +%doc %{_mandir}/*/* +%doc COPYING README + +%files devel +%defattr(-,root,root) +/usr/%_lib/pkgconfig/* +/usr/include/wv +%{_libdir}/*.la +%{_libdir}/*.so + +%changelog -n wv +* Wed Nov 15 2006 - prusnak@suse.cz +- fixed VUL-0: overflow (overflow.patch) [#215612] +* Sat Oct 21 2006 - dmueller@suse.de +- build against system expat to reduce code size +* Thu Jan 26 2006 - nadvornik@suse.cz +- fixed libdir in pkgconfig file [#115679] +* Wed Jan 25 2006 - mls@suse.de +- converted neededforbuild to BuildRequires +* Thu Jan 12 2006 - nadvornik@suse.cz +- compile with -fstack-protector +* Thu Aug 04 2005 - gekker@suse.de +- Fix to open files RO rather than RW +* Mon Feb 07 2005 - nadvornik@suse.cz +- updated to 1.0.3 +* Thu Nov 11 2004 - sbrabec@suse.cz +- Fixed buffer overflow in the wvHandleDateTimePicture function in wv + library: CAN-2004-0645 (#47767). +* Tue Mar 30 2004 - nadvornik@suse.cz +- prefer w3m in wvText as it handles UTF-8 output better +- better temp file handling in wvText +* Fri Feb 13 2004 - meissner@suse.de +- fixed pkgconfig path. +* Thu Feb 12 2004 - ro@suse.de +- added directory /usr/include/wv to devel filelist +* Wed Feb 11 2004 - nadvornik@suse.cz +- updated to 1.0.0 +- compile with -fno-strict-aliasing +* Sat Jan 10 2004 - adrian@suse.de +- add %%run_ldconfig +* Mon Jul 28 2003 - nadvornik@suse.cz +- updated to 0.7.6 +* Wed Jun 18 2003 - nadvornik@suse.cz +- fixed to compile with new libwmf +* Thu May 29 2003 - nadvornik@suse.cz +- packaged wv.h +* Wed Sep 11 2002 - ro@suse.de +- fixed patch (my fault) +* Wed Sep 11 2002 - pthomas@suse.de +- Make wvText output to stdout on request. +- Add missing itmes to my last entry. +* Wed Sep 11 2002 - ro@suse.de +- fixed requires of devel-package +* Tue Sep 10 2002 - pthomas@suse.de +- Change wvText to use either w3m or lynx. +- wv-devel requires wv of same version. +- Require w3m +- Filter out /usr/include from CPPFLAGS. +- Don't patch config.h.in but instead call autoheader to + regenerate it. +* Fri Jul 26 2002 - adrian@suse.de +- fix neededforbuild +* Thu Jun 20 2002 - nadvornik@suse.cz +- update to 0.7.2 +* Fri Apr 05 2002 - nadvornik@suse.cz +- fixed instalation of manpages +* Thu Apr 04 2002 - nadvornik@suse.cz +- fixed to compile with new autoconf +* Fri Mar 08 2002 - nadvornik@suse.cz +- fixed permissions and removed CVS dirs in doc directory +* Thu Feb 07 2002 - nadvornik@suse.cz +- update to 0.7.1: + - built with shared library +* Fri Feb 01 2002 - ro@suse.de +- changed neededforbuild to +* Wed Nov 28 2001 - nadvornik@suse.cz +- update to 0.7.0: + - compiles with libwmf 0.2.2 +* Thu Jun 28 2001 - nadvornik@suse.cz +- update to 0.6.5 +- libwmf is now a separate package +* Wed Jun 13 2001 - nadvornik@suse.cz +- fixed to compile with new autoconf +* Fri May 18 2001 - nadvornik@suse.cz +- fixed cast warnings and include files for ia64 +* Mon Apr 23 2001 - nadvornik@suse.cz +- fixed to compile on s390 +* Mon Mar 12 2001 - nadvornik@suse.cz +- libwmf compiled with -fPIC, now it can be linked to + ImageMagick module +* Thu Feb 08 2001 - nadvornik@suse.cz +- update wv to 0.6.4, libwmf to 0.1.21 +- fixed bug #6165 +* Wed Nov 22 2000 - nadvornik@suse.cz +- fixed docdir name +* Tue Nov 21 2000 - schwab@suse.de +- Fix permissions. +- Remove all CVS directories. +- Avoid double slashes. +* Fri Nov 10 2000 - nadvornik@suse.cz +- rename mswordvw -> wv +- mswordvd -> wv-devel +- update wv to 0.6.2, libwmf to 0.1.20 +* Wed Nov 08 2000 - ro@suse.de +- fixed neededforbuild for ImageMagick +* Mon Oct 09 2000 - nadvornik@suse.cz +- fixed Copyright +- used bzip2 +* Mon Sep 18 2000 - nadvornik@suse.cz +- added magickd to neededforbuild +- fixed to compile +* Mon Jun 19 2000 - nadvornik@suse.cz +- update to 0.5.44 +* Mon Jun 05 2000 - nadvornik@suse.cz +- fixed to compile with ImageMagick-5.2.0 +* Fri May 26 2000 - schwab@suse.de +- Update config files. +* Thu May 18 2000 - nadvornik@suse.cz +- used %%{_defaultdocdir} +* Tue May 02 2000 - nadvornik@suse.cz +- fixed to compile +* Thu Apr 20 2000 - nadvornik@suse.cz +- fixed filelist +- created development subpackage mswordvd +* Tue Apr 18 2000 - nadvornik@suse.cz +- update to 0.5.43, libwmf 0.1.17 +- added Buildroot +* Mon Jan 31 2000 - kukuk@suse.de +- Update to 0.5.14-bw6 +- Fix spec file +- Move /usr/man -> /usr/share/man +* Mon Sep 13 1999 - bs@suse.de +- ran old prepare_spec on spec file to switch to new prepare_spec. +* Wed Aug 04 1999 - uli@suse.de +- added some missing files +* Fri May 21 1999 - kukuk@suse.de +- Update mswordview to 0.5.14 +* Thu Apr 29 1999 - kukuk@suse.de +- first initial version of mswordview 0.5.10 with libwmf 0.1.9