forked from pool/postfix
This commit is contained in:
parent
c29722be0d
commit
fb0acb9041
@ -1,7 +1,7 @@
|
||||
Index: postfix-2.3.0/conf/dynamicmaps.cf
|
||||
Index: conf/dynamicmaps.cf
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ postfix-2.3.0/conf/dynamicmaps.cf
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ conf/dynamicmaps.cf 2007-04-12 15:15:19.005884127 +0200
|
||||
@@ -0,0 +1,7 @@
|
||||
+# Postfix dynamic maps configuration file.
|
||||
+#
|
||||
@ -10,10 +10,10 @@ Index: postfix-2.3.0/conf/dynamicmaps.cf
|
||||
+#
|
||||
+#type location of .so file open function (mkmap func)
|
||||
+#==== ================================ ============= ============
|
||||
Index: postfix-2.3.0/conf/postfix-files
|
||||
Index: conf/postfix-files
|
||||
===================================================================
|
||||
--- postfix-2.3.0.orig/conf/postfix-files
|
||||
+++ postfix-2.3.0/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
|
||||
@@ -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
|
||||
@ -46,10 +46,10 @@ Index: postfix-2.3.0/conf/postfix-files
|
||||
$config_directory/cidr_table:f:root:-:644:o
|
||||
$config_directory/generic:f:root:-:644:p
|
||||
$config_directory/generics:f:root:-:644:o
|
||||
Index: postfix-2.3.0/src/dns/Makefile.in
|
||||
Index: src/dns/Makefile.in
|
||||
===================================================================
|
||||
--- postfix-2.3.0.orig/src/dns/Makefile.in
|
||||
+++ postfix-2.3.0/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
|
||||
@@ -14,7 +14,7 @@ LIBS = ../../lib/libutil.a
|
||||
LIB_DIR = ../../lib
|
||||
INC_DIR = ../../include
|
||||
@ -73,10 +73,10 @@ Index: postfix-2.3.0/src/dns/Makefile.in
|
||||
|
||||
update: $(LIB_DIR)/$(LIB) $(HDRS)
|
||||
-for i in $(HDRS); \
|
||||
Index: postfix-2.3.0/src/global/Makefile.in
|
||||
Index: src/global/Makefile.in
|
||||
===================================================================
|
||||
--- postfix-2.3.0.orig/src/global/Makefile.in
|
||||
+++ postfix-2.3.0/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
|
||||
@@ -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 \
|
||||
@ -98,7 +98,7 @@ Index: postfix-2.3.0/src/global/Makefile.in
|
||||
+.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c
|
||||
|
||||
-all: $(LIB)
|
||||
+all: $(LIB) $(LDAPSO) $(MYSQLSO) $(PGSQLSO)
|
||||
+all: $(LIB) $(LDAPSO) $(MYSQLSO) $(PGSQLSO)
|
||||
|
||||
$(OBJS): ../../conf/makedefs.out
|
||||
|
||||
@ -137,7 +137,7 @@ Index: postfix-2.3.0/src/global/Makefile.in
|
||||
-for i in $(HDRS); \
|
||||
do \
|
||||
cmp -s $$i $(INC_DIR)/$$i 2>/dev/null || cp $$i $(INC_DIR); \
|
||||
@@ -403,7 +422,7 @@ lint:
|
||||
@@ -425,7 +444,7 @@ lint:
|
||||
lint $(DEFS) $(SRCS) $(LINTFIX)
|
||||
|
||||
clean:
|
||||
@ -146,10 +146,10 @@ Index: postfix-2.3.0/src/global/Makefile.in
|
||||
rm -rf printfck
|
||||
|
||||
tidy: clean
|
||||
Index: postfix-2.3.0/src/global/mail_conf.c
|
||||
Index: src/global/mail_conf.c
|
||||
===================================================================
|
||||
--- postfix-2.3.0.orig/src/global/mail_conf.c
|
||||
+++ postfix-2.3.0/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
|
||||
@@ -175,6 +175,13 @@ void mail_conf_suck(void)
|
||||
path = concatenate(var_config_dir, "/", "main.cf", (char *) 0);
|
||||
dict_load_file(CONFIG_DICT, path);
|
||||
@ -164,10 +164,10 @@ Index: postfix-2.3.0/src/global/mail_conf.c
|
||||
}
|
||||
|
||||
/* mail_conf_eval - expand macros in string */
|
||||
Index: postfix-2.3.0/src/global/mail_dict.c
|
||||
Index: src/global/mail_dict.c
|
||||
===================================================================
|
||||
--- postfix-2.3.0.orig/src/global/mail_dict.c
|
||||
+++ postfix-2.3.0/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
|
||||
@@ -45,6 +45,7 @@ typedef struct {
|
||||
|
||||
static DICT_OPEN_INFO dict_open_info[] = {
|
||||
@ -184,10 +184,10 @@ Index: postfix-2.3.0/src/global/mail_dict.c
|
||||
0,
|
||||
};
|
||||
|
||||
Index: postfix-2.3.0/src/global/mail_params.c
|
||||
Index: src/global/mail_params.c
|
||||
===================================================================
|
||||
--- postfix-2.3.0.orig/src/global/mail_params.c
|
||||
+++ postfix-2.3.0/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
|
||||
@@ -77,6 +77,7 @@
|
||||
/* char *var_export_environ;
|
||||
/* char *var_debug_peer_list;
|
||||
@ -212,10 +212,10 @@ Index: postfix-2.3.0/src/global/mail_params.c
|
||||
char *var_trace_service;
|
||||
int var_db_create_buf;
|
||||
int var_db_read_buf;
|
||||
Index: postfix-2.3.0/src/global/mkmap_open.c
|
||||
Index: src/global/mkmap_open.c
|
||||
===================================================================
|
||||
--- postfix-2.3.0.orig/src/global/mkmap_open.c
|
||||
+++ postfix-2.3.0/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
|
||||
@@ -78,7 +78,7 @@
|
||||
* types that exist as files. Network-based maps are not of interest.
|
||||
*/
|
||||
@ -242,10 +242,10 @@ Index: postfix-2.3.0/src/global/mkmap_open.c
|
||||
if (strcmp(type, mp->type) == 0)
|
||||
break;
|
||||
}
|
||||
Index: postfix-2.3.0/src/master/Makefile.in
|
||||
Index: src/master/Makefile.in
|
||||
===================================================================
|
||||
--- postfix-2.3.0.orig/src/master/Makefile.in
|
||||
+++ postfix-2.3.0/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
|
||||
@@ -20,7 +20,7 @@ LIB_DIR = ../../lib
|
||||
INC_DIR = ../../include
|
||||
BIN_DIR = ../../libexec
|
||||
@ -269,11 +269,11 @@ Index: postfix-2.3.0/src/master/Makefile.in
|
||||
|
||||
$(BIN_DIR)/$(PROG): $(PROG)
|
||||
cp $(PROG) $(BIN_DIR)
|
||||
Index: postfix-2.3.0/src/postconf/postconf.c
|
||||
Index: src/postconf/postconf.c
|
||||
===================================================================
|
||||
--- postfix-2.3.0.orig/src/postconf/postconf.c
|
||||
+++ postfix-2.3.0/src/postconf/postconf.c
|
||||
@@ -898,6 +898,16 @@ static void show_maps(void)
|
||||
--- 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
|
||||
@@ -893,6 +893,16 @@ static void show_maps(void)
|
||||
{
|
||||
ARGV *maps_argv;
|
||||
int i;
|
||||
@ -290,10 +290,10 @@ Index: postfix-2.3.0/src/postconf/postconf.c
|
||||
|
||||
maps_argv = dict_mapnames();
|
||||
for (i = 0; i < maps_argv->argc; i++)
|
||||
Index: postfix-2.3.0/src/postmap/postmap.c
|
||||
Index: src/postmap/postmap.c
|
||||
===================================================================
|
||||
--- postfix-2.3.0.orig/src/postmap/postmap.c
|
||||
+++ postfix-2.3.0/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
|
||||
@@ -5,7 +5,7 @@
|
||||
/* Postfix lookup table management
|
||||
/* SYNOPSIS
|
||||
@ -303,7 +303,7 @@ Index: postfix-2.3.0/src/postmap/postmap.c
|
||||
/* [\fB-d \fIkey\fR] [\fB-q \fIkey\fR]
|
||||
/* [\fIfile_type\fR:]\fIfile_name\fR ...
|
||||
/* DESCRIPTION
|
||||
@@ -109,6 +109,8 @@
|
||||
@@ -115,6 +115,8 @@
|
||||
/* as the original input order.
|
||||
/* This feature is available in Postfix version 2.2 and later,
|
||||
/* and is not available for all database types.
|
||||
@ -312,7 +312,7 @@ Index: postfix-2.3.0/src/postmap/postmap.c
|
||||
/* .IP \fB-v\fR
|
||||
/* Enable verbose logging for debugging purposes. Multiple \fB-v\fR
|
||||
/* options make the software increasingly verbose.
|
||||
@@ -531,6 +533,18 @@ static void postmap_seq(const char *map_
|
||||
@@ -538,6 +540,18 @@ static void postmap_seq(const char *map_
|
||||
dict_close(dict);
|
||||
}
|
||||
|
||||
@ -331,7 +331,7 @@ Index: postfix-2.3.0/src/postmap/postmap.c
|
||||
/* usage - explain */
|
||||
|
||||
static NORETURN usage(char *myname)
|
||||
@@ -549,6 +563,7 @@ int main(int argc, char **argv)
|
||||
@@ -558,6 +572,7 @@ int main(int argc, char **argv)
|
||||
int postmap_flags = POSTMAP_FLAG_AS_OWNER | POSTMAP_FLAG_SAVE_PERM;
|
||||
int open_flags = O_RDWR | O_CREAT | O_TRUNC;
|
||||
int dict_flags = DICT_FLAG_DUP_WARN | DICT_FLAG_FOLD_FIX;
|
||||
@ -339,7 +339,7 @@ Index: postfix-2.3.0/src/postmap/postmap.c
|
||||
char *query = 0;
|
||||
char *delkey = 0;
|
||||
int sequence = 0;
|
||||
@@ -588,7 +603,7 @@ int main(int argc, char **argv)
|
||||
@@ -602,7 +617,7 @@ int main(int argc, char **argv)
|
||||
/*
|
||||
* Parse JCL.
|
||||
*/
|
||||
@ -348,7 +348,7 @@ Index: postfix-2.3.0/src/postmap/postmap.c
|
||||
switch (ch) {
|
||||
default:
|
||||
usage(argv[0]);
|
||||
@@ -602,8 +617,8 @@ int main(int argc, char **argv)
|
||||
@@ -616,8 +631,8 @@ int main(int argc, char **argv)
|
||||
msg_fatal("out of memory");
|
||||
break;
|
||||
case 'd':
|
||||
@ -359,7 +359,7 @@ Index: postfix-2.3.0/src/postmap/postmap.c
|
||||
delkey = optarg;
|
||||
break;
|
||||
case 'f':
|
||||
@@ -623,8 +638,8 @@ int main(int argc, char **argv)
|
||||
@@ -637,8 +652,8 @@ int main(int argc, char **argv)
|
||||
postmap_flags &= ~POSTMAP_FLAG_SAVE_PERM;
|
||||
break;
|
||||
case 'q':
|
||||
@ -370,7 +370,7 @@ Index: postfix-2.3.0/src/postmap/postmap.c
|
||||
query = optarg;
|
||||
break;
|
||||
case 'r':
|
||||
@@ -632,10 +647,15 @@ int main(int argc, char **argv)
|
||||
@@ -646,10 +661,15 @@ int main(int argc, char **argv)
|
||||
dict_flags |= DICT_FLAG_DUP_REPLACE;
|
||||
break;
|
||||
case 's':
|
||||
@ -388,7 +388,7 @@ Index: postfix-2.3.0/src/postmap/postmap.c
|
||||
case 'v':
|
||||
msg_verbose++;
|
||||
break;
|
||||
@@ -701,6 +721,21 @@ int main(int argc, char **argv)
|
||||
@@ -717,6 +737,21 @@ int main(int argc, char **argv)
|
||||
exit(0);
|
||||
}
|
||||
exit(1);
|
||||
@ -410,10 +410,10 @@ Index: postfix-2.3.0/src/postmap/postmap.c
|
||||
} else { /* create/update map(s) */
|
||||
if (optind + 1 > argc)
|
||||
usage(argv[0]);
|
||||
Index: postfix-2.3.0/src/tls/Makefile.in
|
||||
Index: src/tls/Makefile.in
|
||||
===================================================================
|
||||
--- postfix-2.3.0.orig/src/tls/Makefile.in
|
||||
+++ postfix-2.3.0/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
|
||||
@@ -22,7 +22,7 @@ LIB_DIR = ../../lib
|
||||
INC_DIR = ../../include
|
||||
MAKES =
|
||||
@ -437,16 +437,16 @@ Index: postfix-2.3.0/src/tls/Makefile.in
|
||||
|
||||
update: $(LIB_DIR)/$(LIB) $(HDRS)
|
||||
-for i in $(HDRS); \
|
||||
Index: postfix-2.3.0/src/util/Makefile.in
|
||||
Index: src/util/Makefile.in
|
||||
===================================================================
|
||||
--- postfix-2.3.0.orig/src/util/Makefile.in
|
||||
+++ postfix-2.3.0/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
|
||||
@@ -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
|
||||
+ allascii.c load_file.c load_lib.c sdbm.c
|
||||
- allascii.c load_file.c killme_after.c
|
||||
+ allascii.c load_file.c killme_after.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 \
|
||||
@ -539,11 +539,11 @@ Index: postfix-2.3.0/src/util/Makefile.in
|
||||
rm -rf printfck
|
||||
|
||||
tidy: clean
|
||||
Index: postfix-2.3.0/src/util/dict.h
|
||||
Index: src/util/dict.h
|
||||
===================================================================
|
||||
--- postfix-2.3.0.orig/src/util/dict.h
|
||||
+++ postfix-2.3.0/src/util/dict.h
|
||||
@@ -65,6 +65,7 @@ extern DICT *dict_debug(DICT *);
|
||||
--- 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
|
||||
@@ -66,6 +66,7 @@ extern DICT *dict_debug(DICT *);
|
||||
#define DICT_FLAG_NO_UNAUTH (1<<13) /* disallow unauthenticated data */
|
||||
#define DICT_FLAG_FOLD_FIX (1<<14) /* case-fold key with fixed-case map */
|
||||
#define DICT_FLAG_FOLD_MUL (1<<15) /* case-fold key with multi-case map */
|
||||
@ -551,7 +551,7 @@ Index: postfix-2.3.0/src/util/dict.h
|
||||
#define DICT_FLAG_FOLD_ANY (DICT_FLAG_FOLD_FIX | DICT_FLAG_FOLD_MUL)
|
||||
|
||||
/* IMPORTANT: Update the dict_mask[] table when the above changes */
|
||||
@@ -109,6 +110,11 @@ extern const char *dict_eval(const char
|
||||
@@ -136,6 +137,11 @@ extern const char *dict_eval(const char
|
||||
extern DICT *dict_open(const char *, int, int);
|
||||
extern DICT *dict_open3(const char *, const char *, int, int);
|
||||
extern void dict_open_register(const char *, DICT *(*) (const char *, int, int));
|
||||
@ -563,11 +563,11 @@ Index: postfix-2.3.0/src/util/dict.h
|
||||
|
||||
#define dict_get(dp, key) (dp)->lookup((dp), (key))
|
||||
#define dict_put(dp, key, val) (dp)->update((dp), (key), (val))
|
||||
Index: postfix-2.3.0/src/util/dict_db.c
|
||||
Index: src/util/dict_db.c
|
||||
===================================================================
|
||||
--- postfix-2.3.0.orig/src/util/dict_db.c
|
||||
+++ postfix-2.3.0/src/util/dict_db.c
|
||||
@@ -658,6 +658,12 @@ static DICT *dict_db_open(const char *cl
|
||||
--- 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
|
||||
@@ -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)
|
||||
msg_fatal("set DB hash element count %d: %m", DICT_DB_NELM);
|
||||
@ -580,11 +580,11 @@ Index: postfix-2.3.0/src/util/dict_db.c
|
||||
#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);
|
||||
Index: postfix-2.3.0/src/util/dict_dbm.c
|
||||
Index: src/util/dict_dbm.c
|
||||
===================================================================
|
||||
--- postfix-2.3.0.orig/src/util/dict_dbm.c
|
||||
+++ postfix-2.3.0/src/util/dict_dbm.c
|
||||
@@ -401,6 +401,10 @@ DICT *dict_dbm_open(const char *path,
|
||||
--- 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
|
||||
@@ -407,6 +407,10 @@ DICT *dict_dbm_open(const char *path,
|
||||
char *dbm_path;
|
||||
int lock_fd;
|
||||
|
||||
@ -595,10 +595,10 @@ Index: postfix-2.3.0/src/util/dict_dbm.c
|
||||
/*
|
||||
* Note: DICT_FLAG_LOCK is used only by programs that do fine-grained (in
|
||||
* the time domain) locking while accessing individual database records.
|
||||
Index: postfix-2.3.0/src/util/dict_open.c
|
||||
Index: src/util/dict_open.c
|
||||
===================================================================
|
||||
--- postfix-2.3.0.orig/src/util/dict_open.c
|
||||
+++ postfix-2.3.0/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
|
||||
@@ -44,6 +44,8 @@
|
||||
/* DICT *(*open) (const char *, int, int);
|
||||
/*
|
||||
@ -863,10 +863,10 @@ Index: postfix-2.3.0/src/util/dict_open.c
|
||||
#ifdef TEST
|
||||
|
||||
/*
|
||||
Index: postfix-2.3.0/src/util/load_lib.c
|
||||
Index: src/util/load_lib.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ postfix-2.3.0/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
|
||||
@@ -0,0 +1,135 @@
|
||||
+/*++
|
||||
+/* NAME
|
||||
@ -1003,10 +1003,10 @@ Index: postfix-2.3.0/src/util/load_lib.c
|
||||
+#endif
|
||||
+ return 0;
|
||||
+}
|
||||
Index: postfix-2.3.0/src/util/load_lib.h
|
||||
Index: src/util/load_lib.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ postfix-2.3.0/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
|
||||
@@ -0,0 +1,41 @@
|
||||
+#ifndef _LOAD_LIB_H_INCLUDED_
|
||||
+#define _LOAD_LIB_H_INCLUDED_
|
||||
@ -1049,10 +1049,10 @@ Index: postfix-2.3.0/src/util/load_lib.h
|
||||
+/*--*/
|
||||
+
|
||||
+#endif
|
||||
Index: postfix-2.3.0/src/util/sdbm.c
|
||||
Index: src/util/sdbm.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ postfix-2.3.0/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
|
||||
@@ -0,0 +1,972 @@
|
||||
+/*++
|
||||
+/* NAME
|
||||
@ -2026,10 +2026,10 @@ Index: postfix-2.3.0/src/util/sdbm.c
|
||||
+ return db;
|
||||
+}
|
||||
+
|
||||
Index: postfix-2.3.0/src/util/sdbm.h
|
||||
Index: src/util/sdbm.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ postfix-2.3.0/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
|
||||
@@ -0,0 +1,97 @@
|
||||
+/*++
|
||||
+/* NAME
|
||||
@ -2128,11 +2128,11 @@ Index: postfix-2.3.0/src/util/sdbm.h
|
||||
+#define BADMESS /* generate a message for worst case:
|
||||
+ cannot make room after SPLTMAX splits */
|
||||
+#endif /* UTIL_SDBM_H */
|
||||
Index: postfix-2.3.0/src/util/sys_defs.h
|
||||
Index: src/util/sys_defs.h
|
||||
===================================================================
|
||||
--- postfix-2.3.0.orig/src/util/sys_defs.h
|
||||
+++ postfix-2.3.0/src/util/sys_defs.h
|
||||
@@ -655,6 +655,7 @@ extern int initgroups(const char *, int)
|
||||
--- 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
|
||||
@@ -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 */
|
||||
#define HAS_FSYNC
|
||||
@ -2140,8 +2140,8 @@ Index: postfix-2.3.0/src/util/sys_defs.h
|
||||
#define HAS_DB
|
||||
#define DEF_DB_TYPE "hash"
|
||||
#define ALIAS_DB_MAP "hash:/etc/aliases"
|
||||
@@ -667,11 +668,25 @@ extern int initgroups(const char *, int)
|
||||
#define UNIX_DOMAIN_CONNECT_BLOCKS_FOR_ACCEPT
|
||||
@@ -700,11 +701,25 @@ extern int initgroups(const char *, int)
|
||||
#define STATFS_IN_SYS_VFS_H
|
||||
#define PREPEND_PLUS_TO_OPTSTRING
|
||||
#define HAS_POSIX_REGEXP
|
||||
+#define HAS_DLOPEN
|
||||
@ -2166,7 +2166,7 @@ Index: postfix-2.3.0/src/util/sys_defs.h
|
||||
#if __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1
|
||||
#define SOCKADDR_SIZE socklen_t
|
||||
#define SOCKOPT_SIZE socklen_t
|
||||
@@ -757,6 +772,7 @@ extern int h_errno; /* <netdb.h> impor
|
||||
@@ -859,6 +874,7 @@ extern int h_errno; /* <netdb.h> impor
|
||||
#define USE_STATFS
|
||||
#define STATFS_IN_SYS_VFS_H
|
||||
#define HAS_POSIX_REGEXP
|
||||
@ -2174,7 +2174,7 @@ Index: postfix-2.3.0/src/util/sys_defs.h
|
||||
#define NATIVE_SENDMAIL_PATH "/usr/sbin/sendmail"
|
||||
#define NATIVE_MAILQ_PATH "/usr/bin/mailq"
|
||||
#define NATIVE_NEWALIAS_PATH "/usr/bin/newaliases"
|
||||
@@ -794,6 +810,7 @@ extern int h_errno; /* <netdb.h> impor
|
||||
@@ -896,6 +912,7 @@ extern int h_errno; /* <netdb.h> impor
|
||||
#define USE_STATFS
|
||||
#define STATFS_IN_SYS_VFS_H
|
||||
#define HAS_POSIX_REGEXP
|
||||
@ -2182,7 +2182,7 @@ Index: postfix-2.3.0/src/util/sys_defs.h
|
||||
#define NATIVE_SENDMAIL_PATH "/usr/sbin/sendmail"
|
||||
#define NATIVE_MAILQ_PATH "/usr/bin/mailq"
|
||||
#define NATIVE_NEWALIAS_PATH "/usr/bin/newaliases"
|
||||
@@ -833,6 +850,7 @@ extern int h_errno;
|
||||
@@ -935,6 +952,7 @@ extern int h_errno;
|
||||
#define USE_STATFS
|
||||
#define STATFS_IN_SYS_VFS_H
|
||||
#define HAS_POSIX_REGEXP
|
||||
@ -2190,10 +2190,10 @@ Index: postfix-2.3.0/src/util/sys_defs.h
|
||||
#define NATIVE_SENDMAIL_PATH "/usr/bin/sendmail"
|
||||
#define NATIVE_MAILQ_PATH "/usr/bin/mailq"
|
||||
#define NATIVE_NEWALIAS_PATH "/usr/bin/newaliases"
|
||||
Index: postfix-2.3.0/src/tls/tls_client.c
|
||||
Index: src/tls/tls_client.c
|
||||
===================================================================
|
||||
--- postfix-2.3.0.orig/src/tls/tls_client.c
|
||||
+++ postfix-2.3.0/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
|
||||
@@ -147,6 +147,8 @@
|
||||
#define STR vstring_str
|
||||
#define LEN VSTRING_LEN
|
||||
@ -2203,11 +2203,11 @@ Index: postfix-2.3.0/src/tls/tls_client.c
|
||||
/* load_clnt_session - load session from client cache (non-callback) */
|
||||
|
||||
static SSL_SESSION *load_clnt_session(TLScontext_t *TLScontext)
|
||||
Index: postfix-2.3.0/src/tls/tls_server.c
|
||||
Index: src/tls/tls_server.c
|
||||
===================================================================
|
||||
--- postfix-2.3.0.orig/src/tls/tls_server.c
|
||||
+++ postfix-2.3.0/src/tls/tls_server.c
|
||||
@@ -127,6 +127,8 @@
|
||||
--- 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
|
||||
@@ -120,6 +120,8 @@
|
||||
#define STR(x) vstring_str(x)
|
||||
#define LEN(x) VSTRING_LEN(x)
|
||||
|
||||
@ -2216,10 +2216,10 @@ Index: postfix-2.3.0/src/tls/tls_server.c
|
||||
/* Application-specific. */
|
||||
|
||||
/* We must keep some of the info available */
|
||||
Index: postfix-2.3.0/src/milter/Makefile.in
|
||||
Index: src/milter/Makefile.in
|
||||
===================================================================
|
||||
--- postfix-2.3.0.orig/src/milter/Makefile.in
|
||||
+++ postfix-2.3.0/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
|
||||
@@ -14,7 +14,7 @@ LIB_DIR = ../../lib
|
||||
INC_DIR = ../../include
|
||||
MAKES =
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9487d86349da28980a73c8c2ced8df0568c80f1349d2351f3d8dd20b46289b4e
|
||||
size 2792371
|
3
postfix-2.4.0.tar.gz
Normal file
3
postfix-2.4.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7cbc4d8904512ac1792193c54a2989b481e6402447b82988b6a88b8091af6bbd
|
||||
size 2931537
|
@ -1,3 +1,99 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu May 3 12:09:13 CEST 2007 - varkoly@suse.de
|
||||
|
||||
- dynamic_maps.patch: readded the chunk for dict_tcp and dict_pcre
|
||||
- replaced prereq for postfix with a prereq on
|
||||
%{name} = %{version}
|
||||
- updated to postfix 2.4, patchlevel 0
|
||||
Major changes - safety
|
||||
* As a safety measure, Postfix now by default creates mailbox dotlock
|
||||
files on all systems. This prevents problems with GNU POP3D which
|
||||
subverts kernel locking by creating a new mailbox file and deleting
|
||||
the old one
|
||||
|
||||
Major changes - Milter support
|
||||
* The support for Milter header modification
|
||||
requests was revised. With minimal change in the on-disk representation,
|
||||
the code was greatly simplified, and regression tests were updated
|
||||
to ensure that old errors were not re-introduced. The queue file
|
||||
format is entirely backwards compatible with Postfix 2.3.
|
||||
|
||||
* Support for Milter requests to replace the message
|
||||
body. Postfix now implements all the header/body modification
|
||||
requests that are available with Sendmail 8.13.
|
||||
|
||||
* A new field is added to the queue file "size"
|
||||
record that specifies the message content length. Postfix 2.3 and
|
||||
older Postfix 2.4 snapshots will ignore this field, and will report
|
||||
the message size as it was before the body was replaced.
|
||||
|
||||
Major changes - TLS support
|
||||
* The check_smtpd_policy client sends TLS certificate
|
||||
attributes (client ccert_subject, ccert_issuer) only after successful
|
||||
client certificate verification. The reason is that the certification
|
||||
verification status itself is not available in the policy request.
|
||||
|
||||
* The check_smtpd_policy client sends TLS certificate
|
||||
fingerprint information even when the certificate itself was not
|
||||
verified.
|
||||
|
||||
* The remote SMTP client TLS certificate fingerprint
|
||||
can be used for access control even when the certificate itself was
|
||||
not verified.
|
||||
|
||||
* The format of SMTP server TLS session cache
|
||||
lookup keys has changed. The lookup key now includes the master.cf
|
||||
service name.
|
||||
|
||||
Major changes - performance
|
||||
* Better support for systems that run thousands
|
||||
of Postfix processes. Postfix now supports FreeBSD kqueue(2),
|
||||
Solaris poll(7d) and Linux epoll(4) as more scalable alternatives
|
||||
to the traditional select(2) system call, and uses poll(2) when
|
||||
examining a single file descriptor for readability or writability.
|
||||
These features are supported on sufficiently recent versions of
|
||||
FreeBSD, NetBSD, OpenBSD, Solaris and Linux; support for other
|
||||
systems will be added as evidence becomes available that usable
|
||||
implementations exist.
|
||||
|
||||
Major changes - delivery status notifications
|
||||
* Small changes were made to the default bounce
|
||||
message templates, to prevent HTML-aware software from hiding or
|
||||
removing the text "<postmaster>", and producing misleading text.
|
||||
|
||||
* Postfix no longer announces its name in delivery
|
||||
status notifications. Users believe that Wietse provides a free
|
||||
help desk service that solves all their email problems.
|
||||
|
||||
Major changes - ETRN support
|
||||
* More precise queue flushing with the ETRN,
|
||||
"postqueue -s site", and "sendmail -qRsite" commands, after
|
||||
minimization of race conditions. New per-queue-file flushing with
|
||||
"postqueue -i queueid" and "sendmail -qIqueueid".
|
||||
|
||||
Major changes - small office/home office support
|
||||
* Postfix no longer requires a domain name. It
|
||||
uses "localdomain" as the default Internet domain name when no
|
||||
domain is specified via main.cf or via the machine's hostname.
|
||||
|
||||
Major changes - SMTP access control
|
||||
* The check_smtpd_policy client sends TLS certificate
|
||||
attributes (client ccert_subject, ccert_issuer) only after successful
|
||||
client certificate verification. The reason is that the certification
|
||||
verification status itself is not available in the policy request.
|
||||
|
||||
* The check_smtpd_policy client sends TLS certificate
|
||||
fingerprint information even when the certificate itself was not
|
||||
verified.
|
||||
|
||||
* The remote SMTP client TLS certificate fingerprint can be used for
|
||||
access control even when the certificate itself was not verified.
|
||||
|
||||
* The Postfix installation procedure no longer
|
||||
updates main.cf with "unknown_local_recipient_reject_code = 450".
|
||||
Four years after the introduction of mandatory recipient validation,
|
||||
this transitional tool is no longer neeed.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 29 14:33:03 CEST 2007 - rguenther@suse.de
|
||||
|
||||
|
97
postfix.spec
97
postfix.spec
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package postfix (Version 2.3.2)
|
||||
# spec file for package postfix (Version 2.4.0)
|
||||
#
|
||||
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
@ -23,8 +23,8 @@ Provides: smtp_daemon
|
||||
Conflicts: sendmail exim
|
||||
Autoreqprov: on
|
||||
Summary: A fast, secure, and flexible mailer
|
||||
Version: 2.3.2
|
||||
Release: 44
|
||||
Version: 2.4.0
|
||||
Release: 1
|
||||
Source: postfix-%{version}.tar.gz
|
||||
Source1: postfix-SuSE.tar.gz
|
||||
Patch: dynamic_maps.patch
|
||||
@ -39,20 +39,20 @@ Summary: postfix plugin to support MySQL maps
|
||||
Autoreqprov: on
|
||||
Group: Productivity/Networking/Email/Servers
|
||||
Prefix: %{_prefix}
|
||||
Prereq: postfix
|
||||
Prereq: %{name} = %{version}
|
||||
#
|
||||
%package postgresql
|
||||
Summary: postfix plugin to support PostgreSQL maps
|
||||
Autoreqprov: on
|
||||
Group: Productivity/Networking/Email/Servers
|
||||
Prefix: %{_prefix}
|
||||
Prereq: postfix
|
||||
Prereq: %{name} = %{version}
|
||||
#
|
||||
%package devel
|
||||
Summary: Development headers for the postfix package.
|
||||
Autoreqprov: on
|
||||
Group: Productivity/Networking/Email/Servers
|
||||
Prereq: postfix
|
||||
Prereq: %{name} = %{version}
|
||||
#
|
||||
# Some defines
|
||||
#
|
||||
@ -65,9 +65,9 @@ Prereq: postfix
|
||||
%define pf_newaliases_path /usr/bin/newaliases
|
||||
%define pf_mailq_path /usr/bin/mailq
|
||||
%define pf_setgid_group maildrop
|
||||
%define pf_readme_directory %{_docdir}/postfix/README_FILES
|
||||
%define pf_html_directory %{_docdir}/postfix/html
|
||||
%define pf_sample_directory %{_docdir}/postfix/samples
|
||||
%define pf_readme_directory %{_docdir}/%{name}/README_FILES
|
||||
%define pf_html_directory %{_docdir}/%{name}/html
|
||||
%define pf_sample_directory %{_docdir}/%{name}/samples
|
||||
%define postfix_uid 51
|
||||
%define postfix_gid 51
|
||||
%define maildrop_gid 59
|
||||
@ -78,7 +78,7 @@ Prereq: postfix
|
||||
# ---------------------------------------------------------------------------
|
||||
%prep
|
||||
%setup -n postfix-%{version} -a 1
|
||||
%patch -p1
|
||||
%patch
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
@ -580,6 +580,83 @@ Authors:
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu May 03 2007 - varkoly@suse.de
|
||||
- dynamic_maps.patch: readded the chunk for dict_tcp and dict_pcre
|
||||
- replaced prereq for postfix with a prereq on
|
||||
%%{name} = %%{version}
|
||||
- updated to postfix 2.4, patchlevel 0
|
||||
Major changes - safety
|
||||
* As a safety measure, Postfix now by default creates mailbox dotlock
|
||||
files on all systems. This prevents problems with GNU POP3D which
|
||||
subverts kernel locking by creating a new mailbox file and deleting
|
||||
the old one
|
||||
Major changes - Milter support
|
||||
* The support for Milter header modification
|
||||
requests was revised. With minimal change in the on-disk representation,
|
||||
the code was greatly simplified, and regression tests were updated
|
||||
to ensure that old errors were not re-introduced. The queue file
|
||||
format is entirely backwards compatible with Postfix 2.3.
|
||||
* Support for Milter requests to replace the message
|
||||
body. Postfix now implements all the header/body modification
|
||||
requests that are available with Sendmail 8.13.
|
||||
* A new field is added to the queue file "size"
|
||||
record that specifies the message content length. Postfix 2.3 and
|
||||
older Postfix 2.4 snapshots will ignore this field, and will report
|
||||
the message size as it was before the body was replaced.
|
||||
Major changes - TLS support
|
||||
* The check_smtpd_policy client sends TLS certificate
|
||||
attributes (client ccert_subject, ccert_issuer) only after successful
|
||||
client certificate verification. The reason is that the certification
|
||||
verification status itself is not available in the policy request.
|
||||
* The check_smtpd_policy client sends TLS certificate
|
||||
fingerprint information even when the certificate itself was not
|
||||
verified.
|
||||
* The remote SMTP client TLS certificate fingerprint
|
||||
can be used for access control even when the certificate itself was
|
||||
not verified.
|
||||
* The format of SMTP server TLS session cache
|
||||
lookup keys has changed. The lookup key now includes the master.cf
|
||||
service name.
|
||||
Major changes - performance
|
||||
* Better support for systems that run thousands
|
||||
of Postfix processes. Postfix now supports FreeBSD kqueue(2),
|
||||
Solaris poll(7d) and Linux epoll(4) as more scalable alternatives
|
||||
to the traditional select(2) system call, and uses poll(2) when
|
||||
examining a single file descriptor for readability or writability.
|
||||
These features are supported on sufficiently recent versions of
|
||||
FreeBSD, NetBSD, OpenBSD, Solaris and Linux; support for other
|
||||
systems will be added as evidence becomes available that usable
|
||||
implementations exist.
|
||||
Major changes - delivery status notifications
|
||||
* Small changes were made to the default bounce
|
||||
message templates, to prevent HTML-aware software from hiding or
|
||||
removing the text "<postmaster>", and producing misleading text.
|
||||
* Postfix no longer announces its name in delivery
|
||||
status notifications. Users believe that Wietse provides a free
|
||||
help desk service that solves all their email problems.
|
||||
Major changes - ETRN support
|
||||
* More precise queue flushing with the ETRN,
|
||||
"postqueue -s site", and "sendmail -qRsite" commands, after
|
||||
minimization of race conditions. New per-queue-file flushing with
|
||||
"postqueue -i queueid" and "sendmail -qIqueueid".
|
||||
Major changes - small office/home office support
|
||||
* Postfix no longer requires a domain name. It
|
||||
uses "localdomain" as the default Internet domain name when no
|
||||
domain is specified via main.cf or via the machine's hostname.
|
||||
Major changes - SMTP access control
|
||||
* The check_smtpd_policy client sends TLS certificate
|
||||
attributes (client ccert_subject, ccert_issuer) only after successful
|
||||
client certificate verification. The reason is that the certification
|
||||
verification status itself is not available in the policy request.
|
||||
* The check_smtpd_policy client sends TLS certificate
|
||||
fingerprint information even when the certificate itself was not
|
||||
verified.
|
||||
* The remote SMTP client TLS certificate fingerprint can be used for
|
||||
access control even when the certificate itself was not verified.
|
||||
* The Postfix installation procedure no longer
|
||||
updates main.cf with "unknown_local_recipient_reject_code = 450".
|
||||
Four years after the introduction of mandatory recipient validation,
|
||||
this transitional tool is no longer neeed.
|
||||
* Thu Mar 29 2007 - rguenther@suse.de
|
||||
- Add pwdutils BuildRequires to allow postinst script to succeed.
|
||||
- Add /usr/share/omc directory.
|
||||
|
Loading…
x
Reference in New Issue
Block a user