From list at eworm.de  Fri Aug  8 22:23:33 2025
From: list at eworm.de (Christian Hesse)
Date: Sat,  9 Aug 2025 00:23:33 +0200
Subject: [PATCH 1/1] RFC: git: update to v2.51.0-rc1
Message-ID: <20250808222333.48983-1-list@eworm.de>

From: Christian Hesse <mail at eworm.de>

Update to git version v2.51.0-rc1, this requires changes for these
upstream commits:

* 8f49151763cb81adf4bcec53c1ae67057081b02d
  object-store: rename files to "odb.{c,h}"

Signed-off-by: Christian Hesse <mail at eworm.de>
---
 Makefile   | 4 ++--
 cgit.h     | 2 +-
 git        | 2 +-
 ui-clone.c | 1 -
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index a97d9d4..67ca081 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,8 @@ htmldir = $(docdir)
 pdfdir = $(docdir)
 mandir = $(prefix)/share/man
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 2.50.1
-GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
+GIT_VER = 2.51.0.rc1
+GIT_URL = https://www.kernel.org/pub/software/scm/git/testing/git-$(GIT_VER).tar.xz
 INSTALL = install
 COPYTREE = cp -r
 MAN5_TXT = $(wildcard *.5.txt)
diff --git a/cgit.h b/cgit.h
index 9146d9a..653ec28 100644
--- a/cgit.h
+++ b/cgit.h
@@ -17,7 +17,7 @@
 #include <notes.h>
 #include <object.h>
 #include <object-name.h>
-#include <object-store.h>
+#include <odb.h>
 #include <path.h>
 #include <refs.h>
 #include <revision.h>
diff --git a/git b/git
index d82adb6..2c2ba49 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit d82adb61ba2fd11d8f2587fca1b6bd7925ce4044
+Subproject commit 2c2ba49d55ff26c1082b8137b1ec5eeccb4337d1
diff --git a/ui-clone.c b/ui-clone.c
index 2ed3e1c..0fadf24 100644
--- a/ui-clone.c
+++ b/ui-clone.c
@@ -14,7 +14,6 @@
 #include "html.h"
 #include "ui-shared.h"
 #include "packfile.h"
-#include "object-store.h"
 
 static int print_ref_info(const char *refname, const char *referent UNUSED,
 			  const struct object_id *oid, int flags, void *cb_data)

From list at eworm.de  Mon Aug 18 19:16:07 2025
From: list at eworm.de (Christian Hesse)
Date: Mon, 18 Aug 2025 21:16:07 +0200
Subject: [PATCH 1/1] git: update to v2.51.0
Message-ID: <20250818191607.18433-1-list@eworm.de>

From: Christian Hesse <mail at eworm.de>

Update to git version v2.51.0, this requires changes for these
upstream commits:

* 8f49151763cb81adf4bcec53c1ae67057081b02d
  object-store: rename files to "odb.{c,h}"

Signed-off-by: Christian Hesse <mail at eworm.de>
---
 Makefile   | 2 +-
 cgit.h     | 2 +-
 git        | 2 +-
 ui-clone.c | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index a97d9d4..60075af 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ htmldir = $(docdir)
 pdfdir = $(docdir)
 mandir = $(prefix)/share/man
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 2.50.1
+GIT_VER = 2.51.0
 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
 INSTALL = install
 COPYTREE = cp -r
diff --git a/cgit.h b/cgit.h
index 9146d9a..653ec28 100644
--- a/cgit.h
+++ b/cgit.h
@@ -17,7 +17,7 @@
 #include <notes.h>
 #include <object.h>
 #include <object-name.h>
-#include <object-store.h>
+#include <odb.h>
 #include <path.h>
 #include <refs.h>
 #include <revision.h>
diff --git a/git b/git
index d82adb6..c44beea 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit d82adb61ba2fd11d8f2587fca1b6bd7925ce4044
+Subproject commit c44beea485f0f2feaf460e2ac87fdd5608d63cf0
diff --git a/ui-clone.c b/ui-clone.c
index 2ed3e1c..0fadf24 100644
--- a/ui-clone.c
+++ b/ui-clone.c
@@ -14,7 +14,6 @@
 #include "html.h"
 #include "ui-shared.h"
 #include "packfile.h"
-#include "object-store.h"
 
 static int print_ref_info(const char *refname, const char *referent UNUSED,
 			  const struct object_id *oid, int flags, void *cb_data)

From christian at cbarcenas.com  Thu Aug 21 19:46:33 2025
From: christian at cbarcenas.com (Christian Barcenas)
Date: Thu, 21 Aug 2025 14:46:33 -0500
Subject: [PATCH] ui-shared: don't write <link> if favicon unset
Message-ID: <CAJMok+a6B4-GmCyjg8EqrP-CUxPsq1zRUPAFRHyiM+g4TjJqJg@mail.gmail.com>

Since the favicon setting defaults to "/favicon.ico", the user can
only unset it with favicon=. However, that would write an empty string
as the config value. Previously, such empty string always satisfied
the if condition. In this case it is better to omit the <link> entirely.

Signed-off-by: Christian Barcenas <christian at cbarcenas.com>

diff --git a/ui-shared.c b/ui-shared.c
index 6fae72d..3c33600 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -832,7 +832,7 @@ void cgit_print_docstart(void)
        else
                emit_js_link(NULL, "/cgit.js");

-       if (ctx.cfg.favicon) {
+       if (ctx.cfg.favicon && *ctx.cfg.favicon) {
                html("<link rel='shortcut icon' href='");
                html_attr(ctx.cfg.favicon);
                html("'/>\n");

From christian at cbarcenas.com  Thu Aug 21 19:46:37 2025
From: christian at cbarcenas.com (Christian Barcenas)
Date: Thu, 21 Aug 2025 14:46:37 -0500
Subject: [PATCH wiki] Add links to Debian and Ubuntu packages
Message-ID: <CAJMok+YqW=9Fnt8tgDuAM=77KSuTTBOQm32BrQUu8Ti4tEF=9w@mail.gmail.com>

Signed-off-by: Christian Barcenas <christian at cbarcenas.com>

diff --git a/index b/index
index 8ff5fce..eb59cbe 100644
--- a/index
+++ b/index
@@ -47,6 +47,8 @@ Packages
  * [Arch Linux][archlinux]
  * [Gentoo][gentoo]
  * [Fedora/RHEL/CentOS][fedora]
+ * [Debian][debian]
+ * [Ubuntu][ubuntu]
  * [OS X][macports]
  * [OpenSUSE][OpenSUSE]
  * [NetBSD][pkgsrc]
@@ -55,6 +57,8 @@ Packages
 [archlinux]:    https://www.archlinux.org/packages/?name=cgit
 [fedora]:       https://apps.fedoraproject.org/packages/cgit
 [gentoo]:       https://packages.gentoo.org/packages/www-apps/cgit
+[debian]:       https://packages.debian.org/cgit
+[ubuntu]:       https://packages.ubuntu.com/cgit
 [macports]:     https://trac.macports.org/browser/trunk/dports/www/cgit
 [opensuse]:     https://software.opensuse.org/package/cgit
 [pkgsrc]:       http://pkgsrc.se/www/cgit

From christian at cbarcenas.com  Thu Aug 21 19:46:41 2025
From: christian at cbarcenas.com (Christian Barcenas)
Date: Thu, 21 Aug 2025 14:46:41 -0500
Subject: [PATCH 1/2] Makefile: fix uninstall to remove js and robots.txt
Message-ID: <CAJMok+ZMF52VkWtw8b6JeCStg58OTvn92U+WU64E0Hhw4Nsctw@mail.gmail.com>

Signed-off-by: Christian Barcenas <christian at cbarcenas.com>

diff --git a/Makefile b/Makefile
index 7f8a5cb..7f36cee 100644
--- a/Makefile
+++ b/Makefile
@@ -111,8 +111,10 @@ install-pdf: doc-pdf
 uninstall:
        rm -f $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
        rm -f $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css
+       rm -f $(DESTDIR)$(CGIT_DATA_PATH)/cgit.js
        rm -f $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png
        rm -f $(DESTDIR)$(CGIT_DATA_PATH)/favicon.ico
+       rm -f $(DESTDIR)$(CGIT_DATA_PATH)/robots.txt

 uninstall-doc: uninstall-man uninstall-html uninstall-pdf

From christian at cbarcenas.com  Thu Aug 21 19:46:45 2025
From: christian at cbarcenas.com (Christian Barcenas)
Date: Thu, 21 Aug 2025 14:46:45 -0500
Subject: [PATCH 2/2] Makefile: fix uninstall to remove filters
Message-ID: <CAJMok+YF_WhXPy1h2e0FKGZtDgdg-U9vNRNM4dw4ZWt05sPGLQ@mail.gmail.com>

Signed-off-by: Christian Barcenas <christian at cbarcenas.com>

diff --git a/Makefile b/Makefile
index 7f36cee..75c9561 100644
--- a/Makefile
+++ b/Makefile
@@ -108,6 +108,11 @@ install-pdf: doc-pdf
        $(INSTALL) -m 0755 -d $(DESTDIR)$(pdfdir)
        $(INSTALL) -m 0644 $(DOC_PDF) $(DESTDIR)$(pdfdir)

+define rm_f
+rm -f $(1)
+
+endef
+
 uninstall:
        rm -f $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
        rm -f $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css
@@ -115,6 +120,8 @@ uninstall:
        rm -f $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png
        rm -f $(DESTDIR)$(CGIT_DATA_PATH)/favicon.ico
        rm -f $(DESTDIR)$(CGIT_DATA_PATH)/robots.txt
+       $(foreach file,$(patsubst filters/%,%,$(shell find filters/ !
-type d)), \
+               $(call rm_f,$(DESTDIR)$(filterdir)/$(file)))

 uninstall-doc: uninstall-man uninstall-html uninstall-pdf

From tmz at pobox.com  Thu Aug 21 20:15:42 2025
From: tmz at pobox.com (Todd Zullinger)
Date: Thu, 21 Aug 2025 16:15:42 -0400
Subject: [PATCH wiki] Add links to Debian and Ubuntu packages
In-Reply-To: <CAJMok+YqW=9Fnt8tgDuAM=77KSuTTBOQm32BrQUu8Ti4tEF=9w@mail.gmail.com>
References: <CAJMok+YqW=9Fnt8tgDuAM=77KSuTTBOQm32BrQUu8Ti4tEF=9w@mail.gmail.com>
Message-ID: <aKd-bvPZzbW9XQod@teonanacatl.net>

Christian Barcenas wrote:
> Signed-off-by: Christian Barcenas <christian at cbarcenas.com>
> 
> diff --git a/index b/index
> index 8ff5fce..eb59cbe 100644
> --- a/index
> +++ b/index
> @@ -47,6 +47,8 @@ Packages
>   * [Arch Linux][archlinux]
>   * [Gentoo][gentoo]
>   * [Fedora/RHEL/CentOS][fedora]
> + * [Debian][debian]
> + * [Ubuntu][ubuntu]
>   * [OS X][macports]
>   * [OpenSUSE][OpenSUSE]
>   * [NetBSD][pkgsrc]
> @@ -55,6 +57,8 @@ Packages
>  [archlinux]:    https://www.archlinux.org/packages/?name=cgit
>  [fedora]:       https://apps.fedoraproject.org/packages/cgit
>  [gentoo]:       https://packages.gentoo.org/packages/www-apps/cgit
> +[debian]:       https://packages.debian.org/cgit
> +[ubuntu]:       https://packages.ubuntu.com/cgit
>  [macports]:     https://trac.macports.org/browser/trunk/dports/www/cgit
>  [opensuse]:     https://software.opensuse.org/package/cgit
>  [pkgsrc]:       http://pkgsrc.se/www/cgit

I'm surpsied Those weren't included already.  I submitted
some fixes to the wiki branch in 2022 which were never
picked up, so it's hard to say if this will face the same
fate.  In case of interest, the patches I sent are here:

    https://lists.zx2c4.com/pipermail/cgit/2022-February/004701.html

-- 
Todd