From 61c574818b3c3b5efc7736bcc1e765f1bce51315 Mon Sep 17 00:00:00 2001 From: Mark Zhuang Date: Tue, 10 Nov 2026 16:50:02 +0800 Subject: [PATCH] debian: preserve prebuilt x64 guest shim in source packages dpkg-source drop *.so, use .so.1 to bypass --- CMakeLists.txt | 2 +- src/wemeet_unlock_shim.S | 2 +- system/box64.box64rc | 2 +- ...ock_shim.so => libwemeet_unlock_shim.so.1} | Bin 14032 -> 13480 bytes 4 files changed, 3 insertions(+), 3 deletions(-) rename x64lib/{libwemeet_unlock_shim.so => libwemeet_unlock_shim.so.1} (76%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0ece222d44..c74391b616 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1562,7 +1562,7 @@ if(NOT _x86 AND NOT _x86_64 AND NOT NOBOX64) endif() set(INSTALL_PATH "/usr/lib/box64-x86_64-linux-gnu") if(NOT NO_LIB_INSTALL AND NOT TERMUX AND NOT ANDROID) - install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libwemeet_unlock_shim.so DESTINATION ${INSTALL_PATH}) + install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libwemeet_unlock_shim.so.1 DESTINATION ${INSTALL_PATH}) endif() if(NOT NO_LIB_INSTALL) if(NOT TERMUX AND NOT ANDROID) diff --git a/src/wemeet_unlock_shim.S b/src/wemeet_unlock_shim.S index 3e3df0b398..1319165f4d 100644 --- a/src/wemeet_unlock_shim.S +++ b/src/wemeet_unlock_shim.S @@ -8,7 +8,7 @@ # Preserve the two guest registers around the real call. # # Build: -# x86_64-linux-gnu-gcc -shared -nostdlib -fPIC -Wl,-soname,libwemeet_unlock_shim.so -o libwemeet_unlock_shim.so wemeet_unlock_shim.S +# x86_64-linux-gnu-gcc -shared -nostdlib -fPIC -Wl,-soname,libwemeet_unlock_shim.so.1 -o libwemeet_unlock_shim.so.1 wemeet_unlock_shim.S # # The [wemeetapp] profile in system/box64.box64rc loads it through BOX64_LD_PRELOAD. diff --git a/system/box64.box64rc b/system/box64.box64rc index 4fb12d1f1c..76719c2dbb 100644 --- a/system/box64.box64rc +++ b/system/box64.box64rc @@ -447,7 +447,7 @@ BOX64_DYNAREC_DIV0=1 BOX64_DYNAREC_STRONGMEM=1 [wemeetapp] -BOX64_LD_PRELOAD=libwemeet_unlock_shim.so +BOX64_LD_PRELOAD=libwemeet_unlock_shim.so.1 [weixin] BOX64_MALLOC_HACK=2 diff --git a/x64lib/libwemeet_unlock_shim.so b/x64lib/libwemeet_unlock_shim.so.1 similarity index 76% rename from x64lib/libwemeet_unlock_shim.so rename to x64lib/libwemeet_unlock_shim.so.1 index a0465605c098ebd16a556f69732eab5988884d0d..b1237eb7d8398ae81f9748c7491864a0aebcf662 100755 GIT binary patch delta 810 zcmZWn&1(}u6rY)-HmTZd=vNlRO$v6m6*k?ZTkOGR^rx{17{?f6sHo1 zYa$~8VTfEw;PFOwFW8ee5|9fj>a&9QK57;YuJ(2 zp$ba>9ir0~WjA3F9w=+jc|E$Y_UIe@{`}(8hvoL_($Uuzyi)B;t|$06DAB>euQ~rMuyFOV?WnC zGLHM<*e%Ei-n*9P=qq|C870;}4TNM)`+Z$k)IpXlB?1^NyF-SaXRiiNhz!@KM_{+S zsp474tKq}REbMqI@ZDQB&m&A+edd_~jf!nvM&wtLY%$8EIq(iq2T{srlna}KPQ@Ms@7QO*9E6O~UQ5<{v{BUBs0k5(>v}LAzR$ zw;?}Olk;!~_xlh|)yx&-^yAXgI(^{?#(mq|Mueu#=-EeW_;%?rBJ>j&6#+UV)GY)&;^H6HvyA9u}@I0!$q#R%#MD_TUHNqE`rKk?ZsxH+u1~Cd^5t6Jcd{0dO)lZd`g-MqWU|Uh zv-8jSpRaxUHg|O`huDj?W&<8z;~*92oOTwqQ|1wWQT?aYPwl8027bkBEJeY2Z>d>t zExb;ZdS|&owPr0+kJqWz8dR^9-v}B(u*2(gT09o+H<<@}NTw(yHQmYpjZ%-*rhqA6 z3YY?>fGJ=Km;$DNDPRihtpf4!pB^WQAHK=;;6o*DiCvXRe*7Vhlvqj;(K;buZpv z=DQi@2Pt!znJ;hb?e=UmQ@|831xx``z!WeAOaW8C6fgx$0aL&fUrE-R*hDPRhi0;Yf|U<#N5rhqA63YY?>z`s^tKp96A?^8q` z?fq&a|M}NH>no)%@Q8`Re%z4s}bC&IHN-`+f9FoN*=1+mm{b3Z3(>3 z#hre!x{dQ7`+MjP%CGN{#6Pg5zwo6z$yc}h?NjXUwv`!;-<8+BurO7wPcOddw21S& z>&WbG`i+3RXI`8dIrZ$*$4UO$YD(Rf@xz;*nn_ zrxS%KR?%vUXN-RF<2PW1e6Xk`o4XUkq)v>k&Dekb+dPWjs4ehpt;k6RDt9`p(_R!gmvZmp zyyV}17|u;1-zjB_yk_xR9Jj#7c?LeJ!8o5dR~X|2H{>jXkMjxLKJ1^0+N*evnt(iikvp>d{QEE90kMDB5jV2; zU!H#yfr@$l`|KB8@%iBI4c>Ff$HNAG%v{kPd_33i{t(_1!hH`O^#6>xvVZXL_h*xn zqofp*dbHE}FhbtWYL6H}@PAh4os6P0__#0S?;7UT&;)+h`Kwtc Xw`IO;k#W26=Z~dPYuR9K=lOpDy(=Z0