From owner-freebsd-ports Wed Mar 27 21:27:46 2002 Delivered-To: freebsd-ports@freebsd.org Received: from rwcrmhc52.attbi.com (rwcrmhc52.attbi.com [216.148.227.88]) by hub.freebsd.org (Postfix) with ESMTP id 805A137B400 for ; Wed, 27 Mar 2002 21:27:33 -0800 (PST) Received: from photoniii ([66.31.5.199]) by rwcrmhc52.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with SMTP id <20020328052729.PBVF1147.rwcrmhc52.attbi.com@photoniii> for ; Thu, 28 Mar 2002 05:27:29 +0000 Date: Thu, 28 Mar 2002 00:35:15 -0500 From: Tadayuki OKADA To: ports Subject: problem with XFree86-4.2.0 Message-Id: <20020328003515.59bd8dca.tadayuki@attbi.com> X-Mailer: Sylpheed version 0.7.4 (GTK+ 1.2.10; i386-portbld-freebsd4.5) Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Multipart_Thu__28_Mar_2002_00:35:15_-0500_08189200" Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org This is a multi-part message in MIME format. --Multipart_Thu__28_Mar_2002_00:35:15_-0500_08189200 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Hello, I had a problem with XFree86-4.2.0. Various X11 program (KDE, etc.) will core-dump with it. There's a patch for that problem: http://www.xfree86.org/pipermail/i18n/2002-January/002927.html I applied the patch, and now I can use KDE again. The patch file attached. It should be put into x11/XFree86-4-libraries/files directory. Regards, -- Tadayuki OKADA --Multipart_Thu__28_Mar_2002_00:35:15_-0500_08189200 Content-Type: application/octet-stream; name="patch-XlcDL.c" Content-Disposition: attachment; filename="patch-XlcDL.c" Content-Transfer-Encoding: base64 LS0tIGxpYi9YMTEvWGxjREwuYy5vbGQJMjAwMi8wMS8yMyAxNjoyNjo0MQkxLjUKKysrIGxpYi9Y MTEvWGxjREwuYwkyMDAyLzAxLzI3IDE4OjIwOjQ4CkBAIC04Myw2ICs4Myw3IEBAIHR5cGVkZWYg c3RydWN0IHsKICAgY2hhciAqaW1fcmVnaXN0ZXI7CiAgIGNoYXIgKmltX3VucmVnaXN0ZXI7CiAg IGludCBkbF9yZWxlYXNlOworICB1bnNpZ25lZCBpbnQgcmVmY291bnQ7CiAjaWYgZGVmaW5lZCho cHV4KQogICBzaGxfdCBkbF9tb2R1bGU7CiAjZWxzZQpAQCAtMjE0LDYgKzIxNSw3IEBAIExpbWl0 IHRoZSBsZW5ndGggb2YgcGF0aCB0byBwcmV2ZW50IHN0YWMKIAkgIHhpMThuX29iamVjdHNfbGlz dFtsY19jb3VudF0ub3BlbiA9IHN0cmR1cChhcmdzWzJdKTsKIAkgIHhpMThuX29iamVjdHNfbGlz dFtsY19jb3VudF0uZGxfcmVsZWFzZSA9IFhJMThOX0RMUkVMOwogCSAgeGkxOG5fb2JqZWN0c19s aXN0W2xjX2NvdW50XS5sb2NhbGVfbmFtZSA9IHN0cmR1cChsY19uYW1lKTsKKwkgIHhpMThuX29i amVjdHNfbGlzdFtsY19jb3VudF0ucmVmY291bnQgPSAwOwogCSAgeGkxOG5fb2JqZWN0c19saXN0 W2xjX2NvdW50XS5kbF9tb2R1bGUgPSAodm9pZCopTlVMTDsKIAkgIGlmIChuID09IDUpIHsKIAkg ICAgeGkxOG5fb2JqZWN0c19saXN0W2xjX2NvdW50XS5pbV9yZWdpc3RlciA9IHN0cmR1cChhcmdz WzNdKTsKQEAgLTI4NCw2ICsyODYsODUgQEAgY29uc3QgY2hhciAqbGNfZGlyOwogICAgIHJldHVy biBwYXRoOwogfQogCisvKiBXZSByZWZlcmVuY2UgY291bnQgZGxvcGVuKCkgYW5kIGRsY2xvc2Uo KSBvZiBtb2R1bGVzOyB1bmZvcnR1bmF0ZWx5LAorICogc2luY2UgWENsb3NlSU0sIFhDbG9zZU9N LCBYbGNDbG9zZSBhcmVuJ3Qgd3JhcHBlZCwgYnV0IGRpcmVjdGx5CisgKiBjYWxsIHRoZSBjbG9z ZSBtZXRob2Qgb2YgdGhlIG9iamVjdCwgd2UgbGVhayBhIHJlZmVyZW5jZSBjb3VudCBldmVyeQor ICogdGltZSB3ZSBvcGVuIHRoZW4gY2xvc2UgYSBtb2R1bGUuIEZpeGluZyB0aGlzIHdvdWxkIHJl cXVpcmUKKyAqIGVpdGhlciBjcmVhdGluZyBwcm94eSBvYmplY3RzIG9yIGhvb2tzIGZvciBjbG9z ZV9pbS9jbG9zZV9vbQorICogaW4gWExDZAorICovCitzdGF0aWMgQm9vbAorb3Blbl9vYmplY3Qg KG9iamVjdCwgbGNfZGlyKQorICAgICBYSTE4Tk9iamVjdHNMaXN0IG9iamVjdDsKKyAgICAgY2hh ciAqbGNfZGlyOworeworICBjaGFyICpwYXRoOworICAKKyAgaWYgKG9iamVjdC0+cmVmY291bnQg PT0gMCkgeworICAgICAgcGF0aCA9IF9fbGNfcGF0aChvYmplY3QtPmRsX25hbWUsIGxjX2Rpcik7 CisjaWYgZGVmaW5lZChocHV4KQorICAgICAgb2JqZWN0LT5kbF9tb2R1bGUgPSBzaGxfbG9hZChw YXRoLCBCSU5EX0RFRkVSUkVELCAwTCk7CisjZWxzZQorICAgICAgb2JqZWN0LT5kbF9tb2R1bGUg PSBkbG9wZW4ocGF0aCwgUlRMRF9MQVpZKTsKKyNlbmRpZgorICAgICAgWGZyZWUocGF0aCk7CisK KyAgICAgIGlmICghb2JqZWN0LT5kbF9tb2R1bGUpCisJICByZXR1cm4gRmFsc2U7CisgICAgfQor CisgIG9iamVjdC0+cmVmY291bnQrKzsKKyAgcmV0dXJuIFRydWU7Cit9CisKK3N0YXRpYyB2b2lk ICoKK2ZldGNoX3N5bWJvbCAob2JqZWN0LCBzeW1ib2wpCisgICAgIFhJMThOT2JqZWN0c0xpc3Qg b2JqZWN0OworICAgICBjaGFyICpzeW1ib2w7Cit7CisgICAgdm9pZCAqcmVzdWx0ID0gTlVMTDsK KyNpZiBkZWZpbmVkKGhwdXgpCisgICAgaW50IGdldHN5bXNfY250LCBpOworICAgIHN0cnVjdCBz aGxfc3ltYm9sICpzeW1ib2xzOworI2VuZGlmCisKKyNpZiBkZWZpbmVkKGhwdXgpCisgICAgZ2V0 c3ltc19jbnQgPSBzaGxfZ2V0c3ltYm9scyhvYmplY3QtPmRsX21vZHVsZSwgVFlQRV9QUk9DRURV UkUsCisJCQkJIEVYUE9SVF9TWU1CT0xTLCBtYWxsb2MsICZzeW1ib2xzKTsKKworICAgIGZvcihp PTA7IGk8Z2V0c3ltc19jbnQ7IGkrKykgeworICAgICAgICBpZighc3RyY21wKHN5bWJvbHNbaV0u bmFtZSwgc3ltYm9sKSkgeworCSAgICByZXN1bHQgPSBzeW1ib2xzW2ldLnZhbHVlOworCSAgICBi cmVhazsKKyAgICAgICAgIH0KKyAgICB9CisKKyAgICBpZihnZXRzeW1zX2NudCA+IDApIHsKKyAg ICAgICAgZnJlZShzeW1ib2xzKTsKKyAgICB9CisjZWxzZQorICAgIHJlc3VsdCA9IChYTENkKCop KCkpdHJ5X2JvdGhfZGxzeW0ob2JqZWN0LT5kbF9tb2R1bGUsIHN5bWJvbCk7CisjZW5kaWYKKwor ICAgIHJldHVybiByZXN1bHQ7Cit9CisKK3N0YXRpYyB2b2lkCitjbG9zZV9vYmplY3QgKG9iamVj dCkKKyAgICAgWEkxOE5PYmplY3RzTGlzdCBvYmplY3Q7Cit7CisgIG9iamVjdC0+cmVmY291bnQt LTsKKyAgaWYgKG9iamVjdC0+cmVmY291bnQgPT0gMCkKKyAgICB7CisjaWYgZGVmaW5lZChocHV4 KQorICAgICAgICBzaGxfdW5sb2FkKG9iamVjdC0+ZGxfbW9kdWxlKTsKKyNlbHNlCisgICAgICAg IGRsY2xvc2Uob2JqZWN0LT5kbF9tb2R1bGUpOworI2VuZGlmCisgICAgICAgIG9iamVjdC0+ZGxf bW9kdWxlID0gTlVMTDsKKyAgICB9Cit9CisKIFhMQ2QKICNpZiBOZWVkRnVuY3Rpb25Qcm90b3R5 cGVzCiBfWGxjRHluYW1pY0xvYWQoY29uc3QgY2hhciAqbGNfbmFtZSkKQEAgLTI5NCwxNCArMzc1 LDkgQEAgX1hsY0R5bmFtaWNMb2FkKGxjX25hbWUpCiB7CiAgICAgWExDZCBsY2QgPSAoWExDZClO VUxMOwogICAgIFhMQ2QgKCpsY19sb2FkZXIpKCkgPSAoWExDZCgqKSgpKU5VTEw7Ci0gICAgY2hh ciAqcGF0aDsKICAgICBpbnQgY291bnQ7CiAgICAgWEkxOE5PYmplY3RzTGlzdCBvYmplY3RzX2xp c3Q7CiAgICAgY2hhciBsY19kaXJbQlVGU0laRV07Ci0jaWYgZGVmaW5lZChocHV4KQotICAgIGlu dCBnZXRzeW1zX2NudCwgaTsKLSAgICBzdHJ1Y3Qgc2hsX3N5bWJvbCAqc3ltYm9sczsKLSNlbmRp ZgogCiAgICAgaWYgKGxjX25hbWUgPT0gTlVMTCkgcmV0dXJuIChYTENkKU5VTEw7CiAKQEAgLTMx NSw0NSArMzkxLDE3IEBAIF9YbGNEeW5hbWljTG9hZChsY19uYW1lKQogICAgIGZvciAoOyBjb3Vu dC0tID4gMDsgb2JqZWN0c19saXN0KyspIHsKICAgICAgICAgaWYgKG9iamVjdHNfbGlzdC0+dHlw ZSAhPSBYTENfT0JKRUNUIHx8CiAJICAgIHN0cmNtcChvYmplY3RzX2xpc3QtPmxvY2FsZV9uYW1l LCBsY19uYW1lKSkgY29udGludWU7Ci0JaWYgKCFvYmplY3RzX2xpc3QtPmRsX21vZHVsZSkgewot CSAgcGF0aCA9IF9fbGNfcGF0aChvYmplY3RzX2xpc3QtPmRsX25hbWUsIGxjX2Rpcik7Ci0jaWYg ZGVmaW5lZChocHV4KQotCSAgb2JqZWN0c19saXN0LT5kbF9tb2R1bGUgPSBzaGxfbG9hZChwYXRo LCBCSU5EX0RFRkVSUkVELCAwTCk7Ci0jZWxzZQotCSAgb2JqZWN0c19saXN0LT5kbF9tb2R1bGUg PSBkbG9wZW4ocGF0aCwgUlRMRF9MQVpZKTsKLSNlbmRpZgotCSAgWGZyZWUocGF0aCk7Ci0JICBp ZiAoIW9iamVjdHNfbGlzdC0+ZGxfbW9kdWxlKSBjb250aW51ZTsKLQl9Ci0jaWYgZGVmaW5lZCho cHV4KQotCWdldHN5bXNfY250ID0gc2hsX2dldHN5bWJvbHMob2JqZWN0c19saXN0LT5kbF9tb2R1 bGUsIFRZUEVfUFJPQ0VEVVJFLAotCQlFWFBPUlRfU1lNQk9MUywgbWFsbG9jLCAmc3ltYm9scyk7 Ci0KLQlmb3IoaT0wOyBpPGdldHN5bXNfY250OyBpKyspIHsKLQkgICAgaWYoIXN0cmNtcChzeW1i b2xzW2ldLm5hbWUsIG9iamVjdHNfbGlzdC0+b3BlbikpIHsKLQkJbGNfbG9hZGVyID0gc3ltYm9s c1tpXS52YWx1ZTsKLQkJYnJlYWs7Ci0JICAgIH0KLQl9CisJaWYgKCFvcGVuX29iamVjdCAob2Jq ZWN0c19saXN0LCBsY19kaXIpKQorCSAgICBjb250aW51ZTsKIAotCWlmKGdldHN5bXNfY250ID4g MCkgewotCSAgICBmcmVlKHN5bWJvbHMpOwotCX0KLSNlbHNlCi0JbGNfbG9hZGVyID0gKFhMQ2Qo KikoKSl0cnlfYm90aF9kbHN5bShvYmplY3RzX2xpc3QtPmRsX21vZHVsZSwKLQkJCQkJICAgICAg b2JqZWN0c19saXN0LT5vcGVuKTsKLSNlbmRpZgorCWxjX2xvYWRlciA9IChYTENkKCopKCkpZmV0 Y2hfc3ltYm9sIChvYmplY3RzX2xpc3QsIG9iamVjdHNfbGlzdC0+b3Blbik7CiAJaWYgKCFsY19s b2FkZXIpIGNvbnRpbnVlOwogCWxjZCA9ICgqbGNfbG9hZGVyKShsY19uYW1lKTsKIAlpZiAobGNk ICE9IChYTENkKU5VTEwpIHsKIAkgICAgYnJlYWs7CiAJfQotI2lmIGRlZmluZWQoaHB1eCkKLQlz aGxfdW5sb2FkKG9iamVjdHNfbGlzdC0+ZGxfbW9kdWxlKTsKLSNlbHNlCi0JZGxjbG9zZShvYmpl Y3RzX2xpc3QtPmRsX21vZHVsZSk7Ci0jZW5kaWYKLQlvYmplY3RzX2xpc3QtPmRsX21vZHVsZSA9 IE5VTEw7CisJCisJY2xvc2Vfb2JqZWN0IChvYmplY3RzX2xpc3QpOwogICAgIH0KICAgICByZXR1 cm4gKFhMQ2QpbGNkOwogfQpAQCAtMzcxLDE2ICs0MTksMTEgQEAgY2hhciAqcmVzX25hbWUsICpy ZXNfY2xhc3M7CiAjZW5kaWYKIHsKICAgWElNIGltID0gKFhJTSlOVUxMOwotICBjaGFyICpwYXRo OwogICBjaGFyIGxjX2RpcltCVUZTSVpFXTsKICAgY2hhciAqbGNfbmFtZTsKICAgWElNICgqaW1f b3BlbklNKSgpID0gKFhJTSgqKSgpKU5VTEw7CiAgIGludCBjb3VudDsKICAgWEkxOE5PYmplY3Rz TGlzdCBvYmplY3RzX2xpc3QgPSB4aTE4bl9vYmplY3RzX2xpc3Q7Ci0jaWYgZGVmaW5lZChocHV4 KQotICBpbnQgZ2V0c3ltc19jbnQsIGk7Ci0gIHN0cnVjdCBzaGxfc3ltYm9sICpzeW1ib2xzOwot I2VuZGlmCiAKICAgbGNfbmFtZSA9IGxjZC0+Y29yZS0+bmFtZTsKIApAQCAtMzkwLDQ2ICs0MzMs MTggQEAgY2hhciAqcmVzX25hbWUsICpyZXNfY2xhc3M7CiAgIGZvciAoOyBjb3VudC0tID4gMDsg b2JqZWN0c19saXN0KyspIHsKICAgICBpZiAob2JqZWN0c19saXN0LT50eXBlICE9IFhJTV9PQkpF Q1QgfHwKIAlzdHJjbXAob2JqZWN0c19saXN0LT5sb2NhbGVfbmFtZSwgbGNfbmFtZSkpIGNvbnRp bnVlOwotICAgIGlmICghb2JqZWN0c19saXN0LT5kbF9tb2R1bGUpIHsKLSAgICAgIHBhdGggPSBf X2xjX3BhdGgob2JqZWN0c19saXN0LT5kbF9uYW1lLCBsY19kaXIpOwotI2lmIGRlZmluZWQoaHB1 eCkKLSAgICAgIG9iamVjdHNfbGlzdC0+ZGxfbW9kdWxlID0gc2hsX2xvYWQocGF0aCwgQklORF9E RUZFUlJFRCwgMEwpOwotI2Vsc2UKLSAgICAgIG9iamVjdHNfbGlzdC0+ZGxfbW9kdWxlID0gZGxv cGVuKHBhdGgsIFJUTERfTEFaWSk7Ci0jZW5kaWYKLSAgICAgIFhmcmVlKHBhdGgpOwotICAgICAg aWYgKCFvYmplY3RzX2xpc3QtPmRsX21vZHVsZSkgY29udGludWU7Ci0gICAgfQotI2lmIGRlZmlu ZWQoaHB1eCkKLSAgICBnZXRzeW1zX2NudCA9IHNobF9nZXRzeW1ib2xzKG9iamVjdHNfbGlzdC0+ ZGxfbW9kdWxlLCBUWVBFX1BST0NFRFVSRSwKLQlFWFBPUlRfU1lNQk9MUywgbWFsbG9jLCAmc3lt Ym9scyk7CiAKLSAgICBmb3IoaT0wOyBpPGdldHN5bXNfY250OyBpKyspIHsKLQlpZighc3RyY21w KHN5bWJvbHNbaV0ubmFtZSwgb2JqZWN0c19saXN0LT5vcGVuKSkgewotCSAgICBpbV9vcGVuSU0g PSBzeW1ib2xzW2ldLnZhbHVlOwotCSAgICBicmVhazsKLQl9Ci0gICAgIH0KKyAgICBpZiAoIW9w ZW5fb2JqZWN0IChvYmplY3RzX2xpc3QsIGxjX2RpcikpCisgICAgICAgIGNvbnRpbnVlOwogCi0g ICAgaWYoZ2V0c3ltc19jbnQgPiAwKSB7Ci0JZnJlZShzeW1ib2xzKTsKLSAgICB9Ci0jZWxzZQot ICAgIGltX29wZW5JTSA9IChYSU0oKikoKSl0cnlfYm90aF9kbHN5bShvYmplY3RzX2xpc3QtPmRs X21vZHVsZSwKLQkJCQkJIG9iamVjdHNfbGlzdC0+b3Blbik7CisgICAgaW1fb3BlbklNID0gKFhJ TSgqKSgpKWZldGNoX3N5bWJvbChvYmplY3RzX2xpc3QsIG9iamVjdHNfbGlzdC0+b3Blbik7CiAg ICAgaWYgKCFpbV9vcGVuSU0pIGNvbnRpbnVlOwotI2VuZGlmCiAgICAgaW0gPSAoKmltX29wZW5J TSkobGNkLCBkaXNwbGF5LCByZGIsIHJlc19uYW1lLCByZXNfY2xhc3MpOwogICAgIGlmIChpbSAh PSAoWElNKU5VTEwpIHsKLSAgICAgIGJyZWFrOworICAgICAgICBicmVhazsKICAgICB9Ci0gICAg aW1fb3BlbklNID0gMDsKLSNpZiBkZWZpbmVkKGhwdXgpCi0gICAgc2hsX3VubG9hZChvYmplY3Rz X2xpc3QtPmRsX21vZHVsZSk7Ci0jZWxzZQotICAgIGRsY2xvc2Uob2JqZWN0c19saXN0LT5kbF9t b2R1bGUpOwotI2VuZGlmCi0gICAgb2JqZWN0c19saXN0LT5kbF9tb2R1bGUgPSBOVUxMOworICAg IAorICAgIGNsb3NlX29iamVjdCAob2JqZWN0c19saXN0KTsKICAgfQogICByZXR1cm4gKFhJTSlp bTsKIH0KQEAgLTQ0NSw3ICs0NjAsNiBAQCBjaGFyCSpyZXNfbmFtZSwgKnJlc19jbGFzczsKIFhJ TVByb2MJIGNhbGxiYWNrOwogWFBvaW50ZXIJKmNsaWVudF9kYXRhOwogewotICBjaGFyICpwYXRo OwogICBjaGFyIGxjX2RpcltCVUZTSVpFXTsKICAgY2hhciAqbGNfbmFtZTsKICAgQm9vbCAoKmlt X3JlZ2lzdGVySU0pKCkgPSAoQm9vbCgqKSgpKU5VTEw7CkBAIC00NjUsNDcgKzQ3OSwxOCBAQCBY UG9pbnRlcgkqY2xpZW50X2RhdGE7CiAgIGZvciAoOyBjb3VudC0tID4gMDsgb2JqZWN0c19saXN0 KyspIHsKICAgICBpZiAob2JqZWN0c19saXN0LT50eXBlICE9IFhJTV9PQkpFQ1QgfHwKIAlzdHJj bXAob2JqZWN0c19saXN0LT5sb2NhbGVfbmFtZSwgbGNfbmFtZSkpIGNvbnRpbnVlOwotICAgIGlm ICghb2JqZWN0c19saXN0LT5kbF9tb2R1bGUpIHsKLSAgICAgIHBhdGggPSBfX2xjX3BhdGgob2Jq ZWN0c19saXN0LT5kbF9uYW1lLCBsY19kaXIpOwotI2lmIGRlZmluZWQoaHB1eCkKLSAgICAgIG9i amVjdHNfbGlzdC0+ZGxfbW9kdWxlID0gc2hsX2xvYWQocGF0aCwgQklORF9ERUZFUlJFRCwgMEwp OwotI2Vsc2UKLSAgICAgIG9iamVjdHNfbGlzdC0+ZGxfbW9kdWxlID0gZGxvcGVuKHBhdGgsIFJU TERfTEFaWSk7Ci0jZW5kaWYKLSAgICAgIFhmcmVlKHBhdGgpOwotICAgICAgaWYgKCFvYmplY3Rz X2xpc3QtPmRsX21vZHVsZSkgY29udGludWU7Ci0gICAgfQotI2lmIGRlZmluZWQoaHB1eCkKLSAg ICBnZXRzeW1zX2NudCA9IHNobF9nZXRzeW1ib2xzKG9iamVjdHNfbGlzdC0+ZGxfbW9kdWxlLCBU WVBFX1BST0NFRFVSRSwKLQlFWFBPUlRfU1lNQk9MUywgbWFsbG9jLCAmc3ltYm9scyk7Ci0KLSAg ICBmb3IoaT0wOyBpPGdldHN5bXNfY250OyBpKyspIHsKLQlpZighc3RyY21wKHN5bWJvbHNbaV0u bmFtZSwgb2JqZWN0c19saXN0LT5vcGVuKSkgewotCSAgICBpbV9yZWdpc3RlcklNID0gc3ltYm9s c1tpXS52YWx1ZTsKLQkgICAgYnJlYWs7Ci0JfQotICAgICB9CiAKLSAgICBpZihnZXRzeW1zX2Nu dCA+IDApIHsKLQlmcmVlKHN5bWJvbHMpOwotICAgIH0KLSNlbHNlCi0gICAgaW1fcmVnaXN0ZXJJ TSA9IChCb29sKCopKCkpdHJ5X2JvdGhfZGxzeW0ob2JqZWN0c19saXN0LT5kbF9tb2R1bGUsCi0J CQkJCSAgICAgIG9iamVjdHNfbGlzdC0+aW1fcmVnaXN0ZXIpOworICAgIGlmICghb3Blbl9vYmpl Y3QgKG9iamVjdHNfbGlzdCwgbGNfZGlyKSkKKyAgICAgICAgY29udGludWU7CisgICAgaW1fcmVn aXN0ZXJJTSA9IChCb29sKCopKCkpZmV0Y2hfc3ltYm9sKG9iamVjdHNfbGlzdCwKKwkJCQkJICAg IG9iamVjdHNfbGlzdC0+aW1fcmVnaXN0ZXIpOwogICAgIGlmICghaW1fcmVnaXN0ZXJJTSkgY29u dGludWU7Ci0jZW5kaWYKICAgICByZXRfZmxhZyA9ICgqaW1fcmVnaXN0ZXJJTSkobGNkLCBkaXNw bGF5LCByZGIsCiAJCQkJcmVzX25hbWUsIHJlc19jbGFzcywKIAkJCQljYWxsYmFjaywgY2xpZW50 X2RhdGEpOwogICAgIGlmIChyZXRfZmxhZykgYnJlYWs7CiAKLSAgICBpbV9yZWdpc3RlcklNID0g MDsKLSNpZiBkZWZpbmVkKGhwdXgpCi0gICAgc2hsX3VubG9hZChvYmplY3RzX2xpc3QtPmRsX21v ZHVsZSk7Ci0jZWxzZQotICAgIGRsY2xvc2Uob2JqZWN0c19saXN0LT5kbF9tb2R1bGUpOwotI2Vu ZGlmCi0gICAgb2JqZWN0c19saXN0LT5kbF9tb2R1bGUgPSBOVUxMOworICAgIGNsb3NlX29iamVj dCAob2JqZWN0c19saXN0KTsKICAgfQogICByZXR1cm4gKEJvb2wpcmV0X2ZsYWc7CiB9CkBAIC01 MjEsNyArNTA2LDYgQEAgY2hhcgkqcmVzX25hbWUsICpyZXNfY2xhc3M7CiBYSU1Qcm9jCSBjYWxs YmFjazsKIFhQb2ludGVyCSpjbGllbnRfZGF0YTsKIHsKLSAgY2hhciAqcGF0aDsKICAgY2hhciBs Y19kaXJbQlVGU0laRV07CiAgIGNoYXIgKmxjX25hbWU7CiAgIEJvb2wgKCppbV91bnJlZ2lzdGVy SU0pKCkgPSAoQm9vbCgqKSgpKU5VTEw7CkBAIC01NDAsNDggKzUyNCwyMSBAQCBYUG9pbnRlcgkq Y2xpZW50X2RhdGE7CiAgIGZvciAoOyBjb3VudC0tID4gMDsgb2JqZWN0c19saXN0KyspIHsKICAg ICBpZiAob2JqZWN0c19saXN0LT50eXBlICE9IFhJTV9PQkpFQ1QgfHwKIAlzdHJjbXAob2JqZWN0 c19saXN0LT5sb2NhbGVfbmFtZSwgbGNfbmFtZSkpIGNvbnRpbnVlOwotICAgIGlmICghb2JqZWN0 c19saXN0LT5kbF9tb2R1bGUpIHsKLSAgICAgIHBhdGggPSBfX2xjX3BhdGgob2JqZWN0c19saXN0 LT5kbF9uYW1lLCBsY19kaXIpOwotI2lmIGRlZmluZWQoaHB1eCkKLSAgICAgIG9iamVjdHNfbGlz dC0+ZGxfbW9kdWxlID0gc2hsX2xvYWQocGF0aCwgQklORF9ERUZFUlJFRCwgMEwpOwotI2Vsc2UK LSAgICAgIG9iamVjdHNfbGlzdC0+ZGxfbW9kdWxlID0gZGxvcGVuKHBhdGgsIFJUTERfTEFaWSk7 Ci0jZW5kaWYKLSAgICAgIFhmcmVlKHBhdGgpOwotICAgICAgaWYgKCFvYmplY3RzX2xpc3QtPmRs X21vZHVsZSkgY29udGludWU7Ci0gICAgfQotI2lmIGRlZmluZWQoaHB1eCkKLSAgICBnZXRzeW1z X2NudCA9IHNobF9nZXRzeW1ib2xzKG9iamVjdHNfbGlzdC0+ZGxfbW9kdWxlLCBUWVBFX1BST0NF RFVSRSwKLQlFWFBPUlRfU1lNQk9MUywgbWFsbG9jLCAmc3ltYm9scyk7CiAKLSAgICBmb3IoaT0w OyBpPGdldHN5bXNfY250OyBpKyspIHsKLQlpZighc3RyY21wKHN5bWJvbHNbaV0ubmFtZSwgb2Jq ZWN0c19saXN0LT5vcGVuKSkgewotCSAgICBpbV91bnJlZ2lzdGVySU0gPSBzeW1ib2xzW2ldLnZh bHVlOwotCSAgICBicmVhazsKLQl9Ci0gICAgIH0KKyAgICBpZiAoIW9iamVjdHNfbGlzdC0+cmVm Y291bnQpIC8qIE11c3QgYWxyZWFkeSBiZSBvcGVuZWQgKi8KKyAgICAgICAgY29udGludWU7CiAK LSAgICBpZihnZXRzeW1zX2NudCA+IDApIHsKLQlmcmVlKHN5bWJvbHMpOwotICAgIH0KLSNlbHNl Ci0gICAgaW1fdW5yZWdpc3RlcklNID0gKEJvb2woKikoKSl0cnlfYm90aF9kbHN5bShvYmplY3Rz X2xpc3QtPmRsX21vZHVsZSwKLQkJCQkJCW9iamVjdHNfbGlzdC0+aW1fdW5yZWdpc3Rlcik7Cisg ICAgaW1fdW5yZWdpc3RlcklNID0gKEJvb2woKikoKSlmZXRjaF9zeW1ib2wob2JqZWN0c19saXN0 LAorCQkJCQkgICAgICBvYmplY3RzX2xpc3QtPmltX3VucmVnaXN0ZXIpOwogCiAgICAgaWYgKCFp bV91bnJlZ2lzdGVySU0pIGNvbnRpbnVlOwotI2VuZGlmCiAgICAgcmV0X2ZsYWcgPSAoKmltX3Vu cmVnaXN0ZXJJTSkobGNkLCBkaXNwbGF5LCByZGIsCiAJCQkJICByZXNfbmFtZSwgcmVzX2NsYXNz LAogCQkJCSAgY2FsbGJhY2ssIGNsaWVudF9kYXRhKTsKLSAgICBpZiAocmV0X2ZsYWcpIGJyZWFr OwotCi0gICAgaW1fdW5yZWdpc3RlcklNID0gMDsKLSNpZiBkZWZpbmVkKGhwdXgpCi0gICAgc2hs X3VubG9hZChvYmplY3RzX2xpc3QtPmRsX21vZHVsZSk7Ci0jZWxzZQotICAgIGRsY2xvc2Uob2Jq ZWN0c19saXN0LT5kbF9tb2R1bGUpOwotI2VuZGlmCi0gICAgb2JqZWN0c19saXN0LT5kbF9tb2R1 bGUgPSBOVUxMOworICAgIGlmIChyZXRfZmxhZykgeworICAgICAgICBjbG9zZV9vYmplY3QgKG9i amVjdHNfbGlzdCk7IC8qIG9wZW5lZCBpbiBSZWdpc3RlcklNSW5zdGFudGlhdGVDYWxsYmFjayAq LworCWJyZWFrOworICAgIH0KICAgfQogICByZXR1cm4gKEJvb2wpcmV0X2ZsYWc7CiB9CkBAIC02 MTcsNyArNTc0LDYgQEAgY2hhciAqcmVzX2NsYXNzOwogewogICBYT00gb20gPSAoWE9NKU5VTEw7 CiAgIGludCBjb3VudDsKLSAgY2hhciAqcGF0aDsKICAgY2hhciBsY19kaXJbQlVGU0laRV07CiAg IGNoYXIgKmxjX25hbWU7CiAgIFhPTSAoKm9tX29wZW5PTSkoKSA9IChYT00oKikoKSlOVUxMOwpA QCAtNjM1LDQ2ICs1OTEsMTYgQEAgY2hhciAqcmVzX2NsYXNzOwogICBmb3IgKDsgY291bnQtLSA+ IDA7IG9iamVjdHNfbGlzdCsrKSB7CiAgICAgaWYgKG9iamVjdHNfbGlzdC0+dHlwZSAhPSBYT01f T0JKRUNUIHx8CiAJc3RyY21wKG9iamVjdHNfbGlzdC0+bG9jYWxlX25hbWUsIGxjX25hbWUpKSBj b250aW51ZTsKLSAgICBpZiAoIW9iamVjdHNfbGlzdC0+ZGxfbW9kdWxlKSB7Ci0gICAgICBwYXRo ID0gX19sY19wYXRoKG9iamVjdHNfbGlzdC0+ZGxfbmFtZSwgbGNfZGlyKTsKLSNpZiBkZWZpbmVk KGhwdXgpCi0gICAgICBvYmplY3RzX2xpc3QtPmRsX21vZHVsZSA9IHNobF9sb2FkKHBhdGgsIEJJ TkRfREVGRVJSRUQsIDBMKTsKLSNlbHNlCi0gICAgICBvYmplY3RzX2xpc3QtPmRsX21vZHVsZSA9 IGRsb3BlbihwYXRoLCBSVExEX0xBWlkpOwotI2VuZGlmCi0gICAgICBYZnJlZShwYXRoKTsKLSAg ICAgIGlmICghb2JqZWN0c19saXN0LT5kbF9tb2R1bGUpIGNvbnRpbnVlOwotICAgIH0KLSNpZiBk ZWZpbmVkKGhwdXgpCi0gICAgZ2V0c3ltc19jbnQgPSBzaGxfZ2V0c3ltYm9scyhvYmplY3RzX2xp c3QtPmRsX21vZHVsZSwgVFlQRV9QUk9DRURVUkUsCi0JRVhQT1JUX1NZTUJPTFMsIG1hbGxvYywg JnN5bWJvbHMpOwotCi0gICAgZm9yKGk9MDsgaTxnZXRzeW1zX2NudDsgaSsrKSB7Ci0JaWYoIXN0 cmNtcChzeW1ib2xzW2ldLm5hbWUsIG9iamVjdHNfbGlzdC0+b3BlbikpIHsKLQkgICAgb21fb3Bl bk9NID0gc3ltYm9sc1tpXS52YWx1ZTsKLQkgICAgYnJlYWs7Ci0JfQotICAgICB9Ci0KLSAgICBp ZihnZXRzeW1zX2NudCA+IDApIHsKLQlmcmVlKHN5bWJvbHMpOwotICAgIH0KLSNlbHNlCi0gICAg b21fb3Blbk9NID0gKFhPTSgqKSgpKXRyeV9ib3RoX2Rsc3ltKG9iamVjdHNfbGlzdC0+ZGxfbW9k dWxlLAotCQkJCQkgb2JqZWN0c19saXN0LT5vcGVuKTsKKyAgICBpZiAoIW9wZW5fb2JqZWN0IChv YmplY3RzX2xpc3QsIGxjX2RpcikpCisgICAgICAgIGNvbnRpbnVlOworICAgIAorICAgIG9tX29w ZW5PTSA9IChYT00oKikoKSlmZXRjaF9zeW1ib2wob2JqZWN0c19saXN0LCBvYmplY3RzX2xpc3Qt Pm9wZW4pOwogICAgIGlmICghb21fb3Blbk9NKSBjb250aW51ZTsKLSNlbmRpZgogICAgIG9tID0g KCpvbV9vcGVuT00pKGxjZCwgZGlzcGxheSwgcmRiLCByZXNfbmFtZSwgcmVzX2NsYXNzKTsKICAg ICBpZiAob20gIT0gKFhPTSlOVUxMKSB7Ci0gICAgICBicmVhazsKKyAgICAgICAgYnJlYWs7CiAg ICAgfQotICAgIG9tX29wZW5PTSA9IDA7Ci0jaWYgZGVmaW5lZChocHV4KQotICAgIHNobF91bmxv YWQob2JqZWN0c19saXN0LT5kbF9tb2R1bGUpOwotI2Vsc2UKLSAgICBkbGNsb3NlKG9iamVjdHNf bGlzdC0+ZGxfbW9kdWxlKTsKLSNlbmRpZgotICAgIG9iamVjdHNfbGlzdC0+ZGxfbW9kdWxlID0g TlVMTDsKKyAgICBjbG9zZV9vYmplY3Qob2JqZWN0c19saXN0KTsKICAgfQogICByZXR1cm4gKFhP TSlvbTsKIH0K --Multipart_Thu__28_Mar_2002_00:35:15_-0500_08189200-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message