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: 11-Mar-2005 10:50:35
Branch: HEAD Handle: 2005031109503500
Modified files:
openpkg-src/postfix etc.tar postfix.patch postfix.spec
Log:
upgrade to Postfix 2.2
Summary:
Revision Changes Path
1.21 BLOB openpkg-src/postfix/etc.tar
1.7 +17 -100 openpkg-src/postfix/postfix.patch
1.217 +10 -23 openpkg-src/postfix/postfix.spec
____________________________________________________________________________
(cd openpkg-src/postfix && \
uudecode <<'@@ .' && \
mv etc.tar etc.tar.orig && \
xdelta patch etc.tar.xdelta etc.tar.orig etc.tar && \
rm -f etc.tar.orig etc.tar.xdelta)
Index: openpkg-src/postfix/etc.tar
============================================================================
begin 664 etc.tar.xdelta
M)5A$6C`P-"4````(`!``$`````````````````````!S:&EE;&$N,C$T,C0N
M;VQD<VAI96QA+C(Q-#(T+FYE=Q^+"`````````,#````````````'XL(````
M`````V-@:&!F8&`PN"+;<[.?81/+RP;.&[EMAIL PROTECTED]/>#\OQP```````!4
()5A$6C`P-"4`
`
end
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/postfix/postfix.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 postfix.patch
--- openpkg-src/postfix/postfix.patch 6 Feb 2005 13:05:57 -0000 1.6
+++ openpkg-src/postfix/postfix.patch 11 Mar 2005 09:50:35 -0000 1.7
@@ -1,9 +1,18 @@
-https://rt.openpkg.org/Ticket/Display.html?id=285
-USE_SOFTLIMITONLY kludge
-
+Index: makedefs
+--- makedefs.orig 2005-02-22 13:35:52 +0100
++++ makedefs 2005-03-11 10:30:49 +0100
+@@ -116,6 +116,8 @@
+ ;;
+ FreeBSD.5*) SYSTYPE=FREEBSD5
+ ;;
++ FreeBSD.6*) SYSTYPE=FREEBSD6
++ ;;
+ OpenBSD.2*) SYSTYPE=OPENBSD2
+ ;;
+ 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 2005-02-06 13:34:59 +0100
++++ src/util/file_limit.c 2005-03-11 10:30:43 +0100
@@ -80,12 +80,21 @@
void set_file_limit(off_t limit)
{
@@ -27,8 +36,8 @@
msg_fatal("setrlimit: %m");
#ifdef SIGXFSZ
Index: src/util/msg_syslog.c
---- src/util/msg_syslog.c.orig 2004-01-04 17:14:58 +0100
-+++ src/util/msg_syslog.c 2005-02-06 13:34:59 +0100
+--- src/util/msg_syslog.c.orig 2005-01-19 02:22:19 +0100
++++ src/util/msg_syslog.c 2005-03-11 10:30:43 +0100
@@ -50,6 +50,11 @@
#include <syslog.h>
#include <string.h>
@@ -77,100 +86,9 @@
}
/* msg_syslog_init - initialize */
-
------------------------------------------------------------------------------
-
-Steffen Hansen has patched postfix-2.1.5 for making various client
-information (ip, hostname etc.) available to processes run via the pipe
-transport. The code has been accepted for postfix-2.2, but depending on
-how far away from release that is, it might be a good idea to have the
-patch in OpenPKG.
-
-Index: man/man8/pipe.8
---- man/man8/pipe.8.orig 2004-08-09 16:51:07 +0200
-+++ man/man8/pipe.8 2005-02-06 13:34:59 +0100
-@@ -128,6 +128,22 @@
- and replaced with corresponding information from the Postfix queue
- manager delivery request:
- .RS
-+.IP \fB${\fBclient_address\fR}\fR
-+This macro expands to the remote client network address.
-+.sp
-+This is available in Postfix 2.2 and later.
-+.IP \fB${\fBclient_helo\fR}\fR
-+This macro expands to the remote client HELO command parameter.
-+.sp
-+This is available in Postfix 2.2 and later.
-+.IP \fB${\fBclient_hostname\fR}\fR
-+This macro expands to the remote client hostname.
-+.sp
-+This is available in Postfix 2.2 and later.
-+.IP \fB${\fBclient_protocol\fR}\fR
-+This macro expands to the remote client protocol.
-+.sp
-+This is available in Postfix 2.2 and later.
- .IP \fB${\fBextension\fR}\fR
- This macro expands to the extension part of a recipient address.
- For example, with an address [EMAIL PROTECTED] the extension is
-Index: src/pipe/pipe.c
---- src/pipe/pipe.c.orig 2004-07-24 01:09:21 +0200
-+++ src/pipe/pipe.c 2005-02-06 13:34:59 +0100
-@@ -332,6 +332,10 @@
- #define PIPE_DICT_EXTENSION "extension" /* key */
- #define PIPE_DICT_MAILBOX "mailbox" /* key */
- #define PIPE_DICT_SIZE "size" /* key */
-+#define PIPE_DICT_CLIENT_ADDR "client_address" /* key */
-+#define PIPE_DICT_CLIENT_NAME "client_hostname" /* key */
-+#define PIPE_DICT_CLIENT_PROTO "client_protocol" /* key */
-+#define PIPE_DICT_CLIENT_HELO "client_helo" /* key */
-
- /*
- * Flags used to pass back the type of special parameter found by
-@@ -412,6 +416,10 @@
- PIPE_DICT_EXTENSION, PIPE_FLAG_EXTENSION,
- PIPE_DICT_MAILBOX, PIPE_FLAG_MAILBOX,
- PIPE_DICT_SIZE, 0,
-+ PIPE_DICT_CLIENT_ADDR, 0,
-+ PIPE_DICT_CLIENT_NAME, 0,
-+ PIPE_DICT_CLIENT_PROTO, 0,
-+ PIPE_DICT_CLIENT_HELO, 0,
- 0, 0,
- };
- struct cmd_flags *p;
-@@ -954,6 +962,15 @@
- dict_update(PIPE_DICT_TABLE, PIPE_DICT_SIZE, STR(buf));
- vstring_free(buf);
-
-+ dict_update(PIPE_DICT_TABLE, PIPE_DICT_CLIENT_ADDR,
-+ request->client_addr);
-+ dict_update(PIPE_DICT_TABLE, PIPE_DICT_CLIENT_HELO,
-+ request->client_helo);
-+ dict_update(PIPE_DICT_TABLE, PIPE_DICT_CLIENT_NAME,
-+ request->client_name);
-+ dict_update(PIPE_DICT_TABLE, PIPE_DICT_CLIENT_PROTO,
-+ request->client_proto);
-+
- if ((expanded_argv = expand_argv(service, attr.command,
- rcpt_list, attr.flags)) == 0) {
- deliver_status = eval_command_status(PIPE_STAT_DEFER, service,
-
------------------------------------------------------------------------------
-
-Index: makedefs
---- makedefs.orig 2004-04-14 20:59:43 +0200
-+++ makedefs 2005-02-06 13:34:59 +0100
-@@ -93,6 +93,8 @@
- ;;
- FreeBSD.5*) SYSTYPE=FREEBSD5
- ;;
-+ FreeBSD.6*) SYSTYPE=FREEBSD6
-+ ;;
- OpenBSD.2*) SYSTYPE=OPENBSD2
- ;;
- OpenBSD.3*) SYSTYPE=OPENBSD3
Index: src/util/sys_defs.h
---- src/util/sys_defs.h.orig 2004-08-01 23:05:23 +0200
-+++ src/util/sys_defs.h 2005-02-06 13:34:59 +0100
+--- src/util/sys_defs.h.orig 2005-02-04 01:07:44 +0100
++++ src/util/sys_defs.h 2005-03-11 10:30:49 +0100
@@ -24,7 +24,7 @@
* 4.4BSD and close derivatives.
*/
@@ -180,4 +98,3 @@
|| defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
|| defined(OPENBSD2) || defined(OPENBSD3) \
|| defined(NETBSD1) || defined(NETBSD2) \
-
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/postfix/postfix.spec
============================================================================
$ cvs diff -u -r1.216 -r1.217 postfix.spec
--- openpkg-src/postfix/postfix.spec 6 Feb 2005 13:05:57 -0000 1.216
+++ openpkg-src/postfix/postfix.spec 11 Mar 2005 09:50:35 -0000 1.217
@@ -23,9 +23,10 @@
## SUCH DAMAGE.
##
+# FIXME: rse: with_spf/with_srs/with_whoson options broken after upgrade
to Postfix 2.2
+
# package versions
-%define V_postfix 2.1.5
-%define V_tls 0.8.18-2.1.3-0.9.7d
+%define V_postfix 2.2.0
%define V_spf 2.1.5-5
%define V_srs 2.1.4-1
%define V_pflogsumm 1.1.0
@@ -42,7 +43,7 @@
Group: Mail
License: IPL
Version: %{V_postfix}
-Release: 20050206
+Release: 20050311
# package options
%option with_fsl yes
@@ -57,11 +58,10 @@
# list of sources
Source0:
ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-%{V_postfix}.tar.gz
-Source1:
ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/pfixtls-%{V_tls}.tar.gz
-Source2:
http://jimsun.linxnet.com/downloads/pflogsumm-%{V_pflogsumm}.tar.gz
-Source3: etc.tar
-Source4: fsl.postfix
-Source5: rc.postfix
+Source1:
http://jimsun.linxnet.com/downloads/pflogsumm-%{V_pflogsumm}.tar.gz
+Source2: etc.tar
+Source3: fsl.postfix
+Source4: rc.postfix
Patch0: postfix.patch
Patch1: postfix.patch.pfls
Patch2:
ftp://ftp.openpkg.org/sources/CPY/postfix/postfix-%{V_whoson}-whoson.patch
@@ -133,11 +133,6 @@
url = ftp://ftp.porcupine.org/mirrors/postfix-release/official/
regex = postfix-(\d+\.\d+\.\d+)\.tar\.gz
}
- prog postfix:pfixtls = {
- version = %{V_tls}
- url = ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/
- regex = pfixtls-([^-]+-[^-]+-[^-]+)\.tar\.gz
- }
prog postfix:spf = {
version = %{V_spf}
url = http://www.ipnet6.org/postfix/spf/
@@ -162,16 +157,8 @@
%prep
# unpack distribution files
%setup -q
-%if "%{with_ssl}" == "yes"
%setup -q -T -D -a 1
-%endif
%setup -q -T -D -a 2
- %setup -q -T -D -a 3
-
- # apply vendor SSL/TLS patch
-%if "%{with_ssl}" == "yes"
- %{l_patch} -p1 <pfixtls-%{V_tls}/pfixtls.diff
-%endif
# apply vendor SPF/SRS patches
%if "%{with_spf}" == "yes"
@@ -233,7 +220,7 @@
fi
%endif
%if "%{with_ssl}" == "yes"
- CCARGS="$CCARGS -DHAS_SSL"
+ CCARGS="$CCARGS -DHAS_TLS"
AUXLIBS="$AUXLIBS -lssl -lcrypto"
%endif
%if "%{with_spf}" == "yes"
@@ -306,7 +293,7 @@
-e "s;^\\(mail_owner[^=]*=\\).*;\\1 %{l_musr};" \
$RPM_BUILD_ROOT%{l_prefix}/etc/postfix/main.cf
rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/postfix/*.orig
- rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/postfix/LICENSE
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/postfix/*LICENSE
mv $RPM_BUILD_ROOT%{l_prefix}/etc/postfix/postfix-script \
$RPM_BUILD_ROOT%{l_prefix}/sbin/postfix-script
rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/postfix/postfix-script*
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
