Re: Support for NSS as a libpq TLS backend

From: Kevin Burke <kevin(at)burke(dot)dev>
To: Jacob Champion <pchampion(at)vmware(dot)com>
Cc: "daniel(at)yesql(dot)se" <daniel(at)yesql(dot)se>, "pgsql-hackers(at)lists(dot)postgresql(dot)org" <pgsql-hackers(at)lists(dot)postgresql(dot)org>, "hlinnaka(at)iki(dot)fi" <hlinnaka(at)iki(dot)fi>, "andrew(dot)dunstan(at)2ndquadrant(dot)com" <andrew(dot)dunstan(at)2ndquadrant(dot)com>, "sfrost(at)snowman(dot)net" <sfrost(at)snowman(dot)net>, "rachelmheaton(at)gmail(dot)com" <rachelmheaton(at)gmail(dot)com>, "thomas(dot)munro(at)gmail(dot)com" <thomas(dot)munro(at)gmail(dot)com>, "michael(at)paquier(dot)xyz" <michael(at)paquier(dot)xyz>, "andres(at)anarazel(dot)de" <andres(at)anarazel(dot)de>
Subject: Re: Support for NSS as a libpq TLS backend
Date: 2021-10-29 04:31:47
Message-ID: CAKcy5ejjvQKpkNHSGZDyDLNsJkLe39fHqeH29vftxyJdpAk3Zg@mail.gmail.com
Views: Raw Message | Whole Thread | Download mbox | Resend email
Thread:
Lists: pgsql-hackers

Hi all, apologies but I'm having trouble applying the latest patch (v45) to
the latest commit on master (6b0f6f79eef2168ce38a8ee99c3ed76e3df5d7ad)

I downloaded all of the patches to my local filesystem, and then ran:

for patch in
../../kevinburke/rustls-postgres/patchsets/2021-10-05-gustafsson-mailing-list/*.patch;
do git am $patch; done;

I get the following error on the second patch file:

Applying: Refactor SSL testharness for multiple library
error: patch failed: src/test/ssl/t/001_ssltests.pl:7
error: src/test/ssl/t/001_ssltests.pl: patch does not apply
error: patch failed: src/test/ssl/t/SSLServer.pm:26
error: src/test/ssl/t/SSLServer.pm: patch does not apply
Patch failed at 0001 Refactor SSL testharness for multiple library
hint: Use 'git am --show-current-patch=diff' to see the failed patch

I believe that these patches need to integrate the refactoring in
commit b3b4d8e68ae83f432f43f035c7eb481ef93e1583 - git is searching for the
wrong text in the existing file, but I'm not sure how to submit a patch
against a patch.

Thanks,
Kevin

On Tue, Oct 5, 2021 at 8:05 AM Jacob Champion <pchampion(at)vmware(dot)com> wrote:

> On Tue, 2021-10-05 at 15:08 +0200, Daniel Gustafsson wrote:
> > Thanks! These changes looks good. Since you accidentally based this on
> v43
> > and not the v44 I posted with the cryptohash fix in, the attached is a
> v45 with
> > both your v44 and the previous one, all rebased over HEAD.
>
> Thanks, and sorry about that.
>
> --Jacob
>

In response to

Responses

Browse pgsql-hackers by date

  From Date Subject
Next Message Amit Kapila 2021-10-29 04:35:01 Re: Added schema level support for publication.
Previous Message Amul Sul 2021-10-29 04:13:36 Re: Correct error message for end-of-recovery record TLI