Date: Sat, 5 Mar 2005 12:14:40 -0300 (BRT) From: Marcus Grando <marcus@corp.grupos.com.br> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/78447: [MAINTAINER] Update port: mail/postfix-current to 2.3-20050304 Message-ID: <20050305151440.63FCE20A5B@corp.grupos.com.br> Resent-Message-ID: <200503051520.j25FKKaO046526@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 78447
>Category: ports
>Synopsis: [MAINTAINER] Update port: mail/postfix-current to 2.3-20050304
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Mar 05 15:20:20 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Marcus Grando
>Release: FreeBSD 4.11-STABLE i386
>Organization:
Grupos Internet S/A
>Environment:
System: FreeBSD corp.grupos.com.br 4.11-STABLE FreeBSD 4.11-STABLE #42: Sun Feb 27 20:04:47 BRT 2005 root@corp.grupos.com.br:/usr/obj/usr/src/sys/CORP i386
>Description:
Update port: mail/postfix-current to 2.3-20050304
* Update to 2.3-20050304
* Remake all patches
* Update MAIL_VERSION_NUMBER because Wietse forgot
Add files:
files/patch-conf::main.cf
files/patch-conf::post-install
files/patch-makedefs
files/patch-src::global::mail_params.h
files/patch-src::global::mail_version.h
Removed files:
files/patch-ec
files/patch-freebsd6
files/patch-main.cf
files/patch-post-install
>How-To-Repeat:
>Fix:
--- postfix-current.patch begins here ---
diff -ruN postfix-current.old/Makefile postfix-current/Makefile
--- postfix-current.old/Makefile Sat Mar 5 11:39:13 2005
+++ postfix-current/Makefile Sat Mar 5 11:43:54 2005
@@ -15,7 +15,7 @@
# NOTE: PCRE is enabled by default unless you specifically disable it.
PORTNAME= postfix
-PORTVERSIONRAW= 2.2-20050227
+PORTVERSIONRAW= 2.3-20050304
PORTVERSION= ${PORTVERSIONRAW:S/-/./}
PORTEPOCH= 2
CATEGORIES= mail ipv6
diff -ruN postfix-current.old/distinfo postfix-current/distinfo
--- postfix-current.old/distinfo Sat Mar 5 11:39:13 2005
+++ postfix-current/distinfo Sat Mar 5 11:45:51 2005
@@ -1,2 +1,2 @@
-MD5 (postfix/postfix-2.2-20050227.tar.gz) = 10b9b8d39464abae33e9fe480635af3a
-SIZE (postfix/postfix-2.2-20050227.tar.gz) = 2402536
+MD5 (postfix/postfix-2.3-20050304.tar.gz) = 0f76384ea2b344d51d1d77a61853f308
+SIZE (postfix/postfix-2.3-20050304.tar.gz) = 2397445
diff -ruN postfix-current.old/files/patch-conf::main.cf postfix-current/files/patch-conf::main.cf
--- postfix-current.old/files/patch-conf::main.cf Wed Dec 31 21:00:00 1969
+++ postfix-current/files/patch-conf::main.cf Sat Mar 5 11:55:21 2005
@@ -0,0 +1,64 @@
+--- conf/main.cf.orig Sat Mar 5 11:53:42 2005
++++ conf/main.cf Sat Mar 5 11:53:42 2005
+@@ -32,13 +32,13 @@
+ # The command_directory parameter specifies the location of all
+ # postXXX commands.
+ #
+-command_directory = /usr/sbin
++command_directory = !!PREFIX!!/sbin
+
+ # The daemon_directory parameter specifies the location of all Postfix
+ # daemon programs (i.e. programs listed in the master.cf file). This
+ # directory must be owned by root.
+ #
+-daemon_directory = /usr/libexec/postfix
++daemon_directory = !!PREFIX!!/libexec/postfix
+
+ # QUEUE AND PROCESS OWNERSHIP
+ #
+@@ -608,37 +608,37 @@
+ # sendmail_path: The full pathname of the Postfix sendmail command.
+ # This is the Sendmail-compatible mail posting interface.
+ #
+-sendmail_path =
++sendmail_path = !!PREFIX!!/sbin/sendmail
+
+ # newaliases_path: The full pathname of the Postfix newaliases command.
+ # This is the Sendmail-compatible command to build alias databases.
+ #
+-newaliases_path =
++newaliases_path = !!PREFIX!!/bin/newaliases
+
+ # mailq_path: The full pathname of the Postfix mailq command. This
+ # is the Sendmail-compatible mail queue listing command.
+ #
+-mailq_path =
++mailq_path = !!PREFIX!!/bin/mailq
+
+ # setgid_group: The group for mail submission and queue management
+ # commands. This must be a group name with a numerical group ID that
+ # is not shared with other accounts, not even with the Postfix account.
+ #
+-setgid_group =
++setgid_group = maildrop
+
+ # html_directory: The location of the Postfix HTML documentation.
+ #
+-html_directory =
++html_directory = no
+
+ # manpage_directory: The location of the Postfix on-line manual pages.
+ #
+-manpage_directory =
++manpage_directory = !!PREFIX!!/man
+
+ # sample_directory: The location of the Postfix sample configuration files.
+ # This parameter is obsolete as of Postfix 2.1.
+ #
+-sample_directory =
++sample_directory = !!PREFIX!!/etc/postfix
+
+ # readme_directory: The location of the Postfix README files.
+ #
+-readme_directory =
++readme_directory = no
diff -ruN postfix-current.old/files/patch-conf::post-install postfix-current/files/patch-conf::post-install
--- postfix-current.old/files/patch-conf::post-install Wed Dec 31 21:00:00 1969
+++ postfix-current/files/patch-conf::post-install Sat Mar 5 11:56:14 2005
@@ -0,0 +1,11 @@
+--- conf/post-install.orig Thu Feb 24 08:06:08 2005
++++ conf/post-install Sat Mar 5 11:53:42 2005
+@@ -185,7 +185,7 @@
+
+ umask 022
+
+-PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc:/usr/contrib/bin:/usr/gnu/bin:/usr/ucb:/usr/bsd
++PATH=/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin
+ SHELL=/bin/sh
+ IFS="
+ "
diff -ruN postfix-current.old/files/patch-ec postfix-current/files/patch-ec
--- postfix-current.old/files/patch-ec Thu Mar 25 14:37:20 2004
+++ postfix-current/files/patch-ec Wed Dec 31 21:00:00 1969
@@ -1,53 +0,0 @@
-*** ./src/global/mail_params.h.orig Sat Jan 17 10:04:00 2004
---- ./src/global/mail_params.h Fri Jan 30 14:48:23 2004
-***************
-*** 64,70 ****
- extern gid_t var_owner_gid;
-
- #define VAR_SGID_GROUP "setgid_group"
-! #define DEF_SGID_GROUP "postdrop"
- extern char *var_sgid_group;
- extern gid_t var_sgid_gid;
-
---- 64,70 ----
- extern gid_t var_owner_gid;
-
- #define VAR_SGID_GROUP "setgid_group"
-! #define DEF_SGID_GROUP "maildrop"
- extern char *var_sgid_group;
- extern gid_t var_sgid_gid;
-
-***************
-*** 202,208 ****
- */
- #define VAR_DAEMON_DIR "daemon_directory"
- #ifndef DEF_DAEMON_DIR
-! #define DEF_DAEMON_DIR "/usr/libexec/postfix"
- #endif
- extern char *var_daemon_dir;
-
---- 202,208 ----
- */
- #define VAR_DAEMON_DIR "daemon_directory"
- #ifndef DEF_DAEMON_DIR
-! #define DEF_DAEMON_DIR "!!PREFIX!!/libexec/postfix"
- #endif
- extern char *var_daemon_dir;
-
-***************
-*** 231,237 ****
- */
- #define VAR_CONFIG_DIR "config_directory"
- #ifndef DEF_CONFIG_DIR
-! #define DEF_CONFIG_DIR "/etc/postfix"
- #endif
- extern char *var_config_dir;
-
---- 231,237 ----
- */
- #define VAR_CONFIG_DIR "config_directory"
- #ifndef DEF_CONFIG_DIR
-! #define DEF_CONFIG_DIR "!!PREFIX!!/etc/postfix"
- #endif
- extern char *var_config_dir;
-
diff -ruN postfix-current.old/files/patch-freebsd6 postfix-current/files/patch-freebsd6
--- postfix-current.old/files/patch-freebsd6 Mon Feb 14 17:48:03 2005
+++ postfix-current/files/patch-freebsd6 Wed Dec 31 21:00:00 1969
@@ -1,11 +0,0 @@
---- makedefs_orig Tue Jun 15 16:41:45 2004
-+++ makedefs Fri Aug 20 15:06:41 2004
-@@ -93,6 +93,8 @@
- ;;
- FreeBSD.5*) SYSTYPE=FREEBSD5
- ;;
-+ FreeBSD.6*) SYSTYPE=FREEBSD5
-+ ;;
- OpenBSD.2*) SYSTYPE=OPENBSD2
- ;;
- OpenBSD.3*) SYSTYPE=OPENBSD3
diff -ruN postfix-current.old/files/patch-main.cf postfix-current/files/patch-main.cf
--- postfix-current.old/files/patch-main.cf Sun May 2 14:31:56 2004
+++ postfix-current/files/patch-main.cf Wed Dec 31 21:00:00 1969
@@ -1,108 +0,0 @@
-*** ./conf/main.cf~ Mon Apr 26 16:54:42 2004
---- ./conf/main.cf Mon Apr 26 16:54:42 2004
-***************
-*** 32,44 ****
- # The command_directory parameter specifies the location of all
- # postXXX commands.
- #
-! command_directory = /usr/sbin
-
- # The daemon_directory parameter specifies the location of all Postfix
- # daemon programs (i.e. programs listed in the master.cf file). This
- # directory must be owned by root.
- #
-! daemon_directory = /usr/libexec/postfix
-
- # QUEUE AND PROCESS OWNERSHIP
- #
---- 32,44 ----
- # The command_directory parameter specifies the location of all
- # postXXX commands.
- #
-! command_directory = !!PREFIX!!/sbin
-
- # The daemon_directory parameter specifies the location of all Postfix
- # daemon programs (i.e. programs listed in the master.cf file). This
- # directory must be owned by root.
- #
-! daemon_directory = !!PREFIX!!/libexec/postfix
-
- # QUEUE AND PROCESS OWNERSHIP
- #
-***************
-*** 595,631 ****
- # sendmail_path: The full pathname of the Postfix sendmail command.
- # This is the Sendmail-compatible mail posting interface.
- #
-! sendmail_path =
-
- # newaliases_path: The full pathname of the Postfix newaliases command.
- # This is the Sendmail-compatible command to build alias databases.
- #
-! newaliases_path =
-
- # mailq_path: The full pathname of the Postfix mailq command. This
- # is the Sendmail-compatible mail queue listing command.
- #
-! mailq_path =
-
- # setgid_group: The group for mail submission and queue management
- # commands. This must be a group name with a numerical group ID that
- # is not shared with other accounts, not even with the Postfix account.
- #
-! setgid_group =
-
- # html_directory: The location of the Postfix HTML documentation.
- #
-! html_directory =
-
- # manpage_directory: The location of the Postfix on-line manual pages.
- #
-! manpage_directory =
-
- # sample_directory: The location of the Postfix sample configuration files.
- # This parameter is obsolete as of Postfix 2.1.
- #
-! sample_directory =
-
- # readme_directory: The location of the Postfix README files.
- #
-! readme_directory =
---- 595,631 ----
- # sendmail_path: The full pathname of the Postfix sendmail command.
- # This is the Sendmail-compatible mail posting interface.
- #
-! sendmail_path = !!PREFIX!!/sbin/sendmail
-
- # newaliases_path: The full pathname of the Postfix newaliases command.
- # This is the Sendmail-compatible command to build alias databases.
- #
-! newaliases_path = !!PREFIX!!/bin/newaliases
-
- # mailq_path: The full pathname of the Postfix mailq command. This
- # is the Sendmail-compatible mail queue listing command.
- #
-! mailq_path = !!PREFIX!!/bin/mailq
-
- # setgid_group: The group for mail submission and queue management
- # commands. This must be a group name with a numerical group ID that
- # is not shared with other accounts, not even with the Postfix account.
- #
-! setgid_group = maildrop
-
- # html_directory: The location of the Postfix HTML documentation.
- #
-! html_directory = no
-
- # manpage_directory: The location of the Postfix on-line manual pages.
- #
-! manpage_directory = !!PREFIX!!/man
-
- # sample_directory: The location of the Postfix sample configuration files.
- # This parameter is obsolete as of Postfix 2.1.
- #
-! sample_directory = !!PREFIX!!/etc/postfix
-
- # readme_directory: The location of the Postfix README files.
- #
-! readme_directory = no
diff -ruN postfix-current.old/files/patch-makedefs postfix-current/files/patch-makedefs
--- postfix-current.old/files/patch-makedefs Wed Dec 31 21:00:00 1969
+++ postfix-current/files/patch-makedefs Sat Mar 5 11:57:34 2005
@@ -0,0 +1,11 @@
+--- makedefs.orig Tue Feb 8 20:27:50 2005
++++ makedefs Sat Mar 5 11:53:42 2005
+@@ -116,6 +116,8 @@
+ ;;
+ FreeBSD.5*) SYSTYPE=FREEBSD5
+ ;;
++ FreeBSD.6*) SYSTYPE=FREEBSD5
++ ;;
+ OpenBSD.2*) SYSTYPE=OPENBSD2
+ ;;
+ OpenBSD.3*) SYSTYPE=OPENBSD3
diff -ruN postfix-current.old/files/patch-post-install postfix-current/files/patch-post-install
--- postfix-current.old/files/patch-post-install Wed Jan 30 17:47:44 2002
+++ postfix-current/files/patch-post-install Wed Dec 31 21:00:00 1969
@@ -1,11 +0,0 @@
---- ./conf/#post-install~ Fri Jan 18 12:32:54 2002
-+++ ./conf/post-install Fri Jan 18 12:32:54 2002
-@@ -183,7 +183,7 @@
-
- umask 022
-
--PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc:/usr/contrib/bin:/usr/gnu/bin:/usr/ucb:/usr/bsd
-+PATH=/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin
- SHELL=/bin/sh
- IFS="
- "
diff -ruN postfix-current.old/files/patch-src::global::mail_params.h postfix-current/files/patch-src::global::mail_params.h
--- postfix-current.old/files/patch-src::global::mail_params.h Wed Dec 31 21:00:00 1969
+++ postfix-current/files/patch-src::global::mail_params.h Sat Mar 5 11:57:02 2005
@@ -0,0 +1,29 @@
+--- src/global/mail_params.h.orig Fri Feb 11 21:53:21 2005
++++ src/global/mail_params.h Sat Mar 5 11:53:42 2005
+@@ -64,7 +64,7 @@
+ extern gid_t var_owner_gid;
+
+ #define VAR_SGID_GROUP "setgid_group"
+-#define DEF_SGID_GROUP "postdrop"
++#define DEF_SGID_GROUP "maildrop"
+ extern char *var_sgid_group;
+ extern gid_t var_sgid_gid;
+
+@@ -221,7 +221,7 @@
+ */
+ #define VAR_DAEMON_DIR "daemon_directory"
+ #ifndef DEF_DAEMON_DIR
+-#define DEF_DAEMON_DIR "/usr/libexec/postfix"
++#define DEF_DAEMON_DIR "!!PREFIX!!/libexec/postfix"
+ #endif
+ extern char *var_daemon_dir;
+
+@@ -250,7 +250,7 @@
+ */
+ #define VAR_CONFIG_DIR "config_directory"
+ #ifndef DEF_CONFIG_DIR
+-#define DEF_CONFIG_DIR "/etc/postfix"
++#define DEF_CONFIG_DIR "!!PREFIX!!/etc/postfix"
+ #endif
+ extern char *var_config_dir;
+
diff -ruN postfix-current.old/files/patch-src::global::mail_version.h postfix-current/files/patch-src::global::mail_version.h
--- postfix-current.old/files/patch-src::global::mail_version.h Wed Dec 31 21:00:00 1969
+++ postfix-current/files/patch-src::global::mail_version.h Sat Mar 5 11:51:14 2005
@@ -0,0 +1,11 @@
+--- src/global/mail_version.h.orig Sat Mar 5 11:50:13 2005
++++ src/global/mail_version.h Sat Mar 5 11:50:23 2005
+@@ -21,7 +21,7 @@
+ * release date only.
+ */
+ #define MAIL_RELEASE_DATE "20050304"
+-#define MAIL_VERSION_NUMBER "2.2"
++#define MAIL_VERSION_NUMBER "2.3"
+
+ #define VAR_MAIL_VERSION "mail_version"
+ #ifdef SNAPSHOT
--- postfix-current.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050305151440.63FCE20A5B>