From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 29808 invoked from network); 4 Jan 2023 15:09:01 -0000 Received: from lists.zx2c4.com (165.227.139.114) by inbox.vuxu.org with ESMTPUTF8; 4 Jan 2023 15:09:01 -0000 Received: by lists.zx2c4.com (ZX2C4 Mail Server) with ESMTP id 21727d90; Wed, 4 Jan 2023 15:08:44 +0000 (UTC) Return-Path: Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [2a00:1450:4864:20::431]) by lists.zx2c4.com (ZX2C4 Mail Server) with ESMTPS id f78e38ab (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Wed, 4 Jan 2023 15:08:43 +0000 (UTC) Received: by mail-wr1-x431.google.com with SMTP id bn26so13819005wrb.0 for ; Wed, 04 Jan 2023 07:08:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc:subject:date:message-id:reply-to; bh=lQmMWlrhtQbHF4pPk6reHEH1G0Tled+708TuoQObLp8=; b=Xe4JBqfott+OfybJNkMexo1EiKQqCoaFn7w3ZhoOF09fN70KvlcRgfGiOESQwC2/gx 3MyY5T/0bHS1KktliXlyTojP39hnY2kl8fzGbmqjTo6YPLmlb2hw1O6MHBkjsiWpcDE+ 9w96ZsQZ1u0MpRwJhj04iMqtDns2inTgyygQ9VmvYrlhTJLpQOR3rEhSbb7bpxVJy9xL n1w3FgWIChQvq3Pt8npe/9pY61LCmRqk2dugF/M46+wdOt/Sq6h5wk9pA/U8Ybii5j8D kyKk7ajC+7BVRN2+kFBOtoaeirG2JP+4VPdilxmwjYrpJDwWgCDzmwHcTgCCY+TaYNz/ woww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=lQmMWlrhtQbHF4pPk6reHEH1G0Tled+708TuoQObLp8=; b=Yu6FWSY+I4t/kn+fHmjAKreHBTo0wJUmL+Fmqvnob3F0hMnnogQhRwaLVBRw0wW54p om6wGgptp7DNOMYkcCMTrMKTVNGLZYeG2fpJSl9bxaYzxzqzrRTPUac7AWkcie9YdksK cPZvdUMEs2dCL/3GWURLSKzpNLy8nTc1jhj6SjhYlvLDz07pM997ANdPvkMuhll/1o1L qnqxkOPY8+BOcpygJjT+aEJU8GD/9t4IcuH5p235wp8xREuVFmxLUP6tb/B6DhY3ggZe RVIDA6B67smFjo9byDMIG/VZRl/UYQmU3J3YKGfMDapPaMekYsmRGBqyOecWrtiDeEXJ cXyw== X-Gm-Message-State: AFqh2kp3gN8R25E7LBeRckdH3+wnACde48DbiQiDzRvIjnlYlN+lqlYR 9xCI4FK/brzEUZhW1Vad7YpUvEmjXJ7oJS21H2wDAAYsrzg= X-Google-Smtp-Source: AMrXdXuCoH0dcPqw4V60tl7M8U90ooouB2sYDmja5h8Qp9x06jqJgEg2luuLjXvKhIqVl+kinciwTy2r0g4e5sNkpzY= X-Received: by 2002:adf:ebc7:0:b0:24c:21bf:aad8 with SMTP id v7-20020adfebc7000000b0024c21bfaad8mr961266wrn.120.1672844922375; Wed, 04 Jan 2023 07:08:42 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: jean-christophe manciot Date: Wed, 4 Jan 2023 16:08:31 +0100 Message-ID: Subject: Re: Version branches To: cgit@lists.zx2c4.com Content-Type: multipart/mixed; boundary="0000000000005d635405f1718f0d" X-BeenThere: cgit@lists.zx2c4.com X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: List for cgit developers and users List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: cgit-bounces@lists.zx2c4.com Sender: "CGit" --0000000000005d635405f1718f0d Content-Type: text/plain; charset="UTF-8" Also, I can't apply some important patches anymore: - ui-tree: add about link in tree view list - Make default pages configurable - ui-commit: show subject in page title For instance: $ git apply --verbose ../0001-about-link-git2.21.0.patch Checking patch ui-shared.c... Hunk #1 succeeded at 346 (offset 1 line). Checking patch ui-shared.h... Checking patch ui-tree.c... error: while searching for: cgit_print_layout_start(); htmlf("blob: %s (", oid_to_hex(oid)); cgit_plain_link("plain", NULL, NULL, ctx.qry.head, rev, path); if (ctx.repo->enable_blame) { error: patch failed: ui-tree.c:108 error: ui-tree.c: patch does not apply Those patches have been attached. On Wed, Jan 4, 2023 at 3:52 PM jean-christophe manciot wrote: > > Hi there, > I have recloned the repository from scratch but it seems that all > previous git- branches have all disappeared; for > instance, there used to be refs/heads/ch/git-2-39. > > git-cgit$ git clone https://git.zx2c4.com/cgit . > Cloning into '.'... > remote: Enumerating objects: 7124, done. > remote: Counting objects: 100% (1363/1363), done. > remote: Compressing objects: 100% (192/192), done. > remote: Total 7124 (delta 1308), reused 1176 (delta 1171), pack-reused 5761 > Receiving objects: 100% (7124/7124), 8.67 MiB | 11.32 MiB/s, done. > Resolving deltas: 100% (5100/5100), done. > > git-cgit (master)$ git submodule init > Submodule 'git' (https://git.kernel.org/pub/scm/git/git.git) > registered for path 'git' > git-cgit (master)$ git submodule update > Cloning into '/media/Shared/home/actionmystique/src/Git/git-cgit/git'... > Submodule path 'git': checked out 'c48035d29b4e524aed3a32f0403676f0d9128863' > > git-cgit (master)$ git branch -r | grep git- > git-cgit (master)$ > > I used those git branches to build cgit for specific git versions. > How can we do it now? > > Regards. > -- > Jean-Christophe -- Jean-Christophe --0000000000005d635405f1718f0d Content-Type: text/x-patch; charset="US-ASCII"; name="0001-about-link-git2.21.0.patch" Content-Disposition: attachment; filename="0001-about-link-git2.21.0.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lchsmn1k0 LS0tCiB1aS1zaGFyZWQuYyB8IDYgKysrKysrCiB1aS1zaGFyZWQuaCB8IDMgKysrCiB1aS10cmVl LmMgICB8IDMgKysrCiAzIGZpbGVzIGNoYW5nZWQsIDEyIGluc2VydGlvbnMoKykKCmRpZmYgLS1n aXQgYS91aS1zaGFyZWQuYyBiL3VpLXNoYXJlZC5jCmluZGV4IGQyMzU4ZjIuLjkxYjdkNmEgMTAw NjQ0Ci0tLSBhL3VpLXNoYXJlZC5jCisrKyBiL3VpLXNoYXJlZC5jCkBAIC0zNDUsNiArMzQ1LDEy IEBAIHZvaWQgY2dpdF90cmVlX2xpbmsoY29uc3QgY2hhciAqbmFtZSwgY29uc3QgY2hhciAqdGl0 bGUsIGNvbnN0IGNoYXIgKmNsYXNzLAogCXJlcG9yZXZsaW5rKCJ0cmVlIiwgbmFtZSwgdGl0bGUs IGNsYXNzLCBoZWFkLCByZXYsIHBhdGgpOwogfQogCit2b2lkIGNnaXRfYWJvdXRfbGluayhjb25z dCBjaGFyICpuYW1lLCBjb25zdCBjaGFyICp0aXRsZSwgY29uc3QgY2hhciAqY2xhc3MsCisJCSAg ICAgY29uc3QgY2hhciAqaGVhZCwgY29uc3QgY2hhciAqcmV2LCBjb25zdCBjaGFyICpwYXRoKQor eworCXJlcG9yZXZsaW5rKCJhYm91dCIsIG5hbWUsIHRpdGxlLCBjbGFzcywgaGVhZCwgcmV2LCBw YXRoKTsKK30KKwogdm9pZCBjZ2l0X3BsYWluX2xpbmsoY29uc3QgY2hhciAqbmFtZSwgY29uc3Qg Y2hhciAqdGl0bGUsIGNvbnN0IGNoYXIgKmNsYXNzLAogCQkgICAgIGNvbnN0IGNoYXIgKmhlYWQs IGNvbnN0IGNoYXIgKnJldiwgY29uc3QgY2hhciAqcGF0aCkKIHsKZGlmZiAtLWdpdCBhL3VpLXNo YXJlZC5oIGIvdWktc2hhcmVkLmgKaW5kZXggNjk2NDg3My4uZTAxZDVkOCAxMDA2NDQKLS0tIGEv dWktc2hhcmVkLmgKKysrIGIvdWktc2hhcmVkLmgKQEAgLTI0LDYgKzI0LDkgQEAgZXh0ZXJuIHZv aWQgY2dpdF90YWdfbGluayhjb25zdCBjaGFyICpuYW1lLCBjb25zdCBjaGFyICp0aXRsZSwKIGV4 dGVybiB2b2lkIGNnaXRfdHJlZV9saW5rKGNvbnN0IGNoYXIgKm5hbWUsIGNvbnN0IGNoYXIgKnRp dGxlLAogCQkJICAgY29uc3QgY2hhciAqY2xhc3MsIGNvbnN0IGNoYXIgKmhlYWQsCiAJCQkgICBj b25zdCBjaGFyICpyZXYsIGNvbnN0IGNoYXIgKnBhdGgpOworZXh0ZXJuIHZvaWQgY2dpdF9hYm91 dF9saW5rKGNvbnN0IGNoYXIgKm5hbWUsIGNvbnN0IGNoYXIgKnRpdGxlLAorCQkJICAgIGNvbnN0 IGNoYXIgKmNsYXNzLCBjb25zdCBjaGFyICpoZWFkLAorCQkJICAgIGNvbnN0IGNoYXIgKnJldiwg Y29uc3QgY2hhciAqcGF0aCk7CiBleHRlcm4gdm9pZCBjZ2l0X3BsYWluX2xpbmsoY29uc3QgY2hh ciAqbmFtZSwgY29uc3QgY2hhciAqdGl0bGUsCiAJCQkgICAgY29uc3QgY2hhciAqY2xhc3MsIGNv bnN0IGNoYXIgKmhlYWQsCiAJCQkgICAgY29uc3QgY2hhciAqcmV2LCBjb25zdCBjaGFyICpwYXRo KTsKZGlmZiAtLWdpdCBhL3VpLXRyZWUuYyBiL3VpLXRyZWUuYwppbmRleCA4NGViMTdkLi4xYzc1 NDBhIDEwMDY0NAotLS0gYS91aS10cmVlLmMKKysrIGIvdWktdHJlZS5jCkBAIC0xMDgsNiArMTA4 LDkgQEAgc3RhdGljIHZvaWQgcHJpbnRfb2JqZWN0KGNvbnN0IHN0cnVjdCBvYmplY3RfaWQgKm9p ZCwgY29uc3QgY2hhciAqcGF0aCwgY29uc3QgY2gKIAogCWNnaXRfcHJpbnRfbGF5b3V0X3N0YXJ0 KCk7CiAJaHRtbGYoImJsb2I6ICVzICgiLCBvaWRfdG9faGV4KG9pZCkpOworCWNnaXRfYWJvdXRf bGluaygiYWJvdXQiLCBOVUxMLCBOVUxMLCBjdHgucXJ5LmhlYWQsCisJCSAgICAgICAgcmV2LCBw YXRoKTsKKwlodG1sKCIpICgiKTsKIAljZ2l0X3BsYWluX2xpbmsoInBsYWluIiwgTlVMTCwgTlVM TCwgY3R4LnFyeS5oZWFkLAogCQkgICAgICAgIHJldiwgcGF0aCk7CiAJaWYgKGN0eC5yZXBvLT5l bmFibGVfYmxhbWUpIHsK --0000000000005d635405f1718f0d Content-Type: text/x-patch; charset="UTF-8"; name="0003-Make-default-pages-configurable.patch" Content-Disposition: attachment; filename="0003-Make-default-pages-configurable.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lchsn3ds1 RnJvbSA3ZTNjNjBhNzM2MTNlNzZiNDgzZDViNTlkZDQ5OGYzODAwM2VmODc3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/TmE9QzM9QUZtPTIwRmF2aWVyPz0gPGZuYWlt NDJAZ21haWwuY29tPgpEYXRlOiBUaHUsIDE1IEF1ZyAyMDE5IDE0OjMyOjQ0ICswMjAwClN1Ympl Y3Q6IFtQQVRDSCB2Ml0gTWFrZSBkZWZhdWx0IHBhZ2VzIGNvbmZpZ3VyYWJsZQpNSU1FLVZlcnNp b246IDEuMApDb250ZW50LVR5cGU6IHRleHQvcGxhaW47IGNoYXJzZXQ9VVRGLTgKQ29udGVudC1U cmFuc2Zlci1FbmNvZGluZzogOGJpdAoKSXQgd291bGQgYmUgbmljZSB0byBiZSBhYmxlIHRvIGNv bmZpZ3VyZSB0aGUgZGVmYXVsdCBwYWdlIHRvIHVzZSBmb3IgdGhlCnJvb3Qgc2l0ZSBhbmQgcmVw b3NpdG9yaWVzLiBGb3IgZXhhbXBsZSwgaXQgbWlnaHQgbWFrZSBtb3JlIHNlbnNlIHRvCmhhdmUg ImFib3V0IiBvciAidHJlZSIgYXMgdGhlIGRlZmF1bHQgbGFuZGluZyBwYWdlIGZvciBjZXJ0YWlu IHJlcG9zLAppbnN0ZWFkIG9mIHRoZSBkZWZhdWx0ICJzdW1tYXJ5Ii4KClRoaXMgcGF0Y2ggaW50 cm9kdWNlcyB0aGUgZm9sbG93aW5nIGNvbmZpZ3VyYXRpb24gc2V0dGluZ3M6Ci0gInJvb3QtZGVm YXVsdC1wYWdlIjogc2V0cyB0aGUgZGVmYXVsdCBwYWdlIGZvciB0aGUgcm9vdCBzaXRlCiAgKGRl ZmF1bHRzIHRvICJyZXBvbGlzdCIpCi0gInJlcG8uZGVmYXVsdC1wYWdlIjogc2V0cyB0aGUgZGVm YXVsdCBwYWdlIGZvciBpbmRpdmlkdWFsIHJlcG9zCiAgKGRlZmF1bHRzIHRvICJzdW1tYXJ5IikK LSAiZGVmYXVsdC1wYWdlIjogZ2xvYmFsIGRlZmF1bHQgdmFsdWUgZm9yICJyZXBvLmRlZmF1bHQt cGFnZSIKClRoZSBmb2xsb3dpbmcgYWNjZXNzb3J5IGNoYW5nZXMgd2VyZSByZXF1aXJlZCB0byBt YWtlIHRoaXMgd29yazoKLSB0aGUgImluZGV4IiB0YWIgbGluayBvbiByb290IHBhZ2VzIGFuZCB0 aGUgInN1bW1hcnkiIHRhYiBsaW5rIG9uIHJlcG8KICBwYWdlcyBub3cgZXhwbGljaXRseSBwb2lu dCB0byB0aGVpciByZXNwZWN0aXZlIHRhcmdldHMgaW5zdGVhZCBvZgogIHBvaW50aW5nIHRvIHRo ZSBzaXRlL3JlcG8gcm9vdAotIHRyeWluZyB0byBhY2Nlc3MgdGhlICJhYm91dCIgcGFnZSBvbiBh IHJlcG9zaXRvcnkgd2l0aG91dCBvbmUgcmVzdWx0cwogIGluIGJlaW5nIHJlZGlyZWN0ZWQgdG8g dGhlICJzdW1tYXJ5IiBwYWdlIGV4cGxpY2l0bHkKClNpZ25lZC1vZmYtYnk6IE5hw69tIEZhdmll ciA8Zm5haW00MkBnbWFpbC5jb20+Ci0tLQpIb3BlIHRoaXMgaXMgYmV0dGVyLCBJIHdlbnQgYWxs IHRoZSB3YXkgYW5kIGFkZGVkIGEgcGVyLXJlcG8gc2V0dGluZyB0b28uCgogY2dpdC5jICAgICAg ICB8IDEwICsrKysrKysrKysKIGNnaXQuaCAgICAgICAgfCAgMyArKysKIGNnaXRyYy41LnR4dCAg fCAxNCArKysrKysrKysrKysrKwogY21kLmMgICAgICAgICB8IDE4ICsrKysrKysrKy0tLS0tLS0t LQogdWktcmVwb2xpc3QuYyB8ICAyICstCiB1aS1zaGFyZWQuYyAgIHwgMTIgKysrKysrKysrLS0t CiB1aS1zaGFyZWQuaCAgIHwgIDIgKysKIDcgZmlsZXMgY2hhbmdlZCwgNDggaW5zZXJ0aW9ucygr KSwgMTMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvY2dpdC5jIGIvY2dpdC5jCmluZGV4IDI5 MTBkNGIuLjg5YTViYTkgMTAwNjQ0Ci0tLSBhL2NnaXQuYworKysgYi9jZ2l0LmMKQEAgLTQ2LDYg KzQ2LDggQEAgc3RhdGljIHZvaWQgcmVwb19jb25maWcoc3RydWN0IGNnaXRfcmVwbyAqcmVwbywg Y29uc3QgY2hhciAqbmFtZSwgY29uc3QgY2hhciAqdmEKIAkJcmVwby0+aG9tZXBhZ2UgPSB4c3Ry ZHVwKHZhbHVlKTsKIAllbHNlIGlmICghc3RyY21wKG5hbWUsICJkZWZicmFuY2giKSkKIAkJcmVw by0+ZGVmYnJhbmNoID0geHN0cmR1cCh2YWx1ZSk7CisJZWxzZSBpZiAoIXN0cmNtcChuYW1lLCAi ZGVmYXVsdC1wYWdlIikpCisJCXJlcG8tPmRlZmF1bHRfcGFnZSA9IHhzdHJkdXAodmFsdWUpOwog CWVsc2UgaWYgKCFzdHJjbXAobmFtZSwgImV4dHJhLWhlYWQtY29udGVudCIpKQogCQlyZXBvLT5l eHRyYV9oZWFkX2NvbnRlbnQgPSB4c3RyZHVwKHZhbHVlKTsKIAllbHNlIGlmICghc3RyY21wKG5h bWUsICJzbmFwc2hvdHMiKSkKQEAgLTEzMSw2ICsxMzMsOCBAQCBzdGF0aWMgdm9pZCBjb25maWdf Y2IoY29uc3QgY2hhciAqbmFtZSwgY29uc3QgY2hhciAqdmFsdWUpCiAJCWN0eC5jZmcucm9vdF9k ZXNjID0geHN0cmR1cCh2YWx1ZSk7CiAJZWxzZSBpZiAoIXN0cmNtcChuYW1lLCAicm9vdC1yZWFk bWUiKSkKIAkJY3R4LmNmZy5yb290X3JlYWRtZSA9IHhzdHJkdXAodmFsdWUpOworCWVsc2UgaWYg KCFzdHJjbXAobmFtZSwgInJvb3QtZGVmYXVsdC1wYWdlIikpCisJCWN0eC5jZmcucm9vdF9kZWZh dWx0X3BhZ2UgPSB4c3RyZHVwKHZhbHVlKTsKIAllbHNlIGlmICghc3RyY21wKG5hbWUsICJjc3Mi KSkKIAkJY3R4LmNmZy5jc3MgPSB4c3RyZHVwKHZhbHVlKTsKIAllbHNlIGlmICghc3RyY21wKG5h bWUsICJmYXZpY29uIikpCkBAIC0xNDUsNiArMTQ5LDggQEAgc3RhdGljIHZvaWQgY29uZmlnX2Ni KGNvbnN0IGNoYXIgKm5hbWUsIGNvbnN0IGNoYXIgKnZhbHVlKQogCQljdHguY2ZnLmxvZ28gPSB4 c3RyZHVwKHZhbHVlKTsKIAllbHNlIGlmICghc3RyY21wKG5hbWUsICJsb2dvLWxpbmsiKSkKIAkJ Y3R4LmNmZy5sb2dvX2xpbmsgPSB4c3RyZHVwKHZhbHVlKTsKKwllbHNlIGlmICghc3RyY21wKG5h bWUsICJkZWZhdWx0LXBhZ2UiKSkKKwkJY3R4LmNmZy5kZWZhdWx0X3BhZ2UgPSB4c3RyZHVwKHZh bHVlKTsKIAllbHNlIGlmICghc3RyY21wKG5hbWUsICJtb2R1bGUtbGluayIpKQogCQljdHguY2Zn Lm1vZHVsZV9saW5rID0geHN0cmR1cCh2YWx1ZSk7CiAJZWxzZSBpZiAoIXN0cmNtcChuYW1lLCAi c3RyaWN0LWV4cG9ydCIpKQpAQCAtMzY3LDYgKzM3Myw3IEBAIHN0YXRpYyB2b2lkIHByZXBhcmVf Y29udGV4dCh2b2lkKQogCWN0eC5jZmcuYnJhbmNoX3NvcnQgPSAwOwogCWN0eC5jZmcuY29tbWl0 X3NvcnQgPSAwOwogCWN0eC5jZmcuY3NzID0gIi9jZ2l0LmNzcyI7CisJY3R4LmNmZy5kZWZhdWx0 X3BhZ2U9ICJzdW1tYXJ5IjsKIAljdHguY2ZnLmxvZ28gPSAiL2NnaXQucG5nIjsKIAljdHguY2Zn LmZhdmljb24gPSAiL2Zhdmljb24uaWNvIjsKIAljdHguY2ZnLmxvY2FsX3RpbWUgPSAwOwpAQCAt Mzg3LDYgKzM5NCw3IEBAIHN0YXRpYyB2b2lkIHByZXBhcmVfY29udGV4dCh2b2lkKQogCWN0eC5j Zmcucm9ib3RzID0gImluZGV4LCBub2ZvbGxvdyI7CiAJY3R4LmNmZy5yb290X3RpdGxlID0gIkdp dCByZXBvc2l0b3J5IGJyb3dzZXIiOwogCWN0eC5jZmcucm9vdF9kZXNjID0gImEgZmFzdCB3ZWJp bnRlcmZhY2UgZm9yIHRoZSBnaXQgZHNjbSI7CisJY3R4LmNmZy5yb290X2RlZmF1bHRfcGFnZSA9 ICJyZXBvbGlzdCI7CiAJY3R4LmNmZy5zY2FuX2hpZGRlbl9wYXRoID0gMDsKIAljdHguY2ZnLnNj cmlwdF9uYW1lID0gQ0dJVF9TQ1JJUFRfTkFNRTsKIAljdHguY2ZnLnNlY3Rpb24gPSAiIjsKQEAg LTgwMSw2ICs4MDksOCBAQCBzdGF0aWMgdm9pZCBwcmludF9yZXBvKEZJTEUgKmYsIHN0cnVjdCBj Z2l0X3JlcG8gKnJlcG8pCiAJfQogCWlmIChyZXBvLT5kZWZicmFuY2gpCiAJCWZwcmludGYoZiwg InJlcG8uZGVmYnJhbmNoPSVzXG4iLCByZXBvLT5kZWZicmFuY2gpOworCWlmIChyZXBvLT5kZWZh dWx0X3BhZ2UpCisJCWZwcmludGYoZiwgInJlcG8uZGVmYXVsdC1wYWdlPSVzXG4iLCByZXBvLT5k ZWZhdWx0X3BhZ2UpOwogCWlmIChyZXBvLT5leHRyYV9oZWFkX2NvbnRlbnQpCiAJCWZwcmludGYo ZiwgInJlcG8uZXh0cmEtaGVhZC1jb250ZW50PSVzXG4iLCByZXBvLT5leHRyYV9oZWFkX2NvbnRl bnQpOwogCWlmIChyZXBvLT5tb2R1bGVfbGluaykKZGlmZiAtLWdpdCBhL2NnaXQuaCBiL2NnaXQu aAppbmRleCA3ZWM0NmI0Li4wNjAyNGVhIDEwMDY0NAotLS0gYS9jZ2l0LmgKKysrIGIvY2dpdC5o CkBAIC04Niw2ICs4Niw3IEBAIHN0cnVjdCBjZ2l0X3JlcG8gewogCWNoYXIgKm93bmVyOwogCWNo YXIgKmhvbWVwYWdlOwogCWNoYXIgKmRlZmJyYW5jaDsKKwljaGFyICpkZWZhdWx0X3BhZ2U7CiAJ Y2hhciAqbW9kdWxlX2xpbms7CiAJc3RydWN0IHN0cmluZ19saXN0IHJlYWRtZTsKIAljaGFyICpz ZWN0aW9uOwpAQCAtMTk2LDYgKzE5Nyw3IEBAIHN0cnVjdCBjZ2l0X2NvbmZpZyB7CiAJY2hhciAq Y2xvbmVfcHJlZml4OwogCWNoYXIgKmNsb25lX3VybDsKIAljaGFyICpjc3M7CisJY2hhciAqZGVm YXVsdF9wYWdlOwogCWNoYXIgKmZhdmljb247CiAJY2hhciAqZm9vdGVyOwogCWNoYXIgKmhlYWRf aW5jbHVkZTsKQEAgLTIxMCw2ICsyMTIsNyBAQCBzdHJ1Y3QgY2dpdF9jb25maWcgewogCWNoYXIg KnJvb3RfdGl0bGU7CiAJY2hhciAqcm9vdF9kZXNjOwogCWNoYXIgKnJvb3RfcmVhZG1lOworCWNo YXIgKnJvb3RfZGVmYXVsdF9wYWdlOwogCWNoYXIgKnNjcmlwdF9uYW1lOwogCWNoYXIgKnNlY3Rp b247CiAJY2hhciAqcmVwb3NpdG9yeV9zb3J0OwpkaWZmIC0tZ2l0IGEvY2dpdHJjLjUudHh0IGIv Y2dpdHJjLjUudHh0CmluZGV4IGJhNzc4MjYuLjJlNTkxODAgMTAwNjQ0Ci0tLSBhL2NnaXRyYy41 LnR4dAorKysgYi9jZ2l0cmMuNS50eHQKQEAgLTEyOCw2ICsxMjgsMTIgQEAgY3NzOjoKIAlVcmwg d2hpY2ggc3BlY2lmaWVzIHRoZSBjc3MgZG9jdW1lbnQgdG8gaW5jbHVkZSBpbiBhbGwgY2dpdCBw YWdlcy4KIAlEZWZhdWx0IHZhbHVlOiAiL2NnaXQuY3NzIi4KCitkZWZhdWx0LXBhZ2U6OgorCVNw ZWNpZmllcyB0aGUgZGVmYXVsdCBwYWdlIGZvciByZXBvc2l0b3JpZXMuIFRoaXMgc2V0dGluZyBp cyBvbmx5IHVzZWQKKwlpZiBgcmVwby5kZWZhdWx0LXBhZ2VgIGlzIHVuc3BlY2lmaWVkLiBQb3Nz aWJsZSB2YWx1ZXM6ICJhYm91dCIsCisJInN1bW1hcnkiLCAicmVmcyIsICJsb2ciLCAidHJlZSIs ICJjb21taXQiLCAiZGlmZiIsICJzdGF0cyIuICBEZWZhdWx0CisJdmFsdWU6ICJzdW1tYXJ5Ii4K KwogZW1haWwtZmlsdGVyOjoKIAlTcGVjaWZpZXMgYSBjb21tYW5kIHdoaWNoIHdpbGwgYmUgaW52 b2tlZCB0byBmb3JtYXQgbmFtZXMgYW5kIGVtYWlsCiAJYWRkcmVzcyBvZiBjb21taXR0ZXJzLCBh dXRob3JzLCBhbmQgdGFnZ2VycywgYXMgcmVwcmVzZW50ZWQgaW4gdmFyaW91cwpAQCAtMzUyLDYg KzM1OCwxMCBAQCByb2JvdHM6OgogCVRleHQgdXNlZCBhcyBjb250ZW50IGZvciB0aGUgInJvYm90 cyIgbWV0YS10YWcuIERlZmF1bHQgdmFsdWU6CiAJImluZGV4LCBub2ZvbGxvdyIuCgorcm9vdC1k ZWZhdWx0LXBhZ2U6OgorCVNwZWNpZmllcyB0aGUgZGVmYXVsdCByb290IHBhZ2UuIFBvc3NpYmxl IHZhbHVlcyBhcmUgInJlcG9saXN0IiBhbmQKKwkiYWJvdXQiLiBEZWZhdWx0IHZhbHVlOiAicmVw b2xpc3QiLgorCiByb290LWRlc2M6OgogCVRleHQgcHJpbnRlZCBiZWxvdyB0aGUgaGVhZGluZyBv biB0aGUgcmVwb3NpdG9yeSBpbmRleCBwYWdlLiBEZWZhdWx0CiAJdmFsdWU6ICJhIGZhc3Qgd2Vi aW50ZXJmYWNlIGZvciB0aGUgZ2l0IGRzY20iLgpAQCAtNDcyLDYgKzQ4MiwxMCBAQCByZXBvLmNv bW1pdC1zb3J0OjoKIAlvcmRlcmluZy4gSWYgdW5zZXQsIHRoZSBkZWZhdWx0IG9yZGVyaW5nIG9m ICJnaXQgbG9nIiBpcyB1c2VkLiBEZWZhdWx0CiAJdmFsdWU6IHVuc2V0LgoKK3JlcG8uZGVmYXVs dC1wYWdlOjoKKwlTcGVjaWZpZXMgdGhlIGRlZmF1bHQgcGFnZSBmb3IgdGhlIHJlcG9zaXRvcnku IERlZmF1bHQgdmFsdWU6IGdsb2JhbAorCWRlZmF1bHQtcGFnZS4KKwogcmVwby5kZWZicmFuY2g6 OgogCVRoZSBuYW1lIG9mIHRoZSBkZWZhdWx0IGJyYW5jaCBmb3IgdGhpcyByZXBvc2l0b3J5LiBJ ZiBubyBzdWNoIGJyYW5jaAogCWV4aXN0cyBpbiB0aGUgcmVwb3NpdG9yeSwgdGhlIGZpcnN0IGJy YW5jaCBuYW1lICh3aGVuIHNvcnRlZCkgaXMgdXNlZApkaWZmIC0tZ2l0IGEvY21kLmMgYi9jbWQu YwppbmRleCBiZjZkOGY1Li45ZWRhMmM3IDEwMDY0NAotLS0gYS9jbWQuYworKysgYi9jbWQuYwpA QCAtNTEsMTMgKzUxLDEwIEBAIHN0YXRpYyB2b2lkIGFib3V0X2ZuKHZvaWQpCiAJCQlmcmVlKHJl ZGlyZWN0KTsKIAkJfSBlbHNlIGlmIChjdHgucmVwby0+cmVhZG1lLm5yKQogCQkJY2dpdF9wcmlu dF9yZXBvX3JlYWRtZShjdHgucXJ5LnBhdGgpOwotCQllbHNlIGlmIChjdHgucmVwby0+aG9tZXBh Z2UpCi0JCQljZ2l0X3JlZGlyZWN0KGN0eC5yZXBvLT5ob21lcGFnZSwgZmFsc2UpOwogCQllbHNl IHsKLQkJCWNoYXIgKmN1cnJlbnR1cmwgPSBjZ2l0X2N1cnJlbnR1cmwoKTsKLQkJCWNoYXIgKnJl ZGlyZWN0ID0gZm10YWxsb2MoIiVzLi4vIiwgY3VycmVudHVybCk7CisJCQljaGFyICpyZWRpcmVj dCA9IGZtdGFsbG9jKCIlcyVzL3N1bW1hcnkvIiwKKwkJCQljdHguY2ZnLnZpcnR1YWxfcm9vdCwg Y3R4LnJlcG8tPnVybCk7CiAJCQljZ2l0X3JlZGlyZWN0KHJlZGlyZWN0LCBmYWxzZSk7Ci0JCQlm cmVlKGN1cnJlbnR1cmwpOwogCQkJZnJlZShyZWRpcmVjdCk7CiAJCX0KIAl9IGVsc2UKQEAgLTE5 NSwxMCArMTkyLDEzIEBAIHN0cnVjdCBjZ2l0X2NtZCAqY2dpdF9nZXRfY21kKHZvaWQpCiAJaW50 IGk7CgogCWlmIChjdHgucXJ5LnBhZ2UgPT0gTlVMTCkgewotCQlpZiAoY3R4LnJlcG8pCi0JCQlj dHgucXJ5LnBhZ2UgPSAic3VtbWFyeSI7Ci0JCWVsc2UKLQkJCWN0eC5xcnkucGFnZSA9ICJyZXBv bGlzdCI7CisJCWlmIChjdHgucmVwbykgeworCQkJaWYgKGN0eC5yZXBvLT5kZWZhdWx0X3BhZ2Ug JiYgKmN0eC5yZXBvLT5kZWZhdWx0X3BhZ2UpCisJCQkJY3R4LnFyeS5wYWdlID0gY3R4LnJlcG8t PmRlZmF1bHRfcGFnZTsKKwkJCWVsc2UKKwkJCQljdHgucXJ5LnBhZ2UgPSBjdHguY2ZnLmRlZmF1 bHRfcGFnZTsKKwkJfSBlbHNlCisJCQljdHgucXJ5LnBhZ2UgPSBjdHguY2ZnLnJvb3RfZGVmYXVs dF9wYWdlOwogCX0KCiAJZm9yIChpID0gMDsgaSA8IHNpemVvZihjbWRzKS9zaXplb2YoKmNtZHMp OyBpKyspCmRpZmYgLS1naXQgYS91aS1yZXBvbGlzdC5jIGIvdWktcmVwb2xpc3QuYwppbmRleCA3 Y2Y3NjM4Li5hNDlmNDU3IDEwMDY0NAotLS0gYS91aS1yZXBvbGlzdC5jCisrKyBiL3VpLXJlcG9s aXN0LmMKQEAgLTMyMSw3ICszMjEsNyBAQCB2b2lkIGNnaXRfcHJpbnRfcmVwb2xpc3Qodm9pZCkK IAkJfQogCQlodG1sZigiPHRyPjx0ZCBjbGFzcz0nJXMnPiIsCiAJCSAgICAgICFzb3J0ZWQgJiYg c2VjdGlvbiA/ICJzdWJsZXZlbC1yZXBvIiA6ICJ0b3BsZXZlbC1yZXBvIik7Ci0JCWNnaXRfc3Vt bWFyeV9saW5rKGN0eC5yZXBvLT5uYW1lLCBjdHgucmVwby0+bmFtZSwgTlVMTCwgTlVMTCk7CisJ CWNnaXRfcmVwb19saW5rKGN0eC5yZXBvLT5uYW1lLCBjdHgucmVwby0+bmFtZSwgTlVMTCwgTlVM TCk7CiAJCWh0bWwoIjwvdGQ+PHRkPiIpOwogCQlyZXBvdXJsID0gY2dpdF9yZXBvdXJsKGN0eC5y ZXBvLT51cmwpOwogCQlodG1sX2xpbmtfb3BlbihyZXBvdXJsLCBOVUxMLCBOVUxMKTsKZGlmZiAt LWdpdCBhL3VpLXNoYXJlZC5jIGIvdWktc2hhcmVkLmMKaW5kZXggZDIzNThmMi4uYmIzMDUwZSAx MDA2NDQKLS0tIGEvdWktc2hhcmVkLmMKKysrIGIvdWktc2hhcmVkLmMKQEAgLTMyNywxMCArMzI3 LDE2IEBAIHN0YXRpYyB2b2lkIHJlcG9yZXZsaW5rKGNvbnN0IGNoYXIgKnBhZ2UsIGNvbnN0IGNo YXIgKm5hbWUsIGNvbnN0IGNoYXIgKnRpdGxlLAogCWh0bWwoIjwvYT4iKTsKIH0KCit2b2lkIGNn aXRfcmVwb19saW5rKGNvbnN0IGNoYXIgKm5hbWUsIGNvbnN0IGNoYXIgKnRpdGxlLCBjb25zdCBj aGFyICpjbGFzcywKKwkJCWNvbnN0IGNoYXIgKmhlYWQpCit7CisJcmVwb3JldmxpbmsoTlVMTCwg bmFtZSwgdGl0bGUsIGNsYXNzLCBoZWFkLCBOVUxMLCBOVUxMKTsKK30KKwogdm9pZCBjZ2l0X3N1 bW1hcnlfbGluayhjb25zdCBjaGFyICpuYW1lLCBjb25zdCBjaGFyICp0aXRsZSwgY29uc3QgY2hh ciAqY2xhc3MsCiAJCSAgICAgICBjb25zdCBjaGFyICpoZWFkKQogewotCXJlcG9yZXZsaW5rKE5V TEwsIG5hbWUsIHRpdGxlLCBjbGFzcywgaGVhZCwgTlVMTCwgTlVMTCk7CisJcmVwb3Jldmxpbmso InN1bW1hcnkiLCBuYW1lLCB0aXRsZSwgY2xhc3MsIGhlYWQsIE5VTEwsIE5VTEwpOwogfQoKIHZv aWQgY2dpdF90YWdfbGluayhjb25zdCBjaGFyICpuYW1lLCBjb25zdCBjaGFyICp0aXRsZSwgY29u c3QgY2hhciAqY2xhc3MsCkBAIC05OTQsNyArMTAwMCw3IEBAIHN0YXRpYyB2b2lkIHByaW50X2hl YWRlcih2b2lkKQogCWlmIChjdHgucmVwbykgewogCQljZ2l0X2luZGV4X2xpbmsoImluZGV4Iiwg TlVMTCwgTlVMTCwgTlVMTCwgTlVMTCwgMCwgMSk7CiAJCWh0bWwoIiA6ICIpOwotCQljZ2l0X3N1 bW1hcnlfbGluayhjdHgucmVwby0+bmFtZSwgY3R4LnJlcG8tPm5hbWUsIE5VTEwsIE5VTEwpOwor CQljZ2l0X3JlcG9fbGluayhjdHgucmVwby0+bmFtZSwgY3R4LnJlcG8tPm5hbWUsIE5VTEwsIE5V TEwpOwogCQlpZiAoY3R4LmVudi5hdXRoZW50aWNhdGVkKSB7CiAJCQlodG1sKCI8L3RkPjx0ZCBj bGFzcz0nZm9ybSc+Iik7CiAJCQlodG1sKCI8Zm9ybSBtZXRob2Q9J2dldCc+XG4iKTsKQEAgLTEw ODMsNyArMTA4OSw3IEBAIHZvaWQgY2dpdF9wcmludF9wYWdlaGVhZGVyKHZvaWQpCiAJCWh0bWwo IjwvZm9ybT5cbiIpOwogCX0gZWxzZSBpZiAoY3R4LmVudi5hdXRoZW50aWNhdGVkKSB7CiAJCWNo YXIgKmN1cnJlbnR1cmwgPSBjZ2l0X2N1cnJlbnR1cmwoKTsKLQkJc2l0ZV9saW5rKE5VTEwsICJp bmRleCIsIE5VTEwsIGhjKCJyZXBvbGlzdCIpLCBOVUxMLCBOVUxMLCAwLCAxKTsKKwkJc2l0ZV9s aW5rKCJyZXBvbGlzdCIsICJpbmRleCIsIE5VTEwsIGhjKCJyZXBvbGlzdCIpLCBOVUxMLCBOVUxM LCAwLCAxKTsKIAkJaWYgKGN0eC5jZmcucm9vdF9yZWFkbWUpCiAJCQlzaXRlX2xpbmsoImFib3V0 IiwgImFib3V0IiwgTlVMTCwgaGMoImFib3V0IiksCiAJCQkJICBOVUxMLCBOVUxMLCAwLCAxKTsK ZGlmZiAtLWdpdCBhL3VpLXNoYXJlZC5oIGIvdWktc2hhcmVkLmgKaW5kZXggNjk2NDg3My4uNGQx NDg1OCAxMDA2NDQKLS0tIGEvdWktc2hhcmVkLmgKKysrIGIvdWktc2hhcmVkLmgKQEAgLTE3LDYg KzE3LDggQEAgZXh0ZXJuIHZvaWQgY2dpdF9hZGRfY2xvbmVfdXJscyh2b2lkICgqZm4pKGNvbnN0 IGNoYXIgKikpOwoKIGV4dGVybiB2b2lkIGNnaXRfaW5kZXhfbGluayhjb25zdCBjaGFyICpuYW1l LCBjb25zdCBjaGFyICp0aXRsZSwKIAkJCSAgICBjb25zdCBjaGFyICpjbGFzcywgY29uc3QgY2hh ciAqcGF0dGVybiwgY29uc3QgY2hhciAqc29ydCwgaW50IG9mcywgaW50IGFsd2F5c19yb290KTsK K2V4dGVybiB2b2lkIGNnaXRfcmVwb19saW5rKGNvbnN0IGNoYXIgKm5hbWUsIGNvbnN0IGNoYXIg KnRpdGxlLAorCQkJCSAgY29uc3QgY2hhciAqY2xhc3MsIGNvbnN0IGNoYXIgKmhlYWQpOwogZXh0 ZXJuIHZvaWQgY2dpdF9zdW1tYXJ5X2xpbmsoY29uc3QgY2hhciAqbmFtZSwgY29uc3QgY2hhciAq dGl0bGUsCiAJCQkgICAgICBjb25zdCBjaGFyICpjbGFzcywgY29uc3QgY2hhciAqaGVhZCk7CiBl eHRlcm4gdm9pZCBjZ2l0X3RhZ19saW5rKGNvbnN0IGNoYXIgKm5hbWUsIGNvbnN0IGNoYXIgKnRp dGxlLAotLQoyLjIyLjAKCg== --0000000000005d635405f1718f0d Content-Type: text/x-patch; charset="US-ASCII"; name="0004-show-subject-in-page-title.patch" Content-Disposition: attachment; filename="0004-show-subject-in-page-title.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lchsnet12 U2lnbmVkLW9mZi1ieTogQy4gTWNFbnJvZSA8anVuZSBhdCBjYXVzYWwuYWdlbmN5PgotLS0KCldp dGggU2lnbmVkLW9mZi1ieS4KCiB1aS1jb21taXQuYyB8IDEgKwogMSBmaWxlIGNoYW5nZWQsIDEg aW5zZXJ0aW9uKCspCgpkaWZmIC0tZ2l0IGEvdWktY29tbWl0LmMgYi91aS1jb21taXQuYwppbmRl eCA5YTQ3YjU0Li5hYzNjYTAxIDEwMDY0NAotLS0gYS91aS1jb21taXQuYworKysgYi91aS1jb21t aXQuYwpAQCAtNDMsNiArNDMsNyBAQCB2b2lkIGNnaXRfcHJpbnRfY29tbWl0KGNoYXIgKmhleCwg Y29uc3QgY2hhciAqcHJlZml4KQogCiAJbG9hZF9yZWZfZGVjb3JhdGlvbnMoTlVMTCwgREVDT1JB VEVfRlVMTF9SRUZTKTsKIAorCWN0eC5wYWdlLnRpdGxlID0gZm10YWxsb2MoIiVzIC0gJXMiLCBp bmZvLT5zdWJqZWN0LCBjdHgucGFnZS50aXRsZSk7CiAJY2dpdF9wcmludF9sYXlvdXRfc3RhcnQo KTsKIAljZ2l0X3ByaW50X2RpZmZfY3RybHMoKTsKIAlodG1sKCI8dGFibGUgc3VtbWFyeT0nY29t bWl0IGluZm8nIGNsYXNzPSdjb21taXQtaW5mbyc+XG4iKTsKLS0gCjIuMjUuMAo= --0000000000005d635405f1718f0d--