diff --git a/www/webacula/Makefile b/www/webacula/Makefile
index 273f338afb5..55c23903f81 100644
--- a/www/webacula/Makefile
+++ b/www/webacula/Makefile
@@ -1,10 +1,8 @@
-# $OpenBSD: Makefile,v 1.10 2011/07/22 10:20:11 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2011/07/28 09:24:35 ajacoutot Exp $
 
 COMMENT=	bacula(8) web interface
 
-DISTNAME=	webacula-5.0.3
-
-REVISION=	8
+DISTNAME=	webacula-5.5
 
 CATEGORIES=	www sysutils
 
@@ -36,11 +34,8 @@ SUBST_VARS=	INSTDIR TINSTDIR
 do-install:
 	mv ${WRKSRC} ${INSTDIR}
 	${SUBST_CMD} ${INSTDIR}/application/config.ini \
-		${INSTDIR}/install/webacula.conf
-.for i in install/webacula_mysql_create_database.sh \
-	install/webacula_postgresql_create_database.sh \
-	install/webacula_postgresql_make_tables.sh \
-	application/config.ini
+		${INSTDIR}/install/apache/webacula.conf
+.for i in install/db.conf application/config.ini
 	mv ${INSTDIR}/$i ${INSTDIR}/$i.dist
 .endfor
 	${SUBST_CMD} -c ${FILESDIR}/webacula-chroot-bconsole.sh \
diff --git a/www/webacula/distinfo b/www/webacula/distinfo
index 456e75a2256..4284a946827 100644
--- a/www/webacula/distinfo
+++ b/www/webacula/distinfo
@@ -1,5 +1,5 @@
-MD5 (webacula-5.0.3.tar.gz) = CjuR41079VRX9MeLOILCwg==
-RMD160 (webacula-5.0.3.tar.gz) = 547z1TuRTW40n+rLgN9p15RYMMY=
-SHA1 (webacula-5.0.3.tar.gz) = o/o/AaRqrCuWrLwixmJbVJcH/ag=
-SHA256 (webacula-5.0.3.tar.gz) = X1+/Dkae4MW/skFu7oyaocpYd12bjrrAHN2HzzW3hMg=
-SIZE (webacula-5.0.3.tar.gz) = 425748
+MD5 (webacula-5.5.tar.gz) = 1/UlYkeDbdxmOmMT48AZ0g==
+RMD160 (webacula-5.5.tar.gz) = 7thdPI/qWCdGTjGzF4SvS9jWuNs=
+SHA1 (webacula-5.5.tar.gz) = L19eO5tFyo9oyi8K9GskKiR1qlk=
+SHA256 (webacula-5.5.tar.gz) = xi47kj+w3JEJV3uM6nhj0yxPL/pCsA6/3kyJ6ctWxg0=
+SIZE (webacula-5.5.tar.gz) = 757935
diff --git a/www/webacula/patches/patch-application_config_ini b/www/webacula/patches/patch-application_config_ini
index 47d9a6fd2ee..ecde7df8acd 100644
--- a/www/webacula/patches/patch-application_config_ini
+++ b/www/webacula/patches/patch-application_config_ini
@@ -1,8 +1,15 @@
-$OpenBSD: patch-application_config_ini,v 1.1.1.1 2011/03/21 18:01:09 ajacoutot Exp $
---- application/config.ini.orig	Mon Mar 21 15:13:26 2011
-+++ application/config.ini	Mon Mar 21 15:15:41 2011
-@@ -10,20 +10,20 @@ db.config.host = localhost
- db.config.username = root
+$OpenBSD: patch-application_config_ini,v 1.2 2011/07/28 09:24:35 ajacoutot Exp $
+--- application/config.ini.orig	Wed May 11 10:20:56 2011
++++ application/config.ini	Thu Jul 28 10:47:40 2011
+@@ -5,25 +5,25 @@
+ 
+ [general]
+ ;; supported adapters : PDO_MYSQL, PDO_PGSQL, PDO_SQLITE  
+-db.adapter = PDO_MYSQL
++db.adapter = PDO_PGSQL
+ db.config.host = localhost
+-db.config.username = root
++db.config.username = postgres
  db.config.password =
  db.config.dbname = bacula
 -;; for Sqlite db.config.dbname = "/full patch/bacula.db"
@@ -14,7 +21,7 @@ $OpenBSD: patch-application_config_ini,v 1.1.1.1 2011/03/21 18:01:09 ajacoutot E
 +def.timezone = "Europe/London"
  
  ;; if locale undefined, webacula use autodetect
- ;; avaliable locales : en, de, fr, pt_BR, ru, it, es
+ ;; avaliable locales : en, cs, de, fr, pt_BR, ru, it, es
  ; locale = "en"
  
  ;; see INSTALL file for details
@@ -25,14 +32,14 @@ $OpenBSD: patch-application_config_ini,v 1.1.1.1 2011/03/21 18:01:09 ajacoutot E
 +bacula.bconsole = "${LOCALBASE}/sbin/bconsole"
 +bacula.bconsolecmd = "-n -c ${SYSCONFDIR}/bacula/bconsole.conf"
  
- ;; Directory "tmpdir" which will be saved the file, which contains a list of files to restore.
- ;; This directory and files in it should be available to read the Director service.
-@@ -73,7 +73,7 @@ db.config.host = localhost
- db.config.username = wbuser
- db.config.password = "wbpass"
- db.config.dbname = webacula
--;; for Sqlite db.config.dbname = "/var/lib/sqlite/webacula.db"
-+;; for Sqlite db.config.dbname = "/var/db/sqlite/webacula.db"
+ ;; time to live data (session and temporary data tables) for restore files (sec)
+ ; default = 1h
+@@ -62,7 +62,7 @@ fontsize   = 10
  
+ [webacula]
  email.to_admin = root@localhost
- email.from = webacula@localhost
+-email.from = webacula@localhost
++email.from = root@localhost
+ 
+ 
+ 
diff --git a/www/webacula/patches/patch-html_index_php b/www/webacula/patches/patch-html_index_php
new file mode 100644
index 00000000000..0d78a268bfb
--- /dev/null
+++ b/www/webacula/patches/patch-html_index_php
@@ -0,0 +1,15 @@
+$OpenBSD: patch-html_index_php,v 1.3 2011/07/28 09:24:35 ajacoutot Exp $
+--- html/index.php.orig	Thu Jul 28 10:41:02 2011
++++ html/index.php	Thu Jul 28 10:44:37 2011
+@@ -36,8 +36,10 @@ if ( APPLICATION_ENV == 'development') {
+ }
+ 
+ // PATH_SEPARATOR  ":"
+-set_include_path('.' . PATH_SEPARATOR . __DIR__ . '/../library' . PATH_SEPARATOR . '../application/models/' .
++set_include_path('.' . PATH_SEPARATOR . dirname(__FILE__) . '/../library' . PATH_SEPARATOR . '../application/models/' .
+     PATH_SEPARATOR . '../application/forms/' .
++    PATH_SEPARATOR . '/zendframework' .
++    PATH_SEPARATOR . '/var/www/zendframework' .
+     PATH_SEPARATOR . get_include_path() );
+ 
+ include "Zend/Loader.php";
diff --git a/www/webacula/patches/patch-install_SqLite_10_make_tables_sh b/www/webacula/patches/patch-install_SqLite_10_make_tables_sh
new file mode 100644
index 00000000000..213100c5235
--- /dev/null
+++ b/www/webacula/patches/patch-install_SqLite_10_make_tables_sh
@@ -0,0 +1,12 @@
+$OpenBSD: patch-install_SqLite_10_make_tables_sh,v 1.1 2011/07/28 09:24:35 ajacoutot Exp $
+--- install/SqLite/10_make_tables.sh.orig	Wed Jul 27 11:39:55 2011
++++ install/SqLite/10_make_tables.sh	Wed Jul 27 11:40:05 2011
+@@ -55,7 +55,7 @@ INSERT INTO webacula_version (versionId) VALUES (5);
+ END-OF-DATA
+ 
+ # access by apache
+-chgrp apache ${db_name_sqlite}
++chgrp www ${db_name_sqlite}
+ chmod g+rw ${db_name_sqlite}
+ 
+ echo "Sqlite : Webacula Logbook created"
diff --git a/www/webacula/patches/patch-install_SqLite_20_acl_make_tables_sh b/www/webacula/patches/patch-install_SqLite_20_acl_make_tables_sh
new file mode 100644
index 00000000000..78096bbaf84
--- /dev/null
+++ b/www/webacula/patches/patch-install_SqLite_20_acl_make_tables_sh
@@ -0,0 +1,12 @@
+$OpenBSD: patch-install_SqLite_20_acl_make_tables_sh,v 1.1 2011/07/28 09:24:35 ajacoutot Exp $
+--- install/SqLite/20_acl_make_tables.sh.orig	Wed Jul 27 11:39:03 2011
++++ install/SqLite/20_acl_make_tables.sh	Wed Jul 27 11:39:29 2011
+@@ -274,7 +274,7 @@ CREATE TABLE webacula_php_session (
+ END-OF-DATA
+ 
+ # access by apache
+-chgrp apache ${db_name_sqlite}
++chgrp www ${db_name_sqlite}
+ chmod g+rw ${db_name_sqlite}
+ 
+ echo "Sqlite : Webacula ACLs created"
diff --git a/www/webacula/patches/patch-install_webacula_conf b/www/webacula/patches/patch-install_apache_webacula_conf
similarity index 64%
rename from www/webacula/patches/patch-install_webacula_conf
rename to www/webacula/patches/patch-install_apache_webacula_conf
index 1cafe0b6da9..1c972064c24 100644
--- a/www/webacula/patches/patch-install_webacula_conf
+++ b/www/webacula/patches/patch-install_apache_webacula_conf
@@ -1,7 +1,7 @@
-$OpenBSD: patch-install_webacula_conf,v 1.2 2011/03/28 13:38:38 ajacoutot Exp $
---- install/webacula.conf.orig	Mon Jan 24 11:58:16 2011
-+++ install/webacula.conf	Mon Mar 28 15:35:25 2011
-@@ -3,17 +3,24 @@
+$OpenBSD: patch-install_apache_webacula_conf,v 1.1 2011/07/28 09:24:35 ajacoutot Exp $
+--- install/apache/webacula.conf.orig	Wed May 11 10:20:56 2011
++++ install/apache/webacula.conf	Thu Jul 28 11:15:22 2011
+@@ -5,17 +5,24 @@
  # Allows only localhost by default
  #
  
@@ -9,13 +9,13 @@ $OpenBSD: patch-install_webacula_conf,v 1.2 2011/03/28 13:38:38 ajacoutot Exp $
 +<IfModule !mod_rewrite.c>
 +   LoadModule rewrite_module /usr/lib/apache/modules/mod_rewrite.so
 +</IfModule>
- 
++ 
 +<IfModule mod_php5.c>
 +   php_value max_execution_time 3600
 +</IfModule>
-+
+ 
  # AccessFileName .htaccess
--# RewriteLog "/var/log/httpd/rewrite.log"
+-# RewriteLog "/var/log/httpd/mod_rewrite.log"
 +# RewriteLog "/var/www/log/rewrite.log"
  # RewriteLogLevel 3
  
@@ -30,14 +30,27 @@ $OpenBSD: patch-install_webacula_conf,v 1.2 2011/03/28 13:38:38 ajacoutot Exp $
     RewriteEngine On
  
     RewriteBase   /webacula
-@@ -40,42 +47,42 @@ Alias /webacula  /usr/share/webacula/html
+@@ -30,50 +37,50 @@ Alias /webacula  /usr/share/webacula/html
  
- #   AuthType Basic
- #   AuthName "Webacula"
--#   AuthUserFile       /etc/httpd/conf/webacula.users
-+#   AuthUserFile /var/www/conf/webacula.users
- #   Require valid-user
- </Directory>
+    Options Indexes FollowSymLinks
+    AllowOverride All
+-   Order deny,allow
++   #Order deny,allow
+ 
+-   Deny from all
+-   Allow from 127.0.0.1
+-   Allow from localhost
+-   Allow from ::1
++   #Deny from all
++   #Allow from 127.0.0.1
++   #Allow from localhost
++   #Allow from ::1
+    #
+    # change the settings below
+    #
+    # Allow from <your network>
+-/Directory>
++</Directory>
  
  
 -<Directory /usr/share/webacula/docs>
@@ -76,13 +89,17 @@ $OpenBSD: patch-install_webacula_conf,v 1.2 2011/03/28 13:38:38 ajacoutot Exp $
     Deny from all
  </Directory>
  
+-<Directory /usr/share/webacula/data>
++<Directory ${TINSTDIR}/data>
+    Order deny,allow
+    Deny from all
+ </Directory>
+@@ -81,7 +88,7 @@ Alias /webacula  /usr/share/webacula/html
+ #
+ # test mod_rewrite
+ #
 -<Directory /usr/share/webacula/html/test_mod_rewrite>
 +<Directory ${TINSTDIR}/html/test_mod_rewrite>
     RewriteEngine On
     # for test mod_rewrite
     RewriteBase   /webacula/test_mod_rewrite
-@@ -93,4 +100,3 @@ Alias /webacula  /usr/share/webacula/html
-    Allow from localhost
-    Allow from ::1
- </Directory>
--
diff --git a/www/webacula/patches/patch-install_db_conf b/www/webacula/patches/patch-install_db_conf
new file mode 100644
index 00000000000..0be99a35e97
--- /dev/null
+++ b/www/webacula/patches/patch-install_db_conf
@@ -0,0 +1,12 @@
+$OpenBSD: patch-install_db_conf,v 1.1 2011/07/28 09:24:35 ajacoutot Exp $
+--- install/db.conf.orig	Thu Jul 28 10:49:12 2011
++++ install/db.conf	Thu Jul 28 10:49:24 2011
+@@ -4,7 +4,7 @@
+ db_name="bacula"
+ # for Sqlite only
+ db_name_sqlite="/var/bacula/working/bacula.db"
+-db_user="root"
++db_user="postgres"
+ 
+ # CHANGE_THIS
+ db_pwd=""
diff --git a/www/webacula/patches/patch-install_webacula_postgresql_create_database_sh b/www/webacula/patches/patch-install_webacula_postgresql_create_database_sh
deleted file mode 100644
index b3373aa3b1e..00000000000
--- a/www/webacula/patches/patch-install_webacula_postgresql_create_database_sh
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-install_webacula_postgresql_create_database_sh,v 1.1.1.1 2011/03/21 18:01:09 ajacoutot Exp $
---- install/webacula_postgresql_create_database.sh.orig	Mon Mar 21 12:16:46 2011
-+++ install/webacula_postgresql_create_database.sh	Mon Mar 21 12:17:02 2011
-@@ -12,8 +12,8 @@ db_name="webacula"
- db_user="wbuser"
- db_password="wbpass"
- 
--psql -f - -d template1 $* <<END-OF-DATA
--CREATE DATABASE ${db_name} ENCODING 'UTF8';
-+psql -f - $* <<END-OF-DATA
-+CREATE DATABASE ${db_name} TEMPLATE template0 encoding 'utf-8' ;
- ALTER DATABASE ${db_name} SET datestyle TO 'ISO, YMD';
- END-OF-DATA
- 
diff --git a/www/webacula/patches/patch-install_webacula_sqlite_create_database_sh b/www/webacula/patches/patch-install_webacula_sqlite_create_database_sh
deleted file mode 100644
index 13c0a65635f..00000000000
--- a/www/webacula/patches/patch-install_webacula_sqlite_create_database_sh
+++ /dev/null
@@ -1,19 +0,0 @@
-$OpenBSD: patch-install_webacula_sqlite_create_database_sh,v 1.1.1.1 2011/03/21 18:01:09 ajacoutot Exp $
---- install/webacula_sqlite_create_database.sh.orig	Mon Jan 24 11:58:16 2011
-+++ install/webacula_sqlite_create_database.sh	Mon Mar 21 16:53:52 2011
-@@ -1,6 +1,6 @@
- #!/bin/sh
- 
--db_name="/var/lib/sqlite/webacula.db"
-+db_name="/var/www/var/db/sqlite/webacula.db"
- 
- if [ $# -eq 1 ]
- then
-@@ -64,6 +64,6 @@ CREATE TABLE wbtmptablelist (
- END-OF-DATA
- 
- # access by apache
--chgrp apache ${db_name}
-+chgrp www ${db_name}
- chmod g+rw ${db_name}
- exit 0
diff --git a/www/webacula/pkg/PLIST b/www/webacula/pkg/PLIST
index 83aa5f12f24..7662d84ec76 100644
--- a/www/webacula/pkg/PLIST
+++ b/www/webacula/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2011/03/23 07:41:46 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.3 2011/07/28 09:24:35 ajacoutot Exp $
 webacula/
 webacula/4CONTRIBUTORS
 webacula/4CONTRIBUTORS.ru
@@ -9,6 +9,9 @@ webacula/README
 webacula/UPDATE
 webacula/application/
 webacula/application/.htaccess
+webacula/application/cli/
+webacula/application/cli/.htaccess
+webacula/application/cli/test.php
 webacula/application/config.ini.dist
 @mode 0640
 @group www
@@ -17,6 +20,8 @@ webacula/application/config.ini.dist
 @group
 webacula/application/config.ini.original
 webacula/application/controllers/
+webacula/application/controllers/AdminController.php
+webacula/application/controllers/AuthController.php
 webacula/application/controllers/BconsoleController.php
 webacula/application/controllers/ChartController.php
 webacula/application/controllers/ClientController.php
@@ -35,13 +40,24 @@ webacula/application/controllers/VolumeController.php
 webacula/application/controllers/WbjobdescController.php
 webacula/application/controllers/WblogbookController.php
 webacula/application/forms/
+webacula/application/forms/FormBaculaACL.php
+webacula/application/forms/FormBaculaCommandACL.php
+webacula/application/forms/FormBaculaFill.php
+webacula/application/forms/FormForgotPassword.php
 webacula/application/forms/FormJobdesc.php
 webacula/application/forms/FormJobrun.php
+webacula/application/forms/FormLogin.php
 webacula/application/forms/FormRestoreOptions.php
+webacula/application/forms/FormRole.php
+webacula/application/forms/FormUser.php
+webacula/application/forms/FormWebaculaACL.php
 webacula/application/layouts/
 webacula/application/layouts/default/
 webacula/application/layouts/default/dashboard.phtml
-webacula/application/layouts/default/help.phtml
+webacula/application/layouts/default/footer.phtml
+webacula/application/layouts/default/header.phtml
+webacula/application/layouts/default/login.phtml
+webacula/application/layouts/default/main-menu.phtml
 webacula/application/layouts/default/main.phtml
 webacula/application/layouts/default/printable.phtml
 webacula/application/models/
@@ -56,10 +72,23 @@ webacula/application/models/Pool.php
 webacula/application/models/Storage.php
 webacula/application/models/Timeline.php
 webacula/application/models/Version.php
+webacula/application/models/WbClientACL.php
+webacula/application/models/WbCommandACL.php
+webacula/application/models/WbDtCommands.php
+webacula/application/models/WbDtResources.php
+webacula/application/models/WbFilesetACL.php
+webacula/application/models/WbJobACL.php
+webacula/application/models/WbPoolACL.php
+webacula/application/models/WbStorageACL.php
 webacula/application/models/WbTmpTable.php
+webacula/application/models/WbWhereACL.php
 webacula/application/models/Wbjobdesc.php
 webacula/application/models/Wblogbook.php
 webacula/application/models/Wblogtype.php
+webacula/application/models/Wbphpsession.php
+webacula/application/models/Wbresources.php
+webacula/application/models/Wbroles.php
+webacula/application/models/Wbusers.php
 webacula/application/views/
 webacula/application/views/helpers/
 webacula/application/views/helpers/ConvBytes.php
@@ -70,6 +99,18 @@ webacula/application/views/helpers/Int2Char.php
 webacula/application/views/helpers/MainmenuFloat.php
 webacula/application/views/helpers/PermissionOctal2String.php
 webacula/application/views/scripts/
+webacula/application/views/scripts/admin/
+webacula/application/views/scripts/admin/form-bacula-acl.phtml
+webacula/application/views/scripts/admin/form-role.phtml
+webacula/application/views/scripts/admin/form-user.phtml
+webacula/application/views/scripts/admin/index.phtml
+webacula/application/views/scripts/admin/role-index.phtml
+webacula/application/views/scripts/admin/role-main-form.phtml
+webacula/application/views/scripts/admin/role-more-info.phtml
+webacula/application/views/scripts/admin/user-index.phtml
+webacula/application/views/scripts/auth/
+webacula/application/views/scripts/auth/forgot-password.phtml
+webacula/application/views/scripts/auth/login.phtml
 webacula/application/views/scripts/bconsole/
 webacula/application/views/scripts/bconsole/cmd.phtml
 webacula/application/views/scripts/bconsole/wterminal.phtml
@@ -77,20 +118,26 @@ webacula/application/views/scripts/client/
 webacula/application/views/scripts/client/all.phtml
 webacula/application/views/scripts/client/status-client-id.phtml
 webacula/application/views/scripts/decorators/
+webacula/application/views/scripts/decorators/formBaculaACL.phtml
+webacula/application/views/scripts/decorators/formBaculaCommandACL.phtml
+webacula/application/views/scripts/decorators/formBaculaFill.phtml
 webacula/application/views/scripts/decorators/formJobrun.phtml
 webacula/application/views/scripts/decorators/formRestoreoptions.phtml
+webacula/application/views/scripts/decorators/formRole.phtml
+webacula/application/views/scripts/decorators/formUser.phtml
+webacula/application/views/scripts/decorators/formWebaculaACL.phtml
 webacula/application/views/scripts/director/
 webacula/application/views/scripts/director/listjobtotals.phtml
 webacula/application/views/scripts/director/statusdir.phtml
 webacula/application/views/scripts/error/
+webacula/application/views/scripts/error/bacula-access-denied.phtml
 webacula/application/views/scripts/error/error.phtml
+webacula/application/views/scripts/error/webacula-access-denied.phtml
 webacula/application/views/scripts/file/
 webacula/application/views/scripts/file/list.phtml
 webacula/application/views/scripts/file/list_pagination_ctrl.phtml
 webacula/application/views/scripts/help/
-webacula/application/views/scripts/help/index_en.phtml
-webacula/application/views/scripts/help/index_ru.phtml
-webacula/application/views/scripts/help/my-id.phtml
+webacula/application/views/scripts/help/index.phtml
 webacula/application/views/scripts/help/my-php-info.phtml
 webacula/application/views/scripts/index/
 webacula/application/views/scripts/index/index.phtml
@@ -150,19 +197,39 @@ webacula/application/views/scripts/wblogbook/add.phtml
 webacula/application/views/scripts/wblogbook/index-printable.phtml
 webacula/application/views/scripts/wblogbook/index.phtml
 webacula/application/views/scripts/wblogbook/modify.phtml
+webacula/data/
+webacula/data/.htaccess
+webacula/data/README
+@owner www
+webacula/data/cache/
+@owner
+webacula/data/cache/_dummy
 webacula/docs/
 webacula/docs/.htaccess
-webacula/docs/FAQ
-webacula/docs/INSTALL
-webacula/docs/INSTALL.debian
-webacula/docs/INSTALL.es
-webacula/docs/INSTALL.fedora
-webacula/docs/INSTALL.ru
-webacula/docs/RestoreJob.txt
-webacula/docs/WebaculaTerminal.txt
-webacula/docs/Workflow.txt
+webacula/docs/html/
+webacula/docs/html/ACLs.png
+webacula/docs/html/image.png
+webacula/docs/html/install.css
+webacula/docs/html/install.html
+webacula/docs/pdf/
+webacula/docs/pdf/install.pdf
+webacula/docs/src/
+webacula/docs/src/install.tex
+webacula/docs/src/makedoc
+webacula/docs/src/pics/
+webacula/docs/src/pics/ACLs.odg
+webacula/docs/src/pics/ACLs.png
+webacula/docs/txt/
+webacula/docs/txt/FAQ.txt
+webacula/docs/txt/LogBook.txt
+webacula/docs/txt/RestoreJob.txt
+webacula/docs/txt/WebaculaTerminal.txt
+webacula/docs/txt/Workflow.txt
+webacula/docs/txt/install.txt
+webacula/docs/txt/install.ubuntu.txt
 webacula/html/
 webacula/html/.htaccess
+webacula/html/.htaccess_original
 webacula/html/favicon.ico
 webacula/html/images/
 webacula/html/images/1x1.png
@@ -176,6 +243,7 @@ webacula/html/images/dialog-ok-apply-small.png
 webacula/html/images/dialog-ok-apply.png
 webacula/html/images/disconnected.png
 webacula/html/images/document-edit.png
+webacula/html/images/documentinfo.png
 webacula/html/images/edit-delete.png
 webacula/html/images/feed-icon-14x14.png
 webacula/html/images/feed-icon-28x28.png
@@ -197,9 +265,9 @@ webacula/html/scripts/
 webacula/html/scripts/hoverIntent.js
 webacula/html/scripts/insert_tags.js
 webacula/html/scripts/jqModal.js
-webacula/html/scripts/jquery-1.3.2.min.js
+webacula/html/scripts/jquery-1.4.4.min.js
 webacula/html/scripts/jquery-blockUI.js
-webacula/html/scripts/jquery-ui-1.7.2.custom.min.js
+webacula/html/scripts/jquery-ui-1.8.6.custom.min.js
 webacula/html/scripts/jquery-ui.core.js
 webacula/html/scripts/jquery-ui.datepicker-de.js
 webacula/html/scripts/jquery-ui.datepicker-es.js
@@ -218,26 +286,26 @@ webacula/html/scripts/ui.selectmenu.js
 webacula/html/scripts/wterm.jquery.js
 webacula/html/styles/
 webacula/html/styles/default/
+webacula/html/styles/default/admin.css
 webacula/html/styles/default/dialog.css
 webacula/html/styles/default/images/
 webacula/html/styles/default/images/arrows-ffffff.png
 webacula/html/styles/default/images/shadow.png
-webacula/html/styles/default/images/ui-bg_flat_0_aaaaaa_40x100.png
-webacula/html/styles/default/images/ui-bg_flat_55_fbec88_40x100.png
-webacula/html/styles/default/images/ui-bg_glass_75_d0e5f5_1x400.png
-webacula/html/styles/default/images/ui-bg_glass_85_dfeffc_1x400.png
-webacula/html/styles/default/images/ui-bg_glass_95_fef1ec_1x400.png
-webacula/html/styles/default/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
-webacula/html/styles/default/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
-webacula/html/styles/default/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
-webacula/html/styles/default/images/ui-icons_217bc0_256x240.png
+webacula/html/styles/default/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png
+webacula/html/styles/default/images/ui-bg_flat_15_cd0a0a_40x100.png
+webacula/html/styles/default/images/ui-bg_glass_100_e4f1fb_1x400.png
+webacula/html/styles/default/images/ui-bg_glass_50_3baae3_1x400.png
+webacula/html/styles/default/images/ui-bg_glass_80_d7ebf9_1x400.png
+webacula/html/styles/default/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png
+webacula/html/styles/default/images/ui-bg_highlight-hard_70_000000_1x100.png
+webacula/html/styles/default/images/ui-bg_highlight-soft_100_deedf7_1x100.png
+webacula/html/styles/default/images/ui-bg_highlight-soft_25_ffef8f_1x100.png
+webacula/html/styles/default/images/ui-icons_2694e8_256x240.png
 webacula/html/styles/default/images/ui-icons_2e83ff_256x240.png
-webacula/html/styles/default/images/ui-icons_469bdd_256x240.png
-webacula/html/styles/default/images/ui-icons_6da8d5_256x240.png
-webacula/html/styles/default/images/ui-icons_cd0a0a_256x240.png
-webacula/html/styles/default/images/ui-icons_d8e7f3_256x240.png
-webacula/html/styles/default/images/ui-icons_f9bd01_256x240.png
-webacula/html/styles/default/jquery-ui-1.7.2.custom.css
+webacula/html/styles/default/images/ui-icons_3d80b3_256x240.png
+webacula/html/styles/default/images/ui-icons_72a7cf_256x240.png
+webacula/html/styles/default/images/ui-icons_ffffff_256x240.png
+webacula/html/styles/default/jquery-ui-1.8.6.custom.css
 webacula/html/styles/default/site.css
 webacula/html/styles/default/superfish-navbar.css
 webacula/html/styles/default/superfish-vertical.css
@@ -252,29 +320,30 @@ webacula/html/test_mod_rewrite/index.php
 webacula/html/test_mod_rewrite/testlink1.html
 webacula/install/
 webacula/install/.htaccess
-webacula/install/check_system_requirements.php
-webacula/install/webacula.conf
+webacula/install/MySql/
+webacula/install/MySql/10_make_tables.sh
+webacula/install/MySql/20_acl_make_tables.sh
+webacula/install/PostgreSql/
+webacula/install/PostgreSql/10_make_tables.sh
+webacula/install/PostgreSql/20_acl_make_tables.sh
+webacula/install/SqLite/
+webacula/install/SqLite/10_make_tables.sh
+webacula/install/SqLite/20_acl_make_tables.sh
+webacula/install/apache/
+webacula/install/apache/webacula.conf
 @sample /var/www/conf/modules.sample/webacula.conf
-webacula/install/webacula_clean_tmp_files.sh
-webacula/install/webacula_mysql_create_database.sh.dist
-@mode 0755
-@sample webacula/install/webacula_mysql_create_database.sh
-webacula/install/webacula_mysql_make_tables.sh
-@mode
-webacula/install/webacula_postgresql_create_database.sh.dist
-@mode 0755
-@sample webacula/install/webacula_postgresql_create_database.sh
-@mode
-webacula/install/webacula_postgresql_make_tables.sh.dist
-@mode 0755
-@sample webacula/install/webacula_postgresql_make_tables.sh
-@mode
-webacula/install/webacula_postgresql_make_tables.sql
-@mode 0755
-webacula/install/webacula_sqlite_create_database.sh
+webacula/install/check_system_requirements.php
+webacula/install/db.conf.dist
+@mode 0640
+@group www
+@sample webacula/install/db.conf
 @mode
+@group
 webacula/languages/
 webacula/languages/.htaccess
+webacula/languages/cs/
+webacula/languages/cs/webacula_cs.mo
+webacula/languages/cs/webacula_cs.po
 webacula/languages/de/
 webacula/languages/de/webacula_de.mo
 webacula/languages/de/webacula_de.po
@@ -298,22 +367,23 @@ webacula/languages/ru/webacula_ru.mo
 webacula/languages/ru/webacula_ru.po
 webacula/library/
 webacula/library/MyClass/
-webacula/library/MyClass/ControllerAction.php
+webacula/library/MyClass/Action/
+webacula/library/MyClass/Action/Helper/
+webacula/library/MyClass/Action/Helper/MyCache.php
+webacula/library/MyClass/BaculaAcl.php
+webacula/library/MyClass/ControllerAclAction.php
 webacula/library/MyClass/GaugeTime.php
 webacula/library/MyClass/HomebrewBase64.php
 webacula/library/MyClass/SendEmail.php
+webacula/library/MyClass/Session/
+webacula/library/MyClass/Session/SaveHandler/
+webacula/library/MyClass/Session/SaveHandler/DbTable.php
 webacula/library/MyClass/Validate/
+webacula/library/MyClass/Validate/BaculaAclWhere.php
 webacula/library/MyClass/Validate/BaculaJobId.php
 webacula/library/MyClass/Validate/Datetime.php
 webacula/library/MyClass/Validate/LogBookId.php
-webacula/update/
-webacula/update/webacula_mysql_update_3.4_to_5.0.sh
-webacula/update/webacula_mysql_update_3.x_to_3.4.sh
-webacula/update/webacula_postgresql_update_3.4_to_5.0.sh
-webacula/update/webacula_postgresql_update_3.x_to_3.4.sh
-webacula/update/webacula_postgresql_update_3.x_to_3.4.sql
-webacula/update/webacula_sqlite_update_3.4_to_5.0.sh
-webacula/update/webacula_sqlite_update_3.x_to_3.4.sh
+webacula/library/MyClass/WebaculaAcl.php
 @mode 0555
 webacula/webacula-chroot-bconsole
 @mode
diff --git a/www/webacula/pkg/README b/www/webacula/pkg/README
index e0bda19bcf5..c7d2fce47fc 100644
--- a/www/webacula/pkg/README
+++ b/www/webacula/pkg/README
@@ -1,4 +1,4 @@
-$OpenBSD: README,v 1.4 2011/06/02 13:41:42 ajacoutot Exp $
+$OpenBSD: README,v 1.5 2011/07/28 09:24:35 ajacoutot Exp $
 
 +-----------------------------------------------------------------------
 | Running ${FULLPKGNAME} on OpenBSD
@@ -6,40 +6,34 @@ $OpenBSD: README,v 1.4 2011/06/02 13:41:42 ajacoutot Exp $
 
 Webacula has been installed into ${INSTDIR}
 
+*** Upgrading users: refer to the "Update from prior version" section in
+*** ${INSTDIR}/webacula/docs/txt/install.txt
+
 Database creation
 =================
 
-Depending on the database you wish to access, you'll need the
-corresponding PHP module.  e.g:
+You need to install the PHP module corresponding to the database used by
+your bacula(8) installation. e.g:
     for PostreSQL you'll need to install php5-pdo_pgsql
     for MySQL you'll need to install php5-pdo_mysql
     for SQLite3 you'll need to install php5-pdo_sqlite
 
-Note that this is needed for both the webacula DB itself and the one
-used by bacula(8) so you may need two different modules if using
-different RDBMS.
-
-To setup the webacula DB, run the following commands according to the
-RDBMS that webacula will use. While it is not advised to modify
-"db_name" you may want to ajust "db_user", "db_password" and "host" in
-these scripts.
+To add the webacula DB tables, run the following commands according to
+the RDBMS that bacula(8) uses. Note that prior to run these commands,
+you will have to ajust at least "db_name", "db_user", "db_pwd" and
+"webacula_root_pwd" in ${INSTDIR}/install/db.conf.
 Also note that the scripts can take arguments:
-    e.g. ./webacula_postgresql_create_database.sh -U postgres
+    e.g. ./10_make_tables.sh -U postgres
 
-* MySQL
-    # cd ${INSTDIR}/install && ./webacula_mysql_create_database.sh
-    # cd ${INSTDIR}/install && ./webacula_mysql_make_tables.sh
+* change to the directory matching your DB (PostgreSql, MySql or SqLite)
+    # cd ${INSTDIR}/install/PostgreSql
 
-* PostgreSQL
-    # cd ${INSTDIR}/install && ./webacula_postgresql_create_database.sh
-    # cd ${INSTDIR}/install && ./webacula_postgresql_make_tables.sh
+* run the included scripts to create the webacula tables
+    # ./10_make_tables.sh
+    # ./20_acl_make_tables.sh
 
-* SQLite3
-    # mkdir -p /var/www/var/db/sqlite/
-    # cd ${INSTDIR}/install && ./webacula_sqlite_create_database.sh
-    # chown -R www /var/www/var/db/sqlite
-    # chmod 0700 /var/www/var/db/sqlite
-    # chmod 0600 /var/www/var/db/sqlite/webacula.db
+When using SQLite3, make sure that the "www" user|group has write access
+to the directory containing the DB as well as the DB file itself.
 
 Running Webacula under chroot(8)ed Apache
 =========================================
@@ -75,23 +69,14 @@ is available from the chroot(8).
 Then you may want to adapt "def.timezone" according to your current
 location.
 
-Under [webacula] you need to configure the way you will connect to the
-webacula DB.
-Then you may want to adapt "email.to_admin" and "email.from" according
-to your site.
-
-You should add the following cron(8) job to the root's crontab to clean
-old temporary files:
-    0 1 * * *	find /var/www/tmp/ -name "webacula*" -type f -mtime -24 -exec rm -f {} \;
+Under [webacula] you may want to adapt "email.to_admin" and "email.from"
+according to your site.
 
 After restarting your webserver, you can access webacula at:
     http://<hostname>/webacula/
 
-*** WARNING!
-By default *anyone* can access the webacula interface from localhost.
-A sample commented configuration for http basic authentication is
-available in /var/www/conf/modules.sample/webacula.conf and you are
-STRONGLY ADVISED to enable and edit it to your needs.
+The built-in admin username is "root" and the password is the one you
+configured in "webacula_root_pwd" (${INSTDIR}/install/db.conf).
 
 Bacula messages configuration
 =============================
@@ -108,5 +93,5 @@ Messages {
   catalog = all, !skipped, !saved
 }
 
-The reload bacula-dir(8):
+Then reload bacula-dir(8):
     # /etc/rc.d/bacula_dir reload