[packages/sendmail] - updated to 8.14.8 - updated config.m4, constant parts merged from .spec to source - some cleanups
qboosh
qboosh at pld-linux.org
Sat Feb 8 15:07:00 CET 2014
commit 0f645c738bb7946030815988f6d6e03458347b0a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Feb 8 15:08:51 2014 +0100
- updated to 8.14.8
- updated config.m4, constant parts merged from .spec to source
- some cleanups
sendmail-config.m4 | 5 ++++-
sendmail.spec | 26 ++++++++------------------
2 files changed, 12 insertions(+), 19 deletions(-)
---
diff --git a/sendmail.spec b/sendmail.spec
index 80ce7a9..05ea4de 100644
--- a/sendmail.spec
+++ b/sendmail.spec
@@ -3,7 +3,7 @@
# http://sourceforge.net/projects/sid-milter/
# http://www.sendmail.net/
# - http://blue-labs.org/clue/bluelabs.patch-8.12.3 has been updated upstream
-# - move compilation from install to build section, fix re-entrancy of install
+# - fix re-entrancy of install
# - add tests bcond and/or disable tests tha fail on (AC-)builders
#
# Conditional build:
@@ -22,12 +22,12 @@ Summary(ru.UTF-8): Почтовый транспортный агент sendmail
Summary(tr.UTF-8): Elektronik posta hizmetleri sunucusu
Summary(uk.UTF-8): Поштовий транспортний агент sendmail
Name: sendmail
-Version: 8.14.7
+Version: 8.14.8
Release: 1
License: BSD
Group: Networking/Daemons/SMTP
Source0: ftp://ftp.sendmail.org/pub/sendmail/%{name}.%{version}.tar.gz
-# Source0-md5: 348eedfab0ed00931f2df94e78f22c43
+# Source0-md5: 73bfc621c75dbdd3d719e54685d92577
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: %{name}.aliases
@@ -202,37 +202,27 @@ cp -p %{SOURCE7} config.m4
%endif
%build
+echo "define(\`confLIBSEARCHPATH', \`/%{_lib} %{_prefix}/%{_lib}')" >> config.m4
echo "define(\`confCC', \`%{__cc}')" >> config.m4
%ifarch sparc sparc64
echo "define(\`confOPTIMIZE', \`%{rpmcflags} -DUSE_VENDOR_CF_PATH=1 -DSM_CONF_SEM=0 -DNETINET6')" >> config.m4
%else
echo "define(\`confOPTIMIZE', \`%{rpmcflags} -DUSE_VENDOR_CF_PATH=1 -DNETINET6')" >> config.m4
%endif
-echo "APPENDDEF(\`confINCDIRS', \`-I/usr/include/sasl')" >> config.m4
-echo "define(\`confLIBSEARCHPATH', \`/%{_lib} %{_prefix}/%{_lib}')" >> config.m4
-echo "define(\`confLIBSEARCH', \`db resolv')" >> config.m4
-%if 0%{!?debug:1}
-echo "define(\`confLDOPTS', \`-s')" >> config.m4
-%endif
+echo "define(\`confLDOPTS', \`%{rpmldflags}')" >> config.m4
%if %{with ldap}
echo "APPENDDEF(\`confMAPDEF', \`-DLDAPMAP')" >> config.m4
echo "APPENDDEF(\`confLIBS', \`-lldap -llber')" >> config.m4
%endif
%if %{with pgsql}
-echo "APPENDDEF(\`confENVDEF', \`-DSASL')" >> config.m4
echo "APPENDDEF(\`confMAPDEF', \`-DPGSQLMAP')" >> config.m4
-echo "APPENDDEF(\`confLIBS', \`-lpq -lresolv')" >> config.m4
-echo "APPENDDEF(\`confLIBS', \`-lsasl -lcrypto')" >> config.m4
+echo "APPENDDEF(\`confLIBS', \`-lpq -lresolv -lcrypto')" >> config.m4
%endif
%if %{with tls}
echo "APPENDDEF(\`confENVDEF', \`-DSTARTTLS')" >> config.m4
-echo "APPENDDEF(\`confENVDEF', \`-D_FFR_DEAL_WITH_ERROR_SSL')" >> config.m4
echo "APPENDDEF(\`confLIBS', \`-lssl -lcrypto')" >> config.m4
-echo "APPENDDEF(\`confENVDEF', \`-D_FFR_SMTP_SSL')" >> config.m4
%endif
-echo "APPENDDEF(\`confENVDEF', \`-DMILTER')" >> config.m4
-
%ifarch sparc
%define Build sparc32 sh Build
%else
@@ -291,8 +281,8 @@ ln -sf %{_sbindir}/makemap $RPM_BUILD_ROOT%{_bindir}/makemap
# install the cf files
cd cf
-rm -f cf/{Build,Makefile}
-rm -f feature/*~ feature/*.orig
+%{__rm} cf/{Build,Makefile}
+find . -name '*~' -o -name '*.orig' | xargs -r %{__rm}
cp -a * $RPM_BUILD_ROOT%{_datadir}/sendmail-cf
cd -
diff --git a/sendmail-config.m4 b/sendmail-config.m4
index 1ae2ffb..1599491 100644
--- a/sendmail-config.m4
+++ b/sendmail-config.m4
@@ -1,11 +1,14 @@
define(`confMAPDEF', `-DNEWDB -DNIS')
-define(`confENVDEF', `-DXDEBUG=0')
+define(`confENVDEF', `-DXDEBUG=0 -DMILTER')
define(`confLIBS', `-lnsl')
+define(`confLIBSEARCH', `db resolv')
define(`confMANOWN', `root')
define(`confMANGRP', `root')
define(`confMANMODE', `644')
define(`confMAN1SRC', `1')
define(`confMAN5SRC', `5')
define(`confMAN8SRC', `8')
+define(`confSHAREDLIB_EXT', `.so')
APPENDDEF(`confENVDEF', -DSASL)
APPENDDEF(`conf_sendmail_LIBS', -lsasl)
+APPENDDEF(`confINCDIRS', `-I/usr/include/sasl')
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/sendmail.git/commitdiff/0f645c738bb7946030815988f6d6e03458347b0a
More information about the pld-cvs-commit
mailing list