From bf39c9a1bab37170f9658b63212ce103bea9d71d Mon Sep 17 00:00:00 2001 From: nia Date: Mon, 8 Mar 2021 11:06:46 +0000 Subject: re-alpine: remove, unlikely to support openssl 1.1 any time soon upstream is pretty dead while development of mail/alpine continues. --- 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 -- .../patches/patch-imap_src_c-client_auth_gss.c | 60 ---- .../re-alpine/patches/patch-imap_src_mtest_mtest.c | 303 --------------------- .../patches/patch-imap_src_osdep_unix_Makefile.gss | 22 -- .../patches/patch-imap_src_osdep_unix_kerb_mit.c | 25 -- 10 files changed, 1 insertion(+), 513 deletions(-) delete mode 100644 mail/re-alpine/DESCR delete mode 100644 mail/re-alpine/Makefile delete mode 100644 mail/re-alpine/PLIST delete mode 100644 mail/re-alpine/distinfo delete mode 100644 mail/re-alpine/options.mk delete mode 100644 mail/re-alpine/patches/patch-imap_src_c-client_auth_gss.c delete mode 100644 mail/re-alpine/patches/patch-imap_src_mtest_mtest.c delete mode 100644 mail/re-alpine/patches/patch-imap_src_osdep_unix_Makefile.gss delete mode 100644 mail/re-alpine/patches/patch-imap_src_osdep_unix_kerb_mit.c (limited to 'mail') diff --git a/mail/Makefile b/mail/Makefile index 1755f2fecd4..ddb2aa1805c 100644 --- a/mail/Makefile +++ b/mail/Makefile @@ -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-fix SUBDIR+= queue-repair SUBDIR+= quickml SUBDIR+= rblcheck -SUBDIR+= re-alpine SUBDIR+= relay-ctrl SUBDIR+= ripmime SUBDIR+= rmail-mime diff --git a/mail/re-alpine/DESCR b/mail/re-alpine/DESCR deleted file mode 100644 index da7cd0d48b7..00000000000 --- a/mail/re-alpine/DESCR +++ /dev/null @@ -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 --git a/mail/re-alpine/Makefile b/mail/re-alpine/Makefile deleted file mode 100644 index 5e3dcd8b3b0..00000000000 --- a/mail/re-alpine/Makefile +++ /dev/null @@ -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 -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 --git a/mail/re-alpine/PLIST b/mail/re-alpine/PLIST deleted file mode 100644 index 04bcb753350..00000000000 --- a/mail/re-alpine/PLIST +++ /dev/null @@ -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 --git a/mail/re-alpine/distinfo b/mail/re-alpine/distinfo deleted file mode 100644 index 1b54bc865a2..00000000000 --- a/mail/re-alpine/distinfo +++ /dev/null @@ -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 --git a/mail/re-alpine/options.mk b/mail/re-alpine/options.mk deleted file mode 100644 index 4f46ed2ae84..00000000000 --- a/mail/re-alpine/options.mk +++ /dev/null @@ -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 --git a/mail/re-alpine/patches/patch-imap_src_c-client_auth_gss.c b/mail/re-alpine/patches/patch-imap_src_c-client_auth_gss.c deleted file mode 100644 index 3287d854a5a..00000000000 --- a/mail/re-alpine/patches/patch-imap_src_c-client_auth_gss.c +++ /dev/null @@ -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 -+#ifdef GSSAPI_GSSAPI_H_ /* older heimdals use GSSAPI_H_ */ -+#include -+#endif -+#include -+#define gss_nt_service_name GSS_C_NT_HOSTBASED_SERVICE -+#else -+#include -+#include -+#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 --git a/mail/re-alpine/patches/patch-imap_src_mtest_mtest.c b/mail/re-alpine/patches/patch-imap_src_mtest_mtest.c deleted file mode 100644 index e5576dcc9c2..00000000000 --- a/mail/re-alpine/patches/patch-imap_src_mtest_mtest.c +++ /dev/null @@ -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) - break; - } - arg = cmd; -- sprintf (arg,"%lu",last); -+ argmax = sizeof(cmd); -+ snprintf (arg, argmax, "%lu",last); - } - if (last > 0 && last <= stream->nmsgs) - mail_clearflag (stream,arg,"\\DELETED"); -@@ -376,7 +395,7 @@ void overview_header (MAILSTREAM *stream - tmp[3] = elt->answered ? 'A' : ' '; - tmp[4] = elt->deleted ? 'D' : ' '; - mail_parse_date (&selt,ov->date); -- sprintf (tmp+5,"%4lu) ",elt->msgno); -+ snprintf (tmp+5, sizeof(tmp)-5, "%4lu) ",elt->msgno); - mail_date (tmp+11,&selt); - tmp[17] = ' '; - tmp[18] = '\0'; -@@ -386,19 +405,20 @@ void overview_header (MAILSTREAM *stream - for (adr = ov->from; adr && !adr->host; adr = adr->next); - if (adr) { /* if a personal name exists use it */ - if (!(t = adr->personal)) -- sprintf (t = tmp+400,"%s@%s",adr->mailbox,adr->host); -+ snprintf (t = tmp+400, sizeof(tmp)-400, "%s@%s",adr->mailbox,adr->host); - memcpy (tmp+18,t,(size_t) min (20,(long) strlen (t))); - } - strcat (tmp," "); - if (i = elt->user_flags) { - strcat (tmp,"{"); -+ /* XXX bounds? */ - while (i) { - strcat (tmp,stream->user_flags[find_rightmost_bit (&i)]); - if (i) strcat (tmp," "); - } - strcat (tmp,"} "); - } -- sprintf (tmp + strlen (tmp),"%.25s (%lu chars)", -+ snprintf (tmp + strlen (tmp), 400 - strlen(tmp), "%.25s (%lu chars)", - ov->subject ? ov->subject : " ",ov->optional.octets); - puts (tmp); - } -@@ -415,6 +435,7 @@ void header (MAILSTREAM *stream,long msg - unsigned long i; - char tmp[MAILTMPLEN]; - char *t; -+ size_t len; - MESSAGECACHE *cache = mail_elt (stream,msgno); - mail_fetchstructure (stream,msgno,NIL); - tmp[0] = cache->recent ? (cache->seen ? 'R': 'N') : ' '; -@@ -422,7 +443,7 @@ void header (MAILSTREAM *stream,long msg - tmp[2] = cache->flagged ? 'F' : ' '; - tmp[3] = cache->answered ? 'A' : ' '; - tmp[4] = cache->deleted ? 'D' : ' '; -- sprintf (tmp+5,"%4lu) ",cache->msgno); -+ snprintf (tmp+5, sizeof(tmp)-5, "%4lu) ",cache->msgno); - mail_date (tmp+11,cache); - tmp[17] = ' '; - tmp[18] = '\0'; -@@ -437,7 +458,9 @@ void header (MAILSTREAM *stream,long msg - strcat (tmp,"} "); - } - mail_fetchsubject (t = tmp + strlen (tmp),stream,msgno,(long) 25); -- sprintf (t += strlen (t)," (%lu chars)",cache->rfc822_size); -+ len = strlen (t); -+ t += len; -+ snprintf (t, sizeof(tmp)-len, " (%lu chars)",cache->rfc822_size); - puts (tmp); - } - -@@ -451,31 +474,57 @@ void display_body (BODY *body,char *pfx, - { - char tmp[MAILTMPLEN]; - char *s = tmp; -+ size_t len, smax = sizeof(tmp); - PARAMETER *par; - PART *part; /* multipart doesn't have a row to itself */ - if (body->type == TYPEMULTIPART) { - /* if not first time, extend prefix */ -- if (pfx) sprintf (tmp,"%s%ld.",pfx,++i); -+ if (pfx) snprintf (tmp, sizeof(tmp), "%s%ld.",pfx,++i); - else tmp[0] = '\0'; - for (i = 0,part = body->nested.part; part; part = part->next) - display_body (&part->body,tmp,i++); - } - else { /* non-multipart, output oneline descriptor */ - if (!pfx) pfx = ""; /* dummy prefix if top level */ -- sprintf (s," %s%ld %s",pfx,++i,body_types[body->type]); -- if (body->subtype) sprintf (s += strlen (s),"/%s",body->subtype); -- if (body->description) sprintf (s += strlen (s)," (%s)",body->description); -- if (par = body->parameter) do -- sprintf (s += strlen (s),";%s=%s",par->attribute,par->value); -+ snprintf (s, smax, " %s%ld %s",pfx,++i,body_types[body->type]); -+ if (body->subtype) { -+ len = strlen(s); -+ s += len; -+ smax -= len; -+ snprintf (s, smax, "/%s",body->subtype); -+ } -+ if (body->description) { -+ len = strlen(s); -+ s += len; -+ smax -= len; -+ snprintf (s, smax, " (%s)",body->description); -+ } -+ if (par = body->parameter) do { -+ len = strlen(s); -+ s += len; -+ smax -= len; -+ snprintf (s, smax, ";%s=%s",par->attribute,par->value); -+ } - while (par = par->next); -- if (body->id) sprintf (s += strlen (s),", id = %s",body->id); -+ if (body->id) { -+ len = strlen(s); -+ s += len; -+ smax -= len; -+ snprintf (s, smax, ", id = %s",body->id); -+ } - switch (body->type) { /* bytes or lines depending upon body type */ - case TYPEMESSAGE: /* encapsulated message */ - case TYPETEXT: /* plain text */ -- sprintf (s += strlen (s)," (%lu lines)",body->size.lines); -+ len = strlen(s); -+ s += len; -+ smax -= len; -+ snprintf (s, smax, " (%lu lines)",body->size.lines); - break; - default: -- sprintf (s += strlen (s)," (%lu bytes)",body->size.bytes); -+ len = strlen(s); -+ s += len; -+ smax -= len; -+ snprintf (s, smax, " (%lu bytes)",body->size.bytes); - break; - } - puts (tmp); /* output this line */ -@@ -484,7 +533,7 @@ void display_body (BODY *body,char *pfx, - (body = body->nested.msg->body)) { - if (body->type == TYPEMULTIPART) display_body (body,pfx,i-1); - else { /* build encapsulation prefix */ -- sprintf (tmp,"%s%ld.",pfx,i); -+ snprintf (tmp, sizeof(tmp), "%s%ld.",pfx,i); - display_body (body,tmp,(long) 0); - } - } -@@ -592,10 +641,10 @@ void status (MAILSTREAM *stream) - * pointer to input buffer - */ - --void prompt (char *msg,char *txt) -+void prompt (char *msg,char *txt, size_t max) - { - printf ("%s",msg); -- gets (txt); -+ dogets (txt, max); - } - - /* Interfaces to C-client */ -@@ -699,10 +748,13 @@ void mm_login (NETMBX *mb,char *user,cha - if (curhst) fs_give ((void **) &curhst); - curhst = (char *) fs_get (1+strlen (mb->host)); - strcpy (curhst,mb->host); -- sprintf (s = tmp,"{%s/%s",mb->host,mb->service); -- if (*mb->user) sprintf (tmp+strlen (tmp),"/user=%s",strcpy (user,mb->user)); -- if (*mb->authuser) sprintf (tmp+strlen (tmp),"/authuser=%s",mb->authuser); -- if (*mb->user) strcat (s = tmp,"} password:"); -+ snprintf (s = tmp, sizeof(tmp), "{%s/%s",mb->host,mb->service); -+ if (*mb->user) snprintf (tmp+strlen (tmp), sizeof(tmp)-strlen(tmp), "/user=%s",strcpy (user,mb->user)); -+ if (*mb->authuser) snprintf (tmp+strlen (tmp), sizeof(tmp)-strlen(tmp), "/authuser=%s",mb->authuser); -+ if (*mb->user) { -+ s = tmp; -+ snprintf(tmp+strlen(tmp), sizeof(tmp)-strlen(tmp), "%s", "} password:"); -+ } - else { - printf ("%s} username: ",tmp); - fgets (user,NETMAXUSER-1,stdin); -@@ -758,14 +810,14 @@ void smtptest (long debug) - msg->return_path = mail_newaddr (); - msg->return_path->mailbox = cpystr (curusr); - msg->return_path->host = cpystr (curhst); -- prompt ("To: ",line); -+ prompt ("To: ",line, sizeof(line)); - rfc822_parse_adrlist (&msg->to,line,curhst); - if (msg->to) { -- prompt ("cc: ",line); -+ prompt ("cc: ",line, sizeof(line)); - rfc822_parse_adrlist (&msg->cc,line,curhst); - } - else { -- prompt ("Newsgroups: ",line); -+ prompt ("Newsgroups: ",line, sizeof(line)); - if (*line) msg->newsgroups = cpystr (line); - else { - mail_free_body (&body); -@@ -774,12 +826,12 @@ void smtptest (long debug) - return; - } - } -- prompt ("Subject: ",line); -+ prompt ("Subject: ",line, sizeof(line)); - msg->subject = cpystr (line); - puts (" Msg (end with a line with only a '.'):"); - body->type = TYPETEXT; - *text = '\0'; -- while (gets (line)) { -+ while (dogets (line, sizeof(line))) { - if (line[0] == '.') { - if (line[1] == '\0') break; - else strcat (text,"."); diff --git a/mail/re-alpine/patches/patch-imap_src_osdep_unix_Makefile.gss b/mail/re-alpine/patches/patch-imap_src_osdep_unix_Makefile.gss deleted file mode 100644 index 75f0fd16943..00000000000 --- a/mail/re-alpine/patches/patch-imap_src_osdep_unix_Makefile.gss +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-imap_src_osdep_unix_Makefile.gss,v 1.1 2012/10/10 19:49:07 markd Exp $ - -heimdal support from imap-uw package. - ---- imap/src/osdep/unix/Makefile.gss.orig 2007-04-05 02:20:04.000000000 +0000 -+++ imap/src/osdep/unix/Makefile.gss -@@ -29,11 +29,13 @@ - GSSDIR=/usr/local - GSSINCLUDE=$(GSSDIR)/include - GSSLIB=$(GSSDIR)/lib --GSSCFLAGS= -I$(GSSINCLUDE) -DGSS_C_NT_HOSTBASED_SERVICE=gss_nt_service_name -DKRB5_DEPRECATED=1 -+GSSCFLAGS= -I$(GSSINCLUDE) -I$(GSSDIR)/include/krb5 - GSSOLDLDFLAGS= -L$(GSSLIB) -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err - GSSNEWLDFLAGS= -L$(GSSLIB) -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err - - gss: # GSSAPI Kerberos V flags - echo $(GSSCFLAGS) >> OSCFLAGS -- sh -c '(test -f $(GSSLIB)/libk5crypto.a) && echo $(GSSNEWLDFLAGS) || echo $(GSSOLDLDFLAGS)' >> LDFLAGS -+ sh -c '(test -f $(GSSLIB)/libk5crypto.a) && echo $(GSSNEWLDFLAGS) || echo $(GSSOLDLDFLAGS)' >> LDFLAGS.gss1 -+ sh -c '(test -z "$(KRB5_CONFIG)") || $(KRB5_CONFIG) --libs gssapi' > LDFLAGS.gss2 -+ sh -c '(test -z "$(KRB5_CONFIG)") && cat LDFLAGS.gss1 || cat LDFLAGS.gss2' >> LDFLAGS - echo "#include \"kerb_mit.c\"" >> auths.c diff --git a/mail/re-alpine/patches/patch-imap_src_osdep_unix_kerb_mit.c b/mail/re-alpine/patches/patch-imap_src_osdep_unix_kerb_mit.c deleted file mode 100644 index 39789f57052..00000000000 --- a/mail/re-alpine/patches/patch-imap_src_osdep_unix_kerb_mit.c +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-imap_src_osdep_unix_kerb_mit.c,v 1.1 2012/10/10 19:49:08 markd Exp $ - -heimdal support from imap-uw package. - ---- imap/src/osdep/unix/kerb_mit.c.orig 2008-06-04 18:18:34.000000000 +0000 -+++ imap/src/osdep/unix/kerb_mit.c -@@ -26,9 +26,18 @@ - * Last Edited: 30 August 2006 - */ - -+#ifdef HEIMDAL_KRB5 -+#include -+#ifdef GSSAPI_GSSAPI_H_ /* older heimdals use GSSAPI_H_ */ -+#include -+#endif -+#include -+#define gss_nt_service_name GSS_C_NT_HOSTBASED_SERVICE -+#else - #define PROTOTYPE(x) x - #include - #include -+#endif - - - long kerberos_server_valid (void); -- cgit v1.2.3