Update to 5.6.1.2

* Update MESSAGE
* Create empty directories for out-of-the-box running.

Changelog:
5.6.1.2 Release Notes
Bug Fixes

    Fixed bug where sites had no CSS under certain circumstances
    Better support for multilingual page names while retaining XSS protection.
    Fixed scrollbar not returning on second open of dialog.
    Quieter errors if page cache errors out in mkdir or unlink
    Fixed JavaScript bugs in Date Nav edit mode (thanks synlag)

Developer Updates

Added a new constant for PAGE_PATH_SEGMENT_MAX_LENGTH, that defaults to 128. This is the number of characters that URL segment can be (passed to the URLIfy library.)

5.6.1.1 Release Notes
Feature Updates

    Sends an email upon user activation (for sites that keep users inactive until they’re approved.)

Bug Fixes

    Fixed error installing block add-on if other add-ons had already been installed.
    Fixed inability to set advanced permissions on blocks in areas with spaces or certain other special characters in them (a previous 5.6.0.2 bug fixed this problem at the area level, but not at the block level.)
    Fixed broken bulk page delete interface.
    Fixed inability to upgrade from 5.5.2.1 to 5.6.1
    Fixed incorrect usage of getPermissionCollectionID for cache identifier (it was supposed to be used for caching in certain situations but was not. Should lessen the amount of queries on some pages.)
    Fixed this http://www.concrete5.org/developers/bugs/5-6-1/5.6.1-fatal-error-call-to-a-member-function-getcollectionid/
    Fixed http://www.concrete5.org/developers/bugs/5-6-1/modal-exit-sets-overflowauto-on-body-tag-which-should-actually-b/#discussionpost
    Fixed bug where blocks in global headers wouldn’t display their custom design values in the design dialog (although they would work in the page.)
    Fixed: HTML showing as text in file attributes, better display value in file attributes in general.
    Fixed file version not updating due to cache.
    Fixed: http://www.concrete5.org/developers/bugs/5-6-1/local-page-cache-doesnt-clear-on-new-version/
    Fixed: http://www.concrete5.org/developers/bugs/5-6-1/cannot-call-method-hide-of-undefined/
    Fixed: http://www.concrete5.org/developers/bugs/5-6-1/layout-loading-preset-buttons/
    Fixed UserAttributeKey::getByHandle() returning -1 in some cases.
    Fixed: http://www.concrete5.org/developers/bugs/5-6-1/intelligent-search-wont-work-when-quick-link-has-been-deleted/
    Fixed: http://www.concrete5.org/developers/bugs/5-6-1/another-block-design-issue/
    Fixed: Survey Block error if no option is selected
    Fixed: Upgrade from 5.6.0.2 - Error: Block Type cannot be installed because no db.xml file can be found
    Fixed: Words in URLs are removed even if "Excluded URL Word List" is empty
    Fixed error in setup on child pages if pages had had their page types changed in the past.
    Fixed: Deleting a basic workflow kills editing in some cases
    Fixed: Fatal Error when paste a Page List block with rss enabled
    Fixed: PageCache Library fails to Output Cache Headers once cached
    Fixed: http://www.concrete5.org/developers/bugs/5-6-1/composer-changes-not-published/ (Thanks Remo)
    Fixed: http://www.concrete5.org/developers/bugs/5-6-1/clash-with-cache-class

Developer

    Fixed inability to override text helper in the core.

5.6.1 Release Notes
Performance Improvements

    Removed much of the cache library and rewrote calls to dramatically improve performance.
    Completely New Page Caching Library
        Plugabble for working with proxy servers and caching libraries
        Fires much earlier and requires far fewer resources to run (and no database connections)
        Pages can be checked for inclusion in the cache and expired manually from within the speed settings dialog (which has been renamed Full Page Caching)
        Proper page cache headers are written.
    Faster and more reliable customized theme generation (which points to the cached CSS file directly for better performance.)
    Environment/override cache is now stored in the files/cache/ directory (meaning that deleting this directory will clear the override cache, and that it can be accessed without hitting the database)
    Block caching is now stored in the database for faster lookups
    Improved general performance of the dashboard by limiting unneeded database lookups
    Form block only uses jQuery UI when necessary (thanks jordanlev)

Feature Updates and Behavioral Improvements

    Added the ability to control which words are excluded from URLs for SEO purposes (found in Dashboard > System and Settings > SEO > Excluded from URL Words)
    Improved display of Next/Previous block in edit mode. Re-introduced “Exclude System Pages” to the block, defaulted to on.
    Now we notify users if their cookies are disabled when they attempt to login (thanks olsgreen)
    Slideshow Improvements
        Slideshow automatically clears, making it work better in Greek Yogurt theme.
        Slideshow height doesn’t jump around as much (thanks Remo)
    Google maps less intrusive on failure.
    Added button to delete all form responses for a particular form (thanks luisbarresco)
    Better fix for this: http://www.concrete5.org/developers/bugs/5-6-0-2/5.0.6.2-help-popup-window-sticks-on-the-screen/
    Including Italian Provinces (thanks mlocati)

Bug Fixes

    Composer now honors approve and move workflow.
    Composer now honors advanced property and page attribute permissions.
    Fixing permissions loophole where users who couldn’t add blocks to particular areas could add them to other areas and then move them into the areas.
    Fixed: When applying design to area, it cascades to other areas
    Fixed occasional white page with a JSON response when saving in Composer.
    Added back the ability to have periods in additional page path names.
    Fixed advanced permission bug where Schedule Guest Access on blocks - locks site behind login screen
    Re-allowed dashes in File set names (thanks danklassen)
    Fixed translation bugs in 5.6.0 that had to do with the localization library not returning an object.
    Fixed permission bugs on some complicated sites updating from 5.5 to 5.6.
    Fixed XSS vulnerability in composer crop image.
    Minor XSS vulnerability fixes throughout.
    Better integration with Bootstrap themes.
    Added SVG to file extension list by default (thanks Remo.)
    Fixed incorrect syntax in generated sitemap: http://www.concrete5.org/developers/bugs/5-6-0-2/generated-sitemap-incorrect/ (thanks Remo)
    Fixed: http://www.concrete5.org/developers/bugs/5-6-0-2/typo-in-uninstall-package-page/ (thanks Remo)
    Fixed “Wrong parameter count for array_unique” that occurred on PHP < 5.2.10 on adding/updating user groups (thanks Remo)
    Added $_REQUEST variable to the variables sanitized for magic quotes when magic_quotes_gpc is enabled (thanks Remo.)
    Specifying a user in the legacy permissions XML would fail because it tried to use the Group object. This is fixed.
    When logging in via email, the email address is now correctly sent in the forgot password template.
    Fixed http://www.concrete5.org/developers/bugs/5-6-0-2/wrong-declaration-in-concretetoolsfilesget_data.php/ (thanks Remo)
    Fixed http://www.concrete5.org/developers/bugs/5-6-0-2/group_set.php-class-name-typo/#discussionpost (Thanks Remo)
    Fixed event registrations getting lost to new 5.6 class structure and singleton pattern.
    Fixed lots of bugs with layouts, including moving up and down, layouts with presets, some inconsistencies (thanks shelkie and smartwebprojects)
    Dashboard Pages can now have their titles localized (in the HTML title tag) (thanks mlocati)
    Minimum required PHP version updated to 5.2.4 and enforced during install.
    Added Loader::job() method (thanks JohnTheFish)
    Fixed bug where deleting an administrator group could cause problems in site access (thanks jamietellin)
    Fixed ugly SQL error that would occur if you tried to save a composable page type with a particular parent and then didn’t select that parent.
    Too small version compare/preview window in Firefox and IE has been fixed
    Fixing bugs in basic workflow notification (http://www.concrete5.org/developers/bugs/5-6-0-2/workflow-notify-on-approve-event-ignored/)
    Fixed breadcrumb auto-nav template not putting a separator between certain nav elements
    Fixed SQL error on search by theme on sites that upgraded before 5.6.0
    Page type names are now less restrictive
    Lots of HTML fixes (mis-nested tags, incorrect tags, etc...) (thanks mlocati)
    Added SVG to image file types (thanks Remo)
    pkgID is now correctly duplicated on pages that have it set
    Fixing bug where custom styles on a block would disappear if a layout was added to that area (thanks mlocati.)
    Fixed: getStyleSheet in conjunction with caching does not make allowance for SSL
    ogg, ogv, and  as videos (thanks mlocati)
    Changing attributes in sitemap or page search in dashboard wouldn’t trigger a page reindex. This has been fixed.
    Better feedback and redirects when adding pages or deleting pages in sitemap flat view.
    Included newempty-trash-if-a-page-is-not-approved./ (Thanks remo)
    Bug Fixed: http://www.concrete5.org/developers/bugs/5-6-0-2/editable-styles-with-spaces/ (Thanks remo)
    Bug Fixed: http://www.concrete5.org/developers/bugs/5-5-2-1/survey-block-pie-chart-shown-i  Fixed http://www.concrete5.org/developers/bugs/5-6-0-2/the-result-page-selection-is-not-saved-when-you-add-or-edit-the-/#discussionpost
    Fixed http://www.concrete5.org/developers/bugs/5-6-0-2/google-maps-error-on-dashboard-when-used-in-global-area/
 al odd behavior when numbering default versions in version history.
    Fixed http://www.concrete5.org/developers/bugs/5-6-0-2/tinymce-basic-breaks-in-ie7/
    Fixed “approve” button not showing up when deleting a block in a stack.
    Fixed http://www.concrete5.org/developers/bugs/5-6-0-2/installed-5.6.0.2-now-cant-logoff-or-get-the-top-nav-to-edit-pag/
    Fixed bug where file or user attributes couldn’t be saved after clearing until the page was reloaded
    Fixed http://www.concrete5.org/developers/bugs/5-6-0-2/content-import-error/
    Fixed bug where you couldn’t add groups to combinations in advanced permissions if those groups appeared on the second page (or greater) of group results.
    Dashboards in SSL will load the picture of the day from an https:// URL
    Fixed Bulk SEO Page List not displaying all pages in some cases
    Fixed: http://www.concrete5.org/developers/bugs/5-6-0-2/package-id-is-not-set-when-installing-page-types-from-theme-insp/
    Fixed: http://www.concrete5.org/developers/bugs/5-6-0-2/fatal-error-when-installing-from-custom-starting-point/
    Changed topbar margin to apply to html instead of body
    Fixed: http://www.concrete5.org/developers/bugs/5-6-0-2/page-list-limits-to-20-results-when-no-limit-is-set-in-block/
    Fixed: http://www.concrete5.org/developers/bugs/5-6-0-2/form-results-in-dashboard/
    Fixed: http://www.concrete5.org/developers/bugs/5-6-0-2/dir_rel-misbehave-at-lower-level-when-concrete5-is-installed-on-/
    Fixed: http://www.concrete5.org/developers/bugs/5-6-0-2/versions-popup-action-buttons-are-wrapping-up-to-the-next-line-i/
    Fixed: http://www.concrete5.org/developers/bugs/5-6-0-2/upgrading-a-site-where-the-administrators-group-has-been-deleted/
    Fixed: http://www.concrete5.org/developers/bugs/5-6-0-2/adding-file-to-sets-custom-checkbox-inconsistency-across-browser/
    Fixed: http://www.concrete5.org/developers/bugs/5-6-0-2/line-break-in-search-index-for-select-attribute/#discussionpost

Developer Updates

    Added the SITEMAP_APPROVE_IMMEDIATELY constant. Defaults to true. If set to false, pages added via the sitemap will not be approved immediately (or run through workflow.) Useful for sites where workflow is prevalent.
    added option in code for autonav templates to ignore exclude_nav attributes (thanks jordanlev)
    Fixing issue with countries/states helpers being extended improperly
    Added ENABLE_TRANSLATE_LOCALE_EN_US constant for international users who wish to force Zend_Locale to create an object even if using the en_US locale.
    Updated SimplePie RSS parsing library to 1.3.1
    Added APP_VERSION_DISPLAY_IN_HEADER constant (defaults to true) to control whether the version of concrete5 is shown in the meta header section (thanks Remo)
    Added new Security helper with sanitize functions (Thanks Chris Rosser)
    Added new AJAX Helper (thanks mlocati)
    New events
        on_file_added_to_set
        on_get_countries_list
        on_get_states_provinces_list (thanks mlocati)
        on_file_removed_from_set (thanks danklassen)
        on_page_urlify (thanks remo)
        on_page_body_index (thanks danklassen)

5 files changed, 52 insertions, 57 deletions

diff --git a/www/php-concrete5/MESSAGE b/www/php-concrete5/MESSAGE
index 0822382b180..0e2e235d2a4 100644
--- a/www/php-concrete5/MESSAGE
+++ b/www/php-concrete5/MESSAGE
@@ -1,9 +1,9 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.4 2012/05/04 01:15:54 ryoon Exp $
+$NetBSD: MESSAGE,v 1.5 2013/06/09 04:11:01 ryoon Exp $
 
 To use concrete5 with Apache 2.2, you will need to perform the following steps.
 
-1. Install www/apache22 and www/ap-php
+1. Install www/apache24 and www/ap-php
 
 2. Setup PHP. At least, ${PREFIX}/etc/php.ini should have date.timezone line.
    If your machine are located in Tokyo, Japan, you should get the following.
@@ -13,7 +13,7 @@ To use concrete5 with Apache 2.2, you will need to perform the following steps.
 
 3. Install MySQL database server.
 
-	# cd databases/mysql51-server
+	# cd databases/mysql55-server
 	# make install
 
 4. Start MySQL server, and setup MySQL server
@@ -49,8 +49,10 @@ To use concrete5 with Apache 2.2, you will need to perform the following steps.
 	LoadModule php5_module lib/httpd/mod_php5.so
 	AddType application/x-httpd-php .php
 	<Directory ${PREFIX}/share/concrete5>
+		DirectoryIndex index.php
 		Options All
 		Allow from All
+		Require all granted
 	</Directory>
 
 9. Start Apache httpd 2.2
diff --git a/www/php-concrete5/Makefile b/www/php-concrete5/Makefile
index d7fd87f23cd..1c52fd6b0ba 100644
--- a/www/php-concrete5/Makefile
+++ b/www/php-concrete5/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2012/12/25 19:54:50 ryoon Exp $
+# $NetBSD: Makefile,v 1.9 2013/06/09 04:11:01 ryoon Exp $
 #
 
-DISTNAME=	concrete5.6.0.2
-PKGREVISION=	1
+DISTNAME=	concrete5.6.1.2
 PKGNAME=	${PHP_PKG_PREFIX}-${DISTNAME:S/concrete5/concrete5-5/}
 CATEGORIES=	www
-MASTER_SITES=	http://www.concrete5.org/download_file/-/view/44326/8497/
+MASTER_SITES=	http://www.concrete5.org/download_file/-/view/51635/8497/
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	ryoon@NetBSD.org
@@ -45,6 +44,10 @@ REPLACE_PYTHON+=	concrete/libraries/3rdparty/htmldiff.py
 do-install:
 	cd ${WRKSRC} && ${FIND} . -type f \! -name '*.orig' -print | \
 		pax -rw ${DESTDIR}${PREFIX}/${C5DIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${C5DIR}/packages
+	${TOUCH} ${DESTDIR}${PREFIX}/${C5DIR}/packages/.keep
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${C5DIR}/files
+	${TOUCH} ${DESTDIR}${PREFIX}/${C5DIR}/files/.keep
 
 .include "../../lang/php/phpversion.mk"
 .include "../../lang/python/application.mk"
diff --git a/www/php-concrete5/PLIST b/www/php-concrete5/PLIST
index c54db6e646a..e9ac631ddbd 100644
--- a/www/php-concrete5/PLIST
+++ b/www/php-concrete5/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 2012/12/06 14:52:02 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.5 2013/06/09 04:11:01 ryoon Exp $
+share/concrete5/.DS_Store
 share/concrete5/INSTALL
 share/concrete5/LICENSE.TXT
 share/concrete5/concrete/blocks/autonav/add.php
@@ -201,7 +202,6 @@ share/concrete5/concrete/blocks/slideshow/fileset_row_include.php
 share/concrete5/concrete/blocks/slideshow/form_setup_html.php
 share/concrete5/concrete/blocks/slideshow/icon.png
 share/concrete5/concrete/blocks/slideshow/image_row_include.php
-share/concrete5/concrete/blocks/slideshow/tools/map_display.php.bak
 share/concrete5/concrete/blocks/slideshow/view.css
 share/concrete5/concrete/blocks/slideshow/view.php
 share/concrete5/concrete/blocks/survey/add.php
@@ -391,6 +391,7 @@ share/concrete5/concrete/controllers/dashboard/system/registration/profiles/cont
 share/concrete5/concrete/controllers/dashboard/system/registration/public_registration/controller.php
 share/concrete5/concrete/controllers/dashboard/system/seo/bulk_seo_tool.php
 share/concrete5/concrete/controllers/dashboard/system/seo/controller.php
+share/concrete5/concrete/controllers/dashboard/system/seo/excluded.php
 share/concrete5/concrete/controllers/dashboard/system/seo/search_index.php
 share/concrete5/concrete/controllers/dashboard/system/seo/statistics.php
 share/concrete5/concrete/controllers/dashboard/system/seo/tracking_codes/controller.php
@@ -544,6 +545,7 @@ share/concrete5/concrete/core/controllers/single_pages/dashboard/system/registra
 share/concrete5/concrete/core/controllers/single_pages/dashboard/system/registration/public_registration.php
 share/concrete5/concrete/core/controllers/single_pages/dashboard/system/seo.php
 share/concrete5/concrete/core/controllers/single_pages/dashboard/system/seo/bulk_seo_tool.php
+share/concrete5/concrete/core/controllers/single_pages/dashboard/system/seo/excluded.php
 share/concrete5/concrete/core/controllers/single_pages/dashboard/system/seo/search_index.php
 share/concrete5/concrete/core/controllers/single_pages/dashboard/system/seo/statistics.php
 share/concrete5/concrete/core/controllers/single_pages/dashboard/system/seo/tracking_codes.php
@@ -571,6 +573,7 @@ share/concrete5/concrete/core/controllers/single_pages/profile/friends.php
 share/concrete5/concrete/core/controllers/single_pages/profile/messages.php
 share/concrete5/concrete/core/controllers/single_pages/register.php
 share/concrete5/concrete/core/controllers/single_pages/upgrade.php
+share/concrete5/concrete/core/helpers/ajax.php
 share/concrete5/concrete/core/helpers/array.php
 share/concrete5/concrete/core/helpers/date.php
 share/concrete5/concrete/core/helpers/encryption.php
@@ -595,6 +598,7 @@ share/concrete5/concrete/core/helpers/navigation.php
 share/concrete5/concrete/core/helpers/number.php
 share/concrete5/concrete/core/helpers/pagination.php
 share/concrete5/concrete/core/helpers/rating.php
+share/concrete5/concrete/core/helpers/security.php
 share/concrete5/concrete/core/helpers/spellchecker.php
 share/concrete5/concrete/core/helpers/text.php
 share/concrete5/concrete/core/helpers/url.php
@@ -631,8 +635,9 @@ share/concrete5/concrete/core/libraries/database_item_list.php
 share/concrete5/concrete/core/libraries/environment.php
 share/concrete5/concrete/core/libraries/environment_record.php
 share/concrete5/concrete/core/libraries/events.php
+share/concrete5/concrete/core/libraries/file/importer.php
+share/concrete5/concrete/core/libraries/file/inspector.php
 share/concrete5/concrete/core/libraries/file/types.php
-share/concrete5/concrete/core/libraries/file_importer.php
 share/concrete5/concrete/core/libraries/file_type_inspector.php
 share/concrete5/concrete/core/libraries/flv_file_type_inspector.php
 share/concrete5/concrete/core/libraries/image_file_type_inspector.php
@@ -651,6 +656,10 @@ share/concrete5/concrete/core/libraries/newsflow.php
 share/concrete5/concrete/core/libraries/newsflow_item.php
 share/concrete5/concrete/core/libraries/newsflow_slot_item.php
 share/concrete5/concrete/core/libraries/object.php
+share/concrete5/concrete/core/libraries/page_cache/library.php
+share/concrete5/concrete/core/libraries/page_cache/record.php
+share/concrete5/concrete/core/libraries/page_cache/types/file.php
+share/concrete5/concrete/core/libraries/page_cache/unknown_record.php
 share/concrete5/concrete/core/libraries/private_message_mail_importer.php
 share/concrete5/concrete/core/libraries/request.php
 share/concrete5/concrete/core/libraries/update.php
@@ -912,6 +921,7 @@ share/concrete5/concrete/css/ccm_app/twitter_bootstrap/component-animations.less
 share/concrete5/concrete/css/ccm_app/twitter_bootstrap/dropdowns.less
 share/concrete5/concrete/css/ccm_app/twitter_bootstrap/forms.less
 share/concrete5/concrete/css/ccm_app/twitter_bootstrap/grid.less
+share/concrete5/concrete/css/ccm_app/twitter_bootstrap/grid_frontend.less
 share/concrete5/concrete/css/ccm_app/twitter_bootstrap/hero-unit.less
 share/concrete5/concrete/css/ccm_app/twitter_bootstrap/labels-badges.less
 share/concrete5/concrete/css/ccm_app/twitter_bootstrap/layouts.less
@@ -1121,6 +1131,7 @@ share/concrete5/concrete/flash/uploader/images/file_ppt.png
 share/concrete5/concrete/flash/uploader/images/file_xls.png
 share/concrete5/concrete/flash/uploader/images/file_zip.png
 share/concrete5/concrete/flash/uploader/uploader.swf
+share/concrete5/concrete/helpers/ajax.php
 share/concrete5/concrete/helpers/array.php
 share/concrete5/concrete/helpers/concrete/asset_library.php
 share/concrete5/concrete/helpers/concrete/avatar.php
@@ -1160,6 +1171,7 @@ share/concrete5/concrete/helpers/concrete/upgrade/version_552.php
 share/concrete5/concrete/helpers/concrete/upgrade/version_560.php
 share/concrete5/concrete/helpers/concrete/upgrade/version_5601.php
 share/concrete5/concrete/helpers/concrete/upgrade/version_5602.php
+share/concrete5/concrete/helpers/concrete/upgrade/version_561.php
 share/concrete5/concrete/helpers/concrete/urls.php
 share/concrete5/concrete/helpers/concrete/user.php
 share/concrete5/concrete/helpers/concrete/validation.php
@@ -1186,6 +1198,7 @@ share/concrete5/concrete/helpers/navigation.php
 share/concrete5/concrete/helpers/number.php
 share/concrete5/concrete/helpers/pagination.php
 share/concrete5/concrete/helpers/rating.php
+share/concrete5/concrete/helpers/security.php
 share/concrete5/concrete/helpers/spellchecker.php
 share/concrete5/concrete/helpers/text.php
 share/concrete5/concrete/helpers/url.php
@@ -1373,6 +1386,8 @@ share/concrete5/concrete/images/icons/filetypes/mp4.png
 share/concrete5/concrete/images/icons/filetypes/mpe.png
 share/concrete5/concrete/images/icons/filetypes/mpeg.png
 share/concrete5/concrete/images/icons/filetypes/mpg.png
+share/concrete5/concrete/images/icons/filetypes/ogg.png
+share/concrete5/concrete/images/icons/filetypes/ogv.png
 share/concrete5/concrete/images/icons/filetypes/pdf.png
 share/concrete5/concrete/images/icons/filetypes/php.png
 share/concrete5/concrete/images/icons/filetypes/png.png
@@ -1391,6 +1406,7 @@ share/concrete5/concrete/images/icons/filetypes/tmp.png
 share/concrete5/concrete/images/icons/filetypes/ttf.png
 share/concrete5/concrete/images/icons/filetypes/txt.png
 share/concrete5/concrete/images/icons/filetypes/url.png
+share/concrete5/concrete/images/icons/filetypes/webm.png
 share/concrete5/concrete/images/icons/filetypes/wma.png
 share/concrete5/concrete/images/icons/filetypes/wmv.png
 share/concrete5/concrete/images/icons/filetypes/xls.png
@@ -1547,19 +1563,18 @@ share/concrete5/concrete/js/bootstrap/bootstrap.dropdown.js
 share/concrete5/concrete/js/bootstrap/bootstrap.popover.js
 share/concrete5/concrete/js/bootstrap/bootstrap.tooltip.js
 share/concrete5/concrete/js/bootstrap/bootstrap.transitions.js
-share/concrete5/concrete/js/bootstrap/build/bootstrap.js
 share/concrete5/concrete/js/ccm.app.js
 share/concrete5/concrete/js/ccm.base.js
+share/concrete5/concrete/js/ccm.dashboard.js
 share/concrete5/concrete/js/ccm.spellchecker.js
-share/concrete5/concrete/js/ccm_app/_jquery.colorpicker.js
-share/concrete5/concrete/js/ccm_app/_jquery.hoverIntent.js
-share/concrete5/concrete/js/ccm_app/_jquery.liveupdate.js
-share/concrete5/concrete/js/ccm_app/_jquery.metadata.js
-share/concrete5/concrete/js/ccm_app/build/ccm.app.js
 share/concrete5/concrete/js/ccm_app/chosen.jquery.js
 share/concrete5/concrete/js/ccm_app/dashboard.js
 share/concrete5/concrete/js/ccm_app/filemanager.js
+share/concrete5/concrete/js/ccm_app/jquery.colorpicker.js
 share/concrete5/concrete/js/ccm_app/jquery.cookie.js
+share/concrete5/concrete/js/ccm_app/jquery.hoverIntent.js
+share/concrete5/concrete/js/ccm_app/jquery.liveupdate.js
+share/concrete5/concrete/js/ccm_app/jquery.metadata.js
 share/concrete5/concrete/js/ccm_app/layouts.js
 share/concrete5/concrete/js/ccm_app/legacy_dialog.js
 share/concrete5/concrete/js/ccm_app/newsflow.js
@@ -1766,7 +1781,7 @@ share/concrete5/concrete/js/tiny_mce/plugins/searchreplace/editor_plugin_src.js
 share/concrete5/concrete/js/tiny_mce/plugins/searchreplace/js/searchreplace.js
 share/concrete5/concrete/js/tiny_mce/plugins/searchreplace/langs/en_dlg.js
 share/concrete5/concrete/js/tiny_mce/plugins/searchreplace/searchreplace.htm
-share/concrete5/concrete/js/tiny_mce/plugins/spellchecker/changelog
+share/concrete5/concrete/js/tiny_mce/plugins/spellchecker/changelog.txt
 share/concrete5/concrete/js/tiny_mce/plugins/spellchecker/classes/EnchantSpell.php
 share/concrete5/concrete/js/tiny_mce/plugins/spellchecker/classes/GoogleSpell.php
 share/concrete5/concrete/js/tiny_mce/plugins/spellchecker/classes/PSpell.php
@@ -3140,6 +3155,10 @@ share/concrete5/concrete/libraries/marketplace.php
 share/concrete5/concrete/libraries/model.php
 share/concrete5/concrete/libraries/newsflow.php
 share/concrete5/concrete/libraries/object.php
+share/concrete5/concrete/libraries/page_cache/library.php
+share/concrete5/concrete/libraries/page_cache/record.php
+share/concrete5/concrete/libraries/page_cache/types/file.php
+share/concrete5/concrete/libraries/page_cache/unknown_record.php
 share/concrete5/concrete/libraries/request.php
 share/concrete5/concrete/libraries/update.php
 share/concrete5/concrete/libraries/view.php
@@ -3154,6 +3173,7 @@ share/concrete5/concrete/mail/private_message_response_enabled.php
 share/concrete5/concrete/mail/spam_detected.php
 share/concrete5/concrete/mail/user_register.php
 share/concrete5/concrete/mail/user_register_approval_required.php
+share/concrete5/concrete/mail/user_registered_approval_complete.php
 share/concrete5/concrete/mail/validate_user_email.php
 share/concrete5/concrete/models/area.php
 share/concrete5/concrete/models/attribute/categories/collection.php
@@ -3475,6 +3495,7 @@ share/concrete5/concrete/single_pages/dashboard/system/registration/profiles.php
 share/concrete5/concrete/single_pages/dashboard/system/registration/public_registration.php
 share/concrete5/concrete/single_pages/dashboard/system/registration/view.php
 share/concrete5/concrete/single_pages/dashboard/system/seo/bulk_seo_tool.php
+share/concrete5/concrete/single_pages/dashboard/system/seo/excluded.php
 share/concrete5/concrete/single_pages/dashboard/system/seo/search_index.php
 share/concrete5/concrete/single_pages/dashboard/system/seo/statistics.php
 share/concrete5/concrete/single_pages/dashboard/system/seo/tracking_codes.php
@@ -3508,6 +3529,7 @@ share/concrete5/concrete/single_pages/register.php
 share/concrete5/concrete/single_pages/upgrade.php
 share/concrete5/concrete/single_pages/user_error.php
 share/concrete5/concrete/startup/autoload.php
+share/concrete5/concrete/startup/check_page_cache.php
 share/concrete5/concrete/startup/config_check.php
 share/concrete5/concrete/startup/config_check_complete.php
 share/concrete5/concrete/startup/debug_logging.php
@@ -3521,8 +3543,10 @@ share/concrete5/concrete/startup/magic_quotes_gpc_check.php
 share/concrete5/concrete/startup/maintenance_mode_check.php
 share/concrete5/concrete/startup/optional_menu_buttons.php
 share/concrete5/concrete/startup/packages.php
+share/concrete5/concrete/startup/permission_cache_check.php
 share/concrete5/concrete/startup/process.php
 share/concrete5/concrete/startup/required.php
+share/concrete5/concrete/startup/security.php
 share/concrete5/concrete/startup/session.php
 share/concrete5/concrete/startup/shutdown.php
 share/concrete5/concrete/startup/timezone.php
@@ -3746,24 +3770,7 @@ share/concrete5/concrete/tools/workflow/categories/page.php
 share/concrete5/concrete/tools/workflow/dialogs/approve_page_preview.php
 share/concrete5/concrete/tools/workflow/dialogs/change_page_permissions.php
 share/concrete5/config/site_theme_paths.php
+share/concrete5/files/.keep
 share/concrete5/index.php
+share/concrete5/packages/.keep
 share/concrete5/robots.txt
-@pkgdir share/concrete5/updates
-@pkgdir share/concrete5/tools
-@pkgdir share/concrete5/themes
-@pkgdir share/concrete5/single_pages
-@pkgdir share/concrete5/page_types
-@pkgdir share/concrete5/packages
-@pkgdir share/concrete5/models
-@pkgdir share/concrete5/mail
-@pkgdir share/concrete5/libraries
-@pkgdir share/concrete5/languages
-@pkgdir share/concrete5/js
-@pkgdir share/concrete5/jobs
-@pkgdir share/concrete5/helpers
-@pkgdir share/concrete5/files
-@pkgdir share/concrete5/elements
-@pkgdir share/concrete5/css
-@pkgdir share/concrete5/controllers
-@pkgdir share/concrete5/concrete/packages
-@pkgdir share/concrete5/blocks
diff --git a/www/php-concrete5/distinfo b/www/php-concrete5/distinfo
index 89c06646370..5b5c81af145 100644
--- a/www/php-concrete5/distinfo
+++ b/www/php-concrete5/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.6 2012/12/25 09:35:28 ryoon Exp $
+$NetBSD: distinfo,v 1.7 2013/06/09 04:11:01 ryoon Exp $
 
-SHA1 (concrete5.6.0.2.zip) = 30f173bb1715e74c53fbb25d733d415d26d08409
-RMD160 (concrete5.6.0.2.zip) = 4909f0c471bccb4350971ce7e7adba44579d7aef
-Size (concrete5.6.0.2.zip) = 14443587 bytes
-SHA1 (patch-concrete_blocks_image_tools_crop__image.php) = 4c757ba21a81505ef940177e077c2b2c8933be9d
+SHA1 (concrete5.6.1.2.zip) = e70549ca5678b5aedbcc0db55c351fdd1b46d55c
+RMD160 (concrete5.6.1.2.zip) = ee87f4eed184556e96c9bef90ee153bdb50e9e14
+Size (concrete5.6.1.2.zip) = 14659270 bytes
diff --git a/www/php-concrete5/patches/patch-concrete_blocks_image_tools_crop__image.php b/www/php-concrete5/patches/patch-concrete_blocks_image_tools_crop__image.php
deleted file mode 100644
index a5fade66c6f..00000000000
--- a/www/php-concrete5/patches/patch-concrete_blocks_image_tools_crop__image.php
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-concrete_blocks_image_tools_crop__image.php,v 1.1 2012/12/24 04:39:58 ryoon Exp $
-
-fixing minor XSS in composer image cropper
-taken from https://github.com/concrete5japan/concrete5/commit/3ede1508bc2ca0f9365f25e8bf692dc8fc30780f
-Thank you, taca@.
-
---- concrete/blocks/image/tools/crop_image.php.orig	2012-09-21 00:15:18.000000000 +0000
-+++ concrete/blocks/image/tools/crop_image.php
-@@ -18,5 +18,5 @@ $save_url = $url->getBlockTypeToolsUrl($
- <object type="application/x-shockwave-flash" data="<?php  echo ASSETS_URL_FLASH?>/thumbnail_editor_3.swf" width="100%" height="500" id="ccm-image-composer-thumbnail-crop">
- <param name="wmode" value="transparent">
- <param name="quality" value="high">
--<param name="flashvars" value="tint=0&amp;backgroundColor=#FFFFFF&amp;upload=true&amp;webcam=false&amp;width=<?php echo $_GET['width']?>&amp;height=<?php echo $_GET['height']?>&amp;image=<?php echo $f->getRelativePath()?>&amp;save=<?php echo urlencode($save_url)?>">
-+<param name="flashvars" value="tint=0&amp;backgroundColor=#FFFFFF&amp;upload=true&amp;webcam=false&amp;width=<?php echo htmlspecialchars($_GET['width'])?>&amp;height=<?php echo htmlspecialchars($_GET['height'])?>&amp;image=<?php echo $f->getRelativePath()?>&amp;save=<?php echo urlencode($save_url)?>">
- </object>
-\ No newline at end of file