From: Galen Charlton <gmc@esilibrary.com>
Date: Wed, 17 Apr 2013 18:37:59 +0000 (-0400)
Subject: bump up version numbers for 2.1.6
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=778083fbf7082e1cafcd3f2c66f296cf34519e4d;p=contrib%2FConifer.git

bump up version numbers for 2.1.6

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
---

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
index d3628570b8..5d7cf6a31f 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
@@ -6,7 +6,7 @@ use base qw/OpenSRF::Application/;
 sub ils_version {
     # version format is "x-y-z", for example "2-0-0" for Evergreen 2.0.0
     # For branches, format is "x-y"
-    return "2-1-5";
+    return "2-1-6";
 }
 
 __PACKAGE__->register_method(
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 8ed0f9bfd8..286fbddc57 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -58,7 +58,7 @@ CREATE TABLE config.upgrade_log (
 );
 
 INSERT INTO config.upgrade_log (version) VALUES ('0726'); -- denials
-INSERT INTO config.upgrade_log (version) VALUES ('2.1.5');
+INSERT INTO config.upgrade_log (version) VALUES ('2.1.6');
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/README b/README
index 0e38f7c5e9..71aab05559 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for Evergreen 2.1.5
+README for Evergreen 2.1.6
 ==========================
 
 Preamble: referenced user accounts
@@ -38,8 +38,8 @@ the following commands as the *user* Linux account:
 
 [source, bash]
 ------------------------------------------------------------------------------
-wget -c http://evergreen-ils.org/downloads/Evergreen-ILS-2.1.5.tar.gz
-tar xzf Evergreen-ILS-2.1.5.tar.gz
+wget -c http://evergreen-ils.org/downloads/Evergreen-ILS-2.1.6.tar.gz
+tar xzf Evergreen-ILS-2.1.6.tar.gz
 ------------------------------------------------------------------------------
 
 Preamble: Developer instructions
@@ -172,7 +172,7 @@ Installation instructions
 +
 [source, bash]
 ------------------------------------------------------------------------------
-make STAFF_CLIENT_STAMP_ID=rel_2_1_5 install
+make STAFF_CLIENT_STAMP_ID=rel_2_1_6 install
 ------------------------------------------------------------------------------
 +
 2. The server portion of the staff client expects `http://hostname/xul/server`
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index 046aa2fce7..a78195efb8 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -1,6 +1,14 @@
 Evergreen 2.1 release notes
 ===========================
 
+Upgrade notes for 2.1.6
+------------------------
+
+SQL injection fix
+~~~~~~~~~~~~~~~~~
+This release fixes a parameter quoting issue in the ORM that
+could allow arbitrary SQL to be executed.
+
 Upgrade notes
 -------------
 
diff --git a/configure.ac b/configure.ac
index e3e94d8c01..dc45f90aaf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,8 +20,8 @@
 
 export PATH=${PATH}:/usr/sbin
 AC_PREREQ(2.61)
-AC_INIT(Open-ILS, 2.1.5, open-ils-dev@list.georgialibraries.org)
-AM_INIT_AUTOMAKE([OpenILS], [2.1.5])
+AC_INIT(Open-ILS, 2.1.6, open-ils-dev@list.georgialibraries.org)
+AM_INIT_AUTOMAKE([OpenILS], [2.1.6])
 AC_REVISION($Revision: 0.1 $)
 AC_CONFIG_SRCDIR([configure.ac])
 AC_PREFIX_DEFAULT([/openils/])