Author: glen Date: Wed Mar 26 21:40:06 2008 GMT
Module: packages Tag: HEAD
---- Log message:
- update to 2.5.1 stable (by Eero Hänninen)
---- Files affected:
packages/postfix/files:
postfix-conf_msg.patch (1.9 -> 1.10) , postfix-dynamicmaps.patch (1.13 ->
1.14) , postfix-ident.patch (1.3 -> 1.4) , postfix-log-proxy-rejects.patch (1.4
-> 1.5)
---- Diffs:
================================================================
Index: packages/postfix/files/postfix-conf_msg.patch
diff -u packages/postfix/files/postfix-conf_msg.patch:1.9
packages/postfix/files/postfix-conf_msg.patch:1.10
--- packages/postfix/files/postfix-conf_msg.patch:1.9 Mon Jul 17 03:53:33 2006
+++ packages/postfix/files/postfix-conf_msg.patch Wed Mar 26 22:40:01 2008
@@ -17,9 +17,9 @@
--- 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 @@
- VAR_MILT_DEF_ACTION, DEF_MILT_DEF_ACTION, &var_milt_def_action, 1, 0,
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,
};
================================================================
Index: packages/postfix/files/postfix-dynamicmaps.patch
diff -u packages/postfix/files/postfix-dynamicmaps.patch:1.13
packages/postfix/files/postfix-dynamicmaps.patch:1.14
--- packages/postfix/files/postfix-dynamicmaps.patch:1.13 Wed Dec 19
02:07:18 2007
+++ packages/postfix/files/postfix-dynamicmaps.patch Wed Mar 26 22:40:01 2008
@@ -583,16 +583,6 @@
/* mail_params_init - configure built-in parameters */
void mail_params_init()
-@@ -584,6 +619,9 @@
- * Variables that are needed by almost every program.
- */
- get_mail_conf_str_table(other_str_defaults);
-+ if (*var_myorigin=='/') {
-+ var_myorigin=read_file(var_myorigin);
-+ }
- get_mail_conf_int_table(other_int_defaults);
- get_mail_conf_bool_table(bool_defaults);
- get_mail_conf_time_table(time_defaults);
--- postfix-2.3.0/src/global/Makefile.in 2006-07-17 03:28:25.732653648
+0200
+++ postfix-2.3.0/src/global/Makefile.in-new 2006-07-17 03:29:31.805609032
+0200
@@ -32,7 +32,7 @@
@@ -610,8 +600,9 @@
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
-+ allascii.c load_file.c killme_after.c vstream_tweak.c load_lib.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
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 \
@@ -622,16 +613,15 @@
+ 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 \
- fifo_listen.o fifo_trigger.o file_limit.o find_inet.o fsspace.o \
@@ -62,7 +62,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
-+ allascii.o load_file.o killme_after.o vstream_tweak.o load_lib.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
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 \
@@ -81,13 +81,14 @@
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 \
================================================================
Index: packages/postfix/files/postfix-ident.patch
diff -u packages/postfix/files/postfix-ident.patch:1.3
packages/postfix/files/postfix-ident.patch:1.4
--- packages/postfix/files/postfix-ident.patch:1.3 Mon Jul 17 03:53:33 2006
+++ packages/postfix/files/postfix-ident.patch Wed Mar 26 22:40:01 2008
@@ -213,16 +213,16 @@
#define VSTRING_STRDUP(s) vstring_strcpy(vstring_alloc(strlen(s) + 1), (s))
-@@ -4129,6 +4143,9 @@
+@@ -4451,6 +4451,9 @@
xclient_hosts = namadr_list_init(MATCH_FLAG_NONE, var_xclient_hosts);
xforward_hosts = namadr_list_init(MATCH_FLAG_NONE, var_xforward_hosts);
hogger_list = namadr_list_init(MATCH_FLAG_NONE, var_smtpd_hoggers);
+ smtpd_ident_lookup =
-+ namadr_list_init(match_parent_style(VAR_SMTPD_IDENT_LOOKUP),
-+ var_smtpd_ident_lookup);
- if (getuid() == 0 || getuid() == var_owner_uid)
- smtpd_check_init();
- debug_peer_init();
++ namadr_list_init(match_parent_style(VAR_SMTPD_IDENT_LOOKUP),
++ var_smtpd_ident_lookup);
+
+ /*
+ * 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,
VAR_MILT_V, DEF_MILT_V, &var_milt_v, 1, 0,
@@ -287,14 +287,14 @@
INET_PROTO_INFO *proto_info = inet_proto_info();
sa = (struct sockaddr *) & (state->sockaddr);
-@@ -163,6 +170,7 @@
+@@ -177,6 +177,7 @@
state->addr_family = AF_UNSPEC;
state->name_status = SMTPD_PEER_CODE_PERM;
state->reverse_name_status = SMTPD_PEER_CODE_PERM;
+ state->ident_user = mystrdup("NO-USER");
+ state->port = mystrdup(CLIENT_PORT_UNKNOWN);
}
-
- /*
+
@@ -302,6 +310,7 @@
if (aierr) {
msg_warn("%s: hostname %s verification failed: %s",
@@ -324,17 +324,20 @@
}
/*
-@@ -337,6 +360,7 @@
- state->addr_family = AF_UNSPEC;
+@@ -390,7 +391,8 @@
state->name_status = SMTPD_PEER_CODE_OK;
state->reverse_name_status = SMTPD_PEER_CODE_OK;
+ state->port = mystrdup("0"); /* XXX bogus. */
+- }
+ state->ident_user = mystrdup("NO-USER");
- }
++ }
/*
-@@ -355,4 +379,5 @@
+ * Do the name[addr]:port formatting for pretty reports.
+@@ -410,5 +412,6 @@
myfree(state->addr);
myfree(state->namaddr);
myfree(state->rfc_addr);
+ myfree(state->ident_user);
+ myfree(state->port);
}
================================================================
Index: packages/postfix/files/postfix-log-proxy-rejects.patch
diff -u packages/postfix/files/postfix-log-proxy-rejects.patch:1.4
packages/postfix/files/postfix-log-proxy-rejects.patch:1.5
--- packages/postfix/files/postfix-log-proxy-rejects.patch:1.4 Tue Sep 11
00:42:36 2007
+++ packages/postfix/files/postfix-log-proxy-rejects.patch Wed Mar 26
22:40:01 2008
@@ -1,15 +1,17 @@
diff -ur postfix-2.4.5/src/smtpd/smtpd.c postfix-2.4.5-proxy/src/smtpd/smtpd.c
--- postfix-2.4.5/src/smtpd/smtpd.c 2007-09-11 00:27:31.181567626 +0200
+++ postfix-2.4.5-proxy/src/smtpd/smtpd.c 2007-09-11 00:26:54.177444169
+0200
-@@ -2452,6 +2452,8 @@
+@@ -2526,7 +2526,9 @@
int out_error;
char **cpp;
- CLEANUP_STAT_DETAIL *detail;
+ const CLEANUP_STAT_DETAIL *detail;
+- const char *rfc3848_sess;
+ VSTRING *proxy_why = 0;
+ int proxy_code;
++ const char *rfc3848_sess;
+ const char *rfc3848_auth;
#ifdef USE_TLS
- VSTRING *peer_CN;
@@ -2705,8 +2707,19 @@
if (state->err == CLEANUP_STAT_OK) {
(void) smtpd_proxy_cmd(state, SMTPD_PROX_WANT_ANY, ".");
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/postfix/files/postfix-conf_msg.patch?r1=1.9&r2=1.10&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/postfix/files/postfix-dynamicmaps.patch?r1=1.13&r2=1.14&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/postfix/files/postfix-ident.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/postfix/files/postfix-log-proxy-rejects.patch?r1=1.4&r2=1.5&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
