rpm/postfix
SHA256
1
0
Fork 0
forked from pool/postfix
Code Pull Requests Activity

- update to 2.8.2

Browse Source 
* DNSBL/DNSWL:
    o Support for address patterns in DNS blacklist and whitelist lookup results.
    o The Postfix SMTP server now supports DNS-based whitelisting with several safety features
  * Support for read-only sqlite database access.
  * Alias expansion:
    o Postfix now reports a temporary delivery error when the result
      of virtual alias expansion would exceed the virtual_alias_recursion_limit
      or virtual_alias_expansion_limit.
    o To avoid repeated delivery to mailing lists with pathological
      nested alias configurations, the local(8) delivery agent now keeps
      the owner-alias attribute of a parent alias, when delivering mail
      to a child alias that does not have its own owner alias.
  * The Postfix SMTP client no longer appends the local domain when
    looking up a DNS name without ".".
  * The SMTP server now supports contact information that is appended
    to "reject" responses: smtpd_reject_footer
  * Postfix by default no longer adds a "To: undisclosed-recipients:;"
    header when no recipient specified in the message header.
  * tls support:
    o The Postfix SMTP server now always re-computes the SASL mechanism
      list after successful completion of the STARTTLS command.
    o The smtpd_starttls_timeout default value is now stress-dependent.
    o Postfix no longer appends the system-supplied default CA certificates
      to the lists specified with *_tls_CAfile or with *_tls_CApath.
  * New feature: Prototype postscreen(8) server that runs a number
    of time-consuming checks in parallel for all incoming SMTP connections,
    before clients are allowed to talk to a real Postfix SMTP server.
    It detects clients that start talking too soon, or clients that appear

OBS-URL: https://build.opensuse.org/package/show/server:mail/postfix?expand=0&rev=62
This commit is contained in:
Peter Varkoly 2011-03-30 22:00:52 +00:00 committed by Git OBS Bridge
parent 121418f3c3
commit 11539d9c10
6 changed files with 202 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

265
dynamic_maps.patch
View File

@ -1,6 +1,6 @@
diff -ruN postfix-2.7.0-ORIG/conf/dynamicmaps.cf postfix-2.7.0/conf/dynamicmaps.cf diff -ruN postfix-2.8.2/conf/dynamicmaps.cf postfix-2.8.2-dynamic_maps//conf/dynamicmaps.cf
--- postfix-2.7.0-ORIG/conf/dynamicmaps.cf 1970-01-01 01:00:00.000000000 +0100 --- postfix-2.8.2/conf/dynamicmaps.cf 1970-01-01 01:00:00.000000000 +0100
+++ postfix-2.7.0/conf/dynamicmaps.cf 2010-02-25 16:49:10.249798675 +0100 +++ postfix-2.8.2-dynamic_maps//conf/dynamicmaps.cf 2011-03-30 16:02:04.352769373 +0200
@@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
+# Postfix dynamic maps configuration file. +# Postfix dynamic maps configuration file.
+# +#
@ -9,9 +9,9 @@ diff -ruN postfix-2.7.0-ORIG/conf/dynamicmaps.cf postfix-2.7.0/conf/dynamicmaps.
+# +#
+#type location of .so file open function (mkmap func) +#type location of .so file open function (mkmap func)
+#==== ================================ ============= ============ +#==== ================================ ============= ============
diff -ruN postfix-2.7.0-ORIG/conf/postfix-files postfix-2.7.0/conf/postfix-files diff -ruN postfix-2.8.2/conf/postfix-files postfix-2.8.2-dynamic_maps//conf/postfix-files
--- postfix-2.7.0-ORIG/conf/postfix-files 2010-02-03 22:05:49.000000000 +0100 --- postfix-2.8.2/conf/postfix-files 2010-12-29 22:40:32.000000000 +0100
+++ postfix-2.7.0/conf/postfix-files 2010-02-25 16:49:10.250799165 +0100 +++ postfix-2.8.2-dynamic_maps//conf/postfix-files 2011-03-30 16:02:04.353769376 +0200
@@ -65,6 +65,11 @@ @@ -65,6 +65,11 @@
$queue_directory/trace:d:$mail_owner:-:700:ucr $queue_directory/trace:d:$mail_owner:-:700:ucr
$daemon_directory/anvil:f:root:-:755 $daemon_directory/anvil:f:root:-:755
@ -23,8 +23,8 @@ diff -ruN postfix-2.7.0-ORIG/conf/postfix-files postfix-2.7.0/conf/postfix-files
+$daemon_directory/dict_pgsql.so:f:root:-:755 +$daemon_directory/dict_pgsql.so:f:root:-:755
$daemon_directory/cleanup:f:root:-:755 $daemon_directory/cleanup:f:root:-:755
$daemon_directory/discard:f:root:-:755 $daemon_directory/discard:f:root:-:755
$daemon_directory/error:f:root:-:755 $daemon_directory/dnsblog:f:root:-:755
@@ -94,6 +99,11 @@ @@ -97,6 +102,11 @@
$daemon_directory/trivial-rewrite:f:root:-:755 $daemon_directory/trivial-rewrite:f:root:-:755
$daemon_directory/verify:f:root:-:755 $daemon_directory/verify:f:root:-:755
$daemon_directory/virtual:f:root:-:755 $daemon_directory/virtual:f:root:-:755
@ -36,7 +36,7 @@ diff -ruN postfix-2.7.0-ORIG/conf/postfix-files postfix-2.7.0/conf/postfix-files
$daemon_directory/nqmgr:h:$daemon_directory/qmgr $daemon_directory/nqmgr:h:$daemon_directory/qmgr
$daemon_directory/lmtp:h:$daemon_directory/smtp $daemon_directory/lmtp:h:$daemon_directory/smtp
$command_directory/postalias:f:root:-:755 $command_directory/postalias:f:root:-:755
@@ -117,6 +127,7 @@ @@ -120,6 +130,7 @@
$config_directory/aliases:f:root:-:644:p1 $config_directory/aliases:f:root:-:644:p1
$config_directory/bounce.cf.default:f:root:-:644:1 $config_directory/bounce.cf.default:f:root:-:644:1
$config_directory/canonical:f:root:-:644:p1 $config_directory/canonical:f:root:-:644:p1
@ -44,9 +44,9 @@ diff -ruN postfix-2.7.0-ORIG/conf/postfix-files postfix-2.7.0/conf/postfix-files
$config_directory/cidr_table:f:root:-:644:o $config_directory/cidr_table:f:root:-:644:o
$config_directory/generic:f:root:-:644:p1 $config_directory/generic:f:root:-:644:p1
$config_directory/generics:f:root:-:644:o $config_directory/generics:f:root:-:644:o
diff -ruN postfix-2.7.0-ORIG/src/dns/Makefile.in postfix-2.7.0/src/dns/Makefile.in diff -ruN postfix-2.8.2/src/dns/Makefile.in postfix-2.8.2-dynamic_maps//src/dns/Makefile.in
--- postfix-2.7.0-ORIG/src/dns/Makefile.in 2009-01-15 22:36:39.000000000 +0100 --- postfix-2.8.2/src/dns/Makefile.in 2011-01-09 23:12:00.000000000 +0100
+++ postfix-2.7.0/src/dns/Makefile.in 2010-02-25 16:49:10.251798887 +0100 +++ postfix-2.8.2-dynamic_maps//src/dns/Makefile.in 2011-03-30 16:02:04.360769372 +0200
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
LIB_DIR = ../../lib LIB_DIR = ../../lib
INC_DIR = ../../include INC_DIR = ../../include
@ -70,10 +70,10 @@ diff -ruN postfix-2.7.0-ORIG/src/dns/Makefile.in postfix-2.7.0/src/dns/Makefile.
update: $(LIB_DIR)/$(LIB) $(HDRS) update: $(LIB_DIR)/$(LIB) $(HDRS)
-for i in $(HDRS); \ -for i in $(HDRS); \
diff -ruN postfix-2.7.0-ORIG/src/global/mail_conf.c postfix-2.7.0/src/global/mail_conf.c diff -ruN postfix-2.8.2/src/global/mail_conf.c postfix-2.8.2-dynamic_maps//src/global/mail_conf.c
--- postfix-2.7.0-ORIG/src/global/mail_conf.c 2009-01-20 02:50:44.000000000 +0100 --- postfix-2.8.2/src/global/mail_conf.c 2011-01-08 02:49:33.000000000 +0100
+++ postfix-2.7.0/src/global/mail_conf.c 2010-02-25 16:49:10.252799517 +0100 +++ postfix-2.8.2-dynamic_maps//src/global/mail_conf.c 2011-03-30 16:02:04.361769374 +0200
@@ -182,6 +182,13 @@ @@ -190,6 +190,13 @@
path = concatenate(var_config_dir, "/", "main.cf", (char *) 0); path = concatenate(var_config_dir, "/", "main.cf", (char *) 0);
dict_load_file(CONFIG_DICT, path); dict_load_file(CONFIG_DICT, path);
myfree(path); myfree(path);
@ -87,10 +87,10 @@ diff -ruN postfix-2.7.0-ORIG/src/global/mail_conf.c postfix-2.7.0/src/global/mai
} }
/* mail_conf_flush - discard configuration dictionary */ /* mail_conf_flush - discard configuration dictionary */
diff -ruN postfix-2.7.0-ORIG/src/global/mail_dict.c postfix-2.7.0/src/global/mail_dict.c diff -ruN postfix-2.8.2/src/global/mail_dict.c postfix-2.8.2-dynamic_maps//src/global/mail_dict.c
--- postfix-2.7.0-ORIG/src/global/mail_dict.c 2008-01-08 22:07:47.000000000 +0100 --- postfix-2.8.2/src/global/mail_dict.c 2010-06-17 22:48:34.000000000 +0200
+++ postfix-2.7.0/src/global/mail_dict.c 2010-02-25 16:49:10.252799517 +0100 +++ postfix-2.8.2-dynamic_maps//src/global/mail_dict.c 2011-03-30 16:02:04.361769374 +0200
@@ -45,6 +45,7 @@ @@ -46,6 +46,7 @@
static const DICT_OPEN_INFO dict_open_info[] = { static const DICT_OPEN_INFO dict_open_info[] = {
DICT_TYPE_PROXY, dict_proxy_open, DICT_TYPE_PROXY, dict_proxy_open,
@ -98,17 +98,17 @@ diff -ruN postfix-2.7.0-ORIG/src/global/mail_dict.c postfix-2.7.0/src/global/mai
#ifdef HAS_LDAP #ifdef HAS_LDAP
DICT_TYPE_LDAP, dict_ldap_open, DICT_TYPE_LDAP, dict_ldap_open,
#endif #endif
@@ -54,6 +55,7 @@ @@ -58,6 +59,7 @@
#ifdef HAS_PGSQL #ifdef HAS_SQLITE
DICT_TYPE_PGSQL, dict_pgsql_open, DICT_TYPE_SQLITE, dict_sqlite_open,
#endif #endif
+#endif /* MAX_DYNAMIC_MAPS */ +#endif /* MAX_DYNAMIC_MAPS */
0, 0,
}; };
diff -ruN postfix-2.7.0-ORIG/src/global/mail_params.c postfix-2.7.0/src/global/mail_params.c diff -ruN postfix-2.8.2/src/global/mail_params.c postfix-2.8.2-dynamic_maps//src/global/mail_params.c
--- postfix-2.7.0-ORIG/src/global/mail_params.c 2009-12-25 23:29:15.000000000 +0100 --- postfix-2.8.2/src/global/mail_params.c 2010-12-06 00:02:15.000000000 +0100
+++ postfix-2.7.0/src/global/mail_params.c 2010-02-25 16:49:10.254799101 +0100 +++ postfix-2.8.2-dynamic_maps//src/global/mail_params.c 2011-03-30 16:02:04.362769375 +0200
@@ -79,6 +79,7 @@ @@ -79,6 +79,7 @@
/* char *var_export_environ; /* char *var_export_environ;
/* char *var_debug_peer_list; /* char *var_debug_peer_list;
@ -133,19 +133,28 @@ diff -ruN postfix-2.7.0-ORIG/src/global/mail_params.c postfix-2.7.0/src/global/m
char *var_trace_service; char *var_trace_service;
char *var_proxymap_service; char *var_proxymap_service;
char *var_proxywrite_service; char *var_proxywrite_service;
diff -ruN postfix-2.7.0-ORIG/src/global/Makefile.in postfix-2.7.0/src/global/Makefile.in diff -ruN postfix-2.8.2/src/global/Makefile.in postfix-2.8.2-dynamic_maps//src/global/Makefile.in
--- postfix-2.7.0-ORIG/src/global/Makefile.in 2009-10-07 02:09:52.000000000 +0200 --- postfix-2.8.2/src/global/Makefile.in 2011-01-10 21:28:32.000000000 +0100
+++ postfix-2.7.0/src/global/Makefile.in 2010-02-25 16:49:10.256799034 +0100 +++ postfix-2.8.2-dynamic_maps//src/global/Makefile.in 2011-03-30 16:29:42.254738307 +0200
@@ -34,7 +34,7 @@ @@ -3,7 +3,7 @@
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 \
- deliver_request.c dict_ldap.c dict_mysql.c dict_pgsql.c \
+ deliver_request.c \
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 @@
canon_addr.o cfg_parser.o cleanup_strerror.o cleanup_strflags.o \ 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 \ 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 \ defer.o deliver_completed.o deliver_flock.o deliver_pass.o \
- deliver_request.o dict_ldap.o dict_mysql.o dict_pgsql.o \ - deliver_request.o dict_ldap.o dict_mysql.o dict_pgsql.o \
+ deliver_request.o \ + deliver_request.o \
dict_proxy.o domain_list.o dot_lockfile.o dot_lockfile_as.o \ 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 \ 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 \ ehlo_mask.o ext_prop.o file_id.o flush_clnt.o header_opts.o \
@@ -104,10 +104,13 @@ @@ -106,10 +106,13 @@
LIB_DIR = ../../lib LIB_DIR = ../../lib
INC_DIR = ../../include INC_DIR = ../../include
MAKES = MAKES =
@ -161,7 +170,7 @@ diff -ruN postfix-2.7.0-ORIG/src/global/Makefile.in postfix-2.7.0/src/global/Mak
$(OBJS): ../../conf/makedefs.out $(OBJS): ../../conf/makedefs.out
@@ -117,14 +120,30 @@ @@ -119,14 +122,30 @@
test: $(TESTPROG) test: $(TESTPROG)
$(LIB): $(OBJS) $(LIB): $(OBJS)
@ -196,7 +205,7 @@ diff -ruN postfix-2.7.0-ORIG/src/global/Makefile.in postfix-2.7.0/src/global/Mak
-for i in $(HDRS); \ -for i in $(HDRS); \
do \ do \
cmp -s $$i $(INC_DIR)/$$i 2>/dev/null || cp $$i $(INC_DIR); \ cmp -s $$i $(INC_DIR)/$$i 2>/dev/null || cp $$i $(INC_DIR); \
@@ -492,7 +511,7 @@ @@ -497,7 +516,7 @@
lint $(DEFS) $(SRCS) $(LINTFIX) lint $(DEFS) $(SRCS) $(LINTFIX)
clean: clean:
@ -205,9 +214,9 @@ diff -ruN postfix-2.7.0-ORIG/src/global/Makefile.in postfix-2.7.0/src/global/Mak
rm -rf printfck rm -rf printfck
tidy: clean tidy: clean
diff -ruN postfix-2.7.0-ORIG/src/global/mkmap_open.c postfix-2.7.0/src/global/mkmap_open.c diff -ruN postfix-2.8.2/src/global/mkmap_open.c postfix-2.8.2-dynamic_maps//src/global/mkmap_open.c
--- postfix-2.7.0-ORIG/src/global/mkmap_open.c 2008-01-08 23:08:45.000000000 +0100 --- postfix-2.8.2/src/global/mkmap_open.c 2008-01-08 23:08:45.000000000 +0100
+++ postfix-2.7.0/src/global/mkmap_open.c 2010-02-25 16:49:10.257798547 +0100 +++ postfix-2.8.2-dynamic_maps//src/global/mkmap_open.c 2011-03-30 16:02:04.365769372 +0200
@@ -81,7 +81,7 @@ @@ -81,7 +81,7 @@
* We use a different table (in dict_open.c) when querying maps. * We use a different table (in dict_open.c) when querying maps.
*/ */
@ -234,9 +243,9 @@ diff -ruN postfix-2.7.0-ORIG/src/global/mkmap_open.c postfix-2.7.0/src/global/mk
if (strcmp(type, mp->type) == 0) if (strcmp(type, mp->type) == 0)
break; break;
} }
diff -ruN postfix-2.7.0-ORIG/src/master/Makefile.in postfix-2.7.0/src/master/Makefile.in diff -ruN postfix-2.8.2/src/master/Makefile.in postfix-2.8.2-dynamic_maps//src/master/Makefile.in
--- postfix-2.7.0-ORIG/src/master/Makefile.in 2009-07-12 00:56:43.000000000 +0200 --- postfix-2.8.2/src/master/Makefile.in 2011-01-09 23:12:02.000000000 +0100
+++ postfix-2.7.0/src/master/Makefile.in 2010-02-25 16:49:10.258798758 +0100 +++ postfix-2.8.2-dynamic_maps//src/master/Makefile.in 2011-03-30 16:02:04.365769372 +0200
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
INC_DIR = ../../include INC_DIR = ../../include
BIN_DIR = ../../libexec BIN_DIR = ../../libexec
@ -260,9 +269,9 @@ diff -ruN postfix-2.7.0-ORIG/src/master/Makefile.in postfix-2.7.0/src/master/Mak
$(BIN_DIR)/$(PROG): $(PROG) $(BIN_DIR)/$(PROG): $(PROG)
cp $(PROG) $(BIN_DIR) cp $(PROG) $(BIN_DIR)
diff -ruN postfix-2.7.0-ORIG/src/milter/Makefile.in postfix-2.7.0/src/milter/Makefile.in diff -ruN postfix-2.8.2/src/milter/Makefile.in postfix-2.8.2-dynamic_maps//src/milter/Makefile.in
--- postfix-2.7.0-ORIG/src/milter/Makefile.in 2009-01-15 22:36:39.000000000 +0100 --- postfix-2.8.2/src/milter/Makefile.in 2011-01-09 23:12:02.000000000 +0100
+++ postfix-2.7.0/src/milter/Makefile.in 2010-02-25 16:49:10.258798758 +0100 +++ postfix-2.8.2-dynamic_maps//src/milter/Makefile.in 2011-03-30 16:02:04.366769372 +0200
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
INC_DIR = ../../include INC_DIR = ../../include
MAKES = MAKES =
@ -286,10 +295,10 @@ diff -ruN postfix-2.7.0-ORIG/src/milter/Makefile.in postfix-2.7.0/src/milter/Mak
update: $(LIB_DIR)/$(LIB) $(HDRS) update: $(LIB_DIR)/$(LIB) $(HDRS)
-for i in $(HDRS); \ -for i in $(HDRS); \
diff -ruN postfix-2.7.0-ORIG/src/postconf/postconf.c postfix-2.7.0/src/postconf/postconf.c diff -ruN postfix-2.8.2/src/postconf/postconf.c postfix-2.8.2-dynamic_maps//src/postconf/postconf.c
--- postfix-2.7.0-ORIG/src/postconf/postconf.c 2009-12-31 20:02:14.000000000 +0100 --- postfix-2.8.2/src/postconf/postconf.c 2010-09-12 01:05:00.000000000 +0200
+++ postfix-2.7.0/src/postconf/postconf.c 2010-02-25 16:49:10.259796734 +0100 +++ postfix-2.8.2-dynamic_maps//src/postconf/postconf.c 2011-03-30 16:02:04.366769372 +0200
@@ -965,6 +965,16 @@ @@ -1013,6 +1013,16 @@
{ {
ARGV *maps_argv; ARGV *maps_argv;
int i; int i;
@ -306,9 +315,9 @@ diff -ruN postfix-2.7.0-ORIG/src/postconf/postconf.c postfix-2.7.0/src/postconf/
maps_argv = dict_mapnames(); maps_argv = dict_mapnames();
for (i = 0; i < maps_argv->argc; i++) for (i = 0; i < maps_argv->argc; i++)
diff -ruN postfix-2.7.0-ORIG/src/postmap/postmap.c postfix-2.7.0/src/postmap/postmap.c diff -ruN postfix-2.8.2/src/postmap/postmap.c postfix-2.8.2-dynamic_maps//src/postmap/postmap.c
--- postfix-2.7.0-ORIG/src/postmap/postmap.c 2009-04-17 22:04:00.000000000 +0200 --- postfix-2.8.2/src/postmap/postmap.c 2009-04-17 22:04:00.000000000 +0200
+++ postfix-2.7.0/src/postmap/postmap.c 2010-02-25 16:49:10.259796734 +0100 +++ postfix-2.8.2-dynamic_maps//src/postmap/postmap.c 2011-03-30 16:02:04.367769372 +0200
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
/* Postfix lookup table management /* Postfix lookup table management
/* SYNOPSIS /* SYNOPSIS
@ -425,10 +434,10 @@ diff -ruN postfix-2.7.0-ORIG/src/postmap/postmap.c postfix-2.7.0/src/postmap/pos
} else { /* create/update map(s) */ } else { /* create/update map(s) */
if (optind + 1 > argc) if (optind + 1 > argc)
usage(argv[0]); usage(argv[0]);
diff -ruN postfix-2.7.0-ORIG/src/tls/Makefile.in postfix-2.7.0/src/tls/Makefile.in diff -ruN postfix-2.8.2/src/tls/Makefile.in postfix-2.8.2-dynamic_maps//src/tls/Makefile.in
--- postfix-2.7.0-ORIG/src/tls/Makefile.in 2009-01-15 22:36:39.000000000 +0100 --- postfix-2.8.2/src/tls/Makefile.in 2011-01-16 00:09:55.000000000 +0100
+++ postfix-2.7.0/src/tls/Makefile.in 2010-02-25 16:49:10.259796734 +0100 +++ postfix-2.8.2-dynamic_maps//src/tls/Makefile.in 2011-03-30 16:02:04.368769372 +0200
@@ -22,7 +22,7 @@ @@ -24,7 +24,7 @@
INC_DIR = ../../include INC_DIR = ../../include
MAKES = MAKES =
@ -437,7 +446,7 @@ diff -ruN postfix-2.7.0-ORIG/src/tls/Makefile.in postfix-2.7.0/src/tls/Makefile.
all: $(LIB) all: $(LIB)
@@ -38,12 +38,10 @@ @@ -40,12 +40,10 @@
root_tests: root_tests:
$(LIB): $(OBJS) $(LIB): $(OBJS)
@ -451,10 +460,10 @@ diff -ruN postfix-2.7.0-ORIG/src/tls/Makefile.in postfix-2.7.0/src/tls/Makefile.
update: $(LIB_DIR)/$(LIB) $(HDRS) update: $(LIB_DIR)/$(LIB) $(HDRS)
-for i in $(HDRS); \ -for i in $(HDRS); \
diff -ruN postfix-2.7.0-ORIG/src/tls/tls_client.c postfix-2.7.0/src/tls/tls_client.c diff -ruN postfix-2.8.2/src/tls/tls_client.c postfix-2.8.2-dynamic_maps//src/tls/tls_client.c
--- postfix-2.7.0-ORIG/src/tls/tls_client.c 2008-11-09 00:51:41.000000000 +0100 --- postfix-2.8.2/src/tls/tls_client.c 2010-12-31 00:02:03.000000000 +0100
+++ postfix-2.7.0/src/tls/tls_client.c 2010-02-25 16:49:10.260796037 +0100 +++ postfix-2.8.2-dynamic_maps//src/tls/tls_client.c 2011-03-30 16:02:04.369769372 +0200
@@ -155,6 +155,8 @@ @@ -156,6 +156,8 @@
#define STR vstring_str #define STR vstring_str
#define LEN VSTRING_LEN #define LEN VSTRING_LEN
@ -463,10 +472,10 @@ diff -ruN postfix-2.7.0-ORIG/src/tls/tls_client.c postfix-2.7.0/src/tls/tls_clie
/* load_clnt_session - load session from client cache (non-callback) */ /* load_clnt_session - load session from client cache (non-callback) */
static SSL_SESSION *load_clnt_session(TLS_SESS_STATE *TLScontext) static SSL_SESSION *load_clnt_session(TLS_SESS_STATE *TLScontext)
diff -ruN postfix-2.7.0-ORIG/src/tls/tls_server.c postfix-2.7.0/src/tls/tls_server.c diff -ruN postfix-2.8.2/src/tls/tls_server.c postfix-2.8.2-dynamic_maps//src/tls/tls_server.c
--- postfix-2.7.0-ORIG/src/tls/tls_server.c 2008-11-09 00:51:48.000000000 +0100 --- postfix-2.8.2/src/tls/tls_server.c 2011-02-07 16:38:33.000000000 +0100
+++ postfix-2.7.0/src/tls/tls_server.c 2010-02-25 16:49:10.260796037 +0100 +++ postfix-2.8.2-dynamic_maps//src/tls/tls_server.c 2011-03-30 16:02:04.370769372 +0200
@@ -124,6 +124,8 @@ @@ -155,6 +155,8 @@
#define STR(x) vstring_str(x) #define STR(x) vstring_str(x)
#define LEN(x) VSTRING_LEN(x) #define LEN(x) VSTRING_LEN(x)
@ -475,10 +484,10 @@ diff -ruN postfix-2.7.0-ORIG/src/tls/tls_server.c postfix-2.7.0/src/tls/tls_serv
/* Application-specific. */ /* Application-specific. */
/* /*
diff -ruN postfix-2.7.0-ORIG/src/util/dict_db.c postfix-2.7.0/src/util/dict_db.c diff -ruN postfix-2.8.2/src/util/dict_db.c postfix-2.8.2-dynamic_maps//src/util/dict_db.c
--- postfix-2.7.0-ORIG/src/util/dict_db.c 2010-01-02 22:28:08.000000000 +0100 --- postfix-2.8.2/src/util/dict_db.c 2010-09-04 20:48:52.000000000 +0200
+++ postfix-2.7.0/src/util/dict_db.c 2010-02-25 16:49:10.260796037 +0100 +++ postfix-2.8.2-dynamic_maps//src/util/dict_db.c 2011-03-30 16:02:04.371769372 +0200
@@ -675,6 +675,12 @@ @@ -676,6 +676,12 @@
msg_fatal("set DB cache size %d: %m", dict_db_cache_size); 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) 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); msg_fatal("set DB hash element count %d: %m", DICT_DB_NELM);
@ -491,9 +500,9 @@ diff -ruN postfix-2.7.0-ORIG/src/util/dict_db.c postfix-2.7.0/src/util/dict_db.c
#if DB_VERSION_MAJOR == 5 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0) #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) if ((errno = db->open(db, 0, db_path, 0, type, db_flags, 0644)) != 0)
msg_fatal("open database %s: %m", db_path); msg_fatal("open database %s: %m", db_path);
diff -ruN postfix-2.7.0-ORIG/src/util/dict_dbm.c postfix-2.7.0/src/util/dict_dbm.c diff -ruN postfix-2.8.2/src/util/dict_dbm.c postfix-2.8.2-dynamic_maps//src/util/dict_dbm.c
--- postfix-2.7.0-ORIG/src/util/dict_dbm.c 2009-12-24 23:53:04.000000000 +0100 --- postfix-2.8.2/src/util/dict_dbm.c 2009-12-24 23:53:04.000000000 +0100
+++ postfix-2.7.0/src/util/dict_dbm.c 2010-02-25 16:49:10.261795969 +0100 +++ postfix-2.8.2-dynamic_maps//src/util/dict_dbm.c 2011-03-30 16:02:04.371769372 +0200
@@ -409,6 +409,10 @@ @@ -409,6 +409,10 @@
char *dbm_path; char *dbm_path;
int lock_fd; int lock_fd;
@ -505,9 +514,9 @@ diff -ruN postfix-2.7.0-ORIG/src/util/dict_dbm.c postfix-2.7.0/src/util/dict_dbm
/* /*
* Note: DICT_FLAG_LOCK is used only by programs that do fine-grained (in * Note: DICT_FLAG_LOCK is used only by programs that do fine-grained (in
* the time domain) locking while accessing individual database records. * the time domain) locking while accessing individual database records.
diff -ruN postfix-2.7.0-ORIG/src/util/dict.h postfix-2.7.0/src/util/dict.h diff -ruN postfix-2.8.2/src/util/dict.h postfix-2.8.2-dynamic_maps//src/util/dict.h
--- postfix-2.7.0-ORIG/src/util/dict.h 2007-12-03 20:42:26.000000000 +0100 --- postfix-2.8.2/src/util/dict.h 2007-12-03 20:42:26.000000000 +0100
+++ postfix-2.7.0/src/util/dict.h 2010-02-25 16:49:10.261795969 +0100 +++ postfix-2.8.2-dynamic_maps//src/util/dict.h 2011-03-30 16:02:04.372769372 +0200
@@ -66,6 +66,7 @@ @@ -66,6 +66,7 @@
#define DICT_FLAG_NO_UNAUTH (1<<13) /* disallow unauthenticated data */ #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_FIX (1<<14) /* case-fold key with fixed-case map */
@ -528,9 +537,9 @@ diff -ruN postfix-2.7.0-ORIG/src/util/dict.h postfix-2.7.0/src/util/dict.h
#define dict_get(dp, key) ((const char *) (dp)->lookup((dp), (key))) #define dict_get(dp, key) ((const char *) (dp)->lookup((dp), (key)))
#define dict_put(dp, key, val) (dp)->update((dp), (key), (val)) #define dict_put(dp, key, val) (dp)->update((dp), (key), (val))
diff -ruN postfix-2.7.0-ORIG/src/util/dict_open.c postfix-2.7.0/src/util/dict_open.c diff -ruN postfix-2.8.2/src/util/dict_open.c postfix-2.8.2-dynamic_maps//src/util/dict_open.c
--- postfix-2.7.0-ORIG/src/util/dict_open.c 2010-02-10 01:21:30.000000000 +0100 --- postfix-2.8.2/src/util/dict_open.c 2010-09-11 23:49:58.000000000 +0200
+++ postfix-2.7.0/src/util/dict_open.c 2010-02-25 16:49:10.262796668 +0100 +++ postfix-2.8.2-dynamic_maps//src/util/dict_open.c 2011-03-30 16:02:04.373769372 +0200
@@ -44,6 +44,8 @@ @@ -44,6 +44,8 @@
/* DICT *(*open) (const char *, int, int); /* DICT *(*open) (const char *, int, int);
/* /*
@ -540,7 +549,7 @@ diff -ruN postfix-2.7.0-ORIG/src/util/dict_open.c postfix-2.7.0/src/util/dict_op
/* DESCRIPTION /* DESCRIPTION
/* This module implements a low-level interface to multiple /* This module implements a low-level interface to multiple
/* physical dictionary types. /* physical dictionary types.
@@ -159,6 +161,9 @@ @@ -161,6 +163,9 @@
/* /*
/* dict_mapnames() returns a sorted list with the names of all available /* dict_mapnames() returns a sorted list with the names of all available
/* dictionary types. /* dictionary types.
@ -550,7 +559,7 @@ diff -ruN postfix-2.7.0-ORIG/src/util/dict_open.c postfix-2.7.0/src/util/dict_op
/* DIAGNOSTICS /* DIAGNOSTICS
/* Fatal error: open error, unsupported dictionary type, attempt to /* Fatal error: open error, unsupported dictionary type, attempt to
/* update non-writable dictionary. /* update non-writable dictionary.
@@ -183,6 +188,9 @@ @@ -185,6 +190,9 @@
#include <strings.h> #include <strings.h>
#endif #endif
@ -560,7 +569,7 @@ diff -ruN postfix-2.7.0-ORIG/src/util/dict_open.c postfix-2.7.0/src/util/dict_op
/* Utility library. */ /* Utility library. */
#include <argv.h> #include <argv.h>
@@ -208,6 +216,27 @@ @@ -211,6 +219,27 @@
#include <split_at.h> #include <split_at.h>
#include <htable.h> #include <htable.h>
@ -588,7 +597,7 @@ diff -ruN postfix-2.7.0-ORIG/src/util/dict_open.c postfix-2.7.0/src/util/dict_op
/* /*
* lookup table for available map types. * lookup table for available map types.
*/ */
@@ -223,7 +252,9 @@ @@ -226,7 +255,9 @@
DICT_TYPE_ENVIRON, dict_env_open, DICT_TYPE_ENVIRON, dict_env_open,
DICT_TYPE_HT, dict_ht_open, DICT_TYPE_HT, dict_ht_open,
DICT_TYPE_UNIX, dict_unix_open, DICT_TYPE_UNIX, dict_unix_open,
@ -598,7 +607,7 @@ diff -ruN postfix-2.7.0-ORIG/src/util/dict_open.c postfix-2.7.0/src/util/dict_op
#ifdef HAS_SDBM #ifdef HAS_SDBM
DICT_TYPE_SDBM, dict_sdbm_open, DICT_TYPE_SDBM, dict_sdbm_open,
#endif #endif
@@ -243,9 +274,11 @@ @@ -246,9 +277,11 @@
#ifdef HAS_NETINFO #ifdef HAS_NETINFO
DICT_TYPE_NETINFO, dict_ni_open, DICT_TYPE_NETINFO, dict_ni_open,
#endif #endif
@ -610,7 +619,7 @@ diff -ruN postfix-2.7.0-ORIG/src/util/dict_open.c postfix-2.7.0/src/util/dict_op
#ifdef HAS_POSIX_REGEXP #ifdef HAS_POSIX_REGEXP
DICT_TYPE_REGEXP, dict_regexp_open, DICT_TYPE_REGEXP, dict_regexp_open,
#endif #endif
@@ -303,8 +336,31 @@ @@ -307,8 +340,31 @@
dict_type, dict_name); dict_type, dict_name);
if (dict_open_hash == 0) if (dict_open_hash == 0)
dict_open_init(); dict_open_init();
@ -644,7 +653,7 @@ diff -ruN postfix-2.7.0-ORIG/src/util/dict_open.c postfix-2.7.0/src/util/dict_op
if ((dict = dp->open(dict_name, open_flags, dict_flags)) == 0) if ((dict = dp->open(dict_name, open_flags, dict_flags)) == 0)
msg_fatal("opening %s:%s %m", dict_type, dict_name); msg_fatal("opening %s:%s %m", dict_type, dict_name);
if (msg_verbose) if (msg_verbose)
@@ -312,6 +368,36 @@ @@ -316,6 +372,36 @@
return (dict); return (dict);
} }
@ -681,7 +690,7 @@ diff -ruN postfix-2.7.0-ORIG/src/util/dict_open.c postfix-2.7.0/src/util/dict_op
/* dict_open_register - register dictionary type */ /* dict_open_register - register dictionary type */
void dict_open_register(const char *type, void dict_open_register(const char *type,
@@ -345,6 +431,9 @@ @@ -349,6 +435,9 @@
HTABLE_INFO **ht; HTABLE_INFO **ht;
DICT_OPEN_INFO *dp; DICT_OPEN_INFO *dp;
ARGV *mapnames; ARGV *mapnames;
@ -691,7 +700,7 @@ diff -ruN postfix-2.7.0-ORIG/src/util/dict_open.c postfix-2.7.0/src/util/dict_op
if (dict_open_hash == 0) if (dict_open_hash == 0)
dict_open_init(); dict_open_init();
@@ -353,6 +442,13 @@ @@ -357,6 +446,13 @@
dp = (DICT_OPEN_INFO *) ht[0]->value; dp = (DICT_OPEN_INFO *) ht[0]->value;
argv_add(mapnames, dp->type, ARGV_END); argv_add(mapnames, dp->type, ARGV_END);
} }
@ -705,7 +714,7 @@ diff -ruN postfix-2.7.0-ORIG/src/util/dict_open.c postfix-2.7.0/src/util/dict_op
qsort((void *) mapnames->argv, mapnames->argc, sizeof(mapnames->argv[0]), qsort((void *) mapnames->argv, mapnames->argc, sizeof(mapnames->argv[0]),
dict_sort_alpha_cpp); dict_sort_alpha_cpp);
myfree((char *) ht_info); myfree((char *) ht_info);
@@ -360,6 +456,87 @@ @@ -364,6 +460,87 @@
return mapnames; return mapnames;
} }
@ -793,9 +802,9 @@ diff -ruN postfix-2.7.0-ORIG/src/util/dict_open.c postfix-2.7.0/src/util/dict_op
#ifdef TEST #ifdef TEST
/* /*
diff -ruN postfix-2.7.0-ORIG/src/util/load_lib.c postfix-2.7.0/src/util/load_lib.c diff -ruN postfix-2.8.2/src/util/load_lib.c postfix-2.8.2-dynamic_maps//src/util/load_lib.c
--- postfix-2.7.0-ORIG/src/util/load_lib.c 1970-01-01 01:00:00.000000000 +0100 --- postfix-2.8.2/src/util/load_lib.c 1970-01-01 01:00:00.000000000 +0100
+++ postfix-2.7.0/src/util/load_lib.c 2010-02-25 16:49:10.262796668 +0100 +++ postfix-2.8.2-dynamic_maps//src/util/load_lib.c 2011-03-30 16:02:04.374769372 +0200
@@ -0,0 +1,135 @@ @@ -0,0 +1,135 @@
+/*++ +/*++
+/* NAME +/* NAME
@ -932,9 +941,9 @@ diff -ruN postfix-2.7.0-ORIG/src/util/load_lib.c postfix-2.7.0/src/util/load_lib
+#endif +#endif
+ return 0; + return 0;
+} +}
diff -ruN postfix-2.7.0-ORIG/src/util/load_lib.h postfix-2.7.0/src/util/load_lib.h diff -ruN postfix-2.8.2/src/util/load_lib.h postfix-2.8.2-dynamic_maps//src/util/load_lib.h
--- postfix-2.7.0-ORIG/src/util/load_lib.h 1970-01-01 01:00:00.000000000 +0100 --- postfix-2.8.2/src/util/load_lib.h 1970-01-01 01:00:00.000000000 +0100
+++ postfix-2.7.0/src/util/load_lib.h 2010-02-25 16:49:10.262796668 +0100 +++ postfix-2.8.2-dynamic_maps//src/util/load_lib.h 2011-03-30 16:02:04.374769372 +0200
@@ -0,0 +1,41 @@ @@ -0,0 +1,41 @@
+#ifndef _LOAD_LIB_H_INCLUDED_ +#ifndef _LOAD_LIB_H_INCLUDED_
+#define _LOAD_LIB_H_INCLUDED_ +#define _LOAD_LIB_H_INCLUDED_
@ -977,15 +986,16 @@ diff -ruN postfix-2.7.0-ORIG/src/util/load_lib.h postfix-2.7.0/src/util/load_lib
+/*--*/ +/*--*/
+ +
+#endif +#endif
diff -ruN postfix-2.7.0-ORIG/src/util/Makefile.in postfix-2.7.0/src/util/Makefile.in diff -ruN postfix-2.8.2/src/util/Makefile.in postfix-2.8.2-dynamic_maps//src/util/Makefile.in
--- postfix-2.7.0-ORIG/src/util/Makefile.in 2010-01-03 00:50:06.000000000 +0100 --- postfix-2.8.2/src/util/Makefile.in 2011-01-10 21:14:50.000000000 +0100
+++ postfix-2.7.0/src/util/Makefile.in 2010-02-25 16:50:22.897798754 +0100 +++ postfix-2.8.2-dynamic_maps//src/util/Makefile.in 2011-03-30 16:28:24.508739763 +0200
@@ -32,15 +32,15 @@ @@ -33,15 +33,16 @@
write_buf.c write_wait.c sane_basename.c format_tv.c allspace.c \ allascii.c load_file.c killme_after.c vstream_tweak.c \
allascii.c load_file.c killme_after.c vstream_tweak.c upass_connect.c \ unix_pass_listen.c unix_pass_trigger.c edit_file.c inet_windowsize.c \
upass_listen.c upass_trigger.c edit_file.c inet_windowsize.c \ unix_pass_fd_fix.c dict_cache.c valid_utf_8.c dict_thash.c \
- unix_pass_fd_fix.c dict_cache.c - ip_match.c nbbio.c stream_pass_connect.c
+ unix_pass_fd_fix.c dict_cache.c load_lib.c sdbm.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 \ 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_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 \ attr_scan_plain.o auto_clnt.o base64_code.o basename.o binhash.o \
@ -999,16 +1009,17 @@ diff -ruN postfix-2.7.0-ORIG/src/util/Makefile.in postfix-2.7.0/src/util/Makefil
dummy_write.o duplex_pipe.o environ.o events.o exec_command.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 \ 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 \ fullname.o get_domainname.o get_hostname.o hex_code.o hex_quote.o \
@@ -66,7 +66,7 @@ @@ -68,7 +69,8 @@
write_buf.o write_wait.o sane_basename.o format_tv.o allspace.o \ allascii.o load_file.o killme_after.o vstream_tweak.o \
allascii.o load_file.o killme_after.o vstream_tweak.o upass_connect.o \ unix_pass_listen.o unix_pass_trigger.o edit_file.o inet_windowsize.o \
upass_listen.o upass_trigger.o edit_file.o inet_windowsize.o \ unix_pass_fd_fix.o dict_cache.o valid_utf_8.o dict_thash.o \
- unix_pass_fd_fix.o dict_cache.o - ip_match.o nbbio.o stream_pass_connect.o
+ unix_pass_fd_fix.o dict_cache.o load_lib.o sdbm.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 \ 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 \ 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 \ dict_cdb.h dict_cidr.h dict_db.h dict_dbm.h dict_env.h dict_ht.h \
@@ -80,7 +80,7 @@ @@ -82,7 +84,7 @@
msg_output.h msg_syslog.h msg_vstream.h mvect.h myaddrinfo.h myflock.h \ 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 \ 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 \ open_as.h open_lock.h percentm.h posix_signals.h readlline.h ring.h \
@ -1017,7 +1028,7 @@ diff -ruN postfix-2.7.0-ORIG/src/util/Makefile.in postfix-2.7.0/src/util/Makefil
sane_socketpair.h sane_time.h scan_dir.h set_eugid.h set_ugid.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 \ 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 \ stringops.h sys_defs.h timed_connect.h timed_wait.h trigger.h \
@@ -93,6 +93,8 @@ @@ -96,6 +98,8 @@
CFLAGS = $(DEBUG) $(OPT) $(DEFS) CFLAGS = $(DEBUG) $(OPT) $(DEFS)
FILES = Makefile $(SRCS) $(HDRS) FILES = Makefile $(SRCS) $(HDRS)
INCL = INCL =
@ -1026,7 +1037,7 @@ diff -ruN postfix-2.7.0-ORIG/src/util/Makefile.in postfix-2.7.0/src/util/Makefil
LIB = libutil.a LIB = libutil.a
TESTPROG= dict_open dup2_pass_on_exec events exec_command fifo_open \ TESTPROG= dict_open dup2_pass_on_exec events exec_command fifo_open \
fifo_rdonly_bug fifo_rdwr_bug fifo_trigger fsspace fullname \ fifo_rdonly_bug fifo_rdwr_bug fifo_trigger fsspace fullname \
@@ -108,10 +110,11 @@ @@ -111,10 +115,11 @@
LIB_DIR = ../../lib LIB_DIR = ../../lib
INC_DIR = ../../include INC_DIR = ../../include
@ -1040,7 +1051,7 @@ diff -ruN postfix-2.7.0-ORIG/src/util/Makefile.in postfix-2.7.0/src/util/Makefil
$(OBJS): ../../conf/makedefs.out $(OBJS): ../../conf/makedefs.out
@@ -120,15 +123,25 @@ @@ -123,15 +128,25 @@
test: $(TESTPROG) test: $(TESTPROG)
@ -1070,8 +1081,8 @@ diff -ruN postfix-2.7.0-ORIG/src/util/Makefile.in postfix-2.7.0/src/util/Makefil
-for i in $(HDRS); \ -for i in $(HDRS); \
do \ do \
cmp -s $$i $(INC_DIR)/$$i 2>/dev/null || cp $$i $(INC_DIR); \ cmp -s $$i $(INC_DIR)/$$i 2>/dev/null || cp $$i $(INC_DIR); \
@@ -150,7 +163,8 @@ @@ -153,7 +168,8 @@
lint $(SRCS) lint $(DEFS) $(SRCS) $(LINTFIX)
clean: clean:
- rm -f *.o $(LIB) *core $(TESTPROG) junk $(MAKES) *.tmp - rm -f *.o $(LIB) *core $(TESTPROG) junk $(MAKES) *.tmp
@ -1080,9 +1091,9 @@ diff -ruN postfix-2.7.0-ORIG/src/util/Makefile.in postfix-2.7.0/src/util/Makefil
rm -rf printfck rm -rf printfck
tidy: clean tidy: clean
diff -ruN postfix-2.7.0-ORIG/src/util/sdbm.c postfix-2.7.0/src/util/sdbm.c diff -ruN postfix-2.8.2/src/util/sdbm.c postfix-2.8.2-dynamic_maps//src/util/sdbm.c
--- postfix-2.7.0-ORIG/src/util/sdbm.c 1970-01-01 01:00:00.000000000 +0100 --- postfix-2.8.2/src/util/sdbm.c 1970-01-01 01:00:00.000000000 +0100
+++ postfix-2.7.0/src/util/sdbm.c 2010-02-25 16:49:10.264796671 +0100 +++ postfix-2.8.2-dynamic_maps//src/util/sdbm.c 2011-03-30 16:02:04.377769372 +0200
@@ -0,0 +1,972 @@ @@ -0,0 +1,972 @@
+/*++ +/*++
+/* NAME +/* NAME
@ -2056,9 +2067,9 @@ diff -ruN postfix-2.7.0-ORIG/src/util/sdbm.c postfix-2.7.0/src/util/sdbm.c
+ return db; + return db;
+} +}
+ +
diff -ruN postfix-2.7.0-ORIG/src/util/sdbm.h postfix-2.7.0/src/util/sdbm.h diff -ruN postfix-2.8.2/src/util/sdbm.h postfix-2.8.2-dynamic_maps//src/util/sdbm.h
--- postfix-2.7.0-ORIG/src/util/sdbm.h 1970-01-01 01:00:00.000000000 +0100 --- postfix-2.8.2/src/util/sdbm.h 1970-01-01 01:00:00.000000000 +0100
+++ postfix-2.7.0/src/util/sdbm.h 2010-02-25 16:49:10.264796671 +0100 +++ postfix-2.8.2-dynamic_maps//src/util/sdbm.h 2011-03-30 16:02:04.378769372 +0200
@@ -0,0 +1,97 @@ @@ -0,0 +1,97 @@
+/*++ +/*++
+/* NAME +/* NAME
@ -2157,10 +2168,10 @@ diff -ruN postfix-2.7.0-ORIG/src/util/sdbm.h postfix-2.7.0/src/util/sdbm.h
+#define BADMESS /* generate a message for worst case: +#define BADMESS /* generate a message for worst case:
+ cannot make room after SPLTMAX splits */ + cannot make room after SPLTMAX splits */
+#endif /* UTIL_SDBM_H */ +#endif /* UTIL_SDBM_H */
diff -ruN postfix-2.7.0-ORIG/src/util/sys_defs.h postfix-2.7.0/src/util/sys_defs.h diff -ruN postfix-2.8.2/src/util/sys_defs.h postfix-2.8.2-dynamic_maps//src/util/sys_defs.h
--- postfix-2.7.0-ORIG/src/util/sys_defs.h 2009-11-15 00:32:37.000000000 +0100 --- postfix-2.8.2/src/util/sys_defs.h 2011-03-01 20:10:46.000000000 +0100
+++ postfix-2.7.0/src/util/sys_defs.h 2010-02-25 16:49:10.265796533 +0100 +++ postfix-2.8.2-dynamic_maps//src/util/sys_defs.h 2011-03-30 16:02:04.379769372 +0200
@@ -715,6 +715,7 @@ @@ -720,6 +720,7 @@
#define INTERNAL_LOCK MYFLOCK_STYLE_FLOCK #define INTERNAL_LOCK MYFLOCK_STYLE_FLOCK
#define DEF_MAILBOX_LOCK "fcntl, dotlock" /* RedHat >= 4.x */ #define DEF_MAILBOX_LOCK "fcntl, dotlock" /* RedHat >= 4.x */
#define HAS_FSYNC #define HAS_FSYNC
@ -2168,7 +2179,7 @@ diff -ruN postfix-2.7.0-ORIG/src/util/sys_defs.h postfix-2.7.0/src/util/sys_defs
#define HAS_DB #define HAS_DB
#define DEF_DB_TYPE "hash" #define DEF_DB_TYPE "hash"
#define ALIAS_DB_MAP "hash:/etc/aliases" #define ALIAS_DB_MAP "hash:/etc/aliases"
@@ -726,11 +727,25 @@ @@ -731,11 +732,25 @@
#define STATFS_IN_SYS_VFS_H #define STATFS_IN_SYS_VFS_H
#define PREPEND_PLUS_TO_OPTSTRING #define PREPEND_PLUS_TO_OPTSTRING
#define HAS_POSIX_REGEXP #define HAS_POSIX_REGEXP
@ -2194,7 +2205,7 @@ diff -ruN postfix-2.7.0-ORIG/src/util/sys_defs.h postfix-2.7.0/src/util/sys_defs
#ifdef __GLIBC_PREREQ #ifdef __GLIBC_PREREQ
# define HAVE_GLIBC_API_VERSION_SUPPORT(maj, min) __GLIBC_PREREQ(maj, min) # define HAVE_GLIBC_API_VERSION_SUPPORT(maj, min) __GLIBC_PREREQ(maj, min)
#else #else
@@ -896,6 +911,7 @@ @@ -901,6 +916,7 @@
#define USE_STATFS #define USE_STATFS
#define STATFS_IN_SYS_VFS_H #define STATFS_IN_SYS_VFS_H
#define HAS_POSIX_REGEXP #define HAS_POSIX_REGEXP
@ -2202,7 +2213,7 @@ diff -ruN postfix-2.7.0-ORIG/src/util/sys_defs.h postfix-2.7.0/src/util/sys_defs
#define NATIVE_SENDMAIL_PATH "/usr/sbin/sendmail" #define NATIVE_SENDMAIL_PATH "/usr/sbin/sendmail"
#define NATIVE_MAILQ_PATH "/usr/bin/mailq" #define NATIVE_MAILQ_PATH "/usr/bin/mailq"
#define NATIVE_NEWALIAS_PATH "/usr/bin/newaliases" #define NATIVE_NEWALIAS_PATH "/usr/bin/newaliases"
@@ -933,6 +949,7 @@ @@ -938,6 +954,7 @@
#define USE_STATFS #define USE_STATFS
#define STATFS_IN_SYS_VFS_H #define STATFS_IN_SYS_VFS_H
#define HAS_POSIX_REGEXP #define HAS_POSIX_REGEXP
@ -2210,7 +2221,7 @@ diff -ruN postfix-2.7.0-ORIG/src/util/sys_defs.h postfix-2.7.0/src/util/sys_defs
#define NATIVE_SENDMAIL_PATH "/usr/sbin/sendmail" #define NATIVE_SENDMAIL_PATH "/usr/sbin/sendmail"
#define NATIVE_MAILQ_PATH "/usr/bin/mailq" #define NATIVE_MAILQ_PATH "/usr/bin/mailq"
#define NATIVE_NEWALIAS_PATH "/usr/bin/newaliases" #define NATIVE_NEWALIAS_PATH "/usr/bin/newaliases"
@@ -972,6 +989,7 @@ @@ -977,6 +994,7 @@
#define USE_STATFS #define USE_STATFS
#define STATFS_IN_SYS_VFS_H #define STATFS_IN_SYS_VFS_H
#define HAS_POSIX_REGEXP #define HAS_POSIX_REGEXP

58
pointer_to_literals.patch
View File

@ -1,9 +1,7 @@
Nur in postfix-2.3.2/: FILE_TO_FIX. 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
Nur in postfix-2.3.2-orig/: postfix-2.3.0. --- postfix-2.8.2-dynamic_maps_pie/src/cleanup/cleanup_message.c 2010-07-27 22:34:20.000000000 +0200
diff -r -u postfix-2.3.2-orig/src/cleanup/cleanup_message.c postfix-2.3.2/src/cleanup/cleanup_message.c +++ postfix-2.8.2-pointer_to_literals/src/cleanup/cleanup_message.c 2011-03-30 23:10:42.774254791 +0200
--- postfix-2.3.2-orig/src/cleanup/cleanup_message.c 2006-06-15 20:07:15.000000000 +0200 @@ -290,7 +290,7 @@
+++ postfix-2.3.2/src/cleanup/cleanup_message.c 2007-03-05 18:10:32.000000000 +0100
@@ -288,7 +288,7 @@
while (*optional_text && ISSPACE(*optional_text)) while (*optional_text && ISSPACE(*optional_text))
optional_text++; optional_text++;
@ -12,9 +10,10 @@ diff -r -u postfix-2.3.2-orig/src/cleanup/cleanup_message.c postfix-2.3.2/src/cl
#define CLEANUP_ACT_DROP 0 #define CLEANUP_ACT_DROP 0
/* /*
diff -r -u postfix-2.3.2-orig/src/local/local_expand.c postfix-2.3.2/src/local/local_expand.c Nur in postfix-2.8.2-pointer_to_literals/src/cleanup: cleanup_message.c.orig.
--- postfix-2.3.2-orig/src/local/local_expand.c 2005-05-31 15:44:14.000000000 +0200 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.3.2/src/local/local_expand.c 2007-03-05 17:59:03.000000000 +0100 --- 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 @@ @@ -114,7 +114,7 @@
{ {
LOCAL_EXP *local = (LOCAL_EXP *) ptr; LOCAL_EXP *local = (LOCAL_EXP *) ptr;
@ -24,10 +23,10 @@ diff -r -u postfix-2.3.2-orig/src/local/local_expand.c postfix-2.3.2/src/local/l
if (STREQ(name, "user")) { if (STREQ(name, "user")) {
return (local->state->msg_attr.user); return (local->state->msg_attr.user);
diff -r -u postfix-2.3.2-orig/src/smtpd/smtpd_check.c postfix-2.3.2/src/smtpd/smtpd_check.c 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.3.2-orig/src/smtpd/smtpd_check.c 2006-07-07 22:32:43.000000000 +0200 --- postfix-2.8.2-dynamic_maps_pie/src/smtpd/smtpd_check.c 2011-01-04 20:03:50.000000000 +0100
+++ postfix-2.3.2/src/smtpd/smtpd_check.c 2007-03-07 13:36:48.000000000 +0100 +++ postfix-2.8.2-pointer_to_literals/src/smtpd/smtpd_check.c 2011-03-30 23:12:46.513254818 +0200
@@ -353,6 +353,10 @@ @@ -359,6 +359,10 @@
#define CONST_STR(x) ((const char *) vstring_str(x)) #define CONST_STR(x) ((const char *) vstring_str(x))
#define UPDATE_STRING(ptr,val) { if (ptr) myfree(ptr); ptr = mystrdup(val); } #define UPDATE_STRING(ptr,val) { if (ptr) myfree(ptr); ptr = mystrdup(val); }
@ -38,7 +37,7 @@ diff -r -u postfix-2.3.2-orig/src/smtpd/smtpd_check.c postfix-2.3.2/src/smtpd/sm
/* /*
* If some decision can't be made due to a temporary error, then change * If some decision can't be made due to a temporary error, then change
* other decisions into deferrals. * other decisions into deferrals.
@@ -1928,8 +1932,6 @@ @@ -1950,8 +1954,6 @@
if (msg_verbose) if (msg_verbose)
msg_info("%s: %s %s %s", myname, table, value, datum); msg_info("%s: %s %s %s", myname, table, value, datum);
@ -47,26 +46,19 @@ diff -r -u postfix-2.3.2-orig/src/smtpd/smtpd_check.c postfix-2.3.2/src/smtpd/sm
/* /*
* DUNNO means skip this table. Silently ignore optional text. * DUNNO means skip this table. Silently ignore optional text.
*/ */
@@ -2767,7 +2769,6 @@ @@ -2934,8 +2936,6 @@
/* SMTPD_RBL_EXPAND_CONTEXT *rbl_exp = (SMTPD_RBL_EXPAND_CONTEXT *) context;
* "sender_name" or "recipient_name". SMTPD_STATE *state = rbl_exp->state;
*/
-#define STREQ(x,y) (*(x) == *(y) && strcmp((x), (y)) == 0) -#define STREQ(x,y) (*(x) == *(y) && strcmp((x), (y)) == 0)
-
if (state->expand_buf == 0)
state->expand_buf = vstring_alloc(10);
else if (STREQ(suffix, MAIL_ATTR_S_NAME)) { 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
if (*addr) { --- postfix-2.8.2-dynamic_maps_pie/src/util/dict_open.c 2011-03-30 16:02:04.373769372 +0200
@@ -2817,7 +2818,6 @@ +++ postfix-2.8.2-pointer_to_literals/src/util/dict_open.c 2011-03-30 23:10:42.787254814 +0200
if (msg_verbose > 1) @@ -461,7 +461,7 @@
msg_info("smtpd_expand_lookup: ${%s}", name);
-#define STREQN(x,y,n) (*(x) == *(y) && strncmp((x), (y), (n)) == 0)
#define CONST_LEN(x) (sizeof(x) - 1)
/*
diff -r -u postfix-2.3.2-orig/src/util/dict_open.c postfix-2.3.2/src/util/dict_open.c
--- postfix-2.3.2-orig/src/util/dict_open.c 2007-03-05 17:09:12.000000000 +0100
+++ postfix-2.3.2/src/util/dict_open.c 2007-03-05 18:07:42.000000000 +0100
@@ -454,7 +454,7 @@
} }
#ifndef NO_DYNAMIC_MAPS #ifndef NO_DYNAMIC_MAPS
@ -75,4 +67,4 @@ diff -r -u postfix-2.3.2-orig/src/util/dict_open.c postfix-2.3.2/src/util/dict_o
void dict_open_dlinfo(const char *path) void dict_open_dlinfo(const char *path)
{ {
Nur in postfix-2.3.2/: TOFIX. Nur in postfix-2.8.2-pointer_to_literals/src/util: dict_open.c.orig.

3
postfix-2.7.2.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:39be135564bd9d6d11b64bc9bf97b4da70abf14e9a8a0f97da5f8de3012a9617
size 2481850

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

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:88c165c1ae0627bf094e97cbea93269f6cd4461992d202eb3b7c4b1e413ada08
size 2705977

34
postfix.changes
View File

@ -1,3 +1,37 @@
-------------------------------------------------------------------
Wed Mar 30 21:21:16 UTC 2011 - varkoly@novell.com
- update to 2.8.2
* DNSBL/DNSWL:
o Support for address patterns in DNS blacklist and whitelist lookup results.
o The Postfix SMTP server now supports DNS-based whitelisting with several safety features
* Support for read-only sqlite database access.
* Alias expansion:
o Postfix now reports a temporary delivery error when the result
of virtual alias expansion would exceed the virtual_alias_recursion_limit
or virtual_alias_expansion_limit.
o To avoid repeated delivery to mailing lists with pathological
nested alias configurations, the local(8) delivery agent now keeps
the owner-alias attribute of a parent alias, when delivering mail
to a child alias that does not have its own owner alias.
* The Postfix SMTP client no longer appends the local domain when
looking up a DNS name without ".".
* The SMTP server now supports contact information that is appended
to "reject" responses: smtpd_reject_footer
* Postfix by default no longer adds a "To: undisclosed-recipients:;"
header when no recipient specified in the message header.
* tls support:
o The Postfix SMTP server now always re-computes the SASL mechanism
list after successful completion of the STARTTLS command.
o The smtpd_starttls_timeout default value is now stress-dependent.
o Postfix no longer appends the system-supplied default CA certificates
to the lists specified with *_tls_CAfile or with *_tls_CApath.
* New feature: Prototype postscreen(8) server that runs a number
of time-consuming checks in parallel for all incoming SMTP connections,
before clients are allowed to talk to a real Postfix SMTP server.
It detects clients that start talking too soon, or clients that appear
on DNS blocklists, or clients that hang up without sending any command.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 10 11:43:28 UTC 2011 - varkoly@novell.com Thu Feb 10 11:43:28 UTC 2011 - varkoly@novell.com

4
postfix.spec
View File

@ -21,8 +21,8 @@
Name: postfix Name: postfix
Summary: A fast, secure, and flexible mailer Summary: A fast, secure, and flexible mailer
Version: 2.7.2 Version: 2.8.2
Release: 2 Release: 3
License: IBM Public License .. License: IBM Public License ..
Group: Productivity/Networking/Email/Servers Group: Productivity/Networking/Email/Servers
Url: http://www.postfix.org/ Url: http://www.postfix.org/