pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail re-alpine: remove, unlikely to support openssl 1....
details: https://anonhg.NetBSD.org/pkgsrc/rev/19a02b541a30
branches: trunk
changeset: 448455:19a02b541a30
user: nia <nia%pkgsrc.org@localhost>
date: Mon Mar 08 11:06:46 2021 +0000
description:
re-alpine: remove, unlikely to support openssl 1.1 any time soon
upstream is pretty dead while development of mail/alpine continues.
diffstat:
mail/Makefile | 3 +-
mail/re-alpine/DESCR | 9 -
mail/re-alpine/Makefile | 49 -
mail/re-alpine/PLIST | 3 -
mail/re-alpine/distinfo | 10 -
mail/re-alpine/options.mk | 30 -
mail/re-alpine/patches/patch-imap_src_c-client_auth_gss.c | 60 -
mail/re-alpine/patches/patch-imap_src_mtest_mtest.c | 303 ----------
mail/re-alpine/patches/patch-imap_src_osdep_unix_Makefile.gss | 22 -
mail/re-alpine/patches/patch-imap_src_osdep_unix_kerb_mit.c | 25 -
10 files changed, 1 insertions(+), 513 deletions(-)
diffs (truncated from 564 to 300 lines):
diff -r 5137481decac -r 19a02b541a30 mail/Makefile
--- a/mail/Makefile Mon Mar 08 11:01:13 2021 +0000
+++ b/mail/Makefile Mon Mar 08 11:06:46 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.566 2021/02/14 14:03:34 taca Exp $
+# $NetBSD: Makefile,v 1.567 2021/03/08 11:06:46 nia Exp $
#
COMMENT= Electronic mail utilities
@@ -329,7 +329,6 @@
SUBDIR+= queue-repair
SUBDIR+= quickml
SUBDIR+= rblcheck
-SUBDIR+= re-alpine
SUBDIR+= relay-ctrl
SUBDIR+= ripmime
SUBDIR+= rmail-mime
diff -r 5137481decac -r 19a02b541a30 mail/re-alpine/DESCR
--- a/mail/re-alpine/DESCR Mon Mar 08 11:01:13 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-Re-alpine is a fork of Alpine with a new development team. (Alpine
-is the official replacement for the Pine email and news client.)
-
-Re-alpine is a screen-oriented message-handling tool (i.e. a mail
-client) with many configurations for the novice and power user.
-
-This package currently only installs the alpine binary, excluding
-the pilot and pico binaries which would cause it to conflict with
-the pine package.
diff -r 5137481decac -r 19a02b541a30 mail/re-alpine/Makefile
--- a/mail/re-alpine/Makefile Mon Mar 08 11:01:13 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-# $NetBSD: Makefile,v 1.21 2020/04/29 20:28:46 maya Exp $
-#
-
-DISTNAME= re-alpine-2.03
-PKGREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=re-alpine/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= reed%reedmedia.net@localhost
-HOMEPAGE= https://sourceforge.net/projects/re-alpine/
-COMMENT= Console-based mail and news client
-LICENSE= apache-2.0
-
-CONFLICTS= alpine-[0-9]*
-
-BROKEN= "Fails to build with OpenSSL 1.1"
-
-.include "options.mk"
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-ssl-dir=${SSLBASE}
-CONFIGURE_ARGS+= --with-ssl-certs-dir=${SSLCERTS:Q}
-CONFIGURE_ARGS+= --with-ssl-include-dir=${SSLBASE}/include
-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-smime
-
-USE_LIBTOOL= yes
-
-MAKE_JOBS_SAFE= no
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-
-.include "../../mk/bsd.prefs.mk"
-
-SUBST_CLASSES.MirBSD+= mirbsd
-SUBST_STAGE.mirbsd= pre-configure
-SUBST_FILES.mirbsd= configure
-SUBST_SED.mirbsd= -e 's,\*-\*-openbsd,*-*-mirbsd,g'
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/alpine/alpine ${DESTDIR}${PREFIX}/bin/alpine
- ${INSTALL_MAN} ${WRKSRC}/doc/alpine.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/alpine.1
-
-.include "../../mk/terminfo.buildlink3.mk"
-.include "../../mk/pam.buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r 5137481decac -r 19a02b541a30 mail/re-alpine/PLIST
--- a/mail/re-alpine/PLIST Mon Mar 08 11:01:13 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/09/15 23:27:05 reed Exp $
-bin/alpine
-man/man1/alpine.1
diff -r 5137481decac -r 19a02b541a30 mail/re-alpine/distinfo
--- a/mail/re-alpine/distinfo Mon Mar 08 11:01:13 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.6 2016/05/14 15:15:45 bsiegert Exp $
-
-SHA1 (re-alpine-2.03.tar.bz2) = 8e1c4f4a4d38814478e8bd3bbeed1c0f8ee9491b
-RMD160 (re-alpine-2.03.tar.bz2) = a541d93007bc859bf7ebf481fb5a8ccd0df0b551
-SHA512 (re-alpine-2.03.tar.bz2) = 7122e66eac47c867cc6f4d8557dad51639087018c1e19b8d7c8a89344b23be7b5beb8178f7a3e14f10c75d1280a3efdef7a30343127e7c538c7faf2a27ee1583
-Size (re-alpine-2.03.tar.bz2) = 5335178 bytes
-SHA1 (patch-imap_src_c-client_auth_gss.c) = 622b18f03074f87036f5469323125b4c855d9ce5
-SHA1 (patch-imap_src_mtest_mtest.c) = a08084e1ea656385b267049bb2465b1af6c2949b
-SHA1 (patch-imap_src_osdep_unix_Makefile.gss) = ca09bc26a139c68afe8ac1f99be54bd1fc0e77f0
-SHA1 (patch-imap_src_osdep_unix_kerb_mit.c) = c77d5ee1e8aee30811c2df0562caa375ed270c0e
diff -r 5137481decac -r 19a02b541a30 mail/re-alpine/options.mk
--- a/mail/re-alpine/options.mk Mon Mar 08 11:01:13 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-# $NetBSD: options.mk,v 1.3 2019/11/02 16:25:27 rillig Exp $
-#
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.alpine
-PKG_SUPPORTED_OPTIONS= ldap kerberos pinepwd
-PKG_SUGGESTED_OPTIONS= pinepwd
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mkerberos)
-CONFIGURE_ARGS+= --with-krb5
-.include "../../mk/krb5.buildlink3.mk"
-MAKE_ENV+= KRB5_TYPE=${KRB5_TYPE}
-MAKE_FLAGS+= EXTRAAUTHENTICATORS=gss
-EXTRASPECIALS+= GSSDIR=${KRB5BASE}
-CFLAGS.heimdal= -DHEIMDAL_KRB5
-CFLAGS+= ${CFLAGS.${KRB5_TYPE}}
-MAKE_FLAGS+= EXTRALDFLAGS=${LDFLAGS:Q}
-MAKE_FLAGS+= EXTRACFLAGS=${CFLAGS:Q}
-MAKE_FLAGS+= EXTRASPECIALS=${EXTRASPECIALS:Q}
-.endif
-
-.if !empty(PKG_OPTIONS:Mldap)
-CONFIGURE_ARGS+= --with-ldap
-.include "../../databases/openldap-client/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mpinepwd)
-CONFIGURE_ARGS+= --with-passfile=.pinepwd
-.endif
diff -r 5137481decac -r 19a02b541a30 mail/re-alpine/patches/patch-imap_src_c-client_auth_gss.c
--- a/mail/re-alpine/patches/patch-imap_src_c-client_auth_gss.c Mon Mar 08 11:01:13 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-$NetBSD: patch-imap_src_c-client_auth_gss.c,v 1.1 2012/10/10 19:49:07 markd Exp $
-
-heimdal support from imap-uw package.
-
---- imap/src/c-client/auth_gss.c.orig 2008-06-04 18:18:34.000000000 +0000
-+++ imap/src/c-client/auth_gss.c
-@@ -26,6 +26,17 @@
- * Last Edited: 30 August 2006
- */
-
-+#ifdef HEIMDAL_KRB5
-+#include <gssapi/gssapi.h>
-+#ifdef GSSAPI_GSSAPI_H_ /* older heimdals use GSSAPI_H_ */
-+#include <gssapi/gssapi_krb5.h>
-+#endif
-+#include <krb5.h>
-+#define gss_nt_service_name GSS_C_NT_HOSTBASED_SERVICE
-+#else
-+#include <gssapi/gssapi_generic.h>
-+#include <gssapi/gssapi_krb5.h>
-+#endif
-
- long auth_gssapi_valid (void);
- long auth_gssapi_client (authchallenge_t challenger,authrespond_t responder,
-@@ -64,15 +75,32 @@ long auth_gssapi_valid (void)
- OM_uint32 smn;
- gss_buffer_desc buf;
- gss_name_t name;
-+ krb5_context ctx;
-+ krb5_keytab kt;
-+ krb5_kt_cursor csr;
-+
-+ /* make a context */
-+ if (krb5_init_context (&ctx))
-+ return NIL;
- /* make service name */
- sprintf (tmp,"%s@%s",(char *) mail_parameters (NIL,GET_SERVICENAME,NIL),
- mylocalhost ());
- buf.length = strlen (buf.value = tmp);
- /* see if can build a name */
- if (gss_import_name (&smn,&buf,GSS_C_NT_HOSTBASED_SERVICE,&name) !=
-- GSS_S_COMPLETE) return NIL;
-- /* remove server method if no keytab */
-- if (!kerberos_server_valid ()) auth_gss.server = NIL;
-+ GSS_S_COMPLETE) {
-+ krb5_free_context (ctx); /* finished with context */
-+ return NIL;
-+ }
-+
-+ /* get default keytab */
-+ if (!krb5_kt_default (ctx,&kt)) {
-+ /* can do server if have good keytab */
-+ if (!krb5_kt_start_seq_get (ctx,kt,&csr))
-+ auth_gss.server = auth_gssapi_server;
-+ krb5_kt_close (ctx,kt); /* finished with keytab */
-+ }
-+ krb5_free_context (ctx); /* finished with context */
- gss_release_name (&smn,&name);/* finished with name */
- return LONGT;
- }
diff -r 5137481decac -r 19a02b541a30 mail/re-alpine/patches/patch-imap_src_mtest_mtest.c
--- a/mail/re-alpine/patches/patch-imap_src_mtest_mtest.c Mon Mar 08 11:01:13 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,303 +0,0 @@
-$NetBSD: patch-imap_src_mtest_mtest.c,v 1.1 2015/11/08 20:57:37 dholland Exp $
-
-- patch up buffer handling (required to build on openbsd)
-
---- imap/src/mtest/mtest.c.orig 2013-08-15 04:36:01.000000000 +0000
-+++ imap/src/mtest/mtest.c
-@@ -81,9 +81,23 @@ void overview_header (MAILSTREAM *stream
- void header (MAILSTREAM *stream,long msgno);
- void display_body (BODY *body,char *pfx,long i);
- void status (MAILSTREAM *stream);
--void prompt (char *msg,char *txt);
-+void prompt (char *msg,char *txt,size_t len);
- void smtptest (long debug);
-
-+static char *dogets(char *buf, size_t max) {
-+ char *ret;
-+ size_t len;
-+
-+ ret = fgets(buf, max, stdin);
-+ if (ret != NULL) {
-+ len = strlen(buf);
-+ if (len > 0 && buf[len-1] == '\n') {
-+ buf[len-1] = '\0';
-+ }
-+ }
-+ return ret;
-+}
-+
- /* Main program - initialization */
-
- int main ()
-@@ -118,13 +132,13 @@ int main ()
- #endif
- curhst = cpystr (mylocalhost ());
- puts ("MTest -- C client test program");
-- if (!*personalname) prompt ("Personal name: ",personalname);
-+ if (!*personalname) prompt ("Personal name: ",personalname, sizeof(personalname));
- /* user wants protocol telemetry? */
-- prompt ("Debug protocol (y/n)?",tmp);
-+ prompt ("Debug protocol (y/n)?",tmp, sizeof(tmp));
- ucase (tmp);
- debug = (tmp[0] == 'Y') ? T : NIL;
- do {
-- prompt ("Mailbox ('?' for help): ",tmp);
-+ prompt ("Mailbox ('?' for help): ",tmp, sizeof(tmp));
- if (!strcmp (tmp,"?")) {
- puts ("Enter INBOX, mailbox name, or IMAP mailbox as {host}mailbox");
- puts ("Known local mailboxes:");
-@@ -155,14 +169,16 @@ void mm (MAILSTREAM *stream,long debug)
- void *sdb = NIL;
- char cmd[MAILTMPLEN];
- char *s,*arg;
-+ size_t argmax;
- unsigned long i;
- unsigned long last = 0;
- BODY *body;
- status (stream); /* first report message status */
- while (stream) {
-- prompt ("MTest>",cmd); /* prompt user, get command */
-+ prompt ("MTest>",cmd, sizeof(cmd)); /* prompt user, get command */
- /* get argument */
- if (arg = strchr (cmd,' ')) *arg++ = '\0';
-+ if (arg) argmax = sizeof(cmd) - (arg - cmd);
- switch (*ucase (cmd)) { /* dispatch based on command */
- case 'B': /* Body command */
- if (arg) last = atoi (arg);
-@@ -189,7 +205,8 @@ void mm (MAILSTREAM *stream,long debug)
- break;
- }
- arg = cmd;
-- sprintf (arg,"%lu",last);
-+ argmax = sizeof(cmd);
-+ snprintf (arg, argmax, "%lu",last);
- }
- if (last && (last <= stream->nmsgs))
- mail_setflag (stream,arg,"\\DELETED");
-@@ -202,6 +219,7 @@ void mm (MAILSTREAM *stream,long debug)
- case 'F': /* Find command */
- if (!arg) {
- arg = "%";
-+ argmax = 0;
- if (s = sm_read (&sdb)) {
- puts ("Local network subscribed mailboxes:");
- do if (*s == '{') (mm_lsub (NIL,NIL,s,NIL));
-@@ -255,7 +273,7 @@ void mm (MAILSTREAM *stream,long debug)
- }
- /* get the new mailbox */
- while (!(stream = mail_open (stream,arg,debug))) {
-- prompt ("Mailbox: ",arg);
-+ prompt ("Mailbox: ",arg, argmax);
- if (!arg[0]) break;
- }
- last = 0;
-@@ -327,7 +345,8 @@ void mm (MAILSTREAM *stream,long debug)
Home |
Main Index |
Thread Index |
Old Index