[openshift-origin-broker] update to latest release

Tue Mar 12 21:03:50 UTC 2013

commit 49f78207e07dc98b4b94528f8d7fe580a196fb16
Author: Troy Dawson <tdawson at redhat.com>
Date:   Tue Mar 12 16:03:44 2013 -0500

    update to latest release

 .gitignore                                         |    1 +
 ...-origin-broker-1.4.1-gemfile-dependancies.patch |   25 -----
 ...-origin-broker-1.5.1-gemfile-dependancies.patch |   27 ++++++
 openshift-origin-broker.spec                       |   98 ++++++++++++++++----
 sources                                            |    2 +-
 5 files changed, 110 insertions(+), 43 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 287bc9a..777cc8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /openshift-origin-broker-1.1.1.tar.gz
 /openshift-origin-broker-1.1.2.tar.gz
 /openshift-origin-broker-1.4.1.tar.gz
+/openshift-origin-broker-1.5.1.tar.gz
diff --git a/openshift-origin-broker-1.5.1-gemfile-dependancies.patch b/openshift-origin-broker-1.5.1-gemfile-dependancies.patch
new file mode 100644
index 0000000..24c9783
--- /dev/null
+++ b/openshift-origin-broker-1.5.1-gemfile-dependancies.patch
@@ -0,0 +1,27 @@
+diff -ur openshift-origin-broker-1.5.1.orig/Gemfile openshift-origin-broker-1.5.1/Gemfile
+--- openshift-origin-broker-1.5.1.orig/Gemfile	2013-02-28 21:30:38.000000000 -0600
++++ openshift-origin-broker-1.5.1/Gemfile	2013-03-12 16:00:20.005000000 -0500
+@@ -1,8 +1,8 @@
+ source 'http://rubygems.org'
+ 
+-gem 'rails', '~> 3.2.8'
++gem 'rails'
+ gem 'json'
+-gem 'parseconfig', '0.5.2'
++gem 'parseconfig'
+ gem 'xml-simple'
+ gem 'rack'
+ gem 'regin'
+@@ -49,9 +49,9 @@
+ # and rake tasks are available in development mode:
+ group :development, :test do
+   # The require part from http://tinyurl.com/3pf68ho
+-  gem 'rest-client', '1.6.1', :require => 'rest-client'
+-  gem 'mocha', '0.12.1', :require => nil
+-  gem 'rake', '>= 0.8.7', '<= 0.9.2.2'
++  gem 'rest-client', :require => 'rest-client'
++  gem 'mocha'
++  gem 'rake'
+   gem 'simplecov'
+   gem 'cucumber'
+ end
diff --git a/openshift-origin-broker.spec b/openshift-origin-broker.spec
index e6186a6..e2725fd 100644
--- a/openshift-origin-broker.spec
+++ b/openshift-origin-broker.spec
@@ -9,31 +9,38 @@
 
 Summary:       OpenShift Origin broker components
 Name:          openshift-origin-broker
-Version:       1.4.1
+Version:       1.5.1
 Release:       1%{?dist}
 License:       ASL 2.0
 URL:           http://openshift.redhat.com
 Source0:       http://mirror.openshift.com/pub/openshift-origin/source/%{name}/%{name}-%{version}.tar.gz
 # Example blank favicon - upstream currently does not ship one 
 Source1:       %{name}.favicon
-Patch1:        openshift-origin-broker-1.4.1-gemfile-dependancies.patch
+Patch1:        openshift-origin-broker-1.5.1-gemfile-dependancies.patch
 Requires:      httpd
 Requires:      bind
 Requires:      mod_ssl
-Requires:      mod_passenger
 Requires:      mongodb-server
+Requires:      openshift-origin-util
 Requires:      policycoreutils-python
-Requires:      rubygem(rails)
-Requires:      rubygem(xml-simple)
-Requires:      rubygem(bson_ext)
-Requires:      rubygem(rest-client)
-Requires:      rubygem(parseconfig)
-Requires:      rubygem(cucumber)
-Requires:      rubygem(json)
 Requires:      rubygem(openshift-origin-controller)
-Requires:      rubygem(passenger)
-Requires:      rubygem(mocha)
-Requires:      rubygem-passenger-native
+Requires:      %{?scl:%scl_prefix}mod_passenger
+Requires:      %{?scl:%scl_prefix}rubygem(bson_ext)
+Requires:      %{?scl:%scl_prefix}rubygem(cucumber)
+Requires:      %{?scl:%scl_prefix}rubygem(dnsruby)
+Requires:      %{?scl:%scl_prefix}rubygem(json)
+Requires:      %{?scl:%scl_prefix}rubygem(minitest)
+Requires:      %{?scl:%scl_prefix}rubygem(mongo)
+Requires:      %{?scl:%scl_prefix}rubygem(open4)
+Requires:      %{?scl:%scl_prefix}rubygem(parseconfig)
+Requires:      %{?scl:%scl_prefix}rubygem-passenger
+Requires:      %{?scl:%scl_prefix}rubygem-passenger-native
+Requires:      %{?scl:%scl_prefix}rubygem(rails)
+Requires:      %{?scl:%scl_prefix}rubygem(regin)
+Requires:      %{?scl:%scl_prefix}rubygem(rest-client)
+Requires:      %{?scl:%scl_prefix}rubygem(simplecov)
+Requires:      %{?scl:%scl_prefix}rubygem(systemu)
+Requires:      %{?scl:%scl_prefix}rubygem(xml-simple)
 %if %{with_systemd}
 Requires:      systemd-units
 BuildRequires: systemd-units
@@ -84,8 +91,8 @@ ln -s %{brokerdir}/public %{buildroot}%{htmldir}/broker
 ln -s %{brokerdir}/public %{buildroot}%{brokerdir}/httpd/root/broker
 ln -sf %{_sysconfdir}/httpd/modules %{buildroot}%{brokerdir}/httpd/modules
 ln -sf /etc/httpd/conf/magic %{buildroot}%{brokerdir}/httpd/conf/magic
-mv %{buildroot}%{brokerdir}/httpd/000000_openshift_origin_broker_proxy.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/
-mv %{buildroot}%{brokerdir}/httpd/000000_openshift_origin_broker_servername.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/
+mv %{buildroot}%{brokerdir}/httpd/000002_openshift_origin_broker_proxy.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/
+mv %{buildroot}%{brokerdir}/httpd/000002_openshift_origin_broker_servername.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/
 
 mkdir -p %{buildroot}%{_var}/log/openshift/broker/httpd
 
@@ -150,8 +157,8 @@ done
 %{htmldir}/broker
 %config %{brokerdir}/config/environments/production.rb
 %config %{brokerdir}/config/environments/development.rb
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/000000_openshift_origin_broker_proxy.conf
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/000000_openshift_origin_broker_servername.conf
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/000002_openshift_origin_broker_proxy.conf
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/000002_openshift_origin_broker_servername.conf
 %config(noreplace) %{_sysconfdir}/openshift/broker.conf
 %config(noreplace) %{_sysconfdir}/openshift/quickstarts.json
 %{_sysconfdir}/openshift/broker-dev.conf
@@ -165,6 +172,63 @@ done
 %endif
 
 %changelog
+* Tue Mar 12 2013 Troy Dawson <tdawson at redhat.com> 1.5.1-1
+- Bug 911322 (lnader at redhat.com)
+- Merge pull request #1535 from brenton/gemfile_lock_fixes
+  (dmcphers+openshiftbot at redhat.com)
+- Skip Usage capture for sub-account users (rpenta at redhat.com)
+- Merge pull request #1512 from rajatchopra/master (dmcphers at redhat.com)
+- Merge pull request #1536 from
+  smarterclayton/bug_916559_existing_broker_keys_broken (dmcphers at redhat.com)
+- Merge pull request #1532 from smarterclayton/bug_916132_fix_prodrb_for_broker
+  (dmcphers at redhat.com)
+- force stop - fix bug#915587 (rchopra at redhat.com)
+- Bug 916559 - Existing broker keys broken after stage upgrade
+  (ccoleman at redhat.com)
+- Gemfile.lock ownership fixes (bleanhar at redhat.com)
+- Bug 916132 - Fix production.rb for scope loading (ccoleman at redhat.com)
+- adding coverage (dmcphers at redhat.com)
+- add coverage for domain observer being called (dmcphers at redhat.com)
+- Merge pull request #1441 from pravisankar/dev/ravi/us3409
+  (dmcphers+openshiftbot at redhat.com)
+- reverted US2448 (lnader at redhat.com)
+- Added index on 'login' for usage_record and usage mongoid models Added
+  separate usage audit log, /var/log/openshift/broker/usage.log instead of
+  syslog. Moved user action log from /var/log/openshift/user_action.log to
+  /var/log/openshift/broker/user_action.log Added Distributed lock used in oo-
+  admin-ctl-usage script Added Billing Service interface Added oo-admin-ctl-
+  usage script to list and sync usage records to billing vendor Added oo-admin-
+  ctl-usage to broker-util spec file Fixed distributed lock test Add billing
+  service to origin-controller Some more bug fixes (rpenta at redhat.com)
+- ignore errors in teardown (lnader at redhat.com)
+- Added certificate_added_at to alias (lnader at redhat.com)
+- Added validation for SSL certificate and private key (lnader at redhat.com)
+- Added unit tests for alias and domain (lnader at redhat.com)
+- US2448 (lnader at redhat.com)
+- Bug 914639 (dmcphers at redhat.com)
+- Bug 914639 (dmcphers at redhat.com)
+- Implement authorization support in the broker (ccoleman at redhat.com)
+- Revert to original RAILS_LOG_PATH behavior (ccoleman at redhat.com)
+- Bug 913816 - Fix log tailer to pick up the correct config
+  (ccoleman at redhat.com)
+- Bug 914639 (dmcphers at redhat.com)
+- Removing references to cgconfig/all (kraman at gmail.com)
+- Move the broker-only configuration below node in priority.
+  (rmillner at redhat.com)
+- fix rake test:sanity (rchopra at redhat.com)
+- Switch from VirtualHosts to mod_rewrite based routing to support high
+  density. (rmillner at redhat.com)
+- broker unit testcases (rchopra at redhat.com)
+- Fixes to get builds and tests running on RHEL: (kraman at gmail.com)
+- Apply changes from comments. Fix diffs from brenton/origin-server.
+  (john at ibiblio.org)
+- Fix dependency on openshift rubygem (john at ibiblio.org)
+- Fixes for ruby193 (john at ibiblio.org)
+- Broker and broker-util spec files (john at ibiblio.org)
+
+* Tue Mar 12 2013 Troy Dawson <tdawson at redhat.com> 1.5.0-1
+- Update to version 1.5.0
+
 * Fri Feb 15 2013 Troy Dawson <tdawson at redhat.com> 1.4.1-1
 - Added missing create for broker httpd logs dir. Updated owner of broker and
   broker httpd logs to apache:apache. (kraman at gmail.com)
diff --git a/sources b/sources
index 74d7d84..f41fe34 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-20afafd4fc80752c14549270fb8c744d  openshift-origin-broker-1.4.1.tar.gz
+a0514491d56cc14bc43cf882f14aa439  openshift-origin-broker-1.5.1.tar.gz
