From list at eworm.de  Sun Aug  8 15:57:52 2021
From: list at eworm.de (Christian Hesse)
Date: Sun,  8 Aug 2021 17:57:52 +0200
Subject: [PATCH 1/1] RFC: git: update to v2.33.0-rc1
Message-ID: <20210808155752.46554-1-list@eworm.de>

From: Christian Hesse <mail at eworm.de>

Update to git version v2.33.0-rc1, no additional changes required.

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

diff --git a/Makefile b/Makefile
index d13c5bd..31609f3 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.32.0
-GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
+GIT_VER = 2.33.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/git b/git
index ebf3c04..2d755df 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit ebf3c04b262aa27fbb97f8a0156c2347fecafafb
+Subproject commit 2d755dfac9aadab25c3e025b849252b8c0a61465

From net_seeker at web.de  Fri Aug 13 07:12:05 2021
From: net_seeker at web.de (Torsten Kuehnel)
Date: Fri, 13 Aug 2021 09:12:05 +0200
Subject: cannot get cgit display anything except the repo listing page
Message-ID: <20210813091205.cc14dd7486d1b757f2081fa2@web.de>

Dear cgit developer,

i have a problem getting cgit display useful information.
i compiled and installed cgit-1.2.3 like it is decribed in the README file and set it up via nginx fastcgi fcgiwrap

nginx config:

server {
	listen 85.17.xx.xx:443 ssl;
	server_name my.domain.com;
        root /var/www/htdocs/cgit;

        access_log  /var/log/cgit/access.log;
        error_log   /var/log/cgit/error.log;

        ssl_certificate /etc/letsencrypt/live/my.domain.com/fullchain.pem;
        ssl_certificate_key /etc/letsencrypt/live/my.domain.com/privkey.pem;
        include /etc/letsencrypt/options-ssl-nginx.conf;
        ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
	try_files   $uri @cgit;

        location ~* ^.+\.(css|png|ico)$ {
                 expires 0;
            }

        location @cgit {
                include fastcgi_params;
                fastcgi_param  SCRIPT_FILENAME  /var/www/htdocs/cgit/cgit.cgi;
                fastcgi_pass   unix:/var/run/fcgiwrap.socket;
                fastcgi_param  PATH_INFO $uri;
                fastcgi_param  HTTP_HOST $server_name;
                fastcgi_param  QUERY_STRING  $args;
        }
}


/etc/cgitrc:

root-title=Git Verzeichnisse
css=/cgit.css
logo=/cgit.png
snapshots=tar.gz tar.bz2

scan-path=/tmp/

virtual-root=/
enable-index-links=1
enable-log-filecount=1
enable-log-linecount=1
enable-commit-graph=1

In the /tmp/ directory is a git repository "repo01" with one commit in it, owned completely by www-data, the user nginx is run with.

The result ist displaying the proper cgit "welcome" page with the one repo listed, Idle for 8 minutes. But the problem is, following any of the presented links like "summary", "log", or "tree", results in displaying the same entry page which lists the repo, but shows no content.

Spent to days on playing around with the nginx and cgitrc config, but nothing useful happens. The permissions on the repo are fully set to the www-data user. The url changes when i choose a link, but the displayed result is always the same, displaying the overview page of available repos.

Thanks for any help in advance.

Torsten Dieter Kuehnel
--
Torsten Kuehnel <net_seeker at web.de>

From ariel at costas.dev  Fri Aug 13 11:33:49 2021
From: ariel at costas.dev (Ariel Costas)
Date: Fri, 13 Aug 2021 11:33:49 +0000
Subject: cannot get cgit display anything except the repo listing page
In-Reply-To: <20210813091205.cc14dd7486d1b757f2081fa2@web.de> (message from
 Torsten Kuehnel on Fri, 13 Aug 2021 09:12:05 +0200)
References: <20210813091205.cc14dd7486d1b757f2081fa2@web.de>
Message-ID: <0102017b3f4a28ac-c137c4bc-bbe1-46a1-a194-f79f280dc052-000000@eu-west-1.amazonses.com>

Hi there,

Looks like nginx is passing the requests correctly to cgit, but not the request
URI, as cgit is always returning the same page. So, all requests to `/repo01`
are treated as `/`.

Have you checked for something relevant in the access/error logs?

-- 
Ariel Costas (https://costas.dev)
Encrypt your email -- https://emailselfdefense.org/
GnuPG  public  key -- https://costas.dev/pgp

From net_seeker at web.de  Fri Aug 13 20:39:03 2021
From: net_seeker at web.de (Torsten Kuehnel)
Date: Fri, 13 Aug 2021 22:39:03 +0200
Subject: cannot get cgit display anything except the repo listing page
In-Reply-To: <0102017b3f4a28ac-c137c4bc-bbe1-46a1-a194-f79f280dc052-000000@eu-west-1.amazonses.com>
References: <20210813091205.cc14dd7486d1b757f2081fa2@web.de>
 <0102017b3f4a28ac-c137c4bc-bbe1-46a1-a194-f79f280dc052-000000@eu-west-1.amazonses.com>
Message-ID: <20210813223903.d4faee5c2f49c9112246611a@web.de>

On Fri, 13 Aug 2021 11:33:49 +0000
Ariel Costas <ariel at costas.dev> wrote:

> Hi there,
>
> Looks like nginx is passing the requests correctly to cgit, but not the request
> URI, as cgit is always returning the same page. So, all requests to `/repo01`
> are treated as `/`.
>
> Have you checked for something relevant in the access/error logs?

The error log is clean, the access.log shows following entries selecting the "tree" link:

87.176.40.180 - - [13/Aug/2021:22:34:28 +0200] "GET /repo01/tree/ HTTP/2.0" 200 803 "https://my.domain.com/repo01/" "Mozilla/5.0 (X11; Linux x86_64; rv:82.0) Gecko/20100101 Firefox/82.0"

>
> --
> Ariel Costas (https://costas.dev)
> Encrypt your email -- https://emailselfdefense.org/
> GnuPG  public  key -- https://costas.dev/pgp


--
Torsten Kuehnel <net_seeker at web.de>

From net_seeker at web.de  Fri Aug 13 21:22:06 2021
From: net_seeker at web.de (Torsten Kuehnel)
Date: Fri, 13 Aug 2021 23:22:06 +0200
Subject: cannot get cgit display anything except the repo listing page
In-Reply-To: <20210813091205.cc14dd7486d1b757f2081fa2@web.de>
References: <20210813091205.cc14dd7486d1b757f2081fa2@web.de>
Message-ID: <20210813232206.2f4c9af7fa15f21a0bfe8b8d@web.de>

On Fri, 13 Aug 2021 09:12:05 +0200
Torsten Kuehnel <net_seeker at web.de> wrote:

Switching to uwsgi to connect nginx with cgit works out. Looks like fcgiwrap messes things up. Don't ask me for the exact reason.

> Dear cgit developer,
>
> i have a problem getting cgit display useful information.
> i compiled and installed cgit-1.2.3 like it is decribed in the README file and set it up via nginx fastcgi fcgiwrap
>
> nginx config:
>
> server {
> 	listen 85.17.xx.xx:443 ssl;
> 	server_name my.domain.com;
>         root /var/www/htdocs/cgit;
>
>         access_log  /var/log/cgit/access.log;
>         error_log   /var/log/cgit/error.log;
>
>         ssl_certificate /etc/letsencrypt/live/my.domain.com/fullchain.pem;
>         ssl_certificate_key /etc/letsencrypt/live/my.domain.com/privkey.pem;
>         include /etc/letsencrypt/options-ssl-nginx.conf;
>         ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
> 	try_files   $uri @cgit;
>
>         location ~* ^.+\.(css|png|ico)$ {
>                  expires 0;
>             }
>
>         location @cgit {
>                 include fastcgi_params;
>                 fastcgi_param  SCRIPT_FILENAME  /var/www/htdocs/cgit/cgit.cgi;
>                 fastcgi_pass   unix:/var/run/fcgiwrap.socket;
>                 fastcgi_param  PATH_INFO $uri;
>                 fastcgi_param  HTTP_HOST $server_name;
>                 fastcgi_param  QUERY_STRING  $args;
>         }
> }
>
>
> /etc/cgitrc:
>
> root-title=Git Verzeichnisse
> css=/cgit.css
> logo=/cgit.png
> snapshots=tar.gz tar.bz2
>
> scan-path=/tmp/
>
> virtual-root=/
> enable-index-links=1
> enable-log-filecount=1
> enable-log-linecount=1
> enable-commit-graph=1
>
> In the /tmp/ directory is a git repository "repo01" with one commit in it, owned completely by www-data, the user nginx is run with.
>
> The result ist displaying the proper cgit "welcome" page with the one repo listed, Idle for 8 minutes. But the problem is, following any of the presented links like "summary", "log", or "tree", results in displaying the same entry page which lists the repo, but shows no content.
>
> Spent to days on playing around with the nginx and cgitrc config, but nothing useful happens. The permissions on the repo are fully set to the www-data user. The url changes when i choose a link, but the displayed result is always the same, displaying the overview page of available repos.
>
> Thanks for any help in advance.
>
> Torsten Dieter Kuehnel
> --
> Torsten Kuehnel <net_seeker at web.de>


--
Torsten Kuehnel <net_seeker at web.de>

From ariel at costas.dev  Fri Aug 13 21:24:58 2021
From: ariel at costas.dev (Ariel Costas)
Date: Fri, 13 Aug 2021 21:24:58 +0000
Subject: cannot get cgit display anything except the repo listing page
In-Reply-To: <20210813223903.d4faee5c2f49c9112246611a@web.de> (message from
 Torsten Kuehnel on Fri, 13 Aug 2021 22:39:03 +0200)
Message-ID: <0102017b41675ea3-e22bef87-7635-4723-8358-3b350cf2d2f1-000000@eu-west-1.amazonses.com>

It does seem like a problem when calling the CGI script. Perhaps you
could debug what cgit is getting from your NGINX?

You could try creating a new file `/var/www/htdocs/cgit/debug.cgi` with
the contents:

    #!/bin/bash
    echo "Content-Type: text/plain"
    echo ""
    printenv

What this script does is: run bash, respond with the Content-Type header
and a plaintext body containing all the environment variables passed by
NGINX.

Give it execution permissions and owned by www-data, then point NGINX to
that script and visit the site. Check the QUERY_STRING, PATH_INFO and
HTTP_HOST and see if they are the correct ones. Is there something strange?

-- 
Ariel Costas (https://costas.dev)
Encrypt your email -- https://emailselfdefense.org/
  GnuPG public key -- https://costas.dev/pgp
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 227 bytes
Desc: not available
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20210813/53f6b934/attachment.sig>

From net_seeker at web.de  Fri Aug 13 22:03:34 2021
From: net_seeker at web.de (Torsten Kuehnel)
Date: Sat, 14 Aug 2021 00:03:34 +0200
Subject: cannot get cgit display anything except the repo listing page
In-Reply-To: <0102017b41675ea3-e22bef87-7635-4723-8358-3b350cf2d2f1-000000@eu-west-1.amazonses.com>
References: <20210813223903.d4faee5c2f49c9112246611a@web.de>
 <0102017b41675ea3-e22bef87-7635-4723-8358-3b350cf2d2f1-000000@eu-west-1.amazonses.com>
Message-ID: <20210814000334.e410462c4a52c39482ba1c46@web.de>

On Fri, 13 Aug 2021 21:24:58 +0000
Ariel Costas <ariel at costas.dev> wrote:

here comes the content:

HTTP_ACCEPT_ENCODING=gzip, deflate, br
SERVER_NAME=my.domain.com
HTTPS=on
SCRIPT_NAME=/
REDIRECT_STATUS=200
GATEWAY_INTERFACE=CGI/1.1
HTTP_SEC_GPC=1
SERVER_SOFTWARE=nginx/1.14.2
PATH_INFO=/
DOCUMENT_ROOT=/var/www/htdocs/cgit
HTTP_UPGRADE_INSECURE_REQUESTS=1
PWD=/var/www/htdocs/cgit
LOGNAME=www-data
REQUEST_URI=/
PATH_TRANSLATED=/var/www/htdocs/cgit
FCGI_ROLE=RESPONDER
REQUEST_SCHEME=https
HOME=/var/www
LANG=C.UTF-8
QUERY_STRING=
HTTP_TE=trailers
HTTP_ACCEPT_LANGUAGE=de-DE,en-US;q=0.7,en;q=0.3
DOCUMENT_URI=/
INVOCATION_ID=c38ca46505de465a86d38a3900c8c4ad
HTTP_ACCEPT=text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8
REMOTE_PORT=47900
HTTP_HOST=my.domain.com
USER=www-data
SERVER_ADDR=85.17.18.15
HTTP_AUTHORIZATION=Basic dG9yc3RlbmRpZXRlcjM5MzpwZVVnJUdEN3RUJjRYZjM4
HTTP_USER_AGENT=Mozilla/5.0 (X11; Linux x86_64; rv:82.0) Gecko/20100101 Firefox/82.0
SHLVL=1
CONTENT_LENGTH=
SERVER_PROTOCOL=HTTP/2.0
SERVER_PORT=443
SCRIPT_FILENAME=/var/www/htdocs/cgit/debug.cgi
JOURNAL_STREAM=9:39445051
REMOTE_ADDR=87.176.40.180
DAEMON_OPTS=-f
HTTP_CACHE_CONTROL=max-age=0
PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
CONTENT_TYPE=
REQUEST_METHOD=GET
_=/usr/bin/printenv

so that's for the root url of https://my.domain.com with the debug script (url domain changed for obfuscating reasons).

> It does seem like a problem when calling the CGI script. Perhaps you
> could debug what cgit is getting from your NGINX?
>
> You could try creating a new file `/var/www/htdocs/cgit/debug.cgi` with
> the contents:
>
>     #!/bin/bash
>     echo "Content-Type: text/plain"
>     echo ""
>     printenv
>
> What this script does is: run bash, respond with the Content-Type header
> and a plaintext body containing all the environment variables passed by
> NGINX.
>
> Give it execution permissions and owned by www-data, then point NGINX to
> that script and visit the site. Check the QUERY_STRING, PATH_INFO and
> HTTP_HOST and see if they are the correct ones. Is there something strange?
>
> --
> Ariel Costas (https://costas.dev)
> Encrypt your email -- https://emailselfdefense.org/
>   GnuPG public key -- https://costas.dev/pgp


--
Torsten Kuehnel <net_seeker at web.de>

From ariel at costas.dev  Sat Aug 14 22:10:22 2021
From: ariel at costas.dev (Ariel Costas)
Date: Sat, 14 Aug 2021 22:10:22 +0000
Subject: cannot get cgit display anything except the repo listing page
In-Reply-To: <20210814000334.e410462c4a52c39482ba1c46@web.de> (message from
 Torsten Kuehnel on Sat, 14 Aug 2021 00:03:34 +0200)
Message-ID: <0102017b46b749c4-9c00c99b-c1d3-411f-9a69-621236ff8d25-000000@eu-west-1.amazonses.com>

The root path works as expected, doesn't it? Try with a subdirectory
like /repo01/, as you mentioned previously in this thread.

Also, when hiding your domain name on logs, make sure to remove IPs too,
just in case :)

-- 
Ariel Costas (https://costas.dev)
Encrypt your email -- https://emailselfdefense.org/
  GnuPG public key -- https://costas.dev/pgp

From net_seeker at web.de  Sun Aug 15 19:49:36 2021
From: net_seeker at web.de (Torsten Kuehnel)
Date: Sun, 15 Aug 2021 21:49:36 +0200
Subject: cannot get cgit display anything except the repo listing page
In-Reply-To: <0102017b46b749c4-9c00c99b-c1d3-411f-9a69-621236ff8d25-000000@eu-west-1.amazonses.com>
References: <20210814000334.e410462c4a52c39482ba1c46@web.de>
 <0102017b46b749c4-9c00c99b-c1d3-411f-9a69-621236ff8d25-000000@eu-west-1.amazonses.com>
Message-ID: <20210815214936.7fefd2643a99ccfd1b490f38@web.de>

Here comes the output, again:

HTTP_ACCEPT_ENCODING=gzip, deflate, br
SERVER_NAME=my.domain.com
HTTPS=on
SCRIPT_NAME=/repo01/
REDIRECT_STATUS=200
GATEWAY_INTERFACE=CGI/1.1
HTTP_SEC_GPC=1
SERVER_SOFTWARE=nginx/1.14.2
PATH_INFO=/repo01/
DOCUMENT_ROOT=/var/www/htdocs/cgit
HTTP_UPGRADE_INSECURE_REQUESTS=1
PWD=/var/www/htdocs/cgit
LOGNAME=www-data
REQUEST_URI=/repo01/
PATH_TRANSLATED=/var/www/htdocs/cgit
FCGI_ROLE=RESPONDER
REQUEST_SCHEME=https
HOME=/var/www
LANG=C.UTF-8
QUERY_STRING=
HTTP_TE=trailers
HTTP_ACCEPT_LANGUAGE=de-DE,en-US;q=0.7,en;q=0.3
DOCUMENT_URI=/repo01/
INVOCATION_ID=c38ca46505de465a86d38a3900c8c4ad
HTTP_ACCEPT=text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8
REMOTE_PORT=39666
HTTP_HOST=my.domain.com
USER=www-data
SERVER_ADDR=xx.xx.xx.xx
HTTP_AUTHORIZATION=Basic dG9yc3RlbmRpZXRlcjM5MzpwZVVnJUdEN3RUJjRYZjM4
HTTP_USER_AGENT=Mozilla/5.0 (X11; Linux x86_64; rv:82.0) Gecko/20100101 Firefox/82.0
SHLVL=1
CONTENT_LENGTH=
SERVER_PROTOCOL=HTTP/2.0
SERVER_PORT=443
SCRIPT_FILENAME=/var/www/htdocs/cgit/debug.cgi
JOURNAL_STREAM=9:39445051
REMOTE_ADDR=87.176.40.180
DAEMON_OPTS=-f
PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
CONTENT_TYPE=
REQUEST_METHOD=GET
_=/usr/bin/printenv

On Sat, 14 Aug 2021 22:10:22 +0000
Ariel Costas <ariel at costas.dev> wrote:

> The root path works as expected, doesn't it? Try with a subdirectory
> like /repo01/, as you mentioned previously in this thread.
>
> Also, when hiding your domain name on logs, make sure to remove IPs too,
> just in case :)
>
> --
> Ariel Costas (https://costas.dev)
> Encrypt your email -- https://emailselfdefense.org/
>   GnuPG public key -- https://costas.dev/pgp


--
Torsten Kuehnel <net_seeker at web.de>

From june at causal.agency  Sun Aug 15 22:56:07 2021
From: june at causal.agency (june)
Date: Sun, 15 Aug 2021 18:56:07 -0400
Subject: cannot get cgit display anything except the repo listing page
In-Reply-To: <20210815214936.7fefd2643a99ccfd1b490f38@web.de>
References: <20210814000334.e410462c4a52c39482ba1c46@web.de>
 <0102017b46b749c4-9c00c99b-c1d3-411f-9a69-621236ff8d25-000000@eu-west-1.amazonses.com>
 <20210815214936.7fefd2643a99ccfd1b490f38@web.de>
Message-ID: <7FE5AFAF-E3FC-400A-A94F-2F870099D0CF@causal.agency>

> On Aug 15, 2021, at 15:49, Torsten Kuehnel <net_seeker at web.de> wrote:
> 
> Here comes the output, again:
> 
> HTTP_ACCEPT_ENCODING=gzip, deflate, br
> SERVER_NAME=my.domain.com
> HTTPS=on
> SCRIPT_NAME=/repo01/

I think you want SCRIPT_NAME to still be /.


From ariel at costas.dev  Mon Aug 16 11:50:30 2021
From: ariel at costas.dev (Ariel Costas)
Date: Mon, 16 Aug 2021 11:50:30 +0000
Subject: cannot get cgit display anything except the repo listing page
In-Reply-To: <20210815214936.7fefd2643a99ccfd1b490f38@web.de> (message from
 Torsten Kuehnel on Sun, 15 Aug 2021 21:49:36 +0200)
Message-ID: <0102017b4ecc7f80-eb3a6963-67a5-43f5-9418-195fc501786b-000000@eu-west-1.amazonses.com>

This is weird, in both cases SCRIPT_FILENAME is set to the same CGI
script, and according to fcgiwrap's readme, it should use that to use
the document, and cgit to render the correct page with PATH_INFO.

-- 
Ariel Costas (https://costas.dev)
Encrypt your email -- https://emailselfdefense.org/
  GnuPG public key -- https://costas.dev/pgp

From list at eworm.de  Tue Aug 17 06:01:26 2021
From: list at eworm.de (Christian Hesse)
Date: Tue, 17 Aug 2021 08:01:26 +0200
Subject: [PATCH 1/1] git: update to v2.33.0
Message-ID: <20210817060126.23305-1-list@eworm.de>

From: Christian Hesse <mail at eworm.de>

Update to git version v2.33.0, no additional changes required.

Signed-off-by: Christian Hesse <mail at eworm.de>
---
 Makefile | 2 +-
 git      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index d13c5bd..b030ff9 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.32.0
+GIT_VER = 2.33.0
 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 ebf3c04..225bc32 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit ebf3c04b262aa27fbb97f8a0156c2347fecafafb
+Subproject commit 225bc32a989d7a22fa6addafd4ce7dcd04675dbf