diff --git a/dynamic_maps.patch b/dynamic_maps.patch
index 17f0b42..6226e28 100644
--- a/dynamic_maps.patch
+++ b/dynamic_maps.patch
@@ -86,7 +86,7 @@ Index: src/global/Makefile.in
  	dict_proxy.c dict_sqlite.c domain_list.c dot_lockfile.c dot_lockfile_as.c \
  	dsb_scan.c dsn.c dsn_buf.c dsn_mask.c dsn_print.c dsn_util.c \
  	ehlo_mask.c ext_prop.c file_id.c flush_clnt.c header_opts.c \
-@@ -35,7 +35,7 @@ OBJS	= abounce.o anvil_clnt.o been_here.
+@@ -37,7 +37,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 \
  	defer.o deliver_completed.o deliver_flock.o deliver_pass.o \
@@ -95,7 +95,7 @@ Index: src/global/Makefile.in
  	dict_proxy.o dict_sqlite.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 \
-@@ -106,10 +106,13 @@ LIBS	= ../../lib/libutil.a
+@@ -112,10 +112,13 @@ LIBS	= ../../lib/libutil.a
  LIB_DIR	= ../../lib
  INC_DIR	= ../../include
  MAKES	=
@@ -111,7 +111,7 @@ Index: src/global/Makefile.in
  
  $(OBJS): ../../conf/makedefs.out
  
-@@ -119,14 +122,30 @@ Makefile: Makefile.in
+@@ -125,14 +128,30 @@ Makefile: Makefile.in
  test:	$(TESTPROG)
  
  $(LIB):	$(OBJS)
@@ -146,7 +146,7 @@ Index: src/global/Makefile.in
  	-for i in $(HDRS); \
  	do \
  	  cmp -s $$i $(INC_DIR)/$$i 2>/dev/null || cp $$i $(INC_DIR); \
-@@ -497,7 +516,7 @@ lint:
+@@ -577,7 +596,7 @@ lint:
  	lint $(DEFS) $(SRCS) $(LINTFIX)
  
  clean:
@@ -177,7 +177,7 @@ Index: src/global/mail_dict.c
 ===================================================================
 --- src/global/mail_dict.c.orig
 +++ src/global/mail_dict.c
-@@ -47,6 +47,7 @@
+@@ -47,6 +47,7 @@ typedef struct {
  
  static const DICT_OPEN_INFO dict_open_info[] = {
      DICT_TYPE_PROXY, dict_proxy_open,
@@ -185,7 +185,7 @@ Index: src/global/mail_dict.c
  #ifdef HAS_LDAP
      DICT_TYPE_LDAP, dict_ldap_open,
  #endif
-@@ -60,6 +61,7 @@
+@@ -60,6 +61,7 @@ static const DICT_OPEN_INFO dict_open_in
      DICT_TYPE_SQLITE, dict_sqlite_open,
  #endif
      DICT_TYPE_MEMCACHE, dict_memcache_open,
@@ -205,7 +205,7 @@ Index: src/global/mail_params.c
  /*	int	var_in_flow_delay;
  /*	int	var_fault_inj_code;
  /*	char   *var_bounce_service;
-@@ -265,6 +266,7 @@ char   *var_import_environ;
+@@ -268,6 +269,7 @@ char   *var_import_environ;
  char   *var_export_environ;
  char   *var_debug_peer_list;
  int     var_debug_peer_level;
@@ -213,7 +213,7 @@ Index: src/global/mail_params.c
  int     var_fault_inj_code;
  char   *var_bounce_service;
  char   *var_cleanup_service;
-@@ -276,6 +278,7 @@ char   *var_showq_service;
+@@ -279,6 +281,7 @@ char   *var_showq_service;
  char   *var_error_service;
  char   *var_flush_service;
  char   *var_verify_service;
@@ -225,7 +225,7 @@ Index: src/global/mkmap_open.c
 ===================================================================
 --- src/global/mkmap_open.c.orig
 +++ src/global/mkmap_open.c
-@@ -81,7 +81,7 @@
+@@ -82,7 +82,7 @@
    * We use a different table (in dict_open.c) when querying maps.
    */
  typedef struct {
@@ -234,7 +234,7 @@ Index: src/global/mkmap_open.c
      MKMAP  *(*before_open) (const char *);
  } MKMAP_OPEN_INFO;
  
-@@ -156,7 +156,16 @@ MKMAP  *mkmap_open(const char *type, con
+@@ -161,7 +161,16 @@ MKMAP  *mkmap_open(const char *type, con
       */
      for (mp = mkmap_types; /* void */ ; mp++) {
  	if (mp->type == 0)
@@ -309,7 +309,7 @@ Index: src/postconf/Makefile.in
 ===================================================================
 --- src/postconf/Makefile.in.orig
 +++ src/postconf/Makefile.in
-@@ -595,6 +598,7 @@ postconf_node.o: postconf_node.c
+@@ -595,6 +595,7 @@ postconf_node.o: postconf_node.c
  postconf_other.o: ../../include/argv.h
  postconf_other.o: ../../include/dict.h
  postconf_other.o: ../../include/htable.h
@@ -317,7 +317,7 @@ Index: src/postconf/Makefile.in
  postconf_other.o: ../../include/mbox_conf.h
  postconf_other.o: ../../include/sys_defs.h
  postconf_other.o: ../../include/vbuf.h
-Index: src/postconf/postconf.c
+Index: src/postconf/postconf_other.c
 ===================================================================
 --- src/postconf/postconf_other.c.orig
 +++ src/postconf/postconf_other.c
@@ -336,23 +336,23 @@ Index: src/postconf/postconf.c
 +#include <mail_conf.h>
  
  /* XSASL library. */
-
-@@ -66,6 +66,19 @@ void    show_maps(void)
+ 
+@@ -66,6 +71,19 @@ void    show_maps(void)
      ARGV   *maps_argv;
      int     i;
  
-+#ifndef NO_DYNAMIC_MAPS 
-+    char   *path; 
-+    char   *config_dir; 
++#ifndef NO_DYNAMIC_MAPS
++    char   *path;
++    char   *config_dir;
 +
 +    if (var_config_dir)
 +        myfree(var_config_dir);
-+    var_config_dir = mystrdup((config_dir = safe_getenv(CONF_ENV_PATH)) != 0 ? 
-+                             config_dir : DEF_CONFIG_DIR);     /* XXX */ 
-+    path = concatenate(var_config_dir, "/", "dynamicmaps.cf", (char *) 0); 
-+    dict_open_dlinfo(path); 
-+    myfree(path); 
-+#endif 
++    var_config_dir = mystrdup((config_dir = safe_getenv(CONF_ENV_PATH)) != 0 ?
++                             config_dir : DEF_CONFIG_DIR);     /* XXX */
++    path = concatenate(var_config_dir, "/", "dynamicmaps.cf", (char *) 0);
++    dict_open_dlinfo(path);
++    myfree(path);
++#endif
 +
      maps_argv = dict_mapnames();
      for (i = 0; i < maps_argv->argc; i++)
@@ -379,7 +379,7 @@ Index: src/postmap/postmap.c
  /* .IP \fB-v\fR
  /*	Enable verbose logging for debugging purposes. Multiple \fB-v\fR
  /*	options make the software increasingly verbose.
-@@ -723,6 +725,18 @@ static void postmap_seq(const char *map_
+@@ -748,6 +750,18 @@ static void postmap_seq(const char *map_
      dict_close(dict);
  }
  
@@ -398,7 +398,7 @@ Index: src/postmap/postmap.c
  /* usage - explain */
  
  static NORETURN usage(char *myname)
-@@ -743,6 +757,7 @@ int     main(int argc, char **argv)
+@@ -768,6 +782,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;
@@ -406,7 +406,7 @@ Index: src/postmap/postmap.c
      char   *query = 0;
      char   *delkey = 0;
      int     sequence = 0;
-@@ -787,7 +802,7 @@ int     main(int argc, char **argv)
+@@ -817,7 +832,7 @@ int     main(int argc, char **argv)
      /*
       * Parse JCL.
       */
@@ -415,7 +415,7 @@ Index: src/postmap/postmap.c
  	switch (ch) {
  	default:
  	    usage(argv[0]);
-@@ -804,8 +819,8 @@ int     main(int argc, char **argv)
+@@ -834,8 +849,8 @@ int     main(int argc, char **argv)
  		msg_fatal("out of memory");
  	    break;
  	case 'd':
@@ -426,7 +426,7 @@ Index: src/postmap/postmap.c
  	    delkey = optarg;
  	    break;
  	case 'f':
-@@ -831,8 +846,8 @@ int     main(int argc, char **argv)
+@@ -861,8 +876,8 @@ int     main(int argc, char **argv)
  	    postmap_flags &= ~POSTMAP_FLAG_SAVE_PERM;
  	    break;
  	case 'q':
@@ -437,7 +437,7 @@ Index: src/postmap/postmap.c
  	    query = optarg;
  	    break;
  	case 'r':
-@@ -840,10 +855,15 @@ int     main(int argc, char **argv)
+@@ -870,10 +885,15 @@ int     main(int argc, char **argv)
  	    dict_flags |= DICT_FLAG_DUP_REPLACE;
  	    break;
  	case 's':
@@ -455,7 +455,7 @@ Index: src/postmap/postmap.c
  	case 'v':
  	    msg_verbose++;
  	    break;
-@@ -914,6 +934,21 @@ int     main(int argc, char **argv)
+@@ -944,6 +964,21 @@ int     main(int argc, char **argv)
  	    exit(0);
  	}
  	exit(1);
@@ -640,7 +640,7 @@ Index: src/util/dict.h
 ===================================================================
 --- src/util/dict.h.orig
 +++ src/util/dict.h
-@@ -66,6 +66,7 @@ extern DICT *dict_debug(DICT *);
+@@ -80,6 +80,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 */
@@ -648,7 +648,7 @@ Index: src/util/dict.h
  #define DICT_FLAG_FOLD_ANY	(DICT_FLAG_FOLD_FIX | DICT_FLAG_FOLD_MUL)
  #define DICT_FLAG_OPEN_LOCK	(1<<16)	/* open file with exclusive lock */
  
-@@ -139,6 +140,11 @@ extern const char *dict_eval(const char
+@@ -166,6 +167,11 @@ extern int dict_error(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));
@@ -681,7 +681,7 @@ Index: src/util/dict_dbm.c
 ===================================================================
 --- src/util/dict_dbm.c.orig
 +++ src/util/dict_dbm.c
-@@ -409,6 +409,10 @@ DICT   *dict_dbm_open(const char *path,
+@@ -417,6 +417,10 @@ DICT   *dict_dbm_open(const char *path,
      char   *dbm_path;
      int     lock_fd;
  
@@ -2227,7 +2227,7 @@ Index: src/util/sys_defs.h
 ===================================================================
 --- src/util/sys_defs.h.orig
 +++ src/util/sys_defs.h
-@@ -721,6 +721,7 @@ extern int initgroups(const char *, int)
+@@ -755,6 +755,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
@@ -2235,7 +2235,7 @@ Index: src/util/sys_defs.h
  #define HAS_DB
  #define DEF_DB_TYPE	"hash"
  #define ALIAS_DB_MAP	"hash:/etc/aliases"
-@@ -732,11 +733,25 @@ extern int initgroups(const char *, int)
+@@ -768,11 +769,25 @@ extern int initgroups(const char *, int)
  #define STATFS_IN_SYS_VFS_H
  #define PREPEND_PLUS_TO_OPTSTRING
  #define HAS_POSIX_REGEXP
@@ -2261,7 +2261,7 @@ Index: src/util/sys_defs.h
  #ifdef __GLIBC_PREREQ
  # define HAVE_GLIBC_API_VERSION_SUPPORT(maj, min) __GLIBC_PREREQ(maj, min)
  #else
-@@ -902,6 +917,7 @@ extern int h_errno;			/* <netdb.h> impor
+@@ -954,6 +969,7 @@ extern int h_errno;			/* <netdb.h> impor
  #define USE_STATFS
  #define STATFS_IN_SYS_VFS_H
  #define HAS_POSIX_REGEXP
@@ -2269,7 +2269,7 @@ Index: 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"
-@@ -939,6 +955,7 @@ extern int h_errno;			/* <netdb.h> impor
+@@ -993,6 +1009,7 @@ extern int h_errno;			/* <netdb.h> impor
  #define USE_STATFS
  #define STATFS_IN_SYS_VFS_H
  #define HAS_POSIX_REGEXP
@@ -2277,7 +2277,7 @@ Index: 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"
-@@ -978,6 +995,7 @@ extern int h_errno;
+@@ -1034,6 +1051,7 @@ extern int h_errno;
  #define USE_STATFS
  #define STATFS_IN_SYS_VFS_H
  #define HAS_POSIX_REGEXP
diff --git a/dynamic_maps_pie.patch b/dynamic_maps_pie.patch
index ebf7c83..87dd11d 100644
--- a/dynamic_maps_pie.patch
+++ b/dynamic_maps_pie.patch
@@ -1,16 +1,18 @@
-diff -urN postfix-2.5.6-dynamic_maps.patch//makedefs postfix-2.5.6-dynamic_maps_pie.patch//makedefs
---- postfix-2.5.6-dynamic_maps.patch//makedefs	2008-01-15 21:20:24.000000000 +0100
-+++ postfix-2.5.6-dynamic_maps_pie.patch//makedefs	2011-03-17 08:08:20.330968999 +0100
-@@ -503,4 +503,5 @@
+Index: makedefs
+===================================================================
+--- makedefs.orig
++++ makedefs
+@@ -682,4 +682,5 @@ AWK	= $AWK
  STRCASE = $STRCASE
  EXPORT	= AUXLIBS='$AUXLIBS' CCARGS='$CCARGS' OPT='$OPT' DEBUG='$DEBUG'
  WARN	= $WARN
 +PIE	= $PIE
  EOF
-diff -urN postfix-2.5.6-dynamic_maps.patch//src/anvil/Makefile.in postfix-2.5.6-dynamic_maps_pie.patch//src/anvil/Makefile.in
---- postfix-2.5.6-dynamic_maps.patch//src/anvil/Makefile.in	2007-03-17 18:51:46.000000000 +0100
-+++ postfix-2.5.6-dynamic_maps_pie.patch//src/anvil/Makefile.in	2011-03-17 08:08:20.331969001 +0100
-@@ -9,11 +9,14 @@
+Index: src/anvil/Makefile.in
+===================================================================
+--- src/anvil/Makefile.in.orig
++++ src/anvil/Makefile.in
+@@ -9,11 +9,14 @@ TESTPROG=
  PROG	= anvil
  INC_DIR = ../../include
  LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
@@ -26,10 +28,11 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/anvil/Makefile.in postfix-2.5.6-
  
  $(OBJS): ../../conf/makedefs.out
  
-diff -urN postfix-2.5.6-dynamic_maps.patch//src/bounce/Makefile.in postfix-2.5.6-dynamic_maps_pie.patch//src/bounce/Makefile.in
---- postfix-2.5.6-dynamic_maps.patch//src/bounce/Makefile.in	2007-03-17 18:51:45.000000000 +0100
-+++ postfix-2.5.6-dynamic_maps_pie.patch//src/bounce/Makefile.in	2011-03-17 08:08:20.350969002 +0100
-@@ -16,13 +16,16 @@
+Index: src/bounce/Makefile.in
+===================================================================
+--- src/bounce/Makefile.in.orig
++++ src/bounce/Makefile.in
+@@ -16,13 +16,16 @@ PROG	= bounce
  SAMPLES	= ../../conf/bounce.cf.default
  INC_DIR	= ../../include
  LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
@@ -47,10 +50,11 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/bounce/Makefile.in postfix-2.5.6
  
  # Eliminate dependency on installed Postfix.
  ../../conf/bounce.cf.default: template_test.ref annotate.pl
-diff -urN postfix-2.5.6-dynamic_maps.patch//src/cleanup/Makefile.in postfix-2.5.6-dynamic_maps_pie.patch//src/cleanup/Makefile.in
---- postfix-2.5.6-dynamic_maps.patch//src/cleanup/Makefile.in	2007-03-17 18:51:40.000000000 +0100
-+++ postfix-2.5.6-dynamic_maps_pie.patch//src/cleanup/Makefile.in	2011-03-17 08:08:20.331969001 +0100
-@@ -20,11 +20,14 @@
+Index: src/cleanup/Makefile.in
+===================================================================
+--- src/cleanup/Makefile.in.orig
++++ src/cleanup/Makefile.in
+@@ -20,11 +20,14 @@ PROG	= cleanup
  INC_DIR	= ../../include
  LIBS	= ../../lib/libmaster.a ../../lib/libmilter.a ../../lib/libglobal.a \
  	../../lib/libutil.a
@@ -66,10 +70,11 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/cleanup/Makefile.in postfix-2.5.
  
  $(OBJS): ../../conf/makedefs.out
  
-diff -urN postfix-2.5.6-dynamic_maps.patch//src/discard/Makefile.in postfix-2.5.6-dynamic_maps_pie.patch//src/discard/Makefile.in
---- postfix-2.5.6-dynamic_maps.patch//src/discard/Makefile.in	2007-03-17 18:51:47.000000000 +0100
-+++ postfix-2.5.6-dynamic_maps_pie.patch//src/discard/Makefile.in	2011-03-17 08:08:20.333969002 +0100
-@@ -9,11 +9,14 @@
+Index: src/discard/Makefile.in
+===================================================================
+--- src/discard/Makefile.in.orig
++++ src/discard/Makefile.in
+@@ -9,11 +9,14 @@ TESTPROG=
  PROG	= discard
  INC_DIR	= ../../include
  LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
@@ -85,10 +90,11 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/discard/Makefile.in postfix-2.5.
  
  $(OBJS): ../../conf/makedefs.out
  
-diff -urN postfix-2.5.6-dynamic_maps.patch//src/error/Makefile.in postfix-2.5.6-dynamic_maps_pie.patch//src/error/Makefile.in
---- postfix-2.5.6-dynamic_maps.patch//src/error/Makefile.in	2007-03-17 18:51:39.000000000 +0100
-+++ postfix-2.5.6-dynamic_maps_pie.patch//src/error/Makefile.in	2011-03-17 08:08:20.334969002 +0100
-@@ -9,11 +9,14 @@
+Index: src/error/Makefile.in
+===================================================================
+--- src/error/Makefile.in.orig
++++ src/error/Makefile.in
+@@ -9,11 +9,14 @@ TESTPROG=
  PROG	= error
  INC_DIR	= ../../include
  LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
@@ -104,10 +110,11 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/error/Makefile.in postfix-2.5.6-
  
  $(OBJS): ../../conf/makedefs.out
  
-diff -urN postfix-2.5.6-dynamic_maps.patch//src/flush/Makefile.in postfix-2.5.6-dynamic_maps_pie.patch//src/flush/Makefile.in
---- postfix-2.5.6-dynamic_maps.patch//src/flush/Makefile.in	2007-03-17 18:51:46.000000000 +0100
-+++ postfix-2.5.6-dynamic_maps_pie.patch//src/flush/Makefile.in	2011-03-17 08:08:20.334969002 +0100
-@@ -9,11 +9,14 @@
+Index: src/flush/Makefile.in
+===================================================================
+--- src/flush/Makefile.in.orig
++++ src/flush/Makefile.in
+@@ -9,11 +9,14 @@ TESTPROG=
  PROG	= flush
  INC_DIR = ../../include
  LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
@@ -123,10 +130,11 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/flush/Makefile.in postfix-2.5.6-
  
  $(OBJS): ../../conf/makedefs.out
  
-diff -urN postfix-2.5.6-dynamic_maps.patch//src/fsstone/Makefile.in postfix-2.5.6-dynamic_maps_pie.patch//src/fsstone/Makefile.in
---- postfix-2.5.6-dynamic_maps.patch//src/fsstone/Makefile.in	2006-12-04 01:29:52.000000000 +0100
-+++ postfix-2.5.6-dynamic_maps_pie.patch//src/fsstone/Makefile.in	2011-03-17 08:08:20.335969002 +0100
-@@ -9,6 +9,9 @@
+Index: src/fsstone/Makefile.in
+===================================================================
+--- src/fsstone/Makefile.in.orig
++++ src/fsstone/Makefile.in
+@@ -9,6 +9,9 @@ TESTPROG=
  PROG	= fsstone
  INC_DIR	= ../../include
  LIBS	= ../../lib/libglobal.a ../../lib/libutil.a
@@ -136,7 +144,7 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/fsstone/Makefile.in postfix-2.5.
  
  .c.o:;	$(CC) $(CFLAGS) -c $*.c
  
-@@ -20,7 +23,7 @@
+@@ -20,7 +23,7 @@ Makefile: Makefile.in
  	cat ../../conf/makedefs.out $? >$@
  
  fsstone: fsstone.o $(LIBS)
@@ -145,10 +153,11 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/fsstone/Makefile.in postfix-2.5.
  
  test:	$(TESTPROG)
  
-diff -urN postfix-2.5.6-dynamic_maps.patch//src/local/Makefile.in postfix-2.5.6-dynamic_maps_pie.patch//src/local/Makefile.in
---- postfix-2.5.6-dynamic_maps.patch//src/local/Makefile.in	2007-04-29 16:49:29.000000000 +0200
-+++ postfix-2.5.6-dynamic_maps_pie.patch//src/local/Makefile.in	2011-03-17 08:08:20.335969002 +0100
-@@ -15,11 +15,14 @@
+Index: src/local/Makefile.in
+===================================================================
+--- src/local/Makefile.in.orig
++++ src/local/Makefile.in
+@@ -15,11 +15,14 @@ PROG	= local
  TESTPROG= 
  INC_DIR	= ../../include
  LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
@@ -164,10 +173,11 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/local/Makefile.in postfix-2.5.6-
  
  $(OBJS): ../../conf/makedefs.out
  
-diff -urN postfix-2.5.6-dynamic_maps.patch//src/master/Makefile.in postfix-2.5.6-dynamic_maps_pie.patch//src/master/Makefile.in
---- postfix-2.5.6-dynamic_maps.patch//src/master/Makefile.in	2011-03-15 12:27:38.485920001 +0100
-+++ postfix-2.5.6-dynamic_maps_pie.patch//src/master/Makefile.in	2011-03-17 08:08:20.336969002 +0100
-@@ -20,7 +20,7 @@
+Index: src/master/Makefile.in
+===================================================================
+--- src/master/Makefile.in.orig
++++ src/master/Makefile.in
+@@ -20,7 +20,7 @@ LIB_DIR	= ../../lib
  INC_DIR	= ../../include
  BIN_DIR	= ../../libexec
  
@@ -176,7 +186,7 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/master/Makefile.in postfix-2.5.6
  
  all:	$(PROG) $(LIB)
  
-@@ -30,7 +30,7 @@
+@@ -30,7 +30,7 @@ Makefile: Makefile.in
  	cat ../../conf/makedefs.out $? >$@
  
  $(PROG): $(OBJS) $(LIBS)
@@ -185,10 +195,11 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/master/Makefile.in postfix-2.5.6
  
  test:	$(TESTPROG)
  
-diff -urN postfix-2.5.6-dynamic_maps.patch//src/oqmgr/Makefile.in postfix-2.5.6-dynamic_maps_pie.patch//src/oqmgr/Makefile.in
---- postfix-2.5.6-dynamic_maps.patch//src/oqmgr/Makefile.in	2007-12-08 17:02:11.000000000 +0100
-+++ postfix-2.5.6-dynamic_maps_pie.patch//src/oqmgr/Makefile.in	2011-03-17 08:08:20.336969002 +0100
-@@ -15,11 +15,14 @@
+Index: src/oqmgr/Makefile.in
+===================================================================
+--- src/oqmgr/Makefile.in.orig
++++ src/oqmgr/Makefile.in
+@@ -15,11 +15,14 @@ TESTPROG=
  PROG	= qmgr
  INC_DIR	= ../../include
  LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
@@ -204,10 +215,11 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/oqmgr/Makefile.in postfix-2.5.6-
  
  $(OBJS): ../../conf/makedefs.out
  
-diff -urN postfix-2.5.6-dynamic_maps.patch//src/pickup/Makefile.in postfix-2.5.6-dynamic_maps_pie.patch//src/pickup/Makefile.in
---- postfix-2.5.6-dynamic_maps.patch//src/pickup/Makefile.in	2007-03-17 18:51:39.000000000 +0100
-+++ postfix-2.5.6-dynamic_maps_pie.patch//src/pickup/Makefile.in	2011-03-17 08:08:20.337969002 +0100
-@@ -9,11 +9,14 @@
+Index: src/pickup/Makefile.in
+===================================================================
+--- src/pickup/Makefile.in.orig
++++ src/pickup/Makefile.in
+@@ -9,11 +9,14 @@ TESTPROG=
  PROG	= pickup
  INC_DIR = ../../include
  LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
@@ -223,10 +235,11 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/pickup/Makefile.in postfix-2.5.6
  
  $(OBJS): ../../conf/makedefs.out
  
-diff -urN postfix-2.5.6-dynamic_maps.patch//src/pipe/Makefile.in postfix-2.5.6-dynamic_maps_pie.patch//src/pipe/Makefile.in
---- postfix-2.5.6-dynamic_maps.patch//src/pipe/Makefile.in	2007-04-29 16:45:59.000000000 +0200
-+++ postfix-2.5.6-dynamic_maps_pie.patch//src/pipe/Makefile.in	2011-03-17 08:08:20.337969002 +0100
-@@ -9,11 +9,14 @@
+Index: src/pipe/Makefile.in
+===================================================================
+--- src/pipe/Makefile.in.orig
++++ src/pipe/Makefile.in
+@@ -9,11 +9,14 @@ TESTPROG=
  PROG	= pipe
  INC_DIR	= ../../include
  LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
@@ -242,10 +255,11 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/pipe/Makefile.in postfix-2.5.6-d
  
  $(OBJS): ../../conf/makedefs.out
  
-diff -urN postfix-2.5.6-dynamic_maps.patch//src/postalias/Makefile.in postfix-2.5.6-dynamic_maps_pie.patch//src/postalias/Makefile.in
---- postfix-2.5.6-dynamic_maps.patch//src/postalias/Makefile.in	2007-12-03 19:49:08.000000000 +0100
-+++ postfix-2.5.6-dynamic_maps_pie.patch//src/postalias/Makefile.in	2011-03-17 08:08:20.338969002 +0100
-@@ -9,11 +9,14 @@
+Index: src/postalias/Makefile.in
+===================================================================
+--- src/postalias/Makefile.in.orig
++++ src/postalias/Makefile.in
+@@ -9,11 +9,14 @@ TESTPROG=
  PROG	= postalias
  INC_DIR	= ../../include
  LIBS	= ../../lib/libglobal.a ../../lib/libutil.a
@@ -261,10 +275,11 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/postalias/Makefile.in postfix-2.
  
  $(OBJS): ../../conf/makedefs.out
  
-diff -urN postfix-2.5.6-dynamic_maps.patch//src/postcat/Makefile.in postfix-2.5.6-dynamic_maps_pie.patch//src/postcat/Makefile.in
---- postfix-2.5.6-dynamic_maps.patch//src/postcat/Makefile.in	2007-03-17 18:51:45.000000000 +0100
-+++ postfix-2.5.6-dynamic_maps_pie.patch//src/postcat/Makefile.in	2011-03-17 08:08:20.339969002 +0100
-@@ -9,11 +9,14 @@
+Index: src/postcat/Makefile.in
+===================================================================
+--- src/postcat/Makefile.in.orig
++++ src/postcat/Makefile.in
+@@ -9,11 +9,14 @@ TESTPROG=
  PROG	= postcat
  INC_DIR	= ../../include
  LIBS	= ../../lib/libglobal.a ../../lib/libutil.a
@@ -280,10 +295,11 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/postcat/Makefile.in postfix-2.5.
  
  $(OBJS): ../../conf/makedefs.out
  
-diff -urN postfix-2.5.6-dynamic_maps.patch//src/postconf/Makefile.in postfix-2.5.6-dynamic_maps_pie.patch//src/postconf/Makefile.in
---- postfix-2.5.6-dynamic_maps.patch//src/postconf/Makefile.in	2007-11-30 23:47:12.000000000 +0100
-+++ postfix-2.5.6-dynamic_maps_pie.patch//src/postconf/Makefile.in	2011-03-17 08:08:20.351969002 +0100
-@@ -13,11 +13,14 @@
+Index: src/postconf/Makefile.in
+===================================================================
+--- src/postconf/Makefile.in.orig
++++ src/postconf/Makefile.in
+@@ -20,11 +20,14 @@ PROG	= postconf
  SAMPLES	= ../../conf/main.cf.default
  INC_DIR	= ../../include
  LIBS	= ../../lib/libxsasl.a ../../lib/libglobal.a ../../lib/libutil.a
@@ -299,10 +315,11 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/postconf/Makefile.in postfix-2.5
  
  ../../conf/main.cf.default: $(PROG) Makefile
  	rm -f $@
-diff -urN postfix-2.5.6-dynamic_maps.patch//src/postdrop/Makefile.in postfix-2.5.6-dynamic_maps_pie.patch//src/postdrop/Makefile.in
---- postfix-2.5.6-dynamic_maps.patch//src/postdrop/Makefile.in	2007-03-17 18:51:45.000000000 +0100
-+++ postfix-2.5.6-dynamic_maps_pie.patch//src/postdrop/Makefile.in	2011-03-17 08:08:20.339969002 +0100
-@@ -9,11 +9,14 @@
+Index: src/postdrop/Makefile.in
+===================================================================
+--- src/postdrop/Makefile.in.orig
++++ src/postdrop/Makefile.in
+@@ -9,11 +9,14 @@ TESTPROG=
  PROG	= postdrop
  INC_DIR	= ../../include
  LIBS	= ../../lib/libglobal.a ../../lib/libutil.a
@@ -318,10 +335,11 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/postdrop/Makefile.in postfix-2.5
  
  $(OBJS): ../../conf/makedefs.out
  
-diff -urN postfix-2.5.6-dynamic_maps.patch//src/postfix/Makefile.in postfix-2.5.6-dynamic_maps_pie.patch//src/postfix/Makefile.in
---- postfix-2.5.6-dynamic_maps.patch//src/postfix/Makefile.in	2007-03-17 18:51:39.000000000 +0100
-+++ postfix-2.5.6-dynamic_maps_pie.patch//src/postfix/Makefile.in	2011-03-17 08:08:20.340969002 +0100
-@@ -10,11 +10,14 @@
+Index: src/postfix/Makefile.in
+===================================================================
+--- src/postfix/Makefile.in.orig
++++ src/postfix/Makefile.in
+@@ -10,11 +10,14 @@ INC_DIR	= ../../include
  TESTPROG=
  PROG	= postfix
  LIBS	= ../../lib/libglobal.a ../../lib/libutil.a
@@ -337,10 +355,11 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/postfix/Makefile.in postfix-2.5.
  
  $(OBJS): ../../conf/makedefs.out
  
-diff -urN postfix-2.5.6-dynamic_maps.patch//src/postkick/Makefile.in postfix-2.5.6-dynamic_maps_pie.patch//src/postkick/Makefile.in
---- postfix-2.5.6-dynamic_maps.patch//src/postkick/Makefile.in	2007-03-17 18:51:46.000000000 +0100
-+++ postfix-2.5.6-dynamic_maps_pie.patch//src/postkick/Makefile.in	2011-03-17 08:08:20.341969002 +0100
-@@ -9,11 +9,14 @@
+Index: src/postkick/Makefile.in
+===================================================================
+--- src/postkick/Makefile.in.orig
++++ src/postkick/Makefile.in
+@@ -9,11 +9,14 @@ TESTPROG=
  PROG	= postkick
  INC_DIR	= ../../include
  LIBS	= ../../lib/libglobal.a ../../lib/libutil.a
@@ -356,10 +375,11 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/postkick/Makefile.in postfix-2.5
  
  $(OBJS): ../../conf/makedefs.out
  
-diff -urN postfix-2.5.6-dynamic_maps.patch//src/postlock/Makefile.in postfix-2.5.6-dynamic_maps_pie.patch//src/postlock/Makefile.in
---- postfix-2.5.6-dynamic_maps.patch//src/postlock/Makefile.in	2007-03-17 18:51:46.000000000 +0100
-+++ postfix-2.5.6-dynamic_maps_pie.patch//src/postlock/Makefile.in	2011-03-17 08:08:20.341969002 +0100
-@@ -9,11 +9,14 @@
+Index: src/postlock/Makefile.in
+===================================================================
+--- src/postlock/Makefile.in.orig
++++ src/postlock/Makefile.in
+@@ -9,11 +9,14 @@ TESTPROG=
  PROG	= postlock
  INC_DIR	= ../../include
  LIBS	= ../../lib/libglobal.a ../../lib/libutil.a
@@ -375,10 +395,11 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/postlock/Makefile.in postfix-2.5
  
  $(OBJS): ../../conf/makedefs.out
  
-diff -urN postfix-2.5.6-dynamic_maps.patch//src/postlog/Makefile.in postfix-2.5.6-dynamic_maps_pie.patch//src/postlog/Makefile.in
---- postfix-2.5.6-dynamic_maps.patch//src/postlog/Makefile.in	2007-03-17 18:51:46.000000000 +0100
-+++ postfix-2.5.6-dynamic_maps_pie.patch//src/postlog/Makefile.in	2011-03-17 08:08:20.341969002 +0100
-@@ -10,11 +10,14 @@
+Index: src/postlog/Makefile.in
+===================================================================
+--- src/postlog/Makefile.in.orig
++++ src/postlog/Makefile.in
+@@ -10,11 +10,14 @@ INC_DIR	= ../../include
  TESTPROG=
  PROG	= postlog
  LIBS	= ../../lib/libglobal.a ../../lib/libutil.a
@@ -394,10 +415,11 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/postlog/Makefile.in postfix-2.5.
  
  $(OBJS): ../../conf/makedefs.out
  
-diff -urN postfix-2.5.6-dynamic_maps.patch//src/postmap/Makefile.in postfix-2.5.6-dynamic_maps_pie.patch//src/postmap/Makefile.in
---- postfix-2.5.6-dynamic_maps.patch//src/postmap/Makefile.in	2007-12-03 19:19:53.000000000 +0100
-+++ postfix-2.5.6-dynamic_maps_pie.patch//src/postmap/Makefile.in	2011-03-17 08:08:20.342969002 +0100
-@@ -9,11 +9,14 @@
+Index: src/postmap/Makefile.in
+===================================================================
+--- src/postmap/Makefile.in.orig
++++ src/postmap/Makefile.in
+@@ -9,11 +9,14 @@ TESTPROG=
  PROG	= postmap
  INC_DIR	= ../../include
  LIBS	= ../../lib/libglobal.a ../../lib/libutil.a
@@ -413,10 +435,11 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/postmap/Makefile.in postfix-2.5.
  
  $(OBJS): ../../conf/makedefs.out
  
-diff -urN postfix-2.5.6-dynamic_maps.patch//src/postqueue/Makefile.in postfix-2.5.6-dynamic_maps_pie.patch//src/postqueue/Makefile.in
---- postfix-2.5.6-dynamic_maps.patch//src/postqueue/Makefile.in	2007-03-17 18:51:46.000000000 +0100
-+++ postfix-2.5.6-dynamic_maps_pie.patch//src/postqueue/Makefile.in	2011-03-17 08:08:20.343969002 +0100
-@@ -9,11 +9,14 @@
+Index: src/postqueue/Makefile.in
+===================================================================
+--- src/postqueue/Makefile.in.orig
++++ src/postqueue/Makefile.in
+@@ -9,11 +9,14 @@ TESTPROG=
  PROG	= postqueue
  INC_DIR	= ../../include
  LIBS	= ../../lib/libglobal.a ../../lib/libutil.a
@@ -432,10 +455,11 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/postqueue/Makefile.in postfix-2.
  
  $(OBJS): ../../conf/makedefs.out
  
-diff -urN postfix-2.5.6-dynamic_maps.patch//src/postsuper/Makefile.in postfix-2.5.6-dynamic_maps_pie.patch//src/postsuper/Makefile.in
---- postfix-2.5.6-dynamic_maps.patch//src/postsuper/Makefile.in	2007-03-17 18:51:46.000000000 +0100
-+++ postfix-2.5.6-dynamic_maps_pie.patch//src/postsuper/Makefile.in	2011-03-17 08:08:20.343969002 +0100
-@@ -9,11 +9,14 @@
+Index: src/postsuper/Makefile.in
+===================================================================
+--- src/postsuper/Makefile.in.orig
++++ src/postsuper/Makefile.in
+@@ -9,11 +9,14 @@ TESTPROG=
  PROG	= postsuper
  INC_DIR	= ../../include
  LIBS	= ../../lib/libglobal.a ../../lib/libutil.a
@@ -451,10 +475,11 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/postsuper/Makefile.in postfix-2.
  
  $(OBJS): ../../conf/makedefs.out
  
-diff -urN postfix-2.5.6-dynamic_maps.patch//src/proxymap/Makefile.in postfix-2.5.6-dynamic_maps_pie.patch//src/proxymap/Makefile.in
---- postfix-2.5.6-dynamic_maps.patch//src/proxymap/Makefile.in	2007-03-17 18:51:46.000000000 +0100
-+++ postfix-2.5.6-dynamic_maps_pie.patch//src/proxymap/Makefile.in	2011-03-17 08:08:20.344969002 +0100
-@@ -9,11 +9,14 @@
+Index: src/proxymap/Makefile.in
+===================================================================
+--- src/proxymap/Makefile.in.orig
++++ src/proxymap/Makefile.in
+@@ -9,11 +9,14 @@ TESTPROG=
  PROG	= proxymap
  INC_DIR = ../../include
  LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
@@ -470,10 +495,11 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/proxymap/Makefile.in postfix-2.5
  
  $(OBJS): ../../conf/makedefs.out
  
-diff -urN postfix-2.5.6-dynamic_maps.patch//src/qmgr/Makefile.in postfix-2.5.6-dynamic_maps_pie.patch//src/qmgr/Makefile.in
---- postfix-2.5.6-dynamic_maps.patch//src/qmgr/Makefile.in	2007-12-08 17:02:27.000000000 +0100
-+++ postfix-2.5.6-dynamic_maps_pie.patch//src/qmgr/Makefile.in	2011-03-17 08:08:20.344969002 +0100
-@@ -17,11 +17,14 @@
+Index: src/qmgr/Makefile.in
+===================================================================
+--- src/qmgr/Makefile.in.orig
++++ src/qmgr/Makefile.in
+@@ -17,11 +17,14 @@ TESTPROG=
  PROG	= qmgr
  INC_DIR	= ../../include
  LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
@@ -489,10 +515,11 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/qmgr/Makefile.in postfix-2.5.6-d
  
  $(OBJS): ../../conf/makedefs.out
  
-diff -urN postfix-2.5.6-dynamic_maps.patch//src/qmqpd/Makefile.in postfix-2.5.6-dynamic_maps_pie.patch//src/qmqpd/Makefile.in
---- postfix-2.5.6-dynamic_maps.patch//src/qmqpd/Makefile.in	2007-03-17 18:51:46.000000000 +0100
-+++ postfix-2.5.6-dynamic_maps_pie.patch//src/qmqpd/Makefile.in	2011-03-17 08:08:20.345969002 +0100
-@@ -9,11 +9,14 @@
+Index: src/qmqpd/Makefile.in
+===================================================================
+--- src/qmqpd/Makefile.in.orig
++++ src/qmqpd/Makefile.in
+@@ -9,11 +9,14 @@ TESTPROG=
  PROG	= qmqpd
  INC_DIR	= ../../include
  LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libdns.a ../../lib/libutil.a
@@ -508,10 +535,11 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/qmqpd/Makefile.in postfix-2.5.6-
  
  $(OBJS): ../../conf/makedefs.out
  
-diff -urN postfix-2.5.6-dynamic_maps.patch//src/scache/Makefile.in postfix-2.5.6-dynamic_maps_pie.patch//src/scache/Makefile.in
---- postfix-2.5.6-dynamic_maps.patch//src/scache/Makefile.in	2007-03-17 18:51:47.000000000 +0100
-+++ postfix-2.5.6-dynamic_maps_pie.patch//src/scache/Makefile.in	2011-03-17 08:08:20.345969002 +0100
-@@ -9,11 +9,14 @@
+Index: src/scache/Makefile.in
+===================================================================
+--- src/scache/Makefile.in.orig
++++ src/scache/Makefile.in
+@@ -9,11 +9,14 @@ TESTPROG=
  PROG	= scache
  INC_DIR = ../../include
  LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
@@ -527,10 +555,11 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/scache/Makefile.in postfix-2.5.6
  
  $(OBJS): ../../conf/makedefs.out
  
-diff -urN postfix-2.5.6-dynamic_maps.patch//src/sendmail/Makefile.in postfix-2.5.6-dynamic_maps_pie.patch//src/sendmail/Makefile.in
---- postfix-2.5.6-dynamic_maps.patch//src/sendmail/Makefile.in	2007-03-17 18:51:39.000000000 +0100
-+++ postfix-2.5.6-dynamic_maps_pie.patch//src/sendmail/Makefile.in	2011-03-17 08:08:20.346969002 +0100
-@@ -9,11 +9,14 @@
+Index: src/sendmail/Makefile.in
+===================================================================
+--- src/sendmail/Makefile.in.orig
++++ src/sendmail/Makefile.in
+@@ -9,11 +9,14 @@ TESTPROG=
  PROG	= sendmail
  INC_DIR	= ../../include
  LIBS	= ../../lib/libglobal.a ../../lib/libutil.a
@@ -546,10 +575,11 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/sendmail/Makefile.in postfix-2.5
  
  $(OBJS): ../../conf/makedefs.out
  
-diff -urN postfix-2.5.6-dynamic_maps.patch//src/showq/Makefile.in postfix-2.5.6-dynamic_maps_pie.patch//src/showq/Makefile.in
---- postfix-2.5.6-dynamic_maps.patch//src/showq/Makefile.in	2007-03-17 18:51:45.000000000 +0100
-+++ postfix-2.5.6-dynamic_maps_pie.patch//src/showq/Makefile.in	2011-03-17 08:08:20.347969002 +0100
-@@ -9,11 +9,14 @@
+Index: src/showq/Makefile.in
+===================================================================
+--- src/showq/Makefile.in.orig
++++ src/showq/Makefile.in
+@@ -9,11 +9,14 @@ TESTPROG=
  PROG	= showq
  INC_DIR = ../../include
  LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
@@ -565,10 +595,11 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/showq/Makefile.in postfix-2.5.6-
  
  $(OBJS): ../../conf/makedefs.out
  
-diff -urN postfix-2.5.6-dynamic_maps.patch//src/smtp/Makefile.in postfix-2.5.6-dynamic_maps_pie.patch//src/smtp/Makefile.in
---- postfix-2.5.6-dynamic_maps.patch//src/smtp/Makefile.in	2008-01-15 02:09:47.000000000 +0100
-+++ postfix-2.5.6-dynamic_maps_pie.patch//src/smtp/Makefile.in	2011-03-17 08:08:20.352969002 +0100
-@@ -16,11 +16,14 @@
+Index: src/smtp/Makefile.in
+===================================================================
+--- src/smtp/Makefile.in.orig
++++ src/smtp/Makefile.in
+@@ -16,11 +16,14 @@ PROG	= smtp
  INC_DIR	= ../../include
  LIBS	= ../../lib/libmaster.a ../../lib/libtls.a ../../lib/libdns.a \
  	../../lib/libxsasl.a ../../lib/libglobal.a ../../lib/libutil.a
@@ -584,10 +615,11 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/smtp/Makefile.in postfix-2.5.6-d
  
  $(OBJS): ../../conf/makedefs.out
  
-diff -urN postfix-2.5.6-dynamic_maps.patch//src/smtpd/Makefile.in postfix-2.5.6-dynamic_maps_pie.patch//src/smtpd/Makefile.in
---- postfix-2.5.6-dynamic_maps.patch//src/smtpd/Makefile.in	2008-01-08 02:42:32.000000000 +0100
-+++ postfix-2.5.6-dynamic_maps_pie.patch//src/smtpd/Makefile.in	2011-03-17 08:08:20.352969002 +0100
-@@ -16,11 +16,14 @@
+Index: src/smtpd/Makefile.in
+===================================================================
+--- src/smtpd/Makefile.in.orig
++++ src/smtpd/Makefile.in
+@@ -19,11 +19,14 @@ INC_DIR	= ../../include
  LIBS	= ../../lib/libmaster.a ../../lib/libtls.a ../../lib/libdns.a \
  	../../lib/libxsasl.a ../../lib/libmilter.a ../../lib/libglobal.a \
  	../../lib/libutil.a
@@ -603,10 +635,11 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/smtpd/Makefile.in postfix-2.5.6-
  
  $(OBJS): ../../conf/makedefs.out
  
-diff -urN postfix-2.5.6-dynamic_maps.patch//src/smtpstone/Makefile.in postfix-2.5.6-dynamic_maps_pie.patch//src/smtpstone/Makefile.in
---- postfix-2.5.6-dynamic_maps.patch//src/smtpstone/Makefile.in	2007-07-29 18:07:32.000000000 +0200
-+++ postfix-2.5.6-dynamic_maps_pie.patch//src/smtpstone/Makefile.in	2011-03-17 08:08:20.347969002 +0100
-@@ -9,6 +9,9 @@
+Index: src/smtpstone/Makefile.in
+===================================================================
+--- src/smtpstone/Makefile.in.orig
++++ src/smtpstone/Makefile.in
+@@ -9,6 +9,9 @@ TESTPROG=
  INC_DIR	= ../../include
  PROG	= smtp-source smtp-sink qmqp-source qmqp-sink
  LIBS	= ../../lib/libglobal.a ../../lib/libutil.a
@@ -616,7 +649,7 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/smtpstone/Makefile.in postfix-2.
  
  .c.o:;	$(CC) $(CFLAGS) -c $*.c
  
-@@ -20,16 +23,16 @@
+@@ -20,16 +23,16 @@ Makefile: Makefile.in
  	cat ../../conf/makedefs.out $? >$@
  
  smtp-sink: smtp-sink.o $(LIBS)
@@ -637,10 +670,11 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/smtpstone/Makefile.in postfix-2.
  
  test:	$(TESTPROG)
  
-diff -urN postfix-2.5.6-dynamic_maps.patch//src/spawn/Makefile.in postfix-2.5.6-dynamic_maps_pie.patch//src/spawn/Makefile.in
---- postfix-2.5.6-dynamic_maps.patch//src/spawn/Makefile.in	2007-03-17 18:51:46.000000000 +0100
-+++ postfix-2.5.6-dynamic_maps_pie.patch//src/spawn/Makefile.in	2011-03-17 08:08:20.348969002 +0100
-@@ -9,11 +9,14 @@
+Index: src/spawn/Makefile.in
+===================================================================
+--- src/spawn/Makefile.in.orig
++++ src/spawn/Makefile.in
+@@ -9,11 +9,14 @@ TESTPROG=
  PROG	= spawn
  INC_DIR	= ../../include
  LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
@@ -656,10 +690,11 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/spawn/Makefile.in postfix-2.5.6-
  
  $(OBJS): ../../conf/makedefs.out
  
-diff -urN postfix-2.5.6-dynamic_maps.patch//src/tlsmgr/Makefile.in postfix-2.5.6-dynamic_maps_pie.patch//src/tlsmgr/Makefile.in
---- postfix-2.5.6-dynamic_maps.patch//src/tlsmgr/Makefile.in	2007-12-18 17:33:53.000000000 +0100
-+++ postfix-2.5.6-dynamic_maps_pie.patch//src/tlsmgr/Makefile.in	2011-03-17 08:08:20.348969002 +0100
-@@ -10,11 +10,14 @@
+Index: src/tlsmgr/Makefile.in
+===================================================================
+--- src/tlsmgr/Makefile.in.orig
++++ src/tlsmgr/Makefile.in
+@@ -10,11 +10,14 @@ PROG	= tlsmgr
  INC_DIR	= ../../include
  LIBS	= ../../lib/libmaster.a ../../lib/libtls.a ../../lib/libglobal.a \
  	../../lib/libutil.a
@@ -675,10 +710,11 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/tlsmgr/Makefile.in postfix-2.5.6
  
  $(OBJS): ../../conf/makedefs.out
  
-diff -urN postfix-2.5.6-dynamic_maps.patch//src/trivial-rewrite/Makefile.in postfix-2.5.6-dynamic_maps_pie.patch//src/trivial-rewrite/Makefile.in
---- postfix-2.5.6-dynamic_maps.patch//src/trivial-rewrite/Makefile.in	2007-04-22 22:15:11.000000000 +0200
-+++ postfix-2.5.6-dynamic_maps_pie.patch//src/trivial-rewrite/Makefile.in	2011-03-17 08:08:20.349969002 +0100
-@@ -12,13 +12,16 @@
+Index: src/trivial-rewrite/Makefile.in
+===================================================================
+--- src/trivial-rewrite/Makefile.in.orig
++++ src/trivial-rewrite/Makefile.in
+@@ -12,13 +12,16 @@ LIBS	= ../../lib/libmaster.a ../../lib/l
  LIB_DIR	= ../../lib
  INC_DIR	= ../../include
  BIN_DIR	= ../../libexec
@@ -696,10 +732,11 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/trivial-rewrite/Makefile.in post
  
  $(OBJS): ../../conf/makedefs.out
  
-diff -urN postfix-2.5.6-dynamic_maps.patch//src/verify/Makefile.in postfix-2.5.6-dynamic_maps_pie.patch//src/verify/Makefile.in
---- postfix-2.5.6-dynamic_maps.patch//src/verify/Makefile.in	2007-12-05 23:30:53.000000000 +0100
-+++ postfix-2.5.6-dynamic_maps_pie.patch//src/verify/Makefile.in	2011-03-17 08:08:20.349969002 +0100
-@@ -9,11 +9,14 @@
+Index: src/verify/Makefile.in
+===================================================================
+--- src/verify/Makefile.in.orig
++++ src/verify/Makefile.in
+@@ -9,11 +9,14 @@ TESTPROG=
  PROG	= verify
  INC_DIR = ../../include
  LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
@@ -715,10 +752,11 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/verify/Makefile.in postfix-2.5.6
  
  $(OBJS): ../../conf/makedefs.out
  
-diff -urN postfix-2.5.6-dynamic_maps.patch//src/virtual/Makefile.in postfix-2.5.6-dynamic_maps_pie.patch//src/virtual/Makefile.in
---- postfix-2.5.6-dynamic_maps.patch//src/virtual/Makefile.in	2007-03-17 18:51:46.000000000 +0100
-+++ postfix-2.5.6-dynamic_maps_pie.patch//src/virtual/Makefile.in	2011-03-17 08:08:20.350969002 +0100
-@@ -9,11 +9,14 @@
+Index: src/virtual/Makefile.in
+===================================================================
+--- src/virtual/Makefile.in.orig
++++ src/virtual/Makefile.in
+@@ -9,11 +9,14 @@ PROG	= virtual
  TESTPROG= 
  INC_DIR	= ../../include
  LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
@@ -734,10 +772,11 @@ diff -urN postfix-2.5.6-dynamic_maps.patch//src/virtual/Makefile.in postfix-2.5.
  
  $(OBJS): ../../conf/makedefs.out
  
-diff -urN postfix-2.5.6-dynamic_maps.patch//src/xsasl/Makefile.in postfix-2.5.6-dynamic_maps_pie.patch//src/xsasl/Makefile.in
---- postfix-2.5.6-dynamic_maps.patch//src/xsasl/Makefile.in	2007-05-24 18:55:36.000000000 +0200
-+++ postfix-2.5.6-dynamic_maps_pie.patch//src/xsasl/Makefile.in	2011-03-17 08:08:20.353969002 +0100
-@@ -18,7 +18,7 @@
+Index: src/xsasl/Makefile.in
+===================================================================
+--- src/xsasl/Makefile.in.orig
++++ src/xsasl/Makefile.in
+@@ -18,7 +18,7 @@ LIB_DIR	= ../../lib
  INC_DIR	= ../../include
  MAKES	=
  
diff --git a/pointer_to_literals.patch b/pointer_to_literals.patch
index 69c9a5e..c7712f4 100644
--- a/pointer_to_literals.patch
+++ b/pointer_to_literals.patch
@@ -28,7 +28,7 @@ Index: src/smtpd/smtpd_check.c
 ===================================================================
 --- src/smtpd/smtpd_check.c.orig
 +++ src/smtpd/smtpd_check.c
-@@ -359,6 +359,10 @@ static int unv_from_tf_act;
+@@ -357,6 +357,10 @@ static int unv_from_tf_act;
  #define CONST_STR(x)	((const char *) vstring_str(x))
  #define UPDATE_STRING(ptr,val) { if (ptr) myfree(ptr); ptr = mystrdup(val); }
  
@@ -39,7 +39,7 @@ Index: src/smtpd/smtpd_check.c
   /*
    * If some decision can't be made due to a temporary error, then change
    * other decisions into deferrals.
-@@ -1950,8 +1954,6 @@ static int check_table_result(SMTPD_STAT
+@@ -1986,8 +1990,6 @@ static int check_table_result(SMTPD_STAT
      if (msg_verbose)
  	msg_info("%s: %s %s %s", myname, table, value, datum);
  
@@ -48,7 +48,7 @@ Index: src/smtpd/smtpd_check.c
      /*
       * DUNNO means skip this table. Silently ignore optional text.
       */
-@@ -2934,8 +2936,6 @@ static const char *rbl_expand_lookup(con
+@@ -2977,8 +2979,6 @@ static const char *rbl_expand_lookup(con
      SMTPD_RBL_EXPAND_CONTEXT *rbl_exp = (SMTPD_RBL_EXPAND_CONTEXT *) context;
      SMTPD_STATE *state = rbl_exp->state;
  
@@ -61,7 +61,7 @@ Index: src/util/dict_open.c
 ===================================================================
 --- src/util/dict_open.c.orig
 +++ src/util/dict_open.c
-@@ -476,7 +476,7 @@ ARGV   *dict_mapnames()
+@@ -504,7 +504,7 @@ ARGV   *dict_mapnames()
  }
  
  #ifndef NO_DYNAMIC_MAPS
diff --git a/postfix-2.8.12-main.cf.patch b/postfix-main.cf.patch
similarity index 95%
rename from postfix-2.8.12-main.cf.patch
rename to postfix-main.cf.patch
index e86f8ea..38a6207 100644
--- a/postfix-2.8.12-main.cf.patch
+++ b/postfix-main.cf.patch
@@ -1,6 +1,8 @@
---- conf/main.cf.orig	2013-01-10 15:14:09.000000000 +0100
-+++ conf/main.cf	2013-01-10 15:13:12.000000000 +0100
-@@ -655,3 +655,119 @@
+Index: conf/main.cf
+===================================================================
+--- conf/main.cf.orig
++++ conf/main.cf
+@@ -655,3 +655,119 @@ sample_directory =
  #
  readme_directory =
  inet_protocols = ipv4
diff --git a/postfix-2.8.12-master.cf.patch b/postfix-master.cf.patch
similarity index 100%
rename from postfix-2.8.12-master.cf.patch
rename to postfix-master.cf.patch
diff --git a/postfix-2.8.12-post-install.patch b/postfix-post-install.patch
similarity index 100%
rename from postfix-2.8.12-post-install.patch
rename to postfix-post-install.patch
diff --git a/postfix-2.8.12-ssl-release-buffers.patch b/postfix-ssl-release-buffers.patch
similarity index 86%
rename from postfix-2.8.12-ssl-release-buffers.patch
rename to postfix-ssl-release-buffers.patch
index 86efadf..81f313a 100644
--- a/postfix-2.8.12-ssl-release-buffers.patch
+++ b/postfix-ssl-release-buffers.patch
@@ -2,7 +2,7 @@ Index: src/tls/tls_client.c
 ===================================================================
 --- src/tls/tls_client.c.orig
 +++ src/tls/tls_client.c
-@@ -372,6 +372,12 @@ TLS_APPL_STATE *tls_client_init(const TL
+@@ -382,6 +382,12 @@ TLS_APPL_STATE *tls_client_init(const TL
  	return (0);
      }
  
@@ -19,7 +19,7 @@ Index: src/tls/tls_server.c
 ===================================================================
 --- src/tls/tls_server.c.orig
 +++ src/tls/tls_server.c
-@@ -382,6 +382,11 @@ TLS_APPL_STATE *tls_server_init(const TL
+@@ -388,6 +388,11 @@ TLS_APPL_STATE *tls_server_init(const TL
  	tls_print_errors();
  	return (0);
      }
diff --git a/postfix-vda-v10-2.8.12.patch b/postfix-vda-v11-2.9.5.patch
similarity index 97%
rename from postfix-vda-v10-2.8.12.patch
rename to postfix-vda-v11-2.9.5.patch
index a415725..8605bc1 100644
--- a/postfix-vda-v10-2.8.12.patch
+++ b/postfix-vda-v11-2.9.5.patch
@@ -2,7 +2,7 @@ Index: README_FILES/VDA_README
 ===================================================================
 --- /dev/null
 +++ README_FILES/VDA_README
-@@ -0,0 +1,9 @@
+@@ -0,0 +1,10 @@
 +Postfix VDA patch for maildir++ quota support by
 +    Anderson Nadal <andernadal@gmail.com>
 +    Tomas Macek <maca02@atlas.cz>
@@ -12,11 +12,12 @@ Index: README_FILES/VDA_README
 +howto patch the Postfix's sourcetree and configure the options
 +provided by this patch.
 +
++
 Index: src/global/mail_params.h
 ===================================================================
 --- src/global/mail_params.h.orig
 +++ src/global/mail_params.h
-@@ -2333,6 +2333,54 @@ extern char *var_virt_uid_maps;
+@@ -2360,6 +2360,54 @@ extern char *var_virt_uid_maps;
  #define DEF_VIRT_GID_MAPS		""
  extern char *var_virt_gid_maps;
  
@@ -275,7 +276,7 @@ Index: src/virtual/maildir.c
 ===================================================================
 --- src/virtual/maildir.c.orig
 +++ src/virtual/maildir.c
-@@ -63,28 +63,420 @@
+@@ -64,28 +64,420 @@
  #include <mbox_open.h>
  #include <dsn_util.h>
  
@@ -625,7 +626,7 @@ Index: src/virtual/maildir.c
 +                }
 +
 +                if (msg_verbose)
-+                    msg_info("%s: filter data: sql_size=%d sql_mtime=%ld file_mtime=%ld", myname, strlen(filter_sqlres), sqlmtime, filemtime);
++                    msg_info("%s: filter data: sql_size=%li sql_mtime=%ld file_mtime=%ld", myname, strlen(filter_sqlres), sqlmtime, filemtime);
 +            }
 +            if (sqlmtime != filemtime && sqlmtime != 0) {
 +                if ((filterfile = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0640))) {
@@ -708,7 +709,7 @@ Index: src/virtual/maildir.c
  
      GETTIMEOFDAY(&starttime);
  
-@@ -93,15 +485,14 @@ int     deliver_maildir(LOCAL_STATE stat
+@@ -94,15 +486,14 @@ int     deliver_maildir(LOCAL_STATE stat
       */
      state.level++;
      if (msg_verbose)
@@ -727,7 +728,7 @@ Index: src/virtual/maildir.c
      }
  
      /*
-@@ -109,17 +500,115 @@ int     deliver_maildir(LOCAL_STATE stat
+@@ -110,17 +501,115 @@ int     deliver_maildir(LOCAL_STATE stat
       * attribute to reflect the final recipient.
       */
      if (vstream_fseek(state.msg_attr.fp, state.msg_attr.offset, SEEK_SET) < 0)
@@ -801,7 +802,7 @@ Index: src/virtual/maildir.c
 +        }
 +        else {
 +	    if (msg_verbose)
-+		msg_info("%s: quota is negative (%ld), using default virtual_mailbox_limit (%d)",
++		msg_info("%s: quota is negative (%ld), using default virtual_mailbox_limit (%ld)",
 +			    myname, n, var_virt_mailbox_limit);
 +            /* Invalid limit size (negative). Use default virtual_mailbox_limit. */
 +            n = var_virt_mailbox_limit;
@@ -809,7 +810,7 @@ Index: src/virtual/maildir.c
 +    }
 +    else {
 +	if (msg_verbose)
-+	    msg_info("%s: no limit found in the maps, using default virtual_mailbox_limit (%d)",
++	    msg_info("%s: no limit found in the maps, using default virtual_mailbox_limit (%ld)",
 +			myname, var_virt_mailbox_limit);
 +        /* There is no limit in the maps. Use default virtual_mailbox_limit. */
 +        n = var_virt_mailbox_limit;
@@ -826,7 +827,7 @@ Index: src/virtual/maildir.c
 +        	msg_info("%s: maildirsize used=%s sum=%ld count=%ld", myname, sizefilename, saved_size, saved_count);
 +	} else {
 +	    if (msg_verbose)
-+		msg_info("%s: We will recount the quota (var_virt_mailbox_limit = %d, var_virt_maildir_extended = %d, read_maildirsize = %d)",
++		msg_info("%s: We will recount the quota (var_virt_mailbox_limit = %ld, var_virt_maildir_extended = %d, read_maildirsize = %d)",
 +			    myname, var_virt_mailbox_limit, var_virt_maildir_extended, read_mds);
 +
 +	    /* sanity */
@@ -849,7 +850,7 @@ Index: src/virtual/maildir.c
  
      /*
       * Create and write the file as the recipient, so that file quota work.
-@@ -174,46 +663,288 @@ int     deliver_maildir(LOCAL_STATE stat
+@@ -175,46 +664,288 @@ int     deliver_maildir(LOCAL_STATE stat
       * [...]
       */
      set_eugid(usr_attr.uid, usr_attr.gid);
@@ -1175,7 +1176,7 @@ Index: src/virtual/maildir.c
      }
      set_eugid(var_owner_uid, var_owner_gid);
  
-@@ -223,31 +954,64 @@ int     deliver_maildir(LOCAL_STATE stat
+@@ -224,31 +955,64 @@ int     deliver_maildir(LOCAL_STATE stat
       * location possibly under user control.
       */
      if (mail_copy_status & MAIL_COPY_STAT_CORRUPT) {
@@ -1261,8 +1262,8 @@ Index: src/virtual/maildir.c
  }
 Index: src/virtual/virtual.c
 ===================================================================
---- src/virtual/virtual.c.orig	2011-02-19 01:46:06.000000000 +0100
-+++ src/virtual/virtual.c	2013-01-10 15:33:33.000000000 +0100
+--- src/virtual/virtual.c.orig
++++ src/virtual/virtual.c
 @@ -335,12 +335,30 @@ long    var_virt_mailbox_limit;
  char   *var_mail_spool_dir;		/* XXX dependency fix */
  bool    var_strict_mbox_owner;
@@ -1326,37 +1327,26 @@ Index: src/virtual/virtual.c
  
      virtual_mbox_lock_mask = mbox_lock_mask(var_virt_mailbox_lock);
  }
-@@ -503,17 +534,29 @@ int     main(int argc, char **argv)
- 	VAR_VIRT_MAILBOX_LIMIT, DEF_VIRT_MAILBOX_LIMIT, &var_virt_mailbox_limit, 0, 0,
+@@ -510,10 +541,22 @@ int     main(int argc, char **argv)
+ 	VAR_VIRT_GID_MAPS, DEF_VIRT_GID_MAPS, &var_virt_gid_maps, 0, 0,
+ 	VAR_VIRT_MAILBOX_BASE, DEF_VIRT_MAILBOX_BASE, &var_virt_mailbox_base, 1, 0,
+ 	VAR_VIRT_MAILBOX_LOCK, DEF_VIRT_MAILBOX_LOCK, &var_virt_mailbox_lock, 1, 0,
++	VAR_VIRT_MAILBOX_LIMIT_MAPS, DEF_VIRT_MAILBOX_LIMIT_MAPS, &var_virt_mailbox_limit_maps, 0, 0,
++	VAR_VIRT_MAILDIR_LIMIT_MESSAGE, DEF_VIRT_MAILDIR_LIMIT_MESSAGE, &var_virt_maildir_limit_message, 1, 0,
++	VAR_VIRT_MAILDIR_LIMIT_MESSAGE_MAPS, DEF_VIRT_MAILDIR_LIMIT_MESSAGE_MAPS, &var_virt_maildir_limit_message_maps, 0, 0,
++	VAR_VIRT_MAILDIR_SUFFIX, DEF_VIRT_MAILDIR_SUFFIX, &var_virt_maildir_suffix, 0, 0,
++	VAR_VIRT_TRASH_NAME, DEF_VIRT_TRASH_NAME, &var_virt_trash_name, 0, 0,
++	VAR_VIRT_MAILDIR_FILTER_MAPS, DEF_VIRT_MAILDIR_FILTER_MAPS, &var_virt_maildir_filter_maps, 0, 0,
  	0,
      };
-+    static const CONFIG_BOOL_TABLE bool_table[] = {
-+	VAR_STRICT_MBOX_OWNER, DEF_STRICT_MBOX_OWNER, &var_strict_mbox_owner,
+     static const CONFIG_BOOL_TABLE bool_table[] = {
+ 	VAR_STRICT_MBOX_OWNER, DEF_STRICT_MBOX_OWNER, &var_strict_mbox_owner,
 +	VAR_VIRT_MAILBOX_LIMIT_INBOX, DEF_VIRT_MAILBOX_LIMIT_INBOX, &var_virt_mailbox_limit_inbox,
 +	VAR_VIRT_MAILBOX_LIMIT_OVERRIDE, DEF_VIRT_MAILBOX_LIMIT_OVERRIDE, &var_virt_mailbox_limit_override,
 +	VAR_VIRT_MAILDIR_EXTENDED, DEF_VIRT_MAILDIR_EXTENDED, &var_virt_maildir_extended,
 +	VAR_VIRT_OVERQUOTA_BOUNCE, DEF_VIRT_OVERQUOTA_BOUNCE, &var_virt_overquota_bounce,
 +	VAR_VIRT_TRASH_COUNT, DEF_VIRT_TRASH_COUNT, &var_virt_trash_count,
 +	VAR_VIRT_MAILDIR_FILTER, DEF_VIRT_MAILDIR_FILTER, &var_virt_maildir_filter,
-+	0,
-+    };
-     static const CONFIG_STR_TABLE str_table[] = {
- 	VAR_MAIL_SPOOL_DIR, DEF_MAIL_SPOOL_DIR, &var_mail_spool_dir, 0, 0,
- 	VAR_VIRT_MAILBOX_MAPS, DEF_VIRT_MAILBOX_MAPS, &var_virt_mailbox_maps, 0, 0,
- 	VAR_VIRT_UID_MAPS, DEF_VIRT_UID_MAPS, &var_virt_uid_maps, 0, 0,
- 	VAR_VIRT_GID_MAPS, DEF_VIRT_GID_MAPS, &var_virt_gid_maps, 0, 0,
-+	VAR_VIRT_MAILBOX_LIMIT_MAPS, DEF_VIRT_MAILBOX_LIMIT_MAPS, &var_virt_mailbox_limit_maps, 0, 0,
- 	VAR_VIRT_MAILBOX_BASE, DEF_VIRT_MAILBOX_BASE, &var_virt_mailbox_base, 1, 0,
- 	VAR_VIRT_MAILBOX_LOCK, DEF_VIRT_MAILBOX_LOCK, &var_virt_mailbox_lock, 1, 0,
--	0,
--    };
--    static const CONFIG_BOOL_TABLE bool_table[] = {
--	VAR_STRICT_MBOX_OWNER, DEF_STRICT_MBOX_OWNER, &var_strict_mbox_owner,
-+	VAR_VIRT_MAILDIR_LIMIT_MESSAGE, DEF_VIRT_MAILDIR_LIMIT_MESSAGE, &var_virt_maildir_limit_message, 1, 0,
-+	VAR_VIRT_MAILDIR_LIMIT_MESSAGE_MAPS, DEF_VIRT_MAILDIR_LIMIT_MESSAGE_MAPS, &var_virt_maildir_limit_message_maps, 0, 0,
-+	VAR_VIRT_MAILDIR_SUFFIX, DEF_VIRT_MAILDIR_SUFFIX, &var_virt_maildir_suffix, 0, 0,
-+	VAR_VIRT_TRASH_NAME, DEF_VIRT_TRASH_NAME, &var_virt_trash_name, 0, 0,
-+	VAR_VIRT_MAILDIR_FILTER_MAPS, DEF_VIRT_MAILDIR_FILTER_MAPS, &var_virt_maildir_filter_maps, 0, 0,
  	0,
      };
  
diff --git a/postfix.changes b/postfix.changes
index a5f2483..7426857 100644
--- a/postfix.changes
+++ b/postfix.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Jan 10 18:23:56 UTC 2013 - chris@computersalat.de
+
+- rebase patches
+  * vda-v10-2.8.12 -> vda-v11-2.9.5 (and to be a p0)
+  * main, master, post-instal, ssl-release-buffers (remove version)
+  * dynamic_maps, dynamic_maps_pie, pointer_to_literals
+
 -------------------------------------------------------------------
 Thu Jan 10 14:45:59 UTC 2013 - varkoly@suse.com
 
diff --git a/postfix.spec b/postfix.spec
index f0b594d..4afb857 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -32,11 +32,11 @@ Patch:          dynamic_maps.patch
 Patch1:         dynamic_maps_pie.patch
 Patch2:         pointer_to_literals.patch
 Patch3:         ipv6_disabled.patch
-Patch10:        %{name}-2.8.12-main.cf.patch
-Patch11:        %{name}-2.8.12-master.cf.patch
-Patch12:        %{name}-2.8.12-post-install.patch
-Patch20:        %{name}-vda-v10-2.8.12.patch
-Patch21:        postfix-2.8.12-ssl-release-buffers.patch
+Patch10:        %{name}-main.cf.patch
+Patch11:        %{name}-master.cf.patch
+Patch12:        %{name}-post-install.patch
+Patch20:        %{name}-ssl-release-buffers.patch
+Patch100:       %{name}-vda-v11-2.9.5.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         %insserv_prereq %fillup_prereq
 PreReq:         /usr/bin/getent
@@ -140,14 +140,14 @@ PostgreSQL.
 %prep
 %setup -n %{name}-%{version} -a 1 -a 2
 %patch
-%patch1 -p1
+%patch1
 %patch2
 %patch3
 %patch10
 %patch11
 %patch12
 %patch20
-%patch21
+%patch100
 # ---------------------------------------------------------------------------
 
 %build