The unified diff between revisions [2ad2b4ba..] and [9cea7784..] is displayed below. It can also be downloaded as a raw diff.

#
#
# patch "Makefile"
#  from [899f8f7116bbccb07a1c30de2e3270f493877b4b]
#    to [234d3408a308b767841771aa667a40eb5a656c4b]
#
# patch "src/local/local.h"
#  from [7bef693fec56c14894ac6c20a7596723238c15b8]
#    to [336f29347d385933dd1c8d90d26f5fe186310b71]
#
# patch "src/local/ucc_hack.c"
#  from [dff893284a39965bec7cf8dd49b11a4a6902c8b1]
#    to [398a57f86cbae2d3b25d560b5b54cb9881480dcc]
#
============================================================
--- Makefile	899f8f7116bbccb07a1c30de2e3270f493877b4b
+++ Makefile	234d3408a308b767841771aa667a40eb5a656c4b
@@ -1,41 +1,40 @@
-# Do not edit -- this file documents how Postfix was built for your machine.
-SYSTYPE	= MACOSX
+SYSTYPE	= LINUX2
 AR	= ar
 ARFL	= rv
 RANLIB	= ranlib
-SYSLIBS	= -L/opt/local/lib -lpcre -flat_namespace
-CC	= cc -DBIND_8_COMPAT -DNO_NETINFO -DHAS_PCRE -I/opt/local/include
+SYSLIBS	= -ldb -lnsl -lresolv
+CC	= gcc $(WARN)
 OPT	= -O
 DEBUG	= -g
 AWK	= awk
 STRCASE =
-EXPORT	= AUXLIBS=' -L/opt/local/lib -lpcre' CCARGS=' -DBIND_8_COMPAT -DNO_NETINFO -DHAS_PCRE -I/opt/local/include' OPT='-O' DEBUG='-g'
+EXPORT	= AUXLIBS='' CCARGS='' OPT='-O' DEBUG='-g'
 WARN	= -W -Wformat -Wimplicit -Wmissing-prototypes \
 	-Wparentheses -Wstrict-prototypes -Wswitch -Wuninitialized \
 	-Wunused
 SHELL	= /bin/sh
 WARN    = -Wmissing-prototypes -Wformat
 OPTS	= 'CC=$(CC)'
-DIRS	= src/util src/global src/dns src/tls src/master src/postfix src/smtpstone \
+DIRS	= src/util src/global src/dns src/master src/postfix src/smtpstone \
 	src/sendmail src/error src/pickup src/cleanup src/smtpd src/local \
 	src/lmtp src/trivial-rewrite src/qmgr src/oqmgr src/smtp src/bounce \
 	src/pipe src/showq src/postalias src/postcat src/postconf src/postdrop \
 	src/postkick src/postlock src/postlog src/postmap src/postqueue \
 	src/postsuper src/qmqpd src/spawn src/flush src/verify \
-	src/virtual src/proxymap src/anvil src/scache src/discard src/tlsmgr
+	src/virtual src/proxymap
 MANDIRS	= proto man html

 default: update

 makefiles Makefiles:
-	(echo "# Do not edit -- this file documents how Postfix was built for your machine."; $(SHELL) makedefs) >makedefs.tmp
-	set +e; if cmp makedefs.tmp conf/makedefs.out; then rm makedefs.tmp; \
-	else mv makedefs.tmp conf/makedefs.out; fi >/dev/null 2>/dev/null
 	set -e; for i in $(DIRS); do \
 	 (set -e; echo "[$$i]"; cd $$i; rm -f Makefile; \
 	 $(MAKE) -f Makefile.in Makefile MAKELEVEL=) || exit 1; \
 	done;
-	rm -f Makefile; (cat conf/makedefs.out Makefile.in) >Makefile
+	rm -f Makefile; (set -e; $(SHELL) makedefs && cat Makefile.in) >Makefile
+	(echo "# Do not edit -- this file documents how Postfix was built for your machine."; $(SHELL) makedefs) >makedefs.tmp
+	set +e; if cmp makedefs.tmp conf/makedefs.out; then rm makedefs.tmp; \
+	else mv makedefs.tmp conf/makedefs.out; fi >/dev/null 2>/dev/null

 update printfck tests:
 	set -e; for i in $(DIRS); do \
@@ -52,15 +51,9 @@ install: update
 install: update
 	$(SHELL) postfix-install

-package: update
-	$(SHELL) postfix-install -package
-
 upgrade: update
 	$(SHELL) postfix-install -non-interactive

-non-interactive-package: update
-	$(SHELL) postfix-install -non-interactive -package
-
 depend clean:
 	set -e; for i in $(DIRS); do \
 	 (set -e; echo "[$$i]"; cd $$i; $(MAKE) $@) || exit 1; \
============================================================
--- src/local/local.h	7bef693fec56c14894ac6c20a7596723238c15b8
+++ src/local/local.h	336f29347d385933dd1c8d90d26f5fe186310b71
@@ -84,7 +84,7 @@ typedef struct DELIVER_ATTR {
     long    arrival_time;		/* arrival time */
     int     exp_type;			/* expansion type. see below */
     char   *exp_from;			/* expanded_from */
-    int    *ucc_no_relay;               /* don't allow this message to be forwarded non-locally */
+    int    ucc_no_relay;                /* don't allow this message to be forwarded non-locally */
 } DELIVER_ATTR;

 extern void deliver_attr_init(DELIVER_ATTR *);
============================================================
--- src/local/ucc_hack.c	dff893284a39965bec7cf8dd49b11a4a6902c8b1
+++ src/local/ucc_hack.c	398a57f86cbae2d3b25d560b5b54cb9881480dcc
@@ -53,11 +53,13 @@ int ucc_no_relay_check(DELIVER_ATTR attr
      * consistency.
      */
     while (rec_get(attr.fp, buf, 0) == REC_TYPE_NORM) {
+    if (is_header(STR(buf))) {
         char * hdr = STR(buf);
         if (strstr(hdr, var_ucc_no_relay_hdr) == hdr)
         {
             /* found a no_relay header */
             return 1;
+	}
 	} else if (ISSPACE(STR(buf)[0])) {
 	    continue;
 	} else {
@@ -80,6 +82,10 @@ int ucc_deliver_no_relay(LOCAL_STATE sta
     if (been_here(state.dup_filter, "ucc_no_relay %s", state.msg_attr.local))
 	return (YES);

+    msg_info("UCC no_relay hack in effect. user '%s', localpart '%s', recip '%s'",
+		    state.msg_attr.user, state.msg_attr.local,
+		    state.msg_attr.recipient);
+
     mbox_pwd = mypwnam(state.msg_attr.user);
     if (!mbox_pwd)
     {