From 636b014d4412345245822d33f040b091cb756f4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
Date: Mon, 12 Oct 2015 12:19:43 +0200
Subject: [PATCH] New version

  Resolves: rhbz#1270577
- Dropped reset-errno-before-readdir patch (upstreamed)
---
 ...fix-3.0.1-reset-errno-before-readdir.patch | 22 -------------------
 postfix.spec                                  | 13 ++++++-----
 sources                                       |  2 +-
 3 files changed, 8 insertions(+), 29 deletions(-)
 delete mode 100644 postfix-3.0.1-reset-errno-before-readdir.patch

diff --git a/postfix-3.0.1-reset-errno-before-readdir.patch b/postfix-3.0.1-reset-errno-before-readdir.patch
deleted file mode 100644
index c32248f..0000000
--- a/postfix-3.0.1-reset-errno-before-readdir.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-This patch comes from Mika Ilmaranta who attched it to the bug
-https://bugzilla.redhat.com/show_bug.cgi?id=1204139.
-
---- postfix-3.0.1/src/util/scan_dir.c	2015-04-21 20:44:19.985338673 +0300
-+++ postfix-3.0.1/src/util/scan_dir.c.reset-errno-before-readdir	2015-04-21 20:47:32.791855824 +0300
-@@ -78,6 +78,7 @@ 
- #endif
- #endif
- #include <string.h>
-+#include <errno.h>
- 
- /* Utility library. */
- 
-@@ -177,6 +178,8 @@ char   *scan_dir_next(SCAN_DIR *scan)
- #define STREQ(x,y)	(strcmp((x),(y)) == 0)
- 
-     if (info) {
-+	/* Some implementations report spurious errors. */
-+	errno = 0;
- 	while ((dp = readdir(info->dir)) != 0) {
- 	    if (STREQ(dp->d_name, ".") || STREQ(dp->d_name, "..")) {
- 		if (msg_verbose > 1)
diff --git a/postfix.spec b/postfix.spec
index dd2d18e..19cd415 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -41,8 +41,8 @@
 
 Name: postfix
 Summary: Postfix Mail Transport Agent
-Version: 3.0.2
-Release: 2%{?dist}
+Version: 3.0.3
+Release: 1%{?dist}
 Epoch: 2
 Group: System Environment/Daemons
 URL: http://www.postfix.org
@@ -85,9 +85,6 @@ Patch1: postfix-3.0.0-config.patch
 Patch2: postfix-3.0.0-files.patch
 Patch3: postfix-3.0.2-alternatives.patch
 Patch4: postfix-3.0.0-large-fs.patch
-# The patch below resets the global errno variable to 0 before calling
-# readdir(). This seems to fix bug rhbz#1204139
-Patch5: postfix-3.0.1-reset-errno-before-readdir.patch
 Patch9: pflogsumm-1.1.3-datecalc.patch
 
 # Optional patches - set the appropriate environment variables to include
@@ -212,7 +209,6 @@ maps with Postfix, you need this.
 %patch2 -p1 -b .files
 %patch3 -p1 -b .alternatives
 %patch4 -p1 -b .large-fs
-%patch5 -p1 -b .reset-errno-before-readdir
 
 # Change DEF_SHLIB_DIR according to build host
 sed -i \
@@ -732,6 +728,11 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Oct 12 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.0.3-1
+- New version
+  Resolves: rhbz#1270577
+- Dropped reset-errno-before-readdir patch (upstreamed)
+
 * Mon Sep 14 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.0.2-2
 - Fixed sysvinit conditionals
 
diff --git a/sources b/sources
index d8e7fe0..bfc24b5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 5e3fb28dfb5b7f4a8b6b9bf2abde9542  pflogsumm-1.1.3.tar.gz
-d1dc2c23011c222129db3d91aa4f312a  postfix-3.0.2.tar.gz
+61caffae689c11d09b4c972a394ae3b1  postfix-3.0.3.tar.gz