Fixes based on feedback from test users

3 files changed, 34 insertions, 8 deletions

diff --git a/dev-php/jpgraph/ChangeLog b/dev-php/jpgraph/ChangeLog
index 3b91594d1c29..f4416b420b94 100644
--- a/dev-php/jpgraph/ChangeLog
+++ b/dev-php/jpgraph/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-php/jpgraph
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/jpgraph/ChangeLog,v 1.1 2003/08/04 00:33:41 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/jpgraph/ChangeLog,v 1.2 2003/08/04 23:43:56 stuart Exp $
+
+*dev-php/jpgraph-1.12.2 (05 Aug 2003)
+
+  05 Aug 2003; Stuart Herbert <stuart@gentoo.org> jpgraph-1.12.2.ebuild:
+  Tightened up permissions on the cache directory.
+  READ_CACHE is now false if USE_CACHE is false.
+  Fixed the sed patching code.
 
 *dev-php/jpgraph-1.12.2 (04 Aug 2003)
 
diff --git a/dev-php/jpgraph/Manifest b/dev-php/jpgraph/Manifest
index c0cc1e46667f..cca496e4ff48 100644
--- a/dev-php/jpgraph/Manifest
+++ b/dev-php/jpgraph/Manifest
@@ -1,3 +1,3 @@
-MD5 325d87d80dd79570507f3d7a33b13ecc jpgraph-1.12.2.ebuild 2561
-MD5 0d5ce14dd4774f3260cf73d1c3d89f38 ChangeLog 678
+MD5 26d2bf3e442e98c20392782482d78f7e jpgraph-1.12.2.ebuild 2398
+MD5 f3e1aaed1c4a3849ac6ec88b7fb5bb0c ChangeLog 678
 MD5 4f6fb9ae9a7dd1daf9b37c4b458bf0d3 files/digest-jpgraph-1.12.2 67
diff --git a/dev-php/jpgraph/jpgraph-1.12.2.ebuild b/dev-php/jpgraph/jpgraph-1.12.2.ebuild
index 800a1009536a..f81601672172 100644
--- a/dev-php/jpgraph/jpgraph-1.12.2.ebuild
+++ b/dev-php/jpgraph/jpgraph-1.12.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Released under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-php/jpgraph/jpgraph-1.12.2.ebuild,v 1.2 2003/08/04 01:21:56 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/jpgraph/jpgraph-1.12.2.ebuild,v 1.3 2003/08/04 23:43:56 stuart Exp $
 #
 # Based on the ebuild submitted by ??
 
@@ -44,12 +44,31 @@ pkg_setup ()
 
 src_install ()
 {
-	sed -i 's|DEFINE("CACHE_FILE_GROUP", "wwwadmin");|DEFINE("CACHE_FILE_GROUP", "${HTTPD_GROUP}";|' src/jpgraph.php
-	sed -i 's|/tmp/jpgraph_cache/|${JPGRAPH_CACHE_DIR}/|g' src/jpgraph.php
+	einfo "Patching jpgraph.php"
+	
+	# patch 1:
+	# make jpgraph use the correct group for file permissions
 
-	sed -i 's|DEFINE("USE_CACHE",false);|if (!defined("USE_CACHE")) DEFINE("USE_CACHE", false);|' src/jpgraph.php
+	sed -i "s|^DEFINE(\"CACHE_FILE_GROUP\",\"wwwadmin\");|DEFINE(\"CACHE_FILE_GROUP\", \"${HTTPD_GROUP}\";|" src/jpgraph.php
+
+	# patch 2:
+	# make jpgraph use the correct directory for caching
+
+	sed -i "s|/tmp/jpgraph_cache/|${JPGRAPH_CACHE_DIR}/|g;" src/jpgraph.php
+
+	# patch 3:
+	# switch off the directory cache
+
+	sed -i 's|^DEFINE("USE_CACHE",false);|if (!defined("USE_CACHE")) DEFINE("USE_CACHE", false);|' src/jpgraph.php
+
+	# patch 4:
+	# don't read the READ_CACHE if we're not creating any images in the
+	# cache in the first place (doh)
+
+	sed -i 's|DEFINE("READ_CACHE",true);|DEFINE("READ_CACHE", $USE_CACHE);|' src/jpgraph.php
 
 	# install php files
+	einfo "Building list of files to install"
 	php-lib_src_install src `cd src ; find . -type f -print`
 
 	# install documentation
@@ -62,5 +81,5 @@ src_install ()
 
 	keepdir "${JPGRAPH_CACHE_DIR}"
 	fowners ${HTTPD_USER}.${HTTPD_GROUP} "${JPGRAPH_CACHE_DIR}"
-	fperms 777 "${JPGRAPH_CACHE_DIR}"
+	fperms 700 "${JPGRAPH_CACHE_DIR}"
 }