lovely sandbox access violations

4 files changed, 163 insertions, 8 deletions

diff --git a/app-office/qhacc/ChangeLog b/app-office/qhacc/ChangeLog
index 8171aad0104b..8833360d84b2 100644
--- a/app-office/qhacc/ChangeLog
+++ b/app-office/qhacc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/qhacc
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/qhacc/ChangeLog,v 1.15 2004/10/11 23:01:13 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/qhacc/ChangeLog,v 1.16 2004/10/14 00:21:47 carlo Exp $
+
+  14 Oct 2004; Carsten Lohrke <carlo@gentoo.org>
+  +files/qhacc-3.2.1-sandbox.patch, qhacc-3.2.1.ebuild:
+  lovely sandbox access violations
 
   12 Oct 2004; Carsten Lohrke <carlo@gentoo.org> qhacc-3.2.1.ebuild:
   removed stale xml use flag
diff --git a/app-office/qhacc/Manifest b/app-office/qhacc/Manifest
index 178b3949a4c6..ed47e3c882a6 100644
--- a/app-office/qhacc/Manifest
+++ b/app-office/qhacc/Manifest
@@ -1,8 +1,8 @@
-MD5 d002ad185cae8678c9a388309b4c53cd qhacc-3.2.1.ebuild 1990
+MD5 64cb7d41fb72ef1412fccd73e12239a7 qhacc-3.2.1.ebuild 2074
 MD5 83c62fe0b0205752729a02acccfc3ec3 qhacc-2.9.ebuild 1224
 MD5 61a87e1d85536676f392b4b02f0dbce9 qhacc-2.9.9.ebuild 1183
 MD5 27bf4edbb3e2334b0ed8dab2194a9b9d qhacc-2.9.8.ebuild 1099
-MD5 fa517cd5a61fb90bc3b7cd4902e3df62 ChangeLog 2102
+MD5 798e33cce5758a96c9d91e96bbc1e20c ChangeLog 2243
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 MD5 8411a52d54ebbb2038e2e08a9f43b238 files/qhacc-2.9-mysqlplugin-gcc-3.3.patch 982
 MD5 83196bf0c0685733494d5f401c3d926f files/qhacc-2.9-gentoo.patch 7175
@@ -10,3 +10,4 @@ MD5 703c28cb8b7fdc28c19e990234c7eea6 files/digest-qhacc-2.9.8 63
 MD5 6c5e6b109aa837699f48c94d253786ce files/digest-qhacc-2.9.9 63
 MD5 8ad038ef57072d0bd84121a74aa30c59 files/digest-qhacc-3.2.1 63
 MD5 f9848845170083de3cf3420f27f240c1 files/digest-qhacc-2.9 61
+MD5 0a30f7749fee7085b311aa0fa46ace8b files/qhacc-3.2.1-sandbox.patch 6470
diff --git a/app-office/qhacc/files/qhacc-3.2.1-sandbox.patch b/app-office/qhacc/files/qhacc-3.2.1-sandbox.patch
new file mode 100644
index 000000000000..74d4cd7a11ce
--- /dev/null
+++ b/app-office/qhacc/files/qhacc-3.2.1-sandbox.patch
@@ -0,0 +1,145 @@
+--- plugins/Makefile.in.orig	2004-10-13 22:35:19.000000000 +0200
++++ plugins/Makefile.in	2004-10-13 22:36:15.000000000 +0200
+@@ -371,7 +371,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(DESTDIR)/$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+--- plugins/ofx/Makefile.in.orig	2004-10-14 01:28:15.000000000 +0200
++++ plugins/ofx/Makefile.in	2004-10-14 01:30:07.000000000 +0200
+@@ -220,7 +220,7 @@
+ target_alias = @target_alias@
+ @OFX_TRUE@noinst_HEADERS = ofxplugin.h
+ @OFX_TRUE@lib_LTLIBRARIES = libofxio.la
+-@OFX_TRUE@pidir = $(prefix)/plugins
++@OFX_TRUE@pidir = $(DESTDIR)/$(prefix)/plugins
+ @OFX_TRUE@dbdir = $(pidir)/db
+ @OFX_TRUE@importdir = $(pidir)/import
+ @OFX_TRUE@exportdir = $(pidir)/export
+--- plugins/qif/Makefile.in.orig	2004-10-14 01:28:15.000000000 +0200
++++ plugins/qif/Makefile.in	2004-10-14 01:30:07.000000000 +0200
+@@ -219,7 +219,7 @@
+ target_alias = @target_alias@
+ @QIF_TRUE@noinst_HEADERS = qifplugin.h
+ @QIF_TRUE@lib_LTLIBRARIES = libqifio.la
+-@QIF_TRUE@pidir = $(prefix)/plugins
++@QIF_TRUE@pidir = $(DESTDIR)/$(prefix)/plugins
+ @QIF_TRUE@dbdir = $(pidir)/db
+ @QIF_TRUE@importdir = $(pidir)/import
+ @QIF_TRUE@exportdir = $(pidir)/export
+--- plugins/xml/Makefile.in.orig	2004-10-14 01:28:15.000000000 +0200
++++ plugins/xml/Makefile.in	2004-10-14 01:30:07.000000000 +0200
+@@ -227,7 +227,7 @@
+ target_alias = @target_alias@
+ @XML_TRUE@noinst_HEADERS = xmlplugin.h
+ @XML_TRUE@lib_LTLIBRARIES = libxmlio.la
+-@XML_TRUE@pidir = $(prefix)/plugins
++@XML_TRUE@pidir = $(DESTDIR)/$(prefix)/plugins
+ @XML_TRUE@dbdir = $(pidir)/db
+ @XML_TRUE@importdir = $(pidir)/import
+ @XML_TRUE@exportdir = $(pidir)/export
+--- plugins/psql/Makefile.in.orig	2004-10-14 01:28:15.000000000 +0200
++++ plugins/psql/Makefile.in	2004-10-14 01:30:07.000000000 +0200
+@@ -227,7 +227,7 @@
+ target_alias = @target_alias@
+ @PSQL_TRUE@noinst_HEADERS = psqlplugin.h
+ @PSQL_TRUE@lib_LTLIBRARIES = libpsqlio.la
+-@PSQL_TRUE@pidir = $(prefix)/plugins
++@PSQL_TRUE@pidir = $(DESTDIR)/$(prefix)/plugins
+ @PSQL_TRUE@dbdir = $(pidir)/db
+ @PSQL_TRUE@importdir = $(pidir)/import
+ @PSQL_TRUE@exportdir = $(pidir)/export
+--- plugins/reports/Makefile.in.orig	2004-10-14 01:28:15.000000000 +0200
++++ plugins/reports/Makefile.in	2004-10-14 01:30:07.000000000 +0200
+@@ -300,7 +300,7 @@
+ @PGPH_TRUE@									libaves.la libbudget.la libmbudget.la libjournal.la \
+ @PGPH_TRUE@									libtrans.la libacct.la libtbal.la
+ 
+-@PGPH_TRUE@pidir = $(prefix)/plugins
++@PGPH_TRUE@pidir = $(DESTDIR)/$(prefix)/plugins
+ @PGPH_TRUE@reportdir = $(pidir)/report
+ @PGPH_TRUE@noinst_LIBRARIES = libtemp.a
+ @PGPH_TRUE@libtemp_a_SOURCES = reporter.cpp
+--- plugins/mysql/Makefile.in.orig	2004-10-14 01:28:15.000000000 +0200
++++ plugins/mysql/Makefile.in	2004-10-14 01:30:07.000000000 +0200
+@@ -227,7 +227,7 @@
+ target_alias = @target_alias@
+ @MYSQL_TRUE@noinst_HEADERS = mysqlplugin.h
+ @MYSQL_TRUE@lib_LTLIBRARIES = libmysqlio.la
+-@MYSQL_TRUE@pidir = $(prefix)/plugins
++@MYSQL_TRUE@pidir = $(DESTDIR)/$(prefix)/plugins
+ @MYSQL_TRUE@dbdir = $(pidir)/db
+ @MYSQL_TRUE@importdir = $(pidir)/import
+ @MYSQL_TRUE@exportdir = $(pidir)/export
+--- plugins/extprg/Makefile.in.orig	2004-10-14 01:28:15.000000000 +0200
++++ plugins/extprg/Makefile.in	2004-10-14 01:30:07.000000000 +0200
+@@ -227,7 +227,7 @@
+ target_alias = @target_alias@
+ @PRG_TRUE@noinst_HEADERS = extprgplugin.h
+ @PRG_TRUE@lib_LTLIBRARIES = libextprgio.la
+-@PRG_TRUE@pidir = $(prefix)/plugins
++@PRG_TRUE@pidir = $(DESTDIR)/$(prefix)/plugins
+ @PRG_TRUE@dbdir = $(pidir)/db
+ @PRG_TRUE@importdir = $(pidir)/import
+ @PRG_TRUE@exportdir = $(pidir)/export
+--- plugins/graphs/Makefile.in.orig	2004-10-14 01:28:15.000000000 +0200
++++ plugins/graphs/Makefile.in	2004-10-14 01:30:07.000000000 +0200
+@@ -267,7 +267,7 @@
+ @PGPH_TRUE@									libdoublelinegraph.la libsinglebargraph.la \
+ @PGPH_TRUE@									libdoublebargraph.la libpiegraph.la
+ 
+-@PGPH_TRUE@pidir = $(prefix)/plugins
++@PGPH_TRUE@pidir = $(DESTDIR)/$(prefix)/plugins
+ @PGPH_TRUE@graphdir = $(pidir)/graph
+ @PGPH_TRUE@libgraphbase_la_SOURCES = grapher.cpp
+ @PGPH_TRUE@libmonthlygraph_la_SOURCES = monthlygraph.cpp
+--- plugins/archiver/Makefile.in.orig	2004-10-14 01:28:15.000000000 +0200
++++ plugins/archiver/Makefile.in	2004-10-14 01:30:07.000000000 +0200
+@@ -219,7 +219,7 @@
+ target_alias = @target_alias@
+ @ARC_TRUE@noinst_HEADERS = arcplugin.h
+ @ARC_TRUE@lib_LTLIBRARIES = libarcio.la
+-@ARC_TRUE@pidir = $(prefix)/plugins
++@ARC_TRUE@pidir = $(DESTDIR)/$(prefix)/plugins
+ @ARC_TRUE@importdir = $(pidir)/import
+ @ARC_TRUE@exportdir = $(pidir)/export
+ @ARC_TRUE@libarcio_la_SOURCES = arcplugin.cpp
+--- plugins/upgrade/Makefile.in.orig	2004-10-14 01:28:15.000000000 +0200
++++ plugins/upgrade/Makefile.in	2004-10-14 01:30:07.000000000 +0200
+@@ -227,7 +227,7 @@
+ target_alias = @target_alias@
+ @UPG_TRUE@noinst_HEADERS = upgplugin.h
+ @UPG_TRUE@lib_LTLIBRARIES = libupgradeio.la
+-@UPG_TRUE@pidir = $(prefix)/plugins
++@UPG_TRUE@pidir = $(DESTDIR)/$(prefix)/plugins
+ @UPG_TRUE@dbdir = $(pidir)/db
+ @UPG_TRUE@libupgradeio_la_SOURCES = upgplugin.cpp upgplugin.h
+ @UPG_TRUE@RELEASE = 2:0:0
+--- plugins/sqlite/Makefile.in.orig	2004-10-14 01:28:15.000000000 +0200
++++ plugins/sqlite/Makefile.in	2004-10-14 01:30:07.000000000 +0200
+@@ -234,7 +234,7 @@
+ target_alias = @target_alias@
+ @SQLL_TRUE@noinst_HEADERS = sqliteplugin.h lfsqliteplugin.h
+ @SQLL_TRUE@lib_LTLIBRARIES = libsqliteio.la liblfsqliteio.la
+-@SQLL_TRUE@pidir = $(prefix)/plugins
++@SQLL_TRUE@pidir = $(DESTDIR)/$(prefix)/plugins
+ @SQLL_TRUE@dbdir = $(pidir)/db
+ @SQLL_TRUE@importdir = $(pidir)/import
+ @SQLL_TRUE@exportdir = $(pidir)/export
+--- plugins/cliimp/Makefile.in.orig	2004-10-14 01:48:52.000000000 +0200
++++ plugins/cliimp/Makefile.in	2004-10-14 01:52:29.000000000 +0200
+@@ -520,8 +520,8 @@
+ @CLIIMP_TRUE@	rm -f *.o *.core core *~ .*~ *.la *.lo
+ 
+ @CLIIMP_TRUE@install-data-local:
+-@CLIIMP_TRUE@	mkdir -p $(impdir)
+-@CLIIMP_TRUE@	if test ! -L $(impdir)/libcliimpio.so ; then cd $(impdir) && ln -s $(libdir)/libcliimpio.so $(impdir) ; fi
++@CLIIMP_TRUE@	mkdir -p $(DESTDIR)/$(impdir)
++@CLIIMP_TRUE@	if test ! -L $(DESTDIR)/$(impdir)/libcliimpio.so ; then cd $(DESTDIR)/$(impdir) && ln -s $(DESTDIR)/$(libdir)/libcliimpio.so $(DESTDIR)/$(impdir) ; fi
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/app-office/qhacc/qhacc-3.2.1.ebuild b/app-office/qhacc/qhacc-3.2.1.ebuild
index 3aa18d342842..d50469ccc1b4 100644
--- a/app-office/qhacc/qhacc-3.2.1.ebuild
+++ b/app-office/qhacc/qhacc-3.2.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/qhacc/qhacc-3.2.1.ebuild,v 1.3 2004/10/11 23:01:13 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/qhacc/qhacc-3.2.1.ebuild,v 1.4 2004/10/14 00:21:47 carlo Exp $
 
 inherit libtool kde-functions eutils
 
-DESCRIPTION="Personal Finance for QT"
+DESCRIPTION="Personal Finance for Qt"
 HOMEPAGE="http://qhacc.sourceforge.net/"
 SRC_URI="mirror://sourceforge/qhacc/${P}.tar.gz"
 
@@ -21,9 +21,14 @@ RDEPEND="mysql? ( dev-db/mysql++ )
 	sqlite? ( dev-db/sqlite )"
 need-qt 3
 
-src_compile() {
+src_unpack() {
+	unpack ${A}
+	cd ${S}
 	elibtoolize
+	epatch ${FILESDIR}/${P}-sandbox.patch
+}
 
+src_compile() {
 	local myconf="--libdir=/usr/lib/qhacc --bindir=/usr/bin --includedir=/usr/include --datadir=/usr/share/qhacc
 			$(use_enable mysql)
 			$(use_enable postgres psql)
@@ -52,10 +57,10 @@ src_install() {
 }
 
 pkg_postinst() {
-	echo
+	echo ""
 	einfo "A sample configuration is provided in /usr/share/qhacc/easysetup."
 	einfo "copy files: \`mkdir ~/.qhacc ; cp /usr/share/qhacc/easysetup/* ~/.qhacc\`"
 	einfo "run program: \`qhacc -f ~/.qhacc/\`"
 	einfo "set alias: \`echo -e \\\n \"alias qhacc=\\\"qhacc -f ~/.qhacc\\\"\" >> ~/.bashrc\`"
-	echo
+	echo ""
 }