From 4c2489361d353db1a1815172a6143c8f5a2d1c40 Mon Sep 17 00:00:00 2001
From: Matt Domsch <matt@domsch.com>
Date: Wed, 20 Jan 2016 12:12:50 -0600
Subject: [PATCH] Update version to 1.6.1

---
 NEWS          |  8 ++++++++
 S3/PkgInfo.py |  2 +-
 s3cmd.1       | 15 ++++++++++++++-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 181719f17..e1909174b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+s3cmd-1.6.1      - 2016-01-20
+===============
+* Added --host and --host-bucket
+* Added --stats
+* Fix for newer python 2.7.x SSL library updates
+* Many other bug fixes
+
+
 s3cmd-1.6.0      - 2015-09-18
 ===============
 * Support signed URL content disposition type
diff --git a/S3/PkgInfo.py b/S3/PkgInfo.py
index 13de913a2..6c7c165bc 100644
--- a/S3/PkgInfo.py
+++ b/S3/PkgInfo.py
@@ -7,7 +7,7 @@
 ## Copyright: TGRMN Software and contributors
 
 package = "s3cmd"
-version = "1.6.0+"
+version = "1.6.1"
 url = "http://s3tools.org"
 license = "GNU GPL v2+"
 short_description = "Command line tool for managing Amazon S3 and CloudFront services"
diff --git a/s3cmd.1 b/s3cmd.1
index 30c74d7b9..06c63e327 100644
--- a/s3cmd.1
+++ b/s3cmd.1
@@ -331,6 +331,16 @@ us\-east\-1, us\-west\-1, us\-west\-2, eu\-west\-1, eu\-
 central\-1, ap\-northeast\-1, ap\-southeast\-1, ap\-
 southeast\-2, sa\-east\-1
 .TP
+\fB\-\-host\fR=HOSTNAME
+HOSTNAME:PORT for S3 endpoint (default:
+s3.amazonaws.com, alternatives such as s3\-eu\-
+west\-1.amazonaws.com). You should also set \fB\-\-host\-\fR
+bucket.
+.TP
+\fB\-\-host\-bucket\fR=HOST_BUCKET
+DNS\-style bucket+hostname:port template for accessing
+a bucket (default: %(bucket)s.s3.amazonaws.com)
+.TP
 \fB\-\-reduced\-redundancy\fR, \fB\-\-rr\fR
 Store object with 'Reduced redundancy'. Lower per\-GB
 price. [put, cp, mv]
@@ -449,6 +459,9 @@ Display progress meter (default on TTY).
 \fB\-\-no\-progress\fR
 Don't display progress meter (default on non-TTY).
 .TP
+\fB\-\-stats\fR
+Give some file-transfer stats.
+.TP
 \fB\-\-enable\fR
 Enable given CloudFront distribution (only for
 [cfmodify] command)
@@ -495,7 +508,7 @@ Enable verbose output.
 Enable debug output.
 .TP
 \fB\-\-version\fR
-Show s3cmd version (1.6.0) and exit.
+Show s3cmd version (1.6.1) and exit.
 .TP
 \fB\-F\fR, \fB\-\-follow\-symlinks\fR
 Follow symbolic links as if they are regular files