This updates alpine to 2.26. I don't remember what needs to be tested
with PHP. The diff went through a full amd64 bulk without fallout.
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/alpine/Makefile,v
retrieving revision 1.59
diff -u -p -r1.59 Makefile
--- Makefile 7 Aug 2022 08:15:51 -0000 1.59
+++ Makefile 21 Dec 2022 09:39:30 -0000
@@ -6,7 +6,7 @@ COMMENT-pico= UW text editor
COMMENT-pilot= UW file system navigator
FIX_EXTRACT_PERMISSIONS = Yes
-V= 2.25
+V= 2.26
DISTNAME= alpine-${V}
EXTRACT_SUFX= .tar.xz
@@ -17,12 +17,8 @@ PICO_V= 5.09
# grep PILOT_VERSION ${WRKSRC}/pico/pilot.c
PILOT_V= 2.99
-REVISION-main= 3
REVISION-pico= 26
REVISION-pilot= 26
-REVISION-c-client= 4
-REVISION-mailutil= 2
-REVISION-imap= 2
PKGNAME-main= alpine-${V}
PKGNAME-c-client= c-client-${V}
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/alpine/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo 22 Sep 2021 20:57:10 -0000 1.10
+++ distinfo 21 Dec 2022 09:39:37 -0000
@@ -1,2 +1,2 @@
-SHA256 (alpine-2.25.tar.xz) = ZYoVCYL2dAu0Eo5t2BGI6qEhLKC/aJuDwgk7tRjs93Y=
-SIZE (alpine-2.25.tar.xz) = 7495372
+SHA256 (alpine-2.26.tar.xz) = wHecK+bEfTBVSFSj4U7142U5UCszEGiFEyknWJipuro=
+SIZE (alpine-2.26.tar.xz) = 7517628
Index: patches/patch-alpine_pine-use_c
===================================================================
RCS file: /cvs/ports/mail/alpine/patches/patch-alpine_pine-use_c,v
retrieving revision 1.6
diff -u -p -r1.6 patch-alpine_pine-use_c
--- patches/patch-alpine_pine-use_c 11 Mar 2022 19:34:32 -0000 1.6
+++ patches/patch-alpine_pine-use_c 21 Dec 2022 09:42:17 -0000
@@ -1,6 +1,7 @@
---- alpine/pine-use.c.orig Mon Feb 6 01:06:22 2017
-+++ alpine/pine-use.c Tue Apr 25 11:10:08 2017
-@@ -24,7 +24,7 @@ static char rcsid[] = "$Id: pine-use.c 761 2007-10-23
+Index: alpine/pine-use.c
+--- alpine/pine-use.c.orig
++++ alpine/pine-use.c
+@@ -20,7 +20,7 @@
#include <sys/stat.h>
#ifndef MAILSPOOLPCTS
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/mail/alpine/patches/patch-configure,v
retrieving revision 1.12
diff -u -p -r1.12 patch-configure
--- patches/patch-configure 11 Mar 2022 19:34:32 -0000 1.12
+++ patches/patch-configure 21 Dec 2022 09:42:13 -0000
@@ -1,7 +1,7 @@
Index: configure
--- configure.orig
+++ configure
-@@ -13717,6 +13717,7 @@ fi
+@@ -14878,6 +14878,7 @@ fi
fi
@@ -9,7 +9,7 @@ Index: configure
-@@ -14862,6 +14863,7 @@ $as_echo "$ac_res" >&6; }
+@@ -16023,6 +16024,7 @@ $as_echo "$ac_res" >&6; }
INCINTL=
fi
Index: patches/patch-imap_src_osdep_unix_Makefile
===================================================================
RCS file: /cvs/ports/mail/alpine/patches/patch-imap_src_osdep_unix_Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 patch-imap_src_osdep_unix_Makefile
--- patches/patch-imap_src_osdep_unix_Makefile 11 Mar 2022 19:34:32 -0000
1.7
+++ patches/patch-imap_src_osdep_unix_Makefile 21 Dec 2022 09:42:13 -0000
@@ -35,7 +35,7 @@ Index: imap/src/osdep/unix/Makefile
@@ -156,6 +158,7 @@ BINARIES=osdep.o mail.o misc.o newsrc.o smanager.o utf
dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
rfc822.o nntp.o smtp.o imap4r1.o http.o json.o pop3.o \
- unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o mix.o
+ unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o mix.o sha.o
+SOBINARIES=$(BINARIES:.o=.so)
CFLAGS=-g
@@ -93,7 +93,7 @@ Index: imap/src/osdep/unix/Makefile
# Dependencies
-@@ -924,7 +939,7 @@ http.o: mail.h misc.h osdep.h utf8.h http.h json.h
+@@ -925,7 +940,7 @@ sha.o: mail.h misc.h osdep.h sha.h sha-private.h hash.
# OS-dependent
@@ -102,7 +102,7 @@ Index: imap/src/osdep/unix/Makefile
osdep.h env_unix.h tcp_unix.h oauth2_aux.h \
osdep.c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c ip_unix.c\
auths.c crexcl.c flockcyg.c flocklnx.c flocksim.c fsync.c \
-@@ -939,12 +954,12 @@ osdep.o:mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
+@@ -940,12 +955,12 @@ osdep.o:mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
write.c sslstdio.c \
strerror.c strpbrk.c strstr.c strtok.c strtoul.c \
OSCFLAGS
Index: patches/patch-imap_src_osdep_unix_ssl_unix_c
===================================================================
RCS file: /cvs/ports/mail/alpine/patches/patch-imap_src_osdep_unix_ssl_unix_c,v
retrieving revision 1.6
diff -u -p -r1.6 patch-imap_src_osdep_unix_ssl_unix_c
--- patches/patch-imap_src_osdep_unix_ssl_unix_c 11 Mar 2022 19:34:32
-0000 1.6
+++ patches/patch-imap_src_osdep_unix_ssl_unix_c 21 Dec 2022 09:42:13
-0000
@@ -11,7 +11,7 @@ Index: imap/src/osdep/unix/ssl_unix.c
+ int ssl_err;
unsigned long sl,tl;
int minv, maxv;
- int masklow, maskhigh;
+ long masklow, maskhigh;
@@ -465,7 +466,13 @@ static char *ssl_start_work (SSLSTREAM *stream,char *h
SSL_set_connect_state (stream->con);
if (SSL_in_init (stream->con)) SSL_total_renegotiations (stream->con);
Index: patches/patch-pico_osdep_terminal_c
===================================================================
RCS file: /cvs/ports/mail/alpine/patches/patch-pico_osdep_terminal_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-pico_osdep_terminal_c
--- patches/patch-pico_osdep_terminal_c 11 Mar 2022 19:34:32 -0000 1.3
+++ patches/patch-pico_osdep_terminal_c 21 Dec 2022 09:42:13 -0000
@@ -1,7 +1,7 @@
Index: pico/osdep/terminal.c
--- pico/osdep/terminal.c.orig
+++ pico/osdep/terminal.c
-@@ -192,6 +192,12 @@ setup_dflt_esc_seq(void)
+@@ -188,6 +188,12 @@ setup_dflt_esc_seq(void)
kpinsert("\033[H", KEY_HOME, 1);
kpinsert("\033[F", KEY_END, 1);
Index: patches/patch-pith_conf_c
===================================================================
RCS file: /cvs/ports/mail/alpine/patches/patch-pith_conf_c,v
retrieving revision 1.8
diff -u -p -r1.8 patch-pith_conf_c
--- patches/patch-pith_conf_c 11 Mar 2022 19:34:32 -0000 1.8
+++ patches/patch-pith_conf_c 21 Dec 2022 09:42:13 -0000
@@ -3,7 +3,7 @@ By default, check "Do Not Send Flowed Te
Index: pith/conf.c
--- pith/conf.c.orig
+++ pith/conf.c
-@@ -2972,7 +2972,7 @@ feature_list(int index)
+@@ -2974,7 +2974,7 @@ feature_list(int index)
{"use-sender-not-x-sender", "Use Sender Instead of X-X-Sender",
F_USE_SENDER_NOT_X, h_config_use_sender_not_x, PREF_SEND, 0},
{"quell-flowed-text", "Do Not Send Flowed Text",
Index: pkg/PLIST-c-client
===================================================================
RCS file: /cvs/ports/mail/alpine/pkg/PLIST-c-client,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST-c-client
--- pkg/PLIST-c-client 11 Mar 2022 19:34:32 -0000 1.5
+++ pkg/PLIST-c-client 21 Dec 2022 09:46:40 -0000
@@ -13,6 +13,7 @@ include/c-client/flocksim.h
include/c-client/flstring.h
include/c-client/fs.h
include/c-client/ftl.h
+include/c-client/hash.h
include/c-client/http.h
include/c-client/imap4r1.h
include/c-client/json.h
@@ -28,6 +29,8 @@ include/c-client/oauth2_aux.h
include/c-client/osdep.h
include/c-client/pseudo.h
include/c-client/rfc822.h
+include/c-client/sha-private.h
+include/c-client/sha.h
include/c-client/smtp.h
include/c-client/sslio.h
include/c-client/tcp.h
