From 48213ee680e68035782a2a206960b749a89bd167 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
Date: Tue, 26 Mar 2019 16:23:41 +0100
Subject: [PATCH] Fixed example chroot-update script   Resolves: rhbz#1398910

---
 postfix-3.4.4-chroot-example-fix.patch | 35 ++++++++++++++++++++++++++
 postfix.spec                           |  8 +++++-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 postfix-3.4.4-chroot-example-fix.patch

diff --git a/postfix-3.4.4-chroot-example-fix.patch b/postfix-3.4.4-chroot-example-fix.patch
new file mode 100644
index 0000000..5870b4c
--- /dev/null
+++ b/postfix-3.4.4-chroot-example-fix.patch
@@ -0,0 +1,35 @@
+--- a/examples/chroot-setup/LINUX2	2006-01-01 15:53:58.000000000 -0800
++++ b/examples/chroot-setup/LINUX2	2016-11-27 00:45:52.145301784 -0800
+@@ -45,14 +45,14 @@
+ # 20060101 /lib64 support by Keith Owens.
+ #
+ 
+-CP="cp -p"
++CP="cp -p -Z"
+ 
+ cond_copy() {
+   # find files as per pattern in $1
+   # if any, copy to directory $2
+   dir=`dirname "$1"`
+   pat=`basename "$1"`
+-  lr=`find "$dir" -maxdepth 1 -name "$pat"`
++  lr=`find "$dir/" -maxdepth 1 -name "$pat"`
+   if test ! -d "$2" ; then exit 1 ; fi
+   if test "x$lr" != "x" ; then $CP $1 "$2" ; fi
+ } 
+@@ -63,8 +63,8 @@
+ POSTFIX_DIR=${POSTFIX_DIR-/var/spool/postfix}
+ cd ${POSTFIX_DIR}
+ 
+-mkdir -p etc lib usr/lib/zoneinfo
+-test -d /lib64 && mkdir -p lib64
++mkdir -p -Z etc lib usr/lib/zoneinfo
++test -d /lib64 && mkdir -p -Z lib64
+ 
+ # find localtime (SuSE 5.3 does not have /etc/localtime)
+ lt=/etc/localtime
+@@ -88,4 +88,3 @@
+   cond_copy '/lib64/libdb.so*' lib64
+ fi
+ 
+-postfix reload
diff --git a/postfix.spec b/postfix.spec
index cbb1389..191e724 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -48,7 +48,7 @@
 Name: postfix
 Summary: Postfix Mail Transport Agent
 Version: 3.4.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 2
 URL: http://www.postfix.org
 License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+)
@@ -92,6 +92,7 @@ Patch4: postfix-3.4.0-large-fs.patch
 Patch9: pflogsumm-1.1.5-datecalc.patch
 # rhbz#1384871, sent upstream
 Patch10: pflogsumm-1.1.5-ipv6-warnings-fix.patch
+Patch11: postfix-3.4.4-chroot-example-fix.patch
 
 # Optional patches - set the appropriate environment variables to include
 #                    them when building the package/spec file
@@ -226,6 +227,7 @@ pushd pflogsumm-%{pflogsumm_ver}
 %patch10 -p1 -b .ipv6-warnings-fix
 popd
 %endif
+%patch11 -p1 -b .chroot-example-fix
 
 for f in README_FILES/TLS_{LEGACY_,}README TLS_ACKNOWLEDGEMENTS; do
 	iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
@@ -753,6 +755,10 @@ fi
 %endif
 
 %changelog
+* Tue Mar 26 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.4.4-2
+- Fixed example chroot-update script
+  Resolves: rhbz#1398910
+
 * Fri Mar 15 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.4.4-1
 - New version
   Resolves: rhbz#1689029