pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www/php-concrete5 Update to 5.7.4.2
details: https://anonhg.NetBSD.org/pkgsrc/rev/8c7b9c5b5638
branches: trunk
changeset: 652340:8c7b9c5b5638
user: ryoon <ryoon%pkgsrc.org@localhost>
date: Sun May 31 02:16:11 2015 +0000
description:
Update to 5.7.4.2
* Update MESSAGES.
Changelog:
5.7.4.2
Behavioral Improvements
Saving only a custom template on a block will no longer wrap that block in a custom design DIV. Better saving and resetting of custom designs on blocks and areas.
Topics improvements: topics can now be created below other topics; the only different between topic categories and topics is that categories cannot be assigned to objects, only topics can.
We now include the page ID in the attributes dialog and panel.
Feature block now contains an instance of the rich text editor (thanks MrKarlDilkington)
Improvements to new update functionality when site can't connect to concrete5.org
Improvements to new update functionality to make it more resilient with failures, but error messaging.
Adding attributes to a page will ask for it be checked back/approved when clicking the green icon.
Theme name and description can now be translated (thanks mlocati)
Added an error notice when deleting a page type that’s in use in your site.
Bug Fixes
Some servers would redirect infinitely when activating a theme or attempting to logout. This has been fixed.
Fix bug with multiple redactor instances on the same page and in the same composer window causing problems.
Better rendering of empty areas in Firefox (thanks JeramyNS)
Fixed problems with “concrete.seo.trailing_slash” set to true leading to an inability to login, other problems.
Attributes that had already been filled out were being shown as still required in page check-in panel.
Fixed bug where full URLs were incorrectly parsed if asset caching was enabled (thanks mlocati)
Fix download file script leading to 404 errors after you go to the dashboard and hit the back button
Fixed https://www.concrete5.org/developers/bugs/5-7-4-1/dont-allow-to-create-file-sets-with-names-containing-forbidden-c/
Fix https://www.concrete5.org/developers/bugs/5-7-4-1/cant-replace-a-file-with-one-in-the-incoming-directory/
Fix XSS in conversation author object; fix author name not showing if a user didn't put in a website (thanks jaromirdalecky)
Searching files, pages and users by topics now works in the dashboard
Picture tag now properly inserted by Redactor when working with themes that use responsive images.
Fixed z-index of message author and status in conversations dashboard page.
Developer Updates
API improvements to the RedactorEditor class.
And many improvements and bugfixes including security bugfixes.
diffstat:
www/php-concrete5/MESSAGE | 77 +-
www/php-concrete5/Makefile | 29 +-
www/php-concrete5/PLIST | 11067 ++++++++++++++++++++++++------------------
www/php-concrete5/distinfo | 8 +-
4 files changed, 6514 insertions(+), 4667 deletions(-)
diffs (truncated from 11756 to 300 lines):
diff -r 4733cc254fda -r 8c7b9c5b5638 www/php-concrete5/MESSAGE
--- a/www/php-concrete5/MESSAGE Sun May 31 00:17:16 2015 +0000
+++ b/www/php-concrete5/MESSAGE Sun May 31 02:16:11 2015 +0000
@@ -1,9 +1,12 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.6 2013/06/09 04:43:43 ryoon Exp $
+$NetBSD: MESSAGE,v 1.7 2015/05/31 02:16:11 ryoon Exp $
+
+To use concrete5 with nginx, you will need to perform the following steps.
-To use concrete5 with Apache 2.4, you will need to perform the following steps.
+1. Install www/nginx and www/php-fpm with following in your mk.conf.
-1. Install www/apache24 and www/ap-php
+ APACHE_USER=nginx
+ APACHE_GROUP=nginx
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.
@@ -40,25 +43,65 @@
7. Be sure to have the following lines in ${PREFIX}/etc/php.ini.
extension=gd.so
- extension=mysql.so
+ extension=dom.so
+ extension=pdo.so
+ extension=pdo_mysql.so
extension=iconv.so
+ extension=mbstring.so
+ extension=curl.so
+ extension=mcrypt.so
+ extension=json.so
+ extension=zip.so
-8. Be sure to have the following lines in ${PREFIX}/etc/httpd/httpd.conf
+ default_charaset = UTF8
+ mbstring.language = neutral
+ mbstring.internal_encoding = UTF-8
+ mbstring.http_input = auto
+ mbstring.http_output = UTF-8
+ iconv.input_encoding = UTF-8
+ iconv.internal_encoding = UTF-8
+
+8. Be sure to have the following lines in ${PREFIX}/etc/nginx/nginx.conf
+
+ http {
+ include /usr/pkg/etc/nginx/mime.types;
+
+ upstream php-handler {
+ server 127.0.0.1:9000;
+ }
- DocumentRoot "${PREFIX}/share/concrete5"
- 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>
+ server {
+ listen 80;
+ server_name YOUR_SERVER_NAME;
+ client_max_body_size 20m;
+
+ location / {
+ root ${PREFIX}/share/concrete5;
+ index index.php index.html index.htm;
+ try_files $uri $uri/ @rewrite;
+ }
+
+ location @rewrite {
+ rewrite ^/(.*)$ /index.php/$1 last;
+ }
-9. Start Apache httpd 2.2
- # ${RCD_SCRIPTS_DIR}/apache start
+ location ~ \.php($|/) {
+ root ${PREFIX}/share/concrete5;
+ fastcgi_pass 127.0.0.1:9000;
+ fastcgi_index index.php;
+ fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+ include fastcgi_params;
+ }
-10. Access http://localhost/index.php
+ }
+ }
+
+9. Start php-fpm and nginx.
+
+ # ${RCD_SCRIPTS_DIR}/php_fpm start
+ # ${RCD_SCRIPTS_DIR}/nginx start
+
+10. Access http://localhost/
And setup with the following information.
database name: concrete5_db
diff -r 4733cc254fda -r 8c7b9c5b5638 www/php-concrete5/Makefile
--- a/www/php-concrete5/Makefile Sun May 31 00:17:16 2015 +0000
+++ b/www/php-concrete5/Makefile Sun May 31 02:16:11 2015 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2014/09/28 14:13:47 taca Exp $
+# $NetBSD: Makefile,v 1.13 2015/05/31 02:16:11 ryoon Exp $
#
-DISTNAME= concrete5.6.3.2
+DISTNAME= concrete5.7.4.2
PKGNAME= ${PHP_PKG_PREFIX}-${DISTNAME:S/concrete5/concrete5-5/}
CATEGORIES= www
-MASTER_SITES= http://www.concrete5.org/download_file/-/view/66159/8497/
+MASTER_SITES= http://www.concrete5.org/download_file/-/view/79252/
EXTRACT_SUFX= .zip
MAINTAINER= ryoon%NetBSD.org@localhost
@@ -12,9 +12,13 @@
COMMENT= Open sourece Content Management System
LICENSE= mit
-DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.2.0:../../graphics/php-gd
-DEPENDS+= ${PHP_PKG_PREFIX}-iconv>=5.2.0:../../converters/php-iconv
-DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=5.2.0:../../databases/php-mysql
+DEPENDS+= ${PHP_PKG_PREFIX}-pdo_mysql>=5.3.3:../../databases/php-pdo_mysql
+DEPENDS+= ${PHP_PKG_PREFIX}-dom>=5.3.3:../../textproc/php-dom
+DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.3.3:../../graphics/php-gd
+DEPENDS+= ${PHP_PKG_PREFIX}-curl>=5.3.3:../../www/php-curl
+DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=5.3.3:../../security/php-mcrypt
+DEPENDS+= ${PHP_PKG_PREFIX}-json>=5.3.3:../../textproc/php-json
+DEPENDS+= ${PHP_PKG_PREFIX}-zip>=5.3.3:../../archivers/php-zip
USE_LANGUAGES= # none
NO_BUILD= yes
@@ -25,12 +29,11 @@
C5DIR= share/concrete5
INSTALLATION_DIRS= ${C5DIR}
-WRKSRC= ${WRKDIR}/concrete5.6.3.1
.include "../../mk/bsd.prefs.mk"
-APACHE_USER?= www
-APACHE_GROUP?= www
+APACHE_USER?= nginx
+APACHE_GROUP?= nginx
PKG_GROUPS= ${APACHE_GROUP}
PKG_USERS= ${APACHE_USER}:${APACHE_GROUP}
@@ -41,15 +44,17 @@
C5DIR=${C5DIR}
pre-install:
- cd ${WRKSRC} && ${FIND} . languages -type f -exec ${CHMOD} -x {} \;
+ cd ${WRKSRC} && ${FIND} . -type f -exec ${CHMOD} -x {} \;
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
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${C5DIR}/application/config
+ ${TOUCH} ${DESTDIR}${PREFIX}/${C5DIR}/application/config/.keep
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${C5DIR}/application/files
+ ${TOUCH} ${DESTDIR}${PREFIX}/${C5DIR}/application/files/.keep
.include "../../lang/php/phpversion.mk"
.include "../../lang/python/application.mk"
diff -r 4733cc254fda -r 8c7b9c5b5638 www/php-concrete5/PLIST
--- a/www/php-concrete5/PLIST Sun May 31 00:17:16 2015 +0000
+++ b/www/php-concrete5/PLIST Sun May 31 02:16:11 2015 +0000
@@ -1,15 +1,111 @@
-@comment $NetBSD: PLIST,v 1.6 2014/09/28 14:13:47 taca Exp $
-share/concrete5/INSTALL.md
+@comment $NetBSD: PLIST,v 1.7 2015/05/31 02:16:11 ryoon Exp $
share/concrete5/LICENSE.TXT
+share/concrete5/application/bootstrap/app.php
+share/concrete5/application/bootstrap/autoload.php
+share/concrete5/application/bootstrap/start.php
+share/concrete5/application/config/.keep
+share/concrete5/application/files/.keep
+share/concrete5/application/files/index.html
+share/concrete5/application/index.html
+share/concrete5/application/languages/da_DK/LC_MESSAGES/messages.mo
+share/concrete5/application/languages/de_DE/LC_MESSAGES/messages.mo
+share/concrete5/application/languages/el_GR/LC_MESSAGES/messages.mo
+share/concrete5/application/languages/fi_FI/LC_MESSAGES/messages.mo
+share/concrete5/application/languages/fr_FR/LC_MESSAGES/messages.mo
+share/concrete5/application/languages/it_IT/LC_MESSAGES/messages.mo
+share/concrete5/application/languages/ja_JP/LC_MESSAGES/messages.mo
+share/concrete5/application/languages/nl_NL/LC_MESSAGES/messages.mo
+share/concrete5/application/languages/pl_PL/LC_MESSAGES/messages.mo
+share/concrete5/application/languages/pt_BR/LC_MESSAGES/messages.mo
+share/concrete5/application/languages/ru_RU/LC_MESSAGES/messages.mo
+share/concrete5/application/languages/sl_SI/LC_MESSAGES/messages.mo
+share/concrete5/application/languages/sv_SE/LC_MESSAGES/messages.mo
+share/concrete5/application/languages/tr_TR/LC_MESSAGES/messages.mo
+share/concrete5/concrete/attributes/address/composer.php
+share/concrete5/concrete/attributes/address/controller.php
+share/concrete5/concrete/attributes/address/country_state.js
+share/concrete5/concrete/attributes/address/form.php
+share/concrete5/concrete/attributes/address/icon.png
+share/concrete5/concrete/attributes/address/type_form.js
+share/concrete5/concrete/attributes/address/type_form.php
+share/concrete5/concrete/attributes/address/value.php
+share/concrete5/concrete/attributes/boolean/controller.php
+share/concrete5/concrete/attributes/boolean/icon.png
+share/concrete5/concrete/attributes/boolean/type_form.php
+share/concrete5/concrete/attributes/date_time/controller.php
+share/concrete5/concrete/attributes/date_time/icon.png
+share/concrete5/concrete/attributes/date_time/type_form.php
+share/concrete5/concrete/attributes/image_file/controller.php
+share/concrete5/concrete/attributes/image_file/icon.png
+share/concrete5/concrete/attributes/number/controller.php
+share/concrete5/concrete/attributes/number/icon.png
+share/concrete5/concrete/attributes/rating/controller.php
+share/concrete5/concrete/attributes/rating/icon.png
+share/concrete5/concrete/attributes/rating/service.php
+share/concrete5/concrete/attributes/select/controller.php
+share/concrete5/concrete/attributes/select/form.php
+share/concrete5/concrete/attributes/select/icon.png
+share/concrete5/concrete/attributes/select/option.php
+share/concrete5/concrete/attributes/select/option_list.php
+share/concrete5/concrete/attributes/select/search.php
+share/concrete5/concrete/attributes/select/type_form.css
+share/concrete5/concrete/attributes/select/type_form.js
+share/concrete5/concrete/attributes/select/type_form.php
+share/concrete5/concrete/attributes/social_links/controller.php
+share/concrete5/concrete/attributes/social_links/form.css
+share/concrete5/concrete/attributes/social_links/form.js
+share/concrete5/concrete/attributes/social_links/form.php
+share/concrete5/concrete/attributes/social_links/icon.png
+share/concrete5/concrete/attributes/social_links/view.css
+share/concrete5/concrete/attributes/text/controller.php
+share/concrete5/concrete/attributes/text/icon.png
+share/concrete5/concrete/attributes/textarea/controller.php
+share/concrete5/concrete/attributes/textarea/icon.png
+share/concrete5/concrete/attributes/textarea/type_form.php
+share/concrete5/concrete/attributes/topics/controller.php
+share/concrete5/concrete/attributes/topics/db.xml
+share/concrete5/concrete/attributes/topics/form.php
+share/concrete5/concrete/attributes/topics/icon.png
+share/concrete5/concrete/attributes/topics/search.php
+share/concrete5/concrete/attributes/topics/type_form.php
+share/concrete5/concrete/authentication/community/controller.php
+share/concrete5/concrete/authentication/community/form.php
+share/concrete5/concrete/authentication/community/hook.php
+share/concrete5/concrete/authentication/community/type_form.php
+share/concrete5/concrete/authentication/concrete/change_password.php
+share/concrete5/concrete/authentication/concrete/controller.php
+share/concrete5/concrete/authentication/concrete/db.xml
+share/concrete5/concrete/authentication/concrete/email_validated.php
+share/concrete5/concrete/authentication/concrete/forgot_password.php
+share/concrete5/concrete/authentication/concrete/form.php
+share/concrete5/concrete/authentication/concrete/invalid_token.php
+share/concrete5/concrete/authentication/concrete/password_changed.php
+share/concrete5/concrete/authentication/concrete/password_sent.php
+share/concrete5/concrete/authentication/facebook/controller.php
+share/concrete5/concrete/authentication/facebook/form.php
+share/concrete5/concrete/authentication/facebook/hook.php
+share/concrete5/concrete/authentication/facebook/type_form.php
+share/concrete5/concrete/authentication/google/controller.php
+share/concrete5/concrete/authentication/google/form.php
+share/concrete5/concrete/authentication/google/hook.php
+share/concrete5/concrete/authentication/google/type_form.php
+share/concrete5/concrete/authentication/twitter/controller.php
+share/concrete5/concrete/authentication/twitter/form.php
+share/concrete5/concrete/authentication/twitter/hook.php
+share/concrete5/concrete/authentication/twitter/type_form.php
share/concrete5/concrete/blocks/autonav/add.php
share/concrete5/concrete/blocks/autonav/auto.js
share/concrete5/concrete/blocks/autonav/controller.php
+share/concrete5/concrete/blocks/autonav/dashboard_navigation.php
share/concrete5/concrete/blocks/autonav/db.xml
share/concrete5/concrete/blocks/autonav/edit.php
share/concrete5/concrete/blocks/autonav/form_setup_html.php
share/concrete5/concrete/blocks/autonav/icon.png
+share/concrete5/concrete/blocks/autonav/nav_item.php
share/concrete5/concrete/blocks/autonav/templates/breadcrumb.php
-share/concrete5/concrete/blocks/autonav/templates/header_menu.php
+share/concrete5/concrete/blocks/autonav/templates/responsive_header_navigation/view.css
+share/concrete5/concrete/blocks/autonav/templates/responsive_header_navigation/view.js
+share/concrete5/concrete/blocks/autonav/templates/responsive_header_navigation/view.php
share/concrete5/concrete/blocks/autonav/tools/preview_pane.php
share/concrete5/concrete/blocks/autonav/view.php
share/concrete5/concrete/blocks/content/add.php
@@ -17,11 +113,48 @@
share/concrete5/concrete/blocks/content/controller.php
share/concrete5/concrete/blocks/content/db.xml
share/concrete5/concrete/blocks/content/edit.php
-share/concrete5/concrete/blocks/content/editor_config.php
-share/concrete5/concrete/blocks/content/editor_init.php
share/concrete5/concrete/blocks/content/icon.png
share/concrete5/concrete/blocks/content/scrapbook.php
share/concrete5/concrete/blocks/content/view.php
+share/concrete5/concrete/blocks/core_area_layout/add.php
+share/concrete5/concrete/blocks/core_area_layout/controller.php
+share/concrete5/concrete/blocks/core_area_layout/db.xml
+share/concrete5/concrete/blocks/core_area_layout/edit.php
Home |
Main Index |
Thread Index |
Old Index