Accepting request 131303 from home:computersalat:devel:mail

update to 2.8.12

OBS-URL: https://build.opensuse.org/request/show/131303
OBS-URL: https://build.opensuse.org/package/show/server:mail/postfix?expand=0&rev=147
This commit is contained in:
Christian Wittmer 2012-08-21 15:29:38 +00:00 committed by Git OBS Bridge
parent 32985961ee
commit 423ba78ec2
14 changed files with 588 additions and 523 deletions

View File

@ -1,6 +1,7 @@
diff -ruN postfix-2.8.3//conf/dynamicmaps.cf postfix-2.8.3-dynamic_maps.patch//conf/dynamicmaps.cf
--- postfix-2.8.3//conf/dynamicmaps.cf 1970-01-01 01:00:00.000000000 +0100
+++ postfix-2.8.3-dynamic_maps.patch//conf/dynamicmaps.cf 2011-05-10 12:42:04.612116003 +0200
Index: conf/dynamicmaps.cf
===================================================================
--- /dev/null
+++ conf/dynamicmaps.cf
@@ -0,0 +1,7 @@
+# Postfix dynamic maps configuration file.
+#
@ -9,10 +10,11 @@ diff -ruN postfix-2.8.3//conf/dynamicmaps.cf postfix-2.8.3-dynamic_maps.patch//c
+#
+#type location of .so file open function (mkmap func)
+#==== ================================ ============= ============
diff -ruN postfix-2.8.3//conf/postfix-files postfix-2.8.3-dynamic_maps.patch//conf/postfix-files
--- postfix-2.8.3//conf/postfix-files 2010-12-29 22:40:32.000000000 +0100
+++ postfix-2.8.3-dynamic_maps.patch//conf/postfix-files 2011-05-10 12:42:04.613116003 +0200
@@ -65,6 +65,11 @@
Index: conf/postfix-files
===================================================================
--- conf/postfix-files.orig
+++ conf/postfix-files
@@ -65,6 +65,11 @@ $queue_directory/saved:d:$mail_owner:-:7
$queue_directory/trace:d:$mail_owner:-:700:ucr
$daemon_directory/anvil:f:root:-:755
$daemon_directory/bounce:f:root:-:755
@ -24,7 +26,7 @@ diff -ruN postfix-2.8.3//conf/postfix-files postfix-2.8.3-dynamic_maps.patch//co
$daemon_directory/cleanup:f:root:-:755
$daemon_directory/discard:f:root:-:755
$daemon_directory/dnsblog:f:root:-:755
@@ -97,6 +102,11 @@
@@ -97,6 +102,11 @@ $daemon_directory/tlsmgr:f:root:-:755
$daemon_directory/trivial-rewrite:f:root:-:755
$daemon_directory/verify:f:root:-:755
$daemon_directory/virtual:f:root:-:755
@ -36,7 +38,7 @@ diff -ruN postfix-2.8.3//conf/postfix-files postfix-2.8.3-dynamic_maps.patch//co
$daemon_directory/nqmgr:h:$daemon_directory/qmgr
$daemon_directory/lmtp:h:$daemon_directory/smtp
$command_directory/postalias:f:root:-:755
@@ -120,6 +130,7 @@
@@ -120,6 +130,7 @@ $config_directory/access:f:root:-:644:p1
$config_directory/aliases:f:root:-:644:p1
$config_directory/bounce.cf.default:f:root:-:644:1
$config_directory/canonical:f:root:-:644:p1
@ -44,10 +46,11 @@ diff -ruN postfix-2.8.3//conf/postfix-files postfix-2.8.3-dynamic_maps.patch//co
$config_directory/cidr_table:f:root:-:644:o
$config_directory/generic:f:root:-:644:p1
$config_directory/generics:f:root:-:644:o
diff -ruN postfix-2.8.3//src/dns/Makefile.in postfix-2.8.3-dynamic_maps.patch//src/dns/Makefile.in
--- postfix-2.8.3//src/dns/Makefile.in 2011-01-09 23:12:00.000000000 +0100
+++ postfix-2.8.3-dynamic_maps.patch//src/dns/Makefile.in 2011-05-10 12:42:04.620116003 +0200
@@ -14,7 +14,7 @@
Index: src/dns/Makefile.in
===================================================================
--- src/dns/Makefile.in.orig
+++ src/dns/Makefile.in
@@ -14,7 +14,7 @@ LIBS = ../../lib/libutil.a
LIB_DIR = ../../lib
INC_DIR = ../../include
@ -56,7 +59,7 @@ diff -ruN postfix-2.8.3//src/dns/Makefile.in postfix-2.8.3-dynamic_maps.patch//s
all: $(LIB)
@@ -31,12 +31,10 @@
@@ -31,12 +31,10 @@ tests: test dns_rr_to_pa_test dns_rr_to_
root_tests:
$(LIB): $(OBJS)
@ -70,73 +73,11 @@ diff -ruN postfix-2.8.3//src/dns/Makefile.in postfix-2.8.3-dynamic_maps.patch//s
update: $(LIB_DIR)/$(LIB) $(HDRS)
-for i in $(HDRS); \
diff -ruN postfix-2.8.3//src/global/mail_conf.c postfix-2.8.3-dynamic_maps.patch//src/global/mail_conf.c
--- postfix-2.8.3//src/global/mail_conf.c 2011-01-08 02:49:33.000000000 +0100
+++ postfix-2.8.3-dynamic_maps.patch//src/global/mail_conf.c 2011-05-10 12:42:04.621116003 +0200
@@ -190,6 +190,13 @@
path = concatenate(var_config_dir, "/", "main.cf", (char *) 0);
dict_load_file(CONFIG_DICT, path);
myfree(path);
+
+#ifndef NO_DYNAMIC_MAPS
+ path = concatenate(var_config_dir, "/", "dynamicmaps.cf", (char *) 0);
+ dict_open_dlinfo(path);
+ myfree(path);
+#endif
+
}
/* mail_conf_flush - discard configuration dictionary */
diff -ruN postfix-2.8.3//src/global/mail_dict.c postfix-2.8.3-dynamic_maps.patch//src/global/mail_dict.c
--- postfix-2.8.3//src/global/mail_dict.c 2010-06-17 22:48:34.000000000 +0200
+++ postfix-2.8.3-dynamic_maps.patch//src/global/mail_dict.c 2011-05-10 12:42:04.622116003 +0200
@@ -46,6 +46,7 @@
static const DICT_OPEN_INFO dict_open_info[] = {
DICT_TYPE_PROXY, dict_proxy_open,
+#ifndef MAX_DYNAMIC_MAPS
#ifdef HAS_LDAP
DICT_TYPE_LDAP, dict_ldap_open,
#endif
@@ -58,6 +59,7 @@
#ifdef HAS_SQLITE
DICT_TYPE_SQLITE, dict_sqlite_open,
#endif
+#endif /* MAX_DYNAMIC_MAPS */
0,
};
diff -ruN postfix-2.8.3//src/global/mail_params.c postfix-2.8.3-dynamic_maps.patch//src/global/mail_params.c
--- postfix-2.8.3//src/global/mail_params.c 2010-12-06 00:02:15.000000000 +0100
+++ postfix-2.8.3-dynamic_maps.patch//src/global/mail_params.c 2011-05-10 12:42:04.623116003 +0200
@@ -79,6 +79,7 @@
/* char *var_export_environ;
/* char *var_debug_peer_list;
/* int var_debug_peer_level;
+/* int var_command_maxtime;
/* int var_in_flow_delay;
/* int var_fault_inj_code;
/* char *var_bounce_service;
@@ -265,6 +266,7 @@
char *var_export_environ;
char *var_debug_peer_list;
int var_debug_peer_level;
+int var_command_maxtime;
int var_fault_inj_code;
char *var_bounce_service;
char *var_cleanup_service;
@@ -276,6 +278,7 @@
char *var_error_service;
char *var_flush_service;
char *var_verify_service;
+char *var_scache_service;
char *var_trace_service;
char *var_proxymap_service;
char *var_proxywrite_service;
diff -ruN postfix-2.8.3//src/global/Makefile.in postfix-2.8.3-dynamic_maps.patch//src/global/Makefile.in
--- postfix-2.8.3//src/global/Makefile.in 2011-01-10 21:28:32.000000000 +0100
+++ postfix-2.8.3-dynamic_maps.patch//src/global/Makefile.in 2011-05-10 12:42:04.624116003 +0200
@@ -3,7 +3,7 @@
Index: src/global/Makefile.in
===================================================================
--- src/global/Makefile.in.orig
+++ src/global/Makefile.in
@@ -3,7 +3,7 @@ SRCS = abounce.c anvil_clnt.c been_here.
canon_addr.c cfg_parser.c cleanup_strerror.c cleanup_strflags.c \
clnt_stream.c conv_time.c db_common.c debug_peer.c debug_process.c \
defer.c deliver_completed.c deliver_flock.c deliver_pass.c \
@ -145,7 +86,7 @@ diff -ruN postfix-2.8.3//src/global/Makefile.in postfix-2.8.3-dynamic_maps.patch
dict_proxy.c dict_sqlite.c domain_list.c dot_lockfile.c dot_lockfile_as.c \
dsb_scan.c dsn.c dsn_buf.c dsn_mask.c dsn_print.c dsn_util.c \
ehlo_mask.c ext_prop.c file_id.c flush_clnt.c header_opts.c \
@@ -35,7 +35,7 @@
@@ -35,7 +35,7 @@ OBJS = abounce.o anvil_clnt.o been_here.
canon_addr.o cfg_parser.o cleanup_strerror.o cleanup_strflags.o \
clnt_stream.o conv_time.o db_common.o debug_peer.o debug_process.o \
defer.o deliver_completed.o deliver_flock.o deliver_pass.o \
@ -154,7 +95,7 @@ diff -ruN postfix-2.8.3//src/global/Makefile.in postfix-2.8.3-dynamic_maps.patch
dict_proxy.o dict_sqlite.o domain_list.o dot_lockfile.o dot_lockfile_as.o \
dsb_scan.o dsn.o dsn_buf.o dsn_mask.o dsn_print.o dsn_util.o \
ehlo_mask.o ext_prop.o file_id.o flush_clnt.o header_opts.o \
@@ -106,10 +106,13 @@
@@ -106,10 +106,13 @@ LIBS = ../../lib/libutil.a
LIB_DIR = ../../lib
INC_DIR = ../../include
MAKES =
@ -170,7 +111,7 @@ diff -ruN postfix-2.8.3//src/global/Makefile.in postfix-2.8.3-dynamic_maps.patch
$(OBJS): ../../conf/makedefs.out
@@ -119,14 +122,30 @@
@@ -119,14 +122,30 @@ Makefile: Makefile.in
test: $(TESTPROG)
$(LIB): $(OBJS)
@ -205,7 +146,7 @@ diff -ruN postfix-2.8.3//src/global/Makefile.in postfix-2.8.3-dynamic_maps.patch
-for i in $(HDRS); \
do \
cmp -s $$i $(INC_DIR)/$$i 2>/dev/null || cp $$i $(INC_DIR); \
@@ -497,7 +516,7 @@
@@ -497,7 +516,7 @@ lint:
lint $(DEFS) $(SRCS) $(LINTFIX)
clean:
@ -214,9 +155,76 @@ diff -ruN postfix-2.8.3//src/global/Makefile.in postfix-2.8.3-dynamic_maps.patch
rm -rf printfck
tidy: clean
diff -ruN postfix-2.8.3//src/global/mkmap_open.c postfix-2.8.3-dynamic_maps.patch//src/global/mkmap_open.c
--- postfix-2.8.3//src/global/mkmap_open.c 2008-01-08 23:08:45.000000000 +0100
+++ postfix-2.8.3-dynamic_maps.patch//src/global/mkmap_open.c 2011-05-10 12:42:04.625116003 +0200
Index: src/global/mail_conf.c
===================================================================
--- src/global/mail_conf.c.orig
+++ src/global/mail_conf.c
@@ -190,6 +190,13 @@ void mail_conf_suck(void)
path = concatenate(var_config_dir, "/", "main.cf", (char *) 0);
dict_load_file(CONFIG_DICT, path);
myfree(path);
+
+#ifndef NO_DYNAMIC_MAPS
+ path = concatenate(var_config_dir, "/", "dynamicmaps.cf", (char *) 0);
+ dict_open_dlinfo(path);
+ myfree(path);
+#endif
+
}
/* mail_conf_flush - discard configuration dictionary */
Index: src/global/mail_dict.c
===================================================================
--- src/global/mail_dict.c.orig
+++ src/global/mail_dict.c
@@ -46,6 +46,7 @@ typedef struct {
static const DICT_OPEN_INFO dict_open_info[] = {
DICT_TYPE_PROXY, dict_proxy_open,
+#ifndef MAX_DYNAMIC_MAPS
#ifdef HAS_LDAP
DICT_TYPE_LDAP, dict_ldap_open,
#endif
@@ -58,6 +59,7 @@ static const DICT_OPEN_INFO dict_open_in
#ifdef HAS_SQLITE
DICT_TYPE_SQLITE, dict_sqlite_open,
#endif
+#endif /* MAX_DYNAMIC_MAPS */
0,
};
Index: src/global/mail_params.c
===================================================================
--- src/global/mail_params.c.orig
+++ src/global/mail_params.c
@@ -79,6 +79,7 @@
/* char *var_export_environ;
/* char *var_debug_peer_list;
/* int var_debug_peer_level;
+/* int var_command_maxtime;
/* int var_in_flow_delay;
/* int var_fault_inj_code;
/* char *var_bounce_service;
@@ -265,6 +266,7 @@ char *var_import_environ;
char *var_export_environ;
char *var_debug_peer_list;
int var_debug_peer_level;
+int var_command_maxtime;
int var_fault_inj_code;
char *var_bounce_service;
char *var_cleanup_service;
@@ -276,6 +278,7 @@ char *var_showq_service;
char *var_error_service;
char *var_flush_service;
char *var_verify_service;
+char *var_scache_service;
char *var_trace_service;
char *var_proxymap_service;
char *var_proxywrite_service;
Index: src/global/mkmap_open.c
===================================================================
--- src/global/mkmap_open.c.orig
+++ src/global/mkmap_open.c
@@ -81,7 +81,7 @@
* We use a different table (in dict_open.c) when querying maps.
*/
@ -226,7 +234,7 @@ diff -ruN postfix-2.8.3//src/global/mkmap_open.c postfix-2.8.3-dynamic_maps.patc
MKMAP *(*before_open) (const char *);
} MKMAP_OPEN_INFO;
@@ -156,7 +156,16 @@
@@ -156,7 +156,16 @@ MKMAP *mkmap_open(const char *type, con
*/
for (mp = mkmap_types; /* void */ ; mp++) {
if (mp->type == 0)
@ -243,10 +251,11 @@ diff -ruN postfix-2.8.3//src/global/mkmap_open.c postfix-2.8.3-dynamic_maps.patc
if (strcmp(type, mp->type) == 0)
break;
}
diff -ruN postfix-2.8.3//src/master/Makefile.in postfix-2.8.3-dynamic_maps.patch//src/master/Makefile.in
--- postfix-2.8.3//src/master/Makefile.in 2011-01-09 23:12:02.000000000 +0100
+++ postfix-2.8.3-dynamic_maps.patch//src/master/Makefile.in 2011-05-10 12:42:04.626116003 +0200
@@ -20,7 +20,7 @@
Index: src/master/Makefile.in
===================================================================
--- src/master/Makefile.in.orig
+++ src/master/Makefile.in
@@ -20,7 +20,7 @@ LIB_DIR = ../../lib
INC_DIR = ../../include
BIN_DIR = ../../libexec
@ -255,7 +264,7 @@ diff -ruN postfix-2.8.3//src/master/Makefile.in postfix-2.8.3-dynamic_maps.patch
all: $(PROG) $(LIB)
@@ -39,12 +39,10 @@
@@ -39,12 +39,10 @@ tests:
root_tests:
$(LIB): $(LIB_OBJ)
@ -269,10 +278,11 @@ diff -ruN postfix-2.8.3//src/master/Makefile.in postfix-2.8.3-dynamic_maps.patch
$(BIN_DIR)/$(PROG): $(PROG)
cp $(PROG) $(BIN_DIR)
diff -ruN postfix-2.8.3//src/milter/Makefile.in postfix-2.8.3-dynamic_maps.patch//src/milter/Makefile.in
--- postfix-2.8.3//src/milter/Makefile.in 2011-01-09 23:12:02.000000000 +0100
+++ postfix-2.8.3-dynamic_maps.patch//src/milter/Makefile.in 2011-05-10 12:42:04.626116003 +0200
@@ -14,7 +14,7 @@
Index: src/milter/Makefile.in
===================================================================
--- src/milter/Makefile.in.orig
+++ src/milter/Makefile.in
@@ -14,7 +14,7 @@ LIB_DIR = ../../lib
INC_DIR = ../../include
MAKES =
@ -281,7 +291,7 @@ diff -ruN postfix-2.8.3//src/milter/Makefile.in postfix-2.8.3-dynamic_maps.patch
all: $(LIB)
@@ -30,12 +30,10 @@
@@ -30,12 +30,10 @@ tests:
root_tests:
$(LIB): $(OBJS)
@ -295,10 +305,11 @@ diff -ruN postfix-2.8.3//src/milter/Makefile.in postfix-2.8.3-dynamic_maps.patch
update: $(LIB_DIR)/$(LIB) $(HDRS)
-for i in $(HDRS); \
diff -ruN postfix-2.8.3//src/postconf/postconf.c postfix-2.8.3-dynamic_maps.patch//src/postconf/postconf.c
--- postfix-2.8.3//src/postconf/postconf.c 2011-03-29 01:00:58.000000000 +0200
+++ postfix-2.8.3-dynamic_maps.patch//src/postconf/postconf.c 2011-05-10 12:42:04.627116003 +0200
@@ -1013,6 +1013,16 @@
Index: src/postconf/postconf.c
===================================================================
--- src/postconf/postconf.c.orig
+++ src/postconf/postconf.c
@@ -1013,6 +1013,16 @@ static void show_maps(void)
{
ARGV *maps_argv;
int i;
@ -315,9 +326,10 @@ diff -ruN postfix-2.8.3//src/postconf/postconf.c postfix-2.8.3-dynamic_maps.patc
maps_argv = dict_mapnames();
for (i = 0; i < maps_argv->argc; i++)
diff -ruN postfix-2.8.3//src/postmap/postmap.c postfix-2.8.3-dynamic_maps.patch//src/postmap/postmap.c
--- postfix-2.8.3//src/postmap/postmap.c 2009-04-17 22:04:00.000000000 +0200
+++ postfix-2.8.3-dynamic_maps.patch//src/postmap/postmap.c 2011-05-10 12:42:04.629116003 +0200
Index: src/postmap/postmap.c
===================================================================
--- src/postmap/postmap.c.orig
+++ src/postmap/postmap.c
@@ -5,7 +5,7 @@
/* Postfix lookup table management
/* SYNOPSIS
@ -336,7 +348,7 @@ diff -ruN postfix-2.8.3//src/postmap/postmap.c postfix-2.8.3-dynamic_maps.patch/
/* .IP \fB-v\fR
/* Enable verbose logging for debugging purposes. Multiple \fB-v\fR
/* options make the software increasingly verbose.
@@ -723,6 +725,18 @@
@@ -723,6 +725,18 @@ static void postmap_seq(const char *map_
dict_close(dict);
}
@ -355,7 +367,7 @@ diff -ruN postfix-2.8.3//src/postmap/postmap.c postfix-2.8.3-dynamic_maps.patch/
/* usage - explain */
static NORETURN usage(char *myname)
@@ -743,6 +757,7 @@
@@ -743,6 +757,7 @@ int main(int argc, char **argv)
int postmap_flags = POSTMAP_FLAG_AS_OWNER | POSTMAP_FLAG_SAVE_PERM;
int open_flags = O_RDWR | O_CREAT | O_TRUNC;
int dict_flags = DICT_FLAG_DUP_WARN | DICT_FLAG_FOLD_FIX;
@ -363,7 +375,7 @@ diff -ruN postfix-2.8.3//src/postmap/postmap.c postfix-2.8.3-dynamic_maps.patch/
char *query = 0;
char *delkey = 0;
int sequence = 0;
@@ -787,7 +802,7 @@
@@ -787,7 +802,7 @@ int main(int argc, char **argv)
/*
* Parse JCL.
*/
@ -372,7 +384,7 @@ diff -ruN postfix-2.8.3//src/postmap/postmap.c postfix-2.8.3-dynamic_maps.patch/
switch (ch) {
default:
usage(argv[0]);
@@ -804,8 +819,8 @@
@@ -804,8 +819,8 @@ int main(int argc, char **argv)
msg_fatal("out of memory");
break;
case 'd':
@ -383,7 +395,7 @@ diff -ruN postfix-2.8.3//src/postmap/postmap.c postfix-2.8.3-dynamic_maps.patch/
delkey = optarg;
break;
case 'f':
@@ -831,8 +846,8 @@
@@ -831,8 +846,8 @@ int main(int argc, char **argv)
postmap_flags &= ~POSTMAP_FLAG_SAVE_PERM;
break;
case 'q':
@ -394,7 +406,7 @@ diff -ruN postfix-2.8.3//src/postmap/postmap.c postfix-2.8.3-dynamic_maps.patch/
query = optarg;
break;
case 'r':
@@ -840,10 +855,15 @@
@@ -840,10 +855,15 @@ int main(int argc, char **argv)
dict_flags |= DICT_FLAG_DUP_REPLACE;
break;
case 's':
@ -412,7 +424,7 @@ diff -ruN postfix-2.8.3//src/postmap/postmap.c postfix-2.8.3-dynamic_maps.patch/
case 'v':
msg_verbose++;
break;
@@ -914,6 +934,21 @@
@@ -914,6 +934,21 @@ int main(int argc, char **argv)
exit(0);
}
exit(1);
@ -434,10 +446,11 @@ diff -ruN postfix-2.8.3//src/postmap/postmap.c postfix-2.8.3-dynamic_maps.patch/
} else { /* create/update map(s) */
if (optind + 1 > argc)
usage(argv[0]);
diff -ruN postfix-2.8.3//src/tls/Makefile.in postfix-2.8.3-dynamic_maps.patch//src/tls/Makefile.in
--- postfix-2.8.3//src/tls/Makefile.in 2011-01-16 00:09:55.000000000 +0100
+++ postfix-2.8.3-dynamic_maps.patch//src/tls/Makefile.in 2011-05-10 12:42:04.630116003 +0200
@@ -24,7 +24,7 @@
Index: src/tls/Makefile.in
===================================================================
--- src/tls/Makefile.in.orig
+++ src/tls/Makefile.in
@@ -24,7 +24,7 @@ LIB_DIR = ../../lib
INC_DIR = ../../include
MAKES =
@ -446,7 +459,7 @@ diff -ruN postfix-2.8.3//src/tls/Makefile.in postfix-2.8.3-dynamic_maps.patch//s
all: $(LIB)
@@ -40,12 +40,10 @@
@@ -40,12 +40,10 @@ tests:
root_tests:
$(LIB): $(OBJS)
@ -460,9 +473,10 @@ diff -ruN postfix-2.8.3//src/tls/Makefile.in postfix-2.8.3-dynamic_maps.patch//s
update: $(LIB_DIR)/$(LIB) $(HDRS)
-for i in $(HDRS); \
diff -ruN postfix-2.8.3//src/tls/tls_client.c postfix-2.8.3-dynamic_maps.patch//src/tls/tls_client.c
--- postfix-2.8.3//src/tls/tls_client.c 2010-12-31 00:02:03.000000000 +0100
+++ postfix-2.8.3-dynamic_maps.patch//src/tls/tls_client.c 2011-05-10 12:42:04.630116003 +0200
Index: src/tls/tls_client.c
===================================================================
--- src/tls/tls_client.c.orig
+++ src/tls/tls_client.c
@@ -156,6 +156,8 @@
#define STR vstring_str
#define LEN VSTRING_LEN
@ -472,9 +486,10 @@ diff -ruN postfix-2.8.3//src/tls/tls_client.c postfix-2.8.3-dynamic_maps.patch//
/* load_clnt_session - load session from client cache (non-callback) */
static SSL_SESSION *load_clnt_session(TLS_SESS_STATE *TLScontext)
diff -ruN postfix-2.8.3//src/tls/tls_server.c postfix-2.8.3-dynamic_maps.patch//src/tls/tls_server.c
--- postfix-2.8.3//src/tls/tls_server.c 2011-02-07 16:38:33.000000000 +0100
+++ postfix-2.8.3-dynamic_maps.patch//src/tls/tls_server.c 2011-05-10 12:42:04.631116003 +0200
Index: src/tls/tls_server.c
===================================================================
--- src/tls/tls_server.c.orig
+++ src/tls/tls_server.c
@@ -155,6 +155,8 @@
#define STR(x) vstring_str(x)
#define LEN(x) VSTRING_LEN(x)
@ -484,10 +499,141 @@ diff -ruN postfix-2.8.3//src/tls/tls_server.c postfix-2.8.3-dynamic_maps.patch//
/* Application-specific. */
/*
diff -ruN postfix-2.8.3//src/util/dict_db.c postfix-2.8.3-dynamic_maps.patch//src/util/dict_db.c
--- postfix-2.8.3//src/util/dict_db.c 2010-09-04 20:48:52.000000000 +0200
+++ postfix-2.8.3-dynamic_maps.patch//src/util/dict_db.c 2011-05-10 12:42:04.632116003 +0200
@@ -676,6 +676,12 @@
Index: src/util/Makefile.in
===================================================================
--- src/util/Makefile.in.orig
+++ src/util/Makefile.in
@@ -33,15 +33,16 @@ SRCS = alldig.c allprint.c argv.c argv_s
allascii.c load_file.c killme_after.c vstream_tweak.c \
unix_pass_listen.c unix_pass_trigger.c edit_file.c inet_windowsize.c \
unix_pass_fd_fix.c dict_cache.c valid_utf_8.c dict_thash.c \
- ip_match.c nbbio.c stream_pass_connect.c
+ ip_match.c nbbio.c stream_pass_connect.c \
+ load_lib.c sdbm.c
OBJS = alldig.o allprint.o argv.o argv_split.o attr_clnt.o attr_print0.o \
attr_print64.o attr_print_plain.o attr_scan0.o attr_scan64.o \
attr_scan_plain.o auto_clnt.o base64_code.o basename.o binhash.o \
chroot_uid.o cidr_match.o clean_env.o close_on_exec.o concatenate.o \
ctable.o dict.o dict_alloc.o dict_cdb.o dict_cidr.o dict_db.o \
dict_dbm.o dict_debug.o dict_env.o dict_ht.o dict_ni.o dict_nis.o \
- dict_nisplus.o dict_open.o dict_pcre.o dict_regexp.o dict_sdbm.o \
- dict_static.o dict_tcp.o dict_unix.o dir_forest.o doze.o dummy_read.o \
+ dict_nisplus.o dict_open.o dict_regexp.o dict_sdbm.o \
+ dict_static.o dict_unix.o dir_forest.o doze.o dummy_read.o \
dummy_write.o duplex_pipe.o environ.o events.o exec_command.o \
fifo_listen.o fifo_trigger.o file_limit.o find_inet.o fsspace.o \
fullname.o get_domainname.o get_hostname.o hex_code.o hex_quote.o \
@@ -68,7 +69,8 @@ OBJS = alldig.o allprint.o argv.o argv_s
allascii.o load_file.o killme_after.o vstream_tweak.o \
unix_pass_listen.o unix_pass_trigger.o edit_file.o inet_windowsize.o \
unix_pass_fd_fix.o dict_cache.o valid_utf_8.o dict_thash.o \
- ip_match.o nbbio.o stream_pass_connect.o
+ ip_match.o nbbio.o stream_pass_connect.o \
+ load_lib.o sdbm.o
HDRS = argv.h attr.h attr_clnt.h auto_clnt.h base64_code.h binhash.h \
chroot_uid.h cidr_match.h clean_env.h connect.h ctable.h dict.h \
dict_cdb.h dict_cidr.h dict_db.h dict_dbm.h dict_env.h dict_ht.h \
@@ -82,7 +84,7 @@ HDRS = argv.h attr.h attr_clnt.h auto_cl
msg_output.h msg_syslog.h msg_vstream.h mvect.h myaddrinfo.h myflock.h \
mymalloc.h myrand.h name_code.h name_mask.h netstring.h nvtable.h \
open_as.h open_lock.h percentm.h posix_signals.h readlline.h ring.h \
- safe.h safe_open.h sane_accept.h sane_connect.h sane_fsops.h \
+ safe.h safe_open.h sane_accept.h sane_connect.h sane_fsops.h sdbm.h load_lib.h \
sane_socketpair.h sane_time.h scan_dir.h set_eugid.h set_ugid.h \
sigdelay.h sock_addr.h spawn_command.h split_at.h stat_as.h \
stringops.h sys_defs.h timed_connect.h timed_wait.h trigger.h \
@@ -96,6 +98,8 @@ DEFS = -I. -D$(SYSTYPE)
CFLAGS = $(DEBUG) $(OPT) $(DEFS)
FILES = Makefile $(SRCS) $(HDRS)
INCL =
+PCRESO = dict_pcre.so
+TCPSO = dict_tcp.so
LIB = libutil.a
TESTPROG= dict_open dup2_pass_on_exec events exec_command fifo_open \
fifo_rdonly_bug fifo_rdwr_bug fifo_trigger fsspace fullname \
@@ -111,10 +115,11 @@ TESTPROG= dict_open dup2_pass_on_exec ev
LIB_DIR = ../../lib
INC_DIR = ../../include
+LIBS = $(LIB_DIR)/$(LIB) $(LIB_DIR)/$(PCRESO) $(LIB_DIR)/$(TCPSO)
-.c.o:; $(CC) $(CFLAGS) -c $*.c
+.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c
-all: $(LIB)
+all: $(LIB) $(PCRESO) $(TCPSO)
$(OBJS): ../../conf/makedefs.out
@@ -123,15 +128,25 @@ Makefile: Makefile.in
test: $(TESTPROG)
+$(PCRESO): dict_pcre.o
+ gcc -shared -Wl,-soname,dict_pcre.so -o $@ $? -lpcre -L. -lutil
+
+$(TCPSO): dict_tcp.o
+ gcc -shared -Wl,-soname,dict_tcp.so -o $@ $? -L. -lutil
+
$(LIB): $(OBJS)
- $(AR) $(ARFL) $(LIB) $?
- $(RANLIB) $(LIB)
+ gcc -shared -Wl,-soname,libpostfix-util.so.1 -o $(LIB) $(OBJS) -ldl $(SYSLIBS)
$(LIB_DIR)/$(LIB): $(LIB)
cp $(LIB) $(LIB_DIR)
- $(RANLIB) $(LIB_DIR)/$(LIB)
-update: $(LIB_DIR)/$(LIB) $(HDRS)
+$(LIB_DIR)/$(PCRESO): $(PCRESO)
+ cp $(PCRESO) $(LIB_DIR)
+
+$(LIB_DIR)/$(TCPSO): $(TCPSO)
+ cp $(TCPSO) $(LIB_DIR)
+
+update: $(LIBS) $(HDRS)
-for i in $(HDRS); \
do \
cmp -s $$i $(INC_DIR)/$$i 2>/dev/null || cp $$i $(INC_DIR); \
@@ -153,7 +168,8 @@ lint:
lint $(DEFS) $(SRCS) $(LINTFIX)
clean:
- rm -f *.o $(LIB) *core $(TESTPROG) junk $(MAKES) *.tmp
+ rm -f *.o $(LIB) $(PCRESO) $(TCPSO) *core $(TESTPROG) \
+ junk $(MAKES) *.tmp
rm -rf printfck
tidy: clean
Index: src/util/dict.h
===================================================================
--- src/util/dict.h.orig
+++ src/util/dict.h
@@ -66,6 +66,7 @@ extern DICT *dict_debug(DICT *);
#define DICT_FLAG_NO_UNAUTH (1<<13) /* disallow unauthenticated data */
#define DICT_FLAG_FOLD_FIX (1<<14) /* case-fold key with fixed-case map */
#define DICT_FLAG_FOLD_MUL (1<<15) /* case-fold key with multi-case map */
+#define DICT_FLAG_UPGRADE (1<<30) /* Upgrade the db */
#define DICT_FLAG_FOLD_ANY (DICT_FLAG_FOLD_FIX | DICT_FLAG_FOLD_MUL)
#define DICT_FLAG_OPEN_LOCK (1<<16) /* open file with exclusive lock */
@@ -139,6 +140,11 @@ extern const char *dict_eval(const char
extern DICT *dict_open(const char *, int, int);
extern DICT *dict_open3(const char *, const char *, int, int);
extern void dict_open_register(const char *, DICT *(*) (const char *, int, int));
+#ifndef NO_DYNAMIC_MAPS
+extern void dict_open_dlinfo(const char *path);
+typedef void* (*dict_mkmap_func_t)(const char *);
+dict_mkmap_func_t dict_mkmap_func(const char *dict_type);
+#endif
#define dict_get(dp, key) ((const char *) (dp)->lookup((dp), (key)))
#define dict_put(dp, key, val) (dp)->update((dp), (key), (val))
Index: src/util/dict_db.c
===================================================================
--- src/util/dict_db.c.orig
+++ src/util/dict_db.c
@@ -676,6 +676,12 @@ static DICT *dict_db_open(const char *cl
msg_fatal("set DB cache size %d: %m", dict_db_cache_size);
if (type == DB_HASH && db->set_h_nelem(db, DICT_DB_NELM) != 0)
msg_fatal("set DB hash element count %d: %m", DICT_DB_NELM);
@ -500,10 +646,11 @@ diff -ruN postfix-2.8.3//src/util/dict_db.c postfix-2.8.3-dynamic_maps.patch//sr
#if DB_VERSION_MAJOR == 5 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0)
if ((errno = db->open(db, 0, db_path, 0, type, db_flags, 0644)) != 0)
msg_fatal("open database %s: %m", db_path);
diff -ruN postfix-2.8.3//src/util/dict_dbm.c postfix-2.8.3-dynamic_maps.patch//src/util/dict_dbm.c
--- postfix-2.8.3//src/util/dict_dbm.c 2009-12-24 23:53:04.000000000 +0100
+++ postfix-2.8.3-dynamic_maps.patch//src/util/dict_dbm.c 2011-05-10 12:42:04.633116003 +0200
@@ -409,6 +409,10 @@
Index: src/util/dict_dbm.c
===================================================================
--- src/util/dict_dbm.c.orig
+++ src/util/dict_dbm.c
@@ -409,6 +409,10 @@ DICT *dict_dbm_open(const char *path,
char *dbm_path;
int lock_fd;
@ -514,32 +661,10 @@ diff -ruN postfix-2.8.3//src/util/dict_dbm.c postfix-2.8.3-dynamic_maps.patch//s
/*
* Note: DICT_FLAG_LOCK is used only by programs that do fine-grained (in
* the time domain) locking while accessing individual database records.
diff -ruN postfix-2.8.3//src/util/dict.h postfix-2.8.3-dynamic_maps.patch//src/util/dict.h
--- postfix-2.8.3//src/util/dict.h 2011-04-15 18:47:44.000000000 +0200
+++ postfix-2.8.3-dynamic_maps.patch//src/util/dict.h 2011-05-10 12:42:04.634116003 +0200
@@ -66,6 +66,7 @@
#define DICT_FLAG_NO_UNAUTH (1<<13) /* disallow unauthenticated data */
#define DICT_FLAG_FOLD_FIX (1<<14) /* case-fold key with fixed-case map */
#define DICT_FLAG_FOLD_MUL (1<<15) /* case-fold key with multi-case map */
+#define DICT_FLAG_UPGRADE (1<<30) /* Upgrade the db */
#define DICT_FLAG_FOLD_ANY (DICT_FLAG_FOLD_FIX | DICT_FLAG_FOLD_MUL)
#define DICT_FLAG_OPEN_LOCK (1<<16) /* open file with exclusive lock */
@@ -139,6 +140,11 @@
extern DICT *dict_open(const char *, int, int);
extern DICT *dict_open3(const char *, const char *, int, int);
extern void dict_open_register(const char *, DICT *(*) (const char *, int, int));
+#ifndef NO_DYNAMIC_MAPS
+extern void dict_open_dlinfo(const char *path);
+typedef void* (*dict_mkmap_func_t)(const char *);
+dict_mkmap_func_t dict_mkmap_func(const char *dict_type);
+#endif
#define dict_get(dp, key) ((const char *) (dp)->lookup((dp), (key)))
#define dict_put(dp, key, val) (dp)->update((dp), (key), (val))
diff -ruN postfix-2.8.3//src/util/dict_open.c postfix-2.8.3-dynamic_maps.patch//src/util/dict_open.c
--- postfix-2.8.3//src/util/dict_open.c 2011-04-11 19:37:49.000000000 +0200
+++ postfix-2.8.3-dynamic_maps.patch//src/util/dict_open.c 2011-05-10 12:42:04.635116003 +0200
Index: src/util/dict_open.c
===================================================================
--- src/util/dict_open.c.orig
+++ src/util/dict_open.c
@@ -44,6 +44,8 @@
/* DICT *(*open) (const char *, int, int);
/*
@ -597,7 +722,7 @@ diff -ruN postfix-2.8.3//src/util/dict_open.c postfix-2.8.3-dynamic_maps.patch//
/*
* lookup table for available map types.
*/
@@ -231,7 +260,9 @@
@@ -231,7 +260,9 @@ static const DICT_OPEN_INFO dict_open_in
DICT_TYPE_ENVIRON, dict_env_open,
DICT_TYPE_HT, dict_ht_open,
DICT_TYPE_UNIX, dict_unix_open,
@ -607,7 +732,7 @@ diff -ruN postfix-2.8.3//src/util/dict_open.c postfix-2.8.3-dynamic_maps.patch//
#ifdef HAS_SDBM
DICT_TYPE_SDBM, dict_sdbm_open,
#endif
@@ -251,9 +282,11 @@
@@ -251,9 +282,11 @@ static const DICT_OPEN_INFO dict_open_in
#ifdef HAS_NETINFO
DICT_TYPE_NETINFO, dict_ni_open,
#endif
@ -619,7 +744,7 @@ diff -ruN postfix-2.8.3//src/util/dict_open.c postfix-2.8.3-dynamic_maps.patch//
#ifdef HAS_POSIX_REGEXP
DICT_TYPE_REGEXP, dict_regexp_open,
#endif
@@ -312,8 +345,31 @@
@@ -312,8 +345,31 @@ DICT *dict_open3(const char *dict_type
dict_type, dict_name);
if (dict_open_hash == 0)
dict_open_init();
@ -653,7 +778,7 @@ diff -ruN postfix-2.8.3//src/util/dict_open.c postfix-2.8.3-dynamic_maps.patch//
if ((dict = dp->open(dict_name, open_flags, dict_flags)) == 0)
msg_fatal("opening %s:%s %m", dict_type, dict_name);
if (msg_verbose)
@@ -331,6 +387,36 @@
@@ -331,6 +387,36 @@ DICT *dict_open3(const char *dict_type
return (dict);
}
@ -690,7 +815,7 @@ diff -ruN postfix-2.8.3//src/util/dict_open.c postfix-2.8.3-dynamic_maps.patch//
/* dict_open_register - register dictionary type */
void dict_open_register(const char *type,
@@ -364,6 +450,9 @@
@@ -364,6 +450,9 @@ ARGV *dict_mapnames()
HTABLE_INFO **ht;
DICT_OPEN_INFO *dp;
ARGV *mapnames;
@ -700,7 +825,7 @@ diff -ruN postfix-2.8.3//src/util/dict_open.c postfix-2.8.3-dynamic_maps.patch//
if (dict_open_hash == 0)
dict_open_init();
@@ -372,6 +461,13 @@
@@ -372,6 +461,13 @@ ARGV *dict_mapnames()
dp = (DICT_OPEN_INFO *) ht[0]->value;
argv_add(mapnames, dp->type, ARGV_END);
}
@ -714,7 +839,7 @@ diff -ruN postfix-2.8.3//src/util/dict_open.c postfix-2.8.3-dynamic_maps.patch//
qsort((void *) mapnames->argv, mapnames->argc, sizeof(mapnames->argv[0]),
dict_sort_alpha_cpp);
myfree((char *) ht_info);
@@ -379,6 +475,87 @@
@@ -379,6 +475,87 @@ ARGV *dict_mapnames()
return mapnames;
}
@ -802,9 +927,10 @@ diff -ruN postfix-2.8.3//src/util/dict_open.c postfix-2.8.3-dynamic_maps.patch//
#ifdef TEST
/*
diff -ruN postfix-2.8.3//src/util/load_lib.c postfix-2.8.3-dynamic_maps.patch//src/util/load_lib.c
--- postfix-2.8.3//src/util/load_lib.c 1970-01-01 01:00:00.000000000 +0100
+++ postfix-2.8.3-dynamic_maps.patch//src/util/load_lib.c 2011-05-10 12:42:04.635116003 +0200
Index: src/util/load_lib.c
===================================================================
--- /dev/null
+++ src/util/load_lib.c
@@ -0,0 +1,135 @@
+/*++
+/* NAME
@ -941,9 +1067,10 @@ diff -ruN postfix-2.8.3//src/util/load_lib.c postfix-2.8.3-dynamic_maps.patch//s
+#endif
+ return 0;
+}
diff -ruN postfix-2.8.3//src/util/load_lib.h postfix-2.8.3-dynamic_maps.patch//src/util/load_lib.h
--- postfix-2.8.3//src/util/load_lib.h 1970-01-01 01:00:00.000000000 +0100
+++ postfix-2.8.3-dynamic_maps.patch//src/util/load_lib.h 2011-05-10 12:42:04.636116003 +0200
Index: src/util/load_lib.h
===================================================================
--- /dev/null
+++ src/util/load_lib.h
@@ -0,0 +1,41 @@
+#ifndef _LOAD_LIB_H_INCLUDED_
+#define _LOAD_LIB_H_INCLUDED_
@ -986,114 +1113,10 @@ diff -ruN postfix-2.8.3//src/util/load_lib.h postfix-2.8.3-dynamic_maps.patch//s
+/*--*/
+
+#endif
diff -ruN postfix-2.8.3//src/util/Makefile.in postfix-2.8.3-dynamic_maps.patch//src/util/Makefile.in
--- postfix-2.8.3//src/util/Makefile.in 2011-04-15 18:52:47.000000000 +0200
+++ postfix-2.8.3-dynamic_maps.patch//src/util/Makefile.in 2011-05-10 12:42:04.637116003 +0200
@@ -33,15 +33,16 @@
allascii.c load_file.c killme_after.c vstream_tweak.c \
unix_pass_listen.c unix_pass_trigger.c edit_file.c inet_windowsize.c \
unix_pass_fd_fix.c dict_cache.c valid_utf_8.c dict_thash.c \
- ip_match.c nbbio.c stream_pass_connect.c
+ ip_match.c nbbio.c stream_pass_connect.c \
+ load_lib.c sdbm.c
OBJS = alldig.o allprint.o argv.o argv_split.o attr_clnt.o attr_print0.o \
attr_print64.o attr_print_plain.o attr_scan0.o attr_scan64.o \
attr_scan_plain.o auto_clnt.o base64_code.o basename.o binhash.o \
chroot_uid.o cidr_match.o clean_env.o close_on_exec.o concatenate.o \
ctable.o dict.o dict_alloc.o dict_cdb.o dict_cidr.o dict_db.o \
dict_dbm.o dict_debug.o dict_env.o dict_ht.o dict_ni.o dict_nis.o \
- dict_nisplus.o dict_open.o dict_pcre.o dict_regexp.o dict_sdbm.o \
- dict_static.o dict_tcp.o dict_unix.o dir_forest.o doze.o dummy_read.o \
+ dict_nisplus.o dict_open.o dict_regexp.o dict_sdbm.o \
+ dict_static.o dict_unix.o dir_forest.o doze.o dummy_read.o \
dummy_write.o duplex_pipe.o environ.o events.o exec_command.o \
fifo_listen.o fifo_trigger.o file_limit.o find_inet.o fsspace.o \
fullname.o get_domainname.o get_hostname.o hex_code.o hex_quote.o \
@@ -68,7 +69,8 @@
allascii.o load_file.o killme_after.o vstream_tweak.o \
unix_pass_listen.o unix_pass_trigger.o edit_file.o inet_windowsize.o \
unix_pass_fd_fix.o dict_cache.o valid_utf_8.o dict_thash.o \
- ip_match.o nbbio.o stream_pass_connect.o
+ ip_match.o nbbio.o stream_pass_connect.o \
+ load_lib.o sdbm.o
HDRS = argv.h attr.h attr_clnt.h auto_clnt.h base64_code.h binhash.h \
chroot_uid.h cidr_match.h clean_env.h connect.h ctable.h dict.h \
dict_cdb.h dict_cidr.h dict_db.h dict_dbm.h dict_env.h dict_ht.h \
@@ -82,7 +84,7 @@
msg_output.h msg_syslog.h msg_vstream.h mvect.h myaddrinfo.h myflock.h \
mymalloc.h myrand.h name_code.h name_mask.h netstring.h nvtable.h \
open_as.h open_lock.h percentm.h posix_signals.h readlline.h ring.h \
- safe.h safe_open.h sane_accept.h sane_connect.h sane_fsops.h \
+ safe.h safe_open.h sane_accept.h sane_connect.h sane_fsops.h sdbm.h load_lib.h \
sane_socketpair.h sane_time.h scan_dir.h set_eugid.h set_ugid.h \
sigdelay.h sock_addr.h spawn_command.h split_at.h stat_as.h \
stringops.h sys_defs.h timed_connect.h timed_wait.h trigger.h \
@@ -96,6 +98,8 @@
CFLAGS = $(DEBUG) $(OPT) $(DEFS)
FILES = Makefile $(SRCS) $(HDRS)
INCL =
+PCRESO = dict_pcre.so
+TCPSO = dict_tcp.so
LIB = libutil.a
TESTPROG= dict_open dup2_pass_on_exec events exec_command fifo_open \
fifo_rdonly_bug fifo_rdwr_bug fifo_trigger fsspace fullname \
@@ -111,10 +115,11 @@
LIB_DIR = ../../lib
INC_DIR = ../../include
+LIBS = $(LIB_DIR)/$(LIB) $(LIB_DIR)/$(PCRESO) $(LIB_DIR)/$(TCPSO)
-.c.o:; $(CC) $(CFLAGS) -c $*.c
+.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c
-all: $(LIB)
+all: $(LIB) $(PCRESO) $(TCPSO)
$(OBJS): ../../conf/makedefs.out
@@ -123,15 +128,25 @@
test: $(TESTPROG)
+$(PCRESO): dict_pcre.o
+ gcc -shared -Wl,-soname,dict_pcre.so -o $@ $? -lpcre -L. -lutil
+
+$(TCPSO): dict_tcp.o
+ gcc -shared -Wl,-soname,dict_tcp.so -o $@ $? -L. -lutil
+
$(LIB): $(OBJS)
- $(AR) $(ARFL) $(LIB) $?
- $(RANLIB) $(LIB)
+ gcc -shared -Wl,-soname,libpostfix-util.so.1 -o $(LIB) $(OBJS) -ldl $(SYSLIBS)
$(LIB_DIR)/$(LIB): $(LIB)
cp $(LIB) $(LIB_DIR)
- $(RANLIB) $(LIB_DIR)/$(LIB)
-update: $(LIB_DIR)/$(LIB) $(HDRS)
+$(LIB_DIR)/$(PCRESO): $(PCRESO)
+ cp $(PCRESO) $(LIB_DIR)
+
+$(LIB_DIR)/$(TCPSO): $(TCPSO)
+ cp $(TCPSO) $(LIB_DIR)
+
+update: $(LIBS) $(HDRS)
-for i in $(HDRS); \
do \
cmp -s $$i $(INC_DIR)/$$i 2>/dev/null || cp $$i $(INC_DIR); \
@@ -153,7 +168,8 @@
lint $(DEFS) $(SRCS) $(LINTFIX)
clean:
- rm -f *.o $(LIB) *core $(TESTPROG) junk $(MAKES) *.tmp
+ rm -f *.o $(LIB) $(PCRESO) $(TCPSO) *core $(TESTPROG) \
+ junk $(MAKES) *.tmp
rm -rf printfck
tidy: clean
diff -ruN postfix-2.8.3//src/util/sdbm.c postfix-2.8.3-dynamic_maps.patch//src/util/sdbm.c
--- postfix-2.8.3//src/util/sdbm.c 1970-01-01 01:00:00.000000000 +0100
+++ postfix-2.8.3-dynamic_maps.patch//src/util/sdbm.c 2011-05-10 12:42:04.638116003 +0200
Index: src/util/sdbm.c
===================================================================
--- /dev/null
+++ src/util/sdbm.c
@@ -0,0 +1,972 @@
+/*++
+/* NAME
@ -2067,9 +2090,10 @@ diff -ruN postfix-2.8.3//src/util/sdbm.c postfix-2.8.3-dynamic_maps.patch//src/u
+ return db;
+}
+
diff -ruN postfix-2.8.3//src/util/sdbm.h postfix-2.8.3-dynamic_maps.patch//src/util/sdbm.h
--- postfix-2.8.3//src/util/sdbm.h 1970-01-01 01:00:00.000000000 +0100
+++ postfix-2.8.3-dynamic_maps.patch//src/util/sdbm.h 2011-05-10 12:42:04.639116003 +0200
Index: src/util/sdbm.h
===================================================================
--- /dev/null
+++ src/util/sdbm.h
@@ -0,0 +1,97 @@
+/*++
+/* NAME
@ -2168,10 +2192,11 @@ diff -ruN postfix-2.8.3//src/util/sdbm.h postfix-2.8.3-dynamic_maps.patch//src/u
+#define BADMESS /* generate a message for worst case:
+ cannot make room after SPLTMAX splits */
+#endif /* UTIL_SDBM_H */
diff -ruN postfix-2.8.3//src/util/sys_defs.h postfix-2.8.3-dynamic_maps.patch//src/util/sys_defs.h
--- postfix-2.8.3//src/util/sys_defs.h 2011-03-01 20:10:46.000000000 +0100
+++ postfix-2.8.3-dynamic_maps.patch//src/util/sys_defs.h 2011-05-10 12:42:04.640116003 +0200
@@ -720,6 +720,7 @@
Index: src/util/sys_defs.h
===================================================================
--- src/util/sys_defs.h.orig
+++ src/util/sys_defs.h
@@ -721,6 +721,7 @@ extern int initgroups(const char *, int)
#define INTERNAL_LOCK MYFLOCK_STYLE_FLOCK
#define DEF_MAILBOX_LOCK "fcntl, dotlock" /* RedHat >= 4.x */
#define HAS_FSYNC
@ -2179,7 +2204,7 @@ diff -ruN postfix-2.8.3//src/util/sys_defs.h postfix-2.8.3-dynamic_maps.patch//s
#define HAS_DB
#define DEF_DB_TYPE "hash"
#define ALIAS_DB_MAP "hash:/etc/aliases"
@@ -731,11 +732,25 @@
@@ -732,11 +733,25 @@ extern int initgroups(const char *, int)
#define STATFS_IN_SYS_VFS_H
#define PREPEND_PLUS_TO_OPTSTRING
#define HAS_POSIX_REGEXP
@ -2205,7 +2230,7 @@ diff -ruN postfix-2.8.3//src/util/sys_defs.h postfix-2.8.3-dynamic_maps.patch//s
#ifdef __GLIBC_PREREQ
# define HAVE_GLIBC_API_VERSION_SUPPORT(maj, min) __GLIBC_PREREQ(maj, min)
#else
@@ -901,6 +916,7 @@
@@ -902,6 +917,7 @@ extern int h_errno; /* <netdb.h> impor
#define USE_STATFS
#define STATFS_IN_SYS_VFS_H
#define HAS_POSIX_REGEXP
@ -2213,7 +2238,7 @@ diff -ruN postfix-2.8.3//src/util/sys_defs.h postfix-2.8.3-dynamic_maps.patch//s
#define NATIVE_SENDMAIL_PATH "/usr/sbin/sendmail"
#define NATIVE_MAILQ_PATH "/usr/bin/mailq"
#define NATIVE_NEWALIAS_PATH "/usr/bin/newaliases"
@@ -938,6 +954,7 @@
@@ -939,6 +955,7 @@ extern int h_errno; /* <netdb.h> impor
#define USE_STATFS
#define STATFS_IN_SYS_VFS_H
#define HAS_POSIX_REGEXP
@ -2221,7 +2246,7 @@ diff -ruN postfix-2.8.3//src/util/sys_defs.h postfix-2.8.3-dynamic_maps.patch//s
#define NATIVE_SENDMAIL_PATH "/usr/sbin/sendmail"
#define NATIVE_MAILQ_PATH "/usr/bin/mailq"
#define NATIVE_NEWALIAS_PATH "/usr/bin/newaliases"
@@ -977,6 +994,7 @@
@@ -978,6 +995,7 @@ extern int h_errno;
#define USE_STATFS
#define STATFS_IN_SYS_VFS_H
#define HAS_POSIX_REGEXP

View File

@ -1,8 +1,8 @@
Index: makedefs
===================================================================
--- makedefs.orig 2007-03-24 14:30:18.000000000 +0100
+++ makedefs 2007-08-06 00:05:32.627270181 +0200
@@ -475,4 +475,5 @@ AWK = $AWK
--- makedefs.orig
+++ makedefs
@@ -669,4 +669,5 @@ AWK = $AWK
STRCASE = $STRCASE
EXPORT = AUXLIBS='$AUXLIBS' CCARGS='$CCARGS' OPT='$OPT' DEBUG='$DEBUG'
WARN = $WARN
@ -10,8 +10,8 @@ Index: makedefs
EOF
Index: src/anvil/Makefile.in
===================================================================
--- src/anvil/Makefile.in.orig 2007-03-17 18:51:46.000000000 +0100
+++ src/anvil/Makefile.in 2007-08-06 00:05:32.639270914 +0200
--- src/anvil/Makefile.in.orig
+++ src/anvil/Makefile.in
@@ -9,11 +9,14 @@ TESTPROG=
PROG = anvil
INC_DIR = ../../include
@ -30,8 +30,8 @@ Index: src/anvil/Makefile.in
Index: src/cleanup/Makefile.in
===================================================================
--- src/cleanup/Makefile.in.orig 2007-03-17 18:51:40.000000000 +0100
+++ src/cleanup/Makefile.in 2007-08-06 00:05:32.663272382 +0200
--- src/cleanup/Makefile.in.orig
+++ src/cleanup/Makefile.in
@@ -20,11 +20,14 @@ PROG = cleanup
INC_DIR = ../../include
LIBS = ../../lib/libmaster.a ../../lib/libmilter.a ../../lib/libglobal.a \
@ -50,8 +50,8 @@ Index: src/cleanup/Makefile.in
Index: src/discard/Makefile.in
===================================================================
--- src/discard/Makefile.in.orig 2007-03-17 18:51:47.000000000 +0100
+++ src/discard/Makefile.in 2007-08-06 00:05:32.767278742 +0200
--- src/discard/Makefile.in.orig
+++ src/discard/Makefile.in
@@ -9,11 +9,14 @@ TESTPROG=
PROG = discard
INC_DIR = ../../include
@ -70,8 +70,8 @@ Index: src/discard/Makefile.in
Index: src/error/Makefile.in
===================================================================
--- src/error/Makefile.in.orig 2007-03-17 18:51:39.000000000 +0100
+++ src/error/Makefile.in 2007-08-06 00:05:32.791280210 +0200
--- src/error/Makefile.in.orig
+++ src/error/Makefile.in
@@ -9,11 +9,14 @@ TESTPROG=
PROG = error
INC_DIR = ../../include
@ -90,8 +90,8 @@ Index: src/error/Makefile.in
Index: src/flush/Makefile.in
===================================================================
--- src/flush/Makefile.in.orig 2007-03-17 18:51:46.000000000 +0100
+++ src/flush/Makefile.in 2007-08-06 00:05:32.815281678 +0200
--- src/flush/Makefile.in.orig
+++ src/flush/Makefile.in
@@ -9,11 +9,14 @@ TESTPROG=
PROG = flush
INC_DIR = ../../include
@ -110,8 +110,8 @@ Index: src/flush/Makefile.in
Index: src/fsstone/Makefile.in
===================================================================
--- src/fsstone/Makefile.in.orig 2006-12-04 01:29:52.000000000 +0100
+++ src/fsstone/Makefile.in 2007-08-06 00:05:32.855284124 +0200
--- src/fsstone/Makefile.in.orig
+++ src/fsstone/Makefile.in
@@ -9,6 +9,9 @@ TESTPROG=
PROG = fsstone
INC_DIR = ../../include
@ -133,8 +133,8 @@ Index: src/fsstone/Makefile.in
Index: src/local/Makefile.in
===================================================================
--- src/local/Makefile.in.orig 2007-03-17 18:51:42.000000000 +0100
+++ src/local/Makefile.in 2007-08-06 00:05:32.875285347 +0200
--- src/local/Makefile.in.orig
+++ src/local/Makefile.in
@@ -15,11 +15,14 @@ PROG = local
TESTPROG=
INC_DIR = ../../include
@ -153,8 +153,8 @@ Index: src/local/Makefile.in
Index: src/master/Makefile.in
===================================================================
--- src/master/Makefile.in.orig 2007-08-06 00:05:31.915226638 +0200
+++ src/master/Makefile.in 2007-08-06 00:05:32.899286815 +0200
--- src/master/Makefile.in.orig
+++ src/master/Makefile.in
@@ -20,7 +20,7 @@ LIB_DIR = ../../lib
INC_DIR = ../../include
BIN_DIR = ../../libexec
@ -175,9 +175,9 @@ Index: src/master/Makefile.in
Index: src/oqmgr/Makefile.in
===================================================================
--- src/oqmgr/Makefile.in.orig 2007-03-17 18:51:43.000000000 +0100
+++ src/oqmgr/Makefile.in 2007-08-06 00:05:32.923288283 +0200
@@ -13,11 +13,14 @@ TESTPROG=
--- src/oqmgr/Makefile.in.orig
+++ src/oqmgr/Makefile.in
@@ -15,11 +15,14 @@ TESTPROG=
PROG = qmgr
INC_DIR = ../../include
LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
@ -195,8 +195,8 @@ Index: src/oqmgr/Makefile.in
Index: src/pickup/Makefile.in
===================================================================
--- src/pickup/Makefile.in.orig 2007-03-17 18:51:39.000000000 +0100
+++ src/pickup/Makefile.in 2007-08-06 00:05:32.959290484 +0200
--- src/pickup/Makefile.in.orig
+++ src/pickup/Makefile.in
@@ -9,11 +9,14 @@ TESTPROG=
PROG = pickup
INC_DIR = ../../include
@ -215,8 +215,8 @@ Index: src/pickup/Makefile.in
Index: src/pipe/Makefile.in
===================================================================
--- src/pipe/Makefile.in.orig 2007-03-17 18:51:45.000000000 +0100
+++ src/pipe/Makefile.in 2007-08-06 00:05:32.983291952 +0200
--- src/pipe/Makefile.in.orig
+++ src/pipe/Makefile.in
@@ -9,11 +9,14 @@ TESTPROG=
PROG = pipe
INC_DIR = ../../include
@ -235,8 +235,8 @@ Index: src/pipe/Makefile.in
Index: src/postalias/Makefile.in
===================================================================
--- src/postalias/Makefile.in.orig 2007-03-17 18:51:45.000000000 +0100
+++ src/postalias/Makefile.in 2007-08-06 00:05:33.007293420 +0200
--- src/postalias/Makefile.in.orig
+++ src/postalias/Makefile.in
@@ -9,11 +9,14 @@ TESTPROG=
PROG = postalias
INC_DIR = ../../include
@ -255,8 +255,8 @@ Index: src/postalias/Makefile.in
Index: src/postcat/Makefile.in
===================================================================
--- src/postcat/Makefile.in.orig 2007-03-17 18:51:45.000000000 +0100
+++ src/postcat/Makefile.in 2007-08-06 00:05:33.043295621 +0200
--- src/postcat/Makefile.in.orig
+++ src/postcat/Makefile.in
@@ -9,11 +9,14 @@ TESTPROG=
PROG = postcat
INC_DIR = ../../include
@ -275,8 +275,8 @@ Index: src/postcat/Makefile.in
Index: src/postdrop/Makefile.in
===================================================================
--- src/postdrop/Makefile.in.orig 2007-03-17 18:51:45.000000000 +0100
+++ src/postdrop/Makefile.in 2007-08-06 00:05:33.147301981 +0200
--- src/postdrop/Makefile.in.orig
+++ src/postdrop/Makefile.in
@@ -9,11 +9,14 @@ TESTPROG=
PROG = postdrop
INC_DIR = ../../include
@ -295,8 +295,8 @@ Index: src/postdrop/Makefile.in
Index: src/postfix/Makefile.in
===================================================================
--- src/postfix/Makefile.in.orig 2007-03-17 18:51:39.000000000 +0100
+++ src/postfix/Makefile.in 2007-08-06 00:05:33.175303694 +0200
--- src/postfix/Makefile.in.orig
+++ src/postfix/Makefile.in
@@ -10,11 +10,14 @@ INC_DIR = ../../include
TESTPROG=
PROG = postfix
@ -315,8 +315,8 @@ Index: src/postfix/Makefile.in
Index: src/postkick/Makefile.in
===================================================================
--- src/postkick/Makefile.in.orig 2007-03-17 18:51:46.000000000 +0100
+++ src/postkick/Makefile.in 2007-08-06 00:05:33.203305406 +0200
--- src/postkick/Makefile.in.orig
+++ src/postkick/Makefile.in
@@ -9,11 +9,14 @@ TESTPROG=
PROG = postkick
INC_DIR = ../../include
@ -335,8 +335,8 @@ Index: src/postkick/Makefile.in
Index: src/postlock/Makefile.in
===================================================================
--- src/postlock/Makefile.in.orig 2007-03-17 18:51:46.000000000 +0100
+++ src/postlock/Makefile.in 2007-08-06 00:05:33.227306874 +0200
--- src/postlock/Makefile.in.orig
+++ src/postlock/Makefile.in
@@ -9,11 +9,14 @@ TESTPROG=
PROG = postlock
INC_DIR = ../../include
@ -355,8 +355,8 @@ Index: src/postlock/Makefile.in
Index: src/postlog/Makefile.in
===================================================================
--- src/postlog/Makefile.in.orig 2007-03-17 18:51:46.000000000 +0100
+++ src/postlog/Makefile.in 2007-08-06 00:05:33.251308342 +0200
--- src/postlog/Makefile.in.orig
+++ src/postlog/Makefile.in
@@ -10,11 +10,14 @@ INC_DIR = ../../include
TESTPROG=
PROG = postlog
@ -375,8 +375,8 @@ Index: src/postlog/Makefile.in
Index: src/postmap/Makefile.in
===================================================================
--- src/postmap/Makefile.in.orig 2007-03-17 18:51:46.000000000 +0100
+++ src/postmap/Makefile.in 2007-08-06 00:05:33.287310543 +0200
--- src/postmap/Makefile.in.orig
+++ src/postmap/Makefile.in
@@ -9,11 +9,14 @@ TESTPROG=
PROG = postmap
INC_DIR = ../../include
@ -395,8 +395,8 @@ Index: src/postmap/Makefile.in
Index: src/postqueue/Makefile.in
===================================================================
--- src/postqueue/Makefile.in.orig 2007-03-17 18:51:46.000000000 +0100
+++ src/postqueue/Makefile.in 2007-08-06 00:05:33.311312011 +0200
--- src/postqueue/Makefile.in.orig
+++ src/postqueue/Makefile.in
@@ -9,11 +9,14 @@ TESTPROG=
PROG = postqueue
INC_DIR = ../../include
@ -415,8 +415,8 @@ Index: src/postqueue/Makefile.in
Index: src/postsuper/Makefile.in
===================================================================
--- src/postsuper/Makefile.in.orig 2007-03-17 18:51:46.000000000 +0100
+++ src/postsuper/Makefile.in 2007-08-06 00:05:33.335313479 +0200
--- src/postsuper/Makefile.in.orig
+++ src/postsuper/Makefile.in
@@ -9,11 +9,14 @@ TESTPROG=
PROG = postsuper
INC_DIR = ../../include
@ -435,8 +435,8 @@ Index: src/postsuper/Makefile.in
Index: src/proxymap/Makefile.in
===================================================================
--- src/proxymap/Makefile.in.orig 2007-03-17 18:51:46.000000000 +0100
+++ src/proxymap/Makefile.in 2007-08-06 00:05:33.363315191 +0200
--- src/proxymap/Makefile.in.orig
+++ src/proxymap/Makefile.in
@@ -9,11 +9,14 @@ TESTPROG=
PROG = proxymap
INC_DIR = ../../include
@ -455,9 +455,9 @@ Index: src/proxymap/Makefile.in
Index: src/qmgr/Makefile.in
===================================================================
--- src/qmgr/Makefile.in.orig 2007-03-17 18:51:43.000000000 +0100
+++ src/qmgr/Makefile.in 2007-08-06 00:05:33.467321551 +0200
@@ -15,11 +15,14 @@ TESTPROG=
--- src/qmgr/Makefile.in.orig
+++ src/qmgr/Makefile.in
@@ -17,11 +17,14 @@ TESTPROG=
PROG = qmgr
INC_DIR = ../../include
LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
@ -475,8 +475,8 @@ Index: src/qmgr/Makefile.in
Index: src/qmqpd/Makefile.in
===================================================================
--- src/qmqpd/Makefile.in.orig 2007-03-17 18:51:46.000000000 +0100
+++ src/qmqpd/Makefile.in 2007-08-06 00:05:33.491323019 +0200
--- src/qmqpd/Makefile.in.orig
+++ src/qmqpd/Makefile.in
@@ -9,11 +9,14 @@ TESTPROG=
PROG = qmqpd
INC_DIR = ../../include
@ -495,8 +495,8 @@ Index: src/qmqpd/Makefile.in
Index: src/scache/Makefile.in
===================================================================
--- src/scache/Makefile.in.orig 2007-03-17 18:51:47.000000000 +0100
+++ src/scache/Makefile.in 2007-08-06 00:05:33.527325220 +0200
--- src/scache/Makefile.in.orig
+++ src/scache/Makefile.in
@@ -9,11 +9,14 @@ TESTPROG=
PROG = scache
INC_DIR = ../../include
@ -515,8 +515,8 @@ Index: src/scache/Makefile.in
Index: src/sendmail/Makefile.in
===================================================================
--- src/sendmail/Makefile.in.orig 2007-03-17 18:51:39.000000000 +0100
+++ src/sendmail/Makefile.in 2007-08-06 00:05:33.559327177 +0200
--- src/sendmail/Makefile.in.orig
+++ src/sendmail/Makefile.in
@@ -9,11 +9,14 @@ TESTPROG=
PROG = sendmail
INC_DIR = ../../include
@ -535,8 +535,8 @@ Index: src/sendmail/Makefile.in
Index: src/showq/Makefile.in
===================================================================
--- src/showq/Makefile.in.orig 2007-03-17 18:51:45.000000000 +0100
+++ src/showq/Makefile.in 2007-08-06 00:05:33.587328890 +0200
--- src/showq/Makefile.in.orig
+++ src/showq/Makefile.in
@@ -9,11 +9,14 @@ TESTPROG=
PROG = showq
INC_DIR = ../../include
@ -555,8 +555,8 @@ Index: src/showq/Makefile.in
Index: src/smtpstone/Makefile.in
===================================================================
--- src/smtpstone/Makefile.in.orig 2007-03-17 18:51:39.000000000 +0100
+++ src/smtpstone/Makefile.in 2007-08-06 00:05:33.603329868 +0200
--- src/smtpstone/Makefile.in.orig
+++ src/smtpstone/Makefile.in
@@ -9,6 +9,9 @@ TESTPROG=
INC_DIR = ../../include
PROG = smtp-source smtp-sink qmqp-source qmqp-sink
@ -590,8 +590,8 @@ Index: src/smtpstone/Makefile.in
Index: src/spawn/Makefile.in
===================================================================
--- src/spawn/Makefile.in.orig 2007-03-17 18:51:46.000000000 +0100
+++ src/spawn/Makefile.in 2007-08-06 00:05:33.635331825 +0200
--- src/spawn/Makefile.in.orig
+++ src/spawn/Makefile.in
@@ -9,11 +9,14 @@ TESTPROG=
PROG = spawn
INC_DIR = ../../include
@ -610,8 +610,8 @@ Index: src/spawn/Makefile.in
Index: src/tlsmgr/Makefile.in
===================================================================
--- src/tlsmgr/Makefile.in.orig 2007-03-17 18:51:47.000000000 +0100
+++ src/tlsmgr/Makefile.in 2007-08-06 00:05:33.739338185 +0200
--- src/tlsmgr/Makefile.in.orig
+++ src/tlsmgr/Makefile.in
@@ -10,11 +10,14 @@ PROG = tlsmgr
INC_DIR = ../../include
LIBS = ../../lib/libmaster.a ../../lib/libtls.a ../../lib/libglobal.a \
@ -630,8 +630,8 @@ Index: src/tlsmgr/Makefile.in
Index: src/trivial-rewrite/Makefile.in
===================================================================
--- src/trivial-rewrite/Makefile.in.orig 2007-03-17 18:51:42.000000000 +0100
+++ src/trivial-rewrite/Makefile.in 2007-08-06 00:05:33.787341121 +0200
--- src/trivial-rewrite/Makefile.in.orig
+++ src/trivial-rewrite/Makefile.in
@@ -12,13 +12,16 @@ LIBS = ../../lib/libmaster.a ../../lib/l
LIB_DIR = ../../lib
INC_DIR = ../../include
@ -652,8 +652,8 @@ Index: src/trivial-rewrite/Makefile.in
Index: src/verify/Makefile.in
===================================================================
--- src/verify/Makefile.in.orig 2007-03-17 18:51:46.000000000 +0100
+++ src/verify/Makefile.in 2007-08-06 00:05:33.803342099 +0200
--- src/verify/Makefile.in.orig
+++ src/verify/Makefile.in
@@ -9,11 +9,14 @@ TESTPROG=
PROG = verify
INC_DIR = ../../include
@ -672,8 +672,8 @@ Index: src/verify/Makefile.in
Index: src/virtual/Makefile.in
===================================================================
--- src/virtual/Makefile.in.orig 2007-03-17 18:51:46.000000000 +0100
+++ src/virtual/Makefile.in 2007-08-06 00:05:33.823343322 +0200
--- src/virtual/Makefile.in.orig
+++ src/virtual/Makefile.in
@@ -9,11 +9,14 @@ PROG = virtual
TESTPROG=
INC_DIR = ../../include
@ -692,8 +692,8 @@ Index: src/virtual/Makefile.in
Index: src/bounce/Makefile.in
===================================================================
--- src/bounce/Makefile.in.orig 2007-03-17 18:51:45.000000000 +0100
+++ src/bounce/Makefile.in 2007-08-06 00:05:33.839344301 +0200
--- src/bounce/Makefile.in.orig
+++ src/bounce/Makefile.in
@@ -16,13 +16,16 @@ PROG = bounce
SAMPLES = ../../conf/bounce.cf.default
INC_DIR = ../../include
@ -714,9 +714,9 @@ Index: src/bounce/Makefile.in
../../conf/bounce.cf.default: template_test.ref annotate.pl
Index: src/postconf/Makefile.in
===================================================================
--- src/postconf/Makefile.in.orig 2007-03-17 18:51:45.000000000 +0100
+++ src/postconf/Makefile.in 2007-08-06 00:05:33.903348215 +0200
@@ -12,11 +12,14 @@ PROG = postconf
--- src/postconf/Makefile.in.orig
+++ src/postconf/Makefile.in
@@ -15,11 +15,14 @@ PROG = postconf
SAMPLES = ../../conf/main.cf.default
INC_DIR = ../../include
LIBS = ../../lib/libxsasl.a ../../lib/libglobal.a ../../lib/libutil.a
@ -734,9 +734,9 @@ Index: src/postconf/Makefile.in
rm -f $@
Index: src/smtp/Makefile.in
===================================================================
--- src/smtp/Makefile.in.orig 2007-03-17 18:51:45.000000000 +0100
+++ src/smtp/Makefile.in 2007-08-06 00:05:33.915348949 +0200
@@ -14,11 +14,14 @@ PROG = smtp
--- src/smtp/Makefile.in.orig
+++ src/smtp/Makefile.in
@@ -16,11 +16,14 @@ PROG = smtp
INC_DIR = ../../include
LIBS = ../../lib/libmaster.a ../../lib/libtls.a ../../lib/libdns.a \
../../lib/libxsasl.a ../../lib/libglobal.a ../../lib/libutil.a
@ -754,9 +754,9 @@ Index: src/smtp/Makefile.in
Index: src/smtpd/Makefile.in
===================================================================
--- src/smtpd/Makefile.in.orig 2007-03-17 18:51:41.000000000 +0100
+++ src/smtpd/Makefile.in 2007-08-06 00:05:33.931349927 +0200
@@ -16,11 +16,14 @@ INC_DIR = ../../include
--- src/smtpd/Makefile.in.orig
+++ src/smtpd/Makefile.in
@@ -19,11 +19,14 @@ INC_DIR = ../../include
LIBS = ../../lib/libmaster.a ../../lib/libtls.a ../../lib/libdns.a \
../../lib/libxsasl.a ../../lib/libmilter.a ../../lib/libglobal.a \
../../lib/libutil.a
@ -774,8 +774,8 @@ Index: src/smtpd/Makefile.in
Index: src/xsasl/Makefile.in
===================================================================
--- src/xsasl/Makefile.in.orig 2007-03-17 18:51:38.000000000 +0100
+++ src/xsasl/Makefile.in 2007-08-06 00:05:33.947350906 +0200
--- src/xsasl/Makefile.in.orig
+++ src/xsasl/Makefile.in
@@ -18,7 +18,7 @@ LIB_DIR = ../../lib
INC_DIR = ../../include
MAKES =

View File

@ -1,6 +1,8 @@
--- postfix-2.2.9/src/util/inet_proto.c 2005-01-19 02:22:19.000000000 +0100
+++ postfix-2.2.9/src/util/inet_proto.c 2007-01-25 13:22:25.000000000 +0100
@@ -220,9 +220,11 @@
Index: src/util/inet_proto.c
===================================================================
--- src/util/inet_proto.c.orig
+++ src/util/inet_proto.c
@@ -220,9 +220,11 @@ INET_PROTO_INFO *inet_proto_init(const c
pf->sa_family_list = make_uchar_vector(3, AF_INET, AF_INET6, 0);
break;
} else if (errno == EAFNOSUPPORT) {

View File

@ -1,7 +1,8 @@
diff -ur postfix-2.8.2-dynamic_maps_pie/src/cleanup/cleanup_message.c postfix-2.8.2-pointer_to_literals/src/cleanup/cleanup_message.c
--- postfix-2.8.2-dynamic_maps_pie/src/cleanup/cleanup_message.c 2010-07-27 22:34:20.000000000 +0200
+++ postfix-2.8.2-pointer_to_literals/src/cleanup/cleanup_message.c 2011-03-30 23:10:42.774254791 +0200
@@ -290,7 +290,7 @@
Index: src/cleanup/cleanup_message.c
===================================================================
--- src/cleanup/cleanup_message.c.orig
+++ src/cleanup/cleanup_message.c
@@ -290,7 +290,7 @@ static const char *cleanup_act(CLEANUP_S
while (*optional_text && ISSPACE(*optional_text))
optional_text++;
@ -10,11 +11,11 @@ diff -ur postfix-2.8.2-dynamic_maps_pie/src/cleanup/cleanup_message.c postfix-2.
#define CLEANUP_ACT_DROP 0
/*
Nur in postfix-2.8.2-pointer_to_literals/src/cleanup: cleanup_message.c.orig.
diff -ur postfix-2.8.2-dynamic_maps_pie/src/local/local_expand.c postfix-2.8.2-pointer_to_literals/src/local/local_expand.c
--- postfix-2.8.2-dynamic_maps_pie/src/local/local_expand.c 2005-05-31 15:44:14.000000000 +0200
+++ postfix-2.8.2-pointer_to_literals/src/local/local_expand.c 2011-03-30 23:10:42.775254802 +0200
@@ -114,7 +114,7 @@
Index: src/local/local_expand.c
===================================================================
--- src/local/local_expand.c.orig
+++ src/local/local_expand.c
@@ -114,7 +114,7 @@ static const char *local_expand_lookup(c
{
LOCAL_EXP *local = (LOCAL_EXP *) ptr;
@ -23,10 +24,11 @@ diff -ur postfix-2.8.2-dynamic_maps_pie/src/local/local_expand.c postfix-2.8.2-p
if (STREQ(name, "user")) {
return (local->state->msg_attr.user);
diff -ur postfix-2.8.2-dynamic_maps_pie/src/smtpd/smtpd_check.c postfix-2.8.2-pointer_to_literals/src/smtpd/smtpd_check.c
--- postfix-2.8.2-dynamic_maps_pie/src/smtpd/smtpd_check.c 2011-01-04 20:03:50.000000000 +0100
+++ postfix-2.8.2-pointer_to_literals/src/smtpd/smtpd_check.c 2011-03-30 23:12:46.513254818 +0200
@@ -359,6 +359,10 @@
Index: src/smtpd/smtpd_check.c
===================================================================
--- src/smtpd/smtpd_check.c.orig
+++ src/smtpd/smtpd_check.c
@@ -359,6 +359,10 @@ static int unv_from_tf_act;
#define CONST_STR(x) ((const char *) vstring_str(x))
#define UPDATE_STRING(ptr,val) { if (ptr) myfree(ptr); ptr = mystrdup(val); }
@ -37,7 +39,7 @@ diff -ur postfix-2.8.2-dynamic_maps_pie/src/smtpd/smtpd_check.c postfix-2.8.2-po
/*
* If some decision can't be made due to a temporary error, then change
* other decisions into deferrals.
@@ -1950,8 +1954,6 @@
@@ -1950,8 +1954,6 @@ static int check_table_result(SMTPD_STAT
if (msg_verbose)
msg_info("%s: %s %s %s", myname, table, value, datum);
@ -46,7 +48,7 @@ diff -ur postfix-2.8.2-dynamic_maps_pie/src/smtpd/smtpd_check.c postfix-2.8.2-po
/*
* DUNNO means skip this table. Silently ignore optional text.
*/
@@ -2934,8 +2936,6 @@
@@ -2934,8 +2936,6 @@ static const char *rbl_expand_lookup(con
SMTPD_RBL_EXPAND_CONTEXT *rbl_exp = (SMTPD_RBL_EXPAND_CONTEXT *) context;
SMTPD_STATE *state = rbl_exp->state;
@ -55,10 +57,11 @@ diff -ur postfix-2.8.2-dynamic_maps_pie/src/smtpd/smtpd_check.c postfix-2.8.2-po
if (state->expand_buf == 0)
state->expand_buf = vstring_alloc(10);
diff -ur postfix-2.8.2-dynamic_maps_pie/src/util/dict_open.c postfix-2.8.2-pointer_to_literals/src/util/dict_open.c
--- postfix-2.8.2-dynamic_maps_pie/src/util/dict_open.c 2011-03-30 16:02:04.373769372 +0200
+++ postfix-2.8.2-pointer_to_literals/src/util/dict_open.c 2011-03-30 23:10:42.787254814 +0200
@@ -461,7 +461,7 @@
Index: src/util/dict_open.c
===================================================================
--- src/util/dict_open.c.orig
+++ src/util/dict_open.c
@@ -476,7 +476,7 @@ ARGV *dict_mapnames()
}
#ifndef NO_DYNAMIC_MAPS
@ -67,4 +70,3 @@ diff -ur postfix-2.8.2-dynamic_maps_pie/src/util/dict_open.c postfix-2.8.2-point
void dict_open_dlinfo(const char *path)
{
Nur in postfix-2.8.2-pointer_to_literals/src/util: dict_open.c.orig.

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:21539ad7c6883c2812bafd7b584fc128bcf7d1b51f2d2b05a1662b95111a5d8e
size 2684217

View File

@ -1,7 +1,8 @@
diff -ruN postfix-2.8.3-orig/conf/main.cf postfix-2.8.3/conf/main.cf
--- postfix-2.8.3-orig/conf/main.cf 2007-12-18 14:50:25.000000000 +0100
+++ postfix-2.8.3/conf/main.cf 2011-05-17 22:05:14.000000000 +0200
@@ -649,3 +649,119 @@
Index: conf/main.cf
===================================================================
--- conf/main.cf.orig
+++ conf/main.cf
@@ -649,3 +649,119 @@ sample_directory =
# readme_directory: The location of the Postfix README files.
#
readme_directory =

View File

@ -1,6 +1,7 @@
diff -ruN postfix-2.8.3-orig/conf/master.cf postfix-2.8.3/conf/master.cf
--- postfix-2.8.3-orig/conf/master.cf 2010-12-31 15:14:51.000000000 +0100
+++ postfix-2.8.3/conf/master.cf 2011-07-01 14:30:23.000000000 +0200
Index: conf/master.cf
===================================================================
--- conf/master.cf.orig
+++ conf/master.cf
@@ -9,6 +9,11 @@
# (yes) (yes) (yes) (never) (100)
# ==========================================================================
@ -13,7 +14,7 @@ diff -ruN postfix-2.8.3-orig/conf/master.cf postfix-2.8.3/conf/master.cf
#smtp inet n - n - 1 postscreen
#smtpd pass - - n - - smtpd
#dnsblog unix - - n - 0 dnsblog
@@ -50,6 +55,26 @@
@@ -50,6 +55,26 @@ local unix - n n
virtual unix - n n - - virtual
lmtp unix - - n - - lmtp
anvil unix - - n - 1 anvil
@ -40,7 +41,7 @@ diff -ruN postfix-2.8.3-orig/conf/master.cf postfix-2.8.3/conf/master.cf
scache unix - - n - 1 scache
#
# ====================================================================
@@ -84,7 +109,7 @@
@@ -84,7 +109,7 @@ scache unix - - n
# Also specify in main.cf: cyrus_destination_recipient_limit=1
#
#cyrus unix - n n - - pipe
@ -49,7 +50,7 @@ diff -ruN postfix-2.8.3-orig/conf/master.cf postfix-2.8.3/conf/master.cf
#
# ====================================================================
#
@@ -117,3 +142,7 @@
@@ -117,3 +142,7 @@ scache unix - - n
#mailman unix - n n - - pipe
# flags=FR user=list argv=/usr/lib/mailman/bin/postfix-to-mailman.py
# ${nexthop} ${user}

View File

@ -1,7 +1,8 @@
diff -ruN postfix-2.8.3-orig/conf/post-install postfix-2.8.3/conf/post-install
--- postfix-2.8.3-orig/conf/post-install 2011-01-09 15:24:00.000000000 +0100
+++ postfix-2.8.3/conf/post-install 2011-05-15 16:11:52.000000000 +0200
@@ -696,7 +696,7 @@
Index: conf/post-install
===================================================================
--- conf/post-install.orig
+++ conf/post-install
@@ -696,7 +696,7 @@ EOF
# Postfix 2.2.
# Add missing tlsmgr service to master.cf.

View File

@ -1,3 +1,5 @@
Index: src/tls/tls_client.c
===================================================================
--- src/tls/tls_client.c.orig
+++ src/tls/tls_client.c
@@ -372,6 +372,12 @@ TLS_APPL_STATE *tls_client_init(const TL
@ -13,9 +15,11 @@
/*
* See the verify callback in tls_verify.c
*/
Index: src/tls/tls_server.c
===================================================================
--- src/tls/tls_server.c.orig
+++ src/tls/tls_server.c
@@ -381,6 +381,11 @@ TLS_APPL_STATE *tls_server_init(const TL
@@ -382,6 +382,11 @@ TLS_APPL_STATE *tls_server_init(const TL
tls_print_errors();
return (0);
}

3
postfix-2.8.12.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6e679aeaced94a40af7188878b1e0b0f77213ec0d50ecfed4f38a652e4ac10d7
size 2635056

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:99173c0fca500ccc1b44eeac876711f81cac64e3fbc1561788fa02cc5290adbd
size 24730
oid sha256:57e9c1298ab13ac7298e71c9551712da44514e06b812ab112e30c9f2cb646b65
size 24106

View File

@ -1,7 +1,8 @@
diff -uNr postfix-2.8.9.orig/README_FILES/VDA_README postfix-2.8.9/README_FILES/VDA_README
--- postfix-2.8.9.orig/README_FILES/VDA_README 1970-01-01 01:00:00.000000000 +0100
+++ postfix-2.8.9/README_FILES/VDA_README 2011-03-03 08:26:48.000000000 +0100
@@ -0,0 +1,10 @@
Index: README_FILES/VDA_README
===================================================================
--- /dev/null
+++ README_FILES/VDA_README
@@ -0,0 +1,9 @@
+Postfix VDA patch for maildir++ quota support by
+ Anderson Nadal <andernadal@gmail.com>
+ Tomas Macek <maca02@atlas.cz>
@ -11,11 +12,11 @@ diff -uNr postfix-2.8.9.orig/README_FILES/VDA_README postfix-2.8.9/README_FILES/
+howto patch the Postfix's sourcetree and configure the options
+provided by this patch.
+
+
diff -uNr postfix-2.8.9.orig/src/global/mail_params.h postfix-2.8.9/src/global/mail_params.h
--- postfix-2.8.9.orig/src/global/mail_params.h 2011-01-17 15:56:39.000000000 +0100
+++ postfix-2.8.9/src/global/mail_params.h 2011-03-03 07:40:55.000000000 +0100
@@ -2333,6 +2333,54 @@
Index: src/global/mail_params.h
===================================================================
--- src/global/mail_params.h.orig
+++ src/global/mail_params.h
@@ -2333,6 +2333,54 @@ extern char *var_virt_uid_maps;
#define DEF_VIRT_GID_MAPS ""
extern char *var_virt_gid_maps;
@ -70,10 +71,11 @@ diff -uNr postfix-2.8.9.orig/src/global/mail_params.h postfix-2.8.9/src/global/m
#define VAR_VIRT_MINUID "virtual_minimum_uid"
#define DEF_VIRT_MINUID 100
extern int var_virt_minimum_uid;
diff -uNr postfix-2.8.9.orig/src/util/file_limit.c postfix-2.8.9/src/util/file_limit.c
--- postfix-2.8.9.orig/src/util/file_limit.c 2003-10-22 20:48:36.000000000 +0200
+++ postfix-2.8.9/src/util/file_limit.c 2011-03-03 07:40:55.000000000 +0100
@@ -85,7 +85,11 @@
Index: src/util/file_limit.c
===================================================================
--- src/util/file_limit.c.orig
+++ src/util/file_limit.c
@@ -85,7 +85,11 @@ void set_file_limit(off_t limit)
#else
struct rlimit rlim;
@ -86,9 +88,10 @@ diff -uNr postfix-2.8.9.orig/src/util/file_limit.c postfix-2.8.9/src/util/file_l
if (setrlimit(RLIMIT_FSIZE, &rlim) < 0)
msg_fatal("setrlimit: %m");
#ifdef SIGXFSZ
diff -uNr postfix-2.8.9.orig/src/virtual/mailbox.c postfix-2.8.9/src/virtual/mailbox.c
--- postfix-2.8.9.orig/src/virtual/mailbox.c 2008-07-26 03:22:37.000000000 +0200
+++ postfix-2.8.9/src/virtual/mailbox.c 2011-03-03 07:40:55.000000000 +0100
Index: src/virtual/mailbox.c
===================================================================
--- src/virtual/mailbox.c.orig
+++ src/virtual/mailbox.c
@@ -70,6 +70,70 @@
#define YES 1
#define NO 0
@ -160,7 +163,7 @@ diff -uNr postfix-2.8.9.orig/src/virtual/mailbox.c postfix-2.8.9/src/virtual/mai
/* deliver_mailbox_file - deliver to recipient mailbox */
static int deliver_mailbox_file(LOCAL_STATE state, USER_ATTR usr_attr)
@@ -213,62 +277,72 @@
@@ -213,62 +277,72 @@ int deliver_mailbox(LOCAL_STATE stat
* Look up the mailbox owner rights. Defer in case of trouble.
*/
uid_res = mail_addr_find(virtual_uid_maps, state.msg_attr.user,
@ -268,9 +271,10 @@ diff -uNr postfix-2.8.9.orig/src/virtual/mailbox.c postfix-2.8.9/src/virtual/mai
/*
* Cleanup.
diff -uNr postfix-2.8.9.orig/src/virtual/maildir.c postfix-2.8.9/src/virtual/maildir.c
--- postfix-2.8.9.orig/src/virtual/maildir.c 2006-06-26 14:59:19.000000000 +0200
+++ postfix-2.8.9/src/virtual/maildir.c 2011-03-03 08:15:42.000000000 +0100
Index: src/virtual/maildir.c
===================================================================
--- src/virtual/maildir.c.orig
+++ src/virtual/maildir.c
@@ -63,28 +63,420 @@
#include <mbox_open.h>
#include <dsn_util.h>
@ -396,7 +400,8 @@ diff -uNr postfix-2.8.9.orig/src/virtual/maildir.c postfix-2.8.9/src/virtual/mai
+
+ ret_value = sum;
+ }
+
-int deliver_maildir(LOCAL_STATE state, USER_ATTR usr_attr)
+ vstream_fclose(sizefile);
+ vstring_free(sizebuf);
+
@ -549,8 +554,7 @@ diff -uNr postfix-2.8.9.orig/src/virtual/maildir.c postfix-2.8.9/src/virtual/mai
+ }
+ }
+ closedir(dir);
-int deliver_maildir(LOCAL_STATE state, USER_ATTR usr_attr)
+
+ if (msg_verbose)
+ msg_info("%s: full scan done: dir=%s sum=%ld count=%ld", myname, dirname, sum, *countptr);
+
@ -704,7 +708,7 @@ diff -uNr postfix-2.8.9.orig/src/virtual/maildir.c postfix-2.8.9/src/virtual/mai
GETTIMEOFDAY(&starttime);
@@ -93,15 +485,14 @@
@@ -93,15 +485,14 @@ int deliver_maildir(LOCAL_STATE stat
*/
state.level++;
if (msg_verbose)
@ -723,7 +727,7 @@ diff -uNr postfix-2.8.9.orig/src/virtual/maildir.c postfix-2.8.9/src/virtual/mai
}
/*
@@ -109,18 +500,116 @@
@@ -109,17 +500,115 @@ int deliver_maildir(LOCAL_STATE stat
* attribute to reflect the final recipient.
*/
if (vstream_fseek(state.msg_attr.fp, state.msg_attr.offset, SEEK_SET) < 0)
@ -756,7 +760,7 @@ diff -uNr postfix-2.8.9.orig/src/virtual/maildir.c postfix-2.8.9/src/virtual/mai
+ tmpdir = concatenate(tmpdir, "tmp/", (char *) 0);
+ curdir = concatenate(curdir, "cur/", (char *) 0);
+ }
+
+ /* get the sizefilename, no matter if we use var_virt_maildir_extended */
+ if (*var_virt_maildir_suffix == 0) {
+ sizefilename = concatenate(usr_attr.mailbox, "maildirsize", (char *) 0);
@ -842,11 +846,10 @@ diff -uNr postfix-2.8.9.orig/src/virtual/maildir.c postfix-2.8.9/src/virtual/mai
+ set_eugid(var_owner_uid, var_owner_gid);
+ }
+ }
+
/*
* Create and write the file as the recipient, so that file quota work.
* Create any missing directories on the fly. The file name is chosen
@@ -174,46 +663,288 @@
@@ -174,46 +663,288 @@ int deliver_maildir(LOCAL_STATE stat
* [...]
*/
set_eugid(usr_attr.uid, usr_attr.gid);
@ -1172,7 +1175,7 @@ diff -uNr postfix-2.8.9.orig/src/virtual/maildir.c postfix-2.8.9/src/virtual/mai
}
set_eugid(var_owner_uid, var_owner_gid);
@@ -223,31 +954,64 @@
@@ -223,31 +954,64 @@ int deliver_maildir(LOCAL_STATE stat
* location possibly under user control.
*/
if (mail_copy_status & MAIL_COPY_STAT_CORRUPT) {
@ -1230,11 +1233,11 @@ diff -uNr postfix-2.8.9.orig/src/virtual/maildir.c postfix-2.8.9/src/virtual/mai
+ deliver_status =
+ (STR(why->status)[0] == '4' ? defer_append : bounce_append)
+ (BOUNCE_FLAGS(state.request), BOUNCE_ATTR(state.msg_attr));
}
+ }
+ else {
+ dsb_simple(why, "2.0.0", "delivered to maildir");
+ deliver_status = sent(BOUNCE_FLAGS(state.request), SENT_ATTR(state.msg_attr));
+ }
}
+
vstring_free(buf);
+
@ -1256,10 +1259,11 @@ diff -uNr postfix-2.8.9.orig/src/virtual/maildir.c postfix-2.8.9/src/virtual/mai
+
return (deliver_status);
}
diff -uNr postfix-2.8.9.orig/src/virtual/virtual.c postfix-2.8.9/src/virtual/virtual.c
--- postfix-2.8.9.orig/src/virtual/virtual.c 2010-01-02 02:57:04.000000000 +0100
+++ postfix-2.8.9/src/virtual/virtual.c 2011-03-03 07:40:55.000000000 +0100
@@ -335,12 +335,30 @@
Index: src/virtual/virtual.c
===================================================================
--- src/virtual/virtual.c.orig
+++ src/virtual/virtual.c
@@ -335,12 +335,30 @@ int var_virt_mailbox_limit;
char *var_mail_spool_dir; /* XXX dependency fix */
bool var_strict_mbox_owner;
@ -1290,7 +1294,7 @@ diff -uNr postfix-2.8.9.orig/src/virtual/virtual.c postfix-2.8.9/src/virtual/vir
/*
* Bit masks.
@@ -450,15 +468,28 @@
@@ -450,15 +468,28 @@ static void post_init(char *unused_name,
*/
virtual_mailbox_maps =
maps_create(VAR_VIRT_MAILBOX_MAPS, var_virt_mailbox_maps,
@ -1322,7 +1326,7 @@ diff -uNr postfix-2.8.9.orig/src/virtual/virtual.c postfix-2.8.9/src/virtual/vir
virtual_mbox_lock_mask = mbox_lock_mask(var_virt_mailbox_lock);
}
@@ -495,24 +526,39 @@
@@ -495,24 +526,39 @@ MAIL_VERSION_STAMP_DECLARE;
int main(int argc, char **argv)
{
@ -1380,7 +1384,7 @@ diff -uNr postfix-2.8.9.orig/src/virtual/virtual.c postfix-2.8.9/src/virtual/vir
/*
* Fingerprint executables and core dumps.
@@ -526,6 +572,7 @@
@@ -526,6 +572,7 @@ int main(int argc, char **argv)
MAIL_SERVER_PRE_INIT, pre_init,
MAIL_SERVER_POST_INIT, post_init,
MAIL_SERVER_PRE_ACCEPT, pre_accept,
@ -1388,9 +1392,10 @@ diff -uNr postfix-2.8.9.orig/src/virtual/virtual.c postfix-2.8.9/src/virtual/vir
MAIL_SERVER_PRIVILEGED,
0);
}
diff -uNr postfix-2.8.9.orig/src/virtual/virtual.h postfix-2.8.9/src/virtual/virtual.h
--- postfix-2.8.9.orig/src/virtual/virtual.h 2006-01-08 00:59:47.000000000 +0100
+++ postfix-2.8.9/src/virtual/virtual.h 2011-03-03 07:40:55.000000000 +0100
Index: src/virtual/virtual.h
===================================================================
--- src/virtual/virtual.h.orig
+++ src/virtual/virtual.h
@@ -34,6 +34,9 @@
extern MAPS *virtual_mailbox_maps;
extern MAPS *virtual_uid_maps;

View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Fri Aug 10 18:56:59 UTC 2012 - chris@computersalat.de
- update to 2.8.12
* 20120730
Bugfix (introduced: 20000314): AUTH is not allowed after
MAIL. Timo Sirainen. File: smtpd/smtpd_sasl_proto.c.
* 20120702
Bugfix (introduced: 19990127): the BIFF client leaked an
unprivileged UDP socket. Fix by Jaroslav Skarvada. File:
local/biff_notify.c.
* 20120621
Bugfix (introduced: Postfix 2.8): the unused "pass" trigger
client could close the wrong file descriptors. File:
util/unix_pass_trigger.c.
- fix for bnc#771303
* add 'version = 3' to ldap_aliases.cf
- rebase patches
* main, master, post-install: 2.8.3 -> 2.8.12
* ssl-release-buffers: 2.8.5 -> 2.8.12
* vda-v10: 2.8.9 -> 2.8.12
* dynamic_maps, dynamic_maps_pie, ipv6_disabled, pointer_to_literals
- fix changes file
-------------------------------------------------------------------
Thu Jul 19 06:52:18 UTC 2012 - varkoly@suse.com
@ -6,12 +30,13 @@ Thu Jul 19 06:52:18 UTC 2012 - varkoly@suse.com
-------------------------------------------------------------------
Mon Jun 11 09:51:22 UTC 2012 - varkoly@suse.com
- update to 2.8.11
* 20120520
- Bugfix (introduced Postfix 2.4): the event_drain() function
was comparing bitmasks incorrectly causing the program to
always wait for the full time limit. This error affected
the unused postkick command, but only after s/fifo/unix/
in master.cf. File: util/events.c.
- Cleanup: laptop users have always been able to avoid
unnecessary disk spin-up by doing s/fifo/unix/ in master.cf
(this is currently not supported on Solaris systems).
@ -20,7 +45,6 @@ Mon Jun 11 09:51:22 UTC 2012 - varkoly@suse.com
and qmgr servers before closing the UNIX-domain request
sockets. Files: postqueue/postqueue.c, postqueue/Makefile.in.
-------------------------------------------------------------------
Wed May 9 10:07:10 UTC 2012 - varkoly@suse.com

View File

@ -20,7 +20,7 @@ Name: postfix
Summary: A fast, secure, and flexible mailer
License: IPL-1.0
Group: Productivity/Networking/Email/Servers
Version: 2.8.11
Version: 2.8.12
Release: 0
Url: http://www.postfix.org/
Source: %{name}-%{version}.tar.bz2
@ -32,11 +32,11 @@ Patch: dynamic_maps.patch
Patch1: dynamic_maps_pie.patch
Patch2: pointer_to_literals.patch
Patch3: ipv6_disabled.patch
Patch10: %{name}-2.8.3-main.cf.patch
Patch11: %{name}-2.8.3-master.cf.patch
Patch12: %{name}-2.8.3-post-install.patch
Patch20: %{name}-vda-v10-2.8.9.patch
Patch21: postfix-2.8.5-ssl-release-buffers.patch
Patch10: %{name}-2.8.12-main.cf.patch
Patch11: %{name}-2.8.12-master.cf.patch
Patch12: %{name}-2.8.12-post-install.patch
Patch20: %{name}-vda-v10-2.8.12.patch
Patch21: postfix-2.8.12-ssl-release-buffers.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %insserv_prereq %fillup_prereq
PreReq: /usr/bin/getent
@ -139,14 +139,14 @@ PostgreSQL.
%prep
%setup -n %{name}-%{version} -a 1 -a 2
%patch -p1
%patch
%patch1
%patch2 -p1
%patch3 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch20 -p1
%patch2
%patch3
%patch10
%patch11
%patch12
%patch20
%patch21
# ---------------------------------------------------------------------------