Date: Sun, 28 Mar 2010 03:07:15 -0700 From: Garrett Cooper <gcooper@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org, freebsd-bugs@freebsd.org Subject: Re: bin/145101: [patch] pkg_version(1) - remove hardcoded INDEX filename versioning checks from lib.h and version/perform.c Message-ID: <364299f41003280307i3d5c1307na94a7a0028a902e0@mail.gmail.com> In-Reply-To: <201003281000.o2SA0BjB097677@freefall.freebsd.org> References: <201003280952.o2S9qBu6069448@www.freebsd.org> <201003281000.o2SA0BjB097677@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--001485f90dfe9f37af0482d98fe9 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On Sun, Mar 28, 2010 at 3:00 AM, <FreeBSD-gnats-submit@freebsd.org> wrote: > Thank you very much for your problem report. > It has the internal identification `bin/145101'. > The individual assigned to look at your > report is: freebsd-bugs. > > You can access the state of your problem report at any time > via this link: > > http://www.freebsd.org/cgi/query-pr.cgi?pr=3D145101 > >>Category: =A0 =A0 =A0 bin >>Responsible: =A0 =A0freebsd-bugs >>Synopsis: =A0 =A0 =A0 [patch] pkg_version(1) - remove hardcoded INDEX fil= ename versioning checks from lib.h and version/perform.c >>Arrival-Date: =A0 Sun Mar 28 10:00:11 UTC 2010 Here's a better version that detects debunk UNAME_r version info and deals with it in a proper manner. Thanks, -Garrett --001485f90dfe9f37af0482d98fe9 Content-Type: text/plain; charset=US-ASCII; name="simplify-pkg_version-index-versioning.diff.txt" Content-Disposition: attachment; filename="simplify-pkg_version-index-versioning.diff.txt" Content-Transfer-Encoding: base64 X-Attachment-Id: f_g7bopxuv0 PT09PSAvL2RlcG90L3Byb2plY3RzL3NvYzIwMDcvZ2Nvb3Blci1wa2dfaW5zdGFsbC1lbmhhbmNl bWVudHMtc2ltcGxpZmllZC91c3Iuc2Jpbi9wa2dfaW5zdGFsbC9saWIvbGliLmgjMiAtIC9zY3Jh dGNoL2ZyZWVic2QvcGVyZm9yY2UvcGtnX2luc3RhbGwtZW5oYW5jZW1lbnRzL3Vzci5zYmluL3Br Z19pbnN0YWxsL2xpYi9saWIuaCA9PT09CkBAIC0yOCw2ICsyOCw3IEBACiAjaW5jbHVkZSA8c3lz L2ZpbGUuaD4KICNpbmNsdWRlIDxzeXMvc3RhdC5oPgogI2luY2x1ZGUgPHN5cy9xdWV1ZS5oPgor I2luY2x1ZGUgPHN5cy91dHNuYW1lLmg+CiAjaW5jbHVkZSA8Y3R5cGUuaD4KICNpbmNsdWRlIDxk aXJlbnQuaD4KICNpbmNsdWRlIDxlcnIuaD4KQEAgLTg2LDE4ICs4Nyw2IEBACiAjZGVmaW5lIERJ U1BMQVlfRk5BTUUJCSIrRElTUExBWSIKICNkZWZpbmUgTVRSRUVfRk5BTUUJCSIrTVRSRUVfRElS UyIKIAotI2lmIGRlZmluZWQoX19GcmVlQlNEX3ZlcnNpb24pICYmIF9fRnJlZUJTRF92ZXJzaW9u ID49IDkwMDAwMAotI2RlZmluZSBJTkRFWF9GTkFNRQkJIklOREVYLTkiCi0jZWxpZiBkZWZpbmVk KF9fRnJlZUJTRF92ZXJzaW9uKSAmJiBfX0ZyZWVCU0RfdmVyc2lvbiA+PSA4MDAwMDAKLSNkZWZp bmUgSU5ERVhfRk5BTUUJCSJJTkRFWC04IgotI2VsaWYgZGVmaW5lZChfX0ZyZWVCU0RfdmVyc2lv bikgJiYgX19GcmVlQlNEX3ZlcnNpb24gPj0gNzAwMDAwCi0jZGVmaW5lIElOREVYX0ZOQU1FCQki SU5ERVgtNyIKLSNlbGlmIGRlZmluZWQoX19GcmVlQlNEX3ZlcnNpb24pICYmIF9fRnJlZUJTRF92 ZXJzaW9uID49IDYwMDAwMAotI2RlZmluZSBJTkRFWF9GTkFNRQkJIklOREVYLTYiCi0jZWxzZQot I2RlZmluZSBJTkRFWF9GTkFNRQkJIklOREVYIgotI2VuZGlmCi0KICNkZWZpbmUgQ01EX0NIQVIJ CSdAJwkvKiBwcmVmaXggZm9yIGV4dGVuZGVkIFBMSVNUIGNtZCAqLwogCiAvKiBUaGUgbmFtZSBv ZiB0aGUgInByZWZpeCIgZW52aXJvbm1lbnQgdmFyaWFibGUgZ2l2ZW4gdG8gc2NyaXB0cyAqLwo9 PT09IC8vZGVwb3QvcHJvamVjdHMvc29jMjAwNy9nY29vcGVyLXBrZ19pbnN0YWxsLWVuaGFuY2Vt ZW50cy1zaW1wbGlmaWVkL3Vzci5zYmluL3BrZ19pbnN0YWxsL3ZlcnNpb24vcGVyZm9ybS5jIzEg LSAvc2NyYXRjaC9mcmVlYnNkL3BlcmZvcmNlL3BrZ19pbnN0YWxsLWVuaGFuY2VtZW50cy91c3Iu c2Jpbi9wa2dfaW5zdGFsbC92ZXJzaW9uL3BlcmZvcm0uYyA9PT09CkBAIC0zNSwyOCArMzUsNDQg QEAKIHN0YXRpYyB2b2lkIHNob3dfdmVyc2lvbihQYWNrYWdlLCBjb25zdCBjaGFyICosIGNvbnN0 IGNoYXIgKik7CiAKIC8qCi0gKiBUaGlzIGlzIHRoZSB0cmFkaXRpb25hbCBwa2dfcGVyZm9ybSwg ZXhjZXB0IHRoYXQgdGhlIGFyZ3VtZW50IGlzIF9ub3RfCi0gKiBhIGxpc3Qgb2YgcGFja2FnZXMu IEl0IGlzIHRoZSBpbmRleCBmaWxlIGZyb20gdGhlIGNvbW1hbmQgbGluZS4KKyAqIFRoaXMgaXMg dGhlIHRyYWRpdGlvbmFsIHBrZ19wZXJmb3JtLCBleGNlcHQgdGhhdCB0aGUgYXJndW1lbnQgaXMg X25vdF8gYQorICogbGlzdCBvZiBwYWNrYWdlcy4gSXQgaXMgdGhlIGluZGV4IGZpbGUgZnJvbSB0 aGUgY29tbWFuZCBsaW5lLgorICoKKyAqIFdlIGxvb3Agb3ZlciB0aGUgaW5zdGFsbGVkIHBhY2th Z2VzLCBtYXRjaGluZyB0aGVtIHdpdGggdGhlIC1zIGZsYWcgaWYKKyAqIG5lZWRlZCBhbmQgY2Fs bGluZyBwa2dfZG8oKS4gQmVmb3JlaGFuZCB3ZSBzZXQgdXAgYSBmZXcgdGhpbmdzLCBhbmQgYWZ0 ZXIKKyAqIHdlIHRlYXIgdGhlbSBkb3duLi4uCiAgKgotICogV2UgbG9vcCBvdmVyIHRoZSBpbnN0 YWxsZWQgcGFja2FnZXMsIG1hdGNoaW5nIHRoZW0gd2l0aCB0aGUgLXMgZmxhZwotICogaWYgbmVl ZGVkIGFuZCBjYWxsaW5nIHBrZ19kbygpLiBCZWZvcmUgaGFuZCB3ZSBzZXQgdXAgYSBmZXcgdGhp bmdzLAotICogYW5kIGFmdGVyIHdlIHRlYXIgdGhlbSBkb3duLi4uCisgKiBSZXR1cm5zIDAgb24g c3VjY2Vzcywgbm9uLXplcm8gb24gZmFpbHVyZSwgY29ycmVzcG9uZGluZyB0byB0aGUgbnVtYmVy IG9mCisgKiBmYWlsZWQgYXR0ZW1wdHMgdG8gYWNjZXNzIHRoZSBJTkRFWC4KICAqLwogaW50CiBw a2dfcGVyZm9ybShjaGFyICoqaW5kZXhhcmcpCiB7CiAgICAgY2hhciAqKnBrZ3MsICpwYXRbMl0s ICoqcGF0dGVybnM7CiAgICAgc3RydWN0IGluZGV4X2VudHJ5ICppZTsKLSAgICBpbnQgaSwgZXJy X2NudCA9IDA7CisgICAgaW50IGksIGVycl9jbnQgPSAwLCByZWxfbWFqb3JfdmVyOwogICAgIGlu dCBNYXRjaFR5cGU7CiAKKyAgICBzdHJ1Y3QgdXRzbmFtZSB1OworCisgICAgaWYgKHVuYW1lKCZ1 KSA9PSAtMSkgeworCXdhcm4oIiVzLiVzOiBmYWlsZWQgdG8gZGV0ZXJtaW5lIHVuYW1lIGluZm9y bWF0aW9uIiwgcHJvZ25hbWUsCisJICAgIF9fZnVuY19fKTsKKwlyZXR1cm4gMTsKKyAgICB9IGVs c2UgaWYgKChyZWxfbWFqb3JfdmVyID0gKGludCkgc3RydG9sKHUucmVsZWFzZSwgTlVMTCwgMTAp KSA8PSAwKSB7CisJd2FybngoIiVzLiVzOiBiYWQgcmVsZWFzZSB2ZXJzaW9uIHNwZWNpZmllZDog JXMiLCBwcm9nbmFtZSwgX19mdW5jX18sCisJICAgIHUucmVsZWFzZSk7CisJcmV0dXJuIDE7Cisg ICAgfQorCiAgICAgLyoKICAgICAgKiBUcnkgdG8gZmluZCBhbmQgb3BlbiB0aGUgSU5ERVguIFdl IG9ubHkgY2hlY2sgSW5kZXhGaWxlICE9IE5VTEwKICAgICAgKiBsYXRlciwgaWYgd2UgYWN0dWFs bHkgbmVlZCB0aGUgSU5ERVguCiAgICAgICovCi0gICAgaWYgKCppbmRleGFyZyA9PSBOVUxMKQot CXNucHJpbnRmKEluZGV4UGF0aCwgc2l6ZW9mKEluZGV4UGF0aCksICIlcy8lcyIsIFBPUlRTX0RJ UiwgSU5ERVhfRk5BTUUpOwotICAgIGVsc2UKKyAgICBpZiAoKmluZGV4YXJnID09IE5VTEwpIHsK KwlzbnByaW50ZihJbmRleFBhdGgsIHNpemVvZihJbmRleFBhdGgpLCAiJXMvSU5ERVgtJWQiLCBQ T1JUU19ESVIsCisJICAgIHJlbF9tYWpvcl92ZXIpOworICAgIH0gZWxzZQogCXN0cmxjcHkoSW5k ZXhQYXRoLCAqaW5kZXhhcmcsIHNpemVvZihJbmRleFBhdGgpKTsKICAgICBpZiAoaXNVUkwoSW5k ZXhQYXRoKSkKIAlJbmRleEZpbGUgPSBmZXRjaEdldFVSTChJbmRleFBhdGgsICIiKTsK --001485f90dfe9f37af0482d98fe9--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?364299f41003280307i3d5c1307na94a7a0028a902e0>