OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-Jan-2008 10:28:02
Branch: HEAD Handle: 2008012509280100
Modified files:
openpkg-src/postfix postfix.patch postfix.spec postfix.txt
Log:
upgrading package: postfix 2.4.6 -> 2.5.0
Summary:
Revision Changes Path
1.16 +9 -9 openpkg-src/postfix/postfix.patch
1.268 +9 -3 openpkg-src/postfix/postfix.spec
1.5 +29 -33 openpkg-src/postfix/postfix.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/postfix/postfix.patch
============================================================================
$ cvs diff -u -r1.15 -r1.16 postfix.patch
--- openpkg-src/postfix/postfix.patch 13 Dec 2007 17:44:14 -0000 1.15
+++ openpkg-src/postfix/postfix.patch 25 Jan 2008 09:28:01 -0000 1.16
@@ -1,9 +1,9 @@
Index: makedefs
---- makedefs.orig 2007-03-24 14:30:18 +0100
-+++ makedefs 2007-12-13 18:42:19 +0100
-@@ -130,6 +130,10 @@
+--- makedefs.orig 2008-01-15 21:20:24 +0100
++++ makedefs 2008-01-24 12:31:48 +0100
+@@ -132,6 +132,10 @@
;;
- FreeBSD.6*) SYSTYPE=FREEBSD6
+ FreeBSD.7*) SYSTYPE=FREEBSD7
;;
+ FreeBSD.7*) SYSTYPE=FREEBSD7
+ ;;
@@ -14,7 +14,7 @@
OpenBSD.3*) SYSTYPE=OPENBSD3
Index: src/util/file_limit.c
--- src/util/file_limit.c.orig 2003-10-22 20:48:36 +0200
-+++ src/util/file_limit.c 2007-12-13 18:41:59 +0100
++++ src/util/file_limit.c 2008-01-24 12:31:48 +0100
@@ -80,12 +80,21 @@
void set_file_limit(off_t limit)
{
@@ -39,7 +39,7 @@
#ifdef SIGXFSZ
Index: src/util/msg_syslog.c
--- src/util/msg_syslog.c.orig 2006-06-15 20:07:16 +0200
-+++ src/util/msg_syslog.c 2007-12-13 18:41:59 +0100
++++ src/util/msg_syslog.c 2008-01-24 12:31:48 +0100
@@ -50,6 +50,11 @@
#include <syslog.h>
#include <string.h>
@@ -89,13 +89,13 @@
/* msg_syslog_init - initialize */
Index: src/util/sys_defs.h
---- src/util/sys_defs.h.orig 2007-03-24 23:45:33 +0100
-+++ src/util/sys_defs.h 2007-12-13 18:42:42 +0100
+--- src/util/sys_defs.h.orig 2008-01-15 01:51:44 +0100
++++ src/util/sys_defs.h 2008-01-24 12:32:41 +0100
@@ -24,7 +24,7 @@
* 4.4BSD and close derivatives.
*/
#if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
-- || defined(FREEBSD5) || defined(FREEBSD6) \
+- || defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \
+ || defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) ||
defined(FREEBSD8) \
|| defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
|| defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/postfix/postfix.spec
============================================================================
$ cvs diff -u -r1.267 -r1.268 postfix.spec
--- openpkg-src/postfix/postfix.spec 1 Jan 2008 15:03:00 -0000 1.267
+++ openpkg-src/postfix/postfix.spec 25 Jan 2008 09:28:01 -0000 1.268
@@ -22,7 +22,7 @@
##
# package versions
-%define V_postfix 2.4.6
+%define V_postfix 2.5.0
%define V_pflogsumm 1.1.1
%define V_whoson 2.4.0
@@ -37,7 +37,7 @@
Group: Mail
License: IPL
Version: %{V_postfix}
-Release: 20080101
+Release: 20080125
# package options
%option with_fsl yes
@@ -165,7 +165,12 @@
CCARGS=""
CCARGS="$CCARGS %{l_cflags -O}"
CCARGS="$CCARGS %{l_cppflags}"
+ CCARGS="$CCARGS -DDEF_COMMAND_DIR=\\\"%{l_prefix}/sbin\\\""
+ CCARGS="$CCARGS -DDEF_SENDMAIL_PATH=\\\"%{l_prefix}/sbin/sendmail\\\""
CCARGS="$CCARGS -DDEF_CONFIG_DIR=\\\"%{l_prefix}/etc/postfix\\\""
+ CCARGS="$CCARGS -DDEF_DAEMON_DIR=\\\"%{l_prefix}/libexec/postfix\\\""
+ CCARGS="$CCARGS -DDEF_QUEUE_DIR=\\\"%{l_prefix}/var/postfix\\\""
+ CCARGS="$CCARGS -DDEF_DATA_DIR=\\\"%{l_prefix}/var/postfix/data\\\""
AUXLIBS=""
AUXLIBS="$AUXLIBS %{l_ldflags}"
CCARGS="$CCARGS -DHAS_DB"
@@ -232,6 +237,7 @@
daemon_directory=%{l_prefix}/libexec/postfix \
command_directory=%{l_prefix}/sbin \
queue_directory=%{l_prefix}/var/postfix \
+ data_directory=%{l_prefix}/var/postfix/data \
sendmail_path=%{l_prefix}/sbin/sendmail \
newaliases_path=%{l_prefix}/sbin/newaliases \
mailq_path=%{l_prefix}/sbin/mailq \
@@ -274,7 +280,7 @@
( cd $RPM_BUILD_ROOT%{l_prefix}/var/postfix
%{l_shtool} mkdir -f -p -m 700 \
active bounce corrupt defer deferred \
- flush incoming private saved
+ flush incoming private saved data
%{l_shtool} mkdir -f -p -m 730 maildrop
%{l_shtool} mkdir -f -p -m 710 public
%{l_shtool} mkdir -f -p -m 755 log pid
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/postfix/postfix.txt
============================================================================
$ cvs diff -u -r1.4 -r1.5 postfix.txt
--- openpkg-src/postfix/postfix.txt 8 Sep 2007 13:20:56 -0000 1.4
+++ openpkg-src/postfix/postfix.txt 25 Jan 2008 09:28:01 -0000 1.5
@@ -90,34 +90,35 @@
# service type private unpriv chroot wakeup maxproc command + args
# (yes) (yes) (yes) (never) (100)
# ==========================================================================
-smtp inet n - n - - smtpd
-#628 inet n - n - - qmqpd
-pickup fifo n - n 60 1 pickup
-cleanup unix n - n - 0 cleanup
-qmgr fifo n - n 300 1 qmgr
-tlsmgr unix - - n 1000? 1 tlsmgr
-rewrite unix - - n - - trivial-rewrite
-bounce unix - - n - 0 bounce
-defer unix - - n - 0 bounce
-trace unix - - n - 0 bounce
-verify unix - - n - 1 verify
-flush unix n - n 1000? 0 flush
-proxymap unix - - n - - proxymap
-smtp unix - - n - - smtp
-relay unix - - n - - smtp -o
fallback_relay=
-showq unix n - n - - showq
-error unix - - n - - error
-retry unix - - n - - error
-local unix - n n - - local
-virtual unix - n n - - virtual
-lmtp unix - - n - - lmtp
-anvil unix - - n - 1 anvil
-scache unix - - n - 1 scache
-#maildrop unix - n n - - pipe flags=DRhu
user=vmail [EMAIL PROTECTED]@/bin/maildrop -d ${recipient}
-#cyrus unix - n n - - pipe user=cyrus
[EMAIL PROTECTED]@/bin/cyrdeliver -e -r ${sender} -m ${extension} ${user}
-#uucp unix - n n - - pipe flags=Fqhu
user=uucp [EMAIL PROTECTED]@/bin/uux -r -n -z -a$sender - $nexthop!rmail
($recipient)
-#ifmail unix - n n - - pipe flags=F
user=ftn [EMAIL PROTECTED]@/bin/ifmail -r $nexthop ($recipient)
-#bsmtp unix - n n - - pipe flags=Fq.
user=foo [EMAIL PROTECTED]@/bin/bsmtp -f $sender $nexthop $recipient
+smtp inet n - n - - smtpd
+#628 inet n - n - - qmqpd
+pickup fifo n - n 60 1 pickup
+cleanup unix n - n - 0 cleanup
+qmgr fifo n - n 300 1 qmgr
+tlsmgr unix - - n 1000? 1 tlsmgr
+rewrite unix - - n - - trivial-rewrite
+bounce unix - - n - 0 bounce
+defer unix - - n - 0 bounce
+trace unix - - n - 0 bounce
+verify unix - - n - 1 verify
+flush unix n - n 1000? 0 flush
+proxymap unix - - n - - proxymap
+proxywrite unix - - n - - proxymap
+smtp unix - - n - - smtp
+relay unix - - n - - smtp -o
fallback_relay=
+showq unix n - n - - showq
+error unix - - n - - error
+retry unix - - n - - error
+local unix - n n - - local
+virtual unix - n n - - virtual
+lmtp unix - - n - - lmtp
+anvil unix - - n - 1 anvil
+scache unix - - n - 1 scache
+#maildrop unix - n n - - pipe flags=DRhu
user=vmail [EMAIL PROTECTED]@/bin/maildrop -d ${recipient}
+#cyrus unix - n n - - pipe user=cyrus
[EMAIL PROTECTED]@/bin/cyrdeliver -e -r ${sender} -m ${extension} ${user}
+#uucp unix - n n - - pipe flags=Fqhu
user=uucp [EMAIL PROTECTED]@/bin/uux -r -n -z -a$sender - $nexthop!rmail
($recipient)
+#ifmail unix - n n - - pipe flags=F
user=ftn [EMAIL PROTECTED]@/bin/ifmail -r $nexthop ($recipient)
+#bsmtp unix - n n - - pipe flags=Fq.
user=foo [EMAIL PROTECTED]@/bin/bsmtp -f $sender $nexthop $recipient
</file>
<file name="main.cf">
##
@@ -132,11 +133,6 @@
## trivial-rewrite(8).
##
-# paths
-command_directory = @l_prefix@/sbin
-daemon_directory = @l_prefix@/libexec/postfix
-queue_directory = @l_prefix@/var/postfix
-
# users
mail_owner = @l_musr@
setgid_group = @l_rgrp@
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
