From 06ec67816a3a42ca9ec9fdf0d8962037653e2be0 Mon Sep 17 00:00:00 2001 From: "J. King" Date: Fri, 5 Jan 2024 11:20:56 -0500 Subject: [PATCH] Update arsse-git PKGBUILD This includes both adaptations for php-legacy as well as for the new mdoc manual --- dist/arch/PKGBUILD | 1 + dist/arch/PKGBUILD-git | 30 ++++++++++++++++++------------ 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/dist/arch/PKGBUILD b/dist/arch/PKGBUILD index 10d61ff..1308a4f 100644 --- a/dist/arch/PKGBUILD +++ b/dist/arch/PKGBUILD @@ -7,6 +7,7 @@ pkgdesc="Multi-protocol RSS/Atom newsfeed synchronization server" arch=("any") url="https://thearsse.com/" license=("MIT") +conflicts=("arsse-git") depends=() makedepends=() checkdepends=() diff --git a/dist/arch/PKGBUILD-git b/dist/arch/PKGBUILD-git index c366e89..8d2d598 100644 --- a/dist/arch/PKGBUILD-git +++ b/dist/arch/PKGBUILD-git @@ -9,22 +9,25 @@ url="https://thearsse.com/" license=("MIT") provides=("arsse") conflicts=("arsse") -depends=("php>=7.3" "php-intl>=7.3" "php-sqlite>=7.3") -makedepends=("composer" "pandoc") +depends=("php-interpreter>=7.3" "php-intl-interpreter>=7.3" "php-sqlite-interpreter>=7.3") +makedepends=("composer") checkdepends=() optdepends=("nginx: HTTP server" "apache>=2.4: HTTP server" "percona-server: Alternate database" "postgresql>=10: Alternate database" - "php-pgsql>=7.3: PostgreSQL database support") + "php-pgsql-interpreter>=7.3: PostgreSQL database support") backup=("etc/webapps/arsse/config.php" + "etc/webapps/arsse/systemd-environment" "etc/php/php-fpm.d/arsse.conf" + "etc/php-legacy/php-fpm.d/arsse.conf" "etc/webapps/arsse/nginx/example.conf" "etc/webapps/arsse/nginx/arsse.conf" "etc/webapps/arsse/nginx/arsse-loc.conf" "etc/webapps/arsse/nginx/arsse-fcgi.conf" "etc/webapps/arsse/apache/example.conf" "etc/webapps/arsse/apache/arsse.conf" + "etc/webapps/arsse/apache/arsse-fcgi.conf" "etc/webapps/arsse/apache/arsse-loc.conf") source=("git+https://code.mensbeam.com/MensBeam/arsse/") md5sums=("SKIP") @@ -37,7 +40,6 @@ pkgver() { build() { cd "$srcdir/arsse" composer install - ./robo manpage ./robo manual composer install --no-dev -o --no-scripts php arsse.php conf save-defaults config.defaults.php @@ -46,29 +48,33 @@ build() { package() { # define runtime dependencies - depends=("php>=7.3" "php-intl>=7.3" "php-sqlite>=7.3" "php-fpm>=7.3") + depends=("php-interpreter>=7.3" "php-sqlite-interpreter>=7.3" "php-fpm-interpreter>=7.3") # create most directories necessary for the final package cd "$pkgdir" - mkdir -p "usr/share/webapps/arsse" "usr/share/doc/arsse" "usr/share/licenses/arsse" "usr/lib/systemd/system" "usr/lib/sysusers.d" "usr/lib/tmpfiles.d" "etc/php/php-fpm.d" "etc/webapps/arsse" + mkdir -p "usr/share/webapps/arsse" "usr/share/doc/arsse" "usr/share/licenses/arsse" "usr/lib/systemd/system" "usr/lib/sysusers.d" "usr/lib/tmpfiles.d" "etc/php/php-fpm.d" "etc/php-legacy/php-fpm.d" "etc/webapps/arsse" # copy requisite files cd "$srcdir/arsse" cp -r lib locale sql vendor www CHANGELOG UPGRADING README.md arsse.php "$pkgdir/usr/share/webapps/arsse" cp -r manual/* "$pkgdir/usr/share/doc/arsse" cp LICENSE AUTHORS "$pkgdir/usr/share/licenses/arsse" - cp dist/systemd/* "$pkgdir/usr/lib/systemd/system" cp dist/sysuser.conf "$pkgdir/usr/lib/sysusers.d/arsse.conf" cp dist/tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/arsse.conf" cp dist/php-fpm.conf "$pkgdir/etc/php/php-fpm.d/arsse.conf" cp -r dist/man "$pkgdir/usr/share" cp -r dist/nginx dist/apache config.defaults.php "$pkgdir/etc/webapps/arsse" - cd "$pkgdir" # copy files requiring special permissions - cd "$srcdir/arsse" - install -Dm755 dist/arsse "$pkgdir/usr/bin/arsse" install -Dm640 dist/config.php "$pkgdir/etc/webapps/arsse" # patch generic configuration files to use Arch-specific paths and identifiers - sed -i -se 's/\/\(etc\|usr\/share\)\/arsse\//\/\1\/webapps\/arsse\//g' "$pkgdir/etc/webapps/arsse/nginx/"* "$pkgdir/etc/webapps/arsse/apache/"* "$pkgdir/usr/lib/tmpfiles.d/arsse.conf" "$pkgdir/usr/lib/systemd/system/"* "$pkgdir/usr/bin/"* + sed -i -se 's/\/\(etc\|usr\/share\)\/arsse\//\/\1\/webapps\/arsse\//g' "$pkgdir/etc/webapps/arsse/nginx/"* "$pkgdir/etc/webapps/arsse/apache/"* "$pkgdir/usr/lib/tmpfiles.d/arsse.conf" "$pkgdir/usr/lib/systemd/system/"* sed -i -se 's/\/var\/run\/php\//\/run\/php-fpm\//g' "$pkgdir/etc/webapps/arsse/nginx/"* "$pkgdir/etc/webapps/arsse/apache/"* "$pkgdir/etc/php/php-fpm.d/arsse.conf" sed -i -se 's/www-data/http/g' "$pkgdir/etc/php/php-fpm.d/arsse.conf" - sed -i -e 's/^WorkingDirectory=.*$/WorkingDirectory=\/usr\/share\/webapps\/arsse/g' -e 's/^ConfigurationDirectory=.*$/ConfigurationDirectory=webapps\/arsse/g' "$pkgdir/usr/lib/systemd/system/arsse-fetch.service" + sed -i -se 's/^WorkingDirectory=.*$/WorkingDirectory=\/usr\/share\/webapps\/arsse/g' -e 's/^ConfigurationDirectory=.*$/ConfigurationDirectory=webapps\/arsse/g' "$pkgdir/usr/lib/systemd/system/arsse-fetch.service" + # make a duplicate PHP-FPM pool for php-legacy + sed -se 's/php-fpm/php-fpm-legacy/' "$pkgdir/etc/php/php-fpm.d/arsse.conf" > "$pkgdir/etc/php-legacy/php-fpm.d/arsse.conf" + # copy Arch-specific versions of files + install -Dm755 dist/arch/arsse "$pkgdir/usr/bin/arsse" + cp dist/arch/nginx-arsse-fcgi.conf "$pkgdir/etc/webapps/arsse/nginx/arsse-fcgi.conf" + cp dist/arch/apache-arsse-fcgi.conf "$pkgdir/etc/webapps/arsse/apache/arsse-fcgi.conf" + cp dist/arch/*.service "$pkgdir/usr/lib/systemd/system" + cp dist/arch/systemd-environment "$pkgdir/etc/webapps/arsse/systemd-environment" }