diff options
author | Vincent Ambo <mail@tazj.in> | 2021-09-21T10·03+0300 |
---|---|---|
committer | Vincent Ambo <mail@tazj.in> | 2021-09-21T11·29+0300 |
commit | 43b1791ec601732ac31195df96781a848360a9ac (patch) | |
tree | daae8d638343295d2f1f7da955e556ef4c958864 /third_party/git/t/lib-httpd | |
parent | 2d8e7dc9d9c38127ec4ebd13aee8e8f586a43318 (diff) |
chore(3p/git): Unvendor git and track patches instead r/2903
This was vendored a long time ago under the expectation that keeping it in sync with cgit would be easier this way, but it has proven not to be a big issue. On the other hand, a vendored copy of git is an annoying maintenance burden. It is much easier to rebase the single (dottime) patch that we have. This removes the vendored copy of git and instead passes the git source code to cgit via `pkgs.srcOnly`, which includes the applied patch so that cgit can continue rendering dottime. Change-Id: If31f62dea7ce688fd1b9050204e9378019775f2b
Diffstat (limited to 'third_party/git/t/lib-httpd')
-rw-r--r-- | third_party/git/t/lib-httpd/apache.conf | 266 | ||||
-rw-r--r-- | third_party/git/t/lib-httpd/apply-one-time-perl.sh | 27 | ||||
-rw-r--r-- | third_party/git/t/lib-httpd/broken-smart-http.sh | 10 | ||||
-rw-r--r-- | third_party/git/t/lib-httpd/error-smart-http.sh | 3 | ||||
-rwxr-xr-x | third_party/git/t/lib-httpd/error.sh | 31 | ||||
-rw-r--r-- | third_party/git/t/lib-httpd/incomplete-body-upload-pack-v2-http.sh | 3 | ||||
-rw-r--r-- | third_party/git/t/lib-httpd/incomplete-length-upload-pack-v2-http.sh | 3 | ||||
-rw-r--r-- | third_party/git/t/lib-httpd/passwd | 1 | ||||
-rw-r--r-- | third_party/git/t/lib-httpd/ssl.cnf | 8 |
9 files changed, 0 insertions, 352 deletions
diff --git a/third_party/git/t/lib-httpd/apache.conf b/third_party/git/t/lib-httpd/apache.conf deleted file mode 100644 index afa91e38b0e2..000000000000 --- a/third_party/git/t/lib-httpd/apache.conf +++ /dev/null @@ -1,266 +0,0 @@ -ServerName dummy -PidFile httpd.pid -DocumentRoot www -LogFormat "%h %l %u %t \"%r\" %>s %b" common -CustomLog access.log common -ErrorLog error.log -<IfModule !mod_log_config.c> - LoadModule log_config_module modules/mod_log_config.so -</IfModule> -<IfModule !mod_alias.c> - LoadModule alias_module modules/mod_alias.so -</IfModule> -<IfModule !mod_cgi.c> - LoadModule cgi_module modules/mod_cgi.so -</IfModule> -<IfModule !mod_env.c> - LoadModule env_module modules/mod_env.so -</IfModule> -<IfModule !mod_rewrite.c> - LoadModule rewrite_module modules/mod_rewrite.so -</IFModule> -<IfModule !mod_version.c> - LoadModule version_module modules/mod_version.so -</IfModule> -<IfModule !mod_headers.c> - LoadModule headers_module modules/mod_headers.so -</IfModule> -<IfModule !mod_setenvif.c> - LoadModule setenvif_module modules/mod_setenvif.so -</IfModule> - -<IfVersion < 2.4> -LockFile accept.lock -</IfVersion> - -<IfVersion < 2.1> -<IfModule !mod_auth.c> - LoadModule auth_module modules/mod_auth.so -</IfModule> -</IfVersion> - -<IfVersion >= 2.1> -<IfModule !mod_auth_basic.c> - LoadModule auth_basic_module modules/mod_auth_basic.so -</IfModule> -<IfModule !mod_authn_file.c> - LoadModule authn_file_module modules/mod_authn_file.so -</IfModule> -<IfModule !mod_authz_user.c> - LoadModule authz_user_module modules/mod_authz_user.so -</IfModule> -<IfModule !mod_authz_host.c> - LoadModule authz_host_module modules/mod_authz_host.so -</IfModule> -</IfVersion> - -<IfVersion >= 2.4> -<IfModule !mod_authn_core.c> - LoadModule authn_core_module modules/mod_authn_core.so -</IfModule> -<IfModule !mod_authz_core.c> - LoadModule authz_core_module modules/mod_authz_core.so -</IfModule> -<IfModule !mod_access_compat.c> - LoadModule access_compat_module modules/mod_access_compat.so -</IfModule> -<IfModule !mod_mpm_prefork.c> - LoadModule mpm_prefork_module modules/mod_mpm_prefork.so -</IfModule> -<IfModule !mod_unixd.c> - LoadModule unixd_module modules/mod_unixd.so -</IfModule> -</IfVersion> - -PassEnv GIT_VALGRIND -PassEnv GIT_VALGRIND_OPTIONS -PassEnv GNUPGHOME -PassEnv ASAN_OPTIONS -PassEnv LSAN_OPTIONS -PassEnv GIT_TRACE -PassEnv GIT_CONFIG_NOSYSTEM -PassEnv GIT_TEST_SIDEBAND_ALL - -SetEnvIf Git-Protocol ".*" GIT_PROTOCOL=$0 - -Alias /dumb/ www/ -Alias /auth/dumb/ www/auth/dumb/ - -<LocationMatch /smart/> - SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH} - SetEnv GIT_HTTP_EXPORT_ALL -</LocationMatch> -<LocationMatch /smart_noexport/> - SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH} -</LocationMatch> -<LocationMatch /smart_custom_env/> - SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH} - SetEnv GIT_HTTP_EXPORT_ALL - SetEnv GIT_COMMITTER_NAME "Custom User" - SetEnv GIT_COMMITTER_EMAIL custom@example.com -</LocationMatch> -<LocationMatch /smart_namespace/> - SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH} - SetEnv GIT_HTTP_EXPORT_ALL - SetEnv GIT_NAMESPACE ns -</LocationMatch> -<LocationMatch /smart_cookies/> - SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH} - SetEnv GIT_HTTP_EXPORT_ALL - Header set Set-Cookie name=value -</LocationMatch> -<LocationMatch /smart_headers/> - SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH} - SetEnv GIT_HTTP_EXPORT_ALL -</LocationMatch> -<LocationMatch /one_time_perl/> - SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH} - SetEnv GIT_HTTP_EXPORT_ALL -</LocationMatch> -ScriptAlias /smart/incomplete_length/git-upload-pack incomplete-length-upload-pack-v2-http.sh/ -ScriptAlias /smart/incomplete_body/git-upload-pack incomplete-body-upload-pack-v2-http.sh/ -ScriptAliasMatch /error_git_upload_pack/(.*)/git-upload-pack error.sh/ -ScriptAliasMatch /smart_*[^/]*/(.*) ${GIT_EXEC_PATH}/git-http-backend/$1 -ScriptAlias /broken_smart/ broken-smart-http.sh/ -ScriptAlias /error_smart/ error-smart-http.sh/ -ScriptAlias /error/ error.sh/ -ScriptAliasMatch /one_time_perl/(.*) apply-one-time-perl.sh/$1 -<Directory ${GIT_EXEC_PATH}> - Options FollowSymlinks -</Directory> -<Files incomplete-length-upload-pack-v2-http.sh> - Options ExecCGI -</Files> -<Files incomplete-body-upload-pack-v2-http.sh> - Options ExecCGI -</Files> -<Files broken-smart-http.sh> - Options ExecCGI -</Files> -<Files error-smart-http.sh> - Options ExecCGI -</Files> -<Files error.sh> - Options ExecCGI -</Files> -<Files apply-one-time-perl.sh> - Options ExecCGI -</Files> -<Files ${GIT_EXEC_PATH}/git-http-backend> - Options ExecCGI -</Files> - -RewriteEngine on -RewriteRule ^/dumb-redir/(.*)$ /dumb/$1 [R=301] -RewriteRule ^/smart-redir-perm/(.*)$ /smart/$1 [R=301] -RewriteRule ^/smart-redir-temp/(.*)$ /smart/$1 [R=302] -RewriteRule ^/smart-redir-auth/(.*)$ /auth/smart/$1 [R=301] -RewriteRule ^/smart-redir-limited/(.*)/info/refs$ /smart/$1/info/refs [R=301] -RewriteRule ^/ftp-redir/(.*)$ ftp://localhost:1000/$1 [R=302] - -RewriteRule ^/loop-redir/x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-(.*) /$1 [R=302] -RewriteRule ^/loop-redir/(.*)$ /loop-redir/x-$1 [R=302] - -# redir-to/502/x?y -> really-redir-to?path=502/x&qs=y which returns 502 -# redir-to/x?y -> really-redir-to?path=x&qs=y -> x?y -RewriteCond %{QUERY_STRING} ^(.*)$ -RewriteRule ^/redir-to/(.*)$ /really-redir-to?path=$1&qs=%1 [R=302] -RewriteCond %{QUERY_STRING} ^path=502/(.*)&qs=(.*)$ -RewriteRule ^/really-redir-to$ - [R=502,L] -RewriteCond %{QUERY_STRING} ^path=(.*)&qs=(.*)$ -RewriteRule ^/really-redir-to$ /%1?%2 [R=302] - -# The first rule issues a client-side redirect to something -# that _doesn't_ look like a git repo. The second rule is a -# server-side rewrite, so that it turns out the odd-looking -# thing _is_ a git repo. The "[PT]" tells Apache to match -# the usual ScriptAlias rules for /smart. -RewriteRule ^/insane-redir/(.*)$ /intern-redir/$1/foo [R=301] -RewriteRule ^/intern-redir/(.*)/foo$ /smart/$1 [PT] - -# Serve info/refs internally without redirecting, but -# issue a redirect for any object requests. -RewriteRule ^/redir-objects/(.*/info/refs)$ /dumb/$1 [PT] -RewriteRule ^/redir-objects/(.*/objects/.*)$ /dumb/$1 [R=301] - -# Apache 2.2 does not understand <RequireAll>, so we use RewriteCond. -# And as RewriteCond does not allow testing for non-matches, we match -# the desired case first (one has abra, two has cadabra), and let it -# pass by marking the RewriteRule as [L], "last rule, do not process -# any other matching RewriteRules after this"), and then have another -# RewriteRule that matches all other cases and lets them fail via '[F]', -# "fail the request". -RewriteCond %{HTTP:x-magic-one} =abra -RewriteCond %{HTTP:x-magic-two} =cadabra -RewriteRule ^/smart_headers/.* - [L] -RewriteRule ^/smart_headers/.* - [F] - -<IfDefine SSL> -LoadModule ssl_module modules/mod_ssl.so - -SSLCertificateFile httpd.pem -SSLCertificateKeyFile httpd.pem -SSLRandomSeed startup file:/dev/urandom 512 -SSLRandomSeed connect file:/dev/urandom 512 -SSLSessionCache none -SSLMutex file:ssl_mutex -SSLEngine On -</IfDefine> - -<Location /auth/> - AuthType Basic - AuthName "git-auth" - AuthUserFile passwd - Require valid-user -</Location> - -<LocationMatch "^/auth-push/.*/git-receive-pack$"> - AuthType Basic - AuthName "git-auth" - AuthUserFile passwd - Require valid-user -</LocationMatch> - -<LocationMatch "^/auth-fetch/.*/git-upload-pack$"> - AuthType Basic - AuthName "git-auth" - AuthUserFile passwd - Require valid-user -</LocationMatch> - -RewriteCond %{QUERY_STRING} service=git-receive-pack [OR] -RewriteCond %{REQUEST_URI} /git-receive-pack$ -RewriteRule ^/half-auth-complete/ - [E=AUTHREQUIRED:yes] - -<Location /half-auth-complete/> - Order Deny,Allow - Deny from env=AUTHREQUIRED - - AuthType Basic - AuthName "Git Access" - AuthUserFile passwd - Require valid-user - Satisfy Any -</Location> - -<IfDefine DAV> - LoadModule dav_module modules/mod_dav.so - LoadModule dav_fs_module modules/mod_dav_fs.so - - DAVLockDB DAVLock - <Location /dumb/> - Dav on - </Location> - <Location /auth/dumb> - Dav on - </Location> -</IfDefine> - -<IfDefine SVN> - LoadModule dav_svn_module modules/mod_dav_svn.so - - <Location /${LIB_HTTPD_SVN}> - DAV svn - SVNPath "${LIB_HTTPD_SVNPATH}" - </Location> -</IfDefine> diff --git a/third_party/git/t/lib-httpd/apply-one-time-perl.sh b/third_party/git/t/lib-httpd/apply-one-time-perl.sh deleted file mode 100644 index 09a0abdff7c4..000000000000 --- a/third_party/git/t/lib-httpd/apply-one-time-perl.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -# If "one-time-perl" exists in $HTTPD_ROOT_PATH, run perl on the HTTP response, -# using the contents of "one-time-perl" as the perl command to be run. If the -# response was modified as a result, delete "one-time-perl" so that subsequent -# HTTP responses are no longer modified. -# -# This can be used to simulate the effects of the repository changing in -# between HTTP request-response pairs. -if test -f one-time-perl -then - LC_ALL=C - export LC_ALL - - "$GIT_EXEC_PATH/git-http-backend" >out - perl -pe "$(cat one-time-perl)" out >out_modified - - if cmp -s out out_modified - then - cat out - else - cat out_modified - rm one-time-perl - fi -else - "$GIT_EXEC_PATH/git-http-backend" -fi diff --git a/third_party/git/t/lib-httpd/broken-smart-http.sh b/third_party/git/t/lib-httpd/broken-smart-http.sh deleted file mode 100644 index 82cc610b0ac0..000000000000 --- a/third_party/git/t/lib-httpd/broken-smart-http.sh +++ /dev/null @@ -1,10 +0,0 @@ -printf "Content-Type: text/%s\n" "html" -echo -printf "%s\n" "001e# service=git-upload-pack" -printf "%s" "0000" -printf "%s%c%s%s\n" \ - "00a58681d9f286a48b08f37b3a095330da16689e3693 HEAD" \ - 0 \ - " include-tag multi_ack_detailed multi_ack ofs-delta" \ - " side-band side-band-64k thin-pack no-progress shallow no-done " -printf "%s" "0000" diff --git a/third_party/git/t/lib-httpd/error-smart-http.sh b/third_party/git/t/lib-httpd/error-smart-http.sh deleted file mode 100644 index e65d447fc4c4..000000000000 --- a/third_party/git/t/lib-httpd/error-smart-http.sh +++ /dev/null @@ -1,3 +0,0 @@ -echo "Content-Type: application/x-git-upload-pack-advertisement" -echo -printf "%s" "0019ERR server-side error" diff --git a/third_party/git/t/lib-httpd/error.sh b/third_party/git/t/lib-httpd/error.sh deleted file mode 100755 index a77b8e546926..000000000000 --- a/third_party/git/t/lib-httpd/error.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh - -printf "Status: 500 Intentional Breakage\n" - -printf "Content-Type: " -charset=iso-8859-1 -case "$PATH_INFO" in -*html*) - printf "text/html" - ;; -*text*) - printf "text/plain" - ;; -*charset*) - printf "text/plain; charset=utf-8" - charset=utf-8 - ;; -*utf16*) - printf "text/plain; charset=utf-16" - charset=utf-16 - ;; -*odd-spacing*) - printf "text/plain; foo=bar ;charset=utf-16; other=nonsense" - charset=utf-16 - ;; -esac -printf "\n" - -printf "\n" -printf "this is the error message\n" | -iconv -f us-ascii -t $charset diff --git a/third_party/git/t/lib-httpd/incomplete-body-upload-pack-v2-http.sh b/third_party/git/t/lib-httpd/incomplete-body-upload-pack-v2-http.sh deleted file mode 100644 index 90e73ef8d559..000000000000 --- a/third_party/git/t/lib-httpd/incomplete-body-upload-pack-v2-http.sh +++ /dev/null @@ -1,3 +0,0 @@ -printf "Content-Type: text/%s\n" "application/x-git-upload-pack-result" -echo -printf "%s%s" "0079" "45" diff --git a/third_party/git/t/lib-httpd/incomplete-length-upload-pack-v2-http.sh b/third_party/git/t/lib-httpd/incomplete-length-upload-pack-v2-http.sh deleted file mode 100644 index dce552e34823..000000000000 --- a/third_party/git/t/lib-httpd/incomplete-length-upload-pack-v2-http.sh +++ /dev/null @@ -1,3 +0,0 @@ -printf "Content-Type: text/%s\n" "application/x-git-upload-pack-result" -echo -printf "%s" "00" diff --git a/third_party/git/t/lib-httpd/passwd b/third_party/git/t/lib-httpd/passwd deleted file mode 100644 index 99a34d648742..000000000000 --- a/third_party/git/t/lib-httpd/passwd +++ /dev/null @@ -1 +0,0 @@ -user@host:xb4E8pqD81KQs diff --git a/third_party/git/t/lib-httpd/ssl.cnf b/third_party/git/t/lib-httpd/ssl.cnf deleted file mode 100644 index 6dab2579cbf9..000000000000 --- a/third_party/git/t/lib-httpd/ssl.cnf +++ /dev/null @@ -1,8 +0,0 @@ -RANDFILE = $ENV::RANDFILE_PATH - -[ req ] -default_bits = 1024 -distinguished_name = req_distinguished_name -prompt = no -[ req_distinguished_name ] -commonName = 127.0.0.1 |