summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhubertf <hubertf@pkgsrc.org>2000-09-19 13:27:00 +0000
committerhubertf <hubertf@pkgsrc.org>2000-09-19 13:27:00 +0000
commit49434e4473616db28b9d2a9ea0b89b1aae8e0b9e (patch)
tree7a4404f2d30758a019c96071331aa14d239e1cfc
parent8db54e698874a59f7b78194c63ef5fbc3bb7486e (diff)
downloadpkgsrc-49434e4473616db28b9d2a9ea0b89b1aae8e0b9e.tar.gz
Use IMAP c-client libs from imap-uw package.
Fixes security problem describe at http://www.securityfocus.com/advisories/2646
-rw-r--r--mail/pine/Makefile20
-rw-r--r--mail/pine/files/patch-sum10
-rw-r--r--mail/pine/patches/patch-ac61
-rw-r--r--mail/pine/patches/patch-ad18
-rw-r--r--mail/pine/patches/patch-af14
-rw-r--r--mail/pine/patches/patch-ak13
-rw-r--r--mail/pine/patches/patch-al55
-rw-r--r--mail/pine/patches/patch-am18
8 files changed, 121 insertions, 88 deletions
diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index 21abf565d01..6d0f6fb78e1 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.34 2000/02/09 22:17:45 tron Exp $
+# $NetBSD: Makefile,v 1.35 2000/09/19 13:27:00 hubertf Exp $
# FreeBSD Id: Makefile,v 1.21 1997/03/26 02:12:07 ache Exp
#
DISTNAME= pine4.21
-PKGNAME= pine-4.21
+PKGNAME= pine-4.21nb1
CATEGORIES= mail news
MASTER_SITES= ftp://ftp.cac.washington.edu/pine/ \
ftp://ftp.fu-berlin.de/unix/mail/pine/
@@ -14,9 +14,19 @@ HOMEPAGE= http://www.washington.edu/pine/
# This pkg doesn't build pico or libpico; the pico pkg does that part.
DEPENDS= pico-3.7:../../editors/pico
+USE_LIBTOOL= yes
+CONFIGURE_ENV+= LT=${LIBTOOL}
+MAKE_ENV+= LT=${LIBTOOL}
+
+pre-patch:
+ # Make sure the imap lib that comes with pine4.21 isn't
+ # used (see http://www.securityfocus.com/advisories/2646)
+ rm -fr ${WRKSRC}/imap
+
do-configure:
${CP} -f ${WRKSRC}/pine/osdep/os-neb.h ${WRKSRC}/pine/osdep/os-neb.h.orig
- ${SED} -e 's@/usr/local/lib/@${PREFIX}/etc/@' \
+ ${SED} \
+ -e 's@/usr/local/lib/@${PREFIX}/etc/@' \
<${WRKSRC}/pine/osdep/os-neb.h.orig >${WRKSRC}/pine/osdep/os-neb.h
@${RM} -rf ${WRKSRC}/pico
@${LN} -sf ${LOCALBASE}/include/pico ${WRKSRC}/pico
@@ -25,8 +35,8 @@ do-build:
cd ${WRKSRC} && ./build ${BUILDNAME} PREFIX=${PREFIX}
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/pine ${PREFIX}/bin/
- ${INSTALL_PROGRAM} ${WRKSRC}/pine/abookcpy ${PREFIX}/bin/
+ ${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/pine/pine ${PREFIX}/bin/
+ ${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/pine/abookcpy ${PREFIX}/bin/
${INSTALL_SCRIPT} ${FILESDIR}/pgpencrypt ${PREFIX}/bin/
${INSTALL_SCRIPT} ${FILESDIR}/pgpdecode ${PREFIX}/bin/
${INSTALL_SCRIPT} ${FILESDIR}/pgpsign ${PREFIX}/bin/
diff --git a/mail/pine/files/patch-sum b/mail/pine/files/patch-sum
index 3544811da22..a98e83f1b1e 100644
--- a/mail/pine/files/patch-sum
+++ b/mail/pine/files/patch-sum
@@ -1,11 +1,9 @@
-$NetBSD: patch-sum,v 1.4 2000/05/02 17:29:32 kim Exp $
+$NetBSD: patch-sum,v 1.5 2000/09/19 13:27:01 hubertf Exp $
MD5 (patch-aa) = cde5388cc742d06c2cbb3c418c03121d
MD5 (patch-ab) = aee9be029c8880cb76b34b3203d53045
-MD5 (patch-ac) = 684eb92939714a82184a0ac695a69858
-MD5 (patch-af) = 250a49244b2c1c7cf8a44cc1aa2e5dae
-MD5 (patch-ak) = c92a63154ab9a4e02c0d1f38f4ab7dbb
-MD5 (patch-al) = f8180bea4caf97873f5403d762a64bed
-MD5 (patch-am) = 9945aa8499ca29930a1ab9b0ec000f0d
+MD5 (patch-ac) = 404610eda02f09cdb32a12d3d6e732ec
+MD5 (patch-ad) = 643c9e5beecf2e0525bbacc275326b02
+MD5 (patch-al) = 0ed03614c3e7dbd72dfaa696dba0ced3
MD5 (patch-ao) = bf069e8f6c0e571c26a3f52fe2781b6b
MD5 (patch-tabkey) = 918d8281bc5049765f27f7308a83fc47
diff --git a/mail/pine/patches/patch-ac b/mail/pine/patches/patch-ac
index 6b90ddca843..7414314ba40 100644
--- a/mail/pine/patches/patch-ac
+++ b/mail/pine/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.7 1998/11/13 16:32:38 tv Exp $
+$NetBSD: patch-ac,v 1.8 2000/09/19 13:27:01 hubertf Exp $
---- pine/makefile.neb.orig Thu Aug 27 12:50:02 1998
-+++ pine/makefile.neb Sun Sep 27 16:45:10 1998
-@@ -45,9 +45,12 @@
+--- pine/makefile.neb.orig Thu Aug 27 18:50:02 1998
++++ pine/makefile.neb
+@@ -45,11 +45,16 @@
RM= rm -f
LN= ln -s
MAKE= make
@@ -15,33 +15,62 @@ $NetBSD: patch-ac,v 1.7 1998/11/13 16:32:38 tv Exp $
-DEBUG= -g -DDEBUG
+DEBUG= # -g -DDEBUG
- CCLIENTDIR= ../c-client
+-CCLIENTDIR= ../c-client
++CCLIENTDIR= ${LOCALBASE}
++CCLIENTINC= ${CCLIENTDIR}/include/c-client
++CCLIENTLIB= ${CCLIENTDIR}/lib
PICODIR= ../pico
-@@ -61,8 +64,8 @@
+
+ # Only need to uncomment next two lines if you run make from this directory
+@@ -60,14 +65,13 @@
+ LDAPOFILES= addrbook.o adrbkcmd.o args.o bldaddr.o init.o \
other.o pine.o takeaddr.o
- STDLIBS= -ltermlib
+-STDLIBS= -ltermlib
-LOCLIBS= $(PICODIR)/libpico.a $(CCLIENTDIR)/c-client.a
-LIBS= $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
-+LOCLIBS= -lpico $(CCLIENTDIR)/c-client.a
-+LIBS= -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib/ $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
- `cat $(CCLIENTDIR)/LDFLAGS`
+- `cat $(CCLIENTDIR)/LDFLAGS`
++STDLIBS= -ltermlib -lcrypt
++LOCLIBS= -lpico $(CCLIENTLIB)/libimapuw.la
++LIBS= -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib/ $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS)
STDCFLAGS= -DNETBSD -DSYSTYPE=\"NEB\" -DMOUSE
-@@ -82,13 +85,15 @@
- $(CCLIENTDIR)/mail.h $(CCLIENTDIR)/osdep.h \
- $(CCLIENTDIR)/rfc822.h $(CCLIENTDIR)/misc.h
+ CFLAGS= $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(LDAPCFLAGS) \
+- $(STDCFLAGS)
++ $(STDCFLAGS) -I${CCLIENTINC}
-+all: pine abookcpy
+ OFILES= addrbook.o adrbkcmd.o adrbklib.o args.o bldaddr.o context.o filter.o \
+ folder.o help.o helptext.o imap.o init.o mailcap.o mailcmd.o \
+@@ -79,8 +83,10 @@
+ $(PICODIR)/headers.h $(PICODIR)/estruct.h \
+ $(PICODIR)/edef.h $(PICODIR)/efunc.h \
+ $(PICODIR)/pico.h $(PICODIR)/os.h \
+- $(CCLIENTDIR)/mail.h $(CCLIENTDIR)/osdep.h \
+- $(CCLIENTDIR)/rfc822.h $(CCLIENTDIR)/misc.h
++ $(CCLIENTINC)/mail.h $(CCLIENTINC)/osdep.h \
++ $(CCLIENTINC)/rfc822.h $(CCLIENTINC)/misc.h
+
++all: pine abookcpy
+
pine: $(OFILES) $(LOCLIBS)
echo "char datestamp[]="\"`date`\"";" > date.c
- echo "char hoststamp[]="\"`hostname`\"";" >> date.c
+@@ -88,7 +94,7 @@
$(CC) $(LDFLAGS) $(CFLAGS) -o pine $(OFILES) date.c $(LIBS)
abookcpy: abookcpy.o $(LOCLIBES)
- $(CC) $(LDFLAGS) $(CFLAGS) -o abookcpy abookcpy.o $(LIBS)
-+ $(CC) $(LDFLAGS) $(CFLAGS) -o abookcpy abookcpy.o $(CCLIENTDIR)/c-client.a -lcrypt
++ $(CC) $(LDFLAGS) $(CFLAGS) -o abookcpy abookcpy.o $(CCLIENTLIB)/libimapuw.la -lcrypt
pine-use: pine-use.c
$(CC) -o pine-use pine-use.c
+@@ -107,8 +113,8 @@
+
+ $(OFILES): $(HFILES)
+ addrbook.o adrbkcmd.o adrbklib.o bldaddr.o takeaddr.o: adrbklib.h
+-context.o: $(CCLIENTDIR)/misc.h
+-send.o: $(CCLIENTDIR)/smtp.h
++context.o: $(CCLIENTINC)/misc.h
++send.o: $(CCLIENTINC)/smtp.h
+ $(LDAPOFILES): $(LDAPLIBS)
+
+ helptext.c: pine.hlp
diff --git a/mail/pine/patches/patch-ad b/mail/pine/patches/patch-ad
new file mode 100644
index 00000000000..575d74a5889
--- /dev/null
+++ b/mail/pine/patches/patch-ad
@@ -0,0 +1,18 @@
+$NetBSD: patch-ad,v 1.6 2000/09/19 13:27:01 hubertf Exp $
+
+--- pine/init.c.orig Tue Sep 19 14:41:50 2000
++++ pine/init.c
+@@ -2043,9 +2043,13 @@
+
+ #ifndef _WINDOWS
+ if(F_ON(F_OLD_UNIX_DRIVER_WRITE,ps_global)){
++#if 0
++ /* It seems imapuw-2000.rc6 doesn't know about this any more. - HF
++ */
+ extern int unix_old_algorithm;
+
+ unix_old_algorithm = TRUE;
++#endif
+ }
+
+ if(F_ON(F_QUELL_BEZERK_TIMEZONE,ps_global))
diff --git a/mail/pine/patches/patch-af b/mail/pine/patches/patch-af
deleted file mode 100644
index c997ae70c3f..00000000000
--- a/mail/pine/patches/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.5 1999/02/10 15:13:38 frueauf Exp $
-
---- imap/src/mtest/mtest.c.orig Fri Nov 13 10:59:21 1998
-+++ imap/src/mtest/mtest.c Fri Nov 13 10:59:43 1998
-@@ -52,6 +52,9 @@
-
- /* Excellent reasons to hate ifdefs, and why my real code never uses them */
-
-+#ifdef __NetBSD__
-+#define unix 1
-+#endif
- #ifndef unix
- # define unix 0
- #endif
diff --git a/mail/pine/patches/patch-ak b/mail/pine/patches/patch-ak
deleted file mode 100644
index a6aa54a08dc..00000000000
--- a/mail/pine/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.5 1999/11/11 17:40:18 tv Exp $
-
---- imap/Makefile.orig Thu Sep 30 02:03:17 1999
-+++ imap/Makefile Thu Nov 11 12:00:35 1999
-@@ -417,8 +417,6 @@
- bundled:
- @echo Building bundled tools...
- $(CD) mtest;$(MAKE)
-- $(CD) ipopd;$(MAKE)
-- $(CD) imapd;$(MAKE)
-
- clean:
- @echo Removing old processed sources and binaries...
diff --git a/mail/pine/patches/patch-al b/mail/pine/patches/patch-al
index a79628cb906..fe263ad6c81 100644
--- a/mail/pine/patches/patch-al
+++ b/mail/pine/patches/patch-al
@@ -1,29 +1,52 @@
-$NetBSD: patch-al,v 1.5 1999/11/11 17:40:18 tv Exp $
+$NetBSD: patch-al,v 1.6 2000/09/19 13:27:01 hubertf Exp $
---- build.orig Fri Feb 19 18:30:54 1999
-+++ build Thu Nov 11 12:04:59 1999
-@@ -280,20 +280,12 @@
- ln -s imap/c-client c-client
- if [ -s mtest ] ; then rm -f mtest ; fi
- ln -s imap/mtest mtest
+--- build.orig Mon Nov 15 23:16:25 1999
++++ build
+@@ -180,7 +180,7 @@
+ mnt) makeargs="CC=gcc $makeargs" ;;
+ bs3) makeargs="CC=shlicc $makeargs" ;;
+ lyn) [ -f /CYGNUS.bash ] && . /CYGNUS.bash; makeargs="CC=gcc $makeargs" ;;
+- *) makeargs="CC=cc $makeargs" ;;
++ *) makeargs="CC=${LT}\ cc $makeargs" ;;
+ esac
+ fi
+
+@@ -277,23 +277,17 @@
+ esac
+ fi
+
+- 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
- echo ''
-
+- echo "Making c-client library, mtest and imapd"
+- eval echo make "$makeargs" "$K1" "$K2" $ccltarg
+- cd $PHOME/imap
+- eval make "$makeargs" "$K1" "$K2" $ccltarg
+- echo ''
+-
- echo "Making Pico and Pilot"
- cd $PHOME/pico
- eval echo make "$makeargs" -f makefile.$picotarg
- eval make "$makeargs" -f makefile.$picotarg
- echo ''
--
++# We use the ima-uw pkg's stuff for that, see
++# http://www.securityfocus.com/advisories/2646:
++# 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
++# echo "Making c-client library, mtest and imapd"
++# eval echo make "$makeargs" "$K1" "$K2" $ccltarg
++# cd $PHOME/imap
++# eval make "$makeargs" "$K1" "$K2" $ccltarg
++# echo ''
+
echo "Making Pine".
cd $PHOME/pine
- eval echo make "$makeargs" "$L1" "$L2" -f makefile.$pinetarg
-@@ -309,8 +301,6 @@
+@@ -310,8 +304,6 @@
if [ -s ../pico/pilot ] ; then ln ../pico/pilot pilot ; fi
cd $PHOME
echo ''
diff --git a/mail/pine/patches/patch-am b/mail/pine/patches/patch-am
deleted file mode 100644
index 0e1e3b74133..00000000000
--- a/mail/pine/patches/patch-am
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-am,v 1.7 1999/02/10 15:13:38 frueauf Exp $
-
---- imap/src/osdep/unix/env_unix.c.sma Sun Jan 31 02:25:32 1999
-+++ imap/src/osdep/unix/env_unix.c Sun Jan 31 02:27:14 1999
-@@ -547,6 +547,13 @@
- char *sysinbox ()
- {
- char tmp[MAILTMPLEN];
-+ char *t;
-+
-+ if (!sysInbox) {
-+ t = getenv("MAIL");
-+ if (t != NULL)
-+ sysInbox = cpystr(t);
-+ }
- if (!sysInbox) { /* initialize if first time */
- sprintf (tmp,"%s/%s",MAILSPOOL,myusername ());
- sysInbox = cpystr (tmp); /* system inbox is from mail spool */