Merge pull request 'maint: pulled in new version of nextcloud (25.0.8)' (#13) from adamhax0rbana/nextcloud-deb:bullseye into bullseye

Reviewed-on: #13

.gitlab-ci.yml

@@ -1,6 +1,6 @@
-# Build on Bookworm
+# Build on bullseye
 default:
-  image: debian:bookworm
+  image: debian:bullseye
 
 latest:
   # Build the latest .deb file
@@ -10,8 +10,8 @@ latest:
     - apt update && apt install -y build-essential fakeroot devscripts apache2-dev
     - export DEBEMAIL="NOREPLY@`hostname -d`"
     - mkdir -p builddir
-    - uscan --overwrite-download --destdir builddir --download-version $NC_VERSION
+    - uscan --overwrite-download --destdir builddir
-    - cd ../nextcloud-server-$NC_VERSION
+    - cd ../nextcloud-server-25.0.8
     - dpkg-buildpackage -rfakeroot
     - cd - ; cp ../nextcloud-server_*.deb .
   artifacts:

README.md

@@ -15,11 +15,11 @@ sudo apt-get install build-essential fakeroot devscripts apache2-dev
 ```
 git clone https://git.jurisic.org/ijurisic/nextcloud-deb.git
 cd nextcloud-deb
-git checkout bookworm
+git checkout bullseye
 uscan --verbose --download-current-version
-cd ../nextcloud-server-31.0.2
+cd ../nextcloud-server-<current_version>
 dch -n
 dpkg-buildpackage -rfakeroot -us -uc
 cd ..
-dpkg -i nextcloud-server_31.0.2-1~deb12_all.deb
+dpkg -i nextcloud-server_<current_version>_all.deb
 ```

debian/changelog

@@ -1,167 +1,223 @@
-nextcloud-server (31.0.2-1~deb12) bookworm; urgency=medium
+nextcloud-server (25.0.8-1~deb11) bullseye; urgency=medium
 
-  * New upstream release 31.0.2
+  [ adam ]
+  * maint: pulled in new version of nextcloud (25.0.8)
 
- -- Ivan Jurišić <ivan@jurisic.org>  Tue, 1 Apr 2025 13:19:23 +0100
+ -- Adam <adam@hax0rbana.org>  Thu, 22 Jun 2023 11:53:56 -0500
 
-nextcloud-server (31.0.1-1~deb12) bookworm; urgency=medium
+nextcloud-server (25.0.7-1~deb11) bullseye; urgency=medium
 
-  * New upstream release 31.0.1
+  [ adam ]
+  * feat: automated builds using GitLab's CI system
+  * feat: Check for new upstream release and alert us if there is one
+  * maint: support for building nextcloud 25.0.7
+  * maint: updated CI job to be able to handle multiple nextcloud directories
 
- -- Ivan Jurišić <ivan@jurisic.org>  Wed, 19 Mar 2025 11:29:12 +0100
+ -- Adam <adam@hax0rbana.org>  Fri, 02 Jun 2023 01:14:27 -0500
 
-nextcloud-server (31.0.0-1~deb12) bookworm; urgency=medium
+nextcloud-server (25.0.6-1~deb11) bullseye; urgency=medium
 
-  * New upstream release 31.0.0
+  * New upstream release 25.0.6
+  * Updated README to update build dependencies
+  * Fixed typo in README
 
- -- Ivan Jurišić <ivan@jurisic.org>  Wed, 12 Mar 2025 08:00:43 +0100
+ -- Adam <adam@hax0rbana.org>  Thu, 20 Apr 2023 17:30:24 -0500
 
-nextcloud-server (30.0.6-1~deb12) bookworm; urgency=medium
+nextcloud-server (25.0.4-1~deb11) bullseye; urgency=medium
 
-  * New upstream release 30.0.6
+  * New upstream release 25.0.4
 
- -- Ivan Jurišić <ivan@jurisic.org>  Fri, 14 Feb 2025 13:06:40 +0000
+ -- Ivan Jurišić <ivan@jurisic.org>  Thu, 23 Feb 2023 15:19:32 +0000
 
-nextcloud-server (29.0.11-1~deb12) bookworm; urgency=medium
+nextcloud-server (25.0.3-1~deb11) bullseye; urgency=medium
 
-  * New upstream release 29.0.11
+  * New upstream release 25.0.3
 
- -- Jan Baumgarten <jan.baumgarten@iks.ag>  Fri, 17 Jan 2025 16:41:30 +0100
+ -- Ivan Jurišić <ivan@jurisic.org>  Wed, 18 Jan 2023 07:51:54 +0000
 
-nextcloud-server (29.0.10-1~deb12) bookworm; urgency=medium
+nextcloud-server (25.0.2-2~deb11) bullseye; urgency=medium
 
-  * New upstream release 29.0.10
+  * Fixed changelog 25.0.2-1 to 25.0.2-2~deb11
 
- -- Jan Baumgarten <jan.baumgarten@iks.ag>  Sun, 14 Jan 2025 23:04:30 +0100
+ -- Ivan Jurišić <ivan@jurisic.org>  Tue, 13 Dec 2022 11:15:56 +0100
 
-nextcloud-server (29.0.9-1~deb12) bookworm; urgency=medium
+nextcloud-server (25.0.2-1) bullseye; urgency=medium
 
-  * New upstream release 29.0.9
+nextcloud-server (25.0.2-1) bullseye; urgency=medium
 
- -- Jan Baumgarten <jan.baumgarten@iks.ag>  Sun, 10 Nov 2024 12:35:30 +0200
+  * New upstream release 25.0.2
 
-nextcloud-server (29.0.8-1~deb12) bookworm; urgency=medium
+ -- Ivan Jurišić <ivan@jurisic.org>  Tue, 13 Dec 2022 10:26:56 +0100
 
-  * New upstream release 29.0.8
+nextcloud-server (25.0.1-1~deb11) bullseye; urgency=medium
 
- -- Jan Baumgarten <jan.baumgarten@iks.ag>  Mon, 14 Oct 2024 21:44:30 +0200
+  * New upstream release 25.0.1
 
-nextcloud-server (29.0.7-1~deb12) bookworm; urgency=medium
+ -- Ivan Jurišić <ivan@jurisic.org>  Tue, 22 Nov 2022 07:09:51 +0000
 
-  * New upstream release 29.0.7
+nextcloud-server (25.0.0-1~deb11) bullseye; urgency=medium
 
- -- Jan Baumgarten <jan.baumgarten@iks.ag>  Wed, 12 Sep 2024 22:05:30 +0200
+  * New upstream release 25.0.0
 
-nextcloud-server (29.0.6-1~deb12) bookworm; urgency=medium
+ -- Ivan Jurišić <ivan@jurisic.org>  Mon, 24 Oct 2022 09:44:14 +0000
 
-  * New upstream release 29.0.6
+nextcloud-server (24.0.6-1~deb11) bullseye; urgency=medium
 
- -- Jan Baumgarten <jan.baumgarten@iks.ag>  Wed, 04 Sep 2024 08:19:30 +0200
+  * New upstream release 24.0.6
 
-nextcloud-server (29.0.5-1~deb12) bookworm; urgency=medium
+ -- Ivan Jurišić <ivan@jurisic.org>  Thu, 06 Oct 2022 14:17:59 +0000
 
-  * New upstream release 29.0.5
+nextcloud-server (24.0.4-1~deb11) bullseye; urgency=medium
 
- -- Jan Baumgarten <jan.baumgarten@iks.ag>  Thu, 22 Aug 2024 14:39:41 +0200
+  * New upstream release 24.0.4
 
-nextcloud-server (29.0.4-2~deb12) bookworm; urgency=medium
+ -- Ivan Jurišić <ivan@jurisic.org>  Mon, 29 Aug 2022 06:34:09 +0000
 
-  * New upstram release 29.0.4
+nextcloud-server (24.0.3-1~deb11) bullseye; urgency=medium
 
- -- Ivan Jurišić <ivan@jurisic.org>  Tue, 30 Jul 2024 07:37:17 +0000
+  * New upstream release 24.0.3
 
-nextcloud-server (29.0.4-1~deb12.1) bookworm; urgency=medium
+ -- Ivan Jurišić <ivan@jurisic.org>  Tue, 19 Jul 2022 05:54:12 +0000
 
-  * New upstram release 29.0.4
+nextcloud-server (24.0.0-2~deb11) bullseye; urgency=medium
 
- -- Ivan Jurišić <ivan@jurisic.org>  Tue, 30 Jul 2024 07:15:17 +0000
+  * Debian packages : fix install for 24 hub
 
-nextcloud-server (29.0.3-1~deb12) bookworm; urgency=medium
+ -- Ivan Jurišić <ivan@jurisic.org>  Sun, 09 May 2022 11:51:12 +0000
 
-  * New upstream release 29.0.3
+nextcloud-server (24.0.0-1~deb11) bullseye; urgency=medium
 
- -- Jan Baumgarten <jan.baumgarten@iks.ag>  Sat, 29 Jun 2024 16:15:02 +0200
+  * New upstream release 24.0.0
 
-nextcloud-server (29.0.2-1~deb12) bookworm; urgency=medium
+ -- Ivan Jurišić <ivan@jurisic.org>  Sun, 08 May 2022 17:02:19 +0000
 
-  * New upstream release 29.0.2
+nextcloud-server (23.0.4-1~deb11) bullseye; urgency=medium
 
- -- Jan Baumgarten <jan.baumgarten@iks.ag>  Fri, 21 Jun 2024 19:43:00 +0200
+  * New upstream release 23.0.4
 
-nextcloud-server (29.0.0-1~deb12) bookworm; urgency=medium
+ -- Ivan Jurišić <ivan@jurisic.org>  Mon, 25 Apr 2022 10:06:55 +0000
 
-  * New upstream release 29.0.0
+nextcloud-server (23.0.3-1~deb11) bullseye; urgency=medium
 
- -- Ivan Jurišić <ivan@jurisic.org>  Thu, 25 Apr 2024 06:29:57 +0000
+  * New upstream release 23.0.3
 
-nextcloud-server (28.0.3-1~deb12) bookworm; urgency=medium
+ -- Ivan Jurišić <ivan@jurisic.org>  Wed, 23 Mar 2022 08:17:39 +0000
 
-  * New upstream release 28.0.3
+nextcloud-server (23.0.2-1~deb11) bullseye; urgency=medium
 
- -- Ivan Jurišić <ivan@jurisic.org>  Mon, 04 Mar 2024 09:08:55 +0000
+  * New upstream release 23.0.2
 
-nextcloud-server (28.0.2-1~deb12) bookworm; urgency=medium
+ -- Ivan Jurišić <ivan@jurisic.org>  Tue, 22 Feb 2022 15:25:37 +0000
 
-  * New upstream release 28.0.2
+nextcloud-server (23.0.0-1~deb11) bullseye; urgency=medium
 
- -- Ivan Jurišić <ivan@jurisic.org>  Mon, 05 Feb 2024 10:52:15 +0000
+  * New upstream release 23.0.0
 
-nextcloud-server (27.1.6-1~deb12) bookworm; urgency=medium
+ -- Ivan Jurišić <ivan@jurisic.org>  Wed, 01 Dec 2021 08:10:13 +0000
 
-  * New upstream release 27.1.6
+nextcloud-server (22.2.3-1~deb11) bullseye; urgency=medium
 
- -- jan <jan.baumgarten@iks.ag>  Fri, 26 Jan 2024 08:42:57 +0100
+  * New upstream release 22.2.3
 
-nextcloud-server (27.1.5-1~deb12) bookworm; urgency=medium
+ -- Ivan Jurišić <ivan@jurisic.org>  Tue, 23 Nov 2021 08:51:28 +0000
 
-  * New upstream release 27.1.5
+nextcloud-server (22.2.2-1~deb11) bullseye; urgency=medium
 
- -- Jan Baumgarten <jan.baumgarten@iks.ag>  Fri, 24 Nov 2023 21:28:32 +0100
+  * New upstream release 22.2.2
 
-nextcloud-server (27.1.4-1~deb12) bookworm; urgency=medium
+ -- Ivan Jurišić <ivan@jurisic.org>  Mon, 15 Nov 2021 12:50:09 +0000
 
-  * New upstream release 27.1.4
+nextcloud-server (22.2.0-1~deb11) bullseye; urgency=medium
 
- -- Jan Baumgarten <jan.baumgarten@iks.ag>  Fri, 24 Nov 2023 21:28:32 +0100
+  * New upstream release 22.2.0
 
-nextcloud-server (27.1.3-1~deb12) bookworm; urgency=medium
+ -- Ivan Jurišić <ivan@jurisic.org>  Thu, 28 Oct 2021 09:45:40 +0000
 
-  * New upstream release 27.1.3
+nextcloud-server (21.0.2-1~deb11) bullseye; urgency=medium
 
- -- Ivan Jurišić <ivan@jurisic.org>  Fri, 10 Nov 2023 12:22:32 +0000
+  * New upstream release 21.0.2
 
-nextcloud-server (27.1.0-1~deb12) bookworm; urgency=medium
+ -- Ivan Jurišić <ivan@jurisic.org>  Thu, 10 Jun 2021 10:37:41 +0000
 
-  * New upstream release 27.1.0
+nextcloud-server (21.0.1-1~deb11) bullseye; urgency=medium
 
- -- Ivan Jurišić <ivan@jurisic.org>  Mon, 18 Sep 2023 08:59:43 +0000
+  * New upstream release 21.0.1
 
-nextcloud-server (27.0.2-1~deb12) bookworm; urgency=medium
+ -- Ivan Jurišić <ivan@jurisic.org>  Wed, 14 Apr 2021 11:16:11 +0200
 
-  * New upstream release 27.0.2
+nextcloud-server (21.0.0-1~deb11) bullseye; urgency=medium
 
- -- Ivan Jurišić <ivan@jurisic.org>  Tue, 22 Aug 2023 11:20:48 +0000
+  * New upstream release 21.0.0
 
-nextcloud-server (27.0.1-1~deb12) bookworm; urgency=medium
+ -- Ivan Jurišić <ivan@jurisic.org>  Wed, 03 Mar 2021 08:36:19 +0100
 
-  * New upstream release 27.0.1
+nextcloud-server (20.0.7-1~deb11) bullseye; urgency=medium
 
- -- Ivan Jurišić <ivan@jurisic.org>  Thu, 27 Jul 2023 12:13:18 +0000
+  * New upstream release 20.0.7
 
-nextcloud-server (26.0.4-1~deb12) bookworm; urgency=medium
+ -- Ivan Jurišić <ivan@jurisic.org>  Fri, 19 Feb 2021 13:04:54 +0100
 
-  * New upstream release 26.0.4
+nextcloud-server (20.0.5-1~deb11) bullseye; urgency=medium
 
- -- Ivan Jurišić <ivan@jurisic.org>  Wed, 26 Jul 2023 11:40:04 +0000
+  * New upstream release 20.0.5
 
-nextcloud-server (26.0.3-1~deb12) bookworm; urgency=medium
+ -- Ivan Jurišić <ivan@jurisic.org>  Fri, 22 Jan 2021 08:01:57 +0100
 
-  * New upstream release 26.0.3
+nextcloud-server (20.0.4-1~deb11) bullseye; urgency=medium
 
- -- Ivan Jurišić <ivan@jurisic.org>  Mon, 26 Jun 2023 08:07:08 +0200
+  * New upstream release 20.0.4
 
-nextcloud-server (26.0.2-1~deb12) bookworm; urgency=medium
+ -- Ivan Jurišić <ivan@jurisic.org>  Tue, 12 Jan 2021 08:15:57 +0100
 
-  * New upstream release 26.0.2
+nextcloud-server (20.0.3-1~deb11) bullseye; urgency=medium
+
+  * New upstream release 20.0.3
+
+ -- Ivan Jurišić <ivan@jurisic.org>  Thu, 10 Dec 2020 09:39:42 +0100
+
+nextcloud-server (20.0.1-1~deb11) bullseye; urgency=medium
+
+  * New upstream release 20.0.1
+
+ -- Ivan Jurišić <ivan@jurisic.org>  Mon, 02 Nov 2020 13:18:12 +0100
+
+nextcloud-server (20.0.0-1~deb11) bullseye; urgency=medium
+
+  * New upstream release 20.0.0
+
+ -- Ivan Jurišić <ivan@jurisic.org>  Wed, 14 Oct 2020 11:52:38 +0200
+
+nextcloud-server (19.0.4-1~deb11) bullseye; urgency=medium
+
+  * New upstream release 19.0.4
+
+ -- Ivan Jurišić <ivan@jurisic.org>  Wed, 14 Oct 2020 11:44:59 +0200
+
+nextcloud-server (19.0.3-1~deb11) bullseye; urgency=medium
+
+  * New upstream release 19.0.3
+  * Read all chnages from https://nextcloud.com/changelog/
+
+ -- Ivan Jurišić <ivan@jurisic.org>  Fri, 11 Sep 2020 08:59:47 +0200
+
+nextcloud-server (19.0.2-1~deb11) bullseye; urgency=medium
+
+  * New upstream release 19.0.2
+  * Read all chnages from https://nextcloud.com/changelog/
+
+ -- Ivan Jurišić <ivan@jurisic.org>  Fri, 28 Aug 2020 13:33:32 +0200
+
+nextcloud-server (19.0.1-1~deb11) bullseye; urgency=medium
+
+  * New upstream release 19.0.1
+  * Read all chnages from https://nextcloud.com/changelog/
+
+ -- Ivan Jurišić <ivan@jurisic.org>  Wed, 22 Jul 2020 08:28:43 +0200
+
+nextcloud-server (19.0.0-1~deb11) bullseye; urgency=medium
+
+  * New upstream release 19.0.0
+  * Read all chnages from https://nextcloud.com/changelog/
+
+ -- Ivan Jurišić <ivan@jurisic.org>  Tue, 09 Jun 2020 09:53:30 +0200
 
- -- Ivan Jurišić <ivan@jurisic.org>  Mon, 05 Jun 2023 06:13:02 +0000

debian/conffiles

@@ -0,0 +1 @@
+/var/www/nextcloud/.htaccess

debian/control

@@ -2,7 +2,7 @@ Source: nextcloud-server
 Section: net
 Priority: extra
 Maintainer: Ivan Jurišić <ivan@jurisic.org>
-Build-Depends: debhelper (>= 13), dh-apache2 | apache2-dev
+Build-Depends: debhelper (>= 11), dh-apache2 | apache2-dev
 Standards-Version: 3.9.8
 Vcs-Browser: https://github.com/nextcloud/server
 Vcs-Git: https://github.com/nextcloud/server.git

debian/nextcloud-server.install

@@ -1,29 +1,22 @@
-.reuse var/www/nextcloud
-.htaccess var/www/nextcloud
-.user.ini var/www/nextcloud
-*.php var/www/nextcloud
-*.html var/www/nextcloud
-*.txt var/www/nextcloud
-*.json var/www/nextcloud
-*.lock var/www/nextcloud
 3rdparty var/www/nextcloud
 apps var/www/nextcloud
 config var/www/nextcloud
 core var/www/nextcloud
 dist var/www/nextcloud
 lib var/www/nextcloud
+ocm-provider var/www/nextcloud
 ocs var/www/nextcloud
 ocs-provider var/www/nextcloud
 resources var/www/nextcloud
 themes var/www/nextcloud
 updater var/www/nextcloud
+*.php var/www/nextcloud
+*.html var/www/nextcloud
+*.txt var/www/nextcloud
+.htaccess var/www/nextcloud
+.user.ini var/www/nextcloud
 AUTHORS var/www/nextcloud
 COPYING var/www/nextcloud
-LICENSES var/www/nextcloud
 occ var/www/nextcloud
-composer.json var/www/nextcloud
-composer.lock var/www/nextcloud
-package-lock.json var/www/nextcloud
-package.json var/www/nextcloud
 debian/apache/nextcloud.conf		etc/apache2/conf-available
 debian/usr/sbin/occ			usr/sbin

debian/nextcloud-server.postinst

@@ -20,7 +20,7 @@ set -e
 export APACHE2_MAINTSCRIPT_HELPER_QUIET=1
 
 case "$1" in
-configure)
+    configure)
 
 	# Apache conf
 	if [ "a2query -c nextcloud"=~"No conf matches nextcloud" ]; then
@@ -29,7 +29,7 @@ configure)
 	fi
 
 	# Apache modules
-    if [ -e /usr/share/apache2/apache2-maintscript-helper ]; then
+        if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
                 . /usr/share/apache2/apache2-maintscript-helper
                 apache2_invoke enmod rewrite || exit $?
                 apache2_invoke enmod headers || exit $?
@@ -42,19 +42,17 @@ configure)
 		echo "Nextcloud is not configured, please use open web browser http://<your_server_ip>/nextcloud"
 		echo "After configure please run  su 'www-data' -s /bin/sh -c 'php /var/www/nextcloud/occ config:system:set --value true upgrade.disable-web'"
 	elif [ "$(su 'www-data' -s /bin/sh -c 'php /var/www/nextcloud/occ status' | grep 'installed:' | cut -f2 -d ':' | xargs)" = "true" ]; then
-        su 'www-data' -s /bin/sh -c 'php /var/www/nextcloud/occ maintenance:update:htaccess'
 		su 'www-data' -s /bin/sh -c 'php /var/www/nextcloud/occ upgrade'
-        su 'www-data' -s /bin/sh -c 'php /var/www/nextcloud/occ db:add-missing-indices'
+		su 'www-data' -s /bin/sh -c 'php /var/www/nextcloud/occ config:system:set --value true upgrade.disable-web' > /dev/null || true
-        su 'www-data' -s /bin/sh -c 'php /var/www/nextcloud/occ config:system:set --value true upgrade.disable-web' >/dev/null || true
 	else
 		echo "Got unexpect answer, occ status can't to read satus of nextcloud. Check php installation."
 	fi
 
     ;;
 
-abort-upgrade | abort-remove | abort-deconfigure) ;;
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
 
-\
     *)
         echo "postinst called with unknown argument \`$1'" >&2
         exit 1

debian/watch

@@ -1,3 +1,3 @@
 version=4
-opts="pgpmode=auto" https://download.nextcloud.com/server/releases/nextcloud-(31.*)\.zip debian uupdate
+opts="pgpmode=auto" https://download.nextcloud.com/server/releases/nextcloud-(25.*)\.zip debian uupdate