steffen: server/postfix Makefile, 1.11, 1.12 kolab.patch, 1.3, 1.4 postfix-ldap-leafonly.patch, 1.1, 1.2 postfix-pipe-allow-empty-sender.patch, 1.1, 1.2
cvs at intevation.de
cvs at intevation.de
Sat Jul 23 00:36:17 CEST 2005
Author: steffen
Update of /kolabrepository/server/postfix
In directory doto:/tmp/cvs-serv30112/postfix
Modified Files:
Makefile kolab.patch postfix-ldap-leafonly.patch
postfix-pipe-allow-empty-sender.patch
Log Message:
Upgrade to openpkg-2.4
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/postfix/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Makefile 31 May 2005 07:43:51 -0000 1.11
+++ Makefile 22 Jul 2005 22:36:14 -0000 1.12
@@ -1,5 +1,5 @@
ifeq "x$(KOLABPKGURI)" "x"
- KOLABPKGURI = ftp://ftp.openpkg.org/release/2.2/SRC
+ KOLABPKGURI = ftp://ftp.openpkg.org/release/2.4/UPD
endif
ifeq "x$(KOLABRPMSRC)" "x"
KOLABRPMSRC = /kolab/RPM/SRC
@@ -8,15 +8,14 @@
KOLABCVSDIR = $(CURDIR)
endif
-VERSION=2.1.5
-RELEASE=2.2.0
+VERSION=2.2.3
+RELEASE=2.4.1
RPM=/kolab/bin/openpkg rpm
all: postfix-$(VERSION)-$(RELEASE).src.rpm
$(RPM) -ihv postfix-$(VERSION)-$(RELEASE).src.rpm
- cp $(KOLABCVSDIR)/postfix-pipe.patch $(KOLABRPMSRC)/postfix/
cp $(KOLABCVSDIR)/postfix-ldap-leafonly.patch $(KOLABRPMSRC)/postfix/
cp $(KOLABCVSDIR)/postfix-pipe-allow-empty-sender.patch $(KOLABRPMSRC)/postfix/
cp $(KOLABCVSDIR)/kolab.patch $(KOLABRPMSRC)/postfix/ # Patch for postfix.spec
Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/postfix/kolab.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolab.patch 31 May 2005 07:43:51 -0000 1.3
+++ kolab.patch 22 Jul 2005 22:36:14 -0000 1.4
@@ -1,31 +1,30 @@
---- postfix.spec.orig 2005-05-31 03:13:30.000000000 +0200
-+++ postfix.spec 2005-05-31 03:15:30.000000000 +0200
-@@ -42,7 +42,7 @@ Class: BASE
+--- ../postfix.orig/postfix.spec 2005-07-11 16:51:25.000000000 +0200
++++ postfix.spec 2005-07-19 10:28:58.000000000 +0200
+@@ -38,7 +38,7 @@ Class: BASE
Group: Mail
License: IPL
Version: %{V_postfix}
--Release: 2.2.0
-+Release: 2.2.0_kolab3
+-Release: 2.4.1
++Release: 2.4.1_kolab
# package options
%option with_fsl yes
-@@ -67,6 +67,9 @@ Patch1: postfix.patch.pfls
+@@ -59,6 +59,8 @@ Source4: rc.postfix
+ Patch0: postfix.patch
+ Patch1: postfix.patch.pfls
Patch2: ftp://ftp.openpkg.org/sources/CPY/postfix/postfix-%{V_whoson}-whoson.patch
- Patch3: http://www.ipnet6.org/postfix/download/postfix-libspf2-%{V_spf}.patch
- Patch4: http://www.libsrs2.org/patch/postfix-libsrs2-%{V_srs}.patch
-+Patch5: postfix-pipe.patch
-+Patch6: postfix-ldap-leafonly.patch
-+Patch7: postfix-pipe-allow-empty-sender.patch
++Patch3: postfix-ldap-leafonly.patch
++Patch4: postfix-pipe-allow-empty-sender.patch
# build information
Prefix: %{l_prefix}
-@@ -195,6 +198,9 @@ Conflicts: exim, sendmail, ssmtp
+@@ -148,6 +150,9 @@ Conflicts: exim, sendmail, ssmtp
%if "%{with_whoson}" == "yes"
%patch -p0 -P 2
%endif
-+ %patch -p0 -P 5
-+ %patch -p0 -P 6
-+ %patch -p0 -P 7
++ %patch -p0 -P 3
++ %patch -p0 -P 4
++
%build
# configure Postfix (hard-core part I)
Index: postfix-ldap-leafonly.patch
===================================================================
RCS file: /kolabrepository/server/postfix/postfix-ldap-leafonly.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- postfix-ldap-leafonly.patch 19 May 2005 11:13:55 -0000 1.1
+++ postfix-ldap-leafonly.patch 22 Jul 2005 22:36:14 -0000 1.2
@@ -1,7 +1,7 @@
-diff -upr ../postfix-2.1.5.orig/src/global/dict_ldap.c ./src/global/dict_ldap.c
---- ../postfix-2.1.5.orig/src/global/dict_ldap.c 2004-01-04 19:43:18.000000000 +0100
-+++ ./src/global/dict_ldap.c 2005-05-19 11:31:39.000000000 +0200
-@@ -58,6 +58,10 @@
+diff -upr ../postfix-2.2.3.orig/src/global/dict_ldap.c ./src/global/dict_ldap.c
+--- ../postfix-2.2.3.orig/src/global/dict_ldap.c 2005-03-08 19:58:44.000000000 +0100
++++ ./src/global/dict_ldap.c 2005-07-19 02:46:30.000000000 +0200
+@@ -60,6 +60,10 @@
/* .IP special_result_attribute
/* The attribute(s) of directory entries that can contain DNs or URLs.
/* If found, a recursive subsequent search is done using their values.
@@ -12,15 +12,15 @@
/* .IP scope
/* LDAP search scope: sub, base, or one.
/* .IP bind
-@@ -223,6 +227,7 @@ typedef struct {
- char *result_filter;
+@@ -226,6 +230,7 @@ typedef struct {
+ char *search_base;
ARGV *result_attributes;
int num_attributes; /* rest of list is DN's. */
+ int exclude_internal;
int bind;
char *bind_dn;
char *bind_pw;
-@@ -719,6 +724,7 @@ static void dict_ldap_get_values(DICT_LD
+@@ -717,6 +722,7 @@ static void dict_ldap_get_values(DICT_LD
char *myname = "dict_ldap_get_values";
struct timeval tv;
LDAPURLDesc *url;
@@ -29,7 +29,7 @@
tv.tv_sec = dict_ldap->timeout;
tv.tv_usec = 0;
@@ -744,6 +750,27 @@ static void dict_ldap_get_values(DICT_LD
- recursion, dict_ldap->ldapsource, dict_ldap->size_limit);
+ dict_ldap->size_limit);
dict_errno = DICT_ERR_RETRY;
}
+
@@ -62,9 +62,9 @@
/* Ordinary result attribute */
+ if(is_leaf) {
for (i = 0; vals[i] != NULL; i++) {
- if (++expansion > dict_ldap->expansion_limit &&
- dict_ldap->expansion_limit) {
-@@ -815,6 +843,7 @@ static void dict_ldap_get_values(DICT_LD
+ if (db_common_expand(dict_ldap->ctx,
+ dict_ldap->result_format, vals[i],
+@@ -809,6 +837,7 @@ static void dict_ldap_get_values(DICT_LD
msg_info("%s[%d]: search returned %ld value(s) for"
" requested result attribute %s",
myname, recursion, i, attr);
@@ -72,7 +72,7 @@
} else if (recursion < dict_ldap->recursion_limit
&& dict_ldap->result_attributes->argv[i]) {
/* Special result attribute */
-@@ -1363,6 +1392,11 @@ DICT *dict_ldap_open(const char *ldaps
+@@ -1351,6 +1380,11 @@ DICT *dict_ldap_open(const char *ldaps
myfree(attr);
/*
@@ -84,4 +84,3 @@
* get configured value of "bind"; default to true
*/
dict_ldap->bind = cfg_get_bool(dict_ldap->parser, "bind", 1);
-Only in ./src/global: dict_ldap.c~
Index: postfix-pipe-allow-empty-sender.patch
===================================================================
RCS file: /kolabrepository/server/postfix/postfix-pipe-allow-empty-sender.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- postfix-pipe-allow-empty-sender.patch 31 May 2005 07:43:51 -0000 1.1
+++ postfix-pipe-allow-empty-sender.patch 22 Jul 2005 22:36:14 -0000 1.2
@@ -1,16 +1,16 @@
-diff -upr ../postfix-2.1.5.orig/src/pipe/pipe.c ./src/pipe/pipe.c
---- ../postfix-2.1.5.orig/src/pipe/pipe.c 2004-07-24 01:09:21.000000000 +0200
-+++ ./src/pipe/pipe.c 2005-05-31 04:30:55.000000000 +0200
-@@ -41,7 +41,7 @@
- /* .fi
- /* The external command attributes are given in the \fBmaster.cf\fR
- /* file at the end of a service definition. The syntax is as follows:
+diff -upr ../postfix-2.2.3.orig/src/pipe/pipe.c ./src/pipe/pipe.c
+--- ../postfix-2.2.3.orig/src/pipe/pipe.c 2005-02-05 05:21:23.000000000 +0100
++++ ./src/pipe/pipe.c 2005-07-19 02:49:43.000000000 +0200
+@@ -51,7 +51,7 @@
+ /* \fB\er\en\fR or \fB\en\fR. The usual C-style backslash escape
+ /* sequences are recognized: \fB\ea \eb \ef \en \er \et \ev
+ /* \e\fIddd\fR (up to three octal digits) and \fB\e\e\fR.
-/* .IP "\fBflags=BDFORhqu.>\fR (optional)"
+/* .IP "\fBflags=BDFORhnqu.>\fR (optional)"
/* Optional message processing flags. By default, a message is
/* copied unchanged.
/* .RS
-@@ -68,6 +68,9 @@
+@@ -82,6 +82,9 @@
/* Fold the command-line \fB$recipient\fR domain name and \fB$nexthop\fR
/* host name to lower case.
/* This is recommended for delivery via \fBUUCP\fR.
@@ -20,7 +20,7 @@
/* .IP \fBq\fR
/* Quote white space and other special characters in the command-line
/* \fB$sender\fR and \fB$recipient\fR address localparts (text to the
-@@ -349,6 +352,7 @@
+@@ -399,6 +402,7 @@
#define PIPE_OPT_FOLD_USER (1<<16)
#define PIPE_OPT_FOLD_HOST (1<<17)
#define PIPE_OPT_QUOTE_LOCAL (1<<18)
@@ -28,7 +28,7 @@
#define PIPE_OPT_FOLD_FLAGS (PIPE_OPT_FOLD_USER | PIPE_OPT_FOLD_HOST)
-@@ -660,6 +664,9 @@ static void get_service_attr(PIPE_ATTR *
+@@ -719,6 +723,9 @@ static void get_service_attr(PIPE_ATTR *
case 'h':
attr->flags |= PIPE_OPT_FOLD_HOST;
break;
@@ -38,7 +38,7 @@
case 'q':
attr->flags |= PIPE_OPT_QUOTE_LOCAL;
break;
-@@ -835,22 +842,6 @@ static int deliver_message(DELIVER_REQUE
+@@ -901,22 +908,6 @@ static int deliver_message(DELIVER_REQUE
msg_info("%s: from <%s>", myname, request->sender);
/*
@@ -61,7 +61,7 @@
* Sanity checks. The get_service_params() and get_service_attr()
* routines also do some sanity checks. Look up service attributes and
* config information only once. This is safe since the information comes
-@@ -866,6 +857,22 @@ static int deliver_message(DELIVER_REQUE
+@@ -932,6 +923,22 @@ static int deliver_message(DELIVER_REQUE
}
/*
@@ -84,4 +84,3 @@
* The D flag cannot be specified for multi-recipient deliveries.
*/
if ((attr.flags & MAIL_COPY_DELIVERED) && (rcpt_list->len > 1)) {
-Kun i ./src/pipe: pipe.c~
More information about the commits
mailing list