rpm/postfix
SHA256
1
0
Fork 0
forked from pool/postfix
Code Pull Requests Activity

Accepting request 398784 from server:mail

Browse Source 
fix ChangeLog (forwarded request 398783 from computersalat)

OBS-URL: https://build.opensuse.org/request/show/398784
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/postfix?expand=0&rev=131
This commit is contained in:
Dominique Leuenberger 2016-06-02 10:38:46 +00:00 committed by Git OBS Bridge
commit 5c40768a0a
16 changed files with 467 additions and 3324 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
add_missed_library.patch
View File

@ -1,13 +0,0 @@
Index: src/tlsproxy/Makefile.in
===================================================================
--- src/tlsproxy/Makefile.in.orig
+++ src/tlsproxy/Makefile.in
@@ -9,7 +9,7 @@ TESTPROG=
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

2261
dynamic_maps.patch
View File

File diff suppressed because it is too large Load Diff

748
dynamic_maps_pie.patch
View File

@ -1,748 +0,0 @@
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
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
+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 -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
+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.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
+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 -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
+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 -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
+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 -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
+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 -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
+ifdef PIE
+CFLAGS += -fPIE
+endif
.c.o:; $(CC) $(CFLAGS) -c $*.c
@@ -20,7 +23,7 @@
cat ../../conf/makedefs.out $? >$@
fsstone: fsstone.o $(LIBS)
- $(CC) $(CFLAGS) -o $@ fsstone.o $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ fsstone.o $(LIBS) $(SYSLIBS) $(PIE)
test: $(TESTPROG)
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
+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 -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
-.c.o:; $(CC) `for i in $(LIB_OBJ); do [ $$i = $@ ] && echo -fPIC; done` $(CFLAGS) -c $*.c
+.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c
all: $(PROG) $(LIB)
@@ -32,7 +32,7 @@
cat ../../conf/makedefs.out $? >$@
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) $(PIE)
test: $(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
+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 -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
+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 -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
+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 -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
+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 -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
+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 -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
+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 -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
+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 -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
+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 -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
+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 -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
+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 -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
+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 -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
+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 -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
+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 -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
+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 -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
+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 -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
+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 -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
+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 -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
+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 -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
+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 -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
+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 -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
+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 -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/libdns.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 -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
+ifdef PIE
+CFLAGS += -fPIE
+endif
.c.o:; $(CC) $(CFLAGS) -c $*.c
@@ -20,16 +23,16 @@
cat ../../conf/makedefs.out $? >$@
smtp-sink: smtp-sink.o $(LIBS)
- $(CC) $(CFLAGS) -o $@ smtp-sink.o $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ smtp-sink.o $(LIBS) $(SYSLIBS) $(PIE)
smtp-source: smtp-source.o $(LIBS)
- $(CC) $(CFLAGS) -o $@ smtp-source.o $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ smtp-source.o $(LIBS) $(SYSLIBS) $(PIE)
qmqp-sink: qmqp-sink.o $(LIBS)
- $(CC) $(CFLAGS) -o $@ qmqp-sink.o $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ qmqp-sink.o $(LIBS) $(SYSLIBS) $(PIE)
qmqp-source: qmqp-source.o $(LIBS)
- $(CC) $(CFLAGS) -o $@ qmqp-source.o $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ qmqp-source.o $(LIBS) $(SYSLIBS) $(PIE)
test: $(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
+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 -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
.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 -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
+ifdef PIE
+CFLAGS += -fPIE
+endif
.c.o:; $(CC) $(CFLAGS) -c $*.c
all: $(PROG) $(LIB)
$(PROG): $(OBJS) $(LIBS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) $(PIE)
$(OBJS): ../../conf/makedefs.out
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
+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 -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
+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 -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 =
-.c.o:; $(CC) $(CFLAGS) -c $*.c
+.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c
all: $(LIB)

12
pointer_to_literals.patch
View File

@ -54,15 +54,3 @@ diff -Nur postfix-2.11.0/src/smtpd/smtpd_check.c postfix-2.11.0-patched/src/smtp
if (state->expand_buf == 0)
state->expand_buf = vstring_alloc(10);
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
-#define STREQ(x,y) (x == y || (x[0] == y[0] && strcmp(x,y) == 0))
+inline int STREQ(const char *x, const char *y) { return ( x == y || (*(x) == *(y) && strcmp((x), (y)) == 0)); }
void dict_open_dlinfo(const char *path)
{

3
postfix-2.11.7.tar.gz
View File

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

3
postfix-3.1.1.tar.gz Normal file
View File

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

4
postfix-SuSE.tar.gz
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1b4fd1b8d37acc629879890cf8de505aef4c39a0e972c57e7c5df89a9f23d4b3
size 26704
oid sha256:e752d76f5bb7e3df93dbc9a6218c189d7acaa8b27426e5e74ac0bd88d853554c
size 35336

23
postfix-db6.diff
View File

@ -1,23 +0,0 @@
From: Jan Engelhardt <jengelh@inai.de>
Date: 2013-06-14 03:32:16.417459759 +0200
X-Upstream: problem still present in postfix-2.11~20130608
src: allow compilation against libdb-6.0
---
src/util/dict_db.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: src/util/dict_db.c
===================================================================
--- src/util/dict_db.c.orig
+++ src/util/dict_db.c
@@ -699,7 +699,7 @@ static DICT *dict_db_open(const char *cl
if ((errno = db->upgrade(db,db_path,0)) != 0)
msg_fatal("upgrade of database %s: %m",db_path);
}
-#if DB_VERSION_MAJOR == 5 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0)
+#if DB_VERSION_MAJOR > 4 || (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,
"open database %s: %m", db_path));

10
postfix-main.cf.patch
View File

@ -1,8 +1,6 @@
Index: conf/main.cf
===================================================================
--- conf/main.cf.orig
+++ conf/main.cf
@@ -548,6 +548,7 @@ unknown_local_recipient_reject_code = 55
--- conf/main.cf.orig 2015-04-01 10:56:39.000000000 +0000
+++ conf/main.cf 2016-03-16 09:28:51.968093319 +0000
@@ -567,6 +567,7 @@
#
#smtpd_banner = $myhostname ESMTP $mail_name
#smtpd_banner = $myhostname ESMTP $mail_name ($mail_version)
@ -10,7 +8,7 @@ Index: conf/main.cf
# PARALLEL DELIVERY TO THE SAME DESTINATION
#
@@ -654,4 +655,120 @@ sample_directory =
@@ -673,4 +674,120 @@
# readme_directory: The location of the Postfix README files.
#
readme_directory =

74
postfix-master.cf.patch
View File

@ -1,9 +1,7 @@
Index: conf/master.cf
===================================================================
--- conf/master.cf.orig
+++ conf/master.cf
@@ -10,32 +10,38 @@
# (yes) (yes) (yes) (never) (100)
--- conf/master.cf.orig 2016-03-16 09:28:26.256321206 +0100
+++ conf/master.cf 2016-03-16 09:35:02.748681617 +0100
@@ -10,6 +10,11 @@
# (yes) (yes) (no) (never) (100)
# ==========================================================================
smtp inet n - n - - smtpd
+#amavis unix - - n - 4 smtp
@ -14,57 +12,18 @@ Index: conf/master.cf
#smtp inet n - n - 1 postscreen
#smtpd pass - - n - - smtpd
#dnsblog unix - - n - 0 dnsblog
#tlsproxy unix - - n - 0 tlsproxy
#submission inet n - n - - smtpd
-# -o syslog_name=postfix/submission
-# -o smtpd_tls_security_level=encrypt
-# -o smtpd_sasl_auth_enable=yes
-# -o smtpd_reject_unlisted_recipient=no
-# -o smtpd_client_restrictions=$mua_client_restrictions
-# -o smtpd_helo_restrictions=$mua_helo_restrictions
-# -o smtpd_sender_restrictions=$mua_sender_restrictions
-# -o smtpd_recipient_restrictions=
-# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject
-# -o milter_macro_daemon_name=ORIGINATING
+# -o syslog_name=postfix/submission
+# -o smtpd_tls_security_level=encrypt
+# -o smtpd_sasl_auth_enable=yes
+# -o smtpd_reject_unlisted_recipient=no
+# -o smtpd_client_restrictions=$mua_client_restrictions
+# -o smtpd_helo_restrictions=$mua_helo_restrictions
+# -o smtpd_sender_restrictions=$mua_sender_restrictions
+# -o smtpd_recipient_restrictions=
+# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject
+# -o milter_macro_daemon_name=ORIGINATING
@@ -28,6 +33,7 @@
#smtps inet n - n - - smtpd
-# -o syslog_name=postfix/smtps
-# -o smtpd_tls_wrappermode=yes
-# -o smtpd_sasl_auth_enable=yes
-# -o smtpd_reject_unlisted_recipient=no
-# -o smtpd_client_restrictions=$mua_client_restrictions
-# -o smtpd_helo_restrictions=$mua_helo_restrictions
-# -o smtpd_sender_restrictions=$mua_sender_restrictions
-# -o smtpd_recipient_restrictions=
-# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject
-# -o milter_macro_daemon_name=ORIGINATING
+# -o syslog_name=postfix/smtps
+# -o smtpd_tls_wrappermode=yes
+# -o content_filter=smtp:[127.0.0.1]:10024
+# -o smtpd_sasl_auth_enable=yes
+# -o smtpd_reject_unlisted_recipient=no
+# -o smtpd_client_restrictions=$mua_client_restrictions
+# -o smtpd_helo_restrictions=$mua_helo_restrictions
+# -o smtpd_sender_restrictions=$mua_sender_restrictions
+# -o smtpd_recipient_restrictions=
+# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject
+# -o milter_macro_daemon_name=ORIGINATING
#628 inet n - n - - qmqpd
pickup unix n - n 60 1 pickup
cleanup unix n - n - 0 cleanup
@@ -61,6 +67,26 @@ local unix - n n
virtual unix - n n - - virtual
# -o syslog_name=postfix/smtps
# -o smtpd_tls_wrappermode=yes
+# -o content_filter=smtp:[127.0.0.1]:10024
# -o smtpd_sasl_auth_enable=yes
# -o smtpd_reject_unlisted_recipient=no
# -o smtpd_client_restrictions=$mua_client_restrictions
@@ -62,6 +68,27 @@
lmtp unix - - n - - lmtp
anvil unix - - n - 1 anvil
scache unix - - n - 1 scache
+#localhost:10025 inet n - n - - smtpd
+# -o content_filter=
+# -o smtpd_delay_reject=no
@ -85,10 +44,11 @@ Index: conf/master.cf
+# -o local_header_rewrite_clients=
+# -o local_recipient_maps=
+# -o relay_recipient_maps=
scache unix - - n - 1 scache
+
#
# ====================================================================
@@ -95,7 +121,7 @@ scache unix - - n
# Interfaces to non-Postfix software. Be sure to examine the manual
@@ -95,7 +122,7 @@
# Also specify in main.cf: cyrus_destination_recipient_limit=1
#
#cyrus unix - n n - - pipe
@ -97,7 +57,7 @@ Index: conf/master.cf
#
# ====================================================================
#
@@ -128,3 +154,10 @@ scache unix - - n
@@ -128,3 +155,10 @@
#mailman unix - n n - - pipe
# flags=FR user=list argv=/usr/lib/mailman/bin/postfix-to-mailman.py
# ${nexthop} ${user}

24
postfix-opensslconfig.patch
View File

@ -1,24 +0,0 @@
Index: src/tls/tls_server.c
===================================================================
--- src/tls/tls_server.c.orig
+++ src/tls/tls_server.c
@@ -364,6 +364,7 @@ TLS_APPL_STATE *tls_server_init(const TL
*/
SSL_load_error_strings();
OpenSSL_add_ssl_algorithms();
+ OPENSSL_config(NULL);
/*
* First validate the protocols. If these are invalid, we can't continue.
Index: src/tls/tls_client.c
===================================================================
--- src/tls/tls_client.c.orig
+++ src/tls/tls_client.c
@@ -307,6 +307,7 @@ TLS_APPL_STATE *tls_client_init(const TL
*/
SSL_load_error_strings();
OpenSSL_add_ssl_algorithms();
+ OPENSSL_config(NULL);
/*
* Create an application data index for SSL objects, so that we can

13
postfix-post-install.patch
View File

@ -1,13 +0,0 @@
Index: conf/post-install
===================================================================
--- conf/post-install.orig
+++ conf/post-install
@@ -708,7 +708,7 @@ EOF
# Postfix 2.2.
# Add missing tlsmgr service to master.cf.
- grep '^tlsmgr.*tlsmgr' $config_directory/master.cf >/dev/null || {
+ grep '^#*tlsmgr.*tlsmgr' $config_directory/master.cf >/dev/null || {
echo Editing $config_directory/master.cf, adding missing entry for tlsmgr service
cat >>$config_directory/master.cf <<EOF || exit 1
tlsmgr unix - - n 1000? 1 tlsmgr

27
postfix-ssl-release-buffers.patch
View File

@ -1,10 +1,8 @@
Index: src/tls/tls_client.c
===================================================================
--- src/tls/tls_client.c.orig
+++ src/tls/tls_client.c
@@ -356,6 +356,12 @@ TLS_APPL_STATE *tls_client_init(const TL
return (0);
}
--- src/tls/tls_client.c.orig 2016-03-16 09:45:17.686921418 +0100
+++ src/tls/tls_client.c 2016-03-16 09:46:24.431617807 +0100
@@ -369,6 +369,12 @@
SSL_CTX_set_security_level(client_ctx, 0);
#endif
+ /* Keep memory usage as low as possible */
+
@ -15,15 +13,14 @@ Index: src/tls/tls_client.c
/*
* See the verify callback in tls_verify.c
*/
Index: src/tls/tls_server.c
===================================================================
--- src/tls/tls_server.c.orig
+++ src/tls/tls_server.c
@@ -426,6 +426,11 @@ TLS_APPL_STATE *tls_server_init(const TL
return (0);
}
--- src/tls/tls_server.c.orig 2016-03-16 09:45:39.487150299 +0100
+++ src/tls/tls_server.c 2016-03-16 09:51:32.230678857 +0100
@@ -451,6 +451,12 @@
SSL_CTX_set_security_level(server_ctx, 0);
#endif
+ /* Keep memory usage as low as possible */
+ /* Keep memory usage as low as possible */
+
+#ifdef SSL_MODE_RELEASE_BUFFERS
+ SSL_CTX_set_mode(server_ctx, SSL_MODE_RELEASE_BUFFERS);
+#endif

87
postfix-vda-v13-2.10.0.patch → postfix-vda-v13-3.10.0.patch
View File

@ -1281,12 +1281,24 @@ diff -uNr postfix-2.10.0.orig/src/virtual/maildir.c postfix-2.10.0/src/virtual/m
+
return (deliver_status);
}
diff -uNr postfix-2.10.0.orig/src/virtual/virtual.c postfix-2.10.0/src/virtual/virtual.c
--- postfix-2.10.0.orig/src/virtual/virtual.c 2011-02-19 01:46:06.000000000 +0100
+++ postfix-2.10.0/src/virtual/virtual.c 2013-06-07 13:21:22.840143270 +0200
@@ -335,12 +335,30 @@
char *var_mail_spool_dir; /* XXX dependency fix */
diff -uNr postfix-2.10.0.orig/src/virtual/virtual.h postfix-2.10.0/src/virtual/virtual.h
--- postfix-2.10.0.orig/src/virtual/virtual.h 2006-01-08 00:59:47.000000000 +0100
+++ postfix-2.10.0/src/virtual/virtual.h 2013-06-07 13:21:22.841143270 +0200
@@ -34,6 +34,9 @@
extern MAPS *virtual_mailbox_maps;
extern MAPS *virtual_uid_maps;
extern MAPS *virtual_gid_maps;
+extern MAPS *virtual_mailbox_limit_maps;
+extern MAPS *virtual_maildir_limit_message_maps;
+extern MAPS *virtual_maildir_filter_maps;
/*
* User attributes: these control the privileges for delivery to external
--- postfix-3.1.0/src/virtual/virtual.c.orig 2016-03-16 09:58:37.790856521 +0100
+++ postfix-3.1.0/src/virtual/virtual.c 2016-03-16 10:04:44.267207460 +0100
@@ -347,12 +347,28 @@
bool var_strict_mbox_owner;
char *var_virt_dsn_filter;
+char *var_virt_mailbox_limit_maps;
+bool var_virt_mailbox_limit_inbox;
@ -1300,7 +1312,6 @@ diff -uNr postfix-2.10.0.orig/src/virtual/virtual.c postfix-2.10.0/src/virtual/v
+char *var_virt_trash_name;
+bool var_virt_maildir_filter;
+char *var_virt_maildir_filter_maps;
+
+
/*
* Mappings.
@ -1311,46 +1322,33 @@ diff -uNr postfix-2.10.0.orig/src/virtual/virtual.c postfix-2.10.0/src/virtual/v
+MAPS *virtual_mailbox_limit_maps;
+MAPS *virtual_maildir_limit_message_maps;
+MAPS *virtual_maildir_filter_maps;
+
/*
* Bit masks.
@@ -450,15 +468,28 @@
*/
virtual_mailbox_maps =
maps_create(VAR_VIRT_MAILBOX_MAPS, var_virt_mailbox_maps,
- DICT_FLAG_LOCK | DICT_FLAG_PARANOID);
+ DICT_FLAG_LOCK);
@@ -475,6 +491,19 @@
DICT_FLAG_LOCK | DICT_FLAG_PARANOID
| DICT_FLAG_UTF8_REQUEST);
virtual_uid_maps =
maps_create(VAR_VIRT_UID_MAPS, var_virt_uid_maps,
- DICT_FLAG_LOCK | DICT_FLAG_PARANOID);
+ DICT_FLAG_LOCK);
virtual_gid_maps =
maps_create(VAR_VIRT_GID_MAPS, var_virt_gid_maps,
- DICT_FLAG_LOCK | DICT_FLAG_PARANOID);
+ DICT_FLAG_LOCK);
+
+ virtual_mailbox_limit_maps =
+ maps_create(VAR_VIRT_MAILBOX_LIMIT_MAPS, var_virt_mailbox_limit_maps,
+ DICT_FLAG_LOCK);
+ DICT_FLAG_LOCK | DICT_FLAG_UTF8_REQUEST );
+
+ virtual_maildir_limit_message_maps =
+ maps_create(VAR_VIRT_MAILDIR_LIMIT_MESSAGE_MAPS, var_virt_maildir_limit_message_maps,
+ DICT_FLAG_LOCK);
+ DICT_FLAG_LOCK | DICT_FLAG_UTF8_REQUEST );
+
+ virtual_maildir_filter_maps =
+ maps_create(VAR_VIRT_MAILDIR_FILTER_MAPS, var_virt_maildir_filter_maps,
+ DICT_FLAG_LOCK);
+ DICT_FLAG_LOCK | DICT_FLAG_UTF8_REQUEST );
+
+
virtual_mbox_lock_mask = mbox_lock_mask(var_virt_mailbox_lock);
}
@@ -510,10 +541,22 @@
VAR_VIRT_GID_MAPS, DEF_VIRT_GID_MAPS, &var_virt_gid_maps, 0, 0,
@@ -526,6 +555,12 @@
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_DSN_FILTER, DEF_VIRT_DSN_FILTER, &var_virt_dsn_filter, 0, 0,
+ VAR_VIRT_MAILBOX_LIMIT_MAPS, DEF_VIRT_MAILBOX_LIMIT_MAPS, &var_virt_mailbox_limit_maps, 0, 0,
+ VAR_VIRT_MAILDIR_LIMIT_MESSAGE, DEF_VIRT_MAILDIR_LIMIT_MESSAGE, &var_virt_maildir_limit_message, 1, 0,
+ VAR_VIRT_MAILDIR_LIMIT_MESSAGE_MAPS, DEF_VIRT_MAILDIR_LIMIT_MESSAGE_MAPS, &var_virt_maildir_limit_message_maps, 0, 0,
@ -1360,34 +1358,3 @@ diff -uNr postfix-2.10.0.orig/src/virtual/virtual.c postfix-2.10.0/src/virtual/v
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,
+ VAR_VIRT_MAILBOX_LIMIT_OVERRIDE, DEF_VIRT_MAILBOX_LIMIT_OVERRIDE, &var_virt_mailbox_limit_override,
+ VAR_VIRT_MAILDIR_EXTENDED, DEF_VIRT_MAILDIR_EXTENDED, &var_virt_maildir_extended,
+ VAR_VIRT_OVERQUOTA_BOUNCE, DEF_VIRT_OVERQUOTA_BOUNCE, &var_virt_overquota_bounce,
+ VAR_VIRT_TRASH_COUNT, DEF_VIRT_TRASH_COUNT, &var_virt_trash_count,
+ VAR_VIRT_MAILDIR_FILTER, DEF_VIRT_MAILDIR_FILTER, &var_virt_maildir_filter,
0,
};
@@ -530,6 +573,7 @@
MAIL_SERVER_PRE_INIT, pre_init,
MAIL_SERVER_POST_INIT, post_init,
MAIL_SERVER_PRE_ACCEPT, pre_accept,
+ MAIL_SERVER_BOOL_TABLE, bool_table,
MAIL_SERVER_PRIVILEGED,
0);
}
diff -uNr postfix-2.10.0.orig/src/virtual/virtual.h postfix-2.10.0/src/virtual/virtual.h
--- postfix-2.10.0.orig/src/virtual/virtual.h 2006-01-08 00:59:47.000000000 +0100
+++ postfix-2.10.0/src/virtual/virtual.h 2013-06-07 13:21:22.841143270 +0200
@@ -34,6 +34,9 @@
extern MAPS *virtual_mailbox_maps;
extern MAPS *virtual_uid_maps;
extern MAPS *virtual_gid_maps;
+extern MAPS *virtual_mailbox_limit_maps;
+extern MAPS *virtual_maildir_limit_message_maps;
+extern MAPS *virtual_maildir_filter_maps;
/*
* User attributes: these control the privileges for delivery to external

265
postfix.changes
View File

@ -1,3 +1,268 @@
-------------------------------------------------------------------
Sun May 29 16:45:30 UTC 2016 - chris@computersalat.de
- fix Changelog cause of Factory decline
-------------------------------------------------------------------
Tue May 24 13:18:55 UTC 2016 - varkoly@suse.com
- Fix typo in config.postfix
-------------------------------------------------------------------
Tue May 24 04:29:41 UTC 2016 - varkoly@suse.com
- bnc#981097 config.postfix creates broken main.cf for tls client configuration
- bnc#981099 /etc/sysconfig/postfix: POSTFIX_SMTP_TLS_CLIENT incomplete
- update to 3.1.1:
- The new address_verify_pending_request_limit
parameter introduces a safety limit for the number of address
verification probes in the active queue. The default limit is 1/4
of the active queue maximum size. The queue manager enforces the
limit by tempfailing probe messages that exceed the limit. This
design avoids dependencies on global counters that get out of sync
after a process or system crash.
- Machine-readable, JSON-formatted queue listing with "postqueue -j"
(no "mailq" equivalent).
- The milter_macro_defaults feature provides an optional list of macro
name=value pairs. These specify default values for Milter macros when
no value is available from the SMTP session context.
- Support to enforce a destination-independent delay between email
deliveries. The following example inserts 20 seconds of delay
between all deliveries with the SMTP transport, limiting the delivery
rate to at most three messages per minute.
smtp_transport_rate_delay = 20s
- Historically, the default setting "postscreen_dnsbl_ttl = 1h" assumes
that a "not found" result from a DNSBL server will be valid for one
hour. This may have been adequate five years ago when postscreen
was first implemented, but nowadays, that one hour can result in
missed opportunities to block new spambots.
To address this, postscreen now respects the TTL of DNSBL "not
found" replies, as well as the TTL of DNSWL replies (both "found"
and "not found"). The TTL for a "not found" reply is determined
according to RFC 2308 (the TTL of an SOA record in the reply).
Support for DNSBL or DNSWL reply TTL values is controlled by two
configuration parameters:
postscreen_dnsbl_min_ttl (default: 60 seconds).
postscreen_dnsbl_max_ttl (default: $postscreen_dnsbl_ttl or 1 hour)
The postscreen_dnsbl_ttl parameter is now obsolete, and has become
the default value for the new postscreen_dnsbl_max_ttl parameter.
- New "smtpd_client_auth_rate_limit" feature, to
enforce an optional rate limit on AUTH commands per SMTP client IP
address. Similar to other smtpd_client_*_rate_limit features, this
enforces a limit on the number of requests per $anvil_rate_time_unit.
- New SMTPD policy service attribute "policy_context",
with a corresponding "smtpd_policy_service_policy_context" configuration
parameter. Originally, this was implemented to share the same SMTPD
policy service endpoint among multiple check_policy_service clients.
- A new "postfix tls" command to quickly enable opportunistic TLS
in the Postfix SMTP client or server, and to manage SMTP server keys
and certificates, including certificate signing requests and
TLSA DNS records for DANE.
-------------------------------------------------------------------
Tue Apr 19 07:59:32 UTC 2016 - opensuse@dstoecker.de
- build with working support for SMTPUTF8
-------------------------------------------------------------------
Sun Mar 20 14:11:27 UTC 2016 - mrueckert@suse.de
- fix build on sle11 by pointing _libexecdir to /usr/lib all the
time.
-------------------------------------------------------------------
Sun Mar 20 13:46:56 UTC 2016 - mrueckert@suse.de
- some distros did not pull pkgconfig indirectly. pull it directly.
-------------------------------------------------------------------
Sun Mar 20 08:19:23 UTC 2016 - mrueckert@suse.de
- fix building the dynamic maps: the old build had postgresql e.g.
with missing symbols.
- convert to AUXLIBS_* instead of plain AUXLIBS which is needed
for proper dynamic maps.
- reordered the CCARGS and AUXLIBS* lines to group by feature
- use pkgconfig or *_config tools where possible
- picked up signed char from fedora spec file
- enable lmdb support: new BR lmdb-devel, new subpackage
postfix-lmdb.
- don't delete vmail user/groups
-------------------------------------------------------------------
Wed Mar 9 13:06:35 UTC 2016 - varkoly@suse.com
- update to 3.1.0
- Since version 3.0 postfix supports dynamic loading of cdb:, ldap:,
lmdb:, mysql:, pcre:, pgsql:, sdbm:, and sqlite: database clients.
Thats why the patches dynamic_maps.patch and dynamic_maps_pie.patch
could be removed.
- Adapting all the patches to postfix 3.1.0
- remove obsolete patches
* add_missed_library.patch
* postfix-opensslconfig.patch
- update vda patch
* remove postfix-vda-v13-2.10.0.patch
* add postfix-vda-v13-3.10.0.patch
- The patch postfix-db6.diff is not more neccessary
- Backwards-compatibility safety net.
With NEW Postfix installs, you MUST install a main.cf file with
the setting "compatibility_level = 2". See conf/main.cf for an
example.
With UPGRADES of existing Postfix systems, you MUST NOT change the
main.cf compatibility_level setting, nor add this setting if it
does not exist.
Several Postfix default settings have changed with Postfix 3.0. To
avoid massive frustration with existing Postfix installations,
Postfix 3.0 comes with a safety net that forces Postfix to keep
running with backwards-compatible main.cf and master.cf default
settings. This safety net depends on the main.cf compatibility_level
setting (default: 0). Details are in COMPATIBILITY_README.
- Major changes - tls
* [Feature 20160207] A new "postfix tls" command to quickly enable
opportunistic TLS in the Postfix SMTP client or server, and to
manage SMTP server keys and certificates, including certificate
signing requests and TLSA DNS records for DANE.
* As of the middle of 2015, all supported Postfix releases no longer
nable "export" grade ciphers for opportunistic TLS, and no longer
use the deprecated SSLv2 and SSLv3 protocols for mandatory or
opportunistic TLS.
* [Incompat 20150719] The default Diffie-Hellman non-export prime was
updated from 1024 to 2048 bits, because SMTP clients are starting
to reject TLS handshakes with primes smaller than 2048 bits.
* [Feature 20160103] The Postfix SMTP client by default enables DANE
policies when an MX host has a (DNSSEC) secure TLSA DNS record,
even if the MX DNS record was obtained with insecure lookups. The
existence of a secure TLSA record implies that the host wants to
talk TLS and not plaintext. For details see the
smtp_tls_dane_insecure_mx_policy configuration parameter.
- Major changes - default settings
[Incompat 20141009] The default settings have changed for relay_domains
(new: empty, old: $mydestination) and mynetworks_style (new: host,
old: subnet). However the backwards-compatibility safety net will
prevent these changes from taking effect, giving the system
administrator the option to make an old default setting permanent
in main.cf or to adopt the new default setting, before turning off
backwards compatibility. See COMPATIBILITY_README for details.
[Incompat 20141001] A new backwards-compatibility safety net forces
Postfix to run with backwards-compatible main.cf and master.cf
default settings after an upgrade to a newer but incompatible Postfix
version. See COMPATIBILITY_README for details.
While the backwards-compatible default settings are in effect,
Postfix logs what services or what email would be affected by the
incompatible change. Based on this the administrator can make some
backwards-compatibility settings permanent in main.cf or master.cf,
before turning off backwards compatibility.
- Major changes - address verification safety
[Feature 20151227] The new address_verify_pending_request_limit
parameter introduces a safety limit for the number of address
verification probes in the active queue. The default limit is 1/4
of the active queue maximum size. The queue manager enforces the
limit by tempfailing probe messages that exceed the limit. This
design avoids dependencies on global counters that get out of sync
after a process or system crash.
Tempfailing verify requests is not as bad as one might think. The
Postfix verify cache proactively updates active addresses weeks
before they expire. The address_verify_pending_request_limit affects
only unknown addresses, and inactive addresses that have expired
from the address verify cache (by default, after 31 days).
- Major changes - json support
[Feature 20151129] Machine-readable, JSON-formatted queue listing
with "postqueue -j" (no "mailq" equivalent). The output is a stream
of JSON objects, one per queue file. To simplify parsing, each
JSON object is formatted as one text line followed by one newline
character. See the postqueue(1) manpage for a detailed description
of the output format.
- Major changes - milter support
[Feature 20150523] The milter_macro_defaults feature provides an
optional list of macro name=value pairs. These specify default
values for Milter macros when no value is available from the SMTP
session context.
For example, with "milter_macro_defaults = auth_type=TLS", the
Postfix SMTP server will send an auth_type of "TLS" to a Milter,
unless the remote client authenticates with SASL.
This feature was originally implemented for a submission service
that may authenticate clients with a TLS certificate, without having
to make changes to the code that implements TLS support.
- Major changes - output rate control
[Feature 20150710] Destination-independent delivery rate delay
Support to enforce a destination-independent delay between email
deliveries. The following example inserts 20 seconds of delay
between all deliveries with the SMTP transport, limiting the delivery
rate to at most three messages per minute.
/etc/postfix/main.cf:
smtp_transport_rate_delay = 20s
For details, see the description of default_transport_rate_delay
and transport_transport_rate_delay in the postconf(5) manpage.
- Major changes - postscreen dnsbl
[Feature 20150710] postscreen support for the TTL of DNSBL and DNSWL
lookup results
Historically, the default setting "postscreen_dnsbl_ttl = 1h" assumes
that a "not found" result from a DNSBL server will be valid for one
hour. This may have been adequate five years ago when postscreen
was first implemented, but nowadays, that one hour can result in
missed opportunities to block new spambots.
To address this, postscreen now respects the TTL of DNSBL "not
found" replies, as well as the TTL of DNSWL replies (both "found"
and "not found"). The TTL for a "not found" reply is determined
according to RFC 2308 (the TTL of an SOA record in the reply).
Support for DNSBL or DNSWL reply TTL values is controlled by two
configuration parameters:
postscreen_dnsbl_min_ttl (default: 60 seconds).
This parameter specifies a minimum for the amount of time that
a DNSBL or DNSWL result will be cached in the postscreen_cache_map.
This prevents an excessive number of postscreen cache updates
when a DNSBL or DNSWL server specifies a very small reply TTL.
postscreen_dnsbl_max_ttl (default: $postscreen_dnsbl_ttl or 1 hour)
This parameter specifies a maximum for the amount of time that
a DNSBL or DNSWL result will be cached in the postscreen_cache_map.
This prevents cache pollution when a DNSBL or DNSWL server
specifies a very large reply TTL.
The postscreen_dnsbl_ttl parameter is now obsolete, and has become
the default value for the new postscreen_dnsbl_max_ttl parameter.
- Major changes - sasl auth safety
[Feature 20151031] New "smtpd_client_auth_rate_limit" feature, to
enforce an optional rate limit on AUTH commands per SMTP client IP
address. Similar to other smtpd_client_*_rate_limit features, this
enforces a limit on the number of requests per $anvil_rate_time_unit.
- Major changes - smtpd policy
[Feature 20150913] New SMTPD policy service attribute "policy_context",
with a corresponding "smtpd_policy_service_policy_context" configuration
parameter. Originally, this was implemented to share the same SMTPD
policy service endpoint among multiple check_policy_service clients.
-------------------------------------------------------------------
Wed Dec 9 14:05:22 UTC 2015 - varkoly@suse.com

224
postfix.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package postfix
#
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,12 +16,19 @@
#
%if 0%{?suse_version} >= 1320 || ( 0%{?suse_version} == 1315 && 0%{?is_opensuse} )
%bcond_without lmdb
%else
%bcond_with lmdb
%endif
#
# Some defines
#
%define pf_docdir %{_docdir}/%{name}-doc
%define pf_config_directory %{_sysconfdir}/%{name}
%define pf_daemon_directory /usr/lib/%{name}
%define _libexecdir /usr/lib
%define pf_command_directory %{_prefix}/sbin
%define pf_queue_directory var/spool/%{name}
%define pf_sendmail_path %{_sbindir}/sendmail
@ -52,43 +59,42 @@
%define _unitdir /lib/systemd
%endif
Name: postfix
Version: 2.11.7
Version: 3.1.1
Release: 0
Summary: A fast, secure, and flexible mailer
License: IPL-1.0
Group: Productivity/Networking/Email/Servers
Url: http://www.postfix.org/
Source: http://www.artfiles.org/postfix.org/postfix-release/official/postfix-%{version}.tar.gz
#Source1: postfix-%{version}.tar.gz.asc
#Source: http://www.artfiles.org/postfix.org/postfix-release/official/postfix-%{version}.tar.gz
Source: postfix-%{version}.tar.gz
Source2: %{name}-SuSE.tar.gz
Source3: %{name}-mysql.tar.bz2
#Source4: %{name}.keyring
Source10: postfix-rpmlintrc
Source10: %{name}-rpmlintrc
Source11: check_mail_queue
Patch0: dynamic_maps.patch
Patch1: dynamic_maps_pie.patch
Patch1: %{name}-no-md5.patch
Patch2: pointer_to_literals.patch
Patch3: ipv6_disabled.patch
Patch10: %{name}-main.cf.patch
Patch11: %{name}-master.cf.patch
Patch12: %{name}-post-install.patch
Patch20: %{name}-ssl-release-buffers.patch
Patch21: postfix-opensslconfig.patch
Patch100: %{name}-vda-v13-2.10.0.patch
Patch101: postfix-db6.diff
#PATCH-FIX-SLE PATCH-FIX-OPENSUSE to be able to build the agent tls_proxy
Patch102: add_missed_library.patch
Patch103: postfix-no-md5.patch
Patch4: %{name}-main.cf.patch
Patch5: %{name}-master.cf.patch
Patch6: %{name}-post-install.patch
Patch7: %{name}-ssl-release-buffers.patch
Patch8: %{name}-vda-v13-3.10.0.patch
BuildRequires: cyrus-sasl-devel
BuildRequires: db-devel
BuildRequires: libopenssl-devel
%if %{with lmdb}
BuildRequires: lmdb-devel
%endif
BuildRequires: libicu-devel
BuildRequires: mysql-devel
BuildRequires: openldap2-devel
BuildRequires: pcre-devel
BuildRequires: pkgconfig
BuildRequires: postgresql-devel
Requires: iproute2
Requires(pre): permissions
Requires(pre): %insserv_prereq
Requires(pre): %insserv_prereq
Requires(pre): %fillup_prereq
Provides: smtp_daemon
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -104,17 +110,17 @@ BuildRequires: fdupes
BuildRequires: systemd
%{?systemd_requires}
%else
Requires(pre): %insserv_prereq %fillup_prereq
Requires(pre): %{_bindir}/getent
Requires(pre): pwdutils
Requires(pre): /bin/awk
Requires(pre): /bin/grep
Requires(pre): /bin/sed
Requires(pre): fileutils
Requires(pre): netcfg
Requires(pre): pcre
Requires(pre): sh-utils
Requires(pre): textutils
Requires(pre): %insserv_prereq %fillup_prereq
Requires(pre): %{_bindir}/getent
Requires(pre): pwdutils
Requires(pre): /bin/awk
Requires(pre): /bin/grep
Requires(pre): /bin/sed
Requires(pre): fileutils
Requires(pre): netcfg
Requires(pre): pcre
Requires(pre): sh-utils
Requires(pre): textutils
%endif
%description
@ -158,42 +164,82 @@ Postfix plugin to support PostgreSQL maps. This library will be loaded
by starting %{name} if you'll access a postmap which is stored in
PostgreSQL.
%if %{with lmdb}
%package lmdb
Summary: Postfix plugin to support LMDB maps
Group: Productivity/Networking/Email/Servers
Requires(pre): %{name} = %{version}
%description lmdb
Postfix plugin to support LMDB maps. This library will be loaded
by starting %{name} if you'll access a postmap which is stored in
PostgreSQL.
%endif
%prep
%setup -q -a 2 -a 3
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3
%patch10
%patch11
%patch12
%patch20
%patch21
%patch100 -p1
%patch101
%patch102
%patch103 -p1
%patch4
%patch5
%patch6
%patch7
%patch8 -p1
# ---------------------------------------------------------------------------
%build
export CCARGS="-DHAS_LDAP -DHAS_PCRE -DUSE_SASL_AUTH -I%{_includedir}/sasl"
export CCARGS="$CCARGS -DMAX_DYNAMIC_MAPS"
export CCARGS="$CCARGS -DHAS_MYSQL -I%{_includedir}/mysql"
export CCARGS="$CCARGS -DHAS_PGSQL -I%{_includedir}/pgsql"
export CCARGS="$CCARGS -DUSE_CYRUS_SASL"
export AUXLIBS="-lldap -llber -lpcre"
export AUXLIBS="$AUXLIBS -lsasl2"
export AUXLIBS="$AUXLIBS -lssl -lcrypto"
export CCARGS="$CCARGS -DUSE_TLS"
export CCARGS="$CCARGS %{optflags} -Wno-comments"
unset AUXLIBS AUXLIBS_LDAP AUXLIBS_PCRE AUXLIBS_MYSQL AUXLIBS_PGSQL AUXLIBS_SQLITE AUXLIBS_CDB
export CCARGS="${CCARGS} %{optflags} -Wno-comments -Wno-missing-braces -fPIC"
%ifarch s390 s390x ppc
export CCARGS="${CCARGS} -fsigned-char"
%endif
#
if pkg-config openssl ; then
export CCARGS="${CCARGS} -DUSE_TLS $(pkg-config --cflags openssl)"
export AUXLIBS="$AUXLIBS $(pkg-config --libs openssl)"
else
export CCARGS="${CCARGS} -DUSE_TLS"
export AUXLIBS="${AUXLIBS} -lssl -lcrypto"
fi
#
export CCARGS="${CCARGS} -DHAS_LDAP -DLDAP_DEPRECATED=1 -DUSE_LDAP_SASL"
export AUXLIBS_LDAP="-lldap -llber"
#
export CCARGS="${CCARGS} -DHAS_PCRE"
export AUXLIBS_PCRE="-lpcre"
#
export CCARGS="${CCARGS} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I%{_includedir}/sasl"
if pkg-config libsasl2 ; then
export AUXLIBS="$AUXLIBS $(pkg-config --libs libsasl2)"
else
export AUXLIBS="$AUXLIBS -lsasl2"
fi
#
export CCARGS="${CCARGS} -DHAS_MYSQL $(mysql_config --cflags)"
export AUXLIBS_MYSQL="$(mysql_config --libs)"
#
export CCARGS="${CCARGS} -DHAS_PGSQL -I$(pg_config --includedir)"
export AUXLIBS_PGSQL="-lpq"
#
%if %{with lmdb}
export CCARGS="${CCARGS} -DHAS_LMDB -I/usr/local/include" \
export AUXLIBS_LMDB="-llmdb"
%endif
#
# TODO
#export AUXLIBS_SQLITE
#export AUXLIBS_CDB
#export AUXLIBS_SDBM
export PIE=-pie
make makefiles DEBUG=""
cd lib
for i in dns global master tls util milter; do
ln -sf lib${i}.a lib%{name}-${i}.so.1.0.1;
done
cd -
make LD_LIBRARY_PATH=$(pwd)/lib:${LD_LIBRARY_PATH}
make makefiles pie=yes shared=yes dynamicmaps=yes \
shlib_directory=/usr/lib/postfix \
meta_directory=/usr/lib/postfix \
config_directory=/etc/postfix
make
# ---------------------------------------------------------------------------
%install
@ -202,16 +248,9 @@ groupadd -g %{maildrop_gid} -o -r maildrop 2> /dev/null || :
useradd -r -o -g %{name} -u %{pf_uid} -s /bin/false -c "Postfix Daemon" -d /%{pf_queue_directory} %{name} 2> /dev/null || :
usermod -G %{maildrop_gid},%{mail_gid} %{name} 2> /dev/null || :
mkdir -p %{buildroot}/%{_libdir}
install lib/*.1 %{buildroot}/%{_libdir}
for i in %{buildroot}/%{_libdir}/*.1; do
ln -sf ${i##*/} ${i%.*.*}
done
cd lib
for i in libpostfix-*; do
ln -sf $i %{buildroot}/%{_libdir}/${i%%so.*}so
done
cd -
ln -sf $(pwd)/lib/dict_* libexec/
mkdir -p %{buildroot}/etc/postfix
cp conf/* %{buildroot}/etc/postfix/
cp lib/libpostfix-* %{buildroot}/%{_libdir}
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{buildroot}/%{_libdir}
sh postfix-install -non-interactive \
install_root=%{buildroot} \
@ -395,9 +434,6 @@ if [ "$1" = "0" ]; then
else
echo "Can not find \"$FILE\". Not updating the file." >&2
fi
echo "Removing %{vmusr} user"
userdel %{vmusr} 2> /dev/null
groupdel %{vmusr} 2> /dev/null
fi
# ---------------------------------------------------------------------------
@ -469,6 +505,9 @@ fi
%verify_permissions -e %{_sbindir}/postdrop
%verify_permissions -e %{_sysconfdir}/%{name}/sasl_passwd
%verify_permissions -e %{_sbindir}/sendmail
%{fillup_only postfix}
%else
%{fillup_and_insserv -y postfix}
%endif
# ---------------------------------------------------------------------------
@ -508,25 +547,23 @@ fi
%config(noreplace) %{omc_dir}/%{name}.xml
%dir %{_sysconfdir}/%{name}
%config %{_sysconfdir}/%{name}/main.cf.default
%config(noreplace) %{_sysconfdir}/%{name}/[^mysql]*[^mysql]
%config(noreplace) %{_sysconfdir}/%{name}/access
%config(noreplace) %{_sysconfdir}/%{name}/aliases
%config(noreplace) %{_sysconfdir}/%{name}/generic
%config(noreplace) %{_sysconfdir}/%{name}/helo_access
%config(noreplace) %{_sysconfdir}/%{name}/canonical
%config(noreplace) %{_sysconfdir}/%{name}/header_checks
%config(noreplace) %{_sysconfdir}/%{name}/helo_access
%config(noreplace) %{_sysconfdir}/%{name}/ldap_aliases.cf
%config(noreplace) %{_sysconfdir}/%{name}/main.cf
%config(noreplace) %{_sysconfdir}/%{name}/master.cf
%config(noreplace) %{_sysconfdir}/%{name}/openssl_%{name}.conf.in
%config(noreplace) %{_sysconfdir}/%{name}/relocated
%config(noreplace) %{_sysconfdir}/%{name}/transport
%config(noreplace) %{_sysconfdir}/%{name}/virtual
%config(noreplace) %{_sysconfdir}/%{name}/sasl_passwd
%config(noreplace) %{_sysconfdir}/%{name}/sender_canonical
%config(noreplace) %{_sysconfdir}/%{name}/post-install
%config(noreplace) %{_sysconfdir}/%{name}/postfix-files
%config(noreplace) %{_sysconfdir}/%{name}/relay
%config(noreplace) %{_sysconfdir}/%{name}/relay_ccerts
%config(noreplace) %{_sysconfdir}/%{name}/header_checks
%config(noreplace) %{_sysconfdir}/%{name}/bounce.cf.default
%config(noreplace) %{_sysconfdir}/%{name}/dynamicmaps.cf
%config(noreplace) %{_sysconfdir}/%{name}/ldap_aliases.cf
%config(noreplace) %{_sysconfdir}/%{name}/sasl_passwd
%config(noreplace) %{_sysconfdir}/%{name}/sender_canonical
%config(noreplace) %{_sysconfdir}/%{name}/virtual
%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/smtp
%dir %{_sysconfdir}/sasl2/
%config(noreplace) %{_sysconfdir}/sasl2/smtpd.conf
@ -569,9 +606,16 @@ fi
%{_libexecdir}/sendmail
%dir %{_libexecdir}/%{name}
%{_libexecdir}/%{name}/*[^.so]
%{_libexecdir}/%{name}/dict_ldap.so
%{_libexecdir}/%{name}/dict_pcre.so
%{_libexecdir}/%{name}/dict_tcp.so
%{_libexecdir}/%{name}/postfix-ldap.so
%{_libexecdir}/%{name}/postfix-pcre.so
%{_libexecdir}/%{name}/libpostfix-dns.so
%{_libexecdir}/%{name}/libpostfix-global.so
%{_libexecdir}/%{name}/libpostfix-master.so
%{_libexecdir}/%{name}/libpostfix-tls.so
%{_libexecdir}/%{name}/libpostfix-util.so
%{_libexecdir}/%{name}/main.cf.proto
%{_libexecdir}/%{name}/master.cf.proto
%{conf_backup_dir}
%dir %attr(0700,%{name},root) %{pf_data_directory}
%{_mandir}/man?/*.gz
@ -603,10 +647,16 @@ fi
%doc %{name}-mysql/%{name}-mysql.sql
%config(noreplace) %attr(640, root, %{name}) %{_sysconfdir}/%{name}/*_maps.cf
%config(noreplace) %{_sysconfdir}/%{name}/main.cf-mysql
%{_libexecdir}/%{name}/dict_mysql.so
%{_libexecdir}/%{name}/postfix-mysql.so
%files postgresql
%defattr(-,root,root)
%{_libexecdir}/%{name}/dict_pgsql.so
%{_libexecdir}/%{name}/postfix-pgsql.so
%if %{with lmdb}
%files lmdb
%defattr(-,root,root)
%{_libexecdir}/%{name}/postfix-lmdb.so
%endif
%changelog