Sun Oct 17 16:41:33 2021 UTC ()
Pullup ticket #6521 - requested by nia
mail/alpine: security fix

Revisions pulled up:
- mail/alpine/Makefile                                          1.48
- mail/alpine/distinfo                                          1.27
- mail/alpine/patches/patch-imap_src_mtest_mtest.c              deleted

---
   Module Name:	pkgsrc
   Committed By:	nia
   Date:		Sun Oct 17 09:49:10 UTC 2021

   Modified Files:
   	pkgsrc/mail/alpine: Makefile distinfo
   Removed Files:
   	pkgsrc/mail/alpine/patches: patch-imap_src_mtest_mtest.c

   Log Message:
   alpine: Update to 2.25.

   pkgsrc changes and notes:

   - According to the release notes, this fixes CVE-2021-38370 by
     Damian Poddebniak.
   - I have added the maildir patch, as FreeBSD does, because it seems
     useful.
   - I have removed the non-trivial patch for OpenBSD, because going by
     OpenBSD's ports repository it's no longer necessary at all.

      Version 2.25 includes several new features and bug fixes.

      Additions include:
        * Unix Alpine: New configuration variable ssl-ciphers that allows users
          to list the ciphers to use when connecting to a SSL server. Based on a
          collaboration with Professor Martin Trusler.
        * New hidden feature enable-delete-before-writing to add support for
          terminals that need lines to be deleted before being written. Based on
          a collaboration with Professor Martin Trusler.
        * Experimental: The instruction to remove the double quotes from the
          processing of customized headers existed in pine, but it was removed
          in alpine. Restoring old Alpine behavior. See this
        * Add the capability to record http debug. This is necessary to debug
          XOAUTH2 authentication, and records sensitive login information. Do
          not share your debug file if you use this form of debug.
        * Remove the ability to choose between the device and authorize methods
          to login to outlook, since the original client-id can only be used for
          the device method. One needs a special client-id and client-secret to
          use the authorize method in Outlook.
        * PC-Alpine only: Some service providers produce access tokens that are
          too long to save in the Windows Credentials, so the access tokens will
          be split and saved as several pieces. This means that old versions of
          Alpine will NOT be able to use saved passwords once this new version
          of Alpine is used.
        * PC-Alpine: Debug files used to be created with extension .txt1, .txt2,
          etc. Rename those files so that they have extension .txt.
        * Always follow **suppress-asterisks-in-password-prompt** setting in
          the various password prompts. Submitted by tienne Deparis.
        * Use 'alpine -F' instead of 'pine -F' as the browser default pager.
          Submitted by tienne Deparis.
        * Introduction of OTHER CMDS menu for the browser/pilot to let people
          discover the two new commands: "1" is a toggle that switches between 1
          column and multicolumn mode. The "." command toggles between hiding or
          showing hidden files, and the "G" command to travel between
          directories. Contributed by tienne Deparis.
        * Add option -xoauth2-flow to the command line, so that users can
          specify the parameters to set up an xoauth2 connection through the
          command line.
        * Alpine deletes, from its internal memory and external cache, passwords
          that do not work, even if they were saved by the user.
        * New format for saving passwords in the windows credential manager for
          PC-Alpine. Upon starting this new version of Alpine the passwords
          saved in the credential manager are converted to the new format and
          they will not be recognized by old versions of Alpine, but only by
          this and newer versions of Alpine.
        * Enabled encryption protocols in PC-Alpine are based on those enabled
          in the system, unless one is specified directly.

      Bugs that have been addressed include:
        * The c-client library parses information from an IMAP server during
          non-authenticated state which could lead to denial of service.
          Reported by Damian Poddebniak from Mnster University of Applied
          Sciences.
        * Memory corruption when alpine searches for a string that is an
          incomplete utf8 string in a local folder. This could happen by
          chopping a string to make it fit a buffer without regard to its
          content. We fix the string so that chopping it does not damage it.
          Reported by Andrew.
        * Crash in the ntlm authenticator when the user name does not include a
          domain. Reported and fixed by Anders Skargren.
        * When forwarding a message, replacing an attachment might make Alpine
          re-attach the original attachment. Reported by Michael Traxler.
        * When an attachment is deleted, the saved message with the deleted
          attachment contains extra null characters after the end of the
          attachment boundary.
        * Tcp and http debug information is not printed unless the default debug
          level is set to 1. Print this if requested, regardless of what the
          default debug level is.
        * When trying to select a folder for saving a message, one can only
          enter a subfolder by pressing the ">" command, rather than the normal
          navigation by pressing "Return". Reported by Ulf-Dietrich Braunmann.
        * Crash when attempting to remove a configuration for a XOAUTH2 server
          that has no usernames configured.
        * Crash caused by saving (and resaving) XOAUTH2 refresh and access
          tokens in PC-Alpine. Reported by Karl Lindauer.


(tm)
diff -r1.47 -r1.47.8.1 pkgsrc/mail/alpine/Makefile
diff -r1.25 -r1.25.8.1 pkgsrc/mail/alpine/distinfo
diff -r1.3 -r0 pkgsrc/mail/alpine/patches/patch-imap_src_mtest_mtest.c

cvs diff -r1.47 -r1.47.8.1 pkgsrc/mail/alpine/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/alpine/Makefile 2020/11/23 16:36:03 1.47
+++ pkgsrc/mail/alpine/Makefile 2021/10/17 16:41:33 1.47.8.1
@@ -1,38 +1,44 @@ @@ -1,38 +1,44 @@
1# $NetBSD: Makefile,v 1.47 2020/11/23 16:36:03 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.47.8.1 2021/10/17 16:41:33 tm Exp $
2 2
3DISTNAME= alpine-2.24 3DISTNAME= alpine-2.25
4CATEGORIES= mail 4CATEGORIES= mail
5MASTER_SITES= http://alpine.x10host.com/alpine/release/src/ 5MASTER_SITES= http://alpine.x10host.com/alpine/release/src/
 6DIST_SUBDIR= ${DISTNAME}
6EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
7 8
 9PATCH_SITES= https://alpine.x10host.com/alpine/patches/alpine-${PKGVERSION_NOREV}/
 10PATCHFILES+= maildir.patch.gz
 11PATCH_DIST_STRIP= -p1
 12
8MAINTAINER= pkgsrc-users@NetBSD.org 13MAINTAINER= pkgsrc-users@NetBSD.org
9#HOMEPAGE= http://patches.freeiz.com/alpine/release/ 14HOMEPAGE= http://alpine.x10host.com/index.html
10COMMENT= Program for Internet News and E-mail 15COMMENT= Program for Internet News and E-mail
11LICENSE= apache-2.0 16LICENSE= apache-2.0
12 17
13GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
 19USE_TOOLS+= msgfmt msgmerge xgettext
 20USE_LIBTOOL= yes
 21
14CONFIGURE_ARGS+= --with-ssl-dir=${SSLBASE} 22CONFIGURE_ARGS+= --with-ssl-dir=${SSLBASE}
15CONFIGURE_ARGS+= --with-ssl-certs-dir=${SSLCERTS:Q} 23CONFIGURE_ARGS+= --with-ssl-certs-dir=${SSLCERTS:Q}
16CONFIGURE_ARGS+= --with-ssl-include-dir=${SSLBASE}/include 24CONFIGURE_ARGS+= --with-ssl-include-dir=${SSLBASE}/include
17CONFIGURE_ARGS+= --with-ssl-lib-dir=${SSLBASE}/lib 25CONFIGURE_ARGS+= --with-ssl-lib-dir=${SSLBASE}/lib
18CONFIGURE_ARGS+= --with-system-pinerc=${PKG_SYSCONFDIR}/pine.conf 26CONFIGURE_ARGS+= --with-system-pinerc=${PKG_SYSCONFDIR}/pine.conf
19CONFIGURE_ARGS+= --with-system-fixed-pinerc=${PKG_SYSCONFDIR}/pine.conf.fixed 27CONFIGURE_ARGS+= --with-system-fixed-pinerc=${PKG_SYSCONFDIR}/pine.conf.fixed
20CONFIGURE_ARGS+= --with-passfile=.pine-passfile 28CONFIGURE_ARGS+= --with-passfile=.pine-passfile
21# disabled, for Web Alpine Support 29# disabled, for Web Alpine Support
22CONFIGURE_ARGS+= --without-tcl 30CONFIGURE_ARGS+= --without-tcl
23 31
24USE_LIBTOOL= yes 
25 
26MAKE_JOBS_SAFE= no 32MAKE_JOBS_SAFE= no
27INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 33INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
28 34
29.include "../../mk/bsd.prefs.mk" 35.include "../../mk/bsd.prefs.mk"
30 36
31# mach/mach.h defines panic, differently. 37# mach/mach.h defines panic, differently.
32SUBST_CLASSES.Darwin+= panic 38SUBST_CLASSES.Darwin+= panic
33SUBST_STAGE.panic= pre-configure 39SUBST_STAGE.panic= pre-configure
34SUBST_MESSAGE.panic= Renaming the panic function 40SUBST_MESSAGE.panic= Renaming the panic function
35SUBST_FILES.panic= */*.c 41SUBST_FILES.panic= */*.c
36SUBST_FILES.panic+= pith/util.h 42SUBST_FILES.panic+= pith/util.h
37SUBST_SED.panic+= -e 's,panic(,Panic(,g' 43SUBST_SED.panic+= -e 's,panic(,Panic(,g'
38 44

cvs diff -r1.25 -r1.25.8.1 pkgsrc/mail/alpine/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/alpine/distinfo 2020/11/23 16:36:03 1.25
+++ pkgsrc/mail/alpine/distinfo 2021/10/17 16:41:33 1.25.8.1
@@ -1,10 +1,13 @@ @@ -1,10 +1,13 @@
1$NetBSD: distinfo,v 1.25 2020/11/23 16:36:03 bsiegert Exp $ 1$NetBSD: distinfo,v 1.25.8.1 2021/10/17 16:41:33 tm Exp $
2 2
3SHA1 (alpine-2.24.tar.xz) = 42f2936935699686276bc6ab9e510eff7376a3dd 3SHA1 (alpine-2.25/alpine-2.25.tar.xz) = 7f8ab772c1898284d0aa1825c3e18eee72547486
4RMD160 (alpine-2.24.tar.xz) = 1612ff9edfdd66a0ef145f338fa9db26177360e0 4RMD160 (alpine-2.25/alpine-2.25.tar.xz) = 3035891df0de21d15adc0b1665fcb4127b9b5ffd
5SHA512 (alpine-2.24.tar.xz) = 642a51f73732ebdf7c40e2b66370aa2f48fb13b349b477871b26295c3e8b860a0cc78dec9f80efc6ea74c548a080ceff04181eb18c35a9c8cae8d8ef831178c5 5SHA512 (alpine-2.25/alpine-2.25.tar.xz) = 76c214cf66f4ac7af3de40357ad3a592ff2a119e327e5f6c256125b7865d46b09197435fe6ac8077ab7a498e4821925939f3f902431ca77baa786e149466a193
6Size (alpine-2.24.tar.xz) = 7341676 bytes 6Size (alpine-2.25/alpine-2.25.tar.xz) = 7495372 bytes
 7SHA1 (alpine-2.25/maildir.patch.gz) = d7709751b57bc8f0cf7212452c61e82e715744a4
 8RMD160 (alpine-2.25/maildir.patch.gz) = 5c402d391c399763fcf5714cfa7cca7cfbd65964
 9SHA512 (alpine-2.25/maildir.patch.gz) = eea454796cab4e96b83869e880fe17d20799bf3a606712367f42deb0f3870b30f620fc77c307e40303ffc8492e828bb7772965b21614b2c27d4fc972f18ff346
 10Size (alpine-2.25/maildir.patch.gz) = 34758 bytes
7SHA1 (patch-imap_src_c-client_auth_gss.c) = e6da9ee9dbe0751872d1400237a030112eaa56c6 11SHA1 (patch-imap_src_c-client_auth_gss.c) = e6da9ee9dbe0751872d1400237a030112eaa56c6
8SHA1 (patch-imap_src_mtest_mtest.c) = 8c5282047e165fee4b6fe74c230e41d63d3cdc69 
9SHA1 (patch-imap_src_osdep_unix_Makefile.gss) = ca09bc26a139c68afe8ac1f99be54bd1fc0e77f0 12SHA1 (patch-imap_src_osdep_unix_Makefile.gss) = ca09bc26a139c68afe8ac1f99be54bd1fc0e77f0
10SHA1 (patch-imap_src_osdep_unix_kerb_mit.c) = c77d5ee1e8aee30811c2df0562caa375ed270c0e 13SHA1 (patch-imap_src_osdep_unix_kerb_mit.c) = c77d5ee1e8aee30811c2df0562caa375ed270c0e

File Deleted: pkgsrc/mail/alpine/patches/Attic/patch-imap_src_mtest_mtest.c