Control: tags -1 patch

I looked at this again and the following patch is building a hardened
postfix version (based on 3.4.5-1), which is so far running fine.


---
 debian/rules | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/rules b/debian/rules
index 3c4ae95b..ddd67bb8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -73,7 +73,7 @@ TLSDOCFILES=${TLSSRC}/TLS_TODO ${TLSSRC}/TLS_ACKNOWLEDGEMENTS
 build: build-arch build-indep
 build-arch:
        $(checkdir)
-       ${MAKE} makefiles CCARGS="${CCARGS}" DEBUG="${DEBUG}" \
+       ${MAKE} makefiles CCARGS="${CFLAGS} ${CCARGS}" DEBUG="${DEBUG}" \
                AUXLIBS="${AUXLIBS} -L$$(pwd)/debian" OPT="$(OFLAGS)" \
                AUXLIBS_CDB="-lcdb -L../../lib -L. -lpostfix-util" \
                AUXLIBS_LDAP="-lldap -llber -L../../lib -L.
-lpostfix-util -lpostfix-global" \
@@ -86,7 +86,8 @@ build-arch:
                daemon_directory=${CUR_DIR}/usr/lib/postfix/sbin \
                shlibs_directory=${CUR_DIR}/usr/lib/postfix
manpage_directory=/usr/share/man \
                sample_directory=/usr/share/doc/postfix/examples
readme_directory=/usr/share/doc/postfix \
-               html_directory=/usr/share/doc/postfix/html
+               html_directory=/usr/share/doc/postfix/html \
+               ${LDFLAGS}
        ${MAKE} LD_LIBRARY_PATH=$$(pwd)/lib:$${LD_LIBRARY_PATH}
        ${MAKE} manpages
        sed "s:@@DISTRO@@:$(DISTRO):g" < debian/main.cf.in > conf/main.cf.debian
@@ -95,7 +96,7 @@ build-arch:

 build-indep:
        $(checkdir)
-       ${MAKE} makefiles CCARGS="${CCARGS}" DEBUG="${DEBUG}" \
+       ${MAKE} makefiles CCARGS="${CFLAGS} ${CCARGS}" DEBUG="${DEBUG}" \
                AUXLIBS="${AUXLIBS} -L$$(pwd)/debian" OPT="$(OFLAGS)" \
                AUXLIBS_CDB="-lcdb -L../../lib -L. -lpostfix-util" \
                AUXLIBS_LDAP="-lldap -llber -L../../lib -L.
-lpostfix-util -lpostfix-global" \
@@ -108,7 +109,8 @@ build-indep:
                daemon_directory=${CUR_DIR}/usr/lib/postfix/sbin \
                shlibs_directory=${CUR_DIR}/usr/lib/postfix
manpage_directory=/usr/share/man \
                sample_directory=/usr/share/doc/postfix/examples
readme_directory=/usr/share/doc/postfix \
-               html_directory=/usr/share/doc/postfix/html
+               html_directory=/usr/share/doc/postfix/html \
+               ${LDFLAGS}
        ${MAKE} LD_LIBRARY_PATH=$$(pwd)/lib:$${LD_LIBRARY_PATH}
        ${MAKE} manpages
        sed "s:@@DISTRO@@:$(DISTRO):g" < debian/main.cf.in > conf/main.cf.debian
-- 
2.23.0

Reply via email to