From 324e074590eb3b2f81b06bae115518f8fcb3c68b Mon Sep 17 00:00:00 2001 From: Michael Schloh von Bennewitz Date: Wed, 21 Aug 2002 13:52:45 +0000 Subject: [PATCH] Correction and conditional additions for using fsl(3). --- sendmail/sendmail.spec | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/sendmail/sendmail.spec b/sendmail/sendmail.spec index 6b0b4492da..13709eb6b6 100644 --- a/sendmail/sendmail.spec +++ b/sendmail/sendmail.spec @@ -24,9 +24,8 @@ ## # TODO: -# 1 Link to fsl(3) and don't just build it -# 2 User, group ids in %files must be reviewed -# 3 Test alot (also with smtpfeed) +# 1 User, group ids in %files must be reviewed +# 2 Test alot (also with smtpfeed) # # Bugs: # 1 All mitgelieferte config files use 8.11.6 options @@ -47,11 +46,11 @@ Summary: Mail Transfer Agent URL: http://www.sendmail.org/ Vendor: Eric Allman Packager: The OpenPKG Project -Distribution: OpenPKG [JUNK] +Distribution: OpenPKG [EVAL] Group: Mail License: BSD Version: 8.12.5 -Release: 20020819 +Release: 20020821 # list of sources Source0: ftp://ftp.sendmail.org/pub/sendmail/sendmail.%{version}.tar.gz @@ -105,7 +104,7 @@ Conflicts: ssmtp, exim, postfix CC="%{l_cc}" \ CFLAGS="%{l_cflags -O} -I%{l_prefix}/include" \ ./configure \ - --with-logfile=%{l_prefix}/var/sendmail/log/sendmail.log + --with-logfile=%{l_prefix}/var/sendmail/sendmail.log %{l_make} %{l_mflags} ) %endif @@ -119,6 +118,12 @@ Conflicts: ssmtp, exim, postfix -e 's;\(Version\[\][^"]*\)"[^"]*";\1"%{version}+";' \ sendmail/version.c + # conditionally add linker flag defs for fsl(3) + %if "%{with_fsl}" == "yes" + LDFLAGS="`%{l_prefix}/bin/fsl-config --ldflags --all`" \ + LIBS="`%{l_prefix}/bin/fsl-config --libs --all`" \ + %endif + # configure Sendmail ( echo "define(\`confMAPDEF', \`-DMAP_REGEX')dnl" echo "define(\`confSBINOWN', \`%{l_musr}')dnl" @@ -147,7 +152,7 @@ Conflicts: ssmtp, exim, postfix echo "APPENDDEF(\`confENVDEF', \`-D_PATH_SENDMAILPID=\\\"%{l_prefix}/var/sendmail/sendmail.pid\\\"')dnl" echo "APPENDDEF(\`confINCDIRS', \`-I%{l_prefix}/include')dnl" echo "APPENDDEF(\`confLIBDIRS', \`-L%{l_prefix}/lib')dnl" - echo "APPENDDEF(\`confLIBS', \`-ldb')dnl" + echo "APPENDDEF(\`confLIBS', \`-lfsl -ldb')dnl" echo "define(\`confSTDIO_TYPE', \`portable')dnl" echo "APPENDDEF(\`conf_sendmail_ENVDEF', \`-DSTARTTLS')dnl" echo "APPENDDEF(\`conf_sendmail_LIBS', \`-lssl -lcrypto')dnl"