On 2026/09/30 10:38, Stuart Henderson wrote:
> On 2026/09/30 09:49, Stuart Henderson wrote:
> > moved to ports@; [email protected] is a dead mailing list
> > 
> > doesn't nextcloud have integrity checks that get in the way of patching?
> 
> I had an off-list reply (please, keep it on ports@):
> 
> "On the port, these checks are disabled by default"

Seems they are not actually, I had an email warning about this, the
things it didn't like were:

<cal:~>$ doas -u www /var/www/nextcloud/occ integrity:check-core
  - INVALID_HASH:
    - occ:
      - expected: 
4570f9ef62d6c33442bcc96cafb75adb6e7046a5d0ddfc93e81726ac4e7bd76729cf6382c0bd22c5dfdc1bbcd46530c643a763fa7218cda33a6c938d1b8624b7
      - current: 
674177132e1b05b1836b1ac013237e988080a619aa4034167226b756549dd7fbcb5edb8109dfa21e36c840faa8cf898c31cf112e580aa0f5d8b80414f3fabf4e
  - EXTRA_FILE:
    - .htaccess.dist:
      - expected:
      - current: 
a2d827cbc4eadda3ccfdcfa9391985ee63808925b3cf2a43683296de37bcbcab4075ab0c49c3898ada1dd5f71100a673e166ce5f87c002bf18a3960385f7823c

We can avoid these. The default PHP version installs /usr/local/bin/php
so there's no need to change the #! in occ, and we can move the @sample
source file out of the subdir.

any objections to doing this? if it's ok, I'll backport to -stable too.

Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/www/nextcloud/Makefile.inc,v
diff -u -p -r1.6 Makefile.inc
--- Makefile.inc        4 Jul 2026 10:05:10 -0000       1.6
+++ Makefile.inc        18 Nov 2026 17:50:11 -0000
@@ -63,14 +63,14 @@ RUN_DEPENDS +=              databases/pecl-redis${MO
 # image processing
 RUN_DEPENDS +=         graphics/pecl-imagick${MODPHP_FLAVOR}
 
+# nextcloud has its own integrity checks; modifying installed files
+# or creating additional files in the core/app-owned directories
+# triggers warnings. try to avoid making any changes which trigger
+# this. (occ integrity:check-core, occ integrity:check-apps --all).
 do-install:
        cp -Rp ${WRKSRC} ${INSTDIR}
-       mv ${INSTDIR}/.htaccess ${INSTDIR}/.htaccess.dist
-       find ${INSTDIR} -name '*.orig' -delete
+       mv ${INSTDIR}/.htaccess ${INSTDIR}.htaccess.dist
        chown -R ${BINOWN}:${BINGRP} ${INSTDIR}
-
-       perl -pi -e '$$. == 1 && s|^.*env php.*$$|\#!${MODPHP_BIN}|;' \
-               -e 'close ARGV if eof;' ${INSTDIR}/occ
        chmod +x ${INSTDIR}/occ
 
        ${INSTALL_DATA_DIR} ${PREFIX}/conf/modules.sample
Index: 34/Makefile
===================================================================
RCS file: /cvs/ports/www/nextcloud/34/Makefile,v
diff -u -p -r1.11 Makefile
--- 34/Makefile 15 Nov 2026 11:34:23 -0000      1.11
+++ 34/Makefile 18 Nov 2026 17:50:11 -0000
@@ -1,6 +1,6 @@
 NC_VERSION=    34.0.6
 
 # keep above 8.0-stable
-REVISION=      0
+REVISION=      1
 
 .include <bsd.port.mk>
Index: 34/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/nextcloud/34/pkg/PLIST,v
diff -u -p -r1.8 PLIST
--- 34/pkg/PLIST        15 Nov 2026 11:34:23 -0000      1.8
+++ 34/pkg/PLIST        18 Nov 2026 17:50:11 -0000
@@ -5,7 +5,7 @@ conf/modules.sample/
 conf/modules.sample/apache-nextcloud.conf.dist
 @sample conf/modules.sample/apache-nextcloud.conf
 nextcloud/
-nextcloud/.htaccess.dist
+nextcloud.htaccess.dist
 @sample nextcloud/.htaccess
 nextcloud/.user.ini
 nextcloud/3rdparty/
Index: 35/Makefile
===================================================================
RCS file: /cvs/ports/www/nextcloud/35/Makefile,v
diff -u -p -r1.5 Makefile
--- 35/Makefile 15 Nov 2026 11:32:25 -0000      1.5
+++ 35/Makefile 18 Nov 2026 17:50:11 -0000
@@ -1,7 +1,7 @@
 NC_VERSION=    35.0.3
 
 # keep above 8.0-stable
-REVISION=      0
+REVISION=      1
 
 # override PORTROACH from ../Makefile.inc for the highest release branch only
 PORTROACH=
Index: 35/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/nextcloud/35/pkg/PLIST,v
diff -u -p -r1.3 PLIST
--- 35/pkg/PLIST        15 Nov 2026 11:32:25 -0000      1.3
+++ 35/pkg/PLIST        18 Nov 2026 17:50:11 -0000
@@ -4,7 +4,7 @@ conf/modules.sample/
 conf/modules.sample/apache-nextcloud.conf.dist
 @sample conf/modules.sample/apache-nextcloud.conf
 nextcloud/
-nextcloud/.htaccess.dist
+nextcloud.htaccess.dist
 @sample nextcloud/.htaccess
 nextcloud/.user.ini
 nextcloud/3rdparty/

Reply via email to