Fri Jan 10 21:15:21 2020 UTC ()
Use generic SSL version method instead of ancient SSLv3-only. Adjust
PLIST to match reality. Bump revision.


(joerg)
diff -r1.33 -r1.34 pkgsrc/mail/deforaos-mailer/Makefile
diff -r1.6 -r1.7 pkgsrc/mail/deforaos-mailer/PLIST
diff -r1.7 -r1.8 pkgsrc/mail/deforaos-mailer/distinfo
diff -r0 -r1.1 pkgsrc/mail/deforaos-mailer/patches/patch-src_mailer.c
cvs diff -r1.33 -r1.34 pkgsrc/mail/deforaos-mailer/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/deforaos-mailer/Makefile 2019/07/21 22:24:07 1.33
+++ pkgsrc/mail/deforaos-mailer/Makefile 2020/01/10 21:15:21 1.34
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.33 2019/07/21 22:24:07 wiz Exp $ 1# $NetBSD: Makefile,v 1.34 2020/01/10 21:15:21 joerg Exp $
2 2
3DISTNAME= Mailer-0.1.8 3DISTNAME= Mailer-0.1.8
4PKGNAME= deforaos-mailer-0.1.8 4PKGNAME= deforaos-mailer-0.1.8
5PKGREVISION= 8 5PKGREVISION= 9
6CATEGORIES= mail 6CATEGORIES= mail
7MASTER_SITES= https://www.defora.org/os/download/download/4439/ 7MASTER_SITES= https://www.defora.org/os/download/download/4439/
8 8
9MAINTAINER= khorben@defora.org 9MAINTAINER= khorben@defora.org
10HOMEPAGE= https://www.defora.org/ 10HOMEPAGE= https://www.defora.org/
11COMMENT= DeforaOS desktop e-mail client 11COMMENT= DeforaOS desktop e-mail client
12LICENSE= modified-bsd 12LICENSE= modified-bsd
13 13
14BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt 14BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
15BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl 15BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
16 16
17USE_TOOLS+= pkg-config 17USE_TOOLS+= pkg-config
18USE_TOOLS+= xgettext 18USE_TOOLS+= xgettext
cvs diff -r1.6 -r1.7 pkgsrc/mail/deforaos-mailer/PLIST (expand / switch to unified diff)

--- pkgsrc/mail/deforaos-mailer/PLIST 2018/01/01 22:29:40 1.6
+++ pkgsrc/mail/deforaos-mailer/PLIST 2020/01/10 21:15:21 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.6 2018/01/01 22:29:40 rillig Exp $ 1@comment $NetBSD: PLIST,v 1.7 2020/01/10 21:15:21 joerg Exp $
2bin/compose 2bin/compose
3bin/mailer 3bin/mailer
4include/Desktop/Mailer.h 4include/Desktop/Mailer.h
5include/Desktop/Mailer/account.h 5include/Desktop/Mailer/account.h
6include/Desktop/Mailer/folder.h 6include/Desktop/Mailer/folder.h
7include/Desktop/Mailer/helper.h 7include/Desktop/Mailer/helper.h
8include/Desktop/Mailer/mailer.h 8include/Desktop/Mailer/mailer.h
9include/Desktop/Mailer/message.h 9include/Desktop/Mailer/message.h
10include/Desktop/Mailer/plugin.h 10include/Desktop/Mailer/plugin.h
11include/Desktop/Mailer/transport.h 11include/Desktop/Mailer/transport.h
12lib/Mailer/account/imap4.so 12lib/Mailer/account/imap4.so
13lib/Mailer/account/mbox.so 13lib/Mailer/account/mbox.so
14lib/Mailer/account/pop3.so 14lib/Mailer/account/pop3.so
@@ -26,27 +26,26 @@ man/man1/mailer.1 @@ -26,27 +26,26 @@ man/man1/mailer.1
26share/applications/deforaos-mailer.desktop 26share/applications/deforaos-mailer.desktop
27share/gtk-doc/html/Mailer/Mailer-account.html 27share/gtk-doc/html/Mailer/Mailer-account.html
28share/gtk-doc/html/Mailer/Mailer-folder.html 28share/gtk-doc/html/Mailer/Mailer-folder.html
29share/gtk-doc/html/Mailer/Mailer-helper.html 29share/gtk-doc/html/Mailer/Mailer-helper.html
30share/gtk-doc/html/Mailer/Mailer-mailer.html 30share/gtk-doc/html/Mailer/Mailer-mailer.html
31share/gtk-doc/html/Mailer/Mailer-message.html 31share/gtk-doc/html/Mailer/Mailer-message.html
32share/gtk-doc/html/Mailer/Mailer-plugin.html 32share/gtk-doc/html/Mailer/Mailer-plugin.html
33share/gtk-doc/html/Mailer/Mailer.devhelp2 33share/gtk-doc/html/Mailer/Mailer.devhelp2
34share/gtk-doc/html/Mailer/api-index-full.html 34share/gtk-doc/html/Mailer/api-index-full.html
35share/gtk-doc/html/Mailer/ch01.html 35share/gtk-doc/html/Mailer/ch01.html
36share/gtk-doc/html/Mailer/deprecated-api-index.html 36share/gtk-doc/html/Mailer/deprecated-api-index.html
37share/gtk-doc/html/Mailer/home.png 37share/gtk-doc/html/Mailer/home.png
38share/gtk-doc/html/Mailer/index.html 38share/gtk-doc/html/Mailer/index.html
39share/gtk-doc/html/Mailer/index.sgml 
40share/gtk-doc/html/Mailer/left-insensitive.png 39share/gtk-doc/html/Mailer/left-insensitive.png
41share/gtk-doc/html/Mailer/left.png 40share/gtk-doc/html/Mailer/left.png
42share/gtk-doc/html/Mailer/right-insensitive.png 41share/gtk-doc/html/Mailer/right-insensitive.png
43share/gtk-doc/html/Mailer/right.png 42share/gtk-doc/html/Mailer/right.png
44share/gtk-doc/html/Mailer/style.css 43share/gtk-doc/html/Mailer/style.css
45share/gtk-doc/html/Mailer/up-insensitive.png 44share/gtk-doc/html/Mailer/up-insensitive.png
46share/gtk-doc/html/Mailer/up.png 45share/gtk-doc/html/Mailer/up.png
47share/icons/hicolor/16x16/apps/mailer-accounts.png 46share/icons/hicolor/16x16/apps/mailer-accounts.png
48share/icons/hicolor/16x16/apps/mailer-drafts.png 47share/icons/hicolor/16x16/apps/mailer-drafts.png
49share/icons/hicolor/16x16/apps/mailer-inbox.png 48share/icons/hicolor/16x16/apps/mailer-inbox.png
50share/icons/hicolor/16x16/apps/mailer-outbox.png 49share/icons/hicolor/16x16/apps/mailer-outbox.png
51share/icons/hicolor/16x16/apps/mailer-sent.png 50share/icons/hicolor/16x16/apps/mailer-sent.png
52share/icons/hicolor/16x16/apps/mailer.png 51share/icons/hicolor/16x16/apps/mailer.png
cvs diff -r1.7 -r1.8 pkgsrc/mail/deforaos-mailer/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/deforaos-mailer/distinfo 2016/04/05 20:52:34 1.7
+++ pkgsrc/mail/deforaos-mailer/distinfo 2020/01/10 21:15:21 1.8
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.7 2016/04/05 20:52:34 khorben Exp $ 1$NetBSD: distinfo,v 1.8 2020/01/10 21:15:21 joerg Exp $
2 2
3SHA1 (Mailer-0.1.8.tar.gz) = a31bbeb22f11f692e937b6450a3c913424a80b0d 3SHA1 (Mailer-0.1.8.tar.gz) = a31bbeb22f11f692e937b6450a3c913424a80b0d
4RMD160 (Mailer-0.1.8.tar.gz) = 5bc95b752896c8b9fc6019d13767b6663672d019 4RMD160 (Mailer-0.1.8.tar.gz) = 5bc95b752896c8b9fc6019d13767b6663672d019
5SHA512 (Mailer-0.1.8.tar.gz) = fff0b8e6a7796bfb10d76dcfc36297a44b377e14bc0de2c8c939880e5fd956dd0b837f8c7788a3adc295aad18ab6f98001ff1cea03076bffed291f35d77bdd33 5SHA512 (Mailer-0.1.8.tar.gz) = fff0b8e6a7796bfb10d76dcfc36297a44b377e14bc0de2c8c939880e5fd956dd0b837f8c7788a3adc295aad18ab6f98001ff1cea03076bffed291f35d77bdd33
6Size (Mailer-0.1.8.tar.gz) = 108980 bytes 6Size (Mailer-0.1.8.tar.gz) = 108980 bytes
 7SHA1 (patch-src_mailer.c) = 5e3975a0672ab0882a8712e5c21233104d0747d8
File Added: pkgsrc/mail/deforaos-mailer/patches/Attic/patch-src_mailer.c
$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,