Date: Mon, 7 Jul 2025 03:51:37 GMT From: Koichiro Iwao <meta@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 0df0ed7b50dc - main - www/tt-rss: Update to g20250704 (46e05583a991f2d) Message-ID: <202507070351.5673pbJ6051472@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by meta: URL: https://cgit.FreeBSD.org/ports/commit/?id=0df0ed7b50dc182db553dbe420fd132c95ae1201 commit 0df0ed7b50dc182db553dbe420fd132c95ae1201 Author: Derek Schrock <dereks@lifeofadishwasher.com> AuthorDate: 2025-07-06 20:28:20 +0000 Commit: Koichiro Iwao <meta@FreeBSD.org> CommitDate: 2025-07-07 03:51:10 +0000 www/tt-rss: Update to g20250704 (46e05583a991f2d) - Update to g20250704 (46e05583a991f2d) - Remove MYSQL references. See 20250511 [1] - mysql support continues to exist in 2025Q3 - Fully depend on pdo_pgsql [1] https://cgit.freebsd.org/ports/tree/UPDATING PR: 288069 --- www/tt-rss/Makefile | 18 ++--- www/tt-rss/distinfo | 6 +- www/tt-rss/files/config.php.in | 1 - www/tt-rss/files/pkg-message.in | 7 -- www/tt-rss/files/ttrssd.in | 31 -------- www/tt-rss/pkg-plist | 171 +++++----------------------------------- 6 files changed, 27 insertions(+), 207 deletions(-) diff --git a/www/tt-rss/Makefile b/www/tt-rss/Makefile index 90f2e16e73ce..9b41c4a972d8 100644 --- a/www/tt-rss/Makefile +++ b/www/tt-rss/Makefile @@ -1,5 +1,5 @@ PORTNAME= tt-rss -DISTVERSION= g20250427 +DISTVERSION= g20250704 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= LOCAL/meta @@ -17,11 +17,11 @@ USES= gettext-tools php:cli,web,flavors shebangfix USE_GITLAB= yes GL_SITE= https://gitlab.tt-rss.org -GL_TAGNAME= f097c5ed97671f66be71e52c13917c23528ba308 +GL_TAGNAME= 46e05583a991f2d3355cbd062d9932ccee1ea25a # phe json/openssl extension is required but it's statically linked in default php USE_PHP= ctype dom exif fileinfo filter iconv intl mbstring pcntl pdo \ - phar posix session simplexml sockets sodium tokenizer xml \ - xmlwriter zip + pdo_pgsql phar posix session simplexml sockets sodium tokenizer \ + xml xmlwriter zip USE_RC_SUBR= ttrssd SHEBANG_FILES= update.php update_daemon2.php @@ -31,16 +31,8 @@ REINPLACE_ARGS= -i "" NO_ARCH= yes NO_BUILD= yes -# Instead of depending on the extact database driver list php packages that tt-rss -# depends on during install pkg-message as a post install setup. -# mysql: php-mysqli php-pdo_mysql -# pgsql: php-pgsql php-pdo_pgsql -# -# from Mk/Uses/php.mk create sub vars for mysqli/pdo_mysql pgsql/pdo_pgsql values SUB_FILES= config.php httpd-tt-rss.conf pkg-message -SUB_LIST= MYSQL_DEPS="${mysqli_DEPENDS:T} ${pdo_mysql_DEPENDS:T}" \ - PGSQL_DEPS="${pgsql_DEPENDS:T} ${pdo_pgsql_DEPENDS:T}" \ - WWWOWN=${WWWOWN} +SUB_LIST= WWWOWN=${WWWOWN} PLIST_SUB= WWWGRP=${WWWGRP} \ WWWOWN=${WWWOWN} diff --git a/www/tt-rss/distinfo b/www/tt-rss/distinfo index 41aa613d9a2b..3dacbb7cba94 100644 --- a/www/tt-rss/distinfo +++ b/www/tt-rss/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1747000425 -SHA256 (tt-rss-tt-rss-f097c5ed97671f66be71e52c13917c23528ba308_GL0.tar.gz) = 996189e8a7acdc5e8b44fb181b0ff7f6ce746acca77a43e300c0af56efa40b6f -SIZE (tt-rss-tt-rss-f097c5ed97671f66be71e52c13917c23528ba308_GL0.tar.gz) = 8712416 +TIMESTAMP = 1751684153 +SHA256 (tt-rss-tt-rss-46e05583a991f2d3355cbd062d9932ccee1ea25a_GL0.tar.gz) = 72dfbb3ea6ec023ff6fba936e9618e67554253aacc076c9c06de30aabd62729b +SIZE (tt-rss-tt-rss-46e05583a991f2d3355cbd062d9932ccee1ea25a_GL0.tar.gz) = 8775226 diff --git a/www/tt-rss/files/config.php.in b/www/tt-rss/files/config.php.in index e04d7c59cf53..75cf4aa9c350 100644 --- a/www/tt-rss/files/config.php.in +++ b/www/tt-rss/files/config.php.in @@ -24,7 +24,6 @@ #putenv('TTRSS_SINGLE_USER_MODE=true'); #putenv('TTRSS_SELF_URL_PATH='); - #putenv('TTRSS_DB_TYPE='); #putenv('TTRSS_DB_HOST='); #putenv('TTRSS_DB_USER='); #putenv('TTRSS_DB_NAME='); diff --git a/www/tt-rss/files/pkg-message.in b/www/tt-rss/files/pkg-message.in index a0602b7e0475..34bf547f3560 100644 --- a/www/tt-rss/files/pkg-message.in +++ b/www/tt-rss/files/pkg-message.in @@ -3,13 +3,6 @@ message: <<EOM Tiny Tiny RSS is now installed, but it requires some additional setup. -Install your corresponding php database drivers: - - msyql: mysqli pdo_mysql - pkg install %%MYSQL_DEPS%% - postgresql: pgsql pdo_pgsql - pkg install %%PGSQL_DEPS%% - You now need to create a database, a database user, configure the web server, and configure tt-rss. Sample apache24 configs located at %%DATADIR%%/httpd-tt-rss.conf. diff --git a/www/tt-rss/files/ttrssd.in b/www/tt-rss/files/ttrssd.in index 7934b98a4afc..6fdd8b6ea1f3 100644 --- a/www/tt-rss/files/ttrssd.in +++ b/www/tt-rss/files/ttrssd.in @@ -36,35 +36,4 @@ command_args="-rR 10 -H -u %%WWWOWN%% \ '$initdb_php --update-schema=force-yes; \ $phpupd;'" -stop_cmd="${name}_stop" - -# daemon doesn't process signals if it lacks a child process. -# See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=277959 -ttrssd_stop() { - local pid_daemon - local pid_child - local signal="TERM" - - pid_daemon=$(check_pidfile ${pidfile} ${command}) - pid_child=$(check_pidfile ${cpidfile} ${phpcli}) - - if [ -n "$pid_daemon" ]; then - echo "Stopping ${name}." - - if [ -z "${pid_child}" ]; then - signal="INT" - fi - - kill -"$signal" "${pid_daemon}" - - wait_for_pids "${pid_daemon}" "${pid_child}" - else - if [ -n "$pid_child" ]; then - echo "${name} not running? (check ${cpidfile})." - else - echo "${name} not running? (check ${pidfile})." - fi - fi -} - run_rc_command "$1" diff --git a/www/tt-rss/pkg-plist b/www/tt-rss/pkg-plist index 5818ba98cf63..cf91c1353ed6 100644 --- a/www/tt-rss/pkg-plist +++ b/www/tt-rss/pkg-plist @@ -81,6 +81,7 @@ %%WWWDIR%%/classes/RPC.php %%WWWDIR%%/classes/RSSUtils.php %%WWWDIR%%/classes/Sanitizer.php +%%WWWDIR%%/classes/Scheduler.php %%WWWDIR%%/classes/Sessions.php %%WWWDIR%%/classes/Templator.php %%WWWDIR%%/classes/TimeHelper.php @@ -1978,6 +1979,8 @@ %%WWWDIR%%/locale/pt_PT/LC_MESSAGES/messages.po %%WWWDIR%%/locale/ru_RU/LC_MESSAGES/messages.mo %%WWWDIR%%/locale/ru_RU/LC_MESSAGES/messages.po +%%WWWDIR%%/locale/sq/LC_MESSAGES/messages.mo +%%WWWDIR%%/locale/sq/LC_MESSAGES/messages.po %%WWWDIR%%/locale/sv_SE/LC_MESSAGES/messages.mo %%WWWDIR%%/locale/sv_SE/LC_MESSAGES/messages.po %%WWWDIR%%/locale/ta/LC_MESSAGES/messages.mo @@ -2005,10 +2008,6 @@ %%WWWDIR%%/plugins/af_comics/filters/af_comics_dilbert.php %%WWWDIR%%/plugins/af_comics/filters/af_comics_dumbingofage.php %%WWWDIR%%/plugins/af_comics/filters/af_comics_explosm.php -%%WWWDIR%%/plugins/af_comics/filters/af_comics_gocomics.php -%%WWWDIR%%/plugins/af_comics/filters/af_comics_gocomics_farside.php -%%WWWDIR%%/plugins/af_comics/filters/af_comics_pa.php -%%WWWDIR%%/plugins/af_comics/filters/af_comics_pvp.php %%WWWDIR%%/plugins/af_comics/filters/af_comics_tfd.php %%WWWDIR%%/plugins/af_comics/filters/af_comics_theoatmeal.php %%WWWDIR%%/plugins/af_comics/filters/af_comics_twp.php @@ -2048,154 +2047,6 @@ %%WWWDIR%%/public.php %%WWWDIR%%/schema/ttrss_schema_mysql.sql %%WWWDIR%%/schema/ttrss_schema_pgsql.sql -%%WWWDIR%%/sql/mysql/migrations/3.sql -%%WWWDIR%%/sql/mysql/migrations/4.sql -%%WWWDIR%%/sql/mysql/migrations/5.sql -%%WWWDIR%%/sql/mysql/migrations/6.sql -%%WWWDIR%%/sql/mysql/migrations/7.sql -%%WWWDIR%%/sql/mysql/migrations/8.sql -%%WWWDIR%%/sql/mysql/migrations/9.sql -%%WWWDIR%%/sql/mysql/migrations/10.sql -%%WWWDIR%%/sql/mysql/migrations/11.sql -%%WWWDIR%%/sql/mysql/migrations/12.sql -%%WWWDIR%%/sql/mysql/migrations/13.sql -%%WWWDIR%%/sql/mysql/migrations/14.sql -%%WWWDIR%%/sql/mysql/migrations/15.sql -%%WWWDIR%%/sql/mysql/migrations/16.sql -%%WWWDIR%%/sql/mysql/migrations/17.sql -%%WWWDIR%%/sql/mysql/migrations/18.sql -%%WWWDIR%%/sql/mysql/migrations/19.sql -%%WWWDIR%%/sql/mysql/migrations/20.sql -%%WWWDIR%%/sql/mysql/migrations/21.sql -%%WWWDIR%%/sql/mysql/migrations/22.sql -%%WWWDIR%%/sql/mysql/migrations/23.sql -%%WWWDIR%%/sql/mysql/migrations/24.sql -%%WWWDIR%%/sql/mysql/migrations/25.sql -%%WWWDIR%%/sql/mysql/migrations/26.sql -%%WWWDIR%%/sql/mysql/migrations/27.sql -%%WWWDIR%%/sql/mysql/migrations/28.sql -%%WWWDIR%%/sql/mysql/migrations/29.sql -%%WWWDIR%%/sql/mysql/migrations/30.sql -%%WWWDIR%%/sql/mysql/migrations/31.sql -%%WWWDIR%%/sql/mysql/migrations/32.sql -%%WWWDIR%%/sql/mysql/migrations/33.sql -%%WWWDIR%%/sql/mysql/migrations/34.sql -%%WWWDIR%%/sql/mysql/migrations/35.sql -%%WWWDIR%%/sql/mysql/migrations/36.sql -%%WWWDIR%%/sql/mysql/migrations/37.sql -%%WWWDIR%%/sql/mysql/migrations/38.sql -%%WWWDIR%%/sql/mysql/migrations/39.sql -%%WWWDIR%%/sql/mysql/migrations/40.sql -%%WWWDIR%%/sql/mysql/migrations/41.sql -%%WWWDIR%%/sql/mysql/migrations/42.sql -%%WWWDIR%%/sql/mysql/migrations/43.sql -%%WWWDIR%%/sql/mysql/migrations/44.sql -%%WWWDIR%%/sql/mysql/migrations/45.sql -%%WWWDIR%%/sql/mysql/migrations/46.sql -%%WWWDIR%%/sql/mysql/migrations/47.sql -%%WWWDIR%%/sql/mysql/migrations/48.sql -%%WWWDIR%%/sql/mysql/migrations/49.sql -%%WWWDIR%%/sql/mysql/migrations/50.sql -%%WWWDIR%%/sql/mysql/migrations/51.sql -%%WWWDIR%%/sql/mysql/migrations/52.sql -%%WWWDIR%%/sql/mysql/migrations/53.sql -%%WWWDIR%%/sql/mysql/migrations/54.sql -%%WWWDIR%%/sql/mysql/migrations/55.sql -%%WWWDIR%%/sql/mysql/migrations/56.sql -%%WWWDIR%%/sql/mysql/migrations/57.sql -%%WWWDIR%%/sql/mysql/migrations/58.sql -%%WWWDIR%%/sql/mysql/migrations/59.sql -%%WWWDIR%%/sql/mysql/migrations/60.sql -%%WWWDIR%%/sql/mysql/migrations/61.sql -%%WWWDIR%%/sql/mysql/migrations/62.sql -%%WWWDIR%%/sql/mysql/migrations/63.sql -%%WWWDIR%%/sql/mysql/migrations/64.sql -%%WWWDIR%%/sql/mysql/migrations/65.sql -%%WWWDIR%%/sql/mysql/migrations/66.sql -%%WWWDIR%%/sql/mysql/migrations/67.sql -%%WWWDIR%%/sql/mysql/migrations/68.sql -%%WWWDIR%%/sql/mysql/migrations/69.sql -%%WWWDIR%%/sql/mysql/migrations/70.sql -%%WWWDIR%%/sql/mysql/migrations/71.sql -%%WWWDIR%%/sql/mysql/migrations/72.sql -%%WWWDIR%%/sql/mysql/migrations/73.sql -%%WWWDIR%%/sql/mysql/migrations/74.sql -%%WWWDIR%%/sql/mysql/migrations/75.sql -%%WWWDIR%%/sql/mysql/migrations/76.sql -%%WWWDIR%%/sql/mysql/migrations/77.sql -%%WWWDIR%%/sql/mysql/migrations/78.sql -%%WWWDIR%%/sql/mysql/migrations/79.sql -%%WWWDIR%%/sql/mysql/migrations/80.sql -%%WWWDIR%%/sql/mysql/migrations/81.sql -%%WWWDIR%%/sql/mysql/migrations/82.sql -%%WWWDIR%%/sql/mysql/migrations/83.sql -%%WWWDIR%%/sql/mysql/migrations/84.sql -%%WWWDIR%%/sql/mysql/migrations/85.sql -%%WWWDIR%%/sql/mysql/migrations/86.sql -%%WWWDIR%%/sql/mysql/migrations/87.sql -%%WWWDIR%%/sql/mysql/migrations/88.sql -%%WWWDIR%%/sql/mysql/migrations/89.sql -%%WWWDIR%%/sql/mysql/migrations/90.sql -%%WWWDIR%%/sql/mysql/migrations/91.sql -%%WWWDIR%%/sql/mysql/migrations/92.sql -%%WWWDIR%%/sql/mysql/migrations/93.sql -%%WWWDIR%%/sql/mysql/migrations/94.sql -%%WWWDIR%%/sql/mysql/migrations/95.sql -%%WWWDIR%%/sql/mysql/migrations/96.sql -%%WWWDIR%%/sql/mysql/migrations/97.sql -%%WWWDIR%%/sql/mysql/migrations/98.sql -%%WWWDIR%%/sql/mysql/migrations/99.sql -%%WWWDIR%%/sql/mysql/migrations/100.sql -%%WWWDIR%%/sql/mysql/migrations/101.sql -%%WWWDIR%%/sql/mysql/migrations/102.sql -%%WWWDIR%%/sql/mysql/migrations/103.sql -%%WWWDIR%%/sql/mysql/migrations/104.sql -%%WWWDIR%%/sql/mysql/migrations/105.sql -%%WWWDIR%%/sql/mysql/migrations/106.sql -%%WWWDIR%%/sql/mysql/migrations/107.sql -%%WWWDIR%%/sql/mysql/migrations/108.sql -%%WWWDIR%%/sql/mysql/migrations/109.sql -%%WWWDIR%%/sql/mysql/migrations/110.sql -%%WWWDIR%%/sql/mysql/migrations/111.sql -%%WWWDIR%%/sql/mysql/migrations/112.sql -%%WWWDIR%%/sql/mysql/migrations/113.sql -%%WWWDIR%%/sql/mysql/migrations/114.sql -%%WWWDIR%%/sql/mysql/migrations/115.sql -%%WWWDIR%%/sql/mysql/migrations/116.sql -%%WWWDIR%%/sql/mysql/migrations/117.sql -%%WWWDIR%%/sql/mysql/migrations/118.sql -%%WWWDIR%%/sql/mysql/migrations/119.sql -%%WWWDIR%%/sql/mysql/migrations/120.sql -%%WWWDIR%%/sql/mysql/migrations/121.sql -%%WWWDIR%%/sql/mysql/migrations/122.sql -%%WWWDIR%%/sql/mysql/migrations/123.sql -%%WWWDIR%%/sql/mysql/migrations/124.sql -%%WWWDIR%%/sql/mysql/migrations/125.sql -%%WWWDIR%%/sql/mysql/migrations/126.sql -%%WWWDIR%%/sql/mysql/migrations/127.sql -%%WWWDIR%%/sql/mysql/migrations/128.sql -%%WWWDIR%%/sql/mysql/migrations/129.sql -%%WWWDIR%%/sql/mysql/migrations/130.sql -%%WWWDIR%%/sql/mysql/migrations/131.sql -%%WWWDIR%%/sql/mysql/migrations/132.sql -%%WWWDIR%%/sql/mysql/migrations/133.sql -%%WWWDIR%%/sql/mysql/migrations/134.sql -%%WWWDIR%%/sql/mysql/migrations/135.sql -%%WWWDIR%%/sql/mysql/migrations/136.sql -%%WWWDIR%%/sql/mysql/migrations/137.sql -%%WWWDIR%%/sql/mysql/migrations/138.sql -%%WWWDIR%%/sql/mysql/migrations/139.sql -%%WWWDIR%%/sql/mysql/migrations/140.sql -%%WWWDIR%%/sql/mysql/migrations/141.sql -%%WWWDIR%%/sql/mysql/migrations/142.sql -%%WWWDIR%%/sql/mysql/migrations/143.sql -%%WWWDIR%%/sql/mysql/migrations/144.sql -%%WWWDIR%%/sql/mysql/migrations/145.sql -%%WWWDIR%%/sql/mysql/migrations/146.sql -%%WWWDIR%%/sql/mysql/migrations/147.sql -%%WWWDIR%%/sql/mysql/migrations/148.sql -%%WWWDIR%%/sql/mysql/migrations/149.sql -%%WWWDIR%%/sql/mysql/schema.sql %%WWWDIR%%/sql/pgsql/migrations/3.sql %%WWWDIR%%/sql/pgsql/migrations/4.sql %%WWWDIR%%/sql/pgsql/migrations/5.sql @@ -2343,6 +2194,8 @@ %%WWWDIR%%/sql/pgsql/migrations/147.sql %%WWWDIR%%/sql/pgsql/migrations/148.sql %%WWWDIR%%/sql/pgsql/migrations/149.sql +%%WWWDIR%%/sql/pgsql/migrations/150.sql +%%WWWDIR%%/sql/pgsql/migrations/151.sql %%WWWDIR%%/sql/pgsql/schema.sql %%WWWDIR%%/templates.local/index.html %%WWWDIR%%/templates/digest_template.txt @@ -2382,6 +2235,7 @@ %%WWWDIR%%/themes/night_base.less %%WWWDIR%%/themes/night_blue.css %%WWWDIR%%/themes/night_blue.less +%%WWWDIR%%/utils/autoMergeRequest.sh %%WWWDIR%%/utils/phpstan-watcher.sh %%WWWDIR%%/utils/phpunit-integration.sh %%WWWDIR%%/utils/phpunit.sh @@ -2473,6 +2327,19 @@ %%WWWDIR%%/vendor/composer/autoload_static.php %%WWWDIR%%/vendor/composer/installed.json %%WWWDIR%%/vendor/composer/installed.php +%%WWWDIR%%/vendor/dragonmantank/cron-expression/CHANGELOG.md +%%WWWDIR%%/vendor/dragonmantank/cron-expression/README.md +%%WWWDIR%%/vendor/dragonmantank/cron-expression/composer.json +%%WWWDIR%%/vendor/dragonmantank/cron-expression/src/Cron/AbstractField.php +%%WWWDIR%%/vendor/dragonmantank/cron-expression/src/Cron/CronExpression.php +%%WWWDIR%%/vendor/dragonmantank/cron-expression/src/Cron/DayOfMonthField.php +%%WWWDIR%%/vendor/dragonmantank/cron-expression/src/Cron/DayOfWeekField.php +%%WWWDIR%%/vendor/dragonmantank/cron-expression/src/Cron/FieldFactory.php +%%WWWDIR%%/vendor/dragonmantank/cron-expression/src/Cron/FieldFactoryInterface.php +%%WWWDIR%%/vendor/dragonmantank/cron-expression/src/Cron/FieldInterface.php +%%WWWDIR%%/vendor/dragonmantank/cron-expression/src/Cron/HoursField.php +%%WWWDIR%%/vendor/dragonmantank/cron-expression/src/Cron/MinutesField.php +%%WWWDIR%%/vendor/dragonmantank/cron-expression/src/Cron/MonthField.php %%WWWDIR%%/vendor/doctrine/instantiator/.doctrine-project.json %%WWWDIR%%/vendor/doctrine/instantiator/CONTRIBUTING.md %%WWWDIR%%/vendor/doctrine/instantiator/README.mdhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202507070351.5673pbJ6051472>