diff options
Diffstat (limited to 'app-arch/p7zip')
33 files changed, 5450 insertions, 0 deletions
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest new file mode 100644 index 0000000..7acfea2 --- /dev/null +++ b/app-arch/p7zip/Manifest @@ -0,0 +1,40 @@ +AUX 4.65-hardlink.patch 413 SHA256 187fc9f9ec0160c7b5f6a1bf7394e7d92db1fbebf219a1ea55725d40255256c8 SHA512 4474aa46f46d5c42924c31925b52296a20879c4bd5bf8918b6531a20d5d31939ef0956161fcb9d8af2dcc97650bdb348ab920e346b41601be64e93163fe4b7fd WHIRLPOOL 91822c3bb0113613a3246f3aed52464c2dcafe0d9a5e98747e524d4cdfb590036ed9606cfc10590e6e85d6682c3738f5267bcab29f59228c4d7fa8e25b16ce24 +AUX 4.65-makefile.patch 450 SHA256 d36e71be74fdcc3c2afaf2217cb4712f00e3e75f3d23efd6c288f058092c4120 SHA512 dd21f0a4850a6d5643f950c34cac3b34aa4453f47bf3c9f5de9725f5fba2588f5c38d69a980e434b0bb8372ade7c9c0917a6a9f748776838ba6f51823b76de5b WHIRLPOOL 30717ab379a48ae124c20b99d041e71f150d6e46ca9a54cf06bc1e413e94770fafb417047758fe8b24ce4f09b9f0c5ba4edbc895fc3a67ab922842b31d151807 +AUX 7z 142 SHA256 4b5a22ff23f0dc7e3b5dc0c44733fe73b2d3cd1683092a3d691179687cf95e1d SHA512 720d979865f1e66b4102f5cebd3f081162c226f4ba5b40fe66f2b2147d86c90e60786b761b2f9c3de66ba53683c9daa8cd0b544c107208a2698919b5df0c35bc WHIRLPOOL cab2bd7fd00b2fc2bc48c8cc0706bdf1390b25947a002fc395533049fec032cf811798a277341d692b5c48e410adf50b98da93a29dc5b8ab13fb720a4711551e +AUX 7za 144 SHA256 15a7f37e025d1188ee52a262027a268cdfcbd1347171da9aa560a3a1a824366b SHA512 4378841ae3e34b70a2ddc9e426d3f2bc0c41cc3c4a4afd9ad498d6cb8e1733532c6a3ba19b473624a23b0064fc7f3c5b31d4bd46d2c89b5e862da1b59c56b949 WHIRLPOOL b1d97a21cf6483efe1b2c03636336e646d696a894c893fa0f61e2683e03f7a86315f119ecf2b838f682196e1d0691e8732fde5e7da16b9bed3ef3324d2d15399 +AUX 9.04-kde4.patch 5185 SHA256 facc613f8c684ca2c0baff4c89e99f0abe29b12b96ef2281e17a0041e07631c3 SHA512 040a40f634888f89424efac075cf8f5651c91d055de4a2d6dd1f7fbbf8e6e1befcf4f4ffeddd11a641c73cfc2bcfcfb7a8ca3076b222d16aeb306114da4ab6c7 WHIRLPOOL 5b25f5474a5571e2b2ca731d98bd7a14c5e98c417bf2a6359801a387ea7de130aac0da12502a070d7914964b9501131d72d9ed261e765f3952db83b363972737 +AUX 9.04-makefile.patch 470 SHA256 c8ef2898ed994929600c04ed0ecfd2dc2b94982d274ee217cbc05234c37750f6 SHA512 2c131e0b42ae6c8cd236125be313ea032b47edf858d1248a8648fd0e794ca4094016a3bb06e15fe65582626dd9d611a08a87ad5789695fff0a2244bb7f3cec3d WHIRLPOOL b2a66b46651a8036808985524b2c6311fa0d7dbceba453f1ac4bb1cc0fef9fbe060b1d4c04e20353c4232915f340cf3bd65d0f7e0ccc3eac8651d3ac15d389db +AUX p7zip 1210 SHA256 28d181cd1c43628da0adb485e20f270461b6cf8d743d2187a3380f7799fbc2d5 SHA512 e3f1497cc00669430de336aac1d45a0313831b7f5dc88b9b2ca49e743d8e9e7c73b403d94b4fd9de6cd59875fef47756f9dab9ddf12442ee3fff71e413715553 WHIRLPOOL e14aef0141b8260a5206bd94d22560c927a3ce0e643433ee68d8ade0601655b8a6b7c8ad78f81a0fb97323c7c37eb3fc5483d9e49c2ac259d146b60e678cc973 +AUX p7zip-4.16_x86_static.patch 276 SHA256 09fa439da270e1f96d580425a4addaeb4684b3f727d01d08e9b293124646797d SHA512 acbd79ce2b698445384aeca88956605f44944fa91e0677f03403013b45e956537edcbb28ee84d5adc786ae43ce70291ea436e0bf620a0895e985675b879a803f WHIRLPOOL ce883d92a40b0595691913bd0490fa5602caef8ba0d20c5cc724fef28eb75d5163a3c3e77dfe79c98292002045fc8ec6beebe610a6bffc74eeb4f1b18cda30bc +AUX p7zip-9.13-QA.patch 650 SHA256 d44e500a5d15b8c25826fd8a60c61e9c524724c40f22683967212f9843d6db17 SHA512 c8b260d30a39ce66990aaa429d60c3b4a472f03f03c407badbe235106245f4ab0f9422ec1ddd98e5fbe97e9296d69908687625f141e3aa91ff5f32588b332543 WHIRLPOOL 6d01c5f28efe6e528a1a5f7e0fdef7701b4ba92e9a21646832094dbbc3ae7e0e3671ee925c2f8009afca85cb9bdca83fce225063a3c47af7d05625019c47fada +AUX p7zip-9.20.1-QA.patch 650 SHA256 695b6836b13699e3db3e019dbd54275e48a01b59210fd353a2d9e46224c60785 SHA512 b07f8608b973be7c547b226bc23dd064d6cc18f6b1ea70ce72aff72fa098852914eb8d331fe7230b7fdfbb1f0fce59eb3404fd3a5b44d151ea847e87fd2d8f39 WHIRLPOOL 077a4bdf44dcbd66a525e795e082aef41321dc7770415a1cd78716d78aa5b5b2e780afcb4194ea7c2ae2947a596292be18ab8dd3f9bce302e47f8d9cdcc6a046 +AUX p7zip-9.20.1-execstack.patch 785 SHA256 0725ca42b5ac8d4024a18e2759a12c3ba04b8ea504376c14d8890f7bebba3fb1 SHA512 2b3404554295596dd1113700f72f7149baded7b381e70edea78a2cf66ad69ac6fb03653c490843ecab13e348638a0efaaeb3f5e71a0670255d09a91c70c7977f WHIRLPOOL 4aa1a9632d706c4f9f8b906a9a84929605a56e92c4289a296b767d107e11f85848d40bd58ad4df21c2d87f385318b8e740b71bc7c0467ea3af2bd6c58502d25a +AUX p7zip-ds-442.patch 446 SHA256 f7379a06363e34af0307cc5365958f8e56f7788bd90743d85cfa10706996d590 SHA512 241088daf142b301b5fd1e98bfdba9e93a2ad79b945904973c6842adbcd52b4e054fb4d041b4a0ea7663474d221fc95e8198d518affdd620f66056067050c0c7 WHIRLPOOL 816baddd4234df4d5d2212746f5272d64b04eea7411d3593d34aa6a625360e621055bcd687d783decdf00d26041c387af58bb8f115b8fa2c2f3e76664cd52ab8 +AUX p7zip-ds-rcc.patch 9611 SHA256 385719352baebc32c41348b3bb10ea5d27e645d142203db74d286146112c2364 SHA512 acc047844e3dc26cdeca953043d63c8cbc5e215950247862463f0e4001b61cedcc827923e1d3ba0970edae1770ba22918d471caec2bd71bc563442cace6a9e02 WHIRLPOOL 6185cd76efc1eb2cbbf3dbaff0e9c521ed821b83d83ba34d0a46efc5a5534071b397834501b6370ba467f0666ef1fafb1f5e4f1a2382e4208782d45ad079dd77 +AUX p7zip_4.27-libun7zip.patch 19287 SHA256 e37f1846b5cf81212917b3d453c520b7ec5878a9aff385a7d4099fc4491bbd7a SHA512 ae62666143861d703d158f853da179e4a95a1008316f449d11c111d8670b3f9505e760f0c1ffc2bb7286ae5e3f114f708092409706a595ee63f87189a3337996 WHIRLPOOL 82dba6cbd28a346600b18c8601874abe58b8a988a84fcf644765202fbbdb0578ee7c52f0b17d6497445e1e8b2825c3276c4157a4e63b11278d8aa2d022ee85d9 +AUX p7zip_4.44-libun7zip.patch 19480 SHA256 d990724e3a570191ba32cccaf736a40d6c9d13219ffdb18bb738241036423ccd SHA512 b9cbab7b6584584ffa6aa30228460d0c7e8b127159d00939b6da2f139f8122a4923e67e6ee0f71c66f87cfca90d41964202a0e73877ad86948960e2ae72d45c6 WHIRLPOOL 88222cf99f33e4d1286609fa7921b11eaacc66d919255bf460574e30178d3039c37ed97d52ff99a9badbd908c9e2bf22eecfafbcdff73a506d628814b5ce821d +AUX p7zip_4.57-ds-rusxmms.patch 10537 SHA256 543cc5c8e6b92f2c702d082b68877442eb90e5a17e840722a4c072a60ea9385e SHA512 3e6900712dc2b8cf79a541dad5560950230c2b6aaf32609579939c0afd6d06007427d967e2beade42a7f5c3d15323428b4f19056a23d4c4ea171c73a611f7de3 WHIRLPOOL 23ec6a8b10efeb3e307972e779705fe45fe9725ca70f262675de123ef1a2f14db13749f4f4bf76eee70c97fd8730f61a43ed5eb259f9951e99083873b3759152 +AUX p7zip_4.57-libun7zip.patch 23438 SHA256 fafaefbc227adb074fc8e77f78a7d7b52689d5a1b8478a935677321183e464a1 SHA512 f15fcf68b7a0f1628e0d73823764aad4f528446dfc301ce22f009eb3f5070445a5b7dd8ab06effd85c065cb4b79abfe6bc15d122180413489f84046ad1c344e4 WHIRLPOOL 05ccbbfccf8a66021d91c8c9f0c501d50c257461a2314688097b2a4f65c85edb3b833c1d27cb7167f502ec9f3392736b21e3be61aa7b00f5778f8d9f1d168f5e +AUX p7zip_4.65-ds-rusxmms.patch 9323 SHA256 4494a08118650102179de1f280850c83582bd483522c37dffe8699e47cba480a SHA512 540807e009f2574bec30ba440233be62ef7d3eda87b12c498a11ac3a59d25f12abec0ae79b059cd9f5cffd910bdd792710f783deb0053c8f6fe8710a7b49f317 WHIRLPOOL 84e03d9f77b76ea3638006c8c31f0260bd5da3d98151e85c8e3420f862ec2985aed8b7bc502811c9c313124ce7738a1ff401f2bef63773e93ee5086fbcdf2b82 +AUX p7zip_4.65-libun7zip.patch 14251 SHA256 f53a5c849f65f9326b71ad7f44e031fbc5a618697cae8167a53dc0673be13188 SHA512 ad98ed3df11d8b7acceffbb7d2893d466375f71b87cd5148147b915dfc2cdca7a74d1086cf91033a9b30affa8540e5a4f235aa479d5e55a9ffd28bb9649f2c1c WHIRLPOOL 433a646b311a0cfadb415f8a40b5106b495bffdc5b1e3bd6a522fe01301b0a5190bda6f03faf6c5cd113cb7e6a09e6d059842ac4f04a4379c7414bbfc9887920 +AUX p7zip_9.04-ds-rusxmms.patch 9466 SHA256 61d4c284dd25d5f6b13d2393fe667703e221c362a18b021f493d8467b100ad16 SHA512 0bb202b578f96831f4e986794c98858cbba54d681bbd250d5926fadcbc31724634b702efeae037b73b6a955e6b6a71de6c1bdb2baff7b9345a062b3d8c1a6cae WHIRLPOOL 7c0b75999b972769bfbbc18f8598d25df7fa8e638135a14d20c5957df90bac10a6ffbaa696f0e76f4c9a4766d4067ba337c168d41190632f7b4fb7a6b6cfe326 +AUX p7zip_9.13-ds-dynbuf.patch 473 SHA256 e1ddb4a89e7d2376b11177064d554011c6c348080e47c6cd573e994dbba45d94 SHA512 9a7d4cc6141bd4f6f40515605df9072be562237304075e6d2b8e4527152156126d9837191f2a839a7e05ec00a1f86b30d26a6df038a067528e0a3b108264561f WHIRLPOOL 1e24600f25b45a1fb56505284a95ac136cd4dad29c4cb982fb4f1b67c14883201cbb6eaa0b62994dcd318e91953313ca8bc11ee6007218af3133066453ba7fab +AUX p7zip_9.13-ds-rusxmms.patch 10443 SHA256 5c3840ec53e6390e2fc007e9ce8a8186c646b382253044013d307e1df38ab2c5 SHA512 9c7e316afed084ce6fb12bef91fbafc49372a3c4b13b33f5980ffa4800b848079cc0add6899d484a5ae69ef35d9b331aa748727cd9c36185213fb36979fa2985 WHIRLPOOL b80261d887fb017c0407ea77a64f545c5d33f7220abe1d57dd1734a0a29e206da92f1d7da5afd4233e5417c75ebf825f0d70643c2364a0cca8fbac2ddaec2659 +DIST p7zip_4.27_src.tar.bz2 416045 SHA256 1064abbf2e2a9bab515978b554324fe83b9e00eee5dd7d1f031a0b2af9dfae24 SHA512 9bd73f9ae96e98777c980e1bb5056299abeebc6d87d530e03a3f891269b128aee578888ee5a8a912c7e96f10a228847be4a29e8db257227a68bcbe5fea20c156 WHIRLPOOL a082a00bd177fea6149317e2b319fb5e029f17987c0208ea507da2b84465d4b8938e436bbe1c399e996e3a4c6714c61c6aa07bcdc6b900f421e66d72889c1d2f +DIST p7zip_4.30_src_all.tar.bz2 427869 SHA256 2d5ba5c96b82cbcc9987ef81a843f77b886ee5c5d2ff9149f4d11f4f380fc8a9 SHA512 61a6adeca3a4002a2c634dc7df0264641d7074674cf423cfb464e40835958eb8dad21af593d955fca95e68631095fc37b99cdb25770a6e9002d8b4a64a4ec823 WHIRLPOOL 8124ea55c8ef3b120d9f3dca6c06cf0b62c8c7f297d1f9ad53bba00c711ad7d60b669066fa78242592b43c8c5b0f76016ce293f4cde0180193c7b65981eb10c1 +DIST p7zip_4.42_src_all.tar.bz2 1461812 SHA256 029ab89f0a553987abdbe0c14605efdf9c11f0f4074b854a6fc4181345d6ac44 SHA512 ff015f8c9e1a2e28777a253bb3a88aa45ad54bfafbd019ec62d81340b2a4eea4c9ed4532abe80ae722e1a1a03d72f4a5b6f4cb9e8ff8b2243e3eafd0176eb97b WHIRLPOOL e315a080ee30cb325ec3534a282d996bb2d5ce0d75e4b592328ccc2595b08345aacc20b7006af0c4b2fa28d046e9708339cbb4a43e1da85addd3518343aa5bf8 +DIST p7zip_4.44_src_all.tar.bz2 1518820 SHA256 cb87304f682e7176ab95ce73d3ce2b7b65384e051272fc34ef934e2427bbd3af SHA512 d470236ba325c72d3cb4c5866afa052d3f9816b5042115b7ac5a217d20d4aec05bff1f4f278d2283acb41515e14cb0cae5c268ce9145b5bc74118eac812eec6c WHIRLPOOL e0b7f171e7f0416d99b9838326c7bf16a76f1a09e0ed3e385dd55d1a38fc698598459b7fa27ab9b8431543a88fdaf058a29ca8c181edf0ae6ba8ad7880eac3c8 +DIST p7zip_4.57_src_all.tar.bz2 1473608 SHA256 00e923386dd53d532a86331d1694eaeee626783afa503f91edf7370357e05b53 SHA512 436279e64dc37b3db80bf4acede765d461f13853dde71df4d93d13fbacb1ad25ea67605f379cbf1be23d204002ff2ffa4734d36904e32dc0b3f7329037da1ded WHIRLPOOL cdd48f611dd9bd7ddc367593a64144a6c4054f050aff7bd55e72146b21286419898e99e9af71dda22cbc259d52d4275625ceb1a6a50cf2dacda0d08c6886fd49 +DIST p7zip_4.65_src_all.tar.bz2 2501418 SHA256 691cc9419a73a9348319f5b2c3ba2655471bee052c6c7fa57a226800c89ab07f SHA512 ae4a48a959b03b519ff00df510194d4d5780c198c8f4fb907fd2e209728fb77db7baa85d3a5438ca5d94af37a8e736f7486f8cac1ba606cd56b917aed11dac85 WHIRLPOOL 8dc6d6c4e840374ef8f85e7cd03a2dd71a5a18425cd92a1c5a3988240b4d2ee9175717fda312d005a97771ea126e16f13e5805f7eacc3aea4f357aa146b45ea6 +DIST p7zip_9.13_src_all.tar.bz2 3753579 SHA256 fc9c0fa2eabd367d6adbc3ea07bb305dbdc1f68717eea362c8c074b91c03d923 SHA512 84b6687fc33af55c7f282fc6c988789cbdd0b3d2df0adb1c14b6ad12ebc2ed4600ddf6b043d2d8f2baa717ee8afc3601f7e9e37c5d44d6357727bf3a36686e11 WHIRLPOOL 886ba23a09e8aab3b92cd870dda5aa876638c3b7149155b3c8eb1031b94e262f2254ebd575ca42c42e57789ccfff6ab4289937c952373947bd61ec8f92e7370a +DIST p7zip_9.20.1_src_all.tar.bz2 3835235 SHA256 49557e7ffca08100f9fc687f4dfc5aea703ca207640c76d9dee7b66f03cb4782 SHA512 7bb8a276aaefc4a83364e45633c48527de44c6b1205344f3356db570582f30f81d82a94938c99a7ad193587b584cc1c03219c28249de40018bdaee6c3b2a022a WHIRLPOOL cb20f37d3f796931a9b330728aa7148afe98bbf8a49bb91bfd80e4667c16416206b23bf34298e9ec37825e8b43f92a5710f0cea1f974296d5c17aa2c7b0931f3 +EBUILD p7zip-4.27-r1.ebuild 1722 SHA256 a8b59dc0c2f095be3cd53f6a716cbc97cf6ac2c1e74f448fbf9ec9745070a58f SHA512 49408abe34f28590b7b1d0cc5980823e042387452035ab95f633aa1f4c1a872b4a30499bc9d05e0eb334036f6fbd66f5fde25f26acd4ff4a36946d0737b916f3 WHIRLPOOL b97f19c8724ac2588c6f0ee465cdc60d3a5849621c002bea45d63bd01a4f8fbf135c8502eed0440eaaae7f714d417ad8f3b4ca51f7bc2fbf3c1615535845367c +EBUILD p7zip-4.30-r1.ebuild 1728 SHA256 3f65b1eaa89e08496c918ca459505b2a129705dbd7fb90f8bf9cc38caee3924f SHA512 12284d1a8d6099d0c05f88e2cc8046f479d27db6f42b6cdbc473a83324d49c69c91ec68aa66d8ed264979ac4d7bd752b4287da80ee320a996d99edd59381d7d1 WHIRLPOOL 8b39a69b44a0bb574b953a128f11f4bde70e0e5998398fbc0a6f4e425c494eaccf1cce70a1a15d4dd3d0d5b55cf791debd8960cbd77cbe605dfe4b3c779cca5c +EBUILD p7zip-4.42-r1.ebuild 2386 SHA256 872dd581447ab8a523856e2d7118ac95946dd34301cb040fb5afcba49ce1ba9a SHA512 6b51790b5465c2fabdadbb89ea0b1039fbcd92c3e334beb45a9ecdcc59d32376b6d5ee079a14404ed46f09a19bf24bf8e005edc59be21f456e7e02feb934cc8c WHIRLPOOL e2e76f6af32a63261a5670041053697bc78ebfa71a78cba673b088c98e4d575d13b21424435fbcb4f34b421507d06cf82754ae1f6a3c15e846b830244b6f3e1b +EBUILD p7zip-4.44-r1.ebuild 2652 SHA256 96a7b905816eeefb7b76be5004e2eb6f02bdccaab7dc005071c249bac620e1b4 SHA512 30f5dd83b8365386963a42fb714e0882d950ae53a89a508003cfa68a5c5c4206bd25844423eb8cdc545e3b186b9860787edb5aa8d44c2167df1a56b82a65a93e WHIRLPOOL 775b5616390ea5bf159af8c1a548b7d338b6b73661c7ecdc483baac175be546ea12f2047664e06570d4247c40fdf1f9cc62a21c86066ce7ea75efc34175a5e71 +EBUILD p7zip-4.44-r2.ebuild 2698 SHA256 655f1fcc045272bd08c665b659d42ffb694b59a227305ae0815ae1a791621e4f SHA512 176ca2940532316adc156949b5363ea843bd9254922fb7701f3b94363d91a6b609f5b8a2161d2c37626be45eee99da7b200a7bc2f831d01fd6615cb9a3c06d46 WHIRLPOOL f10c1077dd28dc587937ba221031f5ac7ea402995abc033d0683e7c9fbb38451c5c5a8db9290d9b9dce6318309d5526ab93a7aa723e4aaa1e915ad4765139ac5 +EBUILD p7zip-4.57-r1.ebuild 3210 SHA256 b006929fa5e3cb21c8ed80e3637a49795edafa6aea5805d7903fd51fd50bf87c SHA512 89f6148e5b586057b553bb5c1b3d6501a16d0b110f93aca992f952cf2d5c08879677386896b8bc8b4e8193e19e84ed234a173d717e1a1187fed16bf247a04bbf WHIRLPOOL 22a624274706ca06d6b966c37fb208c5caaf212e26fea856d7d3759e03cad30a8881d6d5465f3884339cf4f2090bc88d6bf77e0e9691d2d1427f72b00a063e7c +EBUILD p7zip-4.65-r2.ebuild 4084 SHA256 10e5517f3497b88d5dc1a807c68548fe8d81ffe446680276028cc8b0a994e061 SHA512 f2f525f781a281f4d08cd4be330ae80d08015cb69ef4a3bb63efa841af6ccca8650157f3f048d9a9ee123ecfffe6bf17525a9d1388d096dc917b0c9d6a5f36ac WHIRLPOOL d49d26ed0c635a070668ebf6eb5a986bd9245775bc6051a1757ae69d0091d19e72ab4dd1663517789dec8f0e052b23d9159b0ed2d9e881c706b957488daa68e5 +EBUILD p7zip-9.13-r2.ebuild 4193 SHA256 1a2a9ff0afbcd664c0703037847cee6324b4ce44f578f2ff96742349b95075cb SHA512 0c543f43b34b36382d3d0b3a3a2730a6b41e510daab7087a239cfa8e5feea5a28f02999ecfdd921363aa7549f5b032aa521a031d9204f246beb2e0e41e891e79 WHIRLPOOL dc01393a3fab82504b567531d63a6ea2dc6435937cea6482ba571f0c5ba54d8e7db46b4140194a945a0c5f45d75465f1fe95a481030a2fc4183e1dfa5bfa3e31 +EBUILD p7zip-9.13-r3.ebuild 4258 SHA256 e000860cb1a69bd08e25d23363ed99dc7f364d8a0f8e86fdc021d144c8e2ecdb SHA512 1bef2e300671ab342c70d2e7a03e09feaa110e739e4f1810a5baa518b3f3ca7797a4491d3cd0dd2bfdce9263408cbf6ca88952cef3ba157e662ce26df4ecd872 WHIRLPOOL 2216af7584949411f0d4f98a519f77b958e7488568c525b78a05b2db7d782bbbd49302ecaee4116d0819334afae81cf370270b3924d659b3180b22de07f72300 +EBUILD p7zip-9.20.1-r5.ebuild 4710 SHA256 b3ceb233d5b33c62b36fa635a4dc4c196c4bfef98a6cf58c0c050d6e05affbcd SHA512 e24f04d51ed1e540772cf51b91302bb2ad07bf587549b3c196b0036420dac844e4b63be223a39b03b87de3b525afaec62a598940cd3b5034ee8a2308c23ea506 WHIRLPOOL b3e53395b87b7110bd5698916df7e5004081887df03bad7af8b09f35b6979bb29b88ccf28db95564d7c4e2b9ecc4a93bcfa7de5b07dfc2d86d7fe73184398a2e diff --git a/app-arch/p7zip/files/4.65-hardlink.patch b/app-arch/p7zip/files/4.65-hardlink.patch new file mode 100644 index 0000000..05d9e71 --- /dev/null +++ b/app-arch/p7zip/files/4.65-hardlink.patch @@ -0,0 +1,13 @@ +--- makefile 2009-02-25 16:03:33.000000000 +0100 ++++ makefile.new 2009-02-25 16:03:17.000000000 +0100 +@@ -55,8 +55,8 @@ + $(MAKE) -C CPP/7zip/UI/Console all + + 7zG: common7z +- cd bin ; rm -f Lang ; ln ../GUI/Lang . +- cd bin ; rm -f help ; ln ../GUI/help . ++ cd bin ; rm -f Lang ; ln -sf ../GUI/Lang . ++ cd bin ; rm -f help ; ln -sf ../GUI/help . + $(MAKE) -C CPP/7zip/UI/GUI all + + clean: diff --git a/app-arch/p7zip/files/4.65-makefile.patch b/app-arch/p7zip/files/4.65-makefile.patch new file mode 100644 index 0000000..b0297f8 --- /dev/null +++ b/app-arch/p7zip/files/4.65-makefile.patch @@ -0,0 +1,20 @@ +--- CPP/7zip/Bundles/Format7zFree/makefile 2009-02-09 21:47:24.000000000 +0100 ++++ CPP/7zip/Bundles/Format7zFree/makefile.new 2009-02-25 14:18:31.000000000 +0100 +@@ -271,8 +271,6 @@ + MyAes.o \ + Pbkdf2HmacSha1.o \ + RandGen.o \ +- Rar20Crypto.o \ +- RarAes.o \ + Sha1.o \ + WzAes.o \ + ZipCrypto.o \ +@@ -313,7 +313,6 @@ + $(LZH_OBJS) \ + $(LZM_OBJS) \ + $(NSIS_OBJS) \ +- $(RAR_OBJS) \ + $(SPLIT_OBJS) \ + $(TAR_OBJS) \ + $(UDF_OBJS) \ + diff --git a/app-arch/p7zip/files/7z b/app-arch/p7zip/files/7z new file mode 100644 index 0000000..05c7086 --- /dev/null +++ b/app-arch/p7zip/files/7z @@ -0,0 +1,5 @@ +#!/bin/sh +# 7z wrapper, p7zip, should be called with full path +# so symlink and copy should not be used instead. + +exec /usr/lib/p7zip/7z "$@" diff --git a/app-arch/p7zip/files/7za b/app-arch/p7zip/files/7za new file mode 100644 index 0000000..f718bb4 --- /dev/null +++ b/app-arch/p7zip/files/7za @@ -0,0 +1,5 @@ +#!/bin/sh +# 7za wrapper, p7zip, should be called with full path +# so symlink and copy should not be used instead. + +exec /usr/lib/p7zip/7za "$@" diff --git a/app-arch/p7zip/files/9.04-kde4.patch b/app-arch/p7zip/files/9.04-kde4.patch new file mode 100644 index 0000000..c309d70 --- /dev/null +++ b/app-arch/p7zip/files/9.04-kde4.patch @@ -0,0 +1,87 @@ +diff --git a/GUI/kde/p7zip_compress.desktop b/GUI/kde/p7zip_compress.desktop +index 9010fbd..b965fa6 100644 +--- a/GUI/kde/p7zip_compress.desktop ++++ b/GUI/kde/p7zip_compress.desktop +@@ -1,6 +1,8 @@ + [Desktop Entry] +-ServiceTypes=inode/directory +-Actions=CompressDialog;Compress7z;CompressZip;extractHere;ExtractSubdir;ExtractTo;test;Benchmark ++Type=Service ++ServiceTypes=KonqPopupMenu/Plugin ++MimeType=all/all; ++Actions=CompressDialog;Compress7z;CompressZip;Benchmark + X-KDE-Priority=TopLevel + X-KDE-Submenu=7-Zip + X-KDE-Icon=p7zip +diff --git a/GUI/kde/p7zip_extract.desktop b/GUI/kde/p7zip_extract.desktop +index 9038c76..a7dca4d 100644 +--- a/GUI/kde/p7zip_extract.desktop ++++ b/GUI/kde/p7zip_extract.desktop +@@ -1,10 +1,30 @@ + [Desktop Entry] + X-SuSE-translate=true +-Encoding=UTF-8 +-ServiceTypes=application/x-gzip,application/x-lha,application/x-tar,application/x-tgz,application/x-tbz,application/x-tbz2,application/x-zip,application/x-bzip,application/x-tzo,application/x-lzop,application/x-rar,application/x-rar-compressed,application/x-zoo,application/x-tarz,application/x-archive,application/x-bzip2,application/x-jar,application/x-deb,application/x-ace,application/x-7z,application/x-arc,application/x-arj,application/x-compress,application/x-cpio,application/x-pak +-Actions=extractHere ++Type=Service ++ServiceTypes=KonqPopupMenu/Plugin ++MimeType=application/x-gzip;application/x-lha;application/x-tar;application/x-compressed-tar;application/x-bzip-compressed-tar;application/zip;application/x-bzip;application/x-tzo;application/x-lzop;application/x-rar;application/x-zoo;application/x-tarz;application/x-archive;application/x-bzip2;application/x-java-archive;application/x-deb;application/x-ace;application/x-7z-compressed;application/x-arc;application/x-arj;application/x-compress;application/x-zip-compressed;application/x-cpio;application/x-pak; ++#MimeType=application/x-gzip;application/x-lha;application/x-tar;application/x-tgz;application/x-tbz;application/x-tbz2;application/x-zip;application/x-bzip;application/x-tzo;application/x-lzop;application/x-rar;application/x-rar-compressed;application/x-zoo;application/x-tarz;application/x-archive;application/x-bzip2;application/x-jar;application/x-deb;application/x-ace;application/x-7z;application/x-arc;application/x-arj;application/x-compress;application/x-cpio;application/x-pak; ++Actions=extractHere;ExtractSubdir;ExtractTo;test; ++X-KDE-Priority=TopLevel ++X-KDE-Submenu=7-Zip ++X-KDE-Icon=p7zip + + [Desktop Action extractHere] +-Name=Extract Here with 7-zip ++Name=Extract Here + Exec=p7zipForFilemanager x %U + Icon=p7zip ++ ++[Desktop Action ExtractSubdir] ++Name=Extract to subdirectory ++Icon=p7zip ++Exec=p7zipForFilemanager xs %U ++ ++[Desktop Action ExtractTo] ++Name=Extract to ... ++Icon=p7zip ++Exec=p7zipForFilemanager xd %U ++ ++[Desktop Action test] ++Name=Test Archive ++Exec=p7zipForFilemanager t %U ++Icon=p7zip +diff --git a/GUI/kde/p7zip_extract_subdir.desktop b/GUI/kde/p7zip_extract_subdir.desktop +index 1800fa0..a711f3c 100644 +--- a/GUI/kde/p7zip_extract_subdir.desktop ++++ b/GUI/kde/p7zip_extract_subdir.desktop +@@ -1,6 +1,5 @@ + [Desktop Entry] + X-SuSE-translate=true +-Encoding=UTF-8 + ServiceTypes=application/x-gzip,application/x-lha,application/x-tar,application/x-tgz,application/x-tbz,application/x-tbz2,application/x-zip,application/x-bzip,application/x-tzo,application/x-lzop,application/x-rar,application/x-rar-compressed,application/x-zoo,application/x-tarz,application/x-archive,application/x-bzip2,application/x-jar,application/x-deb,application/x-ace,application/x-7z,application/x-arc,application/x-arj,application/x-compress,application/x-cpio,application/x-pak + Actions=ExtractSubdir + +diff --git a/GUI/kde/p7zip_extract_to.desktop b/GUI/kde/p7zip_extract_to.desktop +index bf13ec0..18d2b74 100644 +--- a/GUI/kde/p7zip_extract_to.desktop ++++ b/GUI/kde/p7zip_extract_to.desktop +@@ -1,6 +1,5 @@ + [Desktop Entry] + X-SuSE-translate=true +-Encoding=UTF-8 + ServiceTypes=application/x-gzip,application/x-lha,application/x-tar,application/x-tgz,application/x-tbz,application/x-tbz2,application/x-zip,application/x-bzip,application/x-tzo,application/x-lzop,application/x-rar,application/x-rar-compressed,application/x-zoo,application/x-tarz,application/x-archive,application/x-bzip2,application/x-jar,application/x-deb,application/x-ace,application/x-7z,application/x-arc,application/x-arj,application/x-compress,application/x-cpio,application/x-pak + Actions=ExtractTo + +diff --git a/GUI/kde/p7zip_test.desktop b/GUI/kde/p7zip_test.desktop +index 2c17acb..5212bb2 100644 +--- a/GUI/kde/p7zip_test.desktop ++++ b/GUI/kde/p7zip_test.desktop +@@ -1,6 +1,5 @@ + [Desktop Entry] + X-SuSE-translate=true +-Encoding=UTF-8 + ServiceTypes=application/x-gzip,application/x-lha,application/x-tar,application/x-tgz,application/x-tbz,application/x-tbz2,application/x-zip,application/x-bzip,application/x-tzo,application/x-lzop,application/x-rar,application/x-rar-compressed,application/x-zoo,application/x-tarz,application/x-archive,application/x-bzip2,application/x-jar,application/x-deb,application/x-ace,application/x-7z,application/x-arc,application/x-arj,application/x-compress,application/x-cpio,application/x-pak + Actions=test + diff --git a/app-arch/p7zip/files/9.04-makefile.patch b/app-arch/p7zip/files/9.04-makefile.patch new file mode 100644 index 0000000..93a99cc --- /dev/null +++ b/app-arch/p7zip/files/9.04-makefile.patch @@ -0,0 +1,19 @@ +--- p7zip_9.04/CPP/7zip/Bundles/Format7zFree/makefile.orig 2010-01-04 13:58:54.527887746 +0100 ++++ p7zip_9.04/CPP/7zip/Bundles/Format7zFree/makefile 2010-01-04 13:59:10.290868343 +0100 +@@ -247,8 +247,6 @@ + MyAes.o \ + Pbkdf2HmacSha1.o \ + RandGen.o \ +- Rar20Crypto.o \ +- RarAes.o \ + Sha1.o \ + WzAes.o \ + ZipCrypto.o \ +@@ -298,7 +296,6 @@ + $(HFS_OBJS) \ + $(ISO_OBJS) \ + $(NSIS_OBJS) \ +- $(RAR_OBJS) \ + $(TAR_OBJS) \ + $(UDF_OBJS) \ + $(WIM_OBJS) \ diff --git a/app-arch/p7zip/files/p7zip b/app-arch/p7zip/files/p7zip new file mode 100644 index 0000000..9aaf078 --- /dev/null +++ b/app-arch/p7zip/files/p7zip @@ -0,0 +1,73 @@ +#!/bin/bash +# gzip-like CLI wrapper for p7zip +set -e + +compress=true +file= + +usage () + { + echo "Usage: $0 [-d] [-h|--help] [file]" + exit 1 + } + +while [ "$#" != "0" ] ; do + case "$1" in + -d) compress=false ;; + -c) echo "$0: ignoring $1 option (not yet implemented)" ;; + -h|--help) usage ;; + *) + if [ "${file}" = "" ] ; then + file="$1" + else + usage + fi + ;; + esac + shift +done + +# make sure they're present, before we screw up +for i in mktemp 7z rm cat tty ; do + if ! which $i > /dev/null ; then + echo "$0: $i: command not found" + exit 1 + fi +done + +if [ "${file}" != "" ] ; then + if ${compress} ; then + 7z a ${file}.7z ${file} + rm ${file} + else + case ${file} in + *.7z) + 7z x ${file} + rm ${file} + ;; + *) + echo "$0: ${file}: unknown suffix -- ignored" + ;; + esac + fi + exit 0 +fi + +tmp=`mktemp` +trap "rm -f ${tmp}" 0 + +if ${compress} ; then + if tty > /dev/null ; then + echo "$0: compressed data not written to a terminal." + echo "For help, type: $0 -h" + exit 1 + fi + rm -f ${tmp} + 7z a ${tmp} -si >/dev/null + cat ${tmp} +else + cat > ${tmp} + 7z x ${tmp} -so 2>/dev/null | cat +fi + +rm -f ${tmp} diff --git a/app-arch/p7zip/files/p7zip-4.16_x86_static.patch b/app-arch/p7zip/files/p7zip-4.16_x86_static.patch new file mode 100644 index 0000000..c52ef86 --- /dev/null +++ b/app-arch/p7zip/files/p7zip-4.16_x86_static.patch @@ -0,0 +1,10 @@ +--- makefile.machine.orig 2005-04-15 18:31:10.000000000 +0200 ++++ makefile.machine 2005-04-15 18:12:26.000000000 +0200 +@@ -11,6 +11,6 @@ + CC=gcc $(ALLFLAGS) + LINK_SHARED=-shared + +-LOCAL_LIBS=-lpthread ++LOCAL_LIBS=-lpthread -static + LOCAL_LIBS_DLL=$(LOCAL_LIBS) -ldl + diff --git a/app-arch/p7zip/files/p7zip-9.13-QA.patch b/app-arch/p7zip/files/p7zip-9.13-QA.patch new file mode 100644 index 0000000..4a2b92e --- /dev/null +++ b/app-arch/p7zip/files/p7zip-9.13-QA.patch @@ -0,0 +1,17 @@ +From: Julian Ospald <hasufell@gentoo.org> +Date: Thu Jun 7 14:29:51 UTC 2012 +Subject: fix QA warnings + +https://sourceforge.net/tracker/?func=detail&atid=660493&aid=3532590&group_id=111810 + +--- CPP/7zip/Archive/NtfsHandler.cpp ++++ CPP/7zip/Archive/NtfsHandler.cpp +@@ -1250,7 +1250,7 @@ + if (recSizeLog < Header.SectorSizeLog) + return false; + numSectorsInRec = 1 << (recSizeLog - Header.SectorSizeLog); +- if (!mftRec.Parse(ByteBuf, Header.SectorSizeLog, numSectorsInRec, NULL, 0)) ++ if (!mftRec.Parse(ByteBuf, Header.SectorSizeLog, numSectorsInRec, 0, NULL)) + return S_FALSE; + if (!mftRec.IsFILE()) + return S_FALSE; diff --git a/app-arch/p7zip/files/p7zip-9.20.1-QA.patch b/app-arch/p7zip/files/p7zip-9.20.1-QA.patch new file mode 100644 index 0000000..8845aca --- /dev/null +++ b/app-arch/p7zip/files/p7zip-9.20.1-QA.patch @@ -0,0 +1,17 @@ +From: Julian Ospald <hasufell@gentoo.org> +Date: Thu Jun 7 14:31:12 UTC 2012 +Subject: fix QA warnings + +https://sourceforge.net/tracker/?func=detail&atid=660493&aid=3532590&group_id=111810 + +--- CPP/7zip/Archive/NtfsHandler.cpp ++++ CPP/7zip/Archive/NtfsHandler.cpp +@@ -1280,7 +1280,7 @@ + if (recSizeLog < Header.SectorSizeLog) + return false; + numSectorsInRec = 1 << (recSizeLog - Header.SectorSizeLog); +- if (!mftRec.Parse(ByteBuf, Header.SectorSizeLog, numSectorsInRec, NULL, 0)) ++ if (!mftRec.Parse(ByteBuf, Header.SectorSizeLog, numSectorsInRec, 0, NULL)) + return S_FALSE; + if (!mftRec.IsFILE()) + return S_FALSE; diff --git a/app-arch/p7zip/files/p7zip-9.20.1-execstack.patch b/app-arch/p7zip/files/p7zip-9.20.1-execstack.patch new file mode 100644 index 0000000..1fdff48 --- /dev/null +++ b/app-arch/p7zip/files/p7zip-9.20.1-execstack.patch @@ -0,0 +1,24 @@ +diff -Naupr p7zip_9.20.1.orig/Asm/x64/7zCrcT8U.asm p7zip_9.20.1/Asm/x64/7zCrcT8U.asm +--- p7zip_9.20.1.orig/Asm/x64/7zCrcT8U.asm 2008-08-14 11:18:07.000000000 +0200 ++++ p7zip_9.20.1/Asm/x64/7zCrcT8U.asm 2011-07-26 17:43:57.727910278 +0200 +@@ -101,3 +101,8 @@ _CrcUpdateT8:
+ ret
+
+ end
++
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
++
+diff -Naupr p7zip_9.20.1.orig/Asm/x86/7zCrcT8U.asm p7zip_9.20.1/Asm/x86/7zCrcT8U.asm +--- p7zip_9.20.1.orig/Asm/x86/7zCrcT8U.asm 2009-07-14 12:44:15.000000000 +0200 ++++ p7zip_9.20.1/Asm/x86/7zCrcT8U.asm 2011-07-26 17:44:23.938864508 +0200 +@@ -99,3 +99,8 @@ _CrcUpdateT8:
+
+
+ ; end
++
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
++
diff --git a/app-arch/p7zip/files/p7zip-ds-442.patch b/app-arch/p7zip/files/p7zip-ds-442.patch new file mode 100644 index 0000000..ba9b3d2 --- /dev/null +++ b/app-arch/p7zip/files/p7zip-ds-442.patch @@ -0,0 +1,11 @@ +diff -dPNur p7zip_4.42/7zip/Bundles/Un7Zip/Un7Zip.cpp p7zip_4.42-new/7zip/Bundles/Un7Zip/Un7Zip.cpp +--- p7zip_4.42/7zip/Bundles/Un7Zip/Un7Zip.cpp 2006-06-28 04:12:35.000000000 +0500 ++++ p7zip_4.42-new/7zip/Bundles/Un7Zip/Un7Zip.cpp 2006-06-28 04:25:56.000000000 +0500 +@@ -117,6 +117,7 @@ + v1, v2, + wildcardCensorHead, + true, ++ false, + passwordEnabled, + password); + if (result != S_OK) diff --git a/app-arch/p7zip/files/p7zip-ds-rcc.patch b/app-arch/p7zip/files/p7zip-ds-rcc.patch new file mode 100644 index 0000000..98e7855 --- /dev/null +++ b/app-arch/p7zip/files/p7zip-ds-rcc.patch @@ -0,0 +1,314 @@ +diff -dPNur p7zip_4.44-old/C/rccrecode.c p7zip_4.44/C/rccrecode.c +--- p7zip_4.44-old/C/rccrecode.c 1970-01-01 01:00:00.000000000 +0100 ++++ p7zip_4.44/C/rccrecode.c 2007-04-14 19:47:03.000000000 +0200 +@@ -0,0 +1,69 @@ ++#include <pthread.h> ++#include <librcc.h> ++ ++static rcc_class_default_charset default_oem[] = { ++ { "ru", "IBM866" }, ++ { NULL, NULL } ++}; ++ ++static rcc_class_default_charset default_iso[] = { ++ { "ru", "CP1251" }, ++ { NULL, NULL } ++}; ++ ++#define ARC_CLASS 0 ++#define OUT_CLASS 1 ++#define ARCOUT_CLASS 0 ++static rcc_class classes[] = { ++ { "oem", RCC_CLASS_STANDARD, NULL, default_oem, "OEM Encoding", 0 }, ++ { "out", RCC_CLASS_STANDARD, "LC_CTYPE", NULL, "Output", 0 }, ++ { NULL } ++}; ++ ++static int initialized = 0; ++static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; ++ ++void *rcc_init() { ++ rcc_context ctx; ++ ++ pthread_mutex_lock(&mutex); ++ if (!initialized) { ++ rccInit(); ++ rccInitDefaultContext(NULL, 0, 0, classes, 0); ++ rccInitDb4(NULL, NULL, 0); ++ } ++ initialized++; ++ pthread_mutex_unlock(&mutex); ++ ++ ctx = rccCreateContext(NULL, 0, 0, classes, 0); ++ if (ctx) rccInitDb4(ctx, NULL, 0); ++ ++ return ctx; ++} ++ ++ ++void rcc_free(void *ctx) { ++ if (ctx) rccFreeContext((rcc_context)ctx); ++ ++ pthread_mutex_lock(&mutex); ++ if (initialized == 1) rccFree(); ++ initialized--; ++ pthread_mutex_unlock(&mutex); ++} ++ ++ ++char *rcc_read(void *ctx, const char *string, size_t size) { ++ if (!initialized) { ++ rcc_init(); ++ if (!initialized) return NULL; ++ } ++ return rccSizedRecode((rcc_context)ctx, ARC_CLASS, OUT_CLASS, string, size, NULL); ++} ++ ++char *rcc_write(rcc_context ctx, const char *string, size_t size) { ++ if (!initialized) { ++ rcc_init(); ++ if (!initialized) return NULL; ++ } ++ return rccSizedRecode((rcc_context)ctx, OUT_CLASS, ARCOUT_CLASS, string, size, NULL); ++} +diff -dPNur p7zip_4.44-old/C/rccrecode.h p7zip_4.44/C/rccrecode.h +--- p7zip_4.44-old/C/rccrecode.h 1970-01-01 01:00:00.000000000 +0100 ++++ p7zip_4.44/C/rccrecode.h 2007-04-14 19:34:20.000000000 +0200 +@@ -0,0 +1,17 @@ ++#ifndef _RCC_RECODE_H ++#define _RCC_RECODE_H ++ ++# ifdef __cplusplus ++extern "C" { ++# endif ++ ++ void *rcc_init(); ++ void rcc_free(void *ctx); ++ char *rcc_read(void *ctx, const char *string, size_t size); ++ char *rcc_write(void *ctx, const char *string, size_t size); ++ ++# ifdef __cplusplus ++} ++# endif ++ ++#endif /* _RCC_RECODE_H */ +diff -dPNur p7zip_4.44-old/CPP/7zip/Archive/Zip/makefile p7zip_4.44/CPP/7zip/Archive/Zip/makefile +--- p7zip_4.44-old/CPP/7zip/Archive/Zip/makefile 2007-01-23 21:29:41.000000000 +0100 ++++ p7zip_4.44/CPP/7zip/Archive/Zip/makefile 2007-04-14 18:36:44.000000000 +0200 +@@ -13,6 +13,7 @@ + LIBS=$(LOCAL_LIBS_DLL) + + OBJS = \ ++../../../../C/rccrecode.o \ + ../../../Common/MyWindows.o \ + ../../../Common/Vector.o\ + ../../../Common/Alloc.o\ +diff -dPNur p7zip_4.44-old/CPP/7zip/Archive/Zip/ZipIn.cpp p7zip_4.44/CPP/7zip/Archive/Zip/ZipIn.cpp +--- p7zip_4.44-old/CPP/7zip/Archive/Zip/ZipIn.cpp 2007-01-20 18:06:58.000000000 +0100 ++++ p7zip_4.44/CPP/7zip/Archive/Zip/ZipIn.cpp 2007-04-14 19:34:59.000000000 +0200 +@@ -9,11 +9,22 @@ + #include "../../Common/LimitedStreams.h" + #include "../../Common/StreamUtils.h" + ++#include "../../../../C/rccrecode.h" ++ + namespace NArchive { + namespace NZip { ++ ++CInArchive::CInArchive() { ++ rccctx = rcc_init(); ++} ++ ++CInArchive::~CInArchive() { ++ rcc_free(rccctx); ++} ++ + + // static const char kEndOfString = '\0'; +- ++ + bool CInArchive::Open(IInStream *inStream, const UInt64 *searchHeaderSizeLimit) + { + m_Stream = inStream; +@@ -179,10 +190,18 @@ + + AString CInArchive::ReadFileName(UInt32 nameSize) + { ++ char *rccrec; + if (nameSize == 0) + return AString(); + SafeReadBytes(m_NameBuffer.GetBuffer(nameSize), nameSize); + m_NameBuffer.ReleaseBuffer(nameSize); ++ ++ rccrec = rcc_read(rccctx, (LPCSTR)m_NameBuffer, 0); ++ if (rccrec) { ++ m_NameBuffer = rccrec; ++ free(rccrec); ++ } ++ + return m_NameBuffer; + } + +diff -dPNur p7zip_4.44-old/CPP/7zip/Archive/Zip/ZipIn.h p7zip_4.44/CPP/7zip/Archive/Zip/ZipIn.h +--- p7zip_4.44-old/CPP/7zip/Archive/Zip/ZipIn.h 2007-01-20 18:06:28.000000000 +0100 ++++ p7zip_4.44/CPP/7zip/Archive/Zip/ZipIn.h 2007-04-14 19:05:31.000000000 +0200 +@@ -104,6 +104,10 @@ + bool SeekInArchive(UInt64 position); + ISequentialInStream *CreateLimitedStream(UInt64 position, UInt64 size); + IInStream* CreateStream(); ++ ++ void *rccctx; ++ CInArchive(); ++ ~CInArchive(); + }; + + }} +diff -dPNur p7zip_4.44-old/CPP/7zip/Archive/Zip/ZipOut.cpp p7zip_4.44/CPP/7zip/Archive/Zip/ZipOut.cpp +--- p7zip_4.44-old/CPP/7zip/Archive/Zip/ZipOut.cpp 2007-01-20 18:06:57.000000000 +0100 ++++ p7zip_4.44/CPP/7zip/Archive/Zip/ZipOut.cpp 2007-04-14 19:44:44.000000000 +0200 +@@ -8,9 +8,19 @@ + #include "../../Common/OffsetStream.h" + #include "../../Common/StreamUtils.h" + ++#include "../../../../C/rccrecode.h" ++ + namespace NArchive { + namespace NZip { + ++COutArchive::COutArchive() { ++ rccctx = rcc_init(); ++} ++ ++COutArchive::~COutArchive() { ++ rcc_free(rccctx); ++} ++ + void COutArchive::Create(IOutStream *outStream) + { + m_Stream = outStream; +@@ -104,6 +114,8 @@ + + HRESULT COutArchive::WriteLocalHeader(const CLocalItem &item) + { ++ char *rccrec; ++ + m_Stream->Seek(m_BasePosition, STREAM_SEEK_SET, NULL); + + bool isZip64 = m_IsZip64 || item.PackSize >= 0xFFFFFFFF || item.UnPackSize >= 0xFFFFFFFF; +@@ -124,6 +136,12 @@ + return E_FAIL; + } + WriteUInt16((UInt16)m_ExtraSize); // test it; ++ rccrec = rcc_write(rccctx, (const char *)item.Name, item.Name.Length()); ++ if (rccrec) { ++ printf("%u, %s.\n", item.Name.Length(), rccrec); ++ WriteBytes(rccrec, strlen(rccrec)); ++ free(rccrec); ++ } else + WriteBytes((const char *)item.Name, item.Name.Length()); + + UInt32 extraPos = 0; +@@ -147,6 +165,8 @@ + + void COutArchive::WriteCentralHeader(const CItem &item) + { ++ char *rccrec; ++ + m_Stream->Seek(m_BasePosition, STREAM_SEEK_SET, NULL); + + bool isUnPack64 = item.UnPackSize >= 0xFFFFFFFF; +@@ -175,6 +195,13 @@ + WriteUInt16(item.InternalAttributes); + WriteUInt32(item.ExternalAttributes); + WriteUInt32(isPosition64 ? 0xFFFFFFFF: (UInt32)item.LocalHeaderPosition); ++ ++ rccrec = rcc_write(rccctx, (const char *)item.Name, item.Name.Length()); ++ if (rccrec) { ++ printf("C: %u, %s.\n", item.Name.Length(), rccrec); ++ WriteBytes(rccrec, strlen(rccrec)); ++ free(rccrec); ++ } else + WriteBytes((const char *)item.Name, item.Name.Length()); + if (isZip64) + { +diff -dPNur p7zip_4.44-old/CPP/7zip/Archive/Zip/ZipOut.h p7zip_4.44/CPP/7zip/Archive/Zip/ZipOut.h +--- p7zip_4.44-old/CPP/7zip/Archive/Zip/ZipOut.h 2007-01-20 18:06:29.000000000 +0100 ++++ p7zip_4.44/CPP/7zip/Archive/Zip/ZipOut.h 2007-04-14 19:10:12.000000000 +0200 +@@ -44,6 +44,11 @@ + void CreateStreamForCompressing(IOutStream **outStream); + void CreateStreamForCopying(ISequentialOutStream **outStream); + void SeekToPackedDataPosition(); ++ ++ void *rccctx; ++ COutArchive(); ++ ~COutArchive(); ++ + }; + + }} +diff -dPNur p7zip_4.44-old/CPP/7zip/Bundles/Alone/makefile p7zip_4.44/CPP/7zip/Bundles/Alone/makefile +--- p7zip_4.44-old/CPP/7zip/Bundles/Alone/makefile 2007-01-23 21:29:43.000000000 +0100 ++++ p7zip_4.44/CPP/7zip/Bundles/Alone/makefile 2007-04-14 18:52:31.000000000 +0200 +@@ -41,6 +41,7 @@ + $(MY_HOME)/mySplitCommandLine.o + + OBJS=\ ++../../../../C/rccrecode.o \ + ../../../Common/MyWindows.o \ + 7zAES.o \ + 7zCompressionMode.o \ +diff -dPNur p7zip_4.44-old/makefile.linux_amd64 p7zip_4.44/makefile.linux_amd64 +--- p7zip_4.44-old/makefile.linux_amd64 2007-04-14 15:37:39.000000000 +0200 ++++ p7zip_4.44/makefile.linux_amd64 2007-04-14 18:50:13.000000000 +0200 +@@ -11,6 +11,6 @@ + CC=x86_64-pc-linux-gnu-gcc $(ALLFLAGS) + LINK_SHARED=-shared + +-LOCAL_LIBS=-lpthread ++LOCAL_LIBS=-lpthread -lrcc + LOCAL_LIBS_DLL=$(LOCAL_LIBS) -ldl + +diff -dPNur p7zip_4.44-old/makefile.linux_gcc_2.95_no_need_for_libstdc p7zip_4.44/makefile.linux_gcc_2.95_no_need_for_libstdc +--- p7zip_4.44-old/makefile.linux_gcc_2.95_no_need_for_libstdc 2007-04-14 15:37:39.000000000 +0200 ++++ p7zip_4.44/makefile.linux_gcc_2.95_no_need_for_libstdc 2007-04-14 18:51:02.000000000 +0200 +@@ -10,6 +10,6 @@ + CC=x86_64-pc-linux-gnu-gcc $(ALLFLAGS) + LINK_SHARED=-shared + +-LOCAL_LIBS=-lpthread ++LOCAL_LIBS=-lpthread -lrcc + LOCAL_LIBS_DLL=$(LOCAL_LIBS) -ldl + +diff -dPNur p7zip_4.44-old/makefile.linux_x86_ppc_alpha p7zip_4.44/makefile.linux_x86_ppc_alpha +--- p7zip_4.44-old/makefile.linux_x86_ppc_alpha 2007-04-14 15:37:39.000000000 +0200 ++++ p7zip_4.44/makefile.linux_x86_ppc_alpha 2007-04-14 18:51:15.000000000 +0200 +@@ -14,6 +14,6 @@ + CC=x86_64-pc-linux-gnu-gcc $(ALLFLAGS) + LINK_SHARED=-shared + +-LOCAL_LIBS=-lpthread ++LOCAL_LIBS=-lpthread -lrcc + LOCAL_LIBS_DLL=$(LOCAL_LIBS) -ldl + +diff -dPNur p7zip_4.44-old/makefile.linux_x86_ppc_alpha__gcc_4.X p7zip_4.44/makefile.linux_x86_ppc_alpha__gcc_4.X +--- p7zip_4.44-old/makefile.linux_x86_ppc_alpha__gcc_4.X 2007-04-14 15:37:39.000000000 +0200 ++++ p7zip_4.44/makefile.linux_x86_ppc_alpha__gcc_4.X 2007-04-14 18:51:19.000000000 +0200 +@@ -14,6 +14,6 @@ + CC=x86_64-pc-linux-gnu-gcc $(ALLFLAGS) + LINK_SHARED=-shared + +-LOCAL_LIBS=-lpthread ++LOCAL_LIBS=-lpthread -lrcc + LOCAL_LIBS_DLL=$(LOCAL_LIBS) -ldl + +diff -dPNur p7zip_4.44-old/makefile.machine p7zip_4.44/makefile.machine +--- p7zip_4.44-old/makefile.machine 2007-04-14 15:37:39.000000000 +0200 ++++ p7zip_4.44/makefile.machine 2007-04-14 18:49:24.000000000 +0200 +@@ -11,6 +11,6 @@ + CC=x86_64-pc-linux-gnu-gcc $(ALLFLAGS) + LINK_SHARED=-shared + +-LOCAL_LIBS=-lpthread ++LOCAL_LIBS=-lpthread -lrcc + LOCAL_LIBS_DLL=$(LOCAL_LIBS) -ldl + diff --git a/app-arch/p7zip/files/p7zip_4.27-libun7zip.patch b/app-arch/p7zip/files/p7zip_4.27-libun7zip.patch new file mode 100644 index 0000000..0020729 --- /dev/null +++ b/app-arch/p7zip/files/p7zip_4.27-libun7zip.patch @@ -0,0 +1,597 @@ +diff -ruN p7zip_4.27.orig/7zip/Bundles/Un7Zip/makefile p7zip_4.27/7zip/Bundles/Un7Zip/makefile +--- p7zip_4.27.orig/7zip/Bundles/Un7Zip/makefile 1970-01-01 03:00:00.000000000 +0300 ++++ p7zip_4.27/7zip/Bundles/Un7Zip/makefile 2005-09-23 09:48:09.000000000 +0400 +@@ -0,0 +1,85 @@ ++PROG=libun7zip.so ++ ++LOCAL_FLAGS= -I../../../Common/ -I../../../myWindows/ -I../../../ -I../../../include_windows/ \ ++-DCOMPRESS_BCJ2 -DEXTRACT_ONLY -DEXCLUDE_COM -DNO_REGISTRY -DFORMAT_7Z \ ++-DCOMPRESS_LZMA -DCOMPRESS_BCJ_X86 -DCOMPRESS_COPY -DCOMPRESS_PPMD -D_SFX $(RPM_OPT_FLAGS) ++ ++include ../../../makefile.machine ++ ++LOCAL_SHARED=$(LINK_SHARED) ++LIBS=$(LOCAL_LIBS_DLL) ++ ++MY_WINDOWS= \ ++ $(MY_HOME)/myGetTickCount.o \ ++ $(MY_HOME)/wine_date_and_time.o \ ++ $(MY_HOME)/myModuleFileName.o \ ++ ++OBJS=\ ++CoderMixer2.o\ ++CoderMixer2MT.o\ ++CoderMixer2ST.o\ ++CrossThreadProgress.o\ ++FilterCoder.o\ ++ItemNameUtils.o\ ++OutStreamWithCRC.o\ ++ConsoleClose.o\ ++ExtractCallbackConsole.o\ ++ExtractCallbackNULL.o\ ++List.o\ ++OpenCallbackConsole.o\ ++UserInputUtils.o\ ++7zDecode.o\ ++7zExtract.o\ ++7zFolderOutStream.o\ ++7zHandler.o\ ++7zHeader.o\ ++7zIn.o\ ++7zMethodID.o\ ++LZMADecoder.o\ ++BranchCoder.o\ ++x86.o\ ++x86_2.o\ ++PPMDDecoder.o\ ++LZOutWindow.o\ ++CopyCoder.o\ ++Error.o\ ++FileDir.o\ ++FileFind.o\ ++FileIO.o\ ++FileName.o\ ++PropVariant.o\ ++PropVariantConversions.o\ ++Synchronization.o\ ++../../../Common/MyWindows.o\ ++../../../Common/Alloc.o\ ++../../../Common/StdInStream.o\ ++../../../Common/StdOutStream.o\ ++../../../Common/StringConvert.o\ ++../../../Common/String.o\ ++../../../Common/CRC.o\ ++../../../Common/Vector.o\ ++../../../Common/Wildcard.o\ ++../../../Common/IntToString.o\ ++FilePathAutoRename.o\ ++FileStreams.o\ ++InBuffer.o\ ++LimitedStreams.o\ ++LockedStream.o\ ++OffsetStream.o\ ++OutBuffer.o\ ++ProgressUtils.o\ ++StreamBinder.o\ ++StreamObjects.o\ ++StreamUtils.o\ ++ArchiveExtractCallback.o\ ++ArchiveOpenCallback.o\ ++ArchiverInfo.o\ ++DefaultName.o\ ++Extract.o\ ++ExtractingFilePath.o\ ++OpenArchive.o\ ++PropIDUtils.o\ ++Un7Zip.o ++ ++include ../../../makefile.glb ++ +diff -ruN p7zip_4.27.orig/7zip/Bundles/Un7Zip/makefile.depend p7zip_4.27/7zip/Bundles/Un7Zip/makefile.depend +--- p7zip_4.27.orig/7zip/Bundles/Un7Zip/makefile.depend 1970-01-01 03:00:00.000000000 +0300 ++++ p7zip_4.27/7zip/Bundles/Un7Zip/makefile.depend 2005-09-23 09:48:46.000000000 +0400 +@@ -0,0 +1 @@ ++ +\ ÷ ËÏÎÃÅ ÆÁÊÌÁ ÎÅÔ ÎÏ×ÏÊ ÓÔÒÏËÉ +diff -ruN p7zip_4.27.orig/7zip/Bundles/Un7Zip/makefile.list p7zip_4.27/7zip/Bundles/Un7Zip/makefile.list +--- p7zip_4.27.orig/7zip/Bundles/Un7Zip/makefile.list 1970-01-01 03:00:00.000000000 +0300 ++++ p7zip_4.27/7zip/Bundles/Un7Zip/makefile.list 2005-09-23 09:48:09.000000000 +0400 +@@ -0,0 +1,128 @@ ++CoderMixer2.o : ../../Archive/Common/CoderMixer2.cpp ++ $(CXX) $(CFLAGS) ../../Archive/Common/CoderMixer2.cpp ++CoderMixer2MT.o : ../../Archive/Common/CoderMixer2MT.cpp ++ $(CXX) $(CFLAGS) ../../Archive/Common/CoderMixer2MT.cpp ++CoderMixer2ST.o : ../../Archive/Common/CoderMixer2ST.cpp ++ $(CXX) $(CFLAGS) ../../Archive/Common/CoderMixer2ST.cpp ++CrossThreadProgress.o : ../../Archive/Common/CrossThreadProgress.cpp ++ $(CXX) $(CFLAGS) ../../Archive/Common/CrossThreadProgress.cpp ++FilterCoder.o : ../../Archive/Common/FilterCoder.cpp ++ $(CXX) $(CFLAGS) ../../Archive/Common/FilterCoder.cpp ++ItemNameUtils.o : ../../Archive/Common/ItemNameUtils.cpp ++ $(CXX) $(CFLAGS) ../../Archive/Common/ItemNameUtils.cpp ++OutStreamWithCRC.o : ../../Archive/Common/OutStreamWithCRC.cpp ++ $(CXX) $(CFLAGS) ../../Archive/Common/OutStreamWithCRC.cpp ++ConsoleClose.o : ../../UI/Console/ConsoleClose.cpp ++ $(CXX) $(CFLAGS) ../../UI/Console/ConsoleClose.cpp ++ExtractCallbackConsole.o : ../../UI/Console/ExtractCallbackConsole.cpp ++ $(CXX) $(CFLAGS) ../../UI/Console/ExtractCallbackConsole.cpp ++ExtractCallbackNULL.o : ../../UI/Console/ExtractCallbackNULL.cpp ++ $(CXX) $(CFLAGS) ../../UI/Console/ExtractCallbackNULL.cpp ++List.o : ../../UI/Console/List.cpp ++ $(CXX) $(CFLAGS) ../../UI/Console/List.cpp ++OpenCallbackConsole.o : ../../UI/Console/OpenCallbackConsole.cpp ++ $(CXX) $(CFLAGS) ../../UI/Console/OpenCallbackConsole.cpp ++UserInputUtils.o : ../../UI/Console/UserInputUtils.cpp ++ $(CXX) $(CFLAGS) ../../UI/Console/UserInputUtils.cpp ++7zDecode.o : ../../Archive/7z/7zDecode.cpp ++ $(CXX) $(CFLAGS) ../../Archive/7z/7zDecode.cpp ++7zExtract.o : ../../Archive/7z/7zExtract.cpp ++ $(CXX) $(CFLAGS) ../../Archive/7z/7zExtract.cpp ++7zFolderOutStream.o : ../../Archive/7z/7zFolderOutStream.cpp ++ $(CXX) $(CFLAGS) ../../Archive/7z/7zFolderOutStream.cpp ++7zHandler.o : ../../Archive/7z/7zHandler.cpp ++ $(CXX) $(CFLAGS) ../../Archive/7z/7zHandler.cpp ++7zHeader.o : ../../Archive/7z/7zHeader.cpp ++ $(CXX) $(CFLAGS) ../../Archive/7z/7zHeader.cpp ++7zIn.o : ../../Archive/7z/7zIn.cpp ++ $(CXX) $(CFLAGS) ../../Archive/7z/7zIn.cpp ++7zMethodID.o : ../../Archive/7z/7zMethodID.cpp ++ $(CXX) $(CFLAGS) ../../Archive/7z/7zMethodID.cpp ++LZMADecoder.o : ../../Compress/LZMA/LZMADecoder.cpp ++ $(CXX) $(CFLAGS) ../../Compress/LZMA/LZMADecoder.cpp ++BranchCoder.o : ../../Compress/Branch/BranchCoder.cpp ++ $(CXX) $(CFLAGS) ../../Compress/Branch/BranchCoder.cpp ++x86.o : ../../Compress/Branch/x86.cpp ++ $(CXX) $(CFLAGS) ../../Compress/Branch/x86.cpp ++x86_2.o : ../../Compress/Branch/x86_2.cpp ++ $(CXX) $(CFLAGS) ../../Compress/Branch/x86_2.cpp ++PPMDDecoder.o : ../../Compress/PPMD/PPMDDecoder.cpp ++ $(CXX) $(CFLAGS) ../../Compress/PPMD/PPMDDecoder.cpp ++LZOutWindow.o : ../../Compress/LZ/LZOutWindow.cpp ++ $(CXX) $(CFLAGS) ../../Compress/LZ/LZOutWindow.cpp ++CopyCoder.o : ../../Compress/Copy/CopyCoder.cpp ++ $(CXX) $(CFLAGS) ../../Compress/Copy/CopyCoder.cpp ++Error.o : ../../../Windows/Error.cpp ++ $(CXX) $(CFLAGS) ../../../Windows/Error.cpp ++FileDir.o : ../../../Windows/FileDir.cpp ++ $(CXX) $(CFLAGS) ../../../Windows/FileDir.cpp ++FileFind.o : ../../../Windows/FileFind.cpp ++ $(CXX) $(CFLAGS) ../../../Windows/FileFind.cpp ++FileIO.o : ../../../Windows/FileIO.cpp ++ $(CXX) $(CFLAGS) ../../../Windows/FileIO.cpp ++FileName.o : ../../../Windows/FileName.cpp ++ $(CXX) $(CFLAGS) ../../../Windows/FileName.cpp ++PropVariant.o : ../../../Windows/PropVariant.cpp ++ $(CXX) $(CFLAGS) ../../../Windows/PropVariant.cpp ++PropVariantConversions.o : ../../../Windows/PropVariantConversions.cpp ++ $(CXX) $(CFLAGS) ../../../Windows/PropVariantConversions.cpp ++Synchronization.o : ../../../Windows/Synchronization.cpp ++ $(CXX) $(CFLAGS) ../../../Windows/Synchronization.cpp ++Alloc.o : ../../../Common/Alloc.cpp ++ $(CXX) $(CFLAGS) ../../../Common/Alloc.cpp ++CRC.o : ../../../Common/CRC.cpp ++ $(CXX) $(CFLAGS) ../../../Common/CRC.cpp ++IntToString.o : ../../../Common/IntToString.cpp ++ $(CXX) $(CFLAGS) ../../../Common/IntToString.cpp ++StdInStream.o : ../../../Common/StdInStream.cpp ++ $(CXX) $(CFLAGS) ../../../Common/StdInStream.cpp ++StdOutStream.o : ../../../Common/StdOutStream.cpp ++ $(CXX) $(CFLAGS) ../../../Common/StdOutStream.cpp ++String.o : ../../../Common/String.cpp ++ $(CXX) $(CFLAGS) ../../../Common/String.cpp ++StringConvert.o : ../../../Common/StringConvert.cpp ++ $(CXX) $(CFLAGS) ../../../Common/StringConvert.cpp ++Vector.o : ../../../Common/Vector.cpp ++ $(CXX) $(CFLAGS) ../../../Common/Vector.cpp ++Wildcard.o : ../../../Common/Wildcard.cpp ++ $(CXX) $(CFLAGS) ../../../Common/Wildcard.cpp ++FilePathAutoRename.o : ../../Common/FilePathAutoRename.cpp ++ $(CXX) $(CFLAGS) ../../Common/FilePathAutoRename.cpp ++FileStreams.o : ../../Common/FileStreams.cpp ++ $(CXX) $(CFLAGS) ../../Common/FileStreams.cpp ++InBuffer.o : ../../Common/InBuffer.cpp ++ $(CXX) $(CFLAGS) ../../Common/InBuffer.cpp ++LimitedStreams.o : ../../Common/LimitedStreams.cpp ++ $(CXX) $(CFLAGS) ../../Common/LimitedStreams.cpp ++LockedStream.o : ../../Common/LockedStream.cpp ++ $(CXX) $(CFLAGS) ../../Common/LockedStream.cpp ++OffsetStream.o : ../../Common/OffsetStream.cpp ++ $(CXX) $(CFLAGS) ../../Common/OffsetStream.cpp ++OutBuffer.o : ../../Common/OutBuffer.cpp ++ $(CXX) $(CFLAGS) ../../Common/OutBuffer.cpp ++ProgressUtils.o : ../../Common/ProgressUtils.cpp ++ $(CXX) $(CFLAGS) ../../Common/ProgressUtils.cpp ++StreamUtils.o : ../../Common/StreamUtils.cpp ++ $(CXX) $(CFLAGS) ../../Common/StreamUtils.cpp ++StreamBinder.o : ../../Common/StreamBinder.cpp ++ $(CXX) $(CFLAGS) ../../Common/StreamBinder.cpp ++StreamObjects.o : ../../Common/StreamObjects.cpp ++ $(CXX) $(CFLAGS) ../../Common/StreamObjects.cpp ++ArchiveExtractCallback.o : ../../UI/Common/ArchiveExtractCallback.cpp ++ $(CXX) $(CFLAGS) ../../UI/Common/ArchiveExtractCallback.cpp ++ArchiveOpenCallback.o : ../../UI/Common/ArchiveOpenCallback.cpp ++ $(CXX) $(CFLAGS) ../../UI/Common/ArchiveOpenCallback.cpp ++ArchiverInfo.o : ../../UI/Common/ArchiverInfo.cpp ++ $(CXX) $(CFLAGS) ../../UI/Common/ArchiverInfo.cpp ++DefaultName.o : ../../UI/Common/DefaultName.cpp ++ $(CXX) $(CFLAGS) ../../UI/Common/DefaultName.cpp ++Extract.o : ../../UI/Common/Extract.cpp ++ $(CXX) $(CFLAGS) ../../UI/Common/Extract.cpp ++ExtractingFilePath.o : ../../UI/Common/ExtractingFilePath.cpp ++ $(CXX) $(CFLAGS) ../../UI/Common/ExtractingFilePath.cpp ++OpenArchive.o : ../../UI/Common/OpenArchive.cpp ++ $(CXX) $(CFLAGS) ../../UI/Common/OpenArchive.cpp ++PropIDUtils.o : ../../UI/Common/PropIDUtils.cpp ++ $(CXX) $(CFLAGS) ../../UI/Common/PropIDUtils.cpp ++Un7Zip.o : ./Un7Zip.cpp ++ $(CXX) $(CFLAGS) ./Un7Zip.cpp +diff -ruN p7zip_4.27.orig/7zip/Bundles/Un7Zip/testlib.c p7zip_4.27/7zip/Bundles/Un7Zip/testlib.c +--- p7zip_4.27.orig/7zip/Bundles/Un7Zip/testlib.c 1970-01-01 03:00:00.000000000 +0300 ++++ p7zip_4.27/7zip/Bundles/Un7Zip/testlib.c 2005-09-23 09:48:09.000000000 +0400 +@@ -0,0 +1,7 @@ ++ ++#include "u7zip.h" ++ ++int main(int argc, char *argv[]) ++{ ++ return un7zip(argv[1], "/tmp", 0); ++} +diff -ruN p7zip_4.27.orig/7zip/Bundles/Un7Zip/u7zip.h p7zip_4.27/7zip/Bundles/Un7Zip/u7zip.h +--- p7zip_4.27.orig/7zip/Bundles/Un7Zip/u7zip.h 1970-01-01 03:00:00.000000000 +0300 ++++ p7zip_4.27/7zip/Bundles/Un7Zip/u7zip.h 2005-09-23 09:48:09.000000000 +0400 +@@ -0,0 +1,19 @@ ++#ifndef __UN7ZIP_H ++#define __UN7ZIP_H ++ ++#define LIST_7Z 0 ++#define TEST_7Z 1 ++#define EXTRACT_7Z 2 ++ ++#define S_OK 0x00000000L ++#define S_FALSE 0x00000001L ++#define E_NOTIMPL 0x80004001L ++#define E_NOINTERFACE 0x80004002L ++#define E_ABORT 0x80004004L ++#define E_FAIL 0x80004005L ++#define E_OUTOFMEMORY 0x8007000EL ++#define E_INVALIDARG 0x80070057L ++ ++int un7zip(char *name, char *dir, int command); ++ ++#endif +diff -ruN p7zip_4.27.orig/7zip/Bundles/Un7Zip/Un7Zip.cpp p7zip_4.27/7zip/Bundles/Un7Zip/Un7Zip.cpp +--- p7zip_4.27.orig/7zip/Bundles/Un7Zip/Un7Zip.cpp 1970-01-01 03:00:00.000000000 +0300 ++++ p7zip_4.27/7zip/Bundles/Un7Zip/Un7Zip.cpp 2005-09-23 09:48:09.000000000 +0400 +@@ -0,0 +1,127 @@ ++// Un7Zip.cpp ++ ++#include "StdAfx.h" ++ ++#include "Common/MyInitGuid.h" ++ ++#include "Common/StdOutStream.h" ++#include "Common/Wildcard.h" ++#include "Common/StringConvert.h" ++#include "Common/MyCom.h" ++#include "Common/Exception.h" ++ ++#include "Windows/FileDir.h" ++#include "Windows/FileName.h" ++#include "Windows/Defs.h" ++ ++#include "../../IPassword.h" ++#include "../../ICoder.h" ++ ++#include "../../UI/Common/OpenArchive.h" ++#include "../../UI/Common/DefaultName.h" ++#include "../../UI/Common/ExitCode.h" ++#include "../../UI/Common/Extract.h" ++ ++#include "../../UI/Console/List.h" ++#include "../../UI/Console/OpenCallbackConsole.h" ++#include "../../UI/Console/ExtractCallbackNULL.h" ++ ++ ++static int Un7Zip(char *name, char *dir, int command); ++ ++extern "C" { ++ ++int un7zip(char *name, char *dir, int command) ++{ ++ return Un7Zip(name, dir, command); ++} ++ ++} ++ ++using namespace NWindows; ++using namespace NFile; ++ ++static const wchar_t *kUniversalWildcard = L"*"; ++static bool AddNameToCensor(NWildcard::CCensor &wildcardCensor) ++{ ++ wildcardCensor.AddItem(true, kUniversalWildcard, false); ++ return true; ++} ++ ++static int Un7Zip(char *name, char *dir, int commands) ++{ ++ ++ CStdOutStream *g_StdStream = &g_StdOut; ++ ++ NWildcard::CCensor wildcardCensor; ++ AddNameToCensor(wildcardCensor); ++ bool passwordEnabled = 1; ++ UString password = L"null"; ++ ++ UString outputDir= MultiByteToUnicodeString(dir); ++ UString archiveName = MultiByteToUnicodeString(name); ++ ++ NFind::CFileInfoW archiveFileInfo; ++ ++ if (!NFind::FindFile(archiveName, archiveFileInfo)) ++ return S_FALSE; ++ if (archiveFileInfo.IsDirectory()) ++ return S_FALSE; ++ ++ { ++ ++ UStringVector v1, v2; ++ v1.Add(archiveName); ++ v2.Add(archiveName); ++ ++ const NWildcard::CCensorNode &wildcardCensorHead = ++ wildcardCensor.Pairs.Front().Head; ++ ++ if(commands > 0) ++ { ++ CExtractCallbackNULL *ecs = new CExtractCallbackNULL; ++ CMyComPtr<IFolderArchiveExtractCallback> extractCallback = ecs; ++ ecs->OutStream = g_StdStream; ++ ecs->PasswordIsDefined = passwordEnabled; ++ ecs->Password = password; ++ ecs->Init(); ++ ++ COpenCallbackConsole openCallback; ++ openCallback.OutStream = g_StdStream; ++ openCallback.PasswordIsDefined = passwordEnabled; ++ openCallback.Password = password; ++ ++ CExtractOptions eo; ++ eo.StdOutMode = false; ++ eo.PathMode = NExtract::NPathMode::kFullPathnames; ++ if(commands == 1) ++ eo.TestMode = 1; ++ else ++ eo.TestMode = 0; ++ eo.OverwriteMode = NExtract::NOverwriteMode::kWithoutPrompt; ++ eo.OutputDir = outputDir; ++ eo.YesToAll = 1; ++ ++ HRESULT result = DecompressArchives( ++ v1, v2, ++ wildcardCensorHead, ++ eo, &openCallback, ecs); ++ if (ecs->NumArchiveErrors != 0 || ecs->NumFileErrors != 0) ++ return S_FALSE; ++ if (result != S_OK) ++ return S_FALSE; ++ } ++ else ++ { ++ HRESULT result = ListArchives( ++ v1, v2, ++ wildcardCensorHead, ++ true, ++ passwordEnabled, ++ password); ++ if (result != S_OK) ++ return S_FALSE;; ++ } ++ } ++ return S_OK; ++} +diff -ruN p7zip_4.27.orig/7zip/UI/Console/ExtractCallbackNULL.cpp p7zip_4.27/7zip/UI/Console/ExtractCallbackNULL.cpp +--- p7zip_4.27.orig/7zip/UI/Console/ExtractCallbackNULL.cpp 1970-01-01 03:00:00.000000000 +0300 ++++ p7zip_4.27/7zip/UI/Console/ExtractCallbackNULL.cpp 2005-09-23 09:48:09.000000000 +0400 +@@ -0,0 +1,132 @@ ++// ExtractCallbackNULL.cpp ++ ++#include "StdAfx.h" ++ ++#include "ExtractCallbackNULL.h" ++#include "UserInputUtils.h" ++#include "ConsoleClose.h" ++ ++#include "Common/Wildcard.h" ++ ++#include "Windows/FileDir.h" ++#include "Windows/FileFind.h" ++#include "Windows/Time.h" ++#include "Windows/Defs.h" ++#include "Windows/PropVariant.h" ++#include "Windows/Error.h" ++#include "Windows/PropVariantConversions.h" ++ ++#include "../../Common/FilePathAutoRename.h" ++ ++#include "../Common/ExtractingFilePath.h" ++ ++using namespace NWindows; ++using namespace NFile; ++using namespace NDirectory; ++ ++STDMETHODIMP CExtractCallbackNULL::SetTotal(UInt64 size) ++{ ++ if (NConsoleClose::TestBreakSignal()) ++ return E_ABORT; ++ return S_OK; ++} ++ ++STDMETHODIMP CExtractCallbackNULL::SetCompleted(const UInt64 *completeValue) ++{ ++ if (NConsoleClose::TestBreakSignal()) ++ return E_ABORT; ++ return S_OK; ++} ++ ++STDMETHODIMP CExtractCallbackNULL::AskOverwrite( ++ const wchar_t *existName, const FILETIME *existTime, const UInt64 *existSize, ++ const wchar_t *newName, const FILETIME *newTime, const UInt64 *newSize, ++ Int32 *answer) ++{ ++ ++ NUserAnswerMode::EEnum overwriteAnswer = ScanUserYesNoAllQuit(OutStream); ++ ++ switch(overwriteAnswer) ++ { ++ case NUserAnswerMode::kQuit: ++ return E_ABORT; ++ case NUserAnswerMode::kNo: ++ *answer = NOverwriteAnswer::kNo; ++ break; ++ case NUserAnswerMode::kNoAll: ++ *answer = NOverwriteAnswer::kNoToAll; ++ break; ++ case NUserAnswerMode::kYesAll: ++ *answer = NOverwriteAnswer::kYesToAll; ++ break; ++ case NUserAnswerMode::kYes: ++ *answer = NOverwriteAnswer::kYes; ++ break; ++ case NUserAnswerMode::kAutoRename: ++ *answer = NOverwriteAnswer::kAutoRename; ++ break; ++ default: ++ return E_FAIL; ++ } ++ return S_OK; ++} ++ ++STDMETHODIMP CExtractCallbackNULL::PrepareOperation(const wchar_t *name, Int32 askExtractMode, const UInt64 *position) ++{ ++ return S_OK; ++} ++ ++STDMETHODIMP CExtractCallbackNULL::MessageError(const wchar_t *message) ++{ ++ return S_OK; ++} ++ ++STDMETHODIMP CExtractCallbackNULL::SetOperationResult(Int32 operationResult) ++{ ++ return S_OK; ++} ++ ++STDMETHODIMP CExtractCallbackNULL::CryptoGetTextPassword(BSTR *password) ++{ ++ if (!PasswordIsDefined) ++ { ++ Password = GetPassword(OutStream); ++ PasswordIsDefined = true; ++ } ++ CMyComBSTR tempName(Password); ++ *password = tempName.Detach(); ++ return S_OK; ++} ++ ++HRESULT CExtractCallbackNULL::BeforeOpen(const wchar_t *name) ++{ ++ return S_OK; ++} ++ ++HRESULT CExtractCallbackNULL::OpenResult(const wchar_t *name, HRESULT result) ++{ ++ return S_OK; ++} ++ ++HRESULT CExtractCallbackNULL::ThereAreNoFiles() ++{ ++ return S_OK; ++} ++ ++HRESULT CExtractCallbackNULL::ExtractResult(HRESULT result) ++{ ++ if (result == S_OK) ++ return result; ++ if (result == E_ABORT) ++ return result; ++ if (result == E_OUTOFMEMORY) ++ return result; ++ return S_OK; ++} ++ ++HRESULT CExtractCallbackNULL::SetPassword(const UString &password) ++{ ++ PasswordIsDefined = true; ++ Password = password; ++ return S_OK; ++} +diff -ruN p7zip_4.27.orig/7zip/UI/Console/ExtractCallbackNULL.h p7zip_4.27/7zip/UI/Console/ExtractCallbackNULL.h +--- p7zip_4.27.orig/7zip/UI/Console/ExtractCallbackNULL.h 1970-01-01 03:00:00.000000000 +0300 ++++ p7zip_4.27/7zip/UI/Console/ExtractCallbackNULL.h 2005-09-23 09:48:09.000000000 +0400 +@@ -0,0 +1,65 @@ ++// ExtractCallbackNULL.h ++ ++#ifndef __EXTRACTCALLBACKCONSOLE_H ++#define __EXTRACTCALLBACKCONSOLE_H ++ ++#include "Common/String.h" ++#include "Common/StdOutStream.h" ++#include "../../Common/FileStreams.h" ++#include "../../IPassword.h" ++#include "../../Archive/IArchive.h" ++#include "../Common/ArchiveExtractCallback.h" ++ ++class CExtractCallbackNULL: ++ public IExtractCallbackUI, ++ public ICryptoGetTextPassword, ++ public CMyUnknownImp ++{ ++public: ++ MY_UNKNOWN_IMP2(IFolderArchiveExtractCallback, ICryptoGetTextPassword) ++ ++ STDMETHOD(SetTotal)(UInt64 total); ++ STDMETHOD(SetCompleted)(const UInt64 *completeValue); ++ ++ // IFolderArchiveExtractCallback ++ STDMETHOD(AskOverwrite)( ++ const wchar_t *existName, const FILETIME *existTime, const UInt64 *existSize, ++ const wchar_t *newName, const FILETIME *newTime, const UInt64 *newSize, ++ Int32 *answer); ++ STDMETHOD (PrepareOperation)(const wchar_t *name, Int32 askExtractMode, const UInt64 *position); ++ ++ STDMETHOD(MessageError)(const wchar_t *message); ++ STDMETHOD(SetOperationResult)(Int32 operationResult); ++ ++ // ICryptoGetTextPassword ++ STDMETHOD(CryptoGetTextPassword)(BSTR *password); ++ ++ HRESULT BeforeOpen(const wchar_t *name); ++ HRESULT OpenResult(const wchar_t *name, HRESULT result); ++ HRESULT ThereAreNoFiles(); ++ HRESULT ExtractResult(HRESULT result); ++ ++ HRESULT SetPassword(const UString &password); ++ ++public: ++ bool PasswordIsDefined; ++ UString Password; ++ ++ UInt64 NumArchives; ++ UInt64 NumArchiveErrors; ++ UInt64 NumFileErrors; ++ UInt64 NumFileErrorsInCurrentArchive; ++ ++ CStdOutStream *OutStream; ++ ++ void CExtractCallbackNULL::Init() ++ { ++ NumArchives = 0; ++ NumArchiveErrors = 0; ++ NumFileErrors = 0; ++ NumFileErrorsInCurrentArchive = 0; ++ } ++ ++}; ++ ++#endif diff --git a/app-arch/p7zip/files/p7zip_4.44-libun7zip.patch b/app-arch/p7zip/files/p7zip_4.44-libun7zip.patch new file mode 100644 index 0000000..e3216c4 --- /dev/null +++ b/app-arch/p7zip/files/p7zip_4.44-libun7zip.patch @@ -0,0 +1,599 @@ +diff -dPNur p7zip_4.44/CPP/7zip/Bundles/Un7Zip/makefile p7zip_4.44-new/CPP/7zip/Bundles/Un7Zip/makefile +--- p7zip_4.44/CPP/7zip/Bundles/Un7Zip/makefile 1970-01-01 01:00:00.000000000 +0100 ++++ p7zip_4.44-new/CPP/7zip/Bundles/Un7Zip/makefile 2007-03-29 13:01:21.000000000 +0200 +@@ -0,0 +1,84 @@ ++PROG=libun7zip.so ++ ++LOCAL_FLAGS= -I../../../Common/ -I../../../myWindows/ -I../../../ -I../../../include_windows/ \ ++-DCOMPRESS_BCJ2 -DEXTRACT_ONLY -DEXCLUDE_COM -DNO_REGISTRY -DFORMAT_7Z \ ++-DCOMPRESS_LZMA -DCOMPRESS_BCJ_X86 -DCOMPRESS_COPY -DCOMPRESS_PPMD -D_SFX $(RPM_OPT_FLAGS) ++ ++include ../../../../makefile.machine ++ ++LOCAL_SHARED=$(LINK_SHARED) ++LIBS=$(LOCAL_LIBS_DLL) ++ ++MY_WINDOWS= \ ++ $(MY_HOME)/myGetTickCount.o \ ++ $(MY_HOME)/wine_date_and_time.o \ ++ ++OBJS=\ ++CoderMixer2.o\ ++CoderMixer2MT.o\ ++CoderMixer2ST.o\ ++CrossThreadProgress.o\ ++FilterCoder.o\ ++ItemNameUtils.o\ ++OutStreamWithCRC.o\ ++ConsoleClose.o\ ++ExtractCallbackConsole.o\ ++ExtractCallbackNULL.o\ ++List.o\ ++OpenCallbackConsole.o\ ++UserInputUtils.o\ ++7zDecode.o\ ++7zExtract.o\ ++7zFolderOutStream.o\ ++7zHandler.o\ ++7zHeader.o\ ++7zIn.o\ ++7zMethodID.o\ ++LZMADecoder.o\ ++BranchCoder.o\ ++x86.o\ ++x86_2.o\ ++PPMDDecoder.o\ ++LZOutWindow.o\ ++CopyCoder.o\ ++Error.o\ ++FileDir.o\ ++FileFind.o\ ++FileIO.o\ ++FileName.o\ ++PropVariant.o\ ++PropVariantConversions.o\ ++Synchronization.o\ ++../../../Common/MyWindows.o\ ++../../../Common/Alloc.o\ ++../../../Common/StdInStream.o\ ++../../../Common/StdOutStream.o\ ++../../../Common/StringConvert.o\ ++../../../Common/String.o\ ++../../../Common/CRC.o\ ++../../../Common/Vector.o\ ++../../../Common/Wildcard.o\ ++../../../Common/IntToString.o\ ++FilePathAutoRename.o\ ++FileStreams.o\ ++InBuffer.o\ ++LimitedStreams.o\ ++LockedStream.o\ ++OffsetStream.o\ ++OutBuffer.o\ ++ProgressUtils.o\ ++StreamBinder.o\ ++StreamObjects.o\ ++StreamUtils.o\ ++ArchiveExtractCallback.o\ ++ArchiveOpenCallback.o\ ++ArchiverInfo.o\ ++DefaultName.o\ ++Extract.o\ ++ExtractingFilePath.o\ ++OpenArchive.o\ ++PropIDUtils.o\ ++Un7Zip.o ++ ++include ../../../../makefile.glb ++ +diff -dPNur p7zip_4.44/CPP/7zip/Bundles/Un7Zip/makefile.depend p7zip_4.44-new/CPP/7zip/Bundles/Un7Zip/makefile.depend +--- p7zip_4.44/CPP/7zip/Bundles/Un7Zip/makefile.depend 1970-01-01 01:00:00.000000000 +0100 ++++ p7zip_4.44-new/CPP/7zip/Bundles/Un7Zip/makefile.depend 2007-03-29 13:01:21.000000000 +0200 +@@ -0,0 +1 @@ ++ +\ No newline at end of file +diff -dPNur p7zip_4.44/CPP/7zip/Bundles/Un7Zip/makefile.list p7zip_4.44-new/CPP/7zip/Bundles/Un7Zip/makefile.list +--- p7zip_4.44/CPP/7zip/Bundles/Un7Zip/makefile.list 1970-01-01 01:00:00.000000000 +0100 ++++ p7zip_4.44-new/CPP/7zip/Bundles/Un7Zip/makefile.list 2007-03-29 13:01:21.000000000 +0200 +@@ -0,0 +1,128 @@ ++CoderMixer2.o : ../../Archive/Common/CoderMixer2.cpp ++ $(CXX) $(CFLAGS) ../../Archive/Common/CoderMixer2.cpp ++CoderMixer2MT.o : ../../Archive/Common/CoderMixer2MT.cpp ++ $(CXX) $(CFLAGS) ../../Archive/Common/CoderMixer2MT.cpp ++CoderMixer2ST.o : ../../Archive/Common/CoderMixer2ST.cpp ++ $(CXX) $(CFLAGS) ../../Archive/Common/CoderMixer2ST.cpp ++CrossThreadProgress.o : ../../Archive/Common/CrossThreadProgress.cpp ++ $(CXX) $(CFLAGS) ../../Archive/Common/CrossThreadProgress.cpp ++FilterCoder.o : ../../Archive/Common/FilterCoder.cpp ++ $(CXX) $(CFLAGS) ../../Archive/Common/FilterCoder.cpp ++ItemNameUtils.o : ../../Archive/Common/ItemNameUtils.cpp ++ $(CXX) $(CFLAGS) ../../Archive/Common/ItemNameUtils.cpp ++OutStreamWithCRC.o : ../../Archive/Common/OutStreamWithCRC.cpp ++ $(CXX) $(CFLAGS) ../../Archive/Common/OutStreamWithCRC.cpp ++ConsoleClose.o : ../../UI/Console/ConsoleClose.cpp ++ $(CXX) $(CFLAGS) ../../UI/Console/ConsoleClose.cpp ++ExtractCallbackConsole.o : ../../UI/Console/ExtractCallbackConsole.cpp ++ $(CXX) $(CFLAGS) ../../UI/Console/ExtractCallbackConsole.cpp ++ExtractCallbackNULL.o : ../../UI/Console/ExtractCallbackNULL.cpp ++ $(CXX) $(CFLAGS) ../../UI/Console/ExtractCallbackNULL.cpp ++List.o : ../../UI/Console/List.cpp ++ $(CXX) $(CFLAGS) ../../UI/Console/List.cpp ++OpenCallbackConsole.o : ../../UI/Console/OpenCallbackConsole.cpp ++ $(CXX) $(CFLAGS) ../../UI/Console/OpenCallbackConsole.cpp ++UserInputUtils.o : ../../UI/Console/UserInputUtils.cpp ++ $(CXX) $(CFLAGS) ../../UI/Console/UserInputUtils.cpp ++7zDecode.o : ../../Archive/7z/7zDecode.cpp ++ $(CXX) $(CFLAGS) ../../Archive/7z/7zDecode.cpp ++7zExtract.o : ../../Archive/7z/7zExtract.cpp ++ $(CXX) $(CFLAGS) ../../Archive/7z/7zExtract.cpp ++7zFolderOutStream.o : ../../Archive/7z/7zFolderOutStream.cpp ++ $(CXX) $(CFLAGS) ../../Archive/7z/7zFolderOutStream.cpp ++7zHandler.o : ../../Archive/7z/7zHandler.cpp ++ $(CXX) $(CFLAGS) ../../Archive/7z/7zHandler.cpp ++7zHeader.o : ../../Archive/7z/7zHeader.cpp ++ $(CXX) $(CFLAGS) ../../Archive/7z/7zHeader.cpp ++7zIn.o : ../../Archive/7z/7zIn.cpp ++ $(CXX) $(CFLAGS) ../../Archive/7z/7zIn.cpp ++7zMethodID.o : ../../Archive/7z/7zMethodID.cpp ++ $(CXX) $(CFLAGS) ../../Archive/7z/7zMethodID.cpp ++LZMADecoder.o : ../../Compress/LZMA/LZMADecoder.cpp ++ $(CXX) $(CFLAGS) ../../Compress/LZMA/LZMADecoder.cpp ++BranchCoder.o : ../../Compress/Branch/BranchCoder.cpp ++ $(CXX) $(CFLAGS) ../../Compress/Branch/BranchCoder.cpp ++x86.o : ../../Compress/Branch/x86.cpp ++ $(CXX) $(CFLAGS) ../../Compress/Branch/x86.cpp ++x86_2.o : ../../Compress/Branch/x86_2.cpp ++ $(CXX) $(CFLAGS) ../../Compress/Branch/x86_2.cpp ++PPMDDecoder.o : ../../Compress/PPMD/PPMDDecoder.cpp ++ $(CXX) $(CFLAGS) ../../Compress/PPMD/PPMDDecoder.cpp ++LZOutWindow.o : ../../Compress/LZ/LZOutWindow.cpp ++ $(CXX) $(CFLAGS) ../../Compress/LZ/LZOutWindow.cpp ++CopyCoder.o : ../../Compress/Copy/CopyCoder.cpp ++ $(CXX) $(CFLAGS) ../../Compress/Copy/CopyCoder.cpp ++Error.o : ../../../Windows/Error.cpp ++ $(CXX) $(CFLAGS) ../../../Windows/Error.cpp ++FileDir.o : ../../../Windows/FileDir.cpp ++ $(CXX) $(CFLAGS) ../../../Windows/FileDir.cpp ++FileFind.o : ../../../Windows/FileFind.cpp ++ $(CXX) $(CFLAGS) ../../../Windows/FileFind.cpp ++FileIO.o : ../../../Windows/FileIO.cpp ++ $(CXX) $(CFLAGS) ../../../Windows/FileIO.cpp ++FileName.o : ../../../Windows/FileName.cpp ++ $(CXX) $(CFLAGS) ../../../Windows/FileName.cpp ++PropVariant.o : ../../../Windows/PropVariant.cpp ++ $(CXX) $(CFLAGS) ../../../Windows/PropVariant.cpp ++PropVariantConversions.o : ../../../Windows/PropVariantConversions.cpp ++ $(CXX) $(CFLAGS) ../../../Windows/PropVariantConversions.cpp ++Synchronization.o : ../../../Windows/Synchronization.cpp ++ $(CXX) $(CFLAGS) ../../../Windows/Synchronization.cpp ++Alloc.o : ../../../Common/Alloc.cpp ++ $(CXX) $(CFLAGS) ../../../Common/Alloc.cpp ++CRC.o : ../../../Common/CRC.cpp ++ $(CXX) $(CFLAGS) ../../../Common/CRC.cpp ++IntToString.o : ../../../Common/IntToString.cpp ++ $(CXX) $(CFLAGS) ../../../Common/IntToString.cpp ++StdInStream.o : ../../../Common/StdInStream.cpp ++ $(CXX) $(CFLAGS) ../../../Common/StdInStream.cpp ++StdOutStream.o : ../../../Common/StdOutStream.cpp ++ $(CXX) $(CFLAGS) ../../../Common/StdOutStream.cpp ++String.o : ../../../Common/String.cpp ++ $(CXX) $(CFLAGS) ../../../Common/String.cpp ++StringConvert.o : ../../../Common/StringConvert.cpp ++ $(CXX) $(CFLAGS) ../../../Common/StringConvert.cpp ++Vector.o : ../../../Common/Vector.cpp ++ $(CXX) $(CFLAGS) ../../../Common/Vector.cpp ++Wildcard.o : ../../../Common/Wildcard.cpp ++ $(CXX) $(CFLAGS) ../../../Common/Wildcard.cpp ++FilePathAutoRename.o : ../../Common/FilePathAutoRename.cpp ++ $(CXX) $(CFLAGS) ../../Common/FilePathAutoRename.cpp ++FileStreams.o : ../../Common/FileStreams.cpp ++ $(CXX) $(CFLAGS) ../../Common/FileStreams.cpp ++InBuffer.o : ../../Common/InBuffer.cpp ++ $(CXX) $(CFLAGS) ../../Common/InBuffer.cpp ++LimitedStreams.o : ../../Common/LimitedStreams.cpp ++ $(CXX) $(CFLAGS) ../../Common/LimitedStreams.cpp ++LockedStream.o : ../../Common/LockedStream.cpp ++ $(CXX) $(CFLAGS) ../../Common/LockedStream.cpp ++OffsetStream.o : ../../Common/OffsetStream.cpp ++ $(CXX) $(CFLAGS) ../../Common/OffsetStream.cpp ++OutBuffer.o : ../../Common/OutBuffer.cpp ++ $(CXX) $(CFLAGS) ../../Common/OutBuffer.cpp ++ProgressUtils.o : ../../Common/ProgressUtils.cpp ++ $(CXX) $(CFLAGS) ../../Common/ProgressUtils.cpp ++StreamUtils.o : ../../Common/StreamUtils.cpp ++ $(CXX) $(CFLAGS) ../../Common/StreamUtils.cpp ++StreamBinder.o : ../../Common/StreamBinder.cpp ++ $(CXX) $(CFLAGS) ../../Common/StreamBinder.cpp ++StreamObjects.o : ../../Common/StreamObjects.cpp ++ $(CXX) $(CFLAGS) ../../Common/StreamObjects.cpp ++ArchiveExtractCallback.o : ../../UI/Common/ArchiveExtractCallback.cpp ++ $(CXX) $(CFLAGS) ../../UI/Common/ArchiveExtractCallback.cpp ++ArchiveOpenCallback.o : ../../UI/Common/ArchiveOpenCallback.cpp ++ $(CXX) $(CFLAGS) ../../UI/Common/ArchiveOpenCallback.cpp ++ArchiverInfo.o : ../../UI/Common/ArchiverInfo.cpp ++ $(CXX) $(CFLAGS) ../../UI/Common/ArchiverInfo.cpp ++DefaultName.o : ../../UI/Common/DefaultName.cpp ++ $(CXX) $(CFLAGS) ../../UI/Common/DefaultName.cpp ++Extract.o : ../../UI/Common/Extract.cpp ++ $(CXX) $(CFLAGS) ../../UI/Common/Extract.cpp ++ExtractingFilePath.o : ../../UI/Common/ExtractingFilePath.cpp ++ $(CXX) $(CFLAGS) ../../UI/Common/ExtractingFilePath.cpp ++OpenArchive.o : ../../UI/Common/OpenArchive.cpp ++ $(CXX) $(CFLAGS) ../../UI/Common/OpenArchive.cpp ++PropIDUtils.o : ../../UI/Common/PropIDUtils.cpp ++ $(CXX) $(CFLAGS) ../../UI/Common/PropIDUtils.cpp ++Un7Zip.o : ./Un7Zip.cpp ++ $(CXX) $(CFLAGS) ./Un7Zip.cpp +diff -dPNur p7zip_4.44/CPP/7zip/Bundles/Un7Zip/testlib.c p7zip_4.44-new/CPP/7zip/Bundles/Un7Zip/testlib.c +--- p7zip_4.44/CPP/7zip/Bundles/Un7Zip/testlib.c 1970-01-01 01:00:00.000000000 +0100 ++++ p7zip_4.44-new/CPP/7zip/Bundles/Un7Zip/testlib.c 2007-03-29 13:01:21.000000000 +0200 +@@ -0,0 +1,7 @@ ++ ++#include "u7zip.h" ++ ++int main(int argc, char *argv[]) ++{ ++ return un7zip(argv[1], "/tmp", 0); ++} +diff -dPNur p7zip_4.44/CPP/7zip/Bundles/Un7Zip/u7zip.h p7zip_4.44-new/CPP/7zip/Bundles/Un7Zip/u7zip.h +--- p7zip_4.44/CPP/7zip/Bundles/Un7Zip/u7zip.h 1970-01-01 01:00:00.000000000 +0100 ++++ p7zip_4.44-new/CPP/7zip/Bundles/Un7Zip/u7zip.h 2007-03-29 13:01:21.000000000 +0200 +@@ -0,0 +1,19 @@ ++#ifndef __UN7ZIP_H ++#define __UN7ZIP_H ++ ++#define LIST_7Z 0 ++#define TEST_7Z 1 ++#define EXTRACT_7Z 2 ++ ++#define S_OK 0x00000000L ++#define S_FALSE 0x00000001L ++#define E_NOTIMPL 0x80004001L ++#define E_NOINTERFACE 0x80004002L ++#define E_ABORT 0x80004004L ++#define E_FAIL 0x80004005L ++#define E_OUTOFMEMORY 0x8007000EL ++#define E_INVALIDARG 0x80070057L ++ ++int un7zip(char *name, char *dir, int command); ++ ++#endif +diff -dPNur p7zip_4.44/CPP/7zip/Bundles/Un7Zip/Un7Zip.cpp p7zip_4.44-new/CPP/7zip/Bundles/Un7Zip/Un7Zip.cpp +--- p7zip_4.44/CPP/7zip/Bundles/Un7Zip/Un7Zip.cpp 1970-01-01 01:00:00.000000000 +0100 ++++ p7zip_4.44-new/CPP/7zip/Bundles/Un7Zip/Un7Zip.cpp 2007-03-29 12:50:00.000000000 +0200 +@@ -0,0 +1,130 @@ ++// Un7Zip.cpp ++ ++#include "StdAfx.h" ++ ++#include "Common/MyInitGuid.h" ++ ++#include "Common/StdOutStream.h" ++#include "Common/Wildcard.h" ++#include "Common/StringConvert.h" ++#include "Common/MyCom.h" ++#include "Common/Exception.h" ++ ++#include "Windows/FileDir.h" ++#include "Windows/FileName.h" ++#include "Windows/Defs.h" ++ ++#include "../../IPassword.h" ++#include "../../ICoder.h" ++ ++#include "../../UI/Common/OpenArchive.h" ++#include "../../UI/Common/DefaultName.h" ++#include "../../UI/Common/ExitCode.h" ++#include "../../UI/Common/Extract.h" ++ ++#include "../../UI/Console/List.h" ++#include "../../UI/Console/OpenCallbackConsole.h" ++#include "../../UI/Console/ExtractCallbackNULL.h" ++ ++ ++static int Un7Zip(char *name, char *dir, int command); ++ ++extern "C" { ++ ++int un7zip(char *name, char *dir, int command) ++{ ++ return Un7Zip(name, dir, command); ++} ++ ++} ++ ++using namespace NWindows; ++using namespace NFile; ++ ++static const wchar_t *kUniversalWildcard = L"*"; ++static bool AddNameToCensor(NWildcard::CCensor &wildcardCensor) ++{ ++ wildcardCensor.AddItem(true, kUniversalWildcard, false); ++ return true; ++} ++ ++static int Un7Zip(char *name, char *dir, int commands) ++{ ++ ++ CStdOutStream *g_StdStream = &g_StdOut; ++ ++ NWildcard::CCensor wildcardCensor; ++ AddNameToCensor(wildcardCensor); ++ bool passwordEnabled = 1; ++ UString password = L"null"; ++ ++ UString outputDir= MultiByteToUnicodeString(dir); ++ UString archiveName = MultiByteToUnicodeString(name); ++ ++ NFind::CFileInfoW archiveFileInfo; ++ ++ if (!NFind::FindFile(archiveName, archiveFileInfo)) ++ return S_FALSE; ++ if (archiveFileInfo.IsDirectory()) ++ return S_FALSE; ++ ++ { ++ ++ UStringVector v1, v2; ++ v1.Add(archiveName); ++ v2.Add(archiveName); ++ ++ const NWildcard::CCensorNode &wildcardCensorHead = ++ wildcardCensor.Pairs.Front().Head; ++ ++ if(commands > 0) ++ { ++ CExtractCallbackNULL *ecs = new CExtractCallbackNULL; ++ CMyComPtr<IFolderArchiveExtractCallback> extractCallback = ecs; ++ ecs->OutStream = g_StdStream; ++ ecs->PasswordIsDefined = passwordEnabled; ++ ecs->Password = password; ++ ecs->Init(); ++ ++ COpenCallbackConsole openCallback; ++ openCallback.OutStream = g_StdStream; ++ openCallback.PasswordIsDefined = passwordEnabled; ++ openCallback.Password = password; ++ ++ CExtractOptions eo; ++ eo.StdOutMode = false; ++ eo.PathMode = NExtract::NPathMode::kFullPathnames; ++ if(commands == 1) ++ eo.TestMode = 1; ++ else ++ eo.TestMode = 0; ++ eo.OverwriteMode = NExtract::NOverwriteMode::kWithoutPrompt; ++ eo.OutputDir = outputDir; ++ eo.YesToAll = 1; ++ ++ UString errorMessage; ++ HRESULT result = DecompressArchives( ++ v1, v2, ++ wildcardCensorHead, ++ eo, &openCallback, ecs, errorMessage); ++ ++ if (ecs->NumArchiveErrors != 0 || ecs->NumFileErrors != 0) ++ return S_FALSE; ++ if (result != S_OK) ++ return S_FALSE; ++ } ++ else ++ { ++ HRESULT result = ListArchives( ++ v1, v2, ++ wildcardCensorHead, ++ true, ++ false, ++ passwordEnabled, ++ password); ++ if (result != S_OK) ++ return S_FALSE;; ++ } ++ } ++ return S_OK; ++} +diff -dPNur p7zip_4.44/CPP/7zip/UI/Console/ExtractCallbackNULL.cpp p7zip_4.44-new/CPP/7zip/UI/Console/ExtractCallbackNULL.cpp +--- p7zip_4.44/CPP/7zip/UI/Console/ExtractCallbackNULL.cpp 1970-01-01 01:00:00.000000000 +0100 ++++ p7zip_4.44-new/CPP/7zip/UI/Console/ExtractCallbackNULL.cpp 2007-03-29 12:55:02.000000000 +0200 +@@ -0,0 +1,132 @@ ++// ExtractCallbackNULL.cpp ++ ++#include "StdAfx.h" ++ ++#include "ExtractCallbackNULL.h" ++#include "UserInputUtils.h" ++#include "ConsoleClose.h" ++ ++#include "Common/Wildcard.h" ++ ++#include "Windows/FileDir.h" ++#include "Windows/FileFind.h" ++#include "Windows/Time.h" ++#include "Windows/Defs.h" ++#include "Windows/PropVariant.h" ++#include "Windows/Error.h" ++#include "Windows/PropVariantConversions.h" ++ ++#include "../../Common/FilePathAutoRename.h" ++ ++#include "../Common/ExtractingFilePath.h" ++ ++using namespace NWindows; ++using namespace NFile; ++using namespace NDirectory; ++ ++STDMETHODIMP CExtractCallbackNULL::SetTotal(UInt64 size) ++{ ++ if (NConsoleClose::TestBreakSignal()) ++ return E_ABORT; ++ return S_OK; ++} ++ ++STDMETHODIMP CExtractCallbackNULL::SetCompleted(const UInt64 *completeValue) ++{ ++ if (NConsoleClose::TestBreakSignal()) ++ return E_ABORT; ++ return S_OK; ++} ++ ++STDMETHODIMP CExtractCallbackNULL::AskOverwrite( ++ const wchar_t *existName, const FILETIME *existTime, const UInt64 *existSize, ++ const wchar_t *newName, const FILETIME *newTime, const UInt64 *newSize, ++ Int32 *answer) ++{ ++ ++ NUserAnswerMode::EEnum overwriteAnswer = ScanUserYesNoAllQuit(OutStream); ++ ++ switch(overwriteAnswer) ++ { ++ case NUserAnswerMode::kQuit: ++ return E_ABORT; ++ case NUserAnswerMode::kNo: ++ *answer = NOverwriteAnswer::kNo; ++ break; ++ case NUserAnswerMode::kNoAll: ++ *answer = NOverwriteAnswer::kNoToAll; ++ break; ++ case NUserAnswerMode::kYesAll: ++ *answer = NOverwriteAnswer::kYesToAll; ++ break; ++ case NUserAnswerMode::kYes: ++ *answer = NOverwriteAnswer::kYes; ++ break; ++ case NUserAnswerMode::kAutoRename: ++ *answer = NOverwriteAnswer::kAutoRename; ++ break; ++ default: ++ return E_FAIL; ++ } ++ return S_OK; ++} ++ ++STDMETHODIMP CExtractCallbackNULL::PrepareOperation(const wchar_t *name, Int32 askExtractMode, const UInt64 *position) ++{ ++ return S_OK; ++} ++ ++STDMETHODIMP CExtractCallbackNULL::MessageError(const wchar_t *message) ++{ ++ return S_OK; ++} ++ ++STDMETHODIMP CExtractCallbackNULL::SetOperationResult(Int32 operationResult, bool encrypted) ++{ ++ return S_OK; ++} ++ ++STDMETHODIMP CExtractCallbackNULL::CryptoGetTextPassword(BSTR *password) ++{ ++ if (!PasswordIsDefined) ++ { ++ Password = GetPassword(OutStream); ++ PasswordIsDefined = true; ++ } ++ CMyComBSTR tempName(Password); ++ *password = tempName.Detach(); ++ return S_OK; ++} ++ ++HRESULT CExtractCallbackNULL::BeforeOpen(const wchar_t *name) ++{ ++ return S_OK; ++} ++ ++HRESULT CExtractCallbackNULL::OpenResult(const wchar_t *name, HRESULT result, bool encrypted) ++{ ++ return S_OK; ++} ++ ++HRESULT CExtractCallbackNULL::ThereAreNoFiles() ++{ ++ return S_OK; ++} ++ ++HRESULT CExtractCallbackNULL::ExtractResult(HRESULT result) ++{ ++ if (result == S_OK) ++ return result; ++ if (result == E_ABORT) ++ return result; ++ if (result == E_OUTOFMEMORY) ++ return result; ++ return S_OK; ++} ++ ++HRESULT CExtractCallbackNULL::SetPassword(const UString &password) ++{ ++ PasswordIsDefined = true; ++ Password = password; ++ return S_OK; ++} +diff -dPNur p7zip_4.44/CPP/7zip/UI/Console/ExtractCallbackNULL.h p7zip_4.44-new/CPP/7zip/UI/Console/ExtractCallbackNULL.h +--- p7zip_4.44/CPP/7zip/UI/Console/ExtractCallbackNULL.h 1970-01-01 01:00:00.000000000 +0100 ++++ p7zip_4.44-new/CPP/7zip/UI/Console/ExtractCallbackNULL.h 2007-03-29 12:55:12.000000000 +0200 +@@ -0,0 +1,65 @@ ++// ExtractCallbackNULL.h ++ ++#ifndef __EXTRACTCALLBACKCONSOLE_H ++#define __EXTRACTCALLBACKCONSOLE_H ++ ++#include "Common/String.h" ++#include "Common/StdOutStream.h" ++#include "../../Common/FileStreams.h" ++#include "../../IPassword.h" ++#include "../../Archive/IArchive.h" ++#include "../Common/ArchiveExtractCallback.h" ++ ++class CExtractCallbackNULL: ++ public IExtractCallbackUI, ++ public ICryptoGetTextPassword, ++ public CMyUnknownImp ++{ ++public: ++ MY_UNKNOWN_IMP2(IFolderArchiveExtractCallback, ICryptoGetTextPassword) ++ ++ STDMETHOD(SetTotal)(UInt64 total); ++ STDMETHOD(SetCompleted)(const UInt64 *completeValue); ++ ++ // IFolderArchiveExtractCallback ++ STDMETHOD(AskOverwrite)( ++ const wchar_t *existName, const FILETIME *existTime, const UInt64 *existSize, ++ const wchar_t *newName, const FILETIME *newTime, const UInt64 *newSize, ++ Int32 *answer); ++ STDMETHOD (PrepareOperation)(const wchar_t *name, Int32 askExtractMode, const UInt64 *position); ++ ++ STDMETHOD(MessageError)(const wchar_t *message); ++ STDMETHOD(SetOperationResult)(Int32 operationResult, bool encrypted); ++ ++ // ICryptoGetTextPassword ++ STDMETHOD(CryptoGetTextPassword)(BSTR *password); ++ ++ HRESULT BeforeOpen(const wchar_t *name); ++ HRESULT OpenResult(const wchar_t *name, HRESULT result, bool encrypted); ++ HRESULT ThereAreNoFiles(); ++ HRESULT ExtractResult(HRESULT result); ++ ++ HRESULT SetPassword(const UString &password); ++ ++public: ++ bool PasswordIsDefined; ++ UString Password; ++ ++ UInt64 NumArchives; ++ UInt64 NumArchiveErrors; ++ UInt64 NumFileErrors; ++ UInt64 NumFileErrorsInCurrentArchive; ++ ++ CStdOutStream *OutStream; ++ ++ void Init() ++ { ++ NumArchives = 0; ++ NumArchiveErrors = 0; ++ NumFileErrors = 0; ++ NumFileErrorsInCurrentArchive = 0; ++ } ++ ++}; ++ ++#endif diff --git a/app-arch/p7zip/files/p7zip_4.57-ds-rusxmms.patch b/app-arch/p7zip/files/p7zip_4.57-ds-rusxmms.patch new file mode 100644 index 0000000..0913c13 --- /dev/null +++ b/app-arch/p7zip/files/p7zip_4.57-ds-rusxmms.patch @@ -0,0 +1,336 @@ +diff -dPNur p7zip_4.57/C/rccrecode.c p7zip_4.57-new/C/rccrecode.c +--- p7zip_4.57/C/rccrecode.c 1970-01-01 01:00:00.000000000 +0100 ++++ p7zip_4.57-new/C/rccrecode.c 2008-04-11 20:23:42.000000000 +0200 +@@ -0,0 +1,71 @@ ++#include <pthread.h> ++#include <librcc.h> ++ ++static rcc_class_default_charset default_oem[] = { ++ { "ru", "IBM866" }, ++ { NULL, NULL } ++}; ++ ++static rcc_class_default_charset default_iso[] = { ++ { "ru", "CP1251" }, ++ { NULL, NULL } ++}; ++ ++#define ARC_CLASS 0 ++#define OUT_CLASS 1 ++#define ARCOUT_CLASS 0 ++static rcc_class classes[] = { ++ { "oem", RCC_CLASS_STANDARD, NULL, default_oem, "OEM Encoding", 0 }, ++ { "out", RCC_CLASS_STANDARD, "LC_CTYPE", NULL, "Output", 0 }, ++ { NULL, RCC_CLASS_STANDARD, NULL, NULL, NULL, 0 } ++}; ++ ++static int initialized = 0; ++static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; ++ ++void *rcc_init() { ++ rcc_context ctx; ++ ++ pthread_mutex_lock(&mutex); ++ if (!initialized) { ++ rccInit(); ++ rccInitDefaultContext(NULL, 0, 0, classes, 0); ++ rccLoad(NULL, "zip"); ++ rccInitDb4(NULL, NULL, 0); ++ } ++ initialized++; ++ pthread_mutex_unlock(&mutex); ++ ++ ctx = rccCreateContext(NULL, 0, 0, classes, 0); ++ if (ctx) rccInitDb4(ctx, NULL, 0); ++ if (ctx) rccLoad(ctx, "zip"); ++ ++ return ctx; ++} ++ ++ ++void rcc_free(void *ctx) { ++ if (ctx) rccFreeContext((rcc_context)ctx); ++ ++ pthread_mutex_lock(&mutex); ++ if (initialized == 1) rccFree(); ++ initialized--; ++ pthread_mutex_unlock(&mutex); ++} ++ ++ ++char *rcc_read(void *ctx, const char *string, size_t size) { ++ if (!initialized) { ++ rcc_init(); ++ if (!initialized) return NULL; ++ } ++ return rccSizedRecode((rcc_context)ctx, ARC_CLASS, OUT_CLASS, string, size, NULL); ++} ++ ++char *rcc_write(rcc_context ctx, const char *string, size_t size) { ++ if (!initialized) { ++ rcc_init(); ++ if (!initialized) return NULL; ++ } ++ return rccSizedRecode((rcc_context)ctx, OUT_CLASS, ARCOUT_CLASS, string, size, NULL); ++} +diff -dPNur p7zip_4.57/C/rccrecode.h p7zip_4.57-new/C/rccrecode.h +--- p7zip_4.57/C/rccrecode.h 1970-01-01 01:00:00.000000000 +0100 ++++ p7zip_4.57-new/C/rccrecode.h 2008-04-11 20:23:42.000000000 +0200 +@@ -0,0 +1,17 @@ ++#ifndef _RCC_RECODE_H ++#define _RCC_RECODE_H ++ ++# ifdef __cplusplus ++extern "C" { ++# endif ++ ++ void *rcc_init(); ++ void rcc_free(void *ctx); ++ char *rcc_read(void *ctx, const char *string, size_t size); ++ char *rcc_write(void *ctx, const char *string, size_t size); ++ ++# ifdef __cplusplus ++} ++# endif ++ ++#endif /* _RCC_RECODE_H */ +diff -dPNur p7zip_4.57/CPP/7zip/Archive/Zip/ZipIn.cpp p7zip_4.57-new/CPP/7zip/Archive/Zip/ZipIn.cpp +--- p7zip_4.57/CPP/7zip/Archive/Zip/ZipIn.cpp 2007-12-08 11:19:00.000000000 +0100 ++++ p7zip_4.57-new/CPP/7zip/Archive/Zip/ZipIn.cpp 2008-04-11 20:23:42.000000000 +0200 +@@ -9,11 +9,22 @@ + #include "../../Common/LimitedStreams.h" + #include "../../Common/StreamUtils.h" + ++#include "../../../../C/rccrecode.h" ++ + namespace NArchive { + namespace NZip { ++ ++CInArchive::CInArchive() { ++ rccctx = rcc_init(); ++} ++ ++CInArchive::~CInArchive() { ++ rcc_free(rccctx); ++} ++ + + // static const char kEndOfString = '\0'; +- ++ + bool CInArchive::Open(IInStream *inStream, const UInt64 *searchHeaderSizeLimit) + { + m_Stream = inStream; +@@ -196,10 +207,18 @@ + + AString CInArchive::ReadFileName(UInt32 nameSize) + { ++ char *rccrec; + if (nameSize == 0) + return AString(); + SafeReadBytes(m_NameBuffer.GetBuffer(nameSize), nameSize); + m_NameBuffer.ReleaseBuffer(nameSize); ++ ++ rccrec = rcc_read(rccctx, (LPCSTR)m_NameBuffer, 0); ++ if (rccrec) { ++ m_NameBuffer = rccrec; ++ free(rccrec); ++ } ++ + return m_NameBuffer; + } + +diff -dPNur p7zip_4.57/CPP/7zip/Archive/Zip/ZipIn.h p7zip_4.57-new/CPP/7zip/Archive/Zip/ZipIn.h +--- p7zip_4.57/CPP/7zip/Archive/Zip/ZipIn.h 2007-12-08 11:19:00.000000000 +0100 ++++ p7zip_4.57-new/CPP/7zip/Archive/Zip/ZipIn.h 2008-04-11 20:23:42.000000000 +0200 +@@ -106,6 +106,10 @@ + bool SeekInArchive(UInt64 position); + ISequentialInStream *CreateLimitedStream(UInt64 position, UInt64 size); + IInStream* CreateStream(); ++ ++ void *rccctx; ++ CInArchive(); ++ ~CInArchive(); + }; + + }} +diff -dPNur p7zip_4.57/CPP/7zip/Archive/Zip/ZipOut.cpp p7zip_4.57-new/CPP/7zip/Archive/Zip/ZipOut.cpp +--- p7zip_4.57/CPP/7zip/Archive/Zip/ZipOut.cpp 2007-06-26 20:06:23.000000000 +0200 ++++ p7zip_4.57-new/CPP/7zip/Archive/Zip/ZipOut.cpp 2008-04-11 20:23:42.000000000 +0200 +@@ -7,9 +7,19 @@ + #include "../../Common/OffsetStream.h" + #include "../../Common/StreamUtils.h" + ++#include "../../../../C/rccrecode.h" ++ + namespace NArchive { + namespace NZip { + ++COutArchive::COutArchive() { ++ rccctx = rcc_init(); ++} ++ ++COutArchive::~COutArchive() { ++ rcc_free(rccctx); ++} ++ + void COutArchive::Create(IOutStream *outStream) + { + if (!m_OutBuffer.Create(1 << 16)) +@@ -112,6 +122,7 @@ + { + SeekTo(m_BasePosition); + ++ char *rccrec; + bool isZip64 = m_IsZip64 || item.PackSize >= 0xFFFFFFFF || item.UnPackSize >= 0xFFFFFFFF; + + WriteUInt32(NSignature::kLocalFileHeader); +@@ -130,6 +141,12 @@ + throw CSystemException(E_FAIL); + } + WriteUInt16((UInt16)m_ExtraSize); // test it; ++ rccrec = rcc_write(rccctx, (const char *)item.Name, item.Name.Length()); ++ if (rccrec) { ++ printf("%u, %s.\n", item.Name.Length(), rccrec); ++ WriteBytes(rccrec, strlen(rccrec)); ++ free(rccrec); ++ } else + WriteBytes((const char *)item.Name, item.Name.Length()); + + UInt32 extraPos = 0; +@@ -154,6 +171,7 @@ + + void COutArchive::WriteCentralHeader(const CItem &item) + { ++ char *rccrec; + bool isUnPack64 = item.UnPackSize >= 0xFFFFFFFF; + bool isPack64 = item.PackSize >= 0xFFFFFFFF; + bool isPosition64 = item.LocalHeaderPosition >= 0xFFFFFFFF; +@@ -180,6 +198,13 @@ + WriteUInt16(item.InternalAttributes); + WriteUInt32(item.ExternalAttributes); + WriteUInt32(isPosition64 ? 0xFFFFFFFF: (UInt32)item.LocalHeaderPosition); ++ ++ rccrec = rcc_write(rccctx, (const char *)item.Name, item.Name.Length()); ++ if (rccrec) { ++ printf("C: %u, %s.\n", item.Name.Length(), rccrec); ++ WriteBytes(rccrec, strlen(rccrec)); ++ free(rccrec); ++ } else + WriteBytes((const char *)item.Name, item.Name.Length()); + if (isZip64) + { +diff -dPNur p7zip_4.57/CPP/7zip/Archive/Zip/ZipOut.h p7zip_4.57-new/CPP/7zip/Archive/Zip/ZipOut.h +--- p7zip_4.57/CPP/7zip/Archive/Zip/ZipOut.h 2007-06-26 20:06:22.000000000 +0200 ++++ p7zip_4.57-new/CPP/7zip/Archive/Zip/ZipOut.h 2008-04-11 20:23:42.000000000 +0200 +@@ -49,6 +49,11 @@ + void CreateStreamForCompressing(IOutStream **outStream); + void CreateStreamForCopying(ISequentialOutStream **outStream); + void SeekToPackedDataPosition(); ++ ++ void *rccctx; ++ COutArchive(); ++ ~COutArchive(); ++ + }; + + }} +diff -dPNur p7zip_4.57/CPP/7zip/Bundles/Alone/makefile p7zip_4.57-new/CPP/7zip/Bundles/Alone/makefile +--- p7zip_4.57/CPP/7zip/Bundles/Alone/makefile 2007-07-24 20:55:33.000000000 +0200 ++++ p7zip_4.57-new/CPP/7zip/Bundles/Alone/makefile 2008-04-11 20:23:42.000000000 +0200 +@@ -15,6 +15,7 @@ + LIBS=$(LOCAL_LIBS) + + OBJS=\ ++rccrecode.o \ + myGetTickCount.o \ + wine_date_and_time.o \ + myAddExeFlag.o \ +diff -dPNur p7zip_4.57/CPP/7zip/Bundles/Alone/makefile.list p7zip_4.57-new/CPP/7zip/Bundles/Alone/makefile.list +--- p7zip_4.57/CPP/7zip/Bundles/Alone/makefile.list 2007-07-24 20:56:10.000000000 +0200 ++++ p7zip_4.57-new/CPP/7zip/Bundles/Alone/makefile.list 2008-04-11 20:23:42.000000000 +0200 +@@ -196,6 +196,7 @@ + ../../../../C/Compress/Branch/BranchPPC.c \ + ../../../../C/Compress/Branch/BranchSPARC.c \ + ../../../../C/Compress/Branch/BranchX86.c \ ++ ../../../../C/rccrecode.c \ + ../../../../C/7zCrc.c \ + ../../../../C/Sort.c \ + ../../../../C/Threads.c \ +@@ -237,6 +238,8 @@ + $(CXX) $(CFLAGS) ../../../Common/IntToString.cpp + ListFileUtils.o : ../../../Common/ListFileUtils.cpp + $(CXX) $(CFLAGS) ../../../Common/ListFileUtils.cpp ++rccrecode.o : ../../../../C/rccrecode.c ++ $(CC) $(CFLAGS) ../../../../C/rccrecode.c + MyWindows.o : ../../../Common/MyWindows.cpp + $(CXX) $(CFLAGS) ../../../Common/MyWindows.cpp + Random.o : ../../../Common/Random.cpp +diff -dPNur p7zip_4.57/CPP/7zip/Bundles/Format7zFree/makefile p7zip_4.57-new/CPP/7zip/Bundles/Format7zFree/makefile +--- p7zip_4.57/CPP/7zip/Bundles/Format7zFree/makefile 2007-08-03 20:16:04.000000000 +0200 ++++ p7zip_4.57-new/CPP/7zip/Bundles/Format7zFree/makefile 2008-04-11 20:30:53.000000000 +0200 +@@ -14,6 +14,7 @@ + LIBS=$(LOCAL_LIBS_DLL) + + OBJS = \ ++rccrecode.o \ + wine_date_and_time.o \ + myGetTickCount.o \ + CRC.o \ +diff -dPNur p7zip_4.57/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4.57-new/CPP/7zip/Bundles/Format7zFree/makefile.list +--- p7zip_4.57/CPP/7zip/Bundles/Format7zFree/makefile.list 2007-08-03 20:17:57.000000000 +0200 ++++ p7zip_4.57-new/CPP/7zip/Bundles/Format7zFree/makefile.list 2008-04-11 20:32:11.000000000 +0200 +@@ -218,6 +218,7 @@ + ../../../../C/Compress/Branch/BranchPPC.c \ + ../../../../C/Compress/Branch/BranchSPARC.c \ + ../../../../C/Compress/Branch/BranchX86.c \ ++ ../../../../C/rccrecode.c \ + ../../../../C/7zCrc.c \ + ../../../../C/Sort.c \ + ../../../../C/Threads.c \ +@@ -237,6 +238,8 @@ + $(CXX) $(CC_SHARED) $(CFLAGS) ../../../Common/ListFileUtils.cpp + MyWindows.o : ../../../Common/MyWindows.cpp + $(CXX) $(CC_SHARED) $(CFLAGS) ../../../Common/MyWindows.cpp ++rccrecode.o : ../../../../C/rccrecode.c ++ $(CC) $(CC_SHARED) $(CFLAGS) ../../../../C/rccrecode.c + Random.o : ../../../Common/Random.cpp + $(CXX) $(CC_SHARED) $(CFLAGS) ../../../Common/Random.cpp + StdInStream.o : ../../../Common/StdInStream.cpp +diff -dPNur p7zip_4.57/makefile.machine p7zip_4.57-new/makefile.machine +--- p7zip_4.57/makefile.machine 2007-12-15 18:19:48.000000000 +0100 ++++ p7zip_4.57-new/makefile.machine 2008-04-11 20:23:42.000000000 +0200 +@@ -14,7 +14,7 @@ + CC_SHARED=-fPIC + LINK_SHARED=-fPIC -shared + +-LOCAL_LIBS=-lpthread ++LOCAL_LIBS=-lpthread -lrcc + LOCAL_LIBS_DLL=$(LOCAL_LIBS) -ldl + + OBJ_CRC32=$(OBJ_CRC32_C) +diff -dPNur p7zip_4.57/makefile.machine.orig p7zip_4.57-new/makefile.machine.orig +--- p7zip_4.57/makefile.machine.orig 1970-01-01 01:00:00.000000000 +0100 ++++ p7zip_4.57-new/makefile.machine.orig 2007-12-15 18:19:48.000000000 +0100 +@@ -0,0 +1,21 @@ ++# ++# makefile for Linux (x86, PPC, alpha ...) ++# ++ ++OPTFLAGS=-O ++ ++ALLFLAGS=${OPTFLAGS} -s \ ++ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ ++ -DNDEBUG -D_REENTRANT -DENV_UNIX \ ++ $(LOCAL_FLAGS) ++ ++CXX=g++ $(ALLFLAGS) ++CC=gcc $(ALLFLAGS) ++CC_SHARED=-fPIC ++LINK_SHARED=-fPIC -shared ++ ++LOCAL_LIBS=-lpthread ++LOCAL_LIBS_DLL=$(LOCAL_LIBS) -ldl ++ ++OBJ_CRC32=$(OBJ_CRC32_C) ++ diff --git a/app-arch/p7zip/files/p7zip_4.57-libun7zip.patch b/app-arch/p7zip/files/p7zip_4.57-libun7zip.patch new file mode 100644 index 0000000..07a3188 --- /dev/null +++ b/app-arch/p7zip/files/p7zip_4.57-libun7zip.patch @@ -0,0 +1,684 @@ +diff -dPNur p7zip_4.57/CPP/7zip/Bundles/Un7Zip/makefile p7zip_4.57-new/CPP/7zip/Bundles/Un7Zip/makefile +--- p7zip_4.57/CPP/7zip/Bundles/Un7Zip/makefile 1970-01-01 01:00:00.000000000 +0100 ++++ p7zip_4.57-new/CPP/7zip/Bundles/Un7Zip/makefile 2008-04-11 19:39:40.000000000 +0200 +@@ -0,0 +1,99 @@ ++PROG=libun7zip.so ++ ++LOCAL_FLAGS= \ ++ -DEXTRACT_ONLY \ ++ -DNO_READ_FROM_CODER \ ++ -D_SFX ++ ++include ../../../../makefile.crc32 ++include ../../../../makefile.machine ++ ++LOCAL_SHARED=$(LINK_SHARED) ++LIBS=$(LOCAL_LIBS_DLL) ++ ++OBJS=\ ++myGetTickCount.o\ ++wine_date_and_time.o\ ++mySplitCommandLine.o\ ++CommandLineParser.o\ ++CRC.o\ ++IntToString.o\ ++StdInStream.o\ ++StdOutStream.o\ ++MyString.o\ ++MyWindows.o\ ++StringConvert.o\ ++MyVector.o\ ++Wildcard.o\ ++CoderMixer2.o\ ++CoderMixer2MT.o\ ++CrossThreadProgress.o\ ++FilterCoder.o\ ++ItemNameUtils.o\ ++OutStreamWithCRC.o\ ++ConsoleClose.o\ ++ExtractCallbackConsole.o\ ++ExtractCallbackNULL.o\ ++List.o\ ++OpenCallbackConsole.o\ ++UserInputUtils.o\ ++7zDecode.o\ ++7zExtract.o\ ++7zFolderOutStream.o\ ++7zHandler.o\ ++7zHeader.o\ ++7zIn.o\ ++7zRegister.o\ ++LZMADecoder.o\ ++LZMARegister.o\ ++BranchCoder.o\ ++x86.o\ ++x86_2.o\ ++PPMDDecoder.o\ ++PPMDRegister.o\ ++LZOutWindow.o\ ++CopyCoder.o\ ++CopyRegister.o\ ++7zAES.o\ ++7zAESRegister.o\ ++MyAES.o\ ++Error.o\ ++FileDir.o\ ++FileFind.o\ ++FileIO.o\ ++FileName.o\ ++PropVariant.o\ ++PropVariantConversions.o\ ++Synchronization.o\ ++System.o\ ++FilePathAutoRename.o\ ++FileStreams.o\ ++InBuffer.o\ ++LimitedStreams.o\ ++LockedStream.o\ ++StreamUtils.o\ ++OutBuffer.o\ ++ProgressUtils.o\ ++StreamBinder.o\ ++StreamObjects.o\ ++VirtThread.o \ ++ArchiveExtractCallback.o\ ++ArchiveOpenCallback.o\ ++DefaultName.o\ ++LoadCodecs.o\ ++Extract.o\ ++ExtractingFilePath.o\ ++OpenArchive.o\ ++PropIDUtils.o\ ++CreateCoder.o\ ++Sha256.o \ ++BranchX86.o \ ++BCJ2Register.o\ ++BCJRegister.o\ ++Threads.o\ ++$(OBJ_CRC32) \ ++Aes.o \ ++Un7Zip.o ++ ++include ../../../../makefile.glb ++ +diff -dPNur p7zip_4.57/CPP/7zip/Bundles/Un7Zip/makefile.depend p7zip_4.57-new/CPP/7zip/Bundles/Un7Zip/makefile.depend +--- p7zip_4.57/CPP/7zip/Bundles/Un7Zip/makefile.depend 1970-01-01 01:00:00.000000000 +0100 ++++ p7zip_4.57-new/CPP/7zip/Bundles/Un7Zip/makefile.depend 2008-04-11 18:37:10.000000000 +0200 +@@ -0,0 +1 @@ ++ +\ No newline at end of file +diff -dPNur p7zip_4.57/CPP/7zip/Bundles/Un7Zip/makefile.list p7zip_4.57-new/CPP/7zip/Bundles/Un7Zip/makefile.list +--- p7zip_4.57/CPP/7zip/Bundles/Un7Zip/makefile.list 1970-01-01 01:00:00.000000000 +0100 ++++ p7zip_4.57-new/CPP/7zip/Bundles/Un7Zip/makefile.list 2008-04-11 19:19:43.000000000 +0200 +@@ -0,0 +1,180 @@ ++wine_date_and_time.o : ../../../myWindows/wine_date_and_time.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../../myWindows/wine_date_and_time.cpp ++myGetTickCount.o : ../../../myWindows/myGetTickCount.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../../myWindows/myGetTickCount.cpp ++mySplitCommandLine.o : ../../../myWindows/mySplitCommandLine.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../../myWindows/mySplitCommandLine.cpp ++CommandLineParser.o : ../../../Common/CommandLineParser.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../../Common/CommandLineParser.cpp ++CRC.o : ../../../Common/CRC.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../../Common/CRC.cpp ++IntToString.o : ../../../Common/IntToString.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../../Common/IntToString.cpp ++ListFileUtils.o : ../../../Common/ListFileUtils.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../../Common/ListFileUtils.cpp ++MyWindows.o : ../../../Common/MyWindows.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../../Common/MyWindows.cpp ++Random.o : ../../../Common/Random.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../../Common/Random.cpp ++StdInStream.o : ../../../Common/StdInStream.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../../Common/StdInStream.cpp ++StdOutStream.o : ../../../Common/StdOutStream.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../../Common/StdOutStream.cpp ++MyString.o : ../../../Common/MyString.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../../Common/MyString.cpp ++StringConvert.o : ../../../Common/StringConvert.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../../Common/StringConvert.cpp ++StringToInt.o : ../../../Common/StringToInt.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../../Common/StringToInt.cpp ++UTFConvert.o : ../../../Common/UTFConvert.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../../Common/UTFConvert.cpp ++MyVector.o : ../../../Common/MyVector.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../../Common/MyVector.cpp ++Wildcard.o : ../../../Common/Wildcard.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../../Common/Wildcard.cpp ++CoderMixer2.o : ../../Archive/Common/CoderMixer2.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Archive/Common/CoderMixer2.cpp ++CoderMixer2MT.o : ../../Archive/Common/CoderMixer2MT.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Archive/Common/CoderMixer2MT.cpp ++CrossThreadProgress.o : ../../Archive/Common/CrossThreadProgress.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Archive/Common/CrossThreadProgress.cpp ++ItemNameUtils.o : ../../Archive/Common/ItemNameUtils.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Archive/Common/ItemNameUtils.cpp ++OutStreamWithCRC.o : ../../Archive/Common/OutStreamWithCRC.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Archive/Common/OutStreamWithCRC.cpp ++ConsoleClose.o : ../../UI/Console/ConsoleClose.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../UI/Console/ConsoleClose.cpp ++ExtractCallbackConsole.o : ../../UI/Console/ExtractCallbackConsole.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../UI/Console/ExtractCallbackConsole.cpp ++List.o : ../../UI/Console/List.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../UI/Console/List.cpp ++MainAr.o : ../../UI/Console/MainAr.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../UI/Console/MainAr.cpp ++OpenCallbackConsole.o : ../../UI/Console/OpenCallbackConsole.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../UI/Console/OpenCallbackConsole.cpp ++UserInputUtils.o : ../../UI/Console/UserInputUtils.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../UI/Console/UserInputUtils.cpp ++7zDecode.o : ../../Archive/7z/7zDecode.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Archive/7z/7zDecode.cpp ++7zExtract.o : ../../Archive/7z/7zExtract.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Archive/7z/7zExtract.cpp ++7zFolderOutStream.o : ../../Archive/7z/7zFolderOutStream.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Archive/7z/7zFolderOutStream.cpp ++7zHandler.o : ../../Archive/7z/7zHandler.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Archive/7z/7zHandler.cpp ++7zHeader.o : ../../Archive/7z/7zHeader.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Archive/7z/7zHeader.cpp ++7zIn.o : ../../Archive/7z/7zIn.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Archive/7z/7zIn.cpp ++LZMADecoder.o : ../../Compress/LZMA/LZMADecoder.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Compress/LZMA/LZMADecoder.cpp ++BranchCoder.o : ../../Compress/Branch/BranchCoder.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Compress/Branch/BranchCoder.cpp ++x86.o : ../../Compress/Branch/x86.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Compress/Branch/x86.cpp ++x86_2.o : ../../Compress/Branch/x86_2.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Compress/Branch/x86_2.cpp ++PPMDDecoder.o : ../../Compress/PPMD/PPMDDecoder.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Compress/PPMD/PPMDDecoder.cpp ++LZOutWindow.o : ../../Compress/LZ/LZOutWindow.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Compress/LZ/LZOutWindow.cpp ++CopyCoder.o : ../../Compress/Copy/CopyCoder.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Compress/Copy/CopyCoder.cpp ++7zAES.o : ../../Crypto/7zAES/7zAES.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Crypto/7zAES/7zAES.cpp ++MyAES.o : ../../Crypto/AES/MyAES.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Crypto/AES/MyAES.cpp ++Sha256.o : ../../Crypto/Hash/Sha256.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Crypto/Hash/Sha256.cpp ++Error.o : ../../../Windows/Error.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../../Windows/Error.cpp ++FileDir.o : ../../../Windows/FileDir.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../../Windows/FileDir.cpp ++FileFind.o : ../../../Windows/FileFind.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../../Windows/FileFind.cpp ++FileIO.o : ../../../Windows/FileIO.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../../Windows/FileIO.cpp ++FileName.o : ../../../Windows/FileName.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../../Windows/FileName.cpp ++PropVariant.o : ../../../Windows/PropVariant.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../../Windows/PropVariant.cpp ++PropVariantConversions.o : ../../../Windows/PropVariantConversions.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../../Windows/PropVariantConversions.cpp ++Synchronization.o : ../../../Windows/Synchronization.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../../Windows/Synchronization.cpp ++System.o : ../../../Windows/System.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../../Windows/System.cpp ++CreateCoder.o : ../../Common/CreateCoder.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Common/CreateCoder.cpp ++FilePathAutoRename.o : ../../Common/FilePathAutoRename.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Common/FilePathAutoRename.cpp ++FileStreams.o : ../../Common/FileStreams.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Common/FileStreams.cpp ++FilterCoder.o : ../../Common/FilterCoder.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Common/FilterCoder.cpp ++InBuffer.o : ../../Common/InBuffer.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Common/InBuffer.cpp ++LimitedStreams.o : ../../Common/LimitedStreams.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Common/LimitedStreams.cpp ++LockedStream.o : ../../Common/LockedStream.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Common/LockedStream.cpp ++StreamUtils.o : ../../Common/StreamUtils.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Common/StreamUtils.cpp ++OutBuffer.o : ../../Common/OutBuffer.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Common/OutBuffer.cpp ++ProgressUtils.o : ../../Common/ProgressUtils.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Common/ProgressUtils.cpp ++StreamBinder.o : ../../Common/StreamBinder.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Common/StreamBinder.cpp ++StreamObjects.o : ../../Common/StreamObjects.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Common/StreamObjects.cpp ++VirtThread.o : ../../Common/VirtThread.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Common/VirtThread.cpp ++ArchiveExtractCallback.o : ../../UI/Common/ArchiveExtractCallback.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../UI/Common/ArchiveExtractCallback.cpp ++ArchiveOpenCallback.o : ../../UI/Common/ArchiveOpenCallback.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../UI/Common/ArchiveOpenCallback.cpp ++LoadCodecs.o : ../../UI/Common/LoadCodecs.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../UI/Common/LoadCodecs.cpp ++DefaultName.o : ../../UI/Common/DefaultName.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../UI/Common/DefaultName.cpp ++Extract.o : ../../UI/Common/Extract.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../UI/Common/Extract.cpp ++ExtractingFilePath.o : ../../UI/Common/ExtractingFilePath.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../UI/Common/ExtractingFilePath.cpp ++OpenArchive.o : ../../UI/Common/OpenArchive.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../UI/Common/OpenArchive.cpp ++PropIDUtils.o : ../../UI/Common/PropIDUtils.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../UI/Common/PropIDUtils.cpp ++Main.o : ./Main.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ./Main.cpp ++BranchX86.o : ../../../../C/Compress/Branch/BranchX86.c ++ $(CC) $(CFLAGS) $(CC_SHARED) ../../../../C/Compress/Branch/BranchX86.c ++7zRegister.o : ../../Archive/7z/7zRegister.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Archive/7z/7zRegister.cpp ++LZMARegister.o : ../../Compress/LZMA/LZMARegister.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Compress/LZMA/LZMARegister.cpp ++BCJ2Register.o : ../../Compress/Branch/BCJ2Register.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Compress/Branch/BCJ2Register.cpp ++BCJRegister.o : ../../Compress/Branch/BCJRegister.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Compress/Branch/BCJRegister.cpp ++PPMDRegister.o : ../../Compress/PPMD/PPMDRegister.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Compress/PPMD/PPMDRegister.cpp ++CopyRegister.o : ../../Compress/Copy/CopyRegister.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Compress/Copy/CopyRegister.cpp ++7zAESRegister.o : ../../Crypto/7zAES/7zAESRegister.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../Crypto/7zAES/7zAESRegister.cpp ++Threads.o : ../../../../C/Threads.c ++ $(CC) $(CFLAGS) $(CC_SHARED) ../../../../C/Threads.c ++Aes.o : ../../../../C/Crypto/Aes.c ++ $(CC) $(CFLAGS) $(CC_SHARED) ../../../../C/Crypto/Aes.c ++# CRC32, C version ++7zCrc.o : ../../../../C/7zCrc.c ++ $(CC) $(CFLAGS) $(CC_SHARED) ../../../../C/7zCrc.c ++# CRC32, ASM version ++7zCrcT8.o : ../../../../C/7zCrcT8.c ++ $(CC) $(CFLAGS) $(CC_SHARED) ../../../../C/7zCrcT8.c ++ExtractCallbackNULL.o : ../../UI/Console/ExtractCallbackNULL.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ../../UI/Console/ExtractCallbackNULL.cpp ++Un7Zip.o : ./Un7Zip.cpp ++ $(CXX) $(CFLAGS) $(CC_SHARED) ./Un7Zip.cpp +diff -dPNur p7zip_4.57/CPP/7zip/Bundles/Un7Zip/testlib.c p7zip_4.57-new/CPP/7zip/Bundles/Un7Zip/testlib.c +--- p7zip_4.57/CPP/7zip/Bundles/Un7Zip/testlib.c 1970-01-01 01:00:00.000000000 +0100 ++++ p7zip_4.57-new/CPP/7zip/Bundles/Un7Zip/testlib.c 2008-04-11 18:37:10.000000000 +0200 +@@ -0,0 +1,7 @@ ++ ++#include "u7zip.h" ++ ++int main(int argc, char *argv[]) ++{ ++ return un7zip(argv[1], "/tmp", 0); ++} +diff -dPNur p7zip_4.57/CPP/7zip/Bundles/Un7Zip/u7zip.h p7zip_4.57-new/CPP/7zip/Bundles/Un7Zip/u7zip.h +--- p7zip_4.57/CPP/7zip/Bundles/Un7Zip/u7zip.h 1970-01-01 01:00:00.000000000 +0100 ++++ p7zip_4.57-new/CPP/7zip/Bundles/Un7Zip/u7zip.h 2008-04-11 18:37:10.000000000 +0200 +@@ -0,0 +1,19 @@ ++#ifndef __UN7ZIP_H ++#define __UN7ZIP_H ++ ++#define LIST_7Z 0 ++#define TEST_7Z 1 ++#define EXTRACT_7Z 2 ++ ++#define S_OK 0x00000000L ++#define S_FALSE 0x00000001L ++#define E_NOTIMPL 0x80004001L ++#define E_NOINTERFACE 0x80004002L ++#define E_ABORT 0x80004004L ++#define E_FAIL 0x80004005L ++#define E_OUTOFMEMORY 0x8007000EL ++#define E_INVALIDARG 0x80070057L ++ ++int un7zip(char *name, char *dir, int command); ++ ++#endif +diff -dPNur p7zip_4.57/CPP/7zip/Bundles/Un7Zip/Un7Zip.cpp p7zip_4.57-new/CPP/7zip/Bundles/Un7Zip/Un7Zip.cpp +--- p7zip_4.57/CPP/7zip/Bundles/Un7Zip/Un7Zip.cpp 1970-01-01 01:00:00.000000000 +0100 ++++ p7zip_4.57-new/CPP/7zip/Bundles/Un7Zip/Un7Zip.cpp 2008-04-11 19:33:45.000000000 +0200 +@@ -0,0 +1,148 @@ ++// Un7Zip.cpp ++ ++#include "StdAfx.h" ++ ++#include "Common/MyInitGuid.h" ++ ++#include "Common/StdOutStream.h" ++#include "Common/Wildcard.h" ++#include "Common/StringConvert.h" ++#include "Common/MyCom.h" ++#include "Common/MyException.h" ++ ++#include "Windows/FileDir.h" ++#include "Windows/FileName.h" ++#include "Windows/Defs.h" ++ ++#include "../../IPassword.h" ++#include "../../ICoder.h" ++ ++#include "../../UI/Common/OpenArchive.h" ++#include "../../UI/Common/DefaultName.h" ++#include "../../UI/Common/ExitCode.h" ++#include "../../UI/Common/Extract.h" ++ ++#include "../../UI/Console/List.h" ++#include "../../UI/Console/OpenCallbackConsole.h" ++#include "../../UI/Console/ExtractCallbackNULL.h" ++ ++ ++static int Un7Zip(char *name, char *dir, int command); ++ ++extern "C" { ++ ++int un7zip(char *name, char *dir, int command) ++{ ++ return Un7Zip(name, dir, command); ++} ++ ++} ++ ++using namespace NWindows; ++using namespace NFile; ++ ++static const wchar_t *kUniversalWildcard = L"*"; ++static bool AddNameToCensor(NWildcard::CCensor &wildcardCensor) ++{ ++ wildcardCensor.AddItem(true, kUniversalWildcard, false); ++ return true; ++} ++ ++static int Un7Zip(char *name, char *dir, int commands) ++{ ++ ++ CStdOutStream *g_StdStream = &g_StdOut; ++ ++ NWildcard::CCensor wildcardCensor; ++ AddNameToCensor(wildcardCensor); ++ bool passwordEnabled = 1; ++ UString password = L"null"; ++ ++ UString outputDir= MultiByteToUnicodeString(dir); ++ UString archiveName = MultiByteToUnicodeString(name); ++ ++ NFind::CFileInfoW archiveFileInfo; ++ ++ if (!NFind::FindFile(archiveName, archiveFileInfo)) ++ return S_FALSE; ++ if (archiveFileInfo.IsDirectory()) ++ return S_FALSE; ++ ++ { ++ ++ UStringVector v1, v2; ++ v1.Add(archiveName); ++ v2.Add(archiveName); ++ ++ ++ CCodecs *codecs = new CCodecs; ++ CMyComPtr< ++ #ifdef EXTERNAL_CODECS ++ ICompressCodecsInfo ++ #else ++ IUnknown ++ #endif ++ > compressCodecsInfo = codecs; ++ HRESULT result = codecs->Load(); ++ if (result != S_OK) ++ throw CSystemException(result); ++ ++ const NWildcard::CCensorNode &wildcardCensorHead = ++ wildcardCensor.Pairs.Front().Head; ++ ++ if(commands > 0) ++ { ++ CExtractCallbackNULL *ecs = new CExtractCallbackNULL; ++ CMyComPtr<IFolderArchiveExtractCallback> extractCallback = ecs; ++ ecs->OutStream = g_StdStream; ++ ecs->PasswordIsDefined = passwordEnabled; ++ ecs->Password = password; ++ ecs->Init(); ++ ++ COpenCallbackConsole openCallback; ++ openCallback.OutStream = g_StdStream; ++ openCallback.PasswordIsDefined = passwordEnabled; ++ openCallback.Password = password; ++ ++ CExtractOptions eo; ++ eo.StdOutMode = false; ++ eo.PathMode = NExtract::NPathMode::kFullPathnames; ++ if(commands == 1) ++ eo.TestMode = 1; ++ else ++ eo.TestMode = 0; ++ eo.OverwriteMode = NExtract::NOverwriteMode::kWithoutPrompt; ++ eo.OutputDir = outputDir; ++ eo.YesToAll = 1; ++ ++ UString errorMessage; ++ CDecompressStat stat; ++ ++ HRESULT result = DecompressArchives( ++ codecs, ++ v1, v2, ++ wildcardCensorHead, ++ eo, &openCallback, ecs, errorMessage, stat); ++ ++ if (ecs->NumArchiveErrors != 0 || ecs->NumFileErrors != 0) ++ return S_FALSE; ++ if (result != S_OK) ++ return S_FALSE; ++ } ++ else ++ { ++ UInt64 numErrors = 0; ++ HRESULT result = ListArchives( ++ codecs, ++ v1, v2, ++ wildcardCensorHead, ++ true, false, ++ passwordEnabled, ++ password, numErrors); ++ ++ if (result != S_OK) ++ return S_FALSE;; ++ } ++ } ++ return S_OK; ++} +diff -dPNur p7zip_4.57/CPP/7zip/UI/Console/ExtractCallbackNULL.cpp p7zip_4.57-new/CPP/7zip/UI/Console/ExtractCallbackNULL.cpp +--- p7zip_4.57/CPP/7zip/UI/Console/ExtractCallbackNULL.cpp 1970-01-01 01:00:00.000000000 +0100 ++++ p7zip_4.57-new/CPP/7zip/UI/Console/ExtractCallbackNULL.cpp 2008-04-11 19:28:29.000000000 +0200 +@@ -0,0 +1,132 @@ ++// ExtractCallbackNULL.cpp ++ ++#include "StdAfx.h" ++ ++#include "ExtractCallbackNULL.h" ++#include "UserInputUtils.h" ++#include "ConsoleClose.h" ++ ++#include "Common/Wildcard.h" ++ ++#include "Windows/FileDir.h" ++#include "Windows/FileFind.h" ++#include "Windows/Time.h" ++#include "Windows/Defs.h" ++#include "Windows/PropVariant.h" ++#include "Windows/Error.h" ++#include "Windows/PropVariantConversions.h" ++ ++#include "../../Common/FilePathAutoRename.h" ++ ++#include "../Common/ExtractingFilePath.h" ++ ++using namespace NWindows; ++using namespace NFile; ++using namespace NDirectory; ++ ++STDMETHODIMP CExtractCallbackNULL::SetTotal(UInt64 size) ++{ ++ if (NConsoleClose::TestBreakSignal()) ++ return E_ABORT; ++ return S_OK; ++} ++ ++STDMETHODIMP CExtractCallbackNULL::SetCompleted(const UInt64 *completeValue) ++{ ++ if (NConsoleClose::TestBreakSignal()) ++ return E_ABORT; ++ return S_OK; ++} ++ ++STDMETHODIMP CExtractCallbackNULL::AskOverwrite( ++ const wchar_t *existName, const FILETIME *existTime, const UInt64 *existSize, ++ const wchar_t *newName, const FILETIME *newTime, const UInt64 *newSize, ++ Int32 *answer) ++{ ++ ++ NUserAnswerMode::EEnum overwriteAnswer = ScanUserYesNoAllQuit(OutStream); ++ ++ switch(overwriteAnswer) ++ { ++ case NUserAnswerMode::kQuit: ++ return E_ABORT; ++ case NUserAnswerMode::kNo: ++ *answer = NOverwriteAnswer::kNo; ++ break; ++ case NUserAnswerMode::kNoAll: ++ *answer = NOverwriteAnswer::kNoToAll; ++ break; ++ case NUserAnswerMode::kYesAll: ++ *answer = NOverwriteAnswer::kYesToAll; ++ break; ++ case NUserAnswerMode::kYes: ++ *answer = NOverwriteAnswer::kYes; ++ break; ++ case NUserAnswerMode::kAutoRename: ++ *answer = NOverwriteAnswer::kAutoRename; ++ break; ++ default: ++ return E_FAIL; ++ } ++ return S_OK; ++} ++ ++STDMETHODIMP CExtractCallbackNULL::PrepareOperation(const wchar_t *name, bool /* isFolder */, Int32 askExtractMode, const UInt64 *position) ++{ ++ return S_OK; ++} ++ ++STDMETHODIMP CExtractCallbackNULL::MessageError(const wchar_t *message) ++{ ++ return S_OK; ++} ++ ++STDMETHODIMP CExtractCallbackNULL::SetOperationResult(Int32 operationResult, bool encrypted) ++{ ++ return S_OK; ++} ++ ++STDMETHODIMP CExtractCallbackNULL::CryptoGetTextPassword(BSTR *password) ++{ ++ if (!PasswordIsDefined) ++ { ++ Password = GetPassword(OutStream); ++ PasswordIsDefined = true; ++ } ++ CMyComBSTR tempName(Password); ++ *password = tempName.Detach(); ++ return S_OK; ++} ++ ++HRESULT CExtractCallbackNULL::BeforeOpen(const wchar_t *name) ++{ ++ return S_OK; ++} ++ ++HRESULT CExtractCallbackNULL::OpenResult(const wchar_t *name, HRESULT result, bool encrypted) ++{ ++ return S_OK; ++} ++ ++HRESULT CExtractCallbackNULL::ThereAreNoFiles() ++{ ++ return S_OK; ++} ++ ++HRESULT CExtractCallbackNULL::ExtractResult(HRESULT result) ++{ ++ if (result == S_OK) ++ return result; ++ if (result == E_ABORT) ++ return result; ++ if (result == E_OUTOFMEMORY) ++ return result; ++ return S_OK; ++} ++ ++HRESULT CExtractCallbackNULL::SetPassword(const UString &password) ++{ ++ PasswordIsDefined = true; ++ Password = password; ++ return S_OK; ++} +diff -dPNur p7zip_4.57/CPP/7zip/UI/Console/ExtractCallbackNULL.h p7zip_4.57-new/CPP/7zip/UI/Console/ExtractCallbackNULL.h +--- p7zip_4.57/CPP/7zip/UI/Console/ExtractCallbackNULL.h 1970-01-01 01:00:00.000000000 +0100 ++++ p7zip_4.57-new/CPP/7zip/UI/Console/ExtractCallbackNULL.h 2008-04-11 19:28:46.000000000 +0200 +@@ -0,0 +1,65 @@ ++// ExtractCallbackNULL.h ++ ++#ifndef __EXTRACTCALLBACKCONSOLE_H ++#define __EXTRACTCALLBACKCONSOLE_H ++ ++#include "Common/MyString.h" ++#include "Common/StdOutStream.h" ++#include "../../Common/FileStreams.h" ++#include "../../IPassword.h" ++#include "../../Archive/IArchive.h" ++#include "../Common/ArchiveExtractCallback.h" ++ ++class CExtractCallbackNULL: ++ public IExtractCallbackUI, ++ public ICryptoGetTextPassword, ++ public CMyUnknownImp ++{ ++public: ++ MY_UNKNOWN_IMP2(IFolderArchiveExtractCallback, ICryptoGetTextPassword) ++ ++ STDMETHOD(SetTotal)(UInt64 total); ++ STDMETHOD(SetCompleted)(const UInt64 *completeValue); ++ ++ // IFolderArchiveExtractCallback ++ STDMETHOD(AskOverwrite)( ++ const wchar_t *existName, const FILETIME *existTime, const UInt64 *existSize, ++ const wchar_t *newName, const FILETIME *newTime, const UInt64 *newSize, ++ Int32 *answer); ++ STDMETHOD (PrepareOperation)(const wchar_t *name, bool isFolder, Int32 askExtractMode, const UInt64 *position); ++ ++ STDMETHOD(MessageError)(const wchar_t *message); ++ STDMETHOD(SetOperationResult)(Int32 operationResult, bool encrypted); ++ ++ // ICryptoGetTextPassword ++ STDMETHOD(CryptoGetTextPassword)(BSTR *password); ++ ++ HRESULT BeforeOpen(const wchar_t *name); ++ HRESULT OpenResult(const wchar_t *name, HRESULT result, bool encrypted); ++ HRESULT ThereAreNoFiles(); ++ HRESULT ExtractResult(HRESULT result); ++ ++ HRESULT SetPassword(const UString &password); ++ ++public: ++ bool PasswordIsDefined; ++ UString Password; ++ ++ UInt64 NumArchives; ++ UInt64 NumArchiveErrors; ++ UInt64 NumFileErrors; ++ UInt64 NumFileErrorsInCurrentArchive; ++ ++ CStdOutStream *OutStream; ++ ++ void Init() ++ { ++ NumArchives = 0; ++ NumArchiveErrors = 0; ++ NumFileErrors = 0; ++ NumFileErrorsInCurrentArchive = 0; ++ } ++ ++}; ++ ++#endif diff --git a/app-arch/p7zip/files/p7zip_4.65-ds-rusxmms.patch b/app-arch/p7zip/files/p7zip_4.65-ds-rusxmms.patch new file mode 100644 index 0000000..7072522 --- /dev/null +++ b/app-arch/p7zip/files/p7zip_4.65-ds-rusxmms.patch @@ -0,0 +1,305 @@ +diff -dPNur p7zip_4.65/C/rccrecode.c p7zip_4.65-new/C/rccrecode.c +--- p7zip_4.65/C/rccrecode.c 1970-01-01 01:00:00.000000000 +0100 ++++ p7zip_4.65-new/C/rccrecode.c 2009-06-14 02:44:19.000000000 +0200 +@@ -0,0 +1,71 @@ ++#include <pthread.h> ++#include <librcc.h> ++ ++static rcc_class_default_charset default_oem[] = { ++ { "ru", "IBM866" }, ++ { NULL, NULL } ++}; ++ ++static rcc_class_default_charset default_iso[] = { ++ { "ru", "CP1251" }, ++ { NULL, NULL } ++}; ++ ++#define ARC_CLASS 0 ++#define OUT_CLASS 1 ++#define ARCOUT_CLASS 0 ++static rcc_class classes[] = { ++ { "oem", RCC_CLASS_STANDARD, NULL, default_oem, "OEM Encoding", 0 }, ++ { "out", RCC_CLASS_STANDARD, "LC_CTYPE", NULL, "Output", 0 }, ++ { NULL, RCC_CLASS_STANDARD, NULL, NULL, NULL, 0 } ++}; ++ ++static int initialized = 0; ++static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; ++ ++void *rcc_init() { ++ rcc_context ctx; ++ ++ pthread_mutex_lock(&mutex); ++ if (!initialized) { ++ rccInit(); ++ rccInitDefaultContext(NULL, 0, 0, classes, 0); ++ rccLoad(NULL, "zip"); ++ rccInitDb4(NULL, NULL, 0); ++ } ++ initialized++; ++ pthread_mutex_unlock(&mutex); ++ ++ ctx = rccCreateContext(NULL, 0, 0, classes, 0); ++ if (ctx) rccInitDb4(ctx, NULL, 0); ++ if (ctx) rccLoad(ctx, "zip"); ++ ++ return ctx; ++} ++ ++ ++void rcc_free(void *ctx) { ++ if (ctx) rccFreeContext((rcc_context)ctx); ++ ++ pthread_mutex_lock(&mutex); ++ if (initialized == 1) rccFree(); ++ initialized--; ++ pthread_mutex_unlock(&mutex); ++} ++ ++ ++char *rcc_read(void *ctx, const char *string, size_t size) { ++ if (!initialized) { ++ rcc_init(); ++ if (!initialized) return NULL; ++ } ++ return rccSizedRecode((rcc_context)ctx, ARC_CLASS, OUT_CLASS, string, size, NULL); ++} ++ ++char *rcc_write(rcc_context ctx, const char *string, size_t size) { ++ if (!initialized) { ++ rcc_init(); ++ if (!initialized) return NULL; ++ } ++ return rccSizedRecode((rcc_context)ctx, OUT_CLASS, ARCOUT_CLASS, string, size, NULL); ++} +diff -dPNur p7zip_4.65/C/rccrecode.h p7zip_4.65-new/C/rccrecode.h +--- p7zip_4.65/C/rccrecode.h 1970-01-01 01:00:00.000000000 +0100 ++++ p7zip_4.65-new/C/rccrecode.h 2009-06-14 02:44:19.000000000 +0200 +@@ -0,0 +1,17 @@ ++#ifndef _RCC_RECODE_H ++#define _RCC_RECODE_H ++ ++# ifdef __cplusplus ++extern "C" { ++# endif ++ ++ void *rcc_init(); ++ void rcc_free(void *ctx); ++ char *rcc_read(void *ctx, const char *string, size_t size); ++ char *rcc_write(void *ctx, const char *string, size_t size); ++ ++# ifdef __cplusplus ++} ++# endif ++ ++#endif /* _RCC_RECODE_H */ +diff -dPNur p7zip_4.65/CPP/7zip/Archive/Zip/ZipIn.cpp p7zip_4.65-new/CPP/7zip/Archive/Zip/ZipIn.cpp +--- p7zip_4.65/CPP/7zip/Archive/Zip/ZipIn.cpp 2008-11-28 23:03:44.000000000 +0100 ++++ p7zip_4.65-new/CPP/7zip/Archive/Zip/ZipIn.cpp 2009-06-14 02:47:28.000000000 +0200 +@@ -9,6 +9,8 @@ + #include "../../Common/LimitedStreams.h" + #include "../../Common/StreamUtils.h" + ++#include "../../../../C/rccrecode.h" ++ + extern "C" + { + #include "../../../../C/CpuArch.h" +@@ -23,6 +25,14 @@ + + // static const char kEndOfString = '\0'; + ++CInArchive::CInArchive() { ++ rccctx = rcc_init(); ++} ++ ++CInArchive::~CInArchive() { ++ rcc_free(rccctx); ++} ++ + HRESULT CInArchive::Open(IInStream *stream, const UInt64 *searchHeaderSizeLimit) + { + Close(); +@@ -198,12 +208,21 @@ + + AString CInArchive::ReadFileName(UInt32 nameSize) + { ++ char *rccrec; ++ + if (nameSize == 0) + return AString(); + char *p = m_NameBuffer.GetBuffer(nameSize); + SafeReadBytes(p, nameSize); + p[nameSize] = 0; + m_NameBuffer.ReleaseBuffer(); ++ ++ rccrec = rcc_read(rccctx, (LPCSTR)m_NameBuffer, 0); ++ if (rccrec) { ++ m_NameBuffer = rccrec; ++ free(rccrec); ++ } ++ + return m_NameBuffer; + } + +diff -dPNur p7zip_4.65/CPP/7zip/Archive/Zip/ZipIn.h p7zip_4.65-new/CPP/7zip/Archive/Zip/ZipIn.h +--- p7zip_4.65/CPP/7zip/Archive/Zip/ZipIn.h 2008-08-14 11:11:13.000000000 +0200 ++++ p7zip_4.65-new/CPP/7zip/Archive/Zip/ZipIn.h 2009-06-14 02:48:32.000000000 +0200 +@@ -108,6 +108,10 @@ + ISequentialInStream *CreateLimitedStream(UInt64 position, UInt64 size); + IInStream* CreateStream(); + ++ void *rccctx; ++ CInArchive(); ++ ~CInArchive(); ++ + bool IsOpen() const { return m_Stream != NULL; } + }; + +diff -dPNur p7zip_4.65/CPP/7zip/Archive/Zip/ZipOut.cpp p7zip_4.65-new/CPP/7zip/Archive/Zip/ZipOut.cpp +--- p7zip_4.65/CPP/7zip/Archive/Zip/ZipOut.cpp 2008-08-14 11:11:26.000000000 +0200 ++++ p7zip_4.65-new/CPP/7zip/Archive/Zip/ZipOut.cpp 2009-06-14 02:44:19.000000000 +0200 +@@ -7,9 +7,19 @@ + #include "../../Common/OffsetStream.h" + #include "../../Common/StreamUtils.h" + ++#include "../../../../C/rccrecode.h" ++ + namespace NArchive { + namespace NZip { + ++COutArchive::COutArchive() { ++ rccctx = rcc_init(); ++} ++ ++COutArchive::~COutArchive() { ++ rcc_free(rccctx); ++} ++ + void COutArchive::Create(IOutStream *outStream) + { + if (!m_OutBuffer.Create(1 << 16)) +@@ -112,6 +122,7 @@ + { + SeekTo(m_BasePosition); + ++ char *rccrec; + bool isZip64 = m_IsZip64 || item.PackSize >= 0xFFFFFFFF || item.UnPackSize >= 0xFFFFFFFF; + + WriteUInt32(NSignature::kLocalFileHeader); +@@ -130,6 +141,12 @@ + throw CSystemException(E_FAIL); + } + WriteUInt16((UInt16)m_ExtraSize); // test it; ++ rccrec = rcc_write(rccctx, (const char *)item.Name, item.Name.Length()); ++ if (rccrec) { ++ printf("%u, %s.\n", item.Name.Length(), rccrec); ++ WriteBytes(rccrec, strlen(rccrec)); ++ free(rccrec); ++ } else + WriteBytes((const char *)item.Name, item.Name.Length()); + + UInt32 extraPos = 0; +@@ -154,6 +171,7 @@ + + void COutArchive::WriteCentralHeader(const CItem &item) + { ++ char *rccrec; + bool isUnPack64 = item.UnPackSize >= 0xFFFFFFFF; + bool isPack64 = item.PackSize >= 0xFFFFFFFF; + bool isPosition64 = item.LocalHeaderPosition >= 0xFFFFFFFF; +@@ -181,6 +199,13 @@ + WriteUInt16(item.InternalAttributes); + WriteUInt32(item.ExternalAttributes); + WriteUInt32(isPosition64 ? 0xFFFFFFFF: (UInt32)item.LocalHeaderPosition); ++ ++ rccrec = rcc_write(rccctx, (const char *)item.Name, item.Name.Length()); ++ if (rccrec) { ++ printf("C: %u, %s.\n", item.Name.Length(), rccrec); ++ WriteBytes(rccrec, strlen(rccrec)); ++ free(rccrec); ++ } else + WriteBytes((const char *)item.Name, item.Name.Length()); + if (isZip64) + { +diff -dPNur p7zip_4.65/CPP/7zip/Archive/Zip/ZipOut.h p7zip_4.65-new/CPP/7zip/Archive/Zip/ZipOut.h +--- p7zip_4.65/CPP/7zip/Archive/Zip/ZipOut.h 2008-08-14 11:11:13.000000000 +0200 ++++ p7zip_4.65-new/CPP/7zip/Archive/Zip/ZipOut.h 2009-06-14 02:44:19.000000000 +0200 +@@ -49,6 +49,11 @@ + void CreateStreamForCompressing(IOutStream **outStream); + void CreateStreamForCopying(ISequentialOutStream **outStream); + void SeekToPackedDataPosition(); ++ ++ void *rccctx; ++ COutArchive(); ++ ~COutArchive(); ++ + }; + + }} +diff -dPNur p7zip_4.65/CPP/7zip/Bundles/Alone/makefile p7zip_4.65-new/CPP/7zip/Bundles/Alone/makefile +--- p7zip_4.65/CPP/7zip/Bundles/Alone/makefile 2009-02-07 19:39:04.000000000 +0100 ++++ p7zip_4.65-new/CPP/7zip/Bundles/Alone/makefile 2009-06-14 02:44:19.000000000 +0200 +@@ -250,6 +250,7 @@ + Sha256.o + + OBJS=\ ++rccrecode.o \ + myGetTickCount.o \ + wine_date_and_time.o \ + myAddExeFlag.o \ +diff -dPNur p7zip_4.65/CPP/7zip/Bundles/Alone/makefile.list p7zip_4.65-new/CPP/7zip/Bundles/Alone/makefile.list +--- p7zip_4.65/CPP/7zip/Bundles/Alone/makefile.list 2009-02-09 21:04:57.000000000 +0100 ++++ p7zip_4.65-new/CPP/7zip/Bundles/Alone/makefile.list 2009-06-14 02:51:45.000000000 +0200 +@@ -204,6 +204,7 @@ + ../../Crypto/ZipStrong.cpp + + SRCS_C=\ ++ ../../../../C/rccrecode.c \ + ../../../../C/Bra.c \ + ../../../../C/Bra86.c \ + ../../../../C/BraIA64.c \ +diff -dPNur p7zip_4.65/CPP/7zip/Bundles/Format7zFree/makefile p7zip_4.65-new/CPP/7zip/Bundles/Format7zFree/makefile +--- p7zip_4.65/CPP/7zip/Bundles/Format7zFree/makefile 2009-02-09 21:47:24.000000000 +0100 ++++ p7zip_4.65-new/CPP/7zip/Bundles/Format7zFree/makefile 2009-06-14 03:00:06.000000000 +0200 +@@ -296,6 +296,7 @@ + Sha256.o \ + + OBJS = \ ++ rccrecode.o \ + wine_date_and_time.o \ + myGetTickCount.o \ + $(COMMON_OBJS) \ +diff -dPNur p7zip_4.65/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4.65-new/CPP/7zip/Bundles/Format7zFree/makefile.list +--- p7zip_4.65/CPP/7zip/Bundles/Format7zFree/makefile.list 2009-02-09 21:04:32.000000000 +0100 ++++ p7zip_4.65-new/CPP/7zip/Bundles/Format7zFree/makefile.list 2009-06-14 03:00:39.000000000 +0200 +@@ -235,6 +235,7 @@ + ../../Crypto/ZipStrong.cpp + + SRCS_C=\ ++ ../../../../C/rccrecode.c \ + ../../../../C/Bra.c \ + ../../../../C/Bra86.c \ + ../../../../C/BraIA64.c \ +diff -dPNur p7zip_4.65/makefile.machine p7zip_4.65-new/makefile.machine +--- p7zip_4.65/makefile.machine 2009-02-14 18:19:09.000000000 +0100 ++++ p7zip_4.65-new/makefile.machine 2009-06-14 02:44:19.000000000 +0200 +@@ -14,7 +14,7 @@ + CC_SHARED=-fPIC + LINK_SHARED=-fPIC -shared + +-LOCAL_LIBS=-lpthread ++LOCAL_LIBS=-lpthread -lrcc + LOCAL_LIBS_DLL=$(LOCAL_LIBS) -ldl + + OBJ_CRC32=$(OBJ_CRC32_C) +diff -dPNur p7zip_4.65/makefile.rules p7zip_4.65-new/makefile.rules +--- p7zip_4.65/makefile.rules 2009-02-09 21:03:16.000000000 +0100 ++++ p7zip_4.65-new/makefile.rules 2009-06-14 02:52:48.000000000 +0200 +@@ -558,3 +558,5 @@ + 7zCrcT8.o : ../../../../C/7zCrcT8.c + $(CC) $(CFLAGS) ../../../../C/7zCrcT8.c + ++rccrecode.o : ../../../../C/rccrecode.c ++ $(CC) $(CFLAGS) ../../../../C/rccrecode.c diff --git a/app-arch/p7zip/files/p7zip_4.65-libun7zip.patch b/app-arch/p7zip/files/p7zip_4.65-libun7zip.patch new file mode 100644 index 0000000..7646c3f --- /dev/null +++ b/app-arch/p7zip/files/p7zip_4.65-libun7zip.patch @@ -0,0 +1,550 @@ +diff -dPNur p7zip_4.65/CPP/7zip/Bundles/Un7Zip/makefile p7zip_4.65-new/CPP/7zip/Bundles/Un7Zip/makefile +--- p7zip_4.65/CPP/7zip/Bundles/Un7Zip/makefile 1970-01-01 01:00:00.000000000 +0100 ++++ p7zip_4.65-new/CPP/7zip/Bundles/Un7Zip/makefile 2009-06-14 23:15:12.000000000 +0200 +@@ -0,0 +1,137 @@ ++PROG=libun7zip.so ++ ++LOCAL_FLAGS= \ ++ -DEXTRACT_ONLY \ ++ -DNO_READ_FROM_CODER \ ++ -D_SFX ++ ++include ../../../../makefile.crc32 ++include ../../../../makefile.machine ++ ++LOCAL_SHARED=$(LINK_SHARED) ++LIBS=$(LOCAL_LIBS_DLL) ++ ++SFX_CONSOLE_OBJS = \ ++ Un7Zip.o ++ ++CONSOLE_OBJS = \ ++ ConsoleClose.o \ ++ ExtractCallbackConsole.o \ ++ ExtractCallbackNULL.o \ ++ List.o \ ++ OpenCallbackConsole.o \ ++ UserInputUtils.o \ ++ ++# NewHandler.o ++COMMON_OBJS = \ ++ CommandLineParser.o \ ++ CRC.o \ ++ IntToString.o \ ++ StdInStream.o \ ++ StdOutStream.o \ ++ MyString.o \ ++ MyWindows.o\ ++ StringConvert.o \ ++ MyVector.o \ ++ Wildcard.o \ ++ ++# DLL.o ++WIN_OBJS = \ ++ Error.o \ ++ FileDir.o \ ++ FileFind.o \ ++ FileIO.o \ ++ FileName.o \ ++ PropVariant.o \ ++ PropVariantConversions.o \ ++ Synchronization.o \ ++ System.o ++ ++7ZIP_COMMON_OBJS = \ ++ CreateCoder.o \ ++ FilePathAutoRename.o \ ++ FileStreams.o \ ++ InBuffer.o \ ++ FilterCoder.o \ ++ LimitedStreams.o \ ++ LockedStream.o \ ++ OutBuffer.o \ ++ ProgressUtils.o \ ++ StreamBinder.o \ ++ StreamObjects.o \ ++ StreamUtils.o \ ++ VirtThread.o \ ++ ++UI_COMMON_OBJS = \ ++ ArchiveExtractCallback.o \ ++ ArchiveOpenCallback.o \ ++ DefaultName.o \ ++ LoadCodecs.o \ ++ Extract.o \ ++ ExtractingFilePath.o \ ++ OpenArchive.o \ ++ PropIDUtils.o \ ++ ++AR_COMMON_OBJS = \ ++ CoderMixer2.o \ ++ CoderMixer2MT.o \ ++ CrossThreadProgress.o \ ++ ItemNameUtils.o \ ++ OutStreamWithCRC.o \ ++ ++ ++7Z_OBJS = \ ++ 7zDecode.o \ ++ 7zExtract.o \ ++ 7zFolderOutStream.o \ ++ 7zHandler.o \ ++ 7zHeader.o \ ++ 7zIn.o \ ++ 7zRegister.o \ ++ ++COMPRESS_OBJS = \ ++ BranchCoder.o \ ++ Bcj2Coder.o \ ++ Bcj2Register.o \ ++ BcjCoder.o \ ++ BcjRegister.o \ ++ CopyCoder.o \ ++ CopyRegister.o \ ++ LzmaDecoder.o \ ++ LzmaRegister.o \ ++ PpmdDecoder.o \ ++ PpmdRegister.o \ ++ ++CRYPTO_OBJS = \ ++ 7zAes.o \ ++ 7zAesRegister.o \ ++ MyAes.o \ ++ ++# Alloc.o ++C_OBJS = \ ++ Bra86.o \ ++ LzmaDec.o \ ++ Threads.o \ ++ Aes.o \ ++ Sha256.o \ ++ ++OBJS = \ ++ myGetTickCount.o\ ++ wine_date_and_time.o\ ++ mySplitCommandLine.o\ ++ $(SFX_CONSOLE_OBJS) \ ++ $(CONSOLE_OBJS) \ ++ $(COMMON_OBJS) \ ++ $(WIN_OBJS) \ ++ $(7ZIP_COMMON_OBJS) \ ++ $(UI_COMMON_OBJS) \ ++ $(AR_COMMON_OBJS) \ ++ $(7Z_OBJS) \ ++ $(COMPRESS_OBJS) \ ++ $(CRYPTO_OBJS) \ ++ $(C_OBJS) \ ++ $(OBJ_CRC32) ++ ++ ++include ../../../../makefile.glb ++ +diff -dPNur p7zip_4.65/CPP/7zip/Bundles/Un7Zip/makefile.depend p7zip_4.65-new/CPP/7zip/Bundles/Un7Zip/makefile.depend +--- p7zip_4.65/CPP/7zip/Bundles/Un7Zip/makefile.depend 1970-01-01 01:00:00.000000000 +0100 ++++ p7zip_4.65-new/CPP/7zip/Bundles/Un7Zip/makefile.depend 2009-06-14 23:15:12.000000000 +0200 +@@ -0,0 +1 @@ ++ +\ No newline at end of file +diff -dPNur p7zip_4.65/CPP/7zip/Bundles/Un7Zip/makefile.list p7zip_4.65-new/CPP/7zip/Bundles/Un7Zip/makefile.list +--- p7zip_4.65/CPP/7zip/Bundles/Un7Zip/makefile.list 1970-01-01 01:00:00.000000000 +0100 ++++ p7zip_4.65-new/CPP/7zip/Bundles/Un7Zip/makefile.list 2009-06-14 23:16:37.000000000 +0200 +@@ -0,0 +1,10 @@ ++CXXFLAGS += $(CC_SHARED) ++CFLAGS += $(CC_SHARED) ++ ++include ../../../../makefile.rules ++ ++ExtractCallbackNULL.o : ../../UI/Console/ExtractCallbackNULL.cpp ++ $(CXX) $(CFLAGS) ../../UI/Console/ExtractCallbackNULL.cpp ++ ++Un7Zip.o : ./Un7Zip.cpp ++ $(CXX) $(CFLAGS) ./Un7Zip.cpp +diff -dPNur p7zip_4.65/CPP/7zip/Bundles/Un7Zip/testlib.c p7zip_4.65-new/CPP/7zip/Bundles/Un7Zip/testlib.c +--- p7zip_4.65/CPP/7zip/Bundles/Un7Zip/testlib.c 1970-01-01 01:00:00.000000000 +0100 ++++ p7zip_4.65-new/CPP/7zip/Bundles/Un7Zip/testlib.c 2009-06-14 23:15:12.000000000 +0200 +@@ -0,0 +1,7 @@ ++ ++#include "u7zip.h" ++ ++int main(int argc, char *argv[]) ++{ ++ return un7zip(argv[1], "/tmp", 0); ++} +diff -dPNur p7zip_4.65/CPP/7zip/Bundles/Un7Zip/u7zip.h p7zip_4.65-new/CPP/7zip/Bundles/Un7Zip/u7zip.h +--- p7zip_4.65/CPP/7zip/Bundles/Un7Zip/u7zip.h 1970-01-01 01:00:00.000000000 +0100 ++++ p7zip_4.65-new/CPP/7zip/Bundles/Un7Zip/u7zip.h 2009-06-14 23:15:12.000000000 +0200 +@@ -0,0 +1,19 @@ ++#ifndef __UN7ZIP_H ++#define __UN7ZIP_H ++ ++#define LIST_7Z 0 ++#define TEST_7Z 1 ++#define EXTRACT_7Z 2 ++ ++#define S_OK 0x00000000L ++#define S_FALSE 0x00000001L ++#define E_NOTIMPL 0x80004001L ++#define E_NOINTERFACE 0x80004002L ++#define E_ABORT 0x80004004L ++#define E_FAIL 0x80004005L ++#define E_OUTOFMEMORY 0x8007000EL ++#define E_INVALIDARG 0x80070057L ++ ++int un7zip(char *name, char *dir, int command); ++ ++#endif +diff -dPNur p7zip_4.65/CPP/7zip/Bundles/Un7Zip/Un7Zip.cpp p7zip_4.65-new/CPP/7zip/Bundles/Un7Zip/Un7Zip.cpp +--- p7zip_4.65/CPP/7zip/Bundles/Un7Zip/Un7Zip.cpp 1970-01-01 01:00:00.000000000 +0100 ++++ p7zip_4.65-new/CPP/7zip/Bundles/Un7Zip/Un7Zip.cpp 2009-06-14 23:15:12.000000000 +0200 +@@ -0,0 +1,148 @@ ++// Un7Zip.cpp ++ ++#include "StdAfx.h" ++ ++#include "Common/MyInitGuid.h" ++ ++#include "Common/StdOutStream.h" ++#include "Common/Wildcard.h" ++#include "Common/StringConvert.h" ++#include "Common/MyCom.h" ++#include "Common/MyException.h" ++ ++#include "Windows/FileDir.h" ++#include "Windows/FileName.h" ++#include "Windows/Defs.h" ++ ++#include "../../IPassword.h" ++#include "../../ICoder.h" ++ ++#include "../../UI/Common/OpenArchive.h" ++#include "../../UI/Common/DefaultName.h" ++#include "../../UI/Common/ExitCode.h" ++#include "../../UI/Common/Extract.h" ++ ++#include "../../UI/Console/List.h" ++#include "../../UI/Console/OpenCallbackConsole.h" ++#include "../../UI/Console/ExtractCallbackNULL.h" ++ ++ ++static int Un7Zip(char *name, char *dir, int command); ++ ++extern "C" { ++ ++int un7zip(char *name, char *dir, int command) ++{ ++ return Un7Zip(name, dir, command); ++} ++ ++} ++ ++using namespace NWindows; ++using namespace NFile; ++ ++static const wchar_t *kUniversalWildcard = L"*"; ++static bool AddNameToCensor(NWildcard::CCensor &wildcardCensor) ++{ ++ wildcardCensor.AddItem(true, kUniversalWildcard, false); ++ return true; ++} ++ ++static int Un7Zip(char *name, char *dir, int commands) ++{ ++ ++ CStdOutStream *g_StdStream = &g_StdOut; ++ ++ NWildcard::CCensor wildcardCensor; ++ AddNameToCensor(wildcardCensor); ++ bool passwordEnabled = 1; ++ UString password = L"null"; ++ ++ UString outputDir= MultiByteToUnicodeString(dir); ++ UString archiveName = MultiByteToUnicodeString(name); ++ ++ NFind::CFileInfoW archiveFileInfo; ++ ++ if (!NFind::FindFile(archiveName, archiveFileInfo)) ++ return S_FALSE; ++ if (archiveFileInfo.IsDir()) ++ return S_FALSE; ++ ++ { ++ ++ UStringVector v1, v2; ++ v1.Add(archiveName); ++ v2.Add(archiveName); ++ ++ ++ CCodecs *codecs = new CCodecs; ++ CMyComPtr< ++ #ifdef EXTERNAL_CODECS ++ ICompressCodecsInfo ++ #else ++ IUnknown ++ #endif ++ > compressCodecsInfo = codecs; ++ HRESULT result = codecs->Load(); ++ if (result != S_OK) ++ throw CSystemException(result); ++ ++ const NWildcard::CCensorNode &wildcardCensorHead = ++ wildcardCensor.Pairs.Front().Head; ++ ++ if(commands > 0) ++ { ++ CExtractCallbackNULL *ecs = new CExtractCallbackNULL; ++ CMyComPtr<IFolderArchiveExtractCallback> extractCallback = ecs; ++ ecs->OutStream = g_StdStream; ++ ecs->PasswordIsDefined = passwordEnabled; ++ ecs->Password = password; ++ ecs->Init(); ++ ++ COpenCallbackConsole openCallback; ++ openCallback.OutStream = g_StdStream; ++ openCallback.PasswordIsDefined = passwordEnabled; ++ openCallback.Password = password; ++ ++ CExtractOptions eo; ++ eo.StdOutMode = false; ++ eo.PathMode = NExtract::NPathMode::kFullPathnames; ++ if(commands == 1) ++ eo.TestMode = 1; ++ else ++ eo.TestMode = 0; ++ eo.OverwriteMode = NExtract::NOverwriteMode::kWithoutPrompt; ++ eo.OutputDir = outputDir; ++ eo.YesToAll = 1; ++ ++ UString errorMessage; ++ CDecompressStat stat; ++ ++ HRESULT result = DecompressArchives( ++ codecs, CIntVector(), ++ v1, v2, ++ wildcardCensorHead, ++ eo, &openCallback, ecs, errorMessage, stat); ++ ++ if (ecs->NumArchiveErrors != 0 || ecs->NumFileErrors != 0) ++ return S_FALSE; ++ if (result != S_OK) ++ return S_FALSE; ++ } ++ else ++ { ++ UInt64 numErrors = 0; ++ HRESULT result = ListArchives( ++ codecs, CIntVector(), ++ v1, v2, ++ wildcardCensorHead, ++ true, false, ++ passwordEnabled, ++ password, numErrors); ++ ++ if (result != S_OK) ++ return S_FALSE;; ++ } ++ } ++ return S_OK; ++} +diff -dPNur p7zip_4.65/CPP/7zip/UI/Console/ExtractCallbackNULL.cpp p7zip_4.65-new/CPP/7zip/UI/Console/ExtractCallbackNULL.cpp +--- p7zip_4.65/CPP/7zip/UI/Console/ExtractCallbackNULL.cpp 1970-01-01 01:00:00.000000000 +0100 ++++ p7zip_4.65-new/CPP/7zip/UI/Console/ExtractCallbackNULL.cpp 2009-06-14 23:15:12.000000000 +0200 +@@ -0,0 +1,130 @@ ++// ExtractCallbackNULL.cpp ++ ++#include "StdAfx.h" ++ ++#include "ExtractCallbackNULL.h" ++#include "UserInputUtils.h" ++#include "ConsoleClose.h" ++ ++#include "Common/Wildcard.h" ++ ++#include "Windows/FileDir.h" ++#include "Windows/FileFind.h" ++#include "Windows/Time.h" ++#include "Windows/Defs.h" ++#include "Windows/PropVariant.h" ++#include "Windows/Error.h" ++#include "Windows/PropVariantConversions.h" ++ ++#include "../../Common/FilePathAutoRename.h" ++ ++#include "../Common/ExtractingFilePath.h" ++ ++using namespace NWindows; ++using namespace NFile; ++using namespace NDirectory; ++ ++STDMETHODIMP CExtractCallbackNULL::SetTotal(UInt64 size) ++{ ++ if (NConsoleClose::TestBreakSignal()) ++ return E_ABORT; ++ return S_OK; ++} ++ ++STDMETHODIMP CExtractCallbackNULL::SetCompleted(const UInt64 *completeValue) ++{ ++ if (NConsoleClose::TestBreakSignal()) ++ return E_ABORT; ++ return S_OK; ++} ++ ++STDMETHODIMP CExtractCallbackNULL::AskOverwrite( ++ const wchar_t *existName, const FILETIME *existTime, const UInt64 *existSize, ++ const wchar_t *newName, const FILETIME *newTime, const UInt64 *newSize, ++ Int32 *answer) ++{ ++ ++ NUserAnswerMode::EEnum overwriteAnswer = ScanUserYesNoAllQuit(OutStream); ++ ++ switch(overwriteAnswer) ++ { ++ case NUserAnswerMode::kQuit: ++ return E_ABORT; ++ case NUserAnswerMode::kNo: ++ *answer = NOverwriteAnswer::kNo; ++ break; ++ case NUserAnswerMode::kNoAll: ++ *answer = NOverwriteAnswer::kNoToAll; ++ break; ++ case NUserAnswerMode::kYesAll: ++ *answer = NOverwriteAnswer::kYesToAll; ++ break; ++ case NUserAnswerMode::kYes: ++ *answer = NOverwriteAnswer::kYes; ++ break; ++ case NUserAnswerMode::kAutoRenameAll: ++ *answer = NOverwriteAnswer::kAutoRename; ++ break; ++ default: ++ return E_FAIL; ++ } ++ return S_OK; ++} ++ ++STDMETHODIMP CExtractCallbackNULL::PrepareOperation(const wchar_t *name, bool /* isFolder */, Int32 askExtractMode, const UInt64 *position) ++{ ++ return S_OK; ++} ++ ++STDMETHODIMP CExtractCallbackNULL::MessageError(const wchar_t *message) ++{ ++ return S_OK; ++} ++ ++STDMETHODIMP CExtractCallbackNULL::SetOperationResult(Int32 operationResult, bool encrypted) ++{ ++ return S_OK; ++} ++ ++STDMETHODIMP CExtractCallbackNULL::CryptoGetTextPassword(BSTR *password) ++{ ++ if (!PasswordIsDefined) ++ { ++ Password = GetPassword(OutStream); ++ PasswordIsDefined = true; ++ } ++ return StringToBstr(Password, password); ++} ++ ++HRESULT CExtractCallbackNULL::BeforeOpen(const wchar_t *name) ++{ ++ return S_OK; ++} ++ ++HRESULT CExtractCallbackNULL::OpenResult(const wchar_t *name, HRESULT result, bool encrypted) ++{ ++ return S_OK; ++} ++ ++HRESULT CExtractCallbackNULL::ThereAreNoFiles() ++{ ++ return S_OK; ++} ++ ++HRESULT CExtractCallbackNULL::ExtractResult(HRESULT result) ++{ ++ if (result == S_OK) ++ return result; ++ if (result == E_ABORT) ++ return result; ++ if (result == E_OUTOFMEMORY) ++ return result; ++ return S_OK; ++} ++ ++HRESULT CExtractCallbackNULL::SetPassword(const UString &password) ++{ ++ PasswordIsDefined = true; ++ Password = password; ++ return S_OK; ++} +diff -dPNur p7zip_4.65/CPP/7zip/UI/Console/ExtractCallbackNULL.h p7zip_4.65-new/CPP/7zip/UI/Console/ExtractCallbackNULL.h +--- p7zip_4.65/CPP/7zip/UI/Console/ExtractCallbackNULL.h 1970-01-01 01:00:00.000000000 +0100 ++++ p7zip_4.65-new/CPP/7zip/UI/Console/ExtractCallbackNULL.h 2009-06-14 23:15:12.000000000 +0200 +@@ -0,0 +1,65 @@ ++// ExtractCallbackNULL.h ++ ++#ifndef __EXTRACTCALLBACKCONSOLE_H ++#define __EXTRACTCALLBACKCONSOLE_H ++ ++#include "Common/MyString.h" ++#include "Common/StdOutStream.h" ++#include "../../Common/FileStreams.h" ++#include "../../IPassword.h" ++#include "../../Archive/IArchive.h" ++#include "../Common/ArchiveExtractCallback.h" ++ ++class CExtractCallbackNULL: ++ public IExtractCallbackUI, ++ public ICryptoGetTextPassword, ++ public CMyUnknownImp ++{ ++public: ++ MY_UNKNOWN_IMP2(IFolderArchiveExtractCallback, ICryptoGetTextPassword) ++ ++ STDMETHOD(SetTotal)(UInt64 total); ++ STDMETHOD(SetCompleted)(const UInt64 *completeValue); ++ ++ // IFolderArchiveExtractCallback ++ STDMETHOD(AskOverwrite)( ++ const wchar_t *existName, const FILETIME *existTime, const UInt64 *existSize, ++ const wchar_t *newName, const FILETIME *newTime, const UInt64 *newSize, ++ Int32 *answer); ++ STDMETHOD (PrepareOperation)(const wchar_t *name, bool isFolder, Int32 askExtractMode, const UInt64 *position); ++ ++ STDMETHOD(MessageError)(const wchar_t *message); ++ STDMETHOD(SetOperationResult)(Int32 operationResult, bool encrypted); ++ ++ // ICryptoGetTextPassword ++ STDMETHOD(CryptoGetTextPassword)(BSTR *password); ++ ++ HRESULT BeforeOpen(const wchar_t *name); ++ HRESULT OpenResult(const wchar_t *name, HRESULT result, bool encrypted); ++ HRESULT ThereAreNoFiles(); ++ HRESULT ExtractResult(HRESULT result); ++ ++ HRESULT SetPassword(const UString &password); ++ ++public: ++ bool PasswordIsDefined; ++ UString Password; ++ ++ UInt64 NumArchives; ++ UInt64 NumArchiveErrors; ++ UInt64 NumFileErrors; ++ UInt64 NumFileErrorsInCurrentArchive; ++ ++ CStdOutStream *OutStream; ++ ++ void Init() ++ { ++ NumArchives = 0; ++ NumArchiveErrors = 0; ++ NumFileErrors = 0; ++ NumFileErrorsInCurrentArchive = 0; ++ } ++ ++}; ++ ++#endif diff --git a/app-arch/p7zip/files/p7zip_9.04-ds-rusxmms.patch b/app-arch/p7zip/files/p7zip_9.04-ds-rusxmms.patch new file mode 100644 index 0000000..7678241 --- /dev/null +++ b/app-arch/p7zip/files/p7zip_9.04-ds-rusxmms.patch @@ -0,0 +1,294 @@ +diff -dPNur p7zip-9.04~dfsg.1/C/rccrecode.c p7zip-9.04~dfsg.1-ds/C/rccrecode.c +--- p7zip-9.04~dfsg.1/C/rccrecode.c 1970-01-01 03:00:00.000000000 +0300 ++++ p7zip-9.04~dfsg.1-ds/C/rccrecode.c 2009-10-28 03:29:23.000000000 +0300 +@@ -0,0 +1,71 @@ ++#include <pthread.h> ++#include <librcc.h> ++ ++static rcc_class_default_charset default_oem[] = { ++ { "ru", "IBM866" }, ++ { NULL, NULL } ++}; ++ ++static rcc_class_default_charset default_iso[] = { ++ { "ru", "CP1251" }, ++ { NULL, NULL } ++}; ++ ++#define ARC_CLASS 0 ++#define OUT_CLASS 1 ++#define ARCOUT_CLASS 0 ++static rcc_class classes[] = { ++ { "oem", RCC_CLASS_STANDARD, NULL, default_oem, "OEM Encoding", 0 }, ++ { "out", RCC_CLASS_STANDARD, "LC_CTYPE", NULL, "Output", 0 }, ++ { NULL, RCC_CLASS_STANDARD, NULL, NULL, NULL, 0 } ++}; ++ ++static int initialized = 0; ++static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; ++ ++void *rcc_init() { ++ rcc_context ctx; ++ ++ pthread_mutex_lock(&mutex); ++ if (!initialized) { ++ rccInit(); ++ rccInitDefaultContext(NULL, 0, 0, classes, 0); ++ rccLoad(NULL, "zip"); ++ rccInitDb4(NULL, NULL, 0); ++ } ++ initialized++; ++ pthread_mutex_unlock(&mutex); ++ ++ ctx = rccCreateContext(NULL, 0, 0, classes, 0); ++ if (ctx) rccInitDb4(ctx, NULL, 0); ++ if (ctx) rccLoad(ctx, "zip"); ++ ++ return ctx; ++} ++ ++ ++void rcc_free(void *ctx) { ++ if (ctx) rccFreeContext((rcc_context)ctx); ++ ++ pthread_mutex_lock(&mutex); ++ if (initialized == 1) rccFree(); ++ initialized--; ++ pthread_mutex_unlock(&mutex); ++} ++ ++ ++char *rcc_read(void *ctx, const char *string, size_t size) { ++ if (!initialized) { ++ rcc_init(); ++ if (!initialized) return NULL; ++ } ++ return rccSizedRecode((rcc_context)ctx, ARC_CLASS, OUT_CLASS, string, size, NULL); ++} ++ ++char *rcc_write(rcc_context ctx, const char *string, size_t size) { ++ if (!initialized) { ++ rcc_init(); ++ if (!initialized) return NULL; ++ } ++ return rccSizedRecode((rcc_context)ctx, OUT_CLASS, ARCOUT_CLASS, string, size, NULL); ++} +diff -dPNur p7zip-9.04~dfsg.1/C/rccrecode.h p7zip-9.04~dfsg.1-ds/C/rccrecode.h +--- p7zip-9.04~dfsg.1/C/rccrecode.h 1970-01-01 03:00:00.000000000 +0300 ++++ p7zip-9.04~dfsg.1-ds/C/rccrecode.h 2009-10-28 03:29:23.000000000 +0300 +@@ -0,0 +1,17 @@ ++#ifndef _RCC_RECODE_H ++#define _RCC_RECODE_H ++ ++# ifdef __cplusplus ++extern "C" { ++# endif ++ ++ void *rcc_init(); ++ void rcc_free(void *ctx); ++ char *rcc_read(void *ctx, const char *string, size_t size); ++ char *rcc_write(void *ctx, const char *string, size_t size); ++ ++# ifdef __cplusplus ++} ++# endif ++ ++#endif /* _RCC_RECODE_H */ +diff -dPNur p7zip-9.04~dfsg.1/CPP/7zip/Archive/Zip/ZipIn.cpp p7zip-9.04~dfsg.1-ds/CPP/7zip/Archive/Zip/ZipIn.cpp +--- p7zip-9.04~dfsg.1/CPP/7zip/Archive/Zip/ZipIn.cpp 2009-06-27 18:18:14.000000000 +0400 ++++ p7zip-9.04~dfsg.1-ds/CPP/7zip/Archive/Zip/ZipIn.cpp 2009-10-28 03:49:06.000000000 +0300 +@@ -9,6 +9,8 @@ + #include "../../Common/LimitedStreams.h" + #include "../../Common/StreamUtils.h" + ++#include "../../../../C/rccrecode.h" ++ + #include "ZipIn.h" + + #define Get16(p) GetUi16(p) +@@ -17,7 +19,17 @@ + + namespace NArchive { + namespace NZip { +- ++ ++CInArchive::CInArchive() ++{ ++ rccctx = rcc_init(); ++} ++ ++CInArchive::~CInArchive() ++{ ++ rcc_free(rccctx); ++} ++ + HRESULT CInArchive::Open(IInStream *stream, const UInt64 *searchHeaderSizeLimit) + { + _inBufMode = false; +@@ -200,12 +212,20 @@ + + void CInArchive::ReadFileName(UInt32 nameSize, AString &dest) + { ++ char *rccrec; ++ + if (nameSize == 0) + dest.Empty(); + char *p = dest.GetBuffer((int)nameSize); + SafeReadBytes(p, nameSize); + p[nameSize] = 0; + dest.ReleaseBuffer(); ++ ++ rccrec = rcc_read(rccctx, (LPCSTR)dest, 0); ++ if (rccrec) { ++ dest = rccrec; ++ free(rccrec); ++ } + } + + void CInArchive::GetArchiveInfo(CInArchiveInfo &archiveInfo) const +diff -dPNur p7zip-9.04~dfsg.1/CPP/7zip/Archive/Zip/ZipIn.h p7zip-9.04~dfsg.1-ds/CPP/7zip/Archive/Zip/ZipIn.h +--- p7zip-9.04~dfsg.1/CPP/7zip/Archive/Zip/ZipIn.h 2009-06-27 18:18:14.000000000 +0400 ++++ p7zip-9.04~dfsg.1-ds/CPP/7zip/Archive/Zip/ZipIn.h 2009-10-28 03:29:23.000000000 +0300 +@@ -114,6 +114,10 @@ + ISequentialInStream *CreateLimitedStream(UInt64 position, UInt64 size); + IInStream* CreateStream(); + ++ void *rccctx; ++ CInArchive(); ++ ~CInArchive(); ++ + bool IsOpen() const { return m_Stream != NULL; } + }; + +diff -dPNur p7zip-9.04~dfsg.1/CPP/7zip/Archive/Zip/ZipOut.h p7zip-9.04~dfsg.1-ds/CPP/7zip/Archive/Zip/ZipOut.h +--- p7zip-9.04~dfsg.1/CPP/7zip/Archive/Zip/ZipOut.h 2009-06-27 18:18:14.000000000 +0400 ++++ p7zip-9.04~dfsg.1-ds/CPP/7zip/Archive/Zip/ZipOut.h 2009-10-28 05:49:05.000000000 +0300 +@@ -49,6 +49,11 @@ + void CreateStreamForCompressing(IOutStream **outStream); + void CreateStreamForCopying(ISequentialOutStream **outStream); + void SeekToPackedDataPosition(); ++ ++ void *rccctx; ++ COutArchive(); ++ ~COutArchive(); ++ void Recode(CItem &item); + }; + + }} +diff -dPNur p7zip-9.04~dfsg.1/CPP/7zip/Archive/Zip/ZipUpdate.cpp p7zip-9.04~dfsg.1-ds/CPP/7zip/Archive/Zip/ZipUpdate.cpp +--- p7zip-9.04~dfsg.1/CPP/7zip/Archive/Zip/ZipUpdate.cpp 2009-06-27 18:18:14.000000000 +0400 ++++ p7zip-9.04~dfsg.1-ds/CPP/7zip/Archive/Zip/ZipUpdate.cpp 2009-10-28 05:48:04.000000000 +0300 +@@ -87,6 +87,7 @@ + item.NtfsATime = ui.NtfsATime; + item.NtfsCTime = ui.NtfsCTime; + item.NtfsTimeIsDefined = ui.NtfsTimeIsDefined; ++ archive.Recode(item); + } + else + isDir = item.IsDir(); +@@ -359,9 +360,11 @@ + item.NtfsCTime = ui.NtfsCTime; + item.NtfsTimeIsDefined = ui.NtfsTimeIsDefined; + ++ archive.Recode(item); ++ + item.CentralExtra.RemoveUnknownSubBlocks(); + item.LocalExtra.RemoveUnknownSubBlocks(); +- ++ + archive.PrepareWriteCompressedData2((UInt16)item.Name.Length(), item.UnPackSize, item.PackSize, item.LocalExtra.HasWzAesField()); + item.LocalHeaderPosition = archive.GetCurrentPosition(); + archive.SeekToPackedDataPosition(); +diff -dPNur p7zip-9.04~dfsg.1/CPP/7zip/Bundles/Alone/makefile p7zip-9.04~dfsg.1-ds/CPP/7zip/Bundles/Alone/makefile +--- p7zip-9.04~dfsg.1/CPP/7zip/Bundles/Alone/makefile 2009-06-27 18:18:14.000000000 +0400 ++++ p7zip-9.04~dfsg.1-ds/CPP/7zip/Bundles/Alone/makefile 2009-10-28 03:29:24.000000000 +0300 +@@ -244,6 +244,7 @@ + + + OBJS=\ ++rccrecode.o \ + myGetTickCount.o \ + wine_date_and_time.o \ + myAddExeFlag.o \ +diff -dPNur p7zip-9.04~dfsg.1/CPP/7zip/Bundles/Alone/makefile.list p7zip-9.04~dfsg.1-ds/CPP/7zip/Bundles/Alone/makefile.list +--- p7zip-9.04~dfsg.1/CPP/7zip/Bundles/Alone/makefile.list 2009-06-27 18:18:14.000000000 +0400 ++++ p7zip-9.04~dfsg.1-ds/CPP/7zip/Bundles/Alone/makefile.list 2009-10-28 03:40:17.000000000 +0300 +@@ -192,6 +192,7 @@ + ../../Crypto/ZipStrong.cpp + + SRCS_C=\ ++ ../../../../C/rccrecode.c \ + ../../../../C/Aes.c \ + ../../../../C/7zStream.c \ + ../../../../C/Bra.c \ +diff -dPNur p7zip-9.04~dfsg.1/CPP/7zip/Bundles/Format7zFree/makefile p7zip-9.04~dfsg.1-ds/CPP/7zip/Bundles/Format7zFree/makefile +--- p7zip-9.04~dfsg.1/CPP/7zip/Bundles/Format7zFree/makefile 2009-06-27 18:18:14.000000000 +0400 ++++ p7zip-9.04~dfsg.1-ds/CPP/7zip/Bundles/Format7zFree/makefile 2009-10-28 03:29:24.000000000 +0300 +@@ -284,6 +284,7 @@ + + + OBJS = \ ++ rccrecode.o \ + wine_date_and_time.o \ + myGetTickCount.o \ + $(COMMON_OBJS) \ +diff -dPNur p7zip-9.04~dfsg.1/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip-9.04~dfsg.1-ds/CPP/7zip/Bundles/Format7zFree/makefile.list +--- p7zip-9.04~dfsg.1/CPP/7zip/Bundles/Format7zFree/makefile.list 2009-06-27 18:18:14.000000000 +0400 ++++ p7zip-9.04~dfsg.1-ds/CPP/7zip/Bundles/Format7zFree/makefile.list 2009-10-28 03:34:02.000000000 +0300 +@@ -218,6 +218,7 @@ + ../../Crypto/ZipStrong.cpp + + SRCS_C=\ ++ ../../../../C/rccrecode.c \ + ../../../../C/7zBuf2.c \ + ../../../../C/7zStream.c \ + ../../../../C/Aes.c \ +diff -dPNur p7zip-9.04~dfsg.1/makefile.machine p7zip-9.04~dfsg.1-ds/makefile.machine +--- p7zip-9.04~dfsg.1/makefile.machine 2009-06-27 18:18:14.000000000 +0400 ++++ p7zip-9.04~dfsg.1-ds/makefile.machine 2009-10-28 03:29:24.000000000 +0300 +@@ -14,7 +14,7 @@ + CC_SHARED=-fPIC + LINK_SHARED=-fPIC -shared + +-LOCAL_LIBS=-lpthread ++LOCAL_LIBS=-lpthread -lrcc + LOCAL_LIBS_DLL=$(LOCAL_LIBS) -ldl + + OBJ_CRC32=$(OBJ_CRC32_C) +diff -dPNur p7zip-9.04~dfsg.1/makefile.rules p7zip-9.04~dfsg.1-ds/makefile.rules +--- p7zip-9.04~dfsg.1/makefile.rules 2009-06-27 18:18:14.000000000 +0400 ++++ p7zip-9.04~dfsg.1-ds/makefile.rules 2009-10-28 03:29:24.000000000 +0300 +@@ -586,3 +586,5 @@ + 7zCrcT8.o : ../../../../C/7zCrcT8.c + $(CC) $(CFLAGS) ../../../../C/7zCrcT8.c + ++rccrecode.o : ../../../../C/rccrecode.c ++ $(CC) $(CFLAGS) ../../../../C/rccrecode.c +diff -dPNur p7zip-9.04~dfsg.1/CPP/7zip/Archive/Zip/ZipOut.cpp p7zip-9.04~dfsg.1-ds/CPP/7zip/Archive/Zip/ZipOut.cpp +--- p7zip-9.04~dfsg.1/CPP/7zip/Archive/Zip/ZipOut.cpp 2009-06-27 18:18:14.000000000 +0400 ++++ p7zip-9.04~dfsg.1-ds/CPP/7zip/Archive/Zip/ZipOut.cpp 2009-10-28 05:49:01.000000000 +0300 +@@ -7,9 +7,24 @@ + #include "../../Common/OffsetStream.h" + #include "../../Common/StreamUtils.h" + ++#include "../../../../C/rccrecode.h" ++ + namespace NArchive { + namespace NZip { + ++COutArchive::COutArchive() { ++ rccctx = rcc_init(); ++} ++ ++COutArchive::~COutArchive() { ++ rcc_free(rccctx); ++} ++ ++void COutArchive::Recode(CItem &item) { ++ char *rccrec = rcc_write(rccctx, (const char *)item.Name, item.Name.Length()); ++ if (rccrec) item.Name = rccrec; ++} ++ + void COutArchive::Create(IOutStream *outStream) + { + if (!m_OutBuffer.Create(1 << 16)) diff --git a/app-arch/p7zip/files/p7zip_9.13-ds-dynbuf.patch b/app-arch/p7zip/files/p7zip_9.13-ds-dynbuf.patch new file mode 100644 index 0000000..7f16a3a --- /dev/null +++ b/app-arch/p7zip/files/p7zip_9.13-ds-dynbuf.patch @@ -0,0 +1,12 @@ +diff -dPNur p7zip_9.13/CPP/Common/DynamicBuffer.h p7zip_9.13-ds/CPP/Common/DynamicBuffer.h +--- p7zip_9.13/CPP/Common/DynamicBuffer.h 2008-08-25 21:40:32.000000000 +0200 ++++ p7zip_9.13-ds/CPP/Common/DynamicBuffer.h 2013-07-14 01:31:24.000000000 +0200 +@@ -17,7 +17,7 @@ + else + delta = 4; + delta = MyMax(delta, size); +- SetCapacity(this->_capacity + delta); ++ this->SetCapacity(this->_capacity + delta); + } + public: + CDynamicBuffer(): CBuffer<T>() {}; diff --git a/app-arch/p7zip/files/p7zip_9.13-ds-rusxmms.patch b/app-arch/p7zip/files/p7zip_9.13-ds-rusxmms.patch new file mode 100644 index 0000000..df27ac2 --- /dev/null +++ b/app-arch/p7zip/files/p7zip_9.13-ds-rusxmms.patch @@ -0,0 +1,307 @@ +diff -dPNur p7zip_9.13/C/rccrecode.c p7zip_9.13-rusxmms/C/rccrecode.c +--- p7zip_9.13/C/rccrecode.c 1970-01-01 01:00:00.000000000 +0100 ++++ p7zip_9.13-rusxmms/C/rccrecode.c 2010-07-31 20:32:27.000000000 +0200 +@@ -0,0 +1,73 @@ ++#include <pthread.h> ++#include <librcc.h> ++ ++static rcc_class_default_charset default_oem[] = { ++ { "ru", "IBM866" }, ++ { NULL, NULL } ++}; ++ ++static rcc_class_default_charset default_iso[] = { ++ { "ru", "CP1251" }, ++ { NULL, NULL } ++}; ++ ++#define ARC_CLASS 0 ++#define OUT_CLASS 1 ++#define ARCOUT_CLASS 0 ++static rcc_class classes[] = { ++ { "oem", RCC_CLASS_STANDARD, NULL, default_oem, "OEM Encoding", 0 }, ++ { "out", RCC_CLASS_STANDARD, "LC_CTYPE", NULL, "Output", 0 }, ++ { NULL, RCC_CLASS_STANDARD, NULL, NULL, NULL, 0 } ++}; ++ ++static int initialized = 0; ++static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; ++ ++void *rcc_init() { ++ rcc_context ctx; ++ ++ pthread_mutex_lock(&mutex); ++ if (!initialized) { ++ rccInit(); ++// rccInitDefaultContext(NULL, 0, 0, classes, 0); ++// rccInitDb4(NULL, NULL, 0); ++// rccLoad(NULL, "zip"); ++ } ++ initialized++; ++ pthread_mutex_unlock(&mutex); ++ ++ ctx = rccCreateContext(NULL, 0, 0, classes, 0); ++ if (ctx) { ++ rccInitDb4(ctx, NULL, 0); ++ rccLoad(ctx, "zip"); ++ } ++ ++ return ctx; ++} ++ ++ ++void rcc_free(void *ctx) { ++ if (ctx) rccFreeContext((rcc_context)ctx); ++ ++ pthread_mutex_lock(&mutex); ++ if (initialized == 1) rccFree(); ++ initialized--; ++ pthread_mutex_unlock(&mutex); ++} ++ ++ ++char *rcc_read(void *ctx, const char *string, size_t size) { ++ if (!initialized) { ++ rcc_init(); ++ if (!initialized) return NULL; ++ } ++ return rccSizedRecode((rcc_context)ctx, ARC_CLASS, OUT_CLASS, string, size, NULL); ++} ++ ++char *rcc_write(void *ctx, const char *string, size_t size) { ++ if (!initialized) { ++ rcc_init(); ++ if (!initialized) return NULL; ++ } ++ return rccSizedRecode((rcc_context)ctx, OUT_CLASS, ARCOUT_CLASS, string, size, NULL); ++} +diff -dPNur p7zip_9.13/C/rccrecode.h p7zip_9.13-rusxmms/C/rccrecode.h +--- p7zip_9.13/C/rccrecode.h 1970-01-01 01:00:00.000000000 +0100 ++++ p7zip_9.13-rusxmms/C/rccrecode.h 2010-07-31 14:07:34.000000000 +0200 +@@ -0,0 +1,17 @@ ++#ifndef _RCC_RECODE_H ++#define _RCC_RECODE_H ++ ++# ifdef __cplusplus ++extern "C" { ++# endif ++ ++ void *rcc_init(); ++ void rcc_free(void *ctx); ++ char *rcc_read(void *ctx, const char *string, size_t size); ++ char *rcc_write(void *ctx, const char *string, size_t size); ++ ++# ifdef __cplusplus ++} ++# endif ++ ++#endif /* _RCC_RECODE_H */ +diff -dPNur p7zip_9.13/CPP/7zip/Archive/Zip/ZipIn.cpp p7zip_9.13-rusxmms/CPP/7zip/Archive/Zip/ZipIn.cpp +--- p7zip_9.13/CPP/7zip/Archive/Zip/ZipIn.cpp 2010-04-25 17:14:42.000000000 +0200 ++++ p7zip_9.13-rusxmms/CPP/7zip/Archive/Zip/ZipIn.cpp 2010-07-31 20:33:42.000000000 +0200 +@@ -9,6 +9,8 @@ + #include "../../Common/LimitedStreams.h" + #include "../../Common/StreamUtils.h" + ++#include "../../../../C/rccrecode.h" ++ + #include "ZipIn.h" + + #define Get16(p) GetUi16(p) +@@ -17,7 +19,17 @@ + + namespace NArchive { + namespace NZip { +- ++ ++CInArchive::CInArchive() ++{ ++ rccctx = rcc_init(); ++} ++ ++CInArchive::~CInArchive() ++{ ++ rcc_free(rccctx); ++} ++ + HRESULT CInArchive::Open(IInStream *stream, const UInt64 *searchHeaderSizeLimit) + { + _inBufMode = false; +@@ -200,12 +212,20 @@ + + void CInArchive::ReadFileName(UInt32 nameSize, AString &dest) + { ++ char *rccrec; ++ + if (nameSize == 0) + dest.Empty(); + char *p = dest.GetBuffer((int)nameSize); + SafeReadBytes(p, nameSize); + p[nameSize] = 0; + dest.ReleaseBuffer(); ++ ++ rccrec = rcc_read(rccctx, (LPCSTR)dest, 0); ++ if (rccrec) { ++ dest = rccrec; ++ free(rccrec); ++ } + } + + void CInArchive::ReadExtra(UInt32 extraSize, CExtraBlock &extraBlock, +diff -dPNur p7zip_9.13/CPP/7zip/Archive/Zip/ZipIn.cpp.orig p7zip_9.13-rusxmms/CPP/7zip/Archive/Zip/ZipIn.cpp.orig +diff -dPNur p7zip_9.13/CPP/7zip/Archive/Zip/ZipIn.h p7zip_9.13-rusxmms/CPP/7zip/Archive/Zip/ZipIn.h +--- p7zip_9.13/CPP/7zip/Archive/Zip/ZipIn.h 2010-04-25 17:14:27.000000000 +0200 ++++ p7zip_9.13-rusxmms/CPP/7zip/Archive/Zip/ZipIn.h 2010-07-31 20:33:42.000000000 +0200 +@@ -117,6 +117,10 @@ + ISequentialInStream *CreateLimitedStream(UInt64 position, UInt64 size); + IInStream* CreateStream(); + ++ void *rccctx; ++ CInArchive(); ++ ~CInArchive(); ++ + bool IsOpen() const { return m_Stream != NULL; } + }; + +diff -dPNur p7zip_9.13/CPP/7zip/Archive/Zip/ZipIn.h.orig p7zip_9.13-rusxmms/CPP/7zip/Archive/Zip/ZipIn.h.orig +diff -dPNur p7zip_9.13/CPP/7zip/Archive/Zip/ZipOut.cpp p7zip_9.13-rusxmms/CPP/7zip/Archive/Zip/ZipOut.cpp +--- p7zip_9.13/CPP/7zip/Archive/Zip/ZipOut.cpp 2010-04-25 17:14:42.000000000 +0200 ++++ p7zip_9.13-rusxmms/CPP/7zip/Archive/Zip/ZipOut.cpp 2010-07-31 20:33:42.000000000 +0200 +@@ -6,9 +6,24 @@ + + #include "ZipOut.h" + ++#include "../../../../C/rccrecode.h" ++ + namespace NArchive { + namespace NZip { + ++COutArchive::COutArchive() { ++ rccctx = rcc_init(); ++} ++ ++COutArchive::~COutArchive() { ++ rcc_free(rccctx); ++} ++ ++void COutArchive::Recode(CItem &item) { ++ char *rccrec = rcc_write(rccctx, (const char *)item.Name, item.Name.Length()); ++ if (rccrec) item.Name = rccrec; ++} ++ + void COutArchive::Create(IOutStream *outStream) + { + if (!m_OutBuffer.Create(1 << 16)) +diff -dPNur p7zip_9.13/CPP/7zip/Archive/Zip/ZipOut.cpp.orig p7zip_9.13-rusxmms/CPP/7zip/Archive/Zip/ZipOut.cpp.orig +diff -dPNur p7zip_9.13/CPP/7zip/Archive/Zip/ZipOut.h p7zip_9.13-rusxmms/CPP/7zip/Archive/Zip/ZipOut.h +--- p7zip_9.13/CPP/7zip/Archive/Zip/ZipOut.h 2010-04-25 17:14:27.000000000 +0200 ++++ p7zip_9.13-rusxmms/CPP/7zip/Archive/Zip/ZipOut.h 2010-07-31 20:33:42.000000000 +0200 +@@ -49,6 +49,11 @@ + void CreateStreamForCompressing(IOutStream **outStream); + void CreateStreamForCopying(ISequentialOutStream **outStream); + void SeekToPackedDataPosition(); ++ ++ void *rccctx; ++ COutArchive(); ++ ~COutArchive(); ++ void Recode(CItem &item); + }; + + }} +diff -dPNur p7zip_9.13/CPP/7zip/Archive/Zip/ZipUpdate.cpp p7zip_9.13-rusxmms/CPP/7zip/Archive/Zip/ZipUpdate.cpp +--- p7zip_9.13/CPP/7zip/Archive/Zip/ZipUpdate.cpp 2010-04-25 17:25:47.000000000 +0200 ++++ p7zip_9.13-rusxmms/CPP/7zip/Archive/Zip/ZipUpdate.cpp 2010-07-31 20:33:42.000000000 +0200 +@@ -86,6 +86,7 @@ + item.NtfsATime = ui.NtfsATime; + item.NtfsCTime = ui.NtfsCTime; + item.NtfsTimeIsDefined = ui.NtfsTimeIsDefined; ++ archive.Recode(item); + } + else + isDir = item.IsDir(); +@@ -358,9 +359,11 @@ + item.NtfsCTime = ui.NtfsCTime; + item.NtfsTimeIsDefined = ui.NtfsTimeIsDefined; + ++ archive.Recode(item); ++ + item.CentralExtra.RemoveUnknownSubBlocks(); + item.LocalExtra.RemoveUnknownSubBlocks(); +- ++ + archive.PrepareWriteCompressedData2((UInt16)item.Name.Length(), item.UnPackSize, item.PackSize, item.LocalExtra.HasWzAesField()); + item.LocalHeaderPosition = archive.GetCurrentPosition(); + archive.SeekToPackedDataPosition(); +diff -dPNur p7zip_9.13/CPP/7zip/Archive/Zip/ZipUpdate.cpp.orig p7zip_9.13-rusxmms/CPP/7zip/Archive/Zip/ZipUpdate.cpp.orig +diff -dPNur p7zip_9.13/CPP/7zip/Bundles/Alone/makefile p7zip_9.13-rusxmms/CPP/7zip/Bundles/Alone/makefile +--- p7zip_9.13/CPP/7zip/Bundles/Alone/makefile 2010-03-16 20:15:59.000000000 +0100 ++++ p7zip_9.13-rusxmms/CPP/7zip/Bundles/Alone/makefile 2010-07-31 20:33:42.000000000 +0200 +@@ -251,6 +251,7 @@ + + + OBJS=\ ++rccrecode.o \ + myGetTickCount.o \ + wine_date_and_time.o \ + myAddExeFlag.o \ +diff -dPNur p7zip_9.13/CPP/7zip/Bundles/Alone/makefile.list p7zip_9.13-rusxmms/CPP/7zip/Bundles/Alone/makefile.list +--- p7zip_9.13/CPP/7zip/Bundles/Alone/makefile.list 2010-03-16 20:17:05.000000000 +0100 ++++ p7zip_9.13-rusxmms/CPP/7zip/Bundles/Alone/makefile.list 2010-07-31 20:33:42.000000000 +0200 +@@ -194,6 +194,7 @@ + ../../Crypto/ZipStrong.cpp + + SRCS_C=\ ++ ../../../../C/rccrecode.c \ + ../../../../C/Aes.c \ + ../../../../C/7zStream.c \ + ../../../../C/Alloc.c \ +diff -dPNur p7zip_9.13/CPP/7zip/Bundles/Alone/makefile.list.orig p7zip_9.13-rusxmms/CPP/7zip/Bundles/Alone/makefile.list.orig +diff -dPNur p7zip_9.13/CPP/7zip/Bundles/Alone/makefile.orig p7zip_9.13-rusxmms/CPP/7zip/Bundles/Alone/makefile.orig +diff -dPNur p7zip_9.13/CPP/7zip/Bundles/Format7zFree/makefile p7zip_9.13-rusxmms/CPP/7zip/Bundles/Format7zFree/makefile +--- p7zip_9.13/CPP/7zip/Bundles/Format7zFree/makefile 2010-03-16 20:49:21.000000000 +0100 ++++ p7zip_9.13-rusxmms/CPP/7zip/Bundles/Format7zFree/makefile 2010-07-31 20:33:42.000000000 +0200 +@@ -298,6 +298,7 @@ + + + OBJS = \ ++ rccrecode.o \ + wine_date_and_time.o \ + myGetTickCount.o \ + $(COMMON_OBJS) \ +diff -dPNur p7zip_9.13/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_9.13-rusxmms/CPP/7zip/Bundles/Format7zFree/makefile.list +--- p7zip_9.13/CPP/7zip/Bundles/Format7zFree/makefile.list 2010-03-16 20:50:11.000000000 +0100 ++++ p7zip_9.13-rusxmms/CPP/7zip/Bundles/Format7zFree/makefile.list 2010-07-31 20:33:42.000000000 +0200 +@@ -224,6 +224,7 @@ + ../../Crypto/ZipStrong.cpp + + SRCS_C=\ ++ ../../../../C/rccrecode.c \ + ../../../../C/7zBuf2.c \ + ../../../../C/7zStream.c \ + ../../../../C/Aes.c \ +diff -dPNur p7zip_9.13/CPP/7zip/Bundles/Format7zFree/makefile.list.orig p7zip_9.13-rusxmms/CPP/7zip/Bundles/Format7zFree/makefile.list.orig +diff -dPNur p7zip_9.13/CPP/7zip/Bundles/Format7zFree/makefile.orig p7zip_9.13-rusxmms/CPP/7zip/Bundles/Format7zFree/makefile.orig +diff -dPNur p7zip_9.13/makefile.machine p7zip_9.13-rusxmms/makefile.machine +--- p7zip_9.13/makefile.machine 2010-05-30 10:33:48.000000000 +0200 ++++ p7zip_9.13-rusxmms/makefile.machine 2010-07-31 20:33:42.000000000 +0200 +@@ -15,7 +15,7 @@ + CC_SHARED=-fPIC + LINK_SHARED=-fPIC -shared + +-LOCAL_LIBS=-lpthread ++LOCAL_LIBS=-lpthread -lrcc + LOCAL_LIBS_DLL=$(LOCAL_LIBS) -ldl + + OBJ_CRC32=$(OBJ_CRC32_C) +diff -dPNur p7zip_9.13/makefile.machine.orig p7zip_9.13-rusxmms/makefile.machine.orig +diff -dPNur p7zip_9.13/makefile.rules p7zip_9.13-rusxmms/makefile.rules +--- p7zip_9.13/makefile.rules 2010-03-16 20:18:44.000000000 +0100 ++++ p7zip_9.13-rusxmms/makefile.rules 2010-07-31 20:33:42.000000000 +0200 +@@ -655,3 +655,5 @@ + LangUtils.o : ../../UI/FileManager/LangUtils.cpp + $(CXX) $(CXXFLAGS) ../../UI/FileManager/LangUtils.cpp + ++rccrecode.o : ../../../../C/rccrecode.c ++ $(CC) $(CFLAGS) ../../../../C/rccrecode.c +diff -dPNur p7zip_9.13/makefile.rules.orig p7zip_9.13-rusxmms/makefile.rules.orig +diff -dPNur p7zip_9.13/p7zip_9.04-ds-rusxmms.patch p7zip_9.13-rusxmms/p7zip_9.04-ds-rusxmms.patch diff --git a/app-arch/p7zip/p7zip-4.27-r1.ebuild b/app-arch/p7zip/p7zip-4.27-r1.ebuild new file mode 100644 index 0000000..18f4baf --- /dev/null +++ b/app-arch/p7zip/p7zip-4.27-r1.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.27.ebuild,v 1.5 2005/10/04 10:47:05 blubb Exp $ + +inherit eutils toolchain-funcs multilib + +DESCRIPTION="Port of 7-Zip archiver for Unix" +HOMEPAGE="http://p7zip.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="amd64 ~ppc x86" +IUSE="static doc" + +S=${WORKDIR}/${PN}_${PV} + +src_unpack() { + unpack ${A} + cd "${S}" + use static && epatch "${FILESDIR}"/p7zip-4.16_x86_static.patch +#SDS + EPATCH_OPTS="-p1" epatch ${FILESDIR}/p7zip_4.27-libun7zip.patch +#EDS + sed -i \ + -e "/^CXX=/s:g++:$(tc-getCXX):" \ + -e "/^CC=/s:gcc:$(tc-getCC):" \ + -e "s:-O1 -s:${CXXFLAGS}:" \ + makefile* || die "cleaning up makefiles" +} + +src_compile() { + emake all2 || die "compilation error" +#SDS + emake -C 7zip/Bundles/Un7Zip +#EDS +} + +src_install() { + # this wrappers can not be symlinks, p7zip should be called with full path + make_wrapper 7za "/usr/lib/${PN}/7za" + make_wrapper 7z "/usr/lib/${PN}/7z" + + exeinto /usr/$(get_libdir)/${PN} + doexe bin/7z bin/7za bin/7zCon.sfx || die "doexe bins" + exeinto /usr/$(get_libdir)/${PN}/Codecs + doexe bin/Codecs/* || die "doexe Codecs" + exeinto /usr/$(get_libdir)/${PN}/Formats + doexe bin/Formats/* || die "doexe Formats" + + doman man1/7z.1 man1/7za.1 + dodoc ChangeLog README TODO + + if use doc ; then + dodoc DOCS/*.txt + dohtml -r DOCS/MANUAL/* + fi + +#SDS + mkdir -p ${D}/usr/lib/ + mkdir -p ${D}/usr/include/ + install -s -D -m 755 7zip/Bundles/Un7Zip/libun7zip.so ${D}/usr/lib/libun7zip.so + install -D -m 644 7zip/Bundles/Un7Zip/u7zip.h ${D}/usr/include/u7zip.h +#EDS + +} diff --git a/app-arch/p7zip/p7zip-4.30-r1.ebuild b/app-arch/p7zip/p7zip-4.30-r1.ebuild new file mode 100644 index 0000000..5ad62be --- /dev/null +++ b/app-arch/p7zip/p7zip-4.30-r1.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.30.ebuild,v 1.1 2005/12/11 19:31:20 radek Exp $ + +inherit eutils toolchain-funcs multilib + +DESCRIPTION="Port of 7-Zip archiver for Unix" +HOMEPAGE="http://p7zip.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="amd64 ~hppa ~ppc x86" +IUSE="static doc" + +S=${WORKDIR}/${PN}_${PV} + +src_unpack() { + unpack ${A} + cd "${S}" + use static && epatch "${FILESDIR}"/p7zip-4.16_x86_static.patch +#SDS + EPATCH_OPTS="-p1" epatch ${FILESDIR}/p7zip_4.27-libun7zip.patch +#EDS + sed -i \ + -e "/^CXX=/s:g++:$(tc-getCXX):" \ + -e "/^CC=/s:gcc:$(tc-getCC):" \ + -e "s:-O1 -s:${CXXFLAGS}:" \ + makefile* || die "cleaning up makefiles" +} + +src_compile() { + emake all2 || die "compilation error" +#SDS + emake -C 7zip/Bundles/Un7Zip +#EDS +} + +src_install() { + # this wrappers can not be symlinks, p7zip should be called with full path + make_wrapper 7za "/usr/lib/${PN}/7za" + make_wrapper 7z "/usr/lib/${PN}/7z" + + exeinto /usr/$(get_libdir)/${PN} + doexe bin/7z bin/7za bin/7zCon.sfx || die "doexe bins" + exeinto /usr/$(get_libdir)/${PN}/Codecs + doexe bin/Codecs/* || die "doexe Codecs" + exeinto /usr/$(get_libdir)/${PN}/Formats + doexe bin/Formats/* || die "doexe Formats" + + doman man1/7z.1 man1/7za.1 + dodoc ChangeLog README TODO + + if use doc ; then + dodoc DOCS/*.txt + dohtml -r DOCS/MANUAL/* + fi + +#SDS + mkdir -p ${D}/usr/lib/ + mkdir -p ${D}/usr/include/ + install -s -D -m 755 7zip/Bundles/Un7Zip/libun7zip.so ${D}/usr/lib/libun7zip.so + install -D -m 644 7zip/Bundles/Un7Zip/u7zip.h ${D}/usr/include/u7zip.h +#EDS +} diff --git a/app-arch/p7zip/p7zip-4.42-r1.ebuild b/app-arch/p7zip/p7zip-4.42-r1.ebuild new file mode 100644 index 0000000..160e40f --- /dev/null +++ b/app-arch/p7zip/p7zip-4.42-r1.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.42.ebuild,v 1.4 2006/06/22 20:10:21 blubb Exp $ + +inherit eutils toolchain-funcs multilib + +DESCRIPTION="Port of 7-Zip archiver for Unix" +HOMEPAGE="http://p7zip.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="amd64 ~hppa ~ppc x86" +IUSE="static doc" + +S=${WORKDIR}/${PN}_${PV} + +src_unpack() { + unpack ${A} + cd "${S}" + use static && epatch "${FILESDIR}"/p7zip-4.16_x86_static.patch +#SDS + EPATCH_OPTS="-p1" epatch ${FILESDIR}/p7zip_4.27-libun7zip.patch || die + epatch ${FILESDIR}/p7zip-ds-442.patch || die +#EDS + + sed -i \ + -e "/^CXX=/s:g++:$(tc-getCXX):" \ + -e "/^CC=/s:gcc:$(tc-getCC):" \ + -e "s:OPTFLAGS=-O:OPTFLAGS=${CXXFLAGS}:" \ + makefile* || die "changing makefiles" + + if use amd64; then + ewarn "Using suboptimal -fPIC upstream makefile due to amd64 being detected. See #126722" + cp -f makefile.linux_amd64 makefile.machine + fi +} + +src_compile() { + emake all3 || die "compilation error" +#SDS + emake -C 7zip/Bundles/Un7Zip || die +#EDS +} + +src_install() { + # this wrappers can not be symlinks, p7zip should be called with full path + make_wrapper 7zr "/usr/lib/${PN}/7zr" + make_wrapper 7za "/usr/lib/${PN}/7za" + make_wrapper 7z "/usr/lib/${PN}/7z" + + dobin ${FILESDIR}/p7zip + + # gzip introduced in 4.42 but i havent' got enough time to check it carefully + # so for now just leaving it commented + # mv needed just as rename, because dobin installs using old name + #mv contrib/gzip-like_CLI_wrapper_for_7z/p7zip contrib/gzip-like_CLI_wrapper_for_7z/7zg + #dobin contrib/gzip-like_CLI_wrapper_for_7z/7zg + + exeinto /usr/$(get_libdir)/${PN} + doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx || die "doexe bins" + exeinto /usr/$(get_libdir)/${PN}/Codecs + doexe bin/Codecs/* || die "doexe Codecs" + exeinto /usr/$(get_libdir)/${PN}/Formats + doexe bin/Formats/* || die "doexe Formats" + + doman man1/7z.1 man1/7za.1 man1/7zr.1 + dodoc ChangeLog README TODO + + if use doc ; then + dodoc DOCS/*.txt + dohtml -r DOCS/MANUAL/* + fi + +#SDS + mkdir -p ${D}/usr/lib/ + mkdir -p ${D}/usr/include/ + install -s -D -m 755 7zip/Bundles/Un7Zip/libun7zip.so ${D}/usr/lib/libun7zip.so || die + install -D -m 644 7zip/Bundles/Un7Zip/u7zip.h ${D}/usr/include/u7zip.h || die +#EDS +} diff --git a/app-arch/p7zip/p7zip-4.44-r1.ebuild b/app-arch/p7zip/p7zip-4.44-r1.ebuild new file mode 100644 index 0000000..9853c2a --- /dev/null +++ b/app-arch/p7zip/p7zip-4.44-r1.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.44.ebuild,v 1.7 2007/03/25 18:14:50 armin76 Exp $ + +inherit eutils toolchain-funcs multilib + +DESCRIPTION="Port of 7-Zip archiver for Unix" +HOMEPAGE="http://p7zip.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~ppc-macos ~ppc64 sparc x86 ~x86-fbsd" +IUSE="static doc" + +S=${WORKDIR}/${PN}_${PV} + +src_unpack() { + unpack ${A} + cd "${S}" + sed -i \ + -e "/^CXX=/s:g++:$(tc-getCXX):" \ + -e "/^CC=/s:gcc:$(tc-getCC):" \ + -e "s:OPTFLAGS=-O:OPTFLAGS=${CXXFLAGS}:" \ + -e 's:-s ::' \ + makefile* || die "changing makefiles" + + if use amd64; then + ewarn "Using suboptimal -fPIC upstream makefile due to amd64 being detected. See #126722" + cp -f makefile.linux_amd64 makefile.machine + elif use ppc-macos; then + # Mac OS X needs this special makefile, because it has a non-GNU linker + cp -f makefile.macosx makefile.machine + elif use x86-fbsd; then + # FreeBSD needs this special makefile, because it hasn't -ldl + sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine + fi + use static && sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine + +#SDS + EPATCH_OPTS="-p1" epatch ${FILESDIR}/p7zip_4.44-libun7zip.patch || die +#EDS +} + +src_compile() { + emake all3 || die "compilation error" +#SDS + emake -C CPP/7zip/Bundles/Un7Zip || die +#EDS +} + +src_install() { + # this wrappers can not be symlinks, p7zip should be called with full path + make_wrapper 7zr "/usr/lib/${PN}/7zr" + make_wrapper 7za "/usr/lib/${PN}/7za" + make_wrapper 7z "/usr/lib/${PN}/7z" + + dobin ${FILESDIR}/p7zip + + # gzip introduced in 4.42, so beware :) + # mv needed just as rename, because dobin installs using old name + mv contrib/gzip-like_CLI_wrapper_for_7z/p7zip contrib/gzip-like_CLI_wrapper_for_7z/7zg + dobin contrib/gzip-like_CLI_wrapper_for_7z/7zg + + exeinto /usr/$(get_libdir)/${PN} + doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx || die "doexe bins" + exeinto /usr/$(get_libdir)/${PN}/Codecs + doexe bin/Codecs/* || die "doexe Codecs" + exeinto /usr/$(get_libdir)/${PN}/Formats + doexe bin/Formats/* || die "doexe Formats" + + doman man1/7z.1 man1/7za.1 man1/7zr.1 + dodoc ChangeLog README TODO + + if use doc ; then + dodoc DOCS/*.txt + dohtml -r DOCS/MANUAL/* + fi + +#SDS + mkdir -p ${D}/usr/lib/ + mkdir -p ${D}/usr/include/ + install -s -D -m 755 CPP/7zip/Bundles/Un7Zip/libun7zip.so ${D}/usr/lib/libun7zip.so || die + install -D -m 644 CPP/7zip/Bundles/Un7Zip/u7zip.h ${D}/usr/include/u7zip.h || die +#EDS +} diff --git a/app-arch/p7zip/p7zip-4.44-r2.ebuild b/app-arch/p7zip/p7zip-4.44-r2.ebuild new file mode 100644 index 0000000..2604381 --- /dev/null +++ b/app-arch/p7zip/p7zip-4.44-r2.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.44.ebuild,v 1.7 2007/03/25 18:14:50 armin76 Exp $ + +inherit eutils toolchain-funcs multilib + +DESCRIPTION="Port of 7-Zip archiver for Unix" +HOMEPAGE="http://p7zip.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~ppc-macos ~ppc64 sparc x86 ~x86-fbsd" +IUSE="static doc" + +S=${WORKDIR}/${PN}_${PV} + +src_unpack() { + unpack ${A} + cd "${S}" + sed -i \ + -e "/^CXX=/s:g++:$(tc-getCXX):" \ + -e "/^CC=/s:gcc:$(tc-getCC):" \ + -e "s:OPTFLAGS=-O:OPTFLAGS=${CXXFLAGS}:" \ + -e 's:-s ::' \ + makefile* || die "changing makefiles" + + if use amd64; then + ewarn "Using suboptimal -fPIC upstream makefile due to amd64 being detected. See #126722" + cp -f makefile.linux_amd64 makefile.machine + elif use ppc-macos; then + # Mac OS X needs this special makefile, because it has a non-GNU linker + cp -f makefile.macosx makefile.machine + elif use x86-fbsd; then + # FreeBSD needs this special makefile, because it hasn't -ldl + sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine + fi + use static && sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine + +#SDS + EPATCH_OPTS="-p1" epatch ${FILESDIR}/p7zip_4.44-libun7zip.patch || die + epatch ${FILESDIR}/p7zip-ds-rcc.patch || die +#EDS +} + +src_compile() { + emake all3 || die "compilation error" +#SDS + emake -C CPP/7zip/Bundles/Un7Zip || die +#EDS +} + +src_install() { + # this wrappers can not be symlinks, p7zip should be called with full path + make_wrapper 7zr "/usr/lib/${PN}/7zr" + make_wrapper 7za "/usr/lib/${PN}/7za" + make_wrapper 7z "/usr/lib/${PN}/7z" + + dobin ${FILESDIR}/p7zip + + # gzip introduced in 4.42, so beware :) + # mv needed just as rename, because dobin installs using old name + mv contrib/gzip-like_CLI_wrapper_for_7z/p7zip contrib/gzip-like_CLI_wrapper_for_7z/7zg + dobin contrib/gzip-like_CLI_wrapper_for_7z/7zg + + exeinto /usr/$(get_libdir)/${PN} + doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx || die "doexe bins" + exeinto /usr/$(get_libdir)/${PN}/Codecs + doexe bin/Codecs/* || die "doexe Codecs" + exeinto /usr/$(get_libdir)/${PN}/Formats + doexe bin/Formats/* || die "doexe Formats" + + doman man1/7z.1 man1/7za.1 man1/7zr.1 + dodoc ChangeLog README TODO + + if use doc ; then + dodoc DOCS/*.txt + dohtml -r DOCS/MANUAL/* + fi + +#SDS + mkdir -p ${D}/usr/lib/ + mkdir -p ${D}/usr/include/ + install -s -D -m 755 CPP/7zip/Bundles/Un7Zip/libun7zip.so ${D}/usr/lib/libun7zip.so || die + install -D -m 644 CPP/7zip/Bundles/Un7Zip/u7zip.h ${D}/usr/include/u7zip.h || die +#EDS +} diff --git a/app-arch/p7zip/p7zip-4.57-r1.ebuild b/app-arch/p7zip/p7zip-4.57-r1.ebuild new file mode 100644 index 0000000..1d34f55 --- /dev/null +++ b/app-arch/p7zip/p7zip-4.57-r1.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.57.ebuild,v 1.7 2008/03/16 17:40:56 nixnut Exp $ + +inherit eutils toolchain-funcs multilib + +DESCRIPTION="Port of 7-Zip archiver for Unix" +HOMEPAGE="http://p7zip.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd" +IUSE="static doc rcc" + +DEPEND="rcc? ( app-i18n/librcc )" + +S=${WORKDIR}/${PN}_${PV} + +src_unpack() { + unpack ${A} + cd "${S}" + +#SDS +# Communism forever! +# Removing nasty removal of non-free code (Rar line). ;) +#EDS + sed -i \ + -e "/^CXX=/s:g++:$(tc-getCXX):" \ + -e "/^CC=/s:gcc:$(tc-getCC):" \ + -e "s:OPTFLAGS=-O:OPTFLAGS=${CXXFLAGS}:" \ + -e 's:-s ::' \ + makefile* || die "changing makefiles" + + if use amd64; then + ewarn "Using suboptimal -fPIC upstream makefile due to amd64 being detected. See #126722" + cp -f makefile.linux_amd64 makefile.machine + elif [[ ${CHOST} == *-darwin* ]] ; then + # Mac OS X needs this special makefile, because it has a non-GNU linker + cp -f makefile.macosx makefile.machine + elif use x86-fbsd; then + # FreeBSD needs this special makefile, because it hasn't -ldl + sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine + fi + use static && sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine + +#SDS + # patching to not included nonfree RAR decompression code is higher a sed call + # But we're removing nonfree code just in case sed wasnt enough +# rm -rf CPP/7zip/Compress/Rar + + EPATCH_OPTS="-p1" epatch "${FILESDIR}"/p7zip_4.57-libun7zip.patch || die + use rcc && ( epatch "${FILESDIR}"/p7zip_4.57-ds-rusxmms.patch || die ) + + find . -maxdepth 1 -name "makefile.linux*" -print0 | xargs -0 sed -i -e "s/LOCAL_LIBS=-lpthread/LOCAL_LIBS=-lpthread -lrcc/" +#EDS +} + +src_compile() { + emake all3 || die "compilation error" +#SDS + emake -C CPP/7zip/Bundles/Un7Zip || die +#EDS +} + +src_install() { + # this wrappers can not be symlinks, p7zip should be called with full path + make_wrapper 7zr "/usr/lib/${PN}/7zr" + make_wrapper 7za "/usr/lib/${PN}/7za" + make_wrapper 7z "/usr/lib/${PN}/7z" + + dobin "${FILESDIR}/p7zip" || die + + # gzip introduced in 4.42, so beware :) + # mv needed just as rename, because dobin installs using old name + mv contrib/gzip-like_CLI_wrapper_for_7z/p7zip contrib/gzip-like_CLI_wrapper_for_7z/7zg || die + dobin contrib/gzip-like_CLI_wrapper_for_7z/7zg || die + + exeinto /usr/$(get_libdir)/${PN} + doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx || die "doexe bins" + exeinto /usr/$(get_libdir)/${PN} + doexe bin/*.so || die "doexe *.so files" + + doman man1/7z.1 man1/7za.1 man1/7zr.1 + dodoc ChangeLog README TODO + + if use doc ; then + dodoc DOCS/*.txt + dohtml -r DOCS/MANUAL/* + fi + +#SDS + mkdir -p ${D}/usr/lib/ + mkdir -p ${D}/usr/include/ + install -s -D -m 755 CPP/7zip/Bundles/Un7Zip/libun7zip.so ${D}/usr/lib/libun7zip.so || die + install -D -m 644 CPP/7zip/Bundles/Un7Zip/u7zip.h ${D}/usr/include/u7zip.h || die +#EDS + +# einfo "Please be aware that rar support was removed (it's nonfree)" +# einfo "You can use app-arch/rar for rar support" +} diff --git a/app-arch/p7zip/p7zip-4.65-r2.ebuild b/app-arch/p7zip/p7zip-4.65-r2.ebuild new file mode 100644 index 0000000..5b3eeb5 --- /dev/null +++ b/app-arch/p7zip/p7zip-4.65-r2.ebuild @@ -0,0 +1,150 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.65.ebuild,v 1.6 2009/05/03 07:12:52 dirtyepic Exp $ + +EAPI="2" +WX_GTK_VER="2.8" + +inherit eutils toolchain-funcs multilib wxwidgets + +DESCRIPTION="Port of 7-Zip archiver for Unix" +HOMEPAGE="http://p7zip.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2" + +LICENSE="LGPL-2.1 rar? ( unRAR )" +SLOT="0" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd" +#SDS +IUSE="doc kde rar static wxwidgets rcc" +#EDS + +RDEPEND="kde? ( x11-libs/wxGTK:2.8[X,-odbc] || ( kde-base/konqueror kde-base/kdebase-meta kde-base/kdebase ) ) + wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )" + +#SDS +DEPEND="${RDEPEND} + rcc? ( app-i18n/librcc )" +#EDS + +S=${WORKDIR}/${PN}_${PV} + +pkg_setup() { + use wxwidgets && wxwidgets_pkg_setup +} + +src_prepare() { + if use kde && ! use wxwidgets ; then + einfo "USE-flag kde needs wxwidgets flag" + einfo "silently enabling wxwidgets flag" + fi + + # remove non-free RAR codec + if use rar; then + ewarn "Enabling nonfree RAR decompressor" + else + sed -e '/Rar/d' -i makefile* + rm -rf CPP/7zip/Compress/Rar + epatch "${FILESDIR}"/${PV}-makefile.patch + fi + + sed -i \ + -e "/^CXX=/s:g++:$(tc-getCXX):" \ + -e "/^CC=/s:gcc:$(tc-getCC):" \ + -e "s:OPTFLAGS=-O:OPTFLAGS=${CXXFLAGS}:" \ + -e 's:-s ::' \ + makefile* || die "changing makefiles" + + if use amd64; then + cp -f makefile.linux_amd64 makefile.machine + elif [[ ${CHOST} == *-darwin* ]] ; then + # Mac OS X needs this special makefile, because it has a non-GNU linker + cp -f makefile.macosx makefile.machine + elif use x86-fbsd; then + # FreeBSD needs this special makefile, because it hasn't -ldl + sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine + fi + use static && sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine + + # We can be more parallel + cp -f makefile.parallel_jobs makefile + + epatch "${FILESDIR}"/${PV}-hardlink.patch + +#SDS + EPATCH_OPTS="-p1" epatch "${FILESDIR}"/p7zip_4.65-libun7zip.patch || die + use rcc && ( epatch "${FILESDIR}"/p7zip_4.65-ds-rusxmms.patch || die ) + + find . -maxdepth 1 -name "makefile.linux*" -print0 | xargs -0 sed -i -e "s/LOCAL_LIBS=-lpthread/LOCAL_LIBS=-lpthread -lrcc/" +#EDS +} + +src_compile() { + emake all3 || die "compilation error" + if use kde || use wxwidgets; then + emake 7zG || die "error building GUI" + fi +#SDS + emake -C CPP/7zip/Bundles/Un7Zip || die +#EDS +} + +src_test() { + emake test_7z test_7zr || die "test failed" + if use kde || use wxwidgets; then + emake test_7zG || die "GUI test failed" + fi +} + +src_install() { + # this wrappers can not be symlinks, p7zip should be called with full path + make_wrapper 7zr "/usr/$(get_libdir)/${PN}/7zr" + make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za" + make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z" + + if use kde || use wxwidgets; then + make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG" + + dobin GUI/p7zipForFilemanager + exeinto /usr/$(get_libdir)/${PN} + doexe bin/7zG + + insinto /usr/$(get_libdir)/${PN} + doins -r GUI/{Lang,help} + + if use kde; then + insinto /usr/share/icons/hicolor/16x16/apps/ + newins GUI/p7zip_16_ok.png p7zip.png + + insinto /usr/share/apps/konqueror/servicemenus/ + doins GUI/kde/*.desktop + fi + fi + + dobin "${FILESDIR}/p7zip" || die + + # gzip introduced in 4.42, so beware :) + newbin contrib/gzip-like_CLI_wrapper_for_7z/p7zip 7zg || die + + exeinto /usr/$(get_libdir)/${PN} + doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx || die "doexe bins" + doexe bin/*.so || die "doexe *.so files" + if use rar; then + exeinto /usr/$(get_libdir)/${PN}/Codecs/ + doexe bin/Codecs/*.so || die "doexe Codecs/*.so files" + fi + + doman man1/7z.1 man1/7za.1 man1/7zr.1 + dodoc ChangeLog README TODO + + if use doc ; then + dodoc DOCS/*.txt + dohtml -r DOCS/MANUAL/* + fi + +#SDS + mkdir -p ${D}/usr/lib/ + mkdir -p ${D}/usr/include/ + install -s -D -m 755 CPP/7zip/Bundles/Un7Zip/libun7zip.so ${D}/usr/lib/libun7zip.so || die + install -D -m 644 CPP/7zip/Bundles/Un7Zip/u7zip.h ${D}/usr/include/u7zip.h || die +#EDS +} diff --git a/app-arch/p7zip/p7zip-9.13-r2.ebuild b/app-arch/p7zip/p7zip-9.13-r2.ebuild new file mode 100644 index 0000000..5328241 --- /dev/null +++ b/app-arch/p7zip/p7zip-9.13-r2.ebuild @@ -0,0 +1,151 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.13.ebuild,v 1.2 2010/07/04 21:58:55 hwoarang Exp $ + +EAPI="2" +WX_GTK_VER="2.8" + +inherit eutils toolchain-funcs multilib wxwidgets + +DESCRIPTION="Port of 7-Zip archiver for Unix" +HOMEPAGE="http://p7zip.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2" + +LICENSE="LGPL-2.1 rar? ( unRAR )" +SLOT="0" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" + +#SDS +IUSE="doc kde rar static wxwidgets rcc" +#EDS + +RDEPEND="kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-base/konqueror ) + wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )" + +#SDS +DEPEND="${RDEPEND} + rcc? ( app-i18n/librcc )" +#EDS + + +S=${WORKDIR}/${PN}_${PV} + +pkg_setup() { + use wxwidgets && wxwidgets_pkg_setup +} + +src_prepare() { + if use kde && ! use wxwidgets ; then + einfo "USE-flag kde needs wxwidgets flag" + einfo "silently enabling wxwidgets flag" + fi + + # remove non-free RAR codec + if use rar; then + ewarn "Enabling nonfree RAR decompressor" + else + sed -e '/Rar/d' -i makefile* + rm -rf CPP/7zip/Compress/Rar + epatch "${FILESDIR}"/9.04-makefile.patch + fi + + sed -i \ + -e "/^CXX=/s:g++:$(tc-getCXX):" \ + -e "/^CC=/s:gcc:$(tc-getCC):" \ + -e "s:OPTFLAGS=-O:OPTFLAGS=${CXXFLAGS}:" \ + -e '/ALLFLAGS/s:-s ::' \ + makefile* || die "changing makefiles" + + if use amd64; then + cp -f makefile.linux_amd64 makefile.machine + elif [[ ${CHOST} == *-darwin* ]] ; then + # Mac OS X needs this special makefile, because it has a non-GNU linker + [[ ${CHOST} == *64-* ]] \ + && cp -f makefile.macosx_64bits makefile.machine \ + || cp -f makefile.macosx_32bits makefile.machine + # bundles have extension .bundle but don't die because USE=-rar + # removes the Rar directory + sed -i -e '/^PROG=/s/\.so/.bundle/' \ + CPP/7zip/Bundles/Format7zFree/makefile \ + CPP/7zip/Compress/Rar/makefile + elif use x86-fbsd; then + # FreeBSD needs this special makefile, because it hasn't -ldl + sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine + fi + use static && sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine + + # We can be more parallel + cp -f makefile.parallel_jobs makefile + + epatch "${FILESDIR}"/9.04-kde4.patch + +#SDS +# EPATCH_OPTS="-p1" epatch "${FILESDIR}"/p7zip_4.65-libun7zip.patch || die + use rcc && ( epatch "${FILESDIR}"/p7zip_9.13-ds-rusxmms.patch || die ) + + find . -maxdepth 1 -name "makefile.linux*" -print0 | xargs -0 sed -i -e "s/LOCAL_LIBS=-lpthread/LOCAL_LIBS=-lpthread -lrcc/" +#EDS + + if use kde || use wxwidgets; then + einfo "Preparing dependency list" + emake depend || die + fi +} + +src_compile() { + emake all3 || die "compilation error" + if use kde || use wxwidgets; then + emake 7zG || die "error building GUI" + fi +} + +src_test() { + emake test_7z test_7zr || die "test failed" +} + +src_install() { + # this wrappers can not be symlinks, p7zip should be called with full path + make_wrapper 7zr "/usr/$(get_libdir)/${PN}/7zr" + make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za" + make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z" + + if use kde || use wxwidgets; then + make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG" + + dobin GUI/p7zipForFilemanager + exeinto /usr/$(get_libdir)/${PN} + doexe bin/7zG + + insinto /usr/$(get_libdir)/${PN} + doins -r GUI/{Lang,help} + + if use kde; then + insinto /usr/share/icons/hicolor/16x16/apps/ + newins GUI/p7zip_16_ok.png p7zip.png + + insinto /usr/share/kde4/services/ServiceMenus + doins GUI/kde/*.desktop + fi + fi + + dobin "${FILESDIR}/p7zip" || die + + # gzip introduced in 4.42, so beware :) + newbin contrib/gzip-like_CLI_wrapper_for_7z/p7zip 7zg || die + + exeinto /usr/$(get_libdir)/${PN} + doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx || die "doexe bins" + doexe bin/*$(get_modname) || die "doexe *$(get_modname) files" + if use rar; then + exeinto /usr/$(get_libdir)/${PN}/Codecs/ + doexe bin/Codecs/*$(get_modname) || die "doexe Codecs/*$(get_modname) files" + fi + + doman man1/7z.1 man1/7za.1 man1/7zr.1 + dodoc ChangeLog README TODO + + if use doc ; then + dodoc DOCS/*.txt + dohtml -r DOCS/MANUAL/* + fi +} diff --git a/app-arch/p7zip/p7zip-9.13-r3.ebuild b/app-arch/p7zip/p7zip-9.13-r3.ebuild new file mode 100644 index 0000000..961654c --- /dev/null +++ b/app-arch/p7zip/p7zip-9.13-r3.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.13.ebuild,v 1.2 2010/07/04 21:58:55 hwoarang Exp $ + +EAPI="2" +WX_GTK_VER="2.8" + +inherit eutils toolchain-funcs multilib wxwidgets + +DESCRIPTION="Port of 7-Zip archiver for Unix" +HOMEPAGE="http://p7zip.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2" + +LICENSE="LGPL-2.1 rar? ( unRAR )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" + +#SDS +IUSE="doc kde rar static wxwidgets rcc" +#EDS + +RDEPEND="kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-base/konqueror ) + wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )" + +#SDS +DEPEND="${RDEPEND} + rcc? ( app-i18n/librcc )" +#EDS + + +S=${WORKDIR}/${PN}_${PV} + +pkg_setup() { + use wxwidgets && wxwidgets_pkg_setup +} + +src_prepare() { + if use kde && ! use wxwidgets ; then + einfo "USE-flag kde needs wxwidgets flag" + einfo "silently enabling wxwidgets flag" + fi + + # remove non-free RAR codec + if use rar; then + ewarn "Enabling nonfree RAR decompressor" + else + sed -e '/Rar/d' -i makefile* + rm -rf CPP/7zip/Compress/Rar + epatch "${FILESDIR}"/9.04-makefile.patch + fi + + sed -i \ + -e "/^CXX=/s:g++:$(tc-getCXX):" \ + -e "/^CC=/s:gcc:$(tc-getCC):" \ + -e "s:OPTFLAGS=-O:OPTFLAGS=${CXXFLAGS}:" \ + -e '/ALLFLAGS/s:-s ::' \ + makefile* || die "changing makefiles" + + if use amd64; then + cp -f makefile.linux_amd64 makefile.machine + elif [[ ${CHOST} == *-darwin* ]] ; then + # Mac OS X needs this special makefile, because it has a non-GNU linker + [[ ${CHOST} == *64-* ]] \ + && cp -f makefile.macosx_64bits makefile.machine \ + || cp -f makefile.macosx_32bits makefile.machine + # bundles have extension .bundle but don't die because USE=-rar + # removes the Rar directory + sed -i -e '/^PROG=/s/\.so/.bundle/' \ + CPP/7zip/Bundles/Format7zFree/makefile \ + CPP/7zip/Compress/Rar/makefile + elif use x86-fbsd; then + # FreeBSD needs this special makefile, because it hasn't -ldl + sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine + fi + use static && sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine + + # We can be more parallel + cp -f makefile.parallel_jobs makefile + + epatch "${FILESDIR}"/9.04-kde4.patch + +#SDS +# EPATCH_OPTS="-p1" epatch "${FILESDIR}"/p7zip_4.65-libun7zip.patch || die + epatch "${FILESDIR}"/p7zip_9.13-ds-dynbuf.patch || die + use rcc && ( epatch "${FILESDIR}"/p7zip_9.13-ds-rusxmms.patch || die ) + + find . -maxdepth 1 -name "makefile.linux*" -print0 | xargs -0 sed -i -e "s/LOCAL_LIBS=-lpthread/LOCAL_LIBS=-lpthread -lrcc/" +#EDS + + if use kde || use wxwidgets; then + einfo "Preparing dependency list" + emake depend || die + fi +} + +src_compile() { + emake all3 || die "compilation error" + if use kde || use wxwidgets; then + emake 7zG || die "error building GUI" + fi +} + +src_test() { + emake test_7z test_7zr || die "test failed" +} + +src_install() { + # this wrappers can not be symlinks, p7zip should be called with full path + make_wrapper 7zr "/usr/$(get_libdir)/${PN}/7zr" + make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za" + make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z" + + if use kde || use wxwidgets; then + make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG" + + dobin GUI/p7zipForFilemanager + exeinto /usr/$(get_libdir)/${PN} + doexe bin/7zG + + insinto /usr/$(get_libdir)/${PN} + doins -r GUI/{Lang,help} + + if use kde; then + insinto /usr/share/icons/hicolor/16x16/apps/ + newins GUI/p7zip_16_ok.png p7zip.png + + insinto /usr/share/kde4/services/ServiceMenus + doins GUI/kde/*.desktop + fi + fi + + dobin "${FILESDIR}/p7zip" || die + + # gzip introduced in 4.42, so beware :) + newbin contrib/gzip-like_CLI_wrapper_for_7z/p7zip 7zg || die + + exeinto /usr/$(get_libdir)/${PN} + doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx || die "doexe bins" + doexe bin/*$(get_modname) || die "doexe *$(get_modname) files" + if use rar; then + exeinto /usr/$(get_libdir)/${PN}/Codecs/ + doexe bin/Codecs/*$(get_modname) || die "doexe Codecs/*$(get_modname) files" + fi + + doman man1/7z.1 man1/7za.1 man1/7zr.1 + dodoc ChangeLog README TODO + + if use doc ; then + dodoc DOCS/*.txt + dohtml -r DOCS/MANUAL/* + fi +} diff --git a/app-arch/p7zip/p7zip-9.20.1-r5.ebuild b/app-arch/p7zip/p7zip-9.20.1-r5.ebuild new file mode 100644 index 0000000..797a51f --- /dev/null +++ b/app-arch/p7zip/p7zip-9.20.1-r5.ebuild @@ -0,0 +1,172 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.20.1-r4.ebuild,v 1.3 2013/08/04 12:09:02 ago Exp $ + +EAPI=4 + +WX_GTK_VER="2.8" + +inherit eutils multilib toolchain-funcs wxwidgets + +DESCRIPTION="Port of 7-Zip archiver for Unix" +HOMEPAGE="http://p7zip.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2" + +LICENSE="LGPL-2.1 rar? ( unRAR )" +SLOT="0" +KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris" + +#SDS +IUSE="doc kde rar +pch static wxwidgets rcc" +#EDS + +REQUIRED_USE="kde? ( wxwidgets )" + +RDEPEND=" + kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-base/kdelibs ) + wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )" + +#SDS +DEPEND="${RDEPEND} + rcc? ( app-i18n/librcc ) + amd64? ( dev-lang/yasm ) + x86? ( dev-lang/nasm )" +#EDS + +S=${WORKDIR}/${PN}_${PV} + +pkg_setup() { + use wxwidgets && wxwidgets_pkg_setup +} + +src_prepare() { + epatch \ + "${FILESDIR}"/${P}-execstack.patch \ + "${FILESDIR}"/${P}-QA.patch + + if ! use pch; then + sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die + fi + + sed \ + -e 's:-m32 ::g' \ + -e 's:-m64 ::g' \ + -e 's:-O::g' \ + -e 's:-pipe::g' \ + -e "/^CC/s:\$(ALLFLAGS):${CFLAGS} \$(ALLFLAGS):g" \ + -e "/^CXX/s:\$(ALLFLAGS):${CXXFLAGS} \$(ALLFLAGS):g" \ + -i makefile* || die + + # remove non-free RAR codec + if use rar; then + ewarn "Enabling nonfree RAR decompressor" + else + sed -e '/Rar/d' -i makefile* || die + rm -rf CPP/7zip/Compress/Rar || die + epatch "${FILESDIR}"/9.04-makefile.patch + fi + + sed -i \ + -e "/^CXX=/s:g++:$(tc-getCXX):" \ + -e "/^CC=/s:gcc:$(tc-getCC):" \ + -e '/ALLFLAGS/s:-s ::' \ + makefile* || die "changing makefiles" + + if use amd64; then + cp -f makefile.linux_amd64_asm makefile.machine || die + elif use x86; then + cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine || die + elif [[ ${CHOST} == *-darwin* ]] ; then + # Mac OS X needs this special makefile, because it has a non-GNU linker + [[ ${CHOST} == *64-* ]] \ + && cp -f makefile.macosx_64bits makefile.machine \ + || cp -f makefile.macosx_32bits makefile.machine + # bundles have extension .bundle but don't die because USE=-rar + # removes the Rar directory + sed -i -e '/strcpy(name/s/\.so/.bundle/' \ + CPP/Windows/DLL.cpp || die + sed -i -e '/^PROG=/s/\.so/.bundle/' \ + CPP/7zip/Bundles/Format7zFree/makefile \ + $(use rar && echo CPP/7zip/Compress/Rar/makefile) || die + elif use x86-fbsd; then + # FreeBSD needs this special makefile, because it hasn't -ldl + sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine + fi + + use static && sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine + +#SDS +# epatch "${FILESDIR}"/p7zip_9.13-ds-dynbuf.patch || die + use rcc && ( epatch "${FILESDIR}"/p7zip_9.13-ds-rusxmms.patch || die ) + + find . -maxdepth 1 -name "makefile.linux*" -print0 | xargs -0 sed -i -e "s/LOCAL_LIBS=-lpthread/LOCAL_LIBS=-lpthread -lrcc/" +#EDS + + if use kde || use wxwidgets; then + einfo "Preparing dependency list" + emake depend + fi +} + +src_compile() { + emake all3 + if use kde || use wxwidgets; then + emake -- 7zG + emake -- 7zFM + fi +} + +src_test() { + emake test test_7z test_7zr +} + +src_install() { + # this wrappers can not be symlinks, p7zip should be called with full path + make_wrapper 7zr "/usr/$(get_libdir)/${PN}/7zr" + make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za" + make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z" + + if use kde || use wxwidgets; then + make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG" + make_wrapper 7zFM "/usr/$(get_libdir)/${PN}/7zFM" + + make_desktop_entry 7zFM "${PN} FM" ${PN}.png "GTK;Utility;Archiving;Compression" + make_desktop_entry 7zG "${PN} GUI" ${PN}.png "GTK;Utility;Archiving;Compression" + + dobin GUI/p7zipForFilemanager + exeinto /usr/$(get_libdir)/${PN} + doexe bin/7z{G,FM} + + insinto /usr/$(get_libdir)/${PN} + doins -r GUI/{Lang,help} + + insinto /usr/share/icons/hicolor/16x16/apps/ + newins GUI/p7zip_16_ok.png p7zip.png + + if use kde; then + + rm GUI/kde4/p7zip_compress.desktop + insinto /usr/share/kde4/services/ServiceMenus + doins GUI/kde4/*.desktop + fi + fi + + dobin contrib/gzip-like_CLI_wrapper_for_7z/p7zip + doman contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1 + + exeinto /usr/$(get_libdir)/${PN} + doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx + doexe bin/*$(get_modname) + if use rar; then + exeinto /usr/$(get_libdir)/${PN}/Codecs/ + doexe bin/Codecs/*$(get_modname) + fi + + doman man1/7z.1 man1/7za.1 man1/7zr.1 + dodoc ChangeLog README TODO + + if use doc; then + dodoc DOCS/*.txt + dohtml -r DOCS/MANUAL/* + fi +} |