Another bump because this makes gpg wks service work correctly.
Would love to get this into 6.7.
Aisha
On 4/19/20 7:28 AM, Aisha Tammy wrote:
> Bumping in case this was missed.
> Was hoping this could be added for the 6.7 release.
>
> aisha
>
> On 4/10/20 7:23 AM, Aisha Tammy wrote:
>> readding the diff, because my thunderbird was wrapping messages by default.
>>
>> thanks again.
>>
>> Index: Makefile
>> ===================================================================
>> RCS file: /cvs/ports/security/gnupg2/Makefile,v
>> retrieving revision 1.66
>> diff -u -p -r1.66 Makefile
>> --- Makefile 12 Jul 2019 21:15:35 -0000 1.66
>> +++ Makefile 10 Apr 2020 11:22:22 -0000
>> @@ -2,7 +2,7 @@
>>
>> COMMENT = GNU privacy guard - a free PGP replacement
>>
>> -DISTNAME = gnupg-2.2.12
>> +DISTNAME = gnupg-2.2.20
>> CATEGORIES = security
>> REVISION = 0
>>
>> @@ -55,6 +55,7 @@ CONFIGURE_STYLE = gnu
>> CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
>> LDFLAGS="-L${LOCALBASE}/lib"
>> CONFIGURE_ARGS += docdir=${LOCALBASE}/share/doc/gnupg2 \
>> + --with-mailprog="/usr/sbin/sendmail" \
>> --enable-gpgtar \
>> --enable-wks-tools \
>> --enable-gpg-is-gpg2
>> Index: distinfo
>> ===================================================================
>> RCS file: /cvs/ports/security/gnupg2/distinfo,v
>> retrieving revision 1.31
>> diff -u -p -r1.31 distinfo
>> --- distinfo 22 Dec 2018 17:49:21 -0000 1.31
>> +++ distinfo 10 Apr 2020 11:22:22 -0000
>> @@ -1,2 +1,2 @@
>> -SHA256 (gnupg-2.2.12.tar.bz2) = 2wMPi0yYZA6RMA021Rbx9Pj+CVFKlOqfx0Ee4aNAgss=
>> -SIZE (gnupg-2.2.12.tar.bz2) = 6682303
>> +SHA256 (gnupg-2.2.20.tar.bz2) = BKfJ1It0w5kWjugnDlSFiN2+UiGMM3cD1/Bjc9MmyjA=
>> +SIZE (gnupg-2.2.20.tar.bz2) = 6786913
>> Index: patches/patch-doc_Makefile_in
>> ===================================================================
>> RCS file: /cvs/ports/security/gnupg2/patches/patch-doc_Makefile_in,v
>> retrieving revision 1.2
>> diff -u -p -r1.2 patch-doc_Makefile_in
>> --- patches/patch-doc_Makefile_in 20 Aug 2017 11:52:38 -0000 1.2
>> +++ patches/patch-doc_Makefile_in 10 Apr 2020 11:22:22 -0000
>> @@ -2,7 +2,7 @@ $OpenBSD: patch-doc_Makefile_in,v 1.2 20
>> Index: doc/Makefile.in
>> --- doc/Makefile.in.orig
>> +++ doc/Makefile.in
>> -@@ -462,14 +462,6 @@ libcommontls = ../common/libcommontls.a
>> +@@ -474,14 +474,6 @@ libcommontls = ../common/libcommontls.a
>> libcommontlsnpth = ../common/libcommontlsnpth.a
>> examples = examples/README examples/scd-event examples/trustlist.txt
>> \
>> examples/vsnfd.prf examples/debug.prf \
>> Index: patches/patch-tools_send-mail_c
>> ===================================================================
>> RCS file: patches/patch-tools_send-mail_c
>> diff -N patches/patch-tools_send-mail_c
>> --- /dev/null 1 Jan 1970 00:00:00 -0000
>> +++ patches/patch-tools_send-mail_c 10 Apr 2020 11:22:22 -0000
>> @@ -0,0 +1,16 @@
>> +$OpenBSD: patch-doc_Makefile_in,v 1.2 2020/04/09 13:40:29 aisha Exp $
>> +
>> +use the sendmail option from the command line
>> +
>> +Index: tools/send-mail.c
>> +--- tools/send-mail.c.orig
>> ++++ tools/send-mail.c
>> +@@ -33,7 +33,7 @@ static gpg_error_t
>> + run_sendmail (estream_t data)
>> + {
>> + gpg_error_t err;
>> +- const char pgmname[] = "/usr/lib/sendmail";
>> ++ const char pgmname[] = "/usr/sbin/sendmail";
>> + const char *argv[3];
>> +
>> + argv[0] = "-oi";
>>
>
