kindly please provide a hash which is the exact unmodified mirror of upstream 7-zip

[cielavenir]

https://github.com/jinfeihan57/p7zip/pull/171 please name https://github.com/jinfeihan57/p7zip/commit/672af56c463c2690b1f90fce3335800cc04abc39 "mirror" (or "7zip_mirror" or "upstream") on your repository for our ease afterwards.

this was ignored.

[jinfeihan57]

I'd love to do it, but where should I put it?

[cielavenir]

@jinfeihan57 anything which can be used as pull request base is ok, I personally use mirror branch

[cielavenir]

I copied 22.01 to https://github.com/cielavenir/p7zip/commits/mirror and merged to my main branch. It was easy.

I think you can just push my mirror branch to your p7zip repository...

[jinfeihan57]

Done. https://github.com/jinfeihan57/p7zip/tree/7zip_mirror

[cielavenir]

@jinfeihan57 thank you

1. now could you merge 7zip_mirror into your p7zip22.00 branch? Here I will merge 7zip_mirror into my branch then finally we can start the discussion on merging.
2. question: I downloaded 7z2102-src.7z and compared the content. meld does not report diff but diff reported line terminators. Does that mean you are converting line terminators? (uh-oh, it is already not "unmodified"...) For reference could you tell me the command you used?

[cielavenir]

by the way 7zip_mirror is 21.02 so please upgrade it to 22.01

[cielavenir]

@jinfeihan57 I asked for unmodified source code base but you did modify it. Please tell me how. Like find type -f | dos2unix ? I do need to use the exactly the same method, otherwise I need to wait until you work on this branch after the every official release.

[jinfeihan57]

@cielavenir Just passed the test on arm platform，A new version will be released this weekend. Can this solve your problems?

[cielavenir]

@jinfeihan57 my problem is that I cannot merge your master into my branch easily, so I need "common ancestor" of git so that 3-way merge works nicely. However your 7zip_mirror branch is old and modified.

As I wrote in https://github.com/jinfeihan57/p7zip/issues/179#issuecomment-1204745629

1. Could you update 7zip_mirror to 22.01?
2. Could you tell me how you modified the source code? (assuming it is only changine line feed) Did you use find type -f | dos2unix?

[cielavenir]

maybe I gave up everything as https://github.com/jinfeihan57/p7zip/pull/172#issuecomment-1255687783 .

hopefully it is possible to copy my Codecs/*.so to jinfeihan57/p7zip distribution.

you can close this.

I'm not sure, but if you have felt any conveniences, I apologize.

[cielavenir]

my fork has been archived with remark https://github.com/cielavenir/p7zip/commit/c7aa56504d66c2472437be2e8ee1725f6129d902

[cielavenir]

damn I found https://github.com/jinfeihan57/p7zip/pull/186#issuecomment-1223976885 comment just now

@jinfeihan57 you should have told me this link first /cc @tansy

[cielavenir]

@jinfeihan57 I have converted my branch to LF. The thing is my base is 22.01 while your base is 22.00.Maybe I could try again when you update your code to 22.01.

However, there is one major issue. I can see that you converted .dsp/.dsw CRLF to LF in https://github.com/jinfeihan57/p7zip/tree/master/CPP/7zip/UI/Console . It will not work for sure. I'm sorry if you feel I'm noisy but that's why I asked and asked you to show how you converted, though your conversion is wrong.

I improved tansy's script in https://github.com/cielavenir/p7zip/blob/main/d2u-dir.sh , I kindly ask to convert again using this script.

[tansy]

I can see that you converted .dsp/.dsw CRLF to LF (...) It will not work for sure

That's true. They have to be converted do CRLF "manually". you can use this script put together on the fly (for .dsp/.dsw only).

[teoberi]

@cielavenir I looked a bit at .github/workflows -> ci.yaml and if you updated the codecs maybe you should also update UASM (it seems that the development of UASM has started again).

[cielavenir]

let me check if the current version builds (I saw that 2.5x master did not built)

[teoberi]

2.5x master did not built, does not include changes for compilation in Linux (dbgcv.c file). For 2.56.2 now I'm also trying to compile, so far 7zr compiles, the rest will follow!

[teoberi]

It compiles OK both 7za and 7zz. Now I have another problem, for gcc (GCC) 12.2.0 I can't enable Full RELRO. For GCC 11 it works, probably some changes must be made in the 7-Zip source code.

checksec --file=b/g_x64/7zz

RELRO STACK CANARY NX PIE RPATH RUNPATH Symbols FORTIFY Fortified Fortifiable FILE No RELRO Canary found NX enabled PIE enabled No RPATH No RUNPATH No Symbols Yes 8 21 b/g_x64/7zz