From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/13552 Path: news.gmane.org!.POSTED!not-for-mail From: =?utf-8?B?0YHQtdGA0LPQtdC5INCy0L7Qu9C60L7QstC40YfRjA==?= Newsgroups: gmane.linux.lib.musl.general Subject: additional patches for musl Date: Sun, 16 Dec 2018 02:01:56 +0200 Message-ID: Reply-To: musl@lists.openwall.com NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="mix-1cb18e91:2f2a439e" X-Trace: blaine.gmane.org 1544921472 20533 195.159.176.226 (16 Dec 2018 00:51:12 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 16 Dec 2018 00:51:12 +0000 (UTC) To: musl@lists.openwall.com Original-X-From: musl-return-13568-gllmg-musl=m.gmane.org@lists.openwall.com Sun Dec 16 01:51:08 2018 Return-path: Envelope-to: gllmg-musl@m.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by blaine.gmane.org with smtp (Exim 4.84_2) (envelope-from ) id 1gYKeA-0005EG-5y for gllmg-musl@m.gmane.org; Sun, 16 Dec 2018 01:51:07 +0100 Original-Received: (qmail 19819 invoked by uid 550); 16 Dec 2018 00:53:14 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Original-Received: (qmail 1505 invoked from network); 16 Dec 2018 00:02:10 -0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=i.ua; s=mail; h=Message-Id:Content-Type:MIME-Version:Date:From:Subject:To:Sender: Reply-To:Cc:Content-Transfer-Encoding:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=j/auDn+hBBaCxC1DXvjzpBIqwijfNl/Y/vMZbeyz55s=; b=WAp1Pt5oY2//mEMwO3GSmvW5Ig 4OATXWjnl+Tq2en24UlhQnXWKjGA80aLqJbZEuTJfFHhiJcOtyqPVgK+ADyIGewN29vPmkWLaFrtI 83B47KH/O/2OpBvHQ6PHLab+Xy/W4yChoMFQkUpr7Q+48oDK9x7Fk+hoaF/zm7idjDrs=; X-Mailer: I.UA Mail System X-Server: st10.mi6.kiev.ua X-Sender-IP: 130.180.220.236 X-User-Agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3600.0 Iron Safari/537.36 Xref: news.gmane.org gmane.linux.lib.musl.general:13552 Archived-At: --mix-1cb18e91:2f2a439e Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit cabulertion. i finded additional patches for implementing some missing musl features. -- реклама ----------------------------------------------------------- Поторопись зарегистрировать самый короткий почтовый адрес @i.ua https://mail.i.ua/reg - и получи 1Gb для хранения писем --mix-1cb18e91:2f2a439e Content-Type: text/x-patch; name="canonicalize_file_name.patch" Content-Disposition: attachment; filename="canonicalize_file_name.patch" Content-Transfer-Encoding: base64 LS0tIGEvaW5jbHVkZS9zdGRsaWIuaAorKysgYi9pbmNsdWRlL3N0ZGxpYi5oCkBAIC0xMjAsNiAr MTIwLDkgQEAKICNpZiBkZWZpbmVkKF9YT1BFTl9TT1VSQ0UpIHx8IGRlZmluZWQoX0dOVV9TT1VS Q0UpIFwKICB8fCBkZWZpbmVkKF9CU0RfU09VUkNFKQogY2hhciAqcmVhbHBhdGggKGNvbnN0IGNo YXIgKl9fcmVzdHJpY3QsIGNoYXIgKl9fcmVzdHJpY3QpOworI2lmZGVmIF9HTlVfU09VUkNFCitj aGFyICpjYW5vbmljYWxpemVfZmlsZV9uYW1lIChjb25zdCBjaGFyICpfX3Jlc3RyaWN0KTsKKyNl bmRpZgogbG9uZyBpbnQgcmFuZG9tICh2b2lkKTsKIHZvaWQgc3JhbmRvbSAodW5zaWduZWQgaW50 KTsKIGNoYXIgKmluaXRzdGF0ZSAodW5zaWduZWQgaW50LCBjaGFyICosIHNpemVfdCk7Ci0tLSBh L3NyYy9taXNjL3JlYWxwYXRoLmMKKysrIGIvc3JjL21pc2MvcmVhbHBhdGguYwpAQCAtNDIsNCAr NDIsOSBAQAogZXJyOgogCV9fc3lzY2FsbChTWVNfY2xvc2UsIGZkKTsKIAlyZXR1cm4gMDsKIH0K KworY2hhciAqY2Fub25pY2FsaXplX2ZpbGVfbmFtZShjb25zdCBjaGFyICpyZXN0cmljdCBmaWxl bmFtZSkKK3sKKwlyZXR1cm4gcmVhbHBhdGgoZmlsZW5hbWUsIE5VTEwpOworfQo= --mix-1cb18e91:2f2a439e Content-Type: text/x-patch; name="netdb.patch" Content-Disposition: attachment; filename="netdb.patch" Content-Transfer-Encoding: base64 LS0tIGEvaW5jbHVkZS9uZXRkYi5oCisrKyBiL2luY2x1ZGUvbmV0ZGIuaApAQCAtMTI0LDYgKzEy NCw4IEBACiAjZGVmaW5lIE5PX1JFQ09WRVJZICAgIDMKICNkZWZpbmUgTk9fREFUQSAgICAgICAg NAogI2RlZmluZSBOT19BRERSRVNTICAgICBOT19EQVRBCisjZGVmaW5lIE5FVERCX0lOVEVSTkFM IC0xCisjZGVmaW5lIE5FVERCX1NVQ0NFU1MgIDAKICNlbmRpZgogCiAjaWYgZGVmaW5lZChfR05V X1NPVVJDRSkgfHwgZGVmaW5lZChfQlNEX1NPVVJDRSkK --mix-1cb18e91:2f2a439e Content-Type: text/x-patch; name="nftw.patch" Content-Disposition: attachment; filename="nftw.patch" Content-Transfer-Encoding: base64 LS0tIGEvaW5jbHVkZS9mdHcuaAorKysgYi9pbmNsdWRlL2Z0dy5oCkBAIC0yMCw2ICsyMCwxNCBA QAogI2RlZmluZSBGVFdfTU9VTlQgMgogI2RlZmluZSBGVFdfQ0hESVIgNAogI2RlZmluZSBGVFdf REVQVEggOAorCisjaWZkZWYgX0dOVV9TT1VSQ0UKKyNkZWZpbmUgRlRXX0FDVElPTlJFVFZBTCAx NgorI2RlZmluZSBGVFdfQ09OVElOVUUgMAorI2RlZmluZSBGVFdfU1RPUCAxCisjZGVmaW5lIEZU V19TS0lQX1NVQlRSRUUgMgorI2RlZmluZSBGVFdfU0tJUF9TSUJMSU5HUyAzCisjZW5kaWYKIAog c3RydWN0IEZUVyB7CiAJaW50IGJhc2U7Ci0tLSBhL3NyYy9taXNjL25mdHcuYworKysgYi9zcmMv bWlzYy9uZnR3LmMKQEAgLTEsMyArMSw4IEBACisjZGVmaW5lIEZUV19BQ1RJT05SRVRWQUwgMTYK KyNkZWZpbmUgRlRXX0NPTlRJTlVFIDAKKyNkZWZpbmUgRlRXX1NUT1AgMQorI2RlZmluZSBGVFdf U0tJUF9TVUJUUkVFIDIKKyNkZWZpbmUgRlRXX1NLSVBfU0lCTElOR1MgMwogI2luY2x1ZGUgPGZ0 dy5oPgogI2luY2x1ZGUgPGRpcmVudC5oPgogI2luY2x1ZGUgPHN5cy9zdGF0Lmg+CkBAIC01OCw4 ICs1OCwyMCBAQAogCWxldi5sZXZlbCA9IG5ldy5sZXZlbDsKIAlsZXYuYmFzZSA9IGggPyBoLT5i YXNlIDogKG5hbWU9c3RycmNocihwYXRoLCAnLycpKSA/IG5hbWUtcGF0aCA6IDA7CiAKLQlpZiAo IShmbGFncyAmIEZUV19ERVBUSCkgJiYgKHI9Zm4ocGF0aCwgJnN0LCB0eXBlLCAmbGV2KSkpCi0J CXJldHVybiByOworCWlmICghKGZsYWdzICYgRlRXX0RFUFRIKSAmJiAocj1mbihwYXRoLCAmc3Qs IHR5cGUsICZsZXYpKSkgeworCQlpZiAoZmxhZ3MgJiBGVFdfQUNUSU9OUkVUVkFMKQorCQkJc3dp dGNoIChyKSB7CisJCQkJY2FzZSBGVFdfU0tJUF9TVUJUUkVFOgorCQkJCQloID0gTlVMTDsKKwkJ CQljYXNlIEZUV19DT05USU5VRToKKwkJCQkJYnJlYWs7CisJCQkJY2FzZSBGVFdfU0tJUF9TSUJM SU5HUzoKKwkJCQljYXNlIEZUV19TVE9QOgorCQkJCQlyZXR1cm4gcjsKKwkJCX0KKwkJZWxzZQor CQkJcmV0dXJuIHI7CisJfQogCiAJZm9yICg7IGg7IGggPSBoLT5jaGFpbikKIAkJaWYgKGgtPmRl diA9PSBzdC5zdF9kZXYgJiYgaC0+aW5vID09IHN0LnN0X2lubykKQEAgLTgyLDcgKzk0LDEwIEBA CiAJCQkJc3RyY3B5KHBhdGgraisxLCBkZS0+ZF9uYW1lKTsKIAkJCQlpZiAoKHI9ZG9fbmZ0dyhw YXRoLCBmbiwgZmRfbGltaXQtMSwgZmxhZ3MsICZuZXcpKSkgewogCQkJCQljbG9zZWRpcihkKTsK LQkJCQkJcmV0dXJuIHI7CisJCQkJCWlmICgoZmxhZ3MgJiBGVFdfQUNUSU9OUkVUVkFMKSAmJiBy ID09IEZUV19TS0lQX1NJQkxJTkdTKQorCQkJCQkJYnJlYWs7CisJCQkJCWVsc2UKKwkJCQkJCXJl dHVybiByOwogCQkJCX0KIAkJCX0KIAkJCWNsb3NlZGlyKGQpOwpAQCAtOTMsOCArMTA4LDE2IEBA CiAJfQogCiAJcGF0aFtsXSA9IDA7Ci0JaWYgKChmbGFncyAmIEZUV19ERVBUSCkgJiYgKHI9Zm4o cGF0aCwgJnN0LCB0eXBlLCAmbGV2KSkpCi0JCXJldHVybiByOworCWlmICgoZmxhZ3MgJiBGVFdf REVQVEgpICYmIChyPWZuKHBhdGgsICZzdCwgdHlwZSwgJmxldikpKSB7CisJCWlmIChmbGFncyAm IEZUV19BQ1RJT05SRVRWQUwpCisJCQlzd2l0Y2ggKHIpIHsKKwkJCQljYXNlIEZUV19TS0lQX1NJ QkxJTkdTOgorCQkJCWNhc2UgRlRXX1NUT1A6CisJCQkJCXJldHVybiByOworCQkJfQorCQllbHNl CisJCQlyZXR1cm4gcjsKKwl9CiAKIAlyZXR1cm4gMDsKIH0K --mix-1cb18e91:2f2a439e Content-Type: text/x-patch; name="printf.h.patch" Content-Disposition: attachment; filename="printf.h.patch" Content-Transfer-Encoding: base64 LS0tIC9kZXYvbnVsbAorKysgYi9zcmMvbWlzYy9wYXJzZS1wcmludGYtZm9ybWF0LmMKQEAgLTAs MCArMSwyNjUgQEAKKy8qKioKKyAgQ29weXJpZ2h0IDIwMTQgRW1pbCBSZW5uZXIgQmVydGhpbmcK KyAgV2l0aCBwYXJ0cyBmcm9tIHRoZSBtdXNsIEMgbGlicmFyeQorICBDb3B5cmlnaHQgMjAwNS0y MDE0IFJpY2ggRmVsa2VyLCBldCBhbC4KKworICBUaGlzIGZpbGUgaXMgZnJlZSBzb2Z0d2FyZTsg eW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yIG1vZGlmeSBpdAorICB1bmRlciB0aGUgdGVy bXMgb2YgdGhlIEdOVSBMZXNzZXIgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBhcyBwdWJsaXNoZWQg YnkKKyAgdGhlIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbjsgZWl0aGVyIHZlcnNpb24gMi4xIG9m IHRoZSBMaWNlbnNlLCBvcgorICAoYXQgeW91ciBvcHRpb24pIGFueSBsYXRlciB2ZXJzaW9uLgor CisgIFRoaXMgZmlsZSBpcyBkaXN0cmlidXRlZCBpbiB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUg dXNlZnVsLCBidXQKKyAgV0lUSE9VVCBBTlkgV0FSUkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1w bGllZCB3YXJyYW50eSBvZgorICBNRVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQQVJU SUNVTEFSIFBVUlBPU0UuIFNlZSB0aGUgR05VCisgIExlc3NlciBHZW5lcmFsIFB1YmxpYyBMaWNl bnNlIGZvciBtb3JlIGRldGFpbHMuCisqKiovCisKKyNpbmNsdWRlIDxzdGRkZWYuaD4KKyNpbmNs dWRlIDxzdHJpbmcuaD4KKworI2luY2x1ZGUgInByaW50Zi5oIgorCitzdGF0aWMgY29uc3QgY2hh ciAqY29uc3VtZV9ub25hcmcoY29uc3QgY2hhciAqZm10KQoreworICAgICAgICBkbyB7CisgICAg ICAgICAgICAgICAgaWYgKCpmbXQgPT0gJ1wwJykKKyAgICAgICAgICAgICAgICAgICAgICAgIHJl dHVybiBmbXQ7CisgICAgICAgIH0gd2hpbGUgKCpmbXQrKyAhPSAnJScpOworICAgICAgICByZXR1 cm4gZm10OworfQorCitzdGF0aWMgY29uc3QgY2hhciAqY29uc3VtZV9udW0oY29uc3QgY2hhciAq Zm10KQoreworICAgICAgICBmb3IgKDsqZm10ID49ICcwJyAmJiAqZm10IDw9ICc5JzsgZm10Kysp CisgICAgICAgICAgICAgICAgLyogZG8gbm90aGluZyAqLzsKKyAgICAgICAgcmV0dXJuIGZtdDsK K30KKworc3RhdGljIGNvbnN0IGNoYXIgKmNvbnN1bWVfYXJnbihjb25zdCBjaGFyICpmbXQsIHNp emVfdCAqYXJnKQoreworICAgICAgICBjb25zdCBjaGFyICpwID0gZm10OworICAgICAgICBzaXpl X3QgdmFsID0gMDsKKworICAgICAgICBpZiAoKnAgPCAnMScgfHwgKnAgPiAnOScpCisgICAgICAg ICAgICAgICAgcmV0dXJuIGZtdDsKKyAgICAgICAgZG8geworICAgICAgICAgICAgICAgIHZhbCA9 IDEwKnZhbCArICgqcCsrIC0gJzAnKTsKKyAgICAgICAgfSB3aGlsZSAoKnAgPj0gJzAnICYmICpw IDw9ICc5Jyk7CisKKyAgICAgICAgaWYgKCpwICE9ICckJykKKyAgICAgICAgICAgICAgICByZXR1 cm4gZm10OworICAgICAgICAqYXJnID0gdmFsOworICAgICAgICByZXR1cm4gcCsxOworfQorCitz dGF0aWMgY29uc3QgY2hhciAqY29uc3VtZV9mbGFncyhjb25zdCBjaGFyICpmbXQpCit7CisgICAg ICAgIHdoaWxlICgxKSB7CisgICAgICAgICAgICAgICAgc3dpdGNoICgqZm10KSB7CisgICAgICAg ICAgICAgICAgY2FzZSAnIyc6CisgICAgICAgICAgICAgICAgY2FzZSAnMCc6CisgICAgICAgICAg ICAgICAgY2FzZSAnLSc6CisgICAgICAgICAgICAgICAgY2FzZSAnICc6CisgICAgICAgICAgICAg ICAgY2FzZSAnKyc6CisgICAgICAgICAgICAgICAgY2FzZSAnXCcnOgorICAgICAgICAgICAgICAg IGNhc2UgJ0knOgorICAgICAgICAgICAgICAgICAgICAgICAgZm10Kys7CisgICAgICAgICAgICAg ICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAg cmV0dXJuIGZtdDsKKyAgICAgICAgfQorfQorCitlbnVtIHN0YXRlIHsKKyAgICAgICAgQkFSRSwK KyAgICAgICAgTFBSRSwKKyAgICAgICAgTExQUkUsCisgICAgICAgIEhQUkUsCisgICAgICAgIEhI UFJFLAorICAgICAgICBCSUdMUFJFLAorICAgICAgICBaVFBSRSwKKyAgICAgICAgSlBSRSwKKyAg ICAgICAgU1RPUAorfTsKKworZW51bSB0eXBlIHsKKyAgICAgICAgTk9ORSwKKyAgICAgICAgUFRS LAorICAgICAgICBJTlQsCisgICAgICAgIFVJTlQsCisgICAgICAgIFVMTE9ORywKKyAgICAgICAg TE9ORywKKyAgICAgICAgVUxPTkcsCisgICAgICAgIFNIT1JULAorICAgICAgICBVU0hPUlQsCisg ICAgICAgIENIQVIsCisgICAgICAgIFVDSEFSLAorICAgICAgICBMTE9ORywKKyAgICAgICAgU0la RVQsCisgICAgICAgIElNQVgsCisgICAgICAgIFVNQVgsCisgICAgICAgIFBESUZGLAorICAgICAg ICBVSVBUUiwKKyAgICAgICAgREJMLAorICAgICAgICBMREJMLAorICAgICAgICBNQVhUWVBFCit9 OworCitzdGF0aWMgY29uc3Qgc2hvcnQgcGFfdHlwZXNbTUFYVFlQRV0gPSB7CisgICAgICAgIFtO T05FXSAgID0gUEFfSU5ULAorICAgICAgICBbUFRSXSAgICA9IFBBX1BPSU5URVIsCisgICAgICAg IFtJTlRdICAgID0gUEFfSU5ULAorICAgICAgICBbVUlOVF0gICA9IFBBX0lOVCwKKyAgICAgICAg W1VMTE9OR10gPSBQQV9JTlQgfCBQQV9GTEFHX0xPTkdfTE9ORywKKyAgICAgICAgW0xPTkddICAg PSBQQV9JTlQgfCBQQV9GTEFHX0xPTkcsCisgICAgICAgIFtVTE9OR10gID0gUEFfSU5UIHwgUEFf RkxBR19MT05HLAorICAgICAgICBbU0hPUlRdICA9IFBBX0lOVCB8IFBBX0ZMQUdfU0hPUlQsCisg ICAgICAgIFtVU0hPUlRdID0gUEFfSU5UIHwgUEFfRkxBR19TSE9SVCwKKyAgICAgICAgW0NIQVJd ICAgPSBQQV9DSEFSLAorICAgICAgICBbVUNIQVJdICA9IFBBX0NIQVIsCisgICAgICAgIFtMTE9O R10gID0gUEFfSU5UIHwgUEFfRkxBR19MT05HX0xPTkcsCisgICAgICAgIFtTSVpFVF0gID0gUEFf SU5UIHwgUEFfRkxBR19MT05HLAorICAgICAgICBbSU1BWF0gICA9IFBBX0lOVCB8IFBBX0ZMQUdf TE9OR19MT05HLAorICAgICAgICBbVU1BWF0gICA9IFBBX0lOVCB8IFBBX0ZMQUdfTE9OR19MT05H LAorICAgICAgICBbUERJRkZdICA9IFBBX0lOVCB8IFBBX0ZMQUdfTE9OR19MT05HLAorICAgICAg ICBbVUlQVFJdICA9IFBBX0lOVCB8IFBBX0ZMQUdfTE9ORywKKyAgICAgICAgW0RCTF0gICAgPSBQ QV9ET1VCTEUsCisgICAgICAgIFtMREJMXSAgID0gUEFfRE9VQkxFIHwgUEFfRkxBR19MT05HX0RP VUJMRQorfTsKKworI2RlZmluZSBTKHgpIFsoeCktJ0EnXQorI2RlZmluZSBFKHgpIChTVE9QICsg KHgpKQorCitzdGF0aWMgY29uc3QgdW5zaWduZWQgY2hhciBzdGF0ZXNbXVsneictJ0EnKzFdID0g eworICAgICAgICB7IC8qIDA6IGJhcmUgdHlwZXMgKi8KKyAgICAgICAgICAgICAgICBTKCdkJykg PSBFKElOVCksIFMoJ2knKSA9IEUoSU5UKSwKKyAgICAgICAgICAgICAgICBTKCdvJykgPSBFKFVJ TlQpLFMoJ3UnKSA9IEUoVUlOVCksUygneCcpID0gRShVSU5UKSwgUygnWCcpID0gRShVSU5UKSwK KyAgICAgICAgICAgICAgICBTKCdlJykgPSBFKERCTCksIFMoJ2YnKSA9IEUoREJMKSwgUygnZycp ID0gRShEQkwpLCAgUygnYScpID0gRShEQkwpLAorICAgICAgICAgICAgICAgIFMoJ0UnKSA9IEUo REJMKSwgUygnRicpID0gRShEQkwpLCBTKCdHJykgPSBFKERCTCksICBTKCdBJykgPSBFKERCTCks CisgICAgICAgICAgICAgICAgUygnYycpID0gRShDSEFSKSxTKCdDJykgPSBFKElOVCksCisgICAg ICAgICAgICAgICAgUygncycpID0gRShQVFIpLCBTKCdTJykgPSBFKFBUUiksIFMoJ3AnKSA9IEUo VUlQVFIpLFMoJ24nKSA9IEUoUFRSKSwKKyAgICAgICAgICAgICAgICBTKCdtJykgPSBFKE5PTkUp LAorICAgICAgICAgICAgICAgIFMoJ2wnKSA9IExQUkUsICAgUygnaCcpID0gSFBSRSwgUygnTCcp ID0gQklHTFBSRSwKKyAgICAgICAgICAgICAgICBTKCd6JykgPSBaVFBSRSwgIFMoJ2onKSA9IEpQ UkUsIFMoJ3QnKSA9IFpUUFJFCisgICAgICAgIH0sIHsgLyogMTogbC1wcmVmaXhlZCAqLworICAg ICAgICAgICAgICAgIFMoJ2QnKSA9IEUoTE9ORyksIFMoJ2knKSA9IEUoTE9ORyksCisgICAgICAg ICAgICAgICAgUygnbycpID0gRShVTE9ORyksUygndScpID0gRShVTE9ORyksUygneCcpID0gRShV TE9ORyksUygnWCcpID0gRShVTE9ORyksCisgICAgICAgICAgICAgICAgUygnZScpID0gRShEQkwp LCAgUygnZicpID0gRShEQkwpLCAgUygnZycpID0gRShEQkwpLCAgUygnYScpID0gRShEQkwpLAor ICAgICAgICAgICAgICAgIFMoJ0UnKSA9IEUoREJMKSwgIFMoJ0YnKSA9IEUoREJMKSwgIFMoJ0cn KSA9IEUoREJMKSwgIFMoJ0EnKSA9IEUoREJMKSwKKyAgICAgICAgICAgICAgICBTKCdjJykgPSBF KElOVCksICBTKCdzJykgPSBFKFBUUiksICBTKCduJykgPSBFKFBUUiksCisgICAgICAgICAgICAg ICAgUygnbCcpID0gTExQUkUKKyAgICAgICAgfSwgeyAvKiAyOiBsbC1wcmVmaXhlZCAqLworICAg ICAgICAgICAgICAgIFMoJ2QnKSA9IEUoTExPTkcpLCBTKCdpJykgPSBFKExMT05HKSwKKyAgICAg ICAgICAgICAgICBTKCdvJykgPSBFKFVMTE9ORyksUygndScpID0gRShVTExPTkcpLAorICAgICAg ICAgICAgICAgIFMoJ3gnKSA9IEUoVUxMT05HKSxTKCdYJykgPSBFKFVMTE9ORyksCisgICAgICAg ICAgICAgICAgUygnbicpID0gRShQVFIpCisgICAgICAgIH0sIHsgLyogMzogaC1wcmVmaXhlZCAq LworICAgICAgICAgICAgICAgIFMoJ2QnKSA9IEUoU0hPUlQpLCBTKCdpJykgPSBFKFNIT1JUKSwK KyAgICAgICAgICAgICAgICBTKCdvJykgPSBFKFVTSE9SVCksUygndScpID0gRShVU0hPUlQpLAor ICAgICAgICAgICAgICAgIFMoJ3gnKSA9IEUoVVNIT1JUKSxTKCdYJykgPSBFKFVTSE9SVCksCisg ICAgICAgICAgICAgICAgUygnbicpID0gRShQVFIpLAorICAgICAgICAgICAgICAgIFMoJ2gnKSA9 IEhIUFJFCisgICAgICAgIH0sIHsgLyogNDogaGgtcHJlZml4ZWQgKi8KKyAgICAgICAgICAgICAg ICBTKCdkJykgPSBFKENIQVIpLCBTKCdpJykgPSBFKENIQVIpLAorICAgICAgICAgICAgICAgIFMo J28nKSA9IEUoVUNIQVIpLFMoJ3UnKSA9IEUoVUNIQVIpLAorICAgICAgICAgICAgICAgIFMoJ3gn KSA9IEUoVUNIQVIpLFMoJ1gnKSA9IEUoVUNIQVIpLAorICAgICAgICAgICAgICAgIFMoJ24nKSA9 IEUoUFRSKQorICAgICAgICB9LCB7IC8qIDU6IEwtcHJlZml4ZWQgKi8KKyAgICAgICAgICAgICAg ICBTKCdlJykgPSBFKExEQkwpLFMoJ2YnKSA9IEUoTERCTCksUygnZycpID0gRShMREJMKSwgUygn YScpID0gRShMREJMKSwKKyAgICAgICAgICAgICAgICBTKCdFJykgPSBFKExEQkwpLFMoJ0YnKSA9 IEUoTERCTCksUygnRycpID0gRShMREJMKSwgUygnQScpID0gRShMREJMKSwKKyAgICAgICAgICAg ICAgICBTKCduJykgPSBFKFBUUikKKyAgICAgICAgfSwgeyAvKiA2OiB6LSBvciB0LXByZWZpeGVk IChhc3N1bWVkIHRvIGJlIHNhbWUgc2l6ZSkgKi8KKyAgICAgICAgICAgICAgICBTKCdkJykgPSBF KFBESUZGKSxTKCdpJykgPSBFKFBESUZGKSwKKyAgICAgICAgICAgICAgICBTKCdvJykgPSBFKFNJ WkVUKSxTKCd1JykgPSBFKFNJWkVUKSwKKyAgICAgICAgICAgICAgICBTKCd4JykgPSBFKFNJWkVU KSxTKCdYJykgPSBFKFNJWkVUKSwKKyAgICAgICAgICAgICAgICBTKCduJykgPSBFKFBUUikKKyAg ICAgICAgfSwgeyAvKiA3OiBqLXByZWZpeGVkICovCisgICAgICAgICAgICAgICAgUygnZCcpID0g RShJTUFYKSwgUygnaScpID0gRShJTUFYKSwKKyAgICAgICAgICAgICAgICBTKCdvJykgPSBFKFVN QVgpLCBTKCd1JykgPSBFKFVNQVgpLAorICAgICAgICAgICAgICAgIFMoJ3gnKSA9IEUoVU1BWCks IFMoJ1gnKSA9IEUoVU1BWCksCisgICAgICAgICAgICAgICAgUygnbicpID0gRShQVFIpCisgICAg ICAgIH0KK307CisKK3NpemVfdCBwYXJzZV9wcmludGZfZm9ybWF0KGNvbnN0IGNoYXIgKmZtdCwg c2l6ZV90IG4sIGludCAqdHlwZXMpCit7CisgICAgICAgIHNpemVfdCBpID0gMDsKKyAgICAgICAg c2l6ZV90IGxhc3QgPSAwOworCisgICAgICAgIG1lbXNldCh0eXBlcywgMCwgbik7CisKKyAgICAg ICAgd2hpbGUgKDEpIHsKKyAgICAgICAgICAgICAgICBzaXplX3QgYXJnOworICAgICAgICAgICAg ICAgIHVuc2lnbmVkIGludCBzdGF0ZTsKKworICAgICAgICAgICAgICAgIGZtdCA9IGNvbnN1bWVf bm9uYXJnKGZtdCk7CisgICAgICAgICAgICAgICAgaWYgKCpmbXQgPT0gJ1wwJykKKyAgICAgICAg ICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgIGlmICgqZm10ID09ICclJykg eworICAgICAgICAgICAgICAgICAgICAgICAgZm10Kys7CisgICAgICAgICAgICAgICAgICAgICAg ICBjb250aW51ZTsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgYXJnID0gMDsK KyAgICAgICAgICAgICAgICBmbXQgPSBjb25zdW1lX2FyZ24oZm10LCAmYXJnKTsKKyAgICAgICAg ICAgICAgICAvKiBmbGFncyAqLworICAgICAgICAgICAgICAgIGZtdCA9IGNvbnN1bWVfZmxhZ3Mo Zm10KTsKKyAgICAgICAgICAgICAgICAvKiB3aWR0aCAqLworICAgICAgICAgICAgICAgIGlmICgq Zm10ID09ICcqJykgeworICAgICAgICAgICAgICAgICAgICAgICAgc2l6ZV90IHdhcmcgPSAwOwor ICAgICAgICAgICAgICAgICAgICAgICAgZm10ID0gY29uc3VtZV9hcmduKGZtdCsxLCAmd2FyZyk7 CisgICAgICAgICAgICAgICAgICAgICAgICBpZiAod2FyZyA9PSAwKQorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICB3YXJnID0gKytpOworICAgICAgICAgICAgICAgICAgICAgICAgaWYg KHdhcmcgPiBsYXN0KQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBsYXN0ID0gd2Fy ZzsKKyAgICAgICAgICAgICAgICAgICAgICAgIGlmICh3YXJnIDw9IG4gJiYgdHlwZXNbd2FyZy0x XSA9PSBOT05FKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0eXBlc1t3YXJnLTFd ID0gSU5UOworICAgICAgICAgICAgICAgIH0gZWxzZQorICAgICAgICAgICAgICAgICAgICAgICAg Zm10ID0gY29uc3VtZV9udW0oZm10KTsKKyAgICAgICAgICAgICAgICAvKiBwcmVjaXNpb24gKi8K KyAgICAgICAgICAgICAgICBpZiAoKmZtdCA9PSAnLicpIHsKKyAgICAgICAgICAgICAgICAgICAg ICAgIGZtdCsrOworICAgICAgICAgICAgICAgICAgICAgICAgaWYgKCpmbXQgPT0gJyonKSB7Cisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNpemVfdCBwYXJnID0gMDsKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgZm10ID0gY29uc3VtZV9hcmduKGZtdCsxLCAmcGFyZyk7 CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChwYXJnID09IDApCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGFyZyA9ICsraTsKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgaWYgKHBhcmcgPiBsYXN0KQorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGxhc3QgPSBwYXJnOworICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBpZiAocGFyZyA8PSBuICYmIHR5cGVzW3BhcmctMV0gPT0gTk9ORSkKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0eXBlc1twYXJnLTFdID0gSU5UOwor ICAgICAgICAgICAgICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgaWYgKCpmbXQgPT0gJy0nKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGZtdCsrOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBmbXQgPSBj b25zdW1lX251bShmbXQpOworICAgICAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAg ICAgIH0KKyAgICAgICAgICAgICAgICAvKiBsZW5ndGggbW9kaWZpZXIgYW5kIGNvbnZlcnNpb24g c3BlY2lmaWVyICovCisgICAgICAgICAgICAgICAgc3RhdGUgPSBCQVJFOworICAgICAgICAgICAg ICAgIGRvIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGNoYXIgYyA9ICpmbXQr KzsKKworICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGMgPCAnQScgfHwgYyA+ICd6JykKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICAgICAg ICAgICAgICBzdGF0ZSA9IHN0YXRlc1tzdGF0ZV1TKGMpOworICAgICAgICAgICAgICAgICAgICAg ICAgaWYgKHN0YXRlID09IDApCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnRp bnVlOworICAgICAgICAgICAgICAgIH0gd2hpbGUgKHN0YXRlIDwgU1RPUCk7CisKKyAgICAgICAg ICAgICAgICBpZiAoc3RhdGUgPT0gRShOT05FKSkKKyAgICAgICAgICAgICAgICAgICAgICAgIGNv bnRpbnVlOworCisgICAgICAgICAgICAgICAgaWYgKGFyZyA9PSAwKQorICAgICAgICAgICAgICAg ICAgICAgICAgYXJnID0gKytpOworICAgICAgICAgICAgICAgIGlmIChhcmcgPiBsYXN0KQorICAg ICAgICAgICAgICAgICAgICAgICAgbGFzdCA9IGFyZzsKKyAgICAgICAgICAgICAgICBpZiAoYXJn IDw9IG4pCisgICAgICAgICAgICAgICAgICAgICAgICB0eXBlc1thcmctMV0gPSBzdGF0ZSAtIFNU T1A7CisgICAgICAgIH0KKworICAgICAgICBpZiAobGFzdCA+IG4pCisgICAgICAgICAgICAgICAg bGFzdCA9IG47CisgICAgICAgIGZvciAoaSA9IDA7IGkgPCBsYXN0OyBpKyspCisgICAgICAgICAg ICAgICAgdHlwZXNbaV0gPSBwYV90eXBlc1t0eXBlc1tpXV07CisKKyAgICAgICAgcmV0dXJuIGxh c3Q7Cit9Ci0tLSAvZGV2L251bGwKKysrIGIvaW5jbHVkZS9wcmludGYuaApAQCAtMCwwICsxLDQx IEBACisvKioqCisgIENvcHlyaWdodCAyMDE0IEVtaWwgUmVubmVyIEJlcnRoaW5nCisgIFdpdGgg cGFydHMgZnJvbSB0aGUgR05VIEMgTGlicmFyeQorICBDb3B5cmlnaHQgMTk5MS0yMDE0IEZyZWUg U29mdHdhcmUgRm91bmRhdGlvbiwgSW5jLgorCisgIFRoaXMgZmlsZSBpcyBmcmVlIHNvZnR3YXJl OyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IgbW9kaWZ5IGl0CisgIHVuZGVyIHRoZSB0 ZXJtcyBvZiB0aGUgR05VIExlc3NlciBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGFzIHB1Ymxpc2hl ZCBieQorICB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uOyBlaXRoZXIgdmVyc2lvbiAyLjEg b2YgdGhlIExpY2Vuc2UsIG9yCisgIChhdCB5b3VyIG9wdGlvbikgYW55IGxhdGVyIHZlcnNpb24u CisKKyAgVGhpcyBmaWxlIGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3BlIHRoYXQgaXQgd2lsbCBi ZSB1c2VmdWwsIGJ1dAorICBXSVRIT1VUIEFOWSBXQVJSQU5UWTsgd2l0aG91dCBldmVuIHRoZSBp bXBsaWVkIHdhcnJhbnR5IG9mCisgIE1FUkNIQU5UQUJJTElUWSBvciBGSVRORVNTIEZPUiBBIFBB UlRJQ1VMQVIgUFVSUE9TRS4gU2VlIHRoZSBHTlUKKyAgTGVzc2VyIEdlbmVyYWwgUHVibGljIExp Y2Vuc2UgZm9yIG1vcmUgZGV0YWlscy4KKyoqKi8KKworI3ByYWdtYSBvbmNlCisKKyNpbmNsdWRl IDxzdGRkZWYuaD4KKworZW51bSB7CQkJCS8qIEMgdHlwZTogKi8KKyAgUEFfSU5ULAkJCS8qIGlu dCAqLworICBQQV9DSEFSLAkJCS8qIGludCwgY2FzdCB0byBjaGFyICovCisgIFBBX1dDSEFSLAkJ CS8qIHdpZGUgY2hhciAqLworICBQQV9TVFJJTkcsCQkJLyogY29uc3QgY2hhciAqLCBhICdcMCct dGVybWluYXRlZCBzdHJpbmcgKi8KKyAgUEFfV1NUUklORywJCQkvKiBjb25zdCB3Y2hhcl90ICos IHdpZGUgY2hhcmFjdGVyIHN0cmluZyAqLworICBQQV9QT0lOVEVSLAkJCS8qIHZvaWQgKiAqLwor ICBQQV9GTE9BVCwJCQkvKiBmbG9hdCAqLworICBQQV9ET1VCTEUsCQkJLyogZG91YmxlICovCisg IFBBX0xBU1QKK307CisKKy8qIEZsYWcgYml0cyB0aGF0IGNhbiBiZSBzZXQgaW4gYSB0eXBlIHJl dHVybmVkIGJ5IGBwYXJzZV9wcmludGZfZm9ybWF0Jy4gICovCisjZGVmaW5lCVBBX0ZMQUdfTUFT SwkJMHhmZjAwCisjZGVmaW5lCVBBX0ZMQUdfTE9OR19MT05HCSgxIDw8IDgpCisjZGVmaW5lCVBB X0ZMQUdfTE9OR19ET1VCTEUJUEFfRkxBR19MT05HX0xPTkcKKyNkZWZpbmUJUEFfRkxBR19MT05H CQkoMSA8PCA5KQorI2RlZmluZQlQQV9GTEFHX1NIT1JUCQkoMSA8PCAxMCkKKyNkZWZpbmUJUEFf RkxBR19QVFIJCSgxIDw8IDExKQorCitzaXplX3QgcGFyc2VfcHJpbnRmX2Zvcm1hdChjb25zdCBj aGFyICpmbXQsIHNpemVfdCBuLCBpbnQgKnR5cGVzKTsK --mix-1cb18e91:2f2a439e Content-Type: text/x-patch; name="qsort_r.patch" Content-Disposition: attachment; filename="qsort_r.patch" Content-Transfer-Encoding: base64 LS0tIGEvaW5jbHVkZS9zdGRsaWIuaAorKysgYi9pbmNsdWRlL3N0ZGxpYi5oCkBAIC01MiwxMCAr NTIsMTMgQEAKIGNoYXIgKmdldGVudiAoY29uc3QgY2hhciAqKTsKIAogaW50IHN5c3RlbSAoY29u c3QgY2hhciAqKTsKIAordHlwZWRlZiBpbnQgKCpfX2NvbXBhcl9mbl90KShjb25zdCB2b2lkICos IGNvbnN0IHZvaWQgKik7Cit0eXBlZGVmIGludCAoKmNvbXBhcmlzb25fZm5fdCkoY29uc3Qgdm9p ZCAqLCBjb25zdCB2b2lkICopOwogdm9pZCAqYnNlYXJjaCAoY29uc3Qgdm9pZCAqLCBjb25zdCB2 b2lkICosIHNpemVfdCwgc2l6ZV90LCBpbnQgKCopKGNvbnN0IHZvaWQgKiwgY29uc3Qgdm9pZCAq KSk7CiB2b2lkIHFzb3J0ICh2b2lkICosIHNpemVfdCwgc2l6ZV90LCBpbnQgKCopKGNvbnN0IHZv aWQgKiwgY29uc3Qgdm9pZCAqKSk7Cit2b2lkIHFzb3J0X3IgKHZvaWQgKiwgc2l6ZV90LCBzaXpl X3QsIGludCAoKikoY29uc3Qgdm9pZCAqLCBjb25zdCB2b2lkICosIHZvaWQgKiksIHZvaWQgKik7 CiAKIGludCBhYnMgKGludCk7CiBsb25nIGxhYnMgKGxvbmcpOwogbG9uZyBsb25nIGxsYWJzIChs b25nIGxvbmcpOwotLS0gYS9zcmMvc3RkbGliL3Fzb3J0LmMJMjAxNy0wMS0wMSAwNDoyNzoxNy4w MDAwMDAwMDAgKzAxMDAKKysrIGIvc3JjL3N0ZGxpYi9xc29ydC5jCTIwMTctMDEtMjkgMDA6MjE6 MjcuMTk0ODg3MDkxICswMTAwCkBAIC0yOCw3ICsyOCw3IEBACiAjaW5jbHVkZSAiYXRvbWljLmgi CiAjZGVmaW5lIG50eih4KSBhX2N0el9sKCh4KSkKIAotdHlwZWRlZiBpbnQgKCpjbXBmdW4pKGNv bnN0IHZvaWQgKiwgY29uc3Qgdm9pZCAqKTsKK3R5cGVkZWYgaW50ICgqY21wZnVuKShjb25zdCB2 b2lkICosIGNvbnN0IHZvaWQgKiwgdm9pZCAqKTsKIAogc3RhdGljIGlubGluZSBpbnQgcG50eihz aXplX3QgcFsyXSkgewogCWludCByID0gbnR6KHBbMF0gLSAxKTsKQEAgLTg1LDcgKzg1LDcgQEAK IAlwWzFdID4+PSBuOwogfQogCi1zdGF0aWMgdm9pZCBzaWZ0KHVuc2lnbmVkIGNoYXIgKmhlYWQs IHNpemVfdCB3aWR0aCwgY21wZnVuIGNtcCwgaW50IHBzaGlmdCwgc2l6ZV90IGxwW10pCitzdGF0 aWMgdm9pZCBzaWZ0KHVuc2lnbmVkIGNoYXIgKmhlYWQsIHNpemVfdCB3aWR0aCwgY21wZnVuIGNt cCwgdm9pZCogYXJnLCBpbnQgcHNoaWZ0LCBzaXplX3QgbHBbXSkKIHsKIAl1bnNpZ25lZCBjaGFy ICpydCwgKmxmOwogCXVuc2lnbmVkIGNoYXIgKmFyWzE0ICogc2l6ZW9mKHNpemVfdCkgKyAxXTsK QEAgLTk2LDEwICs5NiwxMCBAQAogCQlydCA9IGhlYWQgLSB3aWR0aDsKIAkJbGYgPSBoZWFkIC0g d2lkdGggLSBscFtwc2hpZnQgLSAyXTsKIAotCQlpZigoKmNtcCkoYXJbMF0sIGxmKSA+PSAwICYm ICgqY21wKShhclswXSwgcnQpID49IDApIHsKKwkJaWYoKCpjbXApKGFyWzBdLCBsZiwgYXJnKSA+ PSAwICYmICgqY21wKShhclswXSwgcnQsIGFyZykgPj0gMCkgewogCQkJYnJlYWs7CiAJCX0KLQkJ aWYoKCpjbXApKGxmLCBydCkgPj0gMCkgeworCQlpZigoKmNtcCkobGYsIHJ0LCBhcmcpID49IDAp IHsKIAkJCWFyW2krK10gPSBsZjsKIAkJCWhlYWQgPSBsZjsKIAkJCXBzaGlmdCAtPSAxOwpAQCAt MTEyLDcgKzExMiw3IEBACiAJY3ljbGUod2lkdGgsIGFyLCBpKTsKIH0KIAotc3RhdGljIHZvaWQg dHJpbmtsZSh1bnNpZ25lZCBjaGFyICpoZWFkLCBzaXplX3Qgd2lkdGgsIGNtcGZ1biBjbXAsIHNp emVfdCBwcFsyXSwgaW50IHBzaGlmdCwgaW50IHRydXN0eSwgc2l6ZV90IGxwW10pCitzdGF0aWMg dm9pZCB0cmlua2xlKHVuc2lnbmVkIGNoYXIgKmhlYWQsIHNpemVfdCB3aWR0aCwgY21wZnVuIGNt cCwgdm9pZCogYXJnLCBzaXplX3QgcHBbMl0sIGludCBwc2hpZnQsIGludCB0cnVzdHksIHNpemVf dCBscFtdKQogewogCXVuc2lnbmVkIGNoYXIgKnN0ZXBzb24sCiAJICAgICAgICAgICAgICAqcnQs ICpsZjsKQEAgLTEyNywxMyArMTI3LDEzIEBACiAJYXJbMF0gPSBoZWFkOwogCXdoaWxlKHBbMF0g IT0gMSB8fCBwWzFdICE9IDApIHsKIAkJc3RlcHNvbiA9IGhlYWQgLSBscFtwc2hpZnRdOwotCQlp ZigoKmNtcCkoc3RlcHNvbiwgYXJbMF0pIDw9IDApIHsKKwkJaWYoKCpjbXApKHN0ZXBzb24sIGFy WzBdLCBhcmcpIDw9IDApIHsKIAkJCWJyZWFrOwogCQl9CiAJCWlmKCF0cnVzdHkgJiYgcHNoaWZ0 ID4gMSkgewogCQkJcnQgPSBoZWFkIC0gd2lkdGg7CiAJCQlsZiA9IGhlYWQgLSB3aWR0aCAtIGxw W3BzaGlmdCAtIDJdOwotCQkJaWYoKCpjbXApKHJ0LCBzdGVwc29uKSA+PSAwIHx8ICgqY21wKShs Ziwgc3RlcHNvbikgPj0gMCkgeworCQkJaWYoKCpjbXApKHJ0LCBzdGVwc29uLCBhcmcpID49IDAg fHwgKCpjbXApKGxmLCBzdGVwc29uLCBhcmcpID49IDApIHsKIAkJCQlicmVhazsKIAkJCX0KIAkJ fQpAQCAtMTQ3LDExICsxNDcsMTEgQEAKIAl9CiAJaWYoIXRydXN0eSkgewogCQljeWNsZSh3aWR0 aCwgYXIsIGkpOwotCQlzaWZ0KGhlYWQsIHdpZHRoLCBjbXAsIHBzaGlmdCwgbHApOworCQlzaWZ0 KGhlYWQsIHdpZHRoLCBjbXAsIGFyZywgcHNoaWZ0LCBscCk7CiAJfQogfQogCi12b2lkIHFzb3J0 KHZvaWQgKmJhc2UsIHNpemVfdCBuZWwsIHNpemVfdCB3aWR0aCwgY21wZnVuIGNtcCkKK3ZvaWQg cXNvcnRfcih2b2lkICpiYXNlLCBzaXplX3QgbmVsLCBzaXplX3Qgd2lkdGgsIGNtcGZ1biBjbXAs IHZvaWQqIGFyZykKIHsKIAlzaXplX3QgbHBbMTIqc2l6ZW9mKHNpemVfdCldOwogCXNpemVfdCBp LCBzaXplID0gd2lkdGggKiBuZWw7CkBAIC0xNzAsMTQgKzE3MCwxNCBAQAogCiAJd2hpbGUoaGVh ZCA8IGhpZ2gpIHsKIAkJaWYoKHBbMF0gJiAzKSA9PSAzKSB7Ci0JCQlzaWZ0KGhlYWQsIHdpZHRo LCBjbXAsIHBzaGlmdCwgbHApOworCQkJc2lmdChoZWFkLCB3aWR0aCwgY21wLCBhcmcsIHBzaGlm dCwgbHApOwogCQkJc2hyKHAsIDIpOwogCQkJcHNoaWZ0ICs9IDI7CiAJCX0gZWxzZSB7CiAJCQlp ZihscFtwc2hpZnQgLSAxXSA+PSBoaWdoIC0gaGVhZCkgewotCQkJCXRyaW5rbGUoaGVhZCwgd2lk dGgsIGNtcCwgcCwgcHNoaWZ0LCAwLCBscCk7CisJCQkJdHJpbmtsZShoZWFkLCB3aWR0aCwgY21w LCBhcmcsIHAsIHBzaGlmdCwgMCwgbHApOwogCQkJfSBlbHNlIHsKLQkJCQlzaWZ0KGhlYWQsIHdp ZHRoLCBjbXAsIHBzaGlmdCwgbHApOworCQkJCXNpZnQoaGVhZCwgd2lkdGgsIGNtcCwgYXJnLCBw c2hpZnQsIGxwKTsKIAkJCX0KIAkJCQogCQkJaWYocHNoaWZ0ID09IDEpIHsKQEAgLTE5Myw3ICsx OTMsNyBAQAogCQloZWFkICs9IHdpZHRoOwogCX0KIAotCXRyaW5rbGUoaGVhZCwgd2lkdGgsIGNt cCwgcCwgcHNoaWZ0LCAwLCBscCk7CisJdHJpbmtsZShoZWFkLCB3aWR0aCwgY21wLCBhcmcsIHAs IHBzaGlmdCwgMCwgbHApOwogCiAJd2hpbGUocHNoaWZ0ICE9IDEgfHwgcFswXSAhPSAxIHx8IHBb MV0gIT0gMCkgewogCQlpZihwc2hpZnQgPD0gMSkgewpAQCAtMjA1LDExICsyMDUsMTYgQEAKIAkJ CXBzaGlmdCAtPSAyOwogCQkJcFswXSBePSA3OwogCQkJc2hyKHAsIDEpOwotCQkJdHJpbmtsZSho ZWFkIC0gbHBbcHNoaWZ0XSAtIHdpZHRoLCB3aWR0aCwgY21wLCBwLCBwc2hpZnQgKyAxLCAxLCBs cCk7CisJCQl0cmlua2xlKGhlYWQgLSBscFtwc2hpZnRdIC0gd2lkdGgsIHdpZHRoLCBjbXAsIGFy ZywgcCwgcHNoaWZ0ICsgMSwgMSwgbHApOwogCQkJc2hsKHAsIDEpOwogCQkJcFswXSB8PSAxOwot CQkJdHJpbmtsZShoZWFkIC0gd2lkdGgsIHdpZHRoLCBjbXAsIHAsIHBzaGlmdCwgMSwgbHApOwor CQkJdHJpbmtsZShoZWFkIC0gd2lkdGgsIHdpZHRoLCBjbXAsIGFyZywgcCwgcHNoaWZ0LCAxLCBs cCk7CiAJCX0KIAkJaGVhZCAtPSB3aWR0aDsKIAl9CiB9CisKK3ZvaWQgcXNvcnQodm9pZCAqYmFz ZSwgc2l6ZV90IG5lbCwgc2l6ZV90IHdpZHRoLCBpbnQgKCpjbXApKGNvbnN0IHZvaWQgKiwgY29u c3Qgdm9pZCAqKSkKK3sKKwlyZXR1cm4gcXNvcnRfciAoYmFzZSwgbmVsLCB3aWR0aCwgKGNtcGZ1 biljbXAsIE5VTEwpOworfQo= --mix-1cb18e91:2f2a439e Content-Type: text/x-patch; name="secure_getenv.patch" Content-Disposition: attachment; filename="secure_getenv.patch" Content-Transfer-Encoding: base64 LS0tIGEvaW5jbHVkZS9zdGRsaWIuaAorKysgYi9pbmNsdWRlL3N0ZGxpYi5oCkBAIC01MCw3ICs1 MCw4IEBACiBpbnQgYXRfcXVpY2tfZXhpdCAodm9pZCAoKikgKHZvaWQpKTsKIF9Ob3JldHVybiB2 b2lkIHF1aWNrX2V4aXQgKGludCk7CiAKIGNoYXIgKmdldGVudiAoY29uc3QgY2hhciAqKTsKK2No YXIgKnNlY3VyZV9nZXRlbnYgKGNvbnN0IGNoYXIgKik7CiAKIGludCBzeXN0ZW0gKGNvbnN0IGNo YXIgKik7CiAKLS0tIC9kZXYvbnVsbAorKysgYi9zcmMvZW52L3NlY3VyZV9nZXRlbnYuYwpAQCAt MCwwICsxLDggQEAKKyNkZWZpbmUgX0RFRkFVTFRfU09VUkNFIDEKKyNpbmNsdWRlIDxzdGRsaWIu aD4KKyNpbmNsdWRlIDx1bmlzdGQuaD4KKworY2hhciAqc2VjdXJlX2dldGVudihjb25zdCBjaGFy ICpuYW1lKQoreworCXJldHVybiBpc3NldHVnaWQoKSA/IE5VTEwgOiBnZXRlbnYobmFtZSk7Cit9 Cg== --mix-1cb18e91:2f2a439e Content-Type: text/x-patch; name="strndupa.patch" Content-Disposition: attachment; filename="strndupa.patch" Content-Transfer-Encoding: base64 LS0tIGEvaW5jbHVkZS9zdHJpbmcuaAorKysgYi9pbmNsdWRlL3N0cmluZy5oCkBAIC04NSw3ICs4 NSwyMSBAQAogI2VuZGlmCiAKICNpZmRlZiBfR05VX1NPVVJDRQotI2RlZmluZQlzdHJkdXBhKHgp CXN0cmNweShhbGxvY2Eoc3RybGVuKHgpKzEpLHgpCisjaWZkZWYgX19HTlVDX18KKyNkZWZpbmUg c3RyZHVwYSh4KQkoX19leHRlbnNpb25fXyh7IFwKKwkJCWNvbnN0IGNoYXIqIF9fb2xkID0gKHgp OyBcCisJCQlzaXplX3QgX19sZW4gPSBzdHJsZW4oeCkgKyAxOyBcCisJCQljaGFyKiBfX25ldyA9 IChjaGFyKilhbGxvY2EoX19sZW4pOyBcCisJCQkoY2hhciopbWVtY3B5KF9fbmV3LCBfX29sZCwg X19sZW4pOyBcCisJCQl9KSkKKyNkZWZpbmUgc3RybmR1cGEoeCx5KQkoX19leHRlbnNpb25fXyh7 IFwKKwkJCWNvbnN0IGNoYXIqIF9fb2xkID0gKHgpOyBcCisJCQlzaXplX3QgX19sZW4gPSBzdHJu bGVuKHgsICh5KSk7IFwKKwkJCWNoYXIqIF9fbmV3ID0gKGNoYXIqKWFsbG9jYShfX2xlbiArIDEp OyBcCisJCQlfX25ld1tfX2xlbl0gPSAwOyBcCisJCQkoY2hhciopbWVtY3B5KF9fbmV3LCBfX29s ZCwgX19sZW4pOyBcCisJCQl9KSkKKyNlbmRpZgogaW50IHN0cnZlcnNjbXAgKGNvbnN0IGNoYXIg KiwgY29uc3QgY2hhciAqKTsKIGludCBzdHJjYXNlY21wX2wgKGNvbnN0IGNoYXIgKiwgY29uc3Qg Y2hhciAqLCBsb2NhbGVfdCk7CiBpbnQgc3RybmNhc2VjbXBfbCAoY29uc3QgY2hhciAqLCBjb25z dCBjaGFyICosIHNpemVfdCwgbG9jYWxlX3QpOwo= --mix-1cb18e91:2f2a439e Content-Type: text/x-patch; name="utmpx.h.patch" Content-Disposition: attachment; filename="utmpx.h.patch" Content-Transfer-Encoding: base64 LS0tIGEvaW5jbHVkZS91dG1weC5oCisrKyBiL2luY2x1ZGUvdXRtcHguaApAQCAtNTUsNiArNTUs MTIgQEAKICNkZWZpbmUgVVNFUl9QUk9DRVNTICAgIDcKICNkZWZpbmUgREVBRF9QUk9DRVNTICAg IDgKIAorCisjaWZkZWYgX0dOVV9TT1VSQ0UKKyNkZWZpbmUgX1BBVEhfVVRNUFggIi9kZXYvbnVs bC91dG1wIgorI2RlZmluZSBfUEFUSF9XVE1QWCAiL2Rldi9udWxsL3d0bXAiCisjZW5kaWYKKwog I2lmZGVmIF9fY3BsdXNwbHVzCiB9CiAjZW5kaWYK --mix-1cb18e91:2f2a439e Content-Type: text/x-patch; name="stub_macros.patch" Content-Disposition: attachment; filename="stub_macros.patch" Content-Transfer-Encoding: base64 ZGVmaW5lIHVuaW1wbGVtZW50ZWQgbWFjcm9zIHRvIDAgc28gdGhhdCBzeXN0ZW1kIGNvbXBpbGVz Ci0tLSBhL2luY2x1ZGUvZ2xvYi5oCisrKyBiL2luY2x1ZGUvZ2xvYi5oCkBAIC0yMiw2ICsyMiw3 IEBACiBpbnQgIGdsb2IoY29uc3QgY2hhciAqX19yZXN0cmljdCwgaW50LCBpbnQgKCopKGNvbnN0 IGNoYXIgKiwgaW50KSwgZ2xvYl90ICpfX3Jlc3RyaWN0KTsKIHZvaWQgZ2xvYmZyZWUoZ2xvYl90 ICopOwogCisjZGVmaW5lIEdMT0JfQlJBQ0UgMAogI2RlZmluZSBHTE9CX0VSUiAgICAgIDB4MDEK ICNkZWZpbmUgR0xPQl9NQVJLICAgICAweDAyCiAjZGVmaW5lIEdMT0JfTk9TT1JUICAgMHgwNAot LS0gYS9pbmNsdWRlL3JlZ2V4LmgKKysrIGIvaW5jbHVkZS9yZWdleC5oCkBAIC0zMSw2ICszMSw3 IEBACiAKICNkZWZpbmUgUkVHX05PVEJPTCAgICAgIDEKICNkZWZpbmUgUkVHX05PVEVPTCAgICAg IDIKKyNkZWZpbmUgUkVHX1NUQVJURU5EICAgIDAKIAogI2RlZmluZSBSRUdfT0sgICAgICAgICAg MAogI2RlZmluZSBSRUdfTk9NQVRDSCAgICAgMQotLS0gYS9pbmNsdWRlL25ldGRiLmgKKysrIGIv aW5jbHVkZS9uZXRkYi5oCkBAIC0xNDAsNiArMTQwLDggQEAKICNkZWZpbmUgRUFJX0lETl9FTkNP REUgLTEwNQogI2RlZmluZSBOSV9NQVhIT1NUIDI1NQogI2RlZmluZSBOSV9NQVhTRVJWIDMyCisj ZGVmaW5lIE5JX0lETiAwCisjZGVmaW5lIE5JX0lETl9VU0VfU1REM19BU0NJSV9SVUxFUyAwCiAj ZW5kaWYKIAogCg== --mix-1cb18e91:2f2a439e--