Attachment 153100 Details for Bug 197674 – Updated patch.

[patch] Updated patch.

patch-mail_postfix (text/plain), 4.55 KB, created by Yasuhiro Kimura on 2015-02-17 07:07:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2015-02-17 07:07:18 UTC

Size: 4.55 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 378859)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	postfix
>-PORTVERSION=	2.11.3
>-PORTREVISION=	4
>+PORTVERSION=	3.0.0
> PORTEPOCH=	1
> CATEGORIES=	mail ipv6
> MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
>@@ -22,11 +21,10 @@
> LICENSE_FILE=	${WRKSRC}/LICENSE
> LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
> 
>-PORTSCOUT=	limit:^2\.11\.
>+PORTSCOUT=	limit:^3\.0\.
> 
> VDAVERSION=	2.10.0
>-CONFLICTS_INSTALL?=	courier-0.* opensmtpd-[0-9]* \
>-		postfix2?-* postfix21?-* postfix-tls-* \
>+CONFLICTS_INSTALL?=	courier-0.* opensmtpd-[0-9]* postfix-tls-* \
> 		postfix-current-[23].* postfix-current-base-[23].* \
> 		sendmail-8.* sendmail+*-8.* smail-3.* zmailer-2.*
> 
>@@ -358,7 +356,7 @@
> 
> post-install:
> # Fix compressed man pages and strip executables
>-	${REINPLACE_CMD} -i '' -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${STAGEDIR}${DAEMONDIR}/postfix-files
>+	${REINPLACE_CMD} -i '' -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${STAGEDIR}${ETCDIR}/postfix-files
> 	-@${STRIP_CMD} ${STRIP_LIBEXEC:S|^|${STAGEDIR}${PREFIX}/libexec/postfix/|}
> 	-@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/*
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 378859)
>+++ distinfo	(working copy)
>@@ -1,5 +1,5 @@
>-SHA256 (postfix/postfix-2.11.3.tar.gz) = 04e5146e6e56261baae9f63c590348a4b12ce22d3d46260e26e97233f40802c3
>-SIZE (postfix/postfix-2.11.3.tar.gz) = 4039705
>+SHA256 (postfix/postfix-3.0.0.tar.gz) = c2f2f10aa3e6b7090ba979e9c515e42b3140c5c1c17a33d58787569df7ae0955
>+SIZE (postfix/postfix-3.0.0.tar.gz) = 4239248
> SHA256 (postfix/postfix-2.8.0-libspf2-1.2.x-0.patch.gz) = e5c38e5bc226cab109c02a4e530ab1aefd3bb06f2169f3e052bdf83d2727aacc
> SIZE (postfix/postfix-2.8.0-libspf2-1.2.x-0.patch.gz) = 8191
> SHA256 (postfix/postfix-vda-v13-2.10.0.patch) = 6208021eb0b37ac6482e334e538ed5700cc22c4d4dd66ed9e975ae5f20bf935f
>Index: files/patch-src__util__sys_defs.h
>===================================================================
>--- files/patch-src__util__sys_defs.h	(revision 378859)
>+++ files/patch-src__util__sys_defs.h	(working copy)
>@@ -1,11 +1,9 @@
>---- src/util/sys_defs.h.orig	2012-09-24 23:53:56.000000000 +0000
>-+++ src/util/sys_defs.h	2013-10-27 01:17:14.000000000 +0000
>-@@ -25,7 +25,8 @@
>-   */
>+--- src/util/sys_defs.h.orig	2014-12-26 07:33:02.000000000 +0900
>++++ src/util/sys_defs.h	2015-02-12 11:43:26.641763000 +0900
>+@@ -26,6 +26,7 @@
>  #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
>      || defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \
>--    || defined(FREEBSD8) || defined(FREEBSD9) \
>-+    || defined(FREEBSD8) || defined(FREEBSD9) || defined(FREEBSD10) \
>+     || defined(FREEBSD8) || defined(FREEBSD9) || defined(FREEBSD10) \
> +    || defined(FREEBSD11) \
>      || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
>      || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 378859)
>+++ pkg-plist	(working copy)
>@@ -1,5 +1,5 @@
>-@unexec if cmp -s %D/libexec/postfix/main.cf %%PFETC%%/main.cf; then rm -f %%PFETC%%/main.cf; fi
>-@unexec if cmp -s %D/libexec/postfix/master.cf %%PFETC%%/master.cf; then rm -f %%PFETC%%/master.cf; fi
>+@unexec if cmp -s %%PFETC%%/main.cf.proto %%PFETC%%/main.cf; then rm -f %%PFETC%%/main.cf; fi
>+@unexec if cmp -s %%PFETC%%/master.cf.proto %%PFETC%%/master.cf; then rm -f %%PFETC%%/master.cf; fi
> bin/mailq
> bin/newaliases
> %%TEST%%bin/qmqp-sink
>@@ -13,7 +13,11 @@
> etc/postfix/TLS_LICENSE
> etc/postfix/bounce.cf.default
> etc/postfix/main.cf.default
>+etc/postfix/main.cf.proto
> etc/postfix/makedefs.out
>+etc/postfix/master.cf.proto
>+etc/postfix/postfix-files
>+@dir etc/postfix/postfix-files.d
> @cwd %%RESETPREFIX%%
> libexec/postfix/anvil
> libexec/postfix/bounce
>@@ -24,15 +28,12 @@
> libexec/postfix/flush
> libexec/postfix/lmtp
> libexec/postfix/local
>-libexec/postfix/main.cf
> libexec/postfix/master
>-libexec/postfix/master.cf
> libexec/postfix/nqmgr
> libexec/postfix/oqmgr
> libexec/postfix/pickup
> libexec/postfix/pipe
> libexec/postfix/post-install
>-libexec/postfix/postfix-files
> libexec/postfix/postfix-script
> libexec/postfix/postfix-wrapper
> libexec/postfix/postmulti-script
>@@ -140,7 +141,7 @@
> sbin/posttls-finger
> sbin/sendmail
> @dir %%PFETC%%
>-@dir /var/db/postfix
>+@dir(postfix,,700) /var/db/postfix
> @dir(postfix,,700) /var/spool/postfix/active
> @dir(postfix,,700) /var/spool/postfix/bounce
> @dir(postfix,,700) /var/spool/postfix/corrupt

Actions: View | Diff

Attachments on bug 197674: 152994 | 153100 | 153101 | 154339