From xilonmu@gmail.com Tue Jan 1 02:53:22 2008 From: Sebastian To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] [AUR2] How to go about official dependencies Date: Tue, 01 Jan 2008 16:53:21 +0900 Message-ID: In-Reply-To: <428d921d0712310858p397e2a77y86b21d0d4aa9d54a@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3577307445045146299==" --===============3577307445045146299== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable > I don't think this is viable. > Remember, the AUR was (should continue to be) designed in such a way > that it could be run by someone not on the arch server. Direct > database access to the main arch repository would be a huge step in > the wrong direction for this, in my opinion. The database servers don't need to be on the same host in order to connect to them. It's possible to make use of the database without losing any modularity on AUR2's part. I was talking with Dan about "standardising" the main site and AUR, mainly in terms of Django models, because the two sites are so similar. AUR could easily simply be a Django app that the main site uses. It's a bit off-topic, but I don't think integrating the sites in some way (at least to be able to duplicate code easily) would be a bad move. > > Here's the schema for the package, category and repository relations, in > > case you'd like more insight into the database structure. As you will see > > it would be a little difficult to make a record with just the URL > > pointing to a search on the main site. > > {% for dep in pkg.deps %} > {{ dep }}
> {% endfor %} > > or whatever.. > > The main site search functionality returns the details page if there > is a single match. This isn't quite "optimal", as for packages like > vim, it will return a list. > > A better solution may be to add an additional search argument to the > search page, such that 'exact' matches are only attempted instead. eg > a seach on vim would only return details on the vim package itself, > instead of a list of packages with "vim" in the name. In order to do it that way we'd need to add another field like "official_deps" to the Packages relation. It would be a foreign key to an official_dependency relation holding only the name of the package (and possibly the url). Not a great solution, but possibly the quickest to implement. --===============3577307445045146299==-- From eliott@cactuswax.net Tue Jan 1 05:00:15 2008 From: eliott To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] [AUR2] How to go about official dependencies Date: Tue, 01 Jan 2008 02:00:13 -0800 Message-ID: <428d921d0801010200p2297ded6l4510c7efb29f8548@mail.gmail.com> In-Reply-To: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8848844113319413002==" --===============8848844113319413002== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit > The database servers don't need to be on the same host in order to > connect to them. It's possible to make use of the database without > losing any modularity on AUR2's part. Actually, it isn't. You *would* lose modularity, and you would have even tighter coupling. Additionally, remote sql invocation over arbitrary remote networks isn't the greatest idea from both a performance and a security standpoint. The goal of the AUR2 should not be tighter coupling. > I was talking with Dan about "standardising" the main site and AUR, > mainly in terms of Django models, because the two sites are so > similar. AUR could easily simply be a Django app that the main site > uses. It's a bit off-topic, but I don't think integrating the sites in > some way (at least to be able to duplicate code easily) would be a bad > move. With the rearchitecture of the main site, I don't think this is very feasible. I strongly feel that the AUR should remain "it's own app". --===============8848844113319413002==-- From wizzomafizzo@gmail.com Wed Jan 2 15:53:58 2008 From: Callan Barrett To: aur-dev@lists.archlinux.org Subject: [aur-dev] [PATCH] Adds support for TUs and devs to disown packages they do not own Date: Thu, 03 Jan 2008 05:53:50 +0900 Message-ID: <33f0f4ec0801021253w63ed465bn6873c0e366ba8726@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3941391908007489410==" --===============3941391908007489410== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit This is to add support for either devs or TUs to disown packages whether they own them or not. I know of countless times where I or another TU have been asked to orphan packages for someone and end up having to adopt the package first and then disown it, this gets really tedious for more than one package. As far as I can tell there's no other way to disown packages you don't own and if there is at least this is a more obvious way, pretty sure I didn't leave anything out in the patch. -- Callan 'wizzomafizzo' Barrett --===============3941391908007489410== Content-Type: text/x-patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="0001-Signed-off-by-Callan-Barrett-wizzomafizzo-gmail.co.patch" MIME-Version: 1.0 RnJvbSBmYjRlNzRmNDNlZTliNWJlZjQ4ZTU2YTAxYzU5Y2JjODM2MWM4YThjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDYWxsYW4gQmFycmV0dCA8d2l6em9tYWZpenpvQGdtYWlsLmNv bT4KRGF0ZTogVGh1LCAzIEphbiAyMDA4IDA1OjQ2OjMxICswOTAwClN1YmplY3Q6IFtQQVRDSF0g U2lnbmVkLW9mZi1ieTogQ2FsbGFuIEJhcnJldHQgPHdpenpvbWFmaXp6b0BnbWFpbC5jb20+CgpB ZGRzIHN1cHBvcnQgZm9yIFRVcyBhbmQgZGV2cyB0byBkaXNvd24gcGFja2FnZXMgdGhleSBkbyBu b3Qgb3duCi0tLQogd2ViL2h0bWwvcGFja2FnZXMucGhwIHwgICAgNSArKysrLQogd2ViL2xpYi9w a2dmdW5jcy5pbmMgIHwgICAgNCArKystCiAyIGZpbGVzIGNoYW5nZWQsIDcgaW5zZXJ0aW9ucygr KSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS93ZWIvaHRtbC9wYWNrYWdlcy5waHAgYi93 ZWIvaHRtbC9wYWNrYWdlcy5waHAKaW5kZXggOTViNTk3OS4uODVhYjZiNyAxMDA2NDQKLS0tIGEv d2ViL2h0bWwvcGFja2FnZXMucGhwCisrKyBiL3dlYi9odG1sL3BhY2thZ2VzLnBocApAQCAtMTcx LDcgKzE3MSwxMCBAQCBpZiAoaXNzZXQoJF9SRVFVRVNUWyJkb19GbGFnIl0pKSB7CiAJCQkJJHEg PSAiVVBEQVRFIFBhY2thZ2VzICI7CiAJCQkJJHEuPSAiU0VUICIuJGZpZWxkLiIgPSAwICI7CiAJ CQkJJHEuPSAiV0hFUkUgSUQgSU4gKCIgLiAkZGlzb3duIC4gIikgIjsKLQkJCQkkcS49ICJBTkQg Ii4kZmllbGQuIiA9ICIudWlkX2Zyb21fc2lkKCRfQ09PS0lFWyJBVVJTSUQiXSk7CisJCQkJIyBJ ZiBhIHVzZXIgaXMgYSBUVSBvciBkZXYgdGhleSBjYW4gZGlzb3duIGFueSBwYWNrYWdlCisgICAg ICAgIGlmICgkYXR5cGUgPT0gIlVzZXIiKSB7CisJCQkJCSRxLj0gIkFORCAiLiRmaWVsZC4iID0g Ii51aWRfZnJvbV9zaWQoJF9DT09LSUVbIkFVUlNJRCJdKTsKKwkJCQl9CiAJCQkJZGJfcXVlcnko JHEsICRkYmgpOwogCQkJfQogCmRpZmYgLS1naXQgYS93ZWIvbGliL3BrZ2Z1bmNzLmluYyBiL3dl Yi9saWIvcGtnZnVuY3MuaW5jCmluZGV4IGFkOTYzMGUuLmVhZWVjYTggMTAwNjQ0Ci0tLSBhL3dl Yi9saWIvcGtnZnVuY3MuaW5jCisrKyBiL3dlYi9saWIvcGtnZnVuY3MuaW5jCkBAIC00OTIsNyAr NDkyLDkgQEAgZnVuY3Rpb24gcGFja2FnZV9kZXRhaWxzKCRpZD0wLCAkU0lEPSIiKSB7CiAgICAg ICAgICAgICAgICAgICAgIGVjaG8gIiB2YWx1ZT0nIi5fXygiQWRvcHQgUGFja2FnZXMiKS4iJz5c biI7CiAgICAgICAgICAgICAgICAgfQogCQkJCQkKLQkJCQlpZiAoJHJvd1siTWFpbnRhaW5lclVJ RCJdID09IHVpZF9mcm9tX3NpZCgkU0lEKSkgeworCQkJCWlmICgkcm93WyJNYWludGFpbmVyVUlE Il0gPT0gdWlkX2Zyb21fc2lkKCRTSUQpIHx8CisgICAgICAgICAgICBhY2NvdW50X2Zyb21fc2lk KCRTSUQpID09ICJUcnVzdGVkIFVzZXIiIHx8CisgICAgICAgICAgICBhY2NvdW50X2Zyb21fc2lk KCRTSUQpID09ICJEZXZlbG9wZXIiKSB7CiAJCQkJCWVjaG8gIjxpbnB1dCB0eXBlPSdzdWJtaXQn IGNsYXNzPSdidXR0b24nIG5hbWU9J2RvX0Rpc293biciOwogCQkJCQllY2hvICIgdmFsdWU9JyIu X18oIkRpc293biBQYWNrYWdlcyIpLiInPlxuIjsKIAkJCQl9CQotLSAKMS41LjMuNwoK --===============3941391908007489410==-- From simo@archlinux.org Wed Jan 2 17:51:39 2008 From: Simo Leone To: aur-dev@lists.archlinux.org Subject: [aur-dev] Roadmap Date: Wed, 02 Jan 2008 16:51:38 -0600 Message-ID: <20080102225138.GA8486@neotuli.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5002080895462174770==" --===============5002080895462174770== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Hey guys, I would have written this email earlier, but I'm currently overseas enjoying the effects of global warming (since when does it not snow in the arctic?). I had a few spare minutes and decided it might be a good time to sit down and finally write the damn thing. Right, so I just wanted to get a few things cleared up about where I want to take the AUR, short and long term. In the short term, I'd like to keep things realistic. What can and can't we do with the current level of interest in the AUR? Big sweeping changes are out of the question, the userbase is quite large and the AUR is something very prominent in Archland. I haven't read an Arch review that doesn't mention the AUR in quite a while, so we must've got something right. We should be somewhat cautious about large public-facing changes and introducing regressions. Short term fast-track changes should be things like bugfixes, and admin-side changes, and small no-brainer type stuff. Keeping with that, I'd like to tweak the interface a bit. It's always struck me as a tad clunky, and could use some refinement. Parts of it are buggy too. Another small welcome change would be fixing those nasty URLs. Changes here should be backward-compatible, since AUR links are likely pasted in all sorts of places. The AUR's long-term future is less certain. One thing I'd like to get cleared up is this stuff about AUR2. First off, I'd like to know how many separate people/groups are currently coding some AUR-successor. I admit that I probably made a mistake in even introducing the idea of recoding the AUR, and after some further thought it's probably in our best interests to improve upon what we have, and be satisfied with it before any kind of recode is seriously considered. If you're currently working on a 'new' AUR, now's a good time to speak up, so your hard work doesn't go to waste. That said, I've always felt that the AUR's codebase is on a pretty shaky foundation, and needs some serious rearranging. One of my biggest long-term goals is to functionalize the code, and separate the HTML from underlying logic, particularly SQL queries! As it stands, most of it looks like HTML/SQL/PHP soup, a lot of it quite repetative. This is really bad programming practice for a whole shizload of reasons, security among them. Another long-term issue is cleaning up the data. A lot of the users are dead, and packages uncared for. The idea of package maintenence/ownership might be interesting to reexamine and rethink at some point, the results might really benefit the community. There is a whole whole lot more that belongs on both lists, but taking it slow, steady, and simple, is best. The AUR is still growing and maturing as a project, let's not try to make it grow up overnight. Lastly, I welcome you to send patches and take advantage of aur-dev. Developing is always more rewarding when you have others to put their momentum in the same direction. -- Simo Leone Arch Linux Developer --===============5002080895462174770== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="attachment.sig" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjEuNC43IChHTlUv TGludXgpCgppRDhEQlFGSGZCVnoyNkRMb2hxRU42UVJBbkpFQUpzRklMWXhoeUtacXZpeEdTOFJ2 UG5yNUQyQm13Q2ZRVldhCmJoR3FPc2RDcHZaS3Q0aUh2R0RLMC8wPQo9YVNVbAotLS0tLUVORCBQ R1AgU0lHTkFUVVJFLS0tLS0K --===============5002080895462174770==-- From tardo@nagi-fanboi.net Wed Jan 2 23:39:37 2008 From: tardo To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] Roadmap Date: Wed, 02 Jan 2008 23:39:42 -0500 Message-ID: <61494.68.159.102.112.1199335182.squirrel@webmail.nagi-fanboi.net> In-Reply-To: <20080102225138.GA8486@neotuli.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5377285462052932835==" --===============5377285462052932835== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Simo Leone さんは書きました： > Hey guys, > > I would have written this email earlier, but I'm currently overseas > enjoying the effects of global warming (since when does it not snow in > the arctic?). I had a few spare minutes and decided it might be a good > time to sit down and finally write the damn thing. > > Right, so I just wanted to get a few things cleared up about where I > want to take the AUR, short and long term. > > In the short term, I'd like to keep things realistic. What can and can't > we do with the current level of interest in the AUR? Big sweeping > changes are out of the question, the userbase is quite large and the AUR > is something very prominent in Archland. I haven't read an Arch review > that doesn't mention the AUR in quite a while, so we must've got > something right. We should be somewhat cautious about large > public-facing changes and introducing regressions. Short term fast-track > changes should be things like bugfixes, and admin-side changes, and > small no-brainer type stuff. > Keeping with that, I'd like to tweak the interface a > bit. It's always struck me as a tad clunky, and could use some > refinement. Parts of it are buggy too. > Another small welcome change would be fixing those nasty URLs. Changes > here should be backward-compatible, since AUR links are likely pasted > in all sorts of places. > > The AUR's long-term future is less certain. One thing I'd like to get > cleared up is this stuff about AUR2. First off, I'd like to know how > many separate people/groups are currently coding some AUR-successor. > I admit that I probably made a mistake in even introducing the idea > of recoding the AUR, and after some further thought it's probably in > our best interests to improve upon what we have, and be satisfied > with it before any kind of recode is seriously considered. If you're > currently working on a 'new' AUR, now's a good time to speak up, so your > hard work doesn't go to waste. > That said, I've always felt that the AUR's codebase is on a pretty > shaky foundation, and needs some serious rearranging. One of my biggest > long-term goals is to functionalize the code, and separate the HTML from > underlying logic, particularly SQL queries! As it stands, most of it > looks like HTML/SQL/PHP soup, a lot of it quite repetative. This is > really bad programming practice for a whole shizload of reasons, > security among them. > Another long-term issue is cleaning up the data. A lot of the users > are dead, and packages uncared for. The idea of package > maintenence/ownership might be interesting to reexamine and rethink at > some point, the results might really benefit the community. > > There is a whole whole lot more that belongs on both lists, but taking > it slow, steady, and simple, is best. The AUR is still growing and > maturing as a project, let's not try to make it grow up overnight. > Lastly, I welcome you to send patches and take advantage of aur-dev. > Developing is always more rewarding when you have others to put their > momentum in the same direction. > > -- > Simo Leone > Arch Linux Developer > Take a look here: http://git.nagi-fanboi.net/?p=aur.git;a=summary Some of what you ask has already been done by myself and Loui. Feel free to grab parts of code you think is useful. I can't suggest merging the branch because this was based off a previous version of the AUR. I'd love to help rebase/rework the code, but I lose internet in two days and won't be online for about a month (until I find an apartment). - tardo --===============5377285462052932835==-- From louipc.ist@gmail.com Thu Jan 3 00:35:00 2008 From: Loui To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] Roadmap Date: Thu, 03 Jan 2008 00:34:50 -0500 Message-ID: <50673e970801022134h3c243fc2k82c45ffd734f1b6a@mail.gmail.com> In-Reply-To: <20080102225138.GA8486@neotuli.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4730888189598818747==" --===============4730888189598818747== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit On Jan 2, 2008 5:51 PM, Simo Leone wrote: > I admit that I probably made a mistake in even introducing the idea > of recoding the AUR. I think introducing the idea was the best thing to do! After two months of trying to fiddle with the current AUR code I realised that it really isn't worth fixing. I assumed that development slowed because the devs came to that realisation. I think the development manpower would be much better spent working on a completely new system, especially since we've given the interface a bit of a facelift. The only dev on current code I could see making sense are critical bug fixes. I see the next generation of AUR as a network app primarily accessible via CLI tools, but also accessible via other interfaces (web,gtk, etc). I have some other crazy ideas, that might be out of topic for now. Ha! > Another long-term issue is cleaning up the data. A lot of the users > are dead, and packages uncared for. This is another great reason to start fresh. I say toss the old DB once the new system is ready. --===============4730888189598818747==-- From xilonmu@gmail.com Thu Jan 3 00:44:31 2008 From: Sebastian To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] Roadmap Date: Thu, 03 Jan 2008 14:44:29 +0900 Message-ID: In-Reply-To: <50673e970801022134h3c243fc2k82c45ffd734f1b6a@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4768545542786334884==" --===============4768545542786334884== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Afaik there are two AUR2 projects. The first one was the "br" [1] one that was started ages ago, but the developers are very quite and it's hard to get a hold of them. I tried to make them more active in terms of communication but it seems I failed. I spoke with one of the developers and he said they were very close to finishing but I haven't seen any of them since then. Having looked at the code it seems they simply tried to replicate the current AUR in Django so there probably weren't many advantages over the current AUR besides cleaner code. There's also the newer project [2] which seems to be developed only be me now, but Thralas was also active at the beginning. It's getting close to replicating the functionality of the current AUR, but there's still lots to be done.When designing it we aimed for it to be more flexible and generally just more thought out than the current AUR. I'm not a TU or developer so it's a bit hard for me to think of ways to improve the interface for TUs, especially since the cvs system and web interface seems to be only linked by the database. There might be some more information on the wiki; http://wiki.archlinux.org/index.php/AUR_2 The current AUR requires a total rewrite either way, so I don't think there's any point investing much time in adding any features to it. One of the biggest issues (afaik, since I haven't looked at the db schema) is the mixing of business logic and presentation. It's really aweful to try and hack the code when it's like that. The Django framework, as most of you probably know, is really easy to use and fast to develop with, so I think it would be a better investment to focus on any of the new projects. [1] http://aur2.archlinux-br.org/ [2] http://repo.or.cz/w/aur2-xilon.git --===============4768545542786334884==-- From wizzomafizzo@gmail.com Thu Jan 3 11:27:19 2008 From: Callan Barrett To: aur-dev@lists.archlinux.org Subject: [aur-dev] [PATCH] Removes timeout page and moves login form to header Date: Fri, 04 Jan 2008 01:27:17 +0900 Message-ID: <33f0f4ec0801030827j5a35cddao18316c18ec418c29@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0599185957935326264==" --===============0599185957935326264== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit This removes the need for a timeout page (and probably hacker.php) and moves the login form and status to the header. If your login times out you won't lose your place anymore and links will always work. Works for me but at the moment index_po.php is imported in aur.inc which has to stay until the translations from it for login are moved to aur_po.php. -- Callan 'wizzomafizzo' Barrett --===============0599185957935326264== Content-Type: text/x-patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="0001-Signed-off-by-Callan-Barrett-wizzomafizzo-gmail.co.patch" MIME-Version: 1.0 RnJvbSA4ZDJiNjUxZmZkZDk2YWZjMWMzNjRlMjY0N2UwMGNiYzk5NmU3ZjQyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDYWxsYW4gQmFycmV0dCA8d2l6em9tYWZpenpvQGdtYWlsLmNv bT4KRGF0ZTogRnJpLCA0IEphbiAyMDA4IDAxOjE2OjAyICswOTAwClN1YmplY3Q6IFtQQVRDSF0g U2lnbmVkLW9mZi1ieTogQ2FsbGFuIEJhcnJldHQgPHdpenpvbWFmaXp6b0BnbWFpbC5jb20+CgpS ZW1vdmVzIHRpbWVvdXQgcGFnZSBhbmQgbW92ZXMgbG9naW4gZm9ybSB0byBoZWFkZXIKLS0tCiB3 ZWIvaHRtbC9pbmRleC5waHAgICAgICB8ICAgOTggKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0KIHdlYi9saWIvYXVyLmluYyAgICAgICAgIHwgICA3MSArKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKystCiB3ZWIvdGVtcGxhdGUvaGVhZGVyLnBocCB8 ICAgMjggKysrKysrKysrKysrLQogMyBmaWxlcyBjaGFuZ2VkLCA5NSBpbnNlcnRpb25zKCspLCAx MDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvd2ViL2h0bWwvaW5kZXgucGhwIGIvd2ViL2h0 bWwvaW5kZXgucGhwCmluZGV4IDJhMWE0ODkuLjk5Y2NjYmMgMTAwNjQ0Ci0tLSBhL3dlYi9odG1s L2luZGV4LnBocAorKysgYi93ZWIvaHRtbC9pbmRleC5waHAKQEAgLTIsNzggKzIsMTIgQEAKIAog c2V0X2luY2x1ZGVfcGF0aChnZXRfaW5jbHVkZV9wYXRoKCkgLiBQQVRIX1NFUEFSQVRPUiAuICcu Li9saWInIC4gUEFUSF9TRVBBUkFUT1IgLiAnLi4vbGFuZycpOwogCi1pbmNsdWRlKCJpbmRleF9w by5pbmMiKTsKKyMgaW5jbHVkZSgiaW5kZXhfcG8uaW5jIik7CiBpbmNsdWRlKCJwa2dmdW5jc19w by5pbmMiKTsgIyBBZGQgdG8gaGFuZGxlIHRoZSBpMThuIG9mIE15IFBhY2thZ2VzCiBpbmNsdWRl KCJhdXIuaW5jIik7CiBzZXRfbGFuZygpOwogY2hlY2tfc2lkKCk7CiAKLSMgTmVlZCB0byBkbyB0 aGUgYXV0aGVudGljYXRpb24gcHJpb3IgdG8gc2VuZGluZyBhbnkgSFRNTCAoaW5jbHVkaW5nIGhl YWRlcikKLSMKLSRsb2dpbl9lcnJvciA9ICIiOwotaWYgKGlzc2V0KCRfUkVRVUVTVFsidXNlciJd KSB8fCBpc3NldCgkX1JFUVVFU1RbInBhc3MiXSkpIHsKLQkjIEF0dGVtcHRpbmcgdG8gbG9nIGlu Ci0JIwotCWlmICghaXNzZXQoJF9SRVFVRVNUWyJ1c2VyIl0pKSB7Ci0JCSRsb2dpbl9lcnJvciA9 IF9fKCJZb3UgbXVzdCBzdXBwbHkgYSB1c2VybmFtZS4iKTsKLQl9Ci0JaWYgKCFpc3NldCgkX1JF UVVFU1RbInBhc3MiXSkpIHsKLQkJJGxvZ2luX2Vycm9yID0gX18oIllvdSBtdXN0IHN1cHBseSBh IHBhc3N3b3JkLiIpOwotCX0KLQlpZiAoISRsb2dpbl9lcnJvcikgewotCQkjIFRyeSBhbmQgYXV0 aGVudGljYXRlIHRoZSB1c2VyCi0JCSMKLQotCQkjbWQ1IGhhc2ggaXQKLQkJJF9SRVFVRVNUWyJw YXNzIl0gPSBtZDUoJF9SRVFVRVNUWyJwYXNzIl0pOwotCQkkZGJoID0gZGJfY29ubmVjdCgpOwot CQkkcSA9ICJTRUxFQ1QgSUQsIFN1c3BlbmRlZCBGUk9NIFVzZXJzICI7Ci0JCSRxLj0gIldIRVJF IFVzZXJuYW1lID0gJyIgLiBteXNxbF9yZWFsX2VzY2FwZV9zdHJpbmcoJF9SRVFVRVNUWyJ1c2Vy Il0pIC4gIicgIjsKLQkJJHEuPSAiQU5EIFBhc3N3ZCA9ICciIC4gbXlzcWxfcmVhbF9lc2NhcGVf c3RyaW5nKCRfUkVRVUVTVFsicGFzcyJdKSAuICInIjsKLQkJJHJlc3VsdCA9IGRiX3F1ZXJ5KCRx LCAkZGJoKTsKLQkJaWYgKCEkcmVzdWx0KSB7Ci0JCQkkbG9naW5fZXJyb3IgPSBfXygiRXJyb3Ig bG9va2luZyB1cCB1c2VybmFtZSwgJXMuIiwKLQkJCQkJCWFycmF5KGh0bWxzcGVjaWFsY2hhcnMo JF9SRVFVRVNUWyJ1c2VyIl0pKSk7Ci0JCX0gZWxzZSB7Ci0JCQkkcm93ID0gbXlzcWxfZmV0Y2hf cm93KCRyZXN1bHQpOwotCQkJaWYgKGVtcHR5KCRyb3cpKSB7Ci0JCQkJJGxvZ2luX2Vycm9yID0g X18oIkluY29ycmVjdCBwYXNzd29yZCBmb3IgdXNlcm5hbWUsICVzLiIsCi0JCQkJCQlhcnJheSho dG1sc3BlY2lhbGNoYXJzKCRfUkVRVUVTVFsidXNlciJdKSkpOwotCQkJfSBlbHNlaWYgKCRyb3db MV0pIHsKLQkJCQkkbG9naW5fZXJyb3IgPSBfXygiWW91ciBhY2NvdW50IGhhcyBiZWVuIHN1c3Bl bmRlZC4iKTsKLQkJCX0KLQkJfQotCi0JCWlmICghJGxvZ2luX2Vycm9yKSB7Ci0JCQkjIEFjY291 bnQgbG9va3MgZ29vZC4gIEdlbmVyYXRlIGEgU0lEIGFuZCBzdG9yZSBpdC4KLQkJCSMKLQkJCSRs b2dnZWRfaW4gPSAwOwotCQkJJG51bV90cmllcyA9IDA7Ci0JCQl3aGlsZSAoISRsb2dnZWRfaW4g JiYgJG51bV90cmllcyA8IDUpIHsKLQkJCQkkbmV3X3NpZCA9IG5ld19zaWQoKTsKLQkJCQkkcSA9 ICJJTlNFUlQgSU5UTyBTZXNzaW9ucyAoVXNlcnNJRCwgU2Vzc2lvbklELCBMYXN0VXBkYXRlVFMp ICI7Ci0JCQkJJHEuPSJWQUxVRVMgKCIuICRyb3dbMF0uICIsICciIC4gJG5ld19zaWQgLiAiJywg VU5JWF9USU1FU1RBTVAoKSkiOwotCQkJCSRyZXN1bHQgPSBkYl9xdWVyeSgkcSwgJGRiaCk7Ci0J CQkJIyBRdWVyeSB3aWxsIGZhaWwgaWYgJG5ld19zaWQgaXMgbm90IHVuaXF1ZQotCQkJCSMKLQkJ CQlpZiAoJHJlc3VsdCkgewotCQkJCQkkbG9nZ2VkX2luID0gMTsKLQkJCQkJYnJlYWs7Ci0JCQkJ fQotCQkJCSRudW1fdHJpZXMrKzsKLQkJCX0KLQkJCWlmICgkbG9nZ2VkX2luKSB7Ci0JCQkJIyBz ZXQgb3VyIFNJRCBjb29raWUKLQkJCQkjCi0JCQkJc2V0Y29va2llKCJBVVJTSUQiLCAkbmV3X3Np ZCwgMCwgIi8iKTsKLQkJCQloZWFkZXIoIkxvY2F0aW9uOiAvaW5kZXgucGhwIik7Ci0JCQl9IGVs c2UgewotCQkJCSRsb2dpbl9lcnJvciA9IF9fKCJFcnJvciB0cnlpbmcgdG8gZ2VuZXJhdGUgc2Vz c2lvbiBpZC4iKTsKLQkJCX0KLQkJfQotCX0KLX0KLQogIyBBbnkgY29va2llcyBoYXZlIGJlZW4g c2VudCwgY2FuIG5vdyBkaXNwbGF5IEhUTUwKICMKIGh0bWxfaGVhZGVyKCk7CkBAIC05NywzNiAr MzEsNiBAQCBwcmludCBfXygiVGhlIG1vc3QgcG9wdWxhciBwYWNrYWdlcyB3aWxsIGJlIHByb3Zp ZGVkIGFzIGJpbmFyeSBwYWNrYWdlcyBpbiBbY29tbQogcHJpbnQgIjwvdGQ+IjsKIHByaW50ICI8 dGQgY2xhc3M9J2JveFNvZnQnIHZhbGlnbj0ndG9wJz4iOwogCi0jIE5vdyBwcmVzZW50IHRoZSB1 c2VyIGxvZ2luIHN0dWZmCi1pZiAoIWlzc2V0KCRfQ09PS0lFWyJBVVJTSUQiXSkpIHsKLQkjIHRo ZSB1c2VyIGlzIG5vdCBsb2dnZWQgaW4sIGdpdmUgdGhlbSBsb2dpbiB3aWRnZXRzCi0JIwotCWlm ICgkbG9naW5fZXJyb3IpIHsKLQkJcHJpbnQgIjxzcGFuIGNsYXNzPSdlcnJvcic+IiAuICRsb2dp bl9lcnJvciAuICI8L3NwYW4+PGJyIC8+XG4iOwotCX0KLQlwcmludCAiPHRhYmxlIGJvcmRlcj0n MCcgY2VsbHBhZGRpbmc9JzAnIGNlbGxzcGFjaW5nPScwJyB3aWR0aD0nMTAwJSc+XG4iOwotCXBy aW50ICI8Zm9ybSBhY3Rpb249Jy9pbmRleC5waHAnIG1ldGhvZD0ncG9zdCc+XG4iOwotCXByaW50 ICI8dHI+XG4iOwotCXByaW50ICI8dGQ+Ii5fXygiVXNlcm5hbWU6IikuIjwvdGQ+IjsKLQlwcmlu dCAiPHRkPjxpbnB1dCB0eXBlPSd0ZXh0JyBuYW1lPSd1c2VyJyBzaXplPSczMCcgbWF4bGVuZ3Ro PSc2NCc+PC90ZD4iOwotCXByaW50ICI8L3RyPlxuIjsKLQlwcmludCAiPHRyPlxuIjsKLQlwcmlu dCAiPHRkPiIuX18oIlBhc3N3b3JkOiIpLiI8L3RkPiI7Ci0JcHJpbnQgIjx0ZD48aW5wdXQgdHlw ZT0ncGFzc3dvcmQnIG5hbWU9J3Bhc3MnIHNpemU9JzMwJyBtYXhsZW5ndGg9JzMyJz48L3RkPiI7 Ci0JcHJpbnQgIjwvdHI+XG4iOwotCXByaW50ICI8dHI+XG4iOwotCXByaW50ICI8dGQgY29sc3Bh bj0nMicgYWxpZ249J3JpZ2h0Jz4mbmJzcDs8YnIgLz4iOwotCXByaW50ICI8aW5wdXQgdHlwZT0n c3VibWl0JyBjbGFzcz0nYnV0dG9uJyI7Ci0JcHJpbnQgIiB2YWx1ZT0nIi5fXygiTG9naW4iKS4i Jz48L3RkPiI7Ci0JcHJpbnQgIjwvdHI+XG4iOwotCXByaW50ICI8L2Zvcm0+XG4iOwotCXByaW50 ICI8L3RhYmxlPlxuIjsKLQotfSBlbHNlIHsKLQlwcmludCBfXygiTG9nZ2VkLWluIGFzOiAlaCVz JWgiLAotCQkJYXJyYXkoIjxiPiIsIHVzZXJuYW1lX2Zyb21fc2lkKCRfQ09PS0lFWyJBVVJTSUQi XSksICI8L2I+IikpOwotfQotCiAjIE1BSU46IEJvdHRvbSBMZWZ0CiBwcmludCAiPC90ZD4iOwog cHJpbnQgIjwvdHI+IjsKZGlmZiAtLWdpdCBhL3dlYi9saWIvYXVyLmluYyBiL3dlYi9saWIvYXVy LmluYwppbmRleCA4NDczZmFlLi40NzE1NjQ4IDEwMDY0NAotLS0gYS93ZWIvbGliL2F1ci5pbmMK KysrIGIvd2ViL2xpYi9hdXIuaW5jCkBAIC03LDYgKzcsNyBAQCBoZWFkZXIoJ1ByYWdtYTogbm8t Y2FjaGUnKTsKIGluY2x1ZGVfb25jZSgidmVyc2lvbi5pbmMiKTsKIGluY2x1ZGVfb25jZSgiY29u ZmlnLmluYyIpOwogaW5jbHVkZV9vbmNlKCJhdXJfcG8uaW5jIik7CitpbmNsdWRlX29uY2UoImlu ZGV4X3BvLmluYyIpOwogCiAjIFRPRE8gZG8gd2UgbmVlZCB0byBzZXQgdGhlIGRvbWFpbiBvbiBj b29raWVzPyAgSSBzZWVtIHRvIHJlbWVtYmVyIHNvbWUKICMgc2VjdXJpdHkgY29uY2VybnMgYWJv dXQgbm90IHVzaW5nIGRvbWFpbnMgLSBidXQgaXQncyBub3QgbGlrZQpAQCAtOTIsNiArOTMsOCBA QCBmdW5jdGlvbiBjaGVja19zaWQoKSB7CiAJCQkjIGNsZWFyIG91dCB0aGUgaGFja2VyJ3MgY29v a2llLCBhbmQgc2VuZCB0aGVtIHRvIGEgbmF1Z2h0eSBwYWdlCiAJCQkjCiAJCQlzZXRjb29raWUo IkFVUlNJRCIsICIiLCB0aW1lKCkgLSAoNjAqNjAqMjQqMzApLCAiLyIpOworCQkJIyBJIHRoaW5r IGl0J3MgcHJvYmFibHkgc2FmZSB0byBkbyB0aGUgc2FtZSBhcyBiZWxvdyB3aXRoIHRoaXMKKwkJ CSMgYnV0IG5vdCByZWFsbHkgdml0YWwgYXQgdGhpcyBwb2ludAogCQkJaGVhZGVyKCJMb2NhdGlv bjogL2hhY2tlci5waHAiKTsKIAogCQl9IGVsc2VpZiAoJGZhaWxlZCA9PSAyKSB7CkBAIC0xMDQs OCArMTA3LDcgQEAgZnVuY3Rpb24gY2hlY2tfc2lkKCkgewogCQkJZGJfcXVlcnkoJHEsICRkYmgp OwogCiAJCQlzZXRjb29raWUoIkFVUlNJRCIsICIiLCB0aW1lKCkgLSAoNjAqNjAqMjQqMzApLCAi LyIpOwotCQkJaGVhZGVyKCJMb2NhdGlvbjogL3RpbWVvdXQucGhwIik7Ci0KKwkJCXVuc2V0KCRf Q09PS0lFWydBVVJTSUQnXSk7CiAJCX0gZWxzZSB7CiAJCQkjIHN0aWxsIGxvZ2dlZCBpbiBhbmQg aGF2ZW4ndCByZWFjaGVkIHRoZSB0aW1lb3V0LCBnbyBhaGVhZAogCQkJIyBhbmQgdXBkYXRlIHRo ZSBpZGxlIHRpbWVzdGFtcApAQCAtMzM2LDkgKzMzOCw3NCBAQCBmdW5jdGlvbiBzZXRfbGFuZygp IHsKIGZ1bmN0aW9uIGh0bWxfaGVhZGVyKCkgewogCWdsb2JhbCAkX1NFUlZFUjsKIAlnbG9iYWwg JF9DT09LSUU7CisJZ2xvYmFsICRfUE9TVDsKIAlnbG9iYWwgJExBTkc7CiAJZ2xvYmFsICRTVVBQ T1JURURfTEFOR1M7CiAKKwkkbG9naW5fZXJyb3IgPSAiIjsKKwlpZiAoaXNzZXQoJF9QT1NUWyJ1 c2VyIl0pIHx8IGlzc2V0KCRfUE9TVFsicGFzcyJdKSkgeworCQkjIEF0dGVtcHRpbmcgdG8gbG9n IGluCisJCSMKKwkJaWYgKCFpc3NldCgkX1BPU1RbInVzZXIiXSkpIHsKKwkJCSRsb2dpbl9lcnJv ciA9IF9fKCJZb3UgbXVzdCBzdXBwbHkgYSB1c2VybmFtZS4iKTsKKwkJfQorCQlpZiAoIWlzc2V0 KCRfUE9TVFsicGFzcyJdKSkgeworCQkJJGxvZ2luX2Vycm9yID0gX18oIllvdSBtdXN0IHN1cHBs eSBhIHBhc3N3b3JkLiIpOworCQl9CisJCWlmICghJGxvZ2luX2Vycm9yKSB7CisJCQkjIFRyeSBh bmQgYXV0aGVudGljYXRlIHRoZSB1c2VyCisJCQkjCisKKwkJCSNtZDUgaGFzaCBpdAorCQkJJF9Q T1NUWyJwYXNzIl0gPSBtZDUoJF9QT1NUWyJwYXNzIl0pOworCQkJJGRiaCA9IGRiX2Nvbm5lY3Qo KTsKKwkJCSRxID0gIlNFTEVDVCBJRCwgU3VzcGVuZGVkIEZST00gVXNlcnMgIjsKKwkJCSRxLj0g IldIRVJFIFVzZXJuYW1lID0gJyIgLiBteXNxbF9yZWFsX2VzY2FwZV9zdHJpbmcoJF9QT1NUWyJ1 c2VyIl0pIC4gIicgIjsKKwkJCSRxLj0gIkFORCBQYXNzd2QgPSAnIiAuIG15c3FsX3JlYWxfZXNj YXBlX3N0cmluZygkX1BPU1RbInBhc3MiXSkgLiAiJyI7CisJCQkkcmVzdWx0ID0gZGJfcXVlcnko JHEsICRkYmgpOworCQkJaWYgKCEkcmVzdWx0KSB7CisJCQkJJGxvZ2luX2Vycm9yID0gX18oIkVy cm9yIGxvb2tpbmcgdXAgdXNlcm5hbWUsICVzLiIsCisJCQkJCQkJYXJyYXkoaHRtbHNwZWNpYWxj aGFycygkX1BPU1RbInVzZXIiXSkpKTsKKwkJCX0gZWxzZSB7CisJCQkJJHJvdyA9IG15c3FsX2Zl dGNoX3JvdygkcmVzdWx0KTsKKwkJCQlpZiAoZW1wdHkoJHJvdykpIHsKKwkJCQkJJGxvZ2luX2Vy cm9yID0gX18oIkluY29ycmVjdCBwYXNzd29yZCBmb3IgdXNlcm5hbWUsICVzLiIsCisJCQkJCQkJ YXJyYXkoaHRtbHNwZWNpYWxjaGFycygkX1BPU1RbInVzZXIiXSkpKTsKKwkJCQl9IGVsc2VpZiAo JHJvd1sxXSkgeworCQkJCQkkbG9naW5fZXJyb3IgPSBfXygiWW91ciBhY2NvdW50IGhhcyBiZWVu IHN1c3BlbmRlZC4iKTsKKwkJCQl9CisJCQl9CisKKwkJCWlmICghJGxvZ2luX2Vycm9yKSB7CisJ CQkJIyBBY2NvdW50IGxvb2tzIGdvb2QuICBHZW5lcmF0ZSBhIFNJRCBhbmQgc3RvcmUgaXQuCisJ CQkJIworCQkJCSRsb2dnZWRfaW4gPSAwOworCQkJCSRudW1fdHJpZXMgPSAwOworCQkJCXdoaWxl ICghJGxvZ2dlZF9pbiAmJiAkbnVtX3RyaWVzIDwgNSkgeworCQkJCQkkbmV3X3NpZCA9IG5ld19z aWQoKTsKKwkJCQkJJHEgPSAiSU5TRVJUIElOVE8gU2Vzc2lvbnMgKFVzZXJzSUQsIFNlc3Npb25J RCwgTGFzdFVwZGF0ZVRTKSAiOworCQkJCQkkcS49IlZBTFVFUyAoIi4gJHJvd1swXS4gIiwgJyIg LiAkbmV3X3NpZCAuICInLCBVTklYX1RJTUVTVEFNUCgpKSI7CisJCQkJCSRyZXN1bHQgPSBkYl9x dWVyeSgkcSwgJGRiaCk7CisJCQkJCSMgUXVlcnkgd2lsbCBmYWlsIGlmICRuZXdfc2lkIGlzIG5v dCB1bmlxdWUKKwkJCQkJIworCQkJCQlpZiAoJHJlc3VsdCkgeworCQkJCQkJJGxvZ2dlZF9pbiA9 IDE7CisJCQkJCQlicmVhazsKKwkJCQkJfQorCQkJCQkkbnVtX3RyaWVzKys7CisJCQkJfQorCQkJ CWlmICgkbG9nZ2VkX2luKSB7CisJCQkJCSMgc2V0IG91ciBTSUQgY29va2llCisJCQkJCSMKKwkJ CQkJc2V0Y29va2llKCJBVVJTSUQiLCAkbmV3X3NpZCwgMCwgIi8iKTsKKwkJCQkJJF9DT09LSUVb J0FVUlNJRCddID0gJG5ld19zaWQ7CisJCQkJfSBlbHNlIHsKKwkJCQkJJGxvZ2luX2Vycm9yID0g X18oIkVycm9yIHRyeWluZyB0byBnZW5lcmF0ZSBzZXNzaW9uIGlkLiIpOworCQkJCX0KKwkJCX0K KwkJfQorCX0KKwogCWluY2x1ZGUoJ2hlYWRlci5waHAnKTsKIAlyZXR1cm47CiB9CmRpZmYgLS1n aXQgYS93ZWIvdGVtcGxhdGUvaGVhZGVyLnBocCBiL3dlYi90ZW1wbGF0ZS9oZWFkZXIucGhwCmlu ZGV4IGE5MzFmNTcuLjUyMzBkYzUgMTAwNjQ0Ci0tLSBhL3dlYi90ZW1wbGF0ZS9oZWFkZXIucGhw CisrKyBiL3dlYi90ZW1wbGF0ZS9oZWFkZXIucGhwCkBAIC02NSw4ICs2NSwzMCBAQCBmb3JlYWNo ICgkU1VQUE9SVEVEX0xBTkdTIGFzICRsYW5nID0+ICRsYW5nX25hbWUpIHsKICAgICAgICAgICAg PGxpPkxhbmc6IDwvbGk+CiAgICAgICAgICA8L3VsPgogICAgICAgPC9kaXY+Ci0gICA8L2Rpdj4K LSAgIDxkaXYgaWQ9Im1haW5jb250ZW50Ij4KLQkJIDwhLS0gU3RhcnQgb2YgbWFpbiBjb250ZW50 IC0tPgorICAgICAgPGJyIC8+CisgICAgICA8ZGl2IHN0eWxlPSJ0ZXh0LWFsaWduOiByaWdodDsg cGFkZGluZy1yaWdodDogMTBweCI+Cis8P3BocAoraWYgKCFpc3NldCgkX0NPT0tJRVsiQVVSU0lE Il0pKSB7CisJaWYgKCRsb2dpbl9lcnJvcikgeworCQlwcmludCAiPHNwYW4gY2xhc3M9J2Vycm9y Jz4iIC4gJGxvZ2luX2Vycm9yIC4gIjwvc3Bhbj48YnIgLz5cbiI7CisgIH0KKz8+CisgICAgICAg IDxmb3JtIG1ldGhvZD0ncG9zdCc+Cis8P3BocCBwcmludCBfXygiVXNlcm5hbWU6Iik7ID8+Cisg ICAgICAgIDxpbnB1dCB0eXBlPSd0ZXh0JyBuYW1lPSd1c2VyJyBzaXplPSczMCcgbWF4bGVuZ3Ro PSc2NCc+Cis8P3BocCBwcmludCBfXygiUGFzc3dvcmQ6Iik7ID8+CisgICAgICAgIDxpbnB1dCB0 eXBlPSdwYXNzd29yZCcgbmFtZT0ncGFzcycgc2l6ZT0nMzAnIG1heGxlbmd0aD0nMzInPgorICAg ICAgICA8aW5wdXQgdHlwZT0nc3VibWl0JyBjbGFzcz0nYnV0dG9uJyB2YWx1ZT0nPD9waHAgIHBy aW50IF9fKCJMb2dpbiIpOyA/Pic+CisgICAgICAgIDwvZm9ybT4KKzw/cGhwCit9IGVsc2Ugewor CXByaW50IF9fKCJMb2dnZWQtaW4gYXM6ICVoJXMlaCIsCisJCQlhcnJheSgiPGI+IiwgdXNlcm5h bWVfZnJvbV9zaWQoJF9DT09LSUVbIkFVUlNJRCJdKSwgIjwvYj4iKSk7Cit9Cis/PgorICAgIDwv ZGl2PgorICA8L2Rpdj4KKyAgPGRpdiBpZD0ibWFpbmNvbnRlbnQiPgorCSAgPCEtLSBTdGFydCBv ZiBtYWluIGNvbnRlbnQgLS0+CiAKIAotLSAKMS41LjMuNwoK --===============0599185957935326264==-- From aaronmgriffin@gmail.com Thu Jan 3 12:27:57 2008 From: Aaron Griffin To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] [PATCH] Removes timeout page and moves login form to header Date: Thu, 03 Jan 2008 11:27:59 -0600 Message-ID: In-Reply-To: <33f0f4ec0801030827j5a35cddao18316c18ec418c29@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3880821025499865377==" --===============3880821025499865377== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit On Jan 3, 2008 10:27 AM, Callan Barrett wrote: > This removes the need for a timeout page I love you --===============3880821025499865377==-- From aaronmgriffin@gmail.com Thu Jan 3 12:30:17 2008 From: Aaron Griffin To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] [PATCH] Removes timeout page and moves login form to header Date: Thu, 03 Jan 2008 11:30:08 -0600 Message-ID: In-Reply-To: <33f0f4ec0801030827j5a35cddao18316c18ec418c29@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1971647250597968422==" --===============1971647250597968422== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit On Jan 3, 2008 10:27 AM, Callan Barrett wrote: > This removes the need for a timeout page (and probably hacker.php) and > moves the login form and status to the header. If your login times out > you won't lose your place anymore and links will always work. Works > for me but at the moment index_po.php is imported in aur.inc which has > to stay until the translations from it for login are moved to > aur_po.php. Quick comment. All the git tools expect the following commit message format: >>>>> [One line description] [Body description with long text and sign-off lines] <<<<< This is why your patch shows "Signed off by..." as the filename/title of the patch. --===============1971647250597968422==-- From wizzomafizzo@gmail.com Thu Jan 3 12:40:51 2008 From: Callan Barrett To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] [PATCH] Removes timeout page and moves login form to header Date: Fri, 04 Jan 2008 02:40:52 +0900 Message-ID: <33f0f4ec0801030940v56007288q19e06553cfabcfec@mail.gmail.com> In-Reply-To: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3865516413092787757==" --===============3865516413092787757== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit On Jan 4, 2008 2:30 AM, Aaron Griffin wrote: > > Quick comment. > > All the git tools expect the following commit message format: > >>>>> > [One line description] > > [Body description with long text and sign-off lines] > <<<<< > > This is why your patch shows "Signed off by..." as the filename/title > of the patch. Oh right, gotta remember that next time. Thanks. -- Callan 'wizzomafizzo' Barrett --===============3865516413092787757==-- From eliott@cactuswax.net Thu Jan 3 15:32:43 2008 From: eliott To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] [PATCH] Removes timeout page and moves login form to header Date: Thu, 03 Jan 2008 12:32:45 -0800 Message-ID: <428d921d0801031232wc6f0672n4d5fb9b0f2d54c8c@mail.gmail.com> In-Reply-To: <33f0f4ec0801030827j5a35cddao18316c18ec418c29@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7574197648142223319==" --===============7574197648142223319== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit On 1/3/08, Callan Barrett wrote: > This removes the need for a timeout page (and probably hacker.php) and > moves the login form and status to the header. If your login times out > you won't lose your place anymore and links will always work. Works > for me but at the moment index_po.php is imported in aur.inc which has > to stay until the translations from it for login are moved to > aur_po.php. > > -- > Callan 'wizzomafizzo' Barrett Applied to my testing branch. I would like to mirror Aaron's sentiments. Maybe...without the uncomfortably long hug though.. ;) --===============7574197648142223319==-- From wizzomafizzo@gmail.com Thu Jan 3 16:51:42 2008 From: Callan Barrett To: aur-dev@lists.archlinux.org Subject: [aur-dev] [PATCH] Fix bug with botched AURSID values Date: Fri, 04 Jan 2008 06:26:47 +0900 Message-ID: <33f0f4ec0801031326v21ce8302tbe54b3e11fffc559@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5355066109105843629==" --===============5355066109105843629== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit In the check_sid function in aur.inc the condition for expiring the cookie and redirecting to hacker.php could never be met and instead the user would be given blank login instead of being considered logged out, now fixed. This also means we no longer need either hacker.php or timeout.php at all. Also, this bug seems to be present in the AUR version running on aur.archlinux.org. -- Callan 'wizzomafizzo' Barrett --===============5355066109105843629== Content-Type: text/x-patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="0002-Fix-bug-with-botched-AURSID-values.patch" MIME-Version: 1.0 RnJvbSA5YWNiZDYxNmMyYjFiZWQ1ODcwNDFiOTNiOTRmMGFhZWM2MzQ5ZGQwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDYWxsYW4gQmFycmV0dCA8d2l6em9tYWZpenpvQGdtYWlsLmNv bT4KRGF0ZTogRnJpLCA0IEphbiAyMDA4IDA2OjIwOjU2ICswOTAwClN1YmplY3Q6IFtQQVRDSF0g Rml4IGJ1ZyB3aXRoIGJvdGNoZWQgQVVSU0lEIHZhbHVlcwoKVGhpcyBmaXhlcyBhIGJ1ZyB3aGVu IGRlYWxpbmcgd2l0aCBlZGl0ZWQgQVVSU0lEIHZhbHVlcyBpbiBjb29raWVzIHdoZXJlIHRoZSB1 c2VyIGFwcGVhcnMgdG8gYmUgImxvZ2dlZCBpbiIgKGJ1dCB3aXRob3V0IHBlcm1pc3Npb25zKSBp bnN0ZWFkIG9mIGhhdmluZyB0aGVpciBjb29raWUgcmVtb3ZlZC4gQWxzbyBlZmZlY3RpdmVseSBy ZW1vdmVzIHRoZSB1c2UgZm9yIHRpbWVvdXQucGhwIGFuZCBoYWNrZXIucGhwCgpTaWduZWQtb2Zm LWJ5OiBDYWxsYW4gQmFycmV0dCA8d2l6em9tYWZpenpvQGdtYWlsLmNvbT4KLS0tCiB3ZWIvbGli L2F1ci5pbmMgICAgICAgICB8ICAgIDggKysrLS0tLS0KIHdlYi90ZW1wbGF0ZS9oZWFkZXIucGhw IHwgICAgOCArKysrLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA3IGluc2VydGlvbnMoKyksIDkgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvd2ViL2xpYi9hdXIuaW5jIGIvd2ViL2xpYi9hdXIuaW5j CmluZGV4IDQ3MTU2NDguLjAyNTgwNjAgMTAwNjQ0Ci0tLSBhL3dlYi9saWIvYXVyLmluYworKysg Yi93ZWIvbGliL2F1ci5pbmMKQEAgLTc4LDcgKzc4LDcgQEAgZnVuY3Rpb24gY2hlY2tfc2lkKCkg ewogCQkkcSA9ICJTRUxFQ1QgTGFzdFVwZGF0ZVRTLCBVTklYX1RJTUVTVEFNUCgpIEZST00gU2Vz c2lvbnMgIjsKIAkJJHEuPSAiV0hFUkUgU2Vzc2lvbklEID0gJyIgLiBteXNxbF9yZWFsX2VzY2Fw ZV9zdHJpbmcoJF9DT09LSUVbIkFVUlNJRCJdKSAuICInIjsKIAkJJHJlc3VsdCA9IGRiX3F1ZXJ5 KCRxLCAkZGJoKTsKLQkJaWYgKCEkcmVzdWx0KSB7CisJCWlmIChteXNxbF9udW1fcm93cygkcmVz dWx0KSA9PSAwKSB7CiAJCQkjIEludmFsaWQgU2Vzc2lvbklEIC0gaGFja2VyIGFsZXJ0IQogCQkJ IwogCQkJJGZhaWxlZCA9IDE7CkBAIC05MSwxMiArOTEsMTAgQEAgZnVuY3Rpb24gY2hlY2tfc2lk KCkgewogCQl9CiAJCWlmICgkZmFpbGVkID09IDEpIHsKIAkJCSMgY2xlYXIgb3V0IHRoZSBoYWNr ZXIncyBjb29raWUsIGFuZCBzZW5kIHRoZW0gdG8gYSBuYXVnaHR5IHBhZ2UKKwkJCSMgd2h5IGRv IHlvdSBoYXZlIHRvIGJlIHNvIGhhcnNoIG9uIHRoZXNlIHBlb3BsZSE/CiAJCQkjCiAJCQlzZXRj b29raWUoIkFVUlNJRCIsICIiLCB0aW1lKCkgLSAoNjAqNjAqMjQqMzApLCAiLyIpOwotCQkJIyBJ IHRoaW5rIGl0J3MgcHJvYmFibHkgc2FmZSB0byBkbyB0aGUgc2FtZSBhcyBiZWxvdyB3aXRoIHRo aXMKLQkJCSMgYnV0IG5vdCByZWFsbHkgdml0YWwgYXQgdGhpcyBwb2ludAotCQkJaGVhZGVyKCJM b2NhdGlvbjogL2hhY2tlci5waHAiKTsKLQorCQkJdW5zZXQoJF9DT09LSUVbJ0FVUlNJRCddKTsK IAkJfSBlbHNlaWYgKCRmYWlsZWQgPT0gMikgewogCQkJIyB2aXNpdG9yJ3Mgc2Vzc2lvbiBpZCBl aXRoZXIgZG9lc24ndCBleGlzdCwgb3IgdGhlIHRpbWVvdXQKIAkJCSMgd2FzIHJlYWNoZWQgYW5k IHRoZXkgbXVzdCBsb2dpbiBhZ2Fpbiwgc2VuZCB0aGVtIGJhY2sgdG8KZGlmZiAtLWdpdCBhL3dl Yi90ZW1wbGF0ZS9oZWFkZXIucGhwIGIvd2ViL3RlbXBsYXRlL2hlYWRlci5waHAKaW5kZXggNTIz MGRjNS4uNDQwY2IyNCAxMDA2NDQKLS0tIGEvd2ViL3RlbXBsYXRlL2hlYWRlci5waHAKKysrIGIv d2ViL3RlbXBsYXRlL2hlYWRlci5waHAKQEAgLTY4LDcgKzY4LDEwIEBAIGZvcmVhY2ggKCRTVVBQ T1JURURfTEFOR1MgYXMgJGxhbmcgPT4gJGxhbmdfbmFtZSkgewogICAgICAgPGJyIC8+CiAgICAg ICA8ZGl2IHN0eWxlPSJ0ZXh0LWFsaWduOiByaWdodDsgcGFkZGluZy1yaWdodDogMTBweCI+CiA8 P3BocAotaWYgKCFpc3NldCgkX0NPT0tJRVsiQVVSU0lEIl0pKSB7CitpZiAoaXNzZXQoJF9DT09L SUVbIkFVUlNJRCJdKSkgeworICBwcmludCBfXygiTG9nZ2VkLWluIGFzOiAlaCVzJWgiLAorCQkJ YXJyYXkoIjxiPiIsIHVzZXJuYW1lX2Zyb21fc2lkKCRfQ09PS0lFWyJBVVJTSUQiXSksICI8L2I+ IikpOworfSBlbHNlIHsKIAlpZiAoJGxvZ2luX2Vycm9yKSB7CiAJCXByaW50ICI8c3BhbiBjbGFz cz0nZXJyb3InPiIgLiAkbG9naW5fZXJyb3IgLiAiPC9zcGFuPjxiciAvPlxuIjsKICAgfQpAQCAt ODEsOSArODQsNiBAQCBpZiAoIWlzc2V0KCRfQ09PS0lFWyJBVVJTSUQiXSkpIHsKICAgICAgICAg PGlucHV0IHR5cGU9J3N1Ym1pdCcgY2xhc3M9J2J1dHRvbicgdmFsdWU9Jzw/cGhwICBwcmludCBf XygiTG9naW4iKTsgPz4nPgogICAgICAgICA8L2Zvcm0+CiA8P3BocAotfSBlbHNlIHsKLQlwcmlu dCBfXygiTG9nZ2VkLWluIGFzOiAlaCVzJWgiLAotCQkJYXJyYXkoIjxiPiIsIHVzZXJuYW1lX2Zy b21fc2lkKCRfQ09PS0lFWyJBVVJTSUQiXSksICI8L2I+IikpOwogfQogPz4KICAgICA8L2Rpdj4K LS0gCjEuNS4zLjcKCg== --===============5355066109105843629==-- From louipc.ist@gmail.com Thu Jan 3 18:24:15 2008 From: Loui To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] [PATCH] Removes timeout page and moves login form to header Date: Thu, 03 Jan 2008 18:24:17 -0500 Message-ID: <50673e970801031524q50233b2bj93153524873e6d39@mail.gmail.com> In-Reply-To: <428d921d0801031232wc6f0672n4d5fb9b0f2d54c8c@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2663936531724351243==" --===============2663936531724351243== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Hey Callan. I guess you're working off of the testing branch? Please have a look at web/template/login_form.php :D I put down the mechanics but I didn't actually put it into use. I couldn't be sure if a log in form on every page is necessary. Maybe you only really need a login form when you need to log in, like if you want to post a comment. --===============2663936531724351243==-- From wizzomafizzo@gmail.com Thu Jan 3 19:29:49 2008 From: Callan Barrett To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] [PATCH] Removes timeout page and moves login form to header Date: Fri, 04 Jan 2008 09:22:59 +0900 Message-ID: <33f0f4ec0801031622l5a31162fvce6b2068b23cdb5b@mail.gmail.com> In-Reply-To: <50673e970801031524q50233b2bj93153524873e6d39@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4222176391604736432==" --===============4222176391604736432== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit On Jan 4, 2008 8:24 AM, Loui wrote: > Hey Callan. I guess you're working off of the testing branch? Please > have a look at web/template/login_form.php :D > I put down the mechanics but I didn't actually put it into use. I > couldn't be sure if a log in form on every page is necessary. > Maybe you only really need a login form when you need to log in, like > if you want to post a comment. Hello Loui, I am working off the testing branch, didn't notice the login form template though. I'll take a look at it and I think it's an alright idea to split this up into two files but I don't really agree with only having the login form on just a few pages, I think it should still stay in the header (or in its own function called on every page, but html_header already does that and it would mean changing most of the code related). I'll give an example, if I'm given a url to package details page that I need to delete or orphan but I've been logged out it would be way more convenient if I could log back in using that page, not a whole lot to disrupt the work flow. This isn't really uncommon and can be applied basically anywhere on the AUR because let's face it, there's really only about 5 "pages" on the AUR and at least as a TU they all need to be used logged in. A good example of how convenient this is is on the bug tracker and I doubt that takes any extra resources. -- Callan 'wizzomafizzo' Barrett --===============4222176391604736432==-- From shezq23@gmail.com Fri Jan 4 00:07:09 2008 From: Shehzad Qureshi To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] Roadmap Date: Fri, 04 Jan 2008 00:07:07 -0500 Message-ID: <222254590801032107nae3023te61318800c8d874d@mail.gmail.com> In-Reply-To: <61494.68.159.102.112.1199335182.squirrel@webmail.nagi-fanboi.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2161258289395078818==" --===============2161258289395078818== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit I forgot to add... here's a demo of what that git tree looks like: http://aur.nagi-fanboi.net/ --===============2161258289395078818== Content-Type: text/html Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="attachment.html" MIME-Version: 1.0 SSBmb3Jnb3QgdG8gYWRkLi4uIGhlcmUmIzM5O3MgYSBkZW1vIG9mIHdoYXQgdGhhdCBnaXQgdHJl ZSBsb29rcyBsaWtlOjxicj48YnI+PGEgaHJlZj0iaHR0cDovL2F1ci5uYWdpLWZhbmJvaS5uZXQv Ij5odHRwOi8vYXVyLm5hZ2ktZmFuYm9pLm5ldC88L2E+PGJyPgo= --===============2161258289395078818==-- From wizzomafizzo@gmail.com Fri Jan 4 05:54:00 2008 From: Callan Barrett To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] Roadmap Date: Fri, 04 Jan 2008 19:53:58 +0900 Message-ID: <33f0f4ec0801040253x7b91963av1f5111cf34387ce8@mail.gmail.com> In-Reply-To: <222254590801032107nae3023te61318800c8d874d@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1762048049601621942==" --===============1762048049601621942== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit On Jan 4, 2008 2:07 PM, Shehzad Qureshi wrote: > I forgot to add... here's a demo of what that git tree looks like: > > http://aur.nagi-fanboi.net/ I think this looks great! Some of the little things you've put in really add to usability. I really like the stuff such as the search form in the header (or you know, on every page), the way logging out is just a form on the current page and how you got rid of the useless get variables. Love to see most of this in cactus' repo. :) -- Callan 'wizzomafizzo' Barrett --===============1762048049601621942==-- From xilonmu@gmail.com Fri Jan 4 10:21:20 2008 From: Sebastian Nowicki To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] AUR2 Screenshots Date: Sat, 05 Jan 2008 00:21:07 +0900 Message-ID: <20080104151458.GA27602@Odin> In-Reply-To: <20080102225138.GA8486@neotuli.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1617583221331533782==" --===============1617583221331533782== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit I thought it might be a good idea to give more insight to people who can't setup django or simply don't want to. The following screenshots were taken from the current (as of 04.01.2007) snapshot of my repository. Package listing/Main page: - http://img184.imageshack.us/img184/9740/200801042315061679x527skz6.png When searching, if there's only one hit it goes straight to that package's page. Upload form: - http://img301.imageshack.us/img301/4172/200801042317511679x588sod7.png Trying to upload an invalid package: - http://img177.imageshack.us/img177/4753/200801042318021679x787sbt3.png It also checks that at least one set of checksums exist. The parser is based on namcap's parsepkgbuild, except it outputs information in a different format (python). Package details of the newly uploaded package: - http://img112.imageshack.us/img112/5418/200801042319181665x1016pl8.png None of the files (PKGBUILD, tarball, sources) are saved to disk yet, since we're still working out how to go about it. Dependencies from the official repos don't get recorded either, since there's no access to the main DB and some alterations to the AUR DB would be required[1]. Account page: - http://img184.imageshack.us/img184/5589/200801050002271679x612sqz5.png After logging in directly (clicking on the login link), the user is redirected to this page. Account page (new user): - http://img521.imageshack.us/img521/2258/200801050006141679x609sam8.png The PKGBUILD link directs to the user to the AUR User Guidelines[2] and the "these requests" link directs the user to the requests forum[3]. These links are hardcoded in the template. Login form (with errors): - http://img131.imageshack.us/img131/7356/200801042348081679x505slp3.png Registration form: - http://img137.imageshack.us/img137/5193/200801050004291679x529swp2.png Package listing (logged out): - http://img155.imageshack.us/img155/3650/200801042328321679x546soh9.png I think that covers it. Suggestions/flaming is, of course, welcome. [1] http://archlinux.org/pipermail/aur-dev/2008-January/000021.html [2] http://wiki.archlinux.org/index.php/Arch_Packaging_Standards [3] http://bbs.archlinux.org/viewforum.php?id=38 --===============1617583221331533782==-- From aaronmgriffin@gmail.com Fri Jan 4 12:17:28 2008 From: Aaron Griffin To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] AUR2 Screenshots Date: Fri, 04 Jan 2008 11:17:30 -0600 Message-ID: In-Reply-To: <20080104151458.GA27602@Odin> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1282964429835518246==" --===============1282964429835518246== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Oooh, purty --===============1282964429835518246==-- From wizzomafizzo@gmail.com Sat Jan 5 09:05:22 2008 From: Callan Barrett To: aur-dev@lists.archlinux.org Subject: [aur-dev] AUR Variable Names Date: Sat, 05 Jan 2008 23:05:22 +0900 Message-ID: <33f0f4ec0801050605x762268f9xb7d3cc1c34e688c7@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2879549048633120944==" --===============2879549048633120944== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable I'd like some suggestions on how we deal with the issue of this: http://aur.archlinux.org/packages.php?do_Details=3D1&ID=3D6978&O=3D0&L=3D&C= =3D&K=3D&SB=3D&SO=3D&PP=3D&do_MyPackages=3D&do_Orphans=3D&SeB=3D I've seen suggestions of mod_rewrite but really nothing further, I'll start us off but I really want opinions from at least a few different people. To begin I'm not really thrilled with the idea of mod_rewrite at all and I can't find much of a point to using it, I've been told it will be amazing because then we can have urls like /search/foo/ but so what? People don't search using urls they search with the search form and the fact we can start going /package/1337/ instead of say packages.php?id=3D1337 is so incredibly minor why should we bother? I propose that at the very least (that is even if we decide to use mod_rewrite for some crazy reason) we change the variable names to something that's actually descriptive and try get rid of as many variables as possible. If you take a look at tardo's repo you can see the details page now only requires the package id variable and nothing else which is a great step in the right direction, we can also get rid of the sorting options in the search form because you can already sort via the links in column names and the variables do_Search is just as pointless as do_Details. With just these changes we get something like O=3D0&L=3D&C=3D&K=3D&PP=3D&SeB=3D which we could probably make even smaller a= nd nicer if we changed variable names to be descriptive. Anyway, most of all I want to hear what other people have to say about this because I think choosing the right names and issues like backwards compatibility are pretty important. --=20 Callan 'wizzomafizzo' Barrett --===============2879549048633120944==-- From louipc.ist@gmail.com Sat Jan 5 12:16:31 2008 From: Loui To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] AUR Variable Names Date: Sat, 05 Jan 2008 12:16:33 -0500 Message-ID: <50673e970801050916s9f534dan1974c0f217231979@mail.gmail.com> In-Reply-To: <33f0f4ec0801050605x762268f9xb7d3cc1c34e688c7@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4191275630046583522==" --===============4191275630046583522== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable First of all look at how many of those variables are empty. Make the code not put empty variables into the URL and make the code that gets the variables deal with unset/empty variables. I was working on this at some point. 1. On the search page you could use a function for processing variables when sorting results in various ways (eg. by name, maintainer, repo, etc) There's a lot of repeated code there... I'm not sure if I committed any change there 2. For details page I was thinking of storing search parameters into a cookie so you could still go back to the search page to resume looking at previous search results. 3. Separate package search code from package details code. (If it hasn't already been done) $do_Details doesn't actually mean anything. I could set do_Details=3Dgramma and it'll still show me the pkg details, the only requirement seems to be that it is set. so make packages.php only show details and get rid of that variable. It won't hurt existing URL links if you get rid of it either. Make another page like search_packages.php for searching packages. You might want to bug people to get those previous patches applied before getting too ahead hehe. Cheers. On Jan 5, 2008 9:05 AM, Callan Barrett wrote: > I'd like some suggestions on how we deal with the issue of this: > http://aur.archlinux.org/packages.php?do_Details=3D1&ID=3D6978&O=3D0&L=3D&C= =3D&K=3D&SB=3D&SO=3D&PP=3D&do_MyPackages=3D&do_Orphans=3D&SeB=3D > > I've seen suggestions of mod_rewrite but really nothing further, I'll > start us off but I really want opinions from at least a few different > people. To begin I'm not really thrilled with the idea of mod_rewrite > at all and I can't find much of a point to using it, I've been told it > will be amazing because then we can have urls like /search/foo/ but so > what? People don't search using urls they search with the search form > and the fact we can start going /package/1337/ instead of say > packages.php?id=3D1337 is so incredibly minor why should we bother? > > I propose that at the very least (that is even if we decide to use > mod_rewrite for some crazy reason) we change the variable names to > something that's actually descriptive and try get rid of as many > variables as possible. If you take a look at tardo's repo you can see > the details page now only requires the package id variable and nothing > else which is a great step in the right direction, we can also get rid > of the sorting options in the search form because you can already sort > via the links in column names and the variables do_Search is just as > pointless as do_Details. With just these changes we get something like > O=3D0&L=3D&C=3D&K=3D&PP=3D&SeB=3D which we could probably make even smaller= and > nicer if we changed variable names to be descriptive. > > Anyway, most of all I want to hear what other people have to say about > this because I think choosing the right names and issues like > backwards compatibility are pretty important. > > -- > Callan 'wizzomafizzo' Barrett > > --===============4191275630046583522==-- From xilonmu@gmail.com Sat Jan 5 12:57:10 2008 From: Sebastian Nowicki To: aur-dev@lists.archlinux.org Subject: [aur-dev] AUR2 directory structure Date: Sun, 06 Jan 2008 02:56:29 +0900 Message-ID: <20080105173206.GA7927@Odin> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4486016622995738009==" --===============4486016622995738009== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit I'd like to implement saving files to disk, but to do so I first need to decide on the directory structure. Django's FileField model field wants to upload files relative to MEDIA_ROOT[1]. Since I'm currently using the main site's CSS and images directly, MEDIA_ROOT hasn't been used yet. To simplify the problem I think it's best to simply ignore the fact that there may be an SCM backend. We should just focus on the relative directory structure. The easy way to go would be dumping everything into MEDIA_ROOT/repository/package_name/ (possible using MEDIA_ROOT/packages/...). It's simple and easy to navigate. The directory would hold the PKGBUILD, and source or install files and the tarball. The files would be accessible via MEDIA_URL/[packages/]repository/package_name/, with packages/ being optional. I'm not sure that using MEDIA_ROOT is a good idea since, if we eventually get some, images and CSS files, etc. would also go into it, so it seems a bit odd. Also if we do choose to go with an SCM like subversion then it would most likely have to be separated from the MEDIA_ROOT. I'm not sure if overloading this behaviour of the FileField is possible, so we may simply need to use a CharField and do anything, that FileField does for us, manually. For those familiar with the current AUR code, how does AUR do it? Does it even store the source file separately? And how does the main site handle it? [1] http://www.djangoproject.com/documentation/model-api/#filefield --===============4486016622995738009==-- From xilonmu@gmail.com Sat Jan 5 13:06:41 2008 From: Sebastian Nowicki To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] AUR Variable Names Date: Sun, 06 Jan 2008 03:06:00 +0900 Message-ID: <20080105180600.GB7927@Odin> In-Reply-To: <50673e970801050916s9f534dan1974c0f217231979@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2088897407514004164==" --===============2088897407514004164== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit On Sat, Jan 05, 2008 at 12:16:33PM -0500, Loui wrote: > First of all look at how many of those variables are empty. Make the > code not put empty variables into the URL and make the code that gets > the variables deal with unset/empty variables. I was working on this > at some point. I don't think this is possible. The code has nothing to do with what the browser sends to the server. The way it works is that the browser requests the search page from the server. The PHP script does it's thing and outputs the HTML page, which gets downloaded and displayed to the user. The user inputs whatever keywords the user wants and submits. The _browser_ then parses the form and sends the appropriate GET/POST headers (and content). Since some fields are empty (I assume this is why empty variables show up) the browser sends these empty variables in the GET request. The only solution to this that I see is by using JavaScript to dynamically remove any empty fields from the form on an onSubmit event, though I'm not sure that this would actually work. --===============2088897407514004164==-- From louipc.ist@gmail.com Sat Jan 5 13:15:28 2008 From: Loui To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] AUR Variable Names Date: Sat, 05 Jan 2008 13:15:30 -0500 Message-ID: <50673e970801051015o30048538ld27883eb977dc224@mail.gmail.com> In-Reply-To: <20080105180600.GB7927@Odin> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2176718677805108061==" --===============2176718677805108061== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit I'm saying deal with it in the current AUR code. Of course it's possible. There's nothing you can do about outside links other than make sure that the code can deal with that properly. You'd have to do that anyways if you want to omit variables and let them default to something if they're unset. On Jan 5, 2008 1:06 PM, Sebastian Nowicki wrote: > On Sat, Jan 05, 2008 at 12:16:33PM -0500, Loui wrote: > > First of all look at how many of those variables are empty. Make the > > code not put empty variables into the URL and make the code that gets > > the variables deal with unset/empty variables. I was working on this > > at some point. > > I don't think this is possible. The code has nothing to do with what the > browser sends to the server. The way it works is that the browser > requests the search page from the server. The PHP script does it's thing > and outputs the HTML page, which gets downloaded and displayed to the > user. The user inputs whatever keywords the user wants and submits. The > _browser_ then parses the form and sends the appropriate GET/POST > headers (and content). Since some fields are empty (I assume this is why > empty variables show up) the browser sends these empty variables in the > GET request. > > The only solution to this that I see is by using JavaScript to > dynamically remove any empty fields from the form on an onSubmit event, > though I'm not sure that this would actually work. > > --===============2176718677805108061==-- From eliott@cactuswax.net Sat Jan 5 14:24:26 2008 From: eliott To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] AUR Variable Names Date: Sat, 05 Jan 2008 11:24:29 -0800 Message-ID: <428d921d0801051124n48907ebt662b84ac698d9645@mail.gmail.com> In-Reply-To: <33f0f4ec0801050605x762268f9xb7d3cc1c34e688c7@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5672102649830631890==" --===============5672102649830631890== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit On 1/5/08, Callan Barrett wrote: > I'd like some suggestions on how we deal with the issue of this: > http://aur.archlinux.org/packages.php?do_Details=1&ID=6978&O=0&L=&C=& > K=&SB=&SO=&PP=&do_MyPackages=&do_Orphans=&SeB= > > I've seen suggestions of mod_rewrite but really nothing further, I'll > start us off but I really want opinions from at least a few different > people. To begin I'm not really thrilled with the idea of mod_rewrite > at all and I can't find much of a point to using it, I've been told it > will be amazing because then we can have urls like /search/foo/ but so > what? People don't search using urls they search with the search form > and the fact we can start going /package/1337/ instead of say > packages.php?id=1337 is so incredibly minor why should we bother? > > I propose that at the very least (that is even if we decide to use > mod_rewrite for some crazy reason) we change the variable names to > something that's actually descriptive and try get rid of as many > variables as possible. If you take a look at tardo's repo you can see > the details page now only requires the package id variable and nothing > else which is a great step in the right direction, we can also get rid > of the sorting options in the search form because you can already sort > via the links in column names and the variables do_Search is just as > pointless as do_Details. With just these changes we get something like > O=0&L=&C=&K=&PP=&SeB= which we could probably make even smaller and > nicer if we changed variable names to be descriptive. > > Anyway, most of all I want to hear what other people have to say about > this because I think choosing the right names and issues like > backwards compatibility are pretty important. I recommend something similar to what Loui said. Split packages.php into separate files, such as search.php and details.php. Then the long ugly url goes away in the search result package links (just a ?pkgid=100 or whatever). The search page will still have a marginally ugly url when you click a column to sort, but that can certainly be reduced. As to reasoning behind 'pretty urls', they are generally used for two reasons: 1. Search engine results 2. Human readability Search engines give a higher page rank to urls that are descriptive regarding the page. So /packages/exaile would have a higher rank than /packages.php?pkgname=exaile. They may disregard get args, but I don't know. As for #2, that one is obvious. If someone types a url in by hand, they may have a chance at going right to the page they want. I don't know if we care about #1, and #2 may be a non issue in our case...because people are using the system just fine now. --===============5672102649830631890==-- From wizzomafizzo@gmail.com Sat Jan 5 16:05:38 2008 From: Callan Barrett To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] AUR Variable Names Date: Sun, 06 Jan 2008 06:05:39 +0900 Message-ID: <33f0f4ec0801051305p7ee7f204q98661ec9856f43e6@mail.gmail.com> In-Reply-To: <428d921d0801051124n48907ebt662b84ac698d9645@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4023139316755328537==" --===============4023139316755328537== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit On Jan 6, 2008 4:24 AM, eliott wrote: > I recommend something similar to what Loui said. > Split packages.php into separate files, such as search.php and details.php. > Then the long ugly url goes away in the search result package links > (just a ?pkgid=100 or whatever). > > The search page will still have a marginally ugly url when you click a > column to sort, but that can certainly be reduced. The only reason the result links are so long is because there is a link on the details page for "going back to search results" which we can probably achieve the same result by getting rid of the link and providing information about the browser's back button. If we do that this problem is solved and ?pkgid=100 is all we need in this case, too (not saying splitting packages.php is a bad idea, just that we don't *need* to do it to achieve this). I think top priority is fixing how much stuff the search form has to submit, it's a pretty big form for what it does and who knows why it still uses the post method. Also I guess making the AUR use mod_rewrite is pretty minimal to do so we could easily do it on top of changing the normal variable names. Loui: Yes, we could use a function to make the urls based on what we actually have but that is sort of minor compared to actually changing the names to something readable, they're not just ugly because they're long they're ugly because they make absolutely no sense. What patches exactly are you referring to? -- Callan 'wizzomafizzo' Barrett --===============4023139316755328537==-- From tardo@nagi-fanboi.net Sat Jan 5 21:19:51 2008 From: tardo To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] AUR Variable Names Date: Sat, 05 Jan 2008 21:19:55 -0500 Message-ID: <222254590801051819y28f726bft8e9e7f59e4f984c@mail.gmail.com> In-Reply-To: <33f0f4ec0801051305p7ee7f204q98661ec9856f43e6@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6545134274665349877==" --===============6545134274665349877== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit lol... look in my git repo, i've already done all of the above (with the exception of empty vars and seo). --===============6545134274665349877== Content-Type: text/html Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="attachment.html" MIME-Version: 1.0 bG9sLi4uIGxvb2sgaW4gbXkgZ2l0IHJlcG8sIGkmIzM5O3ZlIGFscmVhZHkgZG9uZSBhbGwgb2Yg dGhlIGFib3ZlICh3aXRoIHRoZSBleGNlcHRpb24gb2YgZW1wdHkgdmFycyBhbmQgc2VvKS48YnI+ Cg== --===============6545134274665349877==-- From wizzomafizzo@gmail.com Sat Jan 5 21:55:07 2008 From: Callan Barrett To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] AUR Variable Names Date: Sun, 06 Jan 2008 11:55:10 +0900 Message-ID: <33f0f4ec0801051855l66945070o7dcd7e8343122629@mail.gmail.com> In-Reply-To: <222254590801051819y28f726bft8e9e7f59e4f984c@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3713457984152708174==" --===============3713457984152708174== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit On Jan 6, 2008 11:19 AM, tardo wrote: > lol... look in my git repo, i've already done all of the above (with the > exception of empty vars and seo). I know, I wrote exactly what you just typed in the original email. -- Callan 'wizzomafizzo' Barrett --===============3713457984152708174==-- From wizzomafizzo@gmail.com Sun Jan 6 19:46:45 2008 From: Callan Barrett To: aur-dev@lists.archlinux.org Subject: [aur-dev] [PATCH] Add notify column in search results and notify button Date: Mon, 07 Jan 2008 09:46:47 +0900 Message-ID: <33f0f4ec0801061646kd41a25dvea6ad5b4f2ddde78@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6125203915580521676==" --===============6125203915580521676== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Lets you toggle notification for many packages at once and tells of their status from the search results (like the voted column). Works for me. -- Callan 'wizzomafizzo' Barrett --===============6125203915580521676== Content-Type: text/x-patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="0003-Add-notify-column-in-search-results-and-notify-butto.patch" MIME-Version: 1.0 RnJvbSA5MTg4MzZkMmRjMGVkNmNkNTdhNzlmM2RmNjA5Zjk4ZTVhZjI4YWYyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDYWxsYW4gQmFycmV0dCA8d2l6em9tYWZpenpvQGdtYWlsLmNv bT4KRGF0ZTogTW9uLCA3IEphbiAyMDA4IDA5OjQ0OjIxICswOTAwClN1YmplY3Q6IFtQQVRDSF0g QWRkIG5vdGlmeSBjb2x1bW4gaW4gc2VhcmNoIHJlc3VsdHMgYW5kIG5vdGlmeSBidXR0b24KCkFk ZHMgYSBjb2x1bW4gdG8gc2VhcmNoIHJlc3VsdHMgc2hvd2luZyBpZiBhIHBhY2thZ2UgaGFzIGNv bW1lbnQKbm90aWZpY2F0aW9uIGVuYWJsZWQgYW5kIGFkZHMgc3VwcG9ydCBmb3IgdG9nZ2xpbmcg bm90aWZ5IGZvcgptdWx0aXBsZSBwYWNrYWdlcyBmcm9tIHNlYXJjaAoKU2lnbmVkLW9mZi1ieTog Q2FsbGFuIEJhcnJldHQgPHdpenpvbWFmaXp6b0BnbWFpbC5jb20+Ci0tLQogd2ViL2h0bWwvcGFj a2FnZXMucGhwICAgICAgIHwgICA1NCArKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0KIHdlYi9sYW5nL2VuL3BrZ2Z1bmNzX3BvLmluYyB8ICAgIDIgKwogd2ViL2xhbmcv ZW4vc2VhcmNoX3BvLmluYyAgIHwgICAgNiArKy0tCiB3ZWIvbGliL2F1cmpzb24uY2xhc3MucGhw ICAgfCAgICAyICstCiB3ZWIvbGliL3BrZ2Z1bmNzLmluYyAgICAgICAgfCAgIDQxICsrKysrKysr KysrKysrKysrKysrKysrKysrKystLS0tCiA1IGZpbGVzIGNoYW5nZWQsIDY1IGluc2VydGlvbnMo KyksIDQwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3dlYi9odG1sL3BhY2thZ2VzLnBocCBi L3dlYi9odG1sL3BhY2thZ2VzLnBocAppbmRleCA5NWI1OTc5Li5hZjdiMmFjIDEwMDY0NAotLS0g YS93ZWIvaHRtbC9wYWNrYWdlcy5waHAKKysrIGIvd2ViL2h0bWwvcGFja2FnZXMucGhwCkBAIC01 MDYsNDQgKzUwNiwzNiBAQCBpZiAoaXNzZXQoJF9SRVFVRVNUWyJkb19GbGFnIl0pKSB7CiAJCQkj IFRoZXJlIGN1cnJlbnRseSBzaG91bGRuJ3QgYmUgbXVsdGlwbGUgcmVxdWVzdHMgaGVyZSwgYnV0 IHRoZSBmb3JtYXQgaW4gd2hpY2gKIAkJCSMgaXQncyBzZW50IHJlcXVpcmVzIHRoaXMKIAkJCXdo aWxlIChsaXN0KCRwaWQsICR2KSA9IGVhY2goJGlkcykpIHsKLQkJCQkkcSA9ICJJTlNFUlQgSU5U TyBDb21tZW50Tm90aWZ5IChQa2dJRCwgVXNlcklEKSBWQUxVRVMgKCIuJHBpZC4nLCAnLiR1aWQu JyknOwotCQkJCWRiX3F1ZXJ5KCRxLCAkZGJoKTsKLQkJCQlwcmludCAnPHA+JzsKLQkJCQlwcmlu dCBfXygiWW91IGhhdmUgYmVlbiBhZGRlZCB0byB0aGUgY29tbWVudCBub3RpZmljYXRpb24gbGlz dC4iKTsKLQkJCQlwcmludCAnPGJyIC8+PC9wPic7Ci0JCQkJcGtnZGV0YWlsc19saW5rKCRwaWQp OworCQkJCSRxID0gIlNFTEVDVCBOYW1lIEZST00gUGFja2FnZXMgV0hFUkUgSUQgPSAiIC4gJHBp ZDsKKwkJCQkkcGtnbmFtZSA9IG15c3FsX3Jlc3VsdChkYl9xdWVyeSgkcSwgJGRiaCksIDApOwor CisJCQkJJHEgPSAiU0VMRUNUICogRlJPTSBDb21tZW50Tm90aWZ5IFdIRVJFIFVzZXJJRCA9ICIu JHVpZDsKKwkJCQkkcS49ICIgQU5EIFBrZ0lEID0gIi4kcGlkOworCisJCQkJaWYgKCFteXNxbF9u dW1fcm93cyhkYl9xdWVyeSgkcSwgJGRiaCkpKSB7CisJCQkJCSRxID0gIklOU0VSVCBJTlRPIENv bW1lbnROb3RpZnkgKFBrZ0lELCBVc2VySUQpIFZBTFVFUyAoIi4kcGlkLicsICcuJHVpZC4nKSc7 CisJCQkJCWRiX3F1ZXJ5KCRxLCAkZGJoKTsKKwkJCQkJcHJpbnQgJzxwPic7CisJCQkJCXByaW50 IF9fKCJZb3UgaGF2ZSBiZWVuIGFkZGVkIHRvIHRoZSBjb21tZW50IG5vdGlmaWNhdGlvbiBsaXN0 IGZvciAlcy4iLAorCQkJCQkJYXJyYXkoIjxiPiIgLiAkcGtnbmFtZSAuICI8L2I+IikpOworCQkJ CQlwcmludCAnPGJyIC8+PC9wPic7CisJCQkJfSBlbHNlIHsKKwkJCQkJJHEgPSAiREVMRVRFIEZS T00gQ29tbWVudE5vdGlmeSBXSEVSRSBQa2dJRCA9ICIuJHBpZDsKKwkJCQkJJHEuPSAiIEFORCBV c2VySUQgPSAiLiR1aWQ7CisJCQkJCWRiX3F1ZXJ5KCRxLCAkZGJoKTsKKwkJCQkJcHJpbnQgJzxw Pic7CisJCQkJCXByaW50IF9fKCJZb3UgaGF2ZSBiZWVuIHJlbW92ZWQgZnJvbSB0aGUgY29tbWVu dCBub3RpZmljYXRpb24gbGlzdCBmb3IgJXMuIiwKKwkJCQkJCWFycmF5KCI8Yj4iIC4gJHBrZ25h bWUgLiAiPC9iPiIpKTsKKwkJCQkJcHJpbnQgJzxiciAvPjwvcD4nOworCQkJCX0KIAkJCX0KKwkJ CXBrZ2RldGFpbHNfbGluaygkcGlkKTsKIAkJfSBlbHNlIHsKIAkJCXByaW50ICc8cD4nOwogCQkJ cHJpbnQgX18oIkNvdWxkbid0IGFkZCB0byBub3RpZmljYXRpb24gbGlzdC4iKTsKIAkJCXByaW50 ICc8YnIgLz48L3A+JzsKIAkJfQogCX0JCQkKLX0gZWxzZWlmIChpc3NldCgkX1JFUVVFU1RbImRv X1VuTm90aWZ5Il0pKSB7CQotCWlmICghJGF0eXBlKSB7Ci0JCXByaW50IF9fKCJZb3UgbXVzdCBi ZSBsb2dnZWQgaW4gYmVmb3JlIHlvdSBjYW4gY2FuY2VsIG5vdGlmaWNhdGlvbiBvbiBjb21tZW50 cy4iKTsKLQkJcHJpbnQgIjxiciAvPlxuIjsKLQl9IGVsc2UgewotCQlpZiAoIWVtcHR5KCRpZHMp KSB7Ci0JCQkkZGJoID0gZGJfY29ubmVjdCgpOwotCQkJJHVpZCA9IHVpZF9mcm9tX3NpZCgkX0NP T0tJRVsiQVVSU0lEIl0pOwotCQkJIyBUaGVyZSBjdXJyZW50bHkgc2hvdWxkbid0IGJlIG11bHRp cGxlIHJlcXVlc3RzIGhlcmUsIGJ1dCB0aGUgZm9ybWF0IGluIHdoaWNoCi0JCQkjIGl0J3Mgc2Vu dCByZXF1aXJlcyB0aGlzCi0JCQl3aGlsZSAobGlzdCgkcGlkLCAkdikgPSBlYWNoKCRpZHMpKSB7 Ci0JCQkJJHEgPSAiREVMRVRFIEZST00gQ29tbWVudE5vdGlmeSBXSEVSRSBQa2dJRCA9ICIuJHBp ZDsKLQkJCQkkcS49ICIgQU5EIFVzZXJJRCA9ICIuJHVpZDsKLQkJCQlkYl9xdWVyeSgkcSwgJGRi aCk7Ci0JCQkJcHJpbnQgJzxwPic7Ci0JCQkJcHJpbnQgX18oIllvdSBoYXZlIGJlZW4gcmVtb3Zl ZCBmcm9tIHRoZSBjb21tZW50IG5vdGlmaWNhdGlvbiBsaXN0LiIpOwotCQkJCXByaW50ICc8YnIg Lz48L3A+JzsKLQkJCQlwa2dkZXRhaWxzX2xpbmsoJHBpZCk7Ci0JCQl9Ci0JCX0gZWxzZSB7Ci0J CQlwcmludCAnPHA+JzsKLQkJCXByaW50IF9fKCJDb3VsZG4ndCByZW1vdmUgZnJvbSBub3RpZmlj YXRpb24gbGlzdC4iKTsKLQkJCXByaW50ICc8YnIgLz48L3A+JzsKLQkJfQotCX0JCQkKIH0gZWxz ZSB7CiAJIyBkb19Nb3JlL2RvX0xlc3MvZG9fU2VhcmNoL2RvX015UGFja2FnZXMgLSBqdXN0IGRv IGEgc2VhcmNoCiAJIwpkaWZmIC0tZ2l0IGEvd2ViL2xhbmcvZW4vcGtnZnVuY3NfcG8uaW5jIGIv d2ViL2xhbmcvZW4vcGtnZnVuY3NfcG8uaW5jCmluZGV4IDdkZGU1ZmIuLjJmNmE2MmUgMTAwNjQ0 Ci0tLSBhL3dlYi9sYW5nL2VuL3BrZ2Z1bmNzX3BvLmluYworKysgYi93ZWIvbGFuZy9lbi9wa2dm dW5jc19wby5pbmMKQEAgLTE1Nyw0ICsxNTcsNiBAQCAkX3RbImVuIl1bIlRoZSBhYm92ZSBmaWxl cyBoYXZlIGJlZW4gdmVyaWZpZWQgKGJ5ICVoJXMlaCkgYW5kIGFyZSBzYWZlIHRvIHVzZS4iXQog CiAkX3RbImVuIl1bIlRoaXMgcGFja2FnZSBoYXMgYmVlbiBmbGFnZ2VkIG91dCBvZiBkYXRlLiJd ID0gIlRoaXMgcGFja2FnZSBoYXMgYmVlbiBmbGFnZ2VkIG91dCBvZiBkYXRlLiI7CiAKKyRfdFsi ZW4iXVsiVG9nZ2xlIE5vdGlmeSJdID0gIlRvZ2dsZSBOb3RpZnkiOworCiA/PgpkaWZmIC0tZ2l0 IGEvd2ViL2xhbmcvZW4vc2VhcmNoX3BvLmluYyBiL3dlYi9sYW5nL2VuL3NlYXJjaF9wby5pbmMK aW5kZXggOGZlYjU3Yi4uNjAxNzgyYyAxMDA2NDQKLS0tIGEvd2ViL2xhbmcvZW4vc2VhcmNoX3Bv LmluYworKysgYi93ZWIvbGFuZy9lbi9zZWFyY2hfcG8uaW5jCkBAIC0zOSw3ICszOSw3IEBAICRf dFsiZW4iXVsiRXJyb3IgdHJ5aW5nIHRvIHJldHJpZXZlIHBhY2thZ2UgZGV0YWlscy4iXSA9ICJF cnJvciB0cnlpbmcgdG8gcmV0cmllCiAKICRfdFsiZW4iXVsiVGhlIHNlbGVjdGVkIHBhY2thZ2Vz IGhhdmUgYmVlbiBhZG9wdGVkLiJdID0gIlRoZSBzZWxlY3RlZCBwYWNrYWdlcyBoYXZlIGJlZW4g YWRvcHRlZC4iOwogCi0kX3RbImVuIl1bIllvdSBoYXZlIGJlZW4gcmVtb3ZlZCBmcm9tIHRoZSBj b21tZW50IG5vdGlmaWNhdGlvbiBsaXN0LiJdID0gIllvdSBoYXZlIGJlZW4gcmVtb3ZlZCBmcm9t IHRoZSBjb21tZW50IG5vdGlmaWNhdGlvbiBsaXN0LiI7CiskX3RbImVuIl1bIllvdSBoYXZlIGJl ZW4gcmVtb3ZlZCBmcm9tIHRoZSBjb21tZW50IG5vdGlmaWNhdGlvbiBsaXN0IGZvciAlcy4iXSA9 ICJZb3UgaGF2ZSBiZWVuIHJlbW92ZWQgZnJvbSB0aGUgY29tbWVudCBub3RpZmljYXRpb24gbGlz dGZvciAlcy4iOwogCiAkX3RbImVuIl1bIllvdXIgdm90ZXMgaGF2ZSBiZWVuIGNhc3QgZm9yIHRo ZSBzZWxlY3RlZCBwYWNrYWdlcy4iXSA9ICJZb3VyIHZvdGVzIGhhdmUgYmVlbiBjYXN0IGZvciB0 aGUgc2VsZWN0ZWQgcGFja2FnZXMuIjsKIApAQCAtNDcsNyArNDcsNyBAQCAkX3RbImVuIl1bIllv dSBtdXN0IGJlIGxvZ2dlZCBpbiBiZWZvcmUgeW91IGNhbiBjYW5jZWwgbm90aWZpY2F0aW9uIG9u IGNvbW1lbnRzLgogCiAkX3RbImVuIl1bIllvdSBtdXN0IGJlIGxvZ2dlZCBpbiBiZWZvcmUgeW91 IGNhbiBhZG9wdCBwYWNrYWdlcy4iXSA9ICJZb3UgbXVzdCBiZSBsb2dnZWQgaW4gYmVmb3JlIHlv dSBjYW4gYWRvcHQgcGFja2FnZXMuIjsKIAotJF90WyJlbiJdWyJZb3UgaGF2ZSBiZWVuIGFkZGVk IHRvIHRoZSBjb21tZW50IG5vdGlmaWNhdGlvbiBsaXN0LiJdID0gIllvdSBoYXZlIGJlZW4gYWRk ZWQgdG8gdGhlIGNvbW1lbnQgbm90aWZpY2F0aW9uIGxpc3QuIjsKKyRfdFsiZW4iXVsiWW91IGhh dmUgYmVlbiBhZGRlZCB0byB0aGUgY29tbWVudCBub3RpZmljYXRpb24gbGlzdCBmb3IgJXMuIl0g PSAiWW91IGhhdmUgYmVlbiBhZGRlZCB0byB0aGUgY29tbWVudCBub3RpZmljYXRpb24gbGlzdCBm b3IgJXMuIjsKIAogJF90WyJlbiJdWyJZb3UgZGlkIG5vdCBzZWxlY3QgYW55IHBhY2thZ2VzIHRv IGRpc293bi4iXSA9ICJZb3UgZGlkIG5vdCBzZWxlY3QgYW55IHBhY2thZ2VzIHRvIGRpc293bi4i OwogCkBAIC03NSw0ICs3NSw0IEBAICRfdFsiZW4iXVsiVGhlIHNlbGVjdGVkIHBhY2thZ2VzIGhh dmUgYmVlbiB1bmZsYWdnZWQgc2FmZS4iXSA9ICJUaGUgc2VsZWN0ZWQgcGFjCiAKICRfdFsiZW4i XVsiQ291bGRuJ3QgdW5mbGFnIHBhY2thZ2Ugc2FmZS4iXSA9ICJDb3VsZG4ndCB1bmZsYWcgcGFj a2FnZSBzYWZlLiI7CiAKLT8+ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQorPz4KZGlmZiAt LWdpdCBhL3dlYi9saWIvYXVyanNvbi5jbGFzcy5waHAgYi93ZWIvbGliL2F1cmpzb24uY2xhc3Mu cGhwCmluZGV4IGU2ZTQwZmYuLjJkZjhkZDMgMTAwNjQ0Ci0tLSBhL3dlYi9saWIvYXVyanNvbi5j bGFzcy5waHAKKysrIGIvd2ViL2xpYi9hdXJqc29uLmNsYXNzLnBocApAQCAtMTA4LDcgKzEwOCw3 IEBAIGNsYXNzIEF1ckpTT04gewogICAgIHByaXZhdGUgZnVuY3Rpb24gaW5mbygkcHFkYXRhKSB7 CiAgICAgICAgICRiYXNlX3F1ZXJ5ID0gIlNFTEVDVCBJRCxOYW1lLFZlcnNpb24sRGVzY3JpcHRp b24sVVJMLFVSTFBhdGgsTGljZW5zZSxOdW1Wb3RlcyxPdXRPZkRhdGUgRlJPTSBQYWNrYWdlcyBX SEVSRSAiOwogCi0gICAgICAgIGlmIGlzX251bWVyaWMoJHBxZGF0YSkgeworICAgICAgICBpZiAo IGlzX251bWVyaWMoJHBxZGF0YSkgKSB7CiAgICAgICAgICAgICAvLyBqdXN0IHVzaW5nIHNwcmlu dGYgdG8gY29lcmNlIHRoZSBwcWQgdG8gYW4gaW50CiAgICAgICAgICAgICAvLyBzaG91bGQgaGFu ZGxlIHNxbCBpbmplY3Rpb24gaXNzdWVzLCBzaW5jZSBzcHJpbnRmIHdpbGwKICAgICAgICAgICAg IC8vIGJvcmsgaWYgbm90IGFuIGludCwgb3IgY29udmVydCB0aGUgc3RyaW5nIHRvIGEgbnVtYmVy IDAKZGlmZiAtLWdpdCBhL3dlYi9saWIvcGtnZnVuY3MuaW5jIGIvd2ViL2xpYi9wa2dmdW5jcy5p bmMKaW5kZXggYWQ5NjMwZS4uYWFkMGFjZSAxMDA2NDQKLS0tIGEvd2ViL2xpYi9wa2dmdW5jcy5p bmMKKysrIGIvd2ViL2xpYi9wa2dmdW5jcy5pbmMKQEAgLTI2NSw2ICsyNjUsMjYgQEAgZnVuY3Rp b24gcGtndm90ZXNfZnJvbV9zaWQoJHNpZD0iIikgewogCXJldHVybiAkcGtnczsKIH0KIAorIyBh cnJheSBvZiBwYWNrYWdlIGlkcyB0aGF0IHlvdSdyZSBiZWluZyBub3RpZmllZCBmb3IKKyMgKnlv aW5rKgorIworZnVuY3Rpb24gcGtnbm90aWZ5X2Zyb21fc2lkKCRzaWQ9IiIpIHsKKwkkcGtncyA9 IGFycmF5KCk7CisJaWYgKCEkc2lkKSB7cmV0dXJuICRwa2dzO30KKwkkZGJoID0gZGJfY29ubmVj dCgpOworCSRxID0gIlNFTEVDVCBQa2dJRCAiOworCSRxLj0gIkZST00gQ29tbWVudE5vdGlmeSwg VXNlcnMsIFNlc3Npb25zICI7CisJJHEuPSAiV0hFUkUgVXNlcnMuSUQgPSBTZXNzaW9ucy5Vc2Vy c0lEICI7CisJJHEuPSAiQU5EIFVzZXJzLklEID0gQ29tbWVudE5vdGlmeS5Vc2VySUQgIjsKKwkk cS49ICJBTkQgU2Vzc2lvbnMuU2Vzc2lvbklEID0gJyIubXlzcWxfcmVhbF9lc2NhcGVfc3RyaW5n KCRzaWQpLiInIjsKKwkkcmVzdWx0ID0gZGJfcXVlcnkoJHEsICRkYmgpOworCWlmICgkcmVzdWx0 KSB7CisJCXdoaWxlICgkcm93ID0gbXlzcWxfZmV0Y2hfcm93KCRyZXN1bHQpKSB7CisJCQkkcGtn c1skcm93WzBdXSA9IDE7CisJCX0KKwl9CisJcmV0dXJuICRwa2dzOworfQogCiAjIGRpc3BsYXkg cGFja2FnZSBkZXRhaWxzCiAjCkBAIC00NzUsNyArNDk1LDcgQEAgZnVuY3Rpb24gcGFja2FnZV9k ZXRhaWxzKCRpZD0wLCAkU0lEPSIiKSB7CiAJCQkJCWVjaG8gIjxpbnB1dCB0eXBlPSdzdWJtaXQn IGNsYXNzPSdidXR0b24nIG5hbWU9J2RvX05vdGlmeSciOwogCQkJCQllY2hvICIgdmFsdWU9JyIu X18oIk5vdGlmeSIpLiInIHRpdGxlPSciLl9fKCJOZXcgQ29tbWVudCBOb3RpZmljYXRpb24iKS4i Jz4iOwogCQkJCX0gZWxzZSB7Ci0JCQkJCWVjaG8gIjxpbnB1dCB0eXBlPSdzdWJtaXQnIGNsYXNz PSdidXR0b24nIG5hbWU9J2RvX1VuTm90aWZ5JyI7CisJCQkJCWVjaG8gIjxpbnB1dCB0eXBlPSdz dWJtaXQnIGNsYXNzPSdidXR0b24nIG5hbWU9J2RvX05vdGlmeSciOwogCQkJCQllY2hvICIgdmFs dWU9JyIuX18oIlVuTm90aWZ5IikuIicgdGl0bGU9JyIuX18oIk5vIE5ldyBDb21tZW50IE5vdGlm aWNhdGlvbiIpLiInPiI7CiAJCQkJfQogCkBAIC02MzQsNiArNjU0LDcgQEAgZnVuY3Rpb24gcGtn X3NlYXJjaF9wYWdlKCRTSUQ9IiIpIHsKIAkJJG15dWlkID0gdWlkX2Zyb21fc2lkKCRTSUQpOwog CQkkYWNjdCA9IGFjY291bnRfZnJvbV9zaWQoJFNJRCk7CiAJCSRteV92b3RlcyA9IHBrZ3ZvdGVz X2Zyb21fc2lkKCRTSUQpOworCQkkbXlfbm90aWZ5ID0gcGtnbm90aWZ5X2Zyb21fc2lkKCRTSUQp OwogCX0KIAogCSMgVGhlIHNlYXJjaCBmb3JtCkBAIC05NjIsMTEgKzk4Myw5IEBAIGZ1bmN0aW9u IHBrZ19zZWFyY2hfcGFnZSgkU0lEPSIiKSB7CiAJCQlwcmludCAiPGlucHV0IHR5cGU9J3N1Ym1p dCcgY2xhc3M9J2J1dHRvbicgbmFtZT0nZG9fRGVsZXRlJyI7CiAJCQlwcmludCAiCXZhbHVlPSci Ll9fKCJEZWxldGUgUGFja2FnZXMiKS4iJz48L3RkPlxuIjsKIAkJCXByaW50ICIgIDx0ZCBhbGln bj0nY2VudGVyJz4iOwotCQkJcHJpbnQgIjxpbnB1dCB0eXBlPSdzdWJtaXQnIGNsYXNzPSdidXR0 b24nIG5hbWU9J2RvX1ZvdGUnIjsKLQkJCXByaW50ICIJdmFsdWU9JyIuX18oIlZvdGUiKS4iJz48 L3RkPlxuIjsKKwkJCXByaW50ICI8aW5wdXQgdHlwZT0nc3VibWl0JyBjbGFzcz0nYnV0dG9uJyBu YW1lPSdkb19Ob3RpZnknIjsKKwkJCXByaW50ICIJdmFsdWU9JyIuX18oIlRvZ2dsZSBOb3RpZnki KS4iJz48L3RkPlxuIjsKIAkJCXByaW50ICIgIDx0ZCBhbGlnbj0nY2VudGVyJz4iOwotCQkJcHJp bnQgIjxpbnB1dCB0eXBlPSdzdWJtaXQnIGNsYXNzPSdidXR0b24nIG5hbWU9J2RvX1VuVm90ZSci OwotCQkJcHJpbnQgIgl2YWx1ZT0nIi5fXygiVW4tVm90ZSIpLiInPjwvdGQ+XG4iOwogCQkJcHJp bnQgIjwvdHI+XG4iOwogCQkJcHJpbnQgIjwvdGFibGU+XG4iOwogCQkJcHJpbnQgIiAgPC90ZD5c biI7CkBAIC0xMDIxLDYgKzEwNDAsMTAgQEAgZnVuY3Rpb24gcGtnX3NlYXJjaF9wYWdlKCRTSUQ9 IiIpIHsKIAkJCXByaW50ICIgIDx0aCBzdHlsZT0nYm9yZGVyLWJvdHRvbTogIzY2NiAxcHggc29s aWQ7IHZlcnRpY2FsLWFsaWduOiI7CiAJCQlwcmludCAiIGJvdHRvbSc+PHNwYW4gY2xhc3M9J2Yy Jz4iLl9fKCJWb3RlZCIpLiI8L3NwYW4+PC90aD5cbiI7CiAJCX0KKwkJaWYgKCRTSUQpIHsKKwkJ CXByaW50ICIgIDx0aCBzdHlsZT0nYm9yZGVyLWJvdHRvbTogIzY2NiAxcHggc29saWQ7IHZlcnRp Y2FsLWFsaWduOiI7CisJCQlwcmludCAiIGJvdHRvbSc+PHNwYW4gY2xhc3M9J2YyJz4iLl9fKCJO b3RpZnkiKS4iPC9zcGFuPjwvdGg+XG4iOworCQl9CiAJCXByaW50ICIgIDx0aCBzdHlsZT0nYm9y ZGVyLWJvdHRvbTogIzY2NiAxcHggc29saWQ7IHZlcnRpY2FsLWFsaWduOiI7CiAJCXByaW50ICIg Ym90dG9tJz48c3BhbiBjbGFzcz0nZjInPiIuX18oIkRlc2NyaXB0aW9uIikuIjwvYT4iOwogCQlw cmludCAiPC9zcGFuPjwvdGg+XG4iOwpAQCAtMTA4OSw2ICsxMTEyLDE0IEBAIGZ1bmN0aW9uIHBr Z19zZWFyY2hfcGFnZSgkU0lEPSIiKSB7CiAJCQkJCXByaW50ICImbmJzcDs8L3NwYW4+PC90ZD5c biI7CiAJCQkJfQogCQkJfQorCQkJaWYgKCRTSUQpIHsKKwkJCQlwcmludCAiICA8dGQgY2xhc3M9 JyIuJGMuIic+PHNwYW4gY2xhc3M9J2Y1Jz48c3BhbiBjbGFzcz0nYmx1ZSc+IjsKKwkJCQlpZiAo aXNzZXQoJG15X25vdGlmeVskcm93WyJJRCJdXSkpIHsKKwkJCQkJcHJpbnQgIiZuYnNwOyZuYnNw OyIuX18oIlllcyIpLiI8L3NwYW4+PC90ZD5cbiI7CisJCQkJfSBlbHNlIHsKKwkJCQkJcHJpbnQg IiZuYnNwOzwvc3Bhbj48L3RkPlxuIjsKKwkJCQl9CisJCQl9CiAJCQlwcmludCAiICA8dGQgY2xh c3M9JyIuJGMuIic+PHNwYW4gY2xhc3M9J2Y0Jz48c3BhbiBjbGFzcz0nYmx1ZSc+IjsKIAkJCXBy aW50ICRyb3dbIkRlc2NyaXB0aW9uIl0uIjwvc3Bhbj48L3NwYW4+PC90ZD5cbiI7CiAJCQlwcmlu dCAiICA8dGQgY2xhc3M9JyIuJGMuIic+PHNwYW4gY2xhc3M9J2Y1Jz48c3BhbiBjbGFzcz0nYmx1 ZSc+IjsKLS0gCjEuNS4zLjcKCg== --===============6125203915580521676==-- From xilonmu@gmail.com Mon Jan 7 07:04:16 2008 From: Sebastian Nowicki To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] AUR2 directory structure Date: Mon, 07 Jan 2008 21:04:07 +0900 Message-ID: <20080107120407.GA7370@Odin> In-Reply-To: <20080105173206.GA7927@Odin> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0663872898960298252==" --===============0663872898960298252== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Since there were no replies I just went ahead and implemented one I thought was the most logical. Sources, along with the PKGBUILD/tarball are now saved to the filesystem and properly recorded. I still need to implement downloading the tarball properly. At the moment it just gets the file off the file system, but in order to count the number of downloads I'd need to make it go through a view. Here's a sample directory listing: media/packages |-- catdvi | |-- catdvi.tar.gz | `-- sources | `-- PKGBUILD |-- dbhub | |-- dbhub.tar.gz | `-- sources | `-- PKGBUILD |-- grc | |-- grc.tar.gz | `-- sources | |-- PKGBUILD | `-- install.sh.patch |-- iimms2-git | |-- iimms2-git.tar.gz | `-- sources | |-- PKGBUILD | `-- config.mk `-- slim-theme-the_bait |-- slim-theme-the_bait.tar.gz `-- sources |-- PKGBUILD |-- slim-theme-the_bait-1.tar.gz `-- the_bait.install And of course a screenshot: http://omploader.org/vYWJi --===============0663872898960298252==-- From xilonmu@gmail.com Mon Jan 7 07:53:06 2008 From: Sebastian Nowicki To: aur-dev@lists.archlinux.org Subject: [aur-dev] AUR2 API Date: Mon, 07 Jan 2008 21:52:58 +0900 Message-ID: <20080107125258.GB7370@Odin> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5944107032058509791==" --===============5944107032058509791== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit We have most of what we need to implement the API, and I'm kind of eager to start on it. I thought it may be a good idea to start some discussion about how the API would work. I know there's an implementation in the works for the current AUR, in PHP, so it would be great if we got some implementation ideas from that too. Was there any discussions about that before? The two major functions of the API will be to search and retrieve information about a package. A utility may also want to retrieve comments and vote for package (if that feature was to be implemented). These are the "methods" I can think of: # Returns a tuple of package names that match (name and description is # searched), sorted by relevance # Regex may be used if implemented search(keywords) # Returns all info about the package, excluding dependencies and # such get_package_info(package_name) # Returns a tuple (array) of package names that the package depends on get_package_dependencies(package_name) # Returns a tuple of package comments (dictionary) get_package_comments(package_name) # Not sure about this one, I guess a url returned in get_package_info() # would suffice to use wget. I don't know how one would use JSON to # download a tarball get_package_tarball(package_name) --===============5944107032058509791==-- From eduard.warkentin@gmail.com Mon Jan 7 18:49:26 2008 From: Eduard Warkentin To: aur-dev@lists.archlinux.org Subject: [aur-dev] aur for x86_64 Date: Tue, 08 Jan 2008 00:49:11 +0100 Message-ID: <4782BA77.4010706@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4455623894999155156==" --===============4455623894999155156== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNED MESSAGE----- Hash: RIPEMD160 Hi! I really would like to help aur to be usable for x86_64 packages too. I have no idea whats the current develop on that issue, but I really want to use it for x86_64 too. So if someone please can help me with the main issues at that point, i would be very happy :) Thx and greetings - -- Eduard "bekks" Warkentin GPG key id: 0x32217597 GPG fingerprint: 501B E562 2AF4 65FD EB85 A752 D07B D83D 3221 7597 GPG key server: hkp://subkeys.pgp.net -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.8 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iEYEAREDAAYFAkeCum0ACgkQ0HvYPTIhdZdB/wCgvjezTkJzLAl4lcuuRRk6sUn1 YK4Anii4U1a9Tc/jkdWma/UOPFZDIv+s =815+ -----END PGP SIGNATURE----- --===============4455623894999155156==-- From xilonmu@gmail.com Tue Jan 8 04:08:34 2008 From: Sebastian Nowicki To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] aur for x86_64 Date: Tue, 08 Jan 2008 18:08:19 +0900 Message-ID: <20080108090819.GA7387@Odin> In-Reply-To: <4782BA77.4010706@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5536675324739333659==" --===============5536675324739333659== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit I wasn't aware that there was any issue. All that is required of the packages for them to build on the x86_64 architecture is to have "x86_64" in the arch array (ie. arch=(x86_64)) --===============5536675324739333659==-- From eduard.warkentin@gmail.com Tue Jan 8 12:29:06 2008 From: Eduard Warkentin To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] aur for x86_64 Date: Tue, 08 Jan 2008 18:28:48 +0100 Message-ID: <4783B2D0.6050806@gmail.com> In-Reply-To: <20080108090819.GA7387@Odin> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4360231895793215882==" --===============4360231895793215882== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNED MESSAGE----- Hash: RIPEMD160 Hi1 Yes, for just building packages for x86_64 thats right. but those packages wont appear in AUR until now, which i think is not a good thing. And i really want to help to change that :) Sebastian Nowicki wrote: > I wasn't aware that there was any issue. All that is required of the > packages for them to build on the x86_64 architecture is to have > "x86_64" in the arch array (ie. arch=(x86_64)) - -- best regards, Eduard "bekks" Warkentin GPG key id: 0x32217597 GPG fingerprint: 501B E562 2AF4 65FD EB85 A752 D07B D83D 3221 7597 GPG key server: hkp://subkeys.pgp.net -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.8 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iEYEAREDAAYFAkeDsr8ACgkQ0HvYPTIhdZcaxwCfb6AxmGHtITiq6zSZSsykA3N0 6X4AoJm+q62AsSSj1a9GI6z1s4TLsGSd =Ldd0 -----END PGP SIGNATURE----- --===============4360231895793215882==-- From wizzomafizzo@gmail.com Wed Jan 9 21:15:51 2008 From: Callan Barrett To: aur-dev@lists.archlinux.org Subject: [aur-dev] [PATCH] Bug in uploading PKGBUILDs and aur schema Date: Thu, 10 Jan 2008 11:15:55 +0900 Message-ID: <33f0f4ec0801091815i32173d9bg71d553dc9bfc1188@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5116491587582587035==" --===============5116491587582587035== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit This fixes a bug where TUs and devs couldn't upload packages because the query would have an extra column in it to mark the pkgbuild safe automatically, guessing it got missed when the safe flags were removed. Also fixes a screw up I made with the schema file when I added the tables for the voting app. -- Callan 'wizzomafizzo' Barrett --===============5116491587582587035== Content-Type: text/x-patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="0001-Bug-in-uploading-PKGBUILDs-and-aur-schema.patch" MIME-Version: 1.0 RnJvbSBiZTcxNGMwYzU1ODFkNGQ1YWEwNjIzOTNhYWY3YTA1YjdhYWQyNjg2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDYWxsYW4gQmFycmV0dCA8d2l6em9tYWZpenpvQGdtYWlsLmNv bT4KRGF0ZTogVGh1LCAxMCBKYW4gMjAwOCAxMDozODo1OSArMDkwMApTdWJqZWN0OiBbUEFUQ0hd IEJ1ZyBpbiB1cGxvYWRpbmcgUEtHQlVJTERzIGFuZCBhdXIgc2NoZW1hCgpGaXhlZCBhIGJ1ZyB3 aGVyZSBhIFRVIG9yIGRldiB1cGxvYWRpbmcgYSBQS0dCVUlMRCB3b3VsZCBmYWlsIHNpbGVudGx5 CmR1ZSB0byB0cnlpbmcgdG8gaW5zZXJ0IHRvbyBtYW55IGNvbHVtbnMgKGxlZnRvdmVyIGZyb20g cmVtb3ZpbmcKc2FmZSBmbGFncykgYW5kIHdoZXJlIEkgc2NyZXdlZCB1cCB0aGUgc3ludGF4IG9m IHRoZSBhdXIgc2NoZW1hIGZpbGUKClNpZ25lZC1vZmYtYnk6IENhbGxhbiBCYXJyZXR0IDx3aXp6 b21hZml6em9AZ21haWwuY29tPgotLS0KIHN1cHBvcnQvc2NoZW1hL2F1ci1zY2hlbWEuc3FsIHwg ICAgNCArKy0tCiB3ZWIvaHRtbC9wa2dzdWJtaXQucGhwICAgICAgICB8ICAgIDMgLS0tCiAyIGZp bGVzIGNoYW5nZWQsIDIgaW5zZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9zdXBwb3J0L3NjaGVtYS9hdXItc2NoZW1hLnNxbCBiL3N1cHBvcnQvc2NoZW1hL2F1ci1zY2hl bWEuc3FsCmluZGV4IGM1NzkwYTguLjM3MWYxNDAgMTAwNjQ0Ci0tLSBhL3N1cHBvcnQvc2NoZW1h L2F1ci1zY2hlbWEuc3FsCisrKyBiL3N1cHBvcnQvc2NoZW1hL2F1ci1zY2hlbWEuc3FsCkBAIC0y MjMsMTIgKzIyMywxMiBAQCBDUkVBVEUgVEFCTEUgSUYgTk9UIEVYSVNUUyBUVV9Wb3RlSW5mbyAo CiAgIE5vIHRpbnlpbnQoMykgdW5zaWduZWQgTk9UIE5VTEwgZGVmYXVsdCAnMCcsCiAgIEFic3Rh aW4gdGlueWludCgzKSB1bnNpZ25lZCBOT1QgTlVMTCBkZWZhdWx0ICcwJywKICAgUFJJTUFSWSBL RVkgIChJRCkKLSkKKyk7CiAKIC0tIEluZGl2aWR1YWwgdm90ZSByZWNvcmRzCiAtLQogQ1JFQVRF IFRBQkxFIElGIE5PVCBFWElTVFMgVFVfVm90ZXMgKAogICBWb3RlSUQgaW50KDEwKSB1bnNpZ25l ZCBOT1QgTlVMTCwKICAgVXNlcklEIGludCgxMCkgdW5zaWduZWQgTk9UIE5VTEwKLSkKKyk7CiAK ZGlmZiAtLWdpdCBhL3dlYi9odG1sL3BrZ3N1Ym1pdC5waHAgYi93ZWIvaHRtbC9wa2dzdWJtaXQu cGhwCmluZGV4IDliZWQzZjUuLjQ2Yjc4Y2YgMTAwNjQ0Ci0tLSBhL3dlYi9odG1sL3BrZ3N1Ym1p dC5waHAKKysrIGIvd2ViL2h0bWwvcGtnc3VibWl0LnBocApAQCAtNDg2LDkgKzQ4Niw2IEBAIGlm ICgkX0NPT0tJRVsiQVVSU0lEIl0pIHsKIAkJCQkkcS49IG15c3FsX3JlYWxfZXNjYXBlX3N0cmlu ZygkbmV3X3BrZ2J1aWxkWydwa2dkZXNjJ10pLiInLCAnIjsKIAkJCQkkcS49IG15c3FsX3JlYWxf ZXNjYXBlX3N0cmluZygkbmV3X3BrZ2J1aWxkWyd1cmwnXSk7CiAJCQkJJHEuPSAiJywgMiwgIjsK LQkJCQlpZiAoYWNjb3VudF9mcm9tX3NpZCgkX0NPT0tJRVsiQVVSU0lEIl0pID09ICJUcnVzdGVk IFVzZXIiIHx8IGFjY291bnRfZnJvbV9zaWQoJF9DT09LSUVbIkFVUlNJRCJdKSA9PSAiRGV2ZWxv cGVyIikgewotCQkJCQkkcS49ICIxLCAiLnVpZF9mcm9tX3NpZCgkX0NPT0tJRVsiQVVSU0lEIl0p LiIsICI7Ci0JCQkJfQogCQkJCSRxLj0gIlVOSVhfVElNRVNUQU1QKCksICI7CiAJCQkJJHEuPSB1 aWRfZnJvbV9zaWQoJF9DT09LSUVbIkFVUlNJRCJdKS4iLCAiOwogCQkJCSRxLj0gdWlkX2Zyb21f c2lkKCRfQ09PS0lFWyJBVVJTSUQiXSkuIiwgJyI7Ci0tIAoxLjUuMy43Cgo= --===============5116491587582587035==-- From wizzomafizzo@gmail.com Fri Jan 11 11:00:06 2008 From: Callan Barrett To: aur-dev@lists.archlinux.org Subject: [aur-dev] [PATCH] Removes need for name, overwrite and comment fields from pkgsubmit.php Date: Sat, 12 Jan 2008 01:00:05 +0900 Message-ID: <33f0f4ec0801110800i5a608545k7d55cb0f9010c377@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1472368899960641427==" --===============1472368899960641427== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Alright, this patch gets rid of some fields in the pkgbuild submit form leaving just the category select and file select fields. As far as I can tell it works fine but I think this is an important patch that other people should test if possible, so if anyone reads these emails aside from cactus can you please try this out. -- Callan 'wizzomafizzo' Barrett --===============1472368899960641427==-- From wizzomafizzo@gmail.com Fri Jan 11 11:01:29 2008 From: Callan Barrett To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] [PATCH] Removes need for name, overwrite and comment fields from pkgsubmit.php Date: Sat, 12 Jan 2008 01:01:19 +0900 Message-ID: <33f0f4ec0801110801y622f2325h2760b47756904bfa@mail.gmail.com> In-Reply-To: <33f0f4ec0801110800i5a608545k7d55cb0f9010c377@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2739585866213120016==" --===============2739585866213120016== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit On Jan 12, 2008 1:00 AM, Callan Barrett wrote: > Alright, this patch gets rid of some fields in the pkgbuild submit > form leaving just the category select and file select fields. As far > as I can tell it works fine but I think this is an important patch > that other people should test if possible, so if anyone reads these > emails aside from cactus can you please try this out. Whoops, I'll also attach the patch. ;) -- Callan 'wizzomafizzo' Barrett --===============2739585866213120016== Content-Type: text/x-patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="0002-Removes-need-for-name-overwrite-and-comment-fields.patch" MIME-Version: 1.0 RnJvbSA3YjJiNmE3MzhmNGM3Y2U5YTM1MjA1NmY3M2ZlYjNlZDZmM2FiNDE5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDYWxsYW4gQmFycmV0dCA8d2l6em9tYWZpenpvQGdtYWlsLmNv bT4KRGF0ZTogU2F0LCAxMiBKYW4gMjAwOCAwMDo1MToyOCArMDkwMApTdWJqZWN0OiBbUEFUQ0hd IFJlbW92ZXMgbmVlZCBmb3IgbmFtZSwgb3ZlcndyaXRlIGFuZCBjb21tZW50IGZpZWxkcyBmcm9t IHBrZ3N1Ym1pdC5waHAKClRoaXMgcmVtb3ZlcyB0aGUgbmFtZSwgb3ZlcndyaXRlIGFuZCBjb21t ZW50IG9wdGlvbnMgZnJvbSBwa2dzdWJtaXQucGhwCmJ5IG1vdmluZyB3aGVuIHRoZSB0YXJiYWxs IGlzIGV4dHJhY3RlZCAoYW5kIHdoZXJlKSBhbmQgd2hlbiB0aGUgcGtnYnVpbGQKaXMgcGFyc2Vk IHNvIHBrZ25hbWUgaXMgdGFrZW4gZnJvbSB0aGUgcGtnYnVpbGQgaW5zdGVhZCBvZiB1c2VyIGlu cHV0CgpTaWduZWQtb2ZmLWJ5OiBDYWxsYW4gQmFycmV0dCA8d2l6em9tYWZpenpvQGdtYWlsLmNv bT4KLS0tCiB3ZWIvaHRtbC9wa2dzdWJtaXQucGhwIHwgIDMwNyArKysrKysrKysrKysrKysrKyst LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIHdlYi9saWIvYXVyLmluYyAgICAgICAgfCAg IDIyICsrLS0KIDIgZmlsZXMgY2hhbmdlZCwgMTIzIGluc2VydGlvbnMoKyksIDIwNiBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS93ZWIvaHRtbC9wa2dzdWJtaXQucGhwIGIvd2ViL2h0bWwvcGtn c3VibWl0LnBocAppbmRleCA0NmI3OGNmLi5lMzQ5NTkxIDEwMDY0NAotLS0gYS93ZWIvaHRtbC9w a2dzdWJtaXQucGhwCisrKyBiL3dlYi9odG1sL3BrZ3N1Ym1pdC5waHAKQEAgLTI5LDE1OCArMjks NzggQEAgaWYgKCRfQ09PS0lFWyJBVVJTSUQiXSkgewogCX0KIAogCWlmICgkX1JFUVVFU1RbInBr Z3N1Ym1pdCJdKSB7Ci0JCSMgSWYgdGhpcyB2YXIgaXMgc2V0LCB0aGVuIHRoZSB2aXNpdG9yIGlz IHVwbG9hZGluZyBhIGZpbGUuLi4KLQkJIwotCQlpZiAoISRfUkVRVUVTVFsicGtnbmFtZSJdKSB7 Ci0JCQkkZXJyb3IgPSBfXygiWW91IGRpZCBub3Qgc3BlY2lmeSBhIHBhY2thZ2UgbmFtZS4iKTsK LQkJfSBlbHNlIHsKLQkJCSRwa2dfbmFtZSA9IHN0cl9yZXBsYWNlKCInIiwgIiIsICRfUkVRVUVT VFsicGtnbmFtZSJdKTsKLQkJCSRwa2dfbmFtZSA9IGVzY2FwZXNoZWxsYXJnKCRwa2dfbmFtZSk7 Ci0JCQkkcGtnX25hbWUgPSBzdHJfcmVwbGFjZSgiJyIsICIiLCAkcGtnX25hbWUpOyAjIGdldCBy aWQgb2Ygc2luZ2xlIHF1b3RlcwotICAgICAgICAgICAgCi0gICAgICAgICAgICAjIFNvbHZlcyB0 aGUgcHJvYmxlbSB3aGVuIHlvdSB0cnkgdG8gc3VibWl0IFBLR0JVSUxECi0gICAgICAgICAgICAj IHRoYXQgaGF2ZSB0aGUgbmFtZSB3aXRoIGEgcGVyaW9kIGxpa2UgKGdzdHJlYW1lcjAuMTApCi0g ICAgICAgICAgICAjIEFkZGVkIHN1cHBvcnQgZm9yIHBhY2thZ2VzIHdpdGggKyBjaGFyYWN0ZXJz IGxpa2UgKG15c3FsKyspLgotICAgICAgICAgICAgJHByZXN1bHQgPSBwcmVnX21hdGNoKCIvXlth LXowLTldW2EtejAtOVwuK18tXSokLyIsICRwa2dfbmFtZSk7Ci0gICAgICAgICAgICAKLSAgICAg ICAgICAgIGlmICgkcHJlc3VsdCA9PSBGQUxTRSB8fCAkcHJlc3VsdCA8PSAwKSB7Ci0JCQkJIyBG QUxTRSA9PiBlcnJvciBwcm9jZXNzaW5nIHJlZ2V4LCAwID0+IGludmFsaWQgY2hhcmFjdGVycwot CQkJCSMKLQkJCQkkZXJyb3IgPSBfXygiSW52YWxpZCBuYW1lOiBvbmx5IGxvd2VyY2FzZSBsZXR0 ZXJzIGFyZSBhbGxvd2VkLiIpOwotCQkJfQotCQl9Ci0KLQkJaWYgKCEkZXJyb3IgJiYgKCEkX1JF UVVFU1RbImNvbW1lbnRzIl0gfHwgJF9SRVFVRVNUWyJjb21tZW50cyJdID09ICcnKSkgewotCQkJ JGVycm9yID0gX18oIllvdSBtdXN0IHN1cHBseSBhIGNvbW1lbnQgZm9yIHRoaXMgdXBsb2FkL2No YW5nZS4iKTsKLQkJfQotCi0JCWlmICghJGVycm9yKSB7Ci0JCQkjIGZpcnN0LCBzZWUgaWYgdGhp cyBwYWNrYWdlIGFscmVhZHkgZXhpc3RzLCBhbmQgaWYgaXQgY2FuIGJlIG92ZXJ3cml0dGVuCi0J CQkjCQotCQkJJHBrZ19leGlzdHMgPSBwYWNrYWdlX2V4aXN0cygkcGtnX25hbWUpOwotCQkJaWYg KCRwa2dfZXhpc3RzKSB7Ci0JCQkJIyBvaywgaXQgZXhpc3RzIC0gc2hvdWxkIGl0IGJlIG92ZXJ3 cml0dGVuLCBhbmQgZG9lcyB0aGUgdXNlciBoYXZlCi0JCQkJIyB0aGUgcGVybWlzc2lvbnMgdG8g ZG8gc28/Ci0JCQkJIwotCQkJCWlmIChjYW5fb3ZlcndyaXRlX3BrZygkcGtnX25hbWUsICRfQ09P S0lFWyJBVVJTSUQiXSkpIHsKLQkJCQkJaWYgKCEkX1JFUVVFU1RbIm92ZXJ3cml0ZSJdKSB7Ci0J CQkJCQkkZXJyb3IgPSBfXygiWW91IGRpZCBub3QgdGFnIHRoZSAnb3ZlcndyaXRlJyBjaGVja2Jv eC4iKTsKLQkJCQkJfQotCQkJCX0gZWxzZSB7Ci0JCQkJCSRlcnJvciA9IF9fKCJZb3UgYXJlIG5v dCBhbGxvd2VkIHRvIG92ZXJ3cml0ZSB0aGUgJWglcyVoIHBhY2thZ2UuIiwKLQkJCQkJCQlhcnJh eSgiPGI+IiwgJHBrZ19uYW1lLCAiPC9iPiIpKTsKLQkJCQl9Ci0JCQl9Ci0JCX0KLQotCQkjIFRP RE8gY2hlY2sgdG8gc2VlIGlmIHRoZSB1c2VyIGhhcyB0aGUgYWJpbGl0eSB0byAnY2hhbmdlJyBw YWNrYWdlCi0JCSMgYXR0cmlidXRlcyBzdWNoIGFzIGxvY2F0aW9uIGFuZC9vciBjYXRlZ29yeS4J RXhhbXBsZXM6IFRVcyBjYW4KLQkJIyBvbmx5IGFkZC9jaGFuZ2UgcGFja2FnZXMgaW4gVW5zdXBw b3J0ZWQgYW5kIHRoZSBBVVIsIG5vcm1hbCB1c2VycwotCQkjIGNhbiBvbmx5IGFkZC9jaGFuZ2Ug cGFja2FnZXMgaW4gVW5zdXBwb3J0ZWQuCi0JCSMKLQogCQkjQmVmb3JlIHByb2Nlc3NpbmcsIG1h a2Ugc3VyZSB3ZSBldmVuIGhhdmUgYSBmaWxlCiAJCSMKIAkJaWYgKCRfRklMRVNbJ3BmaWxlJ11b J3NpemUnXSA9PSAwKXsKIAkJCSRlcnJvciA9IF9fKCJFcnJvciAtIE5vIGZpbGUgdXBsb2FkZWQi KTsKIAkJfQogCisJCSMgdGVtcG9yYXJ5IGRpciB0byBwdXQgdGhlIHRhcmJhbGwgY29udGVudHMK KwkJJHRlbXBkaXIgPSB1aWRfZnJvbV9zaWQoJF9DT09LSUVbJ0FVUlNJRCddKSAuIHRpbWUoKTsK KwkJCiAJCWlmICghJGVycm9yKSB7Ci0JCQkjIG5vIGVycm9ycyBjaGVja2luZyB1cGxvYWQgcGVy bWlzc2lvbnMsIGdvIGFoZWFkIGFuZCB0cnkgdG8gcHJvY2VzcwotCQkJIyB0aGUgdXBsb2FkZWQg cGFja2FnZSBmaWxlLgotCQkJIwotCi0gICAgICAgICAgICAkdXBsb2FkX2ZpbGUgPSBVUExPQURf RElSIC4gJF9GSUxFU1sicGZpbGUiXVsibmFtZSJdOwotICAgICAgICAgICAgCi0gICAgICAgICAg ICBpZiAobW92ZV91cGxvYWRlZF9maWxlKCRfRklMRVNbInBmaWxlIl1bInRtcF9uYW1lIl0sICR1 cGxvYWRfZmlsZSkpIHsKLQkJCQkjIG9rLCB3ZSBjYW4gcHJvY2VlZAotCQkJCSMKLQkJCQlpZiAo ZmlsZV9leGlzdHMoSU5DT01JTkdfRElSIC4gJHBrZ19uYW1lKSkgewotCQkJCQkjIGJsb3cgYXdh eSB0aGUgZXhpc3RpbmcgZmlsZS9kaXIgYW5kIGNvbnRlbnRzCi0JCQkJCSMKLQkJCQkJcm1fcmYo SU5DT01JTkdfRElSIC4gJHBrZ19uYW1lKTsKLQkJCQl9Ci0KLQkJCX0gZWxzZSB7Ci0JCQkJIyBl cnJvcnMgdXBsb2FkaW5nIGZpbGUuLi4KLQkJCQkjCi0JCQkJJGVycm9yID0gX18oIkVycm9yIHRy eWluZyB0byB1cGxvYWQgZmlsZSAtIHBsZWFzZSB0cnkgYWdhaW4uIik7Ci0JCQl9Ci0JCX0KLQot CQkjIGF0IHRoaXMgcG9pbnQsIHdlIGNhbiBzYWZlbHkgdW5wYWNrIHRoZSB1cGxvYWRlZCBmaWxl IGFuZCBwYXJzZQotCQkjIGl0cyBjb250ZW50cy4KLQkJIwotCQlpZiAoISRlcnJvcikgewotCQkJ Ci0gICAgICAgICAgICBpZiAoIUBta2RpcihJTkNPTUlOR19ESVIuJHBrZ19uYW1lKSkgeworCQkJ aWYgKCFAbWtkaXIoVVBMT0FEX0RJUiAuICR0ZW1wZGlyKSkgewogCQkJCSRlcnJvciA9IF9fKCJD b3VsZCBub3QgY3JlYXRlIGluY29taW5nIGRpcmVjdG9yeTogJXMuIiwKLQkJCQkJCWFycmF5KElO Q09NSU5HX0RJUi4kcGtnX25hbWUpKTsKKwkJCQkJYXJyYXkoVVBMT0FEX0RJUiAuICR0ZW1wZGly KSk7CiAJCQl9IGVsc2UgewotCQkJCWlmICghQGNoZGlyKElOQ09NSU5HX0RJUi4kcGtnX25hbWUp KSB7CisJCQkJaWYgKCFAY2hkaXIoVVBMT0FEX0RJUiAuICR0ZW1wZGlyKSkgewogCQkJCQkkZXJy b3IgPSBfXygiQ291bGQgbm90IGNoYW5nZSBkaXJlY3RvcnkgdG8gJXMuIiwKLQkJCQkJCQlhcnJh eShJTkNPTUlOR19ESVIuJHBrZ19uYW1lKSk7CisJCQkJCQlhcnJheShVUExPQURfRElSIC4gJHRl bXBkaXIpKTsKIAkJCQl9IGVsc2UgewotCQkJCQkjIHRyeSAuZ3ogZmlyc3QKLQkJCQkJIwotCQkJ CQlleGVjKCIvYmluL3NoIC1jICd0YXIgeHpmICIuJHVwbG9hZF9maWxlLiInIiwgJHRyYXNoLCAk cmV0dmFsKTsKLQkJCQkJaWYgKCEkcmV0dmFsKSB7Ci0JCQkJCQkjIG5vdyB0cnkgLmJ6MiBmb3Jt YXQKLQkJCQkJCSMKLQkJCQkJCWV4ZWMoIi9iaW4vc2ggLWMgJ3RhciB4amYgIi4kdXBsb2FkX2Zp bGUuIiciLCAkdHJhc2gsICRyZXR2YWwpOworCQkJCQlleGVjKCIvYmluL3NoIC1jICd0YXIgeHpm ICIgLiAkX0ZJTEVTWyJwZmlsZSJdWyJ0bXBfbmFtZSJdIC4gIiciLCAkdHJhc2gsICRyZXR2YWwp OworCQkJCQlpZiAoJHJldHZhbCkgeworCQkJCQkJZXhlYygiL2Jpbi9zaCAtYyAndGFyIHhqZiAi IC4gJF9GSUxFU1sicGZpbGUiXVsidG1wX25hbWUiXSAuICInIiwgJHRyYXNoLCAkcmV0dmFsKTsK IAkJCQkJfQotCQkJCQlpZiAoISRyZXR2YWwpIHsKKwkJCQkJaWYgKCRyZXR2YWwpIHsKIAkJCQkJ CSRlcnJvciA9IF9fKCJVbmtub3duIGZpbGUgZm9ybWF0IGZvciB1cGxvYWRlZCBmaWxlLiIpOwog CQkJCQl9CiAJCQkJfQogCQkJfQogCQl9CiAKLQkJIyBBdCB0aGlzIHBvaW50LCBpZiBubyBlcnJv ciBleGlzdHMsIHRoZSBwYWNrYWdlIGhhcyBiZWVuIGV4dHJhY3RlZAotCQkjIFRoZXJlIHNob3Vs ZCBiZSBhIElOQ09NSU5HX0RJUi4kcGtnX25hbWUuIi8iLiRwa2dfbmFtZSBkaXJlY3RvcnkKLQkJ IyBpZiB0aGUgdXNlciBwYWNrYWdlZCBpdCBjb3JyZWN0bHkuCUhvd2V2ZXIsIGlmIHRoZSBmaWxl IHdhcwotCQkjIHBhY2thZ2VkIHdpdGhvdXQgdGhlICRwa2dfbmFtZSBzdWJkaXJlY3RvcnksIHRy eSBhbmQgY3JlYXRlIGl0Ci0JCSMgYW5kIG1vdmUgdGhlIHBhY2thZ2UgY29udGVudHMgaW50byB0 aGUgbmV3IHN1Yi1kaXJlY3RvcnkuCi0JCSMKKwkJIyB3aGVyZSBpcyB0aGUgcGtnYnVpbGQ/IQog CQlpZiAoISRlcnJvcikgewotCQkJaWYgKGlzX2RpcihJTkNPTUlOR19ESVIuJHBrZ19uYW1lLiIv Ii4kcGtnX25hbWUpICYmCi0JCQkJCWlzX2ZpbGUoSU5DT01JTkdfRElSLiRwa2dfbmFtZS4iLyIu JHBrZ19uYW1lLiIvUEtHQlVJTEQiKSkgewotCQkJCSMgdGhlIGZpbGVzIHdlcmUgcGFja2FnZWQg Y29ycmVjdGx5Ci0JCQkJIwotCQkJCWlmICghQGNoZGlyKElOQ09NSU5HX0RJUi4kcGtnX25hbWUu Ii8iLiRwa2dfbmFtZSkpIHsKLQkJCQkJJGVycm9yID0gX18oIkNvdWxkIG5vdCBjaGFuZ2UgdG8g ZGlyZWN0b3J5ICVzLiIsCi0JCQkJCQkJYXJyYXkoSU5DT01JTkdfRElSLiRwa2dfbmFtZS4iLyIu JHBrZ19uYW1lKSk7CisJCQkkZCA9IGRpcihVUExPQURfRElSIC4gJHRlbXBkaXIpOworCisJCQkk cGtnYnVpbGQgPSAiIjsKKwkJCSRkZWVwZGlyID0gIiI7CisJCQl3aGlsZSAoJGZpbGUgPSAkZC0+ cmVhZCgpKSB7CisJCQkJIyB0cnkgdG8gZmluZCBhIFBLR0JVSUxEIGluIHRoZSB0b3AgbGV2ZWwg KG5hdWdodHkhIDpPKSBhbmQKKwkJCQkjIGFsc28gdGhlIGZpcnN0IGRpcmVjdG9yeSBmb3VuZCB0 byB1c2UgZm9yIHRoZSBuZXh0IHBhcnQgaWYgcmVxdWlyZWQKKwkJCQlpZiAoJGZpbGUgPT0gIlBL R0JVSUxEIikgeworCQkJCQkkcGtnYnVpbGQgPSBVUExPQURfRElSIC4gJHRlbXBkaXIgLiAiL1BL R0JVSUxEIjsKKwkJCQkJJHBrZ19kaXIgPSBVUExPQURfRElSIC4gJHRlbXBkaXI7CisJCQkJCWJy ZWFrOworCQkJCX0gZWxzZSBpZiAoaXNfZGlyKCRmaWxlKSkgeworCQkJCQkjIHdlJ2xsIGFzc3Vt ZSB0aGUgZmlyc3QgZGlyZWN0b3J5IHdlIGZpbmQgaXMgdGhlIG9uZSB3aXRoCisJCQkJCSMgdGhl IHBrZ2J1aWxkIGluIGl0CisJCQkJCWlmICgkZmlsZSAhPSAiLiIgJiYgJGZpbGUgIT0gIi4uIikg eworCQkJCQkJJGRlZXBkaXIgPSAkZmlsZTsKKwkJCQkJCWJyZWFrOworCQkJCQl9CiAJCQkJfQot CQkJCSRwa2dfZGlyID0gSU5DT01JTkdfRElSLiRwa2dfbmFtZS4iLyIuJHBrZ19uYW1lOwotCQkJ fSBlbHNlaWYgKGlzX2ZpbGUoSU5DT01JTkdfRElSLiRwa2dfbmFtZS4iL1BLR0JVSUxEIikpIHsK LQkJCQkjIG5vdCBwYWNrYWdlZCBjb3JyZWN0bHksIGJ1dCByZWNvdmVyeSBtYXkgYmUgcG9zc2li bGUuCi0JCQkJIyB0cnkgYW5kIGNyZWF0ZSBJTkNPTUlOR19ESVIuJHBrZ19uYW1lLiIvIi4kcGtn X25hbWUgYW5kCi0JCQkJIyBtb3ZlIHBhY2thZ2UgY29udGVudHMgaW50byB0aGUgbmV3IGRpcgot CQkJCSMKLQkJCQlpZiAoIUBta2RpcihJTkNPTUlOR19ESVIuJHBrZ19uYW1lLiIvIi4kcGtnX25h bWUpKSB7Ci0JCQkJCSRlcnJvciA9IF9fKCJDb3VsZCBub3QgY3JlYXRlIGRpcmVjdG9yeSAlcy4i LAotCQkJCQkJCWFycmF5KElOQ09NSU5HX0RJUi4kcGtnX25hbWUuIi8iLiRwa2dfbmFtZSkpOwot CQkJCX0gZWxzZSB7Ci0JCQkJCWV4ZWMoIi9iaW4vc2ggLWMgJ212ICogIi4kcGtnX25hbWUuIici KTsKLQkJCQkJaWYgKCFmaWxlX2V4aXN0cyhJTkNPTUlOR19ESVIuJHBrZ19uYW1lLiIvIi4kcGtn X25hbWUuIi9QS0dCVUlMRCIpKSB7Ci0JCQkJCQkkZXJyb3IgPSBfXygiRXJyb3IgZXhlYydpbmcg dGhlIG12IGNvbW1hbmQuIik7CisJCQl9CisKKwkJCSMgaWYgd2UgY291bGRuJ3QgZmluZCBhIHBr Z2J1aWxkIGluIHRoZSB0b3AgbGV2ZWwgd2UnbGwKKwkJCSMgY2hlY2sgaW4gdGhlIGZpcnN0IGRp ciB3ZSBmb3VuZCwgaWYgaXQncyBub3QgdGhlcmUgd2UgYXNzdW1lCisJCQkjIHRoZXJlIGlzbid0 IGFueSAoZXZlbiBpZiB0aGVyZSB3YXMgdGhlIHVzZXIgc2hvdWxkIHVwbG9hZCBhIHByb3BlciB0 YXJiYWxsKQorCQkJaWYgKCRwa2didWlsZCA9PSAiIiAmJiAkZGVlcGRpciAhPSAiIikgeworCQkJ CSRkID0gZGlyKFVQTE9BRF9ESVIgLiAkdGVtcGRpciAuICIvIiAuICRkZWVwZGlyKTsKKwkJCQl3 aGlsZSAoJGZpbGUgPSAkZC0+cmVhZCgpKSB7CisJCQkJCWlmICgkZmlsZSA9PSAiUEtHQlVJTEQi KSB7CisJCQkJCQkjIG9oIG15CisJCQkJCQkkcGtnYnVpbGQgPSBVUExPQURfRElSIC4gJHRlbXBk aXIgLiAiLyIgLiAkZGVlcGRpciAuIi9QS0dCVUlMRCI7CisJCQkJCQkkcGtnX2RpciA9IFVQTE9B RF9ESVIgLiAkdGVtcGRpciAuICIvIiAuICRkZWVwZGlyOworCQkJCQkJYnJlYWs7CiAJCQkJCX0K IAkJCQl9Ci0JCQkJaWYgKCFAY2hkaXIoSU5DT01JTkdfRElSLiRwa2dfbmFtZS4iLyIuJHBrZ19u YW1lKSkgewotCQkJCQkkZXJyb3IgPSBfXygiQ291bGQgbm90IGNoYW5nZSB0byBkaXJlY3Rvcnkg JXMuIiwKLQkJCQkJCQlhcnJheShJTkNPTUlOR19ESVIuJHBrZ19uYW1lLiIvIi4kcGtnX25hbWUp KTsKKwkJCQlpZiAoJHBrZ2J1aWxkID09ICIiKSB7CisJCQkJCSRlcnJvciA9IF9fKCJFcnJvciB0 cnlpbmcgdG8gdW5wYWNrIHVwbG9hZCAtIFBLR0JVSUxEIGRvZXMgbm90IGV4aXN0LiIpOwogCQkJ CX0KLQkJCQkkcGtnX2RpciA9IElOQ09NSU5HX0RJUi4kcGtnX25hbWUuIi8iLiRwa2dfbmFtZTsK LQkJCX0gZWxzZSB7Ci0JCQkJIyBzb21lIHdpZXJkIHBhY2thZ2luZy9leHRyYWN0aW9uIGVycm9y IC0gYmFhbAotCQkJCSMKLQkJCQkkZXJyb3IgPSBfXygiRXJyb3IgdHJ5aW5nIHRvIHVucGFjayB1 cGxvYWQgLSBQS0dCVUlMRCBkb2VzIG5vdCBleGlzdC4iKTsKIAkJCX0KLQkJfQogCi0gICAgJHNo Y21kID0gIi9iaW4vbXYgIi4kdXBsb2FkX2ZpbGUuIiAiOwotICAgICRzaGNtZC49IGVzY2FwZXNo ZWxsYXJnKElOQ09NSU5HX0RJUi4kcGtnX25hbWUuIi8iLiRfRklMRVNbInBmaWxlIl1bIm5hbWUi XSk7Ci0JCUBleGVjKCRzaGNtZCk7CisJCQkjIHdlIGtub3cgd2hlcmUgb3VyIHBrZ2J1aWxkIGlz IG5vdywgd29vdCB3b290CisJCX0KIAogCQkjIGlmIG5vIGVycm9yLCBnZXQgbGlzdCBvZiBkaXJl Y3RvcnkgY29udGVudHMgYW5kIHByb2Nlc3MgUEtHQlVJTEQKIAkJIwpAQCAtMTkxLDcgKzExMSw3 IEBAIGlmICgkX0NPT0tJRVsiQVVSU0lEIl0pIHsKIAkJCSRwa2dfY29udGVudHMgPSBhcnJheSgp OwogCQkJd2hpbGUgKCRmID0gJGQtPnJlYWQoKSkgewogCQkJCWlmICgkZiAhPSAiLiIgJiYgJGYg IT0gIi4uIikgewotCQkJCQkkcGtnX2NvbnRlbnRzWyRmXSA9IGZpbGVzaXplKCRmKTsKKwkJCQkJ JHBrZ19jb250ZW50c1skZl0gPSBmaWxlc2l6ZSgkcGtnX2RpciAuICIvIiAuICRmKTsKIAkJCQkJ aWYgKHByZWdfbWF0Y2goIi9eKC4qXC5wa2dcLnRhclwuZ3p8ZmlsZWxpc3QpJC8iLCAkZikpIHsK IAkJCQkJCSRlcnJvciA9IF9fKCJCaW5hcnkgcGFja2FnZXMgYW5kIGZpbGVsaXN0cyBhcmUgbm90 IGFsbG93ZWQgZm9yIHVwbG9hZC4iKTsKIAkJCQkJfQpAQCAtMjg1LDcgKzIwNSw3IEBAIGlmICgk X0NPT0tJRVsiQVVSU0lEIl0pIHsKIAkJCSMgdmFyaWFibGUgaGFzIGEgdmFsdWUuCVRoaXMgZG9l cyBub3QgZG8gYW55IHZhbGlkaXR5IGNoZWNraW5nCiAJCQkjIG9uIHRoZSB2YWx1ZXMsIG9yIGF0 dGVtcHRzIHRvIGZpeCBsaW5lIGNvbnRpbnVhdGlvbi93cmFwcGluZy4KIAkJCSMKLSAgICAgICAg ICAgIGlmICghJHNlZW5fYnVpbGRfZnVuY3Rpb24pIHsKKwkJCWlmICghJHNlZW5fYnVpbGRfZnVu Y3Rpb24pIHsKIAkJCQkkZXJyb3IgPSBfXygiTWlzc2luZyBidWlsZCBmdW5jdGlvbiBpbiBQS0dC VUlMRC4iKTsKIAkJCX0KIAkJCWlmICghYXJyYXlfa2V5X2V4aXN0cygibWQ1c3VtcyIsICRwa2di dWlsZCkpIHsKQEAgLTMwMCwyNCArMjIwLDIwIEBAIGlmICgkX0NPT0tJRVsiQVVSU0lEIl0pIHsK IAkJCWlmICghYXJyYXlfa2V5X2V4aXN0cygicGtnZGVzYyIsICRwa2didWlsZCkpIHsKIAkJCQkk ZXJyb3IgPSBfXygiTWlzc2luZyBwa2dkZXNjIHZhcmlhYmxlIGluIFBLR0JVSUxELiIpOwogCQkJ fQotICAgICAgICAgICAgaWYgKCFhcnJheV9rZXlfZXhpc3RzKCJsaWNlbnNlIiwgJHBrZ2J1aWxk KSkgewotICAgICAgICAgICAgICAgICRlcnJvciA9IF9fKCJNaXNzaW5nIGxpY2Vuc2UgdmFyaWFi bGUgaW4gUEtHQlVJTEQuIik7Ci0gICAgICAgICAgICB9ICAgICAgICAgICAgCisJCQlpZiAoIWFy cmF5X2tleV9leGlzdHMoImxpY2Vuc2UiLCAkcGtnYnVpbGQpKSB7CisJCQkJCSRlcnJvciA9IF9f KCJNaXNzaW5nIGxpY2Vuc2UgdmFyaWFibGUgaW4gUEtHQlVJTEQuIik7CisJCQl9ICAgICAgICAg ICAgCiAJCQlpZiAoIWFycmF5X2tleV9leGlzdHMoInBrZ3JlbCIsICRwa2didWlsZCkpIHsKIAkJ CQkkZXJyb3IgPSBfXygiTWlzc2luZyBwa2dyZWwgdmFyaWFibGUgaW4gUEtHQlVJTEQuIik7CiAJ CQl9CiAJCQlpZiAoIWFycmF5X2tleV9leGlzdHMoInBrZ3ZlciIsICRwa2didWlsZCkpIHsKIAkJ CQkkZXJyb3IgPSBfXygiTWlzc2luZyBwa2d2ZXIgdmFyaWFibGUgaW4gUEtHQlVJTEQuIik7CiAJ CQl9Ci0gICAgICAgICAgICBpZiAoIWFycmF5X2tleV9leGlzdHMoImFyY2giLCAkcGtnYnVpbGQp KSB7Ci0gICAgICAgICAgICAgICAgJGVycm9yID0gX18oIk1pc3NpbmcgYXJjaCB2YXJpYWJsZSBp biBQS0dCVUlMRC4iKTsKLSAgICAgICAgICAgIH0KKwkJCWlmICghYXJyYXlfa2V5X2V4aXN0cygi YXJjaCIsICRwa2didWlsZCkpIHsKKwkJCQkJJGVycm9yID0gX18oIk1pc3NpbmcgYXJjaCB2YXJp YWJsZSBpbiBQS0dCVUlMRC4iKTsKKwkJCX0KIAkJCWlmICghYXJyYXlfa2V5X2V4aXN0cygicGtn bmFtZSIsICRwa2didWlsZCkpIHsKIAkJCQkkZXJyb3IgPSBfXygiTWlzc2luZyBwa2duYW1lIHZh cmlhYmxlIGluIFBLR0JVSUxELiIpOwotCQkJfSBlbHNlIHsKLQkJCQlpZiAoJHBrZ2J1aWxkWyJw a2duYW1lIl0gIT0gJHBrZ19uYW1lKSB7Ci0JCQkJCSRlcnJvciA9IF9fKCJQYWNrYWdlIG5hbWVz IGRvIG5vdCBtYXRjaC4iKTsKLQkJCQl9CiAJCQl9CiAJCX0KIApAQCAtMzUyLDIwICsyNjgsNzAg QEAgaWYgKCRfQ09PS0lFWyJBVVJTSUQiXSkgewogCQkJfQogCQl9CiAKKwkJIyBub3cgd2UndmUg cGFyc2VkIHRoZSBwa2didWlsZCwgbGV0J3MgbW92ZSBpdCB0byB3aGVyZSBpdCBiZWxvbmdzCisJ CSMKKwkJaWYgKCEkZXJyb3IpIHsKKwkJCSRwa2dfbmFtZSA9IHN0cl9yZXBsYWNlKCInIiwgIiIs ICRwa2didWlsZFsncGtnbmFtZSddKTsKKwkJCSRwa2dfbmFtZSA9IGVzY2FwZXNoZWxsYXJnKCRw a2dfbmFtZSk7CisJCQkkcGtnX25hbWUgPSBzdHJfcmVwbGFjZSgiJyIsICIiLCAkcGtnX25hbWUp OyAjIGdldCByaWQgb2Ygc2luZ2xlIHF1b3RlcworICAgICAgICAgICAgCisJCQkjIFNvbHZlcyB0 aGUgcHJvYmxlbSB3aGVuIHlvdSB0cnkgdG8gc3VibWl0IFBLR0JVSUxECisJCQkjIHRoYXQgaGF2 ZSB0aGUgbmFtZSB3aXRoIGEgcGVyaW9kIGxpa2UgKGdzdHJlYW1lcjAuMTApCisJCQkjIEFkZGVk IHN1cHBvcnQgZm9yIHBhY2thZ2VzIHdpdGggKyBjaGFyYWN0ZXJzIGxpa2UgKG15c3FsKyspLgor CQkJJHByZXN1bHQgPSBwcmVnX21hdGNoKCIvXlthLXowLTldW2EtejAtOVwuK18tXSokLyIsICRw a2dfbmFtZSk7CisJCQkKKwkJCWlmICgkcHJlc3VsdCA9PSBGQUxTRSB8fCAkcHJlc3VsdCA8PSAw KSB7CisJCQkJIyBGQUxTRSA9PiBlcnJvciBwcm9jZXNzaW5nIHJlZ2V4LCAwID0+IGludmFsaWQg Y2hhcmFjdGVycworCQkJCSMKKwkJCQkkZXJyb3IgPSBfXygiSW52YWxpZCBuYW1lOiBvbmx5IGxv d2VyY2FzZSBsZXR0ZXJzIGFyZSBhbGxvd2VkLiIpOworCQkJfQorCQl9CisKKwkJaWYgKCEkZXJy b3IpIHsKKwkJCSMgZmlyc3QsIHNlZSBpZiB0aGlzIHBhY2thZ2UgYWxyZWFkeSBleGlzdHMsIGFu ZCBpZiBpdCBjYW4gYmUgb3ZlcndyaXR0ZW4KKwkJCSMJCisJCQkkcGtnX2V4aXN0cyA9IHBhY2th Z2VfZXhpc3RzKCRwa2dfbmFtZSk7CisJCQlpZiAoY2FuX3N1Ym1pdF9wa2coJHBrZ19uYW1lLCAk X0NPT0tJRVsiQVVSU0lEIl0pKSB7CisJCQkJaWYgKGZpbGVfZXhpc3RzKElOQ09NSU5HX0RJUiAu ICRwa2dfbmFtZSkpIHsKKwkJCQkJIyBibG93IGF3YXkgdGhlIGV4aXN0aW5nIGZpbGUvZGlyIGFu ZCBjb250ZW50cworCQkJCQkjCisJCQkJCXJtX3JmKElOQ09NSU5HX0RJUiAuICRwa2dfbmFtZSk7 CisJCQkJfQorCisJCQkJaWYgKCFAbWtkaXIoSU5DT01JTkdfRElSLiRwa2dfbmFtZSkpIHsKKwkJ CQkJJGVycm9yID0gX18oIkNvdWxkIG5vdCBjcmVhdGUgZGlyZWN0b3J5ICVzLiIsCisJCQkJCQlh cnJheShJTkNPTUlOR19ESVIuJHBrZ19uYW1lKSk7CisJCQkJfQorCisJCQkJJHNoY21kID0gIi9i aW4vbXYgIiAuICRwa2dfZGlyIC4gIiAiIC4gZXNjYXBlc2hlbGxhcmcoSU5DT01JTkdfRElSIC4g JHBrZ19uYW1lIC4gIi8iIC4gJHBrZ19uYW1lKTsKKwkJCQlAZXhlYygkc2hjbWQpOworCQkJfSBl bHNlIHsKKwkJCQkkZXJyb3IgPSBfXygiWW91IGFyZSBub3QgYWxsb3dlZCB0byBvdmVyd3JpdGUg dGhlICVoJXMlaCBwYWNrYWdlLiIsCisJCQkJCWFycmF5KCI8Yj4iLCAkcGtnX25hbWUsICI8L2I+ IikpOworCQkJfQorCQl9CisKIAkJIyBSZS10YXIgdGhlIHBhY2thZ2UgZm9yIGNvbnNpc3RlbmN5 J3Mgc2FrZQogCQkjCiAJCWlmICghJGVycm9yKSB7CiAJCQlpZiAoIUBjaGRpcihJTkNPTUlOR19E SVIuJHBrZ19uYW1lKSkgewogCQkJCSRlcnJvciA9IF9fKCJDb3VsZCBub3QgY2hhbmdlIGRpcmVj dG9yeSB0byAlcy4iLAotCQkJCWFycmF5KElOQ09NSU5HX0RJUi4kcGtnX25hbWUpKTsKKwkJCQkJ YXJyYXkoSU5DT01JTkdfRElSLiRwa2dfbmFtZSkpOwogCQkJfQogCQl9CisJCQogCQlpZiAoISRl cnJvcikgewogCQkJQGV4ZWMoIi9iaW4vc2ggLWMgJ3RhciBjemYgIi4kcGtnX25hbWUuIi50YXIu Z3ogIi4kcGtnX25hbWUuIiciLCAkdHJhc2gsICRyZXR2YWwpOwogCQkJaWYgKCRyZXR2YWwpIHsK IAkJCQkkZXJyb3IgPSBfXygiQ291bGQgbm90IHJlLXRhciIpOwogCQkJfQogCQl9CisJCQorCQkj IHdoZXRoZXIgaXQgZmFpbGVkIG9yIG5vdCB3ZSBjYW4gY2xlYW4gdGhpcyBvdXQKKwkJaWYgKGZp bGVfZXhpc3RzKFVQTE9BRF9ESVIgLiAkdGVtcGRpcikpIHsKKwkJCXJtX3JmKFVQTE9BRF9ESVIg LiAkdGVtcGRpcik7CisJCX0KKwogCQkjIHVwZGF0ZSB0aGUgYmFja2VuZCBkYXRhYmFzZQogCQkj CiAJCWlmICghJGVycm9yKSB7CkBAIC00NjEsMTYgKzQyNyw2IEBAIGlmICgkX0NPT0tJRVsiQVVS U0lEIl0pIHsKIAkJCQkJJHEgLj0gJHBkYXRhWyJJRCJdLiIsICciLm15c3FsX3JlYWxfZXNjYXBl X3N0cmluZygkdikuIicpIjsKIAkJCQkJZGJfcXVlcnkoJHEsICRkYmgpOwogCQkJCX0KLQotCQkJ CSMgYWRkIHVwbG9hZCBoaXN0b3J5Ci0JCQkJIwotCQkJCSRxID0gIklOU0VSVCBJTlRPIFBhY2th Z2VDb21tZW50cyAiOwotCQkJCSRxLj0gIihQYWNrYWdlSUQsIFVzZXJzSUQsIENvbW1lbnRzLCBD b21tZW50VFMpIFZBTFVFUyAoIjsKLQkJCQkkcS49ICRwZGF0YVsiSUQiXSAuICIsICIgLiB1aWRf ZnJvbV9zaWQoJF9DT09LSUVbJ0FVUlNJRCddKTsKLQkJCQkkcS49ICIsICciIC4gbXlzcWxfcmVh bF9lc2NhcGVfc3RyaW5nKCRfUkVRVUVTVFsiY29tbWVudHMiXSk7Ci0JCQkJJHEuPSAiJywgVU5J WF9USU1FU1RBTVAoKSkiOwotCQkJCWRiX3F1ZXJ5KCRxKTsKLQogCQkJfSBlbHNlIHsKIAkJCQkj IHRoaXMgaXMgYSBicmFuZCBuZXcgcGFja2FnZQogCQkJCSMKQEAgLTUzMywxNyArNDg5LDExIEBA IGlmICgkX0NPT0tJRVsiQVVSU0lEIl0pIHsKIAkJCQkJJHEgLj0gJHBhY2thZ2VJRC4iLCAnIi5t eXNxbF9yZWFsX2VzY2FwZV9zdHJpbmcoJHYpLiInKSI7CiAJCQkJCWRiX3F1ZXJ5KCRxLCAkZGJo KTsKIAkJCQl9Ci0KLQkJCQkjIGFkZCB1cGxvYWQgaGlzdG9yeQotCQkJCSMKLQkJCQkkcSA9ICJJ TlNFUlQgSU5UTyBQYWNrYWdlQ29tbWVudHMgIjsKLQkJCQkkcS49ICIoUGFja2FnZUlELCBVc2Vy c0lELCBDb21tZW50cywgQ29tbWVudFRTKSBWQUxVRVMgKCI7Ci0JCQkJJHEuPSAkcGFja2FnZUlE IC4gIiwgIiAuIHVpZF9mcm9tX3NpZCgkX0NPT0tJRVsiQVVSU0lEIl0pIC4gIiwgJyI7Ci0JCQkJ JHEuPSBteXNxbF9yZWFsX2VzY2FwZV9zdHJpbmcoJF9SRVFVRVNUWyJjb21tZW50cyJdKTsKLQkJ CQkkcS49ICInLCBVTklYX1RJTUVTVEFNUCgpKSI7Ci0JCQkJZGJfcXVlcnkoJHEsICRkYmgpOwog CQkJfQogCQl9CisKKwkJIyBtdXN0IGNoZGlyIGJlY2F1c2UgaW5jbHVkZSBkaXJzIGFyZSByZWxh dGl2ZSEKKwkJY2hkaXIoJF9TRVJWRVJbJ0RPQ1VNRU5UX1JPT1QnXSk7CiAJfQogCiAKQEAgLTU1 NCwxMyArNTA0LDEzIEBAIGlmICgkX0NPT0tJRVsiQVVSU0lEIl0pIHsKIAkJaWYgKGluaV9nZXQo ImZpbGVfdXBsb2FkcyIpKSB7CiAJCQlpZiAoJGVycm9yKSB7CiAJCQkJcHJpbnQgIjxzcGFuIGNs YXNzPSdlcnJvcic+Ii4kZXJyb3IuIjwvc3Bhbj48YnIgLz5cbiI7Ci0JCQkJcHJpbnQgIjxiciAv PiZuYnNwOzxiciAvPlxuIjsKKwkJCQlwcmludCAiPGJyIC8+XG4iOwogCQkJfQogICAgICAgICAg ICAgCi0gICAgICAgICAgICBpZiAoJHdhcm5pbmcpIHsKLSAgICAgICAgICAgICAgICBwcmludCAi PGJyPjxzcGFuIGNsYXNzPSdlcnJvcic+Ii4kd2FybmluZy4iPC9zcGFuPjxiciAvPlxuIjsKLSAg ICAgICAgICAgICAgICBwcmludCAiPGJyIC8+Jm5ic3A7PGJyIC8+XG4iOwotICAgICAgICAgICAg fQorCQkJaWYgKCR3YXJuaW5nKSB7CisJCQkJCXByaW50ICI8YnI+PHNwYW4gY2xhc3M9J2Vycm9y Jz4iLiR3YXJuaW5nLiI8L3NwYW4+PGJyIC8+XG4iOworCQkJCQlwcmludCAiPGJyIC8+XG4iOwor CQkJfQogICAgICAgICAgICAgCiAJCQkkcGtnX2NhdGVnb3JpZXMgPSBwa2dDYXRlZ29yaWVzKCk7 CiAJCQkkcGtnX2xvY2F0aW9ucyA9IHBrZ0xvY2F0aW9ucygpOwpAQCAtNTczLDEzICs1MjMsNiBA QCBpZiAoJF9DT09LSUVbIkFVUlNJRCJdKSB7CiAJCQlwcmludCAiPHRhYmxlIGJvcmRlcj0nMCcg Y2VsbHNwYWNpbmc9JzUnPlxuIjsKIAkJCXByaW50ICI8dHI+XG4iOwogCQkJcHJpbnQgIgk8dGQg c3Bhbj0nZjQnIGFsaWduPSdyaWdodCc+IjsKLQkJCXByaW50IF9fKCJQYWNrYWdlIG5hbWUiKS4i OjwvdGQ+XG4iOwotCQkJcHJpbnQgIgk8dGQgc3Bhbj0nZjQnIGFsaWduPSdsZWZ0Jz4iOwotCQkJ cHJpbnQgIjxpbnB1dCB0eXBlPSd0ZXh0JyBuYW1lPSdwa2duYW1lJyBzaXplPSczMCcgbWF4bGVu Z3RoPSczMicgLz5cbiI7Ci0JCQlwcmludCAiCTwvdGQ+XG4iOwotCQkJcHJpbnQgIjwvdHI+XG4i OwotCQkJcHJpbnQgIjx0cj5cbiI7Ci0JCQlwcmludCAiCTx0ZCBzcGFuPSdmNCcgYWxpZ249J3Jp Z2h0Jz4iOwogCQkJcHJpbnQgX18oIlBhY2thZ2UgQ2F0ZWdvcnkiKS4iOjwvdGQ+XG4iOwogCQkJ cHJpbnQgIgk8dGQgc3Bhbj0nZjQnIGFsaWduPSdsZWZ0Jz4iOwogCQkJcHJpbnQgIjxzZWxlY3Qg bmFtZT0nY2F0ZWdvcnknPiI7CkBAIC02MDcsMzEgKzU1MCwxMSBAQCBpZiAoJF9DT09LSUVbIkFV UlNJRCJdKSB7CiAJCQlwcmludCAiPGlucHV0IHR5cGU9J2ZpbGUnIG5hbWU9J3BmaWxlJyBzaXpl PSczMCcgLz5cbiI7CiAJCQlwcmludCAiCTwvdGQ+XG4iOwogCQkJcHJpbnQgIjwvdHI+XG4iOwot CQkJcHJpbnQgIjx0cj5cbiI7Ci0JCQlwcmludCAiCTx0ZCBzcGFuPSdmNCcgYWxpZ249J3JpZ2h0 Jz4iOwotCQkJcHJpbnQgX18oIk92ZXJ3cml0ZSBleGlzdGluZyBwYWNrYWdlPyIpOwotCQkJcHJp bnQgIgk8L3RkPlxuIjsKLQkJCXByaW50ICIJPHRkIHNwYW49J2Y0JyBhbGlnbj0nbGVmdCc+IjsK LQkJCXByaW50ICI8aW5wdXQgdHlwZT0ncmFkaW8nIG5hbWU9J292ZXJ3cml0ZScgdmFsdWU9JzEn PiAiLl9fKCJZZXMiKTsKLQkJCXByaW50ICImbmJzcDsmbmJzcDsmbmJzcDsiOwotCQkJcHJpbnQg IjxpbnB1dCB0eXBlPSdyYWRpbycgbmFtZT0nb3ZlcndyaXRlJyB2YWx1ZT0nMCcgY2hlY2tlZD4g IjsKLQkJCXByaW50IF9fKCJObyIpOwotCQkJcHJpbnQgIgk8L3RkPlxuIjsKLQkJCXByaW50ICI8 L3RyPlxuIjsKLQkJCXByaW50ICI8dHI+XG4iOwotCQkJcHJpbnQgIgk8dGQgdmFsaWduPSd0b3An IHNwYW49J2Y0JyBhbGlnbj0ncmlnaHQnPiI7Ci0JCQlwcmludCBfXygiQ29tbWVudCIpLiI6PC90 ZD5cbiI7Ci0JCQlwcmludCAiCTx0ZCBzcGFuPSdmNCcgYWxpZ249J2xlZnQnPiI7Ci0JCQlwcmlu dCAiPHRleHRhcmVhIHJvd3M9JzEwJyBjb2xzPSc1MCcgbmFtZT0nY29tbWVudHMnPjwvdGV4dGFy ZWE+IjsKLQkJCXByaW50ICIJPC90ZD5cbiI7Ci0JCQlwcmludCAiPC90cj5cbiI7CiAKIAkJCXBy aW50ICI8dHI+XG4iOwogCQkJcHJpbnQgIgk8dGQ+Jm5ic3A7PC90ZD5cbiI7CiAJCQlwcmludCAi CTx0ZCBhbGlnbj0nbGVmdCc+IjsKIAkJCXByaW50ICI8aW5wdXQgY2xhc3M9J2J1dHRvbicgdHlw ZT0nc3VibWl0JyB2YWx1ZT0nIi5fXygiVXBsb2FkIikuIicgLz5cbiI7Ci0JCQlwcmludCAiJm5i c3A7Jm5ic3A7Jm5ic3A7IjsKLQkJCXByaW50ICI8aW5wdXQgY2xhc3M9J2J1dHRvbicgdHlwZT0n cmVzZXQnIHZhbHVlPSciLl9fKCJSZXNldCIpLiInIC8+XG4iOwogCQkJcHJpbnQgIjwvdGQ+XG4i OwogCQkJcHJpbnQgIjwvdHI+XG4iOwogCQkJcHJpbnQgIjwvdGFibGU+XG4iOwpAQCAtNjQ2LDcg KzU2OSw3IEBAIGlmICgkX0NPT0tJRVsiQVVSU0lEIl0pIHsKICAgICAgICAgCiAgICAgICAgIGlm ICgkd2FybmluZykgewogICAgICAgICAgICAgcHJpbnQgIjxzcGFuIGNsYXNzPSd3YXJuaW5nJz4i LiR3YXJuaW5nLiI8L3NwYW4+PGJyIC8+XG4iOwotICAgICAgICAgICAgcHJpbnQgIjxiciAvPiZu YnNwOzxiciAvPlxuIjsKKyAgICAgICAgICAgIHByaW50ICI8YnIgLz5cbiI7CiAgICAgICAgIH0K IAl9CiAKZGlmZiAtLWdpdCBhL3dlYi9saWIvYXVyLmluYyBiL3dlYi9saWIvYXVyLmluYwppbmRl eCAwMjU4MDYwLi5jMTgzNjVjIDEwMDY0NAotLS0gYS93ZWIvbGliL2F1ci5pbmMKKysrIGIvd2Vi L2xpYi9hdXIuaW5jCkBAIC03LDYgKzcsNyBAQCBoZWFkZXIoJ1ByYWdtYTogbm8tY2FjaGUnKTsK IGluY2x1ZGVfb25jZSgidmVyc2lvbi5pbmMiKTsKIGluY2x1ZGVfb25jZSgiY29uZmlnLmluYyIp OwogaW5jbHVkZV9vbmNlKCJhdXJfcG8uaW5jIik7CisvLyBUT0RPOiByZW1vdmUgdGhpcywgbW92 ZSB0cmFuc2xhdGlvbnMgb3ZlciBmb3IgbG9naW4gZm9ybQogaW5jbHVkZV9vbmNlKCJpbmRleF9w by5pbmMiKTsKIAogIyBUT0RPIGRvIHdlIG5lZWQgdG8gc2V0IHRoZSBkb21haW4gb24gY29va2ll cz8gIEkgc2VlbSB0byByZW1lbWJlciBzb21lCkBAIC00MjUsMjkgKzQyNiwyMiBAQCBmdW5jdGlv biBkYnVnKCRtc2cpIHsKIAlyZXR1cm47CiB9CiAKLSMgY2hlY2sgdG8gc2VlIGlmIHRoZSB1c2Vy IGNhbiBvdmVyd3JpdGUgYW4gZXhpc3RpbmcgcGFja2FnZQorIyBjaGVjayB0byBzZWUgaWYgdGhl IHVzZXIgY2FuIHN1Ym1pdCBhIHBhY2thZ2UKICMKLWZ1bmN0aW9uIGNhbl9vdmVyd3JpdGVfcGtn KCRuYW1lPSIiLCAkc2lkPSIiKSB7CitmdW5jdGlvbiBjYW5fc3VibWl0X3BrZygkbmFtZT0iIiwg JHNpZD0iIikgewogCWlmICghJG5hbWUgfHwgISRzaWQpIHtyZXR1cm4gMDt9CiAJJGRiaCA9IGRi X2Nvbm5lY3QoKTsKLQkkcSA9ICJTRUxFQ1QgU3VibWl0dGVyVUlELCBNYWludGFpbmVyVUlELCBB VVJNYWludGFpbmVyVUlEICI7CisJJHEgPSAiU0VMRUNUIE1haW50YWluZXJVSUQgIjsKIAkkcS49 ICJGUk9NIFBhY2thZ2VzIFdIRVJFIE5hbWUgPSAnIi5teXNxbF9yZWFsX2VzY2FwZV9zdHJpbmco JG5hbWUpLiInIjsKIAkkcmVzdWx0ID0gZGJfcXVlcnkoJHEsICRkYmgpOwotCWlmICghJHJlc3Vs dCkge3JldHVybiAwO30KKwlpZiAobXlzcWxfbnVtX3Jvd3MoJHJlc3VsdCkgPT0gMCkge3JldHVy biAxO30KIAkkcm93ID0gbXlzcWxfZmV0Y2hfcm93KCRyZXN1bHQpOwogCSRteV91aWQgPSB1aWRf ZnJvbV9zaWQoJHNpZCk7CiAKLQkjIHVzZXIgaXMgYSBkZXYgYW5kIG1haW50YWlucyB0aGUgcGFj a2FnZQotCSMKLQlpZiAoJG15X3VpZCA9PSAkcm93WzJdKSB7cmV0dXJuIDE7fQotCi0JIyB1c2Vy IGlzIGEgVFUgYW5kIHRoZXJlIGlzIG5vIGRldgotCSMKLQlpZiAoISRyb3dbMl0gJiYgJG15X3Vp ZCA9PSAkcm93WzFdKSB7cmV0dXJuIDE7fQorCWlmICgkcm93WzBdID09ICRteV91aWQpIHsKKwkJ cmV0dXJuIDE7CisJfQogCi0JIyB1c2VyIGlzIGEgdXNlciBhbmQgdGhlcmUgaXMgbm8gVFUgb3Ig ZGV2Ci0JIwotCWlmICghJHJvd1syXSAmJiAhJHJvd1sxXSAmJiAkbXlfdWlkID09ICRyb3dbMF0p IHtyZXR1cm4gMTt9CiAJcmV0dXJuIDA7CiB9CiAKLS0gCjEuNS4zLjcKCg== --===============2739585866213120016==-- From xilonmu@gmail.com Fri Jan 11 11:46:22 2008 From: Sebastian Nowicki To: aur-dev@lists.archlinux.org Subject: [aur-dev] AUR2 New feature: Package Requests Date: Sat, 12 Jan 2008 01:46:12 +0900 Message-ID: <20080111164612.GA23550@Odin> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3373554643163279879==" --===============3373554643163279879== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit This morning I was looking for package requests, that I may be able to fill, on the bbs. After a few minutes of flipping through threads, I realised that nobody maintains the forum. These threads do not get edited properly to indicate that a request was filled. Every thread I looked at which seemed to be a request, was in fact already filled. Searching for a valid request seemed impossible. Who know how many threads spanning those 99 pages are actually filled or not? So I figured I may as well make a special section for it on the AUR site. The templates are a bit ugly still, and there's no searching implemented, nor do requests get marked as filled when a package gets submitted, but there's time for that. Here are some screenshots of what's done so far: http://img134.imageshack.us/img134/8855/200801120136181679x759sqm8.png http://img341.imageshack.us/img341/1507/200801120137081679x520seo8.png * http://img521.imageshack.us/img521/6889/200801120137171679x772ste9.png I discussed it with wizzo a bit and decided that comments weren't neccessary, but a "pkgbuild attempt" field would be useful. Any comments/discussion that people may have about the request can reside on the ML or bbs. * Request listing will have an "added" or "requested on" field --===============3373554643163279879==-- From eliott@cactuswax.net Fri Jan 11 12:50:38 2008 From: eliott To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] AUR2 New feature: Package Requests Date: Fri, 11 Jan 2008 09:50:37 -0800 Message-ID: <428d921d0801110950w4c48c33dk9bfa8aec67713512@mail.gmail.com> In-Reply-To: <20080111164612.GA23550@Odin> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1227025942556844799==" --===============1227025942556844799== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit On 1/11/08, Sebastian Nowicki wrote: > This morning I was looking for package requests, that I may be able to > fill, on the bbs. After a few minutes of flipping through threads, I > realised that nobody maintains the forum. These threads do not get > edited properly to indicate that a request was filled. Every thread I > looked at which seemed to be a request, was in fact already filled. > Searching for a valid request seemed impossible. Who know how many > threads spanning those 99 pages are actually filled or not? > > So I figured I may as well make a special section for it on the AUR > site. The templates are a bit ugly still, and there's no searching > implemented, nor do requests get marked as filled when a package gets > submitted, but there's time for that. Here are some screenshots of > what's done so far: > > http://img134.imageshack.us/img134/8855/200801120136181679x759sqm8.png > http://img341.imageshack.us/img341/1507/200801120137081679x520seo8.png * > http://img521.imageshack.us/img521/6889/200801120137171679x772ste9.png > > I discussed it with wizzo a bit and decided that comments weren't > neccessary, but a "pkgbuild attempt" field would be useful. Any > comments/discussion that people may have about the request can reside on > the ML or bbs. > > * Request listing will have an "added" or "requested on" field I don't think I like this kind of thing being tied to the aur code. Requesting a package, or packaging assistance, shouldn't be a formal process. It should be informal, like most community requests for assistance. I think it should just remain a community aspect, and should be just something that happens on the forum or the mailing list. --===============1227025942556844799==-- From roman.kyrylych@gmail.com Fri Jan 11 16:35:27 2008 From: Roman Kyrylych To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] AUR2 New feature: Package Requests Date: Fri, 11 Jan 2008 23:35:27 +0200 Message-ID: <577f15290801111335v6fff2e06wc94166e3f091dc82@mail.gmail.com> In-Reply-To: <428d921d0801110950w4c48c33dk9bfa8aec67713512@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7925559283239953939==" --===============7925559283239953939== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit 2008/1/11, eliott : > On 1/11/08, Sebastian Nowicki wrote: > > This morning I was looking for package requests, that I may be able to > > fill, on the bbs. After a few minutes of flipping through threads, I > > realised that nobody maintains the forum. These threads do not get > > edited properly to indicate that a request was filled. Every thread I > > looked at which seemed to be a request, was in fact already filled. > > Searching for a valid request seemed impossible. Who know how many > > threads spanning those 99 pages are actually filled or not? > > > > So I figured I may as well make a special section for it on the AUR > > site. The templates are a bit ugly still, and there's no searching > > implemented, nor do requests get marked as filled when a package gets > > submitted, but there's time for that. Here are some screenshots of > > what's done so far: > > > > http://img134.imageshack.us/img134/8855/200801120136181679x759sqm8.png > > http://img341.imageshack.us/img341/1507/200801120137081679x520seo8.png * > > http://img521.imageshack.us/img521/6889/200801120137171679x772ste9.png > > > > I discussed it with wizzo a bit and decided that comments weren't > > neccessary, but a "pkgbuild attempt" field would be useful. Any > > comments/discussion that people may have about the request can reside on > > the ML or bbs. > > > > * Request listing will have an "added" or "requested on" field > > I don't think I like this kind of thing being tied to the aur code. > > Requesting a package, or packaging assistance, shouldn't be a formal > process. It should be informal, like most community requests for > assistance. I think it should just remain a community aspect, and > should be just something that happens on the forum or the mailing > list. > There is a "package requests" branch on our forums. -- Roman Kyrylych (Роман Кирилич) --===============7925559283239953939==-- From xilonmu@gmail.com Fri Jan 11 23:25:54 2008 From: Sebastian Nowicki To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] AUR2 New feature: Package Requests Date: Sat, 12 Jan 2008 13:25:35 +0900 Message-ID: <20080112042535.GA7446@Odin> In-Reply-To: <428d921d0801110950w4c48c33dk9bfa8aec67713512@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7546012125487870914==" --===============7546012125487870914== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit On Fri, Jan 11, 2008 at 09:50:37AM -0800, eliott wrote: > Requesting a package, or packaging assistance, shouldn't be a formal > process. It should be informal, like most community requests for > assistance. I think it should just remain a community aspect, and > should be just something that happens on the forum or the mailing > list. > As I mentioned in the previous post, the bbs just does not work. The mailing list doesn't seem like the right place either, since it moves along and posts can be forgotten. It's not really persistent. I think having the requests on the AUR is very logical, it's more automated, organised, easier to search for requests, and filled requests automatically drop off the listing. No maintenance is required since the code does everything. The user is required to give a decent amount of information, which people fail to do on the bbs. Only one account is required to post requests and packages, instead of one for the AUR and one for the bbs. Just because people aren't able to freely post comments and such doesn't mean that there is no community aspect. In my opinion the AUR is very much a community project and I don't see why requests shouldn't be in the same place as the packages. --===============7546012125487870914==-- From wizzomafizzo@gmail.com Sat Jan 12 04:18:45 2008 From: Callan Barrett To: aur-dev@lists.archlinux.org Subject: [aur-dev] [PATCH] Tweaks of various page layouts and handling of data Date: Sat, 12 Jan 2008 18:18:43 +0900 Message-ID: <33f0f4ec0801120118o600a9664j496c2a0113a68c8f@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8939038828420672384==" --===============8939038828420672384== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit This is a patch that fixes a lot of little things: * We no longer have pkgsearch or pkgdetails link functions and all references to them are gone, that's what a back button is for and if we really need it we can come up with something better * No longer have do_Details variable, this means links on the package search are simply ?ID=foo * On the pkgdetails pages when there are either no deps, deps by, sources or comments for a package the list for each will display "None" instead of nothing at all (ruining the layout) * Fixed a bug where if a package had no sources or no deps pkgsubmit.php would submit an empty one * Translation of the word "Search'" has been changed to "Search" Most of these relate to each other. -- Callan 'wizzomafizzo' Barrett --===============8939038828420672384== Content-Type: text/x-patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="0003-Tweaks-of-various-page-layouts-and-handling-of-data.patch" MIME-Version: 1.0 RnJvbSA1Yjg5ZDAwMjM0NTkyZTE0MjU3ODBmOGI2ODBkYjJlOGVlNDdjYjgyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDYWxsYW4gQmFycmV0dCA8d2l6em9tYWZpenpvQGdtYWlsLmNv bT4KRGF0ZTogU2F0LCAxMiBKYW4gMjAwOCAxODowMjoyNiArMDkwMApTdWJqZWN0OiBbUEFUQ0hd IFR3ZWFrcyBvZiB2YXJpb3VzIHBhZ2UgbGF5b3V0cyBhbmQgaGFuZGxpbmcgb2YgZGF0YQoKUmVt b3ZlcyBwa2dzZWFyY2ggYW5kIHBrZ3Jlc3VsdHMgbGluayBmdW5jdGlvbnMgYW5kIGFsbApyZWZl cmVuY2VzIHRvIHRoZW0sIHJlbW92ZXMgZG9fRGV0YWlscyB2YXJpYWJsZSBhbmQgY2xlYW5zCnVw IHNvbWUgbGlua3MsIG5vdyBkaXNwbGF5cyAiTm9uZSIgd2hlbiBubyBkZXBzIGV0Yy4gY2FuCmJl IGZvdW5kIG9uIHBrZ2RldGFpbHMgcGFnZXMgYW5kIGNoYW5nZXMgdHJhbnNsYXRpb24gd29yZAoi U2VhcmNoJyIgdG8gIlNlYXJjaCIKClNpZ25lZC1vZmYtYnk6IENhbGxhbiBCYXJyZXR0IDx3aXp6 b21hZml6em9AZ21haWwuY29tPgotLS0KIHdlYi9odG1sL3BhY2thZ2VzLnBocCAgICAgICAgICAg ICAgICAgfCAgIDMwICstLS0KIHdlYi9odG1sL3BrZ2VkaXQucGhwICAgICAgICAgICAgICAgICAg fCAgIDExICstCiB3ZWIvaHRtbC9wa2dzdWJtaXQucGhwICAgICAgICAgICAgICAgIHwgICAyOCAr Ky0KIHdlYi9sYW5nL2NhL2FjY3RmdW5jc19wby5pbmMgICAgICAgICAgfCAgICAyICstCiB3ZWIv bGFuZy9kZS9hY2N0ZnVuY3NfcG8uaW5jICAgICAgICAgIHwgICAgMiArLQogd2ViL2xhbmcvZW4v YWNjdGZ1bmNzX3BvLmluYyAgICAgICAgICB8ICAgIDIgKy0KIHdlYi9sYW5nL2VzL2FjY3RmdW5j c19wby5pbmMgICAgICAgICAgfCAgICAyICstCiB3ZWIvbGFuZy9mci9hY2N0ZnVuY3NfcG8uaW5j ICAgICAgICAgIHwgICAgMiArLQogd2ViL2xhbmcvaXQvYWNjdGZ1bmNzX3BvLmluYyAgICAgICAg ICB8ICAgIDIgKy0KIHdlYi9sYW5nL3BsL2FjY3RmdW5jc19wby5pbmMgICAgICAgICAgfCAgICAy ICstCiB3ZWIvbGFuZy9wdC9hY2N0ZnVuY3NfcG8uaW5jICAgICAgICAgIHwgICAgMiArLQogd2Vi L2xhbmcvcnUvYWNjdGZ1bmNzX3BvLmluYyAgICAgICAgICB8ICAgIDIgKy0KIHdlYi9saWIvcGtn ZnVuY3MuaW5jICAgICAgICAgICAgICAgICAgfCAgMzQzICsrKysrKysrKysrKysrKy0tLS0tLS0t LS0tLS0tLS0tLQogd2ViL3RlbXBsYXRlL2hlYWRlci5waHAgICAgICAgICAgICAgICB8ICAgIDIg Ky0KIHdlYi90ZW1wbGF0ZS9zZWFyY2hfYWNjb3VudHNfZm9ybS5waHAgfCAgICAyICstCiAxNSBm aWxlcyBjaGFuZ2VkLCAxODkgaW5zZXJ0aW9ucygrKSwgMjQ1IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL3dlYi9odG1sL3BhY2thZ2VzLnBocCBiL3dlYi9odG1sL3BhY2thZ2VzLnBocAppbmRl eCA5ZGVmZjZhLi5iYzM5OGVlIDEwMDY0NAotLS0gYS93ZWIvaHRtbC9wYWNrYWdlcy5waHAKKysr IGIvd2ViL2h0bWwvcGFja2FnZXMucGhwCkBAIC05Miw5ICs5Miw2IEBAIGlmIChpc3NldCgkX1JF UVVFU1RbImRvX0ZsYWciXSkpIHsKIAkJCXByaW50IF9fKCJZb3UgZGlkIG5vdCBzZWxlY3QgYW55 IHBhY2thZ2VzIHRvIGZsYWcuIik7CiAJCQlwcmludCAiPC9wPlxuIjsKIAkJfQotCi0JCXBrZ3Nl YXJjaF9yZXN1bHRzX2xpbmsoKTsKLQkJCQkKIAl9CiAKIH0gZWxzZWlmIChpc3NldCgkX1JFUVVF U1RbImRvX1VuRmxhZyJdKSkgewpAQCAtMTMxLDcgKzEyOCw2IEBAIGlmIChpc3NldCgkX1JFUVVF U1RbImRvX0ZsYWciXSkpIHsKIAkJCXByaW50ICI8L3A+XG4iOwogCQl9CiAKLQkJcGtnc2VhcmNo X3Jlc3VsdHNfbGluaygpOwogCQkJCQogCX0KIApAQCAtMTg3LDcgKzE4Myw2IEBAIGlmIChpc3Nl dCgkX1JFUVVFU1RbImRvX0ZsYWciXSkpIHsKIAkJCXByaW50ICI8L3A+XG4iOwogCQl9CiAKLQkJ cGtnc2VhcmNoX3Jlc3VsdHNfbGluaygpOwogCiAJfQogCkBAIC0yOTUsNyArMjkwLDYgQEAgaWYg KGlzc2V0KCRfUkVRVUVTVFsiZG9fRmxhZyJdKSkgewogCQkJcHJpbnQgX18oIllvdSBkaWQgbm90 IHNlbGVjdCBhbnkgcGFja2FnZXMgdG8gZGVsZXRlLiIpOwogCQkJcHJpbnQgIjwvcD5cbiI7CiAJ CX0gIyBlbmQgaWYgKCFlbXB0eSgkaWRzKSkKLQkJcGtnc2VhcmNoX3Jlc3VsdHNfbGluaygpOwog CX0gIyBlbmQgaWYgKCFhdHlwZSkKIAogfSBlbHNlaWYgKGlzc2V0KCRfUkVRVUVTVFsiZG9fQWRv cHQiXSkpIHsKQEAgLTM1Myw5ICszNDcsNiBAQCBpZiAoaXNzZXQoJF9SRVFVRVNUWyJkb19GbGFn Il0pKSB7CiAJCQlwcmludCBfXygiWW91IGRpZCBub3Qgc2VsZWN0IGFueSBwYWNrYWdlcyB0byBh ZG9wdC4iKTsKIAkJCXByaW50ICI8L3A+XG4iOwogCQl9Ci0KLQkJcGtnc2VhcmNoX3Jlc3VsdHNf bGluaygpOwotCiAJfQogCiAKQEAgLTQxNCwxMyArNDA1LDYgQEAgaWYgKGlzc2V0KCRfUkVRVUVT VFsiZG9fRmxhZyJdKSkgewogCQkJcHJpbnQgX18oIllvdSBkaWQgbm90IHNlbGVjdCBhbnkgcGFj a2FnZXMgdG8gdm90ZSBmb3IuIik7CiAJCQlwcmludCAiPC9wPlxuIjsKIAkJfQotCi0JCWlmIChp c3NldCgkX1JFUVVFU1RbIklEIl0pKSB7Ci0JCQlwa2dkZXRhaWxzX2xpbmsoJF9SRVFVRVNUWyJJ RCJdKTsKLQkJfSBlbHNlIHsKLQkJCXBrZ3NlYXJjaF9yZXN1bHRzX2xpbmsoKTsKLQkJfQotCiAJ fQogCiAKQEAgLTQ3MSwyOCArNDU1LDE5IEBAIGlmIChpc3NldCgkX1JFUVVFU1RbImRvX0ZsYWci XSkpIHsKIAkJCXByaW50IF9fKCJZb3UgZGlkIG5vdCBzZWxlY3QgYW55IHBhY2thZ2VzIHRvIHVu LXZvdGUgZm9yLiIpOwogCQkJcHJpbnQgIjwvcD5cbiI7CiAJCX0KLQotCQlpZiAoaXNzZXQoJF9S RVFVRVNUWyJJRCJdKSkgewotCQkJcGtnZGV0YWlsc19saW5rKCRfUkVRVUVTVFsiSUQiXSk7Ci0J CX0gZWxzZSB7Ci0JCQlwa2dzZWFyY2hfcmVzdWx0c19saW5rKCk7Ci0JCX0KLQogCX0KIAogCi19 IGVsc2VpZiAoaXNzZXQoJF9SRVFVRVNUWyJkb19EZXRhaWxzIl0pKSB7Cit9IGVsc2VpZiAoaXNz ZXQoJF9SRVFVRVNUWyJJRCJdKSkgewogCi0JaWYgKCFpc3NldCgkX1JFUVVFU1RbIklEIl0pIHx8 ICFpbnR2YWwoJF9SRVFVRVNUWyJJRCJdKSkgeworCWlmICghaW50dmFsKCRfUkVRVUVTVFsiSUQi XSkpIHsKIAkJcHJpbnQgX18oIkVycm9yIHRyeWluZyB0byByZXRyaWV2ZSBwYWNrYWdlIGRldGFp bHMuIikuIjxiciAvPlxuIjsKIAkJCiAJfSBlbHNlIHsKIAkJcGFja2FnZV9kZXRhaWxzKCRfUkVR VUVTVFsiSUQiXSwgJF9DT09LSUVbIkFVUlNJRCJdKTsKIAl9CiAKLQlwcmludCAiPGJyIC8+XG4i OwogCSMgRklYTUU6IElmIHNvbWVvbmUgaGl0cyB0aGUgZGV0YWlsIHBhZ2UncyB2b3RlIGJ1dHRv biwgdGhpcyBsaW5rIGRpZXMKLQlwa2dzZWFyY2hfcmVzdWx0c19saW5rKCk7CiAKIH0gZWxzZWlm IChpc3NldCgkX1JFUVVFU1RbImRvX05vdGlmeSJdKSkgewogCSMgSSByZWFsaXplIHRoYXQgdGhl IGltcGxlbWVudGF0aW9uIGhlcmUgc2VlbXMgYSBiaXQgY29udm9sdXRlZCwgYnV0IHdlIHdhbnQg dG8KQEAgLTUzMiw3ICs1MDcsNiBAQCBpZiAoaXNzZXQoJF9SRVFVRVNUWyJkb19GbGFnIl0pKSB7 CiAJCQkJCXByaW50ICc8YnIgLz48L3A+JzsKIAkJCQl9CiAJCQl9Ci0JCQlwa2dkZXRhaWxzX2xp bmsoJHBpZCk7CiAJCX0gZWxzZSB7CiAJCQlwcmludCAnPHA+JzsKIAkJCXByaW50IF9fKCJDb3Vs ZG4ndCBhZGQgdG8gbm90aWZpY2F0aW9uIGxpc3QuIik7CmRpZmYgLS1naXQgYS93ZWIvaHRtbC9w a2dlZGl0LnBocCBiL3dlYi9odG1sL3BrZ2VkaXQucGhwCmluZGV4IDZkODMxNGYuLjllYjJmZTIg MTAwNjQ0Ci0tLSBhL3dlYi9odG1sL3BrZ2VkaXQucGhwCisrKyBiL3dlYi9odG1sL3BrZ2VkaXQu cGhwCkBAIC01OCw3ICs1OCw2IEBAIGlmICgkX1JFUVVFU1RbImRlbF9Db21tZW50Il0pIHsKIAl9 IGVsc2UgewogCQlwcmludCBfXygiTWlzc2luZyBjb21tZW50IElELiIpLiI8YnIgLz5cbiI7CiAJ fQotCXBrZ2RldGFpbHNfbGluaygkX1JFUVVFU1RbIklEIl0pOwogCWh0bWxfZm9vdGVyKEFVUl9W RVJTSU9OKTsKIAlleGl0KCk7CiB9CkBAIC03Niw4ICs3NSw3IEBAIGlmICgkX1JFUVVFU1RbImFk ZF9Db21tZW50Il0pIHsKIAkJJHEuPSAiJyIubXlzcWxfcmVhbF9lc2NhcGVfc3RyaW5nKCRfUkVR VUVTVFsiY29tbWVudCJdKS4iJywgIjsKIAkJJHEuPSAiVU5JWF9USU1FU1RBTVAoKSkiOwogCQlk Yl9xdWVyeSgkcSwgJGRiaCk7Ci0JCXByaW50IF9fKCJDb21tZW50IGhhcyBiZWVuIGFkZGVkLiIp LiI8YnIgLz4mbmJzcDs8YnIgLz5cbiI7Ci0JCXBrZ2RldGFpbHNfbGluaygkX1JFUVVFU1RbIklE Il0pOworCQlwcmludCBfXygiQ29tbWVudCBoYXMgYmVlbiBhZGRlZC4iKTsKIAogCQkjIFNlbmQg ZW1haWwgbm90aWZpY2F0aW9ucwogCQkjCkBAIC0xNDQsOCArMTQyLDYgQEAgaWYgKCRfUkVRVUVT VFsiY2hhbmdlX0NhdGVnb3J5Il0pIHsKIAkJfSBlbHNlIHsKIAkJCXByaW50IF9fKCJJbnZhbGlk IGNhdGVnb3J5IElELiIpLiI8YnIgLz5cbiI7CiAJCX0KLQkJcGtnZGV0YWlsc19saW5rKCRfUkVR VUVTVFsiSUQiXSk7Ci0KIAl9IGVsc2UgewogCQkjIFByb21wdCB2aXNpdG9yIGZvciBuZXcgY2F0 ZWdvcnlfaWQKIAkJIwpAQCAtMTc5LDEwICsxNzUsNyBAQCBpZiAoJF9SRVFVRVNUWyJjaGFuZ2Vf Q2F0ZWdvcnkiXSkgewogCiBwcmludCBfXygiWW91J3ZlIGZvdW5kIGEgYnVnIGlmIHlvdSBzZWUg dGhpcy4uLi4iKS4iPGJyIC8+XG4iOwogCi1odG1sX2Zvb3RlcihBVVJfVkVSU0lPTik7ICAgIyBV c2UgdGhlICRJZCQga2V5d29yZAotICAgICAgICAgICAgICAgICAgICAgICAgICAgIyBOT1RFOiB3 aGVuIGNoZWNraW5nIGluIGEgbmV3IGZpbGUsIHVzZQotICAgICAgICAgICAgICAgICAgICAgICAg ICAgIyAnc3ZuIHByb3BzZXQgc3ZuOmtleXdvcmRzICJJZCIgZmlsZW5hbWUucGhwJwotICAgICAg ICAgICAgICAgICAgICAgICAgICAgIyB0byB0ZWxsIHN2biB0byBleHBhbmQgdGhlICJJZCIga2V5 d29yZC4KK2h0bWxfZm9vdGVyKEFVUl9WRVJTSU9OKTsKIAogIyB2aW06IHRzPTIgc3c9MiBub2V0 IGZ0PXBocAogPz4KZGlmZiAtLWdpdCBhL3dlYi9odG1sL3BrZ3N1Ym1pdC5waHAgYi93ZWIvaHRt bC9wa2dzdWJtaXQucGhwCmluZGV4IGUzNDk1OTEuLjYzODY1NGIgMTAwNjQ0Ci0tLSBhL3dlYi9o dG1sL3BrZ3N1Ym1pdC5waHAKKysrIGIvd2ViL2h0bWwvcGtnc3VibWl0LnBocApAQCAtNDIxLDEx ICs0MjEsMTUgQEAgaWYgKCRfQ09PS0lFWyJBVVJTSUQiXSkgewogCQkJCQlkYl9xdWVyeSgkcSwg JGRiaCk7CiAJCQkJfQogCi0JCQkJJHNvdXJjZXMgPSBleHBsb2RlKCIgIiwgJG5ld19wa2didWls ZFsnc291cmNlJ10pOwotCQkJCXdoaWxlIChsaXN0KCRrLCAkdikgPSBlYWNoKCRzb3VyY2VzKSkg ewotCQkJCQkkcSA9ICJJTlNFUlQgSU5UTyBQYWNrYWdlU291cmNlcyAoUGFja2FnZUlELCBTb3Vy Y2UpIFZBTFVFUyAoIjsKLQkJCQkJJHEgLj0gJHBkYXRhWyJJRCJdLiIsICciLm15c3FsX3JlYWxf ZXNjYXBlX3N0cmluZygkdikuIicpIjsKLQkJCQkJZGJfcXVlcnkoJHEsICRkYmgpOworCQkJCSMg SW5zZXJ0IHNvdXJjZXMsIGlmIHRoZXkgZG9uJ3QgZXhpc3QgZG9uJ3QgaW5zZXIgdGhlbQorCQkJ CSMgCisJCQkJaWYgKCRuZXdfcGtnYnVpbGRbJ3NvdXJjZSddICE9ICIiKSB7CisJCQkJCSRzb3Vy Y2VzID0gZXhwbG9kZSgiICIsICRuZXdfcGtnYnVpbGRbJ3NvdXJjZSddKTsKKwkJCQkJd2hpbGUg KGxpc3QoJGssICR2KSA9IGVhY2goJHNvdXJjZXMpKSB7CisJCQkJCQkkcSA9ICJJTlNFUlQgSU5U TyBQYWNrYWdlU291cmNlcyAoUGFja2FnZUlELCBTb3VyY2UpIFZBTFVFUyAoIjsKKwkJCQkJCSRx IC49ICRwZGF0YVsiSUQiXS4iLCAnIi5teXNxbF9yZWFsX2VzY2FwZV9zdHJpbmcoJHYpLiInKSI7 CisJCQkJCQlkYl9xdWVyeSgkcSwgJGRiaCk7CisJCQkJCX0KIAkJCQl9CiAJCQl9IGVsc2Ugewog CQkJCSMgdGhpcyBpcyBhIGJyYW5kIG5ldyBwYWNrYWdlCkBAIC00ODMsMTEgKzQ4NywxNSBAQCBp ZiAoJF9DT09LSUVbIkFVUlNJRCJdKSB7CiAJCQkJCWRiX3F1ZXJ5KCRxLCAkZGJoKTsKIAkJCQl9 CiAKLQkJCQkkc291cmNlcyA9IGV4cGxvZGUoIiAiLCAkbmV3X3BrZ2J1aWxkWydzb3VyY2UnXSk7 Ci0JCQkJd2hpbGUgKGxpc3QoJGssICR2KSA9IGVhY2goJHNvdXJjZXMpKSB7Ci0JCQkJCSRxID0g IklOU0VSVCBJTlRPIFBhY2thZ2VTb3VyY2VzIChQYWNrYWdlSUQsIFNvdXJjZSkgVkFMVUVTICgi OwotCQkJCQkkcSAuPSAkcGFja2FnZUlELiIsICciLm15c3FsX3JlYWxfZXNjYXBlX3N0cmluZygk dikuIicpIjsKLQkJCQkJZGJfcXVlcnkoJHEsICRkYmgpOworCQkJCSMgaW5zZXJ0IHNvdXJjZXMK KwkJCQkjCisJCQkJaWYgKCRuZXdfcGtnYnVpbGRbJ3NvdXJjZSddICE9ICIiKSB7CisJCQkJCSRz b3VyY2VzID0gZXhwbG9kZSgiICIsICRuZXdfcGtnYnVpbGRbJ3NvdXJjZSddKTsKKwkJCQkJd2hp bGUgKGxpc3QoJGssICR2KSA9IGVhY2goJHNvdXJjZXMpKSB7CisJCQkJCQkkcSA9ICJJTlNFUlQg SU5UTyBQYWNrYWdlU291cmNlcyAoUGFja2FnZUlELCBTb3VyY2UpIFZBTFVFUyAoIjsKKwkJCQkJ CSRxIC49ICRwYWNrYWdlSUQuIiwgJyIubXlzcWxfcmVhbF9lc2NhcGVfc3RyaW5nKCR2KS4iJyki OworCQkJCQkJZGJfcXVlcnkoJHEsICRkYmgpOworCQkJCQl9CiAJCQkJfQogCQkJfQogCQl9CmRp ZmYgLS1naXQgYS93ZWIvbGFuZy9jYS9hY2N0ZnVuY3NfcG8uaW5jIGIvd2ViL2xhbmcvY2EvYWNj dGZ1bmNzX3BvLmluYwppbmRleCA2NzcwNTA2Li41OWRlZTljIDEwMDY0NAotLS0gYS93ZWIvbGFu Zy9jYS9hY2N0ZnVuY3NfcG8uaW5jCisrKyBiL3dlYi9sYW5nL2NhL2FjY3RmdW5jc19wby5pbmMK QEAgLTcsNyArNyw3IEBAIGdsb2JhbCAkX3Q7CiAKICRfdFsiY2EiXVsiTWlzc2luZyBhIHJlcXVp cmVkIGZpZWxkLiJdID0gIk1hbmNhIHVuIGNhbXAgcmVxdWVyaXQuIjsKIAotJF90WyJjYSJdWyJT ZWFyY2gnIl0gPSAiQ2VyY2EnIjsKKyRfdFsiY2EiXVsiU2VhcmNoIl0gPSAiQ2VyY2EnIjsKIAog JF90WyJjYSJdWyJUaGUgYWNjb3VudCwgJWglcyVoLCBoYXMgYmVlbiBzdWNjZXNzZnVsbHkgY3Jl YXRlZC4iXSA9ICJFbCBjb21wdGUsICVoJXMlaCwgcydoYSBjcmVhdCBzYXRpc2ZhY3Tvv73vv71y aWFtZW50LiI7CiAKZGlmZiAtLWdpdCBhL3dlYi9sYW5nL2RlL2FjY3RmdW5jc19wby5pbmMgYi93 ZWIvbGFuZy9kZS9hY2N0ZnVuY3NfcG8uaW5jCmluZGV4IGU3M2ZiNzQuLjI0OGY2NjkgMTAwNjQ0 Ci0tLSBhL3dlYi9sYW5nL2RlL2FjY3RmdW5jc19wby5pbmMKKysrIGIvd2ViL2xhbmcvZGUvYWNj dGZ1bmNzX3BvLmluYwpAQCAtNyw3ICs3LDcgQEAgZ2xvYmFsICRfdDsKIAogJF90WyJkZSJdWyJN aXNzaW5nIGEgcmVxdWlyZWQgZmllbGQuIl0gPSAiRWluIGJlbu+/ve+/vXRpZ3RlcyBGZWxkIGZl aGx0LiI7CiAKLSRfdFsiZGUiXVsiU2VhcmNoJyJdID0gIlN1Y2hlJyI7CiskX3RbImRlIl1bIlNl YXJjaCJdID0gIlN1Y2hlJyI7CiAKICRfdFsiZGUiXVsiVGhlIGFjY291bnQsICVoJXMlaCwgaGFz IGJlZW4gc3VjY2Vzc2Z1bGx5IGNyZWF0ZWQuIl0gPSAiRGFzIEtvbnRvICVoJXMlaCB3dXJkZSBl cmZvbGdyZWljaCBhbmdlbGVndC4iOwogCmRpZmYgLS1naXQgYS93ZWIvbGFuZy9lbi9hY2N0ZnVu Y3NfcG8uaW5jIGIvd2ViL2xhbmcvZW4vYWNjdGZ1bmNzX3BvLmluYwppbmRleCAzYzA1NGMxLi5j MTliZmRiIDEwMDY0NAotLS0gYS93ZWIvbGFuZy9lbi9hY2N0ZnVuY3NfcG8uaW5jCisrKyBiL3dl Yi9sYW5nL2VuL2FjY3RmdW5jc19wby5pbmMKQEAgLTEzLDcgKzEzLDcgQEAgZ2xvYmFsICRfdDsK IAogJF90WyJlbiJdWyJNaXNzaW5nIGEgcmVxdWlyZWQgZmllbGQuIl0gPSAiTWlzc2luZyBhIHJl cXVpcmVkIGZpZWxkLiI7CiAKLSRfdFsiZW4iXVsiU2VhcmNoJyJdID0gIlNlYXJjaCciOworJF90 WyJlbiJdWyJTZWFyY2giXSA9ICJTZWFyY2giOwogCiAkX3RbImVuIl1bIlRoZSBhY2NvdW50LCAl aCVzJWgsIGhhcyBiZWVuIHN1Y2Nlc3NmdWxseSBjcmVhdGVkLiJdID0gIlRoZSBhY2NvdW50LCAl aCVzJWgsIGhhcyBiZWVuIHN1Y2Nlc3NmdWxseSBjcmVhdGVkLiI7CiAKZGlmZiAtLWdpdCBhL3dl Yi9sYW5nL2VzL2FjY3RmdW5jc19wby5pbmMgYi93ZWIvbGFuZy9lcy9hY2N0ZnVuY3NfcG8uaW5j CmluZGV4IDcwNjc0MGEuLjlmOGY5NmUgMTAwNjQ0Ci0tLSBhL3dlYi9sYW5nL2VzL2FjY3RmdW5j c19wby5pbmMKKysrIGIvd2ViL2xhbmcvZXMvYWNjdGZ1bmNzX3BvLmluYwpAQCAtNyw3ICs3LDcg QEAgZ2xvYmFsICRfdDsKIAogJF90WyJlcyJdWyJNaXNzaW5nIGEgcmVxdWlyZWQgZmllbGQuIl0g PSAiRmFsdGEgdW4gY2FtcG8gb2JsaWdhdG9yaW8uIjsKIAotJF90WyJlcyJdWyJTZWFyY2gnIl0g PSAiQnVzY2FyJyI7CiskX3RbImVzIl1bIlNlYXJjaCJdID0gIkJ1c2NhciciOwogCiAkX3RbImVz Il1bIlRoZSBhY2NvdW50LCAlaCVzJWgsIGhhcyBiZWVuIHN1Y2Nlc3NmdWxseSBjcmVhdGVkLiJd ID0gIkxhIGN1ZW50YSwgJWglcyVoLCBzZSBjcmXvv73vv70gY29ycmVjdGFtZW50ZS4iOwogCmRp ZmYgLS1naXQgYS93ZWIvbGFuZy9mci9hY2N0ZnVuY3NfcG8uaW5jIGIvd2ViL2xhbmcvZnIvYWNj dGZ1bmNzX3BvLmluYwppbmRleCAwYzEwNzU3Li42MWU0ZmZiIDEwMDY0NAotLS0gYS93ZWIvbGFu Zy9mci9hY2N0ZnVuY3NfcG8uaW5jCisrKyBiL3dlYi9sYW5nL2ZyL2FjY3RmdW5jc19wby5pbmMK QEAgLTcsNyArNyw3IEBAIGdsb2JhbCAkX3Q7CiAKICRfdFsiZnIiXVsiTWlzc2luZyBhIHJlcXVp cmVkIGZpZWxkLiJdID0gIklsIG1hbnF1ZSB1biBjaGFtcCByZXF1aXMuIjsKIAotJF90WyJmciJd WyJTZWFyY2gnIl0gPSAiUmVjaGVyY2hlciciOworJF90WyJmciJdWyJTZWFyY2giXSA9ICJSZWNo ZXJjaGVyJyI7CiAKICRfdFsiZnIiXVsiVGhlIGFjY291bnQsICVoJXMlaCwgaGFzIGJlZW4gc3Vj Y2Vzc2Z1bGx5IGNyZWF0ZWQuIl0gPSAiTGUgY29tcHRlLCAlaCVzJWgsIGEg77+977+9dO+/ve+/ vSBjcu+/ve+/ve+/ve+/vSBhdmVjIHN1Y2Pvv73vv71zLiI7CiAKZGlmZiAtLWdpdCBhL3dlYi9s YW5nL2l0L2FjY3RmdW5jc19wby5pbmMgYi93ZWIvbGFuZy9pdC9hY2N0ZnVuY3NfcG8uaW5jCmlu ZGV4IGUwOGQzNDIuLmU1YjkzMTYgMTAwNjQ0Ci0tLSBhL3dlYi9sYW5nL2l0L2FjY3RmdW5jc19w by5pbmMKKysrIGIvd2ViL2xhbmcvaXQvYWNjdGZ1bmNzX3BvLmluYwpAQCAtNyw3ICs3LDcgQEAg Z2xvYmFsICRfdDsKIAogJF90WyJpdCJdWyJNaXNzaW5nIGEgcmVxdWlyZWQgZmllbGQuIl0gPSAi TWFuY2EgdW4gY2FtcG8gb2JibGlnYXRvcmlvLiI7CiAKLSRfdFsiaXQiXVsiU2VhcmNoJyJdID0g IkNlcmNhJyI7CiskX3RbIml0Il1bIlNlYXJjaCJdID0gIkNlcmNhJyI7CiAKICRfdFsiaXQiXVsi VGhlIGFjY291bnQsICVoJXMlaCwgaGFzIGJlZW4gc3VjY2Vzc2Z1bGx5IGNyZWF0ZWQuIl0gPSAi TCdhY2NvdW50ICVoJXMlaCDvv73vv70gc3RhdG8gY3JlYXRvIGNvbiBzdWNjZXNzby4iOwogCmRp ZmYgLS1naXQgYS93ZWIvbGFuZy9wbC9hY2N0ZnVuY3NfcG8uaW5jIGIvd2ViL2xhbmcvcGwvYWNj dGZ1bmNzX3BvLmluYwppbmRleCA0Yjk0ZTlkLi5iOWQ2NDU5IDEwMDY0NAotLS0gYS93ZWIvbGFu Zy9wbC9hY2N0ZnVuY3NfcG8uaW5jCisrKyBiL3dlYi9sYW5nL3BsL2FjY3RmdW5jc19wby5pbmMK QEAgLTI3LDcgKzI3LDcgQEAgJF90WyJwbCJdWyJSZS10eXBlIHBhc3N3b3JkIl0gPSAiSGFz77+9 77+9byAocG9ub3duaWUpIjsKICRfdFsicGwiXVsiTGFuZ3VhZ2UgaXMgbm90IGN1cnJlbnRseSBz dXBwb3J0ZWQuIl0gPSAiSu+/ve+/vXp5ayBuaWUgamVzdCBvYmVjbmllIG9ic++/ve+/vXVnaXdh bnkuIjsKICRfdFsicGwiXVsiTWlzc2luZyBVc2VyIElEIl0gPSAiQnJha3VqZSBJRCB177+977+9 eXRrb3duaWthIjsKICRfdFsicGwiXVsiRGV2ZWxvcGVyIl0gPSAiRGV2ZWxvcGVyIjsKLSRfdFsi cGwiXVsiU2VhcmNoJyJdID0gIlN6dWthaiciOworJF90WyJwbCJdWyJTZWFyY2giXSA9ICJTenVr YWonIjsKICRfdFsicGwiXVsiU3RhdHVzIl0gPSAiU3RhdHVzIjsKICRfdFsicGwiXVsiTm8gcmVz dWx0cyBtYXRjaGVkIHlvdXIgc2VhcmNoIGNyaXRlcmlhLiJdID0gIld5c3p1a2l3YW5pZSBuaWUg cHJ6eW5pb3Pvv73vv71vIHJlenVsdGF0dS4iOwogJF90WyJwbCJdWyJOZXZlciJdID0gIk5pZ2R5 IjsKZGlmZiAtLWdpdCBhL3dlYi9sYW5nL3B0L2FjY3RmdW5jc19wby5pbmMgYi93ZWIvbGFuZy9w dC9hY2N0ZnVuY3NfcG8uaW5jCmluZGV4IGM3ZDE1OGEuLjVhOWE4MTMgMTAwNjQ0Ci0tLSBhL3dl Yi9sYW5nL3B0L2FjY3RmdW5jc19wby5pbmMKKysrIGIvd2ViL2xhbmcvcHQvYWNjdGZ1bmNzX3Bv LmluYwpAQCAtMTMsNyArMTMsNyBAQCBnbG9iYWwgJF90OwogCiAkX3RbInB0Il1bIk1pc3Npbmcg YSByZXF1aXJlZCBmaWVsZC4iXSA9ICJVbSBjYW1wbyByZXF1ZXJpZG8gbu+/ve+/vW8gZm9pIGlu Zm9ybWFkby4iOwogCi0kX3RbInB0Il1bIlNlYXJjaCciXSA9ICJQZXNxdWlzYSciOworJF90WyJw dCJdWyJTZWFyY2giXSA9ICJQZXNxdWlzYSciOwogCiAkX3RbInB0Il1bIlRoZSBhY2NvdW50LCAl aCVzJWgsIGhhcyBiZWVuIHN1Y2Nlc3NmdWxseSBjcmVhdGVkLiJdID0gIkEgY29udGEsICVoJXMl aCwgZm9pIGNyaWFkYSBjb20gc3VjZXNzby4iOwogCmRpZmYgLS1naXQgYS93ZWIvbGFuZy9ydS9h Y2N0ZnVuY3NfcG8uaW5jIGIvd2ViL2xhbmcvcnUvYWNjdGZ1bmNzX3BvLmluYwppbmRleCA4ZTAy YTkwLi5jYzRjYWUzIDEwMDY0NAotLS0gYS93ZWIvbGFuZy9ydS9hY2N0ZnVuY3NfcG8uaW5jCisr KyBiL3dlYi9sYW5nL3J1L2FjY3RmdW5jc19wby5pbmMKQEAgLTcsNyArNyw3IEBAIGdsb2JhbCAk X3Q7CiAKICRfdFsicnUiXVsiTWlzc2luZyBhIHJlcXVpcmVkIGZpZWxkLiJdID0gIu+/ve+/ve+/ ve+/ve+/ve+/ve+/ve+/ve+/ve+/ve+/ve+/ve+/ve+/ve+/ve+/ve+/ve+/ve+/ve+/ve+/ve+/ vSDvv73vv73vv73vv73vv73vv73vv73vv73vv73vv73vv73vv73vv73vv73vv73vv73vv73vv73v v73vv73vv73vv73vv73vv70g77+977+977+977+977+977+977+977+977+977+977+977+977+9 77+977+977+9LiI7CiAKLSRfdFsicnUiXVsiU2VhcmNoJyJdID0gIu+/ve+/ve+/ve+/ve+/ve+/ ve+/ve+/ve+/ve+/vSciOworJF90WyJydSJdWyJTZWFyY2giXSA9ICLvv73vv73vv73vv73vv73v v73vv73vv73vv73vv70nIjsKIAogJF90WyJydSJdWyJUaGUgYWNjb3VudCwgJWglcyVoLCBoYXMg YmVlbiBzdWNjZXNzZnVsbHkgY3JlYXRlZC4iXSA9ICLvv73vv73vv73vv73vv73vv73vv73vv73v v73vv73vv73vv73vv73vv70g77+977+977+977+977+977+977+977+977+977+977+977+9ICVo JXMlaCDvv73vv73vv73vv73vv73vv73vv73vv73vv73vv73vv73vv73vv73vv70g77+977+977+9 77+977+977+977+977+977+977+977+977+977+977+9LiI7CiAKZGlmZiAtLWdpdCBhL3dlYi9s aWIvcGtnZnVuY3MuaW5jIGIvd2ViL2xpYi9wa2dmdW5jcy5pbmMKaW5kZXggZjU2MGVmOS4uNDZi YzUyMiAxMDA2NDQKLS0tIGEvd2ViL2xpYi9wa2dmdW5jcy5pbmMKKysrIGIvd2ViL2xpYi9wa2dm dW5jcy5pbmMKQEAgLTYsNDIgKzYsNiBAQCBpbmNsdWRlX29uY2UoImNvbmZpZy5pbmMiKTsKICMK ICRwa2dzZWFyY2hfdmFycyA9IGFycmF5KCJPIiwgIkwiLCAiQyIsICJLIiwgIlNCIiwgIlNPIiwg IlBQIiwgImRvX015UGFja2FnZXMiLCAiZG9fT3JwaGFucyIsICJTZUIiKTsKIAotCi0jIHByaW50 IG91dCB0aGUgJ3JldHVybiB0byBwYWNrYWdlIGRldGFpbHMnIGxpbmsKLSMKLWZ1bmN0aW9uIHBr Z2RldGFpbHNfbGluaygkaWQ9MCkgewotCSR1cmxfZGF0YSA9ICI8YSBocmVmPScvcGFja2FnZXMu cGhwP2RvX0RldGFpbHM9MSZJRD0iLmludHZhbCgkaWQpLiInPiI7Ci0JcHJpbnQgX18oIkdvIGJh Y2sgdG8gJWhwYWNrYWdlIGRldGFpbHMgdmlldyVoLiIsCi0JCWFycmF5KCR1cmxfZGF0YSwgIjwv YT4iKSk7Ci0JcHJpbnQgIlxuPGJyIC8+XG4iOwotCXJldHVybjsKLX0KLQotCi0jIHByaW50IG91 dCB0aGUgJ3JldHVybiB0byBzZWFyY2ggcmVzdWx0cycgbGluawotIwotZnVuY3Rpb24gcGtnc2Vh cmNoX3Jlc3VsdHNfbGluaygpIHsKLQlnbG9iYWwgJF9SRVFVRVNUOwotCWdsb2JhbCAkcGtnc2Vh cmNoX3ZhcnM7Ci0KLQkkdXJsX2RhdGEgPSAiPGEgaHJlZj0nL3BhY2thZ2VzLnBocD9kb19TZWFy Y2g9MSI7Ci0Jd2hpbGUgKGxpc3QoJGssICR2YXIpID0gZWFjaCgkcGtnc2VhcmNoX3ZhcnMpKSB7 Ci0JCWlmICgoJHZhciA9PSAiZG9fTXlQYWNrYWdlcyIgfHwgJHZhciA9PSAiZG9fT3JwaGFucyIp ICYmICRfUkVRVUVTVFskdmFyXSkgewotCQkJJHVybF9kYXRhLj0iJiIuJHZhci4iPTEiOwotCQl9 IGVsc2UgewotCQkJJHVybF9kYXRhLj0iJiIuJHZhci4iPSIucmF3dXJsZW5jb2RlKHN0cmlwc2xh c2hlcygkX1JFUVVFU1RbJHZhcl0pKTsKLQkJfQotCX0KLQkkdXJsX2RhdGEgLj0gIic+IjsKLQlw cmludCAiPGNlbnRlcj4iOwotCXByaW50IF9fKCJHbyBiYWNrIHRvICVoc2VhcmNoIHJlc3VsdHMl aC4iLAotCQlhcnJheSgkdXJsX2RhdGEsICI8L2E+IikpOwotCXByaW50ICI8L2NlbnRlcj4iOwot CXByaW50ICJcbjxiciAvPlxuIjsKLQotCXJldHVybjsKLX0KLQogIyBNYWtlIHN1cmUgdGhpcyB2 aXNpdG9yIGNhbiBkZWxldGUgdGhlIHJlcXVlc3RlZCBwYWNrYWdlIGNvbW1lbnQKICMgVGhleSBj YW4gZGVsZXRlIGlmIHRoZXkgd2VyZSB0aGUgY29tbWVudCBzdWJtaXR0ZXIsIG9yIGlmIHRoZXkg YXJlIGEgVFUvRGV2CiAjCkBAIC0zODcsMjEgKzM1MSwyNSBAQCBmdW5jdGlvbiBwYWNrYWdlX2Rl dGFpbHMoJGlkPTAsICRTSUQ9IiIpIHsKIAkJCWVjaG8gX18oIkRlcGVuZGVuY2llcyIpLiI8L3Nw YW4+PC90ZD48L3RyPlxuIjsKIAkJCWVjaG8gIiAgICAgICAgICAgIDx0cj48dGQgY2xhc3M9J2Jv eFNvZnQnPiI7CiAJCQkkZGVwcyA9IHBhY2thZ2VfZGVwZW5kZW5jaWVzKCRyb3dbIklEIl0pOyAj ICRkZXBzWzBdID0gYXJyYXkoJ2lkJywnbmFtZScsICdkdW1teScpOwotCQkJd2hpbGUgKGxpc3Qo JGssICRkYXJyKSA9IGVhY2goJGRlcHMpKSB7Ci0JCQkJJHVybCA9ICI8YSBocmVmPScvcGFja2Fn ZXMucGhwP2RvX0RldGFpbHM9MSZJRD0iLiRkYXJyWzBdOwotCQkJCXdoaWxlKGxpc3QoJGssICR2 YXIpID0gZWFjaCgkcGtnc2VhcmNoX3ZhcnMpKSB7Ci0JCQkJCWlmICgoJHZhciA9PSAiZG9fTXlQ YWNrYWdlcyIgfHwgJHZhciA9PSAiZG9fT3JwaGFucyIpICYmICRfUkVRVUVTVFskdmFyXSkgewot CQkJCQkJJHVybCAuPSAiJiIuJHZhci4iPTEiOwotCQkJCQl9IGVsc2UgewotCQkJCQkJJHVybCAu PSAiJiIuJHZhci4iPSIucmF3dXJsZW5jb2RlKHN0cmlwc2xhc2hlcygkX1JFUVVFU1RbJHZhcl0p KTsKKwkJCWlmIChjb3VudCgkZGVwcykgPT0gMCkgeworCQkJCXByaW50ICJOb25lXG4iOworCQkJ fSBlbHNlIHsKKwkJCQl3aGlsZSAobGlzdCgkaywgJGRhcnIpID0gZWFjaCgkZGVwcykpIHsKKwkJ CQkJJHVybCA9ICI8YSBocmVmPScvcGFja2FnZXMucGhwP2RvX0RldGFpbHM9MSZJRD0iLiRkYXJy WzBdOworCQkJCQl3aGlsZShsaXN0KCRrLCAkdmFyKSA9IGVhY2goJHBrZ3NlYXJjaF92YXJzKSkg eworCQkJCQkJaWYgKCgkdmFyID09ICJkb19NeVBhY2thZ2VzIiB8fCAkdmFyID09ICJkb19PcnBo YW5zIikgJiYgJF9SRVFVRVNUWyR2YXJdKSB7CisJCQkJCQkJJHVybCAuPSAiJiIuJHZhci4iPTEi OworCQkJCQkJfSBlbHNlIHsKKwkJCQkJCQkkdXJsIC49ICImIi4kdmFyLiI9Ii5yYXd1cmxlbmNv ZGUoc3RyaXBzbGFzaGVzKCRfUkVRVUVTVFskdmFyXSkpOworCQkJCQkJfQogCQkJCQl9CisJCQkJ CXJlc2V0KCRwa2dzZWFyY2hfdmFycyk7CisJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkgCisJCQkJ CQkJCQkvLyAkZGFyclszXSBpcyB0aGUgRGVwQ29uZGl0aW9uICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAKKwkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCSAKKwkJ CQkJaWYgKCRkYXJyWzJdID09IDApIGVjaG8gJHVybC4iJz4iLiRkYXJyWzFdLiRkYXJyWzNdLiI8 L2E+PGJyIC8+XG4iOworCQkJCQllbHNlIGVjaG8gIjxhIGhyZWY9J2h0dHA6Ly9hcmNobGludXgu b3JnL3BhY2thZ2VzL3NlYXJjaC8iLiRkYXJyWzFdLiInPiIuJGRhcnJbMV0uJGRhcnJbM10uIjwv YT48YnIgLz5cbiI7CiAJCQkJfQotCQkJCXJlc2V0KCRwa2dzZWFyY2hfdmFycyk7Ci0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAotICAgICAgICAgICAgICAg IC8vICRkYXJyWzNdIGlzIHRoZSBEZXBDb25kaXRpb24gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAKLQkJCQlpZiAoJGRhcnJbMl0gPT0gMCkgZWNobyAkdXJsLiInPiIuJGRh cnJbMV0uJGRhcnJbM10uIjwvYT48YnIgLz5cbiI7Ci0JCQkJZWxzZSBlY2hvICI8YSBocmVmPSdo dHRwOi8vYXJjaGxpbnV4Lm9yZy9wYWNrYWdlcy9zZWFyY2gvIi4kZGFyclsxXS4iJz4iLiRkYXJy WzFdLiRkYXJyWzNdLiI8L2E+PGJyIC8+XG4iOwogCQkJfQogCQkJZWNobyAiPC90ZD48L3RyPlxu IjsKIAkJCWVjaG8gIjwvdGFibGU+PC90ZD4iOwpAQCAtNDEzLDU4ICszODEsNjYgQEAgZnVuY3Rp b24gcGFja2FnZV9kZXRhaWxzKCRpZD0wLCAkU0lEPSIiKSB7CiAJCQllY2hvIF9fKCJSZXF1aXJl ZCBieSIpLiI8L3NwYW4+PC90ZD48L3RyPlxuIjsKIAkJCWVjaG8gIjx0cj48dGQgY2xhc3M9J2Jv eFNvZnQnPiI7CiAJCQkkZGVwcyA9IHBhY2thZ2VfcmVxdWlyZWQoJHJvd1siSUQiXSk7Ci0JCQl3 aGlsZSAobGlzdCgkaywgJGRhcnIpID0gZWFjaCgkZGVwcykpIHsKLQkJCQkkdXJsID0gIjxhIGhy ZWY9Jy9wYWNrYWdlcy5waHA/ZG9fRGV0YWlscz0xJklEPSIuJGRhcnJbMF07Ci0JCQkJd2hpbGUo bGlzdCgkaywgJHZhcikgPSBlYWNoKCRwa2dzZWFyY2hfdmFycykpIHsKLQkJCQkJaWYgKCgkdmFy ID09ICJkb19NeVBhY2thZ2VzIiB8fCAkdmFyID09ICJkb19PcnBoYW5zIikgJiYgJF9SRVFVRVNU WyR2YXJdKSB7Ci0JCQkJCQkkdXJsIC49ICImIi4kdmFyLiI9MSI7Ci0JCQkJCX0gZWxzZSB7Ci0J CQkJCQkkdXJsIC49ICImIi4kdmFyLiI9Ii5yYXd1cmxlbmNvZGUoc3RyaXBzbGFzaGVzKCRfUkVR VUVTVFskdmFyXSkpOworCQkJaWYgKGNvdW50KCRkZXBzKSA9PSAwKSB7CisJCQkJcHJpbnQgIk5v bmVcbiI7CisJCQl9IGVsc2UgeworCQkJCXdoaWxlIChsaXN0KCRrLCAkZGFycikgPSBlYWNoKCRk ZXBzKSkgeworCQkJCQkkdXJsID0gIjxhIGhyZWY9Jy9wYWNrYWdlcy5waHA/ZG9fRGV0YWlscz0x JklEPSIuJGRhcnJbMF07CisJCQkJCXdoaWxlKGxpc3QoJGssICR2YXIpID0gZWFjaCgkcGtnc2Vh cmNoX3ZhcnMpKSB7CisJCQkJCQlpZiAoKCR2YXIgPT0gImRvX015UGFja2FnZXMiIHx8ICR2YXIg PT0gImRvX09ycGhhbnMiKSAmJiAkX1JFUVVFU1RbJHZhcl0pIHsKKwkJCQkJCQkkdXJsIC49ICIm Ii4kdmFyLiI9MSI7CisJCQkJCQl9IGVsc2UgeworCQkJCQkJCSR1cmwgLj0gIiYiLiR2YXIuIj0i LnJhd3VybGVuY29kZShzdHJpcHNsYXNoZXMoJF9SRVFVRVNUWyR2YXJdKSk7CisJCQkJCQl9CiAJ CQkJCX0KKwkJCQkJcmVzZXQoJHBrZ3NlYXJjaF92YXJzKTsKKwkJCQkJCQkJCQkJCQkJCQkJCQkJ CQkJCSAKKwkJCQkJCQkJCS8vICRkYXJyWzNdIGlzIHRoZSBEZXBDb25kaXRpb24gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAorCQkJCQkJCQkJCQkJCQkJCQkJ CQkJCQkJIAorCQkJCQlpZiAoJGRhcnJbMl0gPT0gMCkgcHJpbnQgJHVybC4iJz4iLiRkYXJyWzFd LiRkYXJyWzNdLiI8L2E+PGJyIC8+XG4iOworCQkJCQllbHNlIHByaW50ICI8YSBocmVmPSdodHRw Oi8vYXJjaGxpbnV4Lm9yZy9wYWNrYWdlcy9zZWFyY2gvIi4kZGFyclsxXS4iJz4iLiRkYXJyWzFd LiRkYXJyWzNdLiI8L2E+PGJyIC8+XG4iOwogCQkJCX0KLQkJCQlyZXNldCgkcGtnc2VhcmNoX3Zh cnMpOwotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKLSAg ICAgICAgICAgICAgICAvLyAkZGFyclszXSBpcyB0aGUgRGVwQ29uZGl0aW9uICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgCi0JCQkJaWYgKCRkYXJyWzJdID09IDApIHByaW50 ICR1cmwuIic+Ii4kZGFyclsxXS4kZGFyclszXS4iPC9hPjxiciAvPlxuIjsKLQkJCQllbHNlIHBy aW50ICI8YSBocmVmPSdodHRwOi8vYXJjaGxpbnV4Lm9yZy9wYWNrYWdlcy9zZWFyY2gvIi4kZGFy clsxXS4iJz4iLiRkYXJyWzFdLiRkYXJyWzNdLiI8L2E+PGJyIC8+XG4iOwogCQkJfQotICAgICAg ICAgICAgZWNobyAiPC90ZD48L3RyPlxuIjsKLSAgICAgICAgICAgIGVjaG8gIiAgICAgICAgICA8 L3RhYmxlPlxuIjsKLSAgICAgICAgICAgIGVjaG8gIiAgICAgICAgPC90ZD5cbiI7CisJCQllY2hv ICI8L3RkPjwvdHI+XG4iOworCQkJZWNobyAiICAgICAgICAgIDwvdGFibGU+XG4iOworCQkJZWNo byAiICAgICAgICA8L3RkPlxuIjsKIAkJCWVjaG8gIiAgICAgICAgPHRkIHZhbGlnbj0ndG9wJz5c biI7CiAJCQllY2hvICIgICAgICAgICAgPHRhYmxlIGNsYXNzPSdib3hTb2Z0JyBzdHlsZT0nd2lk dGg6IDIwMHB4Jz5cbiI7CiAJCQllY2hvICIgICAgICAgICAgICA8dHI+PHRkIGNsYXNzPSdib3hT b2Z0VGl0bGUnPjxzcGFuIGNsYXNzPSdmMyc+IjsKIAkJCWVjaG8gX18oIlNvdXJjZXMiKS4iPC9z cGFuPjwvdGQ+PC90cj5cbiI7CiAJCQllY2hvICIgICAgICAgICAgICA8dHI+PHRkIGNsYXNzPSdi b3hTb2Z0Jz4iOwogCQkJJHNvdXJjZXMgPSBwYWNrYWdlX3NvdXJjZXMoJHJvd1siSUQiXSk7ICMg JHNvdXJjZXNbMF0gPSAnc3JjJzsKLQkJCXdoaWxlIChsaXN0KCRrLCAkc3JjKSA9IGVhY2goJHNv dXJjZXMpKSB7Ci0JCQkJJHBhcnNlZF91cmwgPSBwYXJzZV91cmwoJHNyYyk7Ci0JCQkJaWYgKCRw YXJzZWRfdXJsWydzY2hlbWUnXSkKLQkJCQl7Ci0JCQkJCS8vSXQgaXMgYW4gZXh0ZXJuYWwgc291 cmNlCi0JCQkJCWVjaG8gIjxhIGhyZWY9JyIuJHNyYy4iJz4iLiRzcmMuIjwvYT48YnIgLz5cbiI7 Ci0JCQkJfQotCQkJCWVsc2UgCi0JCQkJewotCQkJCQkvL0l0IGlzIHByZXN1bWFibHkgYW4gaW50 ZXJuYWwgc291cmNlCi0JCQkJCWlmICgkcm93WyJMb2NhdGlvbklEIl0gPT0gMikgewotCQkJCQkJ ZWNobyAiPGEgaHJlZj0nIi5kaXJuYW1lKCRyb3dbJ1VSTFBhdGgnXSkuIi8iLiRyb3dbJ05hbWUn XTsKLQkJCQkJCWVjaG8gIi8iLiRzcmMuIic+Ii4kc3JjLiI8L2E+PGJyIC8+XG4iOwotCQkJCQl9 IGVsc2VpZiAoJHJvd1siTG9jYXRpb25JRCJdID09IDMpIHsKLQkJCQkJCWVjaG8gIjxhIGhyZWY9 J2h0dHA6Ly9jdnMuYXJjaGxpbnV4Lm9yZy9jZ2ktYmluL3ZpZXdjdnMuY2dpLypjaGVja291dCov Ii4kcm93WyJDYXRlZ29yeSJdLiIvIi4kcm93WyJOYW1lIl0uIi8iLiRzcmMuIi8/cmV2PUhFQUQm Y3Zzcm9vdD1BVVImb25seV93aXRoX3RhZz1DVVJSRU5UJz4iOwotCQkJCQkJZWNobyAkc3JjLiI8 L2E+PGJyIC8+XG4iOworCQkJaWYgKGNvdW50KCRzb3VyY2VzKSA9PSAwKSB7CisJCQkJcHJpbnQg Ik5vbmVcbiI7CisJCQl9IGVsc2UgeworCQkJCXdoaWxlIChsaXN0KCRrLCAkc3JjKSA9IGVhY2go JHNvdXJjZXMpKSB7CisJCQkJCSRwYXJzZWRfdXJsID0gcGFyc2VfdXJsKCRzcmMpOworCQkJCQlp ZiAoJHBhcnNlZF91cmxbJ3NjaGVtZSddKQorCQkJCQl7CisJCQkJCQkvL0l0IGlzIGFuIGV4dGVy bmFsIHNvdXJjZQorCQkJCQkJZWNobyAiPGEgaHJlZj0nIi4kc3JjLiInPiIuJHNyYy4iPC9hPjxi ciAvPlxuIjsKKwkJCQkJfQorCQkJCQllbHNlIAorCQkJCQl7CisJCQkJCQkvL0l0IGlzIHByZXN1 bWFibHkgYW4gaW50ZXJuYWwgc291cmNlCisJCQkJCQlpZiAoJHJvd1siTG9jYXRpb25JRCJdID09 IDIpIHsKKwkJCQkJCQllY2hvICI8YSBocmVmPSciLmRpcm5hbWUoJHJvd1snVVJMUGF0aCddKS4i LyIuJHJvd1snTmFtZSddOworCQkJCQkJCWVjaG8gIi8iLiRzcmMuIic+Ii4kc3JjLiI8L2E+PGJy IC8+XG4iOworCQkJCQkJfSBlbHNlaWYgKCRyb3dbIkxvY2F0aW9uSUQiXSA9PSAzKSB7CisJCQkJ CQkJZWNobyAiPGEgaHJlZj0naHR0cDovL2N2cy5hcmNobGludXgub3JnL2NnaS1iaW4vdmlld2N2 cy5jZ2kvKmNoZWNrb3V0Ki8iLiRyb3dbIkNhdGVnb3J5Il0uIi8iLiRyb3dbIk5hbWUiXS4iLyIu JHNyYy4iLz9yZXY9SEVBRCZjdnNyb290PUFVUiZvbmx5X3dpdGhfdGFnPUNVUlJFTlQnPiI7CisJ CQkJCQkJZWNobyAkc3JjLiI8L2E+PGJyIC8+XG4iOworCQkJCQkJfQogCQkJCQl9CiAJCQkJfQog CQkJfQogCQkJZWNobyAiPC90ZD48L3RyPlxuIjsKLSAgICAgICAgICAgIGVjaG8gIiAgICAgICAg ICA8L3RhYmxlPlxuIjsKLSAgICAgICAgICAgIGVjaG8gIiAgICAgICAgPC90ZD5cbiI7CisJCQll Y2hvICIgICAgICAgICAgPC90YWJsZT5cbiI7CisJCQllY2hvICIgICAgICAgIDwvdGQ+XG4iOwog CQkJZWNobyAiICAgICAgPC90cj5cbiI7CiAJCQllY2hvICIgICAgPC90YWJsZT5cbiI7Ci0gICAg ICAgICAgICBlY2hvICIgIDwvZGl2PlxuIjsKLSAgICAgICAgICAgIGVjaG8gIjwvZGl2PlxuXG4i OwotICAgICAgICAgICAgZWNobyAiPGJyIC8+XG5cbiI7CisJCQllY2hvICIgIDwvZGl2PlxuIjsK KwkJCWVjaG8gIjwvZGl2PlxuXG4iOworCQkJZWNobyAiPGJyIC8+XG5cbiI7CiAKIAogCQkJIyBB Y3Rpb25zIEJhcgpAQCAtNTM0LDE5ICs1MTAsMjAgQEAgZnVuY3Rpb24gcGFja2FnZV9kZXRhaWxz KCRpZD0wLCAkU0lEPSIiKSB7CiAJCQkKIAkJCSMgQ29tbWVudHMKIAkJCSMKLSAgICAgICAgICAg IGVjaG8gIjxkaXYgY2xhc3M9XCJwZ2JveFwiPlxuIjsKLSAgICAgICAgICAgIGVjaG8gIiAgPGRp diBjbGFzcz1cInBnYm94dGl0bGVcIj48c3BhbiBjbGFzcz1cImYzXCI+Ii5fXygiQ29tbWVudHMi KS4iPC9zcGFuPjwvZGl2PlxuIjsKLSAgICAgICAgICAgIGVjaG8gIiAgPGRpdiBjbGFzcz1cInBn Ym94Ym9keS1jb21tZW50XCI+XG4iOworCQkJZWNobyAiPGRpdiBjbGFzcz1cInBnYm94XCI+XG4i OworCQkJZWNobyAiICA8ZGl2IGNsYXNzPVwicGdib3h0aXRsZVwiPjxzcGFuIGNsYXNzPVwiZjNc Ij4iLl9fKCJDb21tZW50cyIpLiI8L3NwYW4+PC9kaXY+XG4iOworCQkJZWNobyAiICA8ZGl2IGNs YXNzPVwicGdib3hib2R5LWNvbW1lbnRcIj5cbiI7CiAJCQllY2hvICIgICAgPHRhYmxlIHdpZHRo PScxMDAlJz5cbiI7Ci0JCQllY2hvICIgICAgICA8dHI+XG4iOwotCQkJZWNobyAiICAgICAgICA8 dGQgY29sc3Bhbj0nMic+XG4iOwotCQkJZWNobyAiICAgICAgICAgIDxmb3JtIGFjdGlvbj0nL3Br Z2VkaXQucGhwJyBtZXRob2Q9J3Bvc3QnPlxuIjsKLQkJCWVjaG8gIiAgICAgICAgICAgIDxpbnB1 dCB0eXBlPSdoaWRkZW4nIG5hbWU9J0lEJyB2YWx1ZT0nIi4kcm93WyJJRCJdLiInPlxuIjsKLQkJ CWVjaG8gIiAgICAgICAgICAgIDxpbnB1dCB0eXBlPSdzdWJtaXQnIGNsYXNzPSdidXR0b24nIG5h bWU9J2FkZF9Db21tZW50JyB2YWx1ZT1cIiI7Ci0JCQllY2hvIF9fKCJBZGQgQ29tbWVudCIpLiJc Ij5cbiI7Ci0JCQllY2hvICIgICAgICAgICAgPC9mb3JtPlxuIjsKLQkJCWVjaG8gIiAgICAgICAg PC90ZD5cbiI7Ci0JCQllY2hvICIgICAgICA8L3RyPlxuIjsKKwkJCWlmIChpc3NldCgkX0NPT0tJ RVsnQVVSU0lEJ10pKSB7CisJCQkJZWNobyAiPHRyPjx0ZD4iOworCQkJCWVjaG8gIiAgICAgICAg ICA8Zm9ybSBhY3Rpb249Jy9wa2dlZGl0LnBocCcgbWV0aG9kPSdwb3N0Jz5cbiI7CisJCQkJZWNo byAiICAgICAgICAgICAgPGlucHV0IHR5cGU9J2hpZGRlbicgbmFtZT0nSUQnIHZhbHVlPSciLiRy b3dbIklEIl0uIic+XG4iOworCQkJCWVjaG8gIiAgICAgICAgICAgIDxpbnB1dCB0eXBlPSdzdWJt aXQnIGNsYXNzPSdidXR0b24nIG5hbWU9J2FkZF9Db21tZW50JyB2YWx1ZT1cIiI7CisJCQkJZWNo byBfXygiQWRkIENvbW1lbnQiKS4iXCI+XG4iOworCQkJCWVjaG8gIiAgICAgICAgICA8L2Zvcm0+ XG4iOworCQkJCWVjaG8gIjwvdHI+PC90ZD4iOworCQkJCS8vZWNobyAiPGJyIC8+XG4iOworCQkJ fQogCQkJJGNvbW1lbnRzID0gcGFja2FnZV9jb21tZW50cygkcm93WyJJRCJdKTsKIAkJCWlmICgh ZW1wdHkoJGNvbW1lbnRzKSkgewogCQkJCXdoaWxlIChsaXN0KCRpbmR4LCAkY2FycikgPSBlYWNo KCRjb21tZW50cykpIHsKQEAgLTU1NCw4ICs1MzEsOCBAQCBmdW5jdGlvbiBwYWNrYWdlX2RldGFp bHMoJGlkPTAsICRTSUQ9IiIpIHsKIAkJCQkJZWNobyAiICAgICAgPHRyPlxuIjsKIAkJCQkJZWNo byAiICAgICAgICA8dGQgdmFsaWduPSd0b3AnIHN0eWxlPSdwYWRkaW5nLXJpZ2h0OiAxMCcgY29s c3Bhbj0nMic+XG4iOwogCQkJCQllY2hvICIgICAgICAgICAgPHRhYmxlIGNsYXNzPSdib3hTb2Z0 JyB3aWR0aD0nMTAwJSc+XG4iOwotICAgICAgICAgICAgICAgICAgICBlY2hvICIgICAgICAgICAg ICA8dHI+XG4iOwotICAgICAgICAgICAgICAgICAgICBlY2hvICIgICAgICAgICAgICAgIDx0ZCBj bGFzcz0nYm94U29mdFRpdGxlJz48c3BhbiBjbGFzcz0nZjMnPiI7CisJCQkJCWVjaG8gIiAgICAg ICAgICAgIDx0cj5cbiI7CisJCQkJCWVjaG8gIiAgICAgICAgICAgICAgPHRkIGNsYXNzPSdib3hT b2Z0VGl0bGUnPjxzcGFuIGNsYXNzPSdmMyc+IjsKIAkJCQkJaWYgKGNhbkRlbGV0ZUNvbW1lbnQo JGNhcnJbIklEIl0sIGFjY291bnRfZnJvbV9zaWQoJFNJRCksICRTSUQpKSB7CiAJCQkJCQkkZHVy bCA9ICI8YSBocmVmPScvcGtnZWRpdC5waHA/ZGVsX0NvbW1lbnQ9MSI7CiAJCQkJCQkkZHVybC49 ICImY29tbWVudF9pZD0iLiRjYXJyWyJJRCJdLiImSUQ9Ii4kcm93WyJJRCJdOwpAQCAtNTczLDI0 ICs1NTAsMjQgQEAgZnVuY3Rpb24gcGFja2FnZV9kZXRhaWxzKCRpZD0wLCAkU0lEPSIiKSB7CiAJ CQkJCQkJYXJyYXkoIjxiPiIsJGNhcnJbIlVzZXJOYW1lIl0sIjwvYj4iLAogCQkJCQkJCSAgICAg ICI8aT4iLGdtZGF0ZSgiWW1kIFtIOmk6c10iLCRjYXJyWyJDb21tZW50VFMiXSksIjwvaT4iKSk7 CiAJCQkJCX0KLSAgICAgICAgICAgICAgICAgICAgZWNobyAiPC9zcGFuPjwvdGQ+XG4iOwotICAg ICAgICAgICAgICAgICAgICBlY2hvICIgICAgICAgICAgICA8L3RyPlxuIjsKLSAgICAgICAgICAg ICAgICAgICAgZWNobyAiICAgICAgICAgICAgPHRyPlxuIjsKLSAgICAgICAgICAgICAgICAgICAg ZWNobyAiICAgICAgICAgICAgICA8dGQgY2xhc3M9J2JveFNvZnQnPiI7CisJCQkJCWVjaG8gIjwv c3Bhbj48L3RkPlxuIjsKKwkJCQkJZWNobyAiICAgICAgICAgICAgPC90cj5cbiI7CisJCQkJCWVj aG8gIiAgICAgICAgICAgIDx0cj5cbiI7CisJCQkJCWVjaG8gIiAgICAgICAgICAgICAgPHRkIGNs YXNzPSdib3hTb2Z0Jz4iOwogCQkJCQllY2hvICI8Y29kZT5cbiI7CiAJCQkJCWVjaG8gbmwyYnIo aHRtbHNwZWNpYWxjaGFycygkY2FyclsiQ29tbWVudHMiXSkpOwotICAgICAgICAgICAgICAgICAg ICBlY2hvICI8L2NvZGU+PC90ZD5cbiI7Ci0gICAgICAgICAgICAgICAgICAgIGVjaG8gIiAgICAg ICAgICAgIDwvdHI+XG4iOworCQkJCQllY2hvICI8L2NvZGU+PC90ZD5cbiI7CisJCQkJCWVjaG8g IiAgICAgICAgICAgIDwvdHI+XG4iOwogCQkJCQllY2hvICIgICAgICAgICAgPC90YWJsZT5cbiI7 CiAJCQkJCWVjaG8gIiAgICAgICAgPC90ZD5cbiI7CiAJCQkJCWVjaG8gIiAgICAgIDwvdHI+XG4i OwogCQkJCX0KKwkJCX0gZWxzZSB7CisJCQkJcHJpbnQgIjx0cj48dGQ+Tm9uZTwvdGQ+PC90cj5c biI7CiAJCQl9Ci0KIAkJCWVjaG8gIiAgICA8L3RhYmxlPlxuIjsKLSAgICAgICAgICAgIGVjaG8g IiAgPC9kaXY+XG4iOwotICAgICAgICAgICAgZWNobyAiPC9kaXY+XG4iOwotCQkJCisJCQllY2hv ICIgIDwvZGl2PlxuIjsKKwkJCWVjaG8gIjwvZGl2PlxuIjsKIAkJfQogCX0KIAlyZXR1cm47CkBA IC05NDIsNjEgKzkxOSw3NyBAQCBmdW5jdGlvbiBwa2dfc2VhcmNoX3BhZ2UoJFNJRD0iIikgewog CQkJJHEuPSAiT1JERVIgQlkgTmFtZSAiLiRvcmRlci4iLCBMb2NhdGlvbklEIEFTQywgQ2F0ZWdv cnlJRCBERVNDICI7CiAJCQlicmVhazsKIAl9CisJCQogCSRxbmV4dCA9ICRxLiJMSU1JVCAiLigk TyskUFApLiIsICIuJFBQOyAvL25leHQgcGFnZSdzIHdvcnRoCiAJJHEuPSAiTElNSVQgIi4kTy4i LCAiLiRQUDsKIAotICAgIHByaW50ICI8IS0tIFF1ZXJ5OiAiLiRxLiIgLS0+XG4iOworCWlmICgk U0lEKSB7CisJCSMgVGhlICdBY3Rpb25zJyB0YWJsZQorCQkjCisJCXByaW50ICI8Y2VudGVyPlxu IjsKKwkJcHJpbnQgIjx0YWJsZSBjZWxsc3BhY2luZz0nMycgY2xhc3M9J2JveFNvZnQnPlxuIjsK KwkJcHJpbnQgIjx0cj5cbiI7CisJCXByaW50ICIgIDx0ZCBjbGFzcz0nYm94U29mdFRpdGxlJyBh bGlnbj0ncmlnaHQnPlxuIjsKKwkJcHJpbnQgIiAgICA8c3BhbiBjbGFzcz0nZjMnPiIuX18oIkFj dGlvbnMiKS4iPC9zcGFuPlxuIjsKKwkJcHJpbnQgIiAgPC90ZD5cbiI7CisJCXByaW50ICI8L3Ry PlxuIjsKKwkJcHJpbnQgIjx0cj5cbiI7CisJCXByaW50ICIgIDx0ZCBjbGFzcz0nYm94U29mdCc+ XG4iOworCQlwcmludCAiPHRhYmxlIHN0eWxlPSd3aWR0aDogMTAwJScgYWxpZ249J2NlbnRlcic+ XG4iOworCQlwcmludCAiPHRyPlxuIjsKKwkJcHJpbnQgIiAgPHRkIGFsaWduPSdjZW50ZXInPiI7 CisJCXByaW50ICI8aW5wdXQgdHlwZT0nc3VibWl0JyBjbGFzcz0nYnV0dG9uJyBuYW1lPSdkb19G bGFnJyI7CisJCXByaW50ICIJdmFsdWU9JyIuX18oIkZsYWcgT3V0LW9mLWRhdGUiKS4iJz48L3Rk PlxuIjsKKwkJcHJpbnQgIiAgPHRkIGFsaWduPSdjZW50ZXInPiI7CisJCXByaW50ICI8aW5wdXQg dHlwZT0nc3VibWl0JyBjbGFzcz0nYnV0dG9uJyBuYW1lPSdkb19VbkZsYWcnIjsKKwkJcHJpbnQg Igl2YWx1ZT0nIi5fXygiVW5mbGFnIE91dC1vZi1kYXRlIikuIic+PC90ZD5cbiI7CisJCXByaW50 ICIgIDx0ZCBhbGlnbj0nY2VudGVyJz4iOworCQlwcmludCAiPGlucHV0IHR5cGU9J3N1Ym1pdCcg Y2xhc3M9J2J1dHRvbicgbmFtZT0nZG9fQWRvcHQnIjsKKwkJcHJpbnQgIgl2YWx1ZT0nIi5fXygi QWRvcHQgUGFja2FnZXMiKS4iJz48L3RkPlxuIjsKKwkJcHJpbnQgIiAgPHRkIGFsaWduPSdjZW50 ZXInPiI7CisJCXByaW50ICI8aW5wdXQgdHlwZT0nc3VibWl0JyBjbGFzcz0nYnV0dG9uJyBuYW1l PSdkb19EaXNvd24nIjsKKwkJcHJpbnQgIgl2YWx1ZT0nIi5fXygiRGlzb3duIFBhY2thZ2VzIiku Iic+PC90ZD5cbiI7CisJCXByaW50ICIgIDx0ZCBhbGlnbj0nY2VudGVyJz4iOworCQlwcmludCAi PGlucHV0IHR5cGU9J3N1Ym1pdCcgY2xhc3M9J2J1dHRvbicgbmFtZT0nZG9fRGVsZXRlJyI7CisJ CXByaW50ICIJdmFsdWU9JyIuX18oIkRlbGV0ZSBQYWNrYWdlcyIpLiInPjwvdGQ+XG4iOworCQlw cmludCAiICA8dGQgYWxpZ249J2NlbnRlcic+IjsKKwkJcHJpbnQgIjxpbnB1dCB0eXBlPSdzdWJt aXQnIGNsYXNzPSdidXR0b24nIG5hbWU9J2RvX05vdGlmeSciOworCQlwcmludCAiCXZhbHVlPSci Ll9fKCJUb2dnbGUgTm90aWZ5IikuIic+PC90ZD5cbiI7CisJCXByaW50ICIgIDx0ZCBhbGlnbj0n Y2VudGVyJz4iOworCQlwcmludCAiPC90cj5cbiI7CisJCXByaW50ICI8L3RhYmxlPlxuIjsKKwkJ cHJpbnQgIiAgPC90ZD5cbiI7CisJCXByaW50ICI8L3RyPlxuIjsKKwkJcHJpbnQgIjwvdGFibGU+ XG4iOworCQlwcmludCAiPC9jZW50ZXI+XG4iOworCQlwcmludCAiPGJyIC8+XG4iOworCX0KKwor CS8vIFdoeT8KKwkvLyBwcmludCAiPCEtLSBRdWVyeTogIi4kcS4iIC0tPlxuIjsKKwkKIAkkcmVz dWx0ID0gZGJfcXVlcnkoJHEsICRkYmgpOworCQorCXByaW50ICI8Y2VudGVyPlxuIjsKKwlwcmlu dCAiPHRhYmxlIGNlbGxzcGFjaW5nPSczJyBjbGFzcz0nYm94U29mdCc+XG4iOworCXByaW50ICI8 dHI+XG4iOworCXByaW50ICIgIDx0ZCBjbGFzcz0nYm94U29mdFRpdGxlJyBhbGlnbj0ncmlnaHQn PlxuIjsKKwlwcmludCAiICAgIDxzcGFuIGNsYXNzPSdmMyc+Ii5fXygiUGFja2FnZSBMaXN0aW5n IikuIjwvc3Bhbj5cbiI7CisJcHJpbnQgIiAgPC90ZD5cbiI7CisJcHJpbnQgIjwvdHI+XG4iOwor CXByaW50ICI8dHI+XG4iOworCXByaW50ICIgIDx0ZCBjbGFzcz0nYm94U29mdCc+XG4iOworCXBy aW50ICI8dGFibGUgd2lkdGg9JzEwMCUnIGNlbGxzcGFjaW5nPScwJyBjZWxscGFkZGluZz0nMic+ XG4iOworCiAJaWYgKCEkcmVzdWx0KSB7CisJCXByaW50ICI8ZGl2IGNsYXNzPSdwZ2JveGJvZHkn PiI7CiAJCXByaW50IF9fKCJFcnJvciByZXRyaWV2aW5nIHBhY2thZ2UgbGlzdC4iKTsKLQorCQlw cmludCAiPC9kaXY+IjsKIAl9IGVsc2VpZiAoIW15c3FsX251bV9yb3dzKCRyZXN1bHQpKSB7CisJ CXByaW50ICI8ZGl2IGNsYXNzPSdwZ2JveGJvZHknPiI7CiAJCXByaW50IF9fKCJObyBwYWNrYWdl cyBtYXRjaGVkIHlvdXIgc2VhcmNoIGNyaXRlcmlhLiIpOwotCisJCXByaW50ICI8L2Rpdj4iOwog CX0gZWxzZSB7Ci0KLQkJaWYgKCRTSUQpIHsKLQkJCSMgVGhlICdBY3Rpb25zJyB0YWJsZQotCQkJ IwotCQkJcHJpbnQgIjxjZW50ZXI+XG4iOwotCQkJcHJpbnQgIjx0YWJsZSBjZWxsc3BhY2luZz0n MycgY2xhc3M9J2JveFNvZnQnPlxuIjsKLQkJCXByaW50ICI8dHI+XG4iOwotCQkJcHJpbnQgIiAg PHRkIGNsYXNzPSdib3hTb2Z0VGl0bGUnIGFsaWduPSdyaWdodCc+XG4iOwotCQkJcHJpbnQgIiAg ICA8c3BhbiBjbGFzcz0nZjMnPiIuX18oIkFjdGlvbnMiKS4iPC9zcGFuPlxuIjsKLQkJCXByaW50 ICIgIDwvdGQ+XG4iOwotCQkJcHJpbnQgIjwvdHI+XG4iOwotCQkJcHJpbnQgIjx0cj5cbiI7Ci0J CQlwcmludCAiICA8dGQgY2xhc3M9J2JveFNvZnQnPlxuIjsKLQkJCXByaW50ICI8dGFibGUgc3R5 bGU9J3dpZHRoOiAxMDAlJyBhbGlnbj0nY2VudGVyJz5cbiI7Ci0JCQlwcmludCAiPHRyPlxuIjsK LQkJCXByaW50ICIgIDx0ZCBhbGlnbj0nY2VudGVyJz4iOwotCQkJcHJpbnQgIjxpbnB1dCB0eXBl PSdzdWJtaXQnIGNsYXNzPSdidXR0b24nIG5hbWU9J2RvX0ZsYWcnIjsKLQkJCXByaW50ICIJdmFs dWU9JyIuX18oIkZsYWcgT3V0LW9mLWRhdGUiKS4iJz48L3RkPlxuIjsKLQkJCXByaW50ICIgIDx0 ZCBhbGlnbj0nY2VudGVyJz4iOwotCQkJcHJpbnQgIjxpbnB1dCB0eXBlPSdzdWJtaXQnIGNsYXNz PSdidXR0b24nIG5hbWU9J2RvX1VuRmxhZyciOwotCQkJcHJpbnQgIgl2YWx1ZT0nIi5fXygiVW5m bGFnIE91dC1vZi1kYXRlIikuIic+PC90ZD5cbiI7Ci0JCQlwcmludCAiICA8dGQgYWxpZ249J2Nl bnRlcic+IjsKLQkJCXByaW50ICI8aW5wdXQgdHlwZT0nc3VibWl0JyBjbGFzcz0nYnV0dG9uJyBu YW1lPSdkb19BZG9wdCciOwotCQkJcHJpbnQgIgl2YWx1ZT0nIi5fXygiQWRvcHQgUGFja2FnZXMi KS4iJz48L3RkPlxuIjsKLQkJCXByaW50ICIgIDx0ZCBhbGlnbj0nY2VudGVyJz4iOwotCQkJcHJp bnQgIjxpbnB1dCB0eXBlPSdzdWJtaXQnIGNsYXNzPSdidXR0b24nIG5hbWU9J2RvX0Rpc293bici OwotCQkJcHJpbnQgIgl2YWx1ZT0nIi5fXygiRGlzb3duIFBhY2thZ2VzIikuIic+PC90ZD5cbiI7 Ci0JCQlwcmludCAiICA8dGQgYWxpZ249J2NlbnRlcic+IjsKLQkJCXByaW50ICI8aW5wdXQgdHlw ZT0nc3VibWl0JyBjbGFzcz0nYnV0dG9uJyBuYW1lPSdkb19EZWxldGUnIjsKLQkJCXByaW50ICIJ dmFsdWU9JyIuX18oIkRlbGV0ZSBQYWNrYWdlcyIpLiInPjwvdGQ+XG4iOwotCQkJcHJpbnQgIiAg PHRkIGFsaWduPSdjZW50ZXInPiI7Ci0JCQlwcmludCAiPGlucHV0IHR5cGU9J3N1Ym1pdCcgY2xh c3M9J2J1dHRvbicgbmFtZT0nZG9fTm90aWZ5JyI7Ci0JCQlwcmludCAiCXZhbHVlPSciLl9fKCJU b2dnbGUgTm90aWZ5IikuIic+PC90ZD5cbiI7Ci0JCQlwcmludCAiICA8dGQgYWxpZ249J2NlbnRl cic+IjsKLQkJCXByaW50ICI8L3RyPlxuIjsKLQkJCXByaW50ICI8L3RhYmxlPlxuIjsKLQkJCXBy aW50ICIgIDwvdGQ+XG4iOwotCQkJcHJpbnQgIjwvdHI+XG4iOwotCQkJcHJpbnQgIjwvdGFibGU+ XG4iOwotCQkJcHJpbnQgIjwvY2VudGVyPlxuIjsKLQkJCXByaW50ICI8YnIgLz5cbiI7Ci0JCX0K LQogCQkjIHByaW50IG91dCBwYWNrYWdlIHNlYXJjaCByZXN1bHRzCiAJCSMKIApAQCAtMTAwNiwx NyArOTk5LDYgQEAgZnVuY3Rpb24gcGtnX3NlYXJjaF9wYWdlKCRTSUQ9IiIpIHsKIAkJfSBlbHNl IHsKIAkJCSRTT19uZXh0PSJkIjsKIAkJfQotCQkKLQkJcHJpbnQgIjxjZW50ZXI+XG4iOwotCQlw cmludCAiPHRhYmxlIGNlbGxzcGFjaW5nPSczJyBjbGFzcz0nYm94U29mdCc+XG4iOwotCQlwcmlu dCAiPHRyPlxuIjsKLQkJcHJpbnQgIiAgPHRkIGNsYXNzPSdib3hTb2Z0VGl0bGUnIGFsaWduPSdy aWdodCc+XG4iOwotCQlwcmludCAiICAgIDxzcGFuIGNsYXNzPSdmMyc+Ii5fXygiUGFja2FnZSBM aXN0aW5nIikuIjwvc3Bhbj5cbiI7Ci0JCXByaW50ICIgIDwvdGQ+XG4iOwotCQlwcmludCAiPC90 cj5cbiI7Ci0JCXByaW50ICI8dHI+XG4iOwotCQlwcmludCAiICA8dGQgY2xhc3M9J2JveFNvZnQn PlxuIjsKLQkJcHJpbnQgIjx0YWJsZSB3aWR0aD0nMTAwJScgY2VsbHNwYWNpbmc9JzAnIGNlbGxw YWRkaW5nPScyJz5cbiI7CiAJCXByaW50ICI8dHI+XG4iOwogCQlpZiAoJFNJRCkgewogCQkJcHJp bnQgIiAgPHRoIHN0eWxlPSdib3JkZXItYm90dG9tOiAjNjY2IDFweCBzb2xpZDsgdmVydGljYWwt YWxpZ246IjsKQEAgLTEwNjQsMTAgKzEwNDYsMTAgQEAgZnVuY3Rpb24gcGtnX3NlYXJjaF9wYWdl KCRTSUQ9IiIpIHsKIAkJCSgoJGkgJSAyKSA9PSAwKSA/ICRjID0gImRhdGExIiA6ICRjID0gImRh dGEyIjsKIAkJCXByaW50ICI8dHI+XG4iOwogCQkJaWYgKCRTSUQpIHsKLQkJCQlwcmludCAiICA8 dGQgY2xhc3M9JyIuJGMuIic+IjsKIAkJCQlpZiAoJHJvd1siT3V0T2ZEYXRlIl0pIHsKIAkJCQkJ JGMgPSAib3V0b2ZkYXRlIjsKIAkJCQl9CisJCQkJcHJpbnQgIiAgPHRkIGNsYXNzPSciLiRjLiIn PiI7CiAJCQkJcHJpbnQgIjxpbnB1dCB0eXBlPSdjaGVja2JveCcgbmFtZT0nSURzWyIuJHJvd1si SUQiXS4iXScgdmFsdWU9JzEnPiI7CiAjCQkJCWlmICgkaSA9PSAwKSB7CiAjCQkJCQkkYWxsX2lk cyA9ICRyb3dbIklEIl07CkBAIC0xMDg1LDIwICsxMDY3LDggQEAgZnVuY3Rpb24gcGtnX3NlYXJj aF9wYWdlKCRTSUQ9IiIpIHsKIAkJCXByaW50ICRjYXRzWyRyb3dbIkNhdGVnb3J5SUQiXV0uIjwv c3Bhbj48L3NwYW4+PC90ZD5cbiI7CiAJCQlwcmludCAiICA8dGQgY2xhc3M9JyIuJGMuIic+PHNw YW4gY2xhc3M9J2Y0Jz4iOwogCQkJJHVybCA9ICI8YSBocmVmPScvcGFja2FnZXMucGhwPyI7Ci0J CQkkdXJsIC49ICJkb19EZXRhaWxzPTEmSUQ9IjsKKwkJCSR1cmwgLj0gIklEPSI7CiAJCQkkdXJs IC49ICRyb3dbIklEIl07Ci0JCQl3aGlsZSAobGlzdCgkaywgJHZhcikgPSBlYWNoKCRwa2dzZWFy Y2hfdmFycykpIHsKLQkJCQkjIEknbSBuZXZlciBjb252aW5jZWQgaG93IHRvIGRvIHRoaXMgZW5j b2RpbmcvZGVjb2RpbmcgcHJvcGVybHkuCi0JCQkJIyBwaHAubmV0IHJlY29tbWVuZHMgaHRtbGVu dGl0aWVzKHVybGVuY29kZShkYXRhKSksIGJ1dCB0aGF0Ci0JCQkJIyBkb2Vzbid0IHdvcmshCi0J CQkJIwotCQkJCWlmICgoJHZhciA9PSAiZG9fTXlQYWNrYWdlcyIgfHwgJHZhciA9PSAiZG9fT3Jw aGFucyIpICYmICRfUkVRVUVTVFskdmFyXSkgewotCQkJCQkkdXJsIC49ICImIi4kdmFyLiI9MSI7 Ci0JCQkJfSBlbHNlIHsKLQkJCQkJJHVybCAuPSAiJiIuJHZhci4iPSIucmF3dXJsZW5jb2RlKHN0 cmlwc2xhc2hlcygkX1JFUVVFU1RbJHZhcl0pKTsKLQkJCQl9Ci0JCQl9Ci0JCQlyZXNldCgkcGtn c2VhcmNoX3ZhcnMpOwogCQkJJHVybC49ICInPiI7CiAJCQkkdXJsLj0iPHNwYW4gY2xhc3M9J2Js YWNrJz4iOwogCQkJJHVybC49JHJvd1siTmFtZSJdOwpAQCAtMTIxMCwxMyArMTE4MCwxMiBAQCBm dW5jdGlvbiBwa2dfc2VhcmNoX3BhZ2UoJFNJRD0iIikgewogCQl9CiAJCXByaW50ICIgICAgPC90 ZD5cbiI7CiAJCXByaW50ICIgIDwvdHI+XG4iOwotCi0JCXByaW50ICIgIDwvdGFibGU+XG4iOwot CQlwcmludCAiICA8L3RkPlxuIjsKLQkJcHJpbnQgIjwvdHI+XG4iOwotCQlwcmludCAiPC90YWJs ZT5cbiI7Ci0JCXByaW50ICI8L2NlbnRlcj5cbiI7CiAJfQorCXByaW50ICIgIDwvdGFibGU+XG4i OworCXByaW50ICIgIDwvdGQ+XG4iOworCXByaW50ICI8L3RyPlxuIjsKKwlwcmludCAiPC90YWJs ZT5cbiI7CisJcHJpbnQgIjwvY2VudGVyPlxuIjsKIAlwcmludCAiPC9mb3JtPlxuIjsKIAogCXJl dHVybjsKZGlmZiAtLWdpdCBhL3dlYi90ZW1wbGF0ZS9oZWFkZXIucGhwIGIvd2ViL3RlbXBsYXRl L2hlYWRlci5waHAKaW5kZXggNDQwY2IyNC4uOGUwMjIxMSAxMDA2NDQKLS0tIGEvd2ViL3RlbXBs YXRlL2hlYWRlci5waHAKKysrIGIvd2ViL3RlbXBsYXRlL2hlYWRlci5waHAKQEAgLTQzLDcgKzQz LDcgQEAgaWYgKGlzc2V0KCRfQ09PS0lFWyJBVVJTSUQiXSkpIHsKIAkgICAgICAuX18oIk15IFBh Y2thZ2VzIikuIjwvYT48L2xpPlxuIjsKIH0KID8+Ci0gICA8bGk+PGEgaHJlZj0iaHR0cDovL3d3 dy5hcmNobGludXgub3JnL21haWxtYW4vbGlzdGluZm8vdHVyLXVzZXJzLyI+CisgICA8bGk+PGEg aHJlZj0iaHR0cDovL2FyY2hsaW51eC5vcmcvbWFpbG1hbi9saXN0aW5mby9hdXItZ2VuZXJhbCI+ CiAJPD9waHAgcHJpbnQgX18oIkRpc2N1c3Npb24iKTsgPz48L2E+PC9saT4KIAk8bGk+PGEgaHJl Zj0iaHR0cDovL2J1Z3MuYXJjaGxpbnV4Lm9yZy9pbmRleC5waHA/dGFza3M9YWxsJnByb2plY3Q9 MiI+PD9waHAgcHJpbnQgX18oIkJ1Z3MiKTsgPz48L2E+PC9saT4KICAgIDxsaT48YSBocmVmPSJw YWNrYWdlcy5waHAiPjw/cGhwIHByaW50IF9fKCJQYWNrYWdlcyIpOyA/PjwvYT48L2xpPgpkaWZm IC0tZ2l0IGEvd2ViL3RlbXBsYXRlL3NlYXJjaF9hY2NvdW50c19mb3JtLnBocCBiL3dlYi90ZW1w bGF0ZS9zZWFyY2hfYWNjb3VudHNfZm9ybS5waHAKaW5kZXggNmU3ZDU1Mi4uZDU2NjVlOSAxMDA2 NDQKLS0tIGEvd2ViL3RlbXBsYXRlL3NlYXJjaF9hY2NvdW50c19mb3JtLnBocAorKysgYi93ZWIv dGVtcGxhdGUvc2VhcmNoX2FjY291bnRzX2Zvcm0ucGhwCkBAIC01OCw3ICs1OCw3IEBACiA8dGQ+ Jm5ic3A7PC90ZD4KIDx0ZCBhbGlnbj0nbGVmdCc+Jm5ic3A7PGJyLz4KIDxpbnB1dCB0eXBlPSdz dWJtaXQnIGNsYXNzPSdidXR0b24nCi0JdmFsdWU9Ijw/cGhwIHByaW50IF9fKCJTZWFyY2gnIik7 ID8+Ij4KKwl2YWx1ZT0iPD9waHAgcHJpbnQgX18oIlNlYXJjaCIpOyA/PiI+CiA8aW5wdXQgdHlw ZT0ncmVzZXQnIGNsYXNzPSdidXR0b24nCiAJdmFsdWU9Ijw/cGhwIHByaW50IF9fKCJSZXNldCIp OyA/PiI+PC90ZD4KIDwvdHI+Ci0tIAoxLjUuMy43Cgo= --===============8939038828420672384==-- From wizzomafizzo@gmail.com Sat Jan 12 09:06:23 2008 From: Callan Barrett To: aur-dev@lists.archlinux.org Subject: [aur-dev] [PATCH] Support for verbose page titles Date: Sat, 12 Jan 2008 23:05:08 +0900 Message-ID: <1200146708-25174-1-git-send-email-wizzomafizzo@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3121851088999137422==" --===============3121851088999137422== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Adds support for more verbose page titles based on current page and action by user and removes sort by options from search form as they're obsolete by column links. Signed-off-by: Callan Barrett --- web/html/account.php | 2 +- web/html/index.php | 5 +-- web/html/packages.php | 19 ++++++++++++- web/html/pkgsubmit.php | 2 +- web/lib/aur.inc | 4 ++- web/lib/pkgfuncs.inc | 71 ++++++++++++---------------------------------= -- web/template/header.php | 2 +- 7 files changed, 43 insertions(+), 62 deletions(-) diff --git a/web/html/account.php b/web/html/account.php index 9caada4..9c1eb31 100644 --- a/web/html/account.php +++ b/web/html/account.php @@ -8,7 +8,7 @@ include("pkgfuncs_po.inc"); # Add to handle the i18n of My Pa= ckages include("account_po.inc"); # use some form of this for i18n support set_lang(); # this sets up the visitor's language check_sid(); # see if they're still logged in -html_header(); # print out the HTML header +html_header(__("Accounts")); # print out the HTML header =20 =20 # Main page processing here diff --git a/web/html/index.php b/web/html/index.php index 99cccbc..617b16a 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -7,10 +7,7 @@ include("pkgfuncs_po.inc"); # Add to handle the i18n of My P= ackages include("aur.inc"); set_lang(); check_sid(); - -# Any cookies have been sent, can now display HTML -# -html_header(); +html_header(__("Home")); =20 # Big Top Level Table (Table 1) echo "
\n"; diff --git a/web/html/packages.php b/web/html/packages.php index bc398ee..1600e41 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -7,7 +7,24 @@ include("pkgfuncs.inc"); # package specific functions include("search_po.inc"); # use some form of this for i18n support set_lang(); # this sets up the visitor's language check_sid(); # see if they're still logged in -html_header(); # print out the HTML header + +# set the title to something useful depending on +# what "page" we're on +# +if (isset($_GET['ID'])) { + $id =3D pkgname_from_id($_GET['ID']); + if (!empty($id)) { + $title =3D $id; + } +} else if (isset($_GET['K'])) { + $title =3D "Search: " . $_GET['K']; +} else if (isset($_GET['do_MyPackages'])) { + $title =3D __("My Packages"); +} else { + $title =3D __("Packages"); +} + +html_header($title); # print out the HTML header =20 # enable debugging # diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index 638654b..801348b 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -8,7 +8,7 @@ include("pkgfuncs.inc"); # package functions include("config.inc"); # configuration file with dir locations set_lang(); # this sets up the visitor's language check_sid(); # see if they're still logged in -html_header(); # print out the HTML header +html_header("Submit"); # print out the HTML header echo "
\n"; echo "
".__("Submit")."
\n"; echo "
\n"; diff --git a/web/lib/aur.inc b/web/lib/aur.inc index c18365c..a9095cd 100644 --- a/web/lib/aur.inc +++ b/web/lib/aur.inc @@ -334,7 +334,7 @@ function set_lang() { =20 # common header # -function html_header() { +function html_header($title=3D"") { global $_SERVER; global $_COOKIE; global $_POST; @@ -405,6 +405,8 @@ function html_header() { } } =20 + $title =3D htmlspecialchars($title, ENT_QUOTES); + include('header.php'); return; } diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index 46bc522..d4f3ae7 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -250,6 +250,23 @@ function pkgnotify_from_sid($sid=3D"") { return $pkgs; } =20 +# get name of package based on pkgid +# +function pkgname_from_id($id=3D"") { + if (!empty($id)) { + $dbh =3D db_connect(); + $id =3D intval($id); + $q =3D "SELECT Name FROM Packages WHERE ID =3D " . mysql_real_escape_strin= g($id); + $result =3D db_query($q, $dbh); + if (mysql_num_rows($result) > 0) { + $id =3D mysql_result($result, 0); + } else { + $id =3D ""; + } + } + return $id; +} + # display package details # function package_details($id=3D0, $SID=3D"") { @@ -638,7 +655,7 @@ function pkg_search_page($SID=3D"") { =20 # The search form # - print "
\n"; + print "\n"; print "\n"; =20 print "
\n"; @@ -714,58 +731,6 @@ function pkg_search_page($SID=3D"") { print " \n"; print "\n"; =20 - /* Sort by */ -=09 - print "\n"; - print " ".__("Sort by"); - print "
\n"; - print " \n"; - print "\n"; - - print "\n"; - print " ".__("Sort order"); - print "
\n"; - print " \n"; - print "\n"; - - /* End of Sort by */ - =20 print "\n"; print " ".__("Per page"); print "
\n"; diff --git a/web/template/header.php b/web/template/header.php index 8e02211..b27015a 100644 --- a/web/template/header.php +++ b/web/template/header.php @@ -4,7 +4,7 @@ "> - AUR (<?php print $LANG; ?>) + AUR (<?php print $LANG; ?>)<?php if ($title !=3D "") { print " - " = . $title; } ?> --=20 1.5.3.7 --===============3121851088999137422==-- From wizzomafizzo@gmail.com Sat Jan 12 17:43:05 2008 From: Callan Barrett To: aur-dev@lists.archlinux.org Subject: [aur-dev] [PATCH] Support for verbose page titles Date: Sun, 13 Jan 2008 07:43:05 +0900 Message-ID: <33f0f4ec0801121443w1c812010le2f63dbfc24e9bdf@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7877865465686575770==" --===============7877865465686575770== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Verbose page titles again -- Callan 'wizzomafizzo' Barrett --===============7877865465686575770== Content-Type: text/x-patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="0004-Support-for-verbose-page-titles.patch" MIME-Version: 1.0 RnJvbSAwMjQzMTQ4MDM4ZGE3OWMzYjYwOTc3ZTI3MmQ0ZGRjNjBkYjcyZTMyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDYWxsYW4gQmFycmV0dCA8d2l6em9tYWZpenpvQGdtYWlsLmNv bT4KRGF0ZTogU2F0LCAxMiBKYW4gMjAwOCAyMjoyMTozNiArMDkwMApTdWJqZWN0OiBbUEFUQ0hd IFN1cHBvcnQgZm9yIHZlcmJvc2UgcGFnZSB0aXRsZXMKCkFkZHMgc3VwcG9ydCBmb3IgbW9yZSB2 ZXJib3NlIHBhZ2UgdGl0bGVzIGJhc2VkIG9uIGN1cnJlbnQKcGFnZSBhbmQgYWN0aW9uIGJ5IHVz ZXIgYW5kIHJlbW92ZXMgc29ydCBieSBvcHRpb25zIGZyb20Kc2VhcmNoIGZvcm0gYXMgdGhleSdy ZSBvYnNvbGV0ZSBieSBjb2x1bW4gbGlua3MuCgpTaWduZWQtb2ZmLWJ5OiBDYWxsYW4gQmFycmV0 dCA8d2l6em9tYWZpenpvQGdtYWlsLmNvbT4KLS0tCiB3ZWIvaHRtbC9hY2NvdW50LnBocCAgICB8 ICAgIDIgKy0KIHdlYi9odG1sL2luZGV4LnBocCAgICAgIHwgICAgNSArLS0KIHdlYi9odG1sL3Bh Y2thZ2VzLnBocCAgIHwgICAxOSArKysrKysrKysrKystCiB3ZWIvaHRtbC9wa2dzdWJtaXQucGhw ICB8ICAgIDIgKy0KIHdlYi9saWIvYXVyLmluYyAgICAgICAgIHwgICAgNCArKy0KIHdlYi9saWIv cGtnZnVuY3MuaW5jICAgIHwgICA3MSArKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLQogd2ViL3RlbXBsYXRlL2hlYWRlci5waHAgfCAgICAyICstCiA3IGZpbGVz IGNoYW5nZWQsIDQzIGluc2VydGlvbnMoKyksIDYyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L3dlYi9odG1sL2FjY291bnQucGhwIGIvd2ViL2h0bWwvYWNjb3VudC5waHAKaW5kZXggOWNhYWRh NC4uOWMxZWIzMSAxMDA2NDQKLS0tIGEvd2ViL2h0bWwvYWNjb3VudC5waHAKKysrIGIvd2ViL2h0 bWwvYWNjb3VudC5waHAKQEAgLTgsNyArOCw3IEBAIGluY2x1ZGUoInBrZ2Z1bmNzX3BvLmluYyIp OyAjIEFkZCB0byBoYW5kbGUgdGhlIGkxOG4gb2YgTXkgUGFja2FnZXMKIGluY2x1ZGUoImFjY291 bnRfcG8uaW5jIik7ICAjIHVzZSBzb21lIGZvcm0gb2YgdGhpcyBmb3IgaTE4biBzdXBwb3J0CiBz ZXRfbGFuZygpOyAgICAgICAgICAgICAgICAgIyB0aGlzIHNldHMgdXAgdGhlIHZpc2l0b3IncyBs YW5ndWFnZQogY2hlY2tfc2lkKCk7ICAgICAgICAgICAgICAgICMgc2VlIGlmIHRoZXkncmUgc3Rp bGwgbG9nZ2VkIGluCi1odG1sX2hlYWRlcigpOyAgICAgICAgICAgICAgIyBwcmludCBvdXQgdGhl IEhUTUwgaGVhZGVyCitodG1sX2hlYWRlcihfXygiQWNjb3VudHMiKSk7ICAgICAgICAgICAgICAj IHByaW50IG91dCB0aGUgSFRNTCBoZWFkZXIKIAogCiAjIE1haW4gcGFnZSBwcm9jZXNzaW5nIGhl cmUKZGlmZiAtLWdpdCBhL3dlYi9odG1sL2luZGV4LnBocCBiL3dlYi9odG1sL2luZGV4LnBocApp bmRleCA5OWNjY2JjLi42MTdiMTZhIDEwMDY0NAotLS0gYS93ZWIvaHRtbC9pbmRleC5waHAKKysr IGIvd2ViL2h0bWwvaW5kZXgucGhwCkBAIC03LDEwICs3LDcgQEAgaW5jbHVkZSgicGtnZnVuY3Nf cG8uaW5jIik7ICMgQWRkIHRvIGhhbmRsZSB0aGUgaTE4biBvZiBNeSBQYWNrYWdlcwogaW5jbHVk ZSgiYXVyLmluYyIpOwogc2V0X2xhbmcoKTsKIGNoZWNrX3NpZCgpOwotCi0jIEFueSBjb29raWVz IGhhdmUgYmVlbiBzZW50LCBjYW4gbm93IGRpc3BsYXkgSFRNTAotIwotaHRtbF9oZWFkZXIoKTsK K2h0bWxfaGVhZGVyKF9fKCJIb21lIikpOwogCiAjIEJpZyBUb3AgTGV2ZWwgVGFibGUgKFRhYmxl IDEpCiBlY2hvICI8ZGl2IGNsYXNzPVwicGdib3hcIj5cbiI7CmRpZmYgLS1naXQgYS93ZWIvaHRt bC9wYWNrYWdlcy5waHAgYi93ZWIvaHRtbC9wYWNrYWdlcy5waHAKaW5kZXggYmMzOThlZS4uMTYw MGU0MSAxMDA2NDQKLS0tIGEvd2ViL2h0bWwvcGFja2FnZXMucGhwCisrKyBiL3dlYi9odG1sL3Bh Y2thZ2VzLnBocApAQCAtNyw3ICs3LDI0IEBAIGluY2x1ZGUoInBrZ2Z1bmNzLmluYyIpOyAgICAj IHBhY2thZ2Ugc3BlY2lmaWMgZnVuY3Rpb25zCiBpbmNsdWRlKCJzZWFyY2hfcG8uaW5jIik7ICAg IyB1c2Ugc29tZSBmb3JtIG9mIHRoaXMgZm9yIGkxOG4gc3VwcG9ydAogc2V0X2xhbmcoKTsgICAg ICAgICAgICAgICAgICMgdGhpcyBzZXRzIHVwIHRoZSB2aXNpdG9yJ3MgbGFuZ3VhZ2UKIGNoZWNr X3NpZCgpOyAgICAgICAgICAgICAgICAjIHNlZSBpZiB0aGV5J3JlIHN0aWxsIGxvZ2dlZCBpbgot aHRtbF9oZWFkZXIoKTsgICAgICAgICAgICAgICMgcHJpbnQgb3V0IHRoZSBIVE1MIGhlYWRlcgor CisjIHNldCB0aGUgdGl0bGUgdG8gc29tZXRoaW5nIHVzZWZ1bCBkZXBlbmRpbmcgb24KKyMgd2hh dCAicGFnZSIgd2UncmUgb24KKyMKK2lmIChpc3NldCgkX0dFVFsnSUQnXSkpIHsKKwkkaWQgPSBw a2duYW1lX2Zyb21faWQoJF9HRVRbJ0lEJ10pOworCWlmICghZW1wdHkoJGlkKSkgeworCQkkdGl0 bGUgPSAkaWQ7CisJfQorfQllbHNlIGlmIChpc3NldCgkX0dFVFsnSyddKSkgeworCSR0aXRsZSA9 ICJTZWFyY2g6ICIgLiAkX0dFVFsnSyddOworfSBlbHNlIGlmIChpc3NldCgkX0dFVFsnZG9fTXlQ YWNrYWdlcyddKSkgeworCSR0aXRsZSA9IF9fKCJNeSBQYWNrYWdlcyIpOworfSBlbHNlIHsKKwkk dGl0bGUgPSBfXygiUGFja2FnZXMiKTsKK30KKworaHRtbF9oZWFkZXIoJHRpdGxlKTsgICAgICAg ICAgICAgICMgcHJpbnQgb3V0IHRoZSBIVE1MIGhlYWRlcgogCiAjIGVuYWJsZSBkZWJ1Z2dpbmcK ICMKZGlmZiAtLWdpdCBhL3dlYi9odG1sL3BrZ3N1Ym1pdC5waHAgYi93ZWIvaHRtbC9wa2dzdWJt aXQucGhwCmluZGV4IDYzODY1NGIuLjgwMTM0OGIgMTAwNjQ0Ci0tLSBhL3dlYi9odG1sL3BrZ3N1 Ym1pdC5waHAKKysrIGIvd2ViL2h0bWwvcGtnc3VibWl0LnBocApAQCAtOCw3ICs4LDcgQEAgaW5j bHVkZSgicGtnZnVuY3MuaW5jIik7ICAgICMgcGFja2FnZSBmdW5jdGlvbnMKIGluY2x1ZGUoImNv bmZpZy5pbmMiKTsgICAgICAjIGNvbmZpZ3VyYXRpb24gZmlsZSB3aXRoIGRpciBsb2NhdGlvbnMK IHNldF9sYW5nKCk7ICAgICAgICAgICAgICAgICAjIHRoaXMgc2V0cyB1cCB0aGUgdmlzaXRvcidz IGxhbmd1YWdlCiBjaGVja19zaWQoKTsgICAgICAgICAgICAgICAgIyBzZWUgaWYgdGhleSdyZSBz dGlsbCBsb2dnZWQgaW4KLWh0bWxfaGVhZGVyKCk7ICAgICAgICAgICAgICAjIHByaW50IG91dCB0 aGUgSFRNTCBoZWFkZXIKK2h0bWxfaGVhZGVyKCJTdWJtaXQiKTsgICAgICAgICAgICAgICMgcHJp bnQgb3V0IHRoZSBIVE1MIGhlYWRlcgogZWNobyAiPGRpdiBjbGFzcz1cInBnYm94XCI+XG4iOwog ZWNobyAiICA8ZGl2IGNsYXNzPVwicGdib3h0aXRsZVwiPjxzcGFuIGNsYXNzPVwiZjNcIj4iLl9f KCJTdWJtaXQiKS4iPC9zcGFuPjwvZGl2PlxuIjsKIGVjaG8gIiAgPGRpdiBjbGFzcz1cInBnYm94 Ym9keVwiPlxuIjsKZGlmZiAtLWdpdCBhL3dlYi9saWIvYXVyLmluYyBiL3dlYi9saWIvYXVyLmlu YwppbmRleCBjMTgzNjVjLi5hOTA5NWNkIDEwMDY0NAotLS0gYS93ZWIvbGliL2F1ci5pbmMKKysr IGIvd2ViL2xpYi9hdXIuaW5jCkBAIC0zMzQsNyArMzM0LDcgQEAgZnVuY3Rpb24gc2V0X2xhbmco KSB7CiAKICMgY29tbW9uIGhlYWRlcgogIwotZnVuY3Rpb24gaHRtbF9oZWFkZXIoKSB7CitmdW5j dGlvbiBodG1sX2hlYWRlcigkdGl0bGU9IiIpIHsKIAlnbG9iYWwgJF9TRVJWRVI7CiAJZ2xvYmFs ICRfQ09PS0lFOwogCWdsb2JhbCAkX1BPU1Q7CkBAIC00MDUsNiArNDA1LDggQEAgZnVuY3Rpb24g aHRtbF9oZWFkZXIoKSB7CiAJCX0KIAl9CiAKKwkkdGl0bGUgPSBodG1sc3BlY2lhbGNoYXJzKCR0 aXRsZSwgRU5UX1FVT1RFUyk7CisKIAlpbmNsdWRlKCdoZWFkZXIucGhwJyk7CiAJcmV0dXJuOwog fQpkaWZmIC0tZ2l0IGEvd2ViL2xpYi9wa2dmdW5jcy5pbmMgYi93ZWIvbGliL3BrZ2Z1bmNzLmlu YwppbmRleCA0NmJjNTIyLi5kNGYzYWU3IDEwMDY0NAotLS0gYS93ZWIvbGliL3BrZ2Z1bmNzLmlu YworKysgYi93ZWIvbGliL3BrZ2Z1bmNzLmluYwpAQCAtMjUwLDYgKzI1MCwyMyBAQCBmdW5jdGlv biBwa2dub3RpZnlfZnJvbV9zaWQoJHNpZD0iIikgewogCXJldHVybiAkcGtnczsKIH0KIAorIyBn ZXQgbmFtZSBvZiBwYWNrYWdlIGJhc2VkIG9uIHBrZ2lkCisjCitmdW5jdGlvbiBwa2duYW1lX2Zy b21faWQoJGlkPSIiKSB7CisJaWYgKCFlbXB0eSgkaWQpKSB7CisJCSRkYmggPSBkYl9jb25uZWN0 KCk7CisJCSRpZCA9IGludHZhbCgkaWQpOworCQkkcSA9ICJTRUxFQ1QgTmFtZSBGUk9NIFBhY2th Z2VzIFdIRVJFIElEID0gIiAuIG15c3FsX3JlYWxfZXNjYXBlX3N0cmluZygkaWQpOworCQkkcmVz dWx0ID0gZGJfcXVlcnkoJHEsICRkYmgpOworCQlpZiAobXlzcWxfbnVtX3Jvd3MoJHJlc3VsdCkg PiAwKSB7CisJCQkkaWQgPSBteXNxbF9yZXN1bHQoJHJlc3VsdCwgMCk7CisJCX0gZWxzZSB7CisJ CQkkaWQgPSAiIjsKKwkJfQorCX0KKwlyZXR1cm4gJGlkOworfQorCiAjIGRpc3BsYXkgcGFja2Fn ZSBkZXRhaWxzCiAjCiBmdW5jdGlvbiBwYWNrYWdlX2RldGFpbHMoJGlkPTAsICRTSUQ9IiIpIHsK QEAgLTYzOCw3ICs2NTUsNyBAQCBmdW5jdGlvbiBwa2dfc2VhcmNoX3BhZ2UoJFNJRD0iIikgewog CiAJIyBUaGUgc2VhcmNoIGZvcm0KIAkjCi0JcHJpbnQgIjxmb3JtIGFjdGlvbj0nL3BhY2thZ2Vz LnBocCcgbWV0aG9kPSdwb3N0Jz5cbiI7CisJcHJpbnQgIjxmb3JtIGFjdGlvbj0nL3BhY2thZ2Vz LnBocCcgbWV0aG9kPSdnZXQnPlxuIjsKIAlwcmludCAiPGlucHV0IHR5cGU9J2hpZGRlbicgbmFt ZT0nTycgdmFsdWU9JyIuJE8uIic+XG4iOwogCiAJcHJpbnQgIjxjZW50ZXI+XG4iOwpAQCAtNzE0 LDU4ICs3MzEsNiBAQCBmdW5jdGlvbiBwa2dfc2VhcmNoX3BhZ2UoJFNJRD0iIikgewogICAgIHBy aW50ICIgIDwvc2VsZWN0PlxuIjsKICAgICBwcmludCAiPC90ZD5cbiI7CiAgICAgCi0gICAgLyog U29ydCBieSAqLwotCQotICAgIHByaW50ICI8dGQgYWxpZ249J3JpZ2h0Jz5cbiI7Ci0JcHJpbnQg IiAgPHNwYW4gY2xhc3M9J2Y1Jz48c3BhbiBjbGFzcz0nYmx1ZSc+Ii5fXygiU29ydCBieSIpOwot CXByaW50ICI8L3NwYW4+PC9zcGFuPjxiciAvPlxuIjsKLQlwcmludCAiICA8c2VsZWN0IG5hbWU9 J1NCJz5cbiI7Ci0KLQlwcmludCAiICA8b3B0aW9uIHZhbHVlPW4iOwotCSRfUkVRVUVTVFsiU0Ii XSA9PSAibiIgPyBwcmludCAiIHNlbGVjdGVkPiAiIDogcHJpbnQgIj4gIjsKLQlwcmludCBfXygi TmFtZSIpLiI8L29wdGlvbj5cbiI7Ci0KLQlwcmludCAiICA8b3B0aW9uIHZhbHVlPWMiOwotCSRf UkVRVUVTVFsiU0IiXSA9PSAiYyIgPyBwcmludCAiIHNlbGVjdGVkPiAiIDogcHJpbnQgIj4gIjsK LQlwcmludCBfXygiQ2F0ZWdvcnkiKS4iPC9vcHRpb24+XG4iOwotCi0JcHJpbnQgIiAgPG9wdGlv biB2YWx1ZT1sIjsKLQkkX1JFUVVFU1RbIlNCIl0gPT0gImwiID8gcHJpbnQgIiBzZWxlY3RlZD4g IiA6IHByaW50ICI+ICI7Ci0JcHJpbnQgX18oIkxvY2F0aW9uIikuIjwvb3B0aW9uPlxuIjsKLQot CXByaW50ICIgIDxvcHRpb24gdmFsdWU9diI7Ci0JJF9SRVFVRVNUWyJTQiJdID09ICJ2IiA/IHBy aW50ICIgc2VsZWN0ZWQ+ICIgOiBwcmludCAiPiAiOwotCXByaW50IF9fKCJWb3RlcyIpLiI8L29w dGlvbj5cbiI7Ci0KLQlwcmludCAiICA8b3B0aW9uIHZhbHVlPW0iOwotCSRfUkVRVUVTVFsiU0Ii XSA9PSAibSIgPyBwcmludCAiIHNlbGVjdGVkPiAiIDogcHJpbnQgIj4gIjsKLQlwcmludCBfXygi TWFpbnRhaW5lciIpLiI8L29wdGlvbj5cbiI7Ci0KLQlwcmludCAiICA8b3B0aW9uIHZhbHVlPWEi OwotCSRfUkVRVUVTVFsiU0IiXSA9PSAiYSIgPyBwcmludCAiIHNlbGVjdGVkPiAiIDogcHJpbnQg Ij4gIjsKLQlwcmludCBfXygiQWdlIikuIjwvb3B0aW9uPlxuIjsKLQotCXByaW50ICIgIDwvc2Vs ZWN0PlxuIjsKLQlwcmludCAiPC90ZD5cbiI7Ci0KLQlwcmludCAiPHRkIGFsaWduPSdyaWdodCc+ XG4iOwotCXByaW50ICIgIDxzcGFuIGNsYXNzPSdmNSc+PHNwYW4gY2xhc3M9J2JsdWUnPiIuX18o IlNvcnQgb3JkZXIiKTsKLQlwcmludCAiPC9zcGFuPjwvc3Bhbj48YnIgLz5cbiI7Ci0JcHJpbnQg IiAgPHNlbGVjdCBuYW1lPSdTTyc+XG4iOwotCi0JcHJpbnQgIiAgPG9wdGlvbiB2YWx1ZT1hIjsK LQkkX1JFUVVFU1RbIlNPIl0gPT0gImEiID8gcHJpbnQgIiBzZWxlY3RlZD4gIiA6IHByaW50ICI+ ICI7Ci0JcHJpbnQgX18oIkFzY2VuZGluZyIpLiI8L29wdGlvbj5cbiI7Ci0KLQlwcmludCAiICA8 b3B0aW9uIHZhbHVlPWQiOwotCSRfUkVRVUVTVFsiU08iXSA9PSAiZCIgPyBwcmludCAiIHNlbGVj dGVkPiAiIDogcHJpbnQgIj4gIjsKLQlwcmludCBfXygiRGVzY2VuZGluZyIpLiI8L29wdGlvbj5c biI7Ci0KLQlwcmludCAiICA8L3NlbGVjdD5cbiI7Ci0JcHJpbnQgIjwvdGQ+XG4iOwotCi0gICAg LyogRW5kIG9mIFNvcnQgYnkgKi8KLSAgICAKIAlwcmludCAiPHRkIGFsaWduPSdyaWdodCc+XG4i OwogCXByaW50ICIgIDxzcGFuIGNsYXNzPSdmNSc+PHNwYW4gY2xhc3M9J2JsdWUnPiIuX18oIlBl ciBwYWdlIik7CiAJcHJpbnQgIjwvc3Bhbj48L3NwYW4+PGJyIC8+XG4iOwpkaWZmIC0tZ2l0IGEv d2ViL3RlbXBsYXRlL2hlYWRlci5waHAgYi93ZWIvdGVtcGxhdGUvaGVhZGVyLnBocAppbmRleCA4 ZTAyMjExLi5iMjcwMTVhIDEwMDY0NAotLS0gYS93ZWIvdGVtcGxhdGUvaGVhZGVyLnBocAorKysg Yi93ZWIvdGVtcGxhdGUvaGVhZGVyLnBocApAQCAtNCw3ICs0LDcgQEAKIAk8aHRtbCB4bWxucz0i aHR0cDovL3d3dy53My5vcmcvMTk5OS94aHRtbCIKIAl4bWw6bGFuZz0iPD9waHAgcHJpbnQgIiRM QU5HXCIgbGFuZz1cIiRMQU5HIjsgPz4iPgogCTxoZWFkPgotCTx0aXRsZT5BVVIgKDw/cGhwIHBy aW50ICRMQU5HOyA/Pik8L3RpdGxlPgorICA8dGl0bGU+QVVSICg8P3BocCBwcmludCAkTEFORzsg Pz4pPD9waHAgaWYgKCR0aXRsZSAhPSAiIikgeyBwcmludCAiIC0gIiAuICR0aXRsZTsgfSA/Pjwv dGl0bGU+CiAJPGxpbmsgcmVsPSdzdHlsZXNoZWV0JyB0eXBlPSd0ZXh0L2NzcycgaHJlZj0nL2Nz cy9mb250cy5jc3MnIC8+CiAJPGxpbmsgcmVsPSdzdHlsZXNoZWV0JyB0eXBlPSd0ZXh0L2Nzcycg aHJlZj0nL2Nzcy9jb250YWluZXJzLmNzcycgLz4KIAk8bGluayByZWw9J3N0eWxlc2hlZXQnIHR5 cGU9J3RleHQvY3NzJyBocmVmPScvY3NzL2FyY2guY3NzJyAvPgotLSAKMS41LjMuNwoK --===============7877865465686575770==-- From louipc.ist@gmail.com Sat Jan 12 18:53:16 2008 From: Loui To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] [PATCH] Tweaks of various page layouts and handling of data Date: Sat, 12 Jan 2008 18:53:19 -0500 Message-ID: <50673e970801121553k71c3ed90m217064c8326734aa@mail.gmail.com> In-Reply-To: <33f0f4ec0801120118o600a9664j496c2a0113a68c8f@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3845119429929074787==" --===============3845119429929074787== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Hey is someone applying all your patches to the official repo? It doesn't seem like it. Maybe you can bug someone to give you push access. --===============3845119429929074787==-- From wizzomafizzo@gmail.com Sat Jan 12 20:08:38 2008 From: Callan Barrett To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] [PATCH] Tweaks of various page layouts and handling of data Date: Sun, 13 Jan 2008 10:08:41 +0900 Message-ID: <33f0f4ec0801121708p4839712cu2c342a1707c3487b@mail.gmail.com> In-Reply-To: <50673e970801121553k71c3ed90m217064c8326734aa@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5671472137057219814==" --===============5671472137057219814== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit On Jan 13, 2008 8:53 AM, Loui wrote: > Hey is someone applying all your patches to the official repo? It > doesn't seem like it. > Maybe you can bug someone to give you push access. Not to the official repo but cactus is applying them to his which is apparently where all the action is. -- Callan 'wizzomafizzo' Barrett --===============5671472137057219814==-- From simo@archlinux.org Sat Jan 12 20:19:42 2008 From: Simo Leone To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] [PATCH] Tweaks of various page layouts and handling of data Date: Sat, 12 Jan 2008 19:19:44 -0600 Message-ID: <20080113011944.GB24426@archlinux.org> In-Reply-To: <33f0f4ec0801121708p4839712cu2c342a1707c3487b@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5942660549657784489==" --===============5942660549657784489== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit On Sun, Jan 13, 2008 at 10:08:41AM +0900, Callan Barrett wrote: > On Jan 13, 2008 8:53 AM, Loui wrote: > > Hey is someone applying all your patches to the official repo? It > > doesn't seem like it. > > Maybe you can bug someone to give you push access. > > Not to the official repo but cactus is applying them to his which is > apparently where all the action is. > I'm rather busy with random stuff for a while. But yes, I'll be merging cactus's branch, he's been collecting the goodies for me (thanks dude!). I'll probably get my first chance to seriously look at it this week. -S --===============5942660549657784489== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="attachment.sig" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjEuNC43IChHTlUv TGludXgpCgppRDhEQlFGSGlXY3cyNkRMb2hxRU42UVJBdnpwQUo0Mk13MFMzWHhwUE9rWHBlcG1F SUk3TWpFZUFBQ2ZhQ2lUCmVQVjE4Y0FDOTJUclRoWEFabG9sbzVVPQo9S05JTgotLS0tLUVORCBQ R1AgU0lHTkFUVVJFLS0tLS0K --===============5942660549657784489==-- From dan@archlinux.org Sun Jan 13 21:40:18 2008 From: Dan McGee To: aur-dev@lists.archlinux.org Subject: [aur-dev] [PATCH] Allow pkgsubmit to accept any tar* file Date: Sun, 13 Jan 2008 20:40:21 -0600 Message-ID: <1200278421-29727-1-git-send-email-dan@archlinux.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3524821303800247815==" --===============3524821303800247815== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Instead of restricting to gz and bz2, allow just plain tar and any other format tar can understand to be uploaded. I make the mistake all the time of forgetting to pass -z to tar when making something to upload, and there is no real reason to exclude plain tar files. Signed-off-by: Dan McGee --- web/html/pkgsubmit.php | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index 6e754bf..44b5070 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -121,14 +121,9 @@ if ($_COOKIE["AURSID"]) { $error = __("Could not change directory to %s.", array(INCOMING_DIR.$pkg_name)); } else { - # try .gz first + # try using general tar. it should take .gz, .bz2, and plain .tar # - exec("/bin/sh -c 'tar xzf ".$upload_file."'", $trash, $retval); - if (!$retval) { - # now try .bz2 format - # - exec("/bin/sh -c 'tar xjf ".$upload_file."'", $trash, $retval); - } + exec("/bin/sh -c 'tar xf ".$upload_file."'", $trash, $retval); if (!$retval) { $error = __("Unknown file format for uploaded file."); } -- 1.5.4.rc3 --===============3524821303800247815==-- From dan@archlinux.org Sun Jan 13 21:52:42 2008 From: Dan McGee To: aur-dev@lists.archlinux.org Subject: [aur-dev] [PATCH] Allow pkgsubmit to accept any tar* file Date: Sun, 13 Jan 2008 20:52:44 -0600 Message-ID: <1200279164-30003-1-git-send-email-dan@archlinux.org> In-Reply-To: <1200278421-29727-1-git-send-email-dan@archlinux.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0734982607112064514==" --===============0734982607112064514== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Instead of restricting to gz and bz2, allow just plain tar and any other format tar can understand to be uploaded. I make the mistake all the time of forgetting to pass -z to tar when making something to upload, and there is no real reason to exclude plain tar files. Signed-off-by: Dan McGee --- Hey-o. The same patch as the earlier one in this thread, except it is based off of cactus/testing, since it looks like that is where the real work is getting done right now. PLEASE make this change. :) -Dan web/html/pkgsubmit.php | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index 801348b..ccf66c1 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -47,11 +47,9 @@ if ($_COOKIE["AURSID"]) { $error =3D __("Could not change directory to %s.", array(UPLOAD_DIR . $tempdir)); } else { - exec("/bin/sh -c 'tar xzf " . $_FILES["pfile"]["tmp_name"] . "'", $tras= h, $retval); - if ($retval) { - exec("/bin/sh -c 'tar xjf " . $_FILES["pfile"]["tmp_name"] . "'", $tra= sh, $retval); - } - if ($retval) { + # try using general tar. it should take .gz, .bz2, and plain .tar + exec("/bin/sh -c 'tar xf ".$upload_file."'", $trash, $retval); + if (!$retval) { $error =3D __("Unknown file format for uploaded file."); } } --=20 1.5.4.rc3 --===============0734982607112064514==-- From eliott@cactuswax.net Sun Jan 13 21:59:03 2008 From: eliott To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] [PATCH] Allow pkgsubmit to accept any tar* file Date: Sun, 13 Jan 2008 18:59:07 -0800 Message-ID: <428d921d0801131859g6fac1e68wcfff09d0144df72f@mail.gmail.com> In-Reply-To: <1200278421-29727-1-git-send-email-dan@archlinux.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8250513729842725458==" --===============8250513729842725458== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable for whatever reason, I cannot apply patches like this. The inline fails every time with hunks not applying. Attached patches (even the exact same ones) work flawlessly. It could be the specific version of git i am using, but that doesn't seem to be the problem. I blame gmail currently. error: patch failed: web/html/pkgsubmit.php:121 error: web/html/pkgsubmit.php: patch does not apply Patch failed at 0001. On 1/13/08, Dan McGee wrote: > Instead of restricting to gz and bz2, allow just plain tar and any other > format tar can understand to be uploaded. I make the mistake all the time of > forgetting to pass -z to tar when making something to upload, and there is > no real reason to exclude plain tar files. > > Signed-off-by: Dan McGee > --- > web/html/pkgsubmit.php | 9 ++------- > 1 files changed, 2 insertions(+), 7 deletions(-) > > diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php > index 6e754bf..44b5070 100644 > --- a/web/html/pkgsubmit.php > +++ b/web/html/pkgsubmit.php > @@ -121,14 +121,9 @@ if ($_COOKIE["AURSID"]) { > $error =3D __("Could not change dir= ectory to %s.", > array(INCOMING_DIR.= $pkg_name)); > } else { > - # try .gz first > + # try using general tar. it should = take .gz, .bz2, and plain .tar > # > - exec("/bin/sh -c 'tar xzf ".$upload= _file."'", $trash, $retval); > - if (!$retval) { > - # now try .bz2 format > - # > - exec("/bin/sh -c 'tar xjf "= .$upload_file."'", $trash, $retval); > - } > + exec("/bin/sh -c 'tar xf ".$upload_= file."'", $trash, $retval); > if (!$retval) { > $error =3D __("Unknown file= format for uploaded file."); > } > -- > 1.5.4.rc3 > > > --===============8250513729842725458==-- From eliott@cactuswax.net Sun Jan 13 22:04:32 2008 From: eliott To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] [PATCH] Allow pkgsubmit to accept any tar* file Date: Sun, 13 Jan 2008 19:04:36 -0800 Message-ID: <428d921d0801131904y12946988r1bf197347b5e4193@mail.gmail.com> In-Reply-To: <1200279164-30003-1-git-send-email-dan@archlinux.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8842881062910594951==" --===============8842881062910594951== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This one applied... however, I had to copy/paste with a different editor. I think my vim config (convert tabs to spaces) is causing the problem. This is a big failure of using inline and having to copy paste. Remember kids..dont use tabs, they make cactus cry. On 1/13/08, Dan McGee wrote: > Instead of restricting to gz and bz2, allow just plain tar and any other > format tar can understand to be uploaded. I make the mistake all the time of > forgetting to pass -z to tar when making something to upload, and there is > no real reason to exclude plain tar files. > > Signed-off-by: Dan McGee > --- > > Hey-o. The same patch as the earlier one in this thread, except it is based > off of cactus/testing, since it looks like that is where the real work is > getting done right now. > > PLEASE make this change. :) > > -Dan > > web/html/pkgsubmit.php | 8 +++----- > 1 files changed, 3 insertions(+), 5 deletions(-) > > diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php > index 801348b..ccf66c1 100644 > --- a/web/html/pkgsubmit.php > +++ b/web/html/pkgsubmit.php > @@ -47,11 +47,9 @@ if ($_COOKIE["AURSID"]) { > $error =3D __("Could not change dir= ectory to %s.", > array(UPLOAD_DIR . $tempdir= )); > } else { > - exec("/bin/sh -c 'tar xzf " . $_FIL= ES["pfile"]["tmp_name"] . "'", $trash, $retval); > - if ($retval) { > - exec("/bin/sh -c 'tar xjf "= . $_FILES["pfile"]["tmp_name"] . "'", $trash, $retval); > - } > - if ($retval) { > + # try using general tar. it should = take .gz, .bz2, and plain .tar > + exec("/bin/sh -c 'tar xf ".$upload_= file."'", $trash, $retval); > + if (!$retval) { > $error =3D __("Unknown file= format for uploaded file."); > } > } > -- > 1.5.4.rc3 > > > --===============8842881062910594951==-- From aaronmgriffin@gmail.com Mon Jan 14 01:15:26 2008 From: Aaron Griffin To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] [PATCH] Allow pkgsubmit to accept any tar* file Date: Mon, 14 Jan 2008 00:15:26 -0600 Message-ID: In-Reply-To: <428d921d0801131904y12946988r1bf197347b5e4193@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0848341007938603500==" --===============0848341007938603500== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit On Jan 13, 2008 9:04 PM, eliott wrote: > This one applied... however, I had to copy/paste with a different editor. > I think my vim config (convert tabs to spaces) is causing the problem. > This is a big failure of using inline and having to copy paste. Are you doing copy/pasta from gmail? I always had problems there. Does it do the same when you "view original" and "save as"? For me that always works (after removing the first blank line). > Remember kids..dont use tabs, they make cactus cry. He says, as he top-posts. --===============0848341007938603500==-- From eliott@cactuswax.net Mon Jan 14 14:07:22 2008 From: eliott To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] [PATCH] Allow pkgsubmit to accept any tar* file Date: Mon, 14 Jan 2008 11:07:23 -0800 Message-ID: <428d921d0801141107x5a504fa3uaea086877f1cd2a1@mail.gmail.com> In-Reply-To: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5042024797040838009==" --===============5042024797040838009== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit another fail of gmail. Top posting is standard. wtf! On 1/13/08, Aaron Griffin wrote: > Are you doing copy/pasta from gmail? yes > I always had problems there. Does > it do the same when you "view original" and "save as"? For me that > always works (after removing the first blank line). I tried save page as, but here is the kicker..i have to edit it to remove the first line. I narrowed it down to my vimrc of all things. I finally got it to work using mousepad (xfce gui text editor) after a save page as. Talk about failhouse. :( This seems like a real failing of the inline patch method. It is very fragile in regard to line breaks and tab interpretation. > > Remember kids..dont use tabs, they make cactus cry. > He says, as he top-posts. *shakes fist* --===============5042024797040838009==-- From wizzomafizzo@gmail.com Mon Jan 14 23:26:55 2008 From: Callan Barrett To: aur-dev@lists.archlinux.org Subject: [aur-dev] [PATCH] Prefill category upon upload error and fix bug in last patch Date: Tue, 15 Jan 2008 13:25:29 +0900 Message-ID: <1200371129-11113-1-git-send-email-wizzomafizzo@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1761172897066363438==" --===============1761172897066363438== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit When a package upload fails the category value will be prefilled, fixes a bug in the previous patch where the pkgbuild would not extract properly and splits the html from php in the form so there are no more prints to output it Signed-off-by: Callan Barrett --- web/html/pkgsubmit.php | 87 +++++++++++++++++++++-------------------------- 1 files changed, 39 insertions(+), 48 deletions(-) --===============1761172897066363438== Content-Type: text/x-patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="a6e0285f5a3e570de8ebf0f3456939027f2bb078.diff" MIME-Version: 1.0 ZGlmZiAtLWdpdCBhL3dlYi9odG1sL3BrZ3N1Ym1pdC5waHAgYi93ZWIvaHRtbC9wa2dzdWJtaXQu cGhwCmluZGV4IGNjZjY2YzEuLjJjMGM3ZDAgMTAwNjQ0Ci0tLSBhL3dlYi9odG1sL3BrZ3N1Ym1p dC5waHAKKysrIGIvd2ViL2h0bWwvcGtnc3VibWl0LnBocApAQCAtMzcsNyArMzcsNyBAQCBpZiAo JF9DT09LSUVbIkFVUlNJRCJdKSB7CiAKIAkJIyB0ZW1wb3JhcnkgZGlyIHRvIHB1dCB0aGUgdGFy YmFsbCBjb250ZW50cwogCQkkdGVtcGRpciA9IHVpZF9mcm9tX3NpZCgkX0NPT0tJRVsnQVVSU0lE J10pIC4gdGltZSgpOwotCQkKKwogCQlpZiAoISRlcnJvcikgewogCQkJaWYgKCFAbWtkaXIoVVBM T0FEX0RJUiAuICR0ZW1wZGlyKSkgewogCQkJCSRlcnJvciA9IF9fKCJDb3VsZCBub3QgY3JlYXRl IGluY29taW5nIGRpcmVjdG9yeTogJXMuIiwKQEAgLTQ4LDggKzQ4LDggQEAgaWYgKCRfQ09PS0lF WyJBVVJTSUQiXSkgewogCQkJCQkJYXJyYXkoVVBMT0FEX0RJUiAuICR0ZW1wZGlyKSk7CiAJCQkJ fSBlbHNlIHsKIAkJCQkJIyB0cnkgdXNpbmcgZ2VuZXJhbCB0YXIuIGl0IHNob3VsZCB0YWtlIC5n eiwgLmJ6MiwgYW5kIHBsYWluIC50YXIKLQkJCQkJZXhlYygiL2Jpbi9zaCAtYyAndGFyIHhmICIu JHVwbG9hZF9maWxlLiInIiwgJHRyYXNoLCAkcmV0dmFsKTsKLQkJCQkJaWYgKCEkcmV0dmFsKSB7 CisJCQkJCWV4ZWMoIi9iaW4vc2ggLWMgJ3RhciB4ZiAiLiRfRklMRVNbJ3BmaWxlJ11bJ3RtcF9u YW1lJ10uIiciLCAkdHJhc2gsICRyZXR2YWwpOworCQkJCQlpZiAoJHJldHZhbCkgewogCQkJCQkJ JGVycm9yID0gX18oIlVua25vd24gZmlsZSBmb3JtYXQgZm9yIHVwbG9hZGVkIGZpbGUuIik7CiAJ CQkJCX0KIAkJCQl9CkBAIC01MjAsNTIgKzUyMCw0MyBAQCBpZiAoJF9DT09LSUVbIkFVUlNJRCJd KSB7CiAgICAgICAgICAgICAKIAkJCSRwa2dfY2F0ZWdvcmllcyA9IHBrZ0NhdGVnb3JpZXMoKTsK IAkJCSRwa2dfbG9jYXRpb25zID0gcGtnTG9jYXRpb25zKCk7Cis/PgogCi0JCQlwcmludCAiPGZv cm0gYWN0aW9uPScvcGtnc3VibWl0LnBocCcgbWV0aG9kPSdwb3N0JyI7Ci0JCQlwcmludCAiCWVu Y3R5cGU9J211bHRpcGFydC9mb3JtLWRhdGEnPlxuIjsKLQkJCXByaW50ICI8aW5wdXQgdHlwZT0n aGlkZGVuJyBuYW1lPSdwa2dzdWJtaXQnIHZhbHVlPScxJyAvPlxuIjsKLQkJCXByaW50ICI8aW5w dXQgdHlwZT0naGlkZGVuJyBuYW1lPSdNQVhfRklMRV9TSVpFJyB2YWx1ZT0nIjsKLQkJCXByaW50 IGluaXRlZ2VyKGluaV9nZXQoInVwbG9hZF9tYXhfZmlsZXNpemUiKSkuIicgLz5cbiI7Ci0JCQlw cmludCAiPHRhYmxlIGJvcmRlcj0nMCcgY2VsbHNwYWNpbmc9JzUnPlxuIjsKLQkJCXByaW50ICI8 dHI+XG4iOwotCQkJcHJpbnQgIgk8dGQgc3Bhbj0nZjQnIGFsaWduPSdyaWdodCc+IjsKLQkJCXBy aW50IF9fKCJQYWNrYWdlIENhdGVnb3J5IikuIjo8L3RkPlxuIjsKLQkJCXByaW50ICIJPHRkIHNw YW49J2Y0JyBhbGlnbj0nbGVmdCc+IjsKLQkJCXByaW50ICI8c2VsZWN0IG5hbWU9J2NhdGVnb3J5 Jz4iOwotCQkJcHJpbnQgIjxvcHRpb24gdmFsdWU9JzEnPiAiIC4gX18oIlNlbGVjdCBDYXRlZ29y eSIpIC4gIjwvb3B0aW9uPiI7Ci0JCQl3aGlsZSAobGlzdCgkaywgJHYpID0gZWFjaCgkcGtnX2Nh dGVnb3JpZXMpKSB7Ci0JCQkJcHJpbnQgIjxvcHRpb24gdmFsdWU9JyIuJGsuIic+ICIgLiAkdiAu ICI8L29wdGlvbj4iOwotCQkJfQotCQkJcHJpbnQgIjwvc2VsZWN0PjwvdGQ+XG4iOwotCQkJcHJp bnQgIjwvdHI+XG4iOwotIwkJCXByaW50ICI8dHI+XG4iOwotIwkJCXByaW50ICIJPHRkIHNwYW49 J2Y0JyBhbGlnbj0ncmlnaHQnPiI7Ci0jCQkJcHJpbnQgX18oIlBhY2thZ2UgTG9jYXRpb24iKS4i OjwvdGQ+XG4iOwotIwkJCXByaW50ICIJPHRkIHNwYW49J2Y0JyBhbGlnbj0nbGVmdCc+IjsKLSMJ CQlwcmludCAiPHNlbGVjdCBuYW1lPSdsb2NhdGlvbic+IjsKLSMJCQlwcmludCAiPG9wdGlvbiB2 YWx1ZT0nMCc+ICIgLiBfXygiU2VsZWN0IExvY2F0aW9uIikgLiAiPC9vcHRpb24+IjsKLSMJCQl3 aGlsZSAobGlzdCgkaywgJHYpID0gZWFjaCgkcGtnX2xvY2F0aW9ucykpIHsKLSMJCQkJcHJpbnQg IjxvcHRpb24gdmFsdWU9JyIuJGsuIic+ICIgLiAkdiAuICI8L29wdGlvbj4iOwotIwkJCX0KLSMJ CQlwcmludCAiPC9zZWxlY3Q+PC90ZD5cbiI7Ci0jCQkJcHJpbnQgIjwvdHI+XG4iOwotCQkJcHJp bnQgIjx0cj5cbiI7Ci0JCQlwcmludCAiCTx0ZCBzcGFuPSdmNCcgYWxpZ249J3JpZ2h0Jz4iOwot CQkJcHJpbnQgX18oIlVwbG9hZCBwYWNrYWdlIGZpbGUiKS4iOjwvdGQ+XG4iOwotCQkJcHJpbnQg Igk8dGQgc3Bhbj0nZjQnIGFsaWduPSdsZWZ0Jz4iOwotCQkJcHJpbnQgIjxpbnB1dCB0eXBlPSdm aWxlJyBuYW1lPSdwZmlsZScgc2l6ZT0nMzAnIC8+XG4iOwotCQkJcHJpbnQgIgk8L3RkPlxuIjsK LQkJCXByaW50ICI8L3RyPlxuIjsKLQotCQkJcHJpbnQgIjx0cj5cbiI7Ci0JCQlwcmludCAiCTx0 ZD4mbmJzcDs8L3RkPlxuIjsKLQkJCXByaW50ICIJPHRkIGFsaWduPSdsZWZ0Jz4iOwotCQkJcHJp bnQgIjxpbnB1dCBjbGFzcz0nYnV0dG9uJyB0eXBlPSdzdWJtaXQnIHZhbHVlPSciLl9fKCJVcGxv YWQiKS4iJyAvPlxuIjsKLQkJCXByaW50ICI8L3RkPlxuIjsKLQkJCXByaW50ICI8L3RyPlxuIjsK LQkJCXByaW50ICI8L3RhYmxlPlxuIjsKLQotCQkJcHJpbnQgIjwvZm9ybT5cbiI7Cis8Zm9ybSBh Y3Rpb249Jy9wa2dzdWJtaXQucGhwJyBtZXRob2Q9J3Bvc3QnIGVuY3R5cGU9J211bHRpcGFydC9m b3JtLWRhdGEnPgorCTxpbnB1dCB0eXBlPSdoaWRkZW4nIG5hbWU9J3BrZ3N1Ym1pdCcgdmFsdWU9 JzEnIC8+CisJPHRhYmxlIGJvcmRlcj0nMCcgY2VsbHNwYWNpbmc9JzUnPgorCQk8dHI+CisJCQk8 dGQgc3Bhbj0nZjQnIGFsaWduPSdyaWdodCc+PD9waHAgcHJpbnQgX18oIlBhY2thZ2UgQ2F0ZWdv cnkiKTsgPz46PC90ZD4KKwkJCTx0ZCBzcGFuPSdmNCcgYWxpZ249J2xlZnQnPgorCQkJPHNlbGVj dCBuYW1lPSdjYXRlZ29yeSc+CisJCQkJPG9wdGlvbiB2YWx1ZT0nMSc+PD9waHAgcHJpbnQgX18o IlNlbGVjdCBDYXRlZ29yeSIpOyA/Pjwvb3B0aW9uPgorCQkJCTw/cGhwCisJCQkJCXdoaWxlIChs aXN0KCRrLCAkdikgPSBlYWNoKCRwa2dfY2F0ZWdvcmllcykpIHsKKwkJCQkJCXByaW50ICI8b3B0 aW9uIHZhbHVlPSciLiRrLiInIjsKKwkJCQkJCWlmIChpc3NldCgkX1BPU1RbJ2NhdGVnb3J5J10p ICYmICRfUE9TVFsnY2F0ZWdvcnknXSA9PSAkaykgeworCQkJCQkJCXByaW50ICIgc2VsZWN0ZWQ9 J3NlbGVjdGVkJyI7CisJCQkJCQl9CisJCQkJCQlwcmludCAiPiAiIC4gJHYgLiAiPC9vcHRpb24+ IjsKKwkJCQkJfQorCQkJCT8+CisJCQk8L3NlbGVjdD4KKwkJCTwvdGQ+CisJCTwvdHI+CisJCTx0 cj4KKwkJCTx0ZCBzcGFuPSdmNCcgYWxpZ249J3JpZ2h0Jz48P3BocCBwcmludCBfXygiVXBsb2Fk IHBhY2thZ2UgZmlsZSIpOyA/Pjo8L3RkPgorCQkJPHRkIHNwYW49J2Y0JyBhbGlnbj0nbGVmdCc+ CisJCQkJPGlucHV0IHR5cGU9J2ZpbGUnIG5hbWU9J3BmaWxlJyBzaXplPSczMCcgLz4KKwkJCTwv dGQ+CisJCTwvdHI+CisJCTx0cj4KKwkJCTx0ZCBhbGlnbj0nbGVmdCc+CisJCQkJPGlucHV0IGNs YXNzPSdidXR0b24nIHR5cGU9J3N1Ym1pdCcgdmFsdWU9Jzw/cGhwIHByaW50IF9fKCJVcGxvYWQi KTsgPz4nIC8+CisJCQk8L3RkPgorCQk8L3RyPgorCTwvdGFibGU+Cis8L2Zvcm0+CisKKzw/cGhw CiAJCX0gZWxzZSB7CiAJCQlwcmludCBfXygiU29ycnksIHVwbG9hZHMgYXJlIG5vdCBwZXJtaXR0 ZWQgYnkgdGhpcyBzZXJ2ZXIuIik7CiAJCQlwcmludCAiPGJyIC8+XG4iOwo= --===============1761172897066363438==-- From wizzomafizzo@gmail.com Tue Jan 15 01:55:56 2008 From: Callan Barrett To: aur-dev@lists.archlinux.org Subject: [aur-dev] [PATCH] More cleanup, add TU link to header Date: Tue, 15 Jan 2008 15:54:23 +0900 Message-ID: <1200380063-7480-1-git-send-email-wizzomafizzo@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6466655116743870553==" --===============6466655116743870553== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Cleans up links on front page, adds a TU link to the header to the voting application, fixes some titles and styling for logged in text Signed-off-by: Callan Barrett --- web/html/index.php | 2 +- web/html/packages.php | 2 +- web/lang/en/aur_po.inc | 4 +++- web/lib/aur.inc | 23 ----------------------- web/lib/pkgfuncs.inc | 8 ++++---- web/template/header.php | 19 +++++++++++++------ 6 files changed, 22 insertions(+), 36 deletions(-) --===============6466655116743870553== Content-Type: text/x-patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="c378e554a452931653461860cd434a9cde5433d0.diff" MIME-Version: 1.0 ZGlmZiAtLWdpdCBhL3dlYi9odG1sL2luZGV4LnBocCBiL3dlYi9odG1sL2luZGV4LnBocAppbmRl eCA2MTdiMTZhLi43ZTA0ZDU5IDEwMDY0NAotLS0gYS93ZWIvaHRtbC9pbmRleC5waHAKKysrIGIv d2ViL2h0bWwvaW5kZXgucGhwCkBAIC01Miw3ICs1Miw3IEBAIHdoaWxlICgkcm93ID0gbXlzcWxf ZmV0Y2hfYXNzb2MoJHJlc3VsdCkpIHsKIAlwcmludCAnPHRyPic7CiAgICAgICAgIHByaW50ICc8 dGQgY2xhc3M9ImJveFNvZnQiPic7CiAKLSAgICAgICAgcHJpbnQgJzxzcGFuIGNsYXNzPSJmNCI+ PHNwYW4gY2xhc3M9ImJsdWUiPjxhIGhyZWY9Ii9wYWNrYWdlcy5waHA/ZG9fRGV0YWlscz0xJklE PScuaW50dmFsKCRyb3dbIklEIl0pLiciPic7CisgICAgICAgIHByaW50ICc8c3BhbiBjbGFzcz0i ZjQiPjxzcGFuIGNsYXNzPSJibHVlIj48YSBocmVmPSIvcGFja2FnZXMucGhwP0lEPScuaW50dmFs KCRyb3dbIklEIl0pLiciPic7CiAJcHJpbnQgJHJvd1siTmFtZSJdLiIgIi4kcm93WyJWZXJzaW9u Il0uIjwvYT48L3NwYW4+PC9zcGFuPiI7CiAKICAgICAgICAgcHJpbnQgJzwvdGQ+JzsKZGlmZiAt LWdpdCBhL3dlYi9odG1sL3BhY2thZ2VzLnBocCBiL3dlYi9odG1sL3BhY2thZ2VzLnBocAppbmRl eCAxNjAwZTQxLi4xNDNmYmRmIDEwMDY0NAotLS0gYS93ZWIvaHRtbC9wYWNrYWdlcy5waHAKKysr IGIvd2ViL2h0bWwvcGFja2FnZXMucGhwCkBAIC0xNiw3ICsxNiw3IEBAIGlmIChpc3NldCgkX0dF VFsnSUQnXSkpIHsKIAlpZiAoIWVtcHR5KCRpZCkpIHsKIAkJJHRpdGxlID0gJGlkOwogCX0KLX0J ZWxzZSBpZiAoaXNzZXQoJF9HRVRbJ0snXSkpIHsKK30JZWxzZSBpZiAoIWVtcHR5KCRfR0VUWydL J10pKSB7CiAJJHRpdGxlID0gIlNlYXJjaDogIiAuICRfR0VUWydLJ107CiB9IGVsc2UgaWYgKGlz c2V0KCRfR0VUWydkb19NeVBhY2thZ2VzJ10pKSB7CiAJJHRpdGxlID0gX18oIk15IFBhY2thZ2Vz Iik7CmRpZmYgLS1naXQgYS93ZWIvbGFuZy9lbi9hdXJfcG8uaW5jIGIvd2ViL2xhbmcvZW4vYXVy X3BvLmluYwppbmRleCAxNTQyODE3Li5mZWFiMjNhIDEwMDY0NAotLS0gYS93ZWIvbGFuZy9lbi9h dXJfcG8uaW5jCisrKyBiL3dlYi9sYW5nL2VuL2F1cl9wby5pbmMKQEAgLTI3LDQgKzI3LDYgQEAg JF90WyJlbiJdWyJEaXNjdXNzaW9uIl0gPSAiRGlzY3Vzc2lvbiI7CiAKICRfdFsiZW4iXVsiQnVn cyJdID0gIkJ1Z3MiOwogCi0/PgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKKyRfdFsiZW4i XVsiVHJ1c3RlZCBVc2VyIl0gPSAiVFUiOworCis/PgpkaWZmIC0tZ2l0IGEvd2ViL2xpYi9hdXIu aW5jIGIvd2ViL2xpYi9hdXIuaW5jCmluZGV4IGE5MDk1Y2QuLmNmZTRhOTYgMTAwNjQ0Ci0tLSBh L3dlYi9saWIvYXVyLmluYworKysgYi93ZWIvbGliL2F1ci5pbmMKQEAgLTQ0NywyOSArNDQ3LDYg QEAgZnVuY3Rpb24gY2FuX3N1Ym1pdF9wa2coJG5hbWU9IiIsICRzaWQ9IiIpIHsKIAlyZXR1cm4g MDsKIH0KIAotIyBjb252ZXJ0IGFuIGluaV9nZXQgbnVtYmVyIHRvIGEgcmVhbCBpbnRlZ2VyIC0g c3R1cGlkIFBIUCEKLSMKLWZ1bmN0aW9uIGluaXRlZ2VyKCRpbml2YWw9IjAiLCAkaXNieXRlcz0x KSB7Ci0JJGxhc3RfY2hhciA9IHN0cnRvbG93ZXIoc3Vic3RyKCRpbml2YWwsIC0xKSk7Ci0JaWYg KCRpc2J5dGVzKSB7Ci0JCXN3aXRjaCAoJGxhc3RfY2hhcikgewotCQkJY2FzZSAndCc6ICRtdWx0 aXBsaWVyID0gMTAyNCAqIDEwMjQgKiAxMDI0OyBicmVhazsKLQkJCWNhc2UgJ20nOiAkbXVsdGlw bGllciA9IDEwMjQgKiAxMDI0OyBicmVhazsKLQkJCWNhc2UgJ2snOiAkbXVsdGlwbGllciA9IDEw MjQ7IGJyZWFrOwotCQkJZGVmYXVsdDogICRtdWx0aXBsaWVyID0gMTsgYnJlYWs7Ci0JCX0KLQl9 IGVsc2UgewotCQlzd2l0Y2ggKCRsYXN0X2NoYXIpIHsKLQkJCWNhc2UgJ3QnOiAkbXVsdGlwbGll ciA9IDEwMDAgKiAxMDAwICogMTAwMDsgYnJlYWs7Ci0JCQljYXNlICdtJzogJG11bHRpcGxpZXIg PSAxMDAwICogMTAwMDsgYnJlYWs7Ci0JCQljYXNlICdrJzogJG11bHRpcGxpZXIgPSAxMDAwOyBi cmVhazsKLQkJCWRlZmF1bHQ6ICAkbXVsdGlwbGllciA9IDE7IGJyZWFrOwotCQl9Ci0JfQotCi0J cmV0dXJuIGludHZhbCgkaW5pdmFsKSAqICRtdWx0aXBsaWVyOwotfQotCiAjIHJlY3Vyc2l2ZSBk ZWxldGUgZGlyZWN0b3J5CiAjCiBmdW5jdGlvbiBybV9yZigkZGlybmFtZT0iIikgewpkaWZmIC0t Z2l0IGEvd2ViL2xpYi9wa2dmdW5jcy5pbmMgYi93ZWIvbGliL3BrZ2Z1bmNzLmluYwppbmRleCBk NGYzYWU3Li5hNjA4NmY4IDEwMDY0NAotLS0gYS93ZWIvbGliL3BrZ2Z1bmNzLmluYworKysgYi93 ZWIvbGliL3BrZ2Z1bmNzLmluYwpAQCAtMjkwLDEwICsyOTAsMTAgQEAgZnVuY3Rpb24gcGFja2Fn ZV9kZXRhaWxzKCRpZD0wLCAkU0lEPSIiKSB7CiAJCX0gZWxzZSB7CiAKIAkJCSMgcHJpbnQgb3V0 IHBhY2thZ2UgZGV0YWlscwotICAgICAgICAgICAgIwotICAgICAgICAgICAgZWNobyAiPGRpdiBj bGFzcz1cInBnYm94XCI+XG4iOwotICAgICAgICAgICAgZWNobyAiICA8ZGl2IGNsYXNzPVwicGdi b3h0aXRsZVwiPjxzcGFuIGNsYXNzPVwiZjNcIj4iLl9fKCJQYWNrYWdlIERldGFpbHMiKS4iPC9z cGFuPjwvZGl2PlxuIjsKLSAgICAgICAgICAgIGVjaG8gIiAgPGRpdiBjbGFzcz1cInBnYm94Ym9k eVwiPlxuIjsKKwkJCSMKKyAgICAgIGVjaG8gIjxkaXYgY2xhc3M9XCJwZ2JveFwiPlxuIjsKKyAg ICAgIGVjaG8gIiAgPGRpdiBjbGFzcz1cInBnYm94dGl0bGVcIj48c3BhbiBjbGFzcz1cImYzXCI+ Ii5fXygiUGFja2FnZSBEZXRhaWxzIikuIjwvc3Bhbj48L2Rpdj5cbiI7CisgICAgICBlY2hvICIg IDxkaXYgY2xhc3M9XCJwZ2JveGJvZHlcIj5cbiI7CiAJCQllY2hvICIgICAgPHRhYmxlPlxuIjsK IAkJCWVjaG8gIiAgICAgIDx0cj48dGQgY2xhc3M9J2JveFNvZnQnIGNvbHNwYW49JzInPjxzcGFu IGNsYXNzPSdmMic+IjsKIAkJCWVjaG8gJHJvd1siTmFtZSJdIC4gIiAiIC4gJHJvd1siVmVyc2lv biJdLiI8L3NwYW4+PC90ZD48L3RyPlxuIjsKZGlmZiAtLWdpdCBhL3dlYi90ZW1wbGF0ZS9oZWFk ZXIucGhwIGIvd2ViL3RlbXBsYXRlL2hlYWRlci5waHAKaW5kZXggYjI3MDE1YS4uZDUwYWE0NiAx MDA2NDQKLS0tIGEvd2ViL3RlbXBsYXRlL2hlYWRlci5waHAKKysrIGIvd2ViL3RlbXBsYXRlL2hl YWRlci5waHAKQEAgLTM3LDEwICszNywxNyBAQAogICAgICAgPHVsPgogPD9waHAKIGlmIChpc3Nl dCgkX0NPT0tJRVsiQVVSU0lEIl0pKSB7Ci0gICAgICBlY2hvICcgICAgICAgIDxsaT48YSBocmVm PSIvbG9nb3V0LnBocCI+Jy5fXygiTG9nb3V0IikuIjwvYT48L2xpPlxuIjsKLSAgICAgIGVjaG8g JyAgICAgICAgPGxpPjxhIGhyZWY9Ii9wa2dzdWJtaXQucGhwIj4nLl9fKCJTdWJtaXQiKS4iPC9h PjwvbGk+XG4iOwotICAgICAgZWNobyAnICAgICAgICA8bGk+PGEgaHJlZj0iL3BhY2thZ2VzLnBo cD9kb19NeVBhY2thZ2VzPTEiPicKLQkgICAgICAuX18oIk15IFBhY2thZ2VzIikuIjwvYT48L2xp PlxuIjsKKz8+CisJPGxpPjxhIGhyZWY9Ii9sb2dvdXQucGhwIj48P3BocCBwcmludCBfXygiTG9n b3V0Iik7ID8+PC9hPjwvbGk+CisJPGxpPjxhIGhyZWY9Ii9wa2dzdWJtaXQucGhwIj48P3BocCBw cmludCBfXygiU3VibWl0Iik7ID8+PC9hPjwvbGk+CisJPGxpPjxhIGhyZWY9Ii9wYWNrYWdlcy5w aHA/ZG9fTXlQYWNrYWdlcz0xIj48P3BocCBwcmludCBfXygiTXkgUGFja2FnZXMiKTsgPz48L2E+ PC9saT4KKzw/cGhwCisJaWYgKGFjY291bnRfZnJvbV9zaWQoJF9DT09LSUVbIkFVUlNJRCJdKSA9 PSAiVHJ1c3RlZCBVc2VyIgorCQl8fCBhY2NvdW50X2Zyb21fc2lkKCRfQ09PS0lFWyJBVVJTSUQi XSkgPT0gIkRldmVsb3BlciIpIHsKKz8+CisJPGxpPjxhIGhyZWY9Ii90dS5waHAiPjw/cGhwIHBy aW50IF9fKCJUcnVzdGVkIFVzZXIiKTsgPz48L2E+PC9saT4KKzw/cGhwCisJfQogfQogPz4KICAg IDxsaT48YSBocmVmPSJodHRwOi8vYXJjaGxpbnV4Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2F1ci1n ZW5lcmFsIj4KQEAgLTY1LDggKzcyLDggQEAgZm9yZWFjaCAoJFNVUFBPUlRFRF9MQU5HUyBhcyAk bGFuZyA9PiAkbGFuZ19uYW1lKSB7CiAgICAgICAgICAgIDxsaT5MYW5nOiA8L2xpPgogICAgICAg ICAgPC91bD4KICAgICAgIDwvZGl2PgotICAgICAgPGJyIC8+Ci0gICAgICA8ZGl2IHN0eWxlPSJ0 ZXh0LWFsaWduOiByaWdodDsgcGFkZGluZy1yaWdodDogMTBweCI+CisJCQk8YnIgLz4KKyAgICAg IDxkaXYgc3R5bGU9InRleHQtYWxpZ246IHJpZ2h0OyBwYWRkaW5nLXJpZ2h0OiAxMHB4OyBjbGVh cjogcmlnaHQiPgogPD9waHAKIGlmIChpc3NldCgkX0NPT0tJRVsiQVVSU0lEIl0pKSB7CiAgIHBy aW50IF9fKCJMb2dnZWQtaW4gYXM6ICVoJXMlaCIsCg== --===============6466655116743870553==-- From louipc.ist@gmail.com Tue Jan 15 02:12:28 2008 From: Loui To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] [PATCH] More cleanup, add TU link to header Date: Tue, 15 Jan 2008 02:12:27 -0500 Message-ID: <50673e970801142312u78985e8avb3af72f9196cdf43@mail.gmail.com> In-Reply-To: <1200380063-7480-1-git-send-email-wizzomafizzo@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3701051477913993065==" --===============3701051477913993065== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Man you're a machine! On Jan 15, 2008 1:54 AM, Callan Barrett wrote: > > Cleans up links on front page, adds a TU link to the header to the voting > application, fixes some titles and styling for logged in text > > Signed-off-by: Callan Barrett > --- > web/html/index.php | 2 +- > web/html/packages.php | 2 +- > web/lang/en/aur_po.inc | 4 +++- > web/lib/aur.inc | 23 ----------------------- > web/lib/pkgfuncs.inc | 8 ++++---- > web/template/header.php | 19 +++++++++++++------ > 6 files changed, 22 insertions(+), 36 deletions(-) --===============3701051477913993065==-- From wizzomafizzo@gmail.com Tue Jan 15 05:01:22 2008 From: Callan Barrett To: aur-dev@lists.archlinux.org Subject: [aur-dev] [PATCH] Add search result information Date: Tue, 15 Jan 2008 18:59:48 +0900 Message-ID: <1200391188-28035-1-git-send-email-wizzomafizzo@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4498634280266969277==" --===============4498634280266969277== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This adds search results numbers to the bottom of pages when searching based = on tardo's repository, ex. Showing results 1 - 42 of 42 Signed-off-by: Callan Barrett --- web/lang/en/pkgfuncs_po.inc | 2 + web/lib/pkgfuncs.inc | 66 +++++++++++++++++++++++------------------- 2 files changed, 38 insertions(+), 30 deletions(-) --===============4498634280266969277== Content-Type: text/x-patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="1bbc7f7ee42c5fe4ad14bf487534405e58206018.diff" MIME-Version: 1.0 ZGlmZiAtLWdpdCBhL3dlYi9sYW5nL2VuL3BrZ2Z1bmNzX3BvLmluYyBiL3dlYi9sYW5nL2VuL3Br Z2Z1bmNzX3BvLmluYwppbmRleCAyZjZhNjJlLi4zZTdkMzE4IDEwMDY0NAotLS0gYS93ZWIvbGFu Zy9lbi9wa2dmdW5jc19wby5pbmMKKysrIGIvd2ViL2xhbmcvZW4vcGtnZnVuY3NfcG8uaW5jCkBA IC0xNTksNCArMTU5LDYgQEAgJF90WyJlbiJdWyJUaGlzIHBhY2thZ2UgaGFzIGJlZW4gZmxhZ2dl ZCBvdXQgb2YgZGF0ZS4iXSA9ICJUaGlzIHBhY2thZ2UgaGFzIGJlZW4KIAogJF90WyJlbiJdWyJU b2dnbGUgTm90aWZ5Il0gPSAiVG9nZ2xlIE5vdGlmeSI7CiAKKyRfdFsiZW4iXVsiU2hvd2luZyBy ZXN1bHRzICVzIC0gJXMgb2YgJXMiXSA9ICJTaG93aW5nIHJlc3VsdHMgJXMgLSAlcyBvZiAlcyI7 CisKID8+CmRpZmYgLS1naXQgYS93ZWIvbGliL3BrZ2Z1bmNzLmluYyBiL3dlYi9saWIvcGtnZnVu Y3MuaW5jCmluZGV4IGE2MDg2ZjguLjA5MDJiNDkgMTAwNjQ0Ci0tLSBhL3dlYi9saWIvcGtnZnVu Y3MuaW5jCisrKyBiL3dlYi9saWIvcGtnZnVuY3MuaW5jCkBAIC03MTIsMjQgKzcxMiwyNCBAQCBm dW5jdGlvbiBwa2dfc2VhcmNoX3BhZ2UoJFNJRD0iIikgewogCXByaW50ICI8L3RkPlxuIjsKIAkK IAlwcmludCAiPHRkIGFsaWduPSdyaWdodCc+XG4iOwotICAgIHByaW50ICIgIDxzcGFuIGNsYXNz PSdmNSc+PHNwYW4gY2xhc3M9J2JsdWUnPiIuX18oIlNlYXJjaCBieSIpOwotICAgIHByaW50ICI8 L3NwYW4+PC9zcGFuPjxiciAvPlxuIjsKLSAgICAKLSAgICBwcmludCAiICA8c2VsZWN0IG5hbWU9 J1NlQic+XG4iOwotICAgICMgYnkgbmFtZS9kZXNjcmlwdGlvbgotICAgIHByaW50ICIgIDxvcHRp b24gdmFsdWU9bmQiOwotICAgICRfUkVRVUVTVFsiU2VCIl0gPT0gIm5kIiA/IHByaW50ICIgc2Vs ZWN0ZWQ+ICIgOiBwcmludCAiPiAiOwotICAgIHByaW50IF9fKCJOYW1lIikuIjwvb3B0aW9uPlxu IjsgICAgCi0gICAgIyBieSBtYWludGFpbmVyCi0gICAgcHJpbnQgIiAgPG9wdGlvbiB2YWx1ZT1t IjsKLSAgICAkX1JFUVVFU1RbIlNlQiJdID09ICJtIiA/IHByaW50ICIgc2VsZWN0ZWQ+ICIgOiBw cmludCAiPiAiOwotICAgIHByaW50IF9fKCJNYWludGFpbmVyIikuIjwvb3B0aW9uPlxuIjsKLSAg ICBwcmludCAiICA8b3B0aW9uIHZhbHVlPXMiOwotICAgICRfUkVRVUVTVFsiU2VCIl0gPT0gInMi ID8gcHJpbnQgIiBzZWxlY3RlZD4gIiA6IHByaW50ICI+ICI7Ci0gICAgcHJpbnQgX18oIlN1Ym1p dHRlciIpLiI8L29wdGlvbj5cbiI7ICAgIAotCi0gICAgcHJpbnQgIiAgPC9zZWxlY3Q+XG4iOwot ICAgIHByaW50ICI8L3RkPlxuIjsKKwlwcmludCAiICA8c3BhbiBjbGFzcz0nZjUnPjxzcGFuIGNs YXNzPSdibHVlJz4iLl9fKCJTZWFyY2ggYnkiKTsKKwlwcmludCAiPC9zcGFuPjwvc3Bhbj48YnIg Lz5cbiI7CisJCisJcHJpbnQgIiAgPHNlbGVjdCBuYW1lPSdTZUInPlxuIjsKKwkjIGJ5IG5hbWUv ZGVzY3JpcHRpb24KKwlwcmludCAiICA8b3B0aW9uIHZhbHVlPW5kIjsKKwkkX1JFUVVFU1RbIlNl QiJdID09ICJuZCIgPyBwcmludCAiIHNlbGVjdGVkPiAiIDogcHJpbnQgIj4gIjsKKwlwcmludCBf XygiTmFtZSIpLiI8L29wdGlvbj5cbiI7ICAgIAorCSMgYnkgbWFpbnRhaW5lcgorCXByaW50ICIg IDxvcHRpb24gdmFsdWU9bSI7CisJJF9SRVFVRVNUWyJTZUIiXSA9PSAibSIgPyBwcmludCAiIHNl bGVjdGVkPiAiIDogcHJpbnQgIj4gIjsKKwlwcmludCBfXygiTWFpbnRhaW5lciIpLiI8L29wdGlv bj5cbiI7CisJcHJpbnQgIiAgPG9wdGlvbiB2YWx1ZT1zIjsKKwkkX1JFUVVFU1RbIlNlQiJdID09 ICJzIiA/IHByaW50ICIgc2VsZWN0ZWQ+ICIgOiBwcmludCAiPiAiOworCXByaW50IF9fKCJTdWJt aXR0ZXIiKS4iPC9vcHRpb24+XG4iOyAgICAKKworCXByaW50ICIgIDwvc2VsZWN0PlxuIjsKKwlw cmludCAiPC90ZD5cbiI7CiAgICAgCiAJcHJpbnQgIjx0ZCBhbGlnbj0ncmlnaHQnPlxuIjsKIAlw cmludCAiICA8c3BhbiBjbGFzcz0nZjUnPjxzcGFuIGNsYXNzPSdibHVlJz4iLl9fKCJQZXIgcGFn ZSIpOwpAQCAtNzU0LDE3ICs3NTQsNiBAQCBmdW5jdGlvbiBwa2dfc2VhcmNoX3BhZ2UoJFNJRD0i IikgewogCXByaW50ICIgdmFsdWU9JyIuX18oIkdvIikuIic+XG4iOwogCXByaW50ICI8L3RkPlxu IjsKIAotCS8qCi0JICogIENvbW1lbnRlZCB0aGUgTXkgUGFja2FnZXMgYnV0dG9uIGJlY2F1c2Ug dGhlcmUgaXMgbm8gbmVlZCBmb3IgaXQKLQkgKiAgY2F1c2Ugd2UgYWxyZWFkeSBoYXZlIGEgbGlu ay4KLQkgKiAKLQlpZiAoJFNJRCkgewotCQlwcmludCAiPHRkIGFsaWduPSdyaWdodCcgdmFsaWdu PSdib3R0b20nPiZuYnNwO1xuIjsKLQkJcHJpbnQgIiAgPGlucHV0IHR5cGU9J3N1Ym1pdCcgY2xh c3M9J2J1dHRvbicgbmFtZT0nZG9fTXlQYWNrYWdlcyciOwotCSAJcHJpbnQgIgl2YWx1ZT0nIi5f XygiTXkgUGFja2FnZXMiKS4iJz5cbiI7Ci0JCXByaW50ICI8L3RkPlxuIjsKLQl9Ki8KLQogCXBy aW50ICI8dGQgYWxpZ249J3JpZ2h0JyB2YWxpZ249J2JvdHRvbSc+Jm5ic3A7XG4iOwogCXByaW50 ICIgIDxpbnB1dCB0eXBlPSdzdWJtaXQnIHN0eWxlPSd3aWR0aDo4MHB4JyAgY2xhc3M9J2J1dHRv bicgbmFtZT0nZG9fT3JwaGFucyciOwogCXByaW50ICIgdmFsdWU9JyIuX18oIk9ycGhhbnMiKS4i Jz5cbiI7CkBAIC04ODQsNyArODczLDkgQEAgZnVuY3Rpb24gcGtnX3NlYXJjaF9wYWdlKCRTSUQ9 IiIpIHsKIAkJCSRxLj0gIk9SREVSIEJZIE5hbWUgIi4kb3JkZXIuIiwgTG9jYXRpb25JRCBBU0Ms IENhdGVnb3J5SUQgREVTQyAiOwogCQkJYnJlYWs7CiAJfQotCQkKKwkKKwkkYWxscmVzdWx0cyA9 IG15c3FsX251bV9yb3dzKGRiX3F1ZXJ5KCRxLCAkZGJoKSk7CisKIAkkcW5leHQgPSAkcS4iTElN SVQgIi4oJE8rJFBQKS4iLCAiLiRQUDsgLy9uZXh0IHBhZ2UncyB3b3J0aAogCSRxLj0gIkxJTUlU ICIuJE8uIiwgIi4kUFA7CiAKQEAgLTExMTYsNiArMTEwNywyMSBAQCBmdW5jdGlvbiBwa2dfc2Vh cmNoX3BhZ2UoJFNJRD0iIikgewogCQlwcmludCAiICA8dGFibGUgYm9yZGVyPScwJyBjZWxscGFk ZGluZz0nMCcgY2VsbHNwYWNpbmc9JzAnIHdpZHRoPScxMDAlJz5cbiI7CiAJCXByaW50ICIgIDx0 cj5cbiI7CiAKKwkJIyBmaWd1cmUgb3V0IHRoZSByZXN1bHRzIHRvIHVzZQorCQkkZmlyc3QgPSAk TyArIDE7CisKKwkJaWYgKCgkUFArJE8pID4gJGFsbHJlc3VsdHMpIHsKKwkJCSRsYXN0ID0gJGFs bHJlc3VsdHM7CisJCX0gZWxzZSB7CisJCQkkbGFzdCA9ICRQUCArICRPOworCQl9CisKKwkJIyBw cmludCBudW1iZXIgb2YgcmVzdWx0cworCQkjIG9rIHRoaXMgc3R5bGluZyBzdWNrcworCQlwcmlu dCAiPHRyPjx0ZCBhbGlnbj0nY2VudGVyJyBjb2xzcGFuPScwJz48c3BhbiBjbGFzcz0nZjQnPjxz cGFuIGNsYXNzPSdibHVlJz4iOworCQlwcmludCBfXygiU2hvd2luZyByZXN1bHRzICVzIC0gJXMg b2YgJXMiLCBhcnJheSgkZmlyc3QsICRsYXN0LCAkYWxscmVzdWx0cykpOworCQlwcmludCAiPC9z cGFuPjwvc3Bhbj48L3RkPjwvdHI+IjsKKwogCQkjIGZpcnN0IHByaW50IHRoZSBsZWdlbmQKIAkJ cHJpbnQgIiAgICA8dGQgY29sc3Bhbj0nMicgYWxpZ249J2NlbnRlcic+IjsKICAgICBwcmludCAi ICAgIDxzcGFuIGNsYXNzPSdmNSc+XG4iOwo= --===============4498634280266969277==-- From wizzomafizzo@gmail.com Thu Jan 17 03:05:45 2008 From: Callan Barrett To: aur-dev@lists.archlinux.org Subject: [aur-dev] [PATCH] Fix login error and translation bug Date: Thu, 17 Jan 2008 17:04:00 +0900 Message-ID: <1200557040-28734-1-git-send-email-wizzomafizzo@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7069278763173366841==" --===============7069278763173366841== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Fixes a login error where entering nothing would result in the login message "Incorrect password for username, ." and changes the translation "TU" to "Trusted User" so the menu bar on the accounts page doesn't bug up (we need a new translation system :((() Signed-off-by: Callan Barrett --- web/lang/en/aur_po.inc | 2 +- web/lib/aur.inc | 4 ++-- web/template/header.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) --===============7069278763173366841== Content-Type: text/x-patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="557af1755fc375e4461ae04df8a2706b32bb7ca2.diff" MIME-Version: 1.0 ZGlmZiAtLWdpdCBhL3dlYi9sYW5nL2VuL2F1cl9wby5pbmMgYi93ZWIvbGFuZy9lbi9hdXJfcG8u aW5jCmluZGV4IGZlYWIyM2EuLjY3Y2Y2ZWUgMTAwNjQ0Ci0tLSBhL3dlYi9sYW5nL2VuL2F1cl9w by5pbmMKKysrIGIvd2ViL2xhbmcvZW4vYXVyX3BvLmluYwpAQCAtMjcsNiArMjcsNiBAQCAkX3Rb ImVuIl1bIkRpc2N1c3Npb24iXSA9ICJEaXNjdXNzaW9uIjsKIAogJF90WyJlbiJdWyJCdWdzIl0g PSAiQnVncyI7CiAKLSRfdFsiZW4iXVsiVHJ1c3RlZCBVc2VyIl0gPSAiVFUiOworJF90WyJlbiJd WyJUcnVzdGVkIFVzZXIiXSA9ICJUcnVzdGVkIFVzZXIiOwogCiA/PgpkaWZmIC0tZ2l0IGEvd2Vi L2xpYi9hdXIuaW5jIGIvd2ViL2xpYi9hdXIuaW5jCmluZGV4IGNmZTRhOTYuLjYxMDdjYmIgMTAw NjQ0Ci0tLSBhL3dlYi9saWIvYXVyLmluYworKysgYi93ZWIvbGliL2F1ci5pbmMKQEAgLTM0NSwx MCArMzQ1LDEwIEBAIGZ1bmN0aW9uIGh0bWxfaGVhZGVyKCR0aXRsZT0iIikgewogCWlmIChpc3Nl dCgkX1BPU1RbInVzZXIiXSkgfHwgaXNzZXQoJF9QT1NUWyJwYXNzIl0pKSB7CiAJCSMgQXR0ZW1w dGluZyB0byBsb2cgaW4KIAkJIwotCQlpZiAoIWlzc2V0KCRfUE9TVFsidXNlciJdKSkgeworCQlp ZiAoIWlzc2V0KCRfUE9TVFsidXNlciJdKSB8fCAkX1BPU1RbJ3VzZXInXSA9PT0gIiIpIHsKIAkJ CSRsb2dpbl9lcnJvciA9IF9fKCJZb3UgbXVzdCBzdXBwbHkgYSB1c2VybmFtZS4iKTsKIAkJfQot CQlpZiAoIWlzc2V0KCRfUE9TVFsicGFzcyJdKSkgeworCQlpZiAoIWlzc2V0KCRfUE9TVFsicGFz cyJdKSB8fCAkX1BPU1RbJ3Bhc3MnXSA9PT0gIiIgJiYgZW1wdHkoJGxvZ2luX2Vycm9yKSkgewog CQkJJGxvZ2luX2Vycm9yID0gX18oIllvdSBtdXN0IHN1cHBseSBhIHBhc3N3b3JkLiIpOwogCQl9 CiAJCWlmICghJGxvZ2luX2Vycm9yKSB7CmRpZmYgLS1naXQgYS93ZWIvdGVtcGxhdGUvaGVhZGVy LnBocCBiL3dlYi90ZW1wbGF0ZS9oZWFkZXIucGhwCmluZGV4IGFhY2NmYTIuLjZlMTE0ZmQgMTAw NjQ0Ci0tLSBhL3dlYi90ZW1wbGF0ZS9oZWFkZXIucGhwCisrKyBiL3dlYi90ZW1wbGF0ZS9oZWFk ZXIucGhwCkBAIC05Myw3ICs5Myw3IEBAIGlmIChpc3NldCgkX0NPT0tJRVsiQVVSU0lEIl0pKSB7 CiAgICAgfSA/PgogICAgICAgICA8Zm9ybSBtZXRob2Q9J3Bvc3QnPgogICAgICAgICAgPD9waHAg cHJpbnQgX18oIlVzZXJuYW1lOiIpOyA/PgotICAgICAgICAgIDxpbnB1dCB0eXBlPSd0ZXh0JyBu YW1lPSd1c2VyJyBzaXplPSczMCcgbWF4bGVuZ3RoPSc2NCc+CisJCQkJCTxpbnB1dCB0eXBlPSd0 ZXh0JyBuYW1lPSd1c2VyJyBzaXplPSczMCcgbWF4bGVuZ3RoPSc2NCcgdmFsdWU9Jzw/cGhwIGlm IChpc3NldCgkX1BPU1RbJ3VzZXInXSkpIHsgcHJpbnQgaHRtbHNwZWNpYWxjaGFycygkX1BPU1Rb J3VzZXInXSwgRU5UX1FVT1RFUyk7IH0gPz4nPgogICAgICAgICAgPD9waHAgcHJpbnQgX18oIlBh c3N3b3JkOiIpOyA/PgogICAgICAgICAgIDxpbnB1dCB0eXBlPSdwYXNzd29yZCcgbmFtZT0ncGFz cycgc2l6ZT0nMzAnIG1heGxlbmd0aD0nMzInPgogICAgICAgICAgIDxpbnB1dCB0eXBlPSdzdWJt aXQnIGNsYXNzPSdidXR0b24nIHZhbHVlPSc8P3BocCAgcHJpbnQgX18oIkxvZ2luIik7ID8+Jz4K --===============7069278763173366841==-- From wizzomafizzo@gmail.com Thu Jan 17 11:13:02 2008 From: Callan Barrett To: aur-dev@lists.archlinux.org Subject: [aur-dev] [PATCH] Turn action bar into drop box Date: Fri, 18 Jan 2008 01:11:12 +0900 Message-ID: <1200586272-18378-1-git-send-email-wizzomafizzo@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7011732851751049246==" --===============7011732851751049246== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Moves the action bar down to the bottom right of the search results and turns= it into a drop-down selection box. Signed-off-by: Callan Barrett --- web/html/packages.php | 26 ++++++++--------- web/lang/en/search_po.inc | 2 +- web/lib/pkgfuncs.inc | 67 ++++++++++++++-----------------------------= -- web/template/header.php | 2 +- 4 files changed, 35 insertions(+), 62 deletions(-) --===============7011732851751049246== Content-Type: text/x-patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="8a578d54ba9a141961924a903bcaf32b9b15665a.diff" MIME-Version: 1.0 ZGlmZiAtLWdpdCBhL3dlYi9odG1sL3BhY2thZ2VzLnBocCBiL3dlYi9odG1sL3BhY2thZ2VzLnBo cAppbmRleCAxNDNmYmRmLi5hNmUyZWY5IDEwMDY0NAotLS0gYS93ZWIvaHRtbC9wYWNrYWdlcy5w aHAKKysrIGIvd2ViL2h0bWwvcGFja2FnZXMucGhwCkBAIC00Nyw3ICs0Nyw3IEBAIGlmIChpc3Nl dCgkX0NPT0tJRVsiQVVSU0lEIl0pKSB7CiAKICMgZ3JhYiB0aGUgbGlzdCBvZiBQYWNrYWdlIElE cyB0byBiZSBvcGVyYXRlZCBvbgogIwotaXNzZXQoJF9SRVFVRVNUWyJJRHMiXSkgPyAkaWRzID0g JF9SRVFVRVNUWyJJRHMiXSA6ICRpZHMgPSBhcnJheSgpOworaXNzZXQoJF9QT1NUWyJJRHMiXSkg PyAkaWRzID0gJF9QT1NUWyJJRHMiXSA6ICRpZHMgPSBhcnJheSgpOwogI2lzc2V0KCRfUkVRVUVT VFsiQWxsX0lEcyJdKSA/CiAjCQkkYWxsX2lkcyA9IGV4cGxvZGUoIjoiLCAkX1JFUVVFU1RbIkFs bF9JRHMiXSkgOgogIwkJJGFsbF9pZHMgPSBhcnJheSgpOwpAQCAtNTUsNyArNTUsNyBAQCBpc3Nl dCgkX1JFUVVFU1RbIklEcyJdKSA/ICRpZHMgPSAkX1JFUVVFU1RbIklEcyJdIDogJGlkcyA9IGFy cmF5KCk7CiAKICMgZGV0ZXJtaW5lIHdoYXQgYnV0dG9uIHRoZSB2aXNpdG9yIGNsaWNrZWQKICMK LWlmIChpc3NldCgkX1JFUVVFU1RbImRvX0ZsYWciXSkpIHsKK2lmICgkX1BPU1RbJ2FjdGlvbidd ID09ICJkb19GbGFnIikgewogCWlmICghJGF0eXBlKSB7CiAJCXByaW50IF9fKCJZb3UgbXVzdCBi ZSBsb2dnZWQgaW4gYmVmb3JlIHlvdSBjYW4gZmxhZyBwYWNrYWdlcy4iKTsKIAkJcHJpbnQgIjxi ciAvPlxuIjsKQEAgLTExMSw3ICsxMTEsNyBAQCBpZiAoaXNzZXQoJF9SRVFVRVNUWyJkb19GbGFn Il0pKSB7CiAJCX0KIAl9CiAKLX0gZWxzZWlmIChpc3NldCgkX1JFUVVFU1RbImRvX1VuRmxhZyJd KSkgeworfSBlbHNlaWYgKCRfUE9TVFsnYWN0aW9uJ10gPT0gImRvX1VuRmxhZyIpIHsKIAlpZiAo ISRhdHlwZSkgewogCQlwcmludCBfXygiWW91IG11c3QgYmUgbG9nZ2VkIGluIGJlZm9yZSB5b3Ug Y2FuIHVuZmxhZyBwYWNrYWdlcy4iKTsKIAkJcHJpbnQgIjxiciAvPlxuIjsKQEAgLTE0OCw3ICsx NDgsNyBAQCBpZiAoaXNzZXQoJF9SRVFVRVNUWyJkb19GbGFnIl0pKSB7CiAJCQkJCiAJfQogCi19 IGVsc2VpZiAoaXNzZXQoJF9SRVFVRVNUWyJkb19EaXNvd24iXSkpIHsKK30gZWxzZWlmICgkX1BP U1RbJ2FjdGlvbiddID09ICJkb19EaXNvd24iKSB7CiAJaWYgKCEkYXR5cGUpIHsKIAkJcHJpbnQg X18oIllvdSBtdXN0IGJlIGxvZ2dlZCBpbiBiZWZvcmUgeW91IGNhbiBkaXNvd24gcGFja2FnZXMu Iik7CiAJCXByaW50ICI8YnIgLz5cbiI7CkBAIC0yMDQsNyArMjA0LDcgQEAgaWYgKGlzc2V0KCRf UkVRVUVTVFsiZG9fRmxhZyJdKSkgewogCX0KIAogCi19IGVsc2VpZiAoaXNzZXQoJF9SRVFVRVNU WyJkb19EZWxldGUiXSkpIHsKK30gZWxzZWlmICgkX1BPU1RbJ2FjdGlvbiddID09ICJkb19EZWxl dGUiKSB7CiAJaWYgKCEkYXR5cGUpIHsKIAkJcHJpbnQgX18oIllvdSBtdXN0IGJlIGxvZ2dlZCBp biBiZWZvcmUgeW91IGNhbiBkaXNvd24gcGFja2FnZXMuIik7CiAJCXByaW50ICI8YnIgLz5cbiI7 CkBAIC0zMDksNyArMzA5LDcgQEAgaWYgKGlzc2V0KCRfUkVRVUVTVFsiZG9fRmxhZyJdKSkgewog CQl9ICMgZW5kIGlmICghZW1wdHkoJGlkcykpCiAJfSAjIGVuZCBpZiAoIWF0eXBlKQogCi19IGVs c2VpZiAoaXNzZXQoJF9SRVFVRVNUWyJkb19BZG9wdCJdKSkgeworfSBlbHNlaWYgKCRfUE9TVFsn YWN0aW9uJ10gPT0gImRvX0Fkb3B0IikgewogCWlmICghJGF0eXBlKSB7CiAJCXByaW50IF9fKCJZ b3UgbXVzdCBiZSBsb2dnZWQgaW4gYmVmb3JlIHlvdSBjYW4gYWRvcHQgcGFja2FnZXMuIik7CiAJ CXByaW50ICI8YnIgLz5cbiI7CkBAIC0zNjcsNyArMzY3LDcgQEAgaWYgKGlzc2V0KCRfUkVRVUVT VFsiZG9fRmxhZyJdKSkgewogCX0KIAogCi19IGVsc2VpZiAoaXNzZXQoJF9SRVFVRVNUWyJkb19W b3RlIl0pKSB7Cit9IGVsc2VpZiAoJF9QT1NUWydhY3Rpb24nXSA9PSAiZG9fVm90ZSIpIHsKIAlp ZiAoISRhdHlwZSkgewogCQlwcmludCBfXygiWW91IG11c3QgYmUgbG9nZ2VkIGluIGJlZm9yZSB5 b3UgY2FuIHZvdGUgZm9yIHBhY2thZ2VzLiIpOwogCQlwcmludCAiPGJyIC8+XG4iOwpAQCAtNDI1 LDcgKzQyNSw3IEBAIGlmIChpc3NldCgkX1JFUVVFU1RbImRvX0ZsYWciXSkpIHsKIAl9CiAKIAot fSBlbHNlaWYgKGlzc2V0KCRfUkVRVUVTVFsiZG9fVW5Wb3RlIl0pKSB7Cit9IGVsc2VpZiAoJF9Q T1NUWydhY3Rpb24nXSA9PSAiZG9fVW5Wb3RlIikgewogCWlmICghJGF0eXBlKSB7CiAJCXByaW50 IF9fKCJZb3UgbXVzdCBiZSBsb2dnZWQgaW4gYmVmb3JlIHlvdSBjYW4gdW4tdm90ZSBmb3IgcGFj a2FnZXMuIik7CiAJCXByaW50ICI8YnIgLz5cbiI7CkBAIC00NzUsMTggKzQ3NSwxNiBAQCBpZiAo aXNzZXQoJF9SRVFVRVNUWyJkb19GbGFnIl0pKSB7CiAJfQogCiAKLX0gZWxzZWlmIChpc3NldCgk X1JFUVVFU1RbIklEIl0pKSB7Cit9IGVsc2VpZiAoaXNzZXQoJF9HRVRbIklEIl0pKSB7CiAKLQlp ZiAoIWludHZhbCgkX1JFUVVFU1RbIklEIl0pKSB7CisJaWYgKCFpbnR2YWwoJF9HRVRbIklEIl0p KSB7CiAJCXByaW50IF9fKCJFcnJvciB0cnlpbmcgdG8gcmV0cmlldmUgcGFja2FnZSBkZXRhaWxz LiIpLiI8YnIgLz5cbiI7CiAJCQogCX0gZWxzZSB7Ci0JCXBhY2thZ2VfZGV0YWlscygkX1JFUVVF U1RbIklEIl0sICRfQ09PS0lFWyJBVVJTSUQiXSk7CisJCXBhY2thZ2VfZGV0YWlscygkX0dFVFsi SUQiXSwgJF9DT09LSUVbIkFVUlNJRCJdKTsKIAl9CiAKLQkjIEZJWE1FOiBJZiBzb21lb25lIGhp dHMgdGhlIGRldGFpbCBwYWdlJ3Mgdm90ZSBidXR0b24sIHRoaXMgbGluayBkaWVzCi0KLX0gZWxz ZWlmIChpc3NldCgkX1JFUVVFU1RbImRvX05vdGlmeSJdKSkgeworfSBlbHNlaWYgKCRfUE9TVFsn YWN0aW9uJ10gPT0gImRvX05vdGlmeSIpIHsKIAkjIEkgcmVhbGl6ZSB0aGF0IHRoZSBpbXBsZW1l bnRhdGlvbiBoZXJlIHNlZW1zIGEgYml0IGNvbnZvbHV0ZWQsIGJ1dCB3ZSB3YW50IHRvCiAJIyBl bnN1cmUgdGhhdCBldmVyeXRoaW5nIGhhcHBlbnMgYXMgaXQgc2hvdWxkLCBldmVuIGlmIHNvbWVv bmUgY2FsbGVkIHRoaXMgcGFnZQogCSMgd2l0aG91dCBoYXZpbmcgY2xpY2tlZCBhIGJ1dHRvbiBz b21ld2hlcmUgKG5hdWdodHkgbmF1Z2h0eSkuIFRoaXMgYWxzbyBsZWF2ZXMKZGlmZiAtLWdpdCBh L3dlYi9sYW5nL2VuL3NlYXJjaF9wby5pbmMgYi93ZWIvbGFuZy9lbi9zZWFyY2hfcG8uaW5jCmlu ZGV4IDYwMTc4MmMuLjZjNzNhMWEgMTAwNjQ0Ci0tLSBhL3dlYi9sYW5nL2VuL3NlYXJjaF9wby5p bmMKKysrIGIvd2ViL2xhbmcvZW4vc2VhcmNoX3BvLmluYwpAQCAtMzksNyArMzksNyBAQCAkX3Rb ImVuIl1bIkVycm9yIHRyeWluZyB0byByZXRyaWV2ZSBwYWNrYWdlIGRldGFpbHMuIl0gPSAiRXJy b3IgdHJ5aW5nIHRvIHJldHJpZQogCiAkX3RbImVuIl1bIlRoZSBzZWxlY3RlZCBwYWNrYWdlcyBo YXZlIGJlZW4gYWRvcHRlZC4iXSA9ICJUaGUgc2VsZWN0ZWQgcGFja2FnZXMgaGF2ZSBiZWVuIGFk b3B0ZWQuIjsKIAotJF90WyJlbiJdWyJZb3UgaGF2ZSBiZWVuIHJlbW92ZWQgZnJvbSB0aGUgY29t bWVudCBub3RpZmljYXRpb24gbGlzdCBmb3IgJXMuIl0gPSAiWW91IGhhdmUgYmVlbiByZW1vdmVk IGZyb20gdGhlIGNvbW1lbnQgbm90aWZpY2F0aW9uIGxpc3Rmb3IgJXMuIjsKKyRfdFsiZW4iXVsi WW91IGhhdmUgYmVlbiByZW1vdmVkIGZyb20gdGhlIGNvbW1lbnQgbm90aWZpY2F0aW9uIGxpc3Qg Zm9yICVzLiJdID0gIllvdSBoYXZlIGJlZW4gcmVtb3ZlZCBmcm9tIHRoZSBjb21tZW50IG5vdGlm aWNhdGlvbiBsaXN0IGZvciAlcy4iOwogCiAkX3RbImVuIl1bIllvdXIgdm90ZXMgaGF2ZSBiZWVu IGNhc3QgZm9yIHRoZSBzZWxlY3RlZCBwYWNrYWdlcy4iXSA9ICJZb3VyIHZvdGVzIGhhdmUgYmVl biBjYXN0IGZvciB0aGUgc2VsZWN0ZWQgcGFja2FnZXMuIjsKIApkaWZmIC0tZ2l0IGEvd2ViL2xp Yi9wa2dmdW5jcy5pbmMgYi93ZWIvbGliL3BrZ2Z1bmNzLmluYwppbmRleCA3MTNlYjZiLi4zNjA4 MDEyIDEwMDY0NAotLS0gYS93ZWIvbGliL3BrZ2Z1bmNzLmluYworKysgYi93ZWIvbGliL3BrZ2Z1 bmNzLmluYwpAQCAtNzY2LDggKzc2NiwxMCBAQCBmdW5jdGlvbiBwa2dfc2VhcmNoX3BhZ2UoJFNJ RD0iIikgewogCXByaW50ICI8L3RyPlxuIjsKIAlwcmludCAiPC90YWJsZT5cbiI7CiAJcHJpbnQg IjwvY2VudGVyPlxuIjsKKwlwcmludCAiPC9mb3JtPiI7CiAJcHJpbnQgIjxiciAvPlxuIjsKIAor CXByaW50ICI8Zm9ybSBhY3Rpb249Jy9wYWNrYWdlcy5waHAnIG1ldGhvZD0ncG9zdCc+XG4iOwog CSMgcXVlcnkgdG8gcHVsbCBvdXQgcGFja2FnZSBpbmZvCiAJIwogIwkkcSA9ICJTRUxFQ1QgUGFj a2FnZXMuKiwgSUYoSVNOVUxMKFBhY2thZ2VJRCksIDAsIENPVU5UKCopKSBBUyBWb3RlcyAiOwpA QCAtODc5LDUxICs4ODEsOCBAQCBmdW5jdGlvbiBwa2dfc2VhcmNoX3BhZ2UoJFNJRD0iIikgewog CSRxbmV4dCA9ICRxLiJMSU1JVCAiLigkTyskUFApLiIsICIuJFBQOyAvL25leHQgcGFnZSdzIHdv cnRoCiAJJHEuPSAiTElNSVQgIi4kTy4iLCAiLiRQUDsKIAotCWlmICgkU0lEKSB7Ci0JCSMgVGhl ICdBY3Rpb25zJyB0YWJsZQotCQkjCi0JCXByaW50ICI8Y2VudGVyPlxuIjsKLQkJcHJpbnQgIjx0 YWJsZSBjZWxsc3BhY2luZz0nMycgY2xhc3M9J2JveFNvZnQnPlxuIjsKLQkJcHJpbnQgIjx0cj5c biI7Ci0JCXByaW50ICIgIDx0ZCBjbGFzcz0nYm94U29mdFRpdGxlJyBhbGlnbj0ncmlnaHQnPlxu IjsKLQkJcHJpbnQgIiAgICA8c3BhbiBjbGFzcz0nZjMnPiIuX18oIkFjdGlvbnMiKS4iPC9zcGFu PlxuIjsKLQkJcHJpbnQgIiAgPC90ZD5cbiI7Ci0JCXByaW50ICI8L3RyPlxuIjsKLQkJcHJpbnQg Ijx0cj5cbiI7Ci0JCXByaW50ICIgIDx0ZCBjbGFzcz0nYm94U29mdCc+XG4iOwotCQlwcmludCAi PHRhYmxlIHN0eWxlPSd3aWR0aDogMTAwJScgYWxpZ249J2NlbnRlcic+XG4iOwotCQlwcmludCAi PHRyPlxuIjsKLQkJcHJpbnQgIiAgPHRkIGFsaWduPSdjZW50ZXInPiI7Ci0JCXByaW50ICI8aW5w dXQgdHlwZT0nc3VibWl0JyBjbGFzcz0nYnV0dG9uJyBuYW1lPSdkb19GbGFnJyI7Ci0JCXByaW50 ICIJdmFsdWU9JyIuX18oIkZsYWcgT3V0LW9mLWRhdGUiKS4iJz48L3RkPlxuIjsKLQkJcHJpbnQg IiAgPHRkIGFsaWduPSdjZW50ZXInPiI7Ci0JCXByaW50ICI8aW5wdXQgdHlwZT0nc3VibWl0JyBj bGFzcz0nYnV0dG9uJyBuYW1lPSdkb19VbkZsYWcnIjsKLQkJcHJpbnQgIgl2YWx1ZT0nIi5fXygi VW5mbGFnIE91dC1vZi1kYXRlIikuIic+PC90ZD5cbiI7Ci0JCXByaW50ICIgIDx0ZCBhbGlnbj0n Y2VudGVyJz4iOwotCQlwcmludCAiPGlucHV0IHR5cGU9J3N1Ym1pdCcgY2xhc3M9J2J1dHRvbicg bmFtZT0nZG9fQWRvcHQnIjsKLQkJcHJpbnQgIgl2YWx1ZT0nIi5fXygiQWRvcHQgUGFja2FnZXMi KS4iJz48L3RkPlxuIjsKLQkJcHJpbnQgIiAgPHRkIGFsaWduPSdjZW50ZXInPiI7Ci0JCXByaW50 ICI8aW5wdXQgdHlwZT0nc3VibWl0JyBjbGFzcz0nYnV0dG9uJyBuYW1lPSdkb19EaXNvd24nIjsK LQkJcHJpbnQgIgl2YWx1ZT0nIi5fXygiRGlzb3duIFBhY2thZ2VzIikuIic+PC90ZD5cbiI7Ci0J CXByaW50ICIgIDx0ZCBhbGlnbj0nY2VudGVyJz4iOwotCQlwcmludCAiPGlucHV0IHR5cGU9J3N1 Ym1pdCcgY2xhc3M9J2J1dHRvbicgbmFtZT0nZG9fRGVsZXRlJyI7Ci0JCXByaW50ICIJdmFsdWU9 JyIuX18oIkRlbGV0ZSBQYWNrYWdlcyIpLiInPjwvdGQ+XG4iOwotCQlwcmludCAiICA8dGQgYWxp Z249J2NlbnRlcic+IjsKLQkJcHJpbnQgIjxpbnB1dCB0eXBlPSdzdWJtaXQnIGNsYXNzPSdidXR0 b24nIG5hbWU9J2RvX05vdGlmeSciOwotCQlwcmludCAiCXZhbHVlPSciLl9fKCJUb2dnbGUgTm90 aWZ5IikuIic+PC90ZD5cbiI7Ci0JCXByaW50ICIgIDx0ZCBhbGlnbj0nY2VudGVyJz4iOwotCQlw cmludCAiPC90cj5cbiI7Ci0JCXByaW50ICI8L3RhYmxlPlxuIjsKLQkJcHJpbnQgIiAgPC90ZD5c biI7Ci0JCXByaW50ICI8L3RyPlxuIjsKLQkJcHJpbnQgIjwvdGFibGU+XG4iOwotCQlwcmludCAi PC9jZW50ZXI+XG4iOwotCQlwcmludCAiPGJyIC8+XG4iOwotCX0KLQotCS8vIFdoeT8KLQkvLyBw cmludCAiPCEtLSBRdWVyeTogIi4kcS4iIC0tPlxuIjsKIAkKKwogCSRyZXN1bHQgPSBkYl9xdWVy eSgkcSwgJGRiaCk7CiAJCiAJcHJpbnQgIjxjZW50ZXI+XG4iOwpAQCAtMTEwMCwxMyArMTA1OSwy OSBAQCBmdW5jdGlvbiBwa2dfc2VhcmNoX3BhZ2UoJFNJRD0iIikgewogCQlpZiAoJF9SRVFVRVNU WyJkb19PcnBoYW5zIl0pIHsKIAkJCXByaW50ICI8aW5wdXQgdHlwZT0naGlkZGVuJyBuYW1lPSdk b19PcnBoYW5zJyB2YWx1ZT0nMSc+XG4iOwogCQl9Ci0KKwkJCisJCWlmICgkU0lEKSB7CisJCQkj IFRoZSAnQWN0aW9ucycgYm94CisJCQkjCisJCQlwcmludCAiPGRpdiBzdHlsZT0ndGV4dC1hbGln bjogcmlnaHQ7IHBhZGRpbmc6IDVweCA1JSA1cHggMCc+IjsKKwkJCXByaW50ICI8c2VsZWN0IG5h bWU9J2FjdGlvbic+IjsKKwkJCXByaW50ICI8b3B0aW9uIHZhbHVlPSdkb19GbGFnJz4iLl9fKCJG bGFnIE91dC1vZi1kYXRlIikuIjwvb3B0aW9uPlxuIjsKKwkJCXByaW50ICI8b3B0aW9uIHZhbHVl PSdkb19VbkZsYWcnPiIuX18oIlVuZmxhZyBPdXQtb2YtZGF0ZSIpLiI8L29wdGlvbj5cbiI7CisJ CQlwcmludCAiPG9wdGlvbiB2YWx1ZT0nZG9fQWRvcHQnPiIuX18oIkFkb3B0IFBhY2thZ2VzIiku Ijwvb3B0aW9uPlxuIjsKKwkJCXByaW50ICI8b3B0aW9uIHZhbHVlPSdkb19EaXNvd24nPiIuX18o IkRpc293biBQYWNrYWdlcyIpLiI8L29wdGlvbj5cbiI7CisJCQlwcmludCAiPG9wdGlvbiB2YWx1 ZT0nZG9fRGVsZXRlJz4iLl9fKCJEZWxldGUgUGFja2FnZXMiKS4iPC9vcHRpb24+XG4iOworCQkJ cHJpbnQgIjxvcHRpb24gdmFsdWU9J2RvX05vdGlmeSc+Ii5fXygiVG9nZ2xlIE5vdGlmeSIpLiI8 L29wdGlvbj5cbiI7CisJCQlwcmludCAiPC9zZWxlY3Q+IjsKKwkJCXByaW50ICI8aW5wdXQgdHlw ZT0nc3VibWl0JyBjbGFzcz0nYnV0dG9uJyBzdHlsZT0nd2lkdGg6IDgwcHgnIHZhbHVlPSciIC4g X18oIkdvIikgLiAiJyAvPiI7CisJCQlwcmludCAiPC9kaXY+IjsKKwkJfQorCQkKIAkJcHJpbnQg Ijx0YWJsZSB3aWR0aD0nOTAlJyBjZWxsc3BhY2luZz0nMCcgY2VsbHBhZGRpbmc9JzInPlxuIjsK IAkJcHJpbnQgIjx0cj5cbiI7CiAJCXByaW50ICIgIDx0ZD5cbiI7CiAJCXByaW50ICIgIDx0YWJs ZSBib3JkZXI9JzAnIGNlbGxwYWRkaW5nPScwJyBjZWxsc3BhY2luZz0nMCcgd2lkdGg9JzEwMCUn PlxuIjsKIAkJcHJpbnQgIiAgPHRyPlxuIjsKLQorCQkKIAkJIyBmaWd1cmUgb3V0IHRoZSByZXN1 bHRzIHRvIHVzZQogCQkkZmlyc3QgPSAkTyArIDE7CiAKZGlmZiAtLWdpdCBhL3dlYi90ZW1wbGF0 ZS9oZWFkZXIucGhwIGIvd2ViL3RlbXBsYXRlL2hlYWRlci5waHAKaW5kZXggNmUxMTRmZC4uNDg4 ZDI5MCAxMDA2NDQKLS0tIGEvd2ViL3RlbXBsYXRlL2hlYWRlci5waHAKKysrIGIvd2ViL3RlbXBs YXRlL2hlYWRlci5waHAKQEAgLTkzLDcgKzkzLDcgQEAgaWYgKGlzc2V0KCRfQ09PS0lFWyJBVVJT SUQiXSkpIHsKICAgICB9ID8+CiAgICAgICAgIDxmb3JtIG1ldGhvZD0ncG9zdCc+CiAgICAgICAg ICA8P3BocCBwcmludCBfXygiVXNlcm5hbWU6Iik7ID8+Ci0JCQkJCTxpbnB1dCB0eXBlPSd0ZXh0 JyBuYW1lPSd1c2VyJyBzaXplPSczMCcgbWF4bGVuZ3RoPSc2NCcgdmFsdWU9Jzw/cGhwIGlmIChp c3NldCgkX1BPU1RbJ3VzZXInXSkpIHsgcHJpbnQgaHRtbHNwZWNpYWxjaGFycygkX1BPU1RbJ3Vz ZXInXSwgRU5UX1FVT1RFUyk7IH0gPz4nPgorICAgICAgICAgIDxpbnB1dCB0eXBlPSd0ZXh0JyBu YW1lPSd1c2VyJyBzaXplPSczMCcgbWF4bGVuZ3RoPSc2NCcgdmFsdWU9Jzw/cGhwIGlmIChpc3Nl dCgkX1BPU1RbJ3VzZXInXSkpIHsgcHJpbnQgaHRtbHNwZWNpYWxjaGFycygkX1BPU1RbJ3VzZXIn XSwgRU5UX1FVT1RFUyk7IH0gPz4nPgogICAgICAgICAgPD9waHAgcHJpbnQgX18oIlBhc3N3b3Jk OiIpOyA/PgogICAgICAgICAgIDxpbnB1dCB0eXBlPSdwYXNzd29yZCcgbmFtZT0ncGFzcycgc2l6 ZT0nMzAnIG1heGxlbmd0aD0nMzInPgogICAgICAgICAgIDxpbnB1dCB0eXBlPSdzdWJtaXQnIGNs YXNzPSdidXR0b24nIHZhbHVlPSc8P3BocCAgcHJpbnQgX18oIkxvZ2luIik7ID8+Jz4K --===============7011732851751049246==-- From simo@archlinux.org Sun Jan 20 04:38:09 2008 From: Simo Leone To: aur-dev@lists.archlinux.org Subject: [aur-dev] Testing branch updates Date: Sun, 20 Jan 2008 03:38:06 -0600 Message-ID: <20080120093806.GA12557@neotuli.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============9182491103666479816==" --===============9182491103666479816== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Hey everyone, Just a quick note that the testing branch on projects.archlinux.org was forced to a non-superset tonight. The messy merge history has been cleaned up (thanks Dan!), and Eliott's testing branch was merged and cleaned up a bit. At this point, I'd also like to mention a few other business items: - I'm running a test site at aur.neotuli.net, I will keep this site running the testing branch from projects.archlinux.org, updated as often as I can. - I've changed the structure of the git repo on projects.archlinux.org a a little bit as well. I removed the 'stable' branch. From here on out, 'master' will be the stable branch and will get tagged at releases. 'testing' will remain a place to test code headed for master. - I want to set up a workflow like pacman's, where any patches headed for the AUR pass through the mailing list. This is the easiest way for me to manage incoming patches, and will avoid funky situations like the double merges and such that we saw in the past. - We're headed for another AUR release very shortly. Probably within a week I'll be pushing out what we've got in the testing branch, so if you had any last minute code you wanted to see go up, now's the time :) -Simo --===============9182491103666479816== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="attachment.sig" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjEuNC43IChHTlUv TGludXgpCgppRDhEQlFGSGt4WjgyNkRMb2hxRU42UVJBclU5QUo0aFJnUXdGazdLeVFiTGxvb2xZ VUo0RkFnS2hnQ2VLVHFZCjJseDBYOVpvRXd3dzFMQ3NyblJDdnNvPQo9eURvYwotLS0tLUVORCBQ R1AgU0lHTkFUVVJFLS0tLS0K --===============9182491103666479816==-- From roman.kyrylych@gmail.com Sun Jan 20 04:54:53 2008 From: Roman Kyrylych To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] Testing branch updates Date: Sun, 20 Jan 2008 11:54:52 +0200 Message-ID: <577f15290801200154q48b78324odbbd10f03201c4dd@mail.gmail.com> In-Reply-To: <20080120093806.GA12557@neotuli.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2900952118465457969==" --===============2900952118465457969== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit 2008/1/20, Simo Leone : > Hey everyone, > > Just a quick note that the testing branch on projects.archlinux.org was > forced to a non-superset tonight. The messy merge history has been > cleaned up (thanks Dan!), and Eliott's testing branch was merged and > cleaned up a bit. > > At this point, I'd also like to mention a few other business items: > - I'm running a test site at aur.neotuli.net, I will keep this site > running the testing branch from projects.archlinux.org, updated as > often as I can. > - I've changed the structure of the git repo on projects.archlinux.org a > a little bit as well. I removed the 'stable' branch. From here on out, > 'master' will be the stable branch and will get tagged at releases. > 'testing' will remain a place to test code headed for master. > - I want to set up a workflow like pacman's, where any patches headed > for the AUR pass through the mailing list. This is the easiest way for > me to manage incoming patches, and will avoid funky situations like > the double merges and such that we saw in the past. > - We're headed for another AUR release very shortly. Probably within a > week I'll be pushing out what we've got in the testing branch, so if > you had any last minute code you wanted to see go up, now's the time :) > http://aur.neotuli.net/ displays Parse error: syntax error, unexpected T_STRING in /home/.misha/neotuli/aur.neotuli.net/web/template/header.php on line 1 -- Roman Kyrylych (Роман Кирилич) --===============2900952118465457969==-- From simo@archlinux.org Sun Jan 20 05:39:19 2008 From: Simo Leone To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] Testing branch updates Date: Sun, 20 Jan 2008 04:39:17 -0600 Message-ID: <20080120103917.GA12639@neotuli.net> In-Reply-To: <577f15290801200154q48b78324odbbd10f03201c4dd@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6112026881050892863==" --===============6112026881050892863== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit On Sun, Jan 20, 2008 at 11:54:52AM +0200, Roman Kyrylych wrote: > 2008/1/20, Simo Leone : > > Hey everyone, > > > > Just a quick note that the testing branch on projects.archlinux.org was > > forced to a non-superset tonight. The messy merge history has been > > cleaned up (thanks Dan!), and Eliott's testing branch was merged and > > cleaned up a bit. > > > > At this point, I'd also like to mention a few other business items: > > - I'm running a test site at aur.neotuli.net, I will keep this site > > running the testing branch from projects.archlinux.org, updated as > > often as I can. > > - I've changed the structure of the git repo on projects.archlinux.org a > > a little bit as well. I removed the 'stable' branch. From here on out, > > 'master' will be the stable branch and will get tagged at releases. > > 'testing' will remain a place to test code headed for master. > > - I want to set up a workflow like pacman's, where any patches headed > > for the AUR pass through the mailing list. This is the easiest way for > > me to manage incoming patches, and will avoid funky situations like > > the double merges and such that we saw in the past. > > - We're headed for another AUR release very shortly. Probably within a > > week I'll be pushing out what we've got in the testing branch, so if > > you had any last minute code you wanted to see go up, now's the time :) > > > > http://aur.neotuli.net/ displays > Parse error: syntax error, unexpected T_STRING in > /home/.misha/neotuli/aur.neotuli.net/web/template/header.php on line 1 > dreamhost-related issue. aparently they run php through fcgi which means .htaccess files can't affect php at all. lovely. I worked around it. -S --===============6112026881050892863== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="attachment.sig" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjEuNC43IChHTlUv TGludXgpCgppRDhEQlFGSGt5VFMyNkRMb2hxRU42UVJBaWxxQUo5UWpTa2lzcUJvdHZQcTRsblZj dFpadTNNb0pRQ2dnV1EvCnJCRitJNWt2L1lyYlZpRVN3cjJmTE9jPQo9cjdQSwotLS0tLUVORCBQ R1AgU0lHTkFUVVJFLS0tLS0K --===============6112026881050892863==-- From roman.kyrylych@gmail.com Sun Jan 20 05:58:06 2008 From: Roman Kyrylych To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] Testing branch updates Date: Sun, 20 Jan 2008 12:58:06 +0200 Message-ID: <577f15290801200258r354ec578wf52912337fb97b1a@mail.gmail.com> In-Reply-To: <20080120103917.GA12639@neotuli.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3108564625842920377==" --===============3108564625842920377== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit 2008/1/20, Simo Leone : > On Sun, Jan 20, 2008 at 11:54:52AM +0200, Roman Kyrylych wrote: > > http://aur.neotuli.net/ displays > > Parse error: syntax error, unexpected T_STRING in > > /home/.misha/neotuli/aur.neotuli.net/web/template/header.php on line 1 > > > dreamhost-related issue. aparently they run php through fcgi which means > .htaccess files can't affect php at all. lovely. I worked around it. Ah, I've had the same issue 2 days ago when setting up lighttpd+fastcgi+php. Solved with http://pecl.php.net/package/htscanner -- Roman Kyrylych (Роман Кирилич) --===============3108564625842920377==-- From simo@archlinux.org Sun Jan 20 06:26:03 2008 From: Simo Leone To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] Testing branch updates Date: Sun, 20 Jan 2008 05:26:02 -0600 Message-ID: <20080120112602.GA13008@neotuli.net> In-Reply-To: <577f15290801200258r354ec578wf52912337fb97b1a@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3709439005826560883==" --===============3709439005826560883== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Also, quick note to anyone that happens to be testing... if you try to upload a tar.gz or tar.bz2 (anything but a plain pkgbuild or .tar), you'll find that it claims not to recognize the format. This is just a limitation of the version of tar running on the dreamhost box, in reality these other formats work just fine. -- Simo Leone Arch Linux Developer --===============3709439005826560883== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="attachment.sig" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjEuNC43IChHTlUv TGludXgpCgppRDhEQlFGSGt5L0gyNkRMb2hxRU42UVJBdU5NQUtDaEUveGRYdXpXMXgvUzFyQzUv RlBtUzA0c3Z3Q2ZlWHlzCklHTzVPaFR1NlRaM0RCL2tFalF4eDljPQo9YjFsaQotLS0tLUVORCBQ R1AgU0lHTkFUVVJFLS0tLS0K --===============3709439005826560883==-- From simo@archlinux.org Sun Jan 20 17:15:48 2008 From: Simo Leone To: aur-dev@lists.archlinux.org Subject: [aur-dev] Call for translations Date: Sun, 20 Jan 2008 16:15:48 -0600 Message-ID: <20080120221548.GA13710@neotuli.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7780667882233258681==" --===============7780667882233258681== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit A few of our translations have a couple missing strings. If you guys could take a look and reply with updates, that'd be awesome.e Thanks, -S --===============7780667882233258681== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="attachment.sig" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjEuNC43IChHTlUv TGludXgpCgppRDhEQlFGSGs4Z1IyNkRMb2hxRU42UVJBa3VhQUpvQ0Jjd2c5bC8yYWZiVjhkc2JQ RDhMVU5wdGJnQ2dqaWJsCjVVRWZvbnBtTWR1eVUya2ZWSU44TEhnPQo9TkxodQotLS0tLUVORCBQ R1AgU0lHTkFUVVJFLS0tLS0K --===============7780667882233258681==-- From linuxmania@gmail.com Sun Jan 20 21:01:36 2008 From: Giovanni Scafora To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] Call for translations Date: Mon, 21 Jan 2008 03:01:38 +0100 Message-ID: In-Reply-To: <20080120221548.GA13710@neotuli.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7479839057913804397==" --===============7479839057913804397== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 2008/1/20, Simo Leone : > A few of our translations have a couple missing strings. If you guys > could take a look and reply with updates, that'd be awesome.e I will send you the updated Italian translation in the next 24-48 hours. Thanks. -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com --===============7479839057913804397==-- From eliott@cactuswax.net Mon Jan 21 02:13:59 2008 From: eliott To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] Testing branch updates Date: Sun, 20 Jan 2008 23:13:58 -0800 Message-ID: <428d921d0801202313v2c1c6795qa8e80bae9538568a@mail.gmail.com> In-Reply-To: <20080120112602.GA13008@neotuli.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4413847922897737914==" --===============4413847922897737914== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit On 1/20/08, Simo Leone wrote: > Also, quick note to anyone that happens to be testing... if you try to > upload a tar.gz or tar.bz2 (anything but a plain pkgbuild or .tar), > you'll find that it claims not to recognize the format. This is just a > limitation of the version of tar running on the dreamhost box, in > reality these other formats work just fine. FYI: I didn't get Callan's last two patches merged into my testing repo, so they are still 'in the wild'. http://archlinux.org/pipermail/aur-dev/2008-January/000078.html http://archlinux.org/pipermail/aur-dev/2008-January/000079.html --===============4413847922897737914==-- From matthias@archlinux.de Mon Jan 21 07:46:24 2008 From: Matthias Gorissen To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] Call for translations Date: Mon, 21 Jan 2008 13:44:01 +0100 Message-ID: <200801211344.02144.matthias@archlinux.de> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4536921931266661556==" --===============4536921931266661556== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit It may be my fault, but somehow I seem to be unable to get access to your git-repo: [tlaloc(a)archlinux archlinux]$ git-clone http://projects.archlinux.org/git/aur-git Initialized empty Git repository in /home/tlaloc/archlinux/aur-git/.git/ Cannot get remote repository information. Perhaps git-update-server-info needs to be run there? I would like to have a (handy) look at the de-version, though ... Best regards, Matt --===============4536921931266661556==-- From linuxmania@gmail.com Mon Jan 21 12:26:35 2008 From: Giovanni Scafora To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] Call for translations Date: Mon, 21 Jan 2008 18:26:35 +0100 Message-ID: In-Reply-To: <20080120221548.GA13710@neotuli.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1268385253510913185==" --===============1268385253510913185== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 2008/1/20, Simo Leone : > A few of our translations have a couple missing strings. If you guys > could take a look and reply with updates, that'd be awesome.e Hi guys, here's updated italian translation. Thanks. -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com --===============1268385253510913185== Content-Type: application/x-gzip Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="0046-Updated-Italian-translation.patch.gz" MIME-Version: 1.0 H4sICL3QlEcAAzAwNDYtVXBkYXRlZC1JdGFsaWFuLXRyYW5zbGF0aW9uLnBhdGNoAKVY23LbNhB9 51fseOpxPLYUyrJubpvaiZPGHecyUZKZTprJgCRIoaEAhQDtONMP6nN/IT/Ws6QoiaKs3DQOdcHu Alicc3aRR5mZ0iAKe34c+aM46nUGg27QP4573dGo3w1DEY784VB0BsPuiJ4YTWM5o86AfP+k+KMj 3+94jxDmhH5X5kporWgcithkgn5Jlc4/ToVW4jSZCpW2QzO9550LJ0842CEddegPoTnIEFFPuqOT oxEd+B3f98Z58LcM3Qm9eX728sHjt/RqFsExogsnUgUnlwltU+GU0Z43VomWUcvEcSu4+fqltFot j65lcDcVOrmr3F0Rhi7OdWjfzUxb6ZD+IaKOTweL15p9nlWW5auwP16xx2ttjokI38tVN/ahI1q3 UzqSH1ejV3Zra5i9T2pLLu36tGm9VoosnKzPPaTl7voUq1RaCidwkdEhHfuktJUZJ9reOdjHqVEk U1l+b+17XqTimFqtRDkSd7dmM9g67BU7JtkLRt1Ov92O4o7siQD59/vHx3xYX4jvYQdfmuP0lFrD 7iGOCE+cFL7/9M692VFu5+2bnXN5JVMzk9nOW/qVdsZXKs1nM+FMJnd+9shbtX2t5DW5ibKUIz17 lmY4WJFIW/q+VjYHUj99EqR4KJxI5xRFij7k0rq93EntyqgHK1GtExnyqCOS+Het3IQEIdtOZmQy 0vk0qFantPqkBEmcmFY2lBSCoLmuzAUZfGMPmRnMc1Cb50+TZ1iWtdcmi2iaW0eBJOHgLPC5nOFS LE0ipIakxVYlb0KkU6kNNeK+nMgiH1pMJSE3Sl8hC1G7DHiRkjYYKDePz5o+/0uFhWk3Yl24xcJK 9/OVNTSsQ4gCMuCE0mR0eoOHJBylMkBxDmhlNsQ5chYnN7OJ1PM1zfLP/xWOUnNca9Iib7NcO8OO rDQ4OWw2QC5MmdXqt3LR9Ns97y96akjLayhNkUc+PhMXbNrCkKV+BLcMzFkxHES+DOJ2O5bdeDCK t7Bi6bqBD8tBZkJncMjqhrejozUqXJrE5K5M0UMbqgb+d+0J7dozTWeQlEvWV5plhkV7d06B0uKV 5t8TYNIsTWHC8Vqr3AOGc2shK3PwKXCBoRYtBpguB1tczmuW9eXez5P5svCpMfrkhp7X6HtBUyVX iNsgKghUotNCIYC2JVXaC7CqUjoVYMW8XBpsYONasIpDtwRbpdHGcBlh5QYYpomwYJDUiG1nQKVc IaPLzcIORETCcUjWwM5u4OPDLAN5XHajdEIwTJgxKMpkZZF0WvB8rApeY7WxCjkmVizZG9qRo3DD JxVz/098XFxS0j0VFe+iCrhha+UaUmPe8yLy2SJRh4DaN82eqVBmoeAZa6LEYRpKpCEdGaC91EP0 FZvmfl6NY0IB/EKASG2e4LtVo95BBLePzbVjMAw7cW+IihrG/eGgc7t21L2b8lEfZwXpHQ7ogB+n px4AGqZ5JN8ZHco7O1WHZjK23tkHg5LUBCJl4q2zv4DsEkfN0nFZoEMtoLGheHx7uBrYmhHrGnER l+UeahakcspHa6FR9pBmXDRlWX2AEYcaaBVOWkRTLs1cLJCEOThl2QCYKg4QaK64qFUBUYUOy1gO zQCwuiemK3EKrnD8+RJvhUmtgQxuHararq4ciGFYFJiR3z2+HSQ15yZGasMMkVHRbuHZXysxEN0x NomNqXAuu5eSdbcQouLnSVPIH4NKcwHjBsg0lPn8Yvzg8uziycMXpRm+vBo/uzz7MdKtt9nBttF5 TvvQ1jCI2u1hHAQi3pLTdf9mWtctyvLd4dTyG8p4PbnciIkAyJo39BOBj0UdKIURV6k7wQ3tTnbt 7mS/6DgZbFbEkrUd0gbArqX+hfyQo/5EFNyUqX2BE1IFmCPROIdnueO08n2vtH4KfokkUQaiWVTU usiOJ+aaRT2TNk+dhU5Six+IUXUUTwyTAA11ptgGURZWEX9stqMmSVKJ83Yqnq/5fmpwseUKoPlX VIgfA0b9ThXcPlaB4rjrSzlqt2XHD4a9LfebuncTEvVxBkR/xHjAs7PezjEcLK5tId+hq5vKCihy Hac4GwwyAqoOYeXiws5rcHhg8jTSe27uXIWtRZjODNQ1QAYLSctQHmWiGWmoilV0g7Fpqb9WhXk2 V7bVg6x3Z89X2rJmJ7XcVSanYACKNf9HB8sy5sG9xS2Onm+xlEJqinq+7CDQ+pXNUKamhrv+SHCp SMueFGVDViEmrMeqCqyKgr+phfiaDnPbVkSEzo2Z+V3bYNrxhYa+ZxtfogaA63XavXa3PfC8/wHF wDSAVBIAAA== --===============1268385253510913185==-- From simo@archlinux.org Mon Jan 21 17:04:25 2008 From: Simo Leone To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] Testing branch updates Date: Mon, 21 Jan 2008 16:04:25 -0600 Message-ID: <20080121220425.GB14528@archlinux.org> In-Reply-To: <428d921d0801202313v2c1c6795qa8e80bae9538568a@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0460067621289198450==" --===============0460067621289198450== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit On Sun, Jan 20, 2008 at 11:13:58PM -0800, eliott wrote: > On 1/20/08, Simo Leone wrote: > > Also, quick note to anyone that happens to be testing... if you try to > > upload a tar.gz or tar.bz2 (anything but a plain pkgbuild or .tar), > > you'll find that it claims not to recognize the format. This is just a > > limitation of the version of tar running on the dreamhost box, in > > reality these other formats work just fine. > > FYI: I didn't get Callan's last two patches merged into my testing > repo, so they are still 'in the wild'. > > http://archlinux.org/pipermail/aur-dev/2008-January/000078.html > http://archlinux.org/pipermail/aur-dev/2008-January/000079.html Yup, I got those, thanks! -S --===============0460067621289198450== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="attachment.sig" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjEuNC43IChHTlUv TGludXgpCgppRDhEQlFGSGxSYm0yNkRMb2hxRU42UVJBZ1BxQUo5VlM5R0ZQdGpObTVrNjI0RlNa ZEdZRTFqUWZnQ2NDdDk1CmdCWWREWHhSS3NKaGN2Zmk4NGIvWS9RPQo9Zkx1RwotLS0tLUVORCBQ R1AgU0lHTkFUVVJFLS0tLS0K --===============0460067621289198450==-- From linuxmania@gmail.com Mon Jan 21 17:12:07 2008 From: Giovanni Scafora To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] Call for translations Date: Mon, 21 Jan 2008 23:11:56 +0100 Message-ID: In-Reply-To: <200801211344.02144.matthias@archlinux.de> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1918680175880229463==" --===============1918680175880229463== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 2008/1/21, Matthias Gorissen : > It may be my fault, but somehow I seem to be unable to get access to your > git-repo: > > [tlaloc(a)archlinux archlinux]$ git-clone > http://projects.archlinux.org/git/aur-git > Initialized empty Git repository in /home/tlaloc/archlinux/aur-git/.git/ > Cannot get remote repository information. > Perhaps git-update-server-info needs to be run there? git clone http://projects.archlinux.org/git/aur.git aur-git cd aur-git git checkout -b testing origin/testing -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com --===============1918680175880229463==-- From wizzomafizzo@gmail.com Wed Jan 23 07:34:44 2008 From: Callan Barrett To: aur-dev@lists.archlinux.org Subject: [aur-dev] [PATCH] Turn more and less buttons into links Date: Wed, 23 Jan 2008 21:34:10 +0900 Message-ID: <1201091650-10493-1-git-send-email-wizzomafizzo@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6420173031020370771==" --===============6420173031020370771== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit This is to (at least) fix the more and less buttons which weren't working because of the drop down menu for actions Signed-off-by: Callan Barrett --- web/lib/pkgfuncs.inc | 28 ++++++++++++---------------- 1 files changed, 12 insertions(+), 16 deletions(-) --===============6420173031020370771== Content-Type: text/x-patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="258653b3beb52870ae295d610b0aac66e4cfef3c.diff" MIME-Version: 1.0 ZGlmZiAtLWdpdCBhL3dlYi9saWIvcGtnZnVuY3MuaW5jIGIvd2ViL2xpYi9wa2dmdW5jcy5pbmMK aW5kZXggMzYwODAxMi4uMTk0YjAzNSAxMDA2NDQKLS0tIGEvd2ViL2xpYi9wa2dmdW5jcy5pbmMK KysrIGIvd2ViL2xpYi9wa2dmdW5jcy5pbmMKQEAgLTYwOCwxOCArNjA4LDE1IEBAIGZ1bmN0aW9u IHBrZ19zZWFyY2hfcGFnZSgkU0lEPSIiKSB7CiAKIAkjIGRldGVybWluZSBwYWdpbmcgdmFyaWFi bGVzCiAJIworCWlmIChpbnR2YWwoJF9HRVRbJ08nXSkpIHsKKwkJJE8gPSAkX0dFVFsnTyddOwor CX0gZWxzZSB7CisJCSRPID0gMDsKKwl9CiAJJF9SRVFVRVNUWyJQUCJdID8gJFBQID0gaW50dmFs KCRfUkVRVUVTVFsiUFAiXSkgOiAkUFAgPSAyNTsKIAlpZiAoJFBQIDwgMjUpIHskUFAgPSAyNTt9 CiAJaWYgKCRQUCA+IDEwMCkgeyRQUCA9IDEwMDt9Ci0JJF9SRVFVRVNUWyJPIl0gPyAkTyA9IGlu dHZhbCgkX1JFUVVFU1RbIk8iXSkgOiAkTyA9IDA7Ci0JaWYgKCRfUkVRVUVTVFsiZG9fTW9yZSJd KSB7Ci0JCSRPICs9ICRQUDsKLQl9IGVsc2VpZiAoJF9SRVFVRVNUWyJkb19MZXNzIl0pIHsKLQkJ JE8gLT0gJFBQOwotCX0KLQlpZiAoJE8gPCAwKSB7Ci0JCSRPID0gMDsKLQl9CisJCiAJaWYgKCRf UkVRVUVTVFsiZG9fU2VhcmNoIl0gJiYgJF9SRVFVRVNUWyJkb19TZWFyY2giXSAhPSAxKSB7CiAJ CSMgcmVzZXQgdGhlIG9mZnNldCB0byB6ZXJvIGlmIHRoZXkgaGl0IEdvCiAJCSMKQEAgLTEwNjUs NiArMTA2Miw3IEBAIGZ1bmN0aW9uIHBrZ19zZWFyY2hfcGFnZSgkU0lEPSIiKSB7CiAJCQkjCiAJ CQlwcmludCAiPGRpdiBzdHlsZT0ndGV4dC1hbGlnbjogcmlnaHQ7IHBhZGRpbmc6IDVweCA1JSA1 cHggMCc+IjsKIAkJCXByaW50ICI8c2VsZWN0IG5hbWU9J2FjdGlvbic+IjsKKwkJCXByaW50ICI8 b3B0aW9uPiIgLiBfXygiQWN0aW9ucyIpIC4gIjwvb3B0aW9uPiI7CiAJCQlwcmludCAiPG9wdGlv biB2YWx1ZT0nZG9fRmxhZyc+Ii5fXygiRmxhZyBPdXQtb2YtZGF0ZSIpLiI8L29wdGlvbj5cbiI7 CiAJCQlwcmludCAiPG9wdGlvbiB2YWx1ZT0nZG9fVW5GbGFnJz4iLl9fKCJVbmZsYWcgT3V0LW9m LWRhdGUiKS4iPC9vcHRpb24+XG4iOwogCQkJcHJpbnQgIjxvcHRpb24gdmFsdWU9J2RvX0Fkb3B0 Jz4iLl9fKCJBZG9wdCBQYWNrYWdlcyIpLiI8L29wdGlvbj5cbiI7CkBAIC0xMTA2LDIzICsxMTA0 LDIxIEBAIGZ1bmN0aW9uIHBrZ19zZWFyY2hfcGFnZSgkU0lEPSIiKSB7CiAgICAgcHJpbnQgIiAg ICA8L3NwYW4+PC90ZD5cbiI7CiAJCXByaW50ICIgIDwvdHI+IjsKIAorCiAJICAjIG5vdyBwcmlu dCB0aGUgZm9yd2FyZCBhbmQgYmFjayBidXR0b25zIG9uIHRoZSBib3R0b20KIAkJIyBMRUZUCiAJ CXByaW50ICIgIDx0cj4iOwogCQlwcmludCAiICAgIDx0ZCBhbGlnbj0nbGVmdCc+IjsKIAkJaWYg KCgkTy0kUFApID49IDApIHsKLQkJCXByaW50ICIgICAgPGlucHV0IHR5cGU9J3N1Ym1pdCcgY2xh c3M9J2J1dHRvbicgbmFtZT0nZG9fTGVzcyciOwotCQkJcHJpbnQgIiB2YWx1ZT0nJmx0Oy0tICIu X18oIkxlc3MiKS4iJz5cbiI7Ci0JCX0KLQkJZWxzZSB7Ci0JCQlwcmludCAiJm5ic3A7IjsKKwkJ CXByaW50ICI8YSBocmVmPScvcGFja2FnZXMucGhwP089IiAuICgkTyAtICRQUCkgLiAiJkw9Ii5p bnR2YWwoJF9SRVFVRVNUWyJMIl0pLiImQz0iLmludHZhbCgkX1JFUVVFU1RbIkMiXSkuIiZLPSRL JlNCPWwmU089JFNPX25leHQmUFA9JFBQJlNlQj0iLiRfUkVRVUVTVFsiU2VCIl0uIiZkb19NeVBh Y2thZ2VzPSIuJF9SRVFVRVNUWyJkb19NeVBhY2thZ2VzIl0uIiZkb19PcnBoYW5zPSIuJF9SRVFV RVNUWyJkb19PcnBoYW5zIl0uICInPiIgLiBfXygiTGVzcyIpIC4gIjwvYT4iOworCQl9IGVsc2Ug aWYgKCRPPCRQUCAmJiAkTz4wKSB7CisJCQlwcmludCAiPGEgaHJlZj0nL3BhY2thZ2VzLnBocD9P PTAnPiIgLiBfXygiTGVzcyIpIC4gIjwvYT4iOwogCQl9CiAJCXByaW50ICIgICAgPC90ZD4iOwog CQkjIFJJR0hUCiAJCXByaW50ICIgICAgPHRkIGFsaWduPSdyaWdodCc+IjsKIAkJaWYgKG15c3Fs X251bV9yb3dzKGRiX3F1ZXJ5KCRxbmV4dCwgJGRiaCkpKSB7Ci0JCQlwcmludCAiICAgIDxpbnB1 dCB0eXBlPSdzdWJtaXQnIGNsYXNzPSdidXR0b24nIG5hbWU9J2RvX01vcmUnIjsKLQkJCXByaW50 ICIgdmFsdWU9JyIuX18oIk1vcmUiKS4iIC0tJmd0Oyc+XG4iOworCQkJcHJpbnQgIjxhIGhyZWY9 Jy9wYWNrYWdlcy5waHA/Tz0iIC4gKCRPICsgJFBQKSAuICImTD0iLmludHZhbCgkX1JFUVVFU1Rb IkwiXSkuIiZDPSIuaW50dmFsKCRfUkVRVUVTVFsiQyJdKS4iJks9JEsmU0I9bCZTTz0kU09fbmV4 dCZQUD0kUFAmU2VCPSIuJF9SRVFVRVNUWyJTZUIiXS4iJmRvX015UGFja2FnZXM9Ii4kX1JFUVVF U1RbImRvX015UGFja2FnZXMiXS4iJmRvX09ycGhhbnM9Ii4kX1JFUVVFU1RbImRvX09ycGhhbnMi XS4iJz4iIC4gX18oIk1vcmUiKSAuICI8L2E+IjsKIAkJfQogCQlwcmludCAiICAgIDwvdGQ+XG4i OwogCQlwcmludCAiICA8L3RyPlxuIjsK --===============6420173031020370771==-- From simo@archlinux.org Wed Jan 23 12:27:44 2008 From: Simo Leone To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] [PATCH] Fix login error and translation bug Date: Wed, 23 Jan 2008 11:27:43 -0600 Message-ID: <20080123172743.GA19951@neotuli.net> In-Reply-To: <1200557040-28734-1-git-send-email-wizzomafizzo@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6466588277170796492==" --===============6466588277170796492== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable On Thu, Jan 17, 2008 at 05:04:00PM +0900, Callan Barrett wrote: >=20 > Fixes a login error where entering nothing would result in the login message > "Incorrect password for username, ." and changes the translation "TU" to > "Trusted User" so the menu bar on the accounts page doesn't bug up (we need= a > new translation system :((() >=20 > Signed-off-by: Callan Barrett Applied. --===============6466588277170796492== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="attachment.sig" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjEuNC43IChHTlUv TGludXgpCgppRDhEQlFGSGwza00yNkRMb2hxRU42UVJBb2RnQUtDZjJNZytJQWZiS0FwKzZKbnhR RmNkN3p1MThRQ2ZSVkZKCmlQUHlVeEJYeklCM1ZEVnZ5Qk5FbXBnPQo9cldXeQotLS0tLUVORCBQ R1AgU0lHTkFUVVJFLS0tLS0K --===============6466588277170796492==-- From simo@archlinux.org Wed Jan 23 12:27:59 2008 From: Simo Leone To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] [PATCH] Turn action bar into drop box Date: Wed, 23 Jan 2008 11:27:59 -0600 Message-ID: <20080123172759.GB19951@neotuli.net> In-Reply-To: <1200586272-18378-1-git-send-email-wizzomafizzo@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7322226126249524819==" --===============7322226126249524819== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable On Fri, Jan 18, 2008 at 01:11:12AM +0900, Callan Barrett wrote: >=20 > Moves the action bar down to the bottom right of the search results and tur= ns it > into a drop-down selection box. >=20 Applied --===============7322226126249524819== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="attachment.sig" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjEuNC43IChHTlUv TGludXgpCgppRDhEQlFGSGwza2YyNkRMb2hxRU42UVJBZzBnQUo5eDBxQ21EVjRmbmxEZ0RpdjlX bHk5aW1vYzNnQ2ZaL2N5CkxZdXhpZ1R1NHFDa1FhWnhhNHUzbDk4PQo9RUQxVwotLS0tLUVORCBQ R1AgU0lHTkFUVVJFLS0tLS0K --===============7322226126249524819==-- From simo@archlinux.org Wed Jan 23 12:28:52 2008 From: Simo Leone To: aur-dev@lists.archlinux.org Subject: Re: [aur-dev] [PATCH] Turn more and less buttons into links Date: Wed, 23 Jan 2008 11:28:51 -0600 Message-ID: <20080123172851.GC19951@neotuli.net> In-Reply-To: <1201091650-10493-1-git-send-email-wizzomafizzo@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5920827885554112064==" --===============5920827885554112064== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit On Wed, Jan 23, 2008 at 09:34:10PM +0900, Callan Barrett wrote: > > This is to (at least) fix the more and less buttons which weren't working > because of the drop down menu for actions > > Signed-off-by: Callan Barrett Applied with minor changes to make sure people can't pass in bogus values like starting from package #-4524325. --===============5920827885554112064== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="attachment.sig" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjEuNC43IChHTlUv TGludXgpCgppRDhEQlFGSGwzbFQyNkRMb2hxRU42UVJBcW43QUtDR0RZaUFTYWQrOE1XUk42MjJr KzQ2eVNxRU13Q2JCWVNlCkJFT2ZXY3VsM1Fnc0t2aTAxdGdHLzIwPQo9d0E2QwotLS0tLUVORCBQ R1AgU0lHTkFUVVJFLS0tLS0K --===============5920827885554112064==--