From b96aa7f47713d081e73b995a220c94f598037b7b Mon Sep 17 00:00:00 2001
From: Garrett Holmstrom <gholms@devzero.com>
Date: Wed, 22 Jun 2016 17:50:32 -0700
Subject: [PATCH] Add aws-exec-read to S3's canned ACL list

https://github.com/boto/boto/pull/3332
---
 boto-2.40.0-aws-exec-read.patch | 13 +++++++++++++
 python-boto.spec                |  6 ++++++
 2 files changed, 19 insertions(+)
 create mode 100644 boto-2.40.0-aws-exec-read.patch

diff --git a/boto-2.40.0-aws-exec-read.patch b/boto-2.40.0-aws-exec-read.patch
new file mode 100644
index 0000000..39b0a8f
--- /dev/null
+++ b/boto-2.40.0-aws-exec-read.patch
@@ -0,0 +1,13 @@
+Index: boto-2.40.0/boto/s3/acl.py
+===================================================================
+--- boto-2.40.0.orig/boto/s3/acl.py
++++ boto-2.40.0/boto/s3/acl.py
+@@ -25,7 +25,7 @@ from boto.s3.user import User
+ CannedACLStrings = ['private', 'public-read',
+                     'public-read-write', 'authenticated-read',
+                     'bucket-owner-read', 'bucket-owner-full-control',
+-                    'log-delivery-write']
++                    'log-delivery-write', 'aws-exec-read']
+ 
+ 
+ class Policy(object):
diff --git a/python-boto.spec b/python-boto.spec
index 5673890..6f500e5 100644
--- a/python-boto.spec
+++ b/python-boto.spec
@@ -47,6 +47,10 @@ Patch3:         boto-2.40.0-sigv4-protocol.patch
 # https://github.com/boto/boto/pull/3508
 Patch4:         boto-2.40.0-retry-float.patch
 
+# Add aws-exec-read to S3's canned ACL list
+# https://github.com/boto/boto/pull/3332
+Patch5:         boto-2.40.0-aws-exec-read.patch
+
 BuildRequires:  python2-devel
 BuildRequires:  python-setuptools
 BuildRequires:  python-six
@@ -130,6 +134,7 @@ cloud systems like Eucalyptus, OpenStack and Open Nebula.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 rm -r boto/vendored
 
@@ -193,6 +198,7 @@ mv $RPM_BUILD_ROOT/%{_bindir} examples
 - Added NAT gateway support
 - Fixed sigv4 protocol selection
 - Fixed max_retry_delay config option
+- Added aws-exec-read to S3's canned ACL list
 
 * Mon May 23 2016 Jon Ciesla <limburgher@gmail.com> - 2.40.0-1
 - 2.40.0.