Date: Tue, 9 Nov 2010 23:51:14 +0200 From: "Gennady" <gen@ukr.net> To: pav@FreeBSD.org Cc: freebsd-ports@FreeBSD.org Subject: patch net/ushare: fix build on 8.1 Message-ID: <E1PFw5y-0007Hj-GR@ffe17.ukr.net>
next in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --_----------=_12893394742734610 MIME-Version: 1.0 Content-Disposition: inline Content-Length: 94 Content-Transfer-Encoding: binary Content-Type: text/plain; charset="windows-1251" Hello all With this patches port ushare compile and work. Checked up on FreeBSD 8.1 amd64. --_----------=_12893394742734610 Content-Transfer-Encoding: base64 Content-Type: application/octet-stream; name="patch-http.h" Content-Disposition: attachment LS0tIHNyYy9odHRwLmgub3JpZwkyMDA3LTEyLTA5IDE1OjAzOjM2LjAwMDAw MDAwMCArMDIwMAorKysgc3JjL2h0dHAuaAkyMDEwLTExLTA5IDE0OjI5OjM2 LjE1MDYzMDk3MCArMDIwMApAQCAtMjUsNiArMjUsMjEgQEAKICNpbmNsdWRl IDx1cG5wL3VwbnAuaD4KICNpbmNsdWRlIDx1cG5wL3VwbnB0b29scy5oPgog CisjaWZkZWYgX19GcmVlQlNEX18KK3N0cnVjdCBVcG5wVmlydHVhbERpckNh bGxiYWNrcyB7CitpbnQgICAgICAgICAgICAgICAoKmdldF9pbmZvKSBfX1Ao KGNvbnN0IGNoYXIgKmZpbGVuYW1lLCBzdHJ1Y3QgRmlsZV9JbmZvICppbmZv KSkgOworVXBucFdlYkZpbGVIYW5kbGUgKCpvcGVuKSAgICAgX19QKChjb25z dCBjaGFyICpmaWxlbmFtZSwgZW51bSBVcG5wT3BlbkZpbGVNb2RlIG1vZGUp KSA7CitpbnQgICAgICAgICAgICAgICAoKnJlYWQpICAgICBfX1AoKFVwbnBX ZWJGaWxlSGFuZGxlIGZoLCBjaGFyICpidWYsIHNpemVfdCBidWZsZW4pKSA7 CitpbnQgICAgICAgICAgICAgICAoKndyaXRlKSAgICBfX1AoKFVwbnBXZWJG aWxlSGFuZGxlIGZoIF9fYXR0cmlidXRlX18oKHVudXNlZCkpLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjaGFyICpidWYgX19hdHRy aWJ1dGVfXygodW51c2VkKSksCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHNpemVfdCBidWZsZW4gX19hdHRyaWJ1dGVfXygodW51c2Vk KSkpKSA7CitpbnQgICAgICAgICAgICAgICAoKnNlZWspICAgICBfX1AoKFVw bnBXZWJGaWxlSGFuZGxlIGZoLCBvZmZfdCBvZmZzZXQsIGludCBvcmlnaW4p KSA7CitpbnQgICAgICAgICAgICAgICAoKmNsb3NlKSAgICBfX1AoKFVwbnBX ZWJGaWxlSGFuZGxlIGZoKSkgOworfSA7CisKK2V4dGVybiBzdHJ1Y3QgVXBu cFZpcnR1YWxEaXJDYWxsYmFja3MgdmlydHVhbF9kaXJfY2FsbGJhY2tzOwor I2Vsc2UKIHN0cnVjdCBVcG5wVmlydHVhbERpckNhbGxiYWNrcyB2aXJ0dWFs X2Rpcl9jYWxsYmFja3M7CisjZW5kaWYgLyogX19GcmVlQlNEX18gKi8KIAog I2VuZGlmIC8qIF9IVFRQX0hfICovCg== --_----------=_12893394742734610 Content-Transfer-Encoding: base64 Content-Type: application/octet-stream; name="patch-ushare.h" Content-Disposition: attachment LS0tIHNyYy91c2hhcmUuaC5vcmlnCTIwMDctMTItMDkgMTU6MDM6MzYuMDAw MDAwMDAwICswMjAwCisrKyBzcmMvdXNoYXJlLmgJMjAxMC0xMS0wOSAxNDoz MTowMy40NjYyOTIyMDMgKzAyMDAKQEAgLTI3LDYgKzI3LDExIEBACiAjaW5j bHVkZSA8c3RkYm9vbC5oPgogI2luY2x1ZGUgPHB0aHJlYWQuaD4KIAorI2lm ZGVmIF9fRnJlZUJTRF9fCisjaW5jbHVkZSA8c3RkaW8uaD4KKyNpbmNsdWRl IDxzdHJpbmcuaD4KKyNlbmRpZiAvKiBfX0ZyZWVCU0RfXyAqLworCiAjaWZk ZWYgSEFWRV9ETE5BCiAjaW5jbHVkZSA8ZGxuYS5oPgogI2VuZGlmIC8qIEhB VkVfRExOQSAqLwo= --_----------=_12893394742734610 Content-Transfer-Encoding: base64 Content-Type: application/octet-stream; name="patch-ushare.c" Content-Disposition: attachment LS0tIHNyYy91c2hhcmUuYy5vcmlnCTIwMDctMTItMDkgMTU6MDM6MzYuMDAw MDAwMDAwICswMjAwCisrKyBzcmMvdXNoYXJlLmMJMjAxMC0xMS0wOSAxNDo1 Njo0NC4yNjE0NDU4MzEgKzAyMDAKQEAgLTE3MSw2ICsxNzEsMTkgQEAKICAg cHRocmVhZF9tdXRleF91bmxvY2sgKCZ1dC0+dGVybWluYXRpb25fbXV0ZXgp OwogfQogCisKKyNpZmRlZiBfX0ZyZWVCU0RfXworc3RhdGljIHZvaWQKKypn ZXRfaXBfYWRkcihzdHJ1Y3Qgc29ja2FkZHIgKnNhKQoreworICBpZiAoc2Et PnNhX2ZhbWlseSA9PSBBRl9JTkVUKQorICAgIHJldHVybiAmKCgoc3RydWN0 IHNvY2thZGRyX2luKilzYSktPnNpbl9hZGRyKTsKKyAgZWxzZQorICAgIHJl dHVybiAmKCgoc3RydWN0IHNvY2thZGRyX2luNiopc2EpLT5zaW42X2FkZHIp OworfQorI2VuZGlmIC8qIF9fRnJlZUJTRF9fICovCisKKwogc3RhdGljIHZv aWQKIGhhbmRsZV9hY3Rpb25fcmVxdWVzdCAoc3RydWN0IFVwbnBfQWN0aW9u X1JlcXVlc3QgKnJlcXVlc3QpCiB7CkBAIC0xODgsNyArMjAxLDExIEBACiAg IGlmIChzdHJjbXAgKHJlcXVlc3QtPkRldlVETiArIDUsIHV0LT51ZG4pKQog ICAgIHJldHVybjsKIAorI2lmbmRlZiBfX0ZyZWVCU0RfXwogICBpcCA9IHJl cXVlc3QtPkN0cmxQdElQQWRkci5zX2FkZHI7CisjZWxzZQorICBpcCA9IGdl dF9pcF9hZGRyKChzdHJ1Y3Qgc29ja2FkZHIgKikmcmVxdWVzdC0+Q3RybFB0 SVBBZGRyKSA7CisjZW5kaWYgLyogX19GcmVlQlNEX18gKi8KICAgaXAgPSBu dG9obCAoaXApOwogICBzcHJpbnRmICh2YWwsICIlZC4lZC4lZC4lZCIsCiAg ICAgICAgICAgIChpcCA+PiAyNCkgJiAweEZGLCAoaXAgPj4gMTYpICYgMHhG RiwgKGlwID4+IDgpICYgMHhGRiwgaXAgJiAweEZGKTsKQEAgLTM0OCw2ICsz NjUsNyBAQAogCiAgIFVwbnBFbmFibGVXZWJzZXJ2ZXIgKFRSVUUpOwogCisj aWZuZGVmIF9fRnJlZUJTRF9fCiAgIHJlcyA9IFVwbnBTZXRWaXJ0dWFsRGly Q2FsbGJhY2tzICgmdmlydHVhbF9kaXJfY2FsbGJhY2tzKTsKICAgaWYgKHJl cyAhPSBVUE5QX0VfU1VDQ0VTUykKICAgewpAQCAtMzU1LDYgKzM3Myw0MyBA QAogICAgIGZyZWUgKGRlc2NyaXB0aW9uKTsKICAgICByZXR1cm4gLTE7CiAg IH0KKyNlbHNlCisgIGlmICgocmVzID0gVXBucFZpcnR1YWxEaXJfc2V0X0dl dEluZm9DYWxsYmFjayh2aXJ0dWFsX2Rpcl9jYWxsYmFja3MuZ2V0X2luZm8p KSAhPSBVUE5QX0VfU1VDQ0VTUyApIHsKKyAgICAgbG9nX2Vycm9yIChfKCJD YW5ub3Qgc2V0IHZpcnR1YWwgZGlyZWN0b3J5IGNhbGxiYWNrIC0gZ2V0X2lu Zm9cbiIpKTsKKyAgICAgZnJlZSAoZGVzY3JpcHRpb24pOworICAgICByZXR1 cm4gLTE7CisgIH0KKworICBpZiAoKHJlcyA9IFVwbnBWaXJ0dWFsRGlyX3Nl dF9PcGVuQ2FsbGJhY2sodmlydHVhbF9kaXJfY2FsbGJhY2tzLm9wZW4pKSAh PSBVUE5QX0VfU1VDQ0VTUyApIHsKKyAgICAgbG9nX2Vycm9yIChfKCJDYW5u b3Qgc2V0IHZpcnR1YWwgZGlyZWN0b3J5IGNhbGxiYWNrIC0gb3BlblxuIikp OworICAgICBmcmVlIChkZXNjcmlwdGlvbik7CisgICAgIHJldHVybiAtMTsK KyAgfQorCisgIGlmICgocmVzID0gVXBucFZpcnR1YWxEaXJfc2V0X1JlYWRD YWxsYmFjayh2aXJ0dWFsX2Rpcl9jYWxsYmFja3MucmVhZCkpICE9IFVQTlBf RV9TVUNDRVNTICkgeworICAgICBsb2dfZXJyb3IgKF8oIkNhbm5vdCBzZXQg dmlydHVhbCBkaXJlY3RvcnkgY2FsbGJhY2sgLSByZWFkXG4iKSk7CisgICAg IGZyZWUgKGRlc2NyaXB0aW9uKTsKKyAgICAgcmV0dXJuIC0xOworICB9CisK KyAgaWYgKChyZXMgPSBVcG5wVmlydHVhbERpcl9zZXRfV3JpdGVDYWxsYmFj ayh2aXJ0dWFsX2Rpcl9jYWxsYmFja3Mud3JpdGUpKSAhPSBVUE5QX0VfU1VD Q0VTUyApIHsKKyAgICAgbG9nX2Vycm9yIChfKCJDYW5ub3Qgc2V0IHZpcnR1 YWwgZGlyZWN0b3J5IGNhbGxiYWNrIC0gd3JpdGVcbiIpKTsKKyAgICAgZnJl ZSAoZGVzY3JpcHRpb24pOworICAgICByZXR1cm4gLTE7CisgIH0KKworICBp ZiAoKHJlcyA9IFVwbnBWaXJ0dWFsRGlyX3NldF9TZWVrQ2FsbGJhY2sodmly dHVhbF9kaXJfY2FsbGJhY2tzLnNlZWspKSAhPSBVUE5QX0VfU1VDQ0VTUyAp IHsKKyAgICAgbG9nX2Vycm9yIChfKCJDYW5ub3Qgc2V0IHZpcnR1YWwgZGly ZWN0b3J5IGNhbGxiYWNrIC0gc2Vla1xuIikpOworICAgICBmcmVlIChkZXNj cmlwdGlvbik7CisgICAgIHJldHVybiAtMTsKKyAgfQorCisgIGlmICgocmVz ID0gVXBucFZpcnR1YWxEaXJfc2V0X0Nsb3NlQ2FsbGJhY2sodmlydHVhbF9k aXJfY2FsbGJhY2tzLmNsb3NlKSkgIT0gVVBOUF9FX1NVQ0NFU1MgKSB7Cisg ICAgIGxvZ19lcnJvciAoXygiQ2Fubm90IHNldCB2aXJ0dWFsIGRpcmVjdG9y eSBjYWxsYmFjayAtIGNsb3NlXG4iKSk7CisgICAgIGZyZWUgKGRlc2NyaXB0 aW9uKTsKKyAgICAgcmV0dXJuIC0xOworICB9CisjZW5kaWYgLyogX19GcmVl QlNEX18gKi8KIAogICByZXMgPSBVcG5wQWRkVmlydHVhbERpciAoVklSVFVB TF9ESVIpOwogICBpZiAocmVzICE9IFVQTlBfRV9TVUNDRVNTKQpAQCAtNDIx LDYgKzQ3Niw3IEBACiAgIGl0ZiA9IGl0Zmxpc3Q7CiAgIHdoaWxlIChpdGYp CiAgIHsKKyNpZm5kZWYgX19GcmVlQlNEX18KICAgICBpZiAoKGl0Zi0+aWZh X2ZsYWdzICYgSUZGX1VQKQogICAgICAgICAmJiAhc3RybmNtcCAoaXRmLT5p ZmFfbmFtZSwgaW50ZXJmYWNlLCBJRk5BTVNJWikpCiAgICAgewpAQCAtNDMw LDYgKzQ4NiwyMyBAQAogICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogICAg IGl0ZiA9IGl0Zi0+aWZhX25leHQ7CisjZWxzZQorICAgIGlmIChzdHJuY21w IChpdGYtPmlmYV9uYW1lLCBpbnRlcmZhY2UsIElGTkFNU0laKSkgeworICAg ICAgIGl0ZiA9IGl0Zi0+aWZhX25leHQ7CisgICAgICAgY29udGludWUgOwor ICAgIH0KKworICAgIGlmIChpdGYtPmlmYV9mbGFncyAmIElGRl9VUCkgewor ICAgICAgIGxvZ19pbmZvIChfKCJJbnRlcmZhY2UgJXMgaXMgdXAuXG4iKSwg aW50ZXJmYWNlKTsKKyAgICAgICBmcmVlaWZhZGRycyAoaXRmbGlzdCk7Cisg ICAgICAgcmV0dXJuIHRydWUgOworICAgIH0gZWxzZSB7CisgICAgICAgICBs b2dfZXJyb3IgKF8oIkludGVyZmFjZSAlcyBpcyBkb3duLlxuIiksIGludGVy ZmFjZSk7CisgICAgICAgICBsb2dfZXJyb3IgKF8oIlJlY2hlY2sgdVNoYXJl J3MgY29uZmlndXJhdGlvbiBhbmQgdHJ5IGFnYWluICFcbiIpKTsKKyAgICAg ICAgIGZyZWVpZmFkZHJzIChpdGZsaXN0KTsKKyAgICAgICAgIHJldHVybiBm YWxzZSA7CisgICAgICB9CisjZW5kaWYgLyogIF9fRnJlZUJTRF9fICovCiAg IH0KIAogICBmcmVlaWZhZGRycyAoaXRmKTsK --_----------=_12893394742734610--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1PFw5y-0007Hj-GR>