SHA256
1
0
forked from pool/postfix
OBS User unknown
2007-08-06 19:56:28 +00:00
committed by Git OBS Bridge
parent 4d604d3570
commit 937bd9a794
6 changed files with 392 additions and 178 deletions

View File

@@ -1,7 +1,7 @@
Index: conf/dynamicmaps.cf
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ conf/dynamicmaps.cf 2007-04-12 15:15:19.005884127 +0200
+++ conf/dynamicmaps.cf 2007-08-06 00:02:19.119436818 +0200
@@ -0,0 +1,7 @@
+# Postfix dynamic maps configuration file.
+#
@@ -12,8 +12,8 @@ Index: conf/dynamicmaps.cf
+#==== ================================ ============= ============
Index: conf/postfix-files
===================================================================
--- conf/postfix-files.orig 2007-04-12 15:14:42.407677989 +0200
+++ conf/postfix-files 2007-04-12 15:15:19.013884609 +0200
--- conf/postfix-files.orig 2007-03-25 22:08:21.000000000 +0200
+++ conf/postfix-files 2007-08-06 00:02:19.135437796 +0200
@@ -63,6 +63,11 @@ $queue_directory/saved:d:$mail_owner:-:7
$queue_directory/trace:d:$mail_owner:-:700:ucr
$daemon_directory/anvil:f:root:-:755
@@ -48,8 +48,8 @@ Index: conf/postfix-files
$config_directory/generics:f:root:-:644:o
Index: src/dns/Makefile.in
===================================================================
--- src/dns/Makefile.in.orig 2007-04-12 15:14:42.407677989 +0200
+++ src/dns/Makefile.in 2007-04-12 15:15:19.037886056 +0200
--- src/dns/Makefile.in.orig 2007-03-17 18:51:37.000000000 +0100
+++ src/dns/Makefile.in 2007-08-06 00:02:19.251444890 +0200
@@ -14,7 +14,7 @@ LIBS = ../../lib/libutil.a
LIB_DIR = ../../lib
INC_DIR = ../../include
@@ -75,8 +75,8 @@ Index: src/dns/Makefile.in
-for i in $(HDRS); \
Index: src/global/Makefile.in
===================================================================
--- src/global/Makefile.in.orig 2007-04-12 15:14:42.407677989 +0200
+++ src/global/Makefile.in 2007-04-12 15:16:19.073506556 +0200
--- src/global/Makefile.in.orig 2007-03-17 18:53:42.000000000 +0100
+++ src/global/Makefile.in 2007-08-06 00:02:19.351451006 +0200
@@ -32,7 +32,7 @@ OBJS = abounce.o anvil_clnt.o been_here.
canon_addr.o cfg_parser.o cleanup_strerror.o cleanup_strflags.o \
clnt_stream.o conv_time.o db_common.o debug_peer.o debug_process.o \
@@ -148,8 +148,8 @@ Index: src/global/Makefile.in
tidy: clean
Index: src/global/mail_conf.c
===================================================================
--- src/global/mail_conf.c.orig 2007-04-12 15:14:42.407677989 +0200
+++ src/global/mail_conf.c 2007-04-12 15:15:19.089889190 +0200
--- src/global/mail_conf.c.orig 2004-04-10 16:52:51.000000000 +0200
+++ src/global/mail_conf.c 2007-08-06 00:02:19.451457122 +0200
@@ -175,6 +175,13 @@ void mail_conf_suck(void)
path = concatenate(var_config_dir, "/", "main.cf", (char *) 0);
dict_load_file(CONFIG_DICT, path);
@@ -166,8 +166,8 @@ Index: src/global/mail_conf.c
/* mail_conf_eval - expand macros in string */
Index: src/global/mail_dict.c
===================================================================
--- src/global/mail_dict.c.orig 2007-04-12 15:14:42.407677989 +0200
+++ src/global/mail_dict.c 2007-04-12 15:15:19.117890878 +0200
--- src/global/mail_dict.c.orig 2004-01-04 19:53:27.000000000 +0100
+++ src/global/mail_dict.c 2007-08-06 00:02:19.499460057 +0200
@@ -45,6 +45,7 @@ typedef struct {
static DICT_OPEN_INFO dict_open_info[] = {
@@ -186,8 +186,8 @@ Index: src/global/mail_dict.c
Index: src/global/mail_params.c
===================================================================
--- src/global/mail_params.c.orig 2007-04-12 15:14:42.407677989 +0200
+++ src/global/mail_params.c 2007-04-12 15:15:19.137892083 +0200
--- src/global/mail_params.c.orig 2007-07-10 19:27:12.000000000 +0200
+++ src/global/mail_params.c 2007-08-06 00:02:19.515461036 +0200
@@ -77,6 +77,7 @@
/* char *var_export_environ;
/* char *var_debug_peer_list;
@@ -196,7 +196,7 @@ Index: src/global/mail_params.c
/* int var_in_flow_delay;
/* int var_fault_inj_code;
/* char *var_bounce_service;
@@ -247,6 +248,7 @@ char *var_import_environ;
@@ -248,6 +249,7 @@ char *var_import_environ;
char *var_export_environ;
char *var_debug_peer_list;
int var_debug_peer_level;
@@ -204,7 +204,7 @@ Index: src/global/mail_params.c
int var_fault_inj_code;
char *var_bounce_service;
char *var_cleanup_service;
@@ -258,6 +260,7 @@ char *var_showq_service;
@@ -259,6 +261,7 @@ char *var_showq_service;
char *var_error_service;
char *var_flush_service;
char *var_verify_service;
@@ -214,8 +214,8 @@ Index: src/global/mail_params.c
int var_db_read_buf;
Index: src/global/mkmap_open.c
===================================================================
--- src/global/mkmap_open.c.orig 2007-04-12 15:14:42.411678230 +0200
+++ src/global/mkmap_open.c 2007-04-12 15:15:19.165893771 +0200
--- src/global/mkmap_open.c.orig 2004-12-15 01:24:22.000000000 +0100
+++ src/global/mkmap_open.c 2007-08-06 00:02:19.547462993 +0200
@@ -78,7 +78,7 @@
* types that exist as files. Network-based maps are not of interest.
*/
@@ -244,8 +244,8 @@ Index: src/global/mkmap_open.c
}
Index: src/master/Makefile.in
===================================================================
--- src/master/Makefile.in.orig 2007-04-12 15:14:42.411678230 +0200
+++ src/master/Makefile.in 2007-04-12 15:15:19.205896182 +0200
--- src/master/Makefile.in.orig 2007-03-17 18:51:39.000000000 +0100
+++ src/master/Makefile.in 2007-08-06 00:02:19.563463971 +0200
@@ -20,7 +20,7 @@ LIB_DIR = ../../lib
INC_DIR = ../../include
BIN_DIR = ../../libexec
@@ -271,8 +271,8 @@ Index: src/master/Makefile.in
cp $(PROG) $(BIN_DIR)
Index: src/postconf/postconf.c
===================================================================
--- src/postconf/postconf.c.orig 2007-04-12 15:14:42.467681607 +0200
+++ src/postconf/postconf.c 2007-04-12 15:15:19.257899316 +0200
--- src/postconf/postconf.c.orig 2007-04-26 21:34:57.000000000 +0200
+++ src/postconf/postconf.c 2007-08-06 00:02:19.687471554 +0200
@@ -893,6 +893,16 @@ static void show_maps(void)
{
ARGV *maps_argv;
@@ -292,8 +292,8 @@ Index: src/postconf/postconf.c
for (i = 0; i < maps_argv->argc; i++)
Index: src/postmap/postmap.c
===================================================================
--- src/postmap/postmap.c.orig 2007-04-12 15:14:42.467681607 +0200
+++ src/postmap/postmap.c 2007-04-12 15:15:19.273900280 +0200
--- src/postmap/postmap.c.orig 2007-03-27 02:09:16.000000000 +0200
+++ src/postmap/postmap.c 2007-08-06 00:02:19.707472778 +0200
@@ -5,7 +5,7 @@
/* Postfix lookup table management
/* SYNOPSIS
@@ -412,8 +412,8 @@ Index: src/postmap/postmap.c
usage(argv[0]);
Index: src/tls/Makefile.in
===================================================================
--- src/tls/Makefile.in.orig 2007-04-12 15:14:42.467681607 +0200
+++ src/tls/Makefile.in 2007-04-12 15:15:19.297901727 +0200
--- src/tls/Makefile.in.orig 2007-03-17 18:51:38.000000000 +0100
+++ src/tls/Makefile.in 2007-08-06 00:02:19.731474245 +0200
@@ -22,7 +22,7 @@ LIB_DIR = ../../lib
INC_DIR = ../../include
MAKES =
@@ -439,14 +439,14 @@ Index: src/tls/Makefile.in
-for i in $(HDRS); \
Index: src/util/Makefile.in
===================================================================
--- src/util/Makefile.in.orig 2007-04-12 15:14:42.467681607 +0200
+++ src/util/Makefile.in 2007-04-12 15:15:52.919927827 +0200
--- src/util/Makefile.in.orig 2007-07-29 18:02:35.000000000 +0200
+++ src/util/Makefile.in 2007-08-06 00:04:47.140488589 +0200
@@ -30,21 +30,21 @@ SRCS = alldig.c allprint.c argv.c argv_s
username.c valid_hostname.c vbuf.c vbuf_print.c vstream.c \
vstream_popen.c vstring.c vstring_vstream.c watchdog.c writable.c \
write_buf.c write_wait.c sane_basename.c format_tv.c allspace.c \
- allascii.c load_file.c killme_after.c
+ allascii.c load_file.c killme_after.c load_lib.c sdbm.c
- allascii.c load_file.c killme_after.c vstream_tweak.c
+ allascii.c load_file.c killme_after.c vstream_tweak.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 \
@@ -541,8 +541,8 @@ Index: src/util/Makefile.in
tidy: clean
Index: src/util/dict.h
===================================================================
--- src/util/dict.h.orig 2007-04-12 15:14:42.467681607 +0200
+++ src/util/dict.h 2007-04-12 15:15:19.349904861 +0200
--- src/util/dict.h.orig 2007-01-05 01:48:48.000000000 +0100
+++ src/util/dict.h 2007-08-06 00:02:19.799478404 +0200
@@ -66,6 +66,7 @@ extern DICT *dict_debug(DICT *);
#define DICT_FLAG_NO_UNAUTH (1<<13) /* disallow unauthenticated data */
#define DICT_FLAG_FOLD_FIX (1<<14) /* case-fold key with fixed-case map */
@@ -565,8 +565,8 @@ Index: src/util/dict.h
#define dict_put(dp, key, val) (dp)->update((dp), (key), (val))
Index: src/util/dict_db.c
===================================================================
--- src/util/dict_db.c.orig 2007-04-12 15:14:42.471681848 +0200
+++ src/util/dict_db.c 2007-04-12 15:15:19.373906308 +0200
--- src/util/dict_db.c.orig 2007-01-04 15:06:07.000000000 +0100
+++ src/util/dict_db.c 2007-08-06 00:02:19.843481095 +0200
@@ -664,6 +664,12 @@ static DICT *dict_db_open(const char *cl
msg_fatal("set DB cache size %d: %m", dict_db_cache_size);
if (type == DB_HASH && db->set_h_nelem(db, DICT_DB_NELM) != 0)
@@ -582,8 +582,8 @@ Index: src/util/dict_db.c
msg_fatal("open database %s: %m", db_path);
Index: src/util/dict_dbm.c
===================================================================
--- src/util/dict_dbm.c.orig 2007-04-12 15:14:42.471681848 +0200
+++ src/util/dict_dbm.c 2007-04-12 15:15:19.417908960 +0200
--- src/util/dict_dbm.c.orig 2007-01-04 15:07:36.000000000 +0100
+++ src/util/dict_dbm.c 2007-08-06 00:02:19.867482562 +0200
@@ -407,6 +407,10 @@ DICT *dict_dbm_open(const char *path,
char *dbm_path;
int lock_fd;
@@ -597,8 +597,8 @@ Index: src/util/dict_dbm.c
* the time domain) locking while accessing individual database records.
Index: src/util/dict_open.c
===================================================================
--- src/util/dict_open.c.orig 2007-04-12 15:14:42.471681848 +0200
+++ src/util/dict_open.c 2007-04-12 15:15:19.441910406 +0200
--- src/util/dict_open.c.orig 2006-06-26 14:59:19.000000000 +0200
+++ src/util/dict_open.c 2007-08-06 00:02:19.907485009 +0200
@@ -44,6 +44,8 @@
/* DICT *(*open) (const char *, int, int);
/*
@@ -866,7 +866,7 @@ Index: src/util/dict_open.c
Index: src/util/load_lib.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ src/util/load_lib.c 2007-04-12 15:15:19.461911612 +0200
+++ src/util/load_lib.c 2007-08-06 00:02:19.939486966 +0200
@@ -0,0 +1,135 @@
+/*++
+/* NAME
@@ -1006,7 +1006,7 @@ Index: src/util/load_lib.c
Index: src/util/load_lib.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ src/util/load_lib.h 2007-04-12 15:15:19.481912817 +0200
+++ src/util/load_lib.h 2007-08-06 00:02:19.971488923 +0200
@@ -0,0 +1,41 @@
+#ifndef _LOAD_LIB_H_INCLUDED_
+#define _LOAD_LIB_H_INCLUDED_
@@ -1052,7 +1052,7 @@ Index: src/util/load_lib.h
Index: src/util/sdbm.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ src/util/sdbm.c 2007-04-12 15:15:19.501914023 +0200
+++ src/util/sdbm.c 2007-08-06 00:02:19.995490390 +0200
@@ -0,0 +1,972 @@
+/*++
+/* NAME
@@ -2029,7 +2029,7 @@ Index: src/util/sdbm.c
Index: src/util/sdbm.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ src/util/sdbm.h 2007-04-12 15:15:19.521915228 +0200
+++ src/util/sdbm.h 2007-08-06 00:02:20.023492103 +0200
@@ -0,0 +1,97 @@
+/*++
+/* NAME
@@ -2130,8 +2130,8 @@ Index: src/util/sdbm.h
+#endif /* UTIL_SDBM_H */
Index: src/util/sys_defs.h
===================================================================
--- src/util/sys_defs.h.orig 2007-04-12 15:14:42.471681848 +0200
+++ src/util/sys_defs.h 2007-04-12 15:15:19.561917639 +0200
--- src/util/sys_defs.h.orig 2007-03-24 23:45:33.000000000 +0100
+++ src/util/sys_defs.h 2007-08-06 00:02:20.039493081 +0200
@@ -689,6 +689,7 @@ extern int initgroups(const char *, int)
#define INTERNAL_LOCK MYFLOCK_STYLE_FLOCK
#define DEF_MAILBOX_LOCK "fcntl, dotlock" /* RedHat >= 4.x */
@@ -2192,8 +2192,8 @@ Index: src/util/sys_defs.h
#define NATIVE_NEWALIAS_PATH "/usr/bin/newaliases"
Index: src/tls/tls_client.c
===================================================================
--- src/tls/tls_client.c.orig 2007-04-12 15:14:42.467681607 +0200
+++ src/tls/tls_client.c 2007-04-12 15:15:19.577918603 +0200
--- src/tls/tls_client.c.orig 2007-02-22 01:08:45.000000000 +0100
+++ src/tls/tls_client.c 2007-08-06 00:02:20.079495528 +0200
@@ -147,6 +147,8 @@
#define STR vstring_str
#define LEN VSTRING_LEN
@@ -2205,8 +2205,8 @@ Index: src/tls/tls_client.c
static SSL_SESSION *load_clnt_session(TLScontext_t *TLScontext)
Index: src/tls/tls_server.c
===================================================================
--- src/tls/tls_server.c.orig 2007-04-12 15:14:42.467681607 +0200
+++ src/tls/tls_server.c 2007-04-12 15:15:19.593919568 +0200
--- src/tls/tls_server.c.orig 2007-02-22 01:08:45.000000000 +0100
+++ src/tls/tls_server.c 2007-08-06 00:02:20.095496506 +0200
@@ -120,6 +120,8 @@
#define STR(x) vstring_str(x)
#define LEN(x) VSTRING_LEN(x)
@@ -2218,8 +2218,8 @@ Index: src/tls/tls_server.c
/* We must keep some of the info available */
Index: src/milter/Makefile.in
===================================================================
--- src/milter/Makefile.in.orig 2007-04-12 15:14:42.471681848 +0200
+++ src/milter/Makefile.in 2007-04-12 15:15:19.617921014 +0200
--- src/milter/Makefile.in.orig 2007-03-17 18:51:39.000000000 +0100
+++ src/milter/Makefile.in 2007-08-06 00:02:20.211503600 +0200
@@ -14,7 +14,7 @@ LIB_DIR = ../../lib
INC_DIR = ../../include
MAKES =