- update to 3.3.1

- add stage support
- update WWW

2 files changed, 15 insertions, 12 deletions

diff --git a/databases/pgpoolAdmin/files/patch-.htaccess b/databases/pgpoolAdmin/files/patch-.htaccess
new file mode 100644
index 000000000000..6ff2258e7da4
--- /dev/null
+++ b/databases/pgpoolAdmin/files/patch-.htaccess
@@ -0,0 +1,15 @@
+--- ./.htaccess.orig	2014-08-31 11:25:27.000000000 +0200
++++ ./.htaccess	2014-08-31 11:25:51.000000000 +0200
+@@ -1,5 +1,12 @@
++<IfVersion <= 2.4>
+ <Files ~ "\.tpl|NEWS|ChangeLog">
+ Order allow,deny
+ deny from all
+ satisfy all
+ </Files>
++</IfVersion>
++<IfVersion >= 2.4>
++<Files ~ "\.tpl|NEWS|ChangeLog">
++Require all denied
++</Files>
++</IfVersion>
diff --git a/databases/pgpoolAdmin/files/patch-status.tpl b/databases/pgpoolAdmin/files/patch-status.tpl
deleted file mode 100644
index 19984c994051..000000000000
--- a/databases/pgpoolAdmin/files/patch-status.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
---- templates/status.tpl.orig	Tue Apr 10 18:48:12 2007
-+++ templates/status.tpl	Tue Apr 10 19:58:35 2007
-@@ -183,7 +183,8 @@
-     {/if}
- </p>
- {else}
--{$message.strStopPgpool|escape}
-+  <p>{$message.strStopPgpool|escape}</p>
-+  <div id="status"></div>
- {/if}
- <h2>{$message.strPgpool|escape}</h2>
-     {if $pgpoolIsActive == false}