- update to 2.5.1 stable (by Eero Hänninen)

[packages/postfix.git] / postfix-dynamicmaps.patch

diff --git a/postfix-dynamicmaps.patch b/postfix-dynamicmaps.patch
index f0b5cdd14e319d12c7e73ce9dbb131a3296b275a..7ab0f313dba082c67e6f295d61ea5b3d918f5de0 100644 (file)
--- a/postfix-dynamicmaps.patch
+++ b/postfix-dynamicmaps.patch
@@ -48,14 +48,14 @@ diff -durN postfix-2.1.3.orig/src/global/Makefile.in postfix-2.1.3/src/global/Ma
 -      $(RANLIB) $(LIB)
 +      gcc -shared -Wl,-soname,libpostfix-global.so.1 -o $(LIB) $(OBJS)
 +
-+$(LDAPSO): dict_ldap.o
++$(LDAPSO): dict_ldap.o $(LIB)
 +      gcc -shared -Wl,-soname,dict_ldap.so -o $@ $? -lldap -llber -L../../lib -lutil -L. -lglobal
 +
-+$(MYSQLSO): dict_mysql.o
-+      gcc -shared -Wl,-soname,dict_ldap.so -o $@ $? -lmysqlclient -L../../lib -lutil -L. -lglobal
++$(MYSQLSO): dict_mysql.o $(LIB)
++      gcc -shared -Wl,-soname,dict_mysql.so -o $@ $? -lmysqlclient -L../../lib -lutil -L. -lglobal
 +
-+$(PGSQLSO): dict_pgsql.o
-+      gcc -shared -Wl,-soname,dict_ldap.so -o $@ $? -lpq -L../../lib -lutil -L. -lglobal
++$(PGSQLSO): dict_pgsql.o $(LIB)
++      gcc -shared -Wl,-soname,dict_pgsql.so -o $@ $? -lpq -L../../lib -lutil -L. -lglobal
  
  $(LIB_DIR)/$(LIB): $(LIB)
        cp $(LIB) $(LIB_DIR)
@@ -583,16 +583,6 @@ diff -dur postfix-2.1.3.orig/src/global/mail_dict.c postfix-2.1.3/src/global/mai
  /* 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 @@ diff -dur postfix-2.1.3.orig/src/global/mail_dict.c postfix-2.1.3/src/global/mai
        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 @@ 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 \
-       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 \