From 8bfe98456cc67be435c89221e3c53e05e469c597 Mon Sep 17 00:00:00 2001 From: Jason Boyer Date: Sat, 6 Jan 2018 22:21:09 -0500 Subject: [PATCH] LP1741309: Correct installed file permission Because of the machinations of the _ReplaceInFile macro the extension host JSON file does not inherit permissions correctly. Adding the AccessControl NSIS plugin and using the EnableFileInheritance function corrects this. Signed-off-by: Jason Boyer Signed-off-by: Chris Sharp --- installer/windows/AccessControl.dll | Bin 0 -> 13312 bytes installer/windows/defines.nsh | 2 +- installer/windows/hatch.nsi | 6 +++++- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100755 installer/windows/AccessControl.dll diff --git a/installer/windows/AccessControl.dll b/installer/windows/AccessControl.dll new file mode 100755 index 0000000000000000000000000000000000000000..0de0324fc659e3d2d70a91657f76e50bdbb0af77 GIT binary patch literal 13312 zcmeHO4SZD9mA^?QVT6GhAfcm095o0E;!7qUlle;0WC;9BU|>Q9Klm7u2Qwi|;^aL( zlxXTCZH8yM*80&^yM^Mmu5De{x|X(9gV03kN3pn&E?TjryAMNasu72p_3i(>_a+|_ zHSX^3x7*)u-|u(k-h1vj=bn4+x#!;d-kq8o?`9c{F#|wR7(0NJo-+0K(|?Yldd6ix zoxz^E=;g}~q*cFsd2Kk-YHNu#Z;6Gr+3G{lXtQA3#M@$G)E0@_Dpv+<+nO8rCDW%* z&DBNkSUvMWyZw$MDcE9Jc_bg@?Dq{v3RL{PUT~IP9TrR#@NOs4Iv?f z{LN|jDFaZamH@^)WsLPKiSbR%^^Cnlx>AQo76%yflri?DF~$GS{uNrlUC7uy@ZH^j z20$&q3AhSi1^fl|uLF7kPXg`*>;yDWxd3>;X#hjn2B-zl^Eh~)0o;zdM!?MgKcEb- z1aJjl79a~SXon0yKi~!M(DNYh^sEW^RtIiotfstT+42=W0XuCG|5r>iNgi18tTuZ~2wGPa^wh-}`)m@g`B<6}Sv z#7)=pyIM!-Gz66cyigZv5_!t668YFJy;R9J@d95Fjx;r}+E{2iA8S=<${QNM+z^TJ z^+I!O7ejezq={$MkyfE{1j|?zALV0_df!gIUKGHomxHkgl}5^|`A`E}DmFEh*Vpr{ z&@iwoS|5%zM^AuPm=1USg_fjta5nCZ_4B*Ov=IEV2phwW>5@iY%pw zD$`f4)+1r%EiHVsp;8SVYMqu<>-8)vudFNgFSk=pMoW?eVGHr`DiJ7)*BVwk3weHHC#db7MSPEP_ze&6n;b!N2Ed$xzCG9enV6)hqv{`H~(od2x5%0xlEek+tDKmc}Zy8!{2TWE6B8MLB(6k*PTxH!% z4v1&eD;bONTi}s!P&~CUu~p!C8`kh`k=9lW90Gi(!6xYVh4Wi!bzy!!rq(w{ZJV1y zTUu?Q7(dFP@w9xLMrW?jHU*f44YrW#%eH#WMQu$`WQolei#5l9Yv7%>`3=+@(|I1y-%uBx^B&wRkUHENo^CFxAM^mr}{(EFX+z4XadVCFCbxcN+By_mc}wACydRcG}w7gxJ(gp zO$2pH&NqRKA2!v=Grq_`oO2h->z_9=R2#z8vzSH6X#vWwvX!o@C^PBI;QfY#FR-}z(do}*{$Jl`R7#lFbgQpA`&mUSNosFNh1nRy!?2u6EP*_liPAIWD7HdZ#4CAeOn!gS*#T_2e{P9r?^ zPD$I7VLxKBIls~ZS)z4MAg%qEHs}4fP-$xWZRyP1@god>yf?Ev{?V1O6H;Ll>=RIq z`=w)Y|3``<^>>~$cRT=L6*~6$5$u=8V1EE?XHUX6WbSCBmJt(OoVoL#AiVvyw4LV8 z?;$6>CqD|h?$-3Ks&x5VYSz$Il_B4wW{q7{2KlRMc4}8uro3Ctn!2j8L1n4dnFIRu3hRVE2ui1R~C5tGVsX-(2E@B0rjg)kd7DEr8#D88Y1+mJEgOYS~te%hzR`6MGt4c@+B zAOkW2^0%#MttJ^rRQ`=oIj;DU-IW<>Fs0;6x_pDXPqw!yOt4_66OKJTrK>6pqd#y_ zQ1fzo&xZ9k9f8NL3QD_kO~B5@2zK_EJC30%YwCa~03s+2DmmH6n4e~nho(zoTKHZV z1Fhy-l@pS@Ckqp(qepZ(mZphC=BJmYo1b2haqyHe;~+AIR3=l+_`^NKtK^WoWE}D< zC%`#^pj3MY53{!habLx#b!U3A(vnZZ_lm6RJAHO3n5S8x($oMhe55$ z&5)P6Kofi2-m|`J-G&>`+3;!9%JYWF(qd*~{@MXcDjHDQn5GMP5}NVC4OxqGwW4$F){8WQwtOe`~iK3>Y|qz?qEQltvY*$HJZlID1?A?{_O z9DhMskH)3mMSTa8=>zX!rmhOsNlDEN?cRmmm7F3jXm?yKUJ>VqX%=+*hW*`3)8qx3 zsu`F2hT{t`ZHEVPwUE{~g>)JTY{^bVFw&rPp>3&e!x1eUWC!Xb(P%$emsmGEzO^f< zwRv6ER71~xNH#HdN{|ZTGjXIr$zz1LZr@pdw=d}rbo++0C&5& z{rqlWYWw*`LgrG(Jn?PEJRzfN-cmm%g0#~luS7_29ojupsxi9Cv)e9`mRlslmoM@S zJLXBf;u9Ozqe*pQsPS|z4A^3be`E-nI}gDm`>M-fU*iGV@O74R=8ngKl-8N-3iQI* zr6t;u;zj2UrHcmpk%7#g&~~+ZO>%Yo_Xg?M!QWY?y*llvj~Q1|`RjUP^Pry;Hw#M?C^u+1NoaV$+}CKr-?*0H0-w_;54I8?oie$<;1 zkPng*Qh)rzTg5BEk#b~LuT*16qzUHk8Y6j!>K33=y+hT1LHH%o|Hh=Yx{>}j4Pc40 z)ZqbxYT2VwKL+v;l(&%b@w0B42-cuoK@6-*v<+dH;GK!Kvx&Chgzt2sO~#6OWEKXs zN0<^eVV)1n@AeJKt1$mueF&;`;*_wB(02Jd8kspte4r?2_JRmDrm56ufTmKfyr0&mehi^85N;vqw|4tvOg5Tu7<3xHN*cfI z#%|wXb#RRGddyS_y8HSi-%!GL3Z^e{2pNgCmuMgq@hnLF@+_j#B|k!vZD?BRg&l)I zwRL$e^i(OP1;VeBlD|5K9fLS571GSZf8nR?yv3u~uKI|4 z0;Mx9bQ`qtp1)9J!H8%BPu?Qm_C5yw5)i?qu)F4TnfxX^Ea9`H$PSDplSj!8sAMwvh!2}Zj5_+uVJ$g|D-p3(`dO$&$}vSE?5EBFH4f!Gt)}=Q~U91TaiO&ayG~r6sH}eeFO7 z=DZ@#?XDSCBMLdzBAOl8?+V6Xn9afLxG~;lLF`TXMKigos!A?Y8JIrev1O`eL#|#i z1Jh4i$Yd;JR@fOyHX>V&8#EY#kxeVsR%ovFx$I;BV zDVjh-s2>+a^Z;UFL7AUUT@%YL&kC=Faj;|2c1sA{eOVMgr>wM$BP&nb-vHg>E=(+ zsaV%3r0Fz2AoU{D(q2&2N?wI%Gftl!Xmw(J*8NZF^Qz`}7wGdYBIG!I{v8X=#QMC9 zno;{?Uod9syhx4NEuUbY>W@zghib61GN&n+tJ*86I#SAJ{rVUViCF=;3R=+II5Dc^ z(3nA7m{L-z%%$_IWxpTJkeFVJUpndTr1%=9PsbhkTi5{{`b-u!mZfo0 zEaO_)J1Lg*v8`;I6idcf7U!f`3}acQOp0Y(_ivmO%ed|@m=w#nR&JdX%eYpmh(%p4 zacsbm$b>UK9oYA)F5t85r%|V44BibEs?JeJKB4+SpHF=cLZ|+O&m^o2fQZg;SmNwb zn~7H0xvDb?mm-1({n8xRhRe0zzX>?I6gwv6qo>Ki%xKfR$Ch3s2{DiUU6X%Gx zCUG`XBdLj&!)&%8wHm&O3LH^%J!^1iGGQyPzWUOmX^kbQ#Sp2+>TfJl1Faff6VoZC z>N^11GTKkNKEyF_2#deDV?S2*pj-y=v|qUoCGFIlO>f^!{y;FX&Xib}4Z9d&7ux%n z*!Ek{D_Z?YcZ*PuvxvGEppP9jDRvy$O;~F!i8gDnktwi{KyQ1bH{}n{P_Kn7+A9sr zNu4v<7t~$oH_-}xAkk(jy@60SrgYpriCxH;eJWljr>t`jHTnxk9OFNKn6aw+8#T

xB_P^iKAjzUjr6Pa!9NT5copjS!M+wD@DB`BwZ9Y>7Km-|fAX{k?s>)+Ha+O@Y3 z!+sbe31h$jCfGthwUIrtsxk}Gq#IvNzez^(Mun|@)|`*K)#bGsza@U z`X!#Rh*r0)B~s4rr#e4ASK~TMOudJ48tsG{sw10Xp%}?;R;io#DDr1C9m<>3n`E1b zw?g~IOd^OqlT|b|xAMzE(FR;ixZbyVg|FJ4zofFdnz5N_J6c%!ZnNvy z@>X;w(g6E1wuyQGLyYag)f2Q?K_kKzQO%lGK1Mfe;0L%p)X<2lC91L`#%g8u@gu2I z)19L&s#~D7kvm12PaI@bP0gEhw`SW?ehp`PPOs6OZQPW-RKE+F?$EB!;M*zg+u(yq zF=I`Dqk#2`fw+#b#funwD{H9qG$?j4c9967?@H!TmHqFY3amdlY;d zfKLPN7f9~`oJZY5sM`Wu0pKvlST@?X0hRzt080Vu0NVj~0UiPT7;qTyD&Q309l(cx zi%J-q4X^>O1GoXp0Rg}UKormhpdO~P3}(RG%3@RSQRpHzl}%$NHl5AD{UQsSi5p6@ zSvJeT>&P!KE7NY2>G#BzG&D6~PV%AH$|yyNR31Y@qfyC6cj*;cHieJ0hBh_v#Ibzz zY7DE?&>GR$3SV?0at(VS^=RBkITbk=HKsYMUeNp+1x><8omSLqW1*;^_n=D4Yt@Xr zPralD_uGzHr4ywJIu+)?XuEnrlZ=ASqUJ{FwVb96syV;%!z#tL)A=>$1J1v5{;TsX=X6)LE6?R}-Qaq_^{h*F&2uky zJKc5eg!^&#Gw!6@;CayVwugCVdlz_J-s`<}-gVw@d;7e{yzhJGlwMkTN9p~g-z|Ny zbf^@K+u(y3fN9(cu7$gudy)GcH#_h0ybXDgy#0BH^G@YuC>u z9Pc_ZN-ixaC~=n5maH$iv*a5kKP)+1^2?IbC4VaUOUYHv)y{~s*}2o%;Y>Imc7DhC zedmvz&p3bO{1@kMoo_qeai+VBu9>b&U01jYVcANT-?hdSc12w~Tya;I>mk=Z*JG}y zT|aZZ;(E>XhU<*$Pp&lg6t~4a*L}IW0M@T?uXNYCx4C2PTisuA-{t@$jVb2NA8=imjyzBYE zGu3PHUhJLky~gYDR(PwuYcYN;-tFEyyps2B?|$z;c%Sq>>pkQ>?tR_+2k)P~=e*NO zvrFfeE-YPAYA;<`dQ0h@r4N<3gO0{{gz6eI>V>yOT?B-{2nR zzR&%HdyV@I_ZIg@?maHaU78ooyDRUWyuZ!s$@@*-@ACeXHrdy4P2OOg2xHmPH5E5b#PtWUEJN=z1%mU*loHvj+t literal 0 HcmV?d00001 diff --git a/installer/windows/defines.nsh b/installer/windows/defines.nsh index e311794..8afcac3 100644 --- a/installer/windows/defines.nsh +++ b/installer/windows/defines.nsh @@ -14,7 +14,7 @@ ; Version numbers should be integers !define VERSIONMAJOR 0 !define VERSIONMINOR 1 -!define VERSIONBUILD 3 +!define VERSIONBUILD 5 !define FULLVERSION "${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONBUILD}" ;--------------------------- ; Add Remove info diff --git a/installer/windows/hatch.nsi b/installer/windows/hatch.nsi index 91d1db3..54adc2b 100644 --- a/installer/windows/hatch.nsi +++ b/installer/windows/hatch.nsi @@ -25,8 +25,11 @@ !include ReplaceInFile.nsh ;--------------------------------------------------------------- +; Add local copy of AccessControl plugin +!addplugindir . + ; Installer's filename -Outfile "${APPNAME} Installer.exe" +Outfile "${APPNAME} Installer ${FULLVERSION}.exe" RequestExecutionLevel admin @@ -174,6 +177,7 @@ section "install" ; Set path variable in org.ils_evergreen.hatch.json to $INSTDIR\hatch.bat ${StrRep} '$0' '$INSTDIR' '\' '\\' !insertmacro _ReplaceInFile "$INSTDIR\extension\host\org.evergreen_ils.hatch.json" "/path/to/hatch.sh" "$0\\hatch.bat" + AccessControl::EnableFileInheritance "$INSTDIR\extension\host\org.evergreen_ils.hatch.json" ; Uninstaller writeUninstaller "$INSTDIR\Uninstall ${APPNAME}.exe" -- 2.11.0