CVS commit: pkgsrc/mail/alpine

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/mail/alpine
From: "Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>
Date: Sun, 26 Feb 2023 20:39:50 +0000

Module Name:    pkgsrc
Committed By:   vins
Date:           Sun Feb 26 20:39:49 UTC 2023

Modified Files:
        pkgsrc/mail/alpine: Makefile PLIST distinfo
Added Files:
        pkgsrc/mail/alpine: options.mk
        pkgsrc/mail/alpine/patches: patch-alpine_pine-use.c
            patch-doc_man1_alpine.1 patch-imap_src_osdep_unix_ssl__unix.c
            patch-pico_osdep_terminal.c

Log Message:
mail/alpine: update to release 2.26.

## CHANGES (local)

* HOMEPAGE and MASTER_SITES updated.
* Pull additional upstream patches.
* Replace hard-coded paths.
* Fix default user mailbox location.
* Support rxvt builtin keycodes.
* Add patch for mail providers enforcing SNI (from OpenBSD).
* New build options: aspell, ldap, tcl (all disabled by default).
* The package now also installs:
        - alpine's version of the pico editor.
        - alpine's pilot file browser.
        - the rpdump/rpload utilities to query remote alpine configurations.
        - manpages for the programs mentioned above.
        - documentation and other files useful for reference.
        - a sample system-wide configuration file.

## CHANGES (upstream)

* Unix version of Alpine (not including OSX). Alpine is built with
  password file support by default. If Alpine is built with SMIME
  support and the password file does not exist, then Alpine will
  create it by default and encrypt it.

* In the past Alpine did not recognize images embedded in an HTML
  file, so now it does and a link to open them is given. Additionally,
  Alpine did not pass these images to an external browser for display
  using the external command, and now it will.

* Support for code_verifier and code_challenge when generating a
  refresh token and access token in Gmail and Outlook using the S256
  method and plain method.

* Change the redirect_uri scheme for Gmail, as Google is deprecating
  the use of oob. Changed to http://localhost. Users are supposed to
  enter the URL they see in their browser in place of the code.

* Some servers do not allow the Drafts folder to be removed, even when
  it is empty. Alpine, however, assumes that if the folder exists, it
  must contain a draft message. This joint collaboration with Thomas
  Uhle modifies alpine to not to attempt to continue a draft message
  if the draft folder is empty.

* Contributions by Thomas Uhle:
        - Add support to the LDAP attribute
          "userCertificate";
        - Move voiceMailTelephoneNumber from the TCL side
          to ldap_translate;
        - XOAUTH2 state generator changes format specifier
          from %x to %02x;
        - Web Alpine will not attempt to continue a postponed
          message if the postponed-msgs folder is empty.

* Improvements to the screen that allows a user to select the
  client-id when a user attempts to login to a server and more than
  one client-id is available for that server. In this case additional
  information is given: The method to use (device or authorize), a
  user id that uses the suggested client-id or a report that the
  client-id has not been used.

* To protect the privacy of a user, the message-id of a message will
  be generated using the domain in the From field of the message.

* When saving to a folder in the unix format, Alpine parses the
  destination folder to assign uids to all messages in the folder.
  When the destination folder is large this could significantly slow
  down alpine. Fix based on a patch submitted to the alpine-info list
  by Chris Caputo.

* Add the LOGOUT command to the list of commands that can be
  automatically interrupted in case the connection becomes unstable
  during that command and Alpine times out its connection to the
  server.

* If new mail has arrived when a user is closing a mailbox, Alpine
  will also announce how many new messages have arrived. Suggested by
  Chime Hart.

* When an invitation does not have a timezone in the date of the
  event, but the date is in GMT, adjust the date to local time.

Bugs that have been addressed include:

* Crash when invoking Alpine from the command line and an attempt to
  authorize alpine to use XOAUTH2 is done. Alpine crashes because of a
  missing optional parameter -xoauth2-flow and because no screen has
  been configured yet. Reported by Baron Fujimoto.

* Alpine crashes when it cannot retrieve the privacy policy due to
  failure connecting to the external server.

* Alpine might delete all passwords from the password file if the
  password file is not unlocked by cancellation, or the authentication
  for an XOAUTH2 server is cancelled, or the password of an account is
  changed.

* When the personal name of an address is encoded, and the personal
  name is surrounded by quotes, these are not removed by Alpine at the
  time to offer to take an address from a message to the addressbook.
  Reported by David Prager Branner.

* If a user configures the sendmail-path variable, and does not use a
  global smtp-server, then Alpine will use the sendmail-path even when
  the user configured a smtp-server for a role. Reported by Gregory
  Heytings.

* Crash in PC-Alpine when creating a mail collection and no username
  is indicated in the server path. Reported by Sandy Schuman.

* Crash in Alpine when running a filter that moves deleted messages
  the INBOX in a Gmail account. Reported by Jyrki Voutilainen.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 pkgsrc/mail/alpine/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/mail/alpine/PLIST
cvs rdiff -u -r1.29 -r1.30 pkgsrc/mail/alpine/distinfo
cvs rdiff -u -r0 -r1.6 pkgsrc/mail/alpine/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/alpine/patches/patch-alpine_pine-use.c \
    pkgsrc/mail/alpine/patches/patch-doc_man1_alpine.1 \
    pkgsrc/mail/alpine/patches/patch-imap_src_osdep_unix_ssl__unix.c \
    pkgsrc/mail/alpine/patches/patch-pico_osdep_terminal.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/alpine/Makefile
diff -u pkgsrc/mail/alpine/Makefile:1.52 pkgsrc/mail/alpine/Makefile:1.53
--- pkgsrc/mail/alpine/Makefile:1.52    Sun Jan 15 17:31:01 2023
+++ pkgsrc/mail/alpine/Makefile Sun Feb 26 20:39:49 2023
@@ -1,25 +1,41 @@
-# $NetBSD: Makefile,v 1.52 2023/01/15 17:31:01 bsiegert Exp $
+# $NetBSD: Makefile,v 1.53 2023/02/26 20:39:49 vins Exp $
 
-DISTNAME=      alpine-2.25
-PKGREVISION=   2
+DISTNAME=      alpine-2.26
 CATEGORIES=    mail
-MASTER_SITES=  http://alpine.x10host.com/alpine/release/src/
-DIST_SUBDIR=   ${DISTNAME}p1   # XXX maildir.patch changed upstream
+# repo at https://repo.or.cz/alpine.git
+MASTER_SITES=  https://alpineapp.email/alpine/release/src/
+DIST_SUBDIR=   ${PKGNAME_NOREV}
 EXTRACT_SUFX=  .tar.xz
 
-PATCH_SITES=           https://alpine.x10host.com/alpine/patches/alpine-${PKGVERSION_NOREV}/
+PATCH_SITES=           https://alpineapp.email/alpine/patches/alpine-${PKGVERSION_NOREV}/
+# Maildir Support
 PATCHFILES+=           maildir.patch.gz
+# Enhanced Fancy Thread Interface
+PATCHFILES+=           fancy.patch.gz
+# Justify paragraphs that contain more than one level of quoting
+PATCHFILES+=           fillpara.patch.gz
+# Send e-mail from the command line
+PATCHFILES+=           outgoing.patch.gz
+# Accents in pico
+PATCHFILES+=           WrtAcc.patch.gz
 PATCH_DIST_STRIP=      -p1
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://alpine.x10host.com/index.html
+HOMEPAGE=      https://alpineapp.email/
 COMMENT=       Program for Internet News and E-mail
 LICENSE=       apache-2.0
 
+CONFLICTS+=    pico-[0-9]*      # bin/pico
+
 GNU_CONFIGURE= yes
 USE_TOOLS+=    msgfmt msgmerge xgettext
 USE_LIBTOOL=   yes
 
+MAKE_JOBS_SAFE=        no
+BUILD_DEFS+=   VARBASE
+
+.include "../../mk/bsd.prefs.mk"
+
 CONFIGURE_ARGS+=       --with-ssl-dir=${SSLBASE}
 CONFIGURE_ARGS+=       --with-ssl-certs-dir=${SSLCERTS:Q}
 CONFIGURE_ARGS+=       --with-ssl-include-dir=${SSLBASE}/include
@@ -27,16 +43,24 @@ CONFIGURE_ARGS+=    --with-ssl-lib-dir=${SS
 CONFIGURE_ARGS+=       --with-system-pinerc=${PKG_SYSCONFDIR}/pine.conf
 CONFIGURE_ARGS+=       --with-system-fixed-pinerc=${PKG_SYSCONFDIR}/pine.conf.fixed
 CONFIGURE_ARGS+=       --with-passfile=.pine-passfile
-# disabled, for Web Alpine Support
-CONFIGURE_ARGS+=       --without-tcl
-
-# Should be handled properly with an ldap option and buildlinked.
-CONFIGURE_ARGS.SunOS+= --without-ldap
-
-MAKE_JOBS_SAFE=                no
-INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
-
-.include "../../mk/bsd.prefs.mk"
+CONFIGURE_ARGS+=       --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
+CONFIGURE_ARGS+=       --with-libintl-prefix=${BUILDLINK_PREFIX.gettext}
+.if ${OPSYS} == "Linux"
+CONFIGURE_ARGS+=       --with-system-mail-directory=${VARBASE}/spool/mail
+.else
+CONFIGURE_ARGS+=       --with-system-mail-directory=${VARBASE}/mail
+.endif
+
+.include "options.mk"
+
+EGDIR=         ${PREFIX}/share/examples/${PKGBASE}
+CONF_FILES+=   ${EGDIR}/pine.conf \
+               ${PKG_SYSCONFDIR}/pine.conf
+
+PKG_DOCS=      LICENSE NOTICE README README.maildir VERSION
+PKG_DOCS+=     doc/brochure.txt doc/mailcap.unx doc/mime.types
+PKG_DOCS+=     doc/tech-notes/tech-notes.txt
+DOCDIR=                ${PREFIX}/share/doc/${PKGBASE}
 
 # mach/mach.h defines panic, differently.
 SUBST_CLASSES.Darwin+= panic
@@ -48,11 +72,47 @@ SUBST_FILES.panic+= */*/*/*.c
 SUBST_FILES.panic+=    pith/util.h
 SUBST_SED.panic+=      -e 's,panic *(,Panic(,g'
 
+SUBST_CLASSES+=                paths
+SUBST_STAGE.paths=     pre-configure
+SUBST_MESSAGE.paths=   Replacing hard-coded paths.
+SUBST_FILES.paths=     doc/man1/alpine.1 doc/tech-notes/*.txt pith/pine.hlp
+SUBST_SED.paths+=      -e "s:/usr/local/pine.conf:${PKG_SYSCONFDIR}/pine.conf:g"
+SUBST_SED.paths+=      -e "s:/usr/local/lib:${PKG_SYSCONFDIR}:g"
+SUBST_SED.paths+=      -e "s:/usr/local/bin:${PREFIX}/bin:g"
+SUBST_SED.paths+=      -e "s:/usr/local/ssl:${SSLDIR}:g"
+
+SUBST_CLASSES+=                var
+SUBST_STAGE.var=       pre-configure
+SUBST_FILES.var=       alpine/pine-use.c doc/man1/alpine.1
+SUBST_VARS.var=                VARBASE
+SUBST_MESSAGE.var=     Replacing VARBASE placeholders.
+
+INSTALLATION_DIRS+=    bin ${PKGMANDIR}/man1
+INSTALLATION_DIRS+=    share/examples/${PKGBASE}
+INSTALLATION_DIRS+=    share/doc/${PKGBASE}
+
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/alpine/alpine ${DESTDIR}${PREFIX}/bin/alpine
-       ${INSTALL_MAN} ${WRKSRC}/doc/man1/alpine.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/alpine.1
+.for bin in \
+       alpine/alpine alpine/rpdump alpine/rpload       \
+               pico/pico pico/pilot
+       ${INSTALL_PROGRAM} ${WRKSRC}/${bin} ${DESTDIR}${PREFIX}/bin
+.endfor
+.for man in alpine rpdump rpload pico pilot
+       ${INSTALL_MAN} ${WRKSRC}/doc/man1/${man}.1      \
+               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+.endfor
+
+post-install:
+       ${RUN}${WRKSRC}/alpine/alpine -conf > ${DESTDIR}${EGDIR}/pine.conf
+       ${INSTALL_DATA} ${PKG_DOCS:S|^|${WRKSRC}/|} ${DESTDIR}${DOCDIR}
 
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-tools/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/terminfo.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/krb5.buildlink3.mk"
 .include "../../mk/pam.buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/mail/alpine/PLIST
diff -u pkgsrc/mail/alpine/PLIST:1.1.1.1 pkgsrc/mail/alpine/PLIST:1.2
--- pkgsrc/mail/alpine/PLIST:1.1.1.1    Thu May  3 12:11:37 2007
+++ pkgsrc/mail/alpine/PLIST    Sun Feb 26 20:39:49 2023
@@ -1,3 +1,21 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/05/03 12:11:37 abs Exp $
+@comment $NetBSD: PLIST,v 1.2 2023/02/26 20:39:49 vins Exp $
 bin/alpine
+bin/pico
+bin/pilot
+bin/rpdump
+bin/rpload
 man/man1/alpine.1
+man/man1/pico.1
+man/man1/pilot.1
+man/man1/rpdump.1
+man/man1/rpload.1
+share/doc/alpine/LICENSE
+share/doc/alpine/NOTICE
+share/doc/alpine/README
+share/doc/alpine/README.maildir
+share/doc/alpine/VERSION
+share/doc/alpine/brochure.txt
+share/doc/alpine/mailcap.unx
+share/doc/alpine/mime.types
+share/doc/alpine/tech-notes.txt
+share/examples/alpine/pine.conf

Index: pkgsrc/mail/alpine/distinfo
diff -u pkgsrc/mail/alpine/distinfo:1.29 pkgsrc/mail/alpine/distinfo:1.30
--- pkgsrc/mail/alpine/distinfo:1.29    Sun Dec 26 10:28:24 2021
+++ pkgsrc/mail/alpine/distinfo Sun Feb 26 20:39:49 2023
@@ -1,11 +1,27 @@
-$NetBSD: distinfo,v 1.29 2021/12/26 10:28:24 plunky Exp $
+$NetBSD: distinfo,v 1.30 2023/02/26 20:39:49 vins Exp $
 
-BLAKE2s (alpine-2.25p1/alpine-2.25.tar.xz) = 6c1e0b8522b479477573d8af491045d5222758238fd83ba9fcb837d5c55afc6c
-SHA512 (alpine-2.25p1/alpine-2.25.tar.xz) = 76c214cf66f4ac7af3de40357ad3a592ff2a119e327e5f6c256125b7865d46b09197435fe6ac8077ab7a498e4821925939f3f902431ca77baa786e149466a193
-Size (alpine-2.25p1/alpine-2.25.tar.xz) = 7495372 bytes
-BLAKE2s (alpine-2.25p1/maildir.patch.gz) = 9d4c5e884815ec1c24286f264a0d5430e39f44971935e72c309e27e71062d7e7
-SHA512 (alpine-2.25p1/maildir.patch.gz) = 2973302432d8b7611cc5998c19ce8d9965b2c18a0dd06693a3f409becb3173df5a63d5b87859994bf13d216200823148d00255e242e0bc33b3952cdc7025ee26
-Size (alpine-2.25p1/maildir.patch.gz) = 34788 bytes
+BLAKE2s (alpine-2.26/WrtAcc.patch.gz) = 0ac2c946dea8f432bdfc1f847f2f31b9ef70d1634244fed1ec252c5baf812747
+SHA512 (alpine-2.26/WrtAcc.patch.gz) = 494d798775a384e8e42639437b14ee09bc174520f705e8830636f2039668cbe0f441011de753cb98f5a4d89059c285ef0fc205249a3a079bb0a88c4389cbd595
+Size (alpine-2.26/WrtAcc.patch.gz) = 2180 bytes
+BLAKE2s (alpine-2.26/alpine-2.26.tar.xz) = 4bd671ac3626ad65512971856c9d59121afdd7e2d2e9b5c9fd47de3881af8eaa
+SHA512 (alpine-2.26/alpine-2.26.tar.xz) = 359b5cb30be78a341b76c0475a2d5268b643788f14c9b5b9457af6748034e1d2e70fd7ddf59e5c59ad596a36d8a10afa9c41cbd74241c780b8575d8186168fd2
+Size (alpine-2.26/alpine-2.26.tar.xz) = 7517628 bytes
+BLAKE2s (alpine-2.26/fancy.patch.gz) = 8d5bd515ef996488786de30a84082ed3e37e803d552c5de31cddfa29392b71c2
+SHA512 (alpine-2.26/fancy.patch.gz) = 0840d319dc36715c091c65feff4fd3d7010bec8302b7df6e7ddd505f7590dc684729ce9983214c297efd23eb7b076c932ef15310194bea66ff0ed8b8c5c65796
+Size (alpine-2.26/fancy.patch.gz) = 25055 bytes
+BLAKE2s (alpine-2.26/fillpara.patch.gz) = d27a4dd199e1ab72f8766e2a3319753c7508588f9f627786a87c738d4000374c
+SHA512 (alpine-2.26/fillpara.patch.gz) = 0e7963ff55bad318dd5f743348ddd9a84f5f200c96fcf94d45564b2f4491071c63f9dda77fd9ac7fe72807ac6024589de4d95bbadecc661ceb7d8096769c24bb
+Size (alpine-2.26/fillpara.patch.gz) = 32103 bytes
+BLAKE2s (alpine-2.26/maildir.patch.gz) = feb77674402d0fe83420fba1950d79b4eae78c3ab87b5ebb700127bb6b432bde
+SHA512 (alpine-2.26/maildir.patch.gz) = 13297879e8edb10d87a3b05b2a0c123991ef5213b52ce6fd980a017a498cd5a0c1bd7eae0ef91dae60df5db2a878fa0a4544337b699e19dd4ca358e98af072a6
+Size (alpine-2.26/maildir.patch.gz) = 34840 bytes
+BLAKE2s (alpine-2.26/outgoing.patch.gz) = a7b110e64fe8863b03af14d1f3dccf03a70e0228c1715b2170d3b0361ba27211
+SHA512 (alpine-2.26/outgoing.patch.gz) = c5903a9c3869c301e497bda8fcd9201724be90459710bce167758e730051d022a67292893361dd73480a43bfad8909bc4554f10c84839d8f2f3deac781d868f7
+Size (alpine-2.26/outgoing.patch.gz) = 9039 bytes
+SHA1 (patch-alpine_pine-use.c) = 4661d2ead0a12cf94c40967bfe4dbaae72978631
+SHA1 (patch-doc_man1_alpine.1) = 98f144e123b26a949a4ae7bfed5f262d07a7d035
 SHA1 (patch-imap_src_c-client_auth_gss.c) = e6da9ee9dbe0751872d1400237a030112eaa56c6
 SHA1 (patch-imap_src_osdep_unix_Makefile.gss) = ca09bc26a139c68afe8ac1f99be54bd1fc0e77f0
 SHA1 (patch-imap_src_osdep_unix_kerb_mit.c) = c77d5ee1e8aee30811c2df0562caa375ed270c0e
+SHA1 (patch-imap_src_osdep_unix_ssl__unix.c) = f073043a3c1aa5d0ad352d947111a92416661c6a
+SHA1 (patch-pico_osdep_terminal.c) = 19a5467e9ac98a42c581fbe50d774b9762762436

Added files:

Index: pkgsrc/mail/alpine/options.mk
diff -u /dev/null pkgsrc/mail/alpine/options.mk:1.6
--- /dev/null   Sun Feb 26 20:39:49 2023
+++ pkgsrc/mail/alpine/options.mk       Sun Feb 26 20:39:49 2023
@@ -0,0 +1,39 @@
+# $NetBSD: options.mk,v 1.6 2023/02/26 20:39:49 vins Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.alpine
+
+PKG_SUPPORTED_OPTIONS+=        aspell ldap tcl
+PKG_SUGGESTED_OPTIONS=
+
+.include "../../mk/bsd.options.mk"
+
+###
+### Aspell spell-check support
+###
+.if !empty(PKG_OPTIONS:Maspell)
+.  include "../../textproc/aspell/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-simple-spellcheck=aspell
+CONFIGURE_ARGS+=       --with-interactive-spellcheck=aspell
+CONFIGURE_ENV+=                ac_cv_path_alpine_simple_spellcheck=${PREFIX}/bin/aspell
+CONFIGURE_ENV+=                ac_cv_path_alpine_interactive_spellcheck=${PREFIX}/bin/aspell
+.endif
+
+###
+### LDAP server support
+###
+.if !empty(PKG_OPTIONS:Mldap)
+.  include "../../databases/openldap-client/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-ldap-dir=${BUILDLINK_PREFIX.openldap-client}
+.else
+CONFIGURE_ARGS+=       --without-ldap
+.endif
+
+###
+###  Web Alpine browser
+###
+.if !empty(PKG_OPTIONS:Mtcl)
+.include "../../lang/tcl/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-tcl-lib-dir=${BUILDLINK_PREFIX.tcl}/lib
+.else
+CONFIGURE_ARGS+=       --without-tcl
+.endif

Index: pkgsrc/mail/alpine/patches/patch-alpine_pine-use.c
diff -u /dev/null pkgsrc/mail/alpine/patches/patch-alpine_pine-use.c:1.1
--- /dev/null   Sun Feb 26 20:39:49 2023
+++ pkgsrc/mail/alpine/patches/patch-alpine_pine-use.c  Sun Feb 26 20:39:49 2023
@@ -0,0 +1,19 @@
+$NetBSD: patch-alpine_pine-use.c,v 1.1 2023/02/26 20:39:49 vins Exp $
+
+Fix default user mailbox path.
+
+--- alpine/pine-use.c.orig     2022-06-03 00:14:00.463274817 +0000
++++ alpine/pine-use.c
+@@ -20,7 +20,11 @@
+ #include <sys/stat.h>
+ 
+ #ifndef MAILSPOOLPCTS
+-#define MAILSPOOLPCTS "/usr/spool/mail/%s"
++#if defined(__linux__)
++# define MAILSPOOLPCTS "@VARBASE@/spool/mail/%s"
++#else
++# define MAILSPOOLPCTS "@VARBASE@/mail/%s"
++#endif
+ /* #define MAILSPOOLPCTS "/usr/mail/%s" */
+ #endif
+ 
Index: pkgsrc/mail/alpine/patches/patch-doc_man1_alpine.1
diff -u /dev/null pkgsrc/mail/alpine/patches/patch-doc_man1_alpine.1:1.1
--- /dev/null   Sun Feb 26 20:39:49 2023
+++ pkgsrc/mail/alpine/patches/patch-doc_man1_alpine.1  Sun Feb 26 20:39:49 2023
@@ -0,0 +1,24 @@
+$NetBSD: patch-doc_man1_alpine.1,v 1.1 2023/02/26 20:39:49 vins Exp $
+
+Fix default user mailbox path.
+
+--- doc/man1/alpine.1.orig     2022-06-03 00:14:00.467274807 +0000
++++ doc/man1/alpine.1
+@@ -318,7 +318,7 @@ uses the following environment variables
+ .if n .ta 2.8i
+ .if t .ta 2.1i
+ 
+-/usr/spool/mail/xxxx  Default folder for incoming mail.
++@VARBASE@/mail/xxxx   Default folder for incoming mail.
+ .br
+ ~/mail        Default directory for mail folders.
+ .br
+@@ -354,7 +354,7 @@ uses the following environment variables
+ .br
+ ~/.alpine-smime/public        Directory that contains public key(s).
+ .br
+-/tmp/.\\usr\\spool\\mail\\xxxx        Per-folder mailbox lock files.
++/tmp/.\\var\\mail\\xxxx       Per-folder mailbox lock files.
+ .br
+ ~/.pine-interrupted-mail      Message which was interrupted.
+ .br
Index: pkgsrc/mail/alpine/patches/patch-imap_src_osdep_unix_ssl__unix.c
diff -u /dev/null pkgsrc/mail/alpine/patches/patch-imap_src_osdep_unix_ssl__unix.c:1.1
--- /dev/null   Sun Feb 26 20:39:49 2023
+++ pkgsrc/mail/alpine/patches/patch-imap_src_osdep_unix_ssl__unix.c    Sun Feb 26 20:39:49 2023
@@ -0,0 +1,39 @@
+$NetBSD: patch-imap_src_osdep_unix_ssl__unix.c,v 1.1 2023/02/26 20:39:49 vins Exp $
+
+Some popular mail services enforce SNI for TLSv1.3 clients, so send it
+retry SSL_write() on blocking socket if we're told to do so.
+
+--- imap/src/osdep/unix/ssl_unix.c.orig        2022-06-03 00:14:00.475274788 +0000
++++ imap/src/osdep/unix/ssl_unix.c
+@@ -391,6 +391,7 @@ static char *ssl_start_work (SSLSTREAM *
+ {
+   BIO *bio;
+   X509 *cert;
++  int ssl_err;
+   unsigned long sl,tl;
+   int minv, maxv;
+   long masklow, maskhigh;
+@@ -465,7 +466,13 @@ static char *ssl_start_work (SSLSTREAM *
+   SSL_set_connect_state (stream->con);
+   if (SSL_in_init (stream->con)) SSL_total_renegotiations (stream->con);
+                               /* now negotiate SSL */
+-  if (SSL_write (stream->con,"",0) < 0)
++  do {
++    ssl_err = SSL_write (stream->con,"",0);
++  } while (ssl_err < 0 &&
++      ((SSL_get_error(stream->con, ssl_err) == SSL_ERROR_SYSCALL && errno == EINTR) ||
++       SSL_get_error(stream->con, ssl_err) == SSL_ERROR_WANT_READ ||
++        SSL_get_error(stream->con, ssl_err) == SSL_ERROR_WANT_WRITE));
++  if (ssl_err < 0)
+     return ssl_last_error ? ssl_last_error : "SSL negotiation failed";
+                               /* need to validate host names? */
+   cert = SSL_get_peer_certificate (stream->con);
+@@ -530,7 +537,7 @@ static char *ssl_validate_cert (X509 *ce
+                               /* make sure have a certificate */
+   if (!cert) return "No certificate from server";
+                               /* Method 1: locate CN */
+-#ifndef OPENSSL_1_1_0
++#if !defined(OPENSSL_1_1_0) && !defined(LIBRESSL_VERSION_NUMBER)
+   if (cert->name == NIL)
+      ret = "No name in certificate";
+   else if ((s = strstr (cert->name,"/CN=")) != NIL) {
Index: pkgsrc/mail/alpine/patches/patch-pico_osdep_terminal.c
diff -u /dev/null pkgsrc/mail/alpine/patches/patch-pico_osdep_terminal.c:1.1
--- /dev/null   Sun Feb 26 20:39:49 2023
+++ pkgsrc/mail/alpine/patches/patch-pico_osdep_terminal.c      Sun Feb 26 20:39:49 2023
@@ -0,0 +1,19 @@
+$NetBSD: patch-pico_osdep_terminal.c,v 1.1 2023/02/26 20:39:49 vins Exp $
+
+Support Rxvt builtin keypad sequences.
+
+--- pico/osdep/terminal.c.orig 2022-06-03 00:14:00.491274749 +0000
++++ pico/osdep/terminal.c
+@@ -188,6 +188,12 @@ setup_dflt_esc_seq(void)
+     kpinsert("\033[H", KEY_HOME, 1);
+     kpinsert("\033[F", KEY_END, 1);
+ 
++    /*
++     * rxvt
++     */
++    kpinsert("\033[7~", KEY_HOME, 1);
++    kpinsert("\033[8~", KEY_END, 1);
++
+     /* 
+      * gnome-terminal 2.6.0, don't know why it
+      * changed from 2.2.1

Prev by Date: CVS commit: pkgsrc/lang/smlnj11072
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/lang/smlnj11072
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index