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 Trixie
+# Build on bullseye
 default:
-  image: debian:trixie
+  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
-    - cd ../nextcloud-server-$NC_VERSION
+    - uscan --overwrite-download --destdir builddir
+    - cd ../nextcloud-server-25.0.8
     - dpkg-buildpackage -rfakeroot
     - cd - ; cp ../nextcloud-server_*.deb .
   artifacts:

README.md

@@ -1,7 +1,7 @@
-## Installation from repository
+## Instalation from repository
 ```
-wget -qO /etc/apt/keyrings/jurisic-keyring.asc https://apt.jurisic.org/Release.key
-echo "deb [ signed-by=/etc/apt/keyrings/jurisic-keyring.asc ] https://apt.jurisic.org/debian/ $(lsb_release -cs) main contrib non-free" > /etc/apt/sources.list.d/jurisic.list 
+wget -qO - https://apt.jurisic.org/Release.key | gpg --dearmor | sudo dd of=/usr/share/keyrings/jurisic-keyring.gpg
+echo "deb [ signed-by=/usr/share/keyrings/jurisic-keyring.gpg ] https://apt.jurisic.org/debian/ $(lsb_release -cs) main contrib non-free" | sudo tee /etc/apt/sources.list.d/jurisic.list
 sudo apt update
 sudo apt install nextcloud-server
 ```
@@ -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 trixie
+git checkout bullseye
 uscan --verbose --download-current-version
-cd ../nextcloud-server-32.0.3
+cd ../nextcloud-server-<current_version>
 dch -n
-dpkg-buildpackage -us -uc
+dpkg-buildpackage -rfakeroot -us -uc
 cd ..
-dpkg -i nextcloud-server_32.0.3-2~deb13_all.deb
+dpkg -i nextcloud-server_<current_version>_all.deb
 ```

debian/changelog

@@ -1,30 +1,223 @@
-nextcloud-server (32.0.3-2~deb13) trixie; urgency=medium
+nextcloud-server (25.0.8-1~deb11) bullseye; urgency=medium
 
-  * Fixed occ script, postinstall permissions
-  * Updated rules, readme
+  [ adam ]
+  * maint: pulled in new version of nextcloud (25.0.8)
 
- -- Ivan Jurišić <ivan@jurisic.org>  Tue, 08 Jan 2026 15:34:32 +0200
+ -- Adam <adam@hax0rbana.org>  Thu, 22 Jun 2023 11:53:56 -0500
 
-nextcloud-server (32.0.3-1~deb13) trixie; urgency=medium
+nextcloud-server (25.0.7-1~deb11) bullseye; urgency=medium
 
-  * New upstream release 32.0.3
+  [ 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
 
- -- Jan Baumgarten <jan.baumgarten@iks.ag>  Tue, 16 Dec 2025 09:25:00 +0200
+ -- Adam <adam@hax0rbana.org>  Fri, 02 Jun 2023 01:14:27 -0500
 
-nextcloud-server (32.0.2-1~deb13) trixie; urgency=medium
+nextcloud-server (25.0.6-1~deb11) bullseye; urgency=medium
 
-  * New upstream release 32.0.2
+  * New upstream release 25.0.6
+  * Updated README to update build dependencies
+  * Fixed typo in README
 
- -- Jan Baumgarten <jan.baumgarten@iks.ag>  Sun, 23 Nov 2025 22:34:00 +0200
+ -- Adam <adam@hax0rbana.org>  Thu, 20 Apr 2023 17:30:24 -0500
 
-nextcloud-server (32.0.1-1~deb13) trixie; urgency=medium
+nextcloud-server (25.0.4-1~deb11) bullseye; urgency=medium
 
-  * New upstream release 32.0.1
+  * New upstream release 25.0.4
 
- -- Jan Baumgarten <jan.baumgarten@iks.ag>  Wed, 29 Oct 2025 14:27:00 +0200
+ -- Ivan Jurišić <ivan@jurisic.org>  Thu, 23 Feb 2023 15:19:32 +0000
 
-nextcloud-server (32.0.0-1~deb13) trixie; urgency=medium
+nextcloud-server (25.0.3-1~deb11) bullseye; urgency=medium
 
-  * New upstream release 32.0.0
+  * New upstream release 25.0.3
+
+ -- Ivan Jurišić <ivan@jurisic.org>  Wed, 18 Jan 2023 07:51:54 +0000
+
+nextcloud-server (25.0.2-2~deb11) bullseye; urgency=medium
+
+  * Fixed changelog 25.0.2-1 to 25.0.2-2~deb11
+
+ -- Ivan Jurišić <ivan@jurisic.org>  Tue, 13 Dec 2022 11:15:56 +0100
+
+nextcloud-server (25.0.2-1) bullseye; urgency=medium
+
+nextcloud-server (25.0.2-1) bullseye; urgency=medium
+
+  * New upstream release 25.0.2
+
+ -- Ivan Jurišić <ivan@jurisic.org>  Tue, 13 Dec 2022 10:26:56 +0100
+
+nextcloud-server (25.0.1-1~deb11) bullseye; urgency=medium
+
+  * New upstream release 25.0.1
+
+ -- Ivan Jurišić <ivan@jurisic.org>  Tue, 22 Nov 2022 07:09:51 +0000
+
+nextcloud-server (25.0.0-1~deb11) bullseye; urgency=medium
+
+  * New upstream release 25.0.0
+
+ -- Ivan Jurišić <ivan@jurisic.org>  Mon, 24 Oct 2022 09:44:14 +0000
+
+nextcloud-server (24.0.6-1~deb11) bullseye; urgency=medium
+
+  * New upstream release 24.0.6
+
+ -- Ivan Jurišić <ivan@jurisic.org>  Thu, 06 Oct 2022 14:17:59 +0000
+
+nextcloud-server (24.0.4-1~deb11) bullseye; urgency=medium
+
+  * New upstream release 24.0.4
+
+ -- Ivan Jurišić <ivan@jurisic.org>  Mon, 29 Aug 2022 06:34:09 +0000
+
+nextcloud-server (24.0.3-1~deb11) bullseye; urgency=medium
+
+  * New upstream release 24.0.3
+
+ -- Ivan Jurišić <ivan@jurisic.org>  Tue, 19 Jul 2022 05:54:12 +0000
+
+nextcloud-server (24.0.0-2~deb11) bullseye; urgency=medium
+
+  * Debian packages : fix install for 24 hub
+
+ -- Ivan Jurišić <ivan@jurisic.org>  Sun, 09 May 2022 11:51:12 +0000
+
+nextcloud-server (24.0.0-1~deb11) bullseye; urgency=medium
+
+  * New upstream release 24.0.0
+
+ -- Ivan Jurišić <ivan@jurisic.org>  Sun, 08 May 2022 17:02:19 +0000
+
+nextcloud-server (23.0.4-1~deb11) bullseye; urgency=medium
+
+  * New upstream release 23.0.4
+
+ -- Ivan Jurišić <ivan@jurisic.org>  Mon, 25 Apr 2022 10:06:55 +0000
+
+nextcloud-server (23.0.3-1~deb11) bullseye; urgency=medium
+
+  * New upstream release 23.0.3
+
+ -- Ivan Jurišić <ivan@jurisic.org>  Wed, 23 Mar 2022 08:17:39 +0000
+
+nextcloud-server (23.0.2-1~deb11) bullseye; urgency=medium
+
+  * New upstream release 23.0.2
+
+ -- Ivan Jurišić <ivan@jurisic.org>  Tue, 22 Feb 2022 15:25:37 +0000
+
+nextcloud-server (23.0.0-1~deb11) bullseye; urgency=medium
+
+  * New upstream release 23.0.0
+
+ -- Ivan Jurišić <ivan@jurisic.org>  Wed, 01 Dec 2021 08:10:13 +0000
+
+nextcloud-server (22.2.3-1~deb11) bullseye; urgency=medium
+
+  * New upstream release 22.2.3
+
+ -- Ivan Jurišić <ivan@jurisic.org>  Tue, 23 Nov 2021 08:51:28 +0000
+
+nextcloud-server (22.2.2-1~deb11) bullseye; urgency=medium
+
+  * New upstream release 22.2.2
+
+ -- Ivan Jurišić <ivan@jurisic.org>  Mon, 15 Nov 2021 12:50:09 +0000
+
+nextcloud-server (22.2.0-1~deb11) bullseye; urgency=medium
+
+  * New upstream release 22.2.0
+
+ -- Ivan Jurišić <ivan@jurisic.org>  Thu, 28 Oct 2021 09:45:40 +0000
+
+nextcloud-server (21.0.2-1~deb11) bullseye; urgency=medium
+
+  * New upstream release 21.0.2
+
+ -- Ivan Jurišić <ivan@jurisic.org>  Thu, 10 Jun 2021 10:37:41 +0000
+
+nextcloud-server (21.0.1-1~deb11) bullseye; urgency=medium
+
+  * New upstream release 21.0.1
+
+ -- Ivan Jurišić <ivan@jurisic.org>  Wed, 14 Apr 2021 11:16:11 +0200
+
+nextcloud-server (21.0.0-1~deb11) bullseye; urgency=medium
+
+  * New upstream release 21.0.0
+
+ -- Ivan Jurišić <ivan@jurisic.org>  Wed, 03 Mar 2021 08:36:19 +0100
+
+nextcloud-server (20.0.7-1~deb11) bullseye; urgency=medium
+
+  * New upstream release 20.0.7
+
+ -- Ivan Jurišić <ivan@jurisic.org>  Fri, 19 Feb 2021 13:04:54 +0100
+
+nextcloud-server (20.0.5-1~deb11) bullseye; urgency=medium
+
+  * New upstream release 20.0.5
+
+ -- Ivan Jurišić <ivan@jurisic.org>  Fri, 22 Jan 2021 08:01:57 +0100
+
+nextcloud-server (20.0.4-1~deb11) bullseye; urgency=medium
+
+  * New upstream release 20.0.4
+
+ -- Ivan Jurišić <ivan@jurisic.org>  Tue, 12 Jan 2021 08:15:57 +0100
+
+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>  Thu, 23 Oct 2025 07:50:27 +0200

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 @@
-.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
-*.toml 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

@@ -38,29 +38,21 @@ configure)
                 apache2_invoke enmod mime || exit $?
         fi
 
-    # Permissions and owners
-    chown -R www-data:www-data /var/www/nextcloud
-    chmod 644 /var/www/nextcloud/.htaccess
-    chmod +x /var/www/nextcloud/occ
-    chmod +x /usr/sbin/occ
-
-    # Check status
-    if [ "$(/usr/sbin/occ status | grep 'installed:' | cut -f2 -d ':' | xargs)" = "false" ]; then
+	if [ "$(su 'www-data' -s /bin/sh -c 'php /var/www/nextcloud/occ status' | grep 'installed:' | cut -f2 -d ':' | xargs)" = "false" ]; then
 		echo "Nextcloud is not configured, please use open web browser http://<your_server_ip>/nextcloud"
-        echo "After configure please run  occ config:system:set --value true upgrade.disable-web'"
-    elif [ "$(/usr/sbin/occ status | grep 'installed:' | cut -f2 -d ':' | xargs)" = "true" ]; then
-        /usr/sbin/occ maintenance:update:htaccess
-        /usr/sbin/occ upgrade
-        /usr/sbin/occ db:add-missing-indices
-        /usr/sbin/occ config:system:set --value true upgrade.disable-web >/dev/null || true
+		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 upgrade'
+		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/rules

@@ -13,4 +13,19 @@ override_dh_fixperms:
 	mkdir -p debian/nextcloud-server/var/www/nextcloud/updater
 
 	find debian/nextcloud-server/var/www/nextcloud -type f -print0 | xargs -0 chmod 0640
-	find debian/nextcloud-server/var/www/nextcloud -type d -print0 | xargs -0 chmod 0770
+	find debian/nextcloud-server/var/www/nextcloud -type d -print0 | xargs -0 chmod 0750
+
+	chown -R www-data:www-data debian/nextcloud-server/var/www/nextcloud
+	chown -R www-data:www-data debian/nextcloud-server/var/www/nextcloud/apps
+	chown -R www-data:www-data debian/nextcloud-server/var/www/nextcloud/config
+	chown -R www-data:www-data debian/nextcloud-server/var/www/nextcloud/data
+	chown -R www-data:www-data debian/nextcloud-server/var/www/nextcloud/themes
+	chown -R www-data:www-data debian/nextcloud-server/var/www/nextcloud/updater
+
+	chmod 0644 debian/nextcloud-server/var/www/nextcloud/.htaccess
+	chown www-data:www-data debian/nextcloud-server/var/www/nextcloud/.htaccess
+
+	chmod +x debian/nextcloud-server/var/www/nextcloud/occ
+	chmod +x debian/usr/sbin/occ
+
+	

debian/usr/sbin/occ

@@ -2,7 +2,7 @@
 
 if [ $(id -u) -eq 0 ] || [ $(id -u) -eq 33 ];then
   OPT="$@"
-  su -g www-data -s /bin/sh -c "/var/www/nextcloud/occ $OPT"
+  su www-data -s /bin/sh -c "/usr/bin/php /var/www/nextcloud/occ $OPT"
 else
   echo "Please run as root"
 fi

debian/watch

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