Attachment 84519 Details for Bug 120536 – _zmailer.diff

[patch] _zmailer.diff

_zmailer.diff (text/plain), 9.30 KB, created by Pietro Cerutti on 2008-02-11 15:10:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pietro Cerutti

Created: 2008-02-11 15:10:00 UTC

Size: 9.30 KB

patch

obsolete

>--- distinfo.orig	2008-02-08 15:39:17.000000000 +0100
>+++ distinfo	2008-02-08 15:39:27.000000000 +0100
>@@ -1,3 +1,3 @@
>-MD5 (zmailer-2.99.56.tar.gz) = c94cc0c2e2427a210a046a02ac4c2d50
>-SHA256 (zmailer-2.99.56.tar.gz) = 7a5e6c051fc9c9bdf9774fe9ce11871105d20f569e61bdc8da222a1ff587678d
>-SIZE (zmailer-2.99.56.tar.gz) = 5926859
>+MD5 (zmailer-2.99.57.tar.gz) = abe451575234ac5ce79d9b950b150986
>+SHA256 (zmailer-2.99.57.tar.gz) = 74b878138d82c765174c44250a7789b15c70a1d0fc39bddd096cd4147ed5a115
>+SIZE (zmailer-2.99.57.tar.gz) = 5521100
>--- files/patch-EAI_NODATA	2008-02-08 15:42:43.000000000 +0100
>+++ /dev/null	2008-02-11 10:02:28.000000000 +0100
>@@ -1,37 +0,0 @@
>---- 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");
>--- files/patch-Makefile.in	2004-06-07 18:36:00.000000000 +0200
>+++ /dev/null	2008-02-11 10:02:28.000000000 +0100
>@@ -1,10 +0,0 @@
>---- 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:
>--- files/patch-ab	2007-08-21 14:50:57.000000000 +0200
>+++ /dev/null	2008-02-11 10:02:28.000000000 +0100
>@@ -1,10 +0,0 @@
>---- 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;
>--- files/patch-proto::post-install.sh.in	2008-02-08 15:50:33.000000000 +0100
>+++ /dev/null	2008-02-11 10:02:28.000000000 +0100
>@@ -1,11 +0,0 @@
>---- 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/.");
>--- files/patch-smtpserver-smtpetrn.c	2007-08-21 14:50:57.000000000 +0200
>+++ /dev/null	2008-02-11 10:02:28.000000000 +0100
>@@ -1,11 +0,0 @@
>---- smtpserver/smtpetrn.c.orig	Sun Sep 24 14:05:20 2006
>-+++ smtpserver/smtpetrn.c	Sun Sep 24 14:06:45 2006
>-@@ -21,6 +21,8 @@
>- 
>- #ifndef HAVE_OPENSSL
>- #include "md5.h"
>-+#else
>-+#include <openssl/md5.h>
>- #endif /* --HAVE_OPENSSL */
>- 
>- static int local_etrn(SS, name, cp, silence)
>--- files/patch-aa.orig	2008-02-08 15:45:02.000000000 +0100
>+++ files/patch-aa	2008-02-08 15:45:09.000000000 +0100
>@@ -1,13 +1,5 @@
> --- 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.  */
>--- /dev/null	2008-02-11 10:02:28.000000000 +0100
>+++ files/patch-sfio-src-lib-sfio_sfsetbuf.c	2008-02-11 09:58:49.000000000 +0100
>@@ -0,0 +1,24 @@
>+--- sfio/src/lib/sfio/sfsetbuf.c.orig	2008-02-11 09:54:38.000000000 +0100
>++++ sfio/src/lib/sfio/sfsetbuf.c	2008-02-11 09:55:58.000000000 +0100
>+@@ -6,10 +6,6 @@
>+ 
>+ #include	"sfhdr.h"
>+ 
>+-#if _lib_memalign
>+-extern void *memalign _ARG_((size_t boundary, size_t size));
>+-#endif
>+-
>+ #if defined(__STDPP__directive) && defined(__STDPP__hide)
>+ __STDPP__directive pragma pp:nohide getpagesize
>+ #else
>+@@ -265,10 +261,6 @@
>+ 		}
>+ 		if(!buf)
>+ 		{	/* do allocation */
>+-#if _lib_memalign
>+-			if(!(f->flags&SF_STRING) && _Sfpage && (size % _Sfpage) == 0)
>+-				buf = (Void_t*)memalign(_Sfpage,size);
>+-#endif
>+ 			while(!buf && size > 0)
>+ 			{	if((buf = (Void_t*)malloc(size)) )
>+ 					break;
>--- files/patch-transports-smtp-smtp.h	2007-08-21 14:50:57.000000000 +0200
>+++ /dev/null	2008-02-11 10:08:20.000000000 +0100
>@@ -1,12 +0,0 @@
>---- transports/smtp/smtp.h.orig	Sun Sep 24 14:10:22 2006
>-+++ transports/smtp/smtp.h	Sun Sep 24 14:10:56 2006
>-@@ -69,6 +69,9 @@
>- #include <netinet/tcp.h>
>- #endif
>- 
>-+#include <sys/types.h>
>-+#include <openssl/md5.h>
>-+
>- #ifndef	NFDBITS
>- /*
>-  * This stuff taken from the 4.3bsd /usr/include/sys/types.h, but on the
>--- pkg-plist.orig	2008-02-11 11:54:04.000000000 +0100
>+++ pkg-plist	2008-02-11 12:58:56.000000000 +0100
>@@ -53,7 +53,6 @@
> 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
>@@ -71,7 +70,6 @@
> 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
>@@ -91,7 +89,6 @@
> 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
>@@ -116,7 +113,6 @@
> 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
>@@ -127,7 +123,6 @@
> 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
>@@ -152,7 +147,6 @@
> etc/zmailer/cf/UTAI.cf
> etc/zmailer/cf/TELE-FI.cf
> etc/zmailer/cf/SMTP.cf
>-etc/zmailer/cf/tryme.cf
> etc/zmailer/scheduler.conf
> etc/zmailer/sm.conf
> etc/zmailer/smtpserver.conf
>@@ -184,7 +178,6 @@
> 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
>@@ -200,6 +193,7 @@
> etc/zmailer/guides/smtp-policy
> etc/zmailer/guides/smtp-msa-mode
> etc/zmailer/guides/smtp-etrn
>+etc/zmailer/guides/smtpserver-spf
> etc/zmailer/guides/scheduler-ta-protocol
> etc/zmailer/guides/relations
> etc/zmailer/guides/procmail
>@@ -229,7 +223,6 @@
> 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
>@@ -254,7 +247,6 @@
> 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
>@@ -303,6 +295,7 @@
> sbin/sendmail
> sbin/smtpserver
> sbin/smtpserver-log-parser.pl
>+sbin/zrfilter
> @unexec /bin/rm -f %D/sbin/vacation
> sbin/vacation.exe
> sbin/vacation.sh
>--- Makefile.orig	2007-12-14 16:52:50.000000000 +0100
>+++ Makefile	2008-02-11 14:45:05.000000000 +0100
>@@ -6,29 +6,28 @@
> #
> 
> PORTNAME=	zmailer
>-PORTVERSION=	2.99.56
>+PORTVERSION=	2.99.57
> PORTEPOCH=	1
> CATEGORIES=	mail
> MASTER_SITES=	ftp://ftp.funet.fi/pub/unix/mail/zmailer/src/
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	gahr@gahr.ch
> COMMENT=	A fully functional fast, robust SMTP server and transport agent
> 
> CONFLICTS=	courier-0.* postfix-1.* postfix-2.* sendmail-8.* sendmail-*-8.* smail-3.*
>+
>+OPTIONS=	SSL "Enable SSL support" ON
>+
> GNU_CONFIGURE=	yes
> USE_PERL5=	yes
> 
>-.if defined(WITH_SSL)
>-USE_OPENSSL=	yes
>-CONFIGURE_ARGS=	--with-openssl
>-.else
>-CONFIGURE_ARGS=	--without-openssl
>-.endif
>-
> .include <bsd.port.pre.mk>
> 
>-.if ${OSVERSION} >= 700042
>-BROKEN=		Does not compile with GCC 4.2
>+.if defined(WITHOUT_SSL)
>+CONFIGURE_ARGS=	--without-openssl
>+.else
>+.include "${PORTSDIR}/Mk/bsd.openssl.mk"
>+CONFIGURE_ARGS=	--with-openssl
> .endif
> 
> CONFIGURE_ARGS+=--prefix=${PREFIX}/ \
>@@ -67,6 +66,9 @@
> DOMAIN=		"mydomain.com"
> .endif
> 
>+pre-install:
>+	cd ${WRKSRC}/man && make install
>+
> post-install:
> 	@${SETENV} PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
> # set up the initial mail.conf with reasonable settings.

Actions: View | Diff

Attachments on bug 120536: 84519