From 69a3060fab3e913263dc711d2b75b106c355278b Mon Sep 17 00:00:00 2001 From: ryoon Date: Sun, 29 Jun 2014 15:23:47 +0000 Subject: Update to 1.12 Changelog: 1.11 12/21/2013 Minor parser bugfixes Fix upgrading from older tt-rss versions Minor performance improvements Other bugfixes API: fix labels not applying because API call expected labels in wrong format 1.12 03/21/2014 Parser / misc bugfixes Default theme update Traditional Chinese (zh_TW) translation Various comics plugins merged into af_comics --- www/php-tt-rss/MESSAGE | 67 +++++++++++++++++++++++++++++++------------------ www/php-tt-rss/Makefile | 5 ++-- www/php-tt-rss/PLIST | 37 ++++++++++++++++++++------- www/php-tt-rss/distinfo | 8 +++--- 4 files changed, 76 insertions(+), 41 deletions(-) diff --git a/www/php-tt-rss/MESSAGE b/www/php-tt-rss/MESSAGE index 5f5b008811f..02c74b7401e 100644 --- a/www/php-tt-rss/MESSAGE +++ b/www/php-tt-rss/MESSAGE @@ -1,14 +1,14 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.4 2013/06/09 04:24:11 ryoon Exp $ +$NetBSD: MESSAGE,v 1.5 2014/06/29 15:23:47 ryoon Exp $ -To use php-tt-rss with Apache 2.4 and php 5.4, you will need to perform +To use php-tt-rss with nginx 1.6 and php 5.4, you will need to perform the following steps. -1. Install www/apache24 and www/ap-php +1. Install www/nginx and www/php-fpm. 2. Install PostgreSQL database server. - # cd databases/postgresql91-server + # cd databases/postgresql93-server # make install 3. Start PostgreSQL server. @@ -17,15 +17,12 @@ the following steps. 4. Add PostgreSQL user, ttrss - $ createuser -U pgsql ttrss - Shall the new role be a superuser? (y/n) n - Shall the new role be allowed to create databases? (y/n) y - Shall the new role be allowed to create more new roles? (y/n) n + $ createuser -d -U pgsql ttrss 5. Set password for ttrss user $ psql -U pgsql template1 - psql (9.1.7) + psql (9.3.4) Type "help" for help. template1=# alter user ttrss with password 'ttrss_user_password'; @@ -58,20 +55,37 @@ the following steps. extension=mbstring.so extension=pgsql.so -8. Be sure to have the following lines in ${PREFIX}/etc/httpd/httpd.conf +10. Be sure to have the following in ${PREFIX}/etc/php-fpm.conf - DocumentRoot "${PREFIX}/share/tt-rss" - LoadModule php5_module lib/httpd/mod_php5.so - AddType application/x-httpd-php .php - - DirectoryIndex index.php - Options All - Allow from All - AllowOverride All - Require all granted - + listen.allowed_clients = 127.0.0.1 -9. Edit ${PREFIX}/share/tt-rss/config.php, be sure to have the following +11. Be sure to have the following lines in ${PREFIX}/etc/nginx/nginx.conf + + http { + upstream php-handler { + server 127.0.0.1:9000; + } + + server { + listen 80; + root ${PREFIX}/share/tt-rss; + server_name YOUR_SERVER_NAME; + + location ~ \..*/.*\.php$ {return 404;} + + location ~* ^/(.*\.php)$ { + try_files $uri $uri/ index.php; + + include fastcgi_params; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$1; + fastcgi_param PATH_INFO $2; + fastcgi_pass php-handler; + } + } + + +12. Edit ${PREFIX}/share/tt-rss/config.php, be sure to have the following lines. define('DB_TYPE', "pgsql"); @@ -81,11 +95,14 @@ the following steps. define('DB_PASS', "ttrss_user_password"); define('SELF_URL_PATH', 'http://localhost/'); -10. Start Apache httpd 2.4 +13. Start PHP-FPM daemon. - # ${RCD_SCRIPTS_DIR}/apache start + ${RCD_SCRIPTS_DIR}/php_fpm start -11. Access http://localhost/ , and login with - login/password = "admin"/"password". +14. Start nginx httpd server. + ${RCD_SCRIPTS_DIR}/nginx start + +15. Access http://localhost/ , and login with + login/password = "admin"/"password". =========================================================================== diff --git a/www/php-tt-rss/Makefile b/www/php-tt-rss/Makefile index 59f9244041b..72d0c970447 100644 --- a/www/php-tt-rss/Makefile +++ b/www/php-tt-rss/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2014/01/27 18:41:15 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2014/06/29 15:23:47 ryoon Exp $ -TTRVER= 1.10 +TTRVER= 1.12 DISTNAME= Tiny-Tiny-RSS-${TTRVER} PKGNAME= ${PHP_PKG_PREFIX}-tt-rss-${TTRVER} -PKGREVISION= 1 CATEGORIES= www MASTER_SITES= -http://github.com/gothfox/Tiny-Tiny-RSS/archive/${TTRVER}.tar.gz diff --git a/www/php-tt-rss/PLIST b/www/php-tt-rss/PLIST index eec99686512..839ea5d1e6a 100644 --- a/www/php-tt-rss/PLIST +++ b/www/php-tt-rss/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2013/10/12 13:14:28 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.6 2014/06/29 15:23:47 ryoon Exp $ share/tt-rss/LICENSE share/tt-rss/README.md share/tt-rss/api/index.php @@ -54,10 +54,12 @@ share/tt-rss/classes/rpc.php share/tt-rss/classes/ttrssmailer.php share/tt-rss/config.php-dist share/tt-rss/css/cdm.css +share/tt-rss/css/dijit.css share/tt-rss/css/layout.css share/tt-rss/css/prefs.css share/tt-rss/css/tt-rss.css share/tt-rss/css/utility.css +share/tt-rss/css/zoom.css share/tt-rss/errors.php share/tt-rss/feed-icons/.empty share/tt-rss/feed-icons/index.html @@ -95,8 +97,11 @@ share/tt-rss/images/score_low.png share/tt-rss/images/score_neutral.png share/tt-rss/images/star.png share/tt-rss/images/tag.png +share/tt-rss/images/tick.png share/tt-rss/images/time.png share/tt-rss/images/toolbar.png +share/tt-rss/images/treeExpandImages.png +share/tt-rss/images/untick.png share/tt-rss/images/user.png share/tt-rss/include/autoload.php share/tt-rss/include/ccache.php @@ -108,6 +113,7 @@ share/tt-rss/include/digest.php share/tt-rss/include/errorhandler.php share/tt-rss/include/feedbrowser.php share/tt-rss/include/functions.php +share/tt-rss/include/functions2.php share/tt-rss/include/labels.php share/tt-rss/include/login_form.php share/tt-rss/include/rssfuncs.php @@ -1994,7 +2000,6 @@ share/tt-rss/lib/pubsubhubbub/README.txt share/tt-rss/lib/pubsubhubbub/publisher.php share/tt-rss/lib/pubsubhubbub/subscriber.php share/tt-rss/lib/scriptaculous/controls.js -share/tt-rss/lib/scriptaculous/dragdrop.js share/tt-rss/lib/scriptaculous/effects.js share/tt-rss/lib/scriptaculous/scriptaculous.js share/tt-rss/lib/sphinxapi.php @@ -2035,23 +2040,31 @@ share/tt-rss/locale/ru_RU/LC_MESSAGES/messages.mo share/tt-rss/locale/ru_RU/LC_MESSAGES/messages.po share/tt-rss/locale/sv_SE/LC_MESSAGES/messages.mo share/tt-rss/locale/sv_SE/LC_MESSAGES/messages.po +share/tt-rss/locale/tr_TR/LC_MESSAGES/messages.mo +share/tt-rss/locale/tr_TR/LC_MESSAGES/messages.po share/tt-rss/locale/zh_CN/LC_MESSAGES/messages.mo share/tt-rss/locale/zh_CN/LC_MESSAGES/messages.po +share/tt-rss/locale/zh_TW/LC_MESSAGES/messages.mo +share/tt-rss/locale/zh_TW/LC_MESSAGES/messages.po share/tt-rss/lock/.empty share/tt-rss/lock/.htaccess share/tt-rss/messages.pot share/tt-rss/opml.php -share/tt-rss/plugins/af_buni/init.php -share/tt-rss/plugins/af_buttersafe/init.php -share/tt-rss/plugins/af_dilbert/init.php -share/tt-rss/plugins/af_explosm/init.php -share/tt-rss/plugins/af_gocomics/init.php +share/tt-rss/plugins/af_comics/af_comics_template.php +share/tt-rss/plugins/af_comics/filter_base.php +share/tt-rss/plugins/af_comics/filters/af_comics_cad.php +share/tt-rss/plugins/af_comics/filters/af_comics_comicpress.php +share/tt-rss/plugins/af_comics/filters/af_comics_dilbert.php +share/tt-rss/plugins/af_comics/filters/af_comics_explosm.php +share/tt-rss/plugins/af_comics/filters/af_comics_gocomics.php +share/tt-rss/plugins/af_comics/filters/af_comics_pa.php +share/tt-rss/plugins/af_comics/filters/af_comics_twp.php +share/tt-rss/plugins/af_comics/init.php +share/tt-rss/plugins/af_fsckportal/init.php share/tt-rss/plugins/af_natgeo/init.php -share/tt-rss/plugins/af_pennyarcade/init.php share/tt-rss/plugins/af_redditimgur/init.php share/tt-rss/plugins/af_sciam/init.php share/tt-rss/plugins/af_unburn/init.php -share/tt-rss/plugins/af_whomp/init.php share/tt-rss/plugins/auth_internal/init.php share/tt-rss/plugins/auth_remote/init.php share/tt-rss/plugins/bookmarklets/init.php @@ -2080,6 +2093,8 @@ share/tt-rss/plugins/mark_button/init.php share/tt-rss/plugins/no_iframes/init.php share/tt-rss/plugins/no_title_counters/init.js share/tt-rss/plugins/no_title_counters/init.php +share/tt-rss/plugins/no_url_hashes/init.js +share/tt-rss/plugins/no_url_hashes/init.php share/tt-rss/plugins/note/init.php share/tt-rss/plugins/note/note.js share/tt-rss/plugins/note/note.png @@ -2131,6 +2146,7 @@ share/tt-rss/schema/versions/mysql/120.sql share/tt-rss/schema/versions/mysql/121.sql share/tt-rss/schema/versions/mysql/122.sql share/tt-rss/schema/versions/mysql/123.sql +share/tt-rss/schema/versions/mysql/124.sql share/tt-rss/schema/versions/mysql/13.sql share/tt-rss/schema/versions/mysql/14.sql share/tt-rss/schema/versions/mysql/15.sql @@ -2252,6 +2268,7 @@ share/tt-rss/schema/versions/pgsql/120.sql share/tt-rss/schema/versions/pgsql/121.sql share/tt-rss/schema/versions/pgsql/122.sql share/tt-rss/schema/versions/pgsql/123.sql +share/tt-rss/schema/versions/pgsql/124.sql share/tt-rss/schema/versions/pgsql/13.sql share/tt-rss/schema/versions/pgsql/14.sql share/tt-rss/schema/versions/pgsql/15.sql @@ -2351,9 +2368,11 @@ share/tt-rss/templates/digest_template.txt share/tt-rss/templates/digest_template_html.txt share/tt-rss/templates/email_article_template.txt share/tt-rss/templates/generated_feed.txt +share/tt-rss/templates/resetpass_link_template.txt share/tt-rss/templates/resetpass_template.txt share/tt-rss/themes/.empty share/tt-rss/themes/default.css +share/tt-rss/themes/night.css share/tt-rss/update.php share/tt-rss/update_daemon2.php share/tt-rss/utils/.htaccess diff --git a/www/php-tt-rss/distinfo b/www/php-tt-rss/distinfo index a41b154fc14..1de89bae78c 100644 --- a/www/php-tt-rss/distinfo +++ b/www/php-tt-rss/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.5 2013/10/12 13:14:28 ryoon Exp $ +$NetBSD: distinfo,v 1.6 2014/06/29 15:23:47 ryoon Exp $ -SHA1 (Tiny-Tiny-RSS-1.10.tar.gz) = 0df66dc2e409dfbb487805500c6fe3b92c4104f0 -RMD160 (Tiny-Tiny-RSS-1.10.tar.gz) = 080d63363f3a6a4f61f9fb0a888b502596af5818 -Size (Tiny-Tiny-RSS-1.10.tar.gz) = 2534833 bytes +SHA1 (Tiny-Tiny-RSS-1.12.tar.gz) = 074789338422ccfc7072066bf4eb15d0cb6f0565 +RMD160 (Tiny-Tiny-RSS-1.12.tar.gz) = 900665239659c988d65557d3c924e14c9c0d1b88 +Size (Tiny-Tiny-RSS-1.12.tar.gz) = 2629087 bytes -- cgit v1.2.3