Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nextcloud: 14.0.1 -> 14.0.3 #48319

Merged
merged 1 commit into from Oct 14, 2018
Merged

nextcloud: 14.0.1 -> 14.0.3 #48319

merged 1 commit into from Oct 14, 2018

Conversation

lschuermann
Copy link
Member

Motivation for this change

Update nextcloud to 14.0.3.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

I've tested the upgrade using the new nextcloud module (#47159). The integrity check fails, as the sendmail patch touches the mailer php script.
Can this be solved somehow?

@timokau
Copy link
Member

timokau commented Oct 13, 2018

@GrahamcOfBorg build nextcloud

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: nextcloud

Partial log (click to expand)

configuring
no configure script, doing nothing
building
no Makefile, doing nothing
installing
post-installation fixup
strip is /nix/store/53nysl8bqwxihwzs1pgwka20nf8mbvlp-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/wp8n8yw645pbry5yqm3i0jas7jz88724-nextcloud-14.0.3/lib
patching script interpreter paths in /nix/store/wp8n8yw645pbry5yqm3i0jas7jz88724-nextcloud-14.0.3
/nix/store/wp8n8yw645pbry5yqm3i0jas7jz88724-nextcloud-14.0.3

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: nextcloud

Partial log (click to expand)

building
no Makefile, doing nothing
installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/wbmn0hhbjv4ywmhrzlahrd1niz4m6j2p-nextcloud-14.0.3
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/wbmn0hhbjv4ywmhrzlahrd1niz4m6j2p-nextcloud-14.0.3/lib
patching script interpreter paths in /nix/store/wbmn0hhbjv4ywmhrzlahrd1niz4m6j2p-nextcloud-14.0.3
checking for references to /build in /nix/store/wbmn0hhbjv4ywmhrzlahrd1niz4m6j2p-nextcloud-14.0.3...
/nix/store/wbmn0hhbjv4ywmhrzlahrd1niz4m6j2p-nextcloud-14.0.3

@timokau
Copy link
Member

timokau commented Oct 13, 2018

I've tested the upgrade using the new nextcloud module (#47159). The integrity check fails, as the sendmail patch touches the mailer php script.
Can this be solved somehow?

Does that mean this is work in progress? I don't use nextcloud so I can't help there.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: nextcloud

Partial log (click to expand)

building
no Makefile, doing nothing
installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/8dmmzfscy573id65bsf7glq79jgrmifs-nextcloud-14.0.3
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/8dmmzfscy573id65bsf7glq79jgrmifs-nextcloud-14.0.3/lib
patching script interpreter paths in /nix/store/8dmmzfscy573id65bsf7glq79jgrmifs-nextcloud-14.0.3
checking for references to /build in /nix/store/8dmmzfscy573id65bsf7glq79jgrmifs-nextcloud-14.0.3...
/nix/store/8dmmzfscy573id65bsf7glq79jgrmifs-nextcloud-14.0.3

@lschuermann
Copy link
Member Author

lschuermann commented Oct 14, 2018 •
edited

Does that mean this is work in progress?

Technically, this PR should work just fine. However, when using Nextcloud, it displays a warning about the code integrity checks failing. This can be disabled in the config, but isn't recommended.

Maybe @flokli has figured out another solution. I would like someone else who is actually using Nextcloud (@eqyiel) to confirm this patch. CC: @schneefux @bachp @globin @fpletz

@costrouc costrouc mentioned this pull request Oct 14, 2018
Closed
@fpletz
Copy link
Member

fpletz commented Oct 14, 2018

@GrahamcOfBorg test nextcloud

@GrahamcOfBorg
Copy link

Success on aarch64-linux

Attempted: tests.nextcloud

No partial log is available.

@GrahamcOfBorg
Copy link

Success on x86_64-linux

Attempted: tests.nextcloud

No partial log is available.

@fpletz
Copy link
Member

fpletz commented Oct 14, 2018

@GrahamcOfBorg test nextcloud.basic

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: tests.nextcloud.basic

Partial log (click to expand)

client: exit status 0
nextcloud: running command: sync
nextcloud: exit status 0
test script finished in 73.57s
cleaning up
killing client (pid 631)
killing nextcloud (pid 643)
vde_switch: EOF on stdin, cleaning up and exiting
vde_switch: Could not remove ctl dir '/build/vde1.ctl': Directory not empty
/nix/store/8llkdhyzqbj8d6m9ffhydnis7fvh0njw-vm-test-run-nextcloud-basic

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: tests.nextcloud.basic

Partial log (click to expand)

nextcloud: exit status 0
client: running command: sync
client: exit status 0
test script finished in 511.52s
cleaning up
killing nextcloud (pid 600)
killing client (pid 612)
vde_switch: EOF on stdin, cleaning up and exiting
vde_switch: Could not remove ctl dir '/build/vde1.ctl': Directory not empty
/nix/store/3icq2i2xi3fkk14w50xw19swbw0r1iqp-vm-test-run-nextcloud-basic

@fpletz fpletz merged commit 6d3b54a into NixOS:master Oct 14, 2018
@flokli
Copy link
Contributor

flokli commented Oct 14, 2018 via email

@lschuermann
Copy link
Member Author

@flokli I've seen the PR with Nextcloud itself, and can't await it being merged. I just didn't know whether there was another solution than ignore the code integrity check, don't use the patch or don't update.

I guess updating and living with the integrity warnings was the right choice in this case. 👍 Thank you for your contributions!

@schneefux
Copy link
Contributor

@lschuermann

I would like someone else who is actually using Nextcloud to confirm this patch

The integrity check fails but otherwise it works fine 👍

@lschuermann lschuermann deleted the nextcloud-update branch October 19, 2018 08:24
@lschuermann lschuermann restored the nextcloud-update branch October 19, 2018 09:05
@lschuermann lschuermann deleted the nextcloud-update branch October 19, 2018 09:26
@wilkis3
Copy link

wilkis3 commented Oct 21, 2018

The integrity check doesn't like the file lib/private/Mail/Mailer.php.
They expected an other hash.

Line 277 in nextcloud package:

$binaryPath = \OC_Helper::findBinaryPath('sendmail');

Line 277 in github repo (tag: 14.0.3):

$binaryPath = '/usr/sbin/sendmail';

@flokli
Copy link
Contributor

flokli commented Oct 21, 2018

@wilkis3 yes, see my comment above, referring to nextcloud/server#11404 .

I did not yet wrap my head around phpunit, and fixing the testcases in that PR (which prevents it from being merged).

As soon as I sorted that out, we'll be able to upstream the patch, so the integrity check shouldn't complain anymore in upcoming releases - but for now, that "onofficial" patch is required to get sendmail to work, /usr/sbin/sendmail doesn't exist on NixOS ;-)

@flokli
Copy link
Contributor

flokli commented Nov 8, 2018

@wilkis3 [nextcloud 15.0.0beta1(]https://github.com/nextcloud/server/releases/tag/v15.0.0beta1) was tagged earlier today - containing the patch upstream, so this should not be an issue with 15.0.0 anymore, once released, and PR'ed to nixpkgs.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@lschuermann @timokau @GrahamcOfBorg @fpletz @flokli @schneefux @wilkis3