[kde-freebsd] ports/116767: x11/kdelibs3 - kde3 fails to build

[Scot Hetzel]

The following reply was made to PR ports/116767; it has been noted by GNATS.

From: "Scot Hetzel" <swhetzel at gmail.com>
To: bug-followup at freebsd.org
Cc: ralph at imada.sdu.dk
Subject: Re: ports/116767: x11/kdelibs3 - kde3 fails to build
Date: Tue, 2 Oct 2007 22:49:43 -0500

 ------=_Part_9997_10835362.1191383383044
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 The attached patches fixes the build for kdelibs3.
 
 The patch to cups-util.c replaces the current version with the one
 from the head of the SVN repository.
 
 http://websvn.kde.org/trunk/KDE/kdelibs/kdeprint/cups/cupsdconf2/cups-util.c?revision=709485&view=markup
 
 The patch to ipprequest.cpp changes direct access to HTTP->authstring
 to use http{Set,Get}AuthString.
 
 http://websvn.kde.org/trunk/KDE/kdelibs/kdeprint/cups/ipprequest.cpp?r1=704615&r2=706199
 
 Scot
 
 ------=_Part_9997_10835362.1191383383044
 Content-Type: text/x-csrc; name="patch-kdeprint_cups_cupsdconf2_cups-util.c"
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename="patch-kdeprint_cups_cupsdconf2_cups-util.c"; filename="patch-kdeprint_cups_cupsdconf2_cups-util.c";
  filename="patch-kdeprint_cups_cupsdconf2_cups-util.c"
 X-Attachment-Id: file0
 
 LS0tIGtkZXByaW50L2N1cHMvY3Vwc2Rjb25mMi9jdXBzLXV0aWwuYy1vcmlnCTIwMDctMTAtMDIg
 MjE6MzY6MzcuNDQyNjQ1NTQ2IC0wNTAwCisrKyBrZGVwcmludC9jdXBzL2N1cHNkY29uZjIvY3Vw
 cy11dGlsLmMJMjAwNy0xMC0wMiAyMTo0MjowOC45OTE3MDg2MjUgLTA1MDAKQEAgLTYsNDg5ICs2
 LDExOCBAQAogI2luY2x1ZGUgPHN5cy9zdGF0Lmg+CiAjaW5jbHVkZSA8dW5pc3RkLmg+CiAKLSNk
 ZWZpbmUgQ1VQU19TRVJWRVJST09UCSIvZXRjL2N1cHMiCi1zdGF0aWMgaHR0cF90CQkqY3Vwc19z
 ZXJ2ZXI7CiBzdGF0aWMgaXBwX3N0YXR1c190CWxhc3RfZXJyb3I7Ci1zdGF0aWMgY2hhcgkJYXV0
 aHN0cmluZ1tIVFRQX01BWF9WQUxVRV07Ci1zdGF0aWMgY2hhcgkJcHdkc3RyaW5nWzMzXTsKLXN0
 YXRpYyBpbnQgY3Vwc19sb2NhbF9hdXRoKGh0dHBfdCAqaHR0cCk7CiAKLWNvbnN0IGNoYXIgKgkJ
 CQkvKiBPIC0gRmlsZW5hbWUgZm9yIFBQRCBmaWxlICovCitjb25zdCBjaGFyKiBjdXBzR2V0Q29u
 Zih2b2lkKTsKK2ludCBjdXBzUHV0Q29uZihjb25zdCBjaGFyKik7CisKK2NvbnN0IGNoYXIgKiAg
 ICAvKiBPIC0gRmlsZW5hbWUgZm9yIFBQRCBmaWxlICovCiBjdXBzR2V0Q29uZih2b2lkKQogewot
 ICBpbnQJCWZkOwkJCS8qIFBQRCBmaWxlICovCi0gIGludAkJYnl0ZXM7CQkJLyogTnVtYmVyIG9m
 IGJ5dGVzIHJlYWQgKi8KLSAgY2hhcgkJYnVmZmVyWzgxOTJdOwkJLyogQnVmZmVyIGZvciBmaWxl
 ICovCi0gIGNoYXIJCXJlc291cmNlW0hUVFBfTUFYX1VSSV07CS8qIFJlc291cmNlIG5hbWUgKi8K
 LSAgY29uc3QgY2hhcgkqcGFzc3dvcmQ7CQkvKiBQYXNzd29yZCBzdHJpbmcgKi8KLSAgY2hhcgkJ
 cmVhbG1bSFRUUF9NQVhfVkFMVUVdLAkvKiByZWFsbT0ieHl6IiBzdHJpbmcgKi8KLQkJbm9uY2Vb
 SFRUUF9NQVhfVkFMVUVdLAkvKiBub25jZT0ieHl6IiBzdHJpbmcgKi8KLQkJcGxhaW5bMjU1XSwJ
 CS8qIFBsYWludGV4dCB1c2VybmFtZTpwYXNzd29yZCAqLwotCQllbmNvZGVbNTEyXTsJCS8qIEVu
 Y29kZWQgdXNlcm5hbWU6cGFzc3dvcmQgKi8KLSAgaHR0cF9zdGF0dXNfdAlzdGF0dXM7CQkJLyog
 SFRUUCBzdGF0dXMgZnJvbSBzZXJ2ZXIgKi8KLSAgY2hhcgkJcHJvbXB0WzEwMjRdOwkJLyogUHJv
 bXB0IHN0cmluZyAqLwotICBpbnQJCWRpZ2VzdF90cmllczsJCS8qIE51bWJlciBvZiB0cmllcyB3
 aXRoIERpZ2VzdCAqLwotICBzdGF0aWMgY2hhcglmaWxlbmFtZVtIVFRQX01BWF9VUkldOwkvKiBM
 b2NhbCBmaWxlbmFtZSAqLwotCi0gLyoKLSAgKiBDb25uZWN0IHRvIHRoZSBjb3JyZWN0IHNlcnZl
 ciBhcyBuZWVkZWQuLi4KLSAgKi8KLQotICAgIGlmICgoY3Vwc19zZXJ2ZXIgPSBodHRwQ29ubmVj
 dEVuY3J5cHQoY3Vwc1NlcnZlcigpLCBpcHBQb3J0KCksCi0gICAgICAgICAgICAgICAgICAgICAg
 ICAgICAgICAgICAgICAgICAgICBjdXBzRW5jcnlwdGlvbigpKSkgPT0gTlVMTCkKLSAgICB7Ci0g
 ICAgICBsYXN0X2Vycm9yID0gSVBQX1NFUlZJQ0VfVU5BVkFJTEFCTEU7Ci0gICAgICByZXR1cm4g
 KE5VTEwpOwotICAgIH0KLQotIC8qCi0gICogR2V0IGEgdGVtcCBmaWxlLi4uCi0gICovCi0KLSAg
 aWYgKChmZCA9IGN1cHNUZW1wRmQoZmlsZW5hbWUsIHNpemVvZihmaWxlbmFtZSkpKSA8IDApCi0g
 IHsKLSAgIC8qCi0gICAgKiBDYW4ndCBvcGVuIGZpbGU7IGNsb3NlIHRoZSBzZXJ2ZXIgY29ubmVj
 dGlvbiBhbmQgcmV0dXJuIE5VTEwuLi4KLSAgICAqLwotCi0gICAgaHR0cEZsdXNoKGN1cHNfc2Vy
 dmVyKTsKLSAgICBodHRwQ2xvc2UoY3Vwc19zZXJ2ZXIpOwotICAgIGN1cHNfc2VydmVyID0gTlVM
 TDsKLSAgICByZXR1cm4gKE5VTEwpOwotICB9Ci0KLSAvKgotICAqIEFuZCBzZW5kIGEgcmVxdWVz
 dCB0byB0aGUgSFRUUCBzZXJ2ZXIuLi4KLSAgKi8KLQotICBzbnByaW50ZihyZXNvdXJjZSwgc2l6
 ZW9mKHJlc291cmNlKSwgIi9hZG1pbi9jb25mL2N1cHNkLmNvbmYiKTsKLQotICBkaWdlc3RfdHJp
 ZXMgPSAwOwotCi0gIGRvCi0gIHsKLSAgICBodHRwQ2xlYXJGaWVsZHMoY3Vwc19zZXJ2ZXIpOwot
 ICAgIGh0dHBTZXRGaWVsZChjdXBzX3NlcnZlciwgSFRUUF9GSUVMRF9IT1NULCBjdXBzU2VydmVy
 KCkpOwotICAgIGh0dHBTZXRGaWVsZChjdXBzX3NlcnZlciwgSFRUUF9GSUVMRF9BVVRIT1JJWkFU
 SU9OLCBhdXRoc3RyaW5nKTsKLQotICAgIGlmIChodHRwR2V0KGN1cHNfc2VydmVyLCByZXNvdXJj
 ZSkpCi0gICAgewotICAgICAgaWYgKGh0dHBSZWNvbm5lY3QoY3Vwc19zZXJ2ZXIpKQotICAgICAg
 ewotICAgICAgICBzdGF0dXMgPSBIVFRQX0VSUk9SOwotCWJyZWFrOwotICAgICAgfQotICAgICAg
 ZWxzZQotICAgICAgewotICAgICAgICBzdGF0dXMgPSBIVFRQX1VOQVVUSE9SSVpFRDsKLSAgICAg
 ICAgY29udGludWU7Ci0gICAgICB9Ci0gICAgfQotCi0gICAgd2hpbGUgKChzdGF0dXMgPSBodHRw
 VXBkYXRlKGN1cHNfc2VydmVyKSkgPT0gSFRUUF9DT05USU5VRSk7Ci0KLSAgICBpZiAoc3RhdHVz
 ID09IEhUVFBfVU5BVVRIT1JJWkVEKQotICAgIHsKLSAgICAgIGZwcmludGYoc3RkZXJyLCJjdXBz
 R2V0Q29uZjogdW5hdXRob3JpemVkLi4uXG4iKTsKLQotICAgICAvKgotICAgICAgKiBGbHVzaCBh
 bnkgZXJyb3IgbWVzc2FnZS4uLgotICAgICAgKi8KLQotICAgICAgaHR0cEZsdXNoKGN1cHNfc2Vy
 dmVyKTsKLQotICAgICAvKgotICAgICAgKiBTZWUgaWYgd2UgY2FuIGRvIGxvY2FsIGF1dGhlbnRp
 Y2F0aW9uLi4uCi0gICAgICAqLwotCi0gICAgICBpZiAoY3Vwc19sb2NhbF9hdXRoKGN1cHNfc2Vy
 dmVyKSkKLSAgICAgICAgY29udGludWU7Ci0KLSAgICAgLyoKLSAgICAgICogU2VlIGlmIHdlIHNo
 b3VsZCByZXRyeSB0aGUgY3VycmVudCBkaWdlc3QgcGFzc3dvcmQuLi4KLSAgICAgICovCi0KLSAg
 ICAgIGlmIChzdHJuY21wKGN1cHNfc2VydmVyLT5maWVsZHNbSFRUUF9GSUVMRF9XV1dfQVVUSEVO
 VElDQVRFXSwgIkJhc2ljIiwgNSkgPT0gMCB8fAotICAgICAgICAgIGRpZ2VzdF90cmllcyA+IDEg
 fHwgIXB3ZHN0cmluZ1swXSkKLSAgICAgIHsKLSAgICAgICAvKgotCSogTm9wZSAtIGdldCBhIHBh
 c3N3b3JkIGZyb20gdGhlIHVzZXIuLi4KLQkqLwotCi0Jc25wcmludGYocHJvbXB0LCBzaXplb2Yo
 cHJvbXB0KSwgIlBhc3N3b3JkIGZvciAlcyBvbiAlcz8gIiwgY3Vwc1VzZXIoKSwKLSAgICAgICAg
 CSBjdXBzX3NlcnZlci0+aG9zdG5hbWUpOwotCi0gICAgICAgIGlmICgocGFzc3dvcmQgPSBjdXBz
 R2V0UGFzc3dvcmQocHJvbXB0KSkgPT0gTlVMTCkKLQkgIGJyZWFrOwotCWlmICghcGFzc3dvcmRb
 MF0pCi0JICBicmVhazsKLQotICAgICAgICBzdHJuY3B5KHB3ZHN0cmluZywgcGFzc3dvcmQsIHNp
 emVvZihwd2RzdHJpbmcpIC0gMSk7Ci0JcHdkc3RyaW5nW3NpemVvZihwd2RzdHJpbmcpIC0gMV0g
 PSAnXDAnOwotCi0gICAgICAgIGRpZ2VzdF90cmllcyA9IDA7Ci0gICAgICB9Ci0gICAgICBlbHNl
 Ci0gICAgICAgIGRpZ2VzdF90cmllcyArKzsKLQotICAgICAvKgotICAgICAgKiBHb3QgYSBwYXNz
 d29yZDsgZW5jb2RlIGl0IGZvciB0aGUgc2VydmVyLi4uCi0gICAgICAqLwotCi0gICAgICBpZiAo
 c3RybmNtcChjdXBzX3NlcnZlci0+ZmllbGRzW0hUVFBfRklFTERfV1dXX0FVVEhFTlRJQ0FURV0s
 ICJCYXNpYyIsIDUpID09IDApCi0gICAgICB7Ci0gICAgICAgLyoKLQkqIEJhc2ljIGF1dGhlbnRp
 Y2F0aW9uLi4uCi0JKi8KLQotCXNucHJpbnRmKHBsYWluLCBzaXplb2YocGxhaW4pLCAiJXM6JXMi
 LCBjdXBzVXNlcigpLCBwd2RzdHJpbmcpOwotI2lmIENVUFNfVkVSU0lPTl9NQUpPUiA9PSAxICYm
 IENVUFNfVkVSU0lPTl9NSU5PUiA+PSAyCi0gICAgICAgaHR0cEVuY29kZTY0XzIoZW5jb2RlLCBz
 aXplb2YoZW5jb2RlKSwgcGxhaW4sIHNpemVvZihwbGFpbikpOwotI2Vsc2UKLSAgICAgICBodHRw
 RW5jb2RlNjQoZW5jb2RlLCBwbGFpbik7Ci0jZW5kaWYKLQlzbnByaW50ZihhdXRoc3RyaW5nLCBz
 aXplb2YoYXV0aHN0cmluZyksICJCYXNpYyAlcyIsIGVuY29kZSk7Ci0gICAgICB9Ci0gICAgICBl
 bHNlCi0gICAgICB7Ci0gICAgICAgLyoKLQkqIERpZ2VzdCBhdXRoZW50aWNhdGlvbi4uLgotCSov
 Ci0KLSAgICAgICAgaHR0cEdldFN1YkZpZWxkKGN1cHNfc2VydmVyLCBIVFRQX0ZJRUxEX1dXV19B
 VVRIRU5USUNBVEUsICJyZWFsbSIsIHJlYWxtKTsKLSAgICAgICAgaHR0cEdldFN1YkZpZWxkKGN1
 cHNfc2VydmVyLCBIVFRQX0ZJRUxEX1dXV19BVVRIRU5USUNBVEUsICJub25jZSIsIG5vbmNlKTsK
 LQotCWh0dHBNRDUoY3Vwc1VzZXIoKSwgcmVhbG0sIHB3ZHN0cmluZywgZW5jb2RlKTsKLQlodHRw
 TUQ1RmluYWwobm9uY2UsICJHRVQiLCByZXNvdXJjZSwgZW5jb2RlKTsKLQlzbnByaW50ZihhdXRo
 c3RyaW5nLCBzaXplb2YoYXV0aHN0cmluZyksCi0JICAgICAgICAgIkRpZ2VzdCB1c2VybmFtZT1c
 IiVzXCIsIHJlYWxtPVwiJXNcIiwgbm9uY2U9XCIlc1wiLCAiCi0JICAgICAgICAgInJlc3BvbnNl
 PVwiJXNcIiIsIGN1cHNVc2VyKCksIHJlYWxtLCBub25jZSwgZW5jb2RlKTsKLSAgICAgIH0KLQot
 ICAgICAgY29udGludWU7Ci0gICAgfQotI2lmZGVmIEhBVkVfTElCU1NMCi0gICAgZWxzZSBpZiAo
 c3RhdHVzID09IEhUVFBfVVBHUkFERV9SRVFVSVJFRCkKLSAgICB7Ci0gICAgIC8qCi0gICAgICAq
 IEZsdXNoIGFueSBlcnJvciBtZXNzYWdlLi4uCi0gICAgICAqLwotCi0gICAgICBodHRwRmx1c2go
 Y3Vwc19zZXJ2ZXIpOwotCi0gICAgIC8qCi0gICAgICAqIFVwZ3JhZGUgd2l0aCBlbmNyeXB0aW9u
 Li4uCi0gICAgICAqLwotCi0gICAgICBodHRwRW5jcnlwdGlvbihjdXBzX3NlcnZlciwgSFRUUF9F
 TkNSWVBUX1JFUVVJUkVEKTsKLQotICAgICAvKgotICAgICAgKiBUcnkgYWdhaW4sIHRoaXMgdGlt
 ZSB3aXRoIGVuY3J5cHRpb24gZW5hYmxlZC4uLgotICAgICAgKi8KLQotICAgICAgY29udGludWU7
 Ci0gICAgfQotI2VuZGlmIC8qIEhBVkVfTElCU1NMICovCi0gIH0KLSAgd2hpbGUgKHN0YXR1cyA9
 PSBIVFRQX1VOQVVUSE9SSVpFRCB8fCBzdGF0dXMgPT0gSFRUUF9VUEdSQURFX1JFUVVJUkVEKTsK
 LQotIC8qCi0gICogU2VlIGlmIHdlIGFjdHVhbGx5IGdvdCB0aGUgZmlsZSBvciBhbiBlcnJvci4u
 LgotICAqLworICAgIGludCAgZmQ7ICAgLyogUFBEIGZpbGUgKi8KKyAgICBodHRwX3N0YXR1c190
 IHN0YXR1czsgICAvKiBIVFRQIHN0YXR1cyBmcm9tIHNlcnZlciAqLworICAgIGh0dHBfdCAqY3Vw
 c19zZXJ2ZXI7CisgICAgc3RhdGljIGNoYXIgZmlsZW5hbWVbSFRUUF9NQVhfVVJJXTsgLyogTG9j
 YWwgZmlsZW5hbWUgKi8KKyAgICBjaGFyICAgICAgICAgIGZxZG5bIEhUVFBfTUFYX1VSSSBdOyAg
 IC8qIFNlcnZlciBuYW1lIGJ1ZmZlciAqLworCisKKyAgICAvKgorICAgICAqIENvbm5lY3QgdG8g
 dGhlIGNvcnJlY3Qgc2VydmVyIGFzIG5lZWRlZC4uLgorICAgICAqLworCisgICAgY3Vwc19zZXJ2
 ZXIgPSBodHRwQ29ubmVjdEVuY3J5cHQoY3Vwc1NlcnZlcigpLCBpcHBQb3J0KCksIGN1cHNFbmNy
 eXB0aW9uKCkpOworICAgIGlmIChjdXBzX3NlcnZlciA9PSBOVUxMKSB7CisgICAgICAgIGxhc3Rf
 ZXJyb3IgPSBJUFBfU0VSVklDRV9VTkFWQUlMQUJMRTsKKyAgICAgICAgcmV0dXJuIChOVUxMKTsK
 KyAgICB9CisKKyAgICAvKgorICAgICAqIEdldCBhIHRlbXAgZmlsZS4uLgorICAgICAqLworCisg
 ICAgZmQgPSBjdXBzVGVtcEZkKGZpbGVuYW1lLCBzaXplb2YoZmlsZW5hbWUpKTsKKyAgICBpZiAo
 ZmQgPCAwKSB7CisgICAgICAgIC8qCisgICAgICAgICAqIENhbid0IG9wZW4gZmlsZTsgY2xvc2Ug
 dGhlIHNlcnZlciBjb25uZWN0aW9uIGFuZCByZXR1cm4gTlVMTC4uLgorICAgICAgICAgKi8KKwor
 ICAgICAgICBodHRwRmx1c2goY3Vwc19zZXJ2ZXIpOworICAgICAgICBodHRwQ2xvc2UoY3Vwc19z
 ZXJ2ZXIpOworICAgICAgICBjdXBzX3NlcnZlciA9IE5VTEw7CisgICAgICAgIHJldHVybiAoTlVM
 TCk7CisgICAgfQorCisgICAgLyoKKyAgICAgKiBBbmQgc2VuZCBhIHJlcXVlc3QgdG8gdGhlIEhU
 VFAgc2VydmVyLi4uCisgICAgICovCisgICAgc3RhdHVzID0gY3Vwc0dldEZkKGN1cHNfc2VydmVy
 LCAiL2FkbWluL2NvbmYvY3Vwc2QuY29uZiIsIGZkKTsKIAotICBpZiAoc3RhdHVzICE9IEhUVFBf
 T0spCi0gIHsKICAgICBjbG9zZShmZCk7Ci0gICAgdW5saW5rKGZpbGVuYW1lKTsKICAgICBodHRw
 Rmx1c2goY3Vwc19zZXJ2ZXIpOwogICAgIGh0dHBDbG9zZShjdXBzX3NlcnZlcik7CiAgICAgY3Vw
 c19zZXJ2ZXIgPSBOVUxMOwotICAgIHJldHVybiAoTlVMTCk7Ci0gIH0KLQotIC8qCi0gICogT0ss
 IHdlIG5lZWQgdG8gY29weSB0aGUgZmlsZS4uLgotICAqLwogCi0gIHdoaWxlICgoYnl0ZXMgPSBo
 dHRwUmVhZChjdXBzX3NlcnZlciwgYnVmZmVyLCBzaXplb2YoYnVmZmVyKSkpID4gMCkKLSAgewot
 ICAgIHdyaXRlKGZkLCBidWZmZXIsIGJ5dGVzKTsKLSAgfQotCi0gIGNsb3NlKGZkKTsKLQotICBy
 ZXR1cm4gKGZpbGVuYW1lKTsKKyAgICBpZiAoc3RhdHVzICE9IEhUVFBfT0spIHsKKyAgICAgICAg
 dW5saW5rKGZpbGVuYW1lKTsKKyAgICAgICAgcmV0dXJuIChOVUxMKTsKKyAgICB9IGVsc2Ugewor
 ICAgICAgICByZXR1cm4gKGZpbGVuYW1lKTsKKyAgICB9CiB9CiAKLWludAkJCQkJLyogTyAtIFN0
 YXR1cyBvZiBvcGVyYXRpb24gKi8KLWN1cHNQdXRDb25mKGNvbnN0IGNoYXIgKm5hbWUpCQkvKiBJ
 IC0gTmFtZSBvZiB0aGUgY29uZmlnIGZpbGUgdG8gc2VuZCAqLworaW50ICAgICAvKiBPIC0gU3Rh
 dHVzIG9mIG9wZXJhdGlvbiAqLworY3Vwc1B1dENvbmYoY29uc3QgY2hhciAqbmFtZSkgIC8qIEkg
 LSBOYW1lIG9mIHRoZSBjb25maWcgZmlsZSB0byBzZW5kICovCiB7Ci0gIGludAkJZmQ7CQkJLyog
 UFBEIGZpbGUgKi8KLSAgaW50CQlieXRlczsJCQkvKiBOdW1iZXIgb2YgYnl0ZXMgcmVhZCAqLwot
 ICBjaGFyCQlidWZmZXJbODE5Ml07CQkvKiBCdWZmZXIgZm9yIGZpbGUgKi8KLSAgY2hhcgkJcmVz
 b3VyY2VbSFRUUF9NQVhfVVJJXTsJLyogUmVzb3VyY2UgbmFtZSAqLwotICBjb25zdCBjaGFyCSpw
 YXNzd29yZDsJCS8qIFBhc3N3b3JkIHN0cmluZyAqLwotICBjaGFyCQlyZWFsbVtIVFRQX01BWF9W
 QUxVRV0sCS8qIHJlYWxtPSJ4eXoiIHN0cmluZyAqLwotCQlub25jZVtIVFRQX01BWF9WQUxVRV0s
 CS8qIG5vbmNlPSJ4eXoiIHN0cmluZyAqLwotCQlwbGFpblsyNTVdLAkJLyogUGxhaW50ZXh0IHVz
 ZXJuYW1lOnBhc3N3b3JkICovCi0JCWVuY29kZVs1MTJdOwkJLyogRW5jb2RlZCB1c2VybmFtZTpw
 YXNzd29yZCAqLwotICBodHRwX3N0YXR1c190CXN0YXR1czsJCQkvKiBIVFRQIHN0YXR1cyBmcm9t
 IHNlcnZlciAqLwotICBjaGFyCQlwcm9tcHRbMTAyNF07CQkvKiBQcm9tcHQgc3RyaW5nICovCi0g
 IGludAkJZGlnZXN0X3RyaWVzOwkJLyogTnVtYmVyIG9mIHRyaWVzIHdpdGggRGlnZXN0ICovCi0K
 LSAgaWYgKG5hbWUgPT0gTlVMTCkKLSAgICByZXR1cm4gMDsKLQotIC8qCi0gICogQ29ubmVjdCB0
 byB0aGUgY29ycmVjdCBzZXJ2ZXIgYXMgbmVlZGVkLi4uCi0gICovCi0KLSAgICBpZiAoKGN1cHNf
 c2VydmVyID0gaHR0cENvbm5lY3RFbmNyeXB0KGN1cHNTZXJ2ZXIoKSwgaXBwUG9ydCgpLAotICAg
 ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY3Vwc0VuY3J5cHRpb24oKSkp
 ID09IE5VTEwpCi0gICAgewotICAgICAgbGFzdF9lcnJvciA9IElQUF9TRVJWSUNFX1VOQVZBSUxB
 QkxFOwotICAgICAgcmV0dXJuIDA7Ci0gICAgfQorICAgIGludCAgZmQ7ICAgLyogUFBEIGZpbGUg
 Ki8KKyAgICBodHRwX3N0YXR1c190IHN0YXR1czsgICAvKiBIVFRQIHN0YXR1cyBmcm9tIHNlcnZl
 ciAqLworICAgIGh0dHBfdCAqY3Vwc19zZXJ2ZXI7CiAKLSAvKgotICAqIE9wZW4gdGhlIGxvY2Fs
 IGNvbmZpZyBmaWxlLi4uCi0gICovCi0KLSAgaWYgKChmZCA9IG9wZW4obmFtZSwgT19SRE9OTFkp
 KSA8IDApCi0gIHsKLSAgIC8qCi0gICAgKiBDYW4ndCBvcGVuIGZpbGU7IGNsb3NlIHRoZSBzZXJ2
 ZXIgY29ubmVjdGlvbiBhbmQgcmV0dXJuIE5VTEwuLi4KLSAgICAqLworICAgIGlmIChuYW1lID09
 IE5VTEwpCisgICAgICAgIHJldHVybiAwOwogCi0gICAgaHR0cEZsdXNoKGN1cHNfc2VydmVyKTsK
 LSAgICBodHRwQ2xvc2UoY3Vwc19zZXJ2ZXIpOwotICAgIGN1cHNfc2VydmVyID0gTlVMTDsKLSAg
 ICByZXR1cm4gMDsKLSAgfQorICAgIC8qCisgICAgICogQ29ubmVjdCB0byB0aGUgY29ycmVjdCBz
 ZXJ2ZXIgYXMgbmVlZGVkLi4uCisgICAgICovCiAKLSAvKgotICAqIEFuZCBzZW5kIGEgcmVxdWVz
 dCB0byB0aGUgSFRUUCBzZXJ2ZXIuLi4KLSAgKi8KLQotICBzdHJuY3B5KHJlc291cmNlLCAiL2Fk
 bWluL2NvbmYvY3Vwc2QuY29uZiIsIHNpemVvZihyZXNvdXJjZSkpOwotCi0gIGRpZ2VzdF90cmll
 cyA9IDA7Ci0KLSAgZG8KLSAgewotICAgIGh0dHBDbGVhckZpZWxkcyhjdXBzX3NlcnZlcik7Ci0g
 ICAgaHR0cFNldEZpZWxkKGN1cHNfc2VydmVyLCBIVFRQX0ZJRUxEX0hPU1QsIGN1cHNTZXJ2ZXIo
 KSk7Ci0gICAgaHR0cFNldEZpZWxkKGN1cHNfc2VydmVyLCBIVFRQX0ZJRUxEX0FVVEhPUklaQVRJ
 T04sIGF1dGhzdHJpbmcpOwotICAgIGh0dHBTZXRGaWVsZChjdXBzX3NlcnZlciwgSFRUUF9GSUVM
 RF9UUkFOU0ZFUl9FTkNPRElORywgImNodW5rZWQiKTsKLQotICAgIGlmIChodHRwUHV0KGN1cHNf
 c2VydmVyLCByZXNvdXJjZSkpCi0gICAgewotICAgICAgaWYgKGh0dHBSZWNvbm5lY3QoY3Vwc19z
 ZXJ2ZXIpKQotICAgICAgewotICAgICAgICBzdGF0dXMgPSBIVFRQX0VSUk9SOwotCWJyZWFrOwot
 ICAgICAgfQotICAgICAgZWxzZQotICAgICAgewotICAgICAgICBzdGF0dXMgPSBIVFRQX1VOQVVU
 SE9SSVpFRDsKLSAgICAgICAgY29udGludWU7Ci0gICAgICB9CisgICAgY3Vwc19zZXJ2ZXIgPSBo
 dHRwQ29ubmVjdEVuY3J5cHQoY3Vwc1NlcnZlcigpLCBpcHBQb3J0KCksIGN1cHNFbmNyeXB0aW9u
 KCkpOworICAgIGlmIChjdXBzX3NlcnZlciA9PSBOVUxMKSB7CisgICAgICAgIGxhc3RfZXJyb3Ig
 PSBJUFBfU0VSVklDRV9VTkFWQUlMQUJMRTsKKyAgICAgICAgcmV0dXJuIDA7CiAgICAgfQogCi0g
 ICAgLyogc2VuZCB0aGUgZmlsZSBub3cgKi8KLSAgICBsc2VlayhmZCwgMCwgU0VFS19TRVQpOwot
 ICAgIHN0YXR1cyA9IEhUVFBfQ09OVElOVUU7Ci0gICAgd2hpbGUgKChieXRlcyA9IHJlYWQoZmQs
 IGJ1ZmZlciwgc2l6ZW9mKGJ1ZmZlcikpKSA+IDApCi0gICAgICAgIGlmIChodHRwQ2hlY2soY3Vw
 c19zZXJ2ZXIpKQotCXsKLQkgICAgaWYgKChzdGF0dXMgPSBodHRwVXBkYXRlKGN1cHNfc2VydmVy
 KSkgIT0gSFRUUF9DT05USU5VRSkKLQkgICAgICAgIGJyZWFrOwotCX0KLQllbHNlCi0JICAgIGh0
 dHBXcml0ZShjdXBzX3NlcnZlciwgYnVmZmVyLCBieXRlcyk7Ci0KLSAgICBpZiAoc3RhdHVzID09
 IEhUVFBfQ09OVElOVUUpCi0gICAgewotICAgICAgICBodHRwV3JpdGUoY3Vwc19zZXJ2ZXIsIGJ1
 ZmZlciwgMCk7Ci0Jd2hpbGUgKChzdGF0dXMgPSBodHRwVXBkYXRlKGN1cHNfc2VydmVyKSkgPT0g
 SFRUUF9DT05USU5VRSk7Ci0gICAgfQorICAgIC8qCisgICAgICogT3BlbiB0aGUgbG9jYWwgY29u
 ZmlnIGZpbGUuLi4KKyAgICAgKi8KIAotICAgIGlmIChzdGF0dXMgPT0gSFRUUF9VTkFVVEhPUkla
 RUQpCi0gICAgewotICAgICAgZnByaW50ZihzdGRlcnIsImN1cHNQdXRDb25mOiB1bmF1dGhvcml6
 ZWQuLi4iKTsKLQotICAgICAvKgotICAgICAgKiBGbHVzaCBhbnkgZXJyb3IgbWVzc2FnZS4uLgot
 ICAgICAgKi8KLQotICAgICAgaHR0cEZsdXNoKGN1cHNfc2VydmVyKTsKLQotICAgICAvKgotICAg
 ICAgKiBTZWUgaWYgd2UgY2FuIGRvIGxvY2FsIGF1dGhlbnRpY2F0aW9uLi4uCi0gICAgICAqLwot
 Ci0gICAgICBpZiAoY3Vwc19sb2NhbF9hdXRoKGN1cHNfc2VydmVyKSkKLSAgICAgICAgY29udGlu
 dWU7Ci0KLSAgICAgLyoKLSAgICAgICogU2VlIGlmIHdlIHNob3VsZCByZXRyeSB0aGUgY3VycmVu
 dCBkaWdlc3QgcGFzc3dvcmQuLi4KLSAgICAgICovCi0KLSAgICAgIGlmIChzdHJuY21wKGN1cHNf
 c2VydmVyLT5maWVsZHNbSFRUUF9GSUVMRF9XV1dfQVVUSEVOVElDQVRFXSwgIkJhc2ljIiwgNSkg
 PT0gMCB8fAotICAgICAgICAgIGRpZ2VzdF90cmllcyA+IDEgfHwgIXB3ZHN0cmluZ1swXSkKLSAg
 ICAgIHsKLSAgICAgICAvKgotCSogTm9wZSAtIGdldCBhIHBhc3N3b3JkIGZyb20gdGhlIHVzZXIu
 Li4KLQkqLwotCi0Jc25wcmludGYocHJvbXB0LCBzaXplb2YocHJvbXB0KSwgIlBhc3N3b3JkIGZv
 ciAlcyBvbiAlcz8gIiwgY3Vwc1VzZXIoKSwKLSAgICAgICAgCSBjdXBzX3NlcnZlci0+aG9zdG5h
 bWUpOwotCi0gICAgICAgIGlmICgocGFzc3dvcmQgPSBjdXBzR2V0UGFzc3dvcmQocHJvbXB0KSkg
 PT0gTlVMTCkKLQkgIGJyZWFrOwotCWlmICghcGFzc3dvcmRbMF0pCi0JICBicmVhazsKLQotICAg
 ICAgICBzdHJuY3B5KHB3ZHN0cmluZywgcGFzc3dvcmQsIHNpemVvZihwd2RzdHJpbmcpIC0gMSk7
 Ci0JcHdkc3RyaW5nW3NpemVvZihwd2RzdHJpbmcpIC0gMV0gPSAnXDAnOwotCi0gICAgICAgIGRp
 Z2VzdF90cmllcyA9IDA7Ci0gICAgICB9Ci0gICAgICBlbHNlCi0gICAgICAgIGRpZ2VzdF90cmll
 cyArKzsKLQotICAgICAvKgotICAgICAgKiBHb3QgYSBwYXNzd29yZDsgZW5jb2RlIGl0IGZvciB0
 aGUgc2VydmVyLi4uCi0gICAgICAqLwotCi0gICAgICBpZiAoc3RybmNtcChjdXBzX3NlcnZlci0+
 ZmllbGRzW0hUVFBfRklFTERfV1dXX0FVVEhFTlRJQ0FURV0sICJCYXNpYyIsIDUpID09IDApCi0g
 ICAgICB7Ci0gICAgICAgLyoKLQkqIEJhc2ljIGF1dGhlbnRpY2F0aW9uLi4uCi0JKi8KLQotCXNu
 cHJpbnRmKHBsYWluLCBzaXplb2YocGxhaW4pLCAiJXM6JXMiLCBjdXBzVXNlcigpLCBwd2RzdHJp
 bmcpOwotI2lmIENVUFNfVkVSU0lPTl9NQUpPUiA9PSAxICYmIENVUFNfVkVSU0lPTl9NSU5PUiA+
 PSAyCi0gICAgICAgaHR0cEVuY29kZTY0XzIoZW5jb2RlLCBzaXplb2YoZW5jb2RlKSwgcGxhaW4s
 IHNpemVvZihwbGFpbikpOwotI2Vsc2UKLSAgICAgICBodHRwRW5jb2RlNjQoZW5jb2RlLCBwbGFp
 bik7Ci0jZW5kaWYKLQlzbnByaW50ZihhdXRoc3RyaW5nLCBzaXplb2YoYXV0aHN0cmluZyksICJC
 YXNpYyAlcyIsIGVuY29kZSk7Ci0gICAgICB9Ci0gICAgICBlbHNlCi0gICAgICB7Ci0gICAgICAg
 LyoKLQkqIERpZ2VzdCBhdXRoZW50aWNhdGlvbi4uLgotCSovCi0KLSAgICAgICAgaHR0cEdldFN1
 YkZpZWxkKGN1cHNfc2VydmVyLCBIVFRQX0ZJRUxEX1dXV19BVVRIRU5USUNBVEUsICJyZWFsbSIs
 IHJlYWxtKTsKLSAgICAgICAgaHR0cEdldFN1YkZpZWxkKGN1cHNfc2VydmVyLCBIVFRQX0ZJRUxE
 X1dXV19BVVRIRU5USUNBVEUsICJub25jZSIsIG5vbmNlKTsKLQotCWh0dHBNRDUoY3Vwc1VzZXIo
 KSwgcmVhbG0sIHB3ZHN0cmluZywgZW5jb2RlKTsKLQlodHRwTUQ1RmluYWwobm9uY2UsICJHRVQi
 LCByZXNvdXJjZSwgZW5jb2RlKTsKLQlzbnByaW50ZihhdXRoc3RyaW5nLCBzaXplb2YoYXV0aHN0
 cmluZyksCi0JICAgICAgICAgIkRpZ2VzdCB1c2VybmFtZT1cIiVzXCIsIHJlYWxtPVwiJXNcIiwg
 bm9uY2U9XCIlc1wiLCAiCi0JICAgICAgICAgInJlc3BvbnNlPVwiJXNcIiIsIGN1cHNVc2VyKCks
 IHJlYWxtLCBub25jZSwgZW5jb2RlKTsKLSAgICAgIH0KKyAgICBmZCA9IG9wZW4obmFtZSwgT19S
 RE9OTFkpOworICAgIGlmIChmZCA8IDApIHsKKyAgICAgICAgLyoKKyAgICAgICAgICogQ2FuJ3Qg
 b3BlbiBmaWxlOyBjbG9zZSB0aGUgc2VydmVyIGNvbm5lY3Rpb24gYW5kIHJldHVybiBOVUxMLi4u
 CisgICAgICAgICAqLwogCi0gICAgICBjb250aW51ZTsKKyAgICAgICAgaHR0cEZsdXNoKGN1cHNf
 c2VydmVyKTsKKyAgICAgICAgaHR0cENsb3NlKGN1cHNfc2VydmVyKTsKKyAgICAgICAgY3Vwc19z
 ZXJ2ZXIgPSBOVUxMOworICAgICAgICByZXR1cm4gMDsKICAgICB9Ci0jaWZkZWYgSEFWRV9MSUJT
 U0wKLSAgICBlbHNlIGlmIChzdGF0dXMgPT0gSFRUUF9VUEdSQURFX1JFUVVJUkVEKQotICAgIHsK
 LSAgICAgLyoKLSAgICAgICogRmx1c2ggYW55IGVycm9yIG1lc3NhZ2UuLi4KLSAgICAgICovCi0K
 LSAgICAgIGh0dHBGbHVzaChjdXBzX3NlcnZlcik7Ci0KLSAgICAgLyoKLSAgICAgICogVXBncmFk
 ZSB3aXRoIGVuY3J5cHRpb24uLi4KLSAgICAgICovCi0KLSAgICAgIGh0dHBFbmNyeXB0aW9uKGN1
 cHNfc2VydmVyLCBIVFRQX0VOQ1JZUFRfUkVRVUlSRUQpOwotCi0gICAgIC8qCi0gICAgICAqIFRy
 eSBhZ2FpbiwgdGhpcyB0aW1lIHdpdGggZW5jcnlwdGlvbiBlbmFibGVkLi4uCi0gICAgICAqLwog
 Ci0gICAgICBjb250aW51ZTsKLSAgICB9Ci0jZW5kaWYgLyogSEFWRV9MSUJTU0wgKi8KLSAgfQot
 ICB3aGlsZSAoc3RhdHVzID09IEhUVFBfVU5BVVRIT1JJWkVEIHx8IHN0YXR1cyA9PSBIVFRQX1VQ
 R1JBREVfUkVRVUlSRUQpOwotCi0gLyoKLSAgKiBTZWUgaWYgd2UgYWN0dWFsbHkgZ290IHRoZSBm
 aWxlIG9yIGFuIGVycm9yLi4uCi0gICovCisgICAgLyoKKyAgICAgKiBBbmQgc2VuZCBhIHJlcXVl
 c3QgdG8gdGhlIEhUVFAgc2VydmVyLi4uCisgICAgICovCisKKyAgICBzdGF0dXMgPSBjdXBzUHV0
 RmQoY3Vwc19zZXJ2ZXIsICIvYWRtaW4vY29uZi9jdXBzZC5jb25mIiwgZmQpOwogCi0gIGlmIChz
 dGF0dXMgIT0gSFRUUF9DUkVBVEVEKQotICB7CiAgICAgaHR0cEZsdXNoKGN1cHNfc2VydmVyKTsK
 ICAgICBodHRwQ2xvc2UoY3Vwc19zZXJ2ZXIpOwogICAgIGN1cHNfc2VydmVyID0gTlVMTDsKICAg
 ICBjbG9zZShmZCk7Ci0gICAgcmV0dXJuIDA7Ci0gIH0KLQotICBjbG9zZShmZCk7Ci0KLSAgcmV0
 dXJuIDE7Ci19Ci0KLXN0YXRpYyBpbnQJCQkvKiBPIC0gMSBpZiBhdmFpbGFibGUsIDAgaWYgbm90
 ICovCi1jdXBzX2xvY2FsX2F1dGgoaHR0cF90ICpodHRwKQkvKiBJIC0gQ29ubmVjdGlvbiAqLwot
 ewotICBpbnQJCXBpZDsJCS8qIEN1cnJlbnQgcHJvY2VzcyBJRCAqLwotICBGSUxFCQkqZnA7CQkv
 KiBDZXJ0aWZpY2F0ZSBmaWxlICovCi0gIGNoYXIJCWZpbGVuYW1lWzEwMjRdLAkvKiBDZXJ0aWZp
 Y2F0ZSBmaWxlbmFtZSAqLwotCQljZXJ0aWZpY2F0ZVszM107LyogQ2VydGlmaWNhdGUgc3RyaW5n
 ICovCi0gIGNvbnN0IGNoYXIJKnJvb3Q7CQkvKiBTZXJ2ZXIgcm9vdCBkaXJlY3RvcnkgKi8KLQot
 Ci0gLyoKLSAgKiBTZWUgaWYgd2UgYXJlIGFjY2Vzc2luZyBsb2NhbGhvc3QuLi4KLQl0aGUgc3Ry
 dWN0IGhhcyBjaGFuZ2VkIGluIG5ld2VyIHZlcnNpb25zIC0gUGlnZ1ogKGFkYW1AcGlnZ3ouY28u
 dWspCi0gICovCi0jaWYgQ1VQU19WRVJTSU9OX01BSk9SID09IDEgJiYgQ1VQU19WRVJTSU9OX01J
 Tk9SID49IDIKLSAgICAgICAgaWYgKCFodHRwQWRkckxvY2FsaG9zdChodHRwKSkKLSNlbHNlCi0J
 aWYgKG50b2hsKCooaW50KikmaHR0cC0+aG9zdGFkZHIuc2luX2FkZHIpICE9IDB4N2YwMDAwMDEg
 JiYKLSAgICAgIHN0cmNhc2VjbXAoaHR0cC0+aG9zdG5hbWUsICJsb2NhbGhvc3QiKSAhPSAwKQot
 I2VuZGlmCi0gICByZXR1cm4gKDApOwotCi0gLyoKLSAgKiBUcnkgb3BlbmluZyBhIGNlcnRpZmlj
 YXRlIGZpbGUgZm9yIHRoaXMgUElELiAgSWYgdGhhdCBmYWlscywKLSAgKiB0cnkgdGhlIHJvb3Qg
 Y2VydGlmaWNhdGUuLi4KLSAgKi8KLQotICBpZiAoKHJvb3QgPSBnZXRlbnYoIkNVUFNfU0VSVkVS
 Uk9PVCIpKSA9PSBOVUxMKQotICAgIHJvb3QgPSBDVVBTX1NFUlZFUlJPT1Q7Ci0KLSAgcGlkID0g
 Z2V0cGlkKCk7Ci0gIHNucHJpbnRmKGZpbGVuYW1lLCBzaXplb2YoZmlsZW5hbWUpLCAiJXMvY2Vy
 dHMvJWQiLCByb290LCBwaWQpOwotICBpZiAoKGZwID0gZm9wZW4oZmlsZW5hbWUsICJyIikpID09
 IE5VTEwgJiYgcGlkID4gMCkKLSAgewotICAgIHNucHJpbnRmKGZpbGVuYW1lLCBzaXplb2YoZmls
 ZW5hbWUpLCAiJXMvY2VydHMvMCIsIHJvb3QpOwotICAgIGZwID0gZm9wZW4oZmlsZW5hbWUsICJy
 Iik7Ci0gIH0KLQotICBpZiAoZnAgPT0gTlVMTCkKLSAgICByZXR1cm4gKDApOwotCi0gLyoKLSAg
 KiBSZWFkIHRoZSBjZXJ0aWZpY2F0ZSBmcm9tIHRoZSBmaWxlLi4uCi0gICovCi0KLSAgZmdldHMo
 Y2VydGlmaWNhdGUsIHNpemVvZihjZXJ0aWZpY2F0ZSksIGZwKTsKLSAgZmNsb3NlKGZwKTsKLQot
 IC8qCi0gICogU2V0IHRoZSBhdXRob3JpemF0aW9uIHN0cmluZyBhbmQgcmV0dXJuLi4uCi0gICov
 Ci0KLSAgc25wcmludGYoYXV0aHN0cmluZywgc2l6ZW9mKGF1dGhzdHJpbmcpLCAiTG9jYWwgJXMi
 LCBjZXJ0aWZpY2F0ZSk7CiAKLSAgcmV0dXJuICgxKTsKKyAgICAvKgorICAgICAqIFNlZSBpZiB3
 ZSBhY3R1YWxseSBnb3QgdGhlIGZpbGUgb3IgYW4gZXJyb3IuLi4KKyAgICAgKi8KKworICAgIGlm
 IChzdGF0dXMgIT0gSFRUUF9DUkVBVEVEKQorICAgICAgICByZXR1cm4gMDsKKyAgICBlbHNlCisg
 ICAgICAgIHJldHVybiAxOwogfQo=
 ------=_Part_9997_10835362.1191383383044
 Content-Type: text/x-c++src; name="patch-kdeprint_cups_ipprequest.cpp"
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename="patch-kdeprint_cups_ipprequest.cpp";
  filename="patch-kdeprint_cups_ipprequest.cpp"
 X-Attachment-Id: file2
 
 LS0tIGtkZXByaW50L2N1cHMvaXBwcmVxdWVzdC5jcHAtb3JpZwkyMDA3LTAxLTE1IDA1OjM0OjE5
 LjAwMDAwMDAwMCAtMDYwMAorKysga2RlcHJpbnQvY3Vwcy9pcHByZXF1ZXN0LmNwcAkyMDA3LTEw
 LTAyIDIyOjIxOjUyLjM1OTg5MzEyOSAtMDUwMApAQCAtMzEwLDcgKzMxMCw3IEBACiAJfQogCiAj
 aWZkZWYgSEFWRV9DVVBTX05PX1BXRF9DQUNIRQotCXN0cm5jcHkoIEhUVFAtPmF1dGhzdHJpbmcs
 IGN1cHNfYXV0aHN0cmluZy5kYXRhKCksIEhUVFBfTUFYX1ZBTFVFICk7CisJaHR0cFNldEF1dGhT
 dHJpbmcoIEhUVFAsIE5VTEwsIGN1cHNfYXV0aHN0cmluZy5kYXRhKCkgKTsKICNlbmRpZgogCiAJ
 aWYgKGR1bXBfID4gMCkKQEAgLTMyMCw3ICszMjAsNyBAQAogCiAJcmVxdWVzdF8gPSBjdXBzRG9G
 aWxlUmVxdWVzdChIVFRQLCByZXF1ZXN0XywgKHJlcy5pc0VtcHR5KCkgPyAiLyIgOiByZXMubGF0
 aW4xKCkpLCAoZmlsZW5hbWUuaXNFbXB0eSgpID8gTlVMTCA6IGZpbGVuYW1lLmxhdGluMSgpKSk7
 CiAjaWZkZWYgSEFWRV9DVVBTX05PX1BXRF9DQUNIRQotCWN1cHNfYXV0aHN0cmluZyA9IEhUVFAt
 PmF1dGhzdHJpbmc7CisJY3Vwc19hdXRoc3RyaW5nID0gaHR0cEdldEF1dGhTdHJpbmcoIEhUVFAg
 KTsKICNlbmRpZgogCWh0dHBDbG9zZShIVFRQKTsKIAo=
 ------=_Part_9997_10835362.1191383383044--