From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Feb 15 16:30:11 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 83B5F1065670 for ; Mon, 15 Feb 2010 16:30:11 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 594D38FC13 for ; Mon, 15 Feb 2010 16:30:11 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o1FGUBGm050754 for ; Mon, 15 Feb 2010 16:30:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o1FGUBfo050751; Mon, 15 Feb 2010 16:30:11 GMT (envelope-from gnats) Date: Mon, 15 Feb 2010 16:30:11 GMT Message-Id: <201002151630.o1FGUBfo050751@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: "b. f." Cc: Subject: Re: ports/143954: [PATCH]x11/rxvt-devel: unbreak on 9-CURRENT after utmp/utmpx changes X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "b. f." List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Feb 2010 16:30:11 -0000 The following reply was made to PR ports/143954; it has been noted by GNATS. From: "b. f." To: bug-followup@freebsd.org Cc: akosela@andykosela.com Subject: Re: ports/143954: [PATCH]x11/rxvt-devel: unbreak on 9-CURRENT after utmp/utmpx changes Date: Mon, 15 Feb 2010 11:23:18 -0500 --0016e6d46d7dff6ad6047fa608b5 Content-Type: text/plain; charset=ISO-8859-1 Sorry, I forgot that the changes to the patch should also be conditional on ${OSVERSION}. Please use the attached diff instead: note that patch-src::logging.c is renamed as utmp_patch-src::logging.c, and another patch is added: utmpx_patch-src::logging.c. The x11/rxvt port probably needs similar changes. b. --0016e6d46d7dff6ad6047fa608b5 Content-Type: text/plain; charset=US-ASCII; name="rxvt_devel_utmpx_diff.txt" Content-Disposition: attachment; filename="rxvt_devel_utmpx_diff.txt" Content-Transfer-Encoding: base64 X-Attachment-Id: file0 ZGlmZiAteCAnMy4qJyAteCAnKm9sZC4qJyAteCAnKm5ldy4qJyAtcnVOIHJ4dnQtZGV2ZWwub3Jp Zy9NYWtlZmlsZSByeHZ0LWRldmVsL01ha2VmaWxlCi0tLSByeHZ0LWRldmVsLm9yaWcvTWFrZWZp bGUJMjAxMC0wMi0xNSAwOToyMDoyNS4wMDAwMDAwMDAgLTA1MDAKKysrIHJ4dnQtZGV2ZWwvTWFr ZWZpbGUJMjAxMC0wMi0xNSAxMTowNzozMS4wMDAwMDAwMDAgLTA1MDAKQEAgLTM5LDcgKzM5LDcg QEAKIAkJWElNCQkiQnVpbGQgd2l0aCBYSU0gc3VwcG9ydCIgb2ZmIFwKIAkJWFRFUk0JCSJCdWls ZCB3aXRoIFh0ZXJtIHNjcm9sbGJhciIgb2ZmCiAKLUNPTkZJR1VSRV9BUkdTPQktLWVuYWJsZS11 dG1wIC0tZW5hYmxlLXd0bXAgLS1lbmFibGUtbGFuZ3VhZ2VzIFwKK0NPTkZJR1VSRV9BUkdTPQkt LWVuYWJsZS11dG1wIC0tZW5hYmxlLWxhc3Rsb2cgXAogCQktLXdpdGgteHBtIC0tZW5hYmxlLXhw bS1iYWNrZ3JvdW5kIC0tZW5hYmxlLXNoYXJlZCBcCiAJCS0tZW5hYmxlLW1vdXNld2hlZWwgLS1k aXNhYmxlLWxhbmd1YWdlcwogVVNFX0xEQ09ORklHPQl5ZXMKQEAgLTQ4LDYgKzQ4LDE0IEBACiAK IC5pbmNsdWRlIDxic2QucG9ydC5wcmUubWs+CiAKKy5pZiAke09TVkVSU0lPTn0gPj0gOTAwMDA3 CitDT05GSUdVUkVfQVJHUys9CS0tZGlzYWJsZS13dG1wCitFWFRSQV9QQVRDSEVTKz0JJHtGSUxF U0RJUn0vdXRtcHhfcGF0Y2gtc3JjOjpsb2dnaW5nLmMKKy5lbHNlCitDT05GSUdVUkVfQVJHUys9 CS0tZW5hYmxlLXd0bXAKK0VYVFJBX1BBVENIRVMrPQkke0ZJTEVTRElSfS91dG1wX3BhdGNoLXNy Yzo6bG9nZ2luZy5jCisuZW5kaWYKKwogIyBlbmFibGUgMjU2IGNvbG9yCiAuaWYgZGVmaW5lZChX SVRIXzI1Nl9DT0xPUikKIENPTkZJR1VSRV9BUkdTKz0JLS1lbmFibGUtMjU2LWNvbG9yCmRpZmYg LXggJzMuKicgLXggJypvbGQuKicgLXggJypuZXcuKicgLXJ1TiByeHZ0LWRldmVsLm9yaWcvZmls ZXMvcGF0Y2gtc3JjOjpsb2dnaW5nLmMgcnh2dC1kZXZlbC9maWxlcy9wYXRjaC1zcmM6OmxvZ2dp bmcuYwotLS0gcnh2dC1kZXZlbC5vcmlnL2ZpbGVzL3BhdGNoLXNyYzo6bG9nZ2luZy5jCTIwMTAt MDItMTUgMDk6MjA6MjUuMDAwMDAwMDAwIC0wNTAwCisrKyByeHZ0LWRldmVsL2ZpbGVzL3BhdGNo LXNyYzo6bG9nZ2luZy5jCTE5NjktMTItMzEgMTk6MDA6MDAuMDAwMDAwMDAwIC0wNTAwCkBAIC0x LDEyICswLDAgQEAKLS0tLSBzcmMvbG9nZ2luZy5jCi0rKysgc3JjL2xvZ2dpbmcuYwotQEAgLTgy LDcgKzgyLDggQEAKLSAgICAgZWxzZSBpZiAoc3NjYW5mKHB0eSwgInB0cy8lZCIsICZpKSA9PSAx KQotIAlzcHJpbnRmKHV0X2lkLCAidnQlMDJ4IiwgKGkgJiAweGZmKSk7CS8qIHN5c3YgbmFtaW5n ICovCi0gI2VuZGlmCi0tICAgIGVsc2UgaWYgKFNUUk5DTVAocHR5LCAicHR5IiwgMykgJiYgU1RS TkNNUChwdHksICJ0dHkiLCAzKSkgewotKyAgICBlbHNlIGlmIChTVFJOQ01QKHB0eSwgInB0eSIs IDMpICYmIFNUUk5DTVAocHR5LCAidHR5IiwgMykgJiYKLSsgICAgICAgIFNUUk5DTVAocHR5LCAi cHRzLyIsIDQpKSB7Ci0gCXJ4dnRfcHJpbnRfZXJyb3IoImNhbid0IHBhcnNlIHR0eSBuYW1lIFwi JXNcIiIsIHB0eSk7Ci0gCXJldHVybjsKLSAgICAgfQpkaWZmIC14ICczLionIC14ICcqb2xkLion IC14ICcqbmV3LionIC1ydU4gcnh2dC1kZXZlbC5vcmlnL2ZpbGVzL3V0bXBfcGF0Y2gtc3JjOjps b2dnaW5nLmMgcnh2dC1kZXZlbC9maWxlcy91dG1wX3BhdGNoLXNyYzo6bG9nZ2luZy5jCi0tLSBy eHZ0LWRldmVsLm9yaWcvZmlsZXMvdXRtcF9wYXRjaC1zcmM6OmxvZ2dpbmcuYwkxOTY5LTEyLTMx IDE5OjAwOjAwLjAwMDAwMDAwMCAtMDUwMAorKysgcnh2dC1kZXZlbC9maWxlcy91dG1wX3BhdGNo LXNyYzo6bG9nZ2luZy5jCTIwMTAtMDItMTUgMTE6MDE6MTUuMDAwMDAwMDAwIC0wNTAwCkBAIC0w LDAgKzEsMTIgQEAKKy0tLSBzcmMvbG9nZ2luZy5jCisrKysgc3JjL2xvZ2dpbmcuYworQEAgLTgy LDcgKzgyLDggQEAKKyAgICAgZWxzZSBpZiAoc3NjYW5mKHB0eSwgInB0cy8lZCIsICZpKSA9PSAx KQorIAlzcHJpbnRmKHV0X2lkLCAidnQlMDJ4IiwgKGkgJiAweGZmKSk7CS8qIHN5c3YgbmFtaW5n ICovCisgI2VuZGlmCistICAgIGVsc2UgaWYgKFNUUk5DTVAocHR5LCAicHR5IiwgMykgJiYgU1RS TkNNUChwdHksICJ0dHkiLCAzKSkgeworKyAgICBlbHNlIGlmIChTVFJOQ01QKHB0eSwgInB0eSIs IDMpICYmIFNUUk5DTVAocHR5LCAidHR5IiwgMykgJiYKKysgICAgICAgIFNUUk5DTVAocHR5LCAi cHRzLyIsIDQpKSB7CisgCXJ4dnRfcHJpbnRfZXJyb3IoImNhbid0IHBhcnNlIHR0eSBuYW1lIFwi JXNcIiIsIHB0eSk7CisgCXJldHVybjsKKyAgICAgfQpkaWZmIC14ICczLionIC14ICcqb2xkLion IC14ICcqbmV3LionIC1ydU4gcnh2dC1kZXZlbC5vcmlnL2ZpbGVzL3V0bXB4X3BhdGNoLXNyYzo6 bG9nZ2luZy5jIHJ4dnQtZGV2ZWwvZmlsZXMvdXRtcHhfcGF0Y2gtc3JjOjpsb2dnaW5nLmMKLS0t IHJ4dnQtZGV2ZWwub3JpZy9maWxlcy91dG1weF9wYXRjaC1zcmM6OmxvZ2dpbmcuYwkxOTY5LTEy LTMxIDE5OjAwOjAwLjAwMDAwMDAwMCAtMDUwMAorKysgcnh2dC1kZXZlbC9maWxlcy91dG1weF9w YXRjaC1zcmM6OmxvZ2dpbmcuYwkyMDEwLTAxLTE1IDA3OjU2OjAxLjAwMDAwMDAwMCAtMDUwMApA QCAtMCwwICsxLDUwIEBACistLS0gc3JjL2xvZ2dpbmcuYworKysrIHNyYy9sb2dnaW5nLmMKK0BA IC04Miw3ICs4Miw4IEBACisgICAgIGVsc2UgaWYgKHNzY2FuZihwdHksICJwdHMvJWQiLCAmaSkg PT0gMSkKKyAJc3ByaW50Zih1dF9pZCwgInZ0JTAyeCIsIChpICYgMHhmZikpOwkvKiBzeXN2IG5h bWluZyAqLworICNlbmRpZgorLSAgICBlbHNlIGlmIChTVFJOQ01QKHB0eSwgInB0eSIsIDMpICYm IFNUUk5DTVAocHR5LCAidHR5IiwgMykpIHsKKysgICAgZWxzZSBpZiAoU1RSTkNNUChwdHksICJw dHkiLCAzKSAmJiBTVFJOQ01QKHB0eSwgInR0eSIsIDMpICYmCisrICAgICAgICBTVFJOQ01QKHB0 eSwgInB0cy8iLCA0KSkgeworIAlyeHZ0X3ByaW50X2Vycm9yKCJjYW4ndCBwYXJzZSB0dHkgbmFt ZSBcIiVzXCIiLCBwdHkpOworIAlyZXR1cm47CisgICAgIH0KK0BAIC0xMzcsNyArMTM4LDkgQEAK KyAgICAgU1RSTkNQWSh1dHgtPnV0X3VzZXIsIChwd2VudCAmJiBwd2VudC0+cHdfbmFtZSkgPyBw d2VudC0+cHdfbmFtZSA6ICI/IiwKKyAJICAgIHNpemVvZih1dHgtPnV0X3VzZXIpKTsKKyAgICAg U1RSTkNQWSh1dHgtPnV0X2lkLCB1dF9pZCwgc2l6ZW9mKHV0eC0+dXRfaWQpKTsKKysjaWYgMAor ICAgICB1dHgtPnV0X3Nlc3Npb24gPSBnZXRzaWQoMCk7CisrI2VuZGlmCisgICAgIHV0eC0+dXRf dHYudHZfc2VjID0gdGltZShOVUxMKTsKKyAgICAgdXR4LT51dF90di50dl91c2VjID0gMDsKKyAg ICAgdXR4LT51dF9waWQgPSByLT5oLT5jbWRfcGlkOworQEAgLTIwMiw3ICsyMDUsNyBAQAorIAly eHZ0X3VwZGF0ZV93dG1wKFJYVlRfV1RNUF9GSUxFLCB1dCk7CisgIyAgZW5kaWYKKyAjIGVuZGlm CistIyBpZmRlZiBIQVZFX1NUUlVDVF9VVE1QWAorKyMgaWYgMAorIAl1cGR3dG1weChSWFZUX1dU TVBYX0ZJTEUsIHV0eCk7CisgIyBlbmRpZgorICAgICB9CitAQCAtMjU0LDcgKzI1Nyw5IEBACisg ICAgIGlmICgodG1wdXR4ID0gZ2V0dXR4aWQodXR4KSkpCS8qIHBvc2l0aW9uIHRvIGVudHJ5IGlu IHV0bXAgZmlsZSAqLworIAl1dHggPSB0bXB1dHg7CisgICAgIHV0eC0+dXRfdHlwZSA9IERFQURf UFJPQ0VTUzsKKysjaWYgMAorICAgICB1dHgtPnV0X3Nlc3Npb24gPSBnZXRzaWQoMCk7CisrI2Vu ZGlmCisgICAgIHV0eC0+dXRfdHYudHZfc2VjID0gdGltZShOVUxMKTsKKyAgICAgdXR4LT51dF90 di50dl91c2VjID0gMDsKKyAjZW5kaWYKK0BAIC0yNzQsNyArMjc5LDcgQEAKKyAJcnh2dF91cGRh dGVfd3RtcChSWFZUX1dUTVBfRklMRSwgdXQpOworICMgIGVuZGlmCisgIyBlbmRpZgorLSMgaWZk ZWYgSEFWRV9TVFJVQ1RfVVRNUFgKKysjIGlmIDAKKyAJdXBkd3RtcHgoUlhWVF9XVE1QWF9GSUxF LCB1dHgpOworICMgZW5kaWYKKyAgICAgfQo= --0016e6d46d7dff6ad6047fa608b5--