diff options
Diffstat (limited to 'mail/zmailer')
-rw-r--r-- | mail/zmailer/Makefile | 38 | ||||
-rw-r--r-- | mail/zmailer/distinfo | 4 | ||||
-rw-r--r-- | mail/zmailer/files/extra-patch-EAI_NODATA | 37 | ||||
-rw-r--r-- | mail/zmailer/files/patch-Makefile.in | 10 | ||||
-rw-r--r-- | mail/zmailer/files/patch-aa | 51 | ||||
-rw-r--r-- | mail/zmailer/files/patch-ab | 64 | ||||
-rw-r--r-- | mail/zmailer/files/patch-ac | 10 | ||||
-rw-r--r-- | mail/zmailer/files/patch-ad | 24 | ||||
-rw-r--r-- | mail/zmailer/files/patch-ae | 11 | ||||
-rw-r--r-- | mail/zmailer/files/patch-af | 11 | ||||
-rw-r--r-- | mail/zmailer/files/patch-ag | 11 | ||||
-rw-r--r-- | mail/zmailer/files/patch-ah | 11 | ||||
-rw-r--r-- | mail/zmailer/files/patch-proto::Makefile.in | 21 | ||||
-rw-r--r-- | mail/zmailer/files/patch-proto::post-install.sh.in | 11 | ||||
-rw-r--r-- | mail/zmailer/files/patch-smtpserver::smtpcmds.c | 11 | ||||
-rw-r--r-- | mail/zmailer/files/pkg-install.in | 4 | ||||
-rw-r--r-- | mail/zmailer/pkg-deinstall | 12 | ||||
-rw-r--r-- | mail/zmailer/pkg-message | 9 | ||||
-rw-r--r-- | mail/zmailer/pkg-plist | 422 |
19 files changed, 419 insertions, 353 deletions
diff --git a/mail/zmailer/Makefile b/mail/zmailer/Makefile index 12311ca7f759..70a47af13cb8 100644 --- a/mail/zmailer/Makefile +++ b/mail/zmailer/Makefile @@ -6,8 +6,7 @@ # PORTNAME= zmailer -PORTVERSION= 2.99.51 -PORTREVISION= 1 +PORTVERSION= 2.99.56 CATEGORIES= mail MASTER_SITES= ftp://ftp.funet.fi/pub/unix/mail/zmailer/src/ @@ -16,7 +15,7 @@ COMMENT= A fully functional fast, robust SMTP server and transport agent CONFLICTS= courier-0.* postfix-1.* postfix-2.* sendmail-8.* sendmail-*-8.* smail-3.* GNU_CONFIGURE= yes -USE_GCC= 2.95 +USE_PERL5= yes .if defined(WITH_SSL) USE_OPENSSL= YES @@ -25,8 +24,13 @@ CONFIGURE_ARGS= --with-openssl CONFIGURE_ARGS= --without-openssl .endif +.include <bsd.port.pre.mk> + +.if ( ${OSVERSION} >= 500000 ) +EXTRA_PATCHES= ${FILESDIR}/extra-patch-EAI_NODATA +.endif + CONFIGURE_ARGS+=--prefix=${PREFIX}/ \ - --with-bundled-libresolv \ --with-mailbin=${PREFIX}/sbin \ --with-mailbox=/var/mail \ --with-logdir=/var/log/mail \ @@ -41,15 +45,19 @@ CONFIGURE_ARGS+=--prefix=${PREFIX}/ \ --with-vacationpath=${PREFIX}/bin/vacation \ --includedir=${PREFIX}/include \ --libdir=${PREFIX}/lib \ + --mandir=${PREFIX}/man \ --with-ta-mmap -MAN1= rmail.1 vacation.1 zmailer.1 zmsh.1 mboxpath.1 ssl.1 mailq.1 \ - mailrm.1 newaliases.1 -MAN3= zmailer.3 -MAN5= aliases.5 -MAN8= hold.8 router.8 scheduler.8 sendmail.8 sm.8 smtp.8 \ - smtpserver.8 mprobe.8 expirer.8 errormail.8 mailbox.8 \ - manual-expirer.8 +MAN1= rmail.1zm vacation.1zm zmailer.1zm zmsh.1zm mboxpath.1zm mailq.1zm \ + mailrm.1zm newaliases.1zm +MAN3= zmailer.3zm +MAN5= aliases.5zm +MAN8= hold.8zm router.8zm scheduler.8zm sendmail.8zm sm.8zm smtp.8zm \ + smtpserver.8zm mprobe.8zm expirer.8zm errormail.8zm mailbox.8zm \ + manual-expirer.8zm + +PKGMESSAGE= ${WRKDIR}/MESSAGE +PKGINSTALL= ${WRKDIR}/pkg-install # local variable # this pipe is run before bsd.port.mk is brought in - therefore it is @@ -58,7 +66,6 @@ DOMAIN!= /bin/hostname | /usr/bin/sed -e "s:^"`/bin/hostname -s`\.*::g .if (${DOMAIN} == "") DOMAIN= "mydomain.com" .endif -PKGMESSAGE= ${WRKDIR}/MESSAGE post-configure: ${SED} -e s:@PREFIX@:${PREFIX}:g -e s:@PORTSDIR@:${PORTSDIR}:g \ @@ -68,8 +75,9 @@ post-install: @${INSTALL_SCRIPT} ${FILESDIR}/zmailer.sh.sample \ ${PREFIX}/etc/rc.d/zmailer.sh.sample - ${CAT} ${PKGMESSAGE} | ${SED} -e s:@PREFIX@:${PREFIX}:g \ - -e s:@PORTSDIR@:${PORTSDIR}:g + @${SED} -e 's,%%PREFIX%%,${PREFIX},' ${FILESDIR}/pkg-install.in > \ + ${PKGINSTALL} + @${SETENV} PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL # set up the initial mail.conf with reasonable settings. @${ECHO_CMD} "# Where am I?" > ${PREFIX}/etc/zmailer/mail.conf.sample @@ -115,4 +123,4 @@ replace: ${LN} -s ${PREFIX}/sbin/rmail /bin/rmail; \ fi -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/mail/zmailer/distinfo b/mail/zmailer/distinfo index 675484a6a76a..9fc7de30506b 100644 --- a/mail/zmailer/distinfo +++ b/mail/zmailer/distinfo @@ -1,2 +1,2 @@ -MD5 (zmailer-2.99.51.tar.gz) = cbc9d7af6a14f5bb598b353eef0d9009 -SIZE (zmailer-2.99.51.tar.gz) = 3973769 +MD5 (zmailer-2.99.56.tar.gz) = c94cc0c2e2427a210a046a02ac4c2d50 +SIZE (zmailer-2.99.56.tar.gz) = 5926859 diff --git a/mail/zmailer/files/extra-patch-EAI_NODATA b/mail/zmailer/files/extra-patch-EAI_NODATA new file mode 100644 index 000000000000..b42624c6e7fd --- /dev/null +++ b/mail/zmailer/files/extra-patch-EAI_NODATA @@ -0,0 +1,37 @@ +--- smtpserver/mxverify.c.orig Fri Apr 16 15:45:46 2004 ++++ smtpserver/mxverify.c Fri Apr 16 15:46:38 2004 +@@ -607,7 +607,6 @@ + if (retmode == '+') { + if (rc == -EX_NOHOST || + rc == -EX_UNAVAILABLE || +- rc == EAI_NODATA || + rc == EAI_NONAME) + return -2; /* Definitely hard errors */ + if (rc == 2) +--- transports/smtp/smtp.c.orig Fri Apr 16 15:48:44 2004 ++++ transports/smtp/smtp.c Fri Apr 16 15:54:18 2004 +@@ -2912,6 +2912,7 @@ + return EX_DEFERALL; + } + ++#if 0 /* FreeBSD 5.x doesn't have it */ + if ( r == EAI_NODATA ) { + sprintf(SS->remotemsg,"smtp; 500 (getaddrinfo<%.200s>: No data)",host); + time(&endtime); +@@ -2925,6 +2926,7 @@ + return EX_DEFERALL; + return EX_UNAVAILABLE; + } ++#endif + + r = EX_UNAVAILABLE; /* This gives instant rejection */ + if (rc == EX_TEMPFAIL) r = rc; +@@ -2944,7 +2946,7 @@ + if (r != EX_TEMPFAIL) + r = EX_NOHOST; + #endif +- } else if (gai_err == EAI_NONAME || gai_err == EAI_NODATA) { ++ } else if (gai_err == EAI_NONAME) { + sprintf(SS->remotemsg, + "smtp; 500 (nameserver data inconsistency. No MX, no address: '%.200s' (%s))", + host, gai_err == EAI_NONAME ? "NONAME" : "NODATA"); diff --git a/mail/zmailer/files/patch-Makefile.in b/mail/zmailer/files/patch-Makefile.in new file mode 100644 index 000000000000..f702dd1f9a26 --- /dev/null +++ b/mail/zmailer/files/patch-Makefile.in @@ -0,0 +1,10 @@ +--- Makefile.in.orig Wed Apr 14 17:22:31 2004 ++++ Makefile.in Wed Apr 14 17:23:04 2004 +@@ -130,6 +130,7 @@ + @cd transports ; $(MAKE) $(MFLAGS) install + @cd libc ; $(MAKE) $(MFLAGS) install + @cd utils ; $(MAKE) $(MFLAGS) install ++ @cd man ; $(MAKE) $(MFLAGS) install + $(MAKE) $(MFLAGS) post-install-note + + post-install-note: diff --git a/mail/zmailer/files/patch-aa b/mail/zmailer/files/patch-aa index 8c2b16682037..fbaa6b694939 100644 --- a/mail/zmailer/files/patch-aa +++ b/mail/zmailer/files/patch-aa @@ -1,20 +1,35 @@ ---- configure.in.orig Mon Jul 19 00:38:50 1999 -+++ configure.in Sun Sep 29 01:34:20 2002 -@@ -936,7 +936,7 @@ - AC_SUBST(AUTHLIB) - AC_CHECK_HEADERS(security/pam_appl.h shadow.h) - if test "$ac_cv_header_security_pam_appl_h" = "yes"; then -- AUTHLIB="-lpam -ldl" -+ AUTHLIB="-lpam" - else - if test "$ac_cv_header_shadow_h" = "yes"; then - AUTHLIB="-lshadow" -@@ -956,7 +956,7 @@ - AC_MSG_RESULT([%%% AIEEE! NO <netinet/in.h> HEADER ?!]) - fi +--- configure.orig Fri Dec 26 10:29:15 2003 ++++ configure Fri Dec 26 10:33:26 2003 +@@ -280,6 +280,7 @@ + # Factoring default headers for most tests. + ac_includes_default="\ + #include <stdio.h> ++#include <sys/param.h> + #if HAVE_SYS_TYPES_H + # include <sys/types.h> + #endif +@@ -20317,7 +20318,7 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ --AC_TRY_COMPILE([#include <sys/socket.h>],[socklen_t sl = 2;], -+AC_TRY_COMPILE([#include <sys/types.h> #include <sys/socket.h>],[socklen_t sl = 2;], - AC_DEFINE(HAVE_SOCKLEN_T)) +-#include <sys/types.h> ++#include <sys/param.h> + #include <sys/mount.h> + #include <sys/fs_types.h> + int +@@ -20493,6 +20494,7 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++#include <sys/param.h> + #include <sys/mount.h> - AC_ARG_WITH(ipv6,[ --with-ipv6 Have IPv6 in system, and want to use it], + _ACEOF +@@ -20539,6 +20541,7 @@ + /* end confdefs.h. */ + + #include <sys/fs_types.h> ++#include <sys/param.h> + #include <sys/mount.h> + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 diff --git a/mail/zmailer/files/patch-ab b/mail/zmailer/files/patch-ab index 070c235965f0..f167d88b90db 100644 --- a/mail/zmailer/files/patch-ab +++ b/mail/zmailer/files/patch-ab @@ -1,54 +1,10 @@ ---- configure.orig Mon Jul 19 00:48:10 1999 -+++ configure Sun Sep 29 01:36:22 2002 -@@ -94,6 +94,8 @@ - --with-getpwnam-library=\"-L.. -l..\" - Linking options for non-std getpwnam() libraries" - ac_help="$ac_help -+ --with-openssl Use openssl" -+ac_help="$ac_help - --with-openssl-prefix=/dir/path (defines both include and lib)" - ac_help="$ac_help - --with-openssl-include=/dir/incl/path" -@@ -4661,7 +4663,7 @@ - done - - if test "$ac_cv_header_security_pam_appl_h" = "yes"; then -- AUTHLIB="-lpam -ldl" -+ AUTHLIB="-lpam" - else - if test "$ac_cv_header_shadow_h" = "yes"; then - AUTHLIB="-lshadow" -@@ -4723,6 +4725,7 @@ - cat > conftest.$ac_ext <<EOF - #line 4725 "configure" - #include "confdefs.h" -+#include <sys/types.h> - #include <sys/socket.h> - int main() { - socklen_t sl = 2; -@@ -7847,6 +7850,9 @@ - - - -+# Check whether we are using openssl. -+if test "x$with_openssl" != xno; then -+ - # Check whether --with-openssl-prefix or --without-openssl-prefix was given. - if test "${with_openssl_prefix+set}" = set; then - withval="$with_openssl_prefix" -@@ -7929,12 +7935,13 @@ - OPENSSLPREFIX="/usr" - OPENSSLINCL="" - if test -f "$OPENSSLPREFIX/lib/libssl.so" ; then -- OPENSSLLIB="$OPENSSLPREFIX/lib/libssl.so $OPENSSLPREFIX/lib/libcrypto.so" -+ OPENSSLLIB="$OPENSSLPREFIX/lib/libssl.so $OPENSSLPREFIX/lib/libcrypto.so \$(EXTRA_SSL_LIBS)" - else -- OPENSSLLIB="$OPENSSLPREFIX/lib/libssl.a $OPENSSLPREFIX/lib/libcrypto.a" -+ OPENSSLLIB="$OPENSSLPREFIX/lib/libssl.a $OPENSSLPREFIX/lib/libcrypto.a \$(EXTRA_SSL_LIBS)" - fi - echo "$ac_t""You have OpenSSL version 0.9.3a (or newer) at system root!" 1>&6 - fi -+fi - fi - - +--- transports/smtp/getmxrr.c.orig Mon Jun 23 12:04:35 2003 ++++ transports/smtp/getmxrr.c Fri Dec 26 11:30:58 2003 +@@ -416,7 +416,6 @@ + break; + case EAI_NONAME: + case EAI_FAIL: +- case EAI_NODATA: + case EAI_SERVICE: + default: + break; diff --git a/mail/zmailer/files/patch-ac b/mail/zmailer/files/patch-ac deleted file mode 100644 index 56448631e692..000000000000 --- a/mail/zmailer/files/patch-ac +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.in.orig Mon Jul 19 16:32:01 1999 -+++ Makefile.in Mon Jul 19 16:32:27 1999 -@@ -107,6 +107,7 @@ - @cd transports ; $(MAKE) $(MFLAGS) install - @cd libc ; $(MAKE) $(MFLAGS) install - @cd utils ; $(MAKE) $(MFLAGS) install -+ @cd man ; $(MAKE) $(MFLAGS) install - - router/router: - cd router ; $(MAKE) $(MFLAGS) router-a diff --git a/mail/zmailer/files/patch-ad b/mail/zmailer/files/patch-ad deleted file mode 100644 index 6e12dce4308e..000000000000 --- a/mail/zmailer/files/patch-ad +++ /dev/null @@ -1,24 +0,0 @@ ---- libc/Makefile.in.orig Sat Jul 31 15:49:28 1999 -+++ libc/Makefile.in Sat Jul 31 15:50:07 1999 -@@ -74,15 +74,15 @@ - lint $(DEFS) $(INCL) $(LIBC_INCL) $(SOURCE) - - install: $(TOPDIR)/libs/libzmailer.a -- -if [ ! -d $(prefix)$(LIBRARYDIR) ] ; then \ -- $(MKDIR) $(prefix)$(LIBRARYDIR); \ -+ -if [ ! -d $(LIBRARYDIR) ] ; then \ -+ $(MKDIR) $(LIBRARYDIR); \ - fi -- -if [ ! -d $(prefix)$(INCLUDEDIR) ] ; then \ -- $(MKDIR) $(prefix)$(INCLUDEDIR); \ -+ -if [ ! -d $(INCLUDEDIR) ] ; then \ -+ $(MKDIR) $(INCLUDEDIR); \ - fi -- -$(INSTALL) -m 644 $(TOPDIR)/libs/libzmailer.a $(prefix)$(LIBRARYDIR)/libzmailer.a -+ -$(INSTALL) -m 644 $(TOPDIR)/libs/libzmailer.a $(LIBRARYDIR)/libzmailer.a - -$(RANLIB) $(prefix)$(LIBRARYDIR)/libzmailer.a -- -$(INSTALL) -m 644 $(TOPDIR)/include/mail.h $(prefix)$(INCLUDEDIR)/zmailer.h -+ -$(INSTALL) -m 644 $(TOPDIR)/include/mail.h $(INCLUDEDIR)/zmailer.h - - clean-recursive clean: - -rm -f $(TOPDIR)/libs/$(LIBNAME).a make.log whathost-test diff --git a/mail/zmailer/files/patch-ae b/mail/zmailer/files/patch-ae deleted file mode 100644 index 83dc479697bb..000000000000 --- a/mail/zmailer/files/patch-ae +++ /dev/null @@ -1,11 +0,0 @@ ---- protoc/cf/SMTP.cf.in.orig Sun Aug 29 14:20:54 1999 -+++ proto/cf/SMTP.cf.in Sun Aug 29 14:21:03 1999 -@@ -88,7 +88,7 @@ - } - - orgdomains=x --: ${MAILCONF:=/etc/mail.conf} -+: ${MAILCONF:=$MAILSHARE/mail.conf} - if [ ! -r $MAILCONF ]; then - echo "$0: missing $MAILCONF: using the following values:" - mailconf diff --git a/mail/zmailer/files/patch-af b/mail/zmailer/files/patch-af deleted file mode 100644 index 3ac31d42826d..000000000000 --- a/mail/zmailer/files/patch-af +++ /dev/null @@ -1,11 +0,0 @@ ---- libc/Makefile.in.tmp Sun Aug 29 18:16:42 1999 -+++ libc/Makefile.in Sun Aug 29 18:17:49 1999 -@@ -81,7 +81,7 @@ - $(MKDIR) $(INCLUDEDIR); \ - fi - -$(INSTALL) -m 644 $(TOPDIR)/libs/libzmailer.a $(LIBRARYDIR)/libzmailer.a -- -$(RANLIB) $(prefix)$(LIBRARYDIR)/libzmailer.a -+ -$(RANLIB) $(LIBRARYDIR)/libzmailer.a - -$(INSTALL) -m 644 $(TOPDIR)/include/mail.h $(INCLUDEDIR)/zmailer.h - - clean-recursive clean: diff --git a/mail/zmailer/files/patch-ag b/mail/zmailer/files/patch-ag deleted file mode 100644 index 02442775a99a..000000000000 --- a/mail/zmailer/files/patch-ag +++ /dev/null @@ -1,11 +0,0 @@ ---- compat/rmail/Makefile.in.orig Sun Aug 29 18:26:53 1999 -+++ compat/rmail/Makefile.in Sun Aug 29 18:27:02 1999 -@@ -15,7 +15,7 @@ - RMAIL_LIB= @LIBRESOLV@ @LIBSOCKET@ - INSTALL= @INSTALL@ - TOPDIR= ../.. --RMAILPATH= $(prefix)@RMAILPATH@ -+RMAILPATH= @RMAILPATH@ - LN_S= "@LN_S@" - MKDIR= @MKDIR@ - # diff --git a/mail/zmailer/files/patch-ah b/mail/zmailer/files/patch-ah deleted file mode 100644 index 73f244321df2..000000000000 --- a/mail/zmailer/files/patch-ah +++ /dev/null @@ -1,11 +0,0 @@ ---- compat/sendmail/Makefile.in.orig Sun Aug 29 18:26:10 1999 -+++ compat/sendmail/Makefile.in Sun Aug 29 18:26:19 1999 -@@ -21,7 +21,7 @@ - LIB= -L$(TOPDIR)/libs -lzm -lzc - LIBDEB= $(TOPDIR)/libs/libtag - CFLAGS= $(COPTS) $(CPPFLAGS) $(DEFS) $(INCL) $(SENDMAIL_INCL) --SENDMAILPATH= $(prefix)@SENDMAILPATH@ -+SENDMAILPATH= @SENDMAILPATH@ - - SOURCE= sendmail.c - diff --git a/mail/zmailer/files/patch-proto::Makefile.in b/mail/zmailer/files/patch-proto::Makefile.in new file mode 100644 index 000000000000..30afdda08bb3 --- /dev/null +++ b/mail/zmailer/files/patch-proto::Makefile.in @@ -0,0 +1,21 @@ +--- proto/Makefile.in.orig Fri Oct 24 23:33:43 2003 ++++ proto/Makefile.in Fri Apr 16 13:43:29 2004 +@@ -91,10 +91,6 @@ + echo $(MKDIR) $(DESTDIR)$$MAILBIN/ta && \ + $(MKDIR) $(DESTDIR)$$MAILBIN/ta ; \ + fi ; \ +- if [ ! -d $(DESTDIR)$$MAILBIN/bak ]; then \ +- echo $(MKDIR) $(DESTDIR)$$MAILBIN/bak && \ +- $(MKDIR) $(DESTDIR)$$MAILBIN/bak ; \ +- fi ; \ + if [ ! -d $(DESTDIR)$$POSTOFFICE ]; then \ + echo $(MKDIR) $(DESTDIR)$$POSTOFFICE && \ + $(MKDIR) $(DESTDIR)$$POSTOFFICE ; \ +@@ -130,7 +126,6 @@ + + mailbin: $(PZCONFIG) $(PMAILBIN) $(MD5SUM) + -@(. $(PZCONFIG) ; \ +- if [ ! -d $(DESTDIR)$$MAILBIN/bak ]; then $(MKDIR) $(DESTDIR)$$MAILBIN/bak ; fi ; \ + for file in $(PMAILBIN) ; \ + do \ + name=`expr $$file : '\([^.]*\)'` ; \ diff --git a/mail/zmailer/files/patch-proto::post-install.sh.in b/mail/zmailer/files/patch-proto::post-install.sh.in new file mode 100644 index 000000000000..c352a1a9bbbd --- /dev/null +++ b/mail/zmailer/files/patch-proto::post-install.sh.in @@ -0,0 +1,11 @@ +--- proto/post-install.sh.in.orig Fri Apr 16 12:45:45 2004 ++++ proto/post-install.sh.in Fri Apr 16 12:46:00 2004 +@@ -373,7 +373,7 @@ + ", $POSTOFFICE); + + if (! -d "$POSTOFFICE/.") { +- mymysystem("$MKDIR -p $POSTOFFICE"); ++ mysystem("$MKDIR -p $POSTOFFICE"); + + } + mysystem("chmod 2755 $POSTOFFICE/."); diff --git a/mail/zmailer/files/patch-smtpserver::smtpcmds.c b/mail/zmailer/files/patch-smtpserver::smtpcmds.c deleted file mode 100644 index f64ad2a53687..000000000000 --- a/mail/zmailer/files/patch-smtpserver::smtpcmds.c +++ /dev/null @@ -1,11 +0,0 @@ ---- smtpserver/smtpcmds.c Mon Aug 19 19:19:54 2002 -+++ smtpserver/smtpcmds.c.orig Mon Aug 19 19:16:28 2002 -@@ -223,7 +223,7 @@ - if (STYLE(SS->cfinfo, 'h')) { - char argbuf[MAXHOSTNAMELEN+30]; - char *s; -- sprintf(argbuf,"%s %s", SS->rhostname, -+ snprintf(argbuf, sizeof(argbuf), "%s %s", SS->rhostname, - ((SS->ihostaddr && (SS->ihostaddr[0] != '\0')) - ? SS->ihostaddr : "[0.0.0.0]")); - if ((s = router(SS, RKEY_HELLO, 1, argbuf, strlen(argbuf))) == NULL) diff --git a/mail/zmailer/files/pkg-install.in b/mail/zmailer/files/pkg-install.in new file mode 100644 index 000000000000..fc72ea00a883 --- /dev/null +++ b/mail/zmailer/files/pkg-install.in @@ -0,0 +1,4 @@ +#!/bin/sh +if [ "$2" = POST-INSTALL ]; then + %%PREFIX%%/sbin/post-install +fi diff --git a/mail/zmailer/pkg-deinstall b/mail/zmailer/pkg-deinstall new file mode 100644 index 000000000000..2a5e48ce078e --- /dev/null +++ b/mail/zmailer/pkg-deinstall @@ -0,0 +1,12 @@ +#!/bin/sh +if [ "$2" = DEINSTALL ]; then +cd /var/spool/postoffice +for d in transport queue; do + for i in A B C D E F G H I J K L M N O P Q R S T U V W X Y Z; do for j in A B C D E F G H I J K L M N O P Q R S T U V W X Y Z; do rmdir $d/$i/$j; done; rmdir $d/$i; done +rmdir $d; done +for d in router TLSsrvrcache TLSclntcache; do + for i in A B C D E F G H I J K L M N O P Q R S T U V W X Y Z; do + rmdir $d/$i; done; + rmdir $d +done +fi diff --git a/mail/zmailer/pkg-message b/mail/zmailer/pkg-message index 8f1d3fe342d2..23574568b7df 100644 --- a/mail/zmailer/pkg-message +++ b/mail/zmailer/pkg-message @@ -4,14 +4,7 @@ framework of this package: cd @PORTSDIR@/mail/zmailer && make replace This will prepare ZMailer for initial configuration and replace your existing -transport agent. If you do not wish to replace your mailer, but only wish to -prepare ZMailer for operation, use the provided post-install script as -follows: - - sh @PREFIX@/sbin/post-install - -This will initialize your configuration files and build an initial policy -database. +transport agent. Also please note that a "make world" will sever the proper links for /usr/sbin/sendmail, /usr/bin/mailq and the likes. If you wish to not build diff --git a/mail/zmailer/pkg-plist b/mail/zmailer/pkg-plist index 2503f3d3d926..dea7599558c3 100644 --- a/mail/zmailer/pkg-plist +++ b/mail/zmailer/pkg-plist @@ -1,35 +1,124 @@ -@unexec /bin/rm -f %D/bin/vacation -etc/rc.d/zmailer.sh.sample -etc/zmailer/db/proto/aliases -etc/zmailer/db/proto/fqdnaliases -etc/zmailer/db/proto/routes -etc/zmailer/db/proto/localnames -etc/zmailer/db/proto/smtp-policy.src -etc/zmailer/db/proto/smtp-policy.relay -etc/zmailer/forms/proto/bitnetgw -etc/zmailer/forms/proto/bounce -etc/zmailer/forms/proto/database -etc/zmailer/forms/proto/delivery -etc/zmailer/forms/proto/envelope -etc/zmailer/forms/proto/expansion -etc/zmailer/forms/proto/header -etc/zmailer/forms/proto/headerwarn -etc/zmailer/forms/proto/ip-number -etc/zmailer/forms/proto/localhost -etc/zmailer/forms/proto/loopexceeded -etc/zmailer/forms/proto/nonewsgroup -etc/zmailer/forms/proto/norealname -etc/zmailer/forms/proto/norecipients -etc/zmailer/forms/proto/unresolvable -etc/zmailer/forms/proto/vms-in-pros -etc/zmailer/forms/proto/wrongname -etc/zmailer/proto/scheduler.conf -etc/zmailer/proto/sm.conf -etc/zmailer/proto/smtpserver.conf -etc/zmailer/proto/router.cf -etc/zmailer/zmailer.conf -etc/zmailer/mail.conf.sample +etc/zmailer/db/proto/aliases.md5 +etc/zmailer/db/proto/fqdnaliases.md5 +etc/zmailer/db/proto/fqdnroutes.md5 +etc/zmailer/db/proto/dbases.conf.md5 +etc/zmailer/db/proto/localnames.md5 +etc/zmailer/db/proto/routes.md5 +etc/zmailer/db/proto/smtp-policy.mx.md5 +etc/zmailer/db/proto/smtp-policy.src.md5 +etc/zmailer/db/proto/smtp-policy.relay.md5 +etc/zmailer/db/proto/userdb.md5 +etc/zmailer/db/proto/kill-headers.md5 +etc/zmailer/db/aliases +etc/zmailer/db/fqdnaliases +etc/zmailer/db/fqdnroutes +etc/zmailer/db/dbases.conf +etc/zmailer/db/localnames +etc/zmailer/db/routes +etc/zmailer/db/smtp-policy.mx +etc/zmailer/db/smtp-policy.src +etc/zmailer/db/smtp-policy.relay +etc/zmailer/db/userdb +etc/zmailer/db/kill-headers +etc/zmailer/db/otherservers.zmsh +etc/zmailer/db/fqdnaliasesldap.zmsh +etc/zmailer/db/expired.zmsh +etc/zmailer/db/userdb.zmsh +etc/zmailer/db/userdb.db +etc/zmailer/db/newsgroup.zmsh +etc/zmailer/db/fqdnaliases.zmsh +etc/zmailer/db/fqdnaliases.db +etc/zmailer/db/fullnamemap.zmsh +etc/zmailer/db/aliases.zmsh +etc/zmailer/db/aliases.db +etc/zmailer/db/routesdb.zmsh +etc/zmailer/db/routes.db +etc/zmailer/db/fqdnroutes.zmsh +etc/zmailer/db/iproutesdb.zmsh +etc/zmailer/db/thishost.zmsh +etc/zmailer/db/localnames.db +etc/zmailer/db/smtp-policy.dat +etc/zmailer/db/smtp-policy.db +etc/zmailer/forms/proto/bitnetgw.md5 +etc/zmailer/forms/proto/bounce.md5 +etc/zmailer/forms/proto/database.md5 +etc/zmailer/forms/proto/delivery.md5 +etc/zmailer/forms/proto/envelope.md5 +etc/zmailer/forms/proto/expansion.md5 +etc/zmailer/forms/proto/header.md5 +etc/zmailer/forms/proto/headerwarn.md5 +etc/zmailer/forms/proto/ip-number.md5 +etc/zmailer/forms/proto/localhost.md5 +etc/zmailer/forms/proto/loopexceeded.md5 +etc/zmailer/forms/proto/nonewsgroup.md5 +etc/zmailer/forms/proto/norealname.md5 +etc/zmailer/forms/proto/norecipients.md5 +etc/zmailer/forms/proto/nosuchuser.md5 +etc/zmailer/forms/proto/unresolvable.md5 +etc/zmailer/forms/proto/vms-in-pros.md5 +etc/zmailer/forms/proto/wrongname.md5 +etc/zmailer/forms/bitnetgw +etc/zmailer/forms/bounce +etc/zmailer/forms/database +etc/zmailer/forms/delivery +etc/zmailer/forms/envelope +etc/zmailer/forms/expansion +etc/zmailer/forms/header +etc/zmailer/forms/headerwarn +etc/zmailer/forms/ip-number +etc/zmailer/forms/localhost +etc/zmailer/forms/loopexceeded +etc/zmailer/forms/nonewsgroup +etc/zmailer/forms/norealname +etc/zmailer/forms/norecipients +etc/zmailer/forms/nosuchuser +etc/zmailer/forms/unresolvable +etc/zmailer/forms/vms-in-pros +etc/zmailer/forms/wrongname +etc/zmailer/proto/scheduler.conf.md5 +etc/zmailer/proto/sm.conf.md5 +etc/zmailer/proto/smtpserver.conf.md5 +etc/zmailer/proto/scheduler.auth.md5 +etc/zmailer/proto/smtp-tls.conf.md5 +etc/zmailer/proto/router.cf.md5 +etc/zmailer/cf/proto/SMTP+UUCP.cf.md5 +etc/zmailer/cf/proto/trusted.cf.md5 +etc/zmailer/cf/proto/standard.cf.md5 +etc/zmailer/cf/proto/server.cf.md5 +etc/zmailer/cf/proto/rrouter.cf.md5 +etc/zmailer/cf/proto/process.cf.md5 +etc/zmailer/cf/proto/p-uucp.cf.md5 +etc/zmailer/cf/proto/p-usenet.cf.md5 +etc/zmailer/cf/proto/p-smtp.cf.md5 +etc/zmailer/cf/proto/p-routes.cf.md5 +etc/zmailer/cf/proto/p-ldap.cf.md5 +etc/zmailer/cf/proto/p-iproutes.cf.md5 +etc/zmailer/cf/proto/p-ean.cf.md5 +etc/zmailer/cf/proto/p-bitnet.cf.md5 +etc/zmailer/cf/proto/map.cf.md5 +etc/zmailer/cf/proto/i-uucp.cf.md5 +etc/zmailer/cf/proto/i-smtp.cf.md5 +etc/zmailer/cf/proto/i-routes.cf.md5 +etc/zmailer/cf/proto/i-iproutes.cf.md5 +etc/zmailer/cf/proto/i-bitnet.cf.md5 +etc/zmailer/cf/proto/fuzzy-aliases.cf.md5 +etc/zmailer/cf/proto/fqdnalias.cf.md5 +etc/zmailer/cf/proto/debug.cf.md5 +etc/zmailer/cf/proto/crossbar.cf.md5 +etc/zmailer/cf/proto/consist.cf.md5 +etc/zmailer/cf/proto/canon.cf.md5 +etc/zmailer/cf/proto/aliases2.cf.md5 +etc/zmailer/cf/proto/aliases.cf.md5 +etc/zmailer/cf/proto/aliases-new.cf.md5 +etc/zmailer/cf/proto/UToronto.cf.md5 +etc/zmailer/cf/proto/UTdefault.cf.md5 +etc/zmailer/cf/proto/UTGPU.cf.md5 +etc/zmailer/cf/proto/UTAI.cf.md5 +etc/zmailer/cf/proto/TELE-FI.cf.md5 +etc/zmailer/cf/proto/SMTP.cf.md5 +etc/zmailer/cf/proto/tryme.cf.md5 etc/zmailer/cf/SMTP+UUCP.cf +etc/zmailer/cf/trusted.cf etc/zmailer/cf/standard.cf etc/zmailer/cf/server.cf etc/zmailer/cf/rrouter.cf @@ -38,6 +127,7 @@ etc/zmailer/cf/p-uucp.cf etc/zmailer/cf/p-usenet.cf etc/zmailer/cf/p-smtp.cf etc/zmailer/cf/p-routes.cf +etc/zmailer/cf/p-ldap.cf etc/zmailer/cf/p-iproutes.cf etc/zmailer/cf/p-ean.cf etc/zmailer/cf/p-bitnet.cf @@ -51,33 +141,159 @@ etc/zmailer/cf/fuzzy-aliases.cf etc/zmailer/cf/fqdnalias.cf etc/zmailer/cf/debug.cf etc/zmailer/cf/crossbar.cf -etc/zmailer/cf/UTAI.cf etc/zmailer/cf/consist.cf etc/zmailer/cf/canon.cf etc/zmailer/cf/aliases2.cf etc/zmailer/cf/aliases.cf -etc/zmailer/cf/aliases-with-listserv-support.cf etc/zmailer/cf/aliases-new.cf etc/zmailer/cf/UToronto.cf etc/zmailer/cf/UTdefault.cf etc/zmailer/cf/UTGPU.cf +etc/zmailer/cf/UTAI.cf etc/zmailer/cf/TELE-FI.cf etc/zmailer/cf/SMTP.cf -etc/zmailer/cf/trusted.cf +etc/zmailer/cf/tryme.cf +etc/zmailer/scheduler.conf +etc/zmailer/sm.conf +etc/zmailer/smtpserver.conf +etc/zmailer/scheduler.auth +etc/zmailer/smtp-tls.conf +etc/zmailer/router.cf +etc/zmailer/db/proto/aliases +etc/zmailer/db/proto/fqdnaliases +etc/zmailer/db/proto/fqdnroutes +etc/zmailer/db/proto/dbases.conf +etc/zmailer/db/proto/localnames +etc/zmailer/db/proto/routes +etc/zmailer/db/proto/smtp-policy.mx +etc/zmailer/db/proto/smtp-policy.src +etc/zmailer/db/proto/smtp-policy.relay +etc/zmailer/db/proto/userdb +etc/zmailer/db/proto/kill-headers +etc/zmailer/forms/proto/bitnetgw +etc/zmailer/forms/proto/bounce +etc/zmailer/forms/proto/database +etc/zmailer/forms/proto/delivery +etc/zmailer/forms/proto/envelope +etc/zmailer/forms/proto/expansion +etc/zmailer/forms/proto/header +etc/zmailer/forms/proto/headerwarn +etc/zmailer/forms/proto/ip-number +etc/zmailer/forms/proto/localhost +etc/zmailer/forms/proto/loopexceeded +etc/zmailer/forms/proto/nonewsgroup +etc/zmailer/forms/proto/norealname +etc/zmailer/forms/proto/norecipients +etc/zmailer/forms/proto/nosuchuser +etc/zmailer/forms/proto/unresolvable +etc/zmailer/forms/proto/vms-in-pros +etc/zmailer/forms/proto/wrongname +etc/zmailer/proto/scheduler.conf +etc/zmailer/proto/sm.conf +etc/zmailer/proto/smtpserver.conf +etc/zmailer/proto/scheduler.auth +etc/zmailer/proto/smtp-tls.conf +etc/zmailer/proto/router.cf +etc/zmailer/guides/aliases +etc/zmailer/guides/virtusers +etc/zmailer/guides/smtpauth-login-pam-support +etc/zmailer/guides/smtp-policy +etc/zmailer/guides/smtp-msa-mode +etc/zmailer/guides/smtp-etrn +etc/zmailer/guides/scheduler-ta-protocol +etc/zmailer/guides/relations +etc/zmailer/guides/procmail +etc/zmailer/guides/porting +etc/zmailer/guides/openssl +etc/zmailer/guides/offline-operation +etc/zmailer/guides/lists +etc/zmailer/guides/libmalloc +etc/zmailer/guides/ldap.doc +etc/zmailer/guides/etrn-cluster +etc/zmailer/guides/db +etc/zmailer/guides/cyrus-imap +etc/zmailer/guides/cookbook +etc/zmailer/guides/configure +etc/zmailer/guides/changes +etc/zmailer/guides/zmsh +etc/zmailer/zmailer.conf +etc/zmailer/ChangeLog +etc/zmailer/config.status +etc/zmailer/cf/proto/SMTP+UUCP.cf +etc/zmailer/cf/proto/trusted.cf +etc/zmailer/cf/proto/standard.cf +etc/zmailer/cf/proto/server.cf +etc/zmailer/cf/proto/rrouter.cf +etc/zmailer/cf/proto/process.cf +etc/zmailer/cf/proto/p-uucp.cf +etc/zmailer/cf/proto/p-usenet.cf +etc/zmailer/cf/proto/p-smtp.cf +etc/zmailer/cf/proto/p-routes.cf +etc/zmailer/cf/proto/p-ldap.cf +etc/zmailer/cf/proto/p-iproutes.cf +etc/zmailer/cf/proto/p-ean.cf +etc/zmailer/cf/proto/p-bitnet.cf +etc/zmailer/cf/proto/map.cf +etc/zmailer/cf/proto/i-uucp.cf +etc/zmailer/cf/proto/i-smtp.cf +etc/zmailer/cf/proto/i-routes.cf +etc/zmailer/cf/proto/i-iproutes.cf +etc/zmailer/cf/proto/i-bitnet.cf +etc/zmailer/cf/proto/fuzzy-aliases.cf +etc/zmailer/cf/proto/fqdnalias.cf +etc/zmailer/cf/proto/debug.cf +etc/zmailer/cf/proto/crossbar.cf +etc/zmailer/cf/proto/consist.cf +etc/zmailer/cf/proto/canon.cf +etc/zmailer/cf/proto/aliases2.cf +etc/zmailer/cf/proto/aliases.cf +etc/zmailer/cf/proto/aliases-new.cf +etc/zmailer/cf/proto/UToronto.cf +etc/zmailer/cf/proto/UTdefault.cf +etc/zmailer/cf/proto/UTGPU.cf +etc/zmailer/cf/proto/UTAI.cf +etc/zmailer/cf/proto/TELE-FI.cf +etc/zmailer/cf/proto/SMTP.cf +etc/zmailer/cf/proto/tryme.cf etc/zmailer/vacation.msg +etc/zmailer/mail.conf.sample +@exec mkdir -p %D/etc/zmailer/lists +@exec mkdir -p %D/etc/zmailer/fqlists +@exec mkdir -p %D/etc/zmailer/forms/bak +@exec mkdir -p %D/etc/zmailer/cf/fc +@dirrm etc/zmailer/db/proto +@dirrm etc/zmailer/db +@dirrm etc/zmailer/lists +@dirrm etc/zmailer/fqlists +@dirrm etc/zmailer/forms/bak +@dirrm etc/zmailer/forms/proto +@dirrm etc/zmailer/forms +@dirrm etc/zmailer/guides +@dirrm etc/zmailer/proto +@dirrm etc/zmailer/cf/fc +@dirrm etc/zmailer/cf/proto +@dirrm etc/zmailer/cf +@dirrm etc/zmailer/bak +@dirrm etc/zmailer +@unexec /bin/rm -f %D/bin/vacation +etc/rc.d/zmailer.sh.sample lib/libzmailer.a sbin/autoanswer.pl sbin/bitbucket sbin/dblook +sbin/getmxrr-test sbin/mailq sbin/mailrm sbin/make-incore.sh sbin/makedb sbin/manual-expirer +sbin/manual-rerouter sbin/mboxpath +sbin/md5sum sbin/mprobe sbin/newaliases sbin/newdb +sbin/newdbprocessor sbin/newfqdnaliases sbin/policy-builder.sh sbin/post-install @@ -87,6 +303,7 @@ sbin/router sbin/scheduler sbin/sendmail sbin/smtpserver +sbin/smtpserver-log-parser.pl @unexec /bin/rm -f %D/sbin/vacation sbin/vacation.exe sbin/vacation.sh @@ -97,143 +314,14 @@ sbin/ta/expirer sbin/ta/hold sbin/ta/listexpand sbin/ta/mailbox +sbin/ta/reroute sbin/ta/sm sbin/ta/smtp include/zmailer.h -@exec mkdir -p %D/etc/zmailer/lists/ -@exec mkdir -p %D/etc/zmailer/fqlists/ -@exec mkdir -p %D/etc/zmailer/forms/bak/ -@exec mkdir -p %D/etc/zmailer/cf/fc/ -@exec mkdir -p %D/etc/zmailer/bak/ -@exec mkdir -p /var/spool/postoffice/deferred -@exec mkdir -p /var/spool/postoffice/freezer -@exec mkdir -p /var/spool/postoffice/postman -@exec mkdir -p /var/spool/postoffice/public -@exec mkdir -p /var/spool/postoffice/queue/A -@exec mkdir -p /var/spool/postoffice/queue/B -@exec mkdir -p /var/spool/postoffice/queue/C -@exec mkdir -p /var/spool/postoffice/queue/D -@exec mkdir -p /var/spool/postoffice/queue/E -@exec mkdir -p /var/spool/postoffice/queue/F -@exec mkdir -p /var/spool/postoffice/queue/G -@exec mkdir -p /var/spool/postoffice/queue/H -@exec mkdir -p /var/spool/postoffice/queue/I -@exec mkdir -p /var/spool/postoffice/queue/J -@exec mkdir -p /var/spool/postoffice/queue/K -@exec mkdir -p /var/spool/postoffice/queue/L -@exec mkdir -p /var/spool/postoffice/queue/M -@exec mkdir -p /var/spool/postoffice/queue/N -@exec mkdir -p /var/spool/postoffice/queue/O -@exec mkdir -p /var/spool/postoffice/queue/P -@exec mkdir -p /var/spool/postoffice/queue/Q -@exec mkdir -p /var/spool/postoffice/queue/R -@exec mkdir -p /var/spool/postoffice/queue/S -@exec mkdir -p /var/spool/postoffice/queue/T -@exec mkdir -p /var/spool/postoffice/queue/U -@exec mkdir -p /var/spool/postoffice/queue/V -@exec mkdir -p /var/spool/postoffice/queue/W -@exec mkdir -p /var/spool/postoffice/queue/X -@exec mkdir -p /var/spool/postoffice/queue/Y -@exec mkdir -p /var/spool/postoffice/queue/Z -@exec mkdir -p /var/spool/postoffice/router -@exec mkdir -p /var/spool/postoffice/transport/A -@exec mkdir -p /var/spool/postoffice/transport/B -@exec mkdir -p /var/spool/postoffice/transport/C -@exec mkdir -p /var/spool/postoffice/transport/D -@exec mkdir -p /var/spool/postoffice/transport/E -@exec mkdir -p /var/spool/postoffice/transport/F -@exec mkdir -p /var/spool/postoffice/transport/G -@exec mkdir -p /var/spool/postoffice/transport/H -@exec mkdir -p /var/spool/postoffice/transport/I -@exec mkdir -p /var/spool/postoffice/transport/J -@exec mkdir -p /var/spool/postoffice/transport/K -@exec mkdir -p /var/spool/postoffice/transport/L -@exec mkdir -p /var/spool/postoffice/transport/M -@exec mkdir -p /var/spool/postoffice/transport/N -@exec mkdir -p /var/spool/postoffice/transport/O -@exec mkdir -p /var/spool/postoffice/transport/P -@exec mkdir -p /var/spool/postoffice/transport/Q -@exec mkdir -p /var/spool/postoffice/transport/R -@exec mkdir -p /var/spool/postoffice/transport/S -@exec mkdir -p /var/spool/postoffice/transport/T -@exec mkdir -p /var/spool/postoffice/transport/U -@exec mkdir -p /var/spool/postoffice/transport/V -@exec mkdir -p /var/spool/postoffice/transport/W -@exec mkdir -p /var/spool/postoffice/transport/X -@exec mkdir -p /var/spool/postoffice/transport/Y -@exec mkdir -p /var/spool/postoffice/transport/Z -@dirrm etc/zmailer/db/proto -@dirrm etc/zmailer/db -@dirrm etc/zmailer/lists -@dirrm etc/zmailer/fqlists -@dirrm etc/zmailer/forms/proto -@dirrm etc/zmailer/forms/bak -@dirrm etc/zmailer/forms -@dirrm etc/zmailer/proto -@dirrm etc/zmailer/bak -@dirrm etc/zmailer/cf/fc -@dirrm etc/zmailer/cf -@dirrm etc/zmailer -@dirrm sbin/bak @dirrm sbin/ta @cwd /var/spool -@dirrm postoffice/transport/Z -@dirrm postoffice/transport/Y -@dirrm postoffice/transport/X -@dirrm postoffice/transport/W -@dirrm postoffice/transport/V -@dirrm postoffice/transport/U -@dirrm postoffice/transport/T -@dirrm postoffice/transport/S -@dirrm postoffice/transport/R -@dirrm postoffice/transport/Q -@dirrm postoffice/transport/P -@dirrm postoffice/transport/O -@dirrm postoffice/transport/N -@dirrm postoffice/transport/M -@dirrm postoffice/transport/L -@dirrm postoffice/transport/K -@dirrm postoffice/transport/J -@dirrm postoffice/transport/I -@dirrm postoffice/transport/H -@dirrm postoffice/transport/G -@dirrm postoffice/transport/F -@dirrm postoffice/transport/E -@dirrm postoffice/transport/D -@dirrm postoffice/transport/C -@dirrm postoffice/transport/B -@dirrm postoffice/transport/A -@dirrm postoffice/transport -@dirrm postoffice/router -@dirrm postoffice/queue/Z -@dirrm postoffice/queue/Y -@dirrm postoffice/queue/X -@dirrm postoffice/queue/W -@dirrm postoffice/queue/V -@dirrm postoffice/queue/U -@dirrm postoffice/queue/T -@dirrm postoffice/queue/S -@dirrm postoffice/queue/R -@dirrm postoffice/queue/Q -@dirrm postoffice/queue/P -@dirrm postoffice/queue/O -@dirrm postoffice/queue/N -@dirrm postoffice/queue/M -@dirrm postoffice/queue/L -@dirrm postoffice/queue/K -@dirrm postoffice/queue/J -@dirrm postoffice/queue/I -@dirrm postoffice/queue/H -@dirrm postoffice/queue/G -@dirrm postoffice/queue/F -@dirrm postoffice/queue/E -@dirrm postoffice/queue/D -@dirrm postoffice/queue/C -@dirrm postoffice/queue/B -@dirrm postoffice/queue/A -@dirrm postoffice/queue -@dirrm postoffice/public -@dirrm postoffice/postman -@dirrm postoffice/freezer @dirrm postoffice/deferred +@dirrm postoffice/freezer +@dirrm postoffice/postman +@dirrm postoffice/public @dirrm postoffice |