[openstack-swift/el6: 12/14] Merge branch 'master' into el6
Derek Higgins
derekh at fedoraproject.org
Tue Oct 9 11:33:12 UTC 2012
commit 1b0f413b5877a2233c1e3eec4d0bc311247af3cf
Merge: 088d2e3 d71beae
Author: Alan Pevec <apevec at redhat.com>
Date: Mon Oct 8 12:56:12 2012 +0200
Merge branch 'master' into el6
Conflicts:
.gitignore
openstack-swift.spec
openstack-swift.tmpfs
.gitignore | 2 +-
...pickle-for-serialization-in-memcache-but-.patch | 351 --------------------
...bug-where-serialization_format-is-ignored.patch | 70 ----
account-server.conf | 16 +
container-server.conf | 18 +
object-server.conf | 16 +
openstack-swift.spec | 48 +++-
openstack-swift.tmpfs | 6 +
proxy-server.conf | 39 +++
sources | 2 +-
swift.conf | 2 +
11 files changed, 138 insertions(+), 432 deletions(-)
---
diff --cc openstack-swift.spec
index 628ccd9,58f4d20..c36b918
--- a/openstack-swift.spec
+++ b/openstack-swift.spec
@@@ -10,29 -12,23 +12,33 @@@ Summary: OpenStack Object Stor
Group: Development/Languages
License: ASL 2.0
URL: http://launchpad.net/swift
- Source0: http://launchpad.net/swift/essex/%{version}/+download/swift-%{version}.tar.gz
+ Source0: http://launchpad.net/swift/folsom/%{version}/+download/swift-%{version}.tar.gz
+ #Source0: http://tarballs.openstack.org/swift/swift-%{version}~%{snaptag}.tar.gz
-Source2: %{name}-account.service
-Source21: %{name}-account at .service
+Source1: %{name}-functions
+Source2: %{name}-account.init
+ Source22: account-server.conf
-Source4: %{name}-container.service
-Source41: %{name}-container at .service
+Source200: %{name}-account.upstart
+Source4: %{name}-container.init
+ Source42: container-server.conf
-Source5: %{name}-object.service
-Source51: %{name}-object at .service
+Source400: %{name}-container.upstart
+Source5: %{name}-object.init
+ Source52: object-server.conf
-Source6: %{name}-proxy.service
+Source500: %{name}-object.upstart
+Source6: %{name}-proxy.init
+ Source61: proxy-server.conf
-Source20: %{name}.tmpfs
+Source600: %{name}-proxy.upstart
+ Source7: swift.conf
+
BuildRoot: %{_tmppath}/swift-%{version}-%{release}-root-%(%{__id_u} -n)
+#
- # patches_base=1.4.8
++# patches_base=1.7.4
+#
- Patch0001: 0001-Do-not-use-pickle-for-serialization-in-memcache-but-.patch
- Patch0002: 0002-Fix-bug-where-serialization_format-is-ignored.patch
+
+Patch990: openstack-swift-newdeps.patch
+Patch991: openstack-swift-docmod.patch
+Patch992: openstack-swift-nonet.patch
+
BuildArch: noarch
BuildRequires: dos2unix
BuildRequires: python-devel
@@@ -53,11 -46,16 +59,15 @@@ Requires: python-setuptool
Requires: python-netifaces
Requires: python-netifaces
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
-Requires(post): systemd-sysv
+Requires(post): chkconfig
+Requires(postun): initscripts
+Requires(preun): chkconfig
Requires(pre): shadow-utils
Obsoletes: openstack-swift-auth <= 1.4.0
+ # swift3 was split off in 1.5.0
+ Requires: openstack-swift-plugin-swift3
+ # swiftclient was split offf in 1.6.0
+ Requires: python-swiftclient
%description
OpenStack Object Storage (swift) aggregates commodity servers to work together
@@@ -143,13 -141,6 +153,11 @@@ This package contains documentation fil
%prep
%setup -q -n swift-%{version}
- %patch0001 -p1
- %patch0002 -p1
+
+%patch990 -p1 -b .newdeps
+%patch991 -p1 -b .docmod
+%patch992 -p1 -b .nonet
+
# Fix wrong-file-end-of-line-encoding warning
dos2unix LICENSE
@@@ -285,13 -341,14 +299,16 @@@ f
%{_mandir}/man1/swift.1*
%{_mandir}/man1/swift-get-nodes.1*
%{_mandir}/man1/swift-init.1*
+ %{_mandir}/man1/swift-orphans.1*
%{_mandir}/man1/swift-recon.1*
%{_mandir}/man1/swift-ring-builder.1*
+ %config(noreplace) %{_sysconfdir}/tmpfiles.d/openstack-swift.conf
+%dir %{_datarootdir}/%{name}/functions
+%dir %attr(0755, swift, swift) %{_localstatedir}/run/swift
%dir %{_sysconfdir}/swift
+ %config(noreplace) %attr(660, root, swift) %{_sysconfdir}/swift/swift.conf
+ %dir %attr(0755, swift, root) %{_localstatedir}/run/swift
%dir %{python_sitelib}/swift
- %{_bindir}/swift
%{_bindir}/swift-account-audit
%{_bindir}/swift-bench
%{_bindir}/swift-drive-audit
@@@ -321,7 -375,11 +338,9 @@@
%{_mandir}/man1/swift-account-reaper.1*
%{_mandir}/man1/swift-account-replicator.1*
%{_mandir}/man1/swift-account-server.1*
-%dir %{_unitdir}/%{name}-account.service
-%dir %{_unitdir}/%{name}-account at .service
%dir %{_sysconfdir}/swift/account-server
+ %config(noreplace) %attr(660, root, swift) %{_sysconfdir}/swift/account-server.conf
+ %dir %attr(0755, swift, root) %{_localstatedir}/run/swift/account-server
%{_bindir}/swift-account-auditor
%{_bindir}/swift-account-reaper
%{_bindir}/swift-account-replicator
@@@ -340,7 -395,11 +359,9 @@@
%{_mandir}/man1/swift-container-server.1*
%{_mandir}/man1/swift-container-sync.1*
%{_mandir}/man1/swift-container-updater.1*
-%dir %{_unitdir}/%{name}-container.service
-%dir %{_unitdir}/%{name}-container at .service
%dir %{_sysconfdir}/swift/container-server
+ %config(noreplace) %attr(660, root, swift) %{_sysconfdir}/swift/container-server.conf
+ %dir %attr(0755, swift, root) %{_localstatedir}/run/swift/container-server
%{_bindir}/swift-container-auditor
%{_bindir}/swift-container-server
%{_bindir}/swift-container-replicator
@@@ -351,16 -410,19 +372,20 @@@
%files object
%defattr(-,root,root,-)
%doc etc/object-server.conf-sample etc/rsyncd.conf-sample
+%dir %{_initrddir}/%{name}-object
+%{_datadir}/%{name}/%{name}-object.upstart
+%dir %attr(0755, swift, swift) %{_localstatedir}/run/swift/object-server
%{_mandir}/man5/object-server.conf.5*
+ %{_mandir}/man5/object-expirer.conf.5*
%{_mandir}/man1/swift-object-auditor.1*
+ %{_mandir}/man1/swift-object-expirer.1*
%{_mandir}/man1/swift-object-info.1*
%{_mandir}/man1/swift-object-replicator.1*
%{_mandir}/man1/swift-object-server.1*
%{_mandir}/man1/swift-object-updater.1*
-%dir %{_unitdir}/%{name}-object.service
-%dir %{_unitdir}/%{name}-object at .service
%dir %{_sysconfdir}/swift/object-server
+ %config(noreplace) %attr(660, root, swift) %{_sysconfdir}/swift/object-server.conf
+ %dir %attr(0755, swift, root) %{_localstatedir}/run/swift/object-server
%{_bindir}/swift-object-auditor
%{_bindir}/swift-object-info
%{_bindir}/swift-object-replicator
@@@ -371,12 -433,12 +396,14 @@@
%files proxy
%defattr(-,root,root,-)
%doc etc/proxy-server.conf-sample
+%dir %{_initrddir}/%{name}-proxy
+%{_datadir}/%{name}/%{name}-proxy.upstart
+%dir %attr(0755, swift, swift) %{_localstatedir}/run/swift/proxy-server
%{_mandir}/man5/proxy-server.conf.5*
%{_mandir}/man1/swift-proxy-server.1*
-%dir %{_unitdir}/%{name}-proxy.service
%dir %{_sysconfdir}/swift/proxy-server
+ %config(noreplace) %attr(660, root, swift) %{_sysconfdir}/swift/proxy-server.conf
+ %dir %attr(0755, swift, root) %{_localstatedir}/run/swift/proxy-server
%{_bindir}/swift-proxy-server
%{python_sitelib}/swift/proxy
@@@ -385,18 -447,26 +412,21 @@@
%doc LICENSE doc/build/html
%changelog
+ * Thu Sep 27 2012 Derek Higgins <derekh at redhat.com> - 1.7.4-1
+ - Update to 1.7.4
+
-* Thu Sep 20 2012 Derek Higgins <derekh at redhat.com> 1.7.2-1
-- Update to 1.7.2
-
-* Fri Sep 14 2012 Derek Higgins <derekh at redhat.com> 1.7.0-2
-- Adding config files
+* Thu Sep 27 2012 Derek Higgins <derekh at redhat.com> - 1.4.8-5
+- Do not use pickle for serialization in memcache (CVE-2012-4406)
+- include man pages rhbz#807172
-* Thu Sep 13 2012 Derek Higgins <derekh at redhat.com> 1.7.0-1
-- Update to 1.7.0
+* Mon Jun 25 2012 Alan Pevec <apevec at redhat.com> 1.4.8-4
+- add upstart jobs, alternative to sysv initscripts
-* Mon Aug 13 2012 Alan Pevec <apevec at redhat.com> 1.6.0-1
-- Update to 1.6.0
+* Tue May 01 2012 Pádraig Brady <P at draigBrady.com> 1.4.8-3
+- Start the services later in the boot sequence
-* Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Jun 15 2012 Alan Pevec <apevec at redhat.com> 1.5.0-1
-- Update to 1.5.0
+* Thu Apr 26 2012 Pádraig Brady <P at draigBrady.com> 1.4.8-2
+- Use parallel installed version of python-paste-deploy
* Thu Mar 22 2012 Alan Pevec <apevec at redhat.com> 1.4.8-1
- Update to 1.4.8
More information about the scm-commits
mailing list