From be76f6dd238e36063f342926df25bcef2fc9aa69 Mon Sep 17 00:00:00 2001 From: s3lph Date: Thu, 18 Jul 2024 22:20:02 +0200 Subject: [PATCH] chore: remove nextcloud-28 --- .forgejo/workflows/package.yml | 25 +----- README.md | 21 ----- nextcloud-28-app-calendar/package.sh | 10 --- nextcloud-28-app-contacts/package.sh | 10 --- nextcloud-28-app-deck/package.sh | 10 --- nextcloud-28-app-forms/package.sh | 9 --- nextcloud-28-app-gpoddersync/package.sh | 10 --- nextcloud-28-app-gpxpod/package.sh | 10 --- nextcloud-28-app-groupfolders/package.sh | 10 --- nextcloud-28-app-mail/package.sh | 9 --- nextcloud-28-app-memories/package.sh | 57 ------------- nextcloud-28-app-news/package.sh | 68 ---------------- nextcloud-28-app-nextpod/package.sh | 8 -- nextcloud-28-app-notes/package.sh | 9 --- .../nextcloud-notify-push.default | 25 ------ .../nextcloud-notify-push.service | 12 --- nextcloud-28-app-notify-push/package.sh | 49 ------------ nextcloud-28-app-polls/package.sh | 10 --- .../nextcloud-preview-generator.service | 8 -- .../nextcloud-preview-generator.timer | 9 --- nextcloud-28-app-previewgenerator/package.sh | 17 ---- nextcloud-28-app-richdocuments/package.sh | 10 --- nextcloud-28-app-richdocumentscode/package.sh | 15 ---- nextcloud-28-app-talk/package.sh | 10 --- nextcloud-28-app-tasks/package.sh | 10 --- .../package.sh | 10 --- nextcloud-28-app-user-oidc/package.sh | 10 --- nextcloud-28/config.php | 26 ------ nextcloud-28/debian.conffiles | 2 - nextcloud-28/debian.control | 16 ---- nextcloud-28/debian.postinst | 15 ---- nextcloud-28/nextcloud-cron.service | 8 -- nextcloud-28/nextcloud-cron.timer | 9 --- nextcloud-28/nextcloud.site.conf | 33 -------- nextcloud-28/occ.sh | 4 - nextcloud-28/package.sh | 79 ------------------- .../patches/01_isfairuse_userfacing_ui.patch | 33 -------- 37 files changed, 1 insertion(+), 685 deletions(-) delete mode 100755 nextcloud-28-app-calendar/package.sh delete mode 100755 nextcloud-28-app-contacts/package.sh delete mode 100755 nextcloud-28-app-deck/package.sh delete mode 100755 nextcloud-28-app-forms/package.sh delete mode 100755 nextcloud-28-app-gpoddersync/package.sh delete mode 100755 nextcloud-28-app-gpxpod/package.sh delete mode 100755 nextcloud-28-app-groupfolders/package.sh delete mode 100755 nextcloud-28-app-mail/package.sh delete mode 100755 nextcloud-28-app-memories/package.sh delete mode 100755 nextcloud-28-app-news/package.sh delete mode 100755 nextcloud-28-app-nextpod/package.sh delete mode 100755 nextcloud-28-app-notes/package.sh delete mode 100644 nextcloud-28-app-notify-push/nextcloud-notify-push.default delete mode 100644 nextcloud-28-app-notify-push/nextcloud-notify-push.service delete mode 100755 nextcloud-28-app-notify-push/package.sh delete mode 100755 nextcloud-28-app-polls/package.sh delete mode 100644 nextcloud-28-app-previewgenerator/nextcloud-preview-generator.service delete mode 100644 nextcloud-28-app-previewgenerator/nextcloud-preview-generator.timer delete mode 100755 nextcloud-28-app-previewgenerator/package.sh delete mode 100755 nextcloud-28-app-richdocuments/package.sh delete mode 100755 nextcloud-28-app-richdocumentscode/package.sh delete mode 100755 nextcloud-28-app-talk/package.sh delete mode 100755 nextcloud-28-app-tasks/package.sh delete mode 100755 nextcloud-28-app-twofactor-webauthn/package.sh delete mode 100755 nextcloud-28-app-user-oidc/package.sh delete mode 100644 nextcloud-28/config.php delete mode 100644 nextcloud-28/debian.conffiles delete mode 100644 nextcloud-28/debian.control delete mode 100755 nextcloud-28/debian.postinst delete mode 100644 nextcloud-28/nextcloud-cron.service delete mode 100644 nextcloud-28/nextcloud-cron.timer delete mode 100644 nextcloud-28/nextcloud.site.conf delete mode 100755 nextcloud-28/occ.sh delete mode 100755 nextcloud-28/package.sh delete mode 100644 nextcloud-28/patches/01_isfairuse_userfacing_ui.patch diff --git a/.forgejo/workflows/package.yml b/.forgejo/workflows/package.yml index 7970e4e..0964c94 100644 --- a/.forgejo/workflows/package.yml +++ b/.forgejo/workflows/package.yml @@ -11,7 +11,7 @@ jobs: # One step per package - nextcloud-28: &job + nextcloud-29: &job runs-on: docker container: image: git.kabelsalat.ch/s3lph/package-pipeline-builder:latest @@ -34,29 +34,6 @@ jobs: --upload-file "${file}" \ "${API_REPOSITORY_DEB}" done - nextcloud-28-app-calendar: *job - nextcloud-28-app-contacts: *job - nextcloud-28-app-deck: *job - nextcloud-28-app-forms: *job - nextcloud-28-app-gpoddersync: *job - nextcloud-28-app-gpxpod: *job - nextcloud-28-app-groupfolders: *job - nextcloud-28-app-polls: *job - nextcloud-28-app-previewgenerator: *job - nextcloud-28-app-mail: *job - nextcloud-28-app-memories: *job - nextcloud-28-app-news: *job - nextcloud-28-app-nextpod: *job - nextcloud-28-app-notes: *job - nextcloud-28-app-notify-push: *job - nextcloud-28-app-richdocuments: *job - nextcloud-28-app-richdocumentscode: *job - nextcloud-28-app-talk: *job - nextcloud-28-app-tasks: *job - nextcloud-28-app-twofactor-webauthn: *job - nextcloud-28-app-user-oidc: *job - - nextcloud-29: *job nextcloud-29-app-calendar: *job nextcloud-29-app-contacts: *job nextcloud-29-app-deck: *job diff --git a/README.md b/README.md index aaa828d..f3b9269 100644 --- a/README.md +++ b/README.md @@ -10,27 +10,6 @@ information, please see [https://repo.s3lph.me/](https://repo.s3lph.me/). ## Packages -- [nextcloud-28](https://github.com/nextcloud/server) (Code integrity check fails due to patches applied during build process!) -- [nextcloud-28-app-calendar](https://apps.nextcloud.com/apps/calendar) -- [nextcloud-28-app-contacts](https://apps.nextcloud.com/apps/contacts) -- [nextcloud-28-app-deck](https://apps.nextcloud.com/apps/deck) -- [nextcloud-28-app-forms](https://apps.nextcloud.com/apps/forms) -- [nextcloud-28-app-gpoddersync](https://apps.nextcloud.com/apps/gpoddersync) -- [nextcloud-28-app-gpxpod](https://apps.nextcloud.com/apps/gpxpod) -- [nextcloud-28-app-groupfolders](https://apps.nextcloud.com/apps/groupfolders) -- [nextcloud-28-app-polls](https://apps.nextcloud.com/apps/polls) -- [nextcloud-28-app-previewgenerator](https://apps.nextcloud.com/apps/previewgenerator) -- [nextcloud-28-app-mail](https://apps.nextcloud.com/apps/mail) -- [nextcloud-28-app-memories](https://apps.nextcloud.com/apps/memories) -- [nextcloud-28-app-news](https://apps.nextcloud.com/apps/news) -- [nextcloud-28-app-nextpod](https://apps.nextcloud.com/apps/nextpod) -- [nextcloud-28-app-notes](https://apps.nextcloud.com/apps/notes) -- [nextcloud-28-app-notify-push](https://apps.nextcloud.com/apps/notify_push) -- [nextcloud-28-app-richdocuments](https://apps.nextcloud.com/apps/richdocuments) -- [nextcloud-28-app-richdocumentscode](https://apps.nextcloud.com/apps/richdocumentscode) -- [nextcloud-28-app-tasks](https://apps.nextcloud.com/apps/tasks) -- [nextcloud-28-app-twofactor-webauthn](https://apps.nextcloud.com/apps/twofactor_webauthn) -- [nextcloud-28-app-user-oidc](https://apps.nextcloud.com/apps/user_oidc) - [nextcloud-29](https://github.com/nextcloud/server) (Code integrity check fails due to patches applied during build process!) - [nextcloud-29-app-calendar](https://apps.nextcloud.com/apps/calendar) - [nextcloud-29-app-contacts](https://apps.nextcloud.com/apps/contacts) diff --git a/nextcloud-28-app-calendar/package.sh b/nextcloud-28-app-calendar/package.sh deleted file mode 100755 index f4dc865..0000000 --- a/nextcloud-28-app-calendar/package.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -. ../.skel/nextcloud-app/build-nextcloud-app - -post_prepare() { - github_changelog nextcloud/calendar -} - -build_nextcloud_app calendar 28 - diff --git a/nextcloud-28-app-contacts/package.sh b/nextcloud-28-app-contacts/package.sh deleted file mode 100755 index 305ae24..0000000 --- a/nextcloud-28-app-contacts/package.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -. ../.skel/nextcloud-app/build-nextcloud-app - -post_prepare() { - github_changelog nextcloud/contacts -} - -build_nextcloud_app contacts 28 - diff --git a/nextcloud-28-app-deck/package.sh b/nextcloud-28-app-deck/package.sh deleted file mode 100755 index 2e79e79..0000000 --- a/nextcloud-28-app-deck/package.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -. ../.skel/nextcloud-app/build-nextcloud-app - -post_prepare() { - github_changelog nextcloud/deck -} - -build_nextcloud_app deck 28 - diff --git a/nextcloud-28-app-forms/package.sh b/nextcloud-28-app-forms/package.sh deleted file mode 100755 index e4a507e..0000000 --- a/nextcloud-28-app-forms/package.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -. ../.skel/nextcloud-app/build-nextcloud-app - -post_prepare() { - github_changelog nextcloud/forms -} - -build_nextcloud_app forms 28 diff --git a/nextcloud-28-app-gpoddersync/package.sh b/nextcloud-28-app-gpoddersync/package.sh deleted file mode 100755 index e456dad..0000000 --- a/nextcloud-28-app-gpoddersync/package.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -. ../.skel/nextcloud-app/build-nextcloud-app - -post_prepare() { - cat "${PKGDIR}/usr/lib/nextcloud/nextcloud-apps/${APP}/CHANGELOG.md" | gzip -9n > "${PKGDIR}/usr/share/doc/${PKGNAME}/changelog.gz" -} - -build_nextcloud_app gpoddersync 28 - diff --git a/nextcloud-28-app-gpxpod/package.sh b/nextcloud-28-app-gpxpod/package.sh deleted file mode 100755 index 75d8f64..0000000 --- a/nextcloud-28-app-gpxpod/package.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -. ../.skel/nextcloud-app/build-nextcloud-app - -post_prepare() { - github_changelog julien-nc/gpxpod -} - -build_nextcloud_app gpxpod 28 - diff --git a/nextcloud-28-app-groupfolders/package.sh b/nextcloud-28-app-groupfolders/package.sh deleted file mode 100755 index 7441e65..0000000 --- a/nextcloud-28-app-groupfolders/package.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -. ../.skel/nextcloud-app/build-nextcloud-app - -post_prepare() { - github_changelog nextcloud/groupfolders -} - -build_nextcloud_app groupfolders 28 - diff --git a/nextcloud-28-app-mail/package.sh b/nextcloud-28-app-mail/package.sh deleted file mode 100755 index 10cd748..0000000 --- a/nextcloud-28-app-mail/package.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -. ../.skel/nextcloud-app/build-nextcloud-app - -post_prepare() { - github_changelog nextcloud/mail -} - -build_nextcloud_app mail 28 diff --git a/nextcloud-28-app-memories/package.sh b/nextcloud-28-app-memories/package.sh deleted file mode 100755 index 0b98929..0000000 --- a/nextcloud-28-app-memories/package.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash - -. ../.skel/nextcloud-app/build-nextcloud-app - -export ARCHS=(amd64 arm64) - -function _ncarch() { - case "$1" in - amd64) - echo x86_64 - ;; - arm64) - echo aarch64 - ;; - *) - echo no such architecture - exit 1 - esac -} - -function _binarch() { - case "$1" in - amd64) - echo amd64 - ;; - arm64) - echo aarch64 - ;; - *) - echo no such architecture - exit 1 - esac -} - -function post_chown() { - chmod 0755 "${PKGDIR}/usr/lib/nextcloud/nextcloud-apps/memories/bin-ext/exiftool/build_tag_lookup" - chmod 0755 "${PKGDIR}/usr/lib/nextcloud/nextcloud-apps/memories/bin-ext/exiftool/exiftool" - chmod 0755 "${PKGDIR}/usr/lib/nextcloud/nextcloud-apps/memories/bin-ext/exiftool/validate" -} - -post_prepare() { - NCARCH=$(_ncarch $ARCH) - for oarch in ${ARCHS[@]}; do - if [[ "$(_ncarch $oarch)" == "${NCARCH}" ]]; then - continue - fi - binarch=$(_binarch $oarch) - rm -f ${PKGDIR}/usr/lib/nextcloud/nextcloud-apps/memories/bin-ext/*-${binarch}* - rm -f ${PKGDIR}/usr/lib/nextcloud/nextcloud-apps/memories/bin-ext/exiftool/*-${binarch}* - done - github_changelog pulsejet/memories -} - -export ADDITIONAL_DEPS=", sensible-utils" - -build_nextcloud_app memories 28 - diff --git a/nextcloud-28-app-news/package.sh b/nextcloud-28-app-news/package.sh deleted file mode 100755 index 82d7aa8..0000000 --- a/nextcloud-28-app-news/package.sh +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/bash - -. ../.skel/nextcloud-app/build-nextcloud-app - -function pre_fetch() { - # Filter from .skel/build-nextcloud-app, but with restriction to stable versions removed - export _NCAPPS_JQ='.[] | select(.id == $app) | .releases[] | "\(.version) \(.download) \(.rawPlatformVersionSpec)"' -} - -function _prepare() { - mkdir -p \ - "${PKGDIR}/DEBIAN" \ - "${PKGDIR}/usr/share/doc/${PKGNAME}" \ - "${PKGDIR}/usr/lib/nextcloud/nextcloud-apps" - VERSION=$(cat "${SRCDIR}/${APP}/appinfo/info.xml" | xq-python -r .info.version | sed -re 's/-/~/g') - SUMMARY=$(cat "${SRCDIR}/${APP}/appinfo/info.xml" | xq-python -r '.info.summary | if type == "array" then (.[] | select(.["@lang"]=="en") | .["#text"]) else (.) end') - DESCRIPTION=$(cat "${SRCDIR}/${APP}/appinfo/info.xml" | xq-python -r '.info.description | if type == "array" then (.[] | select(.["@lang"]=="en") | .["#text"]) else (.) end') - PHP_MIN=$(cat "${SRCDIR}/${APP}/appinfo/info.xml" | xq-python -r '.info.dependencies.php."@min-version"') - PHP_MAX=$(cat "${SRCDIR}/${APP}/appinfo/info.xml" | xq-python -r '.info.dependencies.php."@max-version"') - PHP_DEP="" -# #f [[ "${PHP_MIN}" != "null" ]]; then -# PHP_DEP="${PHP_DEP}, php (>= ${PHP_MIN})" -# fi -# if [[ "${PHP_MAX}" != "null" ]]; then -# # awk increments the last version component, from https://stackoverflow.com/a/69489163 -# PHP_MAX=$(echo "${PHP_MAX}" | awk -F. -v OFS=. '{$NF=$NF+1;print}') -# PHP_DEP="${PHP_DEP}, php (<< ${PHP_MAX})" -# fi - cp -r "${SRCDIR}/${APP}" "${PKGDIR}/usr/lib/nextcloud/nextcloud-apps/${APP}" - cat > "${PKGDIR}/DEBIAN/control" < "${PKGDIR}/DEBIAN/postinst" < "${PKGDIR}/DEBIAN/conffiles" - github_changelog nextcloud/notify_push -} - -function post_chown() { - chmod 0600 "${PKGDIR}/etc/default/nextcloud-notify-push" - chmod 0755 "${PKGDIR}/usr/lib/nextcloud/nextcloud-apps/notify_push/bin/notify_push" -} - -function postinst_configure_post() { - deb-systemd-helper enable nextcloud-notify-push.service - deb-systemd-invoke restart nextcloud-notify-push.service -} - -build_nextcloud_app notify_push 28 diff --git a/nextcloud-28-app-polls/package.sh b/nextcloud-28-app-polls/package.sh deleted file mode 100755 index 7095544..0000000 --- a/nextcloud-28-app-polls/package.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -. ../.skel/nextcloud-app/build-nextcloud-app - -post_prepare() { - github_changelog nextcloud/polls -} - -build_nextcloud_app polls 28 - diff --git a/nextcloud-28-app-previewgenerator/nextcloud-preview-generator.service b/nextcloud-28-app-previewgenerator/nextcloud-preview-generator.service deleted file mode 100644 index e9f36bc..0000000 --- a/nextcloud-28-app-previewgenerator/nextcloud-preview-generator.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Pre-Generate Nextcloud preview thumbnails - -[Service] -Type=oneshot -ExecStart=/usr/bin/php /var/lib/nextcloud/webroot/occ preview:pre-generate -User=www-data -Group=www-data diff --git a/nextcloud-28-app-previewgenerator/nextcloud-preview-generator.timer b/nextcloud-28-app-previewgenerator/nextcloud-preview-generator.timer deleted file mode 100644 index b718e19..0000000 --- a/nextcloud-28-app-previewgenerator/nextcloud-preview-generator.timer +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Pre-Generate Nextcloud preview thumbnails - -[Timer] -OnCalendar=*:0/15 -Persistent=true - -[Install] -WantedBy=timers.target diff --git a/nextcloud-28-app-previewgenerator/package.sh b/nextcloud-28-app-previewgenerator/package.sh deleted file mode 100755 index d0ab898..0000000 --- a/nextcloud-28-app-previewgenerator/package.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -. ../.skel/nextcloud-app/build-nextcloud-app - -post_prepare() { - mkdir -p "${PKGDIR}/lib/systemd/system/" - cp "${ROOT}/nextcloud-preview-generator.service" "${PKGDIR}/lib/systemd/system/nextcloud-preview-generator.service" - cp "${ROOT}/nextcloud-preview-generator.timer" "${PKGDIR}/lib/systemd/system/nextcloud-preview-generator.timer" - github_changelog nextcloud/previewgenerator -} - -postinst_configure_post() { - deb-systemd-helper enable nextcloud-preview-generator.timer -} - -build_nextcloud_app previewgenerator 28 - diff --git a/nextcloud-28-app-richdocuments/package.sh b/nextcloud-28-app-richdocuments/package.sh deleted file mode 100755 index 5a6344c..0000000 --- a/nextcloud-28-app-richdocuments/package.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -. ../.skel/nextcloud-app/build-nextcloud-app - -post_prepare() { - github_changelog nextcloud/richdocuments -} - -build_nextcloud_app richdocuments 28 - diff --git a/nextcloud-28-app-richdocumentscode/package.sh b/nextcloud-28-app-richdocumentscode/package.sh deleted file mode 100755 index 22ee6eb..0000000 --- a/nextcloud-28-app-richdocumentscode/package.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -. ../.skel/nextcloud-app/build-nextcloud-app - -export ARCHS=(amd64) - -post_prepare() { - github_changelog CollaboraOnline/richdocumentscode -} - -post_chown() { - chmod 0755 "${PKGDIR}/usr/lib/nextcloud/nextcloud-apps/${APP}/collabora/Collabora_Online.AppImage" -} - -build_nextcloud_app richdocumentscode 28 diff --git a/nextcloud-28-app-talk/package.sh b/nextcloud-28-app-talk/package.sh deleted file mode 100755 index 25bc1c2..0000000 --- a/nextcloud-28-app-talk/package.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -. ../.skel/nextcloud-app/build-nextcloud-app - -post_prepare() { - github_changelog nextcloud/spreed -} - -build_nextcloud_app spreed 28 - diff --git a/nextcloud-28-app-tasks/package.sh b/nextcloud-28-app-tasks/package.sh deleted file mode 100755 index e50ce50..0000000 --- a/nextcloud-28-app-tasks/package.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -. ../.skel/nextcloud-app/build-nextcloud-app - -post_prepare() { - github_changelog nextcloud/tasks -} - -build_nextcloud_app tasks 28 - diff --git a/nextcloud-28-app-twofactor-webauthn/package.sh b/nextcloud-28-app-twofactor-webauthn/package.sh deleted file mode 100755 index 80f0745..0000000 --- a/nextcloud-28-app-twofactor-webauthn/package.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -. ../.skel/nextcloud-app/build-nextcloud-app - -post_prepare() { - cat "${PKGDIR}/usr/lib/nextcloud/nextcloud-apps/${APP}/CHANGELOG.md" | gzip -9n > "${PKGDIR}/usr/share/doc/${PKGNAME}/changelog.gz" -} - -build_nextcloud_app twofactor_webauthn 28 - diff --git a/nextcloud-28-app-user-oidc/package.sh b/nextcloud-28-app-user-oidc/package.sh deleted file mode 100755 index 2a8a84e..0000000 --- a/nextcloud-28-app-user-oidc/package.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -. ../.skel/nextcloud-app/build-nextcloud-app - -post_prepare() { - cat "${PKGDIR}/usr/lib/nextcloud/nextcloud-apps/${APP}/CHANGELOG.md" | gzip -9n > "${PKGDIR}/usr/share/doc/${PKGNAME}/changelog.gz" -} - -build_nextcloud_app user_oidc 28 - diff --git a/nextcloud-28/config.php b/nextcloud-28/config.php deleted file mode 100644 index 863fdba..0000000 --- a/nextcloud-28/config.php +++ /dev/null @@ -1,26 +0,0 @@ - false, - - 'trusted_domains' => [ - 'nextcloud.example.com' - ], - 'overwrite.cli.url' => 'http://nextcloud.example.com', - 'datadirectory' => '/var/lib/nextcloud/data', - 'logfile' => '/var/log/nextcloud/nextcloud.log', - - 'mysql.utf8mb4' => true, - - 'connectivity_check_domains' => ['localhost'], - - 'appstoreenabled' => false, - 'apps_paths' => [ - [ - 'path'=> '/usr/lib/nextcloud/nextcloud-apps', - 'url' => '/dist-apps', - 'writable' => false, - ] - ], - -); diff --git a/nextcloud-28/debian.conffiles b/nextcloud-28/debian.conffiles deleted file mode 100644 index 167e38d..0000000 --- a/nextcloud-28/debian.conffiles +++ /dev/null @@ -1,2 +0,0 @@ -/var/lib/nextcloud/webroot/config/config.php -/etc/apache2/sites-available/nextcloud.site.conf diff --git a/nextcloud-28/debian.control b/nextcloud-28/debian.control deleted file mode 100644 index 4c133af..0000000 --- a/nextcloud-28/debian.control +++ /dev/null @@ -1,16 +0,0 @@ -Package: nextcloud-28 -Version: __VERSION__ -Maintainer: __MAINTAINER__ -Section: web -Priority: optional -Architecture: all -Depends: php-cli (>=8.0), php-curl, php-gd, php-mbstring, php-xml, php-zip, php-bz2, php-intl -Suggests: apache2, mariadb-server, php-mysql, php-redis -Provides: nextcloud, nextcloud-app-twofactor-totp -Conflicts: nextcloud, nextcloud-app-twofactor-totp -Replaces: nextcloud-app-twofactor-totp -Description: A safe home for all your data. - Nextcloud Hub is the first completely integrated on-premises content - collaboration platform on the market, ready for a new generation of - users who expect seamless online collaboration capabilities out of - the box. diff --git a/nextcloud-28/debian.postinst b/nextcloud-28/debian.postinst deleted file mode 100755 index b4c6f07..0000000 --- a/nextcloud-28/debian.postinst +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -set -e - -if [[ "$1" == "configure" ]]; then - - deb-systemd-helper enable nextcloud-cron.timer - - # Only run occ upgrade if nextcloud has been configured - if [[ -z "$(grep installed /var/lib/nextcloud/webroot/config/config.php | grep false)" ]]; then - sudo -u www-data php /var/lib/nextcloud/webroot/occ upgrade - sudo -u www-data php /var/lib/nextcloud/webroot/occ maintenance:mode --off - fi - -fi diff --git a/nextcloud-28/nextcloud-cron.service b/nextcloud-28/nextcloud-cron.service deleted file mode 100644 index 0b689ca..0000000 --- a/nextcloud-28/nextcloud-cron.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Nextcloud Cronjob - -[Service] -Type=oneshot -ExecStart=/usr/bin/php /var/lib/nextcloud/webroot/cron.php -User=www-data -Group=www-data diff --git a/nextcloud-28/nextcloud-cron.timer b/nextcloud-28/nextcloud-cron.timer deleted file mode 100644 index 9295c86..0000000 --- a/nextcloud-28/nextcloud-cron.timer +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Nextcloud Cronjob - -[Timer] -OnCalendar=*:0/5 -Persistent=true - -[Install] -WantedBy=timers.target diff --git a/nextcloud-28/nextcloud.site.conf b/nextcloud-28/nextcloud.site.conf deleted file mode 100644 index 0aa033d..0000000 --- a/nextcloud-28/nextcloud.site.conf +++ /dev/null @@ -1,33 +0,0 @@ - - - ServerName nextcloud.example.com - - DocumentRoot /var/lib/nextcloud/webroot - Alias /dist-apps /usr/lib/nextcloud/nextcloud-apps - - - Require all granted - AllowOverride All - Options FollowSymLinks MultiViews - - - - Require all granted - AllowOverride All - Options FollowSymLinks MultiViews - - - - Dav off - - - - RewriteEngine on - RewriteRule ^\.well-known/host-meta /public.php?service=host-meta [QSA,L] - RewriteRule ^\.well-known/host-meta\.json /public.php?service=host-meta-json [QSA,L] - RewriteRule ^\.well-known/webfinger /public.php?service=webfinger [QSA,L] - RewriteRule ^\.well-known/carddav /remote.php/dav/ [R=301,L] - RewriteRule ^\.well-known/caldav /remote.php/dav/ [R=301,L] - - - \ No newline at end of file diff --git a/nextcloud-28/occ.sh b/nextcloud-28/occ.sh deleted file mode 100755 index 541b5ed..0000000 --- a/nextcloud-28/occ.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -/usr/bin/sudo -u www-data -- /usr/bin/php /var/lib/nextcloud/webroot/occ $@ - diff --git a/nextcloud-28/package.sh b/nextcloud-28/package.sh deleted file mode 100755 index 4e9f2b8..0000000 --- a/nextcloud-28/package.sh +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/bash - -set -exo pipefail - -. ../.skel/helpers.sh - -VERSION=28 - -URL="https://download.nextcloud.com/server/releases/latest-${VERSION}.tar.bz2" - -ROOT=$(pwd) -function fetch() { - cd "${SRCDIR}" - wget "${URL}" --output-document "nextcloud-${VERSION}.tar.bz2" - tar -xf "nextcloud-${VERSION}.tar.bz2" - patch --strip=1 --directory="${SRCDIR}" --ignore-whitespace < "${ROOT}/patches/01_isfairuse_userfacing_ui.patch" -} - -function prepare() { - mkdir -p \ - "${PKGDIR}/DEBIAN" \ - "${PKGDIR}/var/lib/nextcloud" \ - "${PKGDIR}/usr/lib/nextcloud" \ - "${PKGDIR}/var/lib/nextcloud/data" \ - "${PKGDIR}/lib/systemd/system" \ - "${PKGDIR}/var/log/nextcloud" \ - "${PKGDIR}/usr/local/bin" \ - "${PKGDIR}/etc/apache2/sites-available" \ - "${PKGDIR}/usr/share/doc/${PKGNAME}" - VERSION=$(cat "${SRCDIR}/nextcloud/version.php" | grep "OC_VersionString" | cut -d"'" -f2) - cp -r "${SRCDIR}/nextcloud" "${PKGDIR}/var/lib/nextcloud/webroot" - mv "${PKGDIR}/var/lib/nextcloud/webroot/apps" "${PKGDIR}/usr/lib/nextcloud/nextcloud-apps" - cp "${ROOT}/config.php" "${PKGDIR}/var/lib/nextcloud/webroot/config/config.php" - cp "${ROOT}/debian.control" "${PKGDIR}/DEBIAN/control" - cp "${ROOT}/debian.conffiles" "${PKGDIR}/DEBIAN/conffiles" - cp "${ROOT}/debian.postinst" "${PKGDIR}/DEBIAN/postinst" - cp "${ROOT}/nextcloud-cron.service" "${ROOT}/nextcloud-cron.timer" "${PKGDIR}/lib/systemd/system/" - cp "${ROOT}/nextcloud.site.conf" "${PKGDIR}/etc/apache2/sites-available/" - cp "${ROOT}/occ.sh" "${PKGDIR}/usr/local/bin/occ" - sed -re "s/__VERSION__/${VERSION}/g" -i "${PKGDIR}/DEBIAN/control" - sed -re "s/__MAINTAINER__/${MAINTAINER}/g" -i "${PKGDIR}/DEBIAN/control" - cp "${SRCDIR}/nextcloud/COPYING" "${PKGDIR}/usr/share/doc/${PKGNAME}/copyright" - github_changelog nextcloud/server - find "${PKGDIR}" -exec touch -m --reference "${SRCDIR}/nextcloud/version.php" {} \; -} - -function _chown() { - chown 0:0 -R "${PKGDIR}/" - # www-data:www-data - chown 33:33 -R \ - "${PKGDIR}/var/lib/nextcloud" \ - "${PKGDIR}/var/log/nextcloud" \ - "${PKGDIR}/usr/lib/nextcloud" - find "${PKGDIR}/var/lib/nextcloud/webroot" "${PKGDIR}/var/log/nextcloud" -type f -exec chmod 0640 {} \; - find "${PKGDIR}/var/lib/nextcloud/webroot" "${PKGDIR}/var/log/nextcloud" -type d -exec chmod 0750 {} \; - find "${PKGDIR}/usr/lib/nextcloud" -type f -exec chmod 0644 {} \; - find "${PKGDIR}/usr/lib/nextcloud" -type d -exec chmod 0755 {} \; - ln -sf "/var/lib/nextcloud/webroot/core" "${PKGDIR}/usr/lib/nextcloud/core" -} - -function package() { - cd "${BUILDDIR}" - dpkg-deb --build "${PKGDIR}" "${BUILDDIR}" -} - -function build() { - export PKGNAME="nextcloud-${VERSION}" - export BUILDDIR=${ROOT}/build - export SRCDIR=${ROOT}/build/srcdir - export PKGDIR=${ROOT}/build/pkgdir - mkdir -p ${SRCDIR} ${PKGDIR} - fetch - prepare - _chown - package -} - - -build diff --git a/nextcloud-28/patches/01_isfairuse_userfacing_ui.patch b/nextcloud-28/patches/01_isfairuse_userfacing_ui.patch deleted file mode 100644 index a983b8f..0000000 --- a/nextcloud-28/patches/01_isfairuse_userfacing_ui.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -3ur a/nextcloud/apps/settings/templates/settings/personal/personal.info.php b/nextcloud/apps/settings/templates/settings/personal/personal.info.php ---- a/nextcloud/apps/settings/templates/settings/personal/personal.info.php 2022-10-21 16:18:20.730871392 +0200 -+++ b/nextcloud/apps/settings/templates/settings/personal/personal.info.php 2022-10-21 16:23:38.133437330 +0200 -@@ -35,13 +35,6 @@ - 'vue-settings-personal-info', - ]); - ?> -- --
--
-- t('This community release of Nextcloud is unsupported and instant notifications are unavailable.')); ?> --
--
-- - -
-diff -3ur a/nextcloud/core/Controller/LoginController.php b/nextcloud/core/Controller/LoginController.php ---- a/nextcloud/core/Controller/LoginController.php 2022-10-21 16:18:20.610870426 +0200 -+++ b/nextcloud/core/Controller/LoginController.php 2022-10-21 16:19:52.921615072 +0200 -@@ -147,12 +147,6 @@ - } - - $loginMessages = $this->session->get('loginMessages'); -- if (!$this->manager->isFairUseOfFreePushService()) { -- if (!is_array($loginMessages)) { -- $loginMessages = [[], []]; -- } -- $loginMessages[1][] = $this->l10n->t('This community release of Nextcloud is unsupported and push notifications are limited.'); -- } - if (is_array($loginMessages)) { - [$errors, $messages] = $loginMessages; - $this->initialStateService->provideInitialState('core', 'loginMessages', $messages);