From 080ea46ad2e318ea2aa7354e666d2f2f60a71804a0acc50a8fd79b3d15e2aa99 Mon Sep 17 00:00:00 2001 From: Peter Varkoly Date: Wed, 12 Feb 2014 15:25:40 +0000 Subject: [PATCH] - Update to 2.11.0 * TLS o Support for PKI-less TLS server certificate verification, where the CA public key or the server certificate is identified via DNSSEC lookup * LMDB database support * master o The master_service_disable parameter value syntax has changed: use "service/type" instead of "service.type". * postconf: o Support for advanced master.cf query and update operations. This was implemented primarily to support automated system management tools. o The postconf command produces more warnings * relay safety New smtpd_relay_restrictions parameter built-in default settings: smtpd_relay_restrictions = permit_mynetworks permit_sasl_authenticated defer_unauth_destination * postscreen whitelisting Allow a remote SMTP client to skip postscreen(8) tests based on its postscreen_dnsbl_sites score. OBS-URL: https://build.opensuse.org/package/show/server:mail/postfix?expand=0&rev=180 --- add_missed_library.patch | 12 ++ dynamic_maps.patch | 391 ++++++++++++++++++-------------------- dynamic_maps_pie.patch | 369 ++++++++++++++++------------------- pointer_to_literals.patch | 42 ++-- postfix-2.11.0.tar.gz | 3 + postfix-2.11.0.tar.gz.sig | Bin 0 -> 280 bytes postfix-2.9.6.tar.gz | 3 - postfix-2.9.6.tar.gz.sig | Bin 280 -> 0 bytes postfix-SuSE.tar.gz | 4 +- postfix.changes | 25 +++ postfix.spec | 12 +- 11 files changed, 415 insertions(+), 446 deletions(-) create mode 100644 add_missed_library.patch create mode 100644 postfix-2.11.0.tar.gz create mode 100644 postfix-2.11.0.tar.gz.sig delete mode 100644 postfix-2.9.6.tar.gz delete mode 100644 postfix-2.9.6.tar.gz.sig diff --git a/add_missed_library.patch b/add_missed_library.patch new file mode 100644 index 0000000..cf219d9 --- /dev/null +++ b/add_missed_library.patch @@ -0,0 +1,12 @@ +--- src/tlsproxy/Makefile.in.orig 2014-02-12 15:41:35.614464191 +0100 ++++ src/tlsproxy/Makefile.in 2014-02-12 15:42:14.445752897 +0100 +@@ -9,7 +9,7 @@ + PROG = tlsproxy + INC_DIR = ../../include + LIBS = ../../lib/libtls.a ../../lib/libmaster.a ../../lib/libglobal.a \ +- ../../lib/libutil.a ++ ../../lib/libutil.a ../../lib/libdns.a + + .c.o:; $(CC) $(CFLAGS) -c $*.c + + diff --git a/dynamic_maps.patch b/dynamic_maps.patch index 6226e28..94a43f3 100644 --- a/dynamic_maps.patch +++ b/dynamic_maps.patch @@ -1,7 +1,6 @@ -Index: conf/dynamicmaps.cf -=================================================================== ---- /dev/null -+++ conf/dynamicmaps.cf +diff -rNu postfix-2.11.0/conf/dynamicmaps.cf postfix-2.11.0-patched/conf/dynamicmaps.cf +--- postfix-2.11.0/conf/dynamicmaps.cf 1970-01-01 01:00:00.000000000 +0100 ++++ postfix-2.11.0-patched/conf/dynamicmaps.cf 2014-02-12 12:37:46.922115761 +0100 @@ -0,0 +1,7 @@ +# Postfix dynamic maps configuration file. +# @@ -10,11 +9,10 @@ Index: conf/dynamicmaps.cf +# +#type location of .so file open function (mkmap func) +#==== ================================ ============= ============ -Index: conf/postfix-files -=================================================================== ---- conf/postfix-files.orig -+++ conf/postfix-files -@@ -65,6 +65,11 @@ $queue_directory/saved:d:$mail_owner:-:7 +diff -rNu postfix-2.11.0/conf/postfix-files postfix-2.11.0-patched/conf/postfix-files +--- postfix-2.11.0/conf/postfix-files 2013-12-18 16:11:44.000000000 +0100 ++++ postfix-2.11.0-patched/conf/postfix-files 2014-02-12 12:37:46.923115768 +0100 +@@ -65,6 +65,11 @@ $queue_directory/trace:d:$mail_owner:-:700:ucr $daemon_directory/anvil:f:root:-:755 $daemon_directory/bounce:f:root:-:755 @@ -26,7 +24,7 @@ Index: conf/postfix-files $daemon_directory/cleanup:f:root:-:755 $daemon_directory/discard:f:root:-:755 $daemon_directory/dnsblog:f:root:-:755 -@@ -97,6 +102,11 @@ $daemon_directory/tlsmgr:f:root:-:755 +@@ -97,6 +102,11 @@ $daemon_directory/trivial-rewrite:f:root:-:755 $daemon_directory/verify:f:root:-:755 $daemon_directory/virtual:f:root:-:755 @@ -38,7 +36,7 @@ Index: conf/postfix-files $daemon_directory/nqmgr:h:$daemon_directory/qmgr $daemon_directory/lmtp:h:$daemon_directory/smtp $command_directory/postalias:f:root:-:755 -@@ -120,6 +130,7 @@ $config_directory/access:f:root:-:644:p1 +@@ -120,6 +130,7 @@ $config_directory/aliases:f:root:-:644:p1 $config_directory/bounce.cf.default:f:root:-:644:1 $config_directory/canonical:f:root:-:644:p1 @@ -46,11 +44,10 @@ Index: conf/postfix-files $config_directory/cidr_table:f:root:-:644:o $config_directory/generic:f:root:-:644:p1 $config_directory/generics:f:root:-:644:o -Index: src/dns/Makefile.in -=================================================================== ---- src/dns/Makefile.in.orig -+++ src/dns/Makefile.in -@@ -14,7 +14,7 @@ LIBS = ../../lib/libutil.a +diff -rNu postfix-2.11.0/src/dns/Makefile.in postfix-2.11.0-patched/src/dns/Makefile.in +--- postfix-2.11.0/src/dns/Makefile.in 2013-11-18 16:50:13.000000000 +0100 ++++ postfix-2.11.0-patched/src/dns/Makefile.in 2014-02-12 12:37:46.923115768 +0100 +@@ -14,7 +14,7 @@ LIB_DIR = ../../lib INC_DIR = ../../include @@ -59,7 +56,7 @@ Index: src/dns/Makefile.in all: $(LIB) -@@ -31,12 +31,10 @@ tests: test dns_rr_to_pa_test dns_rr_to_ +@@ -31,12 +31,10 @@ root_tests: $(LIB): $(OBJS) @@ -73,11 +70,10 @@ Index: src/dns/Makefile.in update: $(LIB_DIR)/$(LIB) $(HDRS) -for i in $(HDRS); \ -Index: src/global/Makefile.in -=================================================================== ---- src/global/Makefile.in.orig -+++ src/global/Makefile.in -@@ -3,7 +3,7 @@ SRCS = abounce.c anvil_clnt.c been_here. +diff -rNu postfix-2.11.0/src/global/Makefile.in postfix-2.11.0-patched/src/global/Makefile.in +--- postfix-2.11.0/src/global/Makefile.in 2013-12-09 21:13:50.000000000 +0100 ++++ postfix-2.11.0-patched/src/global/Makefile.in 2014-02-12 12:37:46.924115776 +0100 +@@ -3,7 +3,7 @@ canon_addr.c cfg_parser.c cleanup_strerror.c cleanup_strflags.c \ clnt_stream.c conv_time.c db_common.c debug_peer.c debug_process.c \ defer.c deliver_completed.c deliver_flock.c deliver_pass.c \ @@ -86,7 +82,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 \ -@@ -37,7 +37,7 @@ OBJS = abounce.o anvil_clnt.o been_here. +@@ -37,7 +37,7 @@ 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 +91,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 \ -@@ -112,10 +112,13 @@ LIBS = ../../lib/libutil.a +@@ -113,10 +113,13 @@ LIB_DIR = ../../lib INC_DIR = ../../include MAKES = @@ -111,7 +107,7 @@ Index: src/global/Makefile.in $(OBJS): ../../conf/makedefs.out -@@ -125,14 +128,30 @@ Makefile: Makefile.in +@@ -126,14 +129,30 @@ test: $(TESTPROG) $(LIB): $(OBJS) @@ -146,7 +142,7 @@ Index: src/global/Makefile.in -for i in $(HDRS); \ do \ cmp -s $$i $(INC_DIR)/$$i 2>/dev/null || cp $$i $(INC_DIR); \ -@@ -577,7 +596,7 @@ lint: +@@ -584,7 +603,7 @@ lint $(DEFS) $(SRCS) $(LINTFIX) clean: @@ -155,11 +151,10 @@ Index: src/global/Makefile.in rm -rf printfck tidy: clean -Index: src/global/mail_conf.c -=================================================================== ---- src/global/mail_conf.c.orig -+++ src/global/mail_conf.c -@@ -190,6 +190,13 @@ void mail_conf_suck(void) +diff -rNu postfix-2.11.0/src/global/mail_conf.c postfix-2.11.0-patched/src/global/mail_conf.c +--- postfix-2.11.0/src/global/mail_conf.c 2012-01-13 23:21:46.000000000 +0100 ++++ postfix-2.11.0-patched/src/global/mail_conf.c 2014-02-12 12:37:46.924115776 +0100 +@@ -190,6 +190,13 @@ if (dict_load_file_xt(CONFIG_DICT, path) == 0) msg_fatal("open %s: %m", path); myfree(path); @@ -173,11 +168,10 @@ Index: src/global/mail_conf.c } /* mail_conf_flush - discard configuration dictionary */ -Index: src/global/mail_dict.c -=================================================================== ---- src/global/mail_dict.c.orig -+++ src/global/mail_dict.c -@@ -47,6 +47,7 @@ typedef struct { +diff -rNu postfix-2.11.0/src/global/mail_dict.c postfix-2.11.0-patched/src/global/mail_dict.c +--- postfix-2.11.0/src/global/mail_dict.c 2011-12-19 20:55:38.000000000 +0100 ++++ postfix-2.11.0-patched/src/global/mail_dict.c 2014-02-12 12:37:46.924115776 +0100 +@@ -47,6 +47,7 @@ static const DICT_OPEN_INFO dict_open_info[] = { DICT_TYPE_PROXY, dict_proxy_open, @@ -185,7 +179,7 @@ Index: src/global/mail_dict.c #ifdef HAS_LDAP DICT_TYPE_LDAP, dict_ldap_open, #endif -@@ -60,6 +61,7 @@ static const DICT_OPEN_INFO dict_open_in +@@ -60,6 +61,7 @@ DICT_TYPE_SQLITE, dict_sqlite_open, #endif DICT_TYPE_MEMCACHE, dict_memcache_open, @@ -193,10 +187,9 @@ Index: src/global/mail_dict.c 0, }; -Index: src/global/mail_params.c -=================================================================== ---- src/global/mail_params.c.orig -+++ src/global/mail_params.c +diff -rNu postfix-2.11.0/src/global/mail_params.c postfix-2.11.0-patched/src/global/mail_params.c +--- postfix-2.11.0/src/global/mail_params.c 2014-01-08 02:19:18.000000000 +0100 ++++ postfix-2.11.0-patched/src/global/mail_params.c 2014-02-12 12:37:46.925115784 +0100 @@ -79,6 +79,7 @@ /* char *var_export_environ; /* char *var_debug_peer_list; @@ -205,7 +198,7 @@ Index: src/global/mail_params.c /* int var_in_flow_delay; /* int var_fault_inj_code; /* char *var_bounce_service; -@@ -268,6 +269,7 @@ char *var_import_environ; +@@ -273,6 +274,7 @@ char *var_export_environ; char *var_debug_peer_list; int var_debug_peer_level; @@ -213,7 +206,7 @@ Index: src/global/mail_params.c int var_fault_inj_code; char *var_bounce_service; char *var_cleanup_service; -@@ -279,6 +281,7 @@ char *var_showq_service; +@@ -284,6 +286,7 @@ char *var_error_service; char *var_flush_service; char *var_verify_service; @@ -221,11 +214,10 @@ Index: src/global/mail_params.c char *var_trace_service; char *var_proxymap_service; char *var_proxywrite_service; -Index: src/global/mkmap_open.c -=================================================================== ---- src/global/mkmap_open.c.orig -+++ src/global/mkmap_open.c -@@ -82,7 +82,7 @@ +diff -rNu postfix-2.11.0/src/global/mkmap_open.c postfix-2.11.0-patched/src/global/mkmap_open.c +--- postfix-2.11.0/src/global/mkmap_open.c 2014-01-08 02:19:18.000000000 +0100 ++++ postfix-2.11.0-patched/src/global/mkmap_open.c 2014-02-12 13:02:20.390317089 +0100 +@@ -83,7 +83,7 @@ * We use a different table (in dict_open.c) when querying maps. */ typedef struct { @@ -234,28 +226,27 @@ Index: src/global/mkmap_open.c MKMAP *(*before_open) (const char *); } MKMAP_OPEN_INFO; -@@ -161,7 +161,16 @@ MKMAP *mkmap_open(const char *type, con +@@ -166,7 +166,16 @@ */ for (mp = mkmap_types; /* void */ ; mp++) { if (mp->type == 0) +#ifndef NO_DYNAMIC_MAPS -+ { -+ static MKMAP_OPEN_INFO oi; -+ oi.before_open=(MKMAP*(*)(const char*))dict_mkmap_func(type); -+ oi.type=type; -+ mp=&oi; -+ } ++ { ++ static MKMAP_OPEN_INFO oi; ++ oi.before_open=(MKMAP*(*)(const char*))dict_mkmap_func(type); ++ oi.type=type; ++ mp=&oi; ++ } +#else - msg_fatal("unsupported map type: %s", type); + msg_fatal("unsupported map type for this operation: %s", type); +#endif if (strcmp(type, mp->type) == 0) break; } -Index: src/master/Makefile.in -=================================================================== ---- src/master/Makefile.in.orig -+++ src/master/Makefile.in -@@ -20,7 +20,7 @@ LIB_DIR = ../../lib +diff -rNu postfix-2.11.0/src/master/Makefile.in postfix-2.11.0-patched/src/master/Makefile.in +--- postfix-2.11.0/src/master/Makefile.in 2013-11-18 16:50:14.000000000 +0100 ++++ postfix-2.11.0-patched/src/master/Makefile.in 2014-02-12 12:37:46.926115791 +0100 +@@ -22,7 +22,7 @@ INC_DIR = ../../include BIN_DIR = ../../libexec @@ -264,7 +255,7 @@ Index: src/master/Makefile.in all: $(PROG) $(LIB) -@@ -39,12 +39,10 @@ tests: +@@ -41,12 +41,10 @@ root_tests: $(LIB): $(LIB_OBJ) @@ -278,11 +269,10 @@ Index: src/master/Makefile.in $(BIN_DIR)/$(PROG): $(PROG) cp $(PROG) $(BIN_DIR) -Index: src/milter/Makefile.in -=================================================================== ---- src/milter/Makefile.in.orig -+++ src/milter/Makefile.in -@@ -14,7 +14,7 @@ LIB_DIR = ../../lib +diff -rNu postfix-2.11.0/src/milter/Makefile.in postfix-2.11.0-patched/src/milter/Makefile.in +--- postfix-2.11.0/src/milter/Makefile.in 2013-11-18 16:50:14.000000000 +0100 ++++ postfix-2.11.0-patched/src/milter/Makefile.in 2014-02-12 12:37:46.926115791 +0100 +@@ -14,7 +14,7 @@ INC_DIR = ../../include MAKES = @@ -291,7 +281,7 @@ Index: src/milter/Makefile.in all: $(LIB) -@@ -30,12 +30,10 @@ tests: +@@ -30,12 +30,10 @@ root_tests: $(LIB): $(OBJS) @@ -305,23 +295,21 @@ Index: src/milter/Makefile.in update: $(LIB_DIR)/$(LIB) $(HDRS) -for i in $(HDRS); \ -Index: src/postconf/Makefile.in -=================================================================== ---- src/postconf/Makefile.in.orig -+++ src/postconf/Makefile.in -@@ -595,6 +595,7 @@ postconf_node.o: postconf_node.c +diff -rNu postfix-2.11.0/src/postconf/Makefile.in postfix-2.11.0-patched/src/postconf/Makefile.in +--- postfix-2.11.0/src/postconf/Makefile.in 2013-11-27 21:16:56.000000000 +0100 ++++ postfix-2.11.0-patched/src/postconf/Makefile.in 2014-02-12 13:04:12.559089946 +0100 +@@ -938,6 +938,7 @@ postconf_other.o: ../../include/argv.h postconf_other.o: ../../include/dict.h postconf_other.o: ../../include/htable.h +postconf_other.o: ../../include/mail_params.h postconf_other.o: ../../include/mbox_conf.h - postconf_other.o: ../../include/sys_defs.h - postconf_other.o: ../../include/vbuf.h -Index: src/postconf/postconf_other.c -=================================================================== ---- src/postconf/postconf_other.c.orig -+++ src/postconf/postconf_other.c -@@ -46,10 +46,15 @@ + postconf_other.o: ../../include/myflock.h + postconf_other.o: ../../include/name_code.h +diff -rNu postfix-2.11.0/src/postconf/postconf_other.c postfix-2.11.0-patched/src/postconf/postconf_other.c +--- postfix-2.11.0/src/postconf/postconf_other.c 2013-12-19 23:40:30.000000000 +0100 ++++ postfix-2.11.0-patched/src/postconf/postconf_other.c 2014-02-12 12:37:46.927115797 +0100 +@@ -47,10 +47,15 @@ #include #include #include @@ -337,7 +325,7 @@ Index: src/postconf/postconf_other.c /* XSASL library. */ -@@ -66,6 +71,19 @@ void show_maps(void) +@@ -67,6 +72,19 @@ ARGV *maps_argv; int i; @@ -357,10 +345,9 @@ Index: src/postconf/postconf_other.c maps_argv = dict_mapnames(); for (i = 0; i < maps_argv->argc; i++) vstream_printf("%s\n", maps_argv->argv[i]); -Index: src/postmap/postmap.c -=================================================================== ---- src/postmap/postmap.c.orig -+++ src/postmap/postmap.c +diff -rNu postfix-2.11.0/src/postmap/postmap.c postfix-2.11.0-patched/src/postmap/postmap.c +--- postfix-2.11.0/src/postmap/postmap.c 2013-11-20 16:14:32.000000000 +0100 ++++ postfix-2.11.0-patched/src/postmap/postmap.c 2014-02-12 12:37:46.927115797 +0100 @@ -5,7 +5,7 @@ /* Postfix lookup table management /* SYNOPSIS @@ -379,7 +366,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. -@@ -748,6 +750,18 @@ static void postmap_seq(const char *map_ +@@ -764,6 +766,18 @@ dict_close(dict); } @@ -398,7 +385,7 @@ Index: src/postmap/postmap.c /* usage - explain */ static NORETURN usage(char *myname) -@@ -768,6 +782,7 @@ int main(int argc, char **argv) +@@ -784,6 +798,7 @@ 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 +393,7 @@ Index: src/postmap/postmap.c char *query = 0; char *delkey = 0; int sequence = 0; -@@ -817,7 +832,7 @@ int main(int argc, char **argv) +@@ -833,7 +848,7 @@ /* * Parse JCL. */ @@ -415,7 +402,7 @@ Index: src/postmap/postmap.c switch (ch) { default: usage(argv[0]); -@@ -834,8 +849,8 @@ int main(int argc, char **argv) +@@ -850,8 +865,8 @@ msg_fatal("out of memory"); break; case 'd': @@ -426,7 +413,7 @@ Index: src/postmap/postmap.c delkey = optarg; break; case 'f': -@@ -861,8 +876,8 @@ int main(int argc, char **argv) +@@ -877,8 +892,8 @@ postmap_flags &= ~POSTMAP_FLAG_SAVE_PERM; break; case 'q': @@ -437,7 +424,7 @@ Index: src/postmap/postmap.c query = optarg; break; case 'r': -@@ -870,10 +885,15 @@ int main(int argc, char **argv) +@@ -886,10 +901,15 @@ dict_flags |= DICT_FLAG_DUP_REPLACE; break; case 's': @@ -455,7 +442,7 @@ Index: src/postmap/postmap.c case 'v': msg_verbose++; break; -@@ -944,6 +964,21 @@ int main(int argc, char **argv) +@@ -964,6 +984,21 @@ exit(0); } exit(1); @@ -477,11 +464,10 @@ Index: src/postmap/postmap.c } else { /* create/update map(s) */ if (optind + 1 > argc) usage(argv[0]); -Index: src/tls/Makefile.in -=================================================================== ---- src/tls/Makefile.in.orig -+++ src/tls/Makefile.in -@@ -24,7 +24,7 @@ LIB_DIR = ../../lib +diff -rNu postfix-2.11.0/src/tls/Makefile.in postfix-2.11.0-patched/src/tls/Makefile.in +--- postfix-2.11.0/src/tls/Makefile.in 2013-12-31 17:26:05.000000000 +0100 ++++ postfix-2.11.0-patched/src/tls/Makefile.in 2014-02-12 12:37:46.927115797 +0100 +@@ -24,7 +24,7 @@ INC_DIR = ../../include MAKES = @@ -490,7 +476,7 @@ Index: src/tls/Makefile.in all: $(LIB) -@@ -40,12 +40,10 @@ tests: +@@ -40,12 +40,10 @@ root_tests: $(LIB): $(OBJS) @@ -504,10 +490,9 @@ Index: src/tls/Makefile.in update: $(LIB_DIR)/$(LIB) $(HDRS) -for i in $(HDRS); \ -Index: src/tls/tls_client.c -=================================================================== ---- src/tls/tls_client.c.orig -+++ src/tls/tls_client.c +diff -rNu postfix-2.11.0/src/tls/tls_client.c postfix-2.11.0-patched/src/tls/tls_client.c +--- postfix-2.11.0/src/tls/tls_client.c 2013-12-15 14:35:52.000000000 +0100 ++++ postfix-2.11.0-patched/src/tls/tls_client.c 2014-02-12 12:37:46.927115797 +0100 @@ -156,6 +156,8 @@ #define STR vstring_str #define LEN VSTRING_LEN @@ -517,10 +502,9 @@ Index: src/tls/tls_client.c /* load_clnt_session - load session from client cache (non-callback) */ static SSL_SESSION *load_clnt_session(TLS_SESS_STATE *TLScontext) -Index: src/tls/tls_server.c -=================================================================== ---- src/tls/tls_server.c.orig -+++ src/tls/tls_server.c +diff -rNu postfix-2.11.0/src/tls/tls_server.c postfix-2.11.0-patched/src/tls/tls_server.c +--- postfix-2.11.0/src/tls/tls_server.c 2013-12-15 14:35:52.000000000 +0100 ++++ postfix-2.11.0-patched/src/tls/tls_server.c 2014-02-12 12:37:46.927115797 +0100 @@ -155,6 +155,8 @@ #define STR(x) vstring_str(x) #define LEN(x) VSTRING_LEN(x) @@ -530,23 +514,21 @@ Index: src/tls/tls_server.c /* Application-specific. */ /* -Index: src/util/Makefile.in -=================================================================== ---- src/util/Makefile.in.orig -+++ src/util/Makefile.in -@@ -34,15 +34,16 @@ SRCS = alldig.c allprint.c argv.c argv_s - unix_pass_listen.c unix_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 stream_pass_connect.c base32_code.c dict_test.c \ -- dict_fail.c msg_rate_delay.c dict_surrogate.c warn_stat.c -+ dict_fail.c msg_rate_delay.c dict_surrogate.c warn_stat.c \ -+ load_lib.c sdbm.c +diff -rNu postfix-2.11.0/src/util/Makefile.in postfix-2.11.0-patched/src/util/Makefile.in +--- postfix-2.11.0/src/util/Makefile.in 2013-12-26 16:28:55.000000000 +0100 ++++ postfix-2.11.0-patched/src/util/Makefile.in 2014-02-12 13:08:35.151917586 +0100 +@@ -36,15 +36,15 @@ + ip_match.c nbbio.c base32_code.c dict_test.c \ + dict_fail.c msg_rate_delay.c dict_surrogate.c warn_stat.c \ + dict_sockmap.c line_number.c recv_pass_attr.c pass_accept.c \ +- poll_fd.c timecmp.c slmdb.c ++ poll_fd.c timecmp.c slmdb.c load_lib.c sdbm.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 \ 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_static.o dict_tcp.o dict_unix.o dir_forest.o doze.o dummy_read.o \ + dict_nisplus.o dict_open.o dict_regexp.o dict_sdbm.o \ @@ -554,17 +536,16 @@ Index: src/util/Makefile.in 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 \ fullname.o get_domainname.o get_hostname.o hex_code.o hex_quote.o \ -@@ -70,7 +71,8 @@ OBJS = alldig.o allprint.o argv.o argv_s - unix_pass_listen.o unix_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 stream_pass_connect.o base32_code.o dict_test.o \ -- dict_fail.o msg_rate_delay.o dict_surrogate.o warn_stat.o -+ dict_fail.o msg_rate_delay.o dict_surrogate.o warn_stat.o \ -+ load_lib.o sdbm.o +@@ -74,7 +74,7 @@ + ip_match.o nbbio.o base32_code.o dict_test.o \ + dict_fail.o msg_rate_delay.o dict_surrogate.o warn_stat.o \ + dict_sockmap.o line_number.o recv_pass_attr.o pass_accept.o \ +- poll_fd.o timecmp.o slmdb.o ++ poll_fd.o timecmp.o slmdb.o load_lib.o sdbm.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 \ -@@ -84,7 +86,7 @@ HDRS = argv.h attr.h attr_clnt.h auto_cl +@@ -88,7 +88,7 @@ msg_output.h msg_syslog.h msg_vstream.h mvect.h myaddrinfo.h myflock.h \ mymalloc.h myrand.h name_code.h name_mask.h netstring.h nvtable.h \ open_as.h open_lock.h percentm.h posix_signals.h readlline.h ring.h \ @@ -573,7 +554,7 @@ Index: src/util/Makefile.in sane_socketpair.h sane_time.h scan_dir.h set_eugid.h set_ugid.h \ 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 \ -@@ -98,6 +100,8 @@ DEFS = -I. -D$(SYSTYPE) +@@ -103,6 +103,8 @@ CFLAGS = $(DEBUG) $(OPT) $(DEFS) FILES = Makefile $(SRCS) $(HDRS) INCL = @@ -582,7 +563,7 @@ Index: src/util/Makefile.in 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 \ -@@ -113,10 +117,11 @@ TESTPROG= dict_open dup2_pass_on_exec ev +@@ -119,10 +121,11 @@ LIB_DIR = ../../lib INC_DIR = ../../include @@ -596,7 +577,7 @@ Index: src/util/Makefile.in $(OBJS): ../../conf/makedefs.out -@@ -125,15 +130,25 @@ Makefile: Makefile.in +@@ -131,15 +134,25 @@ test: $(TESTPROG) @@ -626,7 +607,7 @@ Index: src/util/Makefile.in -for i in $(HDRS); \ do \ cmp -s $$i $(INC_DIR)/$$i 2>/dev/null || cp $$i $(INC_DIR); \ -@@ -155,7 +170,8 @@ lint: +@@ -161,7 +174,8 @@ lint $(DEFS) $(SRCS) $(LINTFIX) clean: @@ -636,19 +617,18 @@ Index: src/util/Makefile.in rm -rf printfck tidy: clean -Index: src/util/dict.h -=================================================================== ---- src/util/dict.h.orig -+++ src/util/dict.h -@@ -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 */ -+#define DICT_FLAG_UPGRADE (1<<30) /* Upgrade the db */ - #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 */ +diff -rNu postfix-2.11.0/src/util/dict.h postfix-2.11.0-patched/src/util/dict.h +--- postfix-2.11.0/src/util/dict.h 2013-11-20 16:31:49.000000000 +0100 ++++ postfix-2.11.0-patched/src/util/dict.h 2014-02-12 13:10:21.671699162 +0100 +@@ -98,6 +98,7 @@ + #define DICT_FLAG_OPEN_LOCK (1<<16) /* perm lock if not multi-writer safe */ + #define DICT_FLAG_BULK_UPDATE (1<<17) /* optimize for bulk updates */ + #define DICT_FLAG_MULTI_WRITER (1<<18) /* multi-writer safe map */ ++#define DICT_FLAG_UPGRADE (1<<30) /* Upgrade the db */ -@@ -166,6 +167,11 @@ extern int dict_error(const char *); + /* IMPORTANT: Update the dict_mask[] table when the above changes */ + +@@ -187,6 +188,11 @@ 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)); @@ -660,11 +640,10 @@ Index: src/util/dict.h #define dict_get(dp, key) ((const char *) (dp)->lookup((dp), (key))) #define dict_put(dp, key, val) (dp)->update((dp), (key), (val)) -Index: src/util/dict_db.c -=================================================================== ---- src/util/dict_db.c.orig -+++ src/util/dict_db.c -@@ -693,6 +693,12 @@ static DICT *dict_db_open(const char *cl +diff -rNu postfix-2.11.0/src/util/dict_db.c postfix-2.11.0-patched/src/util/dict_db.c +--- postfix-2.11.0/src/util/dict_db.c 2012-01-25 01:41:08.000000000 +0100 ++++ postfix-2.11.0-patched/src/util/dict_db.c 2014-02-12 12:37:46.928115804 +0100 +@@ -693,6 +693,12 @@ msg_fatal("set DB cache size %d: %m", dict_db_cache_size); if (type == DB_HASH && db->set_h_nelem(db, DICT_DB_NELM) != 0) msg_fatal("set DB hash element count %d: %m", DICT_DB_NELM); @@ -677,45 +656,44 @@ Index: src/util/dict_db.c #if DB_VERSION_MAJOR == 5 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0) if ((errno = db->open(db, 0, db_path, 0, type, db_flags, 0644)) != 0) FREE_RETURN(dict_surrogate(class, path, open_flags, dict_flags, -Index: src/util/dict_dbm.c -=================================================================== ---- src/util/dict_dbm.c.orig -+++ src/util/dict_dbm.c -@@ -417,6 +417,10 @@ DICT *dict_dbm_open(const char *path, - char *dbm_path; +diff -rNu postfix-2.11.0/src/util/dict_dbm.c postfix-2.11.0-patched/src/util/dict_dbm.c +--- postfix-2.11.0/src/util/dict_dbm.c 2013-11-14 19:28:03.000000000 +0100 ++++ postfix-2.11.0-patched/src/util/dict_dbm.c 2014-02-12 13:13:01.431869325 +0100 +@@ -417,6 +417,10 @@ + char *dbm_path = 0; int lock_fd; +#ifdef HAVE_GDBM + msg_fatal("%s: gdbm maps use locking that is incompatible with postfix. Use a hash map instead.", -+ path); ++ path); +#endif /* - * Note: DICT_FLAG_LOCK is used only by programs that do fine-grained (in - * the time domain) locking while accessing individual database records. -Index: src/util/dict_open.c -=================================================================== ---- src/util/dict_open.c.orig -+++ src/util/dict_open.c -@@ -44,6 +44,8 @@ - /* DICT *(*open) (const char *, int, int); - /* - /* ARGV *dict_mapnames() + * Let the optimizer worry about eliminating redundant code. + */ +diff -rNu postfix-2.11.0/src/util/dict_open.c postfix-2.11.0-patched/src/util/dict_open.c +--- postfix-2.11.0/src/util/dict_open.c 2014-01-08 02:19:18.000000000 +0100 ++++ postfix-2.11.0-patched/src/util/dict_open.c 2014-02-12 14:40:45.018379461 +0100 +@@ -54,6 +54,9 @@ + /* int dict_longjmp(dict, val) + /* DICT *dict; + /* int val; ++/* ++/* void (*)() dict_mkmap_func(const char *dict_type) +/* -+/* void (*)() dict_mkmap_func(const char *dict_type) /* DESCRIPTION /* This module implements a low-level interface to multiple /* physical dictionary types. -@@ -166,6 +168,9 @@ +@@ -201,6 +204,9 @@ + /* returns non-zero when dict_setjmp() and dict_longjmp() + /* are enabled for a given dictionary. /* - /* dict_mapnames() returns a sorted list with the names of all available - /* dictionary types. ++/* dict_mkmap_func() returns a pointer to the mkmap setup function ++/* for the given map type, as given in /etc/dynamicmaps.cf +/* -+/* dict_mkmap_func() returns a pointer to the mkmap setup function -+/* for the given map type, as given in /etc/dynamicmaps.cf - /* DIAGNOSTICS - /* Fatal error: open error, unsupported dictionary type, attempt to - /* update non-writable dictionary. -@@ -213,6 +218,9 @@ + /* NB: non-local jumps such as dict_longjmp() are not safe for + /* jumping out of any routine that manipulates DICT data. + /* longjmp() like calls are best avoided in signal handlers. +@@ -251,6 +257,9 @@ #include #endif @@ -725,7 +703,7 @@ Index: src/util/dict_open.c /* Utility library. */ #include -@@ -241,6 +249,27 @@ +@@ -281,6 +290,27 @@ #include #include @@ -753,7 +731,7 @@ Index: src/util/dict_open.c /* * lookup table for available map types. */ -@@ -256,7 +285,9 @@ static const DICT_OPEN_INFO dict_open_in +@@ -296,7 +326,9 @@ DICT_TYPE_ENVIRON, dict_env_open, DICT_TYPE_HT, dict_ht_open, DICT_TYPE_UNIX, dict_unix_open, @@ -763,7 +741,7 @@ Index: src/util/dict_open.c #ifdef HAS_SDBM DICT_TYPE_SDBM, dict_sdbm_open, #endif -@@ -276,9 +307,11 @@ static const DICT_OPEN_INFO dict_open_in +@@ -319,9 +351,11 @@ #ifdef HAS_NETINFO DICT_TYPE_NETINFO, dict_ni_open, #endif @@ -775,7 +753,7 @@ Index: src/util/dict_open.c #ifdef HAS_POSIX_REGEXP DICT_TYPE_REGEXP, dict_regexp_open, #endif -@@ -338,9 +371,32 @@ DICT *dict_open3(const char *dict_type +@@ -382,9 +416,32 @@ dict_type, dict_name); if (dict_open_hash == 0) dict_open_init(); @@ -809,7 +787,7 @@ Index: src/util/dict_open.c if ((dict = dp->open(dict_name, open_flags, dict_flags)) == 0) return (dict_surrogate(dict_type, dict_name, open_flags, dict_flags, "cannot open %s:%s: %m", dict_type, dict_name)); -@@ -359,6 +415,36 @@ DICT *dict_open3(const char *dict_type +@@ -408,6 +465,36 @@ return (dict); } @@ -846,7 +824,7 @@ Index: src/util/dict_open.c /* dict_open_register - register dictionary type */ void dict_open_register(const char *type, -@@ -392,6 +478,9 @@ ARGV *dict_mapnames() +@@ -441,6 +528,9 @@ HTABLE_INFO **ht; DICT_OPEN_INFO *dp; ARGV *mapnames; @@ -856,7 +834,7 @@ Index: src/util/dict_open.c if (dict_open_hash == 0) dict_open_init(); -@@ -400,6 +489,13 @@ ARGV *dict_mapnames() +@@ -449,6 +539,13 @@ dp = (DICT_OPEN_INFO *) ht[0]->value; argv_add(mapnames, dp->type, ARGV_END); } @@ -870,7 +848,7 @@ Index: src/util/dict_open.c qsort((void *) mapnames->argv, mapnames->argc, sizeof(mapnames->argv[0]), dict_sort_alpha_cpp); myfree((char *) ht_info); -@@ -407,6 +503,87 @@ ARGV *dict_mapnames() +@@ -456,6 +553,87 @@ return mapnames; } @@ -958,10 +936,9 @@ Index: src/util/dict_open.c #ifdef TEST /* -Index: src/util/load_lib.c -=================================================================== ---- /dev/null -+++ src/util/load_lib.c +diff -rNu postfix-2.11.0/src/util/load_lib.c postfix-2.11.0-patched/src/util/load_lib.c +--- postfix-2.11.0/src/util/load_lib.c 1970-01-01 01:00:00.000000000 +0100 ++++ postfix-2.11.0-patched/src/util/load_lib.c 2014-02-12 12:37:46.929115810 +0100 @@ -0,0 +1,135 @@ +/*++ +/* NAME @@ -1098,10 +1075,9 @@ Index: src/util/load_lib.c +#endif + return 0; +} -Index: src/util/load_lib.h -=================================================================== ---- /dev/null -+++ src/util/load_lib.h +diff -rNu postfix-2.11.0/src/util/load_lib.h postfix-2.11.0-patched/src/util/load_lib.h +--- postfix-2.11.0/src/util/load_lib.h 1970-01-01 01:00:00.000000000 +0100 ++++ postfix-2.11.0-patched/src/util/load_lib.h 2014-02-12 12:37:46.929115810 +0100 @@ -0,0 +1,41 @@ +#ifndef _LOAD_LIB_H_INCLUDED_ +#define _LOAD_LIB_H_INCLUDED_ @@ -1144,10 +1120,9 @@ Index: src/util/load_lib.h +/*--*/ + +#endif -Index: src/util/sdbm.c -=================================================================== ---- /dev/null -+++ src/util/sdbm.c +diff -rNu postfix-2.11.0/src/util/sdbm.c postfix-2.11.0-patched/src/util/sdbm.c +--- postfix-2.11.0/src/util/sdbm.c 1970-01-01 01:00:00.000000000 +0100 ++++ postfix-2.11.0-patched/src/util/sdbm.c 2014-02-12 12:37:46.929115810 +0100 @@ -0,0 +1,972 @@ +/*++ +/* NAME @@ -2121,10 +2096,9 @@ Index: src/util/sdbm.c + return db; +} + -Index: src/util/sdbm.h -=================================================================== ---- /dev/null -+++ src/util/sdbm.h +diff -rNu postfix-2.11.0/src/util/sdbm.h postfix-2.11.0-patched/src/util/sdbm.h +--- postfix-2.11.0/src/util/sdbm.h 1970-01-01 01:00:00.000000000 +0100 ++++ postfix-2.11.0-patched/src/util/sdbm.h 2014-02-12 12:37:46.930115817 +0100 @@ -0,0 +1,97 @@ +/*++ +/* NAME @@ -2223,19 +2197,18 @@ Index: src/util/sdbm.h +#define BADMESS /* generate a message for worst case: + cannot make room after SPLTMAX splits */ +#endif /* UTIL_SDBM_H */ -Index: src/util/sys_defs.h -=================================================================== ---- src/util/sys_defs.h.orig -+++ src/util/sys_defs.h -@@ -755,6 +755,7 @@ extern int initgroups(const char *, int) +diff -rNu postfix-2.11.0/src/util/sys_defs.h postfix-2.11.0-patched/src/util/sys_defs.h +--- postfix-2.11.0/src/util/sys_defs.h 2013-09-29 22:51:55.000000000 +0200 ++++ postfix-2.11.0-patched/src/util/sys_defs.h 2014-02-12 14:44:07.594868198 +0100 +@@ -767,6 +767,7 @@ #define INTERNAL_LOCK MYFLOCK_STYLE_FLOCK #define DEF_MAILBOX_LOCK "fcntl, dotlock" /* RedHat >= 4.x */ #define HAS_FSYNC +#define HAS_SDBM #define HAS_DB - #define DEF_DB_TYPE "hash" - #define ALIAS_DB_MAP "hash:/etc/aliases" -@@ -768,11 +769,25 @@ extern int initgroups(const char *, int) + #define NATIVE_DB_TYPE "hash" + #define ALIAS_DB_MAP DEF_DB_TYPE ":/etc/aliases" +@@ -780,11 +781,25 @@ #define STATFS_IN_SYS_VFS_H #define PREPEND_PLUS_TO_OPTSTRING #define HAS_POSIX_REGEXP @@ -2261,7 +2234,7 @@ Index: src/util/sys_defs.h #ifdef __GLIBC_PREREQ # define HAVE_GLIBC_API_VERSION_SUPPORT(maj, min) __GLIBC_PREREQ(maj, min) #else -@@ -954,6 +969,7 @@ extern int h_errno; /* impor +@@ -966,6 +981,7 @@ #define USE_STATFS #define STATFS_IN_SYS_VFS_H #define HAS_POSIX_REGEXP @@ -2269,7 +2242,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" -@@ -993,6 +1009,7 @@ extern int h_errno; /* impor +@@ -1005,6 +1021,7 @@ #define USE_STATFS #define STATFS_IN_SYS_VFS_H #define HAS_POSIX_REGEXP @@ -2277,7 +2250,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" -@@ -1034,6 +1051,7 @@ extern int h_errno; +@@ -1046,6 +1063,7 @@ #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 87dd11d..b6d1526 100644 --- a/dynamic_maps_pie.patch +++ b/dynamic_maps_pie.patch @@ -1,18 +1,16 @@ -Index: makedefs -=================================================================== ---- makedefs.orig -+++ makedefs -@@ -682,4 +682,5 @@ AWK = $AWK +diff -Nur postfix-2.11.0/makedefs postfix-2.11.0-patched/makedefs +--- postfix-2.11.0/makedefs 2014-01-05 18:18:56.000000000 +0100 ++++ postfix-2.11.0-patched/makedefs 2014-02-12 15:01:05.984323026 +0100 +@@ -651,4 +651,5 @@ STRCASE = $STRCASE EXPORT = AUXLIBS='$AUXLIBS' CCARGS='$CCARGS' OPT='$OPT' DEBUG='$DEBUG' WARN = $WARN +PIE = $PIE EOF -Index: src/anvil/Makefile.in -=================================================================== ---- src/anvil/Makefile.in.orig -+++ src/anvil/Makefile.in -@@ -9,11 +9,14 @@ TESTPROG= +diff -Nur postfix-2.11.0/src/anvil/Makefile.in postfix-2.11.0-patched/src/anvil/Makefile.in +--- postfix-2.11.0/src/anvil/Makefile.in 2013-11-18 16:50:17.000000000 +0100 ++++ postfix-2.11.0-patched/src/anvil/Makefile.in 2014-02-12 15:01:05.984323026 +0100 +@@ -9,11 +9,14 @@ PROG = anvil INC_DIR = ../../include LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a @@ -28,11 +26,10 @@ Index: src/anvil/Makefile.in $(OBJS): ../../conf/makedefs.out -Index: src/bounce/Makefile.in -=================================================================== ---- src/bounce/Makefile.in.orig -+++ src/bounce/Makefile.in -@@ -16,13 +16,16 @@ PROG = bounce +diff -Nur postfix-2.11.0/src/bounce/Makefile.in postfix-2.11.0-patched/src/bounce/Makefile.in +--- postfix-2.11.0/src/bounce/Makefile.in 2013-11-18 16:50:16.000000000 +0100 ++++ postfix-2.11.0-patched/src/bounce/Makefile.in 2014-02-12 15:10:18.763351828 +0100 +@@ -16,13 +16,16 @@ SAMPLES = ../../conf/bounce.cf.default INC_DIR = ../../include LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a @@ -49,12 +46,11 @@ Index: src/bounce/Makefile.in + $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) $(PIE) # Eliminate dependency on installed Postfix. - ../../conf/bounce.cf.default: template_test.ref annotate.pl -Index: src/cleanup/Makefile.in -=================================================================== ---- src/cleanup/Makefile.in.orig -+++ src/cleanup/Makefile.in -@@ -20,11 +20,14 @@ PROG = cleanup + ../../conf/bounce.cf.default: template_test.ref annotate.sh +diff -Nur postfix-2.11.0/src/cleanup/Makefile.in postfix-2.11.0-patched/src/cleanup/Makefile.in +--- postfix-2.11.0/src/cleanup/Makefile.in 2013-11-24 01:48:19.000000000 +0100 ++++ postfix-2.11.0-patched/src/cleanup/Makefile.in 2014-02-12 15:01:05.985323033 +0100 +@@ -20,11 +20,14 @@ INC_DIR = ../../include LIBS = ../../lib/libmaster.a ../../lib/libmilter.a ../../lib/libglobal.a \ ../../lib/libutil.a @@ -70,11 +66,10 @@ Index: src/cleanup/Makefile.in $(OBJS): ../../conf/makedefs.out -Index: src/discard/Makefile.in -=================================================================== ---- src/discard/Makefile.in.orig -+++ src/discard/Makefile.in -@@ -9,11 +9,14 @@ TESTPROG= +diff -Nur postfix-2.11.0/src/discard/Makefile.in postfix-2.11.0-patched/src/discard/Makefile.in +--- postfix-2.11.0/src/discard/Makefile.in 2013-11-18 16:50:17.000000000 +0100 ++++ postfix-2.11.0-patched/src/discard/Makefile.in 2014-02-12 15:01:05.985323033 +0100 +@@ -9,11 +9,14 @@ PROG = discard INC_DIR = ../../include LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a @@ -90,11 +85,10 @@ Index: src/discard/Makefile.in $(OBJS): ../../conf/makedefs.out -Index: src/error/Makefile.in -=================================================================== ---- src/error/Makefile.in.orig -+++ src/error/Makefile.in -@@ -9,11 +9,14 @@ TESTPROG= +diff -Nur postfix-2.11.0/src/error/Makefile.in postfix-2.11.0-patched/src/error/Makefile.in +--- postfix-2.11.0/src/error/Makefile.in 2013-11-18 16:50:14.000000000 +0100 ++++ postfix-2.11.0-patched/src/error/Makefile.in 2014-02-12 15:01:05.985323033 +0100 +@@ -9,11 +9,14 @@ PROG = error INC_DIR = ../../include LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a @@ -110,11 +104,10 @@ Index: src/error/Makefile.in $(OBJS): ../../conf/makedefs.out -Index: src/flush/Makefile.in -=================================================================== ---- src/flush/Makefile.in.orig -+++ src/flush/Makefile.in -@@ -9,11 +9,14 @@ TESTPROG= +diff -Nur postfix-2.11.0/src/flush/Makefile.in postfix-2.11.0-patched/src/flush/Makefile.in +--- postfix-2.11.0/src/flush/Makefile.in 2013-11-18 16:50:17.000000000 +0100 ++++ postfix-2.11.0-patched/src/flush/Makefile.in 2014-02-12 15:01:05.986323041 +0100 +@@ -9,11 +9,14 @@ PROG = flush INC_DIR = ../../include LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a @@ -130,11 +123,10 @@ Index: src/flush/Makefile.in $(OBJS): ../../conf/makedefs.out -Index: src/fsstone/Makefile.in -=================================================================== ---- src/fsstone/Makefile.in.orig -+++ src/fsstone/Makefile.in -@@ -9,6 +9,9 @@ TESTPROG= +diff -Nur postfix-2.11.0/src/fsstone/Makefile.in postfix-2.11.0-patched/src/fsstone/Makefile.in +--- postfix-2.11.0/src/fsstone/Makefile.in 2013-11-18 16:50:14.000000000 +0100 ++++ postfix-2.11.0-patched/src/fsstone/Makefile.in 2014-02-12 15:01:05.986323041 +0100 +@@ -9,6 +9,9 @@ PROG = fsstone INC_DIR = ../../include LIBS = ../../lib/libglobal.a ../../lib/libutil.a @@ -144,7 +136,7 @@ Index: src/fsstone/Makefile.in .c.o:; $(CC) $(CFLAGS) -c $*.c -@@ -20,7 +23,7 @@ Makefile: Makefile.in +@@ -20,7 +23,7 @@ cat ../../conf/makedefs.out $? >$@ fsstone: fsstone.o $(LIBS) @@ -153,11 +145,10 @@ Index: src/fsstone/Makefile.in test: $(TESTPROG) -Index: src/local/Makefile.in -=================================================================== ---- src/local/Makefile.in.orig -+++ src/local/Makefile.in -@@ -15,11 +15,14 @@ PROG = local +diff -Nur postfix-2.11.0/src/local/Makefile.in postfix-2.11.0-patched/src/local/Makefile.in +--- postfix-2.11.0/src/local/Makefile.in 2013-11-18 16:50:15.000000000 +0100 ++++ postfix-2.11.0-patched/src/local/Makefile.in 2014-02-12 15:01:05.986323041 +0100 +@@ -15,11 +15,14 @@ TESTPROG= INC_DIR = ../../include LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a @@ -173,11 +164,10 @@ Index: src/local/Makefile.in $(OBJS): ../../conf/makedefs.out -Index: src/master/Makefile.in -=================================================================== ---- src/master/Makefile.in.orig -+++ src/master/Makefile.in -@@ -20,7 +20,7 @@ LIB_DIR = ../../lib +diff -Nur postfix-2.11.0/src/master/Makefile.in postfix-2.11.0-patched/src/master/Makefile.in +--- postfix-2.11.0/src/master/Makefile.in 2014-02-12 15:03:40.409449650 +0100 ++++ postfix-2.11.0-patched/src/master/Makefile.in 2014-02-12 15:01:05.986323041 +0100 +@@ -22,7 +22,7 @@ INC_DIR = ../../include BIN_DIR = ../../libexec @@ -186,7 +176,7 @@ Index: src/master/Makefile.in all: $(PROG) $(LIB) -@@ -30,7 +30,7 @@ Makefile: Makefile.in +@@ -32,7 +32,7 @@ cat ../../conf/makedefs.out $? >$@ $(PROG): $(OBJS) $(LIBS) @@ -195,11 +185,10 @@ Index: src/master/Makefile.in test: $(TESTPROG) -Index: src/oqmgr/Makefile.in -=================================================================== ---- src/oqmgr/Makefile.in.orig -+++ src/oqmgr/Makefile.in -@@ -15,11 +15,14 @@ TESTPROG= +diff -Nur postfix-2.11.0/src/oqmgr/Makefile.in postfix-2.11.0-patched/src/oqmgr/Makefile.in +--- postfix-2.11.0/src/oqmgr/Makefile.in 2013-11-18 16:50:16.000000000 +0100 ++++ postfix-2.11.0-patched/src/oqmgr/Makefile.in 2014-02-12 15:01:05.987323048 +0100 +@@ -15,11 +15,14 @@ PROG = qmgr INC_DIR = ../../include LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a @@ -215,11 +204,10 @@ Index: src/oqmgr/Makefile.in $(OBJS): ../../conf/makedefs.out -Index: src/pickup/Makefile.in -=================================================================== ---- src/pickup/Makefile.in.orig -+++ src/pickup/Makefile.in -@@ -9,11 +9,14 @@ TESTPROG= +diff -Nur postfix-2.11.0/src/pickup/Makefile.in postfix-2.11.0-patched/src/pickup/Makefile.in +--- postfix-2.11.0/src/pickup/Makefile.in 2013-11-18 16:50:14.000000000 +0100 ++++ postfix-2.11.0-patched/src/pickup/Makefile.in 2014-02-12 15:01:05.987323048 +0100 +@@ -9,11 +9,14 @@ PROG = pickup INC_DIR = ../../include LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a @@ -235,11 +223,10 @@ Index: src/pickup/Makefile.in $(OBJS): ../../conf/makedefs.out -Index: src/pipe/Makefile.in -=================================================================== ---- src/pipe/Makefile.in.orig -+++ src/pipe/Makefile.in -@@ -9,11 +9,14 @@ TESTPROG= +diff -Nur postfix-2.11.0/src/pipe/Makefile.in postfix-2.11.0-patched/src/pipe/Makefile.in +--- postfix-2.11.0/src/pipe/Makefile.in 2013-11-18 16:50:16.000000000 +0100 ++++ postfix-2.11.0-patched/src/pipe/Makefile.in 2014-02-12 15:01:05.987323048 +0100 +@@ -9,11 +9,14 @@ PROG = pipe INC_DIR = ../../include LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a @@ -255,11 +242,10 @@ Index: src/pipe/Makefile.in $(OBJS): ../../conf/makedefs.out -Index: src/postalias/Makefile.in -=================================================================== ---- src/postalias/Makefile.in.orig -+++ src/postalias/Makefile.in -@@ -9,11 +9,14 @@ TESTPROG= +diff -Nur postfix-2.11.0/src/postalias/Makefile.in postfix-2.11.0-patched/src/postalias/Makefile.in +--- postfix-2.11.0/src/postalias/Makefile.in 2013-11-18 16:50:16.000000000 +0100 ++++ postfix-2.11.0-patched/src/postalias/Makefile.in 2014-02-12 15:01:05.987323048 +0100 +@@ -9,11 +9,14 @@ PROG = postalias INC_DIR = ../../include LIBS = ../../lib/libglobal.a ../../lib/libutil.a @@ -275,11 +261,10 @@ Index: src/postalias/Makefile.in $(OBJS): ../../conf/makedefs.out -Index: src/postcat/Makefile.in -=================================================================== ---- src/postcat/Makefile.in.orig -+++ src/postcat/Makefile.in -@@ -9,11 +9,14 @@ TESTPROG= +diff -Nur postfix-2.11.0/src/postcat/Makefile.in postfix-2.11.0-patched/src/postcat/Makefile.in +--- postfix-2.11.0/src/postcat/Makefile.in 2013-11-18 16:50:16.000000000 +0100 ++++ postfix-2.11.0-patched/src/postcat/Makefile.in 2014-02-12 15:01:05.987323048 +0100 +@@ -9,11 +9,14 @@ PROG = postcat INC_DIR = ../../include LIBS = ../../lib/libglobal.a ../../lib/libutil.a @@ -295,11 +280,10 @@ Index: src/postcat/Makefile.in $(OBJS): ../../conf/makedefs.out -Index: src/postconf/Makefile.in -=================================================================== ---- src/postconf/Makefile.in.orig -+++ src/postconf/Makefile.in -@@ -20,11 +20,14 @@ PROG = postconf +diff -Nur postfix-2.11.0/src/postconf/Makefile.in postfix-2.11.0-patched/src/postconf/Makefile.in +--- postfix-2.11.0/src/postconf/Makefile.in 2014-02-12 15:03:40.409449650 +0100 ++++ postfix-2.11.0-patched/src/postconf/Makefile.in 2014-02-12 15:01:05.987323048 +0100 +@@ -22,11 +22,14 @@ SAMPLES = ../../conf/main.cf.default INC_DIR = ../../include LIBS = ../../lib/libxsasl.a ../../lib/libglobal.a ../../lib/libutil.a @@ -315,11 +299,10 @@ Index: src/postconf/Makefile.in ../../conf/main.cf.default: $(PROG) Makefile rm -f $@ -Index: src/postdrop/Makefile.in -=================================================================== ---- src/postdrop/Makefile.in.orig -+++ src/postdrop/Makefile.in -@@ -9,11 +9,14 @@ TESTPROG= +diff -Nur postfix-2.11.0/src/postdrop/Makefile.in postfix-2.11.0-patched/src/postdrop/Makefile.in +--- postfix-2.11.0/src/postdrop/Makefile.in 2013-11-18 16:50:17.000000000 +0100 ++++ postfix-2.11.0-patched/src/postdrop/Makefile.in 2014-02-12 15:01:05.987323048 +0100 +@@ -9,11 +9,14 @@ PROG = postdrop INC_DIR = ../../include LIBS = ../../lib/libglobal.a ../../lib/libutil.a @@ -335,11 +318,10 @@ Index: src/postdrop/Makefile.in $(OBJS): ../../conf/makedefs.out -Index: src/postfix/Makefile.in -=================================================================== ---- src/postfix/Makefile.in.orig -+++ src/postfix/Makefile.in -@@ -10,11 +10,14 @@ INC_DIR = ../../include +diff -Nur postfix-2.11.0/src/postfix/Makefile.in postfix-2.11.0-patched/src/postfix/Makefile.in +--- postfix-2.11.0/src/postfix/Makefile.in 2013-11-18 16:50:14.000000000 +0100 ++++ postfix-2.11.0-patched/src/postfix/Makefile.in 2014-02-12 15:01:05.987323048 +0100 +@@ -10,11 +10,14 @@ TESTPROG= PROG = postfix LIBS = ../../lib/libglobal.a ../../lib/libutil.a @@ -355,11 +337,10 @@ Index: src/postfix/Makefile.in $(OBJS): ../../conf/makedefs.out -Index: src/postkick/Makefile.in -=================================================================== ---- src/postkick/Makefile.in.orig -+++ src/postkick/Makefile.in -@@ -9,11 +9,14 @@ TESTPROG= +diff -Nur postfix-2.11.0/src/postkick/Makefile.in postfix-2.11.0-patched/src/postkick/Makefile.in +--- postfix-2.11.0/src/postkick/Makefile.in 2013-11-18 16:50:17.000000000 +0100 ++++ postfix-2.11.0-patched/src/postkick/Makefile.in 2014-02-12 15:01:05.987323048 +0100 +@@ -9,11 +9,14 @@ PROG = postkick INC_DIR = ../../include LIBS = ../../lib/libglobal.a ../../lib/libutil.a @@ -375,11 +356,10 @@ Index: src/postkick/Makefile.in $(OBJS): ../../conf/makedefs.out -Index: src/postlock/Makefile.in -=================================================================== ---- src/postlock/Makefile.in.orig -+++ src/postlock/Makefile.in -@@ -9,11 +9,14 @@ TESTPROG= +diff -Nur postfix-2.11.0/src/postlock/Makefile.in postfix-2.11.0-patched/src/postlock/Makefile.in +--- postfix-2.11.0/src/postlock/Makefile.in 2013-11-18 16:50:17.000000000 +0100 ++++ postfix-2.11.0-patched/src/postlock/Makefile.in 2014-02-12 15:01:05.987323048 +0100 +@@ -9,11 +9,14 @@ PROG = postlock INC_DIR = ../../include LIBS = ../../lib/libglobal.a ../../lib/libutil.a @@ -395,11 +375,10 @@ Index: src/postlock/Makefile.in $(OBJS): ../../conf/makedefs.out -Index: src/postlog/Makefile.in -=================================================================== ---- src/postlog/Makefile.in.orig -+++ src/postlog/Makefile.in -@@ -10,11 +10,14 @@ INC_DIR = ../../include +diff -Nur postfix-2.11.0/src/postlog/Makefile.in postfix-2.11.0-patched/src/postlog/Makefile.in +--- postfix-2.11.0/src/postlog/Makefile.in 2013-11-18 16:50:17.000000000 +0100 ++++ postfix-2.11.0-patched/src/postlog/Makefile.in 2014-02-12 15:01:05.987323048 +0100 +@@ -10,11 +10,14 @@ TESTPROG= PROG = postlog LIBS = ../../lib/libglobal.a ../../lib/libutil.a @@ -415,11 +394,10 @@ Index: src/postlog/Makefile.in $(OBJS): ../../conf/makedefs.out -Index: src/postmap/Makefile.in -=================================================================== ---- src/postmap/Makefile.in.orig -+++ src/postmap/Makefile.in -@@ -9,11 +9,14 @@ TESTPROG= +diff -Nur postfix-2.11.0/src/postmap/Makefile.in postfix-2.11.0-patched/src/postmap/Makefile.in +--- postfix-2.11.0/src/postmap/Makefile.in 2013-11-18 16:50:17.000000000 +0100 ++++ postfix-2.11.0-patched/src/postmap/Makefile.in 2014-02-12 15:01:05.988323055 +0100 +@@ -9,11 +9,14 @@ PROG = postmap INC_DIR = ../../include LIBS = ../../lib/libglobal.a ../../lib/libutil.a @@ -435,11 +413,10 @@ Index: src/postmap/Makefile.in $(OBJS): ../../conf/makedefs.out -Index: src/postqueue/Makefile.in -=================================================================== ---- src/postqueue/Makefile.in.orig -+++ src/postqueue/Makefile.in -@@ -9,11 +9,14 @@ TESTPROG= +diff -Nur postfix-2.11.0/src/postqueue/Makefile.in postfix-2.11.0-patched/src/postqueue/Makefile.in +--- postfix-2.11.0/src/postqueue/Makefile.in 2013-11-18 16:50:17.000000000 +0100 ++++ postfix-2.11.0-patched/src/postqueue/Makefile.in 2014-02-12 15:01:05.988323055 +0100 +@@ -9,11 +9,14 @@ PROG = postqueue INC_DIR = ../../include LIBS = ../../lib/libglobal.a ../../lib/libutil.a @@ -455,11 +432,10 @@ Index: src/postqueue/Makefile.in $(OBJS): ../../conf/makedefs.out -Index: src/postsuper/Makefile.in -=================================================================== ---- src/postsuper/Makefile.in.orig -+++ src/postsuper/Makefile.in -@@ -9,11 +9,14 @@ TESTPROG= +diff -Nur postfix-2.11.0/src/postsuper/Makefile.in postfix-2.11.0-patched/src/postsuper/Makefile.in +--- postfix-2.11.0/src/postsuper/Makefile.in 2013-11-18 16:50:17.000000000 +0100 ++++ postfix-2.11.0-patched/src/postsuper/Makefile.in 2014-02-12 15:01:05.988323055 +0100 +@@ -9,11 +9,14 @@ PROG = postsuper INC_DIR = ../../include LIBS = ../../lib/libglobal.a ../../lib/libutil.a @@ -475,11 +451,10 @@ Index: src/postsuper/Makefile.in $(OBJS): ../../conf/makedefs.out -Index: src/proxymap/Makefile.in -=================================================================== ---- src/proxymap/Makefile.in.orig -+++ src/proxymap/Makefile.in -@@ -9,11 +9,14 @@ TESTPROG= +diff -Nur postfix-2.11.0/src/proxymap/Makefile.in postfix-2.11.0-patched/src/proxymap/Makefile.in +--- postfix-2.11.0/src/proxymap/Makefile.in 2013-11-18 16:50:17.000000000 +0100 ++++ postfix-2.11.0-patched/src/proxymap/Makefile.in 2014-02-12 15:01:05.988323055 +0100 +@@ -9,11 +9,14 @@ PROG = proxymap INC_DIR = ../../include LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a @@ -495,11 +470,10 @@ Index: src/proxymap/Makefile.in $(OBJS): ../../conf/makedefs.out -Index: src/qmgr/Makefile.in -=================================================================== ---- src/qmgr/Makefile.in.orig -+++ src/qmgr/Makefile.in -@@ -17,11 +17,14 @@ TESTPROG= +diff -Nur postfix-2.11.0/src/qmgr/Makefile.in postfix-2.11.0-patched/src/qmgr/Makefile.in +--- postfix-2.11.0/src/qmgr/Makefile.in 2013-11-18 16:50:15.000000000 +0100 ++++ postfix-2.11.0-patched/src/qmgr/Makefile.in 2014-02-12 15:01:05.988323055 +0100 +@@ -17,11 +17,14 @@ PROG = qmgr INC_DIR = ../../include LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a @@ -515,11 +489,10 @@ Index: src/qmgr/Makefile.in $(OBJS): ../../conf/makedefs.out -Index: src/qmqpd/Makefile.in -=================================================================== ---- src/qmqpd/Makefile.in.orig -+++ src/qmqpd/Makefile.in -@@ -9,11 +9,14 @@ TESTPROG= +diff -Nur postfix-2.11.0/src/qmqpd/Makefile.in postfix-2.11.0-patched/src/qmqpd/Makefile.in +--- postfix-2.11.0/src/qmqpd/Makefile.in 2013-11-18 16:50:17.000000000 +0100 ++++ postfix-2.11.0-patched/src/qmqpd/Makefile.in 2014-02-12 15:01:05.988323055 +0100 +@@ -9,11 +9,14 @@ PROG = qmqpd INC_DIR = ../../include LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libdns.a ../../lib/libutil.a @@ -535,11 +508,10 @@ Index: src/qmqpd/Makefile.in $(OBJS): ../../conf/makedefs.out -Index: src/scache/Makefile.in -=================================================================== ---- src/scache/Makefile.in.orig -+++ src/scache/Makefile.in -@@ -9,11 +9,14 @@ TESTPROG= +diff -Nur postfix-2.11.0/src/scache/Makefile.in postfix-2.11.0-patched/src/scache/Makefile.in +--- postfix-2.11.0/src/scache/Makefile.in 2013-11-18 16:50:17.000000000 +0100 ++++ postfix-2.11.0-patched/src/scache/Makefile.in 2014-02-12 15:01:05.988323055 +0100 +@@ -9,11 +9,14 @@ PROG = scache INC_DIR = ../../include LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a @@ -555,11 +527,10 @@ Index: src/scache/Makefile.in $(OBJS): ../../conf/makedefs.out -Index: src/sendmail/Makefile.in -=================================================================== ---- src/sendmail/Makefile.in.orig -+++ src/sendmail/Makefile.in -@@ -9,11 +9,14 @@ TESTPROG= +diff -Nur postfix-2.11.0/src/sendmail/Makefile.in postfix-2.11.0-patched/src/sendmail/Makefile.in +--- postfix-2.11.0/src/sendmail/Makefile.in 2013-11-18 16:50:14.000000000 +0100 ++++ postfix-2.11.0-patched/src/sendmail/Makefile.in 2014-02-12 15:01:05.988323055 +0100 +@@ -9,11 +9,14 @@ PROG = sendmail INC_DIR = ../../include LIBS = ../../lib/libglobal.a ../../lib/libutil.a @@ -575,11 +546,10 @@ Index: src/sendmail/Makefile.in $(OBJS): ../../conf/makedefs.out -Index: src/showq/Makefile.in -=================================================================== ---- src/showq/Makefile.in.orig -+++ src/showq/Makefile.in -@@ -9,11 +9,14 @@ TESTPROG= +diff -Nur postfix-2.11.0/src/showq/Makefile.in postfix-2.11.0-patched/src/showq/Makefile.in +--- postfix-2.11.0/src/showq/Makefile.in 2013-11-18 16:50:16.000000000 +0100 ++++ postfix-2.11.0-patched/src/showq/Makefile.in 2014-02-12 15:01:05.988323055 +0100 +@@ -9,11 +9,14 @@ PROG = showq INC_DIR = ../../include LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a @@ -595,11 +565,10 @@ Index: src/showq/Makefile.in $(OBJS): ../../conf/makedefs.out -Index: src/smtp/Makefile.in -=================================================================== ---- src/smtp/Makefile.in.orig -+++ src/smtp/Makefile.in -@@ -16,11 +16,14 @@ PROG = smtp +diff -Nur postfix-2.11.0/src/smtp/Makefile.in postfix-2.11.0-patched/src/smtp/Makefile.in +--- postfix-2.11.0/src/smtp/Makefile.in 2013-11-20 23:00:26.000000000 +0100 ++++ postfix-2.11.0-patched/src/smtp/Makefile.in 2014-02-12 15:01:05.988323055 +0100 +@@ -16,11 +16,14 @@ INC_DIR = ../../include LIBS = ../../lib/libmaster.a ../../lib/libtls.a ../../lib/libdns.a \ ../../lib/libxsasl.a ../../lib/libglobal.a ../../lib/libutil.a @@ -615,14 +584,13 @@ Index: src/smtp/Makefile.in $(OBJS): ../../conf/makedefs.out -Index: src/smtpd/Makefile.in -=================================================================== ---- src/smtpd/Makefile.in.orig -+++ src/smtpd/Makefile.in -@@ -19,11 +19,14 @@ INC_DIR = ../../include +diff -Nur postfix-2.11.0/src/smtpd/Makefile.in postfix-2.11.0-patched/src/smtpd/Makefile.in +--- postfix-2.11.0/src/smtpd/Makefile.in 2013-11-20 23:00:36.000000000 +0100 ++++ postfix-2.11.0-patched/src/smtpd/Makefile.in 2014-02-12 15:09:15.355890245 +0100 +@@ -20,11 +20,14 @@ LIBS = ../../lib/libmaster.a ../../lib/libtls.a ../../lib/libdns.a \ - ../../lib/libxsasl.a ../../lib/libmilter.a ../../lib/libglobal.a \ - ../../lib/libutil.a + ../../lib/libxsasl.a ../../lib/libmilter.a ../../lib/libdns.a \ + ../../lib/libglobal.a ../../lib/libutil.a +ifdef PIE +CFLAGS += -fPIE +endif @@ -635,11 +603,10 @@ Index: src/smtpd/Makefile.in $(OBJS): ../../conf/makedefs.out -Index: src/smtpstone/Makefile.in -=================================================================== ---- src/smtpstone/Makefile.in.orig -+++ src/smtpstone/Makefile.in -@@ -9,6 +9,9 @@ TESTPROG= +diff -Nur postfix-2.11.0/src/smtpstone/Makefile.in postfix-2.11.0-patched/src/smtpstone/Makefile.in +--- postfix-2.11.0/src/smtpstone/Makefile.in 2013-11-18 17:32:35.000000000 +0100 ++++ postfix-2.11.0-patched/src/smtpstone/Makefile.in 2014-02-12 15:01:05.989323063 +0100 +@@ -9,6 +9,9 @@ INC_DIR = ../../include PROG = smtp-source smtp-sink qmqp-source qmqp-sink LIBS = ../../lib/libglobal.a ../../lib/libutil.a @@ -649,7 +616,7 @@ Index: src/smtpstone/Makefile.in .c.o:; $(CC) $(CFLAGS) -c $*.c -@@ -20,16 +23,16 @@ Makefile: Makefile.in +@@ -20,16 +23,16 @@ cat ../../conf/makedefs.out $? >$@ smtp-sink: smtp-sink.o $(LIBS) @@ -670,11 +637,10 @@ Index: src/smtpstone/Makefile.in test: $(TESTPROG) -Index: src/spawn/Makefile.in -=================================================================== ---- src/spawn/Makefile.in.orig -+++ src/spawn/Makefile.in -@@ -9,11 +9,14 @@ TESTPROG= +diff -Nur postfix-2.11.0/src/spawn/Makefile.in postfix-2.11.0-patched/src/spawn/Makefile.in +--- postfix-2.11.0/src/spawn/Makefile.in 2013-11-18 16:50:17.000000000 +0100 ++++ postfix-2.11.0-patched/src/spawn/Makefile.in 2014-02-12 15:01:05.989323063 +0100 +@@ -9,11 +9,14 @@ PROG = spawn INC_DIR = ../../include LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a @@ -690,14 +656,13 @@ Index: src/spawn/Makefile.in $(OBJS): ../../conf/makedefs.out -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 +diff -Nur postfix-2.11.0/src/tlsmgr/Makefile.in postfix-2.11.0-patched/src/tlsmgr/Makefile.in +--- postfix-2.11.0/src/tlsmgr/Makefile.in 2013-11-20 23:01:21.000000000 +0100 ++++ postfix-2.11.0-patched/src/tlsmgr/Makefile.in 2014-02-12 15:09:08.211838236 +0100 +@@ -11,11 +11,14 @@ + # Fake libdns dependency, for early-binding shared-library builds. + LIBS = ../../lib/libmaster.a ../../lib/libtls.a ../../lib/libdns.a \ + ../../lib/libglobal.a ../../lib/libutil.a +ifdef PIE +CFLAGS += -fPIE +endif @@ -710,11 +675,10 @@ Index: src/tlsmgr/Makefile.in $(OBJS): ../../conf/makedefs.out -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 +diff -Nur postfix-2.11.0/src/trivial-rewrite/Makefile.in postfix-2.11.0-patched/src/trivial-rewrite/Makefile.in +--- postfix-2.11.0/src/trivial-rewrite/Makefile.in 2013-11-18 16:50:15.000000000 +0100 ++++ postfix-2.11.0-patched/src/trivial-rewrite/Makefile.in 2014-02-12 15:01:05.989323063 +0100 +@@ -12,13 +12,16 @@ LIB_DIR = ../../lib INC_DIR = ../../include BIN_DIR = ../../libexec @@ -732,11 +696,10 @@ Index: src/trivial-rewrite/Makefile.in $(OBJS): ../../conf/makedefs.out -Index: src/verify/Makefile.in -=================================================================== ---- src/verify/Makefile.in.orig -+++ src/verify/Makefile.in -@@ -9,11 +9,14 @@ TESTPROG= +diff -Nur postfix-2.11.0/src/verify/Makefile.in postfix-2.11.0-patched/src/verify/Makefile.in +--- postfix-2.11.0/src/verify/Makefile.in 2013-11-18 16:50:17.000000000 +0100 ++++ postfix-2.11.0-patched/src/verify/Makefile.in 2014-02-12 15:01:05.989323063 +0100 +@@ -9,11 +9,14 @@ PROG = verify INC_DIR = ../../include LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a @@ -752,11 +715,10 @@ Index: src/verify/Makefile.in $(OBJS): ../../conf/makedefs.out -Index: src/virtual/Makefile.in -=================================================================== ---- src/virtual/Makefile.in.orig -+++ src/virtual/Makefile.in -@@ -9,11 +9,14 @@ PROG = virtual +diff -Nur postfix-2.11.0/src/virtual/Makefile.in postfix-2.11.0-patched/src/virtual/Makefile.in +--- postfix-2.11.0/src/virtual/Makefile.in 2013-11-18 16:50:17.000000000 +0100 ++++ postfix-2.11.0-patched/src/virtual/Makefile.in 2014-02-12 15:01:05.989323063 +0100 +@@ -9,11 +9,14 @@ TESTPROG= INC_DIR = ../../include LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a @@ -772,11 +734,10 @@ Index: src/virtual/Makefile.in $(OBJS): ../../conf/makedefs.out -Index: src/xsasl/Makefile.in -=================================================================== ---- src/xsasl/Makefile.in.orig -+++ src/xsasl/Makefile.in -@@ -18,7 +18,7 @@ LIB_DIR = ../../lib +diff -Nur postfix-2.11.0/src/xsasl/Makefile.in postfix-2.11.0-patched/src/xsasl/Makefile.in +--- postfix-2.11.0/src/xsasl/Makefile.in 2013-11-18 16:50:14.000000000 +0100 ++++ postfix-2.11.0-patched/src/xsasl/Makefile.in 2014-02-12 15:01:05.989323063 +0100 +@@ -18,7 +18,7 @@ INC_DIR = ../../include MAKES = diff --git a/pointer_to_literals.patch b/pointer_to_literals.patch index c7712f4..b0f5148 100644 --- a/pointer_to_literals.patch +++ b/pointer_to_literals.patch @@ -1,8 +1,7 @@ -Index: src/cleanup/cleanup_message.c -=================================================================== ---- src/cleanup/cleanup_message.c.orig -+++ src/cleanup/cleanup_message.c -@@ -290,7 +290,7 @@ static const char *cleanup_act(CLEANUP_S +diff -Nur postfix-2.11.0/src/cleanup/cleanup_message.c postfix-2.11.0-patched/src/cleanup/cleanup_message.c +--- postfix-2.11.0/src/cleanup/cleanup_message.c 2013-11-12 18:53:03.000000000 +0100 ++++ postfix-2.11.0-patched/src/cleanup/cleanup_message.c 2014-02-12 15:17:28.172612478 +0100 +@@ -290,7 +290,7 @@ while (*optional_text && ISSPACE(*optional_text)) optional_text++; @@ -11,24 +10,22 @@ Index: src/cleanup/cleanup_message.c #define CLEANUP_ACT_DROP 0 /* -Index: src/local/local_expand.c -=================================================================== ---- src/local/local_expand.c.orig -+++ src/local/local_expand.c -@@ -114,7 +114,7 @@ static const char *local_expand_lookup(c - { +diff -Nur postfix-2.11.0/src/local/local_expand.c postfix-2.11.0-patched/src/local/local_expand.c +--- postfix-2.11.0/src/local/local_expand.c 2013-04-05 23:27:48.000000000 +0200 ++++ postfix-2.11.0-patched/src/local/local_expand.c 2014-02-12 15:22:23.684849057 +0100 +@@ -115,7 +115,7 @@ LOCAL_EXP *local = (LOCAL_EXP *) ptr; + static char rcpt_delim[2]; -#define STREQ(x,y) (*(x) == *(y) && strcmp((x), (y)) == 0) +inline int STREQ(const char *x, const char *y) { return (*(x) == *(y) && strcmp((x), (y)) == 0); } if (STREQ(name, "user")) { return (local->state->msg_attr.user); -Index: src/smtpd/smtpd_check.c -=================================================================== ---- src/smtpd/smtpd_check.c.orig -+++ src/smtpd/smtpd_check.c -@@ -357,6 +357,10 @@ static int unv_from_tf_act; +diff -Nur postfix-2.11.0/src/smtpd/smtpd_check.c postfix-2.11.0-patched/src/smtpd/smtpd_check.c +--- postfix-2.11.0/src/smtpd/smtpd_check.c 2013-11-12 19:00:11.000000000 +0100 ++++ postfix-2.11.0-patched/src/smtpd/smtpd_check.c 2014-02-12 15:17:28.174612493 +0100 +@@ -363,6 +363,10 @@ #define CONST_STR(x) ((const char *) vstring_str(x)) #define UPDATE_STRING(ptr,val) { if (ptr) myfree(ptr); ptr = mystrdup(val); } @@ -39,7 +36,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. -@@ -1986,8 +1990,6 @@ static int check_table_result(SMTPD_STAT +@@ -2073,8 +2077,6 @@ if (msg_verbose) msg_info("%s: %s %s %s", myname, table, value, datum); @@ -48,7 +45,7 @@ Index: src/smtpd/smtpd_check.c /* * DUNNO means skip this table. Silently ignore optional text. */ -@@ -2977,8 +2979,6 @@ static const char *rbl_expand_lookup(con +@@ -3087,8 +3089,6 @@ SMTPD_RBL_EXPAND_CONTEXT *rbl_exp = (SMTPD_RBL_EXPAND_CONTEXT *) context; SMTPD_STATE *state = rbl_exp->state; @@ -57,11 +54,10 @@ Index: src/smtpd/smtpd_check.c if (state->expand_buf == 0) state->expand_buf = vstring_alloc(10); -Index: src/util/dict_open.c -=================================================================== ---- src/util/dict_open.c.orig -+++ src/util/dict_open.c -@@ -504,7 +504,7 @@ ARGV *dict_mapnames() +diff -Nur postfix-2.11.0/src/util/dict_open.c postfix-2.11.0-patched/src/util/dict_open.c +--- postfix-2.11.0/src/util/dict_open.c 2014-02-12 15:19:33.689563158 +0100 ++++ postfix-2.11.0-patched/src/util/dict_open.c 2014-02-12 15:17:28.174612493 +0100 +@@ -554,7 +554,7 @@ } #ifndef NO_DYNAMIC_MAPS diff --git a/postfix-2.11.0.tar.gz b/postfix-2.11.0.tar.gz new file mode 100644 index 0000000..b937cb5 --- /dev/null +++ b/postfix-2.11.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca1d9d32d5662678dc4e3f700cce82f5d7bed6a614852b17b1a5166936330c38 +size 4034741 diff --git a/postfix-2.11.0.tar.gz.sig b/postfix-2.11.0.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..37cd69061992fd87cd7f49d8a0442bed33952c519830a788d7469c444fdf6dd5 GIT binary patch literal 280 zcmV+z0q6dS0TlxU08-Zx&<8JI@WCt1nE?TH?+5^#1P6<|0+e^J&LY}1xWTi+|%7+Ws&TP;Sth!LRft%ZB!Jr>VO zn-wZNXii+S{k*)b-xok4(En8eXLCo~OI1S`hv22-yn(2(if?!bWmg3+J!;6poU!C{Pr2g48=8}e>no>r e%}(cXE8krRR2?$WYBOy-XjrkWtmqrV{BOn*3Wo^* literal 0 HcmV?d00001 diff --git a/postfix-2.9.6.tar.gz b/postfix-2.9.6.tar.gz deleted file mode 100644 index d1785b3..0000000 --- a/postfix-2.9.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:790542a238f64d2620c26e787c98b07fb6e75a7620ce0584a7932b089dc5367c -size 3767309 diff --git a/postfix-2.9.6.tar.gz.sig b/postfix-2.9.6.tar.gz.sig deleted file mode 100644 index 39a100c271329e1d8c1246be8c9bc934bf50268f264f510c2a05d5e0b39c68d6..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 280 zcmV+z0q6dS0TlxU08tLm0S7N&@WCt1nE?Uh(g*)*US}xHM(Z`_9@G<7x|;GaN}W4O zSjAkjtnWb-MY1os`*k1kH2ObIds1DC2|WSnH31t>V<@tr4q$2)3C8MVlM95)Uvb{7 zSPMamrOSq|(;pH*Lzlqgyo+7P?v{@`2$i%2WnLSsjMS4nnj$%R_N{V-g!iN-ptU0O z!GrfiFUlE!N4zuREBj8BOX;InEF~reGu?s}wymm!2=0L{(13wlLIKH_(u|^h(~1vyq>A e*-W50sag`3FZ(>db4w|TjxM_!`1LdJl~e*mUV_;G diff --git a/postfix-SuSE.tar.gz b/postfix-SuSE.tar.gz index 205fdf2..e5e1b9a 100644 --- a/postfix-SuSE.tar.gz +++ b/postfix-SuSE.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e97e44af7ac71ddd41f9d436f44b2e615a30fec3611aeb8131061c4dac9bda9 -size 113152 +oid sha256:b7a9df868759290e2688179983aa7a073e619dd5bf1b5d724a9bfc9ac687a7ee +size 27394 diff --git a/postfix.changes b/postfix.changes index cc4047d..05a21e7 100644 --- a/postfix.changes +++ b/postfix.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Wed Feb 12 15:10:27 UTC 2014 - varkoly@suse.com + +- Update to 2.11.0 + * TLS + o Support for PKI-less TLS server certificate verification, where + the CA public key or the server certificate is identified via DNSSEC lookup + * LMDB database support + * master + o The master_service_disable parameter value syntax has changed: + use "service/type" instead of "service.type". + * postconf: + o Support for advanced master.cf query and update operations. + This was implemented primarily to support automated system management tools. + o The postconf command produces more warnings + * relay safety + New smtpd_relay_restrictions parameter built-in default settings: + smtpd_relay_restrictions = + permit_mynetworks + permit_sasl_authenticated + defer_unauth_destination + * postscreen whitelisting + Allow a remote SMTP client to skip postscreen(8) tests based on + its postscreen_dnsbl_sites score. + ------------------------------------------------------------------- Fri Oct 11 13:32:32 UTC 2013 - matz@suse.de diff --git a/postfix.spec b/postfix.spec index 923fbbb..5b9c2ee 100644 --- a/postfix.spec +++ b/postfix.spec @@ -1,7 +1,7 @@ # # spec file for package postfix # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Name: postfix Summary: A fast, secure, and flexible mailer License: IPL-1.0 Group: Productivity/Networking/Email/Servers -Version: 2.9.6 +Version: 2.11.0 Release: 0 Url: http://www.postfix.org/ @@ -42,6 +42,7 @@ Patch20: %{name}-ssl-release-buffers.patch Patch21: postfix-opensslconfig.patch Patch100: %{name}-vda-v11-2.9.6.patch Patch101: postfix-db6.diff +Patch102: add_missed_library.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq PreReq: /usr/bin/getent @@ -156,9 +157,9 @@ PostgreSQL. %prep %{?gpg_verify: %gpg_verify %{S:1}} %setup -q -a 2 -a 3 -%patch -%patch1 -%patch2 +%patch -p1 +%patch1 -p1 +%patch2 -p1 %patch3 %patch10 %patch11 @@ -167,6 +168,7 @@ PostgreSQL. %patch21 -p1 %patch100 -p1 %patch -P 101 -p1 +%patch102 -p0 # --------------------------------------------------------------------------- %build