Someone who uses this, please test, alpine failing knocks out nearly
300 packages/subpackages from a build with -fno-common default (i.e.
for the clang11 update).
I know there are some users because there were reports of libressl
problems recently :)
I moved the XXX to a non-XXX comment near MASTER_SITES, the releases
are cut from that repo anyway.
Diff also at https://junkpile.org/alpine-2.24.diff
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/alpine/Makefile,v
retrieving revision 1.48
diff -u -p -r1.48 Makefile
--- Makefile 13 Sep 2020 08:05:08 -0000 1.48
+++ Makefile 1 Feb 2021 22:42:24 -0000
@@ -1,7 +1,5 @@
# $OpenBSD: Makefile,v 1.48 2020/09/13 08:05:08 tb Exp $
-# XXX consider moving to https://repo.or.cz/alpine.git
-
COMMENT-main= UW e-mail client
COMMENT-c-client= UW c-client mail access routines
COMMENT-imap= UW IMAP4rev1/POP2/POP3 mail servers
@@ -10,7 +8,7 @@ COMMENT-pico= UW text editor
COMMENT-pilot= UW file system navigator
FIX_EXTRACT_PERMISSIONS = Yes
-V= 2.21
+V= 2.24
DISTNAME= alpine-${V}
EXTRACT_SUFX= .tar.xz
@@ -28,9 +26,8 @@ PKGNAME-mailutil= mailutil-uw-${V}
PKGNAME-pico= pico-${PICO_V}
PKGNAME-pilot= pilot-${PILOT_V}
-REVISION= 5
-REVISION-pico= 20
-REVISION-pilot= 20
+REVISION-pico= 21
+REVISION-pilot= 21
EPOCH-c-client= 0
EPOCH-imap= 0
@@ -42,14 +39,16 @@ CATEGORIES-c-client= devel mail
CATEGORIES-pico= editors
CATEGORIES-pilot= sysutils
-HOMEPAGE= http://alpine.x10host.com/
+HOMEPAGE= https://alpine.x10host.com/
# Apache 2.0
PERMIT_PACKAGE= Yes
-MASTER_SITES= http://alpine.x10host.com/alpine/release/
+# repo at https://repo.or.cz/alpine.git
+MASTER_SITES= https://alpine.x10host.com/alpine/release/src/
MULTI_PACKAGES= -main -c-client -imap -mailutil -pico -pilot
+DEBUG_PACKAGES= ${BUILD_PACKAGES}
WANTLIB += c crypto iconv intl curses ssl
@@ -82,6 +81,7 @@ CONFIGURE_ARGS= --with-system-pinerc=${
--with-interactive-spellcheck=aspell \
--with-c-client-target=bso \
--with-debug-level=0 \
+ --with-bundled-tools \
--without-ldap \
--without-tcl \
--without-npa \
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/alpine/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo 25 Apr 2017 09:20:53 -0000 1.8
+++ distinfo 1 Feb 2021 22:42:24 -0000
@@ -1,2 +1,2 @@
-SHA256 (alpine-2.21.tar.xz) = YDC2iBuBaFRnVqs6XkNijY1WRTmwR2V44od3VXOndDg=
-SIZE (alpine-2.21.tar.xz) = 4720856
+SHA256 (alpine-2.24.tar.xz) = ZRqf+gop4rZGoKbg1aLIxQ8noHomphZAt8eD0G0KvO8=
+SIZE (alpine-2.24.tar.xz) = 7341676
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/mail/alpine/patches/patch-configure,v
retrieving revision 1.9
diff -u -p -r1.9 patch-configure
--- patches/patch-configure 25 Apr 2017 09:20:53 -0000 1.9
+++ patches/patch-configure 1 Feb 2021 22:42:24 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-configure,v 1.9 2017/04/25 09:20:53 ajacoutot Exp $
---- configure.orig Mon Feb 6 01:06:22 2017
-+++ configure Tue Apr 25 11:10:08 2017
-@@ -13778,6 +13778,7 @@ fi
+Index: configure
+--- configure.orig
++++ configure
+@@ -13714,6 +13714,7 @@ fi
fi
@@ -9,7 +10,7 @@ $OpenBSD: patch-configure,v 1.9 2017/04/
-@@ -14923,6 +14924,7 @@ $as_echo "$ac_res" >&6; }
+@@ -14859,6 +14860,7 @@ $as_echo "$ac_res" >&6; }
INCINTL=
fi
Index: patches/patch-doc_man1_alpine_1
===================================================================
RCS file: /cvs/ports/mail/alpine/patches/patch-doc_man1_alpine_1,v
retrieving revision 1.1
diff -u -p -r1.1 patch-doc_man1_alpine_1
--- patches/patch-doc_man1_alpine_1 25 Apr 2017 09:20:53 -0000 1.1
+++ patches/patch-doc_man1_alpine_1 1 Feb 2021 22:42:24 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-doc_man1_alpine_1,v 1.1 2017/04/25 09:20:53 ajacoutot Exp $
---- doc/man1/alpine.1.orig Mon Feb 6 01:06:22 2017
-+++ doc/man1/alpine.1 Tue Apr 25 11:13:00 2017
-@@ -301,7 +301,7 @@ uses the following environment variables:
+Index: doc/man1/alpine.1
+--- doc/man1/alpine.1.orig
++++ doc/man1/alpine.1
+@@ -318,7 +318,7 @@ uses the following environment variables:
.if n .ta 2.8i
.if t .ta 2.1i
@@ -10,7 +11,7 @@ $OpenBSD: patch-doc_man1_alpine_1,v 1.1
.br
~/mail Default directory for mail folders.
.br
-@@ -337,7 +337,7 @@ uses the following environment variables:
+@@ -354,7 +354,7 @@ uses the following environment variables:
.br
~/.alpine-smime/public Directory that contains public key(s).
.br
Index: patches/patch-imap_Makefile
===================================================================
RCS file: /cvs/ports/mail/alpine/patches/patch-imap_Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 patch-imap_Makefile
--- patches/patch-imap_Makefile 24 Mar 2014 12:54:55 -0000 1.3
+++ patches/patch-imap_Makefile 1 Feb 2021 22:42:24 -0000
@@ -2,9 +2,10 @@ $OpenBSD: patch-imap_Makefile,v 1.3 2014
mtest.c calls gets()
---- imap/Makefile.orig Thu Aug 15 06:36:13 2013
-+++ imap/Makefile Sun Mar 23 17:26:41 2014
-@@ -586,8 +586,8 @@ sslunix sslsco:
+Index: imap/Makefile
+--- imap/Makefile.orig
++++ imap/Makefile
+@@ -587,8 +587,8 @@ sslunix sslsco:
@echo ++ SSLTYPE=$(SSLTYPE).nopwd
@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@echo
@@ -15,7 +16,7 @@ mtest.c calls gets()
nounenc:
@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-@@ -676,7 +676,7 @@ an ua:
+@@ -677,7 +677,7 @@ an ua:
$(TOOLS)/$@ "$(LN)" src/ansilib c-client
$(TOOLS)/$@ "$(LN)" src/charset c-client
$(TOOLS)/$@ "$(LN)" src/osdep/$(SYSTEM) c-client
@@ -24,10 +25,10 @@ mtest.c calls gets()
$(TOOLS)/$@ "$(LN)" src/ipopd ipopd
$(TOOLS)/$@ "$(LN)" src/imapd imapd
$(TOOLS)/$@ "$(LN)" src/mailutil mailutil
-@@ -713,7 +713,7 @@ rebuildclean:
-
+@@ -718,7 +718,7 @@ bundledno:
bundled:
@echo Building bundled tools...
+ @echo BUNDLED=$(BUNDLED)
- $(CD) mtest;$(MAKE)
+# $(CD) mtest;$(MAKE)
$(CD) ipopd;$(MAKE)
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.5
diff -u -p -r1.5 patch-imap_src_osdep_unix_Makefile
--- patches/patch-imap_src_osdep_unix_Makefile 25 Apr 2017 09:20:53 -0000 1.5
+++ patches/patch-imap_src_osdep_unix_Makefile 1 Feb 2021 22:42:24 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-imap_src_osdep_unix_Makefile,v 1.5 2017/04/25 09:20:53 ajacoutot Exp $
---- imap/src/osdep/unix/Makefile.orig Mon Jan 12 06:12:25 2015
-+++ imap/src/osdep/unix/Makefile Thu Mar 10 22:35:28 2016
-@@ -44,7 +44,7 @@ IP=4
+Index: imap/src/osdep/unix/Makefile
+--- imap/src/osdep/unix/Makefile.orig
++++ imap/src/osdep/unix/Makefile
+@@ -44,7 +44,7 @@ BUNDLED=
# -O3 seems to be safe, but empirical observation from our local expert
# indicates that in some (many?) cases -O3 code runs slower than -O2.
@@ -23,7 +24,7 @@ $OpenBSD: patch-imap_src_osdep_unix_Make
SSLINCLUDE=$(SSLDIR)/include
SSLLIB=$(SSLDIR)/lib
-@@ -150,6 +150,8 @@ DEFAULTAUTHENTICATORS=ext md5 pla log
+@@ -149,6 +149,8 @@ DEFAULTAUTHENTICATORS=ext md5 pla log bea oa2
DEFAULTDRIVERS=imap nntp pop3 mix mx mbx tenex mtx mh mmdf unix news phile
CHUNKSIZE=65536
@@ -32,15 +33,15 @@ $OpenBSD: patch-imap_src_osdep_unix_Make
# Normally no need to change any of these
ARCHIVE=c-client.a
-@@ -157,6 +159,7 @@ BINARIES=osdep.o mail.o misc.o newsrc.o smanager.o utf
+@@ -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 pop3.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
+SOBINARIES=$(BINARIES:.o=.so)
CFLAGS=-g
CAT=cat
-@@ -165,6 +168,11 @@ MV=mv
+@@ -164,6 +167,11 @@ MV=mv
RM=rm -rf
SH=sh
@@ -52,7 +53,7 @@ $OpenBSD: patch-imap_src_osdep_unix_Make
# Primary build command
-@@ -284,6 +292,7 @@ bso: # OpenBSD
+@@ -283,6 +291,7 @@ bso: # OpenBSD
SPOOLDIR=/var \
ACTIVEFILE=/usr/local/news/lib/active \
RSHPATH=/usr/bin/rsh \
@@ -60,7 +61,7 @@ $OpenBSD: patch-imap_src_osdep_unix_Make
BASECFLAGS="$(GCCCFLAGS)"
cvx: # Convex
-@@ -864,23 +873,29 @@ vu2: # VAX Ultrix 2.3, etc.
+@@ -872,23 +881,29 @@ vu2: # VAX Ultrix 2.3, etc.
# Build it!
@@ -93,16 +94,16 @@ $OpenBSD: patch-imap_src_osdep_unix_Make
# Dependencies
-@@ -915,7 +930,7 @@ utf8aux.o: mail.h misc.h osdep.h utf8.h
+@@ -924,7 +939,7 @@ http.o: mail.h misc.h osdep.h utf8.h http.h json.h
# OS-dependent
-osdep.o:mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
+OSDEPS= mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
- osdep.h env_unix.h tcp_unix.h \
+ 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 \
-@@ -929,12 +944,12 @@ osdep.o:mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
+@@ -939,12 +954,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_env_unix_c
===================================================================
RCS file: /cvs/ports/mail/alpine/patches/patch-imap_src_osdep_unix_env_unix_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-imap_src_osdep_unix_env_unix_c
--- patches/patch-imap_src_osdep_unix_env_unix_c 10 Jul 2016 11:55:21 -0000 1.3
+++ patches/patch-imap_src_osdep_unix_env_unix_c 1 Feb 2021 22:42:24 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-imap_src_osdep_unix_env_unix_c,v 1.3 2016/07/10 11:55:21 ajacoutot Exp $
---- imap/src/osdep/unix/env_unix.c.orig Mon Jan 12 05:12:25 2015
-+++ imap/src/osdep/unix/env_unix.c Sun Jul 10 11:38:07 2016
-@@ -644,11 +644,11 @@ long server_input_wait (long seconds)
+Index: imap/src/osdep/unix/env_unix.c
+--- imap/src/osdep/unix/env_unix.c.orig
++++ imap/src/osdep/unix/env_unix.c
+@@ -668,11 +668,11 @@ long server_input_wait (long seconds)
static struct passwd *pwuser (unsigned char *user)
{
unsigned char *s;
@@ -15,7 +16,7 @@ $OpenBSD: patch-imap_src_osdep_unix_env_
fs_give ((void **) &s);
}
}
-@@ -967,15 +967,12 @@ char *myhomedir ()
+@@ -991,15 +991,12 @@ char *myhomedir ()
static char *mymailboxdir ()
{
char *home = myhomedir ();
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.2
diff -u -p -r1.2 patch-imap_src_osdep_unix_ssl_unix_c
--- patches/patch-imap_src_osdep_unix_ssl_unix_c 13 Sep 2020 08:05:08 -0000 1.2
+++ patches/patch-imap_src_osdep_unix_ssl_unix_c 1 Feb 2021 22:42:24 -0000
@@ -6,23 +6,15 @@ $OpenBSD: patch-imap_src_osdep_unix_ssl_
Index: imap/src/osdep/unix/ssl_unix.c
--- imap/src/osdep/unix/ssl_unix.c.orig
+++ imap/src/osdep/unix/ssl_unix.c
-@@ -266,6 +266,7 @@ static char *ssl_start_work (SSLSTREAM *stream,char *h
+@@ -391,6 +391,7 @@ static char *ssl_start_work (SSLSTREAM *stream,char *h
{
BIO *bio;
X509 *cert;
+ int ssl_err;
unsigned long sl,tl;
- char *s,*t,*err,tmp[MAILTMPLEN], buf[256];
- sslcertificatequery_t scq =
-@@ -313,12 +314,21 @@ static char *ssl_start_work (SSLSTREAM *stream,char *h
- /* create connection */
- if (!(stream->con = (SSL *) SSL_new (stream->context)))
- return "SSL connection failed";
-+ if (host && !SSL_set_tlsext_host_name(stream->con, host)) {
-+ return "Server Name Identification (SNI) failed";
-+ }
- bio = BIO_new_socket (stream->tcpstream->tcpsi,BIO_NOCLOSE);
- SSL_set_bio (stream->con,bio,bio);
+ int minv, maxv;
+ int masklow, maskhigh;
+@@ -459,7 +460,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);
/* now negotiate SSL */
Index: patches/patch-pith_conf_c
===================================================================
RCS file: /cvs/ports/mail/alpine/patches/patch-pith_conf_c,v
retrieving revision 1.5
diff -u -p -r1.5 patch-pith_conf_c
--- patches/patch-pith_conf_c 25 Apr 2017 09:20:53 -0000 1.5
+++ patches/patch-pith_conf_c 1 Feb 2021 22:42:24 -0000
@@ -2,9 +2,10 @@ $OpenBSD: patch-pith_conf_c,v 1.5 2017/0
By default, check "Do Not Send Flowed Text".
---- pith/conf.c.orig Mon Feb 6 01:06:22 2017
-+++ pith/conf.c Tue Apr 25 11:10:11 2017
-@@ -2867,7 +2867,7 @@ feature_list(int index)
+Index: pith/conf.c
+--- pith/conf.c.orig
++++ pith/conf.c
+@@ -2967,7 +2967,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.2
diff -u -p -r1.2 PLIST-c-client
--- pkg/PLIST-c-client 19 Mar 2015 20:25:26 -0000 1.2
+++ pkg/PLIST-c-client 1 Feb 2021 22:42:24 -0000
@@ -33,5 +33,5 @@ include/c-client/tcp_unix.h
include/c-client/unix.h
include/c-client/utf8.h
include/c-client/utf8aux.h
-lib/libc-client.a
+@static-lib lib/libc-client.a
@lib lib/libc-client.so.${LIBc-client_VERSION}
No comments:
Post a Comment