From 457ebe49599476f95a287aafbbe601991097642b Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Thu, 31 Mar 2011 13:07:54 +0000 Subject: [PATCH] * cyglsa.c: Fix compilation with MinGW-w64 toolchains. * make-64bit-version-with-mingw-w64.sh: New file. * cyglsa64.dll: Regenerate with MinGW-w64-gc. --- winsup/lsaauth/ChangeLog | 6 +++++ winsup/lsaauth/cyglsa.c | 4 +-- winsup/lsaauth/cyglsa64.dll | Bin 8704 -> 8704 bytes .../make-64bit-version-with-mingw-w64.sh | 25 ++++++++++++++++++ 4 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 winsup/lsaauth/make-64bit-version-with-mingw-w64.sh diff --git a/winsup/lsaauth/ChangeLog b/winsup/lsaauth/ChangeLog index 7e91cdbb6..671870602 100644 --- a/winsup/lsaauth/ChangeLog +++ b/winsup/lsaauth/ChangeLog @@ -1,3 +1,9 @@ +2011-03-30 Yaakov Selkowitz + + * cyglsa.c: Fix compilation with MinGW-w64 toolchains. + * make-64bit-version-with-mingw-w64.sh: New file. + * cyglsa64.dll: Regenerate with MinGW-w64-gc. + 2010-12-10 Illia Bobyr * cyglsa-config: Unset GREP_OPTIONS when calling grep. diff --git a/winsup/lsaauth/cyglsa.c b/winsup/lsaauth/cyglsa.c index 4ebbd201b..b5a7a841c 100644 --- a/winsup/lsaauth/cyglsa.c +++ b/winsup/lsaauth/cyglsa.c @@ -1,6 +1,6 @@ /* cyglsa.c: LSA authentication module for Cygwin - Copyright 2006, 2008, 2010 Red Hat, Inc. + Copyright 2006, 2008, 2010, 2011 Red Hat, Inc. Written by Corinna Vinschen @@ -19,7 +19,7 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #include #include #include -#ifdef __MINGW32__ +#if defined(__MINGW32__) && !defined(_W64) #include #endif #include "../cygwin/cyglsa.h" diff --git a/winsup/lsaauth/cyglsa64.dll b/winsup/lsaauth/cyglsa64.dll index 0af4de12fb0539e33749a279eb93dbcdd11974ff..f1840472744b41258e371d5a12e98c97bf926bd8 100644 GIT binary patch literal 8704 zcmeHMYj7LY6~1yTVoV&FOhU~xEgMJ%hbA61gw&JJL4GW(8b3sAB^g496=`j&$dZs& zj!kQ-R54^(1es3K0&QvFM+;Lr1sW3L4jnn6n6xkz?X(jLg*1I2*B(e19xjBc-??{J zlJoji3O}-w>$~@y?>z6hkBwSy+Qnuu#>&z1dB#T2)8pcQ&;2I}_T0-x=dyhlzO-n> z*7DM#&fZ{LipC;6F<+nL_l3g|P1>qTu|!x3hNb5A4yi8^Q0uCyDi@ooJu+i~J1<}l ztlHgbSv$_^F2AU(Yyq1G${e&Zv}&`lWFOwd7<4;l7JHTi55esCGUIVECV_y5Y zbkzj~j^{86BH8`oX}HWx%K6c!l>x7!|3lGRt95Tpi!MusT$7rfHDZH1hYwji1Lea-^oemz;wD7+}**>)qNubCnEiHO$ zEyV+czeO=Csp-7sIW1}>jUe^m?0@ok#n{8U^zc!P-1^HcNX{tZy2f(v&t*)Pr&2>x z>|1t2o|IlA-huUn8aIJ)}(;Z(b|`!`%8S4f+dk z8!-PCN~kf+aoe9GuQ#1C2_gm_ak}cFI>vG}`FuV#RKo@?#)Knz>8cNwgKPsCiIOOv z>8gJb=`FIG8j@JzVvznyq*p@7YAy0-g8X=!0~vXi~!2Lxw3_GiT_gNg<{ z%cBSqt`@j)`6Q{E`~qPN?@6P1R|QA36XF6OQu0Zgsf(OgBcI&%2UuE3{C|F&&(BON zkkukl3kdLQ0FbC^k*JYnAUy@rL>4wjX%kcoUOzwGT#}{l5zHXiV;mt@8%)nAV@J!8 zfpT8fT&Uj?qR5jZv>rl}+sFq<&}=`Ng11f&V7@6uH4 zy}2Y6_Yf>eup`A(98~nIV#~mN zC?uEIRIEZ;LsH*_RI!jESAi4+X<`*twpeYVkhX3r$zB`58VTkAj0`#s@a?f!Ln})0 z*Ajjn;omUx1$?>V04<|<^x_# z)4h1^XhzVpXXK zh1Rd*t`2Nzg>++M!*VL!(+&GaxD?TT?%44co{3f`Hp*I9lHB@XECjK{tH_08{}!u; zNV9OU$ZM|%sv4&d4v?|j4-f^Z#Te!b z*tw)8~qBgP466`yq_v50?dcvk@x3KLhB*JxS9>(QqL{EhSKkRRQgJhm=XJQK_g{s0 zvj+R>f)j(Y5_C{yQOgzGI8zZQ4U(0(cVo;IMM+UBDXJnxc{^j+(GqD^A8Lsj*@{~qyUPId7ejnOTkoJe6oeSfwm0tmZfxp@@$fee{f(qF6459W@&M-}VsRdn3t%%t&6p z61Gxgiwa`m8nTrdiZac^HQFg^n*3jZQP6oeQK8llYNJAJv_$RCN$s+N+ShRmL+t=_ z?AQsP$A@pmq|k*_N$;UoB|YpElZwfn^qSilatHjo5_%0+J(5(9on_QTzF~Kz>gF{zSg5g;q~}KH zp&GLbEiR^2Du(PDXF?EjVXwyYVA@AO&l<@&80qr9l)SG3jpiOiiHI3x7C^fEC}@uw zZ0zVP8^@IsPGIfXtH~Wtts(Cdw{Cea(z%x|@qF6uAX^3zGcKq)!ry87jqeCIco7@P zno@)J19d;<7U6ewiiNxzF@x+qV#vGQ`U{-5lJiWBN9d*xrefnpvc|53rfJX;4n+li`Uzfr+!@XVaSbMgsl`3im1lX8_f;C zh0^>Z0z&CK!G;&K7vZau-p46Wu)`I;^3|sH;+cW4 z?1SglZJjEQkk&2G3c}eakW-oL2(5_wi zCGU6`qyEpQ^asuHQ@khb^c3;OO#W|9=}*O^664Cf-si?atk_c<7C9o@5txwZpt0mYC4J>8&&+S;S zKNwPb)EN?H0$UQnz-s9mOG1HVBt0ZGKsdNHp%I#^sASD*w=WUWntlFIsm*n2KP*Dd zG9IWz%%Q|)=>}D6@T-yC)PO_Re>H@CS4!$^*}ehHu(K&oZdqN`2P+5xZ9fA zTitCptd`=MFNTmr`tUPH_h|$*4A%vpzGC>(($TP`vwf}Hw#D6cefzrBhE8{T+m`h! zETFW!AmNRxNYl)0Ay<9A*r3ESyjo)I+rk85O@lq#g5j39&$5FMn?gY~thvM85vkjU z1Y6F82H=fgO1-|g6pl!pO^x{Z#+-&a$qZZysNtX*s3Ygy;eKBz7?6AktruE@exDYM zgr%qtzxb${8Ux6J_E^D#DV7N!pB9cF*`ZQJY`TbNC9LCOt zgULuNs0|X*%i7plw05=uf7!X@`h5Q0U|1FU8$zK7d{#x=jfw7VHFk!yFbmfLbSO0F z4F_*asO~@kx*-_8dc};&5gBjdF||Z`BH<3y4CUsuq&K2&+7~TaR44{(vOcBW`t2>y zCBBOB;l`-dV(dcOi1xS3itTOO_Fuu+eko(Of%k2+htNjQeuwsVG}2UtU*O8|3!Q(k zClvRsT3Hteg&1nHA=-qTdVKy{eLd=F1dlHs*LtyY^z@#_^MkEc4(saO znVv3_e!JQ4F#CJW{vorsWFI%j8MDut{p)7`mf2hQ56y7}e4uBZ*)KGEL1pZ-;>V)1 z?If(9HASL>9l-#*!X^$P##Yf=iyH3HdWpgAw7KK!X}{&8?-REv(ig?47i+_Qy8-_j zQbrQKxF*vf#@H`tyk3pb&VyAv%N=j@1=gv)fJX!Oa{C5spz8HF1=zssE&cH@cKfi_ z&DdkJu|4~vgN(g4dz(Mb-`=3NkP1C`X#P)W4bAHtJnpMk@O2ILeDF_gYvpxqa!V0Y V3ruMXYuFSl1!U*^^MB32e*w%A-`W5G literal 8704 zcmeHMYj7LY6~3}9qByao1Pl(ru!eQVK;kNip-!3<$(EB3_U$A{yzKbDA1Lc?XP4n&VI9Y z%p$*8+tn9J2(fsyH}3Bj0{%!OstQ{bA)br~p@`sV?-cr@L8YOhqFgjY|LwkT+Y1vV zHD+7%hrybkV!n6rV9h=bFReL%e*c3*HP7>YkI_HK`;Jhck9bW>eXWcI?=8N6hAf$$&ZjZ+ghxa~A#vRT)r$e|R2V4m9%J@B<_M2#j?%#Djj-&)Cl>2_Tcx zT*%Rdmka68pp&t^Bm)3;9@@odMURWIY(q>ZA1MY49I7~_(?>C$}F z)t4~_!y2KpQL3X7XdlgD0HOAMSzw$~F$Z(DVypmvoYr_H?~?P-3GnW))d@2xg3Gdq zp)?u8$@onMedt7vyD%&g3x&xkWn|F@Z$CsC$?w?-G@vUXeI-*DXkFq;DO0fkuH{bH z7=wW;$15c!Vy z1ihqp1lsgmdlnod+s9>Z(q#`Fq!{Iz3*vPEX?S2#1F;wyXjsr-CkG^{l=Y~~tv z93B=Qh8qqvDYKW4DJ=%_Rrg-P*JU2^`_$J73uulOMjyS15iHOrb0*CoxrP}uESQmn zjNFr;(;YozCENkAnw!xgBQ7-D?;=C6yeD~YT?^y$zNSK6-eKnD_efk9#9OIoVkd-MrazE!3>nz;~n6NmS~jLaFP=!AVvEoOO|5 zS#B6|UDDD#034a-MbD}2uAb@2JDg)gq&{D@7N;-79KeK@NJsAFVzEdB&R1Ou8me~^ z1tklRH{D`0uqKFa(n)hb$`{}gS^zgnfq{amBM?Ao&!zE6+Kp{9Vjzqdv$Tbn2(Q_s zZLdv=$arkn>!mT&iY9yNB^t{`aQR3X(G)H3)R&`As{j@f2ffyEdRU8pDe*3wh2iPx7BE}ko= zV#4i^G9xzHYcicN-l2o$zH@4OI1Rttkik67b6X&T6x2gtzUmWPi*XuWH>q+qPUx1a zX~#Qd?FZZr?_r21>feD{Lk+HY{whSU6%xk2kK=2i&lCvWS;XroR8V!rRM9zb&J=B& z{tuGakD&_YuAG=}K%XWk?FrmFhF;ELFnRUh*SMa^Ye(utlX*kClWXEPG=a(%?l5J` zvJ-2TKeXZdru1kJ7+;jV{Qz#Nnc-U*aH?E^+5mSOt(( zaxy1Wpni0TE(4Am+MnqRB!Rd#HBGaf9MG?+r!S|?4#U3W>JpFMy^n~?8baQBVgdJu<3cGr0@rg5TWh$cYX zX+z~|q}$=E!{T*BNmpM1J(D5HNfn||%5a}59up}O-oJn^k`oI;W=?f#@;=D#)8;K4 z_vBUG#GSN`ze=(ZIG+sJs9GdDQ?c!9wEmyx^RzLW2<2Q~dWf*NJXT}~d(^->-CCyu zz-I{fa}FeG&1Kt8) zu7~Jqi|CqiDcXanm+Pmx|Hh2pAH2MhgWtIVGAdv#KSp;r;F$#QCIbKUpHyGFa7E5k zbP(V}0)WuRlDHLBtR>hnz{cN$5&Ka%xM#k6)s5%VCRT}P2@yR@M5B}V&+t1Lo1E}h z5`Kj6-{p9Z=(F$hS)|Mb4;2ZVqYJDAgN+z&0K-IxQrPFQ?{m%KBl|vzKO_7%fj2XT zAAW*<_z4D~%Yw5{NG#NM3Z!UVyKP{8{c zhv?G7!(q<@Hh!4GLqF+h;a&NvRos0Zp8JR~Lqty)?z=RHwCyd2l==luVNPDDlauoa zBEK2r6WhrXqRmunC!iO=GkWaeXT6YcbAS0sOw3(2VqZh-^=B`mfd*@hByZegDwY#fZl&f;|D)_%El$WAVH~x_pFu&fP&oPfv*l zPS8R;K6h|(ipSeT-UjlC!O3|1mVnCvJZC&SR7iyNIH0+w+uoXM1ZXaowpx>!J_4Ns z%b^F25@i?Z_|2zK{M2beV#b5l5!ybt6ZwxoUbKDgBG?0fjbCV)x_xSN2Wfk3C8B;J z!p}0~4{eW89}WRjs(jTcdm(Vw6QPF)kC=oWocG*l>?m63)kIPYk~78yvR!4gGwi8d zkRoUB6Q4&$SGS(4OD@b;1u*hxStCEJB>2eR5sbBDAwS_z-%$Q&bK;_k5t+atnp6f` zJ`%w45LkFs^Ws;BA*+rMG9^GaRn1iK&w4%C%=4+J#(AcGFX7=IE5SwJP`-}A)O_8$ z`0bdldyl_=&)>)K{-U0Dm*|@4I|)6fjJ^aP9_Yy$bA5(Seg?eW=$njQHu}v*Z_@8H z=Jy%>UZa21=(iiaNpG2NVe_#aEf-nXMObOe#U<=wOAWJBT3F>)%omohg_f(C1wTov zn=vPPg3q?F+0*-7_@r56|6J0AOKEoztPe0JV0(&S&jQvB*y)}xTf7A34u_)wzpBW1 zhr@##BB5K7iZ{sOtR)&7>Nf=I>WFG4@E=rg%tI zR)@k0J6z&TH2Z@cia+R6LBFoGqpejoWnX4ZsPRB-kg@Zv{YpO{eZzWdAi+n=X%tqV zb-ZlL_CzEW4@J}-#v&>V(~X<5H0HN{(fHn-1{#6A861 z9!>W4&A@GlsPSY%Rf0Ok8wsf)EW~Zf6k&3-HyY_u;{Blr*43cpzzqo{-a0_m{jVOn z0Mb*JVC;sv;7x)dxZXKX=WH6dlICq2WVzgcd)qd;Wv@r@wR_vTT02ZIGvS?H4~Lm^ zgHGu5xm#L+>0DeF#2;H+7fzB$Q@|PoES6Xy{HJ=S>uHH5BkBqPTFRLKJ@tN7jjs^k zRe0b^%zg3DcI0WVat58#>^IFU_<1gUaxxTLA>3XU4lW`i?hxG2AKHrD0)^ZP-7b&P z<4=ZFk3SHe;=CF2f7gxiL0x>-Ee4C=s}>;|p<GNwG8&&8j4^q z>gF=4PT`OeQN59#sLF<;U;{bf zjcliiDfp9WAEbs*aZwkAm>>V?R8RsrQ4w9BPYG;GB>PQxTU0=yi^6g>J{XGh3Tjjc z#1-ss!5;`vvg(v)ql4-w3hW?JZeVR}9a=lvgg5r+ndSHU1AU>0qRTf=3*GrUp-%r2>c78O9%=8 diff --git a/winsup/lsaauth/make-64bit-version-with-mingw-w64.sh b/winsup/lsaauth/make-64bit-version-with-mingw-w64.sh new file mode 100644 index 000000000..2f93c2cb2 --- /dev/null +++ b/winsup/lsaauth/make-64bit-version-with-mingw-w64.sh @@ -0,0 +1,25 @@ +#! /bin/sh +# This script shows how to generate a 64 bit version of cyglsa.dll. +# The 32 bit version will not work on 64 bit systems. +# +# Note that you need MinGW-w64 GCC, headers, and import libs. On Cygwin, +# the required packages are: mingw64-x86_64-binutils, mingw64-x86_64-gcc-core, +# mingw64-x86_64-headers, and mingw64-x86_64-runtime. +# +# Note that this is for building inside the source dir as not to interfere +# with the "official" 32 bit build in the build directory. +# +# Install the dll into /bin and use the cyglsa-config script to register it. +# Don't forget to reboot afterwards. +# +# Add "-DDEBUGGING" to CFLAGS below to create debugging output to +# C:\cyglsa.dbgout at runtime. +# +set -e + +CC="x86_64-w64-mingw32-gcc" +CFLAGS="-fno-exceptions -O0 -Wall -Werror" +LDFLAGS="-s -nostdlib -Wl,--entry,DllMain,--major-os-version,5,--minor-os-version,2" +LIBS="-ladvapi32 -lkernel32 -lntdll" + +$CC $CFLAGS $LDFLAGS -shared -o cyglsa64.dll cyglsa.c mslsa.def $LIBS -- 2.43.5