- postfix 2.11.0

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

diff --git a/postfix-dynamicmaps.patch b/postfix-dynamicmaps.patch
index cb83e65fe166e21f6afda5540b58a8e20c740586..9a3c0b65a55522c0f3404ba705377974faf8a6c1 100644 (file)
--- a/postfix-dynamicmaps.patch
+++ b/postfix-dynamicmaps.patch
@@ -634,45 +634,45 @@ diff -durN postfix-2.1.3.orig/src/util/sys_defs.h postfix-2.1.3/src/util/sys_def
      DICT_TYPE_MEMCACHE, dict_memcache_open,
      0,
  };
---- postfix-2.10.0/src/util/Makefile.in.orig   2013-03-12 18:35:34.678563247 +0100
-+++ postfix-2.10.0/src/util/Makefile.in        2013-03-12 18:37:04.201043205 +0100
+--- postfix-2.11.0/src/util/Makefile.in.orig   2014-01-21 20:11:09.962162436 +0100
++++ postfix-2.11.0/src/util/Makefile.in        2014-01-21 20:19:15.918126827 +0100
 @@ -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 \
+       vstream_popen.c vstring.c vstring_vstream.c watchdog.c \
+       write_buf.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 \
        pass_trigger.c edit_file.c inet_windowsize.c \
        unix_pass_fd_fix.c dict_cache.c valid_utf_8.c dict_thash.c \
        ip_match.c nbbio.c base32_code.c dict_test.c \
-@@ -42,7 +42,7 @@
+@@ -43,7 +43,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 \
+       dict_dbm.o dict_debug.o dict_env.o dict_ht.o dict_lmdb.o dict_ni.o dict_nis.o \
 -      dict_nisplus.o dict_open.o dict_pcre.o dict_regexp.o dict_sdbm.o \
 +      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 \
-@@ -67,7 +67,7 @@
+@@ -68,7 +68,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 \
+       vstream_popen.o vstring.o vstring_vstream.o watchdog.o \
+       write_buf.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 \
        pass_trigger.o edit_file.o inet_windowsize.o \
        unix_pass_fd_fix.o dict_cache.o valid_utf_8.o dict_thash.o \
        ip_match.o nbbio.o base32_code.o dict_test.o \
-@@ -91,7 +91,7 @@
+@@ -93,7 +93,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 \
        edit_file.h dict_cache.h dict_thash.h ip_match.h nbbio.h base32_code.h \
-       dict_fail.h warn_stat.h dict_sockmap.h line_number.h
- TESTSRC       = fifo_open.c fifo_rdwr_bug.c fifo_rdonly_bug.c select_bug.c \
-@@ -100,6 +100,7 @@
+       dict_fail.h warn_stat.h dict_sockmap.h line_number.h timecmp.h \
+       slmdb.h compat_va_copy.h
+@@ -103,6 +103,7 @@
  CFLAGS        = $(DEBUG) $(OPT) $(DEFS)
  FILES = Makefile $(SRCS) $(HDRS)
  INCL  =
@@ -680,7 +680,7 @@ diff -durN postfix-2.1.3.orig/src/util/sys_defs.h postfix-2.1.3/src/util/sys_def
  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 \
-@@ -116,8 +117,9 @@
+@@ -119,8 +120,9 @@
  
  LIB_DIR       = ../../lib
  INC_DIR       = ../../include
@@ -691,7 +691,7 @@ diff -durN postfix-2.1.3.orig/src/util/sys_defs.h postfix-2.1.3/src/util/sys_def
  
  all: $(LIB)
  
-@@ -128,15 +130,19 @@
+@@ -131,15 +133,19 @@
  
  test: $(TESTPROG)
  
@@ -715,7 +715,7 @@ diff -durN postfix-2.1.3.orig/src/util/sys_defs.h postfix-2.1.3/src/util/sys_def
        -for i in $(HDRS); \
        do \
          cmp -s $$i $(INC_DIR)/$$i 2>/dev/null || cp $$i $(INC_DIR); \
-@@ -158,7 +164,8 @@
+@@ -161,7 +167,8 @@
        lint $(DEFS) $(SRCS) $(LINTFIX)
  
  clean: