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-gpg.sh | |
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-gpg.sh')
-rw-r--r-- | third_party/git/t/lib-gpg.sh | 96 |
1 files changed, 0 insertions, 96 deletions
diff --git a/third_party/git/t/lib-gpg.sh b/third_party/git/t/lib-gpg.sh deleted file mode 100644 index 9fc5241228e8..000000000000 --- a/third_party/git/t/lib-gpg.sh +++ /dev/null @@ -1,96 +0,0 @@ -# We always set GNUPGHOME, even if no usable GPG was found, as -# -# - It does not hurt, and -# -# - we cannot set global environment variables in lazy prereqs because they are -# executed in an eval'ed subshell that changes the working directory to a -# temporary one. - -GNUPGHOME="$PWD/gpghome" -export GNUPGHOME - -test_lazy_prereq GPG ' - gpg_version=$(gpg --version 2>&1) - test $? != 127 || exit 1 - - # As said here: http://www.gnupg.org/documentation/faqs.html#q6.19 - # the gpg version 1.0.6 did not parse trust packets correctly, so for - # that version, creation of signed tags using the generated key fails. - case "$gpg_version" in - "gpg (GnuPG) 1.0.6"*) - say "Your version of gpg (1.0.6) is too buggy for testing" - exit 1 - ;; - *) - # Available key info: - # * Type DSA and Elgamal, size 2048 bits, no expiration date, - # name and email: C O Mitter <committer@example.com> - # * Type RSA, size 2048 bits, no expiration date, - # name and email: Eris Discordia <discord@example.net> - # No password given, to enable non-interactive operation. - # To generate new key: - # gpg --homedir /tmp/gpghome --gen-key - # To write armored exported key to keyring: - # gpg --homedir /tmp/gpghome --export-secret-keys \ - # --armor 0xDEADBEEF >> lib-gpg/keyring.gpg - # gpg --homedir /tmp/gpghome --export \ - # --armor 0xDEADBEEF >> lib-gpg/keyring.gpg - # To export ownertrust: - # gpg --homedir /tmp/gpghome --export-ownertrust \ - # > lib-gpg/ownertrust - mkdir "$GNUPGHOME" && - chmod 0700 "$GNUPGHOME" && - (gpgconf --kill gpg-agent || : ) && - gpg --homedir "${GNUPGHOME}" --import \ - "$TEST_DIRECTORY"/lib-gpg/keyring.gpg && - gpg --homedir "${GNUPGHOME}" --import-ownertrust \ - "$TEST_DIRECTORY"/lib-gpg/ownertrust && - gpg --homedir "${GNUPGHOME}" </dev/null >/dev/null \ - --sign -u committer@example.com - ;; - esac -' - -test_lazy_prereq GPGSM ' - test_have_prereq GPG && - # Available key info: - # * see t/lib-gpg/gpgsm-gen-key.in - # To generate new certificate: - # * no passphrase - # gpgsm --homedir /tmp/gpghome/ \ - # -o /tmp/gpgsm.crt.user \ - # --generate-key \ - # --batch t/lib-gpg/gpgsm-gen-key.in - # To import certificate: - # gpgsm --homedir /tmp/gpghome/ \ - # --import /tmp/gpgsm.crt.user - # To export into a .p12 we can later import: - # gpgsm --homedir /tmp/gpghome/ \ - # -o t/lib-gpg/gpgsm_cert.p12 \ - # --export-secret-key-p12 "committer@example.com" - echo | gpgsm --homedir "${GNUPGHOME}" \ - --passphrase-fd 0 --pinentry-mode loopback \ - --import "$TEST_DIRECTORY"/lib-gpg/gpgsm_cert.p12 && - - gpgsm --homedir "${GNUPGHOME}" -K | - grep fingerprint: | - cut -d" " -f4 | - tr -d "\\n" >"${GNUPGHOME}/trustlist.txt" && - - echo " S relax" >>"${GNUPGHOME}/trustlist.txt" && - echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \ - -u committer@example.com -o /dev/null --sign - -' - -test_lazy_prereq RFC1991 ' - test_have_prereq GPG && - echo | gpg --homedir "${GNUPGHOME}" -b --rfc1991 >/dev/null -' - -sanitize_pgp() { - perl -ne ' - /^-----END PGP/ and $in_pgp = 0; - print unless $in_pgp; - /^-----BEGIN PGP/ and $in_pgp = 1; - ' -} |