From 33ed716ae4d4ffe6057a6f85e62466259cef9ae8 Mon Sep 17 00:00:00 2001 From: Aurelien Bompard Date: Sat, 28 Oct 2006 08:53:39 +0000 Subject: [PATCH 1/5] update to 1.2.4, fixes #212696 (CVE-2006-4513) --- .cvsignore | 2 +- sources | 2 +- wv.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 15d09ce..72169ec 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wv-1.2.1.tar.gz +wv-1.2.4.tar.gz diff --git a/sources b/sources index 6c60e23..2443358 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d757080af4595839d5d82a1a573c692c wv-1.2.1.tar.gz +c1861c560491f121e12917fa76970ac5 wv-1.2.4.tar.gz diff --git a/wv.spec b/wv.spec index bb4be51..5400313 100644 --- a/wv.spec +++ b/wv.spec @@ -1,11 +1,11 @@ Name: wv Summary: MSWord 6/7/8/9 binary file format to HTML converter -Version: 1.2.1 -Release: 7%{?dist} +Version: 1.2.4 +Release: 1%{?dist} License: GPL Group: Applications/Text URL: http://wvware.sourceforge.net -Source: http://dl.sf.net/wvware/wv-1.2.1.tar.gz +Source: http://dl.sf.net/wvware/wv-%{version}.tar.gz #Patch0: wv-wvtext-tmp.patch #Patch1: wv-1.0.3-oledecod.patch #Patch2: wv-1.0.3-gcc4.patch @@ -85,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Oct 28 2006 Aurelien Bompard 1.2.4-1 +- update to 1.2.4, fixes #212696 (CVE-2006-4513) + * Fri Sep 08 2006 Aurelien Bompard 1.2.1-7 - rebuild (releases 1 to 7, cvs problem) From e66bf758973778157f1e32cd8c4aa6254dad34de Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 7 Oct 2008 17:24:06 +0000 Subject: [PATCH 2/5] Initialize branch EL-5 for wv --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..42f697a --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-5 From 7053a9b4499b7cb78b81b7240eac3e7fe507e6a0 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 9 Oct 2008 05:56:17 +0000 Subject: [PATCH 3/5] Import from Fedora --- wv-1.0.3-gcc4.patch | 40 ------------- wv-1.0.3-oledecod.patch | 11 ---- wv-1.2.4-pkgconfig.patch | 10 ++++ wv-docbook-filename.patch | 11 ---- wv-field.c.patch | 70 ----------------------- wv-wvdvi-copy.patch | 12 ---- wv-wvmime-tmp-filename.patch | 55 ------------------ wv-wvtext-tmp.patch | 107 ----------------------------------- wv.spec | 18 +++++- 9 files changed, 25 insertions(+), 309 deletions(-) delete mode 100644 wv-1.0.3-gcc4.patch delete mode 100644 wv-1.0.3-oledecod.patch create mode 100644 wv-1.2.4-pkgconfig.patch delete mode 100644 wv-docbook-filename.patch delete mode 100644 wv-field.c.patch delete mode 100644 wv-wvdvi-copy.patch delete mode 100644 wv-wvmime-tmp-filename.patch delete mode 100644 wv-wvtext-tmp.patch diff --git a/wv-1.0.3-gcc4.patch b/wv-1.0.3-gcc4.patch deleted file mode 100644 index 21b48ff..0000000 --- a/wv-1.0.3-gcc4.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- wv-1.0.0/wvConfig.c.gcc4 2005-05-08 23:17:35.000000000 -0400 -+++ wv-1.0.0/wvConfig.c 2005-05-08 23:18:42.000000000 -0400 -@@ -2130,7 +2130,7 @@ - } - - static void --startElement (void *userData, const XML_Char *name, const XML_Char **atts) -+wvStartElement (void *userData, const XML_Char *name, const XML_Char **atts) - { - unsigned int nAtts = 0; - const XML_Char **p; -@@ -3094,7 +3094,7 @@ - } - - static void --endElement (void *userData, const XML_Char *name) -+wvEndElement (void *userData, const XML_Char *name) - { - state_data *mydata = (state_data *) userData; - unsigned int token_type; -@@ -3470,8 +3470,8 @@ - memset(&hdl, 0, sizeof(hdl)); - - hdl.getEntity = _getEntity; -- hdl.startElement = startElement; -- hdl.endElement = endElement; -+ hdl.startElement = wvStartElement; -+ hdl.endElement = wvEndElement; - hdl.characters = charData; - - if (myhandle->fp) -@@ -3514,7 +3514,7 @@ - size_t len; - - XML_SetUserData (parser, myhandle); -- XML_SetElementHandler (parser, startElement, endElement); -+ XML_SetElementHandler (parser, wvStartElement, wvEndElement); - XML_SetCharacterDataHandler (parser, charData); - - if (myhandle->fp == NULL) diff --git a/wv-1.0.3-oledecod.patch b/wv-1.0.3-oledecod.patch deleted file mode 100644 index f2e043d..0000000 --- a/wv-1.0.3-oledecod.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- wv-1.0.3/exporter/support.c.oledecod 2005-05-08 22:50:23.000000000 +0200 -+++ wv-1.0.3/exporter/support.c 2005-05-08 22:50:53.000000000 +0200 -@@ -10,7 +10,7 @@ - #endif - #include "config.h" - #include "wv.h" --#include "oledecod.h" -+#include "ms-ole.h" - - #include "wvexporter-priv.h" - diff --git a/wv-1.2.4-pkgconfig.patch b/wv-1.2.4-pkgconfig.patch new file mode 100644 index 0000000..d2ab7e7 --- /dev/null +++ b/wv-1.2.4-pkgconfig.patch @@ -0,0 +1,10 @@ +--- wv-1.2.4/wv-1.0.pc.in.pkgconfig 2005-04-18 17:14:48.000000000 -0400 ++++ wv-1.2.4/wv-1.0.pc.in 2008-03-30 17:42:15.000000000 -0400 +@@ -1,6 +1,6 @@ + prefix=@prefix@ + exec_prefix=${prefix} +-libdir=${exec_prefix}/lib ++libdir=@libdir@ + includedir=${prefix}/include + + Name: wvWare diff --git a/wv-docbook-filename.patch b/wv-docbook-filename.patch deleted file mode 100644 index 11f8aec..0000000 --- a/wv-docbook-filename.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./wvDocBook.in.filename 2004-05-14 07:16:27.000000000 +0200 -+++ ./wvDocBook.in 2004-05-14 07:16:37.000000000 +0200 -@@ -116,7 +116,7 @@ - if test "x$datadir" = "x"; then - datadir=@datadir@ - fi --xmlcfg="$datadir/wv/wvDocBook.xml" -+xmlcfg="$datadir/wv/wvDocbook.xml" - if test -r "$xmlcfg"; then - okay=yes - else diff --git a/wv-field.c.patch b/wv-field.c.patch deleted file mode 100644 index 677c313..0000000 --- a/wv-field.c.patch +++ /dev/null @@ -1,70 +0,0 @@ -Index: field.c -=================================================================== -RCS file: /cvsroot/wv/field.c,v -retrieving revision 1.19 -retrieving revision 1.20 -diff -u -r1.19 -r1.20 ---- field.c 29 Dec 2002 16:37:00 -0000 1.19 -+++ field.c 5 Jul 2004 18:10:03 -0000 1.20 -@@ -98,18 +98,21 @@ - case 1: - sprintf (temp, "%d", current->tm_mon+1); - strcat (timestr, temp); -+ consumed += strlen (temp); - break; - case 2: - strcat (timestr, "%m"); -+ consumed += 2; - break; - case 3: - strcat (timestr, "%b"); -+ consumed += 2; - break; - default: - strcat (timestr, "%B"); -+ consumed += 2; - break; - } -- consumed += 2; - break; - case 's': - case 'S': -@@ -139,6 +142,7 @@ - case 1: - consumed += sprintf (temp, "%d", current->tm_wday); - strcat (timestr, temp); -+ consumed += strlen (temp); - break; - case 2: - strcat (timestr, "%d"); -@@ -182,12 +186,13 @@ - case 1: - sprintf (temp, "%d", current->tm_hour % 12); - strcat (timestr, temp); -+ consumed += strlen (temp); - break; - default: - strcat (timestr, "%I"); -+ consumed += 2; - break; - } -- consumed += 2; - break; - case 'H': - no = lookahead (token, 'H', 'H'); -@@ -197,6 +202,7 @@ - case 1: - consumed += sprintf (temp, "%d", current->tm_hour); - strcat (timestr, temp); -+ consumed += strlen (temp); - break; - default: - strcat (timestr, "%H"); -@@ -212,6 +218,7 @@ - case 1: - consumed += sprintf (temp, "%d", current->tm_min); - strcat (timestr, temp); -+ consumed += strlen (temp); - break; - default: - strcat (timestr, "%M"); diff --git a/wv-wvdvi-copy.patch b/wv-wvdvi-copy.patch deleted file mode 100644 index b343d0a..0000000 --- a/wv-wvdvi-copy.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- ./wvDVI.in.copy 2004-05-14 07:27:41.000000000 +0200 -+++ ./wvDVI.in 2004-05-14 07:29:43.000000000 +0200 -@@ -299,5 +299,7 @@ - exit 1 - fi - --cp -f "$name".dvi "$o_file" --rm -f "$name".dvi -+if [ "$name".dvi != "$o_file" ]; then -+ cp -f "$name".dvi "$o_file" -+ rm -f "$name".dvi -+fi diff --git a/wv-wvmime-tmp-filename.patch b/wv-wvmime-tmp-filename.patch deleted file mode 100644 index 962940f..0000000 --- a/wv-wvmime-tmp-filename.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- ./wvMime.tmp-filename 2004-05-14 07:18:23.000000000 +0200 -+++ ./wvMime 2004-05-14 08:18:18.000000000 +0200 -@@ -42,34 +42,37 @@ - - # temporary PS file, mangled to get some sort - # of semi-uniqueness --FILE=`basename ${1}` --TMPDIR="/tmp/${FILE}-${USER}-${$}" --TMPPS="$TMPDIR/${FILE}-${USER}-${$}.ps" -- --mkdir $TMPDIR -+FILE="`basename "${1}"`" -+TMPDIR=$(mktemp -d /tmp/wvMime.XXXXXXXX) || { echo "$0: can not create temporary directory" >& 2; exit 1; } -+TMPPS="$TMPDIR/tmp.ps" -+TMPFILE="$TMPDIR/tmpfile" -+TMPTEX="$TMPDIR/tmp.tex" -+#TMPPS="$TMPDIR/${FILE}-${USER}-${$}.ps" - - # Make sure all graphics go into /tmp as well --cp ${1} $TMPDIR/$FILE -+cp "${1}" "$TMPFILE" - - # Extract graphics --wvLatex "$TMPDIR/$FILE" "$TMPDIR/$FILE.tex" 2>/dev/null >/dev/null -+wvLatex "$TMPFILE" "$TMPTEX" 2>/dev/null >/dev/null - - # Graphics conversion if make_epses.sh installed: --STEM=$TMPDIR/`basename ${1} .doc` --type make_epses.sh 2>&1 >/dev/null -- if [ ${?} -eq "0" ]; then -- (cd $TMPDIR; make_epses.sh $STEM) -- fi -+#STEM=$TMPDIR/"`basename "${1}" .doc`" -+#type make_epses.sh >/dev/null 2>&1 -+# if [ ${?} -eq "0" ]; then -+# (cd $TMPDIR; make_epses.sh $STEM) -+# fi - --wvPS $TMPDIR/$FILE ${TMPPS} -+cd $TMPDIR -+wvPS `basename $TMPFILE` `basename ${TMPPS}` - if [ ${?} -ne "0" ]; then - echo "Could not translate into Postscript" -+ rm -rf $TMPDIR - exit 1 - fi - - # call our ghost-viewer --${GV} ${TMPPS} --rm -f ${TMPPS} -+${GV} "${TMPPS}" -+rm -f "${TMPPS}" - - cd / - rm -rf $TMPDIR diff --git a/wv-wvtext-tmp.patch b/wv-wvtext-tmp.patch deleted file mode 100644 index c7861f8..0000000 --- a/wv-wvtext-tmp.patch +++ /dev/null @@ -1,107 +0,0 @@ ---- wvText.in -+++ wvText.in -@@ -3,24 +3,50 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ - datadir=@datadir@ --tmpdir=/tmp -+tmpdir=$(mktemp -d /tmp/wvText.XXXXXXXX) || { echo "$0: can not create temporary directory" >& 2; exit 1; } -+i_file= -+o_file= - - # argument checking --if [ ${#} -ne "2" ]; then -- echo "Usage: ${0} " -+ -+case ${#} in -+ 1) -+ i_file=${1} -+ o_file=- -+ ;; -+ 2) -+ i_file=${1} -+ o_file=${2} -+ ;; -+ *) -+ echo "Usage: `basename ${0}` []" - exit 1 --fi -+ ;; -+esac - - # start out optimistic --USING_LYNX=1 --which lynx >/dev/null 2>&1 --if [ ${?} -ne "0" ]; then -- echo "Could not find required program 'lynx'" -- echo "Not using lynx. Ouput will be pretty bad." -- USING_LYNX=0 --fi -+USING_BROWSER=1 -+BROWSER_CMD="w3m -dump -T text/html" -+browser=none -+ -+which lynx >& /dev/null && browser=lynx -+which w3m >& /dev/null && browser=w3m -+ -+case $browser in -+ w3m) -+ BROWSER_CMD="w3m -dump -T text/html" -+ ;; -+ lynx) -+ BROWSER_CMD="lynx -dump -force_html" -+ ;; -+ *) -+ echo "Neither w3m nor lynx found" -+ echo "Output will be pretty bad." -+ USING_BROWSER=0 -+ ;; -+esac - --if [ ${USING_LYNX} -ne "0" ]; then -+if [ ${USING_BROWSER} -ne "0" ]; then - - # first, test for wvHtml - which wvHtml >/dev/null 2>&1 -@@ -32,25 +58,34 @@ - # intermediate file - TMP_FILE="wv$$.html" - -- wvHtml "${1}" --targetdir="${tmpdir}" "${TMP_FILE}" >/dev/null 2>&1 -+ wvHtml "$i_file" --targetdir="${tmpdir}" "${TMP_FILE}" >/dev/null 2>&1 - if [ ${?} -ne "0" ]; then -- echo "Could not convert into HTML" -+ echo "Could not convert $i_file into HTML" - exit 1 - fi - - # lynx actually does quite well -- TERM=vt100 lynx -dump -force_html "${tmpdir}/${TMP_FILE}" > "${2}" -+ # Output to stdout requested -+ if test "x$o_file" = "x-"; then -+ TERM=vt100 ${BROWSER_CMD} "${tmpdir}/${TMP_FILE}" -+ else -+ TERM=vt100 ${BROWSER_CMD} "${tmpdir}/${TMP_FILE}" > "$o_file" -+ fi - if [ ${?} -ne "0" ]; then -- echo "Could not convert into Text" -+ echo "Could not convert $i_file into Text" - exit 1 - fi - - # clean up -- rm -f "${tmpdir}/${TMP_FILE}" -+ rm -rf "${tmpdir}" - - 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}" -+ if test "x$o_file" = "x-"; then -+ wvWare -x ${datadir}/wv/wvText.xml "$i_file" -+ else -+ wvWare -x ${datadir}/wv/wvText.xml "$i_file" > "$o_file" -+ fi - fi - diff --git a/wv.spec b/wv.spec index 5400313..2fe51d3 100644 --- a/wv.spec +++ b/wv.spec @@ -1,15 +1,16 @@ Name: wv Summary: MSWord 6/7/8/9 binary file format to HTML converter Version: 1.2.4 -Release: 1%{?dist} -License: GPL +Release: 4%{?dist} +License: GPLv2+ Group: Applications/Text URL: http://wvware.sourceforge.net -Source: http://dl.sf.net/wvware/wv-%{version}.tar.gz +Source: http://dl.sourceforge.net/wvware/wv-%{version}.tar.gz #Patch0: wv-wvtext-tmp.patch #Patch1: wv-1.0.3-oledecod.patch #Patch2: wv-1.0.3-gcc4.patch Patch5: wv-1.0.0-rhbug150461.patch +Patch6: wv-1.2.4-pkgconfig.patch BuildRequires: glib2-devel BuildRequires: libjpeg-devel @@ -45,6 +46,7 @@ This package contains the development files #%patch1 -p1 -b .oledecod #%patch2 -p1 -b .gcc4 %patch5 -p1 -b .printf-rhbug150461 +%patch6 -p1 -b .pkgconfig %build @@ -85,6 +87,16 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Mar 30 2008 Michel Salim - 1.2.4-4 +- fix libdir in wv's pkgconfig entry + +* Mon Feb 18 2008 Fedora Release Engineering - 1.2.4-3 +- Autorebuild for GCC 4.3 + +* Sun Aug 26 2007 Aurelien Bompard 1.2.4-2 +- fix license tag +- rebuild for BuildID + * Sat Oct 28 2006 Aurelien Bompard 1.2.4-1 - update to 1.2.4, fixes #212696 (CVE-2006-4513) From ac97593b41112ae88dcbb984786c6a467c40cdd7 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:19:20 +0000 Subject: [PATCH 4/5] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6e1d8c7..9b85549 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := wv SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 4781d7f19ca51af04f6196412411159f8d6c9e47 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:27:34 +0000 Subject: [PATCH 5/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 9b85549..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wv -# $Id$ -NAME := wv -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 42f697a..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-5