From 607a189d9c4b6af3db99acefe825eb43eb677e1c Mon Sep 17 00:00:00 2001 From: Derek Schrock Date: Tue, 11 Aug 2020 20:45:31 -0400 Subject: [PATCH] www/tt-rss: Fix permissions, apache sample, add php dep. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Default permissions for cache/images broken on new installations - Permissions on misc dirs not set to www:www - apache sample updated with 2.4 syntax - Add missing PHP extension iconv Reported by Ulrich Spörlein #248601 --- www/tt-rss/Makefile | 3 ++- www/tt-rss/files/httpd-tt-rss.conf.in | 3 +-- www/tt-rss/pkg-plist | 25 +++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/www/tt-rss/Makefile b/www/tt-rss/Makefile index a9bb9e89cae0..406aca30d096 100644 --- a/www/tt-rss/Makefile +++ b/www/tt-rss/Makefile @@ -3,6 +3,7 @@ PORTNAME= tt-rss PORTVERSION= g20200801 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= https://git.tt-rss.org/fox/tt-rss/archive/ @@ -15,7 +16,7 @@ COMMENT= Tiny Tiny RSS: web-based news feed (RSS/Atom) aggregator LICENSE= GPLv2 USES= php:cli,web shebangfix gettext-tools -USE_PHP= ctype dom fileinfo intl hash json mbstring pcntl posix session xmlrpc +USE_PHP= ctype dom fileinfo iconv intl hash json mbstring pcntl posix session xmlrpc REINPLACE_ARGS= -i "" SHEBANG_FILES= lib/dojo-src/rebuild-dojo.sh utils/extract-i18n-js.pl diff --git a/www/tt-rss/files/httpd-tt-rss.conf.in b/www/tt-rss/files/httpd-tt-rss.conf.in index a5ca5746fc94..c0a0c25e4250 100644 --- a/www/tt-rss/files/httpd-tt-rss.conf.in +++ b/www/tt-rss/files/httpd-tt-rss.conf.in @@ -3,8 +3,7 @@ Options Indexes FollowSymLinks MultiViews AllowOverride None - Order allow,deny - Allow from all + Require all granted diff --git a/www/tt-rss/pkg-plist b/www/tt-rss/pkg-plist index ef3a167b43b6..9e6f119766b7 100644 --- a/www/tt-rss/pkg-plist +++ b/www/tt-rss/pkg-plist @@ -2763,10 +2763,14 @@ @group @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/vendor/Psr/Log/Test @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/vendor/Psr/Log +@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/vendor/Psr @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/vendor/OTPHP +@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/vendor @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/utils +@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/themes/light @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/themes.local @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/themes +@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/templates.local @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/templates @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/schema/versions/pgsql @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/schema/versions/mysql @@ -2797,6 +2801,11 @@ @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/plugins/af_unburn @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/plugins/af_tumblr_1280 @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/plugins/af_redditimgur +@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/plugins/af_readability/vendor/andreskrey/Readability/Nodes/DOM +@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/plugins/af_readability/vendor/andreskrey/Readability/Nodes +@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/plugins/af_readability/vendor/andreskrey/Readability +@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/plugins/af_readability/vendor/andreskrey +@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/plugins/af_readability/vendor @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/plugins/af_readability @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/plugins/af_psql_trgm @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/plugins/af_fsckportal @@ -2805,11 +2814,17 @@ @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/plugins/af_comics @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/plugins.local @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/plugins +@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/plugins/af_proxy_http +@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/plugins/hotkeys_force_top +@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/plugins/hotkeys_noscroll +@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/plugins/hotkeys_swap_jk @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/lock @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/locale/zh_TW/LC_MESSAGES @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/locale/zh_TW @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/locale/zh_CN/LC_MESSAGES @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/locale/zh_CN +@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/locale/uk_UA/LC_MESSAGES +@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/locale/uk_UA @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/locale/tr_TR/LC_MESSAGES @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/locale/tr_TR @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/locale/sv_SE/LC_MESSAGES @@ -2834,6 +2849,8 @@ @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/locale/ja_JP @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/locale/it_IT/LC_MESSAGES @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/locale/it_IT +@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/locale/id/LC_MESSAGES +@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/locale/id @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/locale/hu_HU/LC_MESSAGES @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/locale/hu_HU @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/locale/fr_FR/LC_MESSAGES @@ -2844,6 +2861,8 @@ @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/locale/es_LA @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/locale/es_ES/LC_MESSAGES @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/locale/es_ES +@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/locale/eo/LC_MESSAGES +@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/locale/eo @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/locale/el_GR/LC_MESSAGES @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/locale/el_GR @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/locale/de_DE/LC_MESSAGES @@ -2874,6 +2893,10 @@ @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/lib/phpqrcode/bindings @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/lib/phpqrcode @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/lib/gettext +@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/lib/flat-ttrss +@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/lib/flat-ttrss/fonts +@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/lib/flat-ttrss/images +@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/lib/iconfont @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/lib/dojo/store/util @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/lib/dojo/store/api @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/lib/dojo/store @@ -3129,6 +3152,7 @@ @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/lib/dijit/_base @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/lib/dijit @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/lib +@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/js/form @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/js @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/install @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/include @@ -3145,6 +3169,7 @@ @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/cache/upload @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/cache/feeds @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/cache/export +@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/cache/images @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/cache @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/api @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%% -- 2.28.0