pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/mail/alpine
Module Name: pkgsrc
Committed By: vins
Date: Mon Sep 8 12:57:17 UTC 2025
Modified Files:
pkgsrc/mail/alpine: Makefile distinfo options.mk
pkgsrc/mail/alpine/patches: patch-imap_src_osdep_unix_ssl__unix.c
Added Files:
pkgsrc/mail/alpine/patches: patch-alpine_smime.c
patch-pith_charconv_utf8.c
Log Message:
mail/alpine: fix some compiler warnings and hard-coded paths.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 pkgsrc/mail/alpine/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/mail/alpine/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/mail/alpine/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/alpine/patches/patch-alpine_smime.c \
pkgsrc/mail/alpine/patches/patch-pith_charconv_utf8.c
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/mail/alpine/patches/patch-imap_src_osdep_unix_ssl__unix.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.60 pkgsrc/mail/alpine/Makefile:1.61
--- pkgsrc/mail/alpine/Makefile:1.60 Sat Apr 19 07:58:00 2025
+++ pkgsrc/mail/alpine/Makefile Mon Sep 8 12:57:17 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.60 2025/04/19 07:58:00 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2025/09/08 12:57:17 vins Exp $
DISTNAME= alpine-2.26
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= mail
# repo at https://repo.or.cz/alpine.git
MASTER_SITES= https://alpineapp.email/alpine/release/src/
@@ -46,6 +46,7 @@ CONFIGURE_ARGS+= --with-ssl-include-dir=
CONFIGURE_ARGS+= --with-ssl-lib-dir=${SSLBASE}/lib
CONFIGURE_ARGS+= --with-system-pinerc=${PKG_SYSCONFDIR}/pine.conf
CONFIGURE_ARGS+= --with-system-fixed-pinerc=${PKG_SYSCONFDIR}/pine.conf.fixed
+CONFIGURE_ARGS+= --with-local-support-info=${PREFIX}/${PKGINFODIR}/pine.info
CONFIGURE_ARGS+= --with-passfile=.pine-passfile
CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
CONFIGURE_ARGS+= --with-libintl-prefix=${BUILDLINK_PREFIX.gettext}
@@ -84,11 +85,14 @@ SUBST_SED.panic+= -e 's,panic *(,Panic(,
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_FILES.paths= doc/man1/alpine.1 doc/tech-notes/*.txt
+SUBST_FILES.paths+= pith/filter.c pith/pine.hlp imap/src/osdep/unix/Makefile
+SUBST_SED.paths+= -e "s:/usr/local/lib/pine.conf:${PKG_SYSCONFDIR}/pine.conf:g" \
+ -e "s:/usr/local/lib/pine.info:${PREFIX}/${PKGINFODIR}/pine.info:g" \
+ -e "s:/usr/local/pine.conf:${PKG_SYSCONFDIR}/pine.conf:g" \
+ -e "s:/usr/local/lib:${PKG_SYSCONFDIR}:g" \
+ -e "s:/usr/local/bin:${PREFIX}/bin:g" \
+ -e "s:/usr/local/ssl:${SSLDIR}:g"
SUBST_CLASSES+= var
SUBST_STAGE.var= pre-configure
@@ -112,8 +116,10 @@ do-install:
.endfor
post-install:
- ${RUN}${WRKSRC}/alpine/alpine -conf > ${DESTDIR}${EGDIR}/pine.conf
- ${INSTALL_DATA} ${PKG_DOCS:S|^|${WRKSRC}/|} ${DESTDIR}${DOCDIR}
+ ${RUN} ${WRKSRC}/alpine/alpine -conf > \
+ ${DESTDIR}${EGDIR}/pine.conf
+ ${INSTALL_DATA} ${PKG_DOCS:S|^|${WRKSRC}/|} \
+ ${DESTDIR}${DOCDIR}
# This must come first, or at least before gettext-tools, because the
# latter includes termcap.buildlink3.mk instead; that sets things up
Index: pkgsrc/mail/alpine/distinfo
diff -u pkgsrc/mail/alpine/distinfo:1.32 pkgsrc/mail/alpine/distinfo:1.33
--- pkgsrc/mail/alpine/distinfo:1.32 Tue Jun 18 08:40:04 2024
+++ pkgsrc/mail/alpine/distinfo Mon Sep 8 12:57:17 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2024/06/18 08:40:04 markd Exp $
+$NetBSD: distinfo,v 1.33 2025/09/08 12:57:17 vins Exp $
BLAKE2s (alpine-2.26/WrtAcc.patch.gz) = 0ac2c946dea8f432bdfc1f847f2f31b9ef70d1634244fed1ec252c5baf812747
SHA512 (alpine-2.26/WrtAcc.patch.gz) = 494d798775a384e8e42639437b14ee09bc174520f705e8830636f2039668cbe0f441011de753cb98f5a4d89059c285ef0fc205249a3a079bb0a88c4389cbd595
@@ -15,17 +15,19 @@ Size (alpine-2.26/fancy.patch.gz) = 2505
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/maildir.patch.gz) = 320a7986e702f2b62b8d79dbef2d8b51d304831ea1b3a6ec5625b1db8bd5bb54
+SHA512 (alpine-2.26/maildir.patch.gz) = cc5333ff1352cbfe18fe14203b22e1f5a82e6d2fdabca65f55c60fd185470571e72b2a9dc2b48295f019ebaf95ff839e0376668e4f1d96b65b91ed1882c224d9
+Size (alpine-2.26/maildir.patch.gz) = 35559 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-alpine_smime.c) = 4ae23697ee1b47b3c68844ef76dfb33b2fb034ff
SHA1 (patch-configure) = 0c5e82a48625afb7c225a3d9b828bedb3f6c82c2
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-imap_src_osdep_unix_ssl__unix.c) = 066141968c13c2b342d869987e2abe5204b69635
SHA1 (patch-pico_osdep_terminal.c) = 19a5467e9ac98a42c581fbe50d774b9762762436
+SHA1 (patch-pith_charconv_utf8.c) = 7f80532b13c2fc8edb37017dd84d5be9b23bc027
Index: pkgsrc/mail/alpine/options.mk
diff -u pkgsrc/mail/alpine/options.mk:1.7 pkgsrc/mail/alpine/options.mk:1.8
--- pkgsrc/mail/alpine/options.mk:1.7 Mon Feb 27 20:08:37 2023
+++ pkgsrc/mail/alpine/options.mk Mon Sep 8 12:57:17 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2023/02/27 20:08:37 vins Exp $
+# $NetBSD: options.mk,v 1.8 2025/09/08 12:57:17 vins Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.alpine
@@ -53,7 +53,7 @@ CONFIGURE_ARGS+= --without-pthread
###
.if !empty(PKG_OPTIONS:Mkerberos)
. include "../../mk/krb5.buildlink3.mk"
-CONFIGURE_ARGS+= --with-krb5-dir=${KRB5BASE:Q}
+CONFIGURE_ARGS+= --with-krb5-dir=${KRB5BASE}
CONFIGURE_ENV+= alpine_GSSTYPE=${KRB5_TYPE}
.else
CONFIGURE_ARGS+= --without-krb5
Index: pkgsrc/mail/alpine/patches/patch-imap_src_osdep_unix_ssl__unix.c
diff -u pkgsrc/mail/alpine/patches/patch-imap_src_osdep_unix_ssl__unix.c:1.1 pkgsrc/mail/alpine/patches/patch-imap_src_osdep_unix_ssl__unix.c:1.2
--- pkgsrc/mail/alpine/patches/patch-imap_src_osdep_unix_ssl__unix.c:1.1 Sun Feb 26 20:39:49 2023
+++ pkgsrc/mail/alpine/patches/patch-imap_src_osdep_unix_ssl__unix.c Mon Sep 8 12:57:17 2025
@@ -1,7 +1,7 @@
-$NetBSD: patch-imap_src_osdep_unix_ssl__unix.c,v 1.1 2023/02/26 20:39:49 vins Exp $
+$NetBSD: patch-imap_src_osdep_unix_ssl__unix.c,v 1.2 2025/09/08 12:57:17 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.
+* 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
Added files:
Index: pkgsrc/mail/alpine/patches/patch-alpine_smime.c
diff -u /dev/null pkgsrc/mail/alpine/patches/patch-alpine_smime.c:1.1
--- /dev/null Mon Sep 8 12:57:17 2025
+++ pkgsrc/mail/alpine/patches/patch-alpine_smime.c Mon Sep 8 12:57:17 2025
@@ -0,0 +1,18 @@
+$NetBSD: patch-alpine_smime.c,v 1.1 2025/09/08 12:57:17 vins Exp $
+
+Use X509_ALGOR_get0 instead of directly accessing X509_ALGOR.
+
+--- alpine/smime.c.orig 2022-06-03 00:14:00.463274817 +0000
++++ alpine/smime.c
+@@ -292,7 +292,10 @@ format_smime_info(int pass, BODY *body,
+ gf_puts(_("The algorithm used to encrypt was "), pc);
+
+ if(alg){
+- char *n = (char *) OBJ_nid2sn( OBJ_obj2nid(alg->algorithm));
++ const ASN1_OBJECT *obj;
++ const char *n;
++ X509_ALGOR_get0(&obj, NULL, NULL, alg);
++ n = OBJ_nid2sn(OBJ_obj2nid(obj));
+
+ gf_puts(n ? n : "<unknown>", pc);
+
Index: pkgsrc/mail/alpine/patches/patch-pith_charconv_utf8.c
diff -u /dev/null pkgsrc/mail/alpine/patches/patch-pith_charconv_utf8.c:1.1
--- /dev/null Mon Sep 8 12:57:17 2025
+++ pkgsrc/mail/alpine/patches/patch-pith_charconv_utf8.c Mon Sep 8 12:57:17 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-pith_charconv_utf8.c,v 1.1 2025/09/08 12:57:17 vins Exp $
+
+Provide a declaration of wcwidth().
+
+--- pith/charconv/utf8.c.orig 2025-09-08 11:34:06.467704256 +0000
++++ pith/charconv/utf8.c
+@@ -12,6 +12,7 @@
+ * ========================================================================
+ */
+
++#include <wchar.h>
+
+ /* includable WITHOUT dependency on c-client */
+ #include "../../c-client/mail.h"
Home |
Main Index |
Thread Index |
Old Index