[packages/opensmtpd] remove obsolete patches
glen
glen at pld-linux.org
Fri May 16 08:06:09 CEST 2014
commit 86c67e9a779835ceefa2a05ff18773cee7ca1b52
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Fri May 16 09:05:53 2014 +0300
remove obsolete patches
applied in
https://github.com/poolpOrg/OpenSMTPD/issues/348
chroot-path.patch | 11 -----------
makemap-paths.patch | 15 ---------------
opensmtpd.spec | 8 ++------
3 files changed, 2 insertions(+), 32 deletions(-)
---
diff --git a/opensmtpd.spec b/opensmtpd.spec
index cb8ae89..22d3001 100644
--- a/opensmtpd.spec
+++ b/opensmtpd.spec
@@ -7,7 +7,7 @@
Summary: Free implementation of the server-side SMTP protocol as defined by RFC 5321
Name: opensmtpd
Version: 5.4.2p1
-Release: 0.1
+Release: 0.2
License: ISC
Group: Daemons
Source0: https://www.opensmtpd.org/archives/%{name}-%{version}.tar.gz
@@ -16,8 +16,6 @@ Source1: %{name}.service
Source2: %{name}.init
Source3: %{name}.pam
Source4: aliases
-Patch0: chroot-path.patch
-Patch1: makemap-paths.patch
URL: http://www.opensmtpd.org/
BuildRequires: autoconf
BuildRequires: automake
@@ -60,9 +58,7 @@ part of the OpenBSD Project. The software is freely usable and
re-usable by everyone under an ISC license.
%prep
-%setup -q %{?prerelease: -n %{name}-%{prerelease}p1}
-%patch0 -p1
-%patch1 -p1
+%setup -q
%build
%{__aclocal}
diff --git a/chroot-path.patch b/chroot-path.patch
deleted file mode 100644
index 97235d2..0000000
--- a/chroot-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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"
- #endif
- #ifndef SMTPD_QUEUE_USER
- #define SMTPD_QUEUE_USER "_smtpq"
diff --git a/makemap-paths.patch b/makemap-paths.patch
deleted file mode 100644
index 8b3d55b..0000000
--- a/makemap-paths.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- opensmtpd-201310231634p1/mk/makemap/Makefile.am~ 2013-10-23 16:41:36.000000000 +0300
-+++ opensmtpd-201310231634p1/mk/makemap/Makefile.am 2013-11-03 01:28:42.542110133 +0200
-@@ -43,6 +43,12 @@
- CFLAGS+= -D_GNU_SOURCE
- CPPFLAGS= -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
-
-+PATHS= -DSMTPD_CONFDIR=\"$(sysconfdir)\" \
-+ -DPATH_SMTPCTL=\"$(sbindir)/smtpctl\" \
-+ -DPATH_MAILLOCAL=\"$(pkglibexecdir)/mail.local\" \
-+ -DPATH_FILTERS=\"$(pkglibexecdir)\" \
-+ -DPATH_TABLES=\"$(pkglibexecdir)\"
-+
- MANPAGES= makemap.8.out newaliases.8.out
- MANPAGES_IN= $(smtpd_srcdir)/makemap.8
- MANPAGES_IN+= $(smtpd_srcdir)/newaliases.8
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/opensmtpd.git/commitdiff/86c67e9a779835ceefa2a05ff18773cee7ca1b52
More information about the pld-cvs-commit
mailing list