From 7c1f7555a1679c97c22e16b30f4520765cd29802 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Fri, 16 May 2014 08:59:23 +0300 Subject: [PATCH] up to 5.4.2p1 --- chroot-path.patch | 14 +++++++------- opensmtpd.spec | 38 ++++++++++++++++++-------------------- 2 files changed, 25 insertions(+), 27 deletions(-) diff --git a/chroot-path.patch b/chroot-path.patch index 5947f24..97235d2 100644 --- a/chroot-path.patch +++ b/chroot-path.patch @@ -1,11 +1,11 @@ ---- opensmtpd-201310231634p1/smtpd/smtpd-defines.h~ 2013-10-23 16:41:36.000000000 +0300 -+++ opensmtpd-201310231634p1/smtpd/smtpd-defines.h 2013-11-03 01:19:09.536801945 +0200 -@@ -31,7 +31,7 @@ - #ifndef SMTPD_USER - #define SMTPD_USER "_smtpd" +--- opensmtpd-5.4.2p1/smtpd/smtpd-defines.h~ 2014-03-04 11:49:09.000000000 +0200 ++++ opensmtpd-5.4.2p1/smtpd/smtpd-defines.h 2014-05-16 08:35:53.999689310 +0300 +@@ -32,7 +32,7 @@ + #define SMTPD_USER "_smtpd" #endif + #ifndef PATH_CHROOT -#define PATH_CHROOT "/var/empty" +#define PATH_CHROOT "/usr/share/empty" - #ifndef SMTPD_QUEUE_USER - #define SMTPD_QUEUE_USER "_smtpq" #endif + #ifndef SMTPD_QUEUE_USER + #define SMTPD_QUEUE_USER "_smtpq" diff --git a/opensmtpd.spec b/opensmtpd.spec index 7746b2e..cb8ae89 100644 --- a/opensmtpd.spec +++ b/opensmtpd.spec @@ -4,17 +4,14 @@ # Conditional build: %bcond_without pam # build without PAM support -%define rel 0.4 -%define prerelease 201310231634 Summary: Free implementation of the server-side SMTP protocol as defined by RFC 5321 Name: opensmtpd -Version: 5.3.3p1 -Release: 0.%{prerelease}.%{rel} +Version: 5.4.2p1 +Release: 0.1 License: ISC Group: Daemons -#Source0: http://www.opensmtpd.org/archives/%{name}-%{version}.tar.gz -Source0: http://www.opensmtpd.org/archives/%{name}-%{prerelease}p1.tar.gz -# Source0-md5: d4c28a45527356fbec19853220e3688d +Source0: https://www.opensmtpd.org/archives/%{name}-%{version}.tar.gz +# Source0-md5: c76b39a5fcc0ad05eea541e74b16e62a Source1: %{name}.service Source2: %{name}.init Source3: %{name}.pam @@ -160,16 +157,17 @@ fi %{_mandir}/man8/smtpctl.8* %{_mandir}/man8/smtpd.8* %dir %{_libdir}/%{name} -%dir %{_libdir}/%{name}/smtpd -%attr(755,root,root) %{_libdir}/%{name}/smtpd/backend-queue-null -%attr(755,root,root) %{_libdir}/%{name}/smtpd/backend-queue-ram -%attr(755,root,root) %{_libdir}/%{name}/smtpd/backend-queue-stub -%attr(755,root,root) %{_libdir}/%{name}/smtpd/backend-scheduler-ram -%attr(755,root,root) %{_libdir}/%{name}/smtpd/backend-scheduler-stub -%attr(755,root,root) %{_libdir}/%{name}/smtpd/filter-dnsbl -%attr(755,root,root) %{_libdir}/%{name}/smtpd/filter-monkey -%attr(755,root,root) %{_libdir}/%{name}/smtpd/filter-stub -%attr(755,root,root) %{_libdir}/%{name}/smtpd/filter-trace -%attr(755,root,root) %{_libdir}/%{name}/smtpd/mail.local -%attr(755,root,root) %{_libdir}/%{name}/smtpd/table-passwd -%attr(755,root,root) %{_libdir}/%{name}/smtpd/table-stub +%dir %{_libdir}/%{name}/opensmtpd +%attr(755,root,root) %{_libdir}/%{name}/opensmtpd/encrypt +%attr(755,root,root) %{_libdir}/%{name}/opensmtpd/filter-dnsbl +%attr(755,root,root) %{_libdir}/%{name}/opensmtpd/filter-monkey +%attr(755,root,root) %{_libdir}/%{name}/opensmtpd/filter-stub +%attr(755,root,root) %{_libdir}/%{name}/opensmtpd/filter-trace +%attr(755,root,root) %{_libdir}/%{name}/opensmtpd/mail.local +%attr(755,root,root) %{_libdir}/%{name}/opensmtpd/queue-null +%attr(755,root,root) %{_libdir}/%{name}/opensmtpd/queue-ram +%attr(755,root,root) %{_libdir}/%{name}/opensmtpd/queue-stub +%attr(755,root,root) %{_libdir}/%{name}/opensmtpd/scheduler-ram +%attr(755,root,root) %{_libdir}/%{name}/opensmtpd/scheduler-stub +%attr(755,root,root) %{_libdir}/%{name}/opensmtpd/table-passwd +%attr(755,root,root) %{_libdir}/%{name}/opensmtpd/table-stub -- 2.44.0