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

Update to 2.7.0

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/server:mail/postfix?expand=0&rev=32
This commit is contained in:
Peter Varkoly 2010-02-25 16:02:00 +00:00 committed by Git OBS Bridge
parent bdfe879a59
commit 7dc2bd7a6a
4 changed files with 109 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

208
dynamic_maps.patch
View File

@ -1,6 +1,6 @@
diff -ruN postfix-2.6.1//conf/dynamicmaps.cf postfix-2.6.1-dynamic_maps.patch//conf/dynamicmaps.cf
--- postfix-2.6.1//conf/dynamicmaps.cf 1970-01-01 01:00:00.000000000 +0100
+++ postfix-2.6.1-dynamic_maps.patch//conf/dynamicmaps.cf 2009-05-27 12:50:33.000000000 +0200
diff -ruN postfix-2.7.0-ORIG/conf/dynamicmaps.cf postfix-2.7.0/conf/dynamicmaps.cf
--- postfix-2.7.0-ORIG/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
@@ -0,0 +1,7 @@
+# Postfix dynamic maps configuration file.
+#
@ -9,9 +9,9 @@ diff -ruN postfix-2.6.1//conf/dynamicmaps.cf postfix-2.6.1-dynamic_maps.patch//c
+#
+#type location of .so file open function (mkmap func)
+#==== ================================ ============= ============
diff -ruN postfix-2.6.1//conf/postfix-files postfix-2.6.1-dynamic_maps.patch//conf/postfix-files
--- postfix-2.6.1//conf/postfix-files 2009-02-14 03:08:16.000000000 +0100
+++ postfix-2.6.1-dynamic_maps.patch//conf/postfix-files 2009-05-27 12:55:33.000000000 +0200
diff -ruN postfix-2.7.0-ORIG/conf/postfix-files postfix-2.7.0/conf/postfix-files
--- postfix-2.7.0-ORIG/conf/postfix-files 2010-02-03 22:05:49.000000000 +0100
+++ postfix-2.7.0/conf/postfix-files 2010-02-25 16:49:10.250799165 +0100
@@ -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.6.1//conf/postfix-files postfix-2.6.1-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.6.1//src/dns/Makefile.in postfix-2.6.1-dynamic_maps.patch//src/dns/Makefile.in
--- postfix-2.6.1//src/dns/Makefile.in 2009-01-15 22:36:39.000000000 +0100
+++ postfix-2.6.1-dynamic_maps.patch//src/dns/Makefile.in 2009-05-27 12:50:33.000000000 +0200
diff -ruN postfix-2.7.0-ORIG/src/dns/Makefile.in postfix-2.7.0/src/dns/Makefile.in
--- postfix-2.7.0-ORIG/src/dns/Makefile.in 2009-01-15 22:36:39.000000000 +0100
+++ postfix-2.7.0/src/dns/Makefile.in 2010-02-25 16:49:10.251798887 +0100
@@ -14,7 +14,7 @@
LIB_DIR = ../../lib
INC_DIR = ../../include
@ -70,9 +70,9 @@ diff -ruN postfix-2.6.1//src/dns/Makefile.in postfix-2.6.1-dynamic_maps.patch//s
update: $(LIB_DIR)/$(LIB) $(HDRS)
-for i in $(HDRS); \
diff -ruN postfix-2.6.1//src/global/mail_conf.c postfix-2.6.1-dynamic_maps.patch//src/global/mail_conf.c
--- postfix-2.6.1//src/global/mail_conf.c 2009-01-20 02:50:44.000000000 +0100
+++ postfix-2.6.1-dynamic_maps.patch//src/global/mail_conf.c 2009-05-27 12:50:33.000000000 +0200
diff -ruN postfix-2.7.0-ORIG/src/global/mail_conf.c postfix-2.7.0/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.7.0/src/global/mail_conf.c 2010-02-25 16:49:10.252799517 +0100
@@ -182,6 +182,13 @@
path = concatenate(var_config_dir, "/", "main.cf", (char *) 0);
dict_load_file(CONFIG_DICT, path);
@ -87,9 +87,9 @@ diff -ruN postfix-2.6.1//src/global/mail_conf.c postfix-2.6.1-dynamic_maps.patch
}
/* mail_conf_flush - discard configuration dictionary */
diff -ruN postfix-2.6.1//src/global/mail_dict.c postfix-2.6.1-dynamic_maps.patch//src/global/mail_dict.c
--- postfix-2.6.1//src/global/mail_dict.c 2008-01-08 22:07:47.000000000 +0100
+++ postfix-2.6.1-dynamic_maps.patch//src/global/mail_dict.c 2009-05-27 12:50:33.000000000 +0200
diff -ruN postfix-2.7.0-ORIG/src/global/mail_dict.c postfix-2.7.0/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.7.0/src/global/mail_dict.c 2010-02-25 16:49:10.252799517 +0100
@@ -45,6 +45,7 @@
static const DICT_OPEN_INFO dict_open_info[] = {
@ -106,9 +106,9 @@ diff -ruN postfix-2.6.1//src/global/mail_dict.c postfix-2.6.1-dynamic_maps.patch
0,
};
diff -ruN postfix-2.6.1//src/global/mail_params.c postfix-2.6.1-dynamic_maps.patch//src/global/mail_params.c
--- postfix-2.6.1//src/global/mail_params.c 2009-01-22 22:16:49.000000000 +0100
+++ postfix-2.6.1-dynamic_maps.patch//src/global/mail_params.c 2009-05-27 12:50:33.000000000 +0200
diff -ruN postfix-2.7.0-ORIG/src/global/mail_params.c postfix-2.7.0/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.7.0/src/global/mail_params.c 2010-02-25 16:49:10.254799101 +0100
@@ -79,6 +79,7 @@
/* char *var_export_environ;
/* char *var_debug_peer_list;
@ -133,9 +133,9 @@ diff -ruN postfix-2.6.1//src/global/mail_params.c postfix-2.6.1-dynamic_maps.pat
char *var_trace_service;
char *var_proxymap_service;
char *var_proxywrite_service;
diff -ruN postfix-2.6.1//src/global/Makefile.in postfix-2.6.1-dynamic_maps.patch//src/global/Makefile.in
--- postfix-2.6.1//src/global/Makefile.in 2009-02-13 02:25:05.000000000 +0100
+++ postfix-2.6.1-dynamic_maps.patch//src/global/Makefile.in 2009-05-27 12:50:33.000000000 +0200
diff -ruN postfix-2.7.0-ORIG/src/global/Makefile.in postfix-2.7.0/src/global/Makefile.in
--- postfix-2.7.0-ORIG/src/global/Makefile.in 2009-10-07 02:09:52.000000000 +0200
+++ postfix-2.7.0/src/global/Makefile.in 2010-02-25 16:49:10.256799034 +0100
@@ -34,7 +34,7 @@
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 \
@ -145,7 +145,7 @@ diff -ruN postfix-2.6.1//src/global/Makefile.in postfix-2.6.1-dynamic_maps.patch
dict_proxy.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 \
@@ -103,10 +103,13 @@
@@ -104,10 +104,13 @@
LIB_DIR = ../../lib
INC_DIR = ../../include
MAKES =
@ -161,7 +161,7 @@ diff -ruN postfix-2.6.1//src/global/Makefile.in postfix-2.6.1-dynamic_maps.patch
$(OBJS): ../../conf/makedefs.out
@@ -116,14 +119,30 @@
@@ -117,14 +120,30 @@
test: $(TESTPROG)
$(LIB): $(OBJS)
@ -196,7 +196,7 @@ diff -ruN postfix-2.6.1//src/global/Makefile.in postfix-2.6.1-dynamic_maps.patch
-for i in $(HDRS); \
do \
cmp -s $$i $(INC_DIR)/$$i 2>/dev/null || cp $$i $(INC_DIR); \
@@ -491,7 +510,7 @@
@@ -492,7 +511,7 @@
lint $(DEFS) $(SRCS) $(LINTFIX)
clean:
@ -205,9 +205,9 @@ diff -ruN postfix-2.6.1//src/global/Makefile.in postfix-2.6.1-dynamic_maps.patch
rm -rf printfck
tidy: clean
diff -ruN postfix-2.6.1//src/global/mkmap_open.c postfix-2.6.1-dynamic_maps.patch//src/global/mkmap_open.c
--- postfix-2.6.1//src/global/mkmap_open.c 2008-01-08 23:08:45.000000000 +0100
+++ postfix-2.6.1-dynamic_maps.patch//src/global/mkmap_open.c 2009-05-27 12:50:33.000000000 +0200
diff -ruN postfix-2.7.0-ORIG/src/global/mkmap_open.c postfix-2.7.0/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.7.0/src/global/mkmap_open.c 2010-02-25 16:49:10.257798547 +0100
@@ -81,7 +81,7 @@
* We use a different table (in dict_open.c) when querying maps.
*/
@ -234,9 +234,9 @@ diff -ruN postfix-2.6.1//src/global/mkmap_open.c postfix-2.6.1-dynamic_maps.patc
if (strcmp(type, mp->type) == 0)
break;
}
diff -ruN postfix-2.6.1//src/master/Makefile.in postfix-2.6.1-dynamic_maps.patch//src/master/Makefile.in
--- postfix-2.6.1//src/master/Makefile.in 2009-01-15 22:36:39.000000000 +0100
+++ postfix-2.6.1-dynamic_maps.patch//src/master/Makefile.in 2009-05-27 12:50:33.000000000 +0200
diff -ruN postfix-2.7.0-ORIG/src/master/Makefile.in postfix-2.7.0/src/master/Makefile.in
--- postfix-2.7.0-ORIG/src/master/Makefile.in 2009-07-12 00:56:43.000000000 +0200
+++ postfix-2.7.0/src/master/Makefile.in 2010-02-25 16:49:10.258798758 +0100
@@ -20,7 +20,7 @@
INC_DIR = ../../include
BIN_DIR = ../../libexec
@ -260,9 +260,9 @@ diff -ruN postfix-2.6.1//src/master/Makefile.in postfix-2.6.1-dynamic_maps.patch
$(BIN_DIR)/$(PROG): $(PROG)
cp $(PROG) $(BIN_DIR)
diff -ruN postfix-2.6.1//src/milter/Makefile.in postfix-2.6.1-dynamic_maps.patch//src/milter/Makefile.in
--- postfix-2.6.1//src/milter/Makefile.in 2009-01-15 22:36:39.000000000 +0100
+++ postfix-2.6.1-dynamic_maps.patch//src/milter/Makefile.in 2009-05-27 12:50:33.000000000 +0200
diff -ruN postfix-2.7.0-ORIG/src/milter/Makefile.in postfix-2.7.0/src/milter/Makefile.in
--- postfix-2.7.0-ORIG/src/milter/Makefile.in 2009-01-15 22:36:39.000000000 +0100
+++ postfix-2.7.0/src/milter/Makefile.in 2010-02-25 16:49:10.258798758 +0100
@@ -14,7 +14,7 @@
INC_DIR = ../../include
MAKES =
@ -286,10 +286,10 @@ diff -ruN postfix-2.6.1//src/milter/Makefile.in postfix-2.6.1-dynamic_maps.patch
update: $(LIB_DIR)/$(LIB) $(HDRS)
-for i in $(HDRS); \
diff -ruN postfix-2.6.1//src/postconf/postconf.c postfix-2.6.1-dynamic_maps.patch//src/postconf/postconf.c
--- postfix-2.6.1//src/postconf/postconf.c 2009-02-13 02:49:27.000000000 +0100
+++ postfix-2.6.1-dynamic_maps.patch//src/postconf/postconf.c 2009-05-27 12:50:33.000000000 +0200
@@ -962,6 +962,16 @@
diff -ruN postfix-2.7.0-ORIG/src/postconf/postconf.c postfix-2.7.0/src/postconf/postconf.c
--- postfix-2.7.0-ORIG/src/postconf/postconf.c 2009-12-31 20:02:14.000000000 +0100
+++ postfix-2.7.0/src/postconf/postconf.c 2010-02-25 16:49:10.259796734 +0100
@@ -965,6 +965,16 @@
{
ARGV *maps_argv;
int i;
@ -306,9 +306,9 @@ diff -ruN postfix-2.6.1//src/postconf/postconf.c postfix-2.6.1-dynamic_maps.patc
maps_argv = dict_mapnames();
for (i = 0; i < maps_argv->argc; i++)
diff -ruN postfix-2.6.1//src/postmap/postmap.c postfix-2.6.1-dynamic_maps.patch//src/postmap/postmap.c
--- postfix-2.6.1//src/postmap/postmap.c 2009-04-17 22:04:00.000000000 +0200
+++ postfix-2.6.1-dynamic_maps.patch//src/postmap/postmap.c 2009-05-27 12:59:50.000000000 +0200
diff -ruN postfix-2.7.0-ORIG/src/postmap/postmap.c postfix-2.7.0/src/postmap/postmap.c
--- postfix-2.7.0-ORIG/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
@@ -5,7 +5,7 @@
/* Postfix lookup table management
/* SYNOPSIS
@ -425,9 +425,9 @@ diff -ruN postfix-2.6.1//src/postmap/postmap.c postfix-2.6.1-dynamic_maps.patch/
} else { /* create/update map(s) */
if (optind + 1 > argc)
usage(argv[0]);
diff -ruN postfix-2.6.1//src/tls/Makefile.in postfix-2.6.1-dynamic_maps.patch//src/tls/Makefile.in
--- postfix-2.6.1//src/tls/Makefile.in 2009-01-15 22:36:39.000000000 +0100
+++ postfix-2.6.1-dynamic_maps.patch//src/tls/Makefile.in 2009-05-27 12:50:33.000000000 +0200
diff -ruN postfix-2.7.0-ORIG/src/tls/Makefile.in postfix-2.7.0/src/tls/Makefile.in
--- postfix-2.7.0-ORIG/src/tls/Makefile.in 2009-01-15 22:36:39.000000000 +0100
+++ postfix-2.7.0/src/tls/Makefile.in 2010-02-25 16:49:10.259796734 +0100
@@ -22,7 +22,7 @@
INC_DIR = ../../include
MAKES =
@ -451,9 +451,9 @@ diff -ruN postfix-2.6.1//src/tls/Makefile.in postfix-2.6.1-dynamic_maps.patch//s
update: $(LIB_DIR)/$(LIB) $(HDRS)
-for i in $(HDRS); \
diff -ruN postfix-2.6.1//src/tls/tls_client.c postfix-2.6.1-dynamic_maps.patch//src/tls/tls_client.c
--- postfix-2.6.1//src/tls/tls_client.c 2008-11-09 00:51:41.000000000 +0100
+++ postfix-2.6.1-dynamic_maps.patch//src/tls/tls_client.c 2009-05-27 12:50:33.000000000 +0200
diff -ruN postfix-2.7.0-ORIG/src/tls/tls_client.c postfix-2.7.0/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.7.0/src/tls/tls_client.c 2010-02-25 16:49:10.260796037 +0100
@@ -155,6 +155,8 @@
#define STR vstring_str
#define LEN VSTRING_LEN
@ -463,9 +463,9 @@ diff -ruN postfix-2.6.1//src/tls/tls_client.c postfix-2.6.1-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.6.1//src/tls/tls_server.c postfix-2.6.1-dynamic_maps.patch//src/tls/tls_server.c
--- postfix-2.6.1//src/tls/tls_server.c 2008-11-09 00:51:48.000000000 +0100
+++ postfix-2.6.1-dynamic_maps.patch//src/tls/tls_server.c 2009-05-27 12:50:33.000000000 +0200
diff -ruN postfix-2.7.0-ORIG/src/tls/tls_server.c postfix-2.7.0/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.7.0/src/tls/tls_server.c 2010-02-25 16:49:10.260796037 +0100
@@ -124,6 +124,8 @@
#define STR(x) vstring_str(x)
#define LEN(x) VSTRING_LEN(x)
@ -475,10 +475,10 @@ diff -ruN postfix-2.6.1//src/tls/tls_server.c postfix-2.6.1-dynamic_maps.patch//
/* Application-specific. */
/*
diff -ruN postfix-2.6.1//src/util/dict_db.c postfix-2.6.1-dynamic_maps.patch//src/util/dict_db.c
--- postfix-2.6.1//src/util/dict_db.c 2007-01-04 15:06:07.000000000 +0100
+++ postfix-2.6.1-dynamic_maps.patch//src/util/dict_db.c 2009-05-27 12:50:33.000000000 +0200
@@ -664,6 +664,12 @@
diff -ruN postfix-2.7.0-ORIG/src/util/dict_db.c postfix-2.7.0/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.7.0/src/util/dict_db.c 2010-02-25 16:49:10.260796037 +0100
@@ -675,6 +675,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)
msg_fatal("set DB hash element count %d: %m", DICT_DB_NELM);
@ -491,10 +491,10 @@ diff -ruN postfix-2.6.1//src/util/dict_db.c postfix-2.6.1-dynamic_maps.patch//sr
#if (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.6.1//src/util/dict_dbm.c postfix-2.6.1-dynamic_maps.patch//src/util/dict_dbm.c
--- postfix-2.6.1//src/util/dict_dbm.c 2007-01-04 15:07:36.000000000 +0100
+++ postfix-2.6.1-dynamic_maps.patch//src/util/dict_dbm.c 2009-05-27 12:50:33.000000000 +0200
@@ -407,6 +407,10 @@
diff -ruN postfix-2.7.0-ORIG/src/util/dict_dbm.c postfix-2.7.0/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.7.0/src/util/dict_dbm.c 2010-02-25 16:49:10.261795969 +0100
@@ -409,6 +409,10 @@
char *dbm_path;
int lock_fd;
@ -505,9 +505,9 @@ diff -ruN postfix-2.6.1//src/util/dict_dbm.c postfix-2.6.1-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.6.1//src/util/dict.h postfix-2.6.1-dynamic_maps.patch//src/util/dict.h
--- postfix-2.6.1//src/util/dict.h 2007-12-03 20:42:26.000000000 +0100
+++ postfix-2.6.1-dynamic_maps.patch//src/util/dict.h 2009-05-27 12:50:33.000000000 +0200
diff -ruN postfix-2.7.0-ORIG/src/util/dict.h postfix-2.7.0/src/util/dict.h
--- postfix-2.7.0-ORIG/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
@@ -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 */
@ -528,9 +528,9 @@ diff -ruN postfix-2.6.1//src/util/dict.h postfix-2.6.1-dynamic_maps.patch//src/u
#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.6.1//src/util/dict_open.c postfix-2.6.1-dynamic_maps.patch//src/util/dict_open.c
--- postfix-2.6.1//src/util/dict_open.c 2008-01-08 22:05:20.000000000 +0100
+++ postfix-2.6.1-dynamic_maps.patch//src/util/dict_open.c 2009-05-27 12:50:33.000000000 +0200
diff -ruN postfix-2.7.0-ORIG/src/util/dict_open.c postfix-2.7.0/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.7.0/src/util/dict_open.c 2010-02-25 16:49:10.262796668 +0100
@@ -44,6 +44,8 @@
/* DICT *(*open) (const char *, int, int);
/*
@ -560,7 +560,7 @@ diff -ruN postfix-2.6.1//src/util/dict_open.c postfix-2.6.1-dynamic_maps.patch//
/* Utility library. */
#include <argv.h>
@@ -207,6 +215,27 @@
@@ -208,6 +216,27 @@
#include <split_at.h>
#include <htable.h>
@ -588,14 +588,12 @@ diff -ruN postfix-2.6.1//src/util/dict_open.c postfix-2.6.1-dynamic_maps.patch//
/*
* lookup table for available map types.
*/
@@ -221,9 +250,11 @@
#endif
@@ -223,7 +252,9 @@
DICT_TYPE_ENVIRON, dict_env_open,
DICT_TYPE_HT, dict_ht_open,
DICT_TYPE_UNIX, dict_unix_open,
+#ifndef MAX_DYNAMIC_MAPS
#ifdef SNAPSHOT
DICT_TYPE_TCP, dict_tcp_open,
#endif
+#endif
#ifdef HAS_SDBM
DICT_TYPE_SDBM, dict_sdbm_open,
@ -795,9 +793,9 @@ diff -ruN postfix-2.6.1//src/util/dict_open.c postfix-2.6.1-dynamic_maps.patch//
#ifdef TEST
/*
diff -ruN postfix-2.6.1//src/util/load_lib.c postfix-2.6.1-dynamic_maps.patch//src/util/load_lib.c
--- postfix-2.6.1//src/util/load_lib.c 1970-01-01 01:00:00.000000000 +0100
+++ postfix-2.6.1-dynamic_maps.patch//src/util/load_lib.c 2009-05-27 12:50:33.000000000 +0200
diff -ruN postfix-2.7.0-ORIG/src/util/load_lib.c postfix-2.7.0/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.7.0/src/util/load_lib.c 2010-02-25 16:49:10.262796668 +0100
@@ -0,0 +1,135 @@
+/*++
+/* NAME
@ -934,9 +932,9 @@ diff -ruN postfix-2.6.1//src/util/load_lib.c postfix-2.6.1-dynamic_maps.patch//s
+#endif
+ return 0;
+}
diff -ruN postfix-2.6.1//src/util/load_lib.h postfix-2.6.1-dynamic_maps.patch//src/util/load_lib.h
--- postfix-2.6.1//src/util/load_lib.h 1970-01-01 01:00:00.000000000 +0100
+++ postfix-2.6.1-dynamic_maps.patch//src/util/load_lib.h 2009-05-27 12:50:33.000000000 +0200
diff -ruN postfix-2.7.0-ORIG/src/util/load_lib.h postfix-2.7.0/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.7.0/src/util/load_lib.h 2010-02-25 16:49:10.262796668 +0100
@@ -0,0 +1,41 @@
+#ifndef _LOAD_LIB_H_INCLUDED_
+#define _LOAD_LIB_H_INCLUDED_
@ -979,16 +977,15 @@ diff -ruN postfix-2.6.1//src/util/load_lib.h postfix-2.6.1-dynamic_maps.patch//s
+/*--*/
+
+#endif
diff -ruN postfix-2.6.1//src/util/Makefile.in postfix-2.6.1-dynamic_maps.patch//src/util/Makefile.in
--- postfix-2.6.1//src/util/Makefile.in 2009-04-27 14:04:22.000000000 +0200
+++ postfix-2.6.1-dynamic_maps.patch//src/util/Makefile.in 2009-05-27 16:05:55.000000000 +0200
@@ -31,15 +31,16 @@
vstream_popen.c vstring.c vstring_vstream.c watchdog.c writable.c \
diff -ruN postfix-2.7.0-ORIG/src/util/Makefile.in postfix-2.7.0/src/util/Makefile.in
--- postfix-2.7.0-ORIG/src/util/Makefile.in 2010-01-03 00:50:06.000000000 +0100
+++ postfix-2.7.0/src/util/Makefile.in 2010-02-25 16:50:22.897798754 +0100
@@ -32,15 +32,15 @@
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 upass_connect.c \
- upass_listen.c upass_trigger.c edit_file.c inet_windowsize.c
+ upass_listen.c upass_trigger.c edit_file.c inet_windowsize.c \
+ load_lib.c sdbm.c
upass_listen.c upass_trigger.c edit_file.c inet_windowsize.c \
- unix_pass_fd_fix.c dict_cache.c
+ unix_pass_fd_fix.c dict_cache.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 \
@ -1002,17 +999,16 @@ diff -ruN postfix-2.6.1//src/util/Makefile.in postfix-2.6.1-dynamic_maps.patch//
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 \
@@ -64,7 +65,8 @@
vstream_popen.o vstring.o vstring_vstream.o watchdog.o writable.o \
@@ -66,7 +66,7 @@
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 upass_connect.o \
- upass_listen.o upass_trigger.o edit_file.o inet_windowsize.o
+ upass_listen.o upass_trigger.o edit_file.o inet_windowsize.o \
+ load_lib.o sdbm.o
upass_listen.o upass_trigger.o edit_file.o inet_windowsize.o \
- unix_pass_fd_fix.o dict_cache.o
+ unix_pass_fd_fix.o dict_cache.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 \
@@ -78,7 +80,7 @@
@@ -80,7 +80,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 \
@ -1021,7 +1017,7 @@ diff -ruN postfix-2.6.1//src/util/Makefile.in postfix-2.6.1-dynamic_maps.patch//
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 \
@@ -91,6 +93,8 @@
@@ -93,6 +93,8 @@
CFLAGS = $(DEBUG) $(OPT) $(DEFS)
FILES = Makefile $(SRCS) $(HDRS)
INCL =
@ -1030,7 +1026,7 @@ diff -ruN postfix-2.6.1//src/util/Makefile.in postfix-2.6.1-dynamic_maps.patch//
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 \
@@ -105,10 +109,11 @@
@@ -108,10 +110,11 @@
LIB_DIR = ../../lib
INC_DIR = ../../include
@ -1044,7 +1040,7 @@ diff -ruN postfix-2.6.1//src/util/Makefile.in postfix-2.6.1-dynamic_maps.patch//
$(OBJS): ../../conf/makedefs.out
@@ -117,15 +122,25 @@
@@ -120,15 +123,25 @@
test: $(TESTPROG)
@ -1074,7 +1070,7 @@ diff -ruN postfix-2.6.1//src/util/Makefile.in postfix-2.6.1-dynamic_maps.patch//
-for i in $(HDRS); \
do \
cmp -s $$i $(INC_DIR)/$$i 2>/dev/null || cp $$i $(INC_DIR); \
@@ -147,7 +162,8 @@
@@ -150,7 +163,8 @@
lint $(SRCS)
clean:
@ -1084,9 +1080,9 @@ diff -ruN postfix-2.6.1//src/util/Makefile.in postfix-2.6.1-dynamic_maps.patch//
rm -rf printfck
tidy: clean
diff -ruN postfix-2.6.1//src/util/sdbm.c postfix-2.6.1-dynamic_maps.patch//src/util/sdbm.c
--- postfix-2.6.1//src/util/sdbm.c 1970-01-01 01:00:00.000000000 +0100
+++ postfix-2.6.1-dynamic_maps.patch//src/util/sdbm.c 2009-05-27 12:50:33.000000000 +0200
diff -ruN postfix-2.7.0-ORIG/src/util/sdbm.c postfix-2.7.0/src/util/sdbm.c
--- postfix-2.7.0-ORIG/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
@@ -0,0 +1,972 @@
+/*++
+/* NAME
@ -2060,9 +2056,9 @@ diff -ruN postfix-2.6.1//src/util/sdbm.c postfix-2.6.1-dynamic_maps.patch//src/u
+ return db;
+}
+
diff -ruN postfix-2.6.1//src/util/sdbm.h postfix-2.6.1-dynamic_maps.patch//src/util/sdbm.h
--- postfix-2.6.1//src/util/sdbm.h 1970-01-01 01:00:00.000000000 +0100
+++ postfix-2.6.1-dynamic_maps.patch//src/util/sdbm.h 2009-05-27 12:50:33.000000000 +0200
diff -ruN postfix-2.7.0-ORIG/src/util/sdbm.h postfix-2.7.0/src/util/sdbm.h
--- postfix-2.7.0-ORIG/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
@@ -0,0 +1,97 @@
+/*++
+/* NAME
@ -2161,10 +2157,10 @@ diff -ruN postfix-2.6.1//src/util/sdbm.h postfix-2.6.1-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.6.1//src/util/sys_defs.h postfix-2.6.1-dynamic_maps.patch//src/util/sys_defs.h
--- postfix-2.6.1//src/util/sys_defs.h 2009-05-11 02:45:27.000000000 +0200
+++ postfix-2.6.1-dynamic_maps.patch//src/util/sys_defs.h 2009-05-27 13:19:08.000000000 +0200
@@ -710,6 +710,7 @@
diff -ruN postfix-2.7.0-ORIG/src/util/sys_defs.h postfix-2.7.0/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.7.0/src/util/sys_defs.h 2010-02-25 16:49:10.265796533 +0100
@@ -715,6 +715,7 @@
#define INTERNAL_LOCK MYFLOCK_STYLE_FLOCK
#define DEF_MAILBOX_LOCK "fcntl, dotlock" /* RedHat >= 4.x */
#define HAS_FSYNC
@ -2172,7 +2168,7 @@ diff -ruN postfix-2.6.1//src/util/sys_defs.h postfix-2.6.1-dynamic_maps.patch//s
#define HAS_DB
#define DEF_DB_TYPE "hash"
#define ALIAS_DB_MAP "hash:/etc/aliases"
@@ -721,11 +722,25 @@
@@ -726,11 +727,25 @@
#define STATFS_IN_SYS_VFS_H
#define PREPEND_PLUS_TO_OPTSTRING
#define HAS_POSIX_REGEXP
@ -2198,7 +2194,7 @@ diff -ruN postfix-2.6.1//src/util/sys_defs.h postfix-2.6.1-dynamic_maps.patch//s
#ifdef __GLIBC_PREREQ
# define HAVE_GLIBC_API_VERSION_SUPPORT(maj, min) __GLIBC_PREREQ(maj, min)
#else
@@ -891,6 +906,7 @@
@@ -896,6 +911,7 @@
#define USE_STATFS
#define STATFS_IN_SYS_VFS_H
#define HAS_POSIX_REGEXP
@ -2206,7 +2202,7 @@ diff -ruN postfix-2.6.1//src/util/sys_defs.h postfix-2.6.1-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"
@@ -928,6 +944,7 @@
@@ -933,6 +949,7 @@
#define USE_STATFS
#define STATFS_IN_SYS_VFS_H
#define HAS_POSIX_REGEXP
@ -2214,7 +2210,7 @@ diff -ruN postfix-2.6.1//src/util/sys_defs.h postfix-2.6.1-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"
@@ -967,6 +984,7 @@
@@ -972,6 +989,7 @@
#define USE_STATFS
#define STATFS_IN_SYS_VFS_H
#define HAS_POSIX_REGEXP

3
postfix-2.6.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:09fd1b79d900b42e41c9f3ed31c6400dfb6e0d2955aed27d76d5e464bf2d09c9
size 2438713

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

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

8
postfix.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package postfix (Version 2.6.1)
# spec file for package postfix (Version 2.7.0)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -21,7 +21,7 @@
Name: postfix
Summary: A fast, secure, and flexible mailer
Version: 2.6.1
Version: 2.7.0
Release: 6
License: IBM Public License ..
Group: Productivity/Networking/Email/Servers
@ -36,8 +36,8 @@ Patch1: dynamic_maps_pie.patch
Patch2: pointer_to_literals.patch
Patch3: ipv6_disabled.patch
Patch10: %{name}-2.2.9-main.cf.patch
Patch11: %{name}-%{version}-vda-ng.patch
Patch12: %{name}-%{version}-vda-ng-64bit.patch
Patch11: %{name}-2.6.1-vda-ng.patch
Patch12: %{name}-2.6.1-vda-ng-64bit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %insserv_prereq %fillup_prereq
PreReq: /usr/bin/getent