PR#7: Various fixes and upstream update - rpms/nextcloud

rpms / nextcloud

#7 Various fixes and upstream update

Merged a year ago by ichavero. Opened a year ago by aviram.

Unknown source rawhide into rawhide

update to 24.0.5

Avi Alkalay • a year ago

d94c4af

Set PHP output_buffering to false to kill nextcloud setup warnings

Avi Alkalay • a year ago

4d543f4

Add new .well-known redirects

Avi Alkalay • a year ago

9e3b394

use FPM’s specific configuration

Avi Alkalay • a year ago

8ea470c

nextcloud-defaults.inc

file modified

		`@@ -21,6 +21,9 @@`
		`RequestHeader set XAuthorization %{XAUTHORIZATION}e env=XAUTHORIZATION`
		`</IfModule>`
		`</IfModule>`
		`+ <FilesMatch \.(php\|phar)$>`
		`+ SetHandler "proxy:unix:/run/php-fpm/nextcloud.sock\|fcgi://localhost"`
		`+ </FilesMatch>`
		`</IfModule>`

		`<IfModule mod_php5.c>`

nextcloud-httpd.conf

file modified

+5 -3

		`@@ -16,9 +16,11 @@`
		`# Allows compliant CalDAV / CardDAV clients to be configured using only`
		`# the domain name. For more details see # http://tools.ietf.org/html/rfc6764`

		`- Redirect 301 /.well-known/carddav /nextcloud/remote.php/carddav`
		`- Redirect 301 /.well-known/caldav /nextcloud/remote.php/caldav`
		`- Redirect 301 /.well-known/webdav /nextcloud/remote.php/webdav`
		`+ Redirect 301 /.well-known/carddav /nextcloud/remote.php/dav`
		`+ Redirect 301 /.well-known/caldav /nextcloud/remote.php/dav`
		`+ Redirect 301 /.well-known/webdav /nextcloud/remote.php/dav`
		`+ Redirect 301 /.well-known/webfinger /nextcloud/index.php/.well-known/webfinger`
		`+ Redirect 301 /.well-known/nodeinfo /nextcloud/index.php/.well-known/nodeinfo`

		`<Directory /usr/share/nextcloud/>`
		`Include conf.d/nextcloud-auth-local.inc`

nextcloud-php-fpm.conf

file modified

		`@@ -18,6 +18,7 @@`
		`php_value[memory_limit] = 512M`
		`php_value[upload_max_filesize] = 10G`
		`php_value[post_max_size] = 10G`
		`+ php_value[output_buffering] = false`
		`env[HOSTNAME] = $HOSTNAME`
		`env[PATH] = /usr/local/bin:/usr/bin:/bin`
		`env[TMP] = /tmp`

nextcloud.spec

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`Name: nextcloud`
		`- Version: 24.0.3`
		`+ Version: 24.0.5`
		`Release: %autorelease`
		`Summary: Private file sync and share server`
		`License: AGPLv3+ and MIT and BSD and ASL 2.0 and WTFPL and CC-BY-SA and GPLv3+ and Adobe`

sources

file modified

+1 -2

		`@@ -1,2 +1,1 @@`
		`- SHA512 (nextcloud-22.1.0.tar.bz2) = f591959c35a47d1e88e2aa1694968a36e4673ca55b5d5a9cf0ce6d1ee76002a6445a33ff040a061db0cb753321f59853f723b8dc7106ffda09eed468e5fb7dd3`
		`- SHA512 (nextcloud-24.0.3.tar.bz2) = 92714758f542fa7aeb511761b4f1becc16dc64e5b4b2d54b3dc2fe6b3927b1a9a5a632c5b552efc591568752d7691e92aaab9e4f771435360db9b2c81977300e`
		`+ SHA512 (nextcloud-24.0.5.tar.bz2) = 2673853ba97bb868b318b9bb5025bb44dfdb6c82a9d518bb9c5ee642b781ce39f05fd1b31517946e8cace329cd0ab613341005a39b84afe86cd157a8404d4fcd`

aviram commented a year ago

New .well-known redirects to kill nextcloud setup warnings
Set PHP output_buffering to false to kill nextcloud setup warnings
Use shipped FPM’s specific configuration (https://bugzilla.redhat.com/show_bug.cgi?id=1933529)
Update to 24.0.5
—
I have build it locally (fedpkg --release f36 local) and runs well in my Fedora 36.
It fails to build in koji, I don't know how to use it (https://koji.fedoraproject.org/koji/taskinfo?taskID=92284290)

aviram commented a year ago

I set up a copr with updated packages: https://copr.fedorainfracloud.org/coprs/aviram/nextcloud/

gotmax23 commented on line 4 of sources a year ago

The way the sources file was updated is incorrect. Please run fedpkg new-sources nextcloud-24.0.5.tar.bz2, amend your commit, and force push.

gotmax23 commented on line 2 of changelog a year ago

The way you've updated the changelog is also incorrect, as this package uses rpmautospec which generates changelog entries based on the git commit messages. Please remove these entries from the changelog file.

gotmax23 commented a year ago

I would also squash the new .well-known redirects and Add new .well-known redirects commits.

gotmax23 commented a year ago

To be clear, I am not a maintainer of this package. I'm just helping review your PR :).

aviram commented a year ago

I would also squash the new .well-known redirects and Add new .well-known redirects commits.

I would not know how to do this.

aviram commented a year ago

@gotmax23 I did most of your suggestions, but build still fails.

https://koji.fedoraproject.org/koji/taskinfo?taskID=92349697

Any ideas?

2 new commits added

new source 24.0.5
Let rpmautospec fill changelog from git commits

a year ago

gotmax23 commented a year ago

@gotmax23 I did most of your suggestions, but build still fails.

You want fedpkg scratch-build --srpm.

gotmax23 commented a year ago

I would also squash the new .well-known redirects and Add new .well-known redirects commits.

I would not know how to do this.

I'll fix it for you.

4 new commits added

update to 24.0.5
Set PHP output_buffering to false to kill nextcloud setup warnings
Add new .well-known redirects
use FPM’s specific configuration

a year ago

gotmax23 commented a year ago

I would also squash the new .well-known redirects and Add new .well-known redirects commits.

I would not know how to do this.

I'll fix it for you.

Done.

aviram commented a year ago

@gotmax23 I did most of your suggestions, but build still fails.

You want fedpkg scratch-build --srpm.

I'm a big fan of CLI, but a UI comes handy when you don't know all the possibilities, which is clearly my case. Thank you my friend. Executing this right now.

Edited a year ago by aviram

1 new commit added

Merge branch 'rawhide' of ssh://pkgs.fedoraproject.org/forks/aviram/rpms/nextcloud into rawhide

a year ago

aviram commented a year ago

@gotmax23 I did most of your suggestions, but build still fails.

You want fedpkg scratch-build --srpm.

Still no success with fedpkg build

https://koji.fedoraproject.org/koji/taskinfo?taskID=92376382

gotmax23 commented a year ago

@gotmax23 I did most of your suggestions, but build still fails.

You want fedpkg scratch-build --srpm.

Still no success with fedpkg build

https://koji.fedoraproject.org/koji/taskinfo?taskID=92376382

it doesn't work, because that's not the correct command. fedpkg build is for package maintainers to submit production builds and doesn't work for forks.

gotmax23 commented a year ago

I would also squash the new .well-known redirects and Add new .well-known redirects commits.

I would not know how to do this.

I'll fix it for you.

Done.

It looks like you force pushed which messed this up. I fixed it again. Please run git fetch --all && git reset --hard [your fork's git remote here]/rawhide instead of git pull.

Edited a year ago by gotmax23

4 new commits added

update to 24.0.5
Set PHP output_buffering to false to kill nextcloud setup warnings
Add new .well-known redirects
use FPM’s specific configuration

a year ago

gotmax23 commented a year ago

This looks okay to me after the fixes I made. Hopefully, the maintainers will get to this soon.

aviram commented a year ago

I tried to put many things on [your fork's git remote here], but the only one that worked was git fetch --all && git reset --hard origin/rawhide. This is inside my clone of https://src.fedoraproject.org/fork/aviram/rpms/nextcloud

fedpkg build failed again: https://koji.fedoraproject.org/koji/taskinfo?taskID=92401551

This is incredibly complicated and tricky. And I deal with git, GitHub, forks, packaging etc everyday. I know how to use and use it everyday, But I'm not very advanced though.

aviram commented a year ago

From checkout.log I can see it is trying to checkout from the original repo (/rpms/nextcloud.git) which seems wrong to me.

I was expecting it to checkout my fork (/fork/aviram/rpms/nextcloud).

I don't know why this is happening and what should I do to fix it.

Meanwhile my copr has successfully built up packages.

gotmax23 commented a year ago

I'm not sure why you keep running fedpkg build. It's not working, because it's the wrong command :). fedpkg build is for the package's maintainers who have permissions on the package to submit production builds to be pushed out to users. The correct command to run test builds in koji is fedpkg scratch-build --srpm. However, the CI already ran a scratch-build for you, so you probably don't need to do it again.

gotmax23 commented a year ago

I tried to put many things on [your fork's git remote here], but the only one that worked was git fetch --all && git reset --hard origin/rawhide. This is inside my clone of https://src.fedoraproject.org/fork/aviram/rpms/nextcloud

I'm not sure what you mean. [your fork's git remote here] was a placeholder value. It sounds like origin was the correct value in this case. The correct value depends how you set up your git clone.

This is incredibly complicated and tricky. And I deal with git, GitHub, forks, packaging etc everyday. I know how to use and use it everyday, But I'm not very advanced though.

Yeah, our workflows can be a bit complicated at first. Thanks for sticking with it.