DELTA 387491 2135 22 SVNK*KJ[Z4VW2JUmE d/2S%&#x^_o0şOug TڔKP@6d4 1p[KPDR.$i^>{9g+䐘z!)؊2<(b? x[,/Arl#gFa#L=4uUo.@[DA1]iG(`vް7Pn L_x,.0E"Η= n[eHӈYz+D(ݮ xx|Φo\|":=PI(FPO/?%aW~Ds 6$H )AS4^;$Za[%y~(U^G\#0DL҈">Q%Y$ף։ƨuSM1> q$12|o(&_EUL:"I _QYI iH$;ъ$^vOI+ANLS,i  ^u}T,5W?BNMrW|H||p]3΃挫a%9,$l|$fvC- _PVGP)EENDREP DELTA 339196 1595 26 SVN6}}/Makefile.orig 2015-06-23 15:30:20.000000000 +0000 +++ cpp/Makefile 2015-06-27 09:35:22.892599446 +0000 @@ -13,8 +13,8 @@ SUBDIRS = config src include -ifneq ($(MAKECMDGOALS),install) - SUBDIRS := $(SUBDIRS) test +ifeq ($(NOTESTS),) + SUBDIRS := $(SUBDIRS) test endif INSTALL_SUBDIRS = $(install_bindir) $(install_libdir)$(cpp11libdirsuffix) $(install_includedir) \ ENDREP DELTA 339196 1649 226 SVNEz)d_!<vx^=O0g+Na9Ӧ%SBb+bHK18eGʯ'IV އ(W]B 3N$Ic`4)!4 8"0&)p$ e$?$O~>c@S NѶJ,5|xڕ^WQu+Y/^z_'dֲyܘZYJQ L/8FVitsn,΅E^AC:cdZ:nn"'+p/2<(txɥ:۶3'_NϖR 4Joxπ;EENDREP DELTA 321096 1211 284 SVNxDA?Uk/config/Make.rules.orig 2015-06-23 15:30:20.000000000 +0000 +++ cpp/config/Make.rules 2015-06-27 10:26:42.692387147 +0000 @@ -240,7 +240,9 @@ DB_FLAGS = -I/usr/local/include/db53 else - DB_LIBS = -ldb_cxx + DB_FLAGS = -I%%BDB_INCLUDE_DIR%% + DB_LIBS = -L%%BDB_LIB_DIR%% -l%%BDB_LIB_CXX_NAME%% + DB_RPATH_LINK = $(call rpathlink,%%BDB_LIB_DIR%%) ENDREP DELTA SVNhIhhx^T]k@|~B_HgK%+cDBߌ|Z%WiCq{";}X BqmSdQݭMrx=,*~s\8tP:]aYV~NI8t sVIh`}:d˯5VOh&+D-]'Ȼtycݜmɰ R̸Ԍ?D_U-^zІu&;"Bb%Tug)ϚѿdOnyi-FW΢yww0h&Sj1}J x B[sTы}vˊ& 6˥NWF{NuigG픸H)sea9:S±\+]n79geiN^=Z\ǿ3޻1[TyV'R~=@?ٝqrÎENDREP DELTA SVNjx^}PMO0= 5.1 deprecate 'register' storage class specifier // used by lex generated Scanners. // -#if defined(__clang__) +#if defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 4 # pragma clang diagnostic ignored "-Wdeprecated-register" #endif ENDREP DELTA SVNixiix^TN0}nb$ԛ&{,ZJZ }PD#J~{8Yݴ/̓/cϙ93q]pUcH1%<<\~K%_ :VJN߄x37`< />@zB)s9q0}oN(ڄ[.G3@j܃ vh)#$$q(E8:B;9qBN.?hs2>xgӒfY*?5@/_\s*nhQ)FQh8*Ă XaE"?Ւx*8nvpBE*zPU_DemǬ̤WHA?}p~ e agԧ&w *HBwe4WV01崩iWF``4W MԤot' daO;B; $*@ Ky\ݷNTHN59lOUp Y8WfdC/ v2b+k3%J)EKOw╙s7 ܮTGJyXIΨ!{qɍ[M$6ג_栯#(~)9`fkPFVQMU|a}ua䷩ߩ"TENDREP DELTA SVN$&$$--- cpp/src/Ice/StreamSocket.cpp.orig 2015-07-03 16:22:19.091609986 +0200 +++ cpp/src/Ice/StreamSocket.cpp 2015-07-03 16:22:32.355937985 +0200 @@ -32,7 +32,7 @@ #ifndef ICE_USE_IOCP if(doConnect(_fd, _proxy ? _proxy->getAddress() : _addr, sourceAddr)) { - _state = StateConnected; + _state = _proxy ? StateProxyWrite : StateConnected; } #endif _desc = fdToString(_fd, _proxy, _addr); ENDREP DELTA SVN3x33x^Qk0_q`kRwnܗ`#ocM,Z2O6Ơ5WBG9Bdogo[?IҶv(FZumʺWUY*<*(kUWiXUK|.d8/a _io9m.]2db6\\Td"J$T.eġ[ؖ5(qBҲKoqC48 vsG&SZ=E=x=!tv|a %JL)^z {̂x:$Ď?@3H&P[$ݹϋT$?Uf80a. yyENDREP DELTA SVN8:88--- cpp/src/IceGrid/RegistryI.cpp.orig 2015-07-03 17:43:25.231459982 +0200 +++ cpp/src/IceGrid/RegistryI.cpp 2015-07-03 17:46:57.991198982 +0200 @@ -48,6 +48,13 @@ using namespace Ice; using namespace IceGrid; +namespace IceGrid +{ + +ICE_GRID_API void setRegistryPluginFacade(const RegistryPluginFacadePtr&); + +} + namespace { @@ -159,6 +166,7 @@ RegistryI::~RegistryI() { + IceGrid::setRegistryPluginFacade(0); } bool ENDREP DELTA 293741 31917 349 SVNAcS+x$c$S.x^O0 =WT2m0cԫL0ly7Qڴ}},$1:MgaJ2<a!it/DT7U< h@1a2, $fS]yԻVi%q}?`4al;!!Γ Wiax`щsŪ,;}Ͼd[+ޢMh6ENDREP DELTA 321096 4032 441 SVN. vu+F|F|F|F|LF|F|F|F|K|[|xD|D|D|D|PD|D|D|D|E=^|H}x^TO0~ő(MZ4A4 !\X$v8U)=$+V)eӲV4}Y`@ @ 1pwu]F)d?Ci2o4zGL *3.VYr#&bY1kQť8/RЗJd'ׅ\|-|q=8u>V2t G iʙP?kB{PO ʧb9LMP !2* Z W`  yHT'8~GTjpV N% ij><ږf%V4O{Hتv] خRl2 K8af躧<]CV \Y!SB)j k`RX0b^28Gd20+0B@ lҹSyc!BW-6 7j (ӄkXyfKM.ߘ⢹X鎧` |={]p4ENDREP DELTA SVNx^YKo@>7b!wm $jR魊"7ĒEޥ-m|6~kN8֏ow<3Ȇalrx| =뒅OW$~3ICo[gXr#Gi[}[4 [։iOmn<ᾎhq<>va/?y\{>1KFzxsXLD셠A92opvT^#P֎٭t62Ҏn+󸘂<tAk$-\_kZf7.ExnY:pz1`kEp J1Mb,tk$d)A<4nOKO$H.(\D8qjIh@շ TGd \5zϡE%ԅU.\;u1 ..`5aDOeI:~*[ˍ/:TkM;VVyʈ">R5hjgBeW-TC6ajȐ\UW`jŕ_ i0M U颈wh5ݚeip&܊SVʈ"~hXMfԨK֑z%<.}-dI.8U{!BO󆶗3_qpT7%lդg՗Vޙ{BXT^$G̩JEC\אZvOB]2933hNd Q4ooXm\kʈؤ n E!G"&cNguZ:xMÿ5lpKD k`|r4 Dl;]NbQWU-M}N( :RG+6hI Z7G۝48eu y}ôENDREP DELTA SVN6866--- cpp/test/IceGrid/deployer/Makefile.orig 2015-07-04 13:29:31.867378996 +0200 +++ cpp/test/IceGrid/deployer/Makefile 2015-07-04 13:29:39.896414996 +0200 @@ -53,5 +53,5 @@ $(call mkshlib,$@,$(SVCSONAME),$(SERVICE_OBJS), $(DB_RPATH_LINK) -lFreeze $(LINKWITH)) clean:: - -rm -f build.txt log1.txt log2.txt log3.txt log4.txt + -rm -f build.txt db/log1.txt db/log2.txt db/log3.txt db/log4.txt -rm -rf db/node db/registry db/replica-* ENDREP DELTA SVN5x^Qk0W\>uiةTSGaڡnOR2:beN ټ\8AA(Vl#1'[&q D@dil>c#|QļEfšu$eلۮ^RuFJ ^uI@?\-@?XGl6׊5; V8 2e8L":q$oD\p4\l%k?l43:+v8ln fd6iv4ig92^g'ݕ_2ްO^.o,ߊENDREP DELTA SVNe eex^Kk1Sel6j}(Jo!n !B~fX/}eOc 3' yoȄΨƩfe읖0Rb4bôC^gAQHK$n 9"MN.\pfZPE 䝴Qm)8HQ$r5QoD(# |Oy1Ti?ic\U' Vzd7I4įaOY@p}) '*˵+風jY*Ic(F(xz|_ RV/&0Z ^w2'v}es - + ENDREP DELTA SVNKMKK--- cpp/test/IceGrid/distribution/run.py.orig 2015-07-04 13:42:32.436390995 +0200 +++ cpp/test/IceGrid/distribution/run.py 2015-07-04 13:42:42.506606995 +0200 @@ -25,7 +25,7 @@ commandProc = TestUtil.spawn('"%s" "%s"' % (icePatch2Calc, os.path.join(datadir, dirname))) commandProc.waitTestSuccess() -datadir = os.path.join(os.getcwd(), "data") +datadir = os.path.join(os.getcwd(), "db/data") files = [ [ "original/rootfile", "rootfile" ], ENDREP DELTA SVNe{eex^n0E+Fl e @DWUh $nَh6 Ə9s} H #IE#ngZ(PVq(OrU,]p0+Q!Hi umaߨ]=aSzZ@= E>̚n2 ,o03lj츚7ky'VH#ei0 S͑XUVzRa~T "4ba W`LFອVy#T9H6#}UCGDeFߜЁvv(mKerSi _\-{.)X|9{~_&!ENDREP DELTA SVN{3{{x^Uo0~)($PjiҴvS'79đU/(0c;u]iWo|$ J)t/(SSq2A +r8N#ƚla;ӑ '99Bi Lsdߐlj$=_{ ~F38k9~!7K IYNvE#͊Rw?V`N[x1W0Z@ iG0:A$! K쥜%Nsm[1N%/_n{I2Hau gTZ*n0dUKo%W]PN0%`:[ N 3Cd7WcJm;EZjv'$ߩMbmƮYa>7ʒFdfUc} vb㥞V'#[%h.sEhHwtޣC\zB$*P`e~ %va*` hoL-.P8*SHKB,q'8Aq{wc;9~ֵ8[W|O9dۈ߼@  1@GLbjs{S?vXd2ﲺ J>k,TTBk_DB]ENDREP DELTA SVN\^\\--- cpp/test/IceSSL/configuration/AllTests.cpp.orig 2015-06-27 18:39:22.443351407 +0000 +++ cpp/test/IceSSL/configuration/AllTests.cpp 2015-06-27 18:40:30.619349872 +0000 @@ -3164,6 +3164,7 @@ #endif } +#if 0 // we don't want to talk to zeroc while building cout << "testing system CAs... " << flush; { InitializationData initData; @@ -3208,6 +3209,7 @@ comm->destroy(); } cout << "ok" << endl; +#endif if(shutdown) { ENDREP DELTA SVNtx^j0@_1)nvYXC R" L_Iin`Fs8i+Rm673itOVsq[f%K, +i"Z!$IDVyYEUgjl^L+H}C:8I֡@:%b{Ff g0FZZ LN8y bzp$ȸx _>355"`5ؽ,v l&gqwW^k:L]'S6#ݠn_Ɠe|Rw_NϾc8p= L Qp}9x`2 8-+7ԩ})_ma>vx5ѨŨENDREP DELTA SVN":""x^Vr:}_1SjcҴi2)>x<YnІg83gdYҾ.в7ykLHOlrRnI!ë.] `XZe09jKk/K_eП]K5@n%)#&QY<{sKϾ_g`J*xi,OgS 'f 'F7Y4FISdYq)qeنcv@SjSH  VjҜ{0SPE]!-[#>3"пi]<JZM=6+Ȱbe \@)TVvSK0ZnaV~]0,̯vczf( X#]{ 0j{(,Y" H 𜦛;Md}sW;5,l4E,MST*LB$4 Z 8nbz4zi/Vpwjgݲ'ClJ'-ǍYyx @We]rNo/ut Uo?bYhQ>!$=M:ut}h;ڷo7MdZS$wHԺXg5!^ <7c~mjgLҨd*?ܞ!/o2Ʒz9xA-gDZ^*Ek7wGD'8!oݰg#}Je<Ƞn/ {4q HutowsBq'7b+#B<)>rŝGTy;Su{2n^gAPk,"-9R@(*4G֝*{Nɯ*zGUCg/ij:z.s87w|(ub<7'9ENDREP DELTA 339196 2742 343 SVNa& B &7I7x^_k0ş`CՎABWSҒT/WcɽI u$< s8mםlޙiϨ(3!p8X'J( p`> cp?\F0ZfM|m7r8jELC%5W@z~"{.1]LhvëJ?eB`U0fu\rz`=eI;uL -J}oVcD?-]$c`yͰ&_v۠yzY%E_#΀hGL|ENDREP DELTA SVNBDBB--- python/Makefile.orig 2013-10-04 15:48:15.000000000 +0000 +++ python/Makefile 2013-12-01 16:37:09.381657035 +0000 @@ -15,7 +15,7 @@ INSTALL_SUBDIRS = $(install_pythondir) $(install_libdir) -install:: install-common +install:: @for subdir in $(INSTALL_SUBDIRS); \ do \ if test ! -d $(DESTDIR)$$subdir ; \ ENDREP DELTA SVN\\\x^VQsH~_ѕh,b$ޥ.1L$ud! TXf~{AL=_`Y[-?CԺ^m"$OZv꜁..0]7M(:gNm۽wz=p} 4\_p .ƌ{Qqİfd[KCxQ+~FI,lb*P0x7{aRӐ8ė&a>8x)ʅHs< dI8{&ZC`pBiq`[s4b6J @  _3I#`KahlƉ/% Ec?Id4Z]ѹI,"E8 !)[⮥n-ǻd5V۬ݒ   iJQ@řl^\-JBEEپOA衂Q*`er R1h6$#qU"k©z ,b~FSeL]z1gPV/)]9RMj)WHoZ<~Wq<|FM뢓V으c_lHC0Mw\CZ]%̐Z7.jm X!RDгCr!:=#* cHiuPņoP^ w<~Rn rSw7G_e Ѵ;&ՐETpP!\ӮtAHis@[ȻtOPћdpיWIvyw· w8S |T>_p.5in2ZT L!O6~R7maGm_H}<(/{Jj*Ӎ>.` h[DЭ7`N+ME)/y"hW>"l``s9ğhq~JH?W*P1ENDREP DELTA SVNBvBBx^V]o0}{H 8|D"m=O' LTT6dXHh6KClsϹئii2Z2hy5Ze,Ҝ"y&c"50.`8-c`S` ]`t_&eKTA0ٚq! ,g -؄qI@LYa"NV펭?ñ1n̐Ml;s`iliJ|p&)Zt9M@r^c؁fBddI;e%7[F(vjBOǻ#e'Dʅb7sAENDREP DELTA SVNd#ddx^Vs8~><0ELnGfE%E"=O{W7s7fH.߷+a6k䬿QPџrݿ^T=ŷx;v'o8~ox:帎cXu1 h2 sG,8?7@]BFA"ra񙆲Ӆ3Ia 塄 W/h̰ h@ɪ}4&o9E2B |tp)xߒQ]m3P0'vF15 (߅W}Zw$XLRG'U)?YV)dh9y@hr%] t&2YQ>30 PgeX"y6H]9[pGV V962f'Ċ(d$I=[EV*6L1'{\/)D4!kCЊ0!B@V$KPBA-&i%y_8h)@r$,Jk.ԝ@HdA/Xzv݃? IX~,lMuW޸;8myg2'IQ+U8),KJ bV8,8Ojt#]ѯx ؒxSj5k$KL\L X`];[`^@楺!7e.Apesn,^ZdF" ɡrntoD@> o|6bR [tSCuD;ZԥEk]n?X;7BAz3˱?},XuPZ4}.-8_HGW !g$xoJI(Qq#YCgt!!HC3AֽʴD u w$픻bS=U?"/U,e3U![dB ڝz00Nm:gǎ j°eՀ~T#12 kEN0MuC8} gVvo~C)eA4\h Q3&aȃK&'!ENDREP DELTA SVNP'PPx^Vn6=_1P*eN xtA/`AKt̮, $k;XN(*)>>{3Ce2@y0[Y\}/Ey4)D*Cd'hLtJΒ|~ a( AD2"ƋUnn`xJf?~_&bWJe# m `Lϣpj]*r2_KlǡßUaĎ)%aӚ+#d&r]ZNUyCGM )sf6R6L]m֙šPjOd ߫qDy[+?L&+jɨÑMWAr 2s!*Qe. >O:OyF;K '|J[_lyqn?Rk!HMb(qip_,xO5%ucN_W`E$<07.rxJWaI^k lmL( kjlB_A݉3׊S{h/Q5lbm=GR'41 V+ZC3 tbޙΜIW,[,üæ". Hv=4϶VYɴmIX >l: :c=+GԻr4/ N:yk9) ?ʢ੭R<6pP֣"~K|ӜYn#^ukmZjfbUjTjޜ5=dwjm\%kg/EӶ* 끼Vl8,_oM8_\pqf/vh8{?bY2[Eow,e>|upBH}pzQ<{3ٕտɧ"ENDREP DELTA 367709 0 485 SVNT} T R 4R.orig/Expect.py 2015-01-23 13:16:01.000000000 +0000 +++ scripts/Expect.py 2015-01-23 13:21:06.526614131 +0000 @@ -484,7 +484,7 @@ global processes del processes[self.p.pid] self.p = None - self.r.join() + self.r.join(timeout) # Simulate a match on EOF self.buf = self.r.getbuf() ENDREP DELTA SVNx^RMO0 =_az[?h*M8 . ΡiU1qj$|q'cеۺQ(.;dLzfE4UŢ*I3Vba JYI(yyV3Ƣ,V+Dm> `/#B`%>lɺ1V/x7/k2V/}*)a 7`{{4%PX0.ŨAr i0ƠP_?ǸH&p ' _lrhA]mi˻I7g ~n4rr4~Y|LtkZK_q "mȸͺF~ tWM7t5C vմ?͠\ӞN驼WCENDREP DELTA 382009 123 464 SVNg gqL"I x^ok0_ϟ⪾cUc'12 a`+ŶD,ɷim^{ߝ9kB =_}H$ $ILN])x@Hd%)~%0"|&([ofk\/sbUœNhwPoEy-r:-fazu a$g/]_r؆T\h"fyhC AFӺXf`3_ .35eb%ޜ:0}J6rbU-y:l$j9pOFF.fϖ~wi0W-s ;pDҋ)\676S:^B75/W.*D)P;;(j9X05|{"eHUј|r c)B{dՉu,ҦMc׺ذR- Jx7 [.`Km(EIpBENDREP DELTA SVN_a__--- scripts/icehashpassword.py.orig 2015-06-23 15:30:20.000000000 +0000 +++ scripts/icehashpassword.py 2015-06-27 17:12:00.818709719 +0000 @@ -11,7 +11,7 @@ import sys, getopt, passlib.hash, getpass usePBKDF2 = sys.platform == "win32" or sys.platform == "darwin" -useCryptExt = sys.platform.startswith("linux") +useCryptExt = sys.platform.startswith("linux") or sys.platform.startswith("freebsd") if not usePBKDF2 and not useCryptExt: print("platform not supported") ENDREP DELTA 371546 587 20 SVNzv2_0@tJA[hk?3=NQp9{.+īH5gnc8c@N_bbTǨ iͤп@Ɗ~. |F݁nvwD3 C;ۀ6€PDlM5fj6)a¼ȋ~ 'Y:lNmH}^|DȤ3|{ooN+eQ1{7%kk Dp-:|%{%z8\ %&ϟRw#+FAƾƣKgMmLkɞo2:"}+Um GayS!?-Jr7kGg~> r $_E9/Fl:j r8ԩ6*|%4`c%\%8#lkq;PN`ÁKnĸFxL-xRJuFc:YmC:@ aGUzBD97ټm6݀6nl@ IswϮ.f)nҢb$,!D=NA $=noF!a||^wyweJEjֺ;oHugFi 1hmJO]kpI/.I}ꆨENDREP DELTA 362047 309 32 SVNB>qv&]==${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/php/${PHP_EXT_DIR}/*.soENDREP DELTA 371551 987 17 SVN m  TLENDREP DELTA 371280 26745 33 SVN ] q9f$#wrx^QJ0}n"}0ݚ`֖l*e,vm1Uen9݆|hsɹ~єNBWn&BBĖ