1 files changed, 109 insertions, 30 deletions

diff --git a/www/cherokee/pkg-plist b/www/cherokee/pkg-plist
index dcbada57db77..ce30ec2ddec8 100644
--- a/www/cherokee/pkg-plist
+++ b/www/cherokee/pkg-plist
@@ -10,7 +10,6 @@ etc/cherokee/mods-enabled/.empty
 etc/cherokee/sites-available/.empty
 etc/cherokee/sites-enabled/.empty
 etc/cherokee/ssl/.empty
-include/cherokee/admin_client.h
 include/cherokee/avl.h
 include/cherokee/avl_r.h
 include/cherokee/buffer.h
@@ -69,8 +68,6 @@ lib/cherokee/libplugin_custom.la
 lib/cherokee/libplugin_custom.so
 lib/cherokee/libplugin_custom_error.la
 lib/cherokee/libplugin_custom_error.so
-lib/cherokee/libplugin_tls.la
-lib/cherokee/libplugin_tls.so
 %%MYSQL%%lib/cherokee/libplugin_dbslayer.la
 %%MYSQL%%lib/cherokee/libplugin_dbslayer.so
 lib/cherokee/libplugin_deflate.la
@@ -85,12 +82,12 @@ lib/cherokee/libplugin_error_nn.la
 lib/cherokee/libplugin_error_nn.so
 lib/cherokee/libplugin_error_redir.la
 lib/cherokee/libplugin_error_redir.so
+lib/cherokee/libplugin_evhost.la
+lib/cherokee/libplugin_evhost.so
 lib/cherokee/libplugin_exists.la
 lib/cherokee/libplugin_exists.so
 lib/cherokee/libplugin_extensions.la
 lib/cherokee/libplugin_extensions.so
-lib/cherokee/libplugin_evhost.la
-lib/cherokee/libplugin_evhost.so
 lib/cherokee/libplugin_fcgi.la
 lib/cherokee/libplugin_fcgi.so
 lib/cherokee/libplugin_file.la
@@ -129,24 +126,24 @@ lib/cherokee/libplugin_pam.la
 lib/cherokee/libplugin_pam.so
 lib/cherokee/libplugin_plain.la
 lib/cherokee/libplugin_plain.so
+lib/cherokee/libplugin_post_report.la
+lib/cherokee/libplugin_post_report.so
+lib/cherokee/libplugin_post_track.la
+lib/cherokee/libplugin_post_track.so
 lib/cherokee/libplugin_proxy.la
 lib/cherokee/libplugin_proxy.so
-lib/cherokee/libplugin_post_track.so
-lib/cherokee/libplugin_post_track.la
-lib/cherokee/libplugin_post_report.so
-lib/cherokee/libplugin_post_report.la
 lib/cherokee/libplugin_redir.la
 lib/cherokee/libplugin_redir.so
 lib/cherokee/libplugin_rehost.la
 lib/cherokee/libplugin_rehost.so
-lib/cherokee/libplugin_render_rrd.so
 lib/cherokee/libplugin_render_rrd.la
+lib/cherokee/libplugin_render_rrd.so
 lib/cherokee/libplugin_request.la
 lib/cherokee/libplugin_request.so
 lib/cherokee/libplugin_round_robin.la
 lib/cherokee/libplugin_round_robin.so
-lib/cherokee/libplugin_rrd.so
 lib/cherokee/libplugin_rrd.la
+lib/cherokee/libplugin_rrd.so
 lib/cherokee/libplugin_scgi.la
 lib/cherokee/libplugin_scgi.so
 lib/cherokee/libplugin_secdownload.la
@@ -155,14 +152,16 @@ lib/cherokee/libplugin_server_info.la
 lib/cherokee/libplugin_server_info.so
 lib/cherokee/libplugin_ssi.la
 lib/cherokee/libplugin_ssi.so
-lib/cherokee/libplugin_streaming.la
-lib/cherokee/libplugin_streaming.so
-lib/cherokee/libplugin_target_ip.so
 lib/cherokee/libplugin_target_ip.la
+lib/cherokee/libplugin_target_ip.so
+lib/cherokee/libplugin_tls.la
+lib/cherokee/libplugin_tls.so
 lib/cherokee/libplugin_url_arg.la
 lib/cherokee/libplugin_url_arg.so
-lib/cherokee/libplugin_uwsgi.so
 lib/cherokee/libplugin_uwsgi.la
+lib/cherokee/libplugin_uwsgi.so
+lib/cherokee/libplugin_v_or.la
+lib/cherokee/libplugin_v_or.so
 lib/cherokee/libplugin_wildcard.la
 lib/cherokee/libplugin_wildcard.so
 lib/libcherokee-base.la
@@ -171,9 +170,6 @@ lib/libcherokee-base.so.0
 lib/libcherokee-client.la
 lib/libcherokee-client.so
 lib/libcherokee-client.so.0
-lib/libcherokee-config.la
-lib/libcherokee-config.so
-lib/libcherokee-config.so.0
 lib/libcherokee-server.la
 lib/libcherokee-server.so
 lib/libcherokee-server.so.0
@@ -187,6 +183,8 @@ share/aclocal/cherokee.m4
 %%NLS%%share/locale/en/LC_MESSAGES/cherokee.mo
 %%NLS%%share/locale/es/LC_MESSAGES/cherokee.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/cherokee.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/cherokee.mo
+%%NLS%%share/locale/it/LC_MESSAGES/cherokee.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/cherokee.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/cherokee.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/cherokee.mo
@@ -194,12 +192,8 @@ share/aclocal/cherokee.m4
 %%NLS%%share/locale/sv_SE/LC_MESSAGES/cherokee.mo
 %%ADMIN%%%%DATADIR%%/admin/Auth.py
 %%ADMIN%%%%DATADIR%%/admin/Auth.pyc
-%%ADMIN%%%%DATADIR%%/admin/Backup.py
-%%ADMIN%%%%DATADIR%%/admin/Backup.pyc
 %%ADMIN%%%%DATADIR%%/admin/Balancer.py
 %%ADMIN%%%%DATADIR%%/admin/Balancer.pyc
-%%ADMIN%%%%DATADIR%%/admin/Login.py
-%%ADMIN%%%%DATADIR%%/admin/Login.pyc
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/AjaxUpload.py
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/AjaxUpload.pyc
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Box.py
@@ -298,23 +292,80 @@ share/aclocal/cherokee.m4
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/pyscgi.pyc
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/util.py
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/util.pyc
+%%ADMIN%%%%DATADIR%%/admin/market/__init__.py
+%%ADMIN%%%%DATADIR%%/admin/market/Install.py
+%%ADMIN%%%%DATADIR%%/admin/market/InstallUtil.py
+%%ADMIN%%%%DATADIR%%/admin/market/Install_Log.py
+%%ADMIN%%%%DATADIR%%/admin/market/Menu.py
+%%ADMIN%%%%DATADIR%%/admin/market/Package.py
+%%ADMIN%%%%DATADIR%%/admin/market/PageApp.py
+%%ADMIN%%%%DATADIR%%/admin/market/PageCategory.py
+%%ADMIN%%%%DATADIR%%/admin/market/PageIndex.py
+%%ADMIN%%%%DATADIR%%/admin/market/PageSearch.py
+%%ADMIN%%%%DATADIR%%/admin/market/Review.py
+%%ADMIN%%%%DATADIR%%/admin/market/Library.py
+%%ADMIN%%%%DATADIR%%/admin/market/Util.py
+%%ADMIN%%%%DATADIR%%/admin/market/Maintenance.py
+%%ADMIN%%%%DATADIR%%/admin/market/ows_consts.py
+%%ADMIN%%%%DATADIR%%/admin/market/CommandProgress.py
+%%ADMIN%%%%DATADIR%%/admin/market/__init__.pyc
+%%ADMIN%%%%DATADIR%%/admin/market/Install.pyc
+%%ADMIN%%%%DATADIR%%/admin/market/InstallUtil.pyc
+%%ADMIN%%%%DATADIR%%/admin/market/Install_Log.pyc
+%%ADMIN%%%%DATADIR%%/admin/market/Menu.pyc
+%%ADMIN%%%%DATADIR%%/admin/market/PageApp.pyc
+%%ADMIN%%%%DATADIR%%/admin/market/PageCategory.pyc
+%%ADMIN%%%%DATADIR%%/admin/market/PageIndex.pyc
+%%ADMIN%%%%DATADIR%%/admin/market/PageSearch.pyc
+%%ADMIN%%%%DATADIR%%/admin/market/Review.pyc
+%%ADMIN%%%%DATADIR%%/admin/market/Library.pyc
+%%ADMIN%%%%DATADIR%%/admin/market/Util.pyc
+%%ADMIN%%%%DATADIR%%/admin/market/Maintenance.pyc
+%%ADMIN%%%%DATADIR%%/admin/market/ows_consts.pyc
+%%ADMIN%%%%DATADIR%%/admin/market/CommandProgress.pyc
+%%ADMIN%%%%DATADIR%%/admin/market/Package.pyc
+%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Init.py
+%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Paginator.py
+%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/StarRating.py
+%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Carousel.py
+%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Collapsible.py
+%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Init.pyc
+%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Paginator.pyc
+%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/StarRating.pyc
+%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Carousel.pyc
+%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Collapsible.pyc
+%%ADMIN%%%%DATADIR%%/admin/About.py
+%%ADMIN%%%%DATADIR%%/admin/OWS_Backup.py
+%%ADMIN%%%%DATADIR%%/admin/OWS_Cherokee_Info.py
+%%ADMIN%%%%DATADIR%%/admin/OWS_Login.py
+%%ADMIN%%%%DATADIR%%/admin/OWS_Market_Info.py
+%%ADMIN%%%%DATADIR%%/admin/SaveButton.py
+%%ADMIN%%%%DATADIR%%/admin/SystemInfo.py
+%%ADMIN%%%%DATADIR%%/admin/SystemStats.py
+%%ADMIN%%%%DATADIR%%/admin/SystemStatsWidgets.py
+%%ADMIN%%%%DATADIR%%/admin/popen.py
+%%ADMIN%%%%DATADIR%%/admin/About.pyc
+%%ADMIN%%%%DATADIR%%/admin/OWS_Backup.pyc
+%%ADMIN%%%%DATADIR%%/admin/OWS_Cherokee_Info.pyc
+%%ADMIN%%%%DATADIR%%/admin/OWS_Login.pyc
+%%ADMIN%%%%DATADIR%%/admin/OWS_Market_Info.pyc
+%%ADMIN%%%%DATADIR%%/admin/SaveButton.pyc
+%%ADMIN%%%%DATADIR%%/admin/SystemInfo.pyc
+%%ADMIN%%%%DATADIR%%/admin/SystemStats.pyc
+%%ADMIN%%%%DATADIR%%/admin/SystemStatsWidgets.pyc
+%%ADMIN%%%%DATADIR%%/admin/popen.pyc
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/css/CTK.css
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/css/datepicker.css
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/css/jquery-ui-1.7.2.custom.css
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/css/jquery.ibutton.css
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/images/arrow_ns.png
-%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/bg-body.png
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/images/bg-dialog-buttonpane.png
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/images/bg-dialog-titlebar-close.gif
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/images/bg-dialog-titlebar.png
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/images/bg-dialog.png
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/images/bg-filter.png
-%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/bg-help-a.png
-%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/bg-help-span.png
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/images/bg-sel-actions-sel.png
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/images/bg-sel-actions.png
-%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/bg-td-even.png
-%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/bg-th.png
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/images/del-hover.png
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/images/del.png
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/images/dialog-error.png
@@ -511,6 +562,36 @@ share/aclocal/cherokee.m4
 %%ADMIN%%%%DATADIR%%/admin/static/images/advanced.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/bg-bar.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/cherokee-logo-bar.png
+%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/jquery.ui.stars.gif
+%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/carousel-left-arrow.png
+%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/carousel-right-arrow.png
+%%ADMIN%%%%DATADIR%%/admin/CTK/static/js/StarRating.js
+%%ADMIN%%%%DATADIR%%/admin/static/images/other/linkedin.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/other/irc.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/other/left.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/other/right.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/other/web.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/backup.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/bg-body.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/bg-help-a.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/bg-help-span.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/bg-th.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/bg-td-even.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/cpu.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/disk.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/featured-list-bg.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/featured-list-selected.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/host.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/information.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/market.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/network.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/panel-clone.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/panel-new.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/ram.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/remote.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/sidebar-bg.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/sidebar-market.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/uptime.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/favicon.ico
 %%ADMIN%%%%DATADIR%%/admin/static/images/flags/ad.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/flags/ae.png
@@ -761,13 +842,10 @@ share/aclocal/cherokee.m4
 %%ADMIN%%%%DATADIR%%/admin/static/images/general.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/home.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/icons.png
-%%ADMIN%%%%DATADIR%%/admin/static/images/kid-running.png
-%%ADMIN%%%%DATADIR%%/admin/static/images/kid-stopped.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/mime.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/nav-selected.gif
 %%ADMIN%%%%DATADIR%%/admin/static/images/nav-sep.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/other/contact-bug.png
-%%ADMIN%%%%DATADIR%%/admin/static/images/other/contact-irc.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/other/contact-list.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/other/facebook.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/other/octality-logo.png
@@ -951,6 +1029,7 @@ www/cherokee/index.html
 %%ADMIN%%@dirrm %%DATADIR%%/admin/static/css
 %%ADMIN%%@dirrm %%DATADIR%%/admin/static
 %%ADMIN%%@dirrm %%DATADIR%%/admin/plugins
+%%ADMIN%%@dirrm %%DATADIR%%/admin/market
 %%ADMIN%%@dirrm %%DATADIR%%/admin/CTK/static/js
 %%ADMIN%%@dirrm %%DATADIR%%/admin/CTK/static/images
 %%ADMIN%%@dirrm %%DATADIR%%/admin/CTK/static/css