From 22b0261bc7a45ba429d33202ecc748013d16d115 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 5 Aug 2012 01:06:37 +0200
Subject: [PATCH] Update DoliWamp packager

---
 ChangeLog                             |   1 +
 build/exe/doliwamp/doliwamp.iss       |  16 ++++++++--------
 build/exe/doliwamp/doliwampsmall.bmp  | Bin 12814 -> 12814 bytes
 build/exe/doliwamp/httpd.conf.install |   2 +-
 build/exe/doliwamp/php.ini.install    |   2 +-
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4799424f244..cbad6f0a8ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,7 @@ For users:
 - New: Update language files (de, tr, pt).
 - New: Auto check box on page to edit interface options of user.
 - New: Add great britain provinces.
+- New: Update libs/tools for DoliWamp.
 - Fix: No images into product description lines as PDF generation does
   not work with this.
 
diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss
index 5b96c73dea0..14d82195cfc 100644
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -81,7 +81,7 @@ Name: "desktopicon"; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:
 Name: "{app}\logs"
 Name: "{app}\tmp"
 Name: "{app}\dolibarr_documents"
-Name: "{app}\bin\apache\apache2.2.6\logs"
+Name: "{app}\bin\apache\apache2.2.14\logs"
 
 [Files]
 ; Stop/start
@@ -100,10 +100,10 @@ Source: "build\exe\doliwamp\builddemosslfiles.bat.install"; DestDir: "{app}\"; F
 Source: "build\exe\doliwamp\UsedPort.exe"; DestDir: "{app}\"; Flags: ignoreversion;
 ; PhpMyAdmin, Apache, Php, Mysql
 ; Put here path of Wampserver applications
-; Value OK: apache 2.2.6, php 5.2.5 (5.2.11 fails if php_exif is on), mysql 5.0.45 or 5.1.36
+; Value OK: apache 2.2.6, php 5.2.5 (5.2.11+5.3.1 fails if php_exif, php_pgsql, php_zip is on), mysql 5.0.45 or 5.1.36
 Source: "C:\Program Files\Wamp\apps\phpmyadmin3.2.0.1\*.*"; DestDir: "{app}\apps\phpmyadmin3.2.0.1"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log"
-Source: "C:\Program Files\Wamp\bin\apache\apache2.2.6\*.*"; DestDir: "{app}\bin\apache\apache2.2.6"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
-Source: "C:\Program Files\Wamp\bin\php\php5.2.5\*.*"; DestDir: "{app}\bin\php\php5.2.5"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
+Source: "C:\Program Files\Wamp\bin\apache\apache2.2.14\*.*"; DestDir: "{app}\bin\apache\apache2.2.14"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
+Source: "C:\Program Files\Wamp\bin\php\php5.3.1\*.*"; DestDir: "{app}\bin\php\php5.3.1"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
 Source: "C:\Program Files\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
 ; Mysql data files (does not overwrite if exists)
 Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mysql\data\mysql"; Flags: onlyifdoesntexist ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db"
@@ -117,9 +117,9 @@ Source: "*.*"; DestDir: "{app}\www\dolibarr"; Flags: ignoreversion; Excludes: ".
 Source: "build\exe\doliwamp\phpmyadmin.conf.install"; DestDir: "{app}\alias"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\dolibarr.conf.install"; DestDir: "{app}\alias"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\config.inc.php.install"; DestDir: "{app}\apps\phpmyadmin3.2.0.1"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\httpd.conf.install"; DestDir: "{app}\bin\apache\apache2.2.6\conf"; Flags: ignoreversion;
+Source: "build\exe\doliwamp\httpd.conf.install"; DestDir: "{app}\bin\apache\apache2.2.14\conf"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\my.ini.install"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\php.ini.install"; DestDir: "{app}\bin\php\php5.2.5"; Flags: ignoreversion;
+Source: "build\exe\doliwamp\php.ini.install"; DestDir: "{app}\bin\php\php5.3.1"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\index.php.install"; DestDir: "{app}\www"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\install.forced.php.install"; DestDir: "{app}\www\dolibarr\htdocs\install"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\openssl.conf"; DestDir: "{app}"; Flags: ignoreversion;
@@ -194,8 +194,8 @@ end;
 procedure InitializeWizard();
 begin
   //version des applis, a modifier pour chaque version de WampServer 2
-  apacheVersion := '2.2.6';
-  phpVersion := '5.2.5' ;
+  apacheVersion := '2.2.14';
+  phpVersion := '5.3.1' ;
   mysqlVersion := '5.0.45';
   phpmyadminVersion := '3.2.0.1';
 
diff --git a/build/exe/doliwamp/doliwampsmall.bmp b/build/exe/doliwamp/doliwampsmall.bmp
index ed4a71ff9f7f07c909ba2517d8b128fc1182f5bd..f19e98fd19ae2423acaa635fa3fd23f4584fcbdf 100644
GIT binary patch
literal 12814
zcmds+`CC*~9LDJ%=(p-AO;JHXHn9xR%+k_aK*bG#PyrE1OH{;^MV0|&7}g0ChD8%W
z#oQh;;K?>kOrgwD5SLIkMcmB|eEXhD<1-@;_d8<#aOZj6xifRme9!wi?>Xnrg)wd~
z54DgU@6fXi$%Qn6^pb@oJzH4RI9ph#dUs0tfSy)O?ggdl3%A}-s#d$b3B}624^}Hw
zYo_#pQWZX>FO;f?sePeXO|wLVLKR6|N>!9cKX9~mdVf~CuC*)?MdSBa9`srguiviq
z_}`13F#sHeyZ1tAP81I9&LL%+)Zx9kD9w(9%F7Ogar04o>^q$Q^Dr*dRH6RVF`TaY
z9#s{^DBl#1{0L7Z_&6fY)0R9~L5yFt5Yv-fyBMm&(dr4Wpy})ha2^eHzaz<S7{1Mm
zk!{}o@B#k%<r@^L{Gjo7k-S7t@5k~a>wBgZVi;OI@l{-`t(NsF8q}XW`X5^~tG&Ka
zL)~%g&@6_U#wBW6AC|A~yvNS621jcqzs6>}aOx;!@DAn1V|(=I5rp)Q6F==icBmVo
zX<Z8M9Dh%16F1u$9EF>~R!?ln0fJ3_PU?BY(U7n8VjYU&{SiBJ0ODp@u{=J>p_)Aq
z97Vdlj)vOb46T@aEpkg);DWOJSd(oyCvIG6MsY#_v01Y`cH!_OHijbI&14H4j`Do-
za?|q~=6AEL1-dYImd7VK;ynj}qbT<`%*gE+QUhI4UhwR>8S=F@)FIK=f#uVXC1K7W
zaI|&`v7Khl$(mzGTPWD#^ie$1(U7mYq6o1wERo=4!}2Sb)_dEs6g{;U8qHu!4;q1r
z9<u2NM8AdRt(r>NS+o2Ku0)@~EX7RgjmA1&ZWk%Hj71|+mbVu7@7|I0;NBfPynh$%
z?GN>qrK4dsMkkEkbY36MpZEoFl$|-gIeal5Z<@uHx#R<E_<SsOBnD!KdLeeDenxvs
zG^)!B(M-Q@Ze6=fdwwSXhflP5aPJ@F(!P>F*>OCpKd}Qxant({+wVrBY3hy0ZR64p
zvEGZ;GWqC~72;?0N8I$jbR2*p)m+pbDU&i4bvS$-l=+c;I;bc+j^`v_dvK(hVIEs{
z$cNPb;HTH7@mxR08fqU~94twf^5F6{(C<F+J;5gDTSIId#n0%=&aI)g3OOMkK|}p_
zS38N=Q|1rB@dMjUO@S_-Uv2&yd7+b_roE!O+S0kX4$v?ZKhx4Ywq@fw`<AJ#_O?N>
z$`?1TG<D&4+6T9<w_;~f5V6_F`c9_4IZBw-4^3xy>rLdQBevwZ_Ke#0NcD3@{a=+5
zirl)pfA==ZbP-6TwJhg5Wu7BAS~t7Dd2GwaQ(XsE?L<#2ocM7kYd;b9dp{K=K}~FO
zzEkHrf}=!FK3n7IYUHgLPjwwwwbfqMwEtyyx%NG6PKsO)f2~E5_dwa&>Hb5&k$TPm
zc5V_|=*LL&b7Ixjkk86JSrD1XJp^0j?o4QW1~F<oQyY1y=UAD^Hi6j0xXITR8T?kh
z1sxsja%kviZ^xmMG-9)nt(_6z433h#tkBHdOGIu3D<??fDqEZ8P3k;5oUJ|}%Ox6!
z-)%o^iARdBt*meDf}!9@<84iB$65VLY+)0nzU6AC`#EAu_%yUNoRMnF?UQ$JUB~{c
zP^8VXm-YSSg15j?GR>RjGk>tynkctTVUwT@7}|YpI<KX9Q@JaXH6KOiH(DF9J=Pl;
zw3g+3X9m6nj#5A2vx)nK&8sFMljek}+FE}nWX!img)SU-Zd_qyCK_F?ufc|3SK=~V
z`*EKOiH)ID-$7_O%ge2iuH6Np<7sRip!Ii@l;Q6{@9k+W*+Pud)(8*$@m&$_+-zfW
zJ?iMd$)9&gH8`HL7QPLR(tK^$Y;E*6fC}9j>`hrj3YJu=U5Wz*QK%}-MMKR|+@#-F
z`aNH)F}Zan&Of|=4||h?Xsn!Ao;L&y14rp|ZP{#MFBkV(;=c5OUiy1ex`r8Y7`~PQ
z?B=PJ=Hr(%7dU=Jn~jTj%AmQ_a!!6un&Y(_45L%}n)_%TWCc32J?8|wfFtd^!7Mf-
zQ$2j6XA)&jAK8zr04J8$$2^}7M-D?;Kf4#oX2^A|<!|JNj3%Fy1H-Gnjc)O9aFpq9
zhfC*p|HtWJTt@3r>^UVWFNure)38nM5?64P72xnf*o^XOI)~DfAm}Ks+{HYfhAeqY
zMu4LY|2v!Ub>PCE2eDV}2VL+m^5@F(*oEUWVq<9I0!Lgr|NQ5qVNPN$-)w8bue&m^
zEpiI&8*j6`nev}cTpVo-d|qtE`RLc?)#h`=l#bmAJ}6lFF7g(;Api4`EN`a#7tr@P
z$_{kGm5a4{D?L7nYkLdbGaWB0!2YygY>RNi=4GRa#g*lU<9QQ}5l8t;T<}AFIF9U0
zF<X@-8XPKKCw+f^`ll#a>w&Fd<4_nn7GEuYADcr)u{>~m8n*dr*(h+eIpkgP@qEPX
zvuEwzBQ|Af%kt4sstQ+(hElb4#rsgKLWxbGDq8sgl&WH4Q>wOwje%0NebrbfRsRAt
CM^dE#

literal 12814
zcmeI1Z)lZO9LLvdqlk)L1QJCdM1hf(g(MXN4a<Cyl%@5;k+~Pa2v%T`FqK%Drr}?7
zt(LjDbTD*ojrk|M&e1k?&T6?*W5lfKv~7rRdOpX#x5smzdv~AvZ1+ms2Y&mVbDnd~
z{e6Fb&w2Lr>{}iwu+LQQ?<9{N^XLhWZYsFP`&&?OYH~rr?Gvt%9q|5`{FB$f|6BuC
zuU<7*u3Sk<yw{xJ;b9|Ujo#geDnhn_fdO;w>>1P3)004q_xJZ-H|Nx;?)W^tzj*P2
z85tR|SZ@@Z*Z}!DJ3CEVTU#K3rLV8g;$fcV#$qvZ@W25}jG-I!z@F$V*U!n0W;1Qd
zeMzZg$sCJ!+nQqYeBr~EH2<~v^Gs!BWgIg&!3#!wA=mhJRID`TyGjD-*TZj{mG8Y|
z<sa-VPngr)RAlyTo@?HG^+~In*!L~greMU5*pQga)w69~sp)H7V0xQhNT3t-bK=;*
zA2df}9lK_m4;MdRF=99H;p6ynuJD1ax8;>Ux&7F%p>QPQKR3)Y2P$TmSyOK|*bx5&
zANI?Ie+nCNxpZRpGjY3t&3&J&|HIBgv*g7)P2;`>Yrn3pE;Bedn040#TX(}e0}hwk
zYo0RX67mJu-1n*atX)uen<2+yKXP%leUto$?;(pzN2;d9v5`02_oMY2H%_<lr@BE6
z%;p0&@&GtoI=FR;#kOhF26OtzG6OzKo}F0(Hg}ENUtRK`wL7*WuVnK9TWtHYfieo)
zx3$&gxmh#gR9yU)Y2CZpobCABwAU>RTq}&t>nGdXqS~GdY~XMSxrjG^F1UR8vN`kH
zX(PPU$79X!B&_xCRl0DZt#{zd=7ZhH+u(4iVa-Dc*!;3_wp#T`xgj4N-tlt6dhJ*B
z!M$ervQmrBzka;i>sBl>#5_1$sw<zA5*xB{KE_9}ox5KB>azRo*@apc_93_a^=H4$
zv-nFG0^9D-rW<g$B$+s4;Frnv#Xt9KU1YJjd#F!6&jcH|_<iyjJ`#qAr`qyI4LDrF
zmpCipPpS6geX4!fms*F6VIS%uxHy;l^I1A=WCt5KT&j3?qCNMgvoHH#BX<w=GsQ+t
zB!6W>_+%<<$gDGO(EgV$U9xA7EoHNl;sPJoID>_KqGH2mu#rofO74#50P3!=frs-U
zcQnqy$n36l`?;{&ilvLKzQN(r+Tyz`HsXYP3-};nfV{$45u0Lr=DO?E*FKz0!rlj>
z*bQvxnBNZ~d=k6pOb<>Gva-Hx{)E7_+HY0S9U0fRDA>4HC&PwJd`G}G;1E~dBCn5z
z3w+#nRJ-NZ)ctgxsMzowa0C&u6DuO*gg$!X*1-8edth7YJ9j1dfbtVQn(A)HyP=_>
z>j=F-j7wKR9J_%HS;v~diEgOvd_SU=fDxiz;tR-^>goCMxat4n_c)=OLyccsI(h8q
zsMzqEvBo94Do%-8>O}3v*DZmMcj!CS!?y|i8QZTfFSYc=hUFI9Pbb^c!iIjwionHp
zA>_dikq>M&pUyS=tBNe8iw(PxlfeP+Y~3HXTeh*`16$sI+~UG6#1-;niVgXb`D8Y*
zVJGg_UoD?uza3$d`s&T5seZfFF&Hz&Moe)>BtF@XZ^fOhdo9PNK{-TY<PzjkElP(o
zAKQQhKjRL-Sy_3WvpYoo9{PLG+AdRU-~rc>{WTU7xJ092L&w}LMZ~MxaK&$Y%)85i
zgPce0gA-HSsX4P?BhF#?5&lS@TAwL4){{H@B-@RK4ViS#peCbx@SrP~vp;j>Z$}T+
z8<G4Et}${o{U|=kdVUvK;KGINM#CoGgyTnp7tRL~c95?rw$+FG$FzsWqU4gcSd-N=
zxN5#!8^;F5FxaTE_!r#YW{iEvOT;!rTQ*@XeT^|6()=hjz>m#uGubVjGZ|+a;#Gcx
z-2OIwNd6X<XBuzd!Di%2xXvVSbf<WR^W8&z;>>>2_G&9**anUr&^5m0_q#A{?m;?R
zN3k2&@I|osaS0na4$LC@%>AxzgW2=V$8jPqTz`}ghUMUqp5PhV?ce$aKIFx>MA(h*
zY&th{HdUMZvp<(0KfZ=6{`{bv5Qg{u(rx3C^KcZqArDx<hOHDE#2deX@4<t73LGN#
zQJfLOL4<A7A;ly6MX?()P;=N1|MU}>z%0Dt=s>wc`XEM_ukVm*>l*@GZOuu>{d1$(
z4J^td_#`;t$c&%illUL`(ocNLAwP=zIU8N?Jl<{Nk9ti`hePOxyhE;_tr&$f&Y0=|
zzaIq~awt#wZAKg2TUoqsIeuKU$%FDoxMB=jAY<#<bM`$xt(?a^8$(_ku{W|yC(NOZ
z|F8y3#AuY-4Te;C5<B9zZk!+&F{!vhZuB5RHrC?1jNu3JWyO=m;2L8tZM_3$rg;*X
zv73G$jy&v-9(j))z#<Bh^P<k>H|;ld@6Mgc-4y+U1sf_yz`@1ddPiG+Bmd<c^JG8X
zt1bP&-8O5O8$|4_`N*NWP*`mEy~W_|hwQQ$d;jN)*X}*S!+hyLz9a6A`}_WOXUi75
z2V+6RevI=!R$&rP_nShhZz-wX#p;$O{HA_;ygAs2L(UH4@#GR4HG;D&^=UkwL%WJ|
YW;gEW)ZF}&*Fatac@5+>5KaUC05*nJasU7T

diff --git a/build/exe/doliwamp/httpd.conf.install b/build/exe/doliwamp/httpd.conf.install
index 167e6a477e0..77c7fbe5fda 100644
--- a/build/exe/doliwamp/httpd.conf.install
+++ b/build/exe/doliwamp/httpd.conf.install
@@ -39,7 +39,7 @@ MaxRequestsPerChild  0
 # at a local disk.  If you wish to share the same ServerRoot for multiple
 # httpd daemons, you will need to change at least LockFile and PidFile.
 #
-ServerRoot "WAMPROOT/bin/apache/apache2.2.6"
+ServerRoot "WAMPROOT/bin/apache/apache2.2.14"
 
 #
 # Listen: Allows you to bind Apache to specific IP addresses and/or
diff --git a/build/exe/doliwamp/php.ini.install b/build/exe/doliwamp/php.ini.install
index 9da1cd8f203..2ef19a04699 100644
--- a/build/exe/doliwamp/php.ini.install
+++ b/build/exe/doliwamp/php.ini.install
@@ -534,7 +534,7 @@ doc_root =
 user_dir =
 
 ; Directory in which the loadable extensions (modules) reside.
-extension_dir = "WAMPROOT/bin/php/php5.2.5/ext/"
+extension_dir = "WAMPROOT/bin/php/php5.3.1/ext/"
 
 ; Whether or not to enable the dl() function.  The dl() function does NOT work
 ; properly in multithreaded servers, such as IIS or Zeus, and is automatically