- updated for 2.6.1

Changed files:
    postfix-conf_msg.patch -> 1.11
    postfix-dynamicmaps.patch -> 1.15
    postfix-ident.patch -> 1.5
    postfix-log-proxy-rejects.patch -> 1.6

4 files changed, 50 insertions, 50 deletions

diff --git a/postfix-conf_msg.patch b/postfix-conf_msg.patch
index 44a5fd7..af6de42 100644
--- a/postfix-conf_msg.patch
+++ b/postfix-conf_msg.patch
@@ -14,19 +14,19 @@
  /* LICENSE
  /* .ad
  /* .fi
---- src/smtpd/smtpd.c.orig	2004-06-22 14:32:57.338808646 +0200
-+++ src/smtpd/smtpd.c	2004-06-22 14:41:40.372360162 +0200
-@@ -4514,6 +4514,7 @@
+--- src/smtpd/smtpd.c.orig	2009-05-25 19:13:15.584397697 +0200
++++ src/smtpd/smtpd.c	2009-05-25 19:14:31.066487776 +0200
+@@ -5062,6 +5062,7 @@
  	VAR_MILT_DAEMON_NAME, DEF_MILT_DAEMON_NAME, &var_milt_daemon_name, 1, 0,
  	VAR_MILT_V, DEF_MILT_V, &var_milt_v, 1, 0,
  	VAR_STRESS, DEF_STRESS, &var_stress, 0, 0,
 +	VAR_REJECT_REPLY_MSG_ACCESS_DENIED, DEF_REJECT_REPLY_MSG_ACCESS_DENIED, &var_reject_reply_msg_access_denied, 1, 0,
- 	0,
-     };
-     static CONFIG_RAW_TABLE raw_table[] = {
---- src/global/mail_params.c	2006-06-15 02:50:02.000000000 +0200
-+++ src/global/mail_params.c-new	2006-07-11 19:29:07.162325784 +0200
-@@ -78,6 +78,7 @@
+ 	VAR_UNV_FROM_WHY, DEF_UNV_FROM_WHY, &var_unv_from_why, 0, 0,
+ 	VAR_UNV_RCPT_WHY, DEF_UNV_RCPT_WHY, &var_unv_rcpt_why, 0, 0,
+ 	VAR_REJECT_TMPF_ACT, DEF_REJECT_TMPF_ACT, &var_reject_tmpf_act, 1, 0,
+--- src/global/mail_params.c.orig	2009-05-25 19:15:04.209595211 +0200
++++ src/global/mail_params.c	2009-05-25 19:20:20.187561915 +0200
+@@ -80,6 +80,7 @@
  /*	char	*var_debug_peer_list;
  /*	int	var_debug_peer_level;
  /*	int	var_in_flow_delay;
@@ -34,7 +34,7 @@
  /*	int	var_fault_inj_code;
  /*	char   *var_bounce_service;
  /*	char   *var_cleanup_service;
-@@ -246,6 +247,7 @@
+@@ -265,6 +266,7 @@
  char   *var_export_environ;
  char   *var_debug_peer_list;
  int     var_debug_peer_level;
@@ -42,12 +42,11 @@
  int     var_fault_inj_code;
  char   *var_bounce_service;
  char   *var_cleanup_service;
-@@ -488,6 +490,7 @@
- 	VAR_FLUSH_SERVICE, DEF_FLUSH_SERVICE, &var_flush_service, 1, 0,
- 	VAR_VERIFY_SERVICE, DEF_VERIFY_SERVICE, &var_verify_service, 1, 0,
- 	VAR_TRACE_SERVICE, DEF_TRACE_SERVICE, &var_trace_service, 1, 0,
-	VAR_INT_FILT_CLASSES, DEF_INT_FILT_CLASSES, &var_int_filt_classes, 0, 0,
+@@ -567,6 +569,7 @@
+ 	VAR_PROXYMAP_SERVICE, DEF_PROXYMAP_SERVICE, &var_proxymap_service, 1, 0,
+ 	VAR_PROXYWRITE_SERVICE, DEF_PROXYWRITE_SERVICE, &var_proxywrite_service, 1, 0,
+ 	VAR_INT_FILT_CLASSES, DEF_INT_FILT_CLASSES, &var_int_filt_classes, 0, 0,
 +	VAR_REJECT_REPLY_MSG_ACCESS_DENIED, DEF_REJECT_REPLY_MSG_ACCESS_DENIED, &var_reject_reply_msg_access_denied, 1, 0,
  	0,
      };
-     static CONFIG_STR_FN_TABLE function_str_defaults_2[] = {
+     static const CONFIG_STR_FN_TABLE function_str_defaults_2[] = {
diff --git a/postfix-dynamicmaps.patch b/postfix-dynamicmaps.patch
index 7ab0f31..75666ce 100644
--- a/postfix-dynamicmaps.patch
+++ b/postfix-dynamicmaps.patch
@@ -594,18 +594,18 @@ diff -dur postfix-2.1.3.orig/src/global/mail_dict.c postfix-2.1.3/src/global/mai
  	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 \
---- postfix-2.3.12/src/util/Makefile.in.orig	2007-07-31 01:18:35.000000000 +0200
-+++ postfix-2.3.12/src/util/Makefile.in	2007-08-26 17:34:55.300706718 +0200
-@@ -30,14 +30,14 @@
+--- postfix-2.6.1/src/util/Makefile.in.orig	2009-05-25 19:21:45.370180069 +0200
++++ postfix-2.6.1/src/util/Makefile.in	2009-05-25 19:25:49.971166764 +0200
+@@ -30,7 +30,7 @@
  	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 vstream_tweak.c upass_connect.c \
 +	allascii.c load_file.c killme_after.c vstream_tweak.c upass_connect.c load_lib.c \
- 	upass_listen.c upass_trigger.c
+ 	upass_listen.c upass_trigger.c edit_file.c inet_windowsize.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 \
+@@ -38,7 +38,7 @@
  	chroot_uid.o cidr_match.o clean_env.o close_on_exec.o concatenate.o \
  	ctable.o dict.o dict_alloc.o dict_cdb.o dict_cidr.o dict_db.o \
  	dict_dbm.o dict_debug.o dict_env.o dict_ht.o dict_ni.o dict_nis.o \
@@ -613,24 +613,26 @@ diff -dur postfix-2.1.3.orig/src/global/mail_dict.c postfix-2.1.3/src/global/mai
 +	dict_nisplus.o dict_open.o dict_regexp.o dict_sdbm.o \
  	dict_static.o dict_tcp.o dict_unix.o dir_forest.o doze.o dummy_read.o \
  	dummy_write.o duplex_pipe.o environ.o events.o exec_command.o \
-@@ -62,7 +62,7 @@
+ 	fifo_listen.o fifo_trigger.o file_limit.o find_inet.o fsspace.o \
+@@ -63,7 +63,7 @@
  	username.o valid_hostname.o vbuf.o vbuf_print.o vstream.o \
  	vstream_popen.o vstring.o vstring_vstream.o watchdog.o writable.o \
  	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 \
 +	allascii.o load_file.o killme_after.o vstream_tweak.o upass_connect.o load_lib.o \
- 	upass_listen.o upass_trigger.o
+ 	upass_listen.o upass_trigger.o edit_file.o inet_windowsize.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 \
-@@ -81,13 +81,14 @@
+@@ -83,7 +83,7 @@
  	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 \
  	username.h valid_hostname.h vbuf.h vbuf_print.h vstream.h vstring.h \
--	vstring_vstream.h watchdog.h format_tv.h load_file.h killme_after.h
-+	vstring_vstream.h watchdog.h format_tv.h load_file.h killme_after.h load_lib.h
+-	vstring_vstream.h watchdog.h format_tv.h load_file.h killme_after.h \
++	vstring_vstream.h watchdog.h format_tv.h load_file.h killme_after.h load_lib.h \
+ 	edit_file.h
  TESTSRC	= fifo_open.c fifo_rdwr_bug.c fifo_rdonly_bug.c select_bug.c \
- 	stream_test.c dup2_pass_on_exec.c
- DEFS	= -I. -D$(SYSTYPE)
+ 	stream_test.c dup2_pass_on_exec.c 
+@@ -91,6 +91,7 @@
  CFLAGS	= $(DEBUG) $(OPT) $(DEFS)
  FILES	= Makefile $(SRCS) $(HDRS)
  INCL	=
@@ -638,7 +640,7 @@ diff -dur postfix-2.1.3.orig/src/global/mail_dict.c postfix-2.1.3/src/global/mai
  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 \
-@@ -102,8 +103,9 @@
+@@ -105,8 +106,9 @@
  
  LIB_DIR	= ../../lib
  INC_DIR	= ../../include
@@ -649,7 +651,7 @@ diff -dur postfix-2.1.3.orig/src/global/mail_dict.c postfix-2.1.3/src/global/mai
  
  all: $(LIB)
  
-@@ -114,15 +116,19 @@
+@@ -117,15 +119,19 @@
  
  test:	$(TESTPROG)
  
@@ -673,7 +675,7 @@ diff -dur postfix-2.1.3.orig/src/global/mail_dict.c postfix-2.1.3/src/global/mai
  	-for i in $(HDRS); \
  	do \
  	  cmp -s $$i $(INC_DIR)/$$i 2>/dev/null || cp $$i $(INC_DIR); \
-@@ -144,7 +150,8 @@
+@@ -147,7 +153,8 @@
  	lint $(SRCS)
  
  clean:
diff --git a/postfix-ident.patch b/postfix-ident.patch
index 209dfcf..72e64e9 100644
--- a/postfix-ident.patch
+++ b/postfix-ident.patch
@@ -153,21 +153,21 @@ diff -urN -x '*~' postfix-2.2.5/src/smtpd/smtpd_ident.c postfix-2.2.5-ident/src/
 +    return_val = mystrdup(ident_user);
 +    return return_val;
 +}
---- postfix-2.3-RC9/src/smtpd/Makefile.in.orig	2006-07-09 19:45:31.000000000 +0200
-+++ postfix-2.3-RC9/src/smtpd/Makefile.in	2006-07-11 20:17:09.605127872 +0200
+--- postfix-2.6.1/src/smtpd/Makefile.in.orig	2009-05-25 19:34:22.326563111 +0200
++++ postfix-2.6.1/src/smtpd/Makefile.in	2009-05-25 19:40:29.642775958 +0200
 @@ -1,10 +1,10 @@
  SHELL	= /bin/sh
  SRCS	= smtpd.c smtpd_token.c smtpd_check.c smtpd_chat.c smtpd_state.c \
  	smtpd_peer.c smtpd_sasl_proto.c smtpd_sasl_glue.c smtpd_proxy.c \
--	smtpd_xforward.c smtpd_dsn_fix.c smtpd_milter.c
-+	smtpd_xforward.c smtpd_dsn_fix.c smtpd_milter.c smtpd_ident.c
+-	smtpd_xforward.c smtpd_dsn_fix.c smtpd_milter.c smtpd_resolve.c
++	smtpd_xforward.c smtpd_dsn_fix.c smtpd_milter.c smtpd_resolve.c smtpd_ident.c
  OBJS	= smtpd.o smtpd_token.o smtpd_check.o smtpd_chat.o smtpd_state.o \
  	smtpd_peer.o smtpd_sasl_proto.o smtpd_sasl_glue.o smtpd_proxy.o \
--	smtpd_xforward.o smtpd_dsn_fix.o smtpd_milter.o
-+	smtpd_xforward.o smtpd_dsn_fix.o smtpd_milter.o smtpd_ident.o
+-	smtpd_xforward.o smtpd_dsn_fix.o smtpd_milter.o smtpd_resolve.o
++	smtpd_xforward.o smtpd_dsn_fix.o smtpd_milter.o smtpd_resolve.o smtpd_ident.o
  HDRS	= smtpd_token.h smtpd_check.h smtpd_chat.h smtpd_sasl_proto.h \
- 	smtpd_sasl_glue.h smtpd_proxy.h smtpd_dsn_fix.h smtpd_milter.h
- TESTSRC	= smtpd_token_test.c
+ 	smtpd_sasl_glue.h smtpd_proxy.h smtpd_dsn_fix.h smtpd_milter.h \
+ 	smtpd_resolve.h
 --- postfix-2.3-RC9/src/smtpd/smtpd.c.orig	2006-07-11 20:13:27.780850288 +0200
 +++ postfix-2.3-RC9/src/smtpd/smtpd.c	2006-07-11 20:27:06.515383720 +0200
 @@ -1024,6 +1024,7 @@
@@ -223,14 +223,14 @@ diff -urN -x '*~' postfix-2.2.5/src/smtpd/smtpd_ident.c postfix-2.2.5-ident/src/
  
      /*
       * Open maps before dropping privileges so we can read passwords etc.
-@@ -4513,6 +4513,7 @@
- 	VAR_MILT_DAEMON_NAME, DEF_MILT_DAEMON_NAME, &var_milt_daemon_name, 1, 0,
+@@ -5076,6 +5093,7 @@
  	VAR_MILT_V, DEF_MILT_V, &var_milt_v, 1, 0,
+ 	VAR_STRESS, DEF_STRESS, &var_stress, 0, 0,
  	VAR_REJECT_REPLY_MSG_ACCESS_DENIED, DEF_REJECT_REPLY_MSG_ACCESS_DENIED, &var_reject_reply_msg_access_denied, 1, 0,
 +	VAR_SMTPD_IDENT_LOOKUP, DEF_SMTPD_IDENT_LOOKUP, &var_smtpd_ident_lookup, 0, 0,
- 	0,
-     };
-     static CONFIG_RAW_TABLE raw_table[] = {
+ 	VAR_UNV_FROM_WHY, DEF_UNV_FROM_WHY, &var_unv_from_why, 0, 0,
+ 	VAR_UNV_RCPT_WHY, DEF_UNV_RCPT_WHY, &var_unv_rcpt_why, 0, 0,
+ 	VAR_REJECT_TMPF_ACT, DEF_REJECT_TMPF_ACT, &var_reject_tmpf_act, 1, 0,
 --- postfix-2.3-RC9/src/smtpd/smtpd.h.orig	2006-07-09 21:49:21.000000000 +0200
 +++ postfix-2.3-RC9/src/smtpd/smtpd.h	2006-07-11 20:30:43.993322048 +0200
 @@ -77,6 +77,7 @@
diff --git a/postfix-log-proxy-rejects.patch b/postfix-log-proxy-rejects.patch
index b52bc54..2f7e369 100644
--- a/postfix-log-proxy-rejects.patch
+++ b/postfix-log-proxy-rejects.patch
@@ -33,19 +33,18 @@ diff -ur postfix-2.4.5/src/smtpd/smtpd.c postfix-2.4.5-proxy/src/smtpd/smtpd.c
  	} else if (state->err != CLEANUP_STAT_SIZE) {
  	    state->err |= CLEANUP_STAT_PROXY;
  	    detail = cleanup_stat_detail(CLEANUP_STAT_PROXY);
-diff -ur postfix-2.4.5/src/smtpd/smtpd_check.c postfix-2.4.5-proxy/src/smtpd/smtpd_check.c
---- postfix-2.4.5/src/smtpd/smtpd_check.c	2007-09-11 00:27:30.414953649 +0200
-+++ postfix-2.4.5-proxy/src/smtpd/smtpd_check.c	2007-09-11 00:10:33.804822948 +0200
-@@ -378,7 +378,7 @@
+--- postfix-2.6.1/src/smtpd/smtpd_check.c.orig	2009-05-25 19:29:43.159923869 +0200
++++ postfix-2.6.1/src/smtpd/smtpd_check.c	2009-05-25 19:31:30.299567709 +0200
+@@ -386,7 +386,7 @@
    * mail.
    */
- static void PRINTFLIKE(5, 6) defer_if(SMTPD_DEFER *, int, int, const char *, const char *,...);
+ static int PRINTFLIKE(5, 6) defer_if(SMTPD_DEFER *, int, int, const char *, const char *,...);
 -static int PRINTFLIKE(5, 6) smtpd_check_reject(SMTPD_STATE *, int, int, const char *, const char *,...);
 +int PRINTFLIKE(5, 6) smtpd_check_reject(SMTPD_STATE *, int, int, const char *, const char *,...);
  
  #define DEFER_IF_REJECT2(state, class, code, dsn, fmt, a1, a2) \
      defer_if(&(state)->defer_if_reject, (class), (code), (dsn), (fmt), (a1), (a2))
-@@ -759,7 +759,7 @@
+@@ -758,7 +758,7 @@
  
  /* smtpd_check_reject - do the boring things that must be done */