From 2d09734a3b18f22a8217eb8e6e6c61becbab6ef1 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Oct 21 2010 04:28:43 +0000
Subject: Merge branch 'f12' into el5


---

diff --git a/gnucash-1.8.6-64bit-fixes.patch b/gnucash-1.8.6-64bit-fixes.patch
deleted file mode 100644
index 31d0d69..0000000
--- a/gnucash-1.8.6-64bit-fixes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnucash-1.8.6/src/gnome-utils/gnc-html.c.64bit-fixes	2003-04-12 19:03:30.000000000 +0200
-+++ gnucash-1.8.6/src/gnome-utils/gnc-html.c	2003-10-02 11:06:06.000000000 +0200
-@@ -1315,7 +1315,7 @@ gnc_html_set_button_cb(gnc_html * html, 
- static gboolean 
- raw_html_receiver (gpointer     engine,
-                    const gchar *data,
--                   guint        len,
-+                   size_t       len,
-                    gpointer     user_data)
- {
-   FILE *fh = (FILE *) user_data;
diff --git a/gnucash-2.0.5-libofx.patch b/gnucash-2.0.5-libofx.patch
deleted file mode 100644
index 5d36143..0000000
--- a/gnucash-2.0.5-libofx.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- gnucash-2.0.5/configure.moo	2007-02-24 01:41:41.000000000 -0500
-+++ gnucash-2.0.5/configure	2007-02-24 01:41:41.000000000 -0500
-@@ -27485,44 +27485,6 @@
- 	LIBOFX_CFLAGS="-I${OFXPREFIX}/include"
-     fi
- 
--    ### Check libofx version
--    # Obtain version string
--    { echo "$as_me:$LINENO: checking for libofx version >= 0.7.0" >&5
--echo $ECHO_N "checking for libofx version >= 0.7.0... $ECHO_C" >&6; }
--    if test x${OFXPREFIX} = x ; then
--	ofx_version_output=`ofxdump --version`
--    else
--	ofx_version_output=`${OFXPREFIX}/bin/ofxdump --version`
--    fi
--    # Extract version number; output format changed from 0.6.x to 0.7.x
--    LIBOFX_VERSION=`echo ${ofx_version_output} | sed 's/\([^0-9]*\)\([0-9]*\.\)/\2/' `
--    LIBOFX_VERSION_MAJOR=`echo ${LIBOFX_VERSION} | cut -d. -f1`
--    LIBOFX_VERSION_MINOR=`echo ${LIBOFX_VERSION} | cut -d. -f2`
--    # Make sure the numbers are not empty
--    if test x${LIBOFX_VERSION_MAJOR} = x ; then
--	LIBOFX_VERSION_MAJOR=0
--    fi
--    if test x${LIBOFX_VERSION_MINOR} = x ; then
--	LIBOFX_VERSION_MINOR=0
--    fi
--    # Now check for >= 0.7.x or >= 1.x.x
--    if test "${LIBOFX_VERSION_MAJOR}" -ge 1 -o \
--	     "${LIBOFX_VERSION_MINOR}" -ge 7; then
--	# This is libofx >= 0.7.x
--	{ echo "$as_me:$LINENO: result: found ${LIBOFX_VERSION}" >&5
--echo "${ECHO_T}found ${LIBOFX_VERSION}" >&6; }
--    else
--        if test x${want_ofx} = xyes ; then
--	    { { echo "$as_me:$LINENO: error: found ${LIBOFX_VERSION}; Libofx 0.7.0 or newer needed for ofx support" >&5
--echo "$as_me: error: found ${LIBOFX_VERSION}; Libofx 0.7.0 or newer needed for ofx support" >&2;}
--   { (exit 1); exit 1; }; }
--        else
--	    { echo "$as_me:$LINENO: result: found ${LIBOFX_VERSION}; Libofx 0.7.0 or newer needed for ofx support" >&5
--echo "${ECHO_T}found ${LIBOFX_VERSION}; Libofx 0.7.0 or newer needed for ofx support" >&6; }
--            want_ofx=no
--        fi
--    fi
--
-     if test "x${want_ofx}" != xno ; then
-         # Version number verified. Now check header files.
-         { echo "$as_me:$LINENO: checking for libofx/libofx.h" >&5
diff --git a/gnucash.spec b/gnucash.spec
index a7791cf..847154e 100644
--- a/gnucash.spec
+++ b/gnucash.spec
@@ -4,7 +4,7 @@ Name: gnucash
 Summary: Finance management application
 Version: 2.2.9
 URL: http://gnucash.org/
-Release: 4%{?dist}.1
+Release: 5%{?dist}
 License: GPLv2+
 Group: Applications/Productivity
 Source: http://www.gnucash.org/pub/gnucash/sources/stable/gnucash-%{version}.tar.lzma
@@ -82,6 +82,7 @@ rm -rf $RPM_BUILD_ROOT/%{_infodir} \
 	$RPM_BUILD_ROOT/%{_datadir}/gnome/apps \
 	$RPM_BUILD_ROOT/%{_libdir}/pkgconfig \
 	$RPM_BUILD_ROOT/%{_bindir}/gnucash-config
+	$RPM_BUILD_ROOT/%{_bindir}/gnc-test-env
 
 find $RPM_BUILD_ROOT/%{_libdir} -name *.la -exec rm -f {} \;
 
@@ -133,6 +134,9 @@ fi
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
+* Thu Oct 21 2010 Bill Nottingham <notting@redhat.com>
+- don't ship gnc-test-env (#644933, CVE-2010-3999)
+
 * Mon Jan 18 2010 Bill Nottingham <notting@redhat.com>
 - Fix crash on exporting account tree (#544454, #550362, #546597)