[openstack-swift] Update to upstream 2.0.0
Pete Zaitcev
zaitcev at fedoraproject.org
Fri Jul 11 01:16:50 UTC 2014
commit 0d6e8e3929c3cf9c00f19b405c9b965b21b272cc
Author: Pete Zaitcev <zaitcev at kotori.zaitcev.us>
Date: Thu Jul 10 18:08:42 2014 -0600
Update to upstream 2.0.0
.gitignore | 1 +
0001-remove-runtime-requirement-on-pbr.patch | 2 +-
0002-Add-fixes-for-building-the-doc-package.patch | 2 +-
0003-Set-permissions-on-generated-ring-files.patch | 59 ------------
...perly-quote-www-authenticate-header-value.patch | 95 --------------------
container-reconciler.conf | 52 +++++++++++
openstack-swift-container-reconciler.service | 11 +++
openstack-swift.spec | 26 ++++--
sources | 2 +-
9 files changed, 84 insertions(+), 166 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 46b0175..da891d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
/swift-1.12.0.tar.gz
/swift-1.13.1.rc2.tar.gz
/swift-1.13.1.tar.gz
+/swift-2.0.0.tar.gz
diff --git a/0001-remove-runtime-requirement-on-pbr.patch b/0001-remove-runtime-requirement-on-pbr.patch
index f1099c2..58de7c0 100644
--- a/0001-remove-runtime-requirement-on-pbr.patch
+++ b/0001-remove-runtime-requirement-on-pbr.patch
@@ -1,4 +1,4 @@
-From 6661a95cc27bc3e66b524cd81aa4b49ca2551a1b Mon Sep 17 00:00:00 2001
+From 313afecd7a7292958d9b4b3935cc2b508d717340 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P at draigBrady.com>
Date: Wed, 9 Oct 2013 12:38:40 +0100
Subject: [PATCH] remove runtime requirement on pbr
diff --git a/0002-Add-fixes-for-building-the-doc-package.patch b/0002-Add-fixes-for-building-the-doc-package.patch
index a216e36..896a142 100644
--- a/0002-Add-fixes-for-building-the-doc-package.patch
+++ b/0002-Add-fixes-for-building-the-doc-package.patch
@@ -1,4 +1,4 @@
-From c16135a834bbe0551e75824d2c029a0bc9cf447a Mon Sep 17 00:00:00 2001
+From 435c3d3eff4700dae9a5c026c1bcdea7f28dec56 Mon Sep 17 00:00:00 2001
From: Alan Pevec <apevec at redhat.com>
Date: Thu, 5 Jan 2012 00:03:00 +0100
Subject: [PATCH] Add fixes for building the doc package
diff --git a/container-reconciler.conf b/container-reconciler.conf
new file mode 100644
index 0000000..0a3de02
--- /dev/null
+++ b/container-reconciler.conf
@@ -0,0 +1,52 @@
+[DEFAULT]
+# swift_dir = /etc/swift
+# user = swift
+# You can specify default log routing here if you want:
+# log_name = swift
+# log_facility = LOG_LOCAL0
+# log_level = INFO
+# log_address = /dev/log
+#
+# comma separated list of functions to call to setup custom log handlers.
+# functions get passed: conf, name, log_to_console, log_route, fmt, logger,
+# adapted_logger
+# log_custom_handlers =
+#
+# If set, log_udp_host will override log_address
+# log_udp_host =
+# log_udp_port = 514
+#
+# You can enable StatsD logging here:
+# log_statsd_host = localhost
+# log_statsd_port = 8125
+# log_statsd_default_sample_rate = 1.0
+# log_statsd_sample_rate_factor = 1.0
+# log_statsd_metric_prefix =
+
+[container-reconciler]
+# The reconciler will re-attempt reconciliation if the source object is not
+# available up to reclaim_age seconds before it gives up and deletes the entry
+# in the queue.
+# reclaim_age = 604800
+# The cycle time of the daemon
+# interval = 300
+# Server errors from requests will be retried by default
+# request_tries = 3
+
+[pipeline:main]
+pipeline = catch_errors proxy-logging cache proxy-server
+
+[app:proxy-server]
+use = egg:swift#proxy
+# See proxy-server.conf-sample for options
+
+[filter:cache]
+use = egg:swift#memcache
+# See proxy-server.conf-sample for options
+
+[filter:proxy-logging]
+use = egg:swift#proxy_logging
+
+[filter:catch_errors]
+use = egg:swift#catch_errors
+# See proxy-server.conf-sample for options
diff --git a/openstack-swift-container-reconciler.service b/openstack-swift-container-reconciler.service
new file mode 100644
index 0000000..f233451
--- /dev/null
+++ b/openstack-swift-container-reconciler.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=OpenStack Object Storage (swift) - Container Reconciler
+After=syslog.target network.target
+
+[Service]
+Type=simple
+User=swift
+ExecStart=/usr/bin/swift-container-reconciler /etc/swift/container-reconciler.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/openstack-swift.spec b/openstack-swift.spec
index 17a1dca..517888c 100644
--- a/openstack-swift.spec
+++ b/openstack-swift.spec
@@ -6,14 +6,16 @@
%global milestone ...
Name: openstack-swift
-Version: 1.13.1
-Release: 5%{?dist}
+Version: 2.0.0
+Release: 1%{?dist}
Summary: OpenStack Object Storage (Swift)
Group: Development/Languages
License: ASL 2.0
URL: http://launchpad.net/swift
-Source0: http://launchpad.net/swift/%{release_name}/%{version}/+download/swift-%{version}.tar.gz
+# Terry is sometimes slow updating Launchpad, so we're switching to OpenStack.
+#Source0: http://launchpad.net/swift/#{release_name}/#{version}/+download/swift-#{version}.tar.gz
+Source0: http://tarballs.openstack.org/swift/swift-%{version}.tar.gz
Source2: %{name}-account.service
Source21: %{name}-account at .service
@@ -43,20 +45,20 @@ Source56: %{name}-object-auditor at .service
Source57: %{name}-object-updater.service
Source58: %{name}-object-updater at .service
Source59: %{name}-object-expirer.service
-# Is it possible to supply an instance-style expirer unit for single-node?
+Source63: %{name}-container-reconciler.service
Source6: %{name}-proxy.service
Source61: proxy-server.conf
Source62: object-expirer.conf
+Source64: container-reconciler.conf
Source20: %{name}.tmpfs
Source7: swift.conf
+## Based at https://github.com/redhat-openstack/swift/
#
-# patches_base=1.13.1
+# patches_base=2.0.0
#
Patch0001: 0001-remove-runtime-requirement-on-pbr.patch
Patch0002: 0002-Add-fixes-for-building-the-doc-package.patch
-Patch0003: 0003-Set-permissions-on-generated-ring-files.patch
-Patch0004: 0004-properly-quote-www-authenticate-header-value.patch
BuildArch: noarch
BuildRequires: python-devel
@@ -165,8 +167,6 @@ This package contains documentation files for %{name}.
%patch0001 -p1
%patch0002 -p1
-%patch0003 -p1
-%patch0004 -p1
#sed -i 's/%{version}.%{milestone}/%{version}/' PKG-INFO
@@ -225,6 +225,7 @@ install -p -D -m 755 %{SOURCE56} %{buildroot}%{_unitdir}/%{name}-object-auditor@
install -p -D -m 755 %{SOURCE57} %{buildroot}%{_unitdir}/%{name}-object-updater.service
install -p -D -m 755 %{SOURCE58} %{buildroot}%{_unitdir}/%{name}-object-updater at .service
install -p -D -m 755 %{SOURCE59} %{buildroot}%{_unitdir}/%{name}-object-expirer.service
+install -p -D -m 755 %{SOURCE63} %{buildroot}%{_unitdir}/%{name}-container-reconciler.service
install -p -D -m 755 %{SOURCE6} %{buildroot}%{_unitdir}/%{name}-proxy.service
# Remove tests
rm -fr %{buildroot}/%{python_sitelib}/test
@@ -240,6 +241,7 @@ install -p -D -m 660 %{SOURCE42} %{buildroot}%{_sysconfdir}/swift/container-serv
install -p -D -m 660 %{SOURCE52} %{buildroot}%{_sysconfdir}/swift/object-server.conf
install -p -D -m 660 %{SOURCE61} %{buildroot}%{_sysconfdir}/swift/proxy-server.conf
install -p -D -m 660 %{SOURCE62} %{buildroot}%{_sysconfdir}/swift/object-expirer.conf
+install -p -D -m 660 %{SOURCE64} %{buildroot}%{_sysconfdir}/swift/container-reconciler.conf
install -p -D -m 660 %{SOURCE7} %{buildroot}%{_sysconfdir}/swift/swift.conf
# Install pid directory
install -d -m 755 %{buildroot}%{_localstatedir}/run/swift
@@ -454,12 +456,15 @@ exit 0
%{_mandir}/man5/proxy-server.conf.5*
%{_mandir}/man1/swift-object-expirer.1*
%{_mandir}/man1/swift-proxy-server.1*
+%{_unitdir}/%{name}-container-reconciler.service
%{_unitdir}/%{name}-object-expirer.service
%{_unitdir}/%{name}-proxy.service
%dir %{_sysconfdir}/swift/proxy-server
+%config(noreplace) %attr(640, root, swift) %{_sysconfdir}/swift/container-reconciler.conf
%config(noreplace) %attr(640, root, swift) %{_sysconfdir}/swift/proxy-server.conf
%config(noreplace) %attr(640, root, swift) %{_sysconfdir}/swift/object-expirer.conf
%dir %attr(0755, swift, root) %{_localstatedir}/run/swift/proxy-server
+%{_bindir}/swift-container-reconciler
%{_bindir}/swift-object-expirer
%{_bindir}/swift-proxy-server
%{python_sitelib}/swift/proxy
@@ -469,6 +474,9 @@ exit 0
%doc LICENSE doc/build/html
%changelog
+* Thu Jul 10 2014 Pete Zaitcev <zaitcev at redhat.com> - 2.0.0-1
+- Update to upstream 2.0.0, re-apply our patches
+
* Fri Jun 27 2014 Pete Zaitcev <zaitcev at redhat.com> - 1.13.1-5
- Fix CVE-2014-3497, unquoted realm in WWW-Authenticate
diff --git a/sources b/sources
index 6900b2d..81f30c5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a91eb8795dc0ae7eba5f2b13bde637d3 swift-1.13.1.tar.gz
+b8cebbec5a3cb5a4260d4769edc2034b swift-2.0.0.tar.gz
More information about the scm-commits
mailing list