Package: courier
Version: 0.65.0-3
Severity: normal
Tags: patch
User: [email protected]
Usertags: origin-ubuntu natty ubuntu-patch
User: [email protected]
Usertags: ld-as-needed
libs should be added to LDADD, not LDFLAGS. I'm not sure if the addition of
-lcourierauth to courieresmtp_LDADD is correct, but it's already there in
courieresmtpd_LDFLAGS/courieresmtpd_LDADD.
diff -u courier-0.65.0/courier/module.esmtp/Makefile.in
courier-0.65.0/courier/module.esmtp/Makefile.in
--- courier-0.65.0/courier/module.esmtp/Makefile.in
+++ courier-0.65.0/courier/module.esmtp/Makefile.in
@@ -350,14 +350,13 @@
`cat ../../soxwrap/soxlibs.dep` \
@NETLIBS@ $(ldaddlibdl) $(DEBUGLIB)
-courieresmtp_LDADD = -lcourierauthsaslclient $(commonLDADD)
+courieresmtp_LDADD = $(commonLDADD) -lcourierauthsaslclient -lcourierauth
courieresmtp_LDFLAGS = `...@courierauthconfig@ --ldflags`
courieresmtpd_DEPENDENCIES = $(courieresmtp_DEPENDENCIES) \
../../tcpd/libspipe.la
-courieresmtpd_LDADD = $(commonLDADD) ../../tcpd/libspipe.la
-courieresmtpd_LDFLAGS = `...@courierauthconfig@ --ldflags` \
- -lcourierauthsasl -lcourierauth
+courieresmtpd_LDADD = $(commonLDADD) ../../tcpd/libspipe.la -lcourierauthsasl
-lcourierauth
+courieresmtpd_LDFLAGS = `...@courierauthconfig@ --ldflags`
addcr_SOURCES = addcr.c
librewrite_la_SOURCES = esmtp.c
--- courier-0.65.0.orig/courier/module.esmtp/Makefile.am
+++ courier-0.65.0/courier/module.esmtp/Makefile.am
@@ -91,15 +91,14 @@
`cat ../../soxwrap/soxlibs.dep` \
@NETLIBS@ $(ldaddlibdl) $(DEBUGLIB)
-courieresmtp_LDADD=-lcourierauthsaslclient $(commonLDADD)
+courieresmtp_LDADD=$(commonLDADD) -lcourierauthsaslclient -lcourierauth
courieresmtp_ldflag...@courierauthconfig@ --ldflags`
courieresmtpd_DEPENDENCIES=$(courieresmtp_DEPENDENCIES) \
../../tcpd/libspipe.la
-courieresmtpd_LDADD=$(commonLDADD) ../../tcpd/libspipe.la
-courieresmtpd_ldflag...@courierauthconfig@ --ldflags` \
- -lcourierauthsasl -lcourierauth
+courieresmtpd_LDADD=$(commonLDADD) ../../tcpd/libspipe.la -lcourierauthsasl
-lcourierauth
+courieresmtpd_ldflag...@courierauthconfig@ --ldflags`
addcr_SOURCES=addcr.c
