pool/postfix
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- update to 2,9.4

Browse Source 
* tls support:
     Support to turn off the TLSv1.1 and TLSv1.2 protocols:
     To temporarily turn off problematic protocols globally:
     /etc/postfix/main.cf:
       smtp_tls_protocols = !SSLv2, !TLSv1.1, !TLSv1.2
       smtp_tls_mandatory_protocols = !SSLv2, !TLSv1.1, !TLSv1.2
     However, it may be better to temporarily turn off problematic
     protocols for broken sites only:
     /etc/postfix/main.cf:
       smtp_tls_policy_maps = hash:/etc/postfix/tls_policy
     /etc/postfix/tls_policy:
       example.com         may protocols=!SSLv2:!TLSv1.1:!TLSv1.2
  * 20111012 To simplify integration with third-party
     applications, the Postfix sendmail command now always transforms
     all input lines ending in <CR><LF> into UNIX format (lines ending
     in <LF>). Specify "sendmail_fix_line_endings = strict" to restore
     historical Postfix behavior (i.e. convert all input lines ending
     in <CR><LF> only if the first line ends in <CR><LF>).
  * 20120114 Logfile-based alerting systems may need to be
     updated to look for "error" messages in addition to "fatal" messages.
     Specify "daemon_table_open_error_is_fatal = yes" to get the historical
     behavior (immediate termination with "fatal" message).
  * enable_long_queue_ids Postfix 2.9 introduces support for non-repeating queue IDs (also
     used as queue file names). These names are encoded in a mix of upper
     case, lower case and decimal digit characters.  Long queue IDs are
     disabled by default to avoid breaking tools that parse logfiles and
     that expect queue IDs with the smaller [A-F0-9] character set.
  * 20111209 memcache lookup and update support. This provides
     a way to share postscreen(8) or verify(8) caches between Postfix

OBS-URL: https://build.opensuse.org/package/show/server:mail/postfix?expand=0&rev=154
This commit is contained in:
Peter Varkoly 2013-01-10 15:05:52 +00:00 committed by Git OBS Bridge
parent cba2e1280c
commit dcdcda0a8e
9 changed files with 419 additions and 415 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
dynamic_maps.patch
View File

@ -160,8 +160,8 @@ 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)
path = concatenate(var_config_dir, "/", "main.cf", (char *) 0);
dict_load_file(CONFIG_DICT, path);
if (dict_load_file_xt(CONFIG_DICT, path) == 0)
msg_fatal("open %s: %m", path);
myfree(path);
+
+#ifndef NO_DYNAMIC_MAPS
@ -177,7 +177,7 @@ Index: src/global/mail_dict.c
===================================================================
--- src/global/mail_dict.c.orig
+++ src/global/mail_dict.c
@@ -46,6 +46,7 @@ typedef struct {
@@ -47,6 +47,7 @@
static const DICT_OPEN_INFO dict_open_info[] = {
DICT_TYPE_PROXY, dict_proxy_open,
@ -185,10 +185,10 @@ Index: src/global/mail_dict.c
#ifdef HAS_LDAP
DICT_TYPE_LDAP, dict_ldap_open,
#endif
@@ -58,6 +59,7 @@ static const DICT_OPEN_INFO dict_open_in
#ifdef HAS_SQLITE
@@ -60,6 +61,7 @@
DICT_TYPE_SQLITE, dict_sqlite_open,
#endif
DICT_TYPE_MEMCACHE, dict_memcache_open,
+#endif /* MAX_DYNAMIC_MAPS */
0,
};
@ -305,27 +305,58 @@ 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 +598,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
+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.c
===================================================================
--- src/postconf/postconf.c.orig
+++ src/postconf/postconf.c
@@ -1013,6 +1013,16 @@ static void show_maps(void)
{
--- src/postconf/postconf_other.c.orig
+++ src/postconf/postconf_other.c
@@ -46,10 +46,15 @@
#include <vstream.h>
#include <argv.h>
#include <dict.h>
+#include <mymalloc.h>
+#include <safe.h>
+#include <stringops.h>
/* Global library. */
#include <mbox_conf.h>
+#include <mail_params.h>
+#include <mail_conf.h>
/* XSASL library. */
@@ -66,6 +66,19 @@ void show_maps(void)
ARGV *maps_argv;
int i;
+#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
+
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
@ -503,12 +534,12 @@ Index: src/util/Makefile.in
===================================================================
--- src/util/Makefile.in.orig
+++ src/util/Makefile.in
@@ -33,15 +33,16 @@ SRCS = alldig.c allprint.c argv.c argv_s
allascii.c load_file.c killme_after.c vstream_tweak.c \
@@ -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
+ ip_match.c nbbio.c stream_pass_connect.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
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 \
@ -523,17 +554,17 @@ 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 \
@@ -68,7 +69,8 @@ OBJS = alldig.o allprint.o argv.o argv_s
allascii.o load_file.o killme_after.o vstream_tweak.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
+ ip_match.o nbbio.o stream_pass_connect.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
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 \
@@ -82,7 +84,7 @@ HDRS = argv.h attr.h attr_clnt.h auto_cl
@@ -84,7 +86,7 @@ HDRS = argv.h attr.h attr_clnt.h auto_cl
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 \
@ -542,7 +573,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 \
@@ -96,6 +98,8 @@ DEFS = -I. -D$(SYSTYPE)
@@ -98,6 +100,8 @@ DEFS = -I. -D$(SYSTYPE)
CFLAGS = $(DEBUG) $(OPT) $(DEFS)
FILES = Makefile $(SRCS) $(HDRS)
INCL =
@ -551,7 +582,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 \
@@ -111,10 +115,11 @@ TESTPROG= dict_open dup2_pass_on_exec ev
@@ -113,10 +117,11 @@ TESTPROG= dict_open dup2_pass_on_exec ev
LIB_DIR = ../../lib
INC_DIR = ../../include
@ -565,7 +596,7 @@ Index: src/util/Makefile.in
$(OBJS): ../../conf/makedefs.out
@@ -123,15 +128,25 @@ Makefile: Makefile.in
@@ -125,15 +130,25 @@ Makefile: Makefile.in
test: $(TESTPROG)
@ -595,7 +626,7 @@ Index: src/util/Makefile.in
-for i in $(HDRS); \
do \
cmp -s $$i $(INC_DIR)/$$i 2>/dev/null || cp $$i $(INC_DIR); \
@@ -153,7 +168,8 @@ lint:
@@ -155,7 +170,8 @@ lint:
lint $(DEFS) $(SRCS) $(LINTFIX)
clean:
@ -633,7 +664,7 @@ Index: src/util/dict_db.c
===================================================================
--- src/util/dict_db.c.orig
+++ src/util/dict_db.c
@@ -676,6 +676,12 @@ static DICT *dict_db_open(const char *cl
@@ -693,6 +693,12 @@ static DICT *dict_db_open(const char *cl
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);
@ -645,7 +676,7 @@ 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)
msg_fatal("open database %s: %m", db_path);
FREE_RETURN(dict_surrogate(class, path, open_flags, dict_flags,
Index: src/util/dict_dbm.c
===================================================================
--- src/util/dict_dbm.c.orig
@ -674,7 +705,7 @@ Index: src/util/dict_open.c
/* DESCRIPTION
/* This module implements a low-level interface to multiple
/* physical dictionary types.
@@ -165,6 +167,9 @@
@@ -166,6 +168,9 @@
/*
/* dict_mapnames() returns a sorted list with the names of all available
/* dictionary types.
@ -684,7 +715,7 @@ Index: src/util/dict_open.c
/* DIAGNOSTICS
/* Fatal error: open error, unsupported dictionary type, attempt to
/* update non-writable dictionary.
@@ -189,6 +194,9 @@
@@ -213,6 +218,9 @@
#include <strings.h>
#endif
@ -694,7 +725,7 @@ Index: src/util/dict_open.c
/* Utility library. */
#include <argv.h>
@@ -216,6 +224,27 @@
@@ -241,6 +249,27 @@
#include <htable.h>
#include <myflock.h>
@ -722,7 +753,7 @@ Index: src/util/dict_open.c
/*
* lookup table for available map types.
*/
@@ -231,7 +260,9 @@ static const DICT_OPEN_INFO dict_open_in
@@ -256,7 +285,9 @@ static const DICT_OPEN_INFO dict_open_in
DICT_TYPE_ENVIRON, dict_env_open,
DICT_TYPE_HT, dict_ht_open,
DICT_TYPE_UNIX, dict_unix_open,
@ -732,7 +763,7 @@ Index: src/util/dict_open.c
#ifdef HAS_SDBM
DICT_TYPE_SDBM, dict_sdbm_open,
#endif
@@ -251,9 +282,11 @@ static const DICT_OPEN_INFO dict_open_in
@@ -276,9 +307,11 @@ static const DICT_OPEN_INFO dict_open_in
#ifdef HAS_NETINFO
DICT_TYPE_NETINFO, dict_ni_open,
#endif
@ -744,15 +775,15 @@ Index: src/util/dict_open.c
#ifdef HAS_POSIX_REGEXP
DICT_TYPE_REGEXP, dict_regexp_open,
#endif
@@ -312,8 +345,31 @@ DICT *dict_open3(const char *dict_type
@@ -338,9 +371,32 @@ DICT *dict_open3(const char *dict_type
dict_type, dict_name);
if (dict_open_hash == 0)
dict_open_init();
- if ((dp = (DICT_OPEN_INFO *) htable_find(dict_open_hash, dict_type)) == 0)
- msg_fatal("unsupported dictionary type: %s", dict_type);
+ if ((dp = (DICT_OPEN_INFO *) htable_find(dict_open_hash, dict_type)) == 0) {
+#ifdef NO_DYNAMIC_MAPS
+ msg_fatal("%s: unsupported dictionary type: %s", myname, dict_type);
return (dict_surrogate(dict_type, dict_name, open_flags, dict_flags,
"unsupported dictionary type: %s", dict_type));
+#else
+ struct stat st;
+ LIB_FN fn[2];
@ -776,9 +807,9 @@ Index: src/util/dict_open.c
+ msg_info("%s: calling %s open routine",myname,dict_type);
+ }
if ((dict = dp->open(dict_name, open_flags, dict_flags)) == 0)
msg_fatal("opening %s:%s %m", dict_type, dict_name);
if (msg_verbose)
@@ -331,6 +387,36 @@ DICT *dict_open3(const char *dict_type
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
return (dict);
}
@ -815,7 +846,7 @@ Index: src/util/dict_open.c
/* dict_open_register - register dictionary type */
void dict_open_register(const char *type,
@@ -364,6 +450,9 @@ ARGV *dict_mapnames()
@@ -392,6 +478,9 @@ ARGV *dict_mapnames()
HTABLE_INFO **ht;
DICT_OPEN_INFO *dp;
ARGV *mapnames;
@ -825,7 +856,7 @@ Index: src/util/dict_open.c
if (dict_open_hash == 0)
dict_open_init();
@@ -372,6 +461,13 @@ ARGV *dict_mapnames()
@@ -400,6 +489,13 @@ ARGV *dict_mapnames()
dp = (DICT_OPEN_INFO *) ht[0]->value;
argv_add(mapnames, dp->type, ARGV_END);
}
@ -839,7 +870,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);
@@ -379,6 +475,87 @@ ARGV *dict_mapnames()
@@ -407,6 +503,87 @@ ARGV *dict_mapnames()
return mapnames;
}

481
dynamic_maps_pie.patch
View File

@ -1,18 +1,16 @@
Index: makedefs
===================================================================
--- makedefs.orig
+++ makedefs
@@ -671,4 +671,5 @@ AWK = $AWK
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 @@
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 -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 @@
PROG = anvil
INC_DIR = ../../include
LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
@ -28,11 +26,31 @@ Index: src/anvil/Makefile.in
$(OBJS): ../../conf/makedefs.out
Index: src/cleanup/Makefile.in
===================================================================
--- src/cleanup/Makefile.in.orig
+++ src/cleanup/Makefile.in
@@ -20,11 +20,14 @@ PROG = cleanup
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 @@
SAMPLES = ../../conf/bounce.cf.default
INC_DIR = ../../include
LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
+ifdef PIE
+CFLAGS += -fPIE
+endif
.c.o:; $(CC) $(CFLAGS) -c $*.c
all: $(PROG) ../../conf/bounce.cf.default
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) $(PIE)
# 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 @@
INC_DIR = ../../include
LIBS = ../../lib/libmaster.a ../../lib/libmilter.a ../../lib/libglobal.a \
../../lib/libutil.a
@ -48,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 -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 @@
PROG = discard
INC_DIR = ../../include
LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
@ -68,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 -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 @@
PROG = error
INC_DIR = ../../include
LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
@ -88,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 -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 @@
PROG = flush
INC_DIR = ../../include
LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
@ -108,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 -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 @@
PROG = fsstone
INC_DIR = ../../include
LIBS = ../../lib/libglobal.a ../../lib/libutil.a
@ -122,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)
@ -131,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 -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 @@
TESTPROG=
INC_DIR = ../../include
LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
@ -151,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 -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 @@
INC_DIR = ../../include
BIN_DIR = ../../libexec
@ -164,7 +176,7 @@ Index: src/master/Makefile.in
all: $(PROG) $(LIB)
@@ -30,7 +30,7 @@ Makefile: Makefile.in
@@ -30,7 +30,7 @@
cat ../../conf/makedefs.out $? >$@
$(PROG): $(OBJS) $(LIBS)
@ -173,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 -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 @@
PROG = qmgr
INC_DIR = ../../include
LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
@ -193,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 -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 @@
PROG = pickup
INC_DIR = ../../include
LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
@ -213,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 -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 @@
PROG = pipe
INC_DIR = ../../include
LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
@ -233,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 -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 @@
PROG = postalias
INC_DIR = ../../include
LIBS = ../../lib/libglobal.a ../../lib/libutil.a
@ -253,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 -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 @@
PROG = postcat
INC_DIR = ../../include
LIBS = ../../lib/libglobal.a ../../lib/libutil.a
@ -273,11 +280,29 @@ Index: src/postcat/Makefile.in
$(OBJS): ../../conf/makedefs.out
Index: src/postdrop/Makefile.in
===================================================================
--- src/postdrop/Makefile.in.orig
+++ src/postdrop/Makefile.in
@@ -9,11 +9,14 @@ TESTPROG=
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 @@
SAMPLES = ../../conf/main.cf.default
INC_DIR = ../../include
LIBS = ../../lib/libxsasl.a ../../lib/libglobal.a ../../lib/libutil.a
+ifdef PIE
+CFLAGS += -fPIE
+endif
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) $(PIE)
../../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 @@
PROG = postdrop
INC_DIR = ../../include
LIBS = ../../lib/libglobal.a ../../lib/libutil.a
@ -293,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 -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 @@
TESTPROG=
PROG = postfix
LIBS = ../../lib/libglobal.a ../../lib/libutil.a
@ -313,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 -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 @@
PROG = postkick
INC_DIR = ../../include
LIBS = ../../lib/libglobal.a ../../lib/libutil.a
@ -333,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 -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 @@
PROG = postlock
INC_DIR = ../../include
LIBS = ../../lib/libglobal.a ../../lib/libutil.a
@ -353,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 -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 @@
TESTPROG=
PROG = postlog
LIBS = ../../lib/libglobal.a ../../lib/libutil.a
@ -373,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 -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 @@
PROG = postmap
INC_DIR = ../../include
LIBS = ../../lib/libglobal.a ../../lib/libutil.a
@ -393,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 -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 @@
PROG = postqueue
INC_DIR = ../../include
LIBS = ../../lib/libglobal.a ../../lib/libutil.a
@ -413,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 -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 @@
PROG = postsuper
INC_DIR = ../../include
LIBS = ../../lib/libglobal.a ../../lib/libutil.a
@ -433,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 -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 @@
PROG = proxymap
INC_DIR = ../../include
LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
@ -453,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 -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 @@
PROG = qmgr
INC_DIR = ../../include
LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
@ -473,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 -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 @@
PROG = qmqpd
INC_DIR = ../../include
LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libdns.a ../../lib/libutil.a
@ -493,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 -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 @@
PROG = scache
INC_DIR = ../../include
LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
@ -513,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 -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 @@
PROG = sendmail
INC_DIR = ../../include
LIBS = ../../lib/libglobal.a ../../lib/libutil.a
@ -533,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 -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 @@
PROG = showq
INC_DIR = ../../include
LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
@ -553,11 +565,48 @@ Index: src/showq/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 -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 @@
INC_DIR = ../../include
LIBS = ../../lib/libmaster.a ../../lib/libtls.a ../../lib/libdns.a \
../../lib/libxsasl.a ../../lib/libglobal.a ../../lib/libutil.a
+ifdef PIE
+CFLAGS += -fPIE
+endif
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) $(PIE)
$(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 @@
LIBS = ../../lib/libmaster.a ../../lib/libtls.a ../../lib/libdns.a \
../../lib/libxsasl.a ../../lib/libmilter.a ../../lib/libglobal.a \
../../lib/libutil.a
+ifdef PIE
+CFLAGS += -fPIE
+endif
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) $(PIE)
$(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 @@
INC_DIR = ../../include
PROG = smtp-source smtp-sink qmqp-source qmqp-sink
LIBS = ../../lib/libglobal.a ../../lib/libutil.a
@ -567,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)
@ -588,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 -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 @@
PROG = spawn
INC_DIR = ../../include
LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
@ -608,11 +656,10 @@ 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
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 @@
INC_DIR = ../../include
LIBS = ../../lib/libmaster.a ../../lib/libtls.a ../../lib/libglobal.a \
../../lib/libutil.a
@ -628,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 -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 @@
LIB_DIR = ../../lib
INC_DIR = ../../include
BIN_DIR = ../../libexec
@ -650,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 -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 @@
PROG = verify
INC_DIR = ../../include
LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
@ -670,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 -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 @@
TESTPROG=
INC_DIR = ../../include
LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
@ -690,93 +734,10 @@ Index: src/virtual/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
SAMPLES = ../../conf/bounce.cf.default
INC_DIR = ../../include
LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
+ifdef PIE
+CFLAGS += -fPIE
+endif
.c.o:; $(CC) $(CFLAGS) -c $*.c
all: $(PROG) ../../conf/bounce.cf.default
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) $(PIE)
# Eliminate dependency on installed Postfix.
../../conf/bounce.cf.default: template_test.ref annotate.pl
Index: src/postconf/Makefile.in
===================================================================
--- src/postconf/Makefile.in.orig
+++ src/postconf/Makefile.in
@@ -15,11 +15,14 @@ PROG = postconf
SAMPLES = ../../conf/main.cf.default
INC_DIR = ../../include
LIBS = ../../lib/libxsasl.a ../../lib/libglobal.a ../../lib/libutil.a
+ifdef PIE
+CFLAGS += -fPIE
+endif
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) $(PIE)
../../conf/main.cf.default: $(PROG) Makefile
rm -f $@
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
+ifdef PIE
+CFLAGS += -fPIE
+endif
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) $(PIE)
$(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
LIBS = ../../lib/libmaster.a ../../lib/libtls.a ../../lib/libdns.a \
../../lib/libxsasl.a ../../lib/libmilter.a ../../lib/libglobal.a \
../../lib/libutil.a
+ifdef PIE
+CFLAGS += -fPIE
+endif
.c.o:; $(CC) $(CFLAGS) -c $*.c
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) $(PIE)
$(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 -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 @@
INC_DIR = ../../include
MAKES =

25
ipv6_disabled.patch
View File

@ -1,19 +1,10 @@
Index: src/util/inet_proto.c
===================================================================
--- src/util/inet_proto.c.orig
+++ src/util/inet_proto.c
@@ -220,9 +220,11 @@ INET_PROTO_INFO *inet_proto_init(const c
pf->sa_family_list = make_uchar_vector(3, AF_INET, AF_INET6, 0);
break;
} else if (errno == EAFNOSUPPORT) {
- msg_warn("%s: IPv6 support is disabled: %m", context);
- msg_warn("%s: configuring for IPv4 support only", context);
- /* FALLTHROUGH */
+ /* remove waste warnings 2007-01-25 Peter Varkoly <varkoly@novell.com>
+ * msg_warn("%s: IPv6 support is disabled: %m", context);
+ * msg_warn("%s: configuring for IPv4 support only", context);
+ * FALLTHROUGH
+ */
--- src/util/inet_proto.c.orig 2012-01-03 01:57:59.000000000 +0100
+++ src/util/inet_proto.c 2012-11-15 13:39:22.000000000 +0100
@@ -195,7 +195,6 @@ INET_PROTO_INFO *inet_proto_init(const c
if ((sock = socket(PF_INET6, SOCK_STREAM, 0)) >= 0) {
close(sock);
} else if (errno == EAFNOSUPPORT || errno == EPROTONOSUPPORT) {
- msg_warn("%s: disabling IPv6 name/address support: %m", context);
inet_proto_mask &= ~INET_PROTO_MASK_IPV6;
} else {
msg_fatal("socket: %m");
}

10
postfix-2.8.12-main.cf.patch
View File

@ -1,11 +1,9 @@
Index: conf/main.cf
===================================================================
--- conf/main.cf.orig
+++ conf/main.cf
@@ -649,3 +649,119 @@ sample_directory =
# readme_directory: The location of the Postfix README files.
--- 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 @@
#
readme_directory =
inet_protocols = ipv4
+
+biff = no
+content_filter =

3
postfix-2.8.13.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6855ce56b6672308023cfca65d16b6bb7132be76a76a003e960d38ccb0243b8f
size 2635886

3
postfix-2.9.4.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0de9e6eb9377a02f9979728482369adc360537006da55f0488571212219d7f19
size 2723680

66
postfix-vda-v10-2.8.12.patch
View File

@ -1261,9 +1261,9 @@ Index: src/virtual/maildir.c
}
Index: src/virtual/virtual.c
===================================================================
--- src/virtual/virtual.c.orig
+++ src/virtual/virtual.c
@@ -335,12 +335,30 @@ int var_virt_mailbox_limit;
--- 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
@@ -335,12 +335,30 @@ long var_virt_mailbox_limit;
char *var_mail_spool_dir; /* XXX dependency fix */
bool var_strict_mbox_owner;
@ -1326,35 +1326,10 @@ Index: src/virtual/virtual.c
virtual_mbox_lock_mask = mbox_lock_mask(var_virt_mailbox_lock);
}
@@ -495,24 +526,39 @@ MAIL_VERSION_STAMP_DECLARE;
int main(int argc, char **argv)
{
- static const CONFIG_INT_TABLE int_table[] = {
- VAR_VIRT_MINUID, DEF_VIRT_MINUID, &var_virt_minimum_uid, 1, 0,
- VAR_VIRT_MAILBOX_LIMIT, DEF_VIRT_MAILBOX_LIMIT, &var_virt_mailbox_limit, 0, 0,
- 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_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,
- 0,
- };
+
+ static const CONFIG_INT_TABLE int_table[] = {
+ VAR_VIRT_MINUID, DEF_VIRT_MINUID, &var_virt_minimum_uid, 1, 0,
+ VAR_VIRT_MAILBOX_LIMIT, DEF_VIRT_MAILBOX_LIMIT, &var_virt_mailbox_limit, 0, 0,
+ 0,
+ };
+
@@ -503,17 +534,29 @@ int main(int argc, char **argv)
VAR_VIRT_MAILBOX_LIMIT, DEF_VIRT_MAILBOX_LIMIT, &var_virt_mailbox_limit, 0, 0,
0,
};
+ 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,
@ -1365,26 +1340,27 @@ Index: src/virtual/virtual.c
+ 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,
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,
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,
+ };
0,
};
/*
* Fingerprint executables and core dumps.
@@ -526,6 +572,7 @@ int main(int argc, char **argv)
@@ -530,6 +573,7 @@ int main(int argc, char **argv)
MAIL_SERVER_PRE_INIT, pre_init,
MAIL_SERVER_POST_INIT, post_init,
MAIL_SERVER_PRE_ACCEPT, pre_accept,

47
postfix.changes
View File

@ -1,3 +1,50 @@
-------------------------------------------------------------------
Thu Jan 10 14:45:59 UTC 2013 - varkoly@suse.com
- update to 2,9.4
* tls support:
Support to turn off the TLSv1.1 and TLSv1.2 protocols:
To temporarily turn off problematic protocols globally:
/etc/postfix/main.cf:
smtp_tls_protocols = !SSLv2, !TLSv1.1, !TLSv1.2
smtp_tls_mandatory_protocols = !SSLv2, !TLSv1.1, !TLSv1.2
However, it may be better to temporarily turn off problematic
protocols for broken sites only:
/etc/postfix/main.cf:
smtp_tls_policy_maps = hash:/etc/postfix/tls_policy
/etc/postfix/tls_policy:
example.com may protocols=!SSLv2:!TLSv1.1:!TLSv1.2
* 20111012 To simplify integration with third-party
applications, the Postfix sendmail command now always transforms
all input lines ending in <CR><LF> into UNIX format (lines ending
in <LF>). Specify "sendmail_fix_line_endings = strict" to restore
historical Postfix behavior (i.e. convert all input lines ending
in <CR><LF> only if the first line ends in <CR><LF>).
* 20120114 Logfile-based alerting systems may need to be
updated to look for "error" messages in addition to "fatal" messages.
Specify "daemon_table_open_error_is_fatal = yes" to get the historical
behavior (immediate termination with "fatal" message).
* enable_long_queue_ids Postfix 2.9 introduces support for non-repeating queue IDs (also
used as queue file names). These names are encoded in a mix of upper
case, lower case and decimal digit characters. Long queue IDs are
disabled by default to avoid breaking tools that parse logfiles and
that expect queue IDs with the smaller [A-F0-9] character set.
* 20111209 memcache lookup and update support. This provides
a way to share postscreen(8) or verify(8) caches between Postfix
instances. See MEMCACHE_README and memcache_table(5) for details
and limitations.
* 20111218 To support external SASL authentication, e.g.,
in an NGINX proxy daemon, the Postfix SMTP server now always checks
the smtpd_sender_login_maps table, even without having
"smtpd_sasl_auth_enable = yes" in main.cf.
* ipv6
o The default inet_protocols value is now "all" instead of "ipv4",
meaning use both IPv4 and IPv6.
o The default smtp_address_preference value is now "any" instead
of "ipv6", meaning choose randomly between IPv6 and IPv4. With
this the Postfix SMTP client will have more success delivering
mail to sites that have problematic IPv6 configurations.
-------------------------------------------------------------------
Sat Dec 15 16:33:24 UTC 2012 - chris@computersalat.de

6
postfix.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package postfix
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 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.8.13
Version: 2.9.4
Release: 0
Url: http://www.postfix.org/
Source: %{name}-%{version}.tar.bz2
@ -140,7 +140,7 @@ PostgreSQL.
%prep
%setup -n %{name}-%{version} -a 1 -a 2
%patch
%patch1
%patch1 -p1
%patch2
%patch3
%patch10