Use generic SSL version method instead of ancient SSLv3-only. Adjust PLIST to match reality. Bump revision.diff -r1.33 -r1.34 pkgsrc/mail/deforaos-mailer/Makefile
(joerg)
@@ -1,53 +1,53 @@ | @@ -1,53 +1,53 @@ | |||
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 | |||
3 | DISTNAME= Mailer-0.1.8 | 3 | DISTNAME= Mailer-0.1.8 | |
4 | PKGNAME= deforaos-mailer-0.1.8 | 4 | PKGNAME= deforaos-mailer-0.1.8 | |
5 | PKGREVISION= 8 | 5 | PKGREVISION= 9 | |
6 | CATEGORIES= mail | 6 | CATEGORIES= mail | |
7 | MASTER_SITES= https://www.defora.org/os/download/download/4439/ | 7 | MASTER_SITES= https://www.defora.org/os/download/download/4439/ | |
8 | 8 | |||
9 | MAINTAINER= khorben@defora.org | 9 | MAINTAINER= khorben@defora.org | |
10 | HOMEPAGE= https://www.defora.org/ | 10 | HOMEPAGE= https://www.defora.org/ | |
11 | COMMENT= DeforaOS desktop e-mail client | 11 | COMMENT= DeforaOS desktop e-mail client | |
12 | LICENSE= modified-bsd | 12 | LICENSE= modified-bsd | |
13 | 13 | |||
14 | BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt | 14 | BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt | |
15 | BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl | 15 | BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl | |
16 | 16 | |||
17 | USE_TOOLS+= pkg-config | 17 | USE_TOOLS+= pkg-config | |
18 | USE_TOOLS+= xgettext | 18 | USE_TOOLS+= xgettext | |
19 | 19 | |||
20 | MAKE_JOBS_SAFE= no | 20 | MAKE_JOBS_SAFE= no | |
21 | 21 | |||
22 | MAKE_FLAGS+= DESTDIR=${DESTDIR} | 22 | MAKE_FLAGS+= DESTDIR=${DESTDIR} | |
23 | MAKE_FLAGS+= PREFIX=${PREFIX} | 23 | MAKE_FLAGS+= PREFIX=${PREFIX} | |
24 | MAKE_FLAGS+= CFLAGS=${CFLAGS:Q} | 24 | MAKE_FLAGS+= CFLAGS=${CFLAGS:Q} | |
25 | MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q} | 25 | MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q} | |
26 | AUTO_MKDIRS= yes | 26 | AUTO_MKDIRS= yes | |
27 | 27 | |||
28 | CONFLICTS= john-[0-9]* | 28 | CONFLICTS= john-[0-9]* | |
29 | 29 | |||
30 | LDFLAGS.SunOS+= -lnsl -lsocket | 30 | LDFLAGS.SunOS+= -lnsl -lsocket | |
31 | 31 | |||
32 | .include "../../mk/bsd.prefs.mk" | 32 | .include "../../mk/bsd.prefs.mk" | |
33 | 33 | |||
34 | .if ${PKGMANDIR} != "share/man" | 34 | .if ${PKGMANDIR} != "share/man" | |
35 | post-install: | 35 | post-install: | |
36 | ${MV} ${DESTDIR}${PREFIX}/share/man/html1/compose.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/compose.html | 36 | ${MV} ${DESTDIR}${PREFIX}/share/man/html1/compose.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/compose.html | |
37 | ${MV} ${DESTDIR}${PREFIX}/share/man/html1/mailer.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/mailer.html | 37 | ${MV} ${DESTDIR}${PREFIX}/share/man/html1/mailer.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/mailer.html | |
38 | ${MV} ${DESTDIR}${PREFIX}/share/man/man1/compose.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/compose.1 | 38 | ${MV} ${DESTDIR}${PREFIX}/share/man/man1/compose.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/compose.1 | |
39 | ${MV} ${DESTDIR}${PREFIX}/share/man/man1/mailer.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/mailer.1 | 39 | ${MV} ${DESTDIR}${PREFIX}/share/man/man1/mailer.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/mailer.1 | |
40 | ${RMDIR} ${DESTDIR}${PREFIX}/share/man/html1 | 40 | ${RMDIR} ${DESTDIR}${PREFIX}/share/man/html1 | |
41 | ${RMDIR} ${DESTDIR}${PREFIX}/share/man/man1 | 41 | ${RMDIR} ${DESTDIR}${PREFIX}/share/man/man1 | |
42 | ${RMDIR} ${DESTDIR}${PREFIX}/share/man | 42 | ${RMDIR} ${DESTDIR}${PREFIX}/share/man | |
43 | .endif | 43 | .endif | |
44 | 44 | |||
45 | .include "options.mk" | 45 | .include "options.mk" | |
46 | 46 | |||
47 | .include "../../graphics/hicolor-icon-theme/buildlink3.mk" | 47 | .include "../../graphics/hicolor-icon-theme/buildlink3.mk" | |
48 | .include "../../security/openssl/buildlink3.mk" | 48 | .include "../../security/openssl/buildlink3.mk" | |
49 | .include "../../x11/deforaos-libdesktop/buildlink3.mk" | 49 | .include "../../x11/deforaos-libdesktop/buildlink3.mk" | |
50 | BUILDLINK_API_DEPENDS.gtk-doc+= gtk-doc>=1.20 | 50 | BUILDLINK_API_DEPENDS.gtk-doc+= gtk-doc>=1.20 | |
51 | .include "../../textproc/gtk-doc/buildlink3.mk" | 51 | .include "../../textproc/gtk-doc/buildlink3.mk" | |
52 | .include "../../sysutils/desktop-file-utils/desktopdb.mk" | 52 | .include "../../sysutils/desktop-file-utils/desktopdb.mk" | |
53 | .include "../../mk/bsd.pkg.mk" | 53 | .include "../../mk/bsd.pkg.mk" |
@@ -1,64 +1,63 @@ | @@ -1,64 +1,63 @@ | |||
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 $ | |
2 | bin/compose | 2 | bin/compose | |
3 | bin/mailer | 3 | bin/mailer | |
4 | include/Desktop/Mailer.h | 4 | include/Desktop/Mailer.h | |
5 | include/Desktop/Mailer/account.h | 5 | include/Desktop/Mailer/account.h | |
6 | include/Desktop/Mailer/folder.h | 6 | include/Desktop/Mailer/folder.h | |
7 | include/Desktop/Mailer/helper.h | 7 | include/Desktop/Mailer/helper.h | |
8 | include/Desktop/Mailer/mailer.h | 8 | include/Desktop/Mailer/mailer.h | |
9 | include/Desktop/Mailer/message.h | 9 | include/Desktop/Mailer/message.h | |
10 | include/Desktop/Mailer/plugin.h | 10 | include/Desktop/Mailer/plugin.h | |
11 | include/Desktop/Mailer/transport.h | 11 | include/Desktop/Mailer/transport.h | |
12 | lib/Mailer/account/imap4.so | 12 | lib/Mailer/account/imap4.so | |
13 | lib/Mailer/account/mbox.so | 13 | lib/Mailer/account/mbox.so | |
14 | lib/Mailer/account/pop3.so | 14 | lib/Mailer/account/pop3.so | |
15 | lib/Mailer/plugins/mailing-lists.so | 15 | lib/Mailer/plugins/mailing-lists.so | |
16 | lib/Mailer/plugins/search.so | 16 | lib/Mailer/plugins/search.so | |
17 | lib/libMailer.a | 17 | lib/libMailer.a | |
18 | lib/libMailer.so | 18 | lib/libMailer.so | |
19 | lib/libMailer.so.0 | 19 | lib/libMailer.so.0 | |
20 | lib/libMailer.so.0.0 | 20 | lib/libMailer.so.0.0 | |
21 | lib/pkgconfig/Mailer.pc | 21 | lib/pkgconfig/Mailer.pc | |
22 | man/html1/compose.html | 22 | man/html1/compose.html | |
23 | man/html1/mailer.html | 23 | man/html1/mailer.html | |
24 | man/man1/compose.1 | 24 | man/man1/compose.1 | |
25 | man/man1/mailer.1 | 25 | man/man1/mailer.1 | |
26 | share/applications/deforaos-mailer.desktop | 26 | share/applications/deforaos-mailer.desktop | |
27 | share/gtk-doc/html/Mailer/Mailer-account.html | 27 | share/gtk-doc/html/Mailer/Mailer-account.html | |
28 | share/gtk-doc/html/Mailer/Mailer-folder.html | 28 | share/gtk-doc/html/Mailer/Mailer-folder.html | |
29 | share/gtk-doc/html/Mailer/Mailer-helper.html | 29 | share/gtk-doc/html/Mailer/Mailer-helper.html | |
30 | share/gtk-doc/html/Mailer/Mailer-mailer.html | 30 | share/gtk-doc/html/Mailer/Mailer-mailer.html | |
31 | share/gtk-doc/html/Mailer/Mailer-message.html | 31 | share/gtk-doc/html/Mailer/Mailer-message.html | |
32 | share/gtk-doc/html/Mailer/Mailer-plugin.html | 32 | share/gtk-doc/html/Mailer/Mailer-plugin.html | |
33 | share/gtk-doc/html/Mailer/Mailer.devhelp2 | 33 | share/gtk-doc/html/Mailer/Mailer.devhelp2 | |
34 | share/gtk-doc/html/Mailer/api-index-full.html | 34 | share/gtk-doc/html/Mailer/api-index-full.html | |
35 | share/gtk-doc/html/Mailer/ch01.html | 35 | share/gtk-doc/html/Mailer/ch01.html | |
36 | share/gtk-doc/html/Mailer/deprecated-api-index.html | 36 | share/gtk-doc/html/Mailer/deprecated-api-index.html | |
37 | share/gtk-doc/html/Mailer/home.png | 37 | share/gtk-doc/html/Mailer/home.png | |
38 | share/gtk-doc/html/Mailer/index.html | 38 | share/gtk-doc/html/Mailer/index.html | |
39 | share/gtk-doc/html/Mailer/index.sgml | |||
40 | share/gtk-doc/html/Mailer/left-insensitive.png | 39 | share/gtk-doc/html/Mailer/left-insensitive.png | |
41 | share/gtk-doc/html/Mailer/left.png | 40 | share/gtk-doc/html/Mailer/left.png | |
42 | share/gtk-doc/html/Mailer/right-insensitive.png | 41 | share/gtk-doc/html/Mailer/right-insensitive.png | |
43 | share/gtk-doc/html/Mailer/right.png | 42 | share/gtk-doc/html/Mailer/right.png | |
44 | share/gtk-doc/html/Mailer/style.css | 43 | share/gtk-doc/html/Mailer/style.css | |
45 | share/gtk-doc/html/Mailer/up-insensitive.png | 44 | share/gtk-doc/html/Mailer/up-insensitive.png | |
46 | share/gtk-doc/html/Mailer/up.png | 45 | share/gtk-doc/html/Mailer/up.png | |
47 | share/icons/hicolor/16x16/apps/mailer-accounts.png | 46 | share/icons/hicolor/16x16/apps/mailer-accounts.png | |
48 | share/icons/hicolor/16x16/apps/mailer-drafts.png | 47 | share/icons/hicolor/16x16/apps/mailer-drafts.png | |
49 | share/icons/hicolor/16x16/apps/mailer-inbox.png | 48 | share/icons/hicolor/16x16/apps/mailer-inbox.png | |
50 | share/icons/hicolor/16x16/apps/mailer-outbox.png | 49 | share/icons/hicolor/16x16/apps/mailer-outbox.png | |
51 | share/icons/hicolor/16x16/apps/mailer-sent.png | 50 | share/icons/hicolor/16x16/apps/mailer-sent.png | |
52 | share/icons/hicolor/16x16/apps/mailer.png | 51 | share/icons/hicolor/16x16/apps/mailer.png | |
53 | share/icons/hicolor/24x24/apps/mailer-accounts.png | 52 | share/icons/hicolor/24x24/apps/mailer-accounts.png | |
54 | share/icons/hicolor/24x24/apps/mailer-drafts.png | 53 | share/icons/hicolor/24x24/apps/mailer-drafts.png | |
55 | share/icons/hicolor/24x24/apps/mailer-inbox.png | 54 | share/icons/hicolor/24x24/apps/mailer-inbox.png | |
56 | share/icons/hicolor/24x24/apps/mailer-outbox.png | 55 | share/icons/hicolor/24x24/apps/mailer-outbox.png | |
57 | share/icons/hicolor/24x24/apps/mailer-sent.png | 56 | share/icons/hicolor/24x24/apps/mailer-sent.png | |
58 | share/icons/hicolor/24x24/apps/mailer.png | 57 | share/icons/hicolor/24x24/apps/mailer.png | |
59 | share/icons/hicolor/48x48/apps/mailer-inbox.png | 58 | share/icons/hicolor/48x48/apps/mailer-inbox.png | |
60 | share/icons/hicolor/48x48/apps/mailer-outbox.png | 59 | share/icons/hicolor/48x48/apps/mailer-outbox.png | |
61 | share/icons/hicolor/48x48/apps/mailer-sent.png | 60 | share/icons/hicolor/48x48/apps/mailer-sent.png | |
62 | share/icons/hicolor/48x48/apps/mailer.png | 61 | share/icons/hicolor/48x48/apps/mailer.png | |
63 | share/locale/es/LC_MESSAGES/Mailer.mo | 62 | share/locale/es/LC_MESSAGES/Mailer.mo | |
64 | share/locale/fr/LC_MESSAGES/Mailer.mo | 63 | share/locale/fr/LC_MESSAGES/Mailer.mo |
@@ -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 | |||
3 | SHA1 (Mailer-0.1.8.tar.gz) = a31bbeb22f11f692e937b6450a3c913424a80b0d | 3 | SHA1 (Mailer-0.1.8.tar.gz) = a31bbeb22f11f692e937b6450a3c913424a80b0d | |
4 | RMD160 (Mailer-0.1.8.tar.gz) = 5bc95b752896c8b9fc6019d13767b6663672d019 | 4 | RMD160 (Mailer-0.1.8.tar.gz) = 5bc95b752896c8b9fc6019d13767b6663672d019 | |
5 | SHA512 (Mailer-0.1.8.tar.gz) = fff0b8e6a7796bfb10d76dcfc36297a44b377e14bc0de2c8c939880e5fd956dd0b837f8c7788a3adc295aad18ab6f98001ff1cea03076bffed291f35d77bdd33 | 5 | SHA512 (Mailer-0.1.8.tar.gz) = fff0b8e6a7796bfb10d76dcfc36297a44b377e14bc0de2c8c939880e5fd956dd0b837f8c7788a3adc295aad18ab6f98001ff1cea03076bffed291f35d77bdd33 | |
6 | Size (Mailer-0.1.8.tar.gz) = 108980 bytes | 6 | Size (Mailer-0.1.8.tar.gz) = 108980 bytes | |
7 | SHA1 (patch-src_mailer.c) = 5e3975a0672ab0882a8712e5c21233104d0747d8 |
$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,