From owner-freebsd-toolchain@FreeBSD.ORG Wed Jan 22 17:26:11 2014 Return-Path: Delivered-To: freebsd-toolchain@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4F781CF7; Wed, 22 Jan 2014 17:26:11 +0000 (UTC) Received: from rcpt-expgw.biglobe.ne.jp (rcpt-expgw.biglobe.ne.jp [IPv6:2001:260:401:16::2]) by mx1.freebsd.org (Postfix) with ESMTP id C19211F0F; Wed, 22 Jan 2014 17:26:10 +0000 (UTC) Received: from vc-gw.biglobe.ne.jp by rcpt-expgw.biglobe.ne.jp (shby/5910021009) with SMTP id s0MHPrC7027939; Thu, 23 Jan 2014 02:25:53 +0900 Received: from smtp-gw.biglobe.ne.jp ([172.30.161.159]) by vc-gw.biglobe.ne.jp (kbkr/0716090908) with ESMTP id s0MHPr8Z020461; Thu, 23 Jan 2014 02:25:53 +0900 X-Biglobe-Sender: Received: from [192.168.0.100] (KD027083060020.ppp-bb.dion.ne.jp [27.83.60.20]) by smtp-gw.biglobe.ne.jp id CUZlAC1EB41F; Thu, 23 Jan 2014 02:25:53 +0900 (JST) Message-ID: <52DFFF20.9000809@kbh.biglobe.ne.jp> Date: Thu, 23 Jan 2014 02:25:52 +0900 From: Yamaya Takashi User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 MIME-Version: 1.0 To: Niclas Zeising Subject: Re: [CFT] Update to clang 3.4 References: <541C998A-071A-4917-9D91-DD00CB0E2689@FreeBSD.org> <63BD3165-A62E-4FE7-9817-4A2692584916@bsdimp.com> <264FAA6E-871A-48AF-A8D9-EC431A537195@FreeBSD.org> <6766B735-98CB-4F1D-B3B5-A43D81BB558A@FreeBSD.org> <52D286BE.7000102@kbh.biglobe.ne.jp> <50EAAC3C-2D38-4409-B525-2608D39BFE70@FreeBSD.org> <52DFCCFF.8080002@daemonic.se> In-Reply-To: <52DFCCFF.8080002@daemonic.se> Content-Type: multipart/mixed; boundary="------------080501070209050709030102" Cc: freebsd-toolchain@freebsd.org, Dimitry Andric X-BeenThere: freebsd-toolchain@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Maintenance of FreeBSD's integrated toolchain List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Jan 2014 17:26:11 -0000 This is a multi-part message in MIME format. --------------080501070209050709030102 Content-Type: text/plain; charset=GB2312 Content-Transfer-Encoding: 7bit On 2014/01/22 22:51, Niclas Zeising wrote: > On 01/12/14 17:21, Dimitry Andric wrote: >> On 12 Jan 2014, at 13:12, Yamaya Takashi wrote: >>> buildworld is failed when WITH_LLDB= >> Yes, this is a known issue. I discussed it with Ed Maste. Clang 3.4 >> will have to be imported first, afterwards we can fix lldb. >> >> >>> some ports cannot build. >>> >>> reason1: clang cannot handle some options. >>> (libmad build) >>> cc: error: unknown argument: '-fforce-addr' >>> cc: error: unknown argument: '-fthread-jumps' >>> cc: error: unknown argument: '-fcse-follow-jumps' >>> cc: error: unknown argument: '-fcse-skip-blocks' >>> cc: error: unknown argument: '-fregmove' >>> cc: error: unknown argument: '-fschedule-insns2' >>> (libtheora build) >>> cc: error: unknown argument: '-fforce-addr' >>> (poppler build) >>> c++: error: unknown argument: '-fno-check-new' >>> (py27-sqlite build) >>> cc: error: unknown argument: '-R/usr/local/lib' >>> (tbb build) >>> c++: error: unknown argument: '-fno-schedule-insns2' >>> (gstreamer-ffmpeg build) >>> cc: error: unknown argument: '-fno-force-addr' >> Indeed, this is likely the most troublesome aspect of the upgrade. >> >> Most of the above options, like "-fcse-follow-jumps", "-fno-check-new", >> etc are gcc-specific, and will never be supported by clang. These >> options will have to be removed, or made conditional on the compiler. >> >> The -R option is not a compiler option, but an ld option, and is also >> ambiguous: ld interprets it as --just-symbols when it is followed by the >> name of a file, but as -rpath when it is followed by the name of a >> directory. In all cases, this should be replaced with -Wl,-rpath. >> >> >>> reason2: c++ -std=c++11 detect bad c++ code which older clang cannot detect. >>> (libproxy build) >>> /usr/ports/net/libproxy/work/libproxy-0.4.6/libproxy/modules/wpad_dns_alias.cpp:30:23: >>> error: cannot initialize return object of type 'libproxy::url *' with an >>> rvalue of type 'bool' >>> if (lasturl) return false; >>> ^~~~~ >>> (liveMedia build) >> I have not looked in detail at this one, but this looks like a simple >> bug. The code should not return a boolean when the return type of the >> function is a libproxy::url pointer. Should be easy to fix. >> >> The new C++11 rules make it possible to avoid 'casting' a false value to >> a NULL pointer, and clang 3.4 detects this. >> >> >>> c++ -c -Iinclude -I../UsageEnvironment/include -I../groupsock/include >>> -I. -DBSD=1 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 >>> -D_FILE_OFFSET_BITS=64 -DHAVE_SOCKADDR_LEN=1 -Wall -DBSD=1 -O2 -pipe >>> -Qunused-arguments -march=native -fPIC -fno-strict-aliasing -std=c++11 >>> -Wno-c++11-narrowing -stdlib=libc++ -Wno-deprecated RTSPRegisterSender.cpp >>> RTSPClient.cpp:916:25: error: comparison between pointer and integer >>> ('const char *' and 'int') >>> if (&line[paramIndex] == '\0') return False; // the header is assumed >>> to be bad if it has no parameters >>> ~~~~~~~~~~~~~~~~~ ^ ~~~~ >>> (mp4v2 build) >> This looks like an incorrect comparison: a pointer is compared with a >> literal character. Should be easy to fix. >> >> >>> c++ -DHAVE_CONFIG_H -I./include -I./include -I. -I. -Wall -Wformat -O2 >>> -pipe -Qunused-arguments -march=native -fno-strict-aliasing -std=c++11 >>> -Wno-c++11-narrowing -stdlib=libc++ -fvisibility=hidden -c >>> src/mp4container.cpp -fPIC -DPIC -o src/.libs/mp4container.o >>> src/mp4.cpp:679:20: error: cannot initialize return object of type >>> 'mp4v2_ismacrypParams *' (aka 'mp4v2_ismacryp_session_params *') with an >>> rvalue of type 'MP4TrackId' (aka 'unsigned int') >>> return MP4_INVALID_TRACK_ID; >>> ^~~~~~~~~~~~~~~~~~~~ >>> ./include/mp4v2/general.h:45:33: note: expanded from macro >>> 'MP4_INVALID_TRACK_ID' >>> #define MP4_INVALID_TRACK_ID ((MP4TrackId)0) /**< Constant: >>> invalid MP4TrackId. */ >>> ^~~~~~~~~~~~~~~ >>> (thunderbird build) >> Again, an attempt is made to use an incorrect type for the return value >> of a function. Either the value should be explicitly cast to the >> correct type (mp4v2_ismacrypParams *), or the MP4_INVALID_TRACK_ID >> define should be fixed to be of the correct type. >> >> >>> clang++ -o jsoptparse.o -c -I../../../dist/system_wrappers_js -include >>> /usr/ports/mail/thunderbird/work/comm-esr24/mozilla/js/src/config/gcc_hidden.h >>> -DEXPORT_JS_API -DIMPL_MFBT -DMOZ_GLUE_IN_PROGRAM -DNO_NSPR_10_SUPPORT >>> -I/usr/ports/mail/thunderbird/work/comm-esr24/mozilla/js/src -I.. >>> -I/usr/ports/mail/thunderbird/work/comm-esr24/mozilla/js/src/shell -I. >>> -I../../../dist/include -I/usr/local/include/nspr -fPIC >>> -Qunused-arguments -isystem/usr/local/include -Qunused-arguments -Wall >>> -Wpointer-arith -Woverloaded-virtual -Werror=return-type -Wtype-limits >>> -Wempty-body -Werror=conversion-null -Wsign-compare >>> -Wno-invalid-offsetof -Wno-c++0x-extensions -Wno-extended-offsetof >>> -Wno-unknown-warning-option -Wno-return-type-c-linkage >>> -Wno-mismatched-tags -O2 -pipe -Qunused-arguments -march=native -O3 >>> -fno-strict-aliasing -std=c++11 -Wno-c++11-narrowing -stdlib=libc++ >>> -fno-rtti -ffunction-sections -fdata-sections -fno-exceptions -pipe >>> -DNDEBUG -DTRIMMED -O2 -O3 -fomit-frame-pointer -Qunused-arguments >>> -isystem/usr/local/include -DMOZILLA_CLIENT -include ../js-confdefs.h >>> -MD -MP -MF .deps/jsoptparse.o.pp /usr/ports/mail/thunderbir >>> d/work/comm-esr24/mozilla/js/src/shell/jsoptparse.cpp >>> /usr/ports/mail/thunderbird/work/comm-esr24/mozilla/js/src/shell/jsoptparse.cpp:256:22: >>> error: comparison between pointer and integer ('char *' and 'int') >>> if (value[0] == '\0') >>> ~~~~~~~~ ^ ~~~~ >> Like the mp4v2 build, this is probably a simple bug. The code should >> not compare a pointer to an integer. Most likely, the right side was >> supposed to be NULL instead? >> > I'm probably late to the party, as always... But, have you or Yamaya > Takashi tried to punt these issues to the respective port managers for > investigation? > Regards! I have patches for libproxy, liveMedia, mp4v2 and thunderbird. --------------080501070209050709030102 Content-Type: text/plain; charset=UTF-8; name="thunderbird.patch.txt" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="thunderbird.patch.txt" SW5kZXg6IG1haWwvdGh1bmRlcmJpcmQvZmlsZXMvcGF0Y2gtbW96aWxsYS1qcy1zcmMtc2hl bGwtanNvcHRwYXJzZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gbWFpbC90aHVuZGVyYmlyZC9m aWxlcy9wYXRjaC1tb3ppbGxhLWpzLXNyYy1zaGVsbC1qc29wdHBhcnNlLmNwcAkocmV2aXNp b24gMCkKKysrIG1haWwvdGh1bmRlcmJpcmQvZmlsZXMvcGF0Y2gtbW96aWxsYS1qcy1zcmMt c2hlbGwtanNvcHRwYXJzZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwxMSBAQAor LS0tIG1vemlsbGEvanMvc3JjL3NoZWxsL2pzb3B0cGFyc2UuY3BwLm9yaWcJMjAxNC0wMS0x NCAwMTowNjozOS4xMzc4NjQ4NzUgKzA5MDAKKysrKyBtb3ppbGxhL2pzL3NyYy9zaGVsbC9q c29wdHBhcnNlLmNwcAkyMDE0LTAxLTE0IDAxOjE3OjQwLjc3NTgyMjQ5MiArMDkwMAorQEAg LTI1Myw3ICsyNTMsNyBAQAorICAgICBjaGFyICplcSA9IHN0cmNocihhcmd2WyppXSwgJz0n KTsKKyAgICAgaWYgKGVxKSB7CisgICAgICAgICAqdmFsdWUgPSBlcSArIDE7CistICAgICAg ICBpZiAodmFsdWVbMF0gPT0gJ1wwJykKKysgICAgICAgIGlmICgqKnZhbHVlID09ICdcMCcp CisgICAgICAgICAgICAgcmV0dXJuIGVycm9yKCJBIHZhbHVlIGlzIHJlcXVpcmVkIGZvciBv cHRpb24gJS4qcyIsIGVxIC0gYXJndlsqaV0sIGFyZ3ZbKmldKTsKKyAgICAgICAgIHJldHVy biBPa2F5OworICAgICB9CgpQcm9wZXJ0eSBjaGFuZ2VzIG9uOiBtYWlsL3RodW5kZXJiaXJk L2ZpbGVzL3BhdGNoLW1vemlsbGEtanMtc3JjLXNoZWxsLWpzb3B0cGFyc2UuY3BwCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KQWRkZWQ6IHN2bjptaW1lLXR5cGUKIyMgLTAsMCArMSAjIwordGV4dC9wbGFp bgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIHByb3BlcnR5CkFkZGVkOiBmYnNkOm5va2V5d29y ZHMKIyMgLTAsMCArMSAjIworeWVzClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgcHJvcGVydHkK QWRkZWQ6IHN2bjplb2wtc3R5bGUKIyMgLTAsMCArMSAjIworbmF0aXZlClwgTm8gbmV3bGlu ZSBhdCBlbmQgb2YgcHJvcGVydHkK --------------080501070209050709030102 Content-Type: text/plain; charset=UTF-8; name="mp4v2.patch.txt" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="mp4v2.patch.txt" SW5kZXg6IG11bHRpbWVkaWEvbXA0djIvZmlsZXMvcGF0Y2gtc3JjX19tcDQuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIG11bHRpbWVkaWEvbXA0djIvZmlsZXMvcGF0Y2gtc3JjX19tcDQuY3Bw CShyZXZpc2lvbiAwKQorKysgbXVsdGltZWRpYS9tcDR2Mi9maWxlcy9wYXRjaC1zcmNfX21w NC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwxMSBAQAorLS0tIHNyYy9tcDQuY3Bw Lm9yaWcJMjAxNC0wMS0xNCAwMDozNjoxNy45MTI5OTMyMDggKzA5MDAKKysrKyBzcmMvbXA0 LmNwcAkyMDE0LTAxLTE0IDAwOjQzOjQxLjEwMzk2ODU5NyArMDkwMAorQEAgLTY3Niw3ICs2 NzYsNyBAQAorICAgICAgICAgfQorIAorICAgICAgICAgY2F0Y2ggKC4uLikgeworLSAgICAg ICAgICAgIHJldHVybiBNUDRfSU5WQUxJRF9UUkFDS19JRDsKKysgICAgICAgICAgICByZXR1 cm4gTlVMTDsKKyAgICAgICAgIH0KKyAgICAgfQorIAoKUHJvcGVydHkgY2hhbmdlcyBvbjog bXVsdGltZWRpYS9tcDR2Mi9maWxlcy9wYXRjaC1zcmNfX21wNC5jcHAKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpBZGRlZDogZmJzZDpub2tleXdvcmRzCiMjIC0wLDAgKzEgIyMKK3llcwpcIE5vIG5ld2xp bmUgYXQgZW5kIG9mIHByb3BlcnR5CkFkZGVkOiBzdm46ZW9sLXN0eWxlCiMjIC0wLDAgKzEg IyMKK25hdGl2ZQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIHByb3BlcnR5CkFkZGVkOiBzdm46 bWltZS10eXBlCiMjIC0wLDAgKzEgIyMKK3RleHQvcGxhaW4KXCBObyBuZXdsaW5lIGF0IGVu ZCBvZiBwcm9wZXJ0eQpJbmRleDogbXVsdGltZWRpYS9tcDR2Mi9maWxlcy9wYXRjaC1zcmNf X3J0cGhpbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIG11bHRpbWVkaWEvbXA0djIvZmlsZXMv cGF0Y2gtc3JjX19ydHBoaW50LmNwcAkocmV2aXNpb24gMCkKKysrIG11bHRpbWVkaWEvbXA0 djIvZmlsZXMvcGF0Y2gtc3JjX19ydHBoaW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMCww ICsxLDExIEBACistLS0gc3JjL3J0cGhpbnQuY3BwLm9yaWcJMjAxNC0wMS0xNCAwMDo0Nzoy OC45ODM5NDkyMjMgKzA5MDAKKysrKyBzcmMvcnRwaGludC5jcHAJMjAxNC0wMS0xNCAwMDo1 NDowNi43OTE5MzEzODMgKzA5MDAKK0BAIC0zNDUsNyArMzQ1LDcgQEAKKyAgICAgICAgICAg ICAgICAgcFNsYXNoID0gc3RyY2hyKHBTbGFzaCwgJy8nKTsKKyAgICAgICAgICAgICAgICAg aWYgKHBTbGFzaCAhPSBOVUxMKSB7CisgICAgICAgICAgICAgICAgICAgICBwU2xhc2grKzsK Ky0gICAgICAgICAgICAgICAgICAgIGlmIChwU2xhc2ggIT0gJ1wwJykgeworKyAgICAgICAg ICAgICAgICAgICAgaWYgKCpwU2xhc2ggIT0gJ1wwJykgeworICAgICAgICAgICAgICAgICAg ICAgICAgIGxlbmd0aCA9IHN0cmxlbihwUnRwTWFwKSAtIChwU2xhc2ggLSBwUnRwTWFwKTsK KyAgICAgICAgICAgICAgICAgICAgICAgICAqcHBFbmNvZGluZ1BhcmFtcyA9IChjaGFyICop TVA0Q2FsbG9jKGxlbmd0aCArIDEpOworICAgICAgICAgICAgICAgICAgICAgICAgIHN0cm5j cHkoKnBwRW5jb2RpbmdQYXJhbXMsIHBTbGFzaCwgbGVuZ3RoKTsKClByb3BlcnR5IGNoYW5n ZXMgb246IG11bHRpbWVkaWEvbXA0djIvZmlsZXMvcGF0Y2gtc3JjX19ydHBoaW50LmNwcApf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCkFkZGVkOiBzdm46bWltZS10eXBlCiMjIC0wLDAgKzEgIyMKK3RleHQv cGxhaW4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBwcm9wZXJ0eQpBZGRlZDogZmJzZDpub2tl eXdvcmRzCiMjIC0wLDAgKzEgIyMKK3llcwpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIHByb3Bl cnR5CkFkZGVkOiBzdm46ZW9sLXN0eWxlCiMjIC0wLDAgKzEgIyMKK25hdGl2ZQpcIE5vIG5l d2xpbmUgYXQgZW5kIG9mIHByb3BlcnR5Cg== --------------080501070209050709030102 Content-Type: text/plain; charset=UTF-8; name="liveMedia.patch.txt" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="liveMedia.patch.txt" SW5kZXg6IG5ldC9saXZlTWVkaWEvZmlsZXMvcGF0Y2gtbGl2ZU1lZGlhLVJUU1BDbGllbnQu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIG5ldC9saXZlTWVkaWEvZmlsZXMvcGF0Y2gtbGl2ZU1l ZGlhLVJUU1BDbGllbnQuY3BwCShyZXZpc2lvbiAwKQorKysgbmV0L2xpdmVNZWRpYS9maWxl cy9wYXRjaC1saXZlTWVkaWEtUlRTUENsaWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTAs MCArMSwxMSBAQAorLS0tIGxpdmVNZWRpYS9SVFNQQ2xpZW50LmNwcC5vcmlnCTIwMTQtMDEt MTQgMDA6MjE6MTAuNjE2Mzc2NDQzICswOTAwCisrKysgbGl2ZU1lZGlhL1JUU1BDbGllbnQu Y3BwCTIwMTQtMDEtMTQgMDA6MjQ6MTEuNTQxMzQ5NzI5ICswOTAwCitAQCAtOTEzLDcgKzkx Myw3IEBACisgICAvLyBUaGUgbGluZSBiZWdpbnMgd2l0aCB0aGUgZGVzaXJlZCBoZWFkZXIg bmFtZS4gIFRyaW0gb2ZmIGFueSB3aGl0ZXNwYWNlLCBhbmQgcmV0dXJuIHRoZSBoZWFkZXIg cGFyYW1ldGVyczoKKyAgIHVuc2lnbmVkIHBhcmFtSW5kZXggPSBoZWFkZXJOYW1lTGVuZ3Ro OworICAgd2hpbGUgKGxpbmVbcGFyYW1JbmRleF0gIT0gJ1wwJyAmJiAobGluZVtwYXJhbUlu ZGV4XSA9PSAnICcgfHwgbGluZVtwYXJhbUluZGV4XSA9PSAnXHQnKSkgKytwYXJhbUluZGV4 OworLSAgaWYgKCZsaW5lW3BhcmFtSW5kZXhdID09ICdcMCcpIHJldHVybiBGYWxzZTsgLy8g dGhlIGhlYWRlciBpcyBhc3N1bWVkIHRvIGJlIGJhZCBpZiBpdCBoYXMgbm8gcGFyYW1ldGVy cworKyAgaWYgKGxpbmVbcGFyYW1JbmRleF0gPT0gJ1wwJykgcmV0dXJuIEZhbHNlOyAvLyB0 aGUgaGVhZGVyIGlzIGFzc3VtZWQgdG8gYmUgYmFkIGlmIGl0IGhhcyBubyBwYXJhbWV0ZXJz CisgCisgICBoZWFkZXJQYXJhbXMgPSAmbGluZVtwYXJhbUluZGV4XTsKKyAgIHJldHVybiBU cnVlOwoKUHJvcGVydHkgY2hhbmdlcyBvbjogbmV0L2xpdmVNZWRpYS9maWxlcy9wYXRjaC1s aXZlTWVkaWEtUlRTUENsaWVudC5jcHAKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpBZGRlZDogZmJzZDpub2tl eXdvcmRzCiMjIC0wLDAgKzEgIyMKK3llcwpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIHByb3Bl cnR5CkFkZGVkOiBzdm46ZW9sLXN0eWxlCiMjIC0wLDAgKzEgIyMKK25hdGl2ZQpcIE5vIG5l d2xpbmUgYXQgZW5kIG9mIHByb3BlcnR5CkFkZGVkOiBzdm46bWltZS10eXBlCiMjIC0wLDAg KzEgIyMKK3RleHQvcGxhaW4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBwcm9wZXJ0eQo= --------------080501070209050709030102 Content-Type: text/plain; charset=UTF-8; name="libproxy.patch.txt" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="libproxy.patch.txt" SW5kZXg6IG5ldC9saWJwcm94eS9maWxlcy9wYXRjaC1saWJwcm94eV9tb2R1bGVfd3BhZF9k bnNfYWxpYXMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIG5ldC9saWJwcm94eS9maWxlcy9wYXRj aC1saWJwcm94eV9tb2R1bGVfd3BhZF9kbnNfYWxpYXMuY3BwCShyZXZpc2lvbiAwKQorKysg bmV0L2xpYnByb3h5L2ZpbGVzL3BhdGNoLWxpYnByb3h5X21vZHVsZV93cGFkX2Ruc19hbGlh cy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwxMSBAQAorLS0tIGxpYnByb3h5L21v ZHVsZXMvd3BhZF9kbnNfYWxpYXMuY3BwLm9yaWcJMjAxNC0wMS0xNCAwMDowNDoxMi41MjQ0 MTk3ODQgKzA5MDAKKysrKyBsaWJwcm94eS9tb2R1bGVzL3dwYWRfZG5zX2FsaWFzLmNwcAky MDE0LTAxLTE0IDAwOjA0OjI3LjMxMTQyMjQ2MiArMDkwMAorQEAgLTI3LDcgKzI3LDcgQEAK KyAJdm9pZCByZXdpbmQoKSAgICAgICAgICAgICAgeyBsYXN0dXJsID0gTlVMTDsgbGFzdHBh YyA9IE5VTEw7IH0KKyAKKyAJdXJsKiBuZXh0KGNoYXIqKiBwYWMpIHsKKy0JCWlmIChsYXN0 dXJsKSByZXR1cm4gZmFsc2U7CisrCQlpZiAobGFzdHVybCkgcmV0dXJuIE5VTEw7CisgCisg CQlsYXN0dXJsID0gbmV3IHVybCgiaHR0cDovL3dwYWQvd3BhZC5kYXQiKTsKKyAJCWxhc3Rw YWMgPSAqcGFjID0gbGFzdHVybC0+Z2V0X3BhYygpOwoKUHJvcGVydHkgY2hhbmdlcyBvbjog bmV0L2xpYnByb3h5L2ZpbGVzL3BhdGNoLWxpYnByb3h5X21vZHVsZV93cGFkX2Ruc19hbGlh cy5jcHAKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpBZGRlZDogc3ZuOm1pbWUtdHlwZQojIyAtMCwwICsxICMj Cit0ZXh0L3BsYWluClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgcHJvcGVydHkKQWRkZWQ6IGZi c2Q6bm9rZXl3b3JkcwojIyAtMCwwICsxICMjCit5ZXMKXCBObyBuZXdsaW5lIGF0IGVuZCBv ZiBwcm9wZXJ0eQpBZGRlZDogc3ZuOmVvbC1zdHlsZQojIyAtMCwwICsxICMjCituYXRpdmUK XCBObyBuZXdsaW5lIGF0IGVuZCBvZiBwcm9wZXJ0eQo= --------------080501070209050709030102--