[OpenSRF-GIT] OpenSRF branch rel_2_5 updated. osrf_rel_2_5_0-beta-4-gf626531

Wed Mar 1 11:03:10 EST 2017

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenSRF".

The branch, rel_2_5 has been updated
       via  f626531f9b4101c03365ce2f9cae219b350564c2 (commit)
       via  caf15e949d339fc2125185888431109c9a1f0ccc (commit)
       via  ac8125b786d779e044e145bb8b6aa4f5576fbd85 (commit)
      from  838aed4e78a69f5fef7a55f018f2659b0236f5ac (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f626531f9b4101c03365ce2f9cae219b350564c2
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Wed Mar 1 11:00:11 2017 -0500

    update ChangeLog for 2.5.0-rc
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/ChangeLog b/ChangeLog
index 10d93c5..38a3be1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,8 @@
-commit cf6a373f0c3f5e60dc72f4de44b11866d5b986af
+commit caf15e949d339fc2125185888431109c9a1f0ccc
 Author: Galen Charlton <gmc at equinoxinitiative.org>
-Date:   Tue Feb 21 17:26:20 2017 -0500
+Date:   Wed Mar 1 10:59:56 2017 -0500
 
-    udpate version stamps for 2.5.0-beta
+    update version stamp for 2.5.0-rc
     
     Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
 
@@ -11,69 +11,27 @@ Date:   Tue Feb 21 17:26:20 2017 -0500
 1	1	src/python/setup.py
 1	1	version.m4
 
-commit 5d552226c08385bda3ece8ac308329ba423af76b
+commit ac8125b786d779e044e145bb8b6aa4f5576fbd85
 Author: Galen Charlton <gmc at equinoxinitiative.org>
-Date:   Tue Feb 21 17:25:00 2017 -0500
+Date:   Wed Mar 1 10:55:40 2017 -0500
 
-    update release notes for 2.5-beta
-    
-    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
-
-13	2	doc/RELEASE_NOTES.txt
-
-commit 3d1aae3f88a547fb76754085e062de3f139246ba
-Author: Galen Charlton <gmc at equinoxinitiative.org>
-Date:   Tue Feb 21 16:21:23 2017 -0500
-
-    LP#1666706: add --with-websockets-port configure option
-    
-    This patch adds the ability to specify the WebSockets
-    port as a configure option, avoiding the need to manually
-    edit a couple JavaScript files if one chooses to proxy
-    WS traffic.
-    
-    This patch also cleans up the set of JavaScript files that
-    are installed so that some test case files are not installed
-    by default.
-    
-    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
+    update release notes for 2.5.0-rc
 
-2	0	.gitignore
-7	1	README
-8	0	configure.ac
-1	2	src/Makefile.am
-0	104	src/javascript/opensrf_ws.js
-104	0	src/javascript/opensrf_ws.js.in
-0	248	src/javascript/opensrf_ws_shared.js
-248	0	src/javascript/opensrf_ws_shared.js.in
- delete mode 100644 src/javascript/opensrf_ws.js
- create mode 100644 src/javascript/opensrf_ws.js.in
- delete mode 100644 src/javascript/opensrf_ws_shared.js
- create mode 100644 src/javascript/opensrf_ws_shared.js.in
+10	2	doc/RELEASE_NOTES.txt
 
-commit 21c1412b408943cc4425dce2e9cc9222faf4fa78
-Author: Mike Rylander <mrylander at gmail.com>
-Date:   Thu Aug 4 08:57:44 2016 -0400
+commit 838aed4e78a69f5fef7a55f018f2659b0236f5ac
+Author: Bill Erickson <berickxx at gmail.com>
+Date:   Wed Feb 22 16:05:25 2017 -0500
 
-    LP#1616501: teach mod_perl handlers how to detect client disconnects
-    
-    This patch provides an API so that mod_perl handlers
-    that act as OpenSRF clients have a way to specify that
-    if the browser disconnects, to stop trying to receive
-    results from an XMPP request.
-    
-    To invoke it, mod_perl handlers can add the following:
+    LP#1667091 Remove non-SSL websockets sample configs
     
-    use OpenSRF;
-    ...
-    sub hander {
-    ...
-        my $r = shift;
-        OpenSRF->OSRF_APACHE_REQUEST_OBJ($r);
-    ...
+    All WebSockets communication occurs via SSL in the sample configuration
+    files.  Non-SSL communication is still an option if required with local
+    configuration.
     
-    Signed-off-by: Mike Rylander <mrylander at gmail.com>
+    Signed-off-by: Bill Erickson <berickxx at gmail.com>
     Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
 
-17	0	src/perl/lib/OpenSRF.pm
-25	1	src/perl/lib/OpenSRF/Transport/SlimJabber/XMPPReader.pm
+0	9	examples/apache2/websockets/apache2.conf
+0	8	examples/apache_24/websockets/apache2.conf
+1	1	examples/nginx/osrf-ws-http-proxy

commit caf15e949d339fc2125185888431109c9a1f0ccc
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Wed Mar 1 10:59:56 2017 -0500

    update version stamp for 2.5.0-rc
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/README b/README
index 248c8ec..b7f88b4 100644
--- a/README
+++ b/README
@@ -29,7 +29,7 @@ Issue the following commands as the *user* Linux account.
 +
 [source, bash]
 ------------------------------------------------------------------------------
-wget https://evergreen-ils.org/downloads/opensrf-2.5.0-beta.tar.gz
+wget https://evergreen-ils.org/downloads/opensrf-2.5.0-rc.tar.gz
 ------------------------------------------------------------------------------
 +
 [NOTE]
@@ -40,8 +40,8 @@ http://git.evergreen-ils.org/?p=OpenSRF.git
 +
 [source, bash]
 ------------------------------------------------------------------------------
-tar -xvf opensrf-2.5.0-beta.tar.gz
-cd opensrf-2.5.0-beta/
+tar -xvf opensrf-2.5.0-rc.tar.gz
+cd opensrf-2.5.0-rc/
 ------------------------------------------------------------------------------
 
 Installing prerequisites
@@ -469,14 +469,14 @@ a2dismod websocket
 .(Debian)
 [source, bash]
 ---------------------------------------------------------------------------
-cd /path/to/opensrf-2.5.0-beta
+cd /path/to/opensrf-2.5.0-rc
 cp examples/apache2/websockets/apache2.conf /etc/apache2-websockets/
 ---------------------------------------------------------------------------
 +
 .(Ubuntu Trusty / Xenial)
 [source, bash]
 ---------------------------------------------------------------------------
-cd /path/to/opensrf-2.5.0-beta
+cd /path/to/opensrf-2.5.0-rc
 cp examples/apache_24/websockets/apache2.conf /etc/apache2-websockets/
 ---------------------------------------------------------------------------
 +
@@ -548,7 +548,7 @@ apt-get install nginx
 +
 [source, bash]
 ---------------------------------------------------------------------------
-cd /path/to/opensrf-2.5.0-beta
+cd /path/to/opensrf-2.5.0-rc
 cp examples/nginx/osrf-ws-http-proxy /etc/nginx/sites-available/
 ln -s /etc/nginx/sites-available/osrf-ws-http-proxy /etc/nginx/sites-enabled/osrf-ws-http-proxy
 ---------------------------------------------------------------------------
@@ -603,7 +603,7 @@ apt-get install haproxy
 +
 [source, bash]
 ---------------------------------------------------------------------------
-cd /path/to/opensrf-2.5.0-beta
+cd /path/to/opensrf-2.5.0-rc
 cat examples/haproxy/osrf-ws-http-proxy >> /etc/haproxy/haproxy.cfg
 ---------------------------------------------------------------------------
 +
diff --git a/src/perl/lib/OpenSRF.pm b/src/perl/lib/OpenSRF.pm
index 9f4d147..4a7d73d 100644
--- a/src/perl/lib/OpenSRF.pm
+++ b/src/perl/lib/OpenSRF.pm
@@ -12,11 +12,11 @@ OpenSRF - Top level class for OpenSRF perl modules.
 
 =head1 VERSION
 
-Version 2.5.0-beta
+Version 2.5.0-rc
 
 =cut
 
-our $VERSION = "2.50_3";
+our $VERSION = "2.50_4";
 
 =head1 METHODS
 
diff --git a/src/python/setup.py b/src/python/setup.py
index 97901d8..0248af8 100644
--- a/src/python/setup.py
+++ b/src/python/setup.py
@@ -3,7 +3,7 @@
 from setuptools import setup
 
 setup(name='OpenSRF',
-    version='2.5.0-beta',
+    version='2.5.0-rc',
     install_requires=[
         'dnspython', # required by pyxmpp
     	'python-memcached',
diff --git a/version.m4 b/version.m4
index b55c254..cb49eb7 100644
--- a/version.m4
+++ b/version.m4
@@ -1 +1 @@
-m4_define([VERSION_NUMBER],[2.5.0-beta]) 
+m4_define([VERSION_NUMBER],[2.5.0-rc]) 

commit ac8125b786d779e044e145bb8b6aa4f5576fbd85
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Wed Mar 1 10:55:40 2017 -0500

    update release notes for 2.5.0-rc

diff --git a/doc/RELEASE_NOTES.txt b/doc/RELEASE_NOTES.txt
index 889b005..e5f11f8 100644
--- a/doc/RELEASE_NOTES.txt
+++ b/doc/RELEASE_NOTES.txt
@@ -1,5 +1,5 @@
-Release notes for OpenSRF 2.5.0-beta
-====================================
+Release notes for OpenSRF 2.5.0-rc
+==================================
 
 Supported platforms
 -------------------
@@ -9,6 +9,14 @@ The following Linux distributions are supported:
   * Fedora 17, 18
   * Ubuntu 14.04 (Trusty Tahr) and 16.04 LTS (Xenial Xerus)
 
+Changes in 2.5.0-rc
+-------------------
+The OpenSRF 2.5 release candidate includes the following addition
+since 2.5.0-beta:
+
+* LP#1667091: the default configuration files shipped with OpenSRF
+  no longer include support for insecure WebSockets.
+
 Changes in 2.5.0-beta
 ---------------------
 OpenSRF 2.5.0-beta includes the following additions since 2.5.0-alpha2:

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog               |   78 +++++++++++------------------------------------
 README                  |   14 ++++----
 doc/RELEASE_NOTES.txt   |   12 ++++++-
 src/perl/lib/OpenSRF.pm |    4 +-
 src/python/setup.py     |    2 +-
 version.m4              |    2 +-
 6 files changed, 39 insertions(+), 73 deletions(-)


hooks/post-receive
-- 
OpenSRF
