Browse Source

updated 2 packages

sendmail-8.15.2-1
clamav-0.102.0-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12238 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 4 years ago
parent
commit
2c14797aaa
2 changed files with 96 additions and 14 deletions
  1. 21 8
      c/clamav/clamav-vl.spec
  2. 75 6
      s/sendmail/sendmail-vl.spec

+ 21 - 8
c/clamav/clamav-vl.spec

@@ -13,7 +13,7 @@
 Summary: Clam AntiVirus
 Summary(ja): Clamアンチウィルススキャナ
 Name: clamav
-Version: 0.101.4
+Version: 0.102.0
 Release: 1%{?_dist_release}
 License: GPL
 Group: Applications/System
@@ -33,6 +33,7 @@ BuildRequires: llvm-devel
 %endif
 %if %{?milter}
 BuildRequires: sendmail-devel
+#BuildRequires: sendmail-milter
 %endif
 Requires: logrotate
 Requires(pre): shadow-utils, grep
@@ -82,15 +83,24 @@ Clam AntiVirus.
 %prep
 %setup -q
 
-perl -pi -e 's|^#PidFile .+$|PidFile /var/run/clamav/clamd.pid|' etc/clamd.conf
-perl -pi -e 's|^#LogFile .+$|LogFile /var/log/clamav/clamd.log|' etc/clamd.conf
-perl -pi -e 's|^#PidFile .+$|PidFile /var/run/clamav/freshclam.pid|' etc/freshclam.conf
-perl -pi -e 's|^#UpdateLogFile .+$|UpdateLogFile /var/log/clamav/freshclam.log|' etc/freshclam.conf
-perl -pi -e 's|^#PidFile .+$|PidFile /var/run/clamav/clamav-milter.pid|' etc/clamav-milter.conf
-perl -pi -e 's|^#LogFile .+$|LogFile /var/log/clamav/clamav-milter.log|' etc/clamav-milter.conf
+perl -pi -e 's|^#PidFile .+$|PidFile /var/run/clamav/clamd.pid|' etc/clamd.conf.sample
+perl -pi -e 's|^#LogFile .+$|LogFile /var/log/clamav/clamd.log|' etc/clamd.conf.sample
+
+perl -pi -e 's|^#PidFile .+$|PidFile /var/run/clamav/freshclam.pid|' etc/freshclam.conf.sample
+perl -pi -e 's|^#UpdateLogFile .+$|UpdateLogFile /var/log/clamav/freshclam.log|' etc/freshclam.conf.sample
+
+%if %{?milter}
+perl -pi -e 's|^#PidFile .+$|PidFile /var/run/clamav/clamav-milter.pid|' etc/clamav-milter.conf.sample
+perl -pi -e 's|^#LogFile .+$|LogFile /var/log/clamav/clamav-milter.log|' etc/clamav-milter.conf.sample
+%endif
 
 %build
-CFLAGS=%{pcre_cflags} \
+%if %{?milter}
+export CLAMAV_MILTER_LIBS="-lpthread %{_libdir}/libmilter.a"
+export have_milter=yes
+%endif
+
+CFLAGS="%{pcre_cflags}" \
 %configure \
 	--disable-clamav \
 %if %{with external_llvm}
@@ -233,6 +243,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Fri Oct 04 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.102.0-1
+- new upstream release.
+
 * Thu Aug 22 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.101.4-1
 - new upstream release.
 

+ 75 - 6
s/sendmail/sendmail-vl.spec

@@ -1,3 +1,5 @@
+%bcond_with shared_libmilter
+
 # stop strip
 %define __spec_install_post /usr/lib/rpm/brp-compress || :
 
@@ -12,9 +14,9 @@
 Summary: A widely used Mail Transport Agent (MTA).
 Summary(ja): 広く使用されているメール配送エージェント (MTA)。
 Name: sendmail
-Version: 8.14.9
+Version: 8.15.2
 Release: 1%{?_dist_release}
-URL: http://www.sendmail.org/
+URL: https://www.proofpoint.com/us/open-source-email-solution
 License: Sendmail
 Group: System Environment/Daemons
 Provides: smtpdaemon
@@ -34,10 +36,16 @@ Source11: Sendmail-sasl2.conf
 #Patch1: sendmail-8.12.11-smrsh-paths.patch
 Patch2: sendmail-8.12.10-movefiles.patch
 Patch3: sendmail-8.14.9-pid.vine.patch
-Patch4: sendmail-8.12.7-manpage.patch
+Patch4: sendmail-8.15.1-manpage.patch
 #Patch5: sendmail-8.13.0-dynamic.patch
 Patch6: sendmail-8.13.0-cyrus.patch
 #Patch7: sendmail-8.13.1-parseaddr.c.cataddr.8.379.patch
+Patch8: sendmail-8.15.2-gethostbyname2.patch
+Patch9: sendmail-8.14.3-sharedmilter.patch
+Patch10: sendmail-8.15.2-openssl-1.1.0-fix.patch
+Patch11: sendmail-8.15.2-openssl-1.1.0-ecdhe-fix.patch
+Patch12: sendmail-8.15.2-libmilter-socket-activation.patch
+
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: db4-devel, tcp_wrappers
 #Provides: %{_sbindir}/sendmail %{_bindir}/mailq %{_bindir}/newaliases
@@ -112,6 +120,9 @@ Summary: Extra development include files for sendmail
 Summary(ja): sendmail拡張のためのインクルードファイル
 Group: Development/Libraries
 Requires: %{name}-static == %{version}-%{release}
+%if %{with shared_libmilter}
+Requires: %{name}-milter == %{version}-%{release}
+%endif
 
 %description devel
 Include files for addons of sendmail.
@@ -130,6 +141,21 @@ Development libraries for addons of sendmail.
 %description static -l ja
 sendmail拡張機能の開発のためのライブラリです。
 
+%if %{with shared_libmilter}
+%package milter
+Summary: The sendmail milter library
+Summary(ja): sendmail milterライブラリ
+Group: Development/Libraries
+
+%description milter
+The sendmail Mail Filter API (Milter) is designed to allow third-party
+programs access to mail messages as they are being processed in order to
+filter meta-information and content.
+
+This package includes the milter shared library.
+%endif
+
+
 %package cf
 Summary: The files needed to reconfigure Sendmail.
 Summary(ja): Sendmailの再設定に必要なファイル
@@ -157,6 +183,17 @@ your sendmail.cf file.
 #%patch5 -p1 -b .dynamic
 %patch6 -p1 -b .cyrus
 #%patch7 -p1 -b .cataddr
+%patch8 -p1 -b .gethostbyname
+
+%if %{with shared_libmilter}
+cp devtools/M4/UNIX/{,shared}library.m4
+%patch9 -p1 -b .sharedmilter
+%endif
+
+%patch10 -p1 -b .openssl111
+%patch11 -p1 -b .openssl_ecdhe
+%patch12 -p1 -b .milter_socket
+
 
 perl -pi -e 's|/usr/share/sendmail-cf/m4|../m4|' ./cf/cf/submit.mc
 
@@ -196,7 +233,7 @@ EOF
 
 %if %{with_tls}
 cat >> devtools/Site/site.config.m4 << EOF
-APPENDDEF(\`conf_sendmail_ENVDEF', \`-DSTARTTLS')dnl
+APPENDDEF(\`conf_sendmail_ENVDEF', \`-DSTARTTLS -D_FFR_TLS_1 -D_FFR_TLS_EC -D_FFR_TLS_USE_CERTIFICATE_CHAIN_FILE')dnl
 APPENDDEF(\`conf_sendmail_LIBS', \`-lssl -lcrypto')dnl
 EOF
 %endif
@@ -305,6 +342,8 @@ for f in hoststat mailq newaliases purgestat ; do
 done
 install -d -m 755 $RPM_BUILD_ROOT/etc/smrsh
 
+rm -f %{buildroot}/rootfile
+
 cat <<EOF > $RPM_BUILD_ROOT/etc/mail/access
 # Check the /usr/share/doc/sendmail/README.cf file for a description
 # of the format of this file. (search for access_db in that file)
@@ -346,8 +385,18 @@ install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_libdir}/sasl/Sendmail.conf
 
 install -m 644 %{SOURCE8} $RPM_BUILD_ROOT/etc/pam.d/smtp
 
-install -m 755 -d $RPM_BUILD_ROOT%{_libdir}
-install -m 644 $OBJDIR/libmilter/libmilter.a $RPM_BUILD_ROOT%{_libdir}
+install -d -m 755 %{buildroot}%{_libdir}
+# fix location of libmilter
+%if %{with shared_libmilter}
+%ifarch x86_64
+mv -f %{buildroot}/usr/lib/libmilter.so* %{buildroot}%{_libdir}/
+%endif
+chmod +x %{buildroot}%{_libdir}/libmilter.so.*
+%else
+%ifarch x86_64
+mv -f %{buildroot}/usr/lib/libmilter.a %{buildroot}%{_libdir}/
+%endif
+%endif
 install -m 644 $OBJDIR/libsmutil/libsmutil.a $RPM_BUILD_ROOT%{_libdir}
 install -m 644 $OBJDIR/libsm/libsm.a         $RPM_BUILD_ROOT%{_libdir}
 
@@ -502,19 +551,39 @@ exit 0
 
 %files devel
 %defattr(-,root,root)
+%doc libmilter/docs/*
+%dir %{_includedir}/libmilter
 %{_includedir}/libmilter/*.h
+%if %{with shared_libmilter}
+%{_libdir}/libmilter.so
+%endif
 
 %files static
 %defattr(-,root,root)
+%if %{without shared_libmilter}
 %{_libdir}/libmilter.a
+%endif
 %{_libdir}/libsmutil.a
 %{_libdir}/libsm.a
 
+%if %{with shared_libmilter}
+%files milter
+%doc LICENSE
+%doc libmilter/README
+%{_libdir}/libmilter.so.[0-9].[0-9]
+%{_libdir}/libmilter.so.[0-9].[0-9].[0-9]
+%endif
+
 %files doc
 %defattr(-,root,root)
 %{_docdir}/sendmail
 
 %changelog
+* Fri Oct 04 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.15.2-1
+- updated to 8.15.2.
+- updated Patch4.
+- added Patch8-12.
+
 * Mon Dec 29 2014 IWAI, Masaharu <iwaim.sub@gmail.com> 8.14.9-1
 - update to 8.14.9
 - update PID patch (Patch3)