From 0e9fabcedd3aa800fb482e3c7afec467a22f5250 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 20 Jan 2020 11:28:05 +0100 Subject: [PATCH] alpine: update to 2.22. --- srcpkgs/alpine/patches/418e8bc5.patch | 22 ---------------------- srcpkgs/alpine/patches/libressl.patch | 13 ------------- srcpkgs/alpine/template | 13 +++++++------ 3 files changed, 7 insertions(+), 41 deletions(-) delete mode 100644 srcpkgs/alpine/patches/418e8bc5.patch delete mode 100644 srcpkgs/alpine/patches/libressl.patch diff --git a/srcpkgs/alpine/patches/418e8bc5.patch b/srcpkgs/alpine/patches/418e8bc5.patch deleted file mode 100644 index 7cc8dc7a8c..0000000000 --- a/srcpkgs/alpine/patches/418e8bc5.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 418e8bc5789d9ef223f043848619b6a648748dcc Mon Sep 17 00:00:00 2001 -From: Eduardo Chappa -Date: Thu, 22 Aug 2019 19:11:53 -0600 -Subject: [PATCH 1/1] * Ignore extra text in challenge from smtp server - during authentication. - ---- - imap/src/c-client/smtp.c | 1 + - pith/pine.hlp | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - ---- imap/src/c-client/smtp.c -+++ imap/src/c-client/smtp.c -@@ -363,6 +363,7 @@ void *smtp_challenge (void *s,unsigned long *len) - sprintf (tmp,"SMTP SERVER BUG (invalid challenge, continuing): %.80s",stream->reply+4); - mm_log (tmp,ERROR); - ret = cpystr(""); /* This is silly: fake a reply, it will be ignored */ -+ *len = 0L; - } - return ret; - } - diff --git a/srcpkgs/alpine/patches/libressl.patch b/srcpkgs/alpine/patches/libressl.patch deleted file mode 100644 index 65c6857c9c..0000000000 --- a/srcpkgs/alpine/patches/libressl.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- imap/src/osdep/unix/ssl_unix.c.orig -+++ imap/src/osdep/unix/ssl_unix.c -@@ -249,9 +249,7 @@ - return NIL; /* out of range? bail out */ - - #ifndef OPENSSL_1_1_0 -- if(client_request == SSL3_VERSION) -- return SSLv3_client_method(); -- else if(client_request == TLS1_VERSION) -+ if(client_request == TLS1_VERSION) - return TLSv1_client_method(); - else if(client_request == TLS1_1_VERSION) - return TLSv1_1_client_method(); diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template index 6557a6debc..9b14713bc5 100644 --- a/srcpkgs/alpine/template +++ b/srcpkgs/alpine/template @@ -1,27 +1,28 @@ # Template file for 'alpine' pkgname=alpine -version=2.21.99999 -revision=2 -_githash=abeb2c25935ef8c75f1e5deef0f81276754dc975 +version=2.22 +revision=1 +_githash=99948a254e2c2352547b962cbd1c23738e7af6b3 _gitshort="${_githash:0:7}" wrksrc="${pkgname}-${_gitshort}" build_style=gnu-configure configure_args="--without-passfile --without-tcl --disable-shared - --with-ssl-dir=${XBPS_CROSS_BASE}/usr alpine_SSLPROVIDER=libressl + --with-ssl-dir=${XBPS_CROSS_BASE}/usr --with-system-pinerc=/etc/${pkgname}.d/pine.conf --with-system-fixed-pinerc=/etc/${pkgname}.d/pine.conf.fixed" hostmakedepends="hunspell" -makedepends="pam-devel ncurses-devel gettext-devel libldap-devel mit-krb5-devel" +makedepends="gettext-devel libldap-devel mit-krb5-devel ncurses-devel" short_desc="Apache-licensed PINE mail user agent (with Chappa patches)" maintainer="Leah Neukirchen " license="Apache-2.0" homepage="http://repo.or.cz/alpine.git" distfiles="http://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz" -checksum=983f04e1c5f1beba767877303c682d3c995e0cd93ad6888f2d9933ef4236c25f +checksum=58fd9115174af1105a5b10aa4af527ad3be0ad99a06ea5830881bc78e00cd4fa post_extract() { sed -i -e '/run test program/s/^/: /' \ -e 's/linux-gnu/linux-/g' ${wrksrc}/configure + touch /etc/shadow # bleh } do_build() {