Date: Wed, 28 Nov 2018 12:57:39 +0900 From: =?UTF-8?B?6rmA7KKF7ISx?= <jongsung.kim@gmail.com> To: =?UTF-8?Q?Bernhard_Fr=C3=B6hlich?= <decke@freebsd.org> Cc: ports@freebsd.org Subject: multimedia/tvheadend: merge request Message-ID: <CAOVNo=DvBu81T1c8mhF6q253J1A2R8on27-8ELWf77AX9pSdJw@mail.gmail.com>
next in thread | raw e-mail | index | archive | help
--000000000000e0a447057bb191e8 Content-Type: text/plain; charset="UTF-8" Hi, Please merge attached two patches fixing FreeBSD-related issues. All they are mainlined, but not included in v4.2.7. The first one is slightly modified from original patch to be applied to v4.2.7. Thanks. --000000000000e0a447057bb191e8 Content-Type: text/x-patch; charset="US-ASCII"; name="0001-webui-fix-http_serve_file-for-FreeBSD.patch" Content-Disposition: attachment; filename="0001-webui-fix-http_serve_file-for-FreeBSD.patch" Content-Transfer-Encoding: base64 Content-ID: <f_jp0mxput0> X-Attachment-Id: f_jp0mxput0 RnJvbSA0MTFmOTU3NzMzMjIyZTI0ZGY0ZWFkOWZiMTUzMzJkY2IyYzExNmRhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb25nc3VuZyBLaW0gPGpvbmdzdW5nLmtpbUBnbWFpbC5jb20+ CkRhdGU6IFR1ZSwgMjkgTWF5IDIwMTggMDM6NDI6MDQgKzA5MDAKU3ViamVjdDogW1BBVENIIDEv Ml0gd2VidWk6IGZpeCBodHRwX3NlcnZlX2ZpbGUoKSBmb3IgRnJlZUJTRAoKVGhpcyBwYXRjaCBm aXhlcyB0d28gbWFqb3IgcHJvYmxlbXMgb2YgRnJlZUJTRCBwb3J0IG9mIHR2aGVhZGVuZDoKCjEu IHZlcnkgaGlnaCBDUFUgdXNhZ2Ugd2hpbGUgc3RyZWFtaW5nIGEgcmVjb3JlZCBwcm9ncmFtCjIu IHVuYWJsZSB0byBzdHJlYW0gdGhlIHJlY29yZGVkIHByb2dyYW0gYmV5b25kIDEyOE1CLgoKVW5s aWtlIExpbnV4IHNlbmRmaWxlKCksIEZyZWVCU0Qgc2VuZGZpbGUoKSByZXF1aXJlcyBhbiBleHBs aWNpdApmaWxlIG9mZnNldCwgYW5kIHJldHVybiB2YWx1ZSBtdXN0IGJlIGNoZWNrZWQgdG8gY2F0 Y2ggYW55IGVycm9yCm9jY3VycmVkLiAoaS5lLiwgY2xvc2VkIGNvbm5lY3Rpb24pCgpQYXRjaCB0 ZXN0ZWQgd2l0aCB0aGUgbGF0ZXN0IEZyZWVCU0QgcG9ydCBvZiB0dmhlYWRlbmQtNC4yLjYuCi0t LQogc3JjL3dlYnVpL3dlYnVpLmMgfCAyNCArKysrKysrKysrKysrKysrKy0tLS0tLS0KIDEgZmls ZSBjaGFuZ2VkLCAxNyBpbnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L3NyYy93ZWJ1aS93ZWJ1aS5jIGIvc3JjL3dlYnVpL3dlYnVpLmMKaW5kZXggMTJiOTY1MjMwLi4z MzFkOTk4ZTkgMTAwNjQ0Ci0tLSBhL3NyYy93ZWJ1aS93ZWJ1aS5jCisrKyBiL3NyYy93ZWJ1aS93 ZWJ1aS5jCkBAIC0xNTcwLDcgKzE1NzAsNyBAQCBodHRwX3NlcnZlX2ZpbGUoaHR0cF9jb25uZWN0 aW9uX3QgKmhjLCBjb25zdCBjaGFyICpmbmFtZSwKICNpZiBkZWZpbmVkKFBMQVRGT1JNX0xJTlVY KQogICBzc2l6ZV90IHI7CiAjZWxpZiBkZWZpbmVkKFBMQVRGT1JNX0ZSRUVCU0QpIHx8IGRlZmlu ZWQoUExBVEZPUk1fREFSV0lOKQotICBvZmZfdCByOworICBvZmZfdCBvLCByOwogI2VuZGlmCiAg IAogICBpZiAoZmNvbnYpIHsKQEAgLTE2MzEsMTEgKzE2MzEsMTUgQEAgaHR0cF9zZXJ2ZV9maWxl KGh0dHBfY29ubmVjdGlvbl90ICpoYywgY29uc3QgY2hhciAqZm5hbWUsCiAgIHNwcmludGYocmFu Z2VfYnVmLCAiYnl0ZXMgJWpkLSVqZC8lamQiLAogICAgIGZpbGVfc3RhcnQsIGZpbGVfZW5kLCAo aW50bWF4X3Qpc3Quc3Rfc2l6ZSk7CiAKKyNpZiBkZWZpbmVkKFBMQVRGT1JNX0xJTlVYKQogICBp ZihmaWxlX3N0YXJ0ID4gMCkKICAgICBpZiAobHNlZWsoZmQsIGZpbGVfc3RhcnQsIFNFRUtfU0VU KSAhPSBmaWxlX3N0YXJ0KSB7CiAgICAgICBjbG9zZShmZCk7CiAgICAgICByZXR1cm4gSFRUUF9T VEFUVVNfSU5URVJOQUw7CiAgICAgfQorI2VsaWYgZGVmaW5lZChQTEFURk9STV9GUkVFQlNEKSB8 fCBkZWZpbmVkKFBMQVRGT1JNX0RBUldJTikKKyAgbyA9IGZpbGVfc3RhcnQ7CisjZW5kaWYKIAog ICBpZiAocHJlb3ApIHsKICAgICByZXQgPSBwcmVvcChoYywgZmlsZV9zdGFydCwgY29udGVudF9s ZW4sIG9wYXF1ZSk7CkBAIC0xNjU2LDE2ICsxNjYwLDIyIEBAIGh0dHBfc2VydmVfZmlsZShodHRw X2Nvbm5lY3Rpb25fdCAqaGMsIGNvbnN0IGNoYXIgKmZuYW1lLAogICAgICAgY2h1bmsgPSBNSU4o MTAyNCAqICgoc3RhdHMgPyAxMjggOiAxMDI0KSAqIDEwMjQpLCBjb250ZW50X2xlbik7CiAjaWYg ZGVmaW5lZChQTEFURk9STV9MSU5VWCkKICAgICAgIHIgPSBzZW5kZmlsZShoYy0+aGNfZmQsIGZk LCBOVUxMLCBjaHVuayk7CisgICAgICBpZiAociA8IDApIHsKKyAgICAgICAgcmV0ID0gLTE7Cisg ICAgICAgIGJyZWFrOworICAgICAgfQogI2VsaWYgZGVmaW5lZChQTEFURk9STV9GUkVFQlNEKQot ICAgICAgc2VuZGZpbGUoZmQsIGhjLT5oY19mZCwgMCwgY2h1bmssIE5VTEwsICZyLCAwKTsKKyAg ICAgIHJldCA9IHNlbmRmaWxlKGZkLCBoYy0+aGNfZmQsIG8sIGNodW5rLCBOVUxMLCAmciwgMCk7 CisgICAgICBpZiAocmV0IDwgMCkKKyAgICAgICAgYnJlYWs7CisgICAgICBvICs9IHI7CiAjZWxp ZiBkZWZpbmVkKFBMQVRGT1JNX0RBUldJTikKICAgICAgIHIgPSBjaHVuazsKLSAgICAgIHNlbmRm aWxlKGZkLCBoYy0+aGNfZmQsIDAsICZyLCBOVUxMLCAwKTsKLSNlbmRpZgotICAgICAgaWYociA8 IDApIHsKLSAgICAgICAgcmV0ID0gLTE7CisgICAgICByZXQgPSBzZW5kZmlsZShmZCwgaGMtPmhj X2ZkLCBvLCAmciwgTlVMTCwgMCk7CisgICAgICBpZiAocmV0IDwgMCkKICAgICAgICAgYnJlYWs7 Ci0gICAgICB9CisgICAgICBvICs9IHI7CisjZW5kaWYKICAgICAgIGNvbnRlbnRfbGVuIC09IHI7 CiAgICAgICBpZiAoc3RhdHMpCiAgICAgICAgIHN0YXRzKGhjLCByLCBvcGFxdWUpOwotLSAKMi4x OS4xCgo= --000000000000e0a447057bb191e8 Content-Type: text/x-patch; charset="US-ASCII"; name="0002-webui-epg-fix-compatibility-issue-for-FreeBSD.patch" Content-Disposition: attachment; filename="0002-webui-epg-fix-compatibility-issue-for-FreeBSD.patch" Content-Transfer-Encoding: base64 Content-ID: <f_jp0mxpva1> X-Attachment-Id: f_jp0mxpva1 RnJvbSA1MzYzZmI1Y2VmYmY4ZjlmMGY0ZDM4ZjgxMjUyY2U5Mzk0MjY2NWU0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb25nc3VuZyBLaW0gPGpvbmdzdW5nLmtpbUBnbWFpbC5jb20+ CkRhdGU6IFR1ZSwgMjAgTm92IDIwMTggMTc6MzY6MTAgKzA5MDAKU3ViamVjdDogW1BBVENIIDIv Ml0gd2VidWk6IGVwZzogZml4IGNvbXBhdGliaWxpdHkgaXNzdWUgZm9yIEZyZWVCU0QKClRoZSBF UEcgc2NyZWVuIHNlcnZpY2VkIGJ5IEZyZWVCU0QgcG9ydCBvZiB0dmhlYWRlbmQgaGFzIHR3byBh Ym5vcm1hbCBjb250cm9sCmJlaGF2aW9yczoKCiAgICBSZXNldCBBbGwgYnV0dG9uIG1ha2VzIHRo ZSBsaXN0IGVtcHR5CiAgICBUeXBpbmcgYW5kIHRoZW4gZGVsZXRpbmcgYW55IHNlYXJjaCBzdHJp bmcgYWxzbyBtYWtlcyB0aGUgbGlzdCBlbXB0eS4KClRoaXMgcGF0Y2ggZml4ZXMgdGhlIHN5bXB0 b21zIGFib3ZlLgoKUGF0Y2ggdGVzdGVkIHdpdGggdGhlIGxhdGVzdCBGcmVlQlNEIHBvcnQgb2Yg dHZoZWFkZW5kLTQuMi43LgoKQ2hhbmdlcyBzaW5jZSB2MToKLSBjYWxsIHJlc2V0IG9ubHkgaWYg cmVxdWlyZWQKLS0tCiBzcmMvd2VidWkvc3RhdGljL2FwcC9lcGcuanMgfCA5ICsrKysrLS0tLQog MSBmaWxlIGNoYW5nZWQsIDUgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9zcmMvd2VidWkvc3RhdGljL2FwcC9lcGcuanMgYi9zcmMvd2VidWkvc3RhdGljL2FwcC9l cGcuanMKaW5kZXggMmM4YjkxNGIyLi43MzM3MTc3ZWYgMTAwNjQ0Ci0tLSBhL3NyYy93ZWJ1aS9z dGF0aWMvYXBwL2VwZy5qcworKysgYi9zcmMvd2VidWkvc3RhdGljL2FwcC9lcGcuanMKQEAgLTkw MiwxMCArOTAyLDExIEBAIHR2aGVhZGVuZC5lcGcgPSBmdW5jdGlvbigpIHsKICAgICBlcGdGaWx0 ZXJUaXRsZS5vbigndmFsaWQnLCBmdW5jdGlvbihjKSB7CiAgICAgICAgIHZhciB2YWx1ZSA9IGMu Z2V0VmFsdWUoKTsKIAotICAgICAgICBpZiAodmFsdWUubGVuZ3RoIDwgMSkKLSAgICAgICAgICAg IHZhbHVlID0gbnVsbDsKLQotICAgICAgICBpZiAoZXBnU3RvcmUuYmFzZVBhcmFtcy50aXRsZSAh PT0gdmFsdWUpIHsKKyAgICAgICAgaWYgKHZhbHVlLmxlbmd0aCA8IDEpIHsKKyAgICAgICAgICAg IGRlbGV0ZSBlcGdTdG9yZS5iYXNlUGFyYW1zLnRpdGxlOworICAgICAgICAgICAgZXBnVmlldy5y ZXNldCgpOworICAgICAgICB9CisgICAgICAgIGVsc2UgaWYgKGVwZ1N0b3JlLmJhc2VQYXJhbXMu dGl0bGUgIT09IHZhbHVlKSB7CiAgICAgICAgICAgICBlcGdTdG9yZS5iYXNlUGFyYW1zLnRpdGxl ID0gdmFsdWU7CiAgICAgICAgICAgICBlcGdWaWV3LnJlc2V0KCk7CiAgICAgICAgIH0KLS0gCjIu MTkuMQoK --000000000000e0a447057bb191e8--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAOVNo=DvBu81T1c8mhF6q253J1A2R8on27-8ELWf77AX9pSdJw>