[pkgsrc/pkgsrc-2008Q3]: pkgsrc/mail/imap-uw pullup ticket #2578 - requested b...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/pkgsrc-2008Q3]: pkgsrc/mail/imap-uw pullup ticket #2578 - requested b...
From: rtr <rtr%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 06:39:57 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/fa592f3ab574
branches:  pkgsrc-2008Q3
changeset: 547878:fa592f3ab574
user:      rtr <rtr%pkgsrc.org@localhost>
date:      Fri Nov 07 09:58:38 2008 +0000

description:
pullup ticket #2578 - requested by tron
imap-uw: update package for security and bug fixes

revisions pulled up:
pkgsrc/mail/imap-uw/Makefile            1.126
pkgsrc/mail/imap-uw/PLIST               1.15
pkgsrc/mail/imap-uw/distinfo            1.34
pkgsrc/mail/imap-uw/patches/patch-aa    1.20
pkgsrc/mail/imap-uw/patches/patch-ab    1.23
pkgsrc/mail/imap-uw/patches/patch-ad    1.8
pkgsrc/mail/imap-uw/patches/patch-ae    1.18
pkgsrc/mail/imap-uw/patches/patch-ak    r0
pkgsrc/mail/imap-uw/patches/patch-bb    1.3
pkgsrc/mail/imap-uw/patches/patch-bc    1.3

   Module Name:    pkgsrc
   Committed By:   tron
   Date:           Thu Nov  6 15:27:00 UTC 2008

   Modified Files:
           pkgsrc/mail/imap-uw: Makefile PLIST distinfo
           pkgsrc/mail/imap-uw/patches: patch-aa patch-ab patch-ad patch-ae
               patch-bb patch-bc
   Removed Files:
           pkgsrc/mail/imap-uw/patches: patch-ak

   Log Message:
   Update "imap-uw" package to imap-2007d. Changes since version 2006j2:
   - security fix for users of tmail or dmail.
   - bug fixes and reliability improvements.
   - A new function, utf8_csvalidmap(), has been added for the benefit of
     Alpine to use in examining UTF-8 text and determining efficiently
     whether it can be downgraded to a legacy charset.  If you develop an
     MUA, this may be useful for you too, although you'll have to read the
     source code to see how to use it.  The purpose of the "not-CJK" bit is
     to prevent messages being downgraded to a CJK charset if all they have
     in that charset are some special punctuation.

   This update address the security vulnerability reported in SA32483.

diffstat:

 mail/imap-uw/Makefile         |   8 ++------
 mail/imap-uw/PLIST            |  12 +++++++++---
 mail/imap-uw/distinfo         |  21 ++++++++++-----------
 mail/imap-uw/patches/patch-aa |  21 ++++++---------------
 mail/imap-uw/patches/patch-ab |  41 ++++++++++++-----------------------------
 mail/imap-uw/patches/patch-ad |  16 ++++++++--------
 mail/imap-uw/patches/patch-ae |  16 ++++++++--------
 mail/imap-uw/patches/patch-ak |  23 -----------------------
 mail/imap-uw/patches/patch-bb |  14 +++++++-------
 mail/imap-uw/patches/patch-bc |  10 +++++-----
 10 files changed, 67 insertions(+), 115 deletions(-)

diffs (truncated from 381 to 300 lines):

diff -r 391f6379e992 -r fa592f3ab574 mail/imap-uw/Makefile
--- a/mail/imap-uw/Makefile     Wed Nov 05 22:50:23 2008 +0000
+++ b/mail/imap-uw/Makefile     Fri Nov 07 09:58:38 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.124 2008/05/26 22:01:07 tron Exp $
+# $NetBSD: Makefile,v 1.124.8.1 2008/11/07 09:58:38 rtr Exp $
 #
 # ATTENTION:
 # The Kerberos support in this software is known to be problematic. If you
@@ -9,9 +9,8 @@
 # The most common reason to install this package is as a prerequisite for pine.
 # If you upgrade this package, you *must* test mail/pine with the new version.
 
-DISTNAME=      imap-2006j2
+DISTNAME=      imap-2007d
 PKGNAME=       ${DISTNAME:S/-/-uw-/}
-PKGREVISION=   6
 CATEGORIES=    mail
 MASTER_SITES=  ftp://ftp.cac.washington.edu/imap/
 EXTRACT_SUFX=  .tar.Z
@@ -56,9 +55,6 @@
 .endif
 BUILD_TARGET.OSF1=     osf
 BUILD_TARGET.OpenBSD=  bso
-.if ${OPSYS} == NetBSD && exists(/usr/include/security/pam_appl.h)
-BUILD_TARGET.NetBSD=   nep
-.endif
 BUILD_TARGET.*=                neb
 MESSAGE_SRC=           ${PKGDIR}/MESSAGE
 
diff -r 391f6379e992 -r fa592f3ab574 mail/imap-uw/PLIST
--- a/mail/imap-uw/PLIST        Wed Nov 05 22:50:23 2008 +0000
+++ b/mail/imap-uw/PLIST        Fri Nov 07 09:58:38 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2007/08/05 04:51:34 obache Exp $
+@comment $NetBSD: PLIST,v 1.14.14.1 2008/11/07 09:58:38 rtr Exp $
 bin/dmail
 bin/mailutil
 bin/mlock
@@ -70,7 +70,6 @@
 share/doc/imap-uw/rfc/rfc2088.txt
 share/doc/imap-uw/rfc/rfc2177.txt
 share/doc/imap-uw/rfc/rfc2180.txt
-share/doc/imap-uw/rfc/rfc2192.txt
 share/doc/imap-uw/rfc/rfc2193.txt
 share/doc/imap-uw/rfc/rfc2195.txt
 share/doc/imap-uw/rfc/rfc2221.txt
@@ -84,7 +83,6 @@
 share/doc/imap-uw/rfc/rfc3516.txt
 share/doc/imap-uw/rfc/rfc3656.txt
 share/doc/imap-uw/rfc/rfc3691.txt
-share/doc/imap-uw/rfc/rfc4234.txt
 share/doc/imap-uw/rfc/rfc4314.txt
 share/doc/imap-uw/rfc/rfc4315.txt
 share/doc/imap-uw/rfc/rfc4422.txt
@@ -99,6 +97,14 @@
 share/doc/imap-uw/rfc/rfc4731.txt
 share/doc/imap-uw/rfc/rfc4752.txt
 share/doc/imap-uw/rfc/rfc4790.txt
+share/doc/imap-uw/rfc/rfc4959.txt
+share/doc/imap-uw/rfc/rfc4978.txt
+share/doc/imap-uw/rfc/rfc5032.txt
+share/doc/imap-uw/rfc/rfc5051.txt
+share/doc/imap-uw/rfc/rfc5092.txt
+share/doc/imap-uw/rfc/rfc5161.txt
+share/doc/imap-uw/rfc/rfc5162.txt
+share/doc/imap-uw/rfc/rfc5234.txt
 @dirrm share/doc/imap-uw/rfc
 @dirrm share/doc/imap-uw/draft
 @dirrm share/doc/imap-uw
diff -r 391f6379e992 -r fa592f3ab574 mail/imap-uw/distinfo
--- a/mail/imap-uw/distinfo     Wed Nov 05 22:50:23 2008 +0000
+++ b/mail/imap-uw/distinfo     Fri Nov 07 09:58:38 2008 +0000
@@ -1,19 +1,18 @@
-$NetBSD: distinfo,v 1.33 2008/04/20 22:37:06 dbj Exp $
+$NetBSD: distinfo,v 1.33.8.1 2008/11/07 09:58:38 rtr Exp $
 
-SHA1 (imap-2006j2.tar.Z) = 41fc3f8cf11f1931a9c046240bc04ceb9f1416c0
-RMD160 (imap-2006j2.tar.Z) = 9192720a527e8977ef6e3eb6bcf8f3b26680e4fc
-Size (imap-2006j2.tar.Z) = 2686745 bytes
-SHA1 (patch-aa) = 116009b1713eb78286343293e6e57fff8b1c0e2f
-SHA1 (patch-ab) = 4fbb5d1c917eb2887cd398eb5e8cb7ceeda06dbd
+SHA1 (imap-2007d.tar.Z) = 298efcd34d2d6349953b2c4f5a39ed91f3cc9f46
+RMD160 (imap-2007d.tar.Z) = 2371508655eb8dfd847a12162ddae4f4952bfdd5
+Size (imap-2007d.tar.Z) = 2794618 bytes
+SHA1 (patch-aa) = ac880c250dfee3d0d316063ace5b92cd2f190510
+SHA1 (patch-ab) = 2ab52cb74a9b4eb1565f5bcbfb03969c038f52f1
 SHA1 (patch-ac) = eab1435fdf7ab59ea8afbde949a92dd756e6aea3
-SHA1 (patch-ad) = 51d00ec69f4404536d6daf51d971c294884b23c5
-SHA1 (patch-ae) = c7befb1e0ec0184bbf076694ac7cd8df93902eaa
+SHA1 (patch-ad) = d817dca51413bb8d228c2fabadffa3b924dff11d
+SHA1 (patch-ae) = 85e0917ce1934f6789bbce45ad5321e28cf294d9
 SHA1 (patch-af) = 38d3d020109076403becf691a8eb288ccabd9f70
 SHA1 (patch-ag) = 4152c1c618bf78f63668070e26e8feb0f7df91ed
 SHA1 (patch-ah) = ca68ec33fbf8ac4138669588b32098eb4f156f75
 SHA1 (patch-ai) = 312d2bd29be2f8fc03c24a635afcb0ca4ae33832
 SHA1 (patch-aj) = d9edbd39d552b70561c8df8d1d34568cec528cf9
-SHA1 (patch-ak) = 97c61cc9fbe7edb0d1b12b85e256ec91624cfd76
 SHA1 (patch-al) = f85551692a8e7e6d7bbdba9aed4850e3a434058b
 SHA1 (patch-am) = f0c5d250d69976c85537c9b8080365e8c2391c9d
 SHA1 (patch-ao) = b23f356cdeaccd996fd2d11b23da265b6b0df49f
@@ -29,8 +28,8 @@
 SHA1 (patch-ay) = a39cd708e2bfb2f03661cefb56249c7243b80c7f
 SHA1 (patch-az) = 706c9e8ae56b92f2ce148ff0fd08f002f8be4ae5
 SHA1 (patch-ba) = 9f4784050ad0cd61d9324517821077976485d41c
-SHA1 (patch-bb) = 2e942e3d37cae74f5ba85cc9a862df7e57598959
-SHA1 (patch-bc) = 59c938431f78d6f4c29d66f4bf77b9d416147694
+SHA1 (patch-bb) = b6b5a5294019c23376187b4ff324bf58fdbc113e
+SHA1 (patch-bc) = ae0119037fee2e94c6b60de3c9efc946ed4cfb68
 SHA1 (patch-bd) = 303a47372f9fdd6fd57fae9d3073e40620dc98f4
 SHA1 (patch-be) = 73afbc9f3c65d3adce37a3f1ee7f55e0ec665a54
 SHA1 (patch-bf) = 63c582e88bd6286295d5d9639bafec355278d537
diff -r 391f6379e992 -r fa592f3ab574 mail/imap-uw/patches/patch-aa
--- a/mail/imap-uw/patches/patch-aa     Wed Nov 05 22:50:23 2008 +0000
+++ b/mail/imap-uw/patches/patch-aa     Fri Nov 07 09:58:38 2008 +0000
@@ -1,17 +1,8 @@
-$NetBSD: patch-aa,v 1.19 2007/08/03 17:03:30 obache Exp $
+$NetBSD: patch-aa,v 1.19.14.1 2008/11/07 09:58:39 rtr Exp $
 
---- Makefile.orig      2007-05-08 22:50:45.000000000 +0000
-+++ Makefile
-@@ -307,7 +307,7 @@ SPECIALS:
- 
- # Note on SCO you may have to set LN to "ln".
- 
--a32 a41 aix bs3 bsi d-g d54 do4 drs epx ga4 gas gh9 ghp ghs go5 gsc gsg gso gul h11 hpp hpx lnp lyn mct mnt neb nec nto nxt nx3 osf os4 ptx qnx sc5 sco sgi sg6 shp sl4 sl5 slx snx soc sol sos uw2: 
an
-+a32 a41 aix bs3 bsi d-g d54 do4 drs epx ga4 gas gh9 ghp ghs go5 gsc gsg gso gul h11 hpp hpx lnp lyn mct mnt neb nec nep nto nxt nx3 osf os4 ptx qnx sc5 sco sgi sg6 shp sl4 sl5 slx snx soc sol sos 
uw2: an
-       $(BUILD) BUILDTYPE=$@
- 
- # If you use sv4, you may find that it works to move it to use the an process.
-@@ -559,9 +559,6 @@ sslunix sslsco:
+--- Makefile.orig      2008-06-04 19:43:35.000000000 +0100
++++ Makefile   2008-11-06 11:43:50.000000000 +0000
+@@ -577,9 +577,6 @@
        @echo + In order to rectify this problem, you MUST build with:
        @echo ++ SSLTYPE=$(SSLTYPE).nopwd
        @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -21,7 +12,7 @@
  
  nounenc:
        @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-@@ -582,9 +579,6 @@ sslnone:
+@@ -600,9 +597,6 @@
        @echo ++ SSLTYPE=nopwd
        @echo + You must also have OpenSSL or equivalent installed.
        @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -31,7 +22,7 @@
  
  nonossl:
        @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-@@ -618,9 +612,6 @@ ip6:
+@@ -636,9 +630,6 @@
        @echo + cancelled and you must rebuild.  If you did not specify IPv6
        @echo + yourself, try adding IP6=4 to the make command line.
        @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
diff -r 391f6379e992 -r fa592f3ab574 mail/imap-uw/patches/patch-ab
--- a/mail/imap-uw/patches/patch-ab     Wed Nov 05 22:50:23 2008 +0000
+++ b/mail/imap-uw/patches/patch-ab     Fri Nov 07 09:58:38 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.22 2007/08/03 17:03:30 obache Exp $
+$NetBSD: patch-ab,v 1.22.14.1 2008/11/07 09:58:39 rtr Exp $
 
---- src/osdep/unix/Makefile.orig       2007-06-17 15:37:44.000000000 +0000
-+++ src/osdep/unix/Makefile
-@@ -48,7 +48,7 @@ GCCOPTLEVEL= -O2
+--- src/osdep/unix/Makefile.orig       2008-06-04 19:18:34.000000000 +0100
++++ src/osdep/unix/Makefile    2008-11-06 13:57:35.000000000 +0000
+@@ -48,7 +48,7 @@
  # Try to have some consistency in GCC builds.  We want optimization, but we
  # also want to be able to debug.
  
@@ -11,7 +11,7 @@
  GCC4CFLAGS= $(GCCCFLAGS) -Wno-pointer-sign
  
  
-@@ -144,7 +144,7 @@ CHUNKSIZE=65536
+@@ -149,7 +149,7 @@
  
  # Normally no need to change any of these
  
@@ -20,7 +20,7 @@
  BINARIES=osdep.o mail.o misc.o newsrc.o smanager.o utf8.o utf8aux.o siglocal.o \
   dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
   rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
-@@ -425,7 +425,7 @@ gso:       os_sol.h        # GCC Solaris
+@@ -430,7 +430,7 @@
         RSHPATH=/usr/bin/rsh \
         BASECFLAGS="$(GCCCFLAGS)" \
         BASELDFLAGS="-lsocket -lnsl -lgen" \
@@ -29,7 +29,7 @@
  
  gsu:  # GCC SUN-OS
        $(BUILD) `$(CAT) SPECIALS` OS=sun \
-@@ -524,7 +524,7 @@ neb:       # NetBSD
+@@ -529,7 +529,7 @@
        $(BUILD) `$(CAT) SPECIALS` OS=bsi \
         CRXTYPE=nfs \
         SPOOLDIR=/var \
@@ -38,24 +38,7 @@
         RSHPATH=/usr/bin/rsh \
         BASECFLAGS="$(GCCCFLAGS)" \
         BASELDFLAGS="-lcrypt"
-@@ -539,6 +539,16 @@ nec:      # NEC UX
-        BASELDFLAGS="-lsocket -lnsl -lgen" \
-        RANLIB=true CC=/usr/abiccs/bin/cc
- 
-+nep:  # NetBSD with PAM
-+      $(BUILD) `$(CAT) SPECIALS` OS=bsi \
-+       CHECKPW=pam \
-+       CRXTYPE=nfs \
-+       SPOOLDIR=/var \
-+       ACTIVEFILE=/var/news/db/active \
-+       RSHPATH=/usr/bin/rsh \
-+       BASECFLAGS="$(GCCCFLAGS)" \
-+       BASELDFLAGS="-lpam"
-+
- nto:  # QNX Neutrino RTP
-       $(BUILD) `$(CAT) SPECIALS` OS=$@ \
-        CRXTYPE=nfs \
-@@ -850,7 +860,7 @@ $(ARCHIVE): $(BINARIES)
+@@ -855,7 +855,7 @@
        @$(SH) ARCHIVE
  
  .c.o:
@@ -64,7 +47,7 @@
  
  
  # Cleanup
-@@ -910,7 +920,7 @@ osdep.o:mail.h misc.h env.h fs.h ftl.h n
+@@ -915,7 +915,7 @@
        @echo pem.h, buffer.h, bio.h, and crypto.h, that means that OpenSSL
        @echo is not installed on your system.  Either install OpenSSL first
        @echo or build with command: make `$(CAT) OSTYPE` SSLTYPE=none
@@ -73,9 +56,9 @@
  
  osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c
        $(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c
-@@ -961,7 +971,7 @@ onceenv:
-        -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \
-        -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS
+@@ -968,7 +968,7 @@
+        -DLOCKPGM1=\"$(LOCKPGM1)\" -DLOCKPGM2=\"$(LOCKPGM2)\" \
+        -DLOCKPGM3=\"$(LOCKPGM3)\" > OSCFLAGS
        echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
 -      echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
 +      echo "$(LTLINK) $(CC) -o $(ARCHIVE) $(BINARIES:.o=.lo) -rpath $(PREFIX)/lib -version-info $(CCLIENT_MAJOR):$(CCLIENT_MINOR) \`$(CAT) LDFLAGS\`" > ARCHIVE
diff -r 391f6379e992 -r fa592f3ab574 mail/imap-uw/patches/patch-ad
--- a/mail/imap-uw/patches/patch-ad     Wed Nov 05 22:50:23 2008 +0000
+++ b/mail/imap-uw/patches/patch-ad     Fri Nov 07 09:58:38 2008 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.7 2007/08/03 17:03:30 obache Exp $
+$NetBSD: patch-ad,v 1.7.14.1 2008/11/07 09:58:39 rtr Exp $
 
---- src/dmail/Makefile.orig    2006-08-31 00:09:38.000000000 +0000
-+++ src/dmail/Makefile
+--- src/dmail/Makefile.orig    2008-06-04 19:18:34.000000000 +0100
++++ src/dmail/Makefile 2008-11-06 13:29:54.000000000 +0000
 @@ -26,7 +26,7 @@
  
  
@@ -11,12 +11,12 @@
  SHELL = /bin/sh
  
  # Get local definitions from c-client directory
-@@ -36,7 +36,7 @@ CFLAGS = -I$C `cat $C/CFLAGS`
+@@ -36,7 +36,7 @@
  LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
  
- dmail: $(CCLIENTLIB) dmail.o
--      $(CC) $(CFLAGS) -o dmail dmail.o $(LDFLAGS)
-+      $(LTLINK) $(CC) $(CFLAGS) -o dmail dmail.o $(LDFLAGS)
+ dmail: $(CCLIENTLIB) dmail.o dquota.o
+-      $(CC) $(CFLAGS) -o dmail dmail.o dquota.o $(LDFLAGS)
++      $(LTLINK) $(CC) $(CFLAGS) -o dmail dmail.o dquota.o $(LDFLAGS)
  
- dmail.o: $C/mail.h $C/misc.h $C/osdep.h
+ dmail.o: $C/mail.h $C/misc.h $C/osdep.h dquota.h
  
diff -r 391f6379e992 -r fa592f3ab574 mail/imap-uw/patches/patch-ae
--- a/mail/imap-uw/patches/patch-ae     Wed Nov 05 22:50:23 2008 +0000
+++ b/mail/imap-uw/patches/patch-ae     Fri Nov 07 09:58:38 2008 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.17 2007/08/03 17:03:30 obache Exp $
+$NetBSD: patch-ae,v 1.17.14.1 2008/11/07 09:58:39 rtr Exp $
 
---- src/tmail/Makefile.orig    2006-08-31 00:27:38.000000000 +0000
-+++ src/tmail/Makefile
+--- src/tmail/Makefile.orig    2008-06-04 19:18:34.000000000 +0100
++++ src/tmail/Makefile 2008-11-06 13:32:39.000000000 +0000
 @@ -26,7 +26,7 @@
  
  
@@ -11,12 +11,12 @@
  SHELL = /bin/sh
  
  # Get local definitions from c-client directory
-@@ -36,7 +36,7 @@ CFLAGS = -I$C `cat $C/CFLAGS`
+@@ -36,7 +36,7 @@
  LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
Prev by Date: [pkgsrc/pkgsrc-2008Q3]: pkgsrc/multimedia/ns-flash pullup ticket #2579 - requ...
Next by Date: [pkgsrc/pkgsrc-2008Q3]: pkgsrc/multimedia/vlc Pullup ticket #2581 - requested...
Previous by Thread: [pkgsrc/pkgsrc-2008Q3]: pkgsrc/multimedia/ns-flash pullup ticket #2579 - requ...
Next by Thread: [pkgsrc/pkgsrc-2008Q3]: pkgsrc/multimedia/vlc Pullup ticket #2581 - requested...
Indexes:
Home | Main Index | Thread Index | Old Index