235149 – net-misc/openssh-5.1_p1 fails to patch prefix specific patches.

Bug 235149 - net-misc/openssh-5.1_p1 fails to patch prefix specific patches.

Summary: net-misc/openssh-5.1_p1 fails to patch prefix specific patches.

Status:	RESOLVED FIXED

Alias:	None

Product:	Gentoo/Alt
Classification:	Unclassified
Component:	Prefix Support (show other bugs)
Hardware:	All All

Importance:	High major (vote)
Assignee:	Gentoo non-Linux Team

URL:
Whiteboard:
Keywords:

Depends on:
Blocks:

Reported:	2008-08-18 22:52 UTC by Michał Bartoszkiewicz
Modified:	2008-09-24 19:56 UTC (History)
CC List:	1 user (show)

See Also:
Package list:
Runtime testing required:	---

Attachments
Patching log (openssh-4.7_p1-interix.patch-56587.out,30.03 KB, text/plain) 2008-08-18 22:53 UTC, Michał Bartoszkiewicz	Details
Patch output (openssh-4.9_p1-x509-hpn-glue.patch-2939.out,4.19 KB, text/plain) 2008-08-21 11:37 UTC, Jens Rutschmann	Details
new interix patch (openssh-5.1_p1-interix.patch,13.19 KB, patch) 2008-09-20 16:08 UTC, Elias Pipping	Details \| Diff
new root-uid patch (openssh-5.1_p1-root-uid.patch,18.03 KB, patch) 2008-09-20 16:08 UTC, Elias Pipping	Details \| Diff
changes to the ebuild (openssh-5.1_p1-r1.diff,383 bytes, patch) 2008-09-20 16:13 UTC, Elias Pipping	Details \| Diff
new root-uid patch that doesn't cause conflicts with the HPN patch (openssh-5.1_p1-root-uid.patch,18.05 KB, patch) 2008-09-20 16:39 UTC, Elias Pipping	Details \| Diff
even newer patch for interix. takes care of setgroups() (openssh-5.1_p1-interix.patch,13.46 KB, patch) 2008-09-21 11:02 UTC, Elias Pipping	Details \| Diff
new diff against the ebuild (openssh-5.1_p1-r1.diff,405 bytes, patch) 2008-09-21 11:05 UTC, Elias Pipping	Details \| Diff
Show Obsolete (3) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.

Description Michał Bartoszkiewicz 2008-08-18 22:52:14 UTC

Emerging net-misc/openssh-5.1_p1 fails with:
 * Failed Patch: openssh-4.7_p1-interix.patch !

Comment 1 Michał Bartoszkiewicz 2008-08-18 22:53:24 UTC

Created attachment 163257 [details]
Patching log

Comment 2 Jeremy Olexa (darkside) (RETIRED) archtester

2008-08-18 23:15:48 UTC

Actually, both prefix specific patches don't apply anymore. openssh-4.7_p1-interix.patch & openssh-4.7_p1-root-uid.patch. P.masked for now, we will need to look at it more.

Comment 3 Jens Rutschmann 2008-08-21 11:37:04 UTC

Created attachment 163460 [details]
Patch output

openssh-4.9_p1-x509-hpn-glue.patch is failing on my system, too.
Tried to merge net-misc/openssh-5.1_p1, see attached patch output.

Comment 4 Fabian Groffen gentoo-dev

2008-09-03 20:01:27 UTC

openssh-5.1_p1-r1 unpacks for me.

Comment 5 Elias Pipping 2008-09-20 16:07:27 UTC

I can't test them, but I've updated the patches to apply against 5.1_p1.

Please test  them and let me know if they work.

btw: why is this 'resolved fixed'? 5.1p1-r1 is still masked and the only reason it unpacks is because
the patches were commented out.

Comment 6 Elias Pipping 2008-09-20 16:08:15 UTC

Created attachment 165904 [details, diff]
new interix patch

Comment 7 Elias Pipping 2008-09-20 16:08:36 UTC

Created attachment 165906 [details, diff]
new root-uid patch

Comment 8 Elias Pipping 2008-09-20 16:13:30 UTC

Created attachment 165910 [details, diff]
changes to the ebuild

Comment 9 Elias Pipping 2008-09-20 16:39:59 UTC

Created attachment 165911 [details, diff]
new root-uid patch that doesn't cause conflicts with the HPN patch

Comment 10 Fabian Groffen gentoo-dev

2008-09-20 18:16:20 UTC

I applied the updated patches, thanks!

Comment 11 Elias Pipping 2008-09-21 11:02:36 UTC

Created attachment 165984 [details, diff]
even newer patch for interix. takes care of setgroups()

Comment 12 Elias Pipping 2008-09-21 11:05:03 UTC

Created attachment 165985 [details, diff]
new diff against the ebuild

Comment 13 Elias Pipping 2008-09-21 11:05:39 UTC

@grobian: should work now, please try again on interix

Comment 14 Fabian Groffen gentoo-dev

2008-09-24 19:56:22 UTC

applied, thanks.