diff --git a/dynamic_maps.patch b/dynamic_maps.patch index 4e6b754..361f119 100644 --- a/dynamic_maps.patch +++ b/dynamic_maps.patch @@ -1,6 +1,6 @@ -diff -ruN postfix-2.8.2/conf/dynamicmaps.cf postfix-2.8.2-dynamic_maps//conf/dynamicmaps.cf ---- postfix-2.8.2/conf/dynamicmaps.cf 1970-01-01 01:00:00.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//conf/dynamicmaps.cf 2011-03-30 16:02:04.352769373 +0200 +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 @@ -0,0 +1,7 @@ +# Postfix dynamic maps configuration file. +# @@ -9,9 +9,9 @@ diff -ruN postfix-2.8.2/conf/dynamicmaps.cf postfix-2.8.2-dynamic_maps//conf/dyn +# +#type location of .so file open function (mkmap func) +#==== ================================ ============= ============ -diff -ruN postfix-2.8.2/conf/postfix-files postfix-2.8.2-dynamic_maps//conf/postfix-files ---- postfix-2.8.2/conf/postfix-files 2010-12-29 22:40:32.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//conf/postfix-files 2011-03-30 16:02:04.353769376 +0200 +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 @@ $queue_directory/trace:d:$mail_owner:-:700:ucr $daemon_directory/anvil:f:root:-:755 @@ -44,9 +44,9 @@ diff -ruN postfix-2.8.2/conf/postfix-files postfix-2.8.2-dynamic_maps//conf/post $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.2/src/dns/Makefile.in postfix-2.8.2-dynamic_maps//src/dns/Makefile.in ---- postfix-2.8.2/src/dns/Makefile.in 2011-01-09 23:12:00.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//src/dns/Makefile.in 2011-03-30 16:02:04.360769372 +0200 +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 @@ LIB_DIR = ../../lib INC_DIR = ../../include @@ -70,9 +70,9 @@ diff -ruN postfix-2.8.2/src/dns/Makefile.in postfix-2.8.2-dynamic_maps//src/dns/ update: $(LIB_DIR)/$(LIB) $(HDRS) -for i in $(HDRS); \ -diff -ruN postfix-2.8.2/src/global/mail_conf.c postfix-2.8.2-dynamic_maps//src/global/mail_conf.c ---- postfix-2.8.2/src/global/mail_conf.c 2011-01-08 02:49:33.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//src/global/mail_conf.c 2011-03-30 16:02:04.361769374 +0200 +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); @@ -87,9 +87,9 @@ diff -ruN postfix-2.8.2/src/global/mail_conf.c postfix-2.8.2-dynamic_maps//src/g } /* mail_conf_flush - discard configuration dictionary */ -diff -ruN postfix-2.8.2/src/global/mail_dict.c postfix-2.8.2-dynamic_maps//src/global/mail_dict.c ---- postfix-2.8.2/src/global/mail_dict.c 2010-06-17 22:48:34.000000000 +0200 -+++ postfix-2.8.2-dynamic_maps//src/global/mail_dict.c 2011-03-30 16:02:04.361769374 +0200 +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[] = { @@ -106,9 +106,9 @@ diff -ruN postfix-2.8.2/src/global/mail_dict.c postfix-2.8.2-dynamic_maps//src/g 0, }; -diff -ruN postfix-2.8.2/src/global/mail_params.c postfix-2.8.2-dynamic_maps//src/global/mail_params.c ---- postfix-2.8.2/src/global/mail_params.c 2010-12-06 00:02:15.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//src/global/mail_params.c 2011-03-30 16:02:04.362769375 +0200 +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; @@ -133,9 +133,9 @@ diff -ruN postfix-2.8.2/src/global/mail_params.c postfix-2.8.2-dynamic_maps//src char *var_trace_service; char *var_proxymap_service; char *var_proxywrite_service; -diff -ruN postfix-2.8.2/src/global/Makefile.in postfix-2.8.2-dynamic_maps//src/global/Makefile.in ---- postfix-2.8.2/src/global/Makefile.in 2011-01-10 21:28:32.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//src/global/Makefile.in 2011-03-30 16:29:42.254738307 +0200 +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 @@ 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 \ @@ -214,9 +214,9 @@ diff -ruN postfix-2.8.2/src/global/Makefile.in postfix-2.8.2-dynamic_maps//src/g rm -rf printfck tidy: clean -diff -ruN postfix-2.8.2/src/global/mkmap_open.c postfix-2.8.2-dynamic_maps//src/global/mkmap_open.c ---- postfix-2.8.2/src/global/mkmap_open.c 2008-01-08 23:08:45.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//src/global/mkmap_open.c 2011-03-30 16:02:04.365769372 +0200 +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 @@ -81,7 +81,7 @@ * We use a different table (in dict_open.c) when querying maps. */ @@ -243,9 +243,9 @@ diff -ruN postfix-2.8.2/src/global/mkmap_open.c postfix-2.8.2-dynamic_maps//src/ if (strcmp(type, mp->type) == 0) break; } -diff -ruN postfix-2.8.2/src/master/Makefile.in postfix-2.8.2-dynamic_maps//src/master/Makefile.in ---- postfix-2.8.2/src/master/Makefile.in 2011-01-09 23:12:02.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//src/master/Makefile.in 2011-03-30 16:02:04.365769372 +0200 +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 @@ INC_DIR = ../../include BIN_DIR = ../../libexec @@ -269,9 +269,9 @@ diff -ruN postfix-2.8.2/src/master/Makefile.in postfix-2.8.2-dynamic_maps//src/m $(BIN_DIR)/$(PROG): $(PROG) cp $(PROG) $(BIN_DIR) -diff -ruN postfix-2.8.2/src/milter/Makefile.in postfix-2.8.2-dynamic_maps//src/milter/Makefile.in ---- postfix-2.8.2/src/milter/Makefile.in 2011-01-09 23:12:02.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//src/milter/Makefile.in 2011-03-30 16:02:04.366769372 +0200 +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 @@ INC_DIR = ../../include MAKES = @@ -295,9 +295,9 @@ diff -ruN postfix-2.8.2/src/milter/Makefile.in postfix-2.8.2-dynamic_maps//src/m update: $(LIB_DIR)/$(LIB) $(HDRS) -for i in $(HDRS); \ -diff -ruN postfix-2.8.2/src/postconf/postconf.c postfix-2.8.2-dynamic_maps//src/postconf/postconf.c ---- postfix-2.8.2/src/postconf/postconf.c 2010-09-12 01:05:00.000000000 +0200 -+++ postfix-2.8.2-dynamic_maps//src/postconf/postconf.c 2011-03-30 16:02:04.366769372 +0200 +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 @@ { ARGV *maps_argv; @@ -315,9 +315,9 @@ diff -ruN postfix-2.8.2/src/postconf/postconf.c postfix-2.8.2-dynamic_maps//src/ maps_argv = dict_mapnames(); for (i = 0; i < maps_argv->argc; i++) -diff -ruN postfix-2.8.2/src/postmap/postmap.c postfix-2.8.2-dynamic_maps//src/postmap/postmap.c ---- postfix-2.8.2/src/postmap/postmap.c 2009-04-17 22:04:00.000000000 +0200 -+++ postfix-2.8.2-dynamic_maps//src/postmap/postmap.c 2011-03-30 16:02:04.367769372 +0200 +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 @@ -5,7 +5,7 @@ /* Postfix lookup table management /* SYNOPSIS @@ -434,9 +434,9 @@ diff -ruN postfix-2.8.2/src/postmap/postmap.c postfix-2.8.2-dynamic_maps//src/po } else { /* create/update map(s) */ if (optind + 1 > argc) usage(argv[0]); -diff -ruN postfix-2.8.2/src/tls/Makefile.in postfix-2.8.2-dynamic_maps//src/tls/Makefile.in ---- postfix-2.8.2/src/tls/Makefile.in 2011-01-16 00:09:55.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//src/tls/Makefile.in 2011-03-30 16:02:04.368769372 +0200 +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 @@ INC_DIR = ../../include MAKES = @@ -460,9 +460,9 @@ diff -ruN postfix-2.8.2/src/tls/Makefile.in postfix-2.8.2-dynamic_maps//src/tls/ update: $(LIB_DIR)/$(LIB) $(HDRS) -for i in $(HDRS); \ -diff -ruN postfix-2.8.2/src/tls/tls_client.c postfix-2.8.2-dynamic_maps//src/tls/tls_client.c ---- postfix-2.8.2/src/tls/tls_client.c 2010-12-31 00:02:03.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//src/tls/tls_client.c 2011-03-30 16:02:04.369769372 +0200 +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 @@ -156,6 +156,8 @@ #define STR vstring_str #define LEN VSTRING_LEN @@ -472,9 +472,9 @@ diff -ruN postfix-2.8.2/src/tls/tls_client.c postfix-2.8.2-dynamic_maps//src/tls /* 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.2/src/tls/tls_server.c postfix-2.8.2-dynamic_maps//src/tls/tls_server.c ---- postfix-2.8.2/src/tls/tls_server.c 2011-02-07 16:38:33.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//src/tls/tls_server.c 2011-03-30 16:02:04.370769372 +0200 +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 @@ -155,6 +155,8 @@ #define STR(x) vstring_str(x) #define LEN(x) VSTRING_LEN(x) @@ -484,9 +484,9 @@ diff -ruN postfix-2.8.2/src/tls/tls_server.c postfix-2.8.2-dynamic_maps//src/tls /* Application-specific. */ /* -diff -ruN postfix-2.8.2/src/util/dict_db.c postfix-2.8.2-dynamic_maps//src/util/dict_db.c ---- postfix-2.8.2/src/util/dict_db.c 2010-09-04 20:48:52.000000000 +0200 -+++ postfix-2.8.2-dynamic_maps//src/util/dict_db.c 2011-03-30 16:02:04.371769372 +0200 +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 @@ 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) @@ -500,9 +500,9 @@ diff -ruN postfix-2.8.2/src/util/dict_db.c postfix-2.8.2-dynamic_maps//src/util/ #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.2/src/util/dict_dbm.c postfix-2.8.2-dynamic_maps//src/util/dict_dbm.c ---- postfix-2.8.2/src/util/dict_dbm.c 2009-12-24 23:53:04.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//src/util/dict_dbm.c 2011-03-30 16:02:04.371769372 +0200 +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 @@ char *dbm_path; int lock_fd; @@ -514,18 +514,18 @@ diff -ruN postfix-2.8.2/src/util/dict_dbm.c postfix-2.8.2-dynamic_maps//src/util /* * 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.2/src/util/dict.h postfix-2.8.2-dynamic_maps//src/util/dict.h ---- postfix-2.8.2/src/util/dict.h 2007-12-03 20:42:26.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//src/util/dict.h 2011-03-30 16:02:04.372769372 +0200 +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 */ - /* IMPORTANT: Update the dict_mask[] table when the above changes */ -@@ -138,6 +139,11 @@ +@@ -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)); @@ -537,9 +537,9 @@ diff -ruN postfix-2.8.2/src/util/dict.h postfix-2.8.2-dynamic_maps//src/util/dic #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.2/src/util/dict_open.c postfix-2.8.2-dynamic_maps//src/util/dict_open.c ---- postfix-2.8.2/src/util/dict_open.c 2010-09-11 23:49:58.000000000 +0200 -+++ postfix-2.8.2-dynamic_maps//src/util/dict_open.c 2011-03-30 16:02:04.373769372 +0200 +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 @@ -44,6 +44,8 @@ /* DICT *(*open) (const char *, int, int); /* @@ -549,7 +549,7 @@ diff -ruN postfix-2.8.2/src/util/dict_open.c postfix-2.8.2-dynamic_maps//src/uti /* DESCRIPTION /* This module implements a low-level interface to multiple /* physical dictionary types. -@@ -161,6 +163,9 @@ +@@ -165,6 +167,9 @@ /* /* dict_mapnames() returns a sorted list with the names of all available /* dictionary types. @@ -559,7 +559,7 @@ diff -ruN postfix-2.8.2/src/util/dict_open.c postfix-2.8.2-dynamic_maps//src/uti /* DIAGNOSTICS /* Fatal error: open error, unsupported dictionary type, attempt to /* update non-writable dictionary. -@@ -185,6 +190,9 @@ +@@ -189,6 +194,9 @@ #include #endif @@ -569,9 +569,9 @@ diff -ruN postfix-2.8.2/src/util/dict_open.c postfix-2.8.2-dynamic_maps//src/uti /* Utility library. */ #include -@@ -211,6 +219,27 @@ - #include +@@ -216,6 +224,27 @@ #include + #include +#ifndef NO_DYNAMIC_MAPS +#include @@ -597,7 +597,7 @@ diff -ruN postfix-2.8.2/src/util/dict_open.c postfix-2.8.2-dynamic_maps//src/uti /* * lookup table for available map types. */ -@@ -226,7 +255,9 @@ +@@ -231,7 +260,9 @@ DICT_TYPE_ENVIRON, dict_env_open, DICT_TYPE_HT, dict_ht_open, DICT_TYPE_UNIX, dict_unix_open, @@ -607,7 +607,7 @@ diff -ruN postfix-2.8.2/src/util/dict_open.c postfix-2.8.2-dynamic_maps//src/uti #ifdef HAS_SDBM DICT_TYPE_SDBM, dict_sdbm_open, #endif -@@ -246,9 +277,11 @@ +@@ -251,9 +282,11 @@ #ifdef HAS_NETINFO DICT_TYPE_NETINFO, dict_ni_open, #endif @@ -619,7 +619,7 @@ diff -ruN postfix-2.8.2/src/util/dict_open.c postfix-2.8.2-dynamic_maps//src/uti #ifdef HAS_POSIX_REGEXP DICT_TYPE_REGEXP, dict_regexp_open, #endif -@@ -307,8 +340,31 @@ +@@ -312,8 +345,31 @@ dict_type, dict_name); if (dict_open_hash == 0) dict_open_init(); @@ -653,7 +653,7 @@ diff -ruN postfix-2.8.2/src/util/dict_open.c postfix-2.8.2-dynamic_maps//src/uti if ((dict = dp->open(dict_name, open_flags, dict_flags)) == 0) msg_fatal("opening %s:%s %m", dict_type, dict_name); if (msg_verbose) -@@ -316,6 +372,36 @@ +@@ -331,6 +387,36 @@ return (dict); } @@ -690,7 +690,7 @@ diff -ruN postfix-2.8.2/src/util/dict_open.c postfix-2.8.2-dynamic_maps//src/uti /* dict_open_register - register dictionary type */ void dict_open_register(const char *type, -@@ -349,6 +435,9 @@ +@@ -364,6 +450,9 @@ HTABLE_INFO **ht; DICT_OPEN_INFO *dp; ARGV *mapnames; @@ -700,7 +700,7 @@ diff -ruN postfix-2.8.2/src/util/dict_open.c postfix-2.8.2-dynamic_maps//src/uti if (dict_open_hash == 0) dict_open_init(); -@@ -357,6 +446,13 @@ +@@ -372,6 +461,13 @@ dp = (DICT_OPEN_INFO *) ht[0]->value; argv_add(mapnames, dp->type, ARGV_END); } @@ -714,7 +714,7 @@ diff -ruN postfix-2.8.2/src/util/dict_open.c postfix-2.8.2-dynamic_maps//src/uti qsort((void *) mapnames->argv, mapnames->argc, sizeof(mapnames->argv[0]), dict_sort_alpha_cpp); myfree((char *) ht_info); -@@ -364,6 +460,87 @@ +@@ -379,6 +475,87 @@ return mapnames; } @@ -802,9 +802,9 @@ diff -ruN postfix-2.8.2/src/util/dict_open.c postfix-2.8.2-dynamic_maps//src/uti #ifdef TEST /* -diff -ruN postfix-2.8.2/src/util/load_lib.c postfix-2.8.2-dynamic_maps//src/util/load_lib.c ---- postfix-2.8.2/src/util/load_lib.c 1970-01-01 01:00:00.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//src/util/load_lib.c 2011-03-30 16:02:04.374769372 +0200 +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 @@ -0,0 +1,135 @@ +/*++ +/* NAME @@ -941,9 +941,9 @@ diff -ruN postfix-2.8.2/src/util/load_lib.c postfix-2.8.2-dynamic_maps//src/util +#endif + return 0; +} -diff -ruN postfix-2.8.2/src/util/load_lib.h postfix-2.8.2-dynamic_maps//src/util/load_lib.h ---- postfix-2.8.2/src/util/load_lib.h 1970-01-01 01:00:00.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//src/util/load_lib.h 2011-03-30 16:02:04.374769372 +0200 +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 @@ -0,0 +1,41 @@ +#ifndef _LOAD_LIB_H_INCLUDED_ +#define _LOAD_LIB_H_INCLUDED_ @@ -986,9 +986,9 @@ diff -ruN postfix-2.8.2/src/util/load_lib.h postfix-2.8.2-dynamic_maps//src/util +/*--*/ + +#endif -diff -ruN postfix-2.8.2/src/util/Makefile.in postfix-2.8.2-dynamic_maps//src/util/Makefile.in ---- postfix-2.8.2/src/util/Makefile.in 2011-01-10 21:14:50.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//src/util/Makefile.in 2011-03-30 16:28:24.508739763 +0200 +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 \ @@ -1091,9 +1091,9 @@ diff -ruN postfix-2.8.2/src/util/Makefile.in postfix-2.8.2-dynamic_maps//src/uti rm -rf printfck tidy: clean -diff -ruN postfix-2.8.2/src/util/sdbm.c postfix-2.8.2-dynamic_maps//src/util/sdbm.c ---- postfix-2.8.2/src/util/sdbm.c 1970-01-01 01:00:00.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//src/util/sdbm.c 2011-03-30 16:02:04.377769372 +0200 +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 @@ -0,0 +1,972 @@ +/*++ +/* NAME @@ -2067,9 +2067,9 @@ diff -ruN postfix-2.8.2/src/util/sdbm.c postfix-2.8.2-dynamic_maps//src/util/sdb + return db; +} + -diff -ruN postfix-2.8.2/src/util/sdbm.h postfix-2.8.2-dynamic_maps//src/util/sdbm.h ---- postfix-2.8.2/src/util/sdbm.h 1970-01-01 01:00:00.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//src/util/sdbm.h 2011-03-30 16:02:04.378769372 +0200 +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 @@ -0,0 +1,97 @@ +/*++ +/* NAME @@ -2168,9 +2168,9 @@ diff -ruN postfix-2.8.2/src/util/sdbm.h postfix-2.8.2-dynamic_maps//src/util/sdb +#define BADMESS /* generate a message for worst case: + cannot make room after SPLTMAX splits */ +#endif /* UTIL_SDBM_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.8.2/src/util/sys_defs.h 2011-03-01 20:10:46.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//src/util/sys_defs.h 2011-03-30 16:02:04.379769372 +0200 +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 @@ #define INTERNAL_LOCK MYFLOCK_STYLE_FLOCK #define DEF_MAILBOX_LOCK "fcntl, dotlock" /* RedHat >= 4.x */ diff --git a/postfix-2.8.2.tar.bz2 b/postfix-2.8.2.tar.bz2 deleted file mode 100644 index 8e70477..0000000 --- a/postfix-2.8.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:88c165c1ae0627bf094e97cbea93269f6cd4461992d202eb3b7c4b1e413ada08 -size 2705977 diff --git a/postfix-2.8.3.tar.bz2 b/postfix-2.8.3.tar.bz2 new file mode 100644 index 0000000..fdf30df --- /dev/null +++ b/postfix-2.8.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a1cecf39698f952c102aca086c6fc4872cee4dcc5fa97a2b5e2bc13f4a55a6a +size 2707899 diff --git a/postfix.changes b/postfix.changes index 72cd07b..7d570f7 100644 --- a/postfix.changes +++ b/postfix.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 10 09:20:23 UTC 2011 - varkoly@novell.com + +- update to 2.8.3 - VUL-0: postfix memory corruption + ------------------------------------------------------------------- Sun Apr 10 07:00:18 UTC 2011 - varkoly@novell.com diff --git a/postfix.spec b/postfix.spec index 2504549..139a847 100644 --- a/postfix.spec +++ b/postfix.spec @@ -19,7 +19,7 @@ Name: postfix Summary: A fast, secure, and flexible mailer -Version: 2.8.2 +Version: 2.8.3 Release: 5 License: IBM Public License .. Group: Productivity/Networking/Email/Servers