Date: Tuesday, February 2, 2021 @ 01:11:29 Author: anatolik Revision: 840935
archrelease: copy trunk to community-any Added: tt-rss/repos/community-any/PKGBUILD (from rev 840934, tt-rss/trunk/PKGBUILD) tt-rss/repos/community-any/php7.patch (from rev 840934, tt-rss/trunk/php7.patch) tt-rss/repos/community-any/tt-rss.install (from rev 840934, tt-rss/trunk/tt-rss.install) tt-rss/repos/community-any/tt-rss.service (from rev 840934, tt-rss/trunk/tt-rss.service) Deleted: tt-rss/repos/community-any/PKGBUILD tt-rss/repos/community-any/php7.patch tt-rss/repos/community-any/service tt-rss/repos/community-any/tt-rss.install ----------------+ PKGBUILD | 124 +++++++++++++++++++++++++++---------------------------- php7.patch | 52 +++++++++++------------ service | 10 ---- tt-rss.install | 25 ++++++----- tt-rss.service | 10 ++++ 5 files changed, 112 insertions(+), 109 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-02-02 01:10:39 UTC (rev 840934) +++ PKGBUILD 2021-02-02 01:11:29 UTC (rev 840935) @@ -1,62 +0,0 @@ -# Maintainer: Anatol Pomozov <ana...@archlinux.org> -# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> -# Contributor: Clément Démoulins <clem...@archivel.fr> -# Contributor: David Rosenstrauch <dar...@darose.net> -# Contributor: Erik Mank <e...@braindisorder.org> - -pkgname=tt-rss -pkgver=r10198.6d8f2221b -pkgrel=1 -epoch=2 -pkgdesc='Web-based news feed (RSS/Atom) aggregator' -arch=(any) -url='https://tt-rss.org' -license=(GPL) -backup=(etc/webapps/tt-rss/config.php) -depends=(php7 php7-intl) -install=tt-rss.install -optdepends=('mysql' - 'postgresql' - 'php7-gd: for coloured feed badges') -makedepends=('git') -_commit=6d8f2221b82b6a31becbeed8baf5e05ad9e053fe -# periodic releases are over https://tt-rss.org/forum/viewtopic.php?f=10&t=3262 -source=(git+https://git.tt-rss.org/fox/tt-rss.git#commit=$_commit - service - php7.patch) -sha1sums=('SKIP' - '6975508c8cbe86152489fc6f1887c1d0d7df19e0' - '6e6a6350bf645f2d84785aa1c8e613be0cca337e') - -pkgver() { - cd tt-rss - printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" -} - -prepare() { - cd tt-rss - patch -p1 < ../php7.patch # https://bugs.archlinux.org/task/69462#comment196184 -} - -package() { - cd tt-rss - _instdir="$pkgdir"/usr/share/webapps/$pkgname - - install -d "$_instdir" - cp -ra * "$_instdir/" - - echo $pkgver > "$_instdir/version_static.txt" - - install -Dm640 -g 33 config.php-dist "$pkgdir"/etc/webapps/tt-rss/config.php - ln -s /etc/webapps/tt-rss/config.php "$_instdir"/config.php - - install -d "$pkgdir"/var/lib/tt-rss - mv "$_instdir"/{lock,feed-icons,cache} "$pkgdir"/var/lib/tt-rss - ln -s /var/lib/tt-rss/lock "$_instdir"/lock - ln -s /var/lib/tt-rss/feed-icons "$_instdir"/feed-icons - ln -s /var/lib/tt-rss/cache "$_instdir"/cache - chown -R 33:33 "$pkgdir"/var/lib/tt-rss - chmod -R 777 "$pkgdir"/var/lib/tt-rss/* - - install -Dm644 "$srcdir"/service "$pkgdir"/usr/lib/systemd/system/tt-rss.service -} Copied: tt-rss/repos/community-any/PKGBUILD (from rev 840934, tt-rss/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-02-02 01:11:29 UTC (rev 840935) @@ -0,0 +1,62 @@ +# Maintainer: Anatol Pomozov <ana...@archlinux.org> +# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> +# Contributor: Clément Démoulins <clem...@archivel.fr> +# Contributor: David Rosenstrauch <dar...@darose.net> +# Contributor: Erik Mank <e...@braindisorder.org> + +pkgname=tt-rss +pkgver=r10198.6d8f2221b +pkgrel=2 +epoch=2 +pkgdesc='Web-based news feed (RSS/Atom) aggregator' +arch=(any) +url='https://tt-rss.org' +license=(GPL) +backup=(etc/webapps/tt-rss/config.php) +depends=(php7 php7-intl) +install=tt-rss.install +optdepends=('mysql' + 'postgresql' + 'php7-gd: for coloured feed badges') +makedepends=('git') +_commit=6d8f2221b82b6a31becbeed8baf5e05ad9e053fe +# periodic releases are over https://tt-rss.org/forum/viewtopic.php?f=10&t=3262 +source=(git+https://git.tt-rss.org/fox/tt-rss.git#commit=$_commit + tt-rss.service + php7.patch) +sha1sums=('SKIP' + '6975508c8cbe86152489fc6f1887c1d0d7df19e0' + '6e6a6350bf645f2d84785aa1c8e613be0cca337e') + +pkgver() { + cd tt-rss + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" +} + +prepare() { + cd tt-rss + patch -p1 < ../php7.patch # https://bugs.archlinux.org/task/69462#comment196184 +} + +package() { + cd tt-rss + _instdir="$pkgdir"/usr/share/webapps/$pkgname + + install -d "$_instdir" + cp -ra * "$_instdir/" + + echo $pkgver > "$_instdir/version_static.txt" + + install -Dm640 -g 33 config.php-dist "$pkgdir"/etc/webapps/tt-rss/config.php + ln -s /etc/webapps/tt-rss/config.php "$_instdir"/config.php + + install -d "$pkgdir"/var/lib/tt-rss + mv "$_instdir"/{lock,feed-icons,cache} "$pkgdir"/var/lib/tt-rss + ln -s /var/lib/tt-rss/lock "$_instdir"/lock + ln -s /var/lib/tt-rss/feed-icons "$_instdir"/feed-icons + ln -s /var/lib/tt-rss/cache "$_instdir"/cache + chown -R 33:33 "$pkgdir"/var/lib/tt-rss + chmod -R 777 "$pkgdir"/var/lib/tt-rss/* + + install -Dm644 "$srcdir"/tt-rss.service "$pkgdir"/usr/lib/systemd/system/tt-rss.service +} Deleted: php7.patch =================================================================== --- php7.patch 2021-02-02 01:10:39 UTC (rev 840934) +++ php7.patch 2021-02-02 01:11:29 UTC (rev 840935) @@ -1,26 +0,0 @@ -diff --git a/config.php-dist b/config.php-dist -index eed1a699d..c18886390 100644 ---- a/config.php-dist -+++ b/config.php-dist -@@ -44,7 +44,7 @@ - // *** Files and directories *** - // ***************************** - -- define('PHP_EXECUTABLE', '/usr/bin/php'); -+ define('PHP_EXECUTABLE', '/usr/bin/php7'); - // Path to PHP *COMMAND LINE* executable, used for various command-line tt-rss - // programs and update daemon. Do not try to use CGI binary here, it won't work. - // If you see HTTP headers being displayed while running tt-rss scripts, -diff --git a/update.php b/update.php -index 2737b0456..721696d3a 100755 ---- a/update.php -+++ b/update.php -@@ -73,7 +73,7 @@ - } - - if (!defined('PHP_EXECUTABLE')) -- define('PHP_EXECUTABLE', '/usr/bin/php'); -+ define('PHP_EXECUTABLE', '/usr/bin/php7'); - - $pdo = Db::pdo(); - Copied: tt-rss/repos/community-any/php7.patch (from rev 840934, tt-rss/trunk/php7.patch) =================================================================== --- php7.patch (rev 0) +++ php7.patch 2021-02-02 01:11:29 UTC (rev 840935) @@ -0,0 +1,26 @@ +diff --git a/config.php-dist b/config.php-dist +index eed1a699d..c18886390 100644 +--- a/config.php-dist ++++ b/config.php-dist +@@ -44,7 +44,7 @@ + // *** Files and directories *** + // ***************************** + +- define('PHP_EXECUTABLE', '/usr/bin/php'); ++ define('PHP_EXECUTABLE', '/usr/bin/php7'); + // Path to PHP *COMMAND LINE* executable, used for various command-line tt-rss + // programs and update daemon. Do not try to use CGI binary here, it won't work. + // If you see HTTP headers being displayed while running tt-rss scripts, +diff --git a/update.php b/update.php +index 2737b0456..721696d3a 100755 +--- a/update.php ++++ b/update.php +@@ -73,7 +73,7 @@ + } + + if (!defined('PHP_EXECUTABLE')) +- define('PHP_EXECUTABLE', '/usr/bin/php'); ++ define('PHP_EXECUTABLE', '/usr/bin/php7'); + + $pdo = Db::pdo(); + Deleted: service =================================================================== --- service 2021-02-02 01:10:39 UTC (rev 840934) +++ service 2021-02-02 01:11:29 UTC (rev 840935) @@ -1,10 +0,0 @@ -[Unit] -Description=Tiny Tiny RSS feeds update daemon -After=network.target mysqld.service postgresql.service - -[Service] -ExecStart=/usr/bin/php7 /usr/share/webapps/tt-rss/update.php --daemon -User=http - -[Install] -WantedBy=multi-user.target Deleted: tt-rss.install =================================================================== --- tt-rss.install 2021-02-02 01:10:39 UTC (rev 840934) +++ tt-rss.install 2021-02-02 01:11:29 UTC (rev 840935) @@ -1,11 +0,0 @@ -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - if [ "$(vercmp $2 1:19.2.r209.gb68db2d02-1)" -le 0 ]; then - cat << EOF -===> Please make sure 'extension=intl' is enabled in PHP config (/etc/php/php.ini) -===> Otherwise you'll get a 'PHP UConverter class is missing' error -===> See https://wiki.archlinux.org/index.php/TT-RSS for more info -EOF - fi -} Copied: tt-rss/repos/community-any/tt-rss.install (from rev 840934, tt-rss/trunk/tt-rss.install) =================================================================== --- tt-rss.install (rev 0) +++ tt-rss.install 2021-02-02 01:11:29 UTC (rev 840935) @@ -0,0 +1,14 @@ +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + if [ "$(vercmp $2 2:r10198.6d8f2221b-2)" -le 0 ]; then + cat << EOF +===> tt-rss is not compliant with PHP 8 yet and requires use of PHP 7. +===> https://bugs.archlinux.org/task/69462 +===> Please reconfigure PHP-specific bits: +===> * Enable required modules in /etc/php7/php.ini +===> * Start/enable php-fpm7 systemd service +===> See https://wiki.archlinux.org/index.php/TT-RSS for more information. +EOF + fi +} Copied: tt-rss/repos/community-any/tt-rss.service (from rev 840934, tt-rss/trunk/tt-rss.service) =================================================================== --- tt-rss.service (rev 0) +++ tt-rss.service 2021-02-02 01:11:29 UTC (rev 840935) @@ -0,0 +1,10 @@ +[Unit] +Description=Tiny Tiny RSS feeds update daemon +After=network.target mysqld.service postgresql.service + +[Service] +ExecStart=/usr/bin/php7 /usr/share/webapps/tt-rss/update.php --daemon +User=http + +[Install] +WantedBy=multi-user.target