[Bug 57016] New: staging patchinstall.py fails on security wine_todo

List overview All Threads

newer

older

[Bug 58093] New:...

[Bug 58086] New: Conflict during...

WineHQ Bugzilla

30 Jul 2024 30 Jul '24

12:28 p.m.

https://bugs.winehq.org/show_bug.cgi?id=57016

Bug ID: 57016 Summary: staging patchinstall.py fails on security wine_todo Product: Wine-staging Version: 9.13 Hardware: x86-64 OS: Linux Status: UNCONFIRMED Severity: normal Priority: P2 Component: -unknown Assignee: wine-bugs@winehq.org Reporter: zlice@crtdrift.us CC: leslie_alistair@hotmail.com, z.figura12@gmail.com Distribution: ---

Created attachment 76859 --> https://bugs.winehq.org/attachment.cgi?id=76859 current_broken_diff

wine-staging-9.13/patches/server-Stored_ACLs/0004-server-Temporarily-store-the-full-security-descripto.patch

-- Do not reply to this email, post in Bugzilla using the above URL to reply. You are receiving this mail because: You are watching all bug changes.

Show replies by date

WineHQ Bugzilla

30 Jul 30 Jul

12:28 p.m.

New subject: [Bug 57016] staging patchinstall.py fails on security wine_todo

https://bugs.winehq.org/show_bug.cgi?id=57016

--- Comment #1 from zlice zlice@crtdrift.us --- Created attachment 76860 --> https://bugs.winehq.org/attachment.cgi?id=76860 updated_working_diff

-- Do not reply to this email, post in Bugzilla using the above URL to reply. You are receiving this mail because: You are watching all bug changes.

WineHQ Bugzilla

12:30 p.m.

New subject: [Bug 57016] staging patchinstall.py fails on security wine_todo

https://bugs.winehq.org/show_bug.cgi?id=57016

--- Comment #2 from zlice zlice@crtdrift.us --- attachments made me not get to the actual issue...

staging/patchinstall.py -all

will fail trying to patch for security tests.

wine-staging-9.13/patches/server-Stored_ACLs/0004-server-Temporarily-store-the-full-security-descripto.patch

Can not find the lines in dlls/advapi32/tests/security.c which seem to be off and need updated.

-- Do not reply to this email, post in Bugzilla using the above URL to reply. You are receiving this mail because: You are watching all bug changes.

WineHQ Bugzilla

21 Aug 21 Aug

1:32 p.m.

New subject: [Bug 57016] staging patchinstall.py fails on security wine_todo

https://bugs.winehq.org/show_bug.cgi?id=57016

aurb arusanu.bu@gmail.com changed:

What |Removed |Added ---------------------------------------------------------------------------- CC| |arusanu.bu@gmail.com

--- Comment #3 from aurb arusanu.bu@gmail.com --- I have a similar issue with this specific patch mentioned here but in a strange way. In my desktop environment, bash/KDE, the patch applies successfully with no hiccups. However, the patching fails in a chroot environment and I haven't figure out why yet.

-- Do not reply to this email, post in Bugzilla using the above URL to reply. You are receiving this mail because: You are watching all bug changes.

WineHQ Bugzilla

5:53 p.m.

New subject: [Bug 57016] staging patchinstall.py fails on security wine_todo

https://bugs.winehq.org/show_bug.cgi?id=57016

--- Comment #4 from Zeb Figura z.figura12@gmail.com --- I can't reproduce this. Can you please past the error message you see?

-- Do not reply to this email, post in Bugzilla using the above URL to reply. You are receiving this mail because: You are watching all bug changes.

WineHQ Bugzilla

6:10 p.m.

New subject: [Bug 57016] staging patchinstall.py fails on security wine_todo

https://bugs.winehq.org/show_bug.cgi?id=57016

--- Comment #5 from zlice zlice@crtdrift.us --- Created attachment 76964 --> https://bugs.winehq.org/attachment.cgi?id=76964 patch_fail

This is done in a chroot technically with Void's build system.

But the `dlls/advapi32/tests/security.c` file as originally attached, does not have the same line numbers as the patches in wine's staging patch dir it seems.

-- Do not reply to this email, post in Bugzilla using the above URL to reply. You are receiving this mail because: You are watching all bug changes.

WineHQ Bugzilla

6:23 p.m.

New subject: [Bug 57016] staging patchinstall.py fails on security wine_todo

https://bugs.winehq.org/show_bug.cgi?id=57016

--- Comment #6 from Zeb Figura z.figura12@gmail.com --- (In reply to zlice from comment #5)

...

Created attachment 76964 [details] patch_fail

This is done in a chroot technically with Void's build system.

But the `dlls/advapi32/tests/security.c` file as originally attached, does not have the same line numbers as the patches in wine's staging patch dir it seems.

This seems to be part of some broader build system, given the "post_patch". That kind of thing really needs to be stated up front. Can you reproduce the failure using commands directly?

Also, there's something odd about the output, it's interleaved in a nonsensical way. Is patchinstall.py somehow being run in parallel?

-- Do not reply to this email, post in Bugzilla using the above URL to reply. You are receiving this mail because: You are watching all bug changes.

WineHQ Bugzilla

6:38 p.m.

New subject: [Bug 57016] staging patchinstall.py fails on security wine_todo

https://bugs.winehq.org/show_bug.cgi?id=57016

--- Comment #7 from aurb arusanu.bu@gmail.com --- Created attachment 76965 --> https://bugs.winehq.org/attachment.cgi?id=76965 full error patching log

(In reply to Zeb Figura from comment #4)

...

I can't reproduce this. Can you please past the error message you see?

There is not much output similar to comment #5, here is the gist of it:

+ ./staging/patchinstall.py DESTDIR=./ --all patching dlls/ntdll/loader.c .... patching dlls/advapi32/tests/security.c 1 out of 4 hunks FAILED -- saving rejects to file dlls/advapi32/tests/security.c.rej [PATCH] ERR: Textual patch did not apply, aborting. .... /home/aurb/rpmbuild/BUILD/wine-9.15/staging/../patches/gitapply.sh -d ./ < /home/aurb/rpmbuild/BUILD/wine-9.15/staging/../patches/server-Stored_ACLs/0004-server-Temporarily-store-the-full-security-descripto.patch Failed to apply patch server-Stored_ACLs/0004-server-Temporarily-store-the-full-security-descripto.patch error: Bad exit status from /home/aurb/rpmbuild/tmp/rpm-tmp.6yu3QR (%prep)

-- Do not reply to this email, post in Bugzilla using the above URL to reply. You are receiving this mail because: You are watching all bug changes.

WineHQ Bugzilla

7 p.m.

New subject: [Bug 57016] staging patchinstall.py fails on security wine_todo

https://bugs.winehq.org/show_bug.cgi?id=57016

--- Comment #8 from aurb arusanu.bu@gmail.com --- Created attachment 76966 --> https://bugs.winehq.org/attachment.cgi?id=76966 rejected bit of the patch

The failing patch part.

-- Do not reply to this email, post in Bugzilla using the above URL to reply. You are receiving this mail because: You are watching all bug changes.

WineHQ Bugzilla

7:33 p.m.

New subject: [Bug 57016] staging patchinstall.py fails on security wine_todo

https://bugs.winehq.org/show_bug.cgi?id=57016

--- Comment #9 from zlice zlice@crtdrift.us --- (In reply to Zeb Figura from comment #6)

...

(In reply to zlice from comment #5)

...
Created attachment 76964 [details] patch_fail

This is done in a chroot technically with Void's build system.

But the `dlls/advapi32/tests/security.c` file as originally attached, does not have the same line numbers as the patches in wine's staging patch dir it seems.

This seems to be part of some broader build system, given the "post_patch". That kind of thing really needs to be stated up front. Can you reproduce the failure using commands directly?

Also, there's something odd about the output, it's interleaved in a nonsensical way. Is patchinstall.py somehow being run in parallel?

It does work extracting manually. It looks like gitapply.sh has a `nogit` var that doesn't get set. Setting this to 1 by default will result in the same error on `dlls/advapi32/tests/security.c`

-- Do not reply to this email, post in Bugzilla using the above URL to reply. You are receiving this mail because: You are watching all bug changes.

WineHQ Bugzilla

7:43 p.m.

New subject: [Bug 57016] staging patchinstall.py fails on security wine_todo

https://bugs.winehq.org/show_bug.cgi?id=57016

--- Comment #10 from Zeb Figura z.figura12@gmail.com --- Thanks, that helps.

Can we just require git at build time, rather than spending time debugging this? Is that a blocker for any of these environments?

-- Do not reply to this email, post in Bugzilla using the above URL to reply. You are receiving this mail because: You are watching all bug changes.

WineHQ Bugzilla

7:47 p.m.

New subject: [Bug 57016] staging patchinstall.py fails on security wine_todo

https://bugs.winehq.org/show_bug.cgi?id=57016

--- Comment #11 from zlice zlice@crtdrift.us --- I have no clue what keeps happening, commenting and logging in seem to be just doing whatever they want on firefox.

Adding 'git' to the build deps allows patchinstall.py and gitapply.sh to run. The original issue isn't exactly accurate and the suggested diff-patches are probably not needed. Good enough for a work around to install git to chroot.

-- Do not reply to this email, post in Bugzilla using the above URL to reply. You are receiving this mail because: You are watching all bug changes.

WineHQ Bugzilla

7:48 p.m.

New subject: [Bug 57016] staging patchinstall.py fails on security wine_todo

https://bugs.winehq.org/show_bug.cgi?id=57016

--- Comment #12 from zlice zlice@crtdrift.us --- (In reply to Zeb Figura from comment #10)

...

Thanks, that helps.

Can we just require git at build time, rather than spending time debugging this? Is that a blocker for any of these environments?

Yes, this is what I added. Not sure if it should be fixed otherwise but that's good enough. Clearly no one using Void has built staging in a while since this was just brought up the other week/day :)

-- Do not reply to this email, post in Bugzilla using the above URL to reply. You are receiving this mail because: You are watching all bug changes.

WineHQ Bugzilla

7:55 p.m.

New subject: [Bug 57016] staging patchinstall.py fails on security wine_todo

https://bugs.winehq.org/show_bug.cgi?id=57016

--- Comment #13 from aurb arusanu.bu@gmail.com --- Adding git works for me too. Great, thanks.

-- Do not reply to this email, post in Bugzilla using the above URL to reply. You are receiving this mail because: You are watching all bug changes.

WineHQ Bugzilla

11 Apr 11 Apr

12:16 p.m.

New subject: [Bug 57016] staging patchinstall.py fails on security wine_todo

http://bugs.winehq.org/show_bug.cgi?id=57016

zlice zlice@crtdrift.us changed:

--- Comment #14 from zlice zlice@crtdrift.us --- got reminded of this today. sounds like git was the fix. closing as resolved

-- Do not reply to this email, post in Bugzilla using the above URL to reply. You are receiving this mail because: You are watching all bug changes.

WineHQ Bugzilla

4:56 p.m.

New subject: [Bug 57016] staging patchinstall.py fails on security wine_todo

http://bugs.winehq.org/show_bug.cgi?id=57016

Zeb Figura z.figura12@gmail.com changed:

--- Comment #15 from Zeb Figura z.figura12@gmail.com --- Nothing was fixed in wine-staging, so I'm going to call this NOTOURBUG.

-- Do not reply to this email, post in Bugzilla using the above URL to reply. You are receiving this mail because: You are watching all bug changes.

Age (days ago)

305

Last active (days ago)

wine-bugs@winehq.org

15 comments

1 participants

tags (0)

participants (1)

WineHQ Bugzilla