Update to Cherokee 1.2.105

Requested by Moritz Wilhelmy on IRC.


Vulnerabilities fixed:

* CVE-2011-2191
  Cross-site request forgery (CSRF) vulnerability in Cherokee-admin in Cherokee
  before 1.2.99 allows remote attackers to hijack the authentication of
  administrators for requests that insert cross-site scripting (XSS) sequences,
  as demonstrated by a crafted nickname field to vserver/apply.

* CVE-2011-2190
  The generate_admin_password function in Cherokee before 1.2.99 uses time and
  PID values for seeding of a random number generator, which makes it easier
  for local users to determine admin passwords via a brute-force attack.


New features (excerpt):

* Caching policies support
* Custom header can be defined inside rules
* Improved Index Page
* Kqueue is now used by default on MacOS X and *BSD
* New option to disable the use of SSLv2
* Wild cards are now supported in dirlist fields
* Redirection entries can be reordered
* ${vserver_name_req} in logger 'Custom'
* Cherokee-admin can be shut down from within
* TLS/SSL supports the 'IP per VServer' workaround now
* Virtual Server complex match support (OR rules)
* Redirection error handler has a 'default' option now
* New ${root_domain} macro in Advanced Virtual Hosting
* Failover load balancing plug-in
* cherokee-admin-launcher tool
* Information Source name resolution pre-caching
* Gzip and Default is configurable now (#1054)
* ${http_host}, ${http_referrer}, and ${http_user_agent} (#896)
* Much better OPTIONS support
* Documentation improvements
* Information Sources can be reordered now (*CGI handlers)
* X-Sendfile and X-Accel-Redirect support in the proxy
* Shared memory implementation (no longer SysV) (#537)
* Logger custom. New macro: ${http_cookie}
* Virtual Host regex group replacement (^ parameters)
* --with-cgiroot in configure
* -i / --disable-iocache param in cherokee-admin
* 'Server Info' extended to support accepts and timeouts
* cherokee-admin-launcher accepts SIGHUP now
* CTK_COOKIE security enhancement
* Enhanced pre-saving validations
* Interpreter env. vars can embedded $VARs evaluation
* QA bench can be run without installing Cherokee first
* OS tuning documentation
* Regex against full header match
* Nick name match is optional on VServers (#1075)
* Front-Line Cache (beta)
* Cherokee Distribution (beta)
* CHEROKEE_TRACE special "from=<ip>" support
* SSL/TLS Wizard
* SSI recursive includes
* "UNIX socket in a abstract namespace" support
* Adds SHA512 support to the MySQL validator
* HSTS (HTTP Strict Transport Security) support

4 files changed, 168 insertions, 49 deletions

diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile
index 91e680b5b9e..f5a0c8a7b84 100644
--- a/www/cherokee/Makefile
+++ b/www/cherokee/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2012/03/15 11:53:43 obache Exp $
+# $NetBSD: Makefile,v 1.19 2012/03/22 22:40:18 asau Exp $
 #
 
-DISTNAME=	cherokee-1.0.5
-PKGREVISION=	3
+DISTNAME=	cherokee-1.2.101
 CATEGORIES=	www
-MASTER_SITES=	http://www.cherokee-project.com/download/1.0/${PKGVERSION_NOREV}/
+MASTER_SITES=	http://www.cherokee-project.com/download/1.2/${PKGVERSION_NOREV}/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.cherokee-project.com/
@@ -38,12 +37,15 @@ INSTALLATION_DIRS+=	${EGDIR}/pam.d
 
 .include "options.mk"
 
-# Need to installation
-#TEST_TARGET=		test
-
 BUILD_DEFS+=		VARBASE
 
-REPLACE_PYTHON=		admin/server.py admin/upgrade_config.py
+REPLACE_PYTHON=		admin/CTK/CTK-run.pre \
+			admin/server.py admin/upgrade_config.py \
+			cherokee/cherokee-admin-launcher \
+			cherokee/cherokee-tweak
+
+# Needs installation:
+TEST_TARGET=		test
 
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../lang/python/application.mk"
diff --git a/www/cherokee/PLIST b/www/cherokee/PLIST
index 26b61993a04..cd97d9fb2a2 100644
--- a/www/cherokee/PLIST
+++ b/www/cherokee/PLIST
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.3 2010/07/11 12:18:55 obache Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/03/22 22:40:18 asau Exp $
+bin/CTK-run
 bin/cget
+bin/cherokee-admin-launcher
 bin/cherokee-config
+bin/cherokee-macos-askpass
 bin/cherokee-panic
 bin/cherokee-tweak
-include/cherokee/admin_client.h
 include/cherokee/avl.h
 include/cherokee/avl_r.h
 include/cherokee/buffer.h
@@ -57,12 +59,14 @@ ${PLIST.mysql}lib/cherokee/libplugin_dbslayer.la
 lib/cherokee/libplugin_deflate.la
 lib/cherokee/libplugin_directory.la
 lib/cherokee/libplugin_dirlist.la
+lib/cherokee/libplugin_drop.la
 lib/cherokee/libplugin_empty_gif.la
 lib/cherokee/libplugin_error_nn.la
 lib/cherokee/libplugin_error_redir.la
 lib/cherokee/libplugin_evhost.la
 lib/cherokee/libplugin_exists.la
 lib/cherokee/libplugin_extensions.la
+lib/cherokee/libplugin_failover.la
 lib/cherokee/libplugin_fcgi.la
 lib/cherokee/libplugin_file.la
 lib/cherokee/libplugin_from.la
@@ -95,18 +99,18 @@ lib/cherokee/libplugin_scgi.la
 lib/cherokee/libplugin_secdownload.la
 lib/cherokee/libplugin_server_info.la
 lib/cherokee/libplugin_ssi.la
-lib/cherokee/libplugin_streaming.la
 lib/cherokee/libplugin_target_ip.la
 lib/cherokee/libplugin_tls.la
 lib/cherokee/libplugin_url_arg.la
 lib/cherokee/libplugin_uwsgi.la
+lib/cherokee/libplugin_v_or.la
 lib/cherokee/libplugin_wildcard.la
 lib/libcherokee-base.la
 lib/libcherokee-client.la
-lib/libcherokee-config.la
 lib/libcherokee-server.la
 lib/pkgconfig/cherokee.pc
 man/man1/cget.1
+man/man1/cherokee-admin-launcher.1
 man/man1/cherokee-admin.1
 man/man1/cherokee-config.1
 man/man1/cherokee-tweak.1
@@ -116,12 +120,15 @@ sbin/cherokee
 sbin/cherokee-admin
 sbin/cherokee-worker
 share/aclocal/cherokee.m4
+share/cherokee/admin/About.py
 share/cherokee/admin/Auth.py
-share/cherokee/admin/Backup.py
 share/cherokee/admin/Balancer.py
+share/cherokee/admin/CTK/CTK/AjaxUpload.py
 share/cherokee/admin/CTK/CTK/Box.py
 share/cherokee/admin/CTK/CTK/Button.py
+share/cherokee/admin/CTK/CTK/Carousel.py
 share/cherokee/admin/CTK/CTK/Checkbox.py
+share/cherokee/admin/CTK/CTK/Collapsible.py
 share/cherokee/admin/CTK/CTK/Combobox.py
 share/cherokee/admin/CTK/CTK/Config.py
 share/cherokee/admin/CTK/CTK/Container.py
@@ -134,12 +141,15 @@ share/cherokee/admin/CTK/CTK/Help.py
 share/cherokee/admin/CTK/CTK/HiddenField.py
 share/cherokee/admin/CTK/CTK/Image.py
 share/cherokee/admin/CTK/CTK/Indenter.py
+share/cherokee/admin/CTK/CTK/Init.py
 share/cherokee/admin/CTK/CTK/JS.py
 share/cherokee/admin/CTK/CTK/Link.py
 share/cherokee/admin/CTK/CTK/List.py
+share/cherokee/admin/CTK/CTK/MailHTML.py
 share/cherokee/admin/CTK/CTK/Notice.py
 share/cherokee/admin/CTK/CTK/Page.py
 share/cherokee/admin/CTK/CTK/PageCleaner.py
+share/cherokee/admin/CTK/CTK/Paginator.py
 share/cherokee/admin/CTK/CTK/Plugin.py
 share/cherokee/admin/CTK/CTK/Post.py
 share/cherokee/admin/CTK/CTK/ProgressBar.py
@@ -150,6 +160,7 @@ share/cherokee/admin/CTK/CTK/RawHTML.py
 share/cherokee/admin/CTK/CTK/Refreshable.py
 share/cherokee/admin/CTK/CTK/Server.py
 share/cherokee/admin/CTK/CTK/SortableList.py
+share/cherokee/admin/CTK/CTK/StarRating.py
 share/cherokee/admin/CTK/CTK/Submitter.py
 share/cherokee/admin/CTK/CTK/Tab.py
 share/cherokee/admin/CTK/CTK/Table.py
@@ -162,6 +173,7 @@ share/cherokee/admin/CTK/CTK/Widget.py
 share/cherokee/admin/CTK/CTK/XMLRPCProxy.py
 share/cherokee/admin/CTK/CTK/__init__.py
 share/cherokee/admin/CTK/CTK/consts.py
+share/cherokee/admin/CTK/CTK/i18n.py
 share/cherokee/admin/CTK/CTK/iPhoneToggle.py
 share/cherokee/admin/CTK/CTK/json_embedded.py
 share/cherokee/admin/CTK/CTK/pyscgi.py
@@ -171,35 +183,24 @@ share/cherokee/admin/CTK/static/css/datepicker.css
 share/cherokee/admin/CTK/static/css/jquery-ui-1.7.2.custom.css
 share/cherokee/admin/CTK/static/css/jquery.ibutton.css
 share/cherokee/admin/CTK/static/images/arrow_ns.png
-share/cherokee/admin/CTK/static/images/bg-body.png
-share/cherokee/admin/CTK/static/images/bg-button-a-big.png
-share/cherokee/admin/CTK/static/images/bg-button-a-light.png
-share/cherokee/admin/CTK/static/images/bg-button-a.png
-share/cherokee/admin/CTK/static/images/bg-button-clone.png
-share/cherokee/admin/CTK/static/images/bg-button-new.png
-share/cherokee/admin/CTK/static/images/bg-button-span-big.png
-share/cherokee/admin/CTK/static/images/bg-button-span-light.png
-share/cherokee/admin/CTK/static/images/bg-button-span-start-light.png
-share/cherokee/admin/CTK/static/images/bg-button-span-stop-light.png
-share/cherokee/admin/CTK/static/images/bg-button-span.png
 share/cherokee/admin/CTK/static/images/bg-dialog-buttonpane.png
 share/cherokee/admin/CTK/static/images/bg-dialog-titlebar-close.gif
 share/cherokee/admin/CTK/static/images/bg-dialog-titlebar.png
 share/cherokee/admin/CTK/static/images/bg-dialog.png
 share/cherokee/admin/CTK/static/images/bg-filter.png
-share/cherokee/admin/CTK/static/images/bg-help-a.png
-share/cherokee/admin/CTK/static/images/bg-help-span.png
 share/cherokee/admin/CTK/static/images/bg-sel-actions-sel.png
 share/cherokee/admin/CTK/static/images/bg-sel-actions.png
-share/cherokee/admin/CTK/static/images/bg-td-even.png
-share/cherokee/admin/CTK/static/images/bg-th.png
+share/cherokee/admin/CTK/static/images/carousel-left-arrow.png
+share/cherokee/admin/CTK/static/images/carousel-right-arrow.png
 share/cherokee/admin/CTK/static/images/del-hover.png
 share/cherokee/admin/CTK/static/images/del.png
 share/cherokee/admin/CTK/static/images/dialog-error.png
 share/cherokee/admin/CTK/static/images/dialog-information.png
 share/cherokee/admin/CTK/static/images/dialog-warning.png
+share/cherokee/admin/CTK/static/images/forbid.png
 share/cherokee/admin/CTK/static/images/ibutton-slider-default.png
 share/cherokee/admin/CTK/static/images/input-bg.png
+share/cherokee/admin/CTK/static/images/jquery.ui.stars.gif
 share/cherokee/admin/CTK/static/images/loader.gif
 share/cherokee/admin/CTK/static/images/loading.gif
 share/cherokee/admin/CTK/static/images/off.png
@@ -208,30 +209,41 @@ share/cherokee/admin/CTK/static/images/on.png
 share/cherokee/admin/CTK/static/images/online.png
 share/cherokee/admin/CTK/static/images/tabbg.png
 share/cherokee/admin/CTK/static/images/tick.png
+share/cherokee/admin/CTK/static/images/ui-bg_gloss-wave_35_f6a828_500x100.png
+share/cherokee/admin/CTK/static/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
 share/cherokee/admin/CTK/static/images/ui-icons_222222_256x240.png
 share/cherokee/admin/CTK/static/images/ui-icons_2e83ff_256x240.png
 share/cherokee/admin/CTK/static/images/ui-icons_454545_256x240.png
 share/cherokee/admin/CTK/static/images/ui-icons_888888_256x240.png
 share/cherokee/admin/CTK/static/images/ui-icons_cd0a0a_256x240.png
 share/cherokee/admin/CTK/static/images/uploadify.cancel.png
+share/cherokee/admin/CTK/static/js/Carousel.js
 share/cherokee/admin/CTK/static/js/Help.js
+share/cherokee/admin/CTK/static/js/StarRating.js
 share/cherokee/admin/CTK/static/js/Submitter.js
+share/cherokee/admin/CTK/static/js/ajaxupload.3.6.js
 share/cherokee/admin/CTK/static/js/common.js
+share/cherokee/admin/CTK/static/js/jquery-1.3.2.js
 share/cherokee/admin/CTK/static/js/jquery-1.3.2.min.js
 share/cherokee/admin/CTK/static/js/jquery-ui-1.7.2.custom.min.js
+share/cherokee/admin/CTK/static/js/jquery-ui-1.7.2.js
 share/cherokee/admin/CTK/static/js/jquery.cookie.js
 share/cherokee/admin/CTK/static/js/jquery.form-defaults.js
 share/cherokee/admin/CTK/static/js/jquery.ibutton.js
 share/cherokee/admin/CTK/static/js/jquery.tablednd_0_5.js
 share/cherokee/admin/CTK/static/js/jquery.uploadProgress.js
+share/cherokee/admin/Certs.py
 share/cherokee/admin/CgiBase.py
 share/cherokee/admin/Cherokee.py
 share/cherokee/admin/Flags.py
 share/cherokee/admin/Graph.py
 share/cherokee/admin/Handler.py
 share/cherokee/admin/Icons.py
-share/cherokee/admin/Login.py
 share/cherokee/admin/Mime.py
+share/cherokee/admin/OWS_Backup.py
+share/cherokee/admin/OWS_Cherokee_Info.py
+share/cherokee/admin/OWS_Login.py
+share/cherokee/admin/OWS_Market_Info.py
 share/cherokee/admin/Page.py
 share/cherokee/admin/PageAdvanced.py
 share/cherokee/admin/PageEntry.py
@@ -249,7 +261,12 @@ share/cherokee/admin/PageVServer.py
 share/cherokee/admin/PageVServers.py
 share/cherokee/admin/Rule.py
 share/cherokee/admin/RuleSimple.py
+share/cherokee/admin/SaveButton.py
+share/cherokee/admin/SavingChecks.py
 share/cherokee/admin/SelectionPanel.py
+share/cherokee/admin/SystemInfo.py
+share/cherokee/admin/SystemStats.py
+share/cherokee/admin/SystemStatsWidgets.py
 share/cherokee/admin/Wizard.py
 share/cherokee/admin/XMLServerDigest.py
 share/cherokee/admin/cherokee.conf.sample
@@ -258,6 +275,31 @@ share/cherokee/admin/configured.py
 share/cherokee/admin/consts.py
 share/cherokee/admin/exception.html
 share/cherokee/admin/help.html
+share/cherokee/admin/icons/cherokee-admin-launcher-128.png
+share/cherokee/admin/icons/cherokee-admin-launcher-16.png
+share/cherokee/admin/icons/cherokee-admin-launcher-256.png
+share/cherokee/admin/icons/cherokee-admin-launcher-32.png
+share/cherokee/admin/icons/cherokee-admin-launcher-48.png
+share/cherokee/admin/icons/cherokee-admin-launcher-512.png
+share/cherokee/admin/icons/cherokee-admin-launcher-96.png
+share/cherokee/admin/icons/cherokee-admin-launcher.svg
+share/cherokee/admin/market/CommandProgress.py
+share/cherokee/admin/market/Distro.py
+share/cherokee/admin/market/Install.py
+share/cherokee/admin/market/InstallUtil.py
+share/cherokee/admin/market/Install_Log.py
+share/cherokee/admin/market/Library.py
+share/cherokee/admin/market/Maintenance.py
+share/cherokee/admin/market/Menu.py
+share/cherokee/admin/market/PageApp.py
+share/cherokee/admin/market/PageCategory.py
+share/cherokee/admin/market/PageIndex.py
+share/cherokee/admin/market/PageSearch.py
+share/cherokee/admin/market/Report.py
+share/cherokee/admin/market/Review.py
+share/cherokee/admin/market/Util.py
+share/cherokee/admin/market/__init__.py
+share/cherokee/admin/market/ows_consts.py
 share/cherokee/admin/performance.conf.sample
 share/cherokee/admin/plugins/admin.py
 share/cherokee/admin/plugins/authlist.py
@@ -266,19 +308,23 @@ share/cherokee/admin/plugins/cgi.py
 share/cherokee/admin/plugins/common.py
 share/cherokee/admin/plugins/custom_error.py
 share/cherokee/admin/plugins/dbslayer.py
+share/cherokee/admin/plugins/deflate.py
 share/cherokee/admin/plugins/directory.py
 share/cherokee/admin/plugins/dirlist.py
+share/cherokee/admin/plugins/drop.py
 share/cherokee/admin/plugins/empty_gif.py
 share/cherokee/admin/plugins/error_nn.py
 share/cherokee/admin/plugins/error_redir.py
 share/cherokee/admin/plugins/evhost.py
 share/cherokee/admin/plugins/exists.py
 share/cherokee/admin/plugins/extensions.py
+share/cherokee/admin/plugins/failover.py
 share/cherokee/admin/plugins/fcgi.py
 share/cherokee/admin/plugins/file.py
 share/cherokee/admin/plugins/from.py
 share/cherokee/admin/plugins/fullpath.py
 share/cherokee/admin/plugins/geoip.py
+share/cherokee/admin/plugins/gzip.py
 share/cherokee/admin/plugins/header.py
 share/cherokee/admin/plugins/htdigest.py
 share/cherokee/admin/plugins/htpasswd.py
@@ -306,12 +352,24 @@ share/cherokee/admin/plugins/tls.py
 share/cherokee/admin/plugins/url_arg.py
 share/cherokee/admin/plugins/uwsgi.py
 share/cherokee/admin/plugins/wildcard.py
+share/cherokee/admin/popen.py
 share/cherokee/admin/server.py
 share/cherokee/admin/static/css/cherokee-admin.css
+share/cherokee/admin/static/help_404.html
 share/cherokee/admin/static/images/advanced.png
+share/cherokee/admin/static/images/backup.png
 share/cherokee/admin/static/images/bg-bar.png
+share/cherokee/admin/static/images/bg-body.png
+share/cherokee/admin/static/images/bg-help-a.png
+share/cherokee/admin/static/images/bg-help-span.png
+share/cherokee/admin/static/images/bg-td-even.png
+share/cherokee/admin/static/images/bg-th.png
 share/cherokee/admin/static/images/cherokee-logo-bar.png
+share/cherokee/admin/static/images/cpu.png
+share/cherokee/admin/static/images/disk.png
 share/cherokee/admin/static/images/favicon.ico
+share/cherokee/admin/static/images/featured-list-bg.png
+share/cherokee/admin/static/images/featured-list-selected.png
 share/cherokee/admin/static/images/flags/ad.png
 share/cherokee/admin/static/images/flags/ae.png
 share/cherokee/admin/static/images/flags/af.png
@@ -560,21 +618,35 @@ share/cherokee/admin/static/images/flags/zm.png
 share/cherokee/admin/static/images/flags/zw.png
 share/cherokee/admin/static/images/general.png
 share/cherokee/admin/static/images/home.png
+share/cherokee/admin/static/images/host.png
 share/cherokee/admin/static/images/icons.png
-share/cherokee/admin/static/images/kid-running.png
-share/cherokee/admin/static/images/kid-stopped.png
+share/cherokee/admin/static/images/information.png
+share/cherokee/admin/static/images/market.png
 share/cherokee/admin/static/images/mime.png
 share/cherokee/admin/static/images/nav-selected.gif
 share/cherokee/admin/static/images/nav-sep.png
+share/cherokee/admin/static/images/network.png
 share/cherokee/admin/static/images/other/contact-bug.png
-share/cherokee/admin/static/images/other/contact-irc.png
 share/cherokee/admin/static/images/other/contact-list.png
 share/cherokee/admin/static/images/other/facebook.png
+share/cherokee/admin/static/images/other/irc.png
+share/cherokee/admin/static/images/other/latest.png
+share/cherokee/admin/static/images/other/left.png
+share/cherokee/admin/static/images/other/linkedin.png
 share/cherokee/admin/static/images/other/octality-logo.png
 share/cherokee/admin/static/images/other/proud.png
+share/cherokee/admin/static/images/other/right.png
 share/cherokee/admin/static/images/other/twitter.png
+share/cherokee/admin/static/images/other/web.png
+share/cherokee/admin/static/images/panel-clone.png
+share/cherokee/admin/static/images/panel-new.png
+share/cherokee/admin/static/images/ram.png
+share/cherokee/admin/static/images/remote.png
+share/cherokee/admin/static/images/sidebar-bg.png
+share/cherokee/admin/static/images/sidebar-market.png
 share/cherokee/admin/static/images/sources.png
 share/cherokee/admin/static/images/status.png
+share/cherokee/admin/static/images/uptime.png
 share/cherokee/admin/static/images/vservers.png
 share/cherokee/admin/static/images/wizards/alfresco.png
 share/cherokee/admin/static/images/wizards/aspnet.png
@@ -583,6 +655,7 @@ share/cherokee/admin/static/images/wizards/concrete5.png
 share/cherokee/admin/static/images/wizards/dbslayer.png
 share/cherokee/admin/static/images/wizards/django.png
 share/cherokee/admin/static/images/wizards/drupal.png
+share/cherokee/admin/static/images/wizards/flcache.png
 share/cherokee/admin/static/images/wizards/gallery.png
 share/cherokee/admin/static/images/wizards/glassfish.png
 share/cherokee/admin/static/images/wizards/hotlinking.png
@@ -601,6 +674,7 @@ share/cherokee/admin/static/images/wizards/phpmyadmin.png
 share/cherokee/admin/static/images/wizards/rails.png
 share/cherokee/admin/static/images/wizards/redirect.png
 share/cherokee/admin/static/images/wizards/rtorrent.png
+share/cherokee/admin/static/images/wizards/ssl_test.png
 share/cherokee/admin/static/images/wizards/static.png
 share/cherokee/admin/static/images/wizards/streaming.png
 share/cherokee/admin/static/images/wizards/sugar.png
@@ -619,29 +693,21 @@ share/cherokee/admin/wizards/alfresco.py
 share/cherokee/admin/wizards/coldfusion.py
 share/cherokee/admin/wizards/concrete5.py
 share/cherokee/admin/wizards/django.py
-share/cherokee/admin/wizards/drupal.py
+share/cherokee/admin/wizards/flcache.py
 share/cherokee/admin/wizards/glassfish.py
 share/cherokee/admin/wizards/hotlinking.py
 share/cherokee/admin/wizards/icons.py
-share/cherokee/admin/wizards/joomla.py
-share/cherokee/admin/wizards/liferay.py
 share/cherokee/admin/wizards/mailman.py
-share/cherokee/admin/wizards/mediawiki.py
-share/cherokee/admin/wizards/moinmoin.py
 share/cherokee/admin/wizards/mono.py
 share/cherokee/admin/wizards/php.py
-share/cherokee/admin/wizards/phpbb.py
-share/cherokee/admin/wizards/phpmyadmin.py
 share/cherokee/admin/wizards/rails.py
 share/cherokee/admin/wizards/redirect.py
 share/cherokee/admin/wizards/rtorrent.py
+share/cherokee/admin/wizards/ssl_test.py
 share/cherokee/admin/wizards/static.py
 share/cherokee/admin/wizards/streaming.py
-share/cherokee/admin/wizards/sugar.py
 share/cherokee/admin/wizards/symfony.py
-share/cherokee/admin/wizards/trac.py
 share/cherokee/admin/wizards/uwsgi.py
-share/cherokee/admin/wizards/wordpress.py
 share/cherokee/admin/wizards/zend.py
 share/cherokee/deps/cgi.deps
 share/cherokee/deps/combined.deps
@@ -700,9 +766,14 @@ share/cherokee/themes/plain/entry.html
 share/cherokee/themes/plain/footer.html
 share/cherokee/themes/plain/header.html
 share/cherokee/themes/plain/theme.css
+share/cherokee/themes/white/entry.html
+share/cherokee/themes/white/footer.html
+share/cherokee/themes/white/header.html
+share/cherokee/themes/white/theme.css
 share/doc/cherokee/basics.html
 share/doc/cherokee/basics_download.html
 share/doc/cherokee/basics_installation.html
+share/doc/cherokee/basics_installation_easy-install.html
 share/doc/cherokee/basics_installation_osx.html
 share/doc/cherokee/basics_installation_svn.html
 share/doc/cherokee/basics_installation_unix.html
@@ -716,12 +787,13 @@ share/doc/cherokee/config_advanced.html
 share/doc/cherokee/config_general.html
 share/doc/cherokee/config_index.html
 share/doc/cherokee/config_info_sources.html
-share/doc/cherokee/config_quickstart.html
+share/doc/cherokee/config_market.html
 share/doc/cherokee/config_status.html
 share/doc/cherokee/config_virtual_servers.html
 share/doc/cherokee/config_virtual_servers_evhost.html
 share/doc/cherokee/config_virtual_servers_rule.html
 share/doc/cherokee/config_virtual_servers_rule_types.html
+share/doc/cherokee/config_walkthrough.html
 share/doc/cherokee/config_wizards.html
 share/doc/cherokee/cookbook.html
 share/doc/cherokee/cookbook_alfresco.html
@@ -731,9 +803,11 @@ share/doc/cherokee/cookbook_concrete5.html
 share/doc/cherokee/cookbook_cross_compilation.html
 share/doc/cherokee/cookbook_dbslayer.html
 share/doc/cherokee/cookbook_django.html
+share/doc/cherokee/cookbook_domain_matching.html
 share/doc/cherokee/cookbook_drupal.html
 share/doc/cherokee/cookbook_embedding_cherokee.html
 share/doc/cherokee/cookbook_glassfish.html
+share/doc/cherokee/cookbook_http_to_https.html
 share/doc/cherokee/cookbook_https_accelerator.html
 share/doc/cherokee/cookbook_joomla.html
 share/doc/cherokee/cookbook_kumbia.html
@@ -755,14 +829,18 @@ share/doc/cherokee/cookbook_streaming.html
 share/doc/cherokee/cookbook_sugarcrm.html
 share/doc/cherokee/cookbook_symfony.html
 share/doc/cherokee/cookbook_trac.html
+share/doc/cherokee/cookbook_traffic_restriction.html
 share/doc/cherokee/cookbook_uwsgi.html
 share/doc/cherokee/cookbook_wordpress.html
 share/doc/cherokee/cookbook_zend.html
 share/doc/cherokee/dev.html
 share/doc/cherokee/dev_cherokee.conf.html
+share/doc/cherokee/dev_ctk.html
 share/doc/cherokee/dev_debug.html
-share/doc/cherokee/dev_issues.html
 share/doc/cherokee/dev_qa.html
+share/doc/cherokee/dev_quickstart.html
+share/doc/cherokee/distro.html
+share/doc/cherokee/distro_dev_intro.html
 share/doc/cherokee/index.html
 share/doc/cherokee/media/css/cherokee_doc.css
 share/doc/cherokee/media/images/admin_advanced0.png
@@ -792,6 +870,8 @@ share/doc/cherokee/media/images/admin_handler_onlylisting_ex.png
 share/doc/cherokee/media/images/admin_handler_proxy.png
 share/doc/cherokee/media/images/admin_handler_secdownload.png
 share/doc/cherokee/media/images/admin_index.png
+share/doc/cherokee/media/images/admin_index_backup.png
+share/doc/cherokee/media/images/admin_index_restore.png
 share/doc/cherokee/media/images/admin_info_sources.png
 share/doc/cherokee/media/images/admin_launch.png
 share/doc/cherokee/media/images/admin_noconfig.png
@@ -806,6 +886,7 @@ share/doc/cherokee/media/images/admin_vserver_errors.png
 share/doc/cherokee/media/images/admin_vserver_evhost.png
 share/doc/cherokee/media/images/admin_vserver_loggers.png
 share/doc/cherokee/media/images/admin_vserver_security.png
+share/doc/cherokee/media/images/admin_vserver_security_ssl.png
 share/doc/cherokee/media/images/admin_vserver_wizard.png
 share/doc/cherokee/media/images/admin_vservers_wizard.png
 share/doc/cherokee/media/images/cookbook_alfresco_alfresco.png
@@ -822,6 +903,14 @@ share/doc/cherokee/media/images/cookbook_django.png
 share/doc/cherokee/media/images/cookbook_django_common.png
 share/doc/cherokee/media/images/cookbook_django_infosources.png
 share/doc/cherokee/media/images/cookbook_drupal.png
+share/doc/cherokee/media/images/cookbook_drupal_dir_rules.png
+share/doc/cherokee/media/images/cookbook_drupal_dir_rules_1.png
+share/doc/cherokee/media/images/cookbook_drupal_dir_rules_2.png
+share/doc/cherokee/media/images/cookbook_drupal_dir_rules_3.png
+share/doc/cherokee/media/images/cookbook_drupal_dir_rules_4.png
+share/doc/cherokee/media/images/cookbook_drupal_dir_rules_6.png
+share/doc/cherokee/media/images/cookbook_drupal_dir_rules_7.png
+share/doc/cherokee/media/images/cookbook_drupal_vserver_rules.png
 share/doc/cherokee/media/images/cookbook_glassfish.png
 share/doc/cherokee/media/images/cookbook_https_accelerator_handler.png
 share/doc/cherokee/media/images/cookbook_https_accelerator_sources.png
@@ -869,6 +958,7 @@ share/doc/cherokee/media/images/cookbook_phpmyadmin_denied.png
 share/doc/cherokee/media/images/cookbook_redir_behavior.png
 share/doc/cherokee/media/images/cookbook_redir_domains.png
 share/doc/cherokee/media/images/cookbook_redir_handler.png
+share/doc/cherokee/media/images/cookbook_redir_https.png
 share/doc/cherokee/media/images/cookbook_ror.png
 share/doc/cherokee/media/images/cookbook_ror_common.png
 share/doc/cherokee/media/images/cookbook_ror_fcgi.png
@@ -888,7 +978,11 @@ share/doc/cherokee/media/images/cookbook_wp2.png
 share/doc/cherokee/media/images/cookbook_wp3.png
 share/doc/cherokee/media/images/cookbook_wp4.png
 share/doc/cherokee/media/images/cookbook_wp5.png
+share/doc/cherokee/media/images/cookbook_wp_example1.png
+share/doc/cherokee/media/images/cookbook_wp_example2.png
+share/doc/cherokee/media/images/cookbook_wp_example3.png
 share/doc/cherokee/media/images/cookbook_zend1.png
+share/doc/cherokee/media/images/market_index.png
 share/doc/cherokee/media/images/other_graphs_conns.png
 share/doc/cherokee/media/images/other_graphs_logging.png
 share/doc/cherokee/media/images/other_graphs_timeouts.png
@@ -899,6 +993,7 @@ share/doc/cherokee/media/images/screencast.png
 share/doc/cherokee/media/images/tracelor.png
 share/doc/cherokee/modules.html
 share/doc/cherokee/modules_balancers.html
+share/doc/cherokee/modules_balancers_failover.html
 share/doc/cherokee/modules_balancers_ip_hash.html
 share/doc/cherokee/modules_balancers_round_robin.html
 share/doc/cherokee/modules_encoders.html
@@ -911,6 +1006,7 @@ share/doc/cherokee/modules_handlers_common.html
 share/doc/cherokee/modules_handlers_custom_error.html
 share/doc/cherokee/modules_handlers_dbslayer.html
 share/doc/cherokee/modules_handlers_dirlist.html
+share/doc/cherokee/modules_handlers_drop.html
 share/doc/cherokee/modules_handlers_empty_gif.html
 share/doc/cherokee/modules_handlers_fcgi.html
 share/doc/cherokee/modules_handlers_file.html
@@ -938,17 +1034,19 @@ share/doc/cherokee/modules_validators_plain.html
 share/doc/cherokee/other.html
 share/doc/cherokee/other_bundle.html
 share/doc/cherokee/other_bundle_cget.html
+share/doc/cherokee/other_bundle_cherokee-admin-launcher.html
 share/doc/cherokee/other_bundle_cherokee-admin.html
 share/doc/cherokee/other_bundle_cherokee-config.html
 share/doc/cherokee/other_bundle_cherokee-tweak.html
 share/doc/cherokee/other_bundle_cherokee-worker.html
 share/doc/cherokee/other_bundle_cherokee.html
-share/doc/cherokee/other_bundle_spawn-fcgi.html
 share/doc/cherokee/other_community.html
 share/doc/cherokee/other_errors.html
 share/doc/cherokee/other_faq.html
+share/doc/cherokee/other_front_line_cache.html
 share/doc/cherokee/other_goodies.html
 share/doc/cherokee/other_graphs.html
+share/doc/cherokee/other_os_tuning.html
 share/doc/cherokee/other_signals.html
 share/examples/cherokee/cherokee/cherokee.conf
 share/examples/cherokee/cherokee/cherokee.conf.perf_sample
@@ -959,6 +1057,9 @@ share/locale/de/LC_MESSAGES/cherokee.mo
 share/locale/en/LC_MESSAGES/cherokee.mo
 share/locale/es/LC_MESSAGES/cherokee.mo
 share/locale/fr/LC_MESSAGES/cherokee.mo
+share/locale/gl/LC_MESSAGES/cherokee.mo
+share/locale/it/LC_MESSAGES/cherokee.mo
+share/locale/jp/LC_MESSAGES/cherokee.mo
 share/locale/nl/LC_MESSAGES/cherokee.mo
 share/locale/pl/LC_MESSAGES/cherokee.mo
 share/locale/pt_BR/LC_MESSAGES/cherokee.mo
diff --git a/www/cherokee/distinfo b/www/cherokee/distinfo
index 36e62dfd05b..004bb39b220 100644
--- a/www/cherokee/distinfo
+++ b/www/cherokee/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2010/07/11 12:18:55 obache Exp $
+$NetBSD: distinfo,v 1.5 2012/03/22 22:40:18 asau Exp $
 
-SHA1 (cherokee-1.0.5.tar.gz) = 61902974f839adbb0459c4df709b4d57f08b7ac2
-RMD160 (cherokee-1.0.5.tar.gz) = 00e64a63d861838c6df83b86ce25a518f3331bbb
-Size (cherokee-1.0.5.tar.gz) = 5364282 bytes
+SHA1 (cherokee-1.2.101.tar.gz) = b27f149c7d7111207ac8c3cd8a4856c05490d136
+RMD160 (cherokee-1.2.101.tar.gz) = dd3dedc352ba17bdcefd8e200143b8ffa19ad035
+Size (cherokee-1.2.101.tar.gz) = 6320209 bytes
+SHA1 (patch-cherokee_common-internal.h) = 730b67aa0cdf4990686e9529cec3a7fc1ddd90a5
diff --git a/www/cherokee/patches/patch-cherokee_common-internal.h b/www/cherokee/patches/patch-cherokee_common-internal.h
new file mode 100644
index 00000000000..ce1ad39af86
--- /dev/null
+++ b/www/cherokee/patches/patch-cherokee_common-internal.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-cherokee_common-internal.h,v 1.1 2012/03/22 22:40:18 asau Exp $
+
+NetBSD uses int64_t for time_t.
+
+--- cherokee/common-internal.h.orig	2011-10-12 18:07:44.000000000 +0000
++++ cherokee/common-internal.h
+@@ -239,6 +239,8 @@ char *strcasestr(char *s, char *find);
+ #  define TIME_MAX ((time_t)INT_MAX)
+ # elif (SIZEOF_TIME_T == SIZEOF_LONG)
+ #  define TIME_MAX ((time_t)LONG_MAX)
++# elif (SIZEOF_TIME_T == 8) /* sizeof(int64_t) */
++#  define TIME_MAX ((time_t)0x7fffffffffffffffULL)
+ # else
+ #  error "Can't define TIME_MAX"
+ # endif