From list at eworm.de Wed Feb 10 15:21:18 2021 From: list at eworm.de (Christian Hesse) Date: Wed, 10 Feb 2021 16:21:18 +0100 Subject: [PATCH 1/1] git: update to v2.30.1 Message-ID: <20210210152118.88076-1-list@eworm.de> From: Christian Hesse Update to git version v2.30.1, no additional changes required. Signed-off-by: Christian Hesse --- Makefile | 2 +- git | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6dfc003..a4e597b 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ htmldir = $(docdir) pdfdir = $(docdir) mandir = $(prefix)/share/man SHA1_HEADER = -GIT_VER = 2.30.0 +GIT_VER = 2.30.1 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz INSTALL = install COPYTREE = cp -r diff --git a/git b/git index 71ca53e..773e25a 160000 --- a/git +++ b/git @@ -1 +1 @@ -Subproject commit 71ca53e8125e36efbda17293c50027d31681a41f +Subproject commit 773e25afc41b1b6533fa9ae2cd825d0b4a697fad From kian at kasad.com Thu Feb 18 22:31:26 2021 From: kian at kasad.com (Kian Kasad) Date: Thu, 18 Feb 2021 14:31:26 -0800 Subject: User-configurable log graph option Message-ID: <20210218223126.yrgfjni73fi4rvw4@frisbee> Hello, I'm using cgit on my website and I'm wondering if it's possible to allow the user (i.e. the person visiting the site) to choose whether or not the commit graph is displayed on the log page. If this isn't currently possible, what do you think about adding such functionality? Maybe something like how the diff page lets the user choose between a "unified diff" and "ssdiff". -- Kian Kasad PGP 0x1715EEAA14DAEC1 -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 228 bytes Desc: not available URL: From john at keeping.me.uk Fri Feb 19 12:22:03 2021 From: john at keeping.me.uk (John Keeping) Date: Fri, 19 Feb 2021 12:22:03 +0000 Subject: User-configurable log graph option In-Reply-To: <20210218223126.yrgfjni73fi4rvw4@frisbee> References: <20210218223126.yrgfjni73fi4rvw4@frisbee> Message-ID: On Thu, Feb 18, 2021 at 02:31:26PM -0800, Kian Kasad wrote: > I'm using cgit on my website and I'm wondering if it's possible to allow > the user (i.e. the person visiting the site) to choose whether or not > the commit graph is displayed on the log page. > > If this isn't currently possible, what do you think about adding such > functionality? Maybe something like how the diff page lets the user > choose between a "unified diff" and "ssdiff". This sounds like a great new feature! I think we still want to allow the administrator to turn the feature on/off but if it is permitted, then it makes sense to allow the end user to choose whether or not they want it enabled. Patches welcome :-) From pwr at bydasein.com Thu Feb 25 07:00:57 2021 From: pwr at bydasein.com (Paul W. Rankin) Date: Thu, 25 Feb 2021 17:00:57 +1000 Subject: OpenBSD - Error reading owner-info for : No such file or directory (2) Message-ID: Hello, I'm running cgit v1.2.3 on OpenBSD 6.8 with httpd and slowcgi. I'm getting tons of log errors in the form: Error reading owner-info for : No such file or directory (2) I've found this Stack Overflow question https://stackoverflow.com/questions/48450631/ which suggests that the problem is with the call to getpwuid trying to access /etc/passwd: if ((pwd = getpwuid(st.st_uid)) == NULL) { fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n", path->buf, strerror(errno), errno); break; } @ https://git.zx2c4.com/cgit/tree/scan-tree.c#n139 On OpenBSD, httpd runs in a chroot at /var/www, which would seem to suggest why cgit would not be able to access /etc/passwd In my cgitrc I have enable-git-config=0 enable-index-owner=0 so that doesn't help. Is there any way to prevent all these error logs? Currently this fills up a log file about once an hour... Thanks! -- Paul W. Rankin https://bydasein.com The single best thing you can do for the world is delete your social media accounts. From john at keeping.me.uk Thu Feb 25 10:26:05 2021 From: john at keeping.me.uk (John Keeping) Date: Thu, 25 Feb 2021 10:26:05 +0000 Subject: OpenBSD - Error reading owner-info for : No such file or directory (2) In-Reply-To: References: Message-ID: On Thu, Feb 25, 2021 at 05:00:57PM +1000, Paul W. Rankin wrote: > I'm running cgit v1.2.3 on OpenBSD 6.8 with httpd and slowcgi. I'm > getting tons of log errors in the form: > Error reading owner-info for : No such file or directory > (2) > > I've found this Stack Overflow question > https://stackoverflow.com/questions/48450631/ which suggests that the > problem is with the call to getpwuid trying to access /etc/passwd: > > if ((pwd = getpwuid(st.st_uid)) == NULL) { > fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n", > path->buf, strerror(errno), errno); > break; > } > > @ https://git.zx2c4.com/cgit/tree/scan-tree.c#n139 > > On OpenBSD, httpd runs in a chroot at /var/www, which would seem to > suggest why cgit would not be able to access /etc/passwd > > In my cgitrc I have > enable-git-config=0 > enable-index-owner=0 > so that doesn't help. > > Is there any way to prevent all these error logs? Currently this fills > up a log file about once an hour... Without any changes to the code, if you set "repo.owner" (or "gitweb.owner" if you have "enable-git-config" set) then this value will be used and the loop that tries getpwuid() won't be entered. I think it would be reasonable to provide a way to disable the "owner from filesystem" code via cgitrc. It's probably meaningless in many setups, for example with Gitolite, where all the repositories are owned by a "git" user anyway. John From pwr at bydasein.com Thu Feb 25 12:09:14 2021 From: pwr at bydasein.com (Paul W. Rankin) Date: Thu, 25 Feb 2021 22:09:14 +1000 Subject: OpenBSD - Error reading owner-info for : No such file or directory (2) In-Reply-To: References: Message-ID: On 2021-02-25 20:26, John Keeping wrote: > On Thu, Feb 25, 2021 at 05:00:57PM +1000, Paul W. Rankin wrote: >> I'm running cgit v1.2.3 on OpenBSD 6.8 with httpd and slowcgi. I'm >> getting tons of log errors in the form: >> Error reading owner-info for : No such file or >> directory >> (2) > > Without any changes to the code, if you set "repo.owner" (or > "gitweb.owner" if you have "enable-git-config" set) then this value > will > be used and the loop that tries getpwuid() won't be entered. > > I think it would be reasonable to provide a way to disable the "owner > from filesystem" code via cgitrc. It's probably meaningless in many > setups, for example with Gitolite, where all the repositories are owned > by a "git" user anyway. Thank you John, this solved it!