Date: Wed, 13 Oct 1999 21:31:09 -0400 (EDT) From: jack@germanium.xtalwind.net To: FreeBSD-gnats-submit@freebsd.org Subject: ports/14313: Update port pine 4.10 -> 4.20 Message-ID: <199910140131.VAA56132@germanium.xtalwind.net>
next in thread | raw e-mail | index | archive | help
>Number: 14313 >Category: ports >Synopsis: Update port pine 4.10 -> 4.20 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Oct 13 18:40:01 PDT 1999 >Closed-Date: >Last-Modified: >Originator: >Release: FreeBSD 3.3-STABLE i386 >Organization: >Environment: >Description: Update of mail/pine4 to 4.20 >How-To-Repeat: >Fix: diff -ruN pine4.old/Makefile pine4/Makefile --- pine4.old/Makefile Wed Aug 25 18:53:05 1999 +++ pine4/Makefile Wed Oct 13 17:36:01 1999 @@ -1,5 +1,5 @@ # New ports collection makefile for: pine -# Version required: 4.10 +# Version required: 4.20 # Date created: 09 July 1998 # Whom: Adrian Penisoara <ady@freebsd.ady.ro> # @@ -9,8 +9,8 @@ # pine4-ssl port. Also, please mirror changes to the files/ # directory to the pine4-ssl port. -DISTNAME?= pine4.10 -PKGNAME?= pine-4.10 +DISTNAME?= pine4.20 +PKGNAME?= pine-4.20 CATEGORIES= mail news MASTER_SITES= ftp://ftp.cac.washington.edu/pine/ diff -ruN pine4.old/files/md5 pine4/files/md5 --- pine4.old/files/md5 Sun Mar 14 20:41:18 1999 +++ pine4/files/md5 Wed Oct 13 17:37:01 1999 @@ -1,2 +1 @@ -MD5 (pine4.10.tar.gz) = f871e201b4070da1f060f35d3b8f2ccd -SIZE (pine4.10.tar.gz) = 2827865 +MD5 (pine4.20.tar.gz) = 9b60a049e3575fc0b1a201f5f0105f14 diff -ruN pine4.old/patches/patch-aa pine4/patches/patch-aa --- pine4.old/patches/patch-aa Sun Mar 14 20:41:19 1999 +++ pine4/patches/patch-aa Wed Dec 31 19:00:00 1969 @@ -1,98 +0,0 @@ -Patch posted on BUGTRAQ & pine-info mailing lists which fixes the -so-called "remote exploit in pine" bug. -More info: http://www.washington.edu/pine/pine-info/1999.02/msg00056.html -*** ./pine/init.c.orig Tue Jan 26 11:57:56 1999 ---- ./pine/init.c Tue Feb 9 19:23:06 1999 -*************** -*** 1791,1796 **** ---- 1791,1798 ---- - F_QUELL_PARTIAL_FETCH, NO_HELP, PREF_NONE}, - {"save-aggregates-copy-sequence", - F_AGG_SEQ_COPY, NO_HELP, PREF_NONE}, -+ {"enable-mailcap-param-substitution", -+ F_DO_MAILCAP_PARAM_SUBST, NO_HELP, PREF_NONE}, - {"termdef-takes-precedence", - F_TCAP_WINS, NO_HELP, PREF_NONE} - }; -*** ./pine/mailcap.c.orig Wed Nov 18 10:00:15 1998 ---- ./pine/mailcap.c Tue Feb 9 19:23:40 1999 -*************** -*** 739,745 **** - dprint(5, (debugfile, "- mc_passes_test -\n")); - - if(mc->testcommand && *mc->testcommand) -! cmd = mc_bld_test_cmd(mc->testcommand, type, subtype, params); - - if(!mc->testcommand || !cmd || !*cmd){ - if(cmd) ---- 739,746 ---- - dprint(5, (debugfile, "- mc_passes_test -\n")); - - if(mc->testcommand && *mc->testcommand) -! if(!(cmd = mc_bld_test_cmd(mc->testcommand, type, subtype, params))) -! return(FALSE); /* couldn't be built */ - - if(!mc->testcommand || !cmd || !*cmd){ - if(cmd) -*************** -*** 794,800 **** - if(needsterm) - *needsterm = mc->needsterminal; - -! command = mc_cmd_bldr(mc->command, type, subtype, params, tmp_file); - - dprint(5, (debugfile, "built command: %s\n", command)); - ---- 795,802 ---- - if(needsterm) - *needsterm = mc->needsterminal; - -! if(!(command = mc_cmd_bldr(mc->command, type, subtype, params, tmp_file))) -! command = cpystr(""); - - dprint(5, (debugfile, "built command: %s\n", command)); - -*************** -*** 871,876 **** ---- 873,884 ---- - break; - - case '{': /* insert requested MIME param */ -+ if(F_OFF(F_DO_MAILCAP_PARAM_SUBST, ps_global)){ -+ dprint(2, -+ (debugfile, "mc_cmd_bldr: param subs %s\n", from)); -+ return(NULL); -+ } -+ - s = strindex(from, '}'); - if(!s){ - q_status_message1(SM_ORDER, 0, 4, -*************** -*** 956,962 **** - sprintf(to, MC_ADD_TMP, tmp_file); - - return(cpystr(tmp_20k_buf)); -! } - - - /* ---- 964,970 ---- - sprintf(to, MC_ADD_TMP, tmp_file); - - return(cpystr(tmp_20k_buf)); -! } - - - /* -*** ./pine/pine.h.orig Thu Jan 28 16:52:00 1999 ---- ./pine/pine.h Tue Feb 9 19:23:21 1999 -*************** -*** 886,891 **** ---- 886,892 ---- - F_SHOW_TEXTPLAIN_INT, - F_ROLE_CONFIRM_DEFAULT, - F_NO_FCC_ATTACH, -+ F_DO_MAILCAP_PARAM_SUBST, - #ifdef ENABLE_LDAP - F_ADD_LDAP_TO_ABOOK, - #endif diff -ruN pine4.old/patches/patch-ab pine4/patches/patch-ab --- pine4.old/patches/patch-ab Sun Mar 14 20:41:19 1999 +++ pine4/patches/patch-ab Wed Dec 31 19:00:00 1969 @@ -1,70 +0,0 @@ -Modified version of a patch posted on pine-info which adds the -_TIMEZONE_ token for the reply-leadin feature. -Credit: Dan Wing <dwing@cisco.com> -*** pine/pine.h.orig Thu Feb 25 19:51:33 1999 ---- pine/pine.h Thu Feb 25 19:52:35 1999 -*************** -*** 1414,1420 **** - iDate, iLDate, iS1Date, iS2Date, iS3Date, iS4Date, iSDate, - iRDate, - iTime24, iTime12, -! iCurDate, iCurTime24, iCurTime12, - iMessNo, iAtt, iMsgID, iSubject, - iSize, iDescripSize, - iNewsAndTo, iToAndNews, iNewsAndRecips, iRecipsAndNews, ---- 1414,1420 ---- - iDate, iLDate, iS1Date, iS2Date, iS3Date, iS4Date, iSDate, - iRDate, - iTime24, iTime12, -! iCurDate, iCurTime24, iCurTime12, iTimezone, - iMessNo, iAtt, iMsgID, iSubject, - iSize, iDescripSize, - iNewsAndTo, iToAndNews, iNewsAndRecips, iRecipsAndNews, -*** pine/reply.c.orig Thu Jan 28 00:32:10 1999 ---- pine/reply.c Thu Feb 25 19:52:01 1999 -*************** -*** 2207,2212 **** ---- 2207,2213 ---- - case iYear: - case iDate: - case iLDate: -+ case iTimezone: - if(env && env->date && env->date[0] && maxlen >= 20) - date_str(env->date, type, 1, buf); - -*** pine/mailindx.c.orig Wed Jan 27 04:50:04 1999 ---- pine/mailindx.c Thu Feb 25 19:52:01 1999 -*************** -*** 1871,1876 **** ---- 1871,1877 ---- - {"CURDATE", iCurDate, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE}, - {"CURTIME24", iCurTime24, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE}, - {"CURTIME12", iCurTime12, FOR_INDEX|FOR_REPLY_INTRO|FOR_TEMPLATE}, -+ {"TIMEZONE", iTimezone, FOR_REPLY_INTRO|FOR_TEMPLATE}, - {NULL, iNothing, FOR_NOTHING} - }; - -*************** -*** 3316,3321 **** ---- 3317,3323 ---- - case iCurDate: - case iCurTime24: - case iCurTime12: -+ case iTimezone: - break; - - default: -*************** -*** 3413,3418 **** ---- 3415,3425 ---- - } - - switch(type){ -+ case iTimezone: -+ sprintf(str, "%+03d%02d", -+ d.hours_off_gmt, -+ d.min_off_gmt); -+ break; - case iRDate: - sprintf(str, "%s%s%s %s %s", - (d.wkday != -1) ? week_abbrev(d.wkday) : "", diff -ruN pine4.old/patches/patch-al pine4/patches/patch-al --- pine4.old/patches/patch-al Sun Mar 14 20:41:19 1999 +++ pine4/patches/patch-al Wed Oct 13 17:54:01 1999 @@ -1,100 +1,60 @@ -*** build.orig Wed Dec 16 01:53:29 1998 ---- build Tue Feb 9 21:38:45 1999 -*************** -*** 80,87 **** - pine The Pine mailer. Once compiled this should work just fine on - your system with no other files than this binary, and no - modifications to your system. Optionally you may create two -! configuration files, /usr/local/lib/pine.conf and -! /usr/local/lib/pine.info. See the documentation for details. - - pico The standalone editor similar to the Pine message composer. - This is a very simple straight forward text editor. ---- 80,87 ---- - pine The Pine mailer. Once compiled this should work just fine on - your system with no other files than this binary, and no - modifications to your system. Optionally you may create two -! configuration files, /usr/local/etc/pine.conf and -! /usr/local/etc/pine.info. See the documentation for details. - - pico The standalone editor similar to the Pine message composer. - This is a very simple straight forward text editor. -*************** -*** 277,287 **** +--- build.orig Fri Feb 19 18:30:54 1999 ++++ build Wed Oct 13 17:53:42 1999 +@@ -80,8 +80,9 @@ + pine The Pine mailer. Once compiled this should work just fine on + your system with no other files than this binary, and no + modifications to your system. Optionally you may create two +- configuration files, /usr/local/lib/pine.conf and +- /usr/local/lib/pine.info. See the documentation for details. ++ configuration files, /usr/local/etc/pine.conf and ++ /usr/local/etc/pine.info. See the documentation for details. ++ - if [ -s c-client ] ; then rm -f c-client ; fi - ln -s imap/c-client c-client -! if [ -s mtest ] ; then rm -f mtest ; fi -! ln -s imap/mtest mtest -! if [ -s imapd ] ; then rm -f imapd ; fi -! ln -s imap/imapd imapd -! echo "Making c-client library, mtest and imapd" - eval echo make "$makeargs" "$K1" "$K2" $ccltarg - cd $PHOME/imap - eval make "$makeargs" "$K1" "$K2" $ccltarg ---- 277,287 ---- - - if [ -s c-client ] ; then rm -f c-client ; fi - ln -s imap/c-client c-client -! # if [ -s mtest ] ; then rm -f mtest ; fi -! # ln -s imap/mtest mtest -! # if [ -s imapd ] ; then rm -f imapd ; fi -! # ln -s imap/imapd imapd -! echo "Making c-client library" - eval echo make "$makeargs" "$K1" "$K2" $ccltarg - cd $PHOME/imap - eval make "$makeargs" "$K1" "$K2" $ccltarg -*************** -*** 302,315 **** - cd $PHOME/bin - rm -f pine mtest imapd pico pilot - if [ -s ../pine/pine ] ; then ln ../pine/pine pine ; fi -! if [ -s ../mtest/mtest ] ; then ln ../mtest/mtest mtest ; fi -! if [ -s ../imapd/imapd ] ; then ln ../imapd/imapd imapd ; fi - if [ -s ../pico/pico ] ; then ln ../pico/pico pico ; fi - if [ -s ../pico/pilot ] ; then ln ../pico/pilot pilot ; fi - cd $PHOME - echo '' - echo "Links to executables are in bin directory:" -! size bin/pine bin/mtest bin/imapd bin/pico bin/pilot - echo "Done" - ;; - ---- 302,315 ---- - cd $PHOME/bin - rm -f pine mtest imapd pico pilot - if [ -s ../pine/pine ] ; then ln ../pine/pine pine ; fi -! # if [ -s ../mtest/mtest ] ; then ln ../mtest/mtest mtest ; fi -! # if [ -s ../imapd/imapd ] ; then ln ../imapd/imapd imapd ; fi - if [ -s ../pico/pico ] ; then ln ../pico/pico pico ; fi - if [ -s ../pico/pilot ] ; then ln ../pico/pilot pilot ; fi - cd $PHOME - echo '' - echo "Links to executables are in bin directory:" -! size bin/pine bin/pico bin/pilot - echo "Done" - ;; - -*************** -*** 320,329 **** - make clean - echo "Cleaning Pine" - cd $PHOME/pine -! make -f makefile.ult clean - echo "Cleaning pico" - cd $PHOME/pico -! make $makeargs -f makefile.ult clean - echo "Done" - cd $PHOME - ;; ---- 320,329 ---- - make clean - echo "Cleaning Pine" - cd $PHOME/pine -! make -f makefile.bsf clean - echo "Cleaning pico" - cd $PHOME/pico -! make $makeargs -f makefile.bsf clean - echo "Done" - cd $PHOME - ;; + pico The standalone editor similar to the Pine message composer. + This is a very simple straight forward text editor. +@@ -278,10 +279,10 @@ + + if [ -s c-client ] ; then rm -f c-client ; fi + ln -s imap/c-client c-client +- if [ -s mtest ] ; then rm -f mtest ; fi +- ln -s imap/mtest mtest +- if [ -s imapd ] ; then rm -f imapd ; fi +- ln -s imap/imapd imapd ++# if [ -s mtest ] ; then rm -f mtest ; fi ++# ln -s imap/mtest mtest ++# if [ -s imapd ] ; then rm -f imapd ; fi ++# ln -s imap/imapd imapd + echo "Making c-client library, mtest and imapd" + eval echo make "$makeargs" "$K1" "$K2" $ccltarg + cd $PHOME/imap +@@ -303,14 +304,14 @@ + cd $PHOME/bin + rm -f pine mtest imapd pico pilot + if [ -s ../pine/pine ] ; then ln ../pine/pine pine ; fi +- if [ -s ../mtest/mtest ] ; then ln ../mtest/mtest mtest ; fi +- if [ -s ../imapd/imapd ] ; then ln ../imapd/imapd imapd ; fi ++# if [ -s ../mtest/mtest ] ; then ln ../mtest/mtest mtest ; fi ++# if [ -s ../imapd/imapd ] ; then ln ../imapd/imapd imapd ; fi + if [ -s ../pico/pico ] ; then ln ../pico/pico pico ; fi + if [ -s ../pico/pilot ] ; then ln ../pico/pilot pilot ; fi + cd $PHOME + echo '' + echo "Links to executables are in bin directory:" +- size bin/pine bin/mtest bin/imapd bin/pico bin/pilot ++ size bin/pine bin/pico bin/pilot + case $maketarg in + mnt) echo "Fixing stacksizes ..." + fixstk 64K bin/pine bin/pico bin/imapd bin/mtest bin/pilot +@@ -325,10 +326,10 @@ + make clean + echo "Cleaning Pine" + cd $PHOME/pine +- make -f makefile.ult clean ++ make -f makefile.bsf clean + echo "Cleaning pico" + cd $PHOME/pico +- make $makeargs -f makefile.ult clean ++ make $makeargs -f makefile.bsf clean + echo "Done" + cd $PHOME + ;; diff -ruN pine4.old/patches/patch-ar pine4/patches/patch-ar --- pine4.old/patches/patch-ar Sun Mar 14 20:41:19 1999 +++ pine4/patches/patch-ar Wed Dec 31 19:00:00 1969 @@ -1,23 +0,0 @@ -*** imap/src/osdep/unix/unix.c.orig Sat Jan 23 06:30:02 1999 ---- imap/src/osdep/unix/unix.c Tue Feb 9 22:08:54 1999 -*************** -*** 1001,1007 **** - case EACCES: /* protection failure */ - if (stat (hitch,&sb)) { /* try again if file exists(?) */ - /* punt silently if paranoid site */ -! if (mail_parameters (NIL,GET_LOCKEACCESERROR,NIL)) - mm_log ("Mailbox vulnerable - directory must have 1777 protection", - WARN); - *lock = '\0'; /* give up on lock file */ ---- 1001,1011 ---- - case EACCES: /* protection failure */ - if (stat (hitch,&sb)) { /* try again if file exists(?) */ - /* punt silently if paranoid site */ -! if ( -! #ifdef __FreeBSD__ -! strncmp(lock,"/var/mail/",10) && /* /var/mail/... isn't lockable */ -! #endif -! mail_parameters (NIL,GET_LOCKEACCESERROR,NIL)) - mm_log ("Mailbox vulnerable - directory must have 1777 protection", - WARN); - *lock = '\0'; /* give up on lock file */ diff -ruN pine4.old/patches/patch-as pine4/patches/patch-as --- pine4.old/patches/patch-as Sun Mar 14 20:41:19 1999 +++ pine4/patches/patch-as Wed Oct 13 18:09:01 1999 @@ -16,19 +16,7 @@ ! come out of the .pinerc and the @@PREFIX@@/etc/pine.conf files. Some can be set by the user while in Pine. Eventually all the local ones should be so and maybe the global ones too. - -*************** -*** 597,602 **** ---- 597,605 ---- - #ifdef DF_SMTP_SERVER - GLO_SMTP_SERVER = parse_list(DF_SMTP_SERVER, 1, NULL); - #endif -+ -+ F_TURN_ON(F_TCAP_WINS,ps); -+ F_TURN_ON(F_QUELL_INTERNAL_MSG,ps); - - /* Set the default mail directory */ - build_path(buf, GLO_MAIL_DIRECTORY, "[]"); + *** pico/edef.h.orig Thu Apr 23 02:53:44 1998 --- pico/edef.h Tue Feb 9 22:14:08 1999 *************** diff -ruN pine4.old/patches/patch-aw pine4/patches/patch-aw --- pine4.old/patches/patch-aw Wed Dec 31 19:00:00 1969 +++ pine4/patches/patch-aw Wed Oct 13 20:12:15 1999 @@ -0,0 +1,12 @@ +--- imap/src/osdep/unix/env_unix.c.orig Sun Oct 10 13:43:21 1999 ++++ imap/src/osdep/unix/env_unix.c Wed Oct 13 20:11:32 1999 +@@ -825,7 +825,8 @@ + } + close (pi[0]); close (pi[1]); + } +- if (lockEaccesError) {/* punt silently if paranoid site */ ++ if (strncmp(base->lock,"/var/mail/",10) && lockEaccesError) { ++ /* punt silently if paranoid site */ + sprintf (tmp,"Mailbox vulnerable - directory %.80s",hitch); + if (s = strrchr (tmp,'/')) *s = '\0'; + strcat (tmp," must have 1777 protection"); >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199910140131.VAA56132>