Summary: | x11/xscreensaver-gnome{-hacks}: Update to 5.36 | ||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|
Product: | Ports & Packages | Reporter: | John Hein <jcfyecrayz> | ||||||||
Component: | Individual Port(s) | Assignee: | freebsd-ports-bugs (Nobody) <ports-bugs> | ||||||||
Status: | Closed Overcome By Events | ||||||||||
Severity: | Affects Some People | CC: | gnome, morrand276, pi, rene, robak, w.schwarzenfeld | ||||||||
Priority: | --- | Keywords: | needs-qa | ||||||||
Version: | Latest | ||||||||||
Hardware: | Any | ||||||||||
OS: | Any | ||||||||||
Attachments: |
|
Description
John Hein
2017-01-05 23:10:25 UTC
The patch fails to apply cleanly, could you please fix the issues and submit updated one? Created attachment 181296 [details]
patch-5.35-to-5.36
This patch testbuilds fine.
Comment on attachment 181296 [details]
patch-5.35-to-5.36
Ups this is not for the -gnome variants.
Confirmed the patch does not apply cleanly. The reported problem is: |Index: x11/xscreensaver-gnome/Makefile |=================================================================== |--- x11/xscreensaver-gnome/Makefile (revision 430548) |+++ x11/xscreensaver-gnome/Makefile (working copy) -------------------------- Patching file x11/xscreensaver-gnome/Makefile using Plan A... Hunk #1 failed at 3. Hunk #2 succeeded at 11. Hunk #3 failed at 20. 2 out of 3 hunks failed--saving rejects to x11/xscreensaver-gnome/Makefile.rej The first hunk apparently fails because of -PORTREVISION?= 4 at line 7, which has since been bumped and should be -PORTREVISION?= 5 The third hunk apparently fails because line 21, USE_PERL5= run is in the patch's context but isn't in the distributed Makefile since bug #233138. There was also a Patching file x11/xscreensaver-gnome-hacks/Makefile using Plan A... Hunk #1 succeeded at 2 with fuzz 1. but it's not significant. Created attachment 200679 [details]
Improved patch for update to 5.36
The attached patch, which is just a slightly adjusted version of the previous one, applies, builds and runs for me on 11.2-RELEASE.
Of course, xscreensaver 5.36 still nags me about it being an old version (which it is), but one thing at a time...
https://www.jwz.org/xscreensaver/download.html says 5.42 is the most recent version. Can you try to update to that version ? The original patch applied cleanly at 2017-03-29. I'm not sure why Bartek had trouble then. And I guess I missed his comment back then. Maybe he didn't notice that the patch was for two different ports (x11/xscreensaver-gnome and x11/xscreensaver-gnome-hacks). If you applied it with 'cd ports/x11/xscreensaver-gnome ; patch < attachment-178565', then it would have failed (but 'cd ports; patch < attachment-178565' worked fine back then). Of course, since then the motion in the tree has made the patch out of date as Andrew observed. And Andrew's updated patch looks good to me for 5.36. I'll look at refreshing for 5.42 (although the x11/xscreensaver port is only at 5.40) if Andrew doesn't beat me to it. I can certainly look into bringing these up to current. I'm new to porting and it seems like a good opportunity to practice. However, given that 5.12 still has a vulnerability (as mentioned by John in the original PR) I suggest it would be better to take the patch to 5.36 now, and get that resolved now, before working on the next version. There aren't any major changes mentioned in the changelog between 5.36 and 5.42 (a few new "hacks," i.e. screen savers, and some improvement to font handling) and I would hate to further delay fixing the vulnerability over that. x11/xscreensaver-gnome{-hacks} - both ports marked BROKEN - unfetchable. No response for a while and this port expired, so removed. |