From 8634821c7ff6529bde5b9147f316cc98cce7c49d Mon Sep 17 00:00:00 2001
From: Olivier Bilodeau <olivier@bottomlesspit.org>
Date: Wed, 7 Mar 2012 12:28:44 -0500
Subject: [PATCH 1/4] fixed /.htaccess: statements wrongly prefixed by -e

---
 .htaccess | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.htaccess b/.htaccess
index cdd32a2..42257ce 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,6 +1,6 @@
--e Options FollowSymLinks
--e php_flag register_globals off
--e php_flag register_long_arrays on
--e AddType application/x-x509-ca-cert .crt  .pem
--e AddType application/pkix-crl    .crl
--e AddType application/pkix-cert   .cer .der
+Options FollowSymLinks
+php_flag register_globals off
+php_flag register_long_arrays on
+AddType application/x-x509-ca-cert .crt  .pem
+AddType application/pkix-crl    .crl
+AddType application/pkix-cert   .cer .der

From 04d13ce7ea5f692299b2cfa5160a7f4da6197c7a Mon Sep 17 00:00:00 2001
From: Olivier Bilodeau <olivier@bottomlesspit.org>
Date: Wed, 7 Mar 2012 12:29:33 -0500
Subject: [PATCH 2/4] fix: README was renamed README.md but this reference was
 not updated

---
 readme.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.php b/readme.php
index 513efe0..c247a34 100644
--- a/readme.php
+++ b/readme.php
@@ -7,7 +7,7 @@ include('./include/common.php');
 printHeader('setup');
 print '<center><font color=red><h1>READ ME</h1></font></center>';
 print '<pre>';
-readfile('./README');
+readfile('./README.md');
 print '</pre>';
 printFooter();
 ?>

From f72da73e302831e38402136bb18b4825b2840fe2 Mon Sep 17 00:00:00 2001
From: Olivier Bilodeau <olivier@bottomlesspit.org>
Date: Wed, 7 Mar 2012 12:59:49 -0500
Subject: [PATCH 3/4] fix: removed another misplaced -e coming from the
 Makefile

---
 ca/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ca/index.php b/ca/index.php
index 9a6d04d..ed365f3 100644
--- a/ca/index.php
+++ b/ca/index.php
@@ -1,3 +1,3 @@
--e <?php
+<?php
 header("Location: ./../index.php");
 ?>

From adc3e717294a694ddac8d245bad1de4d58478a8f Mon Sep 17 00:00:00 2001
From: Olivier Bilodeau <olivier@bottomlesspit.org>
Date: Wed, 7 Mar 2012 14:09:05 -0500
Subject: [PATCH 4/4] added instruction step regarding permissions

otherwise unlink, altering config and creating new symlinks all fails after setup
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 8347aed..bd5a114 100644
--- a/README.md
+++ b/README.md
@@ -60,6 +60,7 @@ Unpack the PHPki tarball onto your web server. For example:
 	cp phpki.tar.gz /var/tmp
 	cd /var/www/html
 	tar -xzvf /var/tmp/phpki.tar.gz
+	chown <apache-user> -R phpki/
 
 To configure the certificate authority and create your root certificate,
 point your browser to where you unpacked PHPki. For example: