diff options
23 files changed, 97 insertions, 376 deletions
diff --git a/mail/courier-mta/DEINSTALL b/mail/courier-mta/DEINSTALL index ecac4e0cffb..c86b2172493 100644 --- a/mail/courier-mta/DEINSTALL +++ b/mail/courier-mta/DEINSTALL @@ -1,4 +1,4 @@ -# $NetBSD: DEINSTALL,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $ +# $NetBSD: DEINSTALL,v 1.2 2007/10/15 15:37:13 jlam Exp $ case ${STAGE} in DEINSTALL) @@ -87,7 +87,9 @@ DEINSTALL) fi done - # Unconditionally remove temporary files. - ${RM} -rf @COURIER_STATEDIR@/tmp/* + # Unconditionally remove temporary files, but not directories + # which are part of the message queue. + # + ${RM} -f @COURIER_STATEDIR@/tmp/* 2>/dev/null ;; esac diff --git a/mail/courier-mta/Makefile b/mail/courier-mta/Makefile index d17ddc63a40..1cbe4127ee1 100644 --- a/mail/courier-mta/Makefile +++ b/mail/courier-mta/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.21 2007/09/23 11:42:44 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2007/10/15 15:37:14 jlam Exp $ DISTNAME= courier-${COURIER_VERSION} PKGNAME= ${DISTNAME:S/-/-mta-/} -PKGREVISION= 11 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/} EXTRACT_SUFX= .tar.bz2 @@ -14,11 +13,12 @@ COMMENT= Courier mail transport agent HOMEPAGE= http://www.courier-mta.org/ DEPENDS+= courier-maildir>=${COURIER_VERSION}:../../mail/courier-maildir -DEPENDS+= couriertcpd>=${COURIER_VERSION}nb3:../../net/couriertcpd -DEPENDS+= maildrop>=2.0.4:../../mail/maildrop +DEPENDS+= couriertcpd>=${COURIER_VERSION}:../../net/couriertcpd +DEPENDS+= maildrop>=2.0.4nb2:../../mail/maildrop USE_TOOLS+= gmake openssl:run perl:run USE_LANGUAGES= c c++ +GCC_REQD+= 3.0 # need Standard C++ Library .include "Makefile.common" diff --git a/mail/courier-mta/Makefile.common b/mail/courier-mta/Makefile.common index 537de578aa2..5248b48ae97 100644 --- a/mail/courier-mta/Makefile.common +++ b/mail/courier-mta/Makefile.common @@ -1,6 +1,7 @@ -# $NetBSD: Makefile.common,v 1.6 2007/08/10 17:57:03 jlam Exp $ +# $NetBSD: Makefile.common,v 1.7 2007/10/15 15:37:14 jlam Exp $ -COURIER_VERSION= 0.56.0 +COURIER_VERSION= 0.57.1 +LICENSE= gnu-gpl-v3 .include "../../mk/bsd.prefs.mk" diff --git a/mail/courier-mta/distinfo b/mail/courier-mta/distinfo index 5694e4e584d..dd5c7fdaa7a 100644 --- a/mail/courier-mta/distinfo +++ b/mail/courier-mta/distinfo @@ -1,26 +1,16 @@ -$NetBSD: distinfo,v 1.8 2007/09/23 11:42:44 jlam Exp $ +$NetBSD: distinfo,v 1.9 2007/10/15 15:37:14 jlam Exp $ -SHA1 (courier-0.56.0.tar.bz2) = 536f24db9f33f8d93445c03dd4edb50c7ec2f6b2 -RMD160 (courier-0.56.0.tar.bz2) = ce8e2d99f5b7baf500d748c18fbd126df8331398 -Size (courier-0.56.0.tar.bz2) = 7022057 bytes -SHA1 (patch-aa) = 53b2fbf9414f3a853ec32006affdab66217ae85f -SHA1 (patch-ab) = 42aa037beab3b57a2e470f1587274ef797b2a770 -SHA1 (patch-ac) = d220279beaff057b74bdf9b50a0c99f21afd7f7b -SHA1 (patch-ad) = c0fcc00a60102782c315ac3e847b565adaa7b73d +SHA1 (courier-0.57.1.tar.bz2) = 5e602d4a4d5dd33b17146c7f54467ac6352e9340 +RMD160 (courier-0.57.1.tar.bz2) = 28b9f409e281403280b69f3a4f4be8b9e4f74dc2 +Size (courier-0.57.1.tar.bz2) = 7098660 bytes +SHA1 (patch-aa) = 10e3bc04883578ea235d9631ee72ead707f92a68 +SHA1 (patch-ab) = e01fd7a1b3993b849c2495874f61c68a89384f9d +SHA1 (patch-ac) = 7790248b02a333e11f1429c88e7428b7e0fedb8d +SHA1 (patch-ad) = 0899aea066310909e4595974e5df69980a4db5d2 SHA1 (patch-ae) = e52ab2f6a4e253dc4a28291db6744ea2593f2fc3 -SHA1 (patch-af) = 446b4db2e6e22461c243481bd5c39ffba68fd4b6 +SHA1 (patch-af) = a3bcc672fc05e05497d7408c1a96ad52226aee01 SHA1 (patch-ah) = 78e0db8d5319d985d7e8aec4c1240561fead3a00 -SHA1 (patch-ai) = 5324b99ebc0492c77f67a8c627ceb3c3efa9d852 -SHA1 (patch-aj) = 0ec994bfb79ca133555a3d300f8a264648591e1b -SHA1 (patch-al) = 8c37ddbb5e3c358ee0920adc27441e38b4efa143 -SHA1 (patch-am) = edab962fa9bf8979e6fc9d319f95840178c3a578 -SHA1 (patch-an) = f56cf08104e7006864fa0e8ce86dcf0e5dd66279 -SHA1 (patch-ao) = c859c61370fbc4a774456b629fb3f05ee1a32621 -SHA1 (patch-ap) = 8696818dc2994f8dbe523034ed1c713101693291 -SHA1 (patch-aq) = 054df1e1e05df3e14b3c531c5bd9768b9d2e34d7 -SHA1 (patch-ar) = ab2c3e40928933eced0856a7c378c908e8a4689d -SHA1 (patch-as) = 08bd540d92a3ef9db533a92b48c653ed2a256f9b -SHA1 (patch-at) = 7c93cabfe5b1164c6699111cd74e612af887881c -SHA1 (patch-au) = 794fdd49f7994689e4e4ee809293d2e67d9bc4c2 -SHA1 (patch-av) = df4847bcf1127766f35cfecd65a293fa2bf7d6c9 -SHA1 (patch-aw) = a777a767893642b8425c70e8a7a791d6e2c77eb7 +SHA1 (patch-ai) = a2172e61d38ccff3d877393bd968171e5fed124a +SHA1 (patch-aj) = 5e3bcd5c8b0186dd048807deb6603102d05f1303 +SHA1 (patch-al) = 1c7935b46b7affafa86e4a858ba6a79b7fbebbc5 +SHA1 (patch-an) = 1c78baf7fc393b013c47745b914571aff94f1497 diff --git a/mail/courier-mta/patches/patch-aa b/mail/courier-mta/patches/patch-aa index e0fd0a5979d..0b2d5614b31 100644 --- a/mail/courier-mta/patches/patch-aa +++ b/mail/courier-mta/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.3 2007/08/10 17:57:04 jlam Exp $ +$NetBSD: patch-aa,v 1.4 2007/10/15 15:37:14 jlam Exp $ ---- courier/Makefile.in.orig 2007-06-23 07:56:06.000000000 -0400 +--- courier/Makefile.in.orig Sat Sep 29 14:57:58 2007 +++ courier/Makefile.in -@@ -50,18 +50,18 @@ build_triplet = @build@ +@@ -46,16 +46,16 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ pkglibexec_PROGRAMS = aliasexp$(EXEEXT) aliascombine$(EXEEXT) \ @@ -22,12 +22,9 @@ $NetBSD: patch-aa,v 1.3 2007/08/10 17:57:04 jlam Exp $ +sbin_PROGRAMS = courier$(EXEEXT) courier-showconfig$(EXEEXT) \ + courier-showmodules$(EXEEXT) aliaslookup$(EXEEXT) @COURIERLDAPALIASD@ \ @EXTRASBIN@ $(am__empty) --cmdlib_PROGRAMS = submitmkdir$(EXEEXT) courierd$(EXEEXT) @EXTRACMDLIB@ -+cmdlib_PROGRAMS = submitmkdir$(EXEEXT) courierd$(EXEEXT) @EXTRACMDLIB@ - DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(srcdir)/courier.h.in $(srcdir)/courierctl.start.in \ -@@ -420,7 +420,7 @@ BUILT_SOURCES = prefix.h exec_prefix.h s + cmdlib_PROGRAMS = submitmkdir$(EXEEXT) courierd$(EXEEXT) @EXTRACMDLIB@ + subdir = . +@@ -433,7 +433,7 @@ BUILT_SOURCES = prefix.h exec_prefix.h s uidgid.h configargs.h sort.h webmlmdhandlerslist.H RFCERRTXTIN = rfcerrheader.txt RFCERRTXTNOIN = rfcerr2045.txt rfcerr2046.txt rfcerr2047.txt @@ -36,7 +33,7 @@ $NetBSD: patch-aa,v 1.3 2007/08/10 17:57:04 jlam Exp $ pkglibexecdir = $(libexecdir)/courier webmaildir = $(libexecdir)/courier/webmail webmail_SOURCES = -@@ -428,22 +428,19 @@ sqwebmaild_SOURCES = +@@ -441,22 +441,19 @@ sqwebmaild_SOURCES = # Don't forget to change perms.sh.in, if webmailimagedir moves. webmailimagedir = $(datadir)/sqwebmail/images @@ -65,7 +62,7 @@ $NetBSD: patch-aa,v 1.3 2007/08/10 17:57:04 jlam Exp $ mlmdatadir = $(datadir)/couriermlm mlmdata_DATA = \ -@@ -499,7 +496,7 @@ mlmdata_DATA = \ +@@ -512,7 +509,7 @@ mlmdata_DATA = \ webmlmsublist.tmpl.html \ webmlm.tmpl.html @@ -74,7 +71,7 @@ $NetBSD: patch-aa,v 1.3 2007/08/10 17:57:04 jlam Exp $ cmdlibdir = @libexecdir@/courier # Subdirectories -@@ -1652,6 +1649,12 @@ couriertls$(EXEEXT): ../tcpd/couriertls$ +@@ -1673,6 +1670,12 @@ couriertls$(EXEEXT): ../tcpd/couriertls$ courierpop3login$(EXEEXT): ../imap/pop3login$(EXEEXT) cp -f ../imap/pop3login$(EXEEXT) courierpop3login$(EXEEXT) @@ -87,7 +84,7 @@ $NetBSD: patch-aa,v 1.3 2007/08/10 17:57:04 jlam Exp $ sort.h: echo '#define SORT "$(SORT)"' >sort.h -@@ -1813,33 +1816,16 @@ install-exec-hook: +@@ -1834,33 +1837,16 @@ install-exec-hook: $(localstatedir)/track\ $(localstatedir)/msgs $(localstatedir)/msgq ; do \ $(mkinstalldirs) $(DESTDIR)$$d || :; done @@ -123,7 +120,7 @@ $NetBSD: patch-aa,v 1.3 2007/08/10 17:57:04 jlam Exp $ test -f $(DESTDIR)$(sysconfdir)/enablefiltering && exit 0; \ echo esmtp >$(DESTDIR)$(sysconfdir)/enablefiltering test -f $(DESTDIR)$(sysconfdir)/aliases/system && exit 0; \ -@@ -1851,10 +1837,6 @@ install-data-hook: +@@ -1872,10 +1858,6 @@ install-data-hook: rm -f $(DESTDIR)$(bindir)/rmail $(LN_S) sendmail $(DESTDIR)$(bindir)/rmail -$(mkinstalldirs) $(DESTDIR)@mandir@/man8 diff --git a/mail/courier-mta/patches/patch-ab b/mail/courier-mta/patches/patch-ab index 6d9b235f678..0eeaee25fed 100644 --- a/mail/courier-mta/patches/patch-ab +++ b/mail/courier-mta/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.2 2007/08/10 17:57:04 jlam Exp $ +$NetBSD: patch-ab,v 1.3 2007/10/15 15:37:14 jlam Exp $ ---- courier/configure.orig 2007-06-23 07:56:05.000000000 -0400 +--- courier/configure.orig Sat Sep 29 14:57:58 2007 +++ courier/configure -@@ -21745,9 +21745,9 @@ done +@@ -22280,9 +22280,9 @@ done if test "$testmode" = "0" then @@ -14,4 +14,4 @@ $NetBSD: patch-ab,v 1.2 2007/08/10 17:57:04 jlam Exp $ + INSTALL_DATA='${BSD_INSTALL_DATA}' fi - ac_ext=cc + ac_ext=cpp diff --git a/mail/courier-mta/patches/patch-ac b/mail/courier-mta/patches/patch-ac index 26d8a4e9220..12a7872c82f 100644 --- a/mail/courier-mta/patches/patch-ac +++ b/mail/courier-mta/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.3 2007/08/10 17:57:04 jlam Exp $ +$NetBSD: patch-ac,v 1.4 2007/10/15 15:37:14 jlam Exp $ ---- courier/doc/Makefile.in.orig 2007-05-12 23:03:54.000000000 -0400 +--- courier/doc/Makefile.in.orig Sun Jul 22 01:32:34 2007 +++ courier/doc/Makefile.in -@@ -141,7 +141,7 @@ target_alias = @target_alias@ +@@ -151,7 +151,7 @@ top_srcdir = @top_srcdir@ version = @version@ htmldocdir = @datadir@/htmldoc CLEANFILES = permissions.dat @@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.3 2007/08/10 17:57:04 jlam Exp $ draft-varshavchik-exdata-smtpext.txt \ draft-varshavchik-verp-smtpext.txt \ draft-varshavchik-security-smtpext.txt \ -@@ -179,66 +179,39 @@ htmlin = \ +@@ -189,66 +189,39 @@ htmlin = \ courier.html \ courierldapaliasd.html \ couriermlm.html \ @@ -88,7 +88,7 @@ $NetBSD: patch-ac,v 1.3 2007/08/10 17:57:04 jlam Exp $ BUILT_SOURCES = \ aliaslookup.html aliaslookup.8 \ -@@ -265,7 +238,7 @@ BUILT_SOURCES = \ +@@ -275,7 +248,7 @@ BUILT_SOURCES = \ webmlmd.html.in webmlmd.1.in EXTRA_DIST = $(nohtmlin) $(BUILT_SOURCES) @@ -97,7 +97,7 @@ $NetBSD: patch-ac,v 1.3 2007/08/10 17:57:04 jlam Exp $ $(man1dir)/rmail.1 $(man1dir)/dotforward.1 \ $(man8dir)/makesmtpaccess-msa.8 \ $(man8dir)/esmtpd-msa.8 -@@ -1139,8 +1112,7 @@ preline.1: preline.1.in +@@ -1156,8 +1129,7 @@ preline.1: preline.1.in install-man-extra: cd $(DESTDIR)$(man8dir) ; \ diff --git a/mail/courier-mta/patches/patch-ad b/mail/courier-mta/patches/patch-ad index b60bae8843b..b92ce652a45 100644 --- a/mail/courier-mta/patches/patch-ad +++ b/mail/courier-mta/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.2 2007/08/10 17:57:04 jlam Exp $ +$NetBSD: patch-ad,v 1.3 2007/10/15 15:37:14 jlam Exp $ ---- courier/filters/Makefile.in.orig 2007-02-25 23:21:06.000000000 -0500 +--- courier/filters/Makefile.in.orig Sun Jul 22 01:32:33 2007 +++ courier/filters/Makefile.in -@@ -229,11 +229,12 @@ SUBDIRS = libfilter perlfilter +@@ -236,11 +236,12 @@ SUBDIRS = libfilter perlfilter CLEANFILES = $(htmldoc_DATA) $(man_MANS) filtersocketdir.h filteractivedir.h \ pidfile.h permissions.dat diff --git a/mail/courier-mta/patches/patch-af b/mail/courier-mta/patches/patch-af index f4ee1268a0c..f69f6e572df 100644 --- a/mail/courier-mta/patches/patch-af +++ b/mail/courier-mta/patches/patch-af @@ -1,14 +1,14 @@ -$NetBSD: patch-af,v 1.2 2007/08/10 17:57:05 jlam Exp $ +$NetBSD: patch-af,v 1.3 2007/10/15 15:37:14 jlam Exp $ ---- courier/filters/perlfilter/Makefile.in.orig 2007-02-25 23:21:34.000000000 -0500 +--- courier/filters/perlfilter/Makefile.in.orig Sat Jul 21 20:31:15 2007 +++ courier/filters/perlfilter/Makefile.in -@@ -205,7 +205,8 @@ target_alias = @target_alias@ +@@ -207,7 +207,8 @@ top_srcdir = @top_srcdir@ EXTRA_DIST = perlfilter-wrapper.pl perlfilter-example.pl BUILT_SOURCES = filtersocketdir.h wrapperpl.h xsinit.c CLEANFILES = $(BUILT_SOURCES) permissions.dat -filterbindir = $(libexecdir)/filters +pkglibexecdir = $(libexecdir)/courier +filterbindir = $(pkglibexecdir)/filters + filterbin_PROGRAMS = @perlfilter_prog@ scriptdir = $(datadir) script_SCRIPTS = perlfilter-wrapper.pl perlfilter-example.pl - filtersocketdir = $(localstatedir)/filters diff --git a/mail/courier-mta/patches/patch-ai b/mail/courier-mta/patches/patch-ai index d22b37c8744..01b017819b4 100644 --- a/mail/courier-mta/patches/patch-ai +++ b/mail/courier-mta/patches/patch-ai @@ -1,8 +1,8 @@ -$NetBSD: patch-ai,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $ +$NetBSD: patch-ai,v 1.2 2007/10/15 15:37:14 jlam Exp $ ---- courier/module.local/local.c.orig 2004-10-23 22:02:38.000000000 -0400 +--- courier/module.local/local.c.orig Sun Oct 7 16:37:52 2007 +++ courier/module.local/local.c -@@ -731,6 +731,8 @@ const char *quota; +@@ -745,6 +745,8 @@ const char *quota; strlen(argv[7])), "SENDER="), argv[7])); diff --git a/mail/courier-mta/patches/patch-aj b/mail/courier-mta/patches/patch-aj index 89bfbc3f550..e7dc06db837 100644 --- a/mail/courier-mta/patches/patch-aj +++ b/mail/courier-mta/patches/patch-aj @@ -1,9 +1,9 @@ -$NetBSD: patch-aj,v 1.3 2007/08/10 17:57:05 jlam Exp $ +$NetBSD: patch-aj,v 1.4 2007/10/15 15:37:14 jlam Exp $ ---- courier/perms.sh.in.orig 2007-06-15 22:21:24.000000000 -0400 +--- courier/perms.sh.in.orig Sun Jul 1 15:36:31 2007 +++ courier/perms.sh.in -@@ -10,119 +10,47 @@ prefix="@prefix@" - exec_prefix="@exec_prefix@" +@@ -11,119 +11,47 @@ exec_prefix="@exec_prefix@" + datarootdir="@datarootdir@" PERMS=" -. 755 @@ -122,7 +122,7 @@ $NetBSD: patch-aj,v 1.3 2007/08/10 17:57:05 jlam Exp $ @datadir@/couriermlm 755 @datadir@/couriermlm/adminrequest.tmpl 644 -@@ -190,11 +118,20 @@ do +@@ -191,11 +119,20 @@ do if test "$USER" = "" then USER="@mailuser@" @@ -143,7 +143,7 @@ $NetBSD: patch-aj,v 1.3 2007/08/10 17:57:05 jlam Exp $ fi case $FILE in -@@ -215,26 +152,7 @@ do +@@ -216,26 +153,7 @@ do echo $FILE $MODE $USER $GROUP $SPECIAL done diff --git a/mail/courier-mta/patches/patch-al b/mail/courier-mta/patches/patch-al index d77d4d8f40d..8f0e06bdbd2 100644 --- a/mail/courier-mta/patches/patch-al +++ b/mail/courier-mta/patches/patch-al @@ -1,8 +1,8 @@ -$NetBSD: patch-al,v 1.1 2007/08/10 17:57:05 jlam Exp $ +$NetBSD: patch-al,v 1.2 2007/10/15 15:37:14 jlam Exp $ ---- courier/courier.c.orig 2006-05-27 00:52:51.000000000 -0400 +--- courier/courier.c.orig Wed Jul 18 02:32:34 2007 +++ courier/courier.c -@@ -197,7 +197,7 @@ int main(int argc, char **argv) +@@ -200,7 +200,7 @@ int main(int argc, char **argv) #endif execl( DATADIR "/courierctl.start", "courierctl.start", (char *)0); diff --git a/mail/courier-mta/patches/patch-am b/mail/courier-mta/patches/patch-am deleted file mode 100644 index 15ea9ac48ca..00000000000 --- a/mail/courier-mta/patches/patch-am +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-am,v 1.2 2007/09/05 19:21:03 jlam Exp $ - ---- courier/cmlm2.C.orig 2007-04-30 23:01:57.000000000 -0400 -+++ courier/cmlm2.C -@@ -10,6 +10,14 @@ - #include "rfc822/rfc2047.h" - #include "unicode/unicode.h" - #include <fcntl.h> -+#if HAVE_LANGINFO_H -+#include <langinfo.h> -+#endif -+#if HAVE_LOCALE_H -+#if HAVE_SETLOCALE -+#include <locale.h> -+#endif -+#endif - #include <unistd.h> - - #include <fstream> diff --git a/mail/courier-mta/patches/patch-an b/mail/courier-mta/patches/patch-an index 1f5e80228f8..1dab76af2f7 100644 --- a/mail/courier-mta/patches/patch-an +++ b/mail/courier-mta/patches/patch-an @@ -1,6 +1,6 @@ -$NetBSD: patch-an,v 1.2 2007/09/06 04:05:40 jlam Exp $ +$NetBSD: patch-an,v 1.3 2007/10/15 15:37:15 jlam Exp $ ---- courier/webmlmd.C.orig Sat Jun 16 02:21:24 2007 +--- courier/webmlmd.C.orig Thu Jul 5 01:47:38 2007 +++ courier/webmlmd.C @@ -22,6 +22,7 @@ #include <string.h> @@ -10,78 +10,43 @@ $NetBSD: patch-an,v 1.2 2007/09/06 04:05:40 jlam Exp $ #include <sys/types.h> #include <sys/stat.h> #include <sys/socket.h> -@@ -39,6 +40,12 @@ - #include <iostream> +@@ -40,6 +41,39 @@ #include <fstream> #include <sstream> + #include <map> ++ +#if defined(__FreeBSD_version) && (__FreeBSD_version < 500029) +#include <cwchar> +namespace std { + typedef basic_string <wchar_t> wstring; ++ ++ template<> ++ struct char_traits<wchar_t> ++ { ++ typedef wchar_t char_type; ++ ++ static void assign(wchar_t &c1, const wchar_t &c2) ++ { ++ c1 = c2; ++ } ++ ++ static wchar_t *assign(wchar_t *s, size_t n, wchar_t c) ++ { ++ return wmemset(s, c, n); ++ } ++ ++ static wchar_t *copy(wchar_t *s1, const wchar_t *s2, unsigned n) ++ { ++ return wmemcpy(s1, s2, n); ++ } ++ ++ static wchar_t *move(wchar_t *s1, const wchar_t *s2, unsigned n) ++ { ++ return wmemmove(s1, s2, n); ++ } ++ }; +} +#endif - #include <map> #include "cmlm.h" -@@ -606,7 +613,10 @@ HANDLER("ADMINUPDATE", do_admin_update) - cmdset(args_array, false); - - { -- std::istringstream i(std::string(cgi("optheaderadd")) + "\n"); -+ std::string t(cgi("optheaderadd")); -+ t += "\n"; -+ -+ std::istringstream i(t); - - std::ofstream ofs(HEADERADD ".new"); - -@@ -623,7 +633,10 @@ HANDLER("ADMINUPDATE", do_admin_update) - } - - { -- std::istringstream i(std::string(cgi("optheaderdel")) + "\n"); -+ std::string t(cgi("optheaderdel")); -+ t += "\n"; -+ -+ std::istringstream i(t); - - std::ofstream ofs(HEADERDEL ".new"); - -@@ -953,10 +966,10 @@ static void sendsubunsub(std::string ext - - if (ctlmsg.start(ext, address, "ctlmsg")) - { -- FILE *stdin=ctlmsg.stdin(); -+ FILE *standard_input=ctlmsg.standard_input(); - - ctlmsg.mk_received_header(); -- fprintf(stdin, "\nSubscription request received.\n"); -+ fprintf(standard_input, "\nSubscription request received.\n"); - - if (ctlmsg.wait()) - { -@@ -1100,10 +1113,10 @@ static void listrequest2(std::string lis - if (confirm.start(method + "-" + token, "", - "ctlmsg")) - { -- FILE *stdin=confirm.stdin(); -+ FILE *standard_input=confirm.standard_input(); - - confirm.mk_received_header(); -- fprintf(stdin, -+ fprintf(standard_input, - "Subject: yes -- confirmed by WebMLM\n" - "\n" - "Confirmed\n"); -@@ -1117,9 +1130,9 @@ static void listrequest2(std::string lis - char buf[1024]; - bool isfirst=true; - -- FILE *stdout=confirm.stdout(); -+ FILE *standard_output=confirm.standard_output(); - -- while (fgets(buf, sizeof(buf), stdout)) -+ while (fgets(buf, sizeof(buf), standard_output)) - { - if (isfirst) - { + #include "cmlmcmdmisc.h" diff --git a/mail/courier-mta/patches/patch-ao b/mail/courier-mta/patches/patch-ao deleted file mode 100644 index 2db7ab6fd18..00000000000 --- a/mail/courier-mta/patches/patch-ao +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ao,v 1.1 2007/08/10 17:57:05 jlam Exp $ - ---- courier/webmlmdcmlm.H.orig 2007-05-19 20:04:55.000000000 -0400 -+++ courier/webmlmdcmlm.H -@@ -62,8 +62,8 @@ namespace webmlmd { - ); - bool wait(); - -- FILE *stdin() { return stdin_filep.fp; } -- FILE *stdout() { return stdout_filep.fp; } -+ FILE *standard_input() { return stdin_filep.fp; } -+ FILE *standard_output() { return stdout_filep.fp; } - - void mk_received_header(); - diff --git a/mail/courier-mta/patches/patch-ap b/mail/courier-mta/patches/patch-ap deleted file mode 100644 index e9d3db4e134..00000000000 --- a/mail/courier-mta/patches/patch-ap +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-ap,v 1.1 2007/08/10 17:57:06 jlam Exp $ - ---- courier/webmlmdmod.C.orig 2007-05-19 20:04:55.000000000 -0400 -+++ courier/webmlmdmod.C -@@ -286,10 +286,10 @@ std::string webmlmd::do_mod_accept(std:: - - if (ctlmsg.start("moderate", "", "ctlmsg")) - { -- FILE *stdin=ctlmsg.stdin(); -+ FILE *standard_input=ctlmsg.standard_input(); - - ctlmsg.mk_received_header(); -- fprintf(stdin, "Subject: yes\n\n" -+ fprintf(standard_input, "Subject: yes\n\n" - "==CUT HERE==\n\n==CUT HERE==\n\n" - "[%s]\n" - "[%s]\n", -@@ -329,10 +329,10 @@ std::string webmlmd::do_mod_reject(std:: - - if (ctlmsg.start("moderate", "", "ctlmsg")) - { -- FILE *stdin=ctlmsg.stdin(); -+ FILE *standard_input=ctlmsg.standard_input(); - - ctlmsg.mk_received_header(); -- fprintf(stdin, "Subject: %s\n\n" -+ fprintf(standard_input, "Subject: %s\n\n" - "==CUT HERE==\n\n%s==CUT HERE==\n\n" - "[%s]\n" - "[%s]\n", diff --git a/mail/courier-mta/patches/patch-aq b/mail/courier-mta/patches/patch-aq deleted file mode 100644 index a4e9704f560..00000000000 --- a/mail/courier-mta/patches/patch-aq +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-aq,v 1.2 2007/09/06 04:05:40 jlam Exp $ - ---- courier/webmlmdsublist.C.orig Sat Jun 16 02:21:24 2007 -+++ courier/webmlmdsublist.C -@@ -196,7 +196,8 @@ public: - std::fstream &getSubListFp() { return sublist; } - }; - --WSubList::WSubList() : sublist(SUBLIST), idxsublist(SUBLIST ".idx"), -+WSubList::WSubList() : sublist(SUBLIST, std::fstream::in|std::fstream::out), -+ idxsublist(SUBLIST ".idx"), - idxEntryCount(0) - { - } -@@ -319,7 +320,7 @@ static void dodel(WSubList &sub_list) - - unsubscribe.mk_received_header(); - -- FILE *fp=unsubscribe.stdin(); -+ FILE *fp=unsubscribe.standard_input(); - - fprintf(fp, - "Subject: admin unsubscribe\n" -@@ -578,7 +579,7 @@ HANDLER("SUBINFO", emit_subinfo) - - char linebuf[256]; - -- while (fgets(linebuf, sizeof(linebuf), subinfo.stdout())) -+ while (fgets(linebuf, sizeof(linebuf), subinfo.standard_output())) - { - std::cout << webmlmd::html_escape(linebuf); - } diff --git a/mail/courier-mta/patches/patch-ar b/mail/courier-mta/patches/patch-ar deleted file mode 100644 index 1d9484914a5..00000000000 --- a/mail/courier-mta/patches/patch-ar +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ar,v 1.1 2007/09/04 21:02:22 joerg Exp $ - ---- cgi/cgidaemond.c.orig 2007-09-04 19:52:18.000000000 +0000 -+++ cgi/cgidaemond.c -@@ -34,6 +34,7 @@ - #include <sys/stat.h> - #include <sys/socket.h> - #include <sys/un.h> -+#include <sys/uio.h> - - static int read_environ(int); - diff --git a/mail/courier-mta/patches/patch-as b/mail/courier-mta/patches/patch-as deleted file mode 100644 index 8384fcca9d9..00000000000 --- a/mail/courier-mta/patches/patch-as +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-as,v 1.1 2007/09/06 04:05:40 jlam Exp $ - ---- courier/webmlmd.H.orig Sat Jun 16 02:21:24 2007 -+++ courier/webmlmd.H -@@ -8,6 +8,7 @@ - #ifndef webmlmd_H - #define webmlmd_H - -+#include <algorithm> - #include <list> - #include <string> - #include <map> -@@ -48,7 +49,7 @@ namespace webmlmd { - T t; - - t.reserve(s.size() * 6 / 5); -- class T::iterator b=s.begin(), e=s.end(), p=b; -+ typename T::iterator b=s.begin(), e=s.end(), p=b; - - while (b != e) - { diff --git a/mail/courier-mta/patches/patch-at b/mail/courier-mta/patches/patch-at deleted file mode 100644 index 91ce0255c4f..00000000000 --- a/mail/courier-mta/patches/patch-at +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-at,v 1.1 2007/09/06 04:05:40 jlam Exp $ - ---- webmail/folder.c.orig Sun May 20 00:04:55 2007 -+++ webmail/folder.c -@@ -271,7 +271,7 @@ void folder_delmsgs(const char *dir, siz - } - else if (*cgi("cmdpurgeall")) - { -- char *deldir; -+ char *cur, *deldir; - struct maildir_info minfo; - - if (maildir_info_imap_find(&minfo, dir, login_returnaddr())<0) -@@ -289,7 +289,7 @@ void folder_delmsgs(const char *dir, siz - return; - } - -- char *cur = malloc(strlen(deldir)+5); -+ cur = malloc(strlen(deldir)+5); - strcpy(cur, deldir); - strcat(cur, "/cur"); - diff --git a/mail/courier-mta/patches/patch-au b/mail/courier-mta/patches/patch-au deleted file mode 100644 index 4b1bf9ba214..00000000000 --- a/mail/courier-mta/patches/patch-au +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-au,v 1.1 2007/09/06 04:05:41 jlam Exp $ - ---- webmail/newmsg.c.orig Sun May 6 21:49:29 2007 -+++ webmail/newmsg.c -@@ -72,12 +72,15 @@ static void newmsg_header(const char *la - { - int hdrmaxlen=512; - const char *p=getarg("HDRMAXLEN"); -+#if HAVE_SQWEBMAIL_UNICODE -+const struct unicode_info *uiptr; -+#endif - - if (p && (atoi(p) > hdrmaxlen)) - hdrmaxlen=atoi(p); - - #if HAVE_SQWEBMAIL_UNICODE --const struct unicode_info *uiptr=unicode_find(sqwebmail_content_charset); -+ uiptr=unicode_find(sqwebmail_content_charset); - #endif - printf("<tr><th align=\"right\"><p class=\"new-message-header\">" - "<span class=\"new-message-header-%s\">%s</span></p></th>" -@@ -411,6 +414,7 @@ void newmsg_init(const char *folder, con - char *draftmessagefilename; - const char *p; - FILE *fp; -+ int wbnochangingfrom; - int attachcnt=0; - char *cursubj, *curto, *curcc, *curbcc, *curfrom, *curreplyto; - -@@ -560,7 +564,7 @@ void newmsg_init(const char *folder, con - printf("<table width=\"100%%\" border=\"0\" cellspacing=\"0\" cellpadding=\"4\" class=\"new-message-box\"><tr><td>\n"); - - printf("<table border=\"0\" width=\"100%%\">\n"); -- int wbnochangingfrom=auth_getoptionenvint("wbnochangingfrom"); -+ wbnochangingfrom=auth_getoptionenvint("wbnochangingfrom"); - if (wbnochangingfrom < 2) - newmsg_header_rfc822(fromlab, "headerfrom", curfrom, - *cgi("from") ? cgi("from"): diff --git a/mail/courier-mta/patches/patch-av b/mail/courier-mta/patches/patch-av deleted file mode 100644 index 5f2568b276c..00000000000 --- a/mail/courier-mta/patches/patch-av +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-av,v 1.1 2007/09/17 15:28:05 jlam Exp $ - ---- tcpd/libcouriertls.c.orig Tue May 22 10:59:26 2007 -+++ tcpd/libcouriertls.c -@@ -419,6 +419,7 @@ SSL_CTX *tls_create(int isserver, const - ctx=SSL_CTX_new(protocol && strcmp(protocol, "SSL2") == 0 - ? SSLv2_method(): - protocol && strcmp(protocol, "SSL3") == 0 ? SSLv3_method(): -+ protocol && strcmp(protocol, "SSL23") == 0 ? SSLv23_method(): - TLSv1_method()); - - if (!ctx) diff --git a/mail/courier-mta/patches/patch-aw b/mail/courier-mta/patches/patch-aw deleted file mode 100644 index 85d89f16ee9..00000000000 --- a/mail/courier-mta/patches/patch-aw +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-aw,v 1.1 2007/09/23 11:42:44 jlam Exp $ - ---- liblock/lockdaemon.c.orig 2007-05-04 23:04:41.000000000 -0400 -+++ liblock/lockdaemon.c -@@ -8,4 +8,5 @@ - #include <stdio.h> - #include <signal.h> -+#include <limits.h> - #include <stdlib.h> - #include <string.h> -@@ -31,4 +32,8 @@ - #endif - -+#ifndef OPEN_MAX -+#define OPEN_MAX 64 -+#endif -+ - #define exit(_a_) _exit(_a_) - -@@ -146,5 +151,5 @@ int lockfd; - } - -- if (lockfd < 0 || dup2(lockfd, 99) != 99) -+ if (lockfd < 0 || dup2(lockfd, OPEN_MAX-1) != OPEN_MAX-1) - { - perror(lockfile); -@@ -153,5 +158,5 @@ int lockfd; - - close(lockfd); -- lockfd=99; -+ lockfd=OPEN_MAX-1; - - #ifdef FD_CLOEXEC |