diff options
36 files changed, 231 insertions, 217 deletions
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile index 52922d4388a..fd882a93bbe 100644 --- a/mail/imap-uw/Makefile +++ b/mail/imap-uw/Makefile @@ -1,13 +1,12 @@ -# $NetBSD: Makefile,v 1.116 2007/03/21 19:39:08 jwise Exp $ +# $NetBSD: Makefile,v 1.117 2007/08/03 17:03:29 obache Exp $ # # ATTENTION: # The Kerberos support in this software is known to be problematic. If you # upgrade this package you *must* test it on a system with Kerberos libraries # but not running Kerberos before committing the changes. -DISTNAME= imap-2004g +DISTNAME= imap-2006j2 PKGNAME= ${DISTNAME:S/-/-uw-/} -PKGREVISION= 2 CATEGORIES= mail MASTER_SITES= ftp://ftp.cac.washington.edu/imap/ EXTRACT_SUFX= .tar.Z @@ -23,6 +22,8 @@ MAKE_ENV+= LTLINK="libtool --mode=link" LTINSTALL_PROGRAM= ${SETENV} ${MAKE_ENV} ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} LTINSTALL_LIB= ${SETENV} ${MAKE_ENV} ${LIBTOOL} --mode=install ${INSTALL_LIB} +WRKSRC= ${WRKDIR}/${DISTNAME:S/2$//} + .include "../../mk/bsd.prefs.mk" # Each platform has its own special target in the imap Makefiles. @@ -59,7 +60,7 @@ BUILD_DEFS+= IMAP_UW_CCLIENT_MBOX_FMT IMAP_UW_MAILSPOOLHOME CCLIENT_LIB= libc-client.la CCLIENT_PICLIB= libc-client_pic.a CCLIENT_MAJOR= 4 -CCLIENT_MINOR= 3 +CCLIENT_MINOR= 4 MAKE_ENV+= CCLIENT_MAJOR=${CCLIENT_MAJOR:Q} MAKE_ENV+= CCLIENT_MINOR=${CCLIENT_MINOR:Q} diff --git a/mail/imap-uw/PLIST b/mail/imap-uw/PLIST index 7cbd17670b1..e2a2b1b1433 100644 --- a/mail/imap-uw/PLIST +++ b/mail/imap-uw/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2006/07/26 20:00:27 jlam Exp $ +@comment $NetBSD: PLIST,v 1.13 2007/08/03 17:03:29 obache Exp $ bin/dmail bin/mailutil bin/mlock @@ -50,7 +50,6 @@ share/doc/imap-uw/bugs.txt share/doc/imap-uw/calendar.txt share/doc/imap-uw/commndmt.txt share/doc/imap-uw/draft/README -share/doc/imap-uw/draft/compare.txt share/doc/imap-uw/draft/i18n.txt share/doc/imap-uw/draft/sort.txt share/doc/imap-uw/drivers.txt @@ -59,13 +58,13 @@ share/doc/imap-uw/imaprc.txt share/doc/imap-uw/internal.txt share/doc/imap-uw/locking.txt share/doc/imap-uw/md5.txt +share/doc/imap-uw/mixfmt.txt share/doc/imap-uw/naming.txt -share/doc/imap-uw/rfc/rfc1731.txt +share/doc/imap-uw/rfc/README share/doc/imap-uw/rfc/rfc1732.txt share/doc/imap-uw/rfc/rfc1733.txt share/doc/imap-uw/rfc/rfc2061.txt share/doc/imap-uw/rfc/rfc2062.txt -share/doc/imap-uw/rfc/rfc2086.txt share/doc/imap-uw/rfc/rfc2087.txt share/doc/imap-uw/rfc/rfc2088.txt share/doc/imap-uw/rfc/rfc2177.txt @@ -74,12 +73,7 @@ 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 -share/doc/imap-uw/rfc/rfc2222.txt -share/doc/imap-uw/rfc/rfc2234.txt -share/doc/imap-uw/rfc/rfc2245.txt share/doc/imap-uw/rfc/rfc2342.txt -share/doc/imap-uw/rfc/rfc2359.txt -share/doc/imap-uw/rfc/rfc2595.txt share/doc/imap-uw/rfc/rfc2683.txt share/doc/imap-uw/rfc/rfc2971.txt share/doc/imap-uw/rfc/rfc3348.txt @@ -89,6 +83,21 @@ share/doc/imap-uw/rfc/rfc3503.txt 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 +share/doc/imap-uw/rfc/rfc4466.txt +share/doc/imap-uw/rfc/rfc4467.txt +share/doc/imap-uw/rfc/rfc4468.txt +share/doc/imap-uw/rfc/rfc4469.txt +share/doc/imap-uw/rfc/rfc4505.txt +share/doc/imap-uw/rfc/rfc4549.txt +share/doc/imap-uw/rfc/rfc4551.txt +share/doc/imap-uw/rfc/rfc4616.txt +share/doc/imap-uw/rfc/rfc4731.txt +share/doc/imap-uw/rfc/rfc4752.txt +share/doc/imap-uw/rfc/rfc4790.txt @dirrm share/doc/imap-uw/rfc @dirrm share/doc/imap-uw/draft @dirrm share/doc/imap-uw diff --git a/mail/imap-uw/distinfo b/mail/imap-uw/distinfo index 50ada3c58a0..dbfb78f9296 100644 --- a/mail/imap-uw/distinfo +++ b/mail/imap-uw/distinfo @@ -1,37 +1,37 @@ -$NetBSD: distinfo,v 1.31 2006/09/11 13:44:27 tron Exp $ +$NetBSD: distinfo,v 1.32 2007/08/03 17:03:29 obache Exp $ -SHA1 (imap-2004g.tar.Z) = 791a8bb247ca51ce0a4c32e814a2f736c2bcf066 -RMD160 (imap-2004g.tar.Z) = a016a06ba073e879d2574a6395ce1074ea74c687 -Size (imap-2004g.tar.Z) = 2246713 bytes -SHA1 (patch-aa) = e18ec6b1674e71865a8aabe41b5da24c572edcb5 -SHA1 (patch-ab) = fbe43bfc811058433936e6eb61bfc7d69f819e45 -SHA1 (patch-ac) = 802b456555f6e79f60444cfe32d42e053d73cef8 -SHA1 (patch-ad) = e4b64935d0af726d3771489df411454788722727 -SHA1 (patch-ae) = 2e33641db5081e0f15e612db98f841591d5b2dd7 -SHA1 (patch-af) = 5800937da2881849508c9012bc268e5acd2fff3e -SHA1 (patch-ag) = 452fcfc1bd17d3cc65e5012db56d37af25bcf3b6 -SHA1 (patch-ah) = 06d780220e21b4dd4b601f66efb6e73ee95991e2 -SHA1 (patch-ai) = c495ed39fbc01e1d8b05f6acd3d11394978f9b43 -SHA1 (patch-aj) = 607286c1fd5eb97a07ffb812387f6a005aaee9c5 -SHA1 (patch-ak) = c798b2aad17091526c667a552839cfe1ec0e23c9 -SHA1 (patch-al) = 2915edc654c185311e09cef571b443c4a9ff7e3c -SHA1 (patch-am) = 0aea2cbe98da312740e678355b11fc964a822cda -SHA1 (patch-ao) = 777b30793ea2e1f33be14e34d837f1f0cc5d0d67 -SHA1 (patch-ap) = ce224812b0744a699e5e07916ca04510bf62da25 -SHA1 (patch-aq) = 7cf038fcb8e072fa46604ac0ac8c02c0d6d3608e -SHA1 (patch-ar) = 6c7cc6c03b87af90866230624c476c7868e323fe -SHA1 (patch-as) = 3760b2126f761be4d09c807f7d21b0ed7b1b89bb -SHA1 (patch-at) = aeb907f8a9a2438490ecd9dc0251b396b4507968 -SHA1 (patch-au) = 88c14e0f2aa61c34f0255d09f6d00e30328f5c82 -SHA1 (patch-av) = 24043b6d1ed9c4cc9a72735caf82ad5a08ff3ee6 -SHA1 (patch-aw) = 46d108d26b9cc414bb2b3b5f5c5325a3d210bf5e -SHA1 (patch-ax) = 136eebbdac13434659583e370443ab2033969ae3 -SHA1 (patch-ay) = 6004d14891d3f7004af834d2e4b217369e2f6ee1 -SHA1 (patch-az) = 6372149e6fec8ffc5091ef5dcca959884c720d1b -SHA1 (patch-ba) = 64b89d377501861ddeecaf58f845132b95ac8f75 -SHA1 (patch-bb) = 220bfb5885dd73cf3375b26bda6be1ea2d39d069 -SHA1 (patch-bc) = b3cd7d728de313cd00af2d9c99cadc2478006232 -SHA1 (patch-bd) = 2dbffe2f11d1c0c2b05eabe3fc976c230e821709 -SHA1 (patch-be) = 032ae39806995e27aba5ab67089a467d3fbe5597 -SHA1 (patch-bf) = 42eee80df6095a7ca0141306743786f6f44545f8 -SHA1 (patch-bg) = 778318297c8a5af995286e447c23503790152bb9 +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 (patch-ac) = eab1435fdf7ab59ea8afbde949a92dd756e6aea3 +SHA1 (patch-ad) = 51d00ec69f4404536d6daf51d971c294884b23c5 +SHA1 (patch-ae) = c7befb1e0ec0184bbf076694ac7cd8df93902eaa +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 +SHA1 (patch-ap) = 266cabd4937105352c474c85f8ff79434fb2f9dd +SHA1 (patch-aq) = 33399fb6dd6478d3a89ec1e967b12d93d9a8219b +SHA1 (patch-ar) = 32f3347697566439b059811be955dc2d3f56cd74 +SHA1 (patch-as) = d07e37e0789251e703805e4d120f6df86d6f5852 +SHA1 (patch-at) = 05688f632966a7ccbe0739bff502a5c27dc88818 +SHA1 (patch-au) = 5f0137f593a0fb3936d3f54310d3fb430d6f7681 +SHA1 (patch-av) = 3851cbacd805dad0c16ba7ce19879d4f3f299275 +SHA1 (patch-aw) = 4aa5b487426ed583ad137c58e117247b52fef494 +SHA1 (patch-ax) = 0edac03adc6f80102d6063170123b1d1b304cde9 +SHA1 (patch-ay) = a39cd708e2bfb2f03661cefb56249c7243b80c7f +SHA1 (patch-az) = 706c9e8ae56b92f2ce148ff0fd08f002f8be4ae5 +SHA1 (patch-ba) = 9f4784050ad0cd61d9324517821077976485d41c +SHA1 (patch-bb) = 2e942e3d37cae74f5ba85cc9a862df7e57598959 +SHA1 (patch-bc) = 59c938431f78d6f4c29d66f4bf77b9d416147694 +SHA1 (patch-bd) = 303a47372f9fdd6fd57fae9d3073e40620dc98f4 +SHA1 (patch-be) = 73afbc9f3c65d3adce37a3f1ee7f55e0ec665a54 +SHA1 (patch-bf) = 63c582e88bd6286295d5d9639bafec355278d537 +SHA1 (patch-bg) = c95483ed73d7c6015df99967c0509cf0ea67d28f diff --git a/mail/imap-uw/options.mk b/mail/imap-uw/options.mk index ad394cc12c3..ebd644e3ea3 100644 --- a/mail/imap-uw/options.mk +++ b/mail/imap-uw/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2006/07/26 20:00:27 jlam Exp $ +# $NetBSD: options.mk,v 1.4 2007/08/03 17:03:29 obache Exp $ .include "../../mk/bsd.prefs.mk" @@ -26,9 +26,9 @@ PKG_SUPPORTED_OPTIONS+= kerberos ### Support both IPv6 and IPv4 connections. ### .if !empty(PKG_OPTIONS:Minet6) -MAKE_FLAGS+= IP=6 +MAKE_FLAGS+= IP6=6 .else -MAKE_FLAGS+= IP=4 +MAKE_FLAGS+= IP6=4 .endif ### diff --git a/mail/imap-uw/patches/patch-aa b/mail/imap-uw/patches/patch-aa index 3068afeb1fc..cc19d9a744e 100644 --- a/mail/imap-uw/patches/patch-aa +++ b/mail/imap-uw/patches/patch-aa @@ -1,33 +1,43 @@ -$NetBSD: patch-aa,v 1.18 2006/09/11 13:44:27 tron Exp $ +$NetBSD: patch-aa,v 1.19 2007/08/03 17:03:30 obache Exp $ ---- Makefile.orig 2005-04-30 21:50:20.000000000 +0100 -+++ Makefile 2006-09-11 14:18:20.000000000 +0100 -@@ -296,7 +296,7 @@ +--- 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 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 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 +-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. -@@ -474,9 +474,6 @@ +@@ -559,9 +559,6 @@ sslunix sslsco: @echo + In order to rectify this problem, you MUST build with: @echo ++ SSLTYPE=$(SSLTYPE).nopwd @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - @echo - @echo Do you want to continue this build anyway? Type y or n please: -- @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) exit 1;; esac' +- @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) (make nounenc;exit 1);; esac' - sslnone: + nounenc: @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -@@ -489,9 +486,6 @@ +@@ -582,9 +579,6 @@ sslnone: @echo ++ SSLTYPE=nopwd @echo + You must also have OpenSSL or equivalent installed. @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - @echo - @echo Do you want to continue this build anyway? Type y or n please: -- @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) exit 1;; esac' +- @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) (make nonossl;exit 1);; esac' - - # C compiler types + nonossl: + @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +@@ -618,9 +612,6 @@ ip6: + @echo + cancelled and you must rebuild. If you did not specify IPv6 + @echo + yourself, try adding IP6=4 to the make command line. + @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +- @echo +- @echo Do you want to build with IPv6 anyway? Type y or n please: +- @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) (make noip6;exit 1);; esac' + @echo OK, I will remember that you really want to build with IPv6. + @echo You will not see this message again. + @$(TOUCH) ip6 diff --git a/mail/imap-uw/patches/patch-ab b/mail/imap-uw/patches/patch-ab index 7840e2dc203..9c7d85b7fff 100644 --- a/mail/imap-uw/patches/patch-ab +++ b/mail/imap-uw/patches/patch-ab @@ -1,41 +1,44 @@ -$NetBSD: patch-ab,v 1.21 2006/09/11 13:44:27 tron Exp $ +$NetBSD: patch-ab,v 1.22 2007/08/03 17:03:30 obache Exp $ ---- src/osdep/unix/Makefile.orig 2005-04-30 21:51:13.000000000 +0100 -+++ src/osdep/unix/Makefile 2006-09-11 14:19:56.000000000 +0100 -@@ -124,7 +124,7 @@ +--- src/osdep/unix/Makefile.orig 2007-06-17 15:37:44.000000000 +0000 ++++ src/osdep/unix/Makefile +@@ -48,7 +48,7 @@ GCCOPTLEVEL= -O2 + # Try to have some consistency in GCC builds. We want optimization, but we + # also want to be able to debug. + +-GCCCFLAGS= -g $(GCCOPTLEVEL) -pipe -fno-omit-frame-pointer ++GCCCFLAGS= -pipe -fno-omit-frame-pointer + GCC4CFLAGS= $(GCCCFLAGS) -Wno-pointer-sign + + +@@ -144,7 +144,7 @@ CHUNKSIZE=65536 # Normally no need to change any of these -ARCHIVE=c-client.a +ARCHIVE=libc-client.la - BINARIES=osdep.o mail.o misc.o newsrc.o smanager.o utf8.o siglocal.o \ + 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 \ -@@ -403,9 +403,9 @@ - SPOOLDIR=/var/spool MAILSPOOL=/var/mail \ - ACTIVEFILE=/usr/share/news/active \ +@@ -425,7 +425,7 @@ gso: os_sol.h # GCC Solaris RSHPATH=/usr/bin/rsh \ -- BASECFLAGS="-g $(GCCOPTLEVEL)" \ -+ BASECFLAGS="" \ + BASECFLAGS="$(GCCCFLAGS)" \ BASELDFLAGS="-lsocket -lnsl -lgen" \ - RANLIB=true CC=gcc + RANLIB=true gsu: # GCC SUN-OS $(BUILD) `$(CAT) SPECIALS` OS=sun \ -@@ -495,9 +495,9 @@ +@@ -524,7 +524,7 @@ neb: # NetBSD $(BUILD) `$(CAT) SPECIALS` OS=bsi \ CRXTYPE=nfs \ SPOOLDIR=/var \ - ACTIVEFILE=/var/db/news/active \ + ACTIVEFILE=/var/news/db/active \ RSHPATH=/usr/bin/rsh \ -- BASECFLAGS="-g -O -pipe" \ -+ BASECFLAGS="-pipe" \ + BASECFLAGS="$(GCCCFLAGS)" \ BASELDFLAGS="-lcrypt" - - nec: # NEC UX -@@ -510,6 +510,16 @@ +@@ -539,6 +539,16 @@ nec: # NEC UX BASELDFLAGS="-lsocket -lnsl -lgen" \ RANLIB=true CC=/usr/abiccs/bin/cc @@ -46,22 +49,13 @@ $NetBSD: patch-ab,v 1.21 2006/09/11 13:44:27 tron Exp $ + SPOOLDIR=/var \ + ACTIVEFILE=/var/news/db/active \ + RSHPATH=/usr/bin/rsh \ -+ BASECFLAGS="-pipe" \ ++ BASECFLAGS="$(GCCCFLAGS)" \ + BASELDFLAGS="-lpam" + nto: # QNX Neutrino RTP $(BUILD) `$(CAT) SPECIALS` OS=$@ \ CRXTYPE=nfs \ -@@ -549,7 +559,7 @@ - $(BUILD) `$(CAT) SPECIALS` OS=$@ \ - CRXTYPE=nfs \ - SPOOLDIR=/var/spool MAILSPOOL=/var/mail \ -- BASECFLAGS="-g -O -Wno-pointer-sign" -+ BASECFLAGS="-Wno-pointer-sign" - - ptx: # PTX - $(BUILD) `$(CAT) SPECIALS` OS=$@ \ -@@ -811,7 +821,7 @@ +@@ -850,7 +860,7 @@ $(ARCHIVE): $(BINARIES) @$(SH) ARCHIVE .c.o: @@ -70,7 +64,7 @@ $NetBSD: patch-ab,v 1.21 2006/09/11 13:44:27 tron Exp $ # Cleanup -@@ -869,7 +879,7 @@ +@@ -910,7 +920,7 @@ osdep.o:mail.h misc.h env.h fs.h ftl.h n @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 @@ -79,7 +73,7 @@ $NetBSD: patch-ab,v 1.21 2006/09/11 13:44:27 tron Exp $ osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c $(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c -@@ -924,7 +934,7 @@ +@@ -961,7 +971,7 @@ onceenv: -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \ -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS diff --git a/mail/imap-uw/patches/patch-ac b/mail/imap-uw/patches/patch-ac index 889aa10010e..67b72f02f0f 100644 --- a/mail/imap-uw/patches/patch-ac +++ b/mail/imap-uw/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.6 2006/07/26 20:00:27 jlam Exp $ +$NetBSD: patch-ac,v 1.7 2007/08/03 17:03:30 obache Exp $ ---- src/mailutil/Makefile.orig 2002-11-18 19:41:46.000000000 -0500 +--- src/mailutil/Makefile.orig 2006-08-31 00:21:20.000000000 +0000 +++ src/mailutil/Makefile -@@ -19,7 +19,7 @@ +@@ -26,7 +26,7 @@ C = ../c-client @@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.6 2006/07/26 20:00:27 jlam Exp $ SHELL = /bin/sh # Get local definitions from c-client directory -@@ -29,7 +29,7 @@ CFLAGS = -I$C `cat $C/CFLAGS` +@@ -36,7 +36,7 @@ CFLAGS = -I$C `cat $C/CFLAGS` LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS` mailutil: $(CCLIENTLIB) mailutil.o diff --git a/mail/imap-uw/patches/patch-ad b/mail/imap-uw/patches/patch-ad index 79163224251..d23ca1b5809 100644 --- a/mail/imap-uw/patches/patch-ad +++ b/mail/imap-uw/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.6 2006/07/26 20:00:27 jlam Exp $ +$NetBSD: patch-ad,v 1.7 2007/08/03 17:03:30 obache Exp $ ---- src/dmail/Makefile.orig 2002-11-18 19:43:31.000000000 -0500 +--- src/dmail/Makefile.orig 2006-08-31 00:09:38.000000000 +0000 +++ src/dmail/Makefile -@@ -18,7 +18,7 @@ +@@ -26,7 +26,7 @@ C = ../c-client @@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.6 2006/07/26 20:00:27 jlam Exp $ SHELL = /bin/sh # Get local definitions from c-client directory -@@ -28,7 +28,7 @@ CFLAGS = -I$C `cat $C/CFLAGS` +@@ -36,7 +36,7 @@ CFLAGS = -I$C `cat $C/CFLAGS` LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS` dmail: $(CCLIENTLIB) dmail.o diff --git a/mail/imap-uw/patches/patch-ae b/mail/imap-uw/patches/patch-ae index c17bf1315e0..2e5dc3b640f 100644 --- a/mail/imap-uw/patches/patch-ae +++ b/mail/imap-uw/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.16 2006/07/26 20:00:27 jlam Exp $ +$NetBSD: patch-ae,v 1.17 2007/08/03 17:03:30 obache Exp $ ---- src/tmail/Makefile.orig 2002-11-18 19:45:14.000000000 -0500 +--- src/tmail/Makefile.orig 2006-08-31 00:27:38.000000000 +0000 +++ src/tmail/Makefile -@@ -18,7 +18,7 @@ +@@ -26,7 +26,7 @@ C = ../c-client @@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.16 2006/07/26 20:00:27 jlam Exp $ SHELL = /bin/sh # Get local definitions from c-client directory -@@ -28,7 +28,7 @@ CFLAGS = -I$C `cat $C/CFLAGS` +@@ -36,7 +36,7 @@ CFLAGS = -I$C `cat $C/CFLAGS` LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS` tmail: $(CCLIENTLIB) tmail.o diff --git a/mail/imap-uw/patches/patch-af b/mail/imap-uw/patches/patch-af index 198b4cc5046..a1013f36a43 100644 --- a/mail/imap-uw/patches/patch-af +++ b/mail/imap-uw/patches/patch-af @@ -1,15 +1,15 @@ -$NetBSD: patch-af,v 1.6 2006/07/26 20:00:27 jlam Exp $ +$NetBSD: patch-af,v 1.7 2007/08/03 17:03:30 obache Exp $ ---- src/osdep/unix/kerb_mit.c.orig 2003-10-17 12:39:42.000000000 -0400 +--- src/osdep/unix/kerb_mit.c.orig 2006-08-31 01:40:15.000000000 +0000 +++ src/osdep/unix/kerb_mit.c -@@ -18,9 +18,15 @@ - * CPYRIGHT, included with this Distribution. +@@ -26,9 +26,15 @@ + * Last Edited: 30 August 2006 */ +#ifdef HEIMDAL_KRB5 +#include <gssapi/gssapi.h> +#include <krb5/krb5.h> -+#define gss_nt_service_name GSS_C_NT_HOSTBASED_SERVICE ++#define gss_nt_service_name GSS_C_NT_HOSTBASED_SERVICE +#else #define PROTOTYPE(x) x #include <gssapi/gssapi_generic.h> diff --git a/mail/imap-uw/patches/patch-ag b/mail/imap-uw/patches/patch-ag index e51b23a5416..79018165490 100644 --- a/mail/imap-uw/patches/patch-ag +++ b/mail/imap-uw/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.4 2005/12/03 00:52:54 joerg Exp $ +$NetBSD: patch-ag,v 1.5 2007/08/03 17:03:30 obache Exp $ ---- src/osdep/unix/os_bsi.c.orig 2005-12-02 23:38:04.000000000 +0000 +--- src/osdep/unix/os_bsi.c.orig 2006-12-08 01:12:39.000000000 +0000 +++ src/osdep/unix/os_bsi.c -@@ -30,7 +30,6 @@ +@@ -38,7 +38,6 @@ #include <netdb.h> #include <ctype.h> #include <errno.h> diff --git a/mail/imap-uw/patches/patch-ah b/mail/imap-uw/patches/patch-ah index e0e69af4394..ede16d8b87d 100644 --- a/mail/imap-uw/patches/patch-ah +++ b/mail/imap-uw/patches/patch-ah @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.7 2005/12/03 00:52:54 joerg Exp $ +$NetBSD: patch-ah,v 1.8 2007/08/03 17:03:30 obache Exp $ ---- src/osdep/unix/dummy.c.orig 2005-12-02 23:44:29.000000000 +0000 +--- src/osdep/unix/dummy.c.orig 2007-06-01 23:20:36.000000000 +0000 +++ src/osdep/unix/dummy.c -@@ -22,7 +22,6 @@ +@@ -30,7 +30,6 @@ #include <stdio.h> #include <ctype.h> #include <errno.h> diff --git a/mail/imap-uw/patches/patch-ai b/mail/imap-uw/patches/patch-ai index bcd6c2bc8b8..b518c7e3686 100644 --- a/mail/imap-uw/patches/patch-ai +++ b/mail/imap-uw/patches/patch-ai @@ -1,8 +1,8 @@ -$NetBSD: patch-ai,v 1.4 2004/05/13 18:14:34 adam Exp $ +$NetBSD: patch-ai,v 1.5 2007/08/03 17:03:30 obache Exp $ ---- src/mtest/mtest.c.orig 2004-05-01 17:22:07.000000000 +0000 +--- src/mtest/mtest.c.orig 2007-06-05 20:32:31.000000000 +0000 +++ src/mtest/mtest.c -@@ -33,6 +33,11 @@ +@@ -41,6 +41,11 @@ /* Excellent reasons to hate ifdefs, and why my real code never uses them */ diff --git a/mail/imap-uw/patches/patch-aj b/mail/imap-uw/patches/patch-aj index 239fb5a2aa6..3bd13e1a999 100644 --- a/mail/imap-uw/patches/patch-aj +++ b/mail/imap-uw/patches/patch-aj @@ -1,20 +1,20 @@ -$NetBSD: patch-aj,v 1.12 2006/07/26 20:00:27 jlam Exp $ +$NetBSD: patch-aj,v 1.13 2007/08/03 17:03:30 obache Exp $ ---- src/osdep/unix/Makefile.gss.orig 2003-03-04 22:29:59.000000000 -0500 +--- src/osdep/unix/Makefile.gss.orig 2007-04-05 02:20:04.000000000 +0000 +++ src/osdep/unix/Makefile.gss -@@ -21,11 +21,13 @@ - # Extended flags needed for additional authenticators. You may need to modify. - +@@ -29,11 +29,13 @@ GSSDIR=/usr/local --GSSCFLAGS= -I$(GSSDIR)/include -DGSS_C_NT_HOSTBASED_SERVICE=gss_nt_service_name -+GSSCFLAGS= -I$(GSSDIR)/include -I$(GSSDIR)/include/krb5 - GSSOLDLDFLAGS= -L$(GSSDIR)/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err - GSSNEWLDFLAGS= -L$(GSSDIR)/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err + 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 -DKRB5_DEPRECATED=1 + 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 $(GSSDIR)/lib/libk5crypto.a) && echo $(GSSNEWLDFLAGS) || echo $(GSSOLDLDFLAGS)' >> LDFLAGS -+ sh -c '(test -f $(GSSDIR)/lib/libk5crypto.a) && echo $(GSSNEWLDFLAGS) || echo $(GSSOLDLDFLAGS)' > LDFLAGS.gss1 +- 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/imap-uw/patches/patch-ak b/mail/imap-uw/patches/patch-ak index 5c6dfc4a4e0..4f3dcb1e65e 100644 --- a/mail/imap-uw/patches/patch-ak +++ b/mail/imap-uw/patches/patch-ak @@ -1,23 +1,23 @@ -$NetBSD: patch-ak,v 1.2 2005/08/12 19:47:17 tv Exp $ +$NetBSD: patch-ak,v 1.3 2007/08/03 17:03:30 obache Exp $ ---- src/osdep/unix/ckp_gss.c.orig 2005-06-05 19:43:50.000000000 -0400 -+++ src/osdep/unix/ckp_gss.c 2005-08-12 15:08:39.000000000 -0400 -@@ -30,6 +30,7 @@ +--- src/osdep/unix/ckp_gss.c.orig 2007-01-16 23:26:49.000000000 +0000 ++++ src/osdep/unix/ckp_gss.c +@@ -38,6 +38,7 @@ struct passwd *checkpw (struct passwd *p { - char tmp[MAILTMPLEN]; + char svrnam[MAILTMPLEN],cltnam[MAILTMPLEN]; krb5_context ctx; + krb5_error error; krb5_timestamp now; krb5_principal service; - krb5_creds *crd = (krb5_creds *) memset (fs_get (sizeof (krb5_creds)),0, -@@ -39,7 +40,9 @@ - /* make service name */ - sprintf (tmp,"%s@%s",(char *) mail_parameters (NIL,GET_SERVICENAME,NIL), - tcp_serverhost ()); + krb5_ccache ccache; +@@ -54,7 +55,9 @@ struct passwd *checkpw (struct passwd *p + /* make client name with principal */ + sprintf (cltnam,"%.80s/%.80s",pw->pw_name, + (char *) mail_parameters (NIL,GET_SERVICENAME,NIL)); - krb5_init_context (&ctx); /* get a context */ + error = krb5_init_context (&ctx); /* get a context */ + if (error) + return NIL; /* get time, client and server principals */ if (!krb5_timeofday (ctx,&now) && - !krb5_parse_name (ctx,pw->pw_name,&crd->client) && + /* Normally, kerb_cp_svr_name (defined/set in env_unix.c) is NIL, so diff --git a/mail/imap-uw/patches/patch-al b/mail/imap-uw/patches/patch-al index 497d3cf26dd..8bf589303ee 100644 --- a/mail/imap-uw/patches/patch-al +++ b/mail/imap-uw/patches/patch-al @@ -1,9 +1,9 @@ -$NetBSD: patch-al,v 1.6 2006/07/26 20:00:27 jlam Exp $ +$NetBSD: patch-al,v 1.7 2007/08/03 17:03:30 obache Exp $ ---- src/c-client/auth_gss.c.orig 2005-05-03 20:24:03.000000000 -0400 +--- src/c-client/auth_gss.c.orig 2006-08-30 23:37:16.000000000 +0000 +++ src/c-client/auth_gss.c -@@ -18,6 +18,14 @@ - * CPYRIGHT, included with this Distribution. +@@ -26,6 +26,14 @@ + * Last Edited: 30 August 2006 */ +#ifdef HEIMDAL_KRB5 @@ -17,7 +17,7 @@ $NetBSD: patch-al,v 1.6 2006/07/26 20:00:27 jlam Exp $ long auth_gssapi_valid (void); long auth_gssapi_client (authchallenge_t challenger,authrespond_t responder, -@@ -56,15 +64,32 @@ long auth_gssapi_valid (void) +@@ -64,15 +72,32 @@ long auth_gssapi_valid (void) OM_uint32 smn; gss_buffer_desc buf; gss_name_t name; diff --git a/mail/imap-uw/patches/patch-am b/mail/imap-uw/patches/patch-am index 14b4c35a903..3b048236e20 100644 --- a/mail/imap-uw/patches/patch-am +++ b/mail/imap-uw/patches/patch-am @@ -1,18 +1,18 @@ -$NetBSD: patch-am,v 1.5 2006/07/26 20:00:27 jlam Exp $ +$NetBSD: patch-am,v 1.6 2007/08/03 17:03:31 obache Exp $ ---- src/osdep/unix/env_unix.c.orig 2004-09-13 17:31:19.000000000 -0400 +--- src/osdep/unix/env_unix.c.orig 2007-05-29 20:29:52.000000000 +0000 +++ src/osdep/unix/env_unix.c -@@ -21,6 +21,9 @@ +@@ -29,6 +29,9 @@ #include <grp.h> #include <signal.h> #include <sys/wait.h> +#ifdef USE_WHOSON +#include <whoson.h> +#endif /* USE_WHOSON */ - - /* c-client environment parameters */ -@@ -567,7 +570,15 @@ long server_login (char *user,char *pwd, + + /* in case stat.h is ancient */ +@@ -693,7 +696,15 @@ long server_login (char *user,char *pwd, else if (disablePlaintext) err = "disabled"; else if (!(authuser && *authuser)) pw = valpwd (user,pwd,argc,argv); else if (valpwd (authuser,pwd,argc,argv)) pw = pwuser (user); @@ -29,7 +29,7 @@ $NetBSD: patch-am,v 1.5 2006/07/26 20:00:27 jlam Exp $ syslog (level|LOG_AUTH,"Login %s user=%.64s auth=%.64s host=%.80s",err, user,(authuser && *authuser) ? authuser : user,tcp_clienthost ()); sleep (3); /* slow down possible cracker */ -@@ -830,7 +841,8 @@ char *sysinbox () +@@ -956,7 +967,8 @@ char *sysinbox () { char tmp[MAILTMPLEN]; if (!sysInbox) { /* initialize if first time */ diff --git a/mail/imap-uw/patches/patch-ao b/mail/imap-uw/patches/patch-ao index a86a3cae1ac..b48fe48bf77 100644 --- a/mail/imap-uw/patches/patch-ao +++ b/mail/imap-uw/patches/patch-ao @@ -1,12 +1,12 @@ -$NetBSD: patch-ao,v 1.1 2005/12/03 00:52:54 joerg Exp $ +$NetBSD: patch-ao,v 1.2 2007/08/03 17:03:31 obache Exp $ ---- src/c-client/netmsg.c.orig 2005-12-02 23:46:56.000000000 +0000 +--- src/c-client/netmsg.c.orig 2006-12-07 02:37:03.000000000 +0000 +++ src/c-client/netmsg.c -@@ -21,7 +21,6 @@ +@@ -29,7 +29,6 @@ #include <stdio.h> #include <errno.h> -extern int errno; /* just in case */ - #include "mail.h" - #include "osdep.h" - #include "misc.h" + #include "c-client.h" + #include "netmsg.h" + #include "flstring.h" diff --git a/mail/imap-uw/patches/patch-ap b/mail/imap-uw/patches/patch-ap index 76535505c5a..5a8de7e207a 100644 --- a/mail/imap-uw/patches/patch-ap +++ b/mail/imap-uw/patches/patch-ap @@ -1,8 +1,8 @@ -$NetBSD: patch-ap,v 1.1 2005/12/03 00:52:54 joerg Exp $ +$NetBSD: patch-ap,v 1.2 2007/08/03 17:03:31 obache Exp $ ---- src/osdep/unix/unix.c.orig 2005-12-02 23:51:06.000000000 +0000 +--- src/osdep/unix/unix.c.orig 2007-06-18 20:22:43.000000000 +0000 +++ src/osdep/unix/unix.c -@@ -34,7 +34,6 @@ +@@ -42,7 +42,6 @@ #include <stdio.h> #include <ctype.h> #include <errno.h> diff --git a/mail/imap-uw/patches/patch-aq b/mail/imap-uw/patches/patch-aq index d9767a540b4..c3e8122a792 100644 --- a/mail/imap-uw/patches/patch-aq +++ b/mail/imap-uw/patches/patch-aq @@ -1,8 +1,8 @@ -$NetBSD: patch-aq,v 1.1 2005/12/03 00:52:54 joerg Exp $ +$NetBSD: patch-aq,v 1.2 2007/08/03 17:03:31 obache Exp $ ---- src/osdep/unix/mbx.c.orig 2005-12-02 23:52:39.000000000 +0000 +--- src/osdep/unix/mbx.c.orig 2007-06-22 18:53:18.000000000 +0000 +++ src/osdep/unix/mbx.c -@@ -29,7 +29,6 @@ +@@ -37,7 +37,6 @@ #include <stdio.h> #include <ctype.h> #include <errno.h> diff --git a/mail/imap-uw/patches/patch-ar b/mail/imap-uw/patches/patch-ar index e5ef1baba85..7ef2919d5e5 100644 --- a/mail/imap-uw/patches/patch-ar +++ b/mail/imap-uw/patches/patch-ar @@ -1,8 +1,8 @@ -$NetBSD: patch-ar,v 1.1 2005/12/03 00:52:54 joerg Exp $ +$NetBSD: patch-ar,v 1.2 2007/08/03 17:03:31 obache Exp $ ---- src/osdep/unix/mmdf.c.orig 2005-12-02 23:59:15.000000000 +0000 +--- src/osdep/unix/mmdf.c.orig 2007-06-18 20:22:25.000000000 +0000 +++ src/osdep/unix/mmdf.c -@@ -22,7 +22,6 @@ +@@ -30,7 +30,6 @@ #include <stdio.h> #include <ctype.h> #include <errno.h> diff --git a/mail/imap-uw/patches/patch-as b/mail/imap-uw/patches/patch-as index e4fb5e41454..e87939b7fea 100644 --- a/mail/imap-uw/patches/patch-as +++ b/mail/imap-uw/patches/patch-as @@ -1,8 +1,8 @@ -$NetBSD: patch-as,v 1.1 2005/12/03 00:52:54 joerg Exp $ +$NetBSD: patch-as,v 1.2 2007/08/03 17:03:31 obache Exp $ ---- src/osdep/unix/tenex.c.orig 2005-12-03 00:01:26.000000000 +0000 +--- src/osdep/unix/tenex.c.orig 2007-06-18 20:20:42.000000000 +0000 +++ src/osdep/unix/tenex.c -@@ -34,7 +34,6 @@ +@@ -42,7 +42,6 @@ #include <stdio.h> #include <ctype.h> #include <errno.h> diff --git a/mail/imap-uw/patches/patch-at b/mail/imap-uw/patches/patch-at index 5053269ade8..a9e653ed00d 100644 --- a/mail/imap-uw/patches/patch-at +++ b/mail/imap-uw/patches/patch-at @@ -1,8 +1,8 @@ -$NetBSD: patch-at,v 1.1 2005/12/03 00:52:54 joerg Exp $ +$NetBSD: patch-at,v 1.2 2007/08/03 17:03:31 obache Exp $ ---- src/osdep/unix/mtx.c.orig 2005-12-03 00:05:28.000000000 +0000 +--- src/osdep/unix/mtx.c.orig 2007-06-18 20:20:56.000000000 +0000 +++ src/osdep/unix/mtx.c -@@ -29,7 +29,6 @@ +@@ -37,7 +37,6 @@ #include <stdio.h> #include <ctype.h> #include <errno.h> diff --git a/mail/imap-uw/patches/patch-au b/mail/imap-uw/patches/patch-au index aa897012f11..b5efaeea1b0 100644 --- a/mail/imap-uw/patches/patch-au +++ b/mail/imap-uw/patches/patch-au @@ -1,8 +1,8 @@ -$NetBSD: patch-au,v 1.1 2005/12/03 00:52:54 joerg Exp $ +$NetBSD: patch-au,v 1.2 2007/08/03 17:03:31 obache Exp $ ---- src/osdep/unix/news.c.orig 2005-12-03 00:09:50.000000000 +0000 +--- src/osdep/unix/news.c.orig 2007-01-30 23:20:30.000000000 +0000 +++ src/osdep/unix/news.c -@@ -22,7 +22,6 @@ +@@ -30,7 +30,6 @@ #include <stdio.h> #include <ctype.h> #include <errno.h> diff --git a/mail/imap-uw/patches/patch-av b/mail/imap-uw/patches/patch-av index 1daf1b41666..16e16e77bfb 100644 --- a/mail/imap-uw/patches/patch-av +++ b/mail/imap-uw/patches/patch-av @@ -1,8 +1,8 @@ -$NetBSD: patch-av,v 1.1 2005/12/03 00:52:54 joerg Exp $ +$NetBSD: patch-av,v 1.2 2007/08/03 17:03:31 obache Exp $ ---- src/osdep/unix/phile.c.orig 2005-12-03 00:15:34.000000000 +0000 +--- src/osdep/unix/phile.c.orig 2007-05-09 23:07:29.000000000 +0000 +++ src/osdep/unix/phile.c -@@ -22,7 +22,6 @@ +@@ -30,7 +30,6 @@ #include <stdio.h> #include <ctype.h> #include <errno.h> diff --git a/mail/imap-uw/patches/patch-aw b/mail/imap-uw/patches/patch-aw index 28c608a231d..ce72c5aa816 100644 --- a/mail/imap-uw/patches/patch-aw +++ b/mail/imap-uw/patches/patch-aw @@ -1,8 +1,8 @@ -$NetBSD: patch-aw,v 1.1 2005/12/03 00:52:54 joerg Exp $ +$NetBSD: patch-aw,v 1.2 2007/08/03 17:03:31 obache Exp $ ---- src/osdep/unix/mh.c.orig 2005-12-03 00:28:43.000000000 +0000 +--- src/osdep/unix/mh.c.orig 2007-05-12 03:26:31.000000000 +0000 +++ src/osdep/unix/mh.c -@@ -22,7 +22,6 @@ +@@ -30,7 +30,6 @@ #include <stdio.h> #include <ctype.h> #include <errno.h> diff --git a/mail/imap-uw/patches/patch-ax b/mail/imap-uw/patches/patch-ax index b8f1d833d11..3a19f7a195c 100644 --- a/mail/imap-uw/patches/patch-ax +++ b/mail/imap-uw/patches/patch-ax @@ -1,8 +1,8 @@ -$NetBSD: patch-ax,v 1.1 2005/12/03 00:52:54 joerg Exp $ +$NetBSD: patch-ax,v 1.2 2007/08/03 17:03:31 obache Exp $ ---- src/osdep/unix/mx.c.orig 2005-12-03 00:43:02.000000000 +0000 +--- src/osdep/unix/mx.c.orig 2007-06-15 02:34:41.000000000 +0000 +++ src/osdep/unix/mx.c -@@ -22,7 +22,6 @@ +@@ -30,7 +30,6 @@ #include <stdio.h> #include <ctype.h> #include <errno.h> diff --git a/mail/imap-uw/patches/patch-ay b/mail/imap-uw/patches/patch-ay index 5833c5030b3..808fa0cff7a 100644 --- a/mail/imap-uw/patches/patch-ay +++ b/mail/imap-uw/patches/patch-ay @@ -1,8 +1,8 @@ -$NetBSD: patch-ay,v 1.1 2005/12/03 00:52:55 joerg Exp $ +$NetBSD: patch-ay,v 1.2 2007/08/03 17:03:31 obache Exp $ ---- src/ipopd/ipop2d.c.orig 2005-12-03 00:45:23.000000000 +0000 +--- src/ipopd/ipop2d.c.orig 2007-05-21 23:24:01.000000000 +0000 +++ src/ipopd/ipop2d.c -@@ -24,7 +24,6 @@ +@@ -32,7 +32,6 @@ #include <stdio.h> #include <ctype.h> #include <errno.h> diff --git a/mail/imap-uw/patches/patch-az b/mail/imap-uw/patches/patch-az index 44769875263..b5ed220547d 100644 --- a/mail/imap-uw/patches/patch-az +++ b/mail/imap-uw/patches/patch-az @@ -1,8 +1,8 @@ -$NetBSD: patch-az,v 1.1 2005/12/03 00:52:55 joerg Exp $ +$NetBSD: patch-az,v 1.2 2007/08/03 17:03:31 obache Exp $ ---- src/tmail/tmail.c.orig 2005-12-03 00:46:07.000000000 +0000 +--- src/tmail/tmail.c.orig 2007-05-21 23:26:20.000000000 +0000 +++ src/tmail/tmail.c -@@ -21,7 +21,6 @@ +@@ -29,7 +29,6 @@ #include <stdio.h> #include <pwd.h> #include <errno.h> diff --git a/mail/imap-uw/patches/patch-ba b/mail/imap-uw/patches/patch-ba index 9fd85a47df3..d4b464f11ce 100644 --- a/mail/imap-uw/patches/patch-ba +++ b/mail/imap-uw/patches/patch-ba @@ -1,8 +1,8 @@ -$NetBSD: patch-ba,v 1.1 2005/12/03 00:52:55 joerg Exp $ +$NetBSD: patch-ba,v 1.2 2007/08/03 17:03:32 obache Exp $ ---- src/ipopd/ipop3d.c.orig 2005-12-03 00:46:31.000000000 +0000 +--- src/ipopd/ipop3d.c.orig 2007-05-21 23:23:47.000000000 +0000 +++ src/ipopd/ipop3d.c -@@ -23,7 +23,6 @@ +@@ -31,7 +31,6 @@ #include <stdio.h> #include <ctype.h> #include <errno.h> diff --git a/mail/imap-uw/patches/patch-bb b/mail/imap-uw/patches/patch-bb index 9cc7d28a375..503f902135d 100644 --- a/mail/imap-uw/patches/patch-bb +++ b/mail/imap-uw/patches/patch-bb @@ -1,8 +1,8 @@ -$NetBSD: patch-bb,v 1.1 2005/12/03 00:52:55 joerg Exp $ +$NetBSD: patch-bb,v 1.2 2007/08/03 17:03:32 obache Exp $ ---- src/mailutil/mailutil.c.orig 2005-12-03 00:46:42.000000000 +0000 +--- src/mailutil/mailutil.c.orig 2007-05-21 23:24:47.000000000 +0000 +++ src/mailutil/mailutil.c -@@ -21,7 +21,6 @@ +@@ -29,7 +29,6 @@ #include <stdio.h> #include <errno.h> diff --git a/mail/imap-uw/patches/patch-bc b/mail/imap-uw/patches/patch-bc index 2950c5c53bd..223b052ff07 100644 --- a/mail/imap-uw/patches/patch-bc +++ b/mail/imap-uw/patches/patch-bc @@ -1,8 +1,8 @@ -$NetBSD: patch-bc,v 1.1 2005/12/03 00:52:55 joerg Exp $ +$NetBSD: patch-bc,v 1.2 2007/08/03 17:03:32 obache Exp $ ---- src/imapd/imapd.c.orig 2005-12-03 00:46:59.000000000 +0000 +--- src/imapd/imapd.c.orig 2007-07-11 20:08:16.000000000 +0000 +++ src/imapd/imapd.c -@@ -23,7 +23,6 @@ +@@ -31,7 +31,6 @@ #include <stdio.h> #include <ctype.h> #include <errno.h> diff --git a/mail/imap-uw/patches/patch-bd b/mail/imap-uw/patches/patch-bd index ed3201787b5..62f7d74d5a5 100644 --- a/mail/imap-uw/patches/patch-bd +++ b/mail/imap-uw/patches/patch-bd @@ -1,8 +1,8 @@ -$NetBSD: patch-bd,v 1.1 2005/12/03 00:52:55 joerg Exp $ +$NetBSD: patch-bd,v 1.2 2007/08/03 17:03:32 obache Exp $ ---- src/dmail/dmail.c.orig 2005-12-03 00:47:14.000000000 +0000 +--- src/dmail/dmail.c.orig 2007-06-18 23:34:41.000000000 +0000 +++ src/dmail/dmail.c -@@ -21,7 +21,6 @@ +@@ -29,7 +29,6 @@ #include <stdio.h> #include <pwd.h> #include <errno.h> diff --git a/mail/imap-uw/patches/patch-be b/mail/imap-uw/patches/patch-be index 2737608ce21..098a7995bd0 100644 --- a/mail/imap-uw/patches/patch-be +++ b/mail/imap-uw/patches/patch-be @@ -1,8 +1,8 @@ -$NetBSD: patch-be,v 1.1 2006/07/26 20:00:27 jlam Exp $ +$NetBSD: patch-be,v 1.2 2007/08/03 17:03:32 obache Exp $ ---- src/imapd/Makefile.orig 2004-06-29 17:26:28.000000000 -0400 +--- src/imapd/Makefile.orig 2006-08-31 00:10:44.000000000 +0000 +++ src/imapd/Makefile -@@ -45,7 +45,7 @@ SHELL= /bin/sh +@@ -43,7 +43,7 @@ SHELL= /bin/sh # Get local definitions from c-client directory C = ../c-client @@ -11,7 +11,7 @@ $NetBSD: patch-be,v 1.1 2006/07/26 20:00:27 jlam Exp $ CC = `cat $C/CCTYPE` CFLAGS = -I$C `cat $C/CFLAGS` $(NSBD) $(ENBD) -DANOFILE=\"$(ANO)\" \ -DALERTFILE=\"$(ALERT)\" -DNNTPFILE=\"$(NNTP)\" \ -@@ -55,7 +55,7 @@ LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS` +@@ -53,7 +53,7 @@ LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS` all: imapd imapd: $(CCLIENTLIB) imapd.o diff --git a/mail/imap-uw/patches/patch-bf b/mail/imap-uw/patches/patch-bf index 130c255d7c4..69c5a1faed7 100644 --- a/mail/imap-uw/patches/patch-bf +++ b/mail/imap-uw/patches/patch-bf @@ -1,8 +1,8 @@ -$NetBSD: patch-bf,v 1.1 2006/07/26 20:00:27 jlam Exp $ +$NetBSD: patch-bf,v 1.2 2007/08/03 17:03:32 obache Exp $ ---- src/ipopd/Makefile.orig 2000-10-24 19:55:07.000000000 -0400 +--- src/ipopd/Makefile.orig 2006-08-31 00:17:30.000000000 +0000 +++ src/ipopd/Makefile -@@ -19,7 +19,7 @@ +@@ -26,7 +26,7 @@ C = ../c-client @@ -11,7 +11,7 @@ $NetBSD: patch-bf,v 1.1 2006/07/26 20:00:27 jlam Exp $ SHELL = /bin/sh # Get local definitions from c-client directory -@@ -31,10 +31,10 @@ LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS` +@@ -38,10 +38,10 @@ LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS` ipopd: ipop2d ipop3d ipop2d: $(CCLIENTLIB) ipop2d.o diff --git a/mail/imap-uw/patches/patch-bg b/mail/imap-uw/patches/patch-bg index a58d65b0ab6..e2d32366759 100644 --- a/mail/imap-uw/patches/patch-bg +++ b/mail/imap-uw/patches/patch-bg @@ -1,8 +1,8 @@ -$NetBSD: patch-bg,v 1.1 2006/07/26 20:00:27 jlam Exp $ +$NetBSD: patch-bg,v 1.2 2007/08/03 17:03:32 obache Exp $ ---- src/mtest/Makefile.orig 2000-10-24 19:55:39.000000000 -0400 +--- src/mtest/Makefile.orig 2006-08-31 00:25:07.000000000 +0000 +++ src/mtest/Makefile -@@ -19,7 +19,7 @@ +@@ -26,7 +26,7 @@ C = ../c-client @@ -11,7 +11,7 @@ $NetBSD: patch-bg,v 1.1 2006/07/26 20:00:27 jlam Exp $ SHELL = /bin/sh # Get local definitions from c-client directory -@@ -31,7 +31,7 @@ LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS` +@@ -38,7 +38,7 @@ LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS` all: mtest mtest: $(CCLIENTLIB) mtest.o |