CVS commit: pkgsrc/mail/deforaos-mailer

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Fri Jan 10 21:15:21 UTC 2020

Modified Files:
        pkgsrc/mail/deforaos-mailer: Makefile PLIST distinfo
Added Files:
        pkgsrc/mail/deforaos-mailer/patches: patch-src_mailer.c

Log Message:
Use generic SSL version method instead of ancient SSLv3-only. Adjust
PLIST to match reality. Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/mail/deforaos-mailer/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/mail/deforaos-mailer/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/mail/deforaos-mailer/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/deforaos-mailer/patches/patch-src_mailer.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/deforaos-mailer/Makefile
diff -u pkgsrc/mail/deforaos-mailer/Makefile:1.33 pkgsrc/mail/deforaos-mailer/Makefile:1.34
--- pkgsrc/mail/deforaos-mailer/Makefile:1.33   Sun Jul 21 22:24:07 2019
+++ pkgsrc/mail/deforaos-mailer/Makefile        Fri Jan 10 21:15:21 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2019/07/21 22:24:07 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2020/01/10 21:15:21 joerg Exp $
 
 DISTNAME=      Mailer-0.1.8
 PKGNAME=       deforaos-mailer-0.1.8
-PKGREVISION=   8
+PKGREVISION=   9
 CATEGORIES=    mail
 MASTER_SITES=  https://www.defora.org/os/download/download/4439/
 

Index: pkgsrc/mail/deforaos-mailer/PLIST
diff -u pkgsrc/mail/deforaos-mailer/PLIST:1.6 pkgsrc/mail/deforaos-mailer/PLIST:1.7
--- pkgsrc/mail/deforaos-mailer/PLIST:1.6       Mon Jan  1 22:29:40 2018
+++ pkgsrc/mail/deforaos-mailer/PLIST   Fri Jan 10 21:15:21 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2018/01/01 22:29:40 rillig Exp $
+@comment $NetBSD: PLIST,v 1.7 2020/01/10 21:15:21 joerg Exp $
 bin/compose
 bin/mailer
 include/Desktop/Mailer.h
@@ -36,7 +36,6 @@ share/gtk-doc/html/Mailer/ch01.html
 share/gtk-doc/html/Mailer/deprecated-api-index.html
 share/gtk-doc/html/Mailer/home.png
 share/gtk-doc/html/Mailer/index.html
-share/gtk-doc/html/Mailer/index.sgml
 share/gtk-doc/html/Mailer/left-insensitive.png
 share/gtk-doc/html/Mailer/left.png
 share/gtk-doc/html/Mailer/right-insensitive.png

Index: pkgsrc/mail/deforaos-mailer/distinfo
diff -u pkgsrc/mail/deforaos-mailer/distinfo:1.7 pkgsrc/mail/deforaos-mailer/distinfo:1.8
--- pkgsrc/mail/deforaos-mailer/distinfo:1.7    Tue Apr  5 20:52:34 2016
+++ pkgsrc/mail/deforaos-mailer/distinfo        Fri Jan 10 21:15:21 2020
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.7 2016/04/05 20:52:34 khorben Exp $
+$NetBSD: distinfo,v 1.8 2020/01/10 21:15:21 joerg Exp $
 
 SHA1 (Mailer-0.1.8.tar.gz) = a31bbeb22f11f692e937b6450a3c913424a80b0d
 RMD160 (Mailer-0.1.8.tar.gz) = 5bc95b752896c8b9fc6019d13767b6663672d019
 SHA512 (Mailer-0.1.8.tar.gz) = fff0b8e6a7796bfb10d76dcfc36297a44b377e14bc0de2c8c939880e5fd956dd0b837f8c7788a3adc295aad18ab6f98001ff1cea03076bffed291f35d77bdd33
 Size (Mailer-0.1.8.tar.gz) = 108980 bytes
+SHA1 (patch-src_mailer.c) = 5e3975a0672ab0882a8712e5c21233104d0747d8

Added files:

Index: pkgsrc/mail/deforaos-mailer/patches/patch-src_mailer.c
diff -u /dev/null pkgsrc/mail/deforaos-mailer/patches/patch-src_mailer.c:1.1
--- /dev/null   Fri Jan 10 21:15:21 2020
+++ pkgsrc/mail/deforaos-mailer/patches/patch-src_mailer.c      Fri Jan 10 21:15:21 2020
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_mailer.c,v 1.1 2020/01/10 21:15:21 joerg Exp $
+
+SSLv23 is considered the generic request and mapped to TLS with newer
+OpenSSL.
+
+--- src/mailer.c.orig  2020-01-08 23:37:23.358580636 +0000
++++ src/mailer.c
+@@ -391,7 +391,7 @@ Mailer * mailer_new(void)
+       /* ssl */
+       SSL_load_error_strings();
+       SSL_library_init();
+-      if((mailer->ssl_ctx = SSL_CTX_new(SSLv3_client_method())) == NULL
++      if((mailer->ssl_ctx = SSL_CTX_new(SSLv23_client_method())) == NULL
+                       || SSL_CTX_set_cipher_list(mailer->ssl_ctx,
+                               SSL_DEFAULT_CIPHER_LIST) != 1
+                       || SSL_CTX_load_verify_locations(mailer->ssl_ctx, NULL,