diff options
Diffstat (limited to 'mail/pine')
| -rw-r--r-- | mail/pine/Makefile | 16 | ||||
| -rw-r--r-- | mail/pine/distinfo | 11 | ||||
| -rw-r--r-- | mail/pine/patches/patch-ad | 8 | ||||
| -rw-r--r-- | mail/pine/patches/patch-al | 10 | ||||
| -rw-r--r-- | mail/pine/patches/patch-ao | 27 |
5 files changed, 21 insertions, 51 deletions
diff --git a/mail/pine/Makefile b/mail/pine/Makefile index 50fd5997ea9..01b8d43560e 100644 --- a/mail/pine/Makefile +++ b/mail/pine/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.99 2005/01/18 04:00:18 jschauma Exp $ +# $NetBSD: Makefile,v 1.100 2005/01/25 10:08:59 adam Exp $ -DISTNAME= pine4.61 -PKGNAME= pine-4.61 -PKGREVISION= 1 +DISTNAME= pine4.62 +PKGNAME= pine-4.62 CATEGORIES= mail news MASTER_SITES= ftp://ftp.cac.washington.edu/pine/ \ ftp://ftp.fu-berlin.de/unix/mail/pine/ @@ -14,8 +13,8 @@ COMMENT= Program for Internet News and E-mail LICENSE= pine-license -USE_BUILDLINK3= YES -USE_PKGINSTALL= YES +USE_BUILDLINK3= yes +USE_PKGINSTALL= yes CONF_FILES= ${PREFIX}/share/examples/pine/pine.conf ${PKG_SYSCONFDIR}/pine.conf @@ -41,7 +40,6 @@ BUILDFILE= sgi .else BUILDNAME= neb BUILDFILE= neb -CFLAGS+= -O .endif .if !empty(CC_VERSION:Mgcc-*) @@ -59,9 +57,9 @@ PINE_LDAPCFLAGS= LDAPCFLAGS="-DENABLE_LDAP" PINE_LDAPLIBS= LDAPLIBS="-lldap -llber" .endif +# Make sure the imap lib that comes with pine isn't +# used (see http://www.securityfocus.com/advisories/2646) pre-patch: - # Make sure the imap lib that comes with pine isn't - # used (see http://www.securityfocus.com/advisories/2646) ${RM} -fr ${WRKSRC}/imap do-configure: diff --git a/mail/pine/distinfo b/mail/pine/distinfo index 2c48cdfdbff..6b939a9f109 100644 --- a/mail/pine/distinfo +++ b/mail/pine/distinfo @@ -1,14 +1,13 @@ -$NetBSD: distinfo,v 1.24 2004/08/12 12:18:50 adam Exp $ +$NetBSD: distinfo,v 1.25 2005/01/25 10:08:59 adam Exp $ -SHA1 (pine4.61.tar.bz2) = 74d3b5d0d7e7364be48d705d67fa52fb8eb1b5fc -Size (pine4.61.tar.bz2) = 3032253 bytes +SHA1 (pine4.62.tar.bz2) = 7011a1030fcf3f78d8fb7d5b7bf2cd46037668f7 +Size (pine4.62.tar.bz2) = 3079348 bytes SHA1 (patch-aa) = 800f84f3c868e6d17798e9f98d8151bb734143b6 SHA1 (patch-ab) = cfac4d24763dbd4285e03c6c25891469c5ac1953 SHA1 (patch-ac) = 870d7d414e25b37e47c5f62447210fe7800c733b -SHA1 (patch-ad) = ef1203c67e9add295e782c2ee2b0fde2a4f6073b +SHA1 (patch-ad) = 68e3238369bcdf49867e2facc876a8f434136228 SHA1 (patch-ae) = 0faf3a4161cba517a559a776d2a3a7fcb5116570 SHA1 (patch-af) = 1cd12e0b7aea804528730ed7323e7ea1ac385466 SHA1 (patch-ag) = 74d7e2dc9b986148825335f6f2b52bde963f9a67 -SHA1 (patch-al) = d150f8c765f87ba7c66f88e7e51974003027456a -SHA1 (patch-ao) = 0d8ba903d643147ae5771a7a053ab9be1e849766 +SHA1 (patch-al) = 0e25dad2c4caf71b4204f137eee3f85d7b9b507c SHA1 (patch-ap) = ad1733f86195ecbd2211f3af7671c1d1c35803bc diff --git a/mail/pine/patches/patch-ad b/mail/pine/patches/patch-ad index 678fc540fc5..1490fab35eb 100644 --- a/mail/pine/patches/patch-ad +++ b/mail/pine/patches/patch-ad @@ -1,6 +1,6 @@ -$NetBSD: patch-ad,v 1.10 2004/01/20 10:16:38 hubertf Exp $ +$NetBSD: patch-ad,v 1.11 2005/01/25 10:08:59 adam Exp $ ---- pine/signals.c.orig Thu Nov 28 00:22:12 2002 +--- pine/signals.c.orig 2004-11-04 22:33:05.000000000 +0000 +++ pine/signals.c @@ -53,6 +53,7 @@ static char rcsid[] = "$Id: signals.c,v ====*/ @@ -10,7 +10,7 @@ $NetBSD: patch-ad,v 1.10 2004/01/20 10:16:38 hubertf Exp $ /* nto defines SA_RESTART but doesn't support it yet (00/12/29 - hubert) */ #if defined(NTO) -@@ -108,7 +109,9 @@ init_signals() +@@ -109,7 +110,9 @@ init_signals() if(CUSHION_SIG){ signal(SIGILL, auger_in_signal); signal(SIGTRAP, auger_in_signal); @@ -20,7 +20,7 @@ $NetBSD: patch-ad,v 1.10 2004/01/20 10:16:38 hubertf Exp $ signal(SIGBUS, auger_in_signal); signal(SIGSEGV, auger_in_signal); signal(SIGSYS, auger_in_signal); -@@ -196,7 +199,9 @@ end_signals(blockem) +@@ -197,7 +200,9 @@ end_signals(blockem) } signal(SIGTRAP, blockem ? SIG_IGN : SIG_DFL); diff --git a/mail/pine/patches/patch-al b/mail/pine/patches/patch-al index f6021ad36bb..50229f93935 100644 --- a/mail/pine/patches/patch-al +++ b/mail/pine/patches/patch-al @@ -1,8 +1,8 @@ -$NetBSD: patch-al,v 1.14 2004/05/13 18:29:54 adam Exp $ +$NetBSD: patch-al,v 1.15 2005/01/25 10:08:59 adam Exp $ ---- build.orig 2004-05-07 19:32:32.000000000 +0000 +--- build.orig 2004-12-27 17:36:53.000000000 +0000 +++ build -@@ -380,71 +380,6 @@ case $maketarg in +@@ -393,71 +393,6 @@ case $maketarg in echo "Including SSL functionality" fi @@ -74,7 +74,7 @@ $NetBSD: patch-al,v 1.14 2004/05/13 18:29:54 adam Exp $ echo "Making Pine and rpload/rpdump". if [ "$ALTDOCPATHS" = "1" ] then -@@ -487,8 +422,6 @@ case $maketarg in +@@ -500,8 +435,6 @@ case $maketarg in fi cd "$PHOME" echo '' @@ -83,7 +83,7 @@ $NetBSD: patch-al,v 1.14 2004/05/13 18:29:54 adam Exp $ case $maketarg in mnt) echo "Fixing stacksizes ..." fixstk 64K bin/pine bin/pico bin/imapd bin/mtest bin/pilot -@@ -514,18 +447,11 @@ case $maketarg in +@@ -527,18 +460,11 @@ case $maketarg in clean) # This only sort of works diff --git a/mail/pine/patches/patch-ao b/mail/pine/patches/patch-ao deleted file mode 100644 index 9f4be20f68e..00000000000 --- a/mail/pine/patches/patch-ao +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-ao,v 1.1 2000/05/02 17:29:33 kim Exp $ - ---- pine/osdep/pw_stuff.orig Mon Aug 30 16:23:45 1999 -+++ pine/osdep/pw_stuff Tue May 2 13:19:38 2000 -@@ -12,6 +12,7 @@ - { - static char fullname[MAX_FULLNAME+1]; - register char *fncp, *gcoscp, *lncp, *end; -+ int first; - - /* full name is all chars up to first ',' (or whole gcos, if no ',') */ - /* replace any & with logname in upper case */ -@@ -21,8 +22,13 @@ - gcoscp++) { - - if(*gcoscp == '&') { -+ first = 1; - for(lncp = logname; *lncp; fncp++, lncp++) -- *fncp = toupper((unsigned char)(*lncp)); -+ if (first) { -+ first = 0; -+ *fncp = toupper((unsigned char)(*lncp)); -+ } else -+ *fncp = *lncp; - } else { - *fncp++ = *gcoscp; - } |