[open-ils-commits] [GIT] Evergreen ILS branch tags/rel_2_11_4 created. d949982b3c937b822c71750b5d5634e0952a7489
Evergreen Git
git at git.evergreen-ils.org
Thu Apr 20 17:19:40 EDT 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 "Evergreen ILS".
The branch, tags/rel_2_11_4 has been created
at d949982b3c937b822c71750b5d5634e0952a7489 (commit)
- Log -----------------------------------------------------------------
commit d949982b3c937b822c71750b5d5634e0952a7489
Author: Dan Wells <dbw2 at calvin.edu>
Date: Wed Apr 19 15:49:15 2017 -0400
Bumping version numbers, adding Upgrade Script and Changelog
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/ChangeLog b/ChangeLog
index 1f72b2c..d8f7417 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,727 @@
-Evergreen doesn't keep a GNU-style ChangeLog except in release tarballs.
-Those seeking a change log are encouraged to run 'git log -v', or read
-it online at: http://git.evergreen-ils.org/?p=Evergreen.git;a=log
+commit 73e7d9e2ee1c83c6c8ef954dbf8b329f9fd42bb6
+Author: Dan Wells <dbw2 at calvin.edu>
+Date: Mon Feb 24 12:09:57 2014 -0500
+
+ Bump OpenILS.pm version
+
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+1 1 Open-ILS/src/perlmods/lib/OpenILS.pm
+
+commit 55ae9538cdf6be5a59e45fb96c2e639b4134e074
+Author: Galen Charlton <gmc at equinoxinitiative.org>
+Date: Wed Apr 19 14:23:24 2017 -0400
+
+ 2.10.10-2.10.11 schema update
+
+ Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
+
+45 0 Open-ILS/src/sql/Pg/version-upgrade/2.10.10-2.10.11-upgrade-db.sql
+ create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.10.10-2.10.11-upgrade-db.sql
+
+commit 6217267dcde191b9ca2f32259d1de2a921aca7d2
+Author: Galen Charlton <gmc at equinoxinitiative.org>
+Date: Thu Feb 16 15:43:21 2017 -0500
+
+ schema update script for 2.10.10
+
+ Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
+
+17 0 Open-ILS/src/sql/Pg/version-upgrade/2.10.9-2.10.10-upgrade-db.sql
+ create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.10.9-2.10.10-upgrade-db.sql
+
+commit 5fc7b53571e963c6d95f527be2ca741e14442bff
+Author: Kathy Lussier <klussier at masslnc.org>
+Date: Wed Apr 19 12:28:19 2017 -0400
+
+ Docs: Release notes for 2.11.4 maintenance release
+
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+73 0 docs/RELEASE_NOTES_2_11.adoc
+
+commit b7a1a6c33ae286e1a9934bdfc5d9ff96dff18135
+Author: Kathy Lussier <klussier at masslnc.org>
+Date: Wed Apr 19 12:09:14 2017 -0400
+
+ Docs: Release notes for the 2.10.11 maintenance release
+
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+ Conflicts:
+ docs/RELEASE_NOTES_2_10.adoc
+
+146 12 docs/RELEASE_NOTES_2_10.adoc
+
+commit 560e0d9cdb78f6704ef840b5db73a5e4ced7ba8c
+Author: Dan Wells <dbw2 at calvin.edu>
+Date: Tue Apr 18 11:06:03 2017 -0400
+
+ LP#1670407 Add tests for xact_finish close/re-open
+
+ Since this bug came about due to negative balance changes (and it was
+ easier), this commit extends the existing negative balances test suite
+ to include basic tests for checking both xact_finish conditions.
+
+ One of these tests fails without the fix from the previous commit.
+
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+11 1 Open-ILS/src/perlmods/live_t/09-lp1198465_neg_balances.t
+
+commit 0120746cf09b68cc10ccc17e0e1e4f3e64b356a9
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Tue Mar 28 14:15:44 2017 -0400
+
+ LP#1670407 Lost checkin re-opens transaction
+
+ Avoid re-closing a circulation that was re-opened during checkin because
+ it acquired a non-zero balance. This is typically caused by, for
+ example, voiding a lost item fee during checkin and/or generating
+ overdues for lost-then-found items.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+24 6 Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
+
+commit a0f74d7c0816ee141a92c7747188ce4665b18b44
+Author: Josh Stompro <stomproj at larl.org>
+Date: Thu Feb 23 13:38:12 2017 -0600
+
+ LP#1667115 - Silence config.hard_due_date warning
+
+ For every checkout where a hard due date isn't used there is a log
+ warning of "retrieve config.hard_due_date called with no ID...".
+
+ This fix silences that warning.
+
+ Signed-off-by: Josh Stompro <stomproj at larl.org>
+ Signed-off-by: Ben Shum <ben at evergreener.net>
+
+3 1 Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
+
+commit a4494298a90f55dd6ce0de32a538031559189cb5
+Author: Galen Charlton <gmc at equinoxinitiative.org>
+Date: Wed Apr 12 16:06:09 2017 -0400
+
+ LP#1665933: describe the new -x option when running -h
+
+ Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
+ Signed-off-by: Ben Shum <ben at evergreener.net>
+
+ Conflicts:
+ build/tools/make_release
+
+1 0 build/tools/make_release
+
+commit c5fd9156b3d63c860beb1e315a391dba032ce35a
+Author: Jason Stephenson <jason at sigio.com>
+Date: Tue Apr 11 10:52:09 2017 -0400
+
+ LP 1665933: Skip XUL staff client build in make_release.
+
+ Add a -x option to skip building the XulRunner staff clients. This is
+ useful for making custom tarballs for local installation where you
+ will build the staff client on the server.
+
+ Signed-off-by: Jason Stephenson <jason at sigio.com>
+ Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
+ Signed-off-by: Ben Shum <ben at evergreener.net>
+
+33 26 build/tools/make_release
+
+commit 55e419ce688bf23e0e0a63388fc4c877c5f4b037
+Author: Mike Rylander <mrylander at gmail.com>
+Date: Thu Mar 9 15:26:44 2017 -0500
+
+ LP#1167541: Use Patron home org for pickup lib instead of staff's
+
+ When staff are placing a hold for a patron, we should use the patron's
+ preferred pickup location, and failing that, their home library rather
+ than the staff's home library.
+
+ To test
+ -------
+ [1] In the web staff client, search for a title to place
+ a hold request on, using a patron record
+ whose home library is different from the home library of
+ the staff member you are logged in as.
+ [2] Note that the pickup location defaults to the staff
+ account's home library.
+ [3] Apply the patch and repeat step #1. This time, the default
+ pickup library should be the home library of the patron.
+ [4] Set a preferred pickup location for the patron, then
+ repeat step #1. This time, the default pickup library
+ should be the preferred pickup location just set.
+ [5] Repeat steps #1-#4 using the XUL staff client; note that
+ for step #3, it will be necessary to rebuild the client.
+
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+ Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+ Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
+
+1 0 Open-ILS/web/js/ui/default/opac/staff.js
+1 0 Open-ILS/web/js/ui/default/staff/services/eframe.js
+1 1 Open-ILS/xul/staff_client/chrome/content/main/menu.js
+
+commit cb419fdd294340f9e707848a63340ae1c521fb1f
+Author: Eva Cerniňáková <cernin at jabok.cz>
+Date: Sun Apr 2 09:03:53 2017 -0700
+
+ Docs: Information for system administrators about translations
+
+ Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
+
+66 0 docs/admin_initial_setup/designing_your_catalog.txt
+
+commit adc59b1a523f68d90b350463f2110a80e68c1499
+Author: Jane Sandberg <sandbej at linnbenton.edu>
+Date: Tue Mar 28 07:23:46 2017 -0400
+
+ Docs: adding more to the config.tt2 variable list
+
+ Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
+
+2 1 docs/opac/new_skin_customizations.txt
+
+commit 2ab9dacafb5dc6f4da3c052cd9796ea1b93408ef
+Author: Jane Sandberg <sandbej at linnbenton.edu>
+Date: Mon Mar 27 23:14:36 2017 -0400
+
+ Docs: adding to the list of config.tt2 variables
+
+3 0 docs/opac/new_skin_customizations.txt
+
+commit 77b5ce23915943c5fad88d814f99ceaa7bb58cac
+Author: Galen Charlton <gmc at equinoxinitiative.org>
+Date: Wed Mar 22 09:58:39 2017 -0400
+
+ LP#1675025: Docs: mention that Vandelay can load MARCXML
+
+ Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
+ Signed-off-by: Remington Steed <rjs7 at calvin.edu>
+
+3 3 docs/cataloging/batch_importing_MARC.txt
+
+commit df912eed732a32098983ce29c19b7c3b715d26c5
+Author: Ben Shum <ben at evergreener.net>
+Date: Tue Mar 21 09:37:48 2017 -0400
+
+ Docs: README to include Debian for changing ownership of /var/lock/apache2
+
+ Minor tweak to also include Debian among distributions where it might
+ be necessary to change ownership of /var/lock/apache2 to opensrf user.
+ Previously this had been Ubuntu only issue, but has since been encountered
+ during new Debian installations.
+
+ Signed-off-by: Ben Shum <ben at evergreener.net>
+
+1 1 docs/installation/server_installation.txt
+
+commit 06aa0813ae22c0e83d2c2e87eb930bee1d12b253
+Author: Remington Steed <rjs7 at calvin.edu>
+Date: Thu Sep 29 14:55:41 2016 -0400
+
+ LP#1586567 Always return Fund Years sorted descending
+
+ Currently, fund year selectors in Acq interfaces (at least Acq Admin ->
+ Funds, and Acq -> Load MARC Order Records) show the fund years in
+ database order. This commit adds a descending sort to the perl function
+ that retrieves fund years for those interfaces. It also removes the
+ unsuccessful attempt at sorting that was present in the dojo code.
+
+ Signed-off-by: Remington Steed <rjs7 at calvin.edu>
+ Signed-off-by: Dawn Dale <ddale at georgialibraries.org>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+5 2 Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Financials.pm
+0 1 Open-ILS/web/js/ui/default/acq/financial/list_funds.js
+0 1 Open-ILS/web/js/ui/default/acq/picklist/upload.js
+
+commit 57193060ce3ffc26b9b753a94d581f89f1ea739d
+Author: Christine Morgan <cmorgan at noblenet.org>
+Date: Wed Mar 1 11:12:02 2017 -0500
+
+ lp1629016: Hide List Option In Staff Client
+
+ This will hide the option to add to Lists when in the staff client.
+
+ Signed-off-by: Christine Morgan <cmorgan at noblenet.org>
+ Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+ Conflicts:
+ Open-ILS/src/templates/opac/parts/record/summary.tt2
+
+3 1 Open-ILS/src/templates/opac/parts/record/summary.tt2
+2 0 Open-ILS/src/templates/opac/parts/result/table.tt2
+
+commit 45f3a75b182a58546db5edacdd622b45973adb2c
+Author: Jason Etheridge <jason at esilibrary.com>
+Date: Wed Nov 2 14:28:08 2016 -0400
+
+ lp1261835 stop colliding bill UI refreshes
+
+ for want of promises in Angular :)
+
+ population of the bill list in this implementation is asynchronous, but the rest
+ of the refresh action is not, and it's sadly being invoked multiple times. There
+ are different ways to fix this, but using a semaphore seems to work.
+
+ Signed-off-by: Jason Etheridge <jason at esilibrary.com>
+ Signed-off-by: Dawn Dale <ddale at georgialibraries.org>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+15 8 Open-ILS/xul/staff_client/server/patron/bill2.js
+
+commit 81d53a8ba69e47d0addbe4586272451f3fdce9d7
+Author: Dan Wells <dbw2 at calvin.edu>
+Date: Wed Nov 2 14:35:16 2016 -0400
+
+ LP#1175293 Use filtered fund dropdown in funding source interface
+
+ The exising interface for allocating to funds from a funding source
+ view lists all funds by code only. Since many (most?) orgs reuse
+ fund codes year to year, you eventually end up with a bunch of
+ dupes you cannot tell apart.
+
+ Let's "borrow" an AutoFieldWidget to do the heavy lifting of creating
+ a filtered list of active funds, and include the year for further
+ user validation.
+
+ This is inspired by a few other fund dropdowns, but may not be the
+ best overall solution.
+
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+ Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+3 14 Open-ILS/src/templates/acq/funding_source/view.tt2
+15 0 Open-ILS/web/js/ui/default/acq/financial/view_funding_source.js
+
+commit b9cab5c6bcbb459cd9fc17bec0c12640cd42c9cc
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Tue Feb 28 11:33:25 2017 -0500
+
+ LP#1668682 Checkout holds fullfill ignores expire time
+
+ Checking out a hold-captured item for a hold whose expire time is in the
+ past, but has not yet been canceled by the hold targeter, now marks the
+ hold as fulfilled.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+1 5 Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
+
+commit f47d0c59d59bc3b06cd641f78859cc92d5983dab
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Sat Mar 11 23:05:15 2017 -0500
+
+ LP#1442276: Stamp schema upgrade for corrupted XSL output
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+1 1 Open-ILS/src/sql/Pg/002.schema.config.sql
+43 0 Open-ILS/src/sql/Pg/upgrade/1030.function.oils_xslt_process_utf8_fix.sql
+0 43 Open-ILS/src/sql/Pg/upgrade/xxxx.function.oils_xslt_process_utf8_fix
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/1030.function.oils_xslt_process_utf8_fix.sql
+ delete mode 100644 Open-ILS/src/sql/Pg/upgrade/xxxx.function.oils_xslt_process_utf8_fix
+
+commit 1d3d3af7d02c62f4cc8fde9ca3d8c631d8cca1e0
+Author: Kathy Lussier <klussier at masslnc.org>
+Date: Fri Mar 10 22:53:18 2017 -0500
+
+ LP#1442276: Upgrade script for Encoding UTF8 output
+
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+43 0 Open-ILS/src/sql/Pg/upgrade/xxxx.function.oils_xslt_process_utf8_fix
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/xxxx.function.oils_xslt_process_utf8_fix
+
+commit e5671114210c8d089c5e8a2eb888532541149463
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Sun Mar 5 11:45:12 2017 -0500
+
+ LP#1442276 output_as_chars() instead of toString
+
+ The SuperCat transform methods for records retrieved by record ID or ISBN call
+ toString on the XSLT output object, which results in a byte string and thus
+ corrupted output. Instead, call output_as_chars() on the stylesheet object to
+ generate a character string and avoid corruption.
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+4 2 Open-ILS/src/perlmods/lib/OpenILS/Application/SuperCat.pm
+
+commit 09a3ae2c1eb904fe03dc41bf71d57fc419bb04b3
+Author: Dan Scott <dan at coffeecode.net>
+Date: Fri Mar 3 16:03:30 2017 -0500
+
+ LP#1442276 pgTAP test for oils_xslt_process
+
+ In moving from the deprecated XML::LibXSLT::output_string() to output_as_chars(),
+ add a regression test to ensure that we do not suffer from corrputed encoding
+ output in the future.
+
+ We test both the case where an output encoding has been explicitly declared,
+ as well as the case where an output encoding has not been explicitly declared.
+ It was this subtle difference that was causing the problem with output_string().
+
+ Signed-off-by: Dan Scott <dan at coffeecode.net>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+45 0 Open-ILS/src/sql/Pg/t/regress/lp1442276_oils_xslt_encoding.pg
+ create mode 100644 Open-ILS/src/sql/Pg/t/regress/lp1442276_oils_xslt_encoding.pg
+
+commit 471807efdf03816b6b22aebf0ff29a0e3e730699
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Fri Mar 3 01:40:19 2017 -0500
+
+ LP#1442276 Prevent corrupted Unicode chars in MARCTXT and RIS
+
+ The MARCTXT and RIS feeds use the deprecated XML::LibXSLT::output_string()
+ method which, depending on the stylesheet, generated either a byte string
+ or characters. Using output_as_bytes() ensures it is always a byte string
+ and avoids the resulting MARCTXT and RIS output from corrupting Unicode
+ characters.
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+2 2 Open-ILS/src/perlmods/lib/OpenILS/WWW/SuperCat/Feed.pm
+
+commit 2314b4d1df8d07ba6ce176e94e6c25417ce65624
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Fri Mar 3 01:26:53 2017 -0500
+
+ LP#1442276 Encode UTF8 output of XSLT transforms
+
+ The XML::LibXSLT::output_string() method was deprecated in favour of
+ output_as_bytes() and output_as_chars(). The latter always generates
+ UTF8 output as characters, which is what we need, while output_string()
+ behaviour depended on the stylesheet.
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+1 1 Open-ILS/src/sql/Pg/002.functions.config.sql
+
+commit 9fd3147414130272cefe8c171249f6c4acb36bc7
+Author: Kathy Lussier <klussier at masslnc.org>
+Date: Wed Mar 8 11:51:35 2017 -0500
+
+ LP#1671165: Fix web client build error
+
+ Bower install was grabbing a later version of angular-cookies than we wanted,
+ resulting in errors when attempting to build the web client. Changing a
+ caret to a tilde in the bower.json files keeps us to a 1.5.x version of
+ angular-cookies, making web client builds happy.
+
+ Many thanks to Ben Shum for finding the solution to this problem!
+
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+ Signed-off-by: Ben Shum <ben at evergreener.net>
+
+ Conflicts:
+ Open-ILS/web/js/ui/default/staff/bower.json
+
+1 1 Open-ILS/web/js/ui/default/staff/bower.json
+
+commit 708fbbd9b00e950668aadcdffdd1d9abf7f1b03c
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Mon Feb 27 12:32:45 2017 -0500
+
+ LP#1576435 Inactive patron search propagation rapair
+
+ Fix a small code thinko in the propagation of the 'inactive' flag
+ for patron-editor duplicate patron searches.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+1 1 Open-ILS/web/js/ui/default/staff/circ/patron/app.js
+
+commit f18b52af9d562fae8e82b2bbca34d5c71312f019
+Author: Jeff Davis <jdavis at sitka.bclibraries.ca>
+Date: Fri May 27 13:10:29 2016 -0700
+
+ LP#1576435: Include inactive patrons on patron reg duplicate search in web client
+
+ Signed-off-by: Jeff Davis <jdavis at sitka.bclibraries.ca>
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+1 1 Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
+12 0 Open-ILS/web/js/ui/default/staff/circ/patron/app.js
+
+commit 56cc18b6632360b83b8e377d4d33cf015f8bf5a5
+Author: Jeff Davis <jdavis at sitka.bclibraries.ca>
+Date: Sat Apr 23 19:12:27 2016 -0700
+
+ LP#1576435: Force "Include inactive patrons?" on patron reg duplicate search
+
+ In the XUL client, duplicate patron checking in the patron registration
+ interface now includes inactive patrons (see LP#1217052). However, if
+ you click on the link "Found X patron(s) with the same name," the
+ resulting patron search does not always include inactive patrons by
+ default (instead, the value of the "Include inactive patrons?" checkbox
+ is cached from your last patron search, as usual).
+
+ To prevent user confusion in this scenario, this commit forces the
+ linked patron search in the XUL client to always include inactive
+ patrons.
+
+ Signed-off-by: Jeff Davis <jdavis at sitka.bclibraries.ca>
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+1 0 Open-ILS/web/js/ui/default/actor/user/register.js
+10 1 Open-ILS/xul/staff_client/server/patron/search_form.js
+
+commit 7dc4a09e8cb1f358f9a010ae8e0e4019693ee51b
+Author: Terran McCanna <tmccanna at georgialibraries.org>
+Date: Mon Jun 6 13:38:32 2016 -0400
+
+ LP#1528647 Self-check only accepts user name value if regex for barcode
+ not set up
+
+ The original fix only worked if password was not required for self-check.
+ This fix allows it to work when password is required as well.
+
+ Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
+ Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+6 2 Open-ILS/web/js/dojo/openils/User.js
+
+commit 495a640fd9762d2d263216ff50f242cb1023c237
+Author: Bob Wicksall <bwicksall at pls-net.org>
+Date: Mon Jun 6 13:35:28 2016 -0400
+
+ LP#1528647 Self-check only accepts user name value if regex
+ for barcode not set up
+
+ This fix allows a patron to log into the self-check interface with either
+ a barcode or a user name.
+
+ Written by: Bob Wicksall <bwicksall at pls-net.org>
+
+ Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
+ Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+5 1 Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js
+
+commit 5e5a396a2689caf2a0b8d5c44acbf96e76281bf4
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Wed Feb 22 11:29:21 2017 -0500
+
+ LP1584891: Export MARC holdings with UTF8 subfields
+
+ The --items option of marc_export adds a new MARC 852 field with a
+ number of subfields that it retrieves from the database. If those
+ subfields (such as call number, copy location, etc) contain Unicode
+ characters, then we need to decode the incoming UTF8 characters
+ when adding the subfield values to avoid corrupting the MARC.
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+ Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+
+8 7 Open-ILS/src/support-scripts/marc_export.in
+
+commit 1d0e9ebff9887e8a10448e6e0a4f60311dd4860a
+Author: Dan Wells <dbw2 at calvin.edu>
+Date: Tue Aug 30 21:50:19 2016 -0400
+
+ LP#1618624 Fix thinko in adjust-to-zero
+
+ It appears that this test was written for an 'unless' instead of
+ an 'if'. 'if' seems just as natural here, so let's go that route.
+
+ This should prevent us from closing circulations prematurely, and
+ also close them when we need to.
+
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+1 1 Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Money.pm
+
+commit a4468573f5c3a878e61cd1ba05479697ad7b4696
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Fri Mar 3 14:48:56 2017 -0500
+
+ Docs: trivial typo
+
+ s/retriving/retrieving/
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+ Signed-off-by: Ben Shum <ben at evergreener.net>
+
+1 1 docs/installation/server_installation.txt
+
+commit 99a93c0f32947c4bfa666a495ab1d42f79b72edc
+Author: Galen Charlton <gmc at equinoxinitiative.org>
+Date: Fri Feb 24 18:04:29 2017 -0500
+
+ LP#1667835: avoid edi_fetcher.pl crash upon fetching zero-length file
+
+ This patch fixes an issue that could cause edi_fetcher.pl to crash
+ if the EDI partner supplies a zero-length file for Net::FTP to
+ download; such files are now skipped.
+
+ Testing would entail setting up an FTP server that contains a
+ zero-length file, then setting up an EDI remote account and
+ using edi_fetcher.pl to try to retrieve the file.
+
+ Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
+ Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+ Signed-off-by: Jason Stephenson <jason at sigio.com>
+
+11 0 Open-ILS/src/perlmods/lib/OpenILS/Utils/RemoteAccount.pm
+
+commit dcbd019f42f93e83f984fe3d79dfa6ebf655c92c
+Author: Jonathan Schatz <jonathan.schatz at bc.libraries.coop>
+Date: Thu Nov 3 01:51:12 2016 -0700
+
+ Replace the 'broken cover' image asset with an actually transparent single-pixel PNG.
+ Useful for fallback to a placeholder cover.
+
+ Signed-off-by: Jonathan Schatz <jonathan.schatz at bc.libraries.coop>
+ Signed-off-by: Jeff Davis <jdavis at sitka.bclibraries.ca>
+ Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+- - Open-ILS/web/opac/images/blank.png
+
+commit 53fffc159c22f2d27677710201d6781a15892820
+Author: Galen Charlton <gmc at equinoxinitiative.org>
+Date: Mon Feb 27 10:09:09 2017 -0500
+
+ LP#1371772: update normalization library info URLs
+
+ This patch follows up on the previous patch by adjusting
+ the normalization of URLs when the lib.prefer_external_url
+ library setting is set to true.
+
+ Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
+
+1 1 Open-ILS/src/templates/opac/parts/library_name_link.tt2
+
+commit 668a26b8f84da809e979ee632ea54e76f49e01a3
+Author: Jason Boyer <jboyer at library.in.gov>
+Date: Mon Feb 13 16:59:01 2017 -0500
+
+ LP1371772: Correct Escape of Library Info URL
+
+ Using the url filter in TT2 causes named anchors to
+ be escaped in such a way that urls including them
+ will likely return a 404. Since the url is being
+ used in an html document, the html filter is
+ sufficient and allows the url to work as intended.
+
+ Signed-off-by: Jason Boyer <jboyer at library.in.gov>
+ Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
+
+1 1 Open-ILS/src/templates/opac/parts/library/core_info.tt2
+
+commit 6abd086fef2dc71203271489dd4bdda0bfcdf4b7
+Author: Debbie Luchenbill <deborah at mobiusconsortium.org>
+Date: Sat Feb 18 07:05:08 2017 -0800
+
+ Docs: Copy Status "Is Available" Flag
+
+ Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
+
+7 1 docs/admin/copy_statuses.txt
+
+commit b67688ed02ff976a8e74a84da2273104a35d1ad7
+Author: Michele Morgan <mmorgan at noblenet.org>
+Date: Tue Feb 7 13:21:48 2017 -0500
+
+ LP#1661754 - Prevent staff users from marking a Long Overdue item Lost
+
+ Prevents circulations that are already Lost or Long Overdue from being
+ marked Lost or Long Overdue. Avoiding patrons being billed twice for the
+ same item.
+
+ Signed-off-by: Michele Morgan <mmorgan at noblenet.org>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+3 1 Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/AssetCommon.pm
+
+commit 355420c14f326b521b76564f62aba9fe28a3d1d9
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Tue Feb 14 10:53:54 2017 -0500
+
+ LP#1662902: do not re-download EDI files that failed parsing
+
+ Avoid fetching and creating edi_message entries for EDI messages that
+ the system cannot parse.
+
+ In the event parsing failed due to a temporary condition (e.g. Ruby
+ translator was not running), messages can be reprocessed by either
+ deleting the offending edi_message row or setting its status to 'retry'.
+
+ See previous commit ("LP#1662902: do not re-download EDI files that
+ failed processing") for a more detailed explanation.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+1 1 Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/EDI.pm
+
+commit 7e335da96df74748265c8bc016ecc5dbe53740c5
+Author: Galen Charlton <gmc at equinoxinitiative.org>
+Date: Thu Feb 9 12:24:35 2017 -0500
+
+ LP#1662902: do not re-download EDI files that failed processing
+
+ At present, the EDI fetcher ignores files (as determined by file
+ name and EDI account details) that were already successfully
+ processed. With this patch, ones that failed processing (e.g.,
+ acq.edi_message.state = 'proc_error') previously are ignored
+ as well.
+
+ This is because most processing errors reflect conditions that
+ require some sort of manual intervention on the part of the materials
+ vendor or the Evergreen user; having edi_fetcher.pl simply redownload
+ and attempt to process the file has no effect other than causing
+ the acq.edi_message table to grow.
+
+ With this patch, the appearance of rows in acq.edi_message whose
+ state is 'proc_error' should be taken as a signal to the Evergreen
+ admin to investigate and resolve whatever issue caused the
+ message to not be processed; after doing that, removing the
+ acq.edi_message rows will allow the file to be downloaded again
+ (assuming it's still available on the file server).
+
+ To test
+ -------
+ [1] Arrange to create or simulate an EDI message that failed
+ processing.
+ [2] Run edi_fetcher.pl to have it attempt to download the
+ failed message in step #1; verify that the file is
+ /not/ downloaded again and that no additonal acq.edi_message
+ rows are created for it.
+
+ Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+1 1 Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/EDI.pm
+
+commit c1ab6f7799f758eec048bc79d158e088c302f05d
+Author: Dan Wells <dbw2 at calvin.edu>
+Date: Thu Feb 16 18:32:45 2017 -0500
+
+ Forward port 2.11.3 upgrade script
+
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+36 0 Open-ILS/src/sql/Pg/version-upgrade/2.11.2-2.11.3-upgrade-db.sql
+ create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.11.2-2.11.3-upgrade-db.sql
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
index d750216..6d27b6b 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
@@ -7,7 +7,7 @@ use OpenILS::Utils::Fieldmapper;
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 "HEAD";
+ return "2-11-4";
}
__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 a719054..d2f675a 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -92,6 +92,7 @@ CREATE TRIGGER no_overlapping_deps
FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1030', :eg_version); -- dbs/kmlussier
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.11.4', :eg_version);
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.11.3-2.11.4-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.11.3-2.11.4-upgrade-db.sql
new file mode 100644
index 0000000..340db09
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/version-upgrade/2.11.3-2.11.4-upgrade-db.sql
@@ -0,0 +1,46 @@
+--Upgrade Script for 2.11.3 to 2.11.4
+\set eg_version '''2.11.4'''
+BEGIN;
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.11.4', :eg_version);
+
+SELECT evergreen.upgrade_deps_block_check('1030', :eg_version);
+
+CREATE OR REPLACE FUNCTION evergreen.oils_xslt_process(TEXT, TEXT) RETURNS TEXT AS $func$
+ use strict;
+
+ use XML::LibXSLT;
+ use XML::LibXML;
+
+ my $doc = shift;
+ my $xslt = shift;
+
+ # The following approach uses the older XML::LibXML 1.69 / XML::LibXSLT 1.68
+ # methods of parsing XML documents and stylesheets, in the hopes of broader
+ # compatibility with distributions
+ my $parser = $_SHARED{'_xslt_process'}{parsers}{xml} || XML::LibXML->new();
+
+ # Cache the XML parser, if we do not already have one
+ $_SHARED{'_xslt_process'}{parsers}{xml} = $parser
+ unless ($_SHARED{'_xslt_process'}{parsers}{xml});
+
+ my $xslt_parser = $_SHARED{'_xslt_process'}{parsers}{xslt} || XML::LibXSLT->new();
+
+ # Cache the XSLT processor, if we do not already have one
+ $_SHARED{'_xslt_process'}{parsers}{xslt} = $xslt_parser
+ unless ($_SHARED{'_xslt_process'}{parsers}{xslt});
+
+ my $stylesheet = $_SHARED{'_xslt_process'}{stylesheets}{$xslt} ||
+ $xslt_parser->parse_stylesheet( $parser->parse_string($xslt) );
+
+ $_SHARED{'_xslt_process'}{stylesheets}{$xslt} = $stylesheet
+ unless ($_SHARED{'_xslt_process'}{stylesheets}{$xslt});
+
+ return $stylesheet->output_as_chars(
+ $stylesheet->transform(
+ $parser->parse_string($doc)
+ )
+ );
+
+$func$ LANGUAGE 'plperlu' STRICT IMMUTABLE;
+
+COMMIT;
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/about.html b/Open-ILS/xul/staff_client/chrome/content/main/about.html
index 7b2b3f5..5e5a5d0 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/about.html
+++ b/Open-ILS/xul/staff_client/chrome/content/main/about.html
@@ -1,7 +1,7 @@
<html><head><script></script></head><body onload="var x = document.getElementById('version'); var version ='/xul/server/'.split(/\//)[2]; if (version == 'server') { version = 'versionless debug build'; } x.appendChild(document.createTextNode(version));">
<h1 style="text-decoration: underline">Evergreen</h1>
<p>Target Server ID: <span id="version"></span></p>
-<p>$HeadURL$</p>
+<p>http://git.evergreen-ils.org/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/rel_2_11_4</p>
<h2>What is Evergreen?</h2>
<blockquote>
<p>
diff --git a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js
index 0613a13..e1f683d 100644
--- a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js
+++ b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js
@@ -11,7 +11,7 @@ pref("toolkit.singletonWindowType", "eg_main");
pref("open-ils.enable_join_tabs", true);
// We'll use this one to help brand some build information into the client, and rely on subversion keywords
-pref("open-ils.repository.headURL","$HeadURL$");
+pref("open-ils.repository.headURL","http://git.evergreen-ils.org/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/rel_2_11_4");
pref("open-ils.repository.author","$Author$");
pref("open-ils.repository.revision","$Revision$");
pref("open-ils.repository.date","$Date$");
diff --git a/Open-ILS/xul/staff_client/windowssetup.nsi b/Open-ILS/xul/staff_client/windowssetup.nsi
index a954357..5ebcd7a 100644
--- a/Open-ILS/xul/staff_client/windowssetup.nsi
+++ b/Open-ILS/xul/staff_client/windowssetup.nsi
@@ -3,7 +3,7 @@
; HM NIS Edit Wizard helper defines
; Old versions of makensis don't like this, moved to Makefile
;!define /file PRODUCT_VERSION "client/VERSION"
-!define PRODUCT_TAG "Master"
+!define PRODUCT_TAG "2.11"
!define PRODUCT_INSTALL_TAG "${PRODUCT_TAG}"
!define UI_IMAGESET "beta"
;!define UI_IMAGESET "release"
diff --git a/README b/README
deleted file mode 120000
index b57451a..0000000
--- a/README
+++ /dev/null
@@ -1 +0,0 @@
-docs/installation/server_installation.txt
\ No newline at end of file
diff --git a/README b/README
new file mode 100644
index 0000000..c3adcdb
--- /dev/null
+++ b/README
@@ -0,0 +1,742 @@
+Installing the Evergreen server
+===============================
+:toc:
+:numbered:
+
+Preamble: referenced user accounts
+----------------------------------
+
+In subsequent sections, we will refer to a number of different accounts, as
+follows:
+
+ * Linux user accounts:
+ ** The *user* Linux account is the account that you use to log onto the
+ Linux system as a regular user.
+ ** The *root* Linux account is an account that has system administrator
+ privileges. On Debian and Fedora you can switch to this account from
+ your *user* account by issuing the `su -` command and entering the
+ password for the *root* account when prompted. On Ubuntu you can switch
+ to this account from your *user* account using the `sudo su -` command
+ and entering the password for your *user* account when prompted.
+ ** The *opensrf* Linux account is an account that you create when installing
+ OpenSRF. You can switch to this account from the *root* account by
+ issuing the `su - opensrf` command.
+ ** The *postgres* Linux account is created automatically when you install
+ the PostgreSQL database server. You can switch to this account from the
+ *root* account by issuing the `su - postgres` command.
+ * PostgreSQL user accounts:
+ ** The *evergreen* PostgreSQL account is a superuser account that you will
+ create to connect to the PostgreSQL database server.
+ * Evergreen administrator account:
+ ** The *egadmin* Evergreen account is an administrator account for
+ Evergreen that you will use to test connectivity and configure your
+ Evergreen instance.
+
+Preamble: developer instructions
+--------------------------------
+
+[NOTE]
+Skip this section if you are using an official release tarball downloaded
+from http://evergreen-ils.org/egdownloads
+
+Developers working directly with the source code from the Git repository,
+rather than an official release tarball, must perform one step before they
+can proceed with the `./configure` step.
+
+As the *user* Linux account, issue the following command in the Evergreen
+source directory to generate the configure script and Makefiles:
+
+[source, bash]
+------------------------------------------------------------------------------
+autoreconf -i
+------------------------------------------------------------------------------
+
+Installing prerequisites
+------------------------
+
+ * **PostgreSQL**: Version 9.3 is recommended. The minimum supported version
+ is 9.1.
+ * **Linux**: Evergreen 2.8 has been tested on Debian Jessie (8.0),
+ Debian Wheezy (7.0), Ubuntu Xenial Xerus (16.04),
+ Ubuntu Trusty Tahr (14.04), and Fedora.
+ If you are running an older version of these distributions, you may want
+ to upgrade before upgrading Evergreen. For instructions on upgrading these
+ distributions, visit the Debian, Ubuntu or Fedora websites.
+ * **OpenSRF**: The minimum supported version of OpenSRF is 2.4.0.
+
+
+Evergreen has a number of prerequisite packages that must be installed
+before you can successfully configure, compile, and install Evergreen.
+
+1. Begin by installing the most recent version of OpenSRF (2.4.0 or later).
+ You can download OpenSRF releases from http://evergreen-ils.org/opensrf-downloads/
+2. On some distributions, it is necessary to install PostgreSQL 9.1+ from external
+ repositories.
++
+ * Debian (Wheezy and Jessie) and Ubuntu (Trusty and Xenial) comes with
+ PostgreSQL 9.1+, so no additional steps are required.
+ * Fedora 19 and 20 come with PostgreSQL 9.2+, so no additional steps are required.
++
+3. On Debian and Ubuntu, run `aptitude update` as the *root* Linux account to
+ retrieve the new packages from the backports repository.
+4. Issue the following commands as the *root* Linux account to install
+ prerequisites using the `Makefile.install` prerequisite installer,
+ substituting `debian-jessie`, `debian-wheezy`, `fedora`,
+ `ubuntu-xenial`, or `ubuntu-trusty` for <osname> below:
++
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install <osname>
+------------------------------------------------------------------------------
++
+5. Add the libdbi-libdbd libraries to the system dynamic library path by
+ issuing the following commands as the *root* Linux account:
++
+[NOTE]
+You should skip this step if installing on Ubuntu Trusty, Ubuntu Xenial or Debian Jessie. The Ubuntu
+and Debian Jessie targets use libdbd-pgsql from packages.
++
+.Debian Wheezy
+[source, bash]
+------------------------------------------------------------------------------
+echo "/usr/local/lib/dbd" > /etc/ld.so.conf.d/eg.conf
+ldconfig
+------------------------------------------------------------------------------
++
+.Fedora
+[source, bash]
+------------------------------------------------------------------------------
+echo "/usr/lib64/dbd" > /etc/ld.so.conf.d/eg.conf
+ldconfig
+------------------------------------------------------------------------------
+
+6. OPTIONAL: Developer additions
++
+To perform certain developer tasks from a Git source code checkout,
+additional packages may be required. As the *root* Linux account:
++
+ * To install packages needed for retrieving and managing web dependencies,
+ use the <osname>-developer Makefile.install target. Currently,
+ this is only needed for building and installing the (preview) browser
+ staff client.
++
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install <osname>-developer
+------------------------------------------------------------------------------
++
+ * To install packages required for building Evergreen release bundles, use
+ the <osname>-packager Makefile.install target.
++
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install <osname>-packager
+------------------------------------------------------------------------------
+
+Optional: Extra steps for browser-based staff client
+----------------------------------------------------
+
+[NOTE]
+Skip this entire section if you are using an official release tarball downloaded
+from http://evergreen-ils.org/downloads
+
+[NOTE]
+You make skip the subsection `Install dependencies for browser-based staff client'
+if you are installing on either Debian Jessie, Ubuntu Trusty, or Ubuntu Xenial and you have
+installed the `Optional: Developer Additions' described above. You will still
+need to do the steps in `Install files for browser-based staff client' below.
+
+Install dependencies for browser-based staff client
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+1. Install Node.js. For more information see also:
+ https://github.com/joyent/node/wiki/installation[Node.js Installation]
++
+[source,sh]
+------------------------------------------------------------------------------
+# Go to a temporary directory
+cd /tmp
+
+# Clone the code and checkout the necessary version
+git clone https://github.com/joyent/node.git
+cd node
+git checkout -b v0.10.28 v0.10.28
+
+# set -j to the number of CPU cores on the server + 1
+./configure && make -j2 && sudo make install
+
+# update packages
+% sudo npm update
+------------------------------------------------------------------------------
++
+2. Install Grunt CLI
++
+[source,sh]
+------------------------------------------------------------------------------
+% sudo npm install -g grunt-cli
+------------------------------------------------------------------------------
++
+3. Install Bower
++
+[source,sh]
+------------------------------------------------------------------------------
+% sudo npm install -g bower
+------------------------------------------------------------------------------
+
+Install files for browser-based staff client
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+1. Building, Testing, Minification: The remaining steps all take place within
+ the staff JS web root:
++
+[source,sh]
+------------------------------------------------------------------------------
+cd $EVERGREEN_ROOT/Open-ILS/web/js/ui/default/staff/
+------------------------------------------------------------------------------
++
+2. Install Project-local Dependencies. npm inspects the 'package.json' file
+ for dependencies and fetches them from the Node package network.
++
+[source,sh]
+------------------------------------------------------------------------------
+npm install # fetch Grunt dependencies
+bower install # fetch JS dependencies
+------------------------------------------------------------------------------
++
+3. Run the build script.
++
+[source,sh]
+------------------------------------------------------------------------------
+# build, run tests, concat+minify
+grunt all
+------------------------------------------------------------------------------
+
+
+Configuration and compilation instructions
+------------------------------------------
+
+For the time being, we are still installing everything in the `/openils/`
+directory. From the Evergreen source directory, issue the following commands as
+the *user* Linux account to configure and build Evergreen:
+
+[source, bash]
+------------------------------------------------------------------------------
+PATH=/openils/bin:$PATH ./configure --prefix=/openils --sysconfdir=/openils/conf
+make
+------------------------------------------------------------------------------
+
+These instructions assume that you have also installed OpenSRF under `/openils/`.
+If not, please adjust PATH as needed so that the Evergreen `configure` script
+can find `osrf_config`.
+
+Installation instructions
+-------------------------
+
+1. Once you have configured and compiled Evergreen, issue the following
+ command as the *root* Linux account to install Evergreen, build the server
+ portion of the staff client, and copy example configuration files to
+ `/openils/conf`.
+ Change the value of the `STAFF_CLIENT_STAMP_ID` variable to match the version
+ of the staff client that you will use to connect to the Evergreen server.
++
+[source, bash]
+------------------------------------------------------------------------------
+make STAFF_CLIENT_STAMP_ID=rel_2_11_4 install
+------------------------------------------------------------------------------
++
+2. The server portion of the staff client expects `http://hostname/xul/server`
+ to resolve. Issue the following commands as the *root* Linux account to
+ create a symbolic link pointing to the `server` subdirectory of the server
+ portion of the staff client that we just built using the staff client ID
+ 'rel_name':
++
+[source, bash]
+------------------------------------------------------------------------------
+cd /openils/var/web/xul
+ln -sf rel_name/server server
+------------------------------------------------------------------------------
+
+Change ownership of the Evergreen files
+---------------------------------------
+
+All files in the `/openils/` directory and subdirectories must be owned by the
+`opensrf` user. Issue the following command as the *root* Linux account to
+change the ownership on the files:
+
+[source, bash]
+------------------------------------------------------------------------------
+chown -R opensrf:opensrf /openils
+------------------------------------------------------------------------------
+
+Additional Instructions for Developers
+--------------------------------------
+
+[NOTE]
+Skip this section if you are using an official release tarball downloaded
+from http://evergreen-ils.org/egdownloads
+
+Developers working directly with the source code from the Git repository,
+rather than an official release tarball, need to install the Dojo Toolkit
+set of JavaScript libraries. The appropriate version of Dojo is included in
+Evergreen release tarballs. Developers should install the Dojo 1.3.3 version
+of Dojo by issuing the following commands as the *opensrf* Linux account:
+
+[source, bash]
+------------------------------------------------------------------------------
+wget http://download.dojotoolkit.org/release-1.3.3/dojo-release-1.3.3.tar.gz
+tar -C /openils/var/web/js -xzf dojo-release-1.3.3.tar.gz
+cp -r /openils/var/web/js/dojo-release-1.3.3/* /openils/var/web/js/dojo/.
+------------------------------------------------------------------------------
+
+
+Configure the Apache Web server
+-------------------------------
+
+. Use the example configuration files in `Open-ILS/examples/apache/` (for
+Apache versions below 2.4) or `Open-ILS/examples/apache_24/` (for Apache
+versions 2.4 or greater) to configure your Web server for the Evergreen
+catalog, staff client, Web services, and administration interfaces. Issue the
+following commands as the *root* Linux account:
++
+.Debian Wheezy
+[source,bash]
+------------------------------------------------------------------------------
+cp Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/
+cp Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/
+cp Open-ILS/examples/apache/eg_startup /etc/apache2/
+# Now set up SSL
+mkdir /etc/apache2/ssl
+cd /etc/apache2/ssl
+------------------------------------------------------------------------------
++
+.Ubuntu Trusty, Ubuntu Xenial, and Debian Jessie
+[source,bash]
+------------------------------------------------------------------------------------
+cp Open-ILS/examples/apache_24/eg_24.conf /etc/apache2/sites-available/eg.conf
+cp Open-ILS/examples/apache_24/eg_vhost_24.conf /etc/apache2/eg_vhost.conf
+cp Open-ILS/examples/apache/eg_startup /etc/apache2/
+# Now set up SSL
+mkdir /etc/apache2/ssl
+cd /etc/apache2/ssl
+------------------------------------------------------------------------------------
++
+.Fedora
+[source,bash]
+------------------------------------------------------------------------------
+cp Open-ILS/examples/apache_24/eg_24.conf /etc/httpd/conf.d/
+cp Open-ILS/examples/apache_24/eg_vhost_24.conf /etc/httpd/eg_vhost.conf
+cp Open-ILS/examples/apache/eg_startup /etc/httpd/
+# Now set up SSL
+mkdir /etc/httpd/ssl
+cd /etc/httpd/ssl
+------------------------------------------------------------------------------
++
+. The `openssl` command cuts a new SSL key for your Apache server. For a
+production server, you should purchase a signed SSL certificate, but you can
+just use a self-signed certificate and accept the warnings in the staff client
+and browser during testing and development. Create an SSL key for the Apache
+server by issuing the following command as the *root* Linux account:
++
+[source,bash]
+------------------------------------------------------------------------------
+openssl req -new -x509 -days 365 -nodes -out server.crt -keyout server.key
+------------------------------------------------------------------------------
++
+. As the *root* Linux account, edit the `eg.conf` file that you copied into
+place.
+ a. To enable access to the offline upload / execute interface from any
+ workstation on any network, make the following change (and note that
+ you *must* secure this for a production instance):
+ * (Apache 2.2): Replace `Allow from 10.0.0.0/8` with `Allow from all`
+ * (Apache 2.4): Replace `Require host 10.0.0.0/8` with `Require all granted`
+ b. (Fedora): Change references from the non-existent `/etc/apache2/` directory
+ to `/etc/httpd/`.
+. Change the user for the Apache server.
+ * (Debian and Ubuntu): As the *root* Linux account, edit
+ `/etc/apache2/envvars`. Change `export APACHE_RUN_USER=www-data` to
+ `export APACHE_RUN_USER=opensrf`.
+ * (Fedora): As the *root* Linux account , edit `/etc/httpd/conf/httpd.conf`.
+ Change `User apache` to `User opensrf`.
+. As the *root* Linux account, configure Apache with KeepAlive settings
+ appropriate for Evergreen. Higher values can improve the performance of a
+ single client by allowing multiple requests to be sent over the same TCP
+ connection, but increase the risk of using up all available Apache child
+ processes and memory.
+ * (Debian and Ubuntu): Edit `/etc/apache2/apache2.conf`.
+ a. Change `KeepAliveTimeout` to `1`.
+ b. Change `MaxKeepAliveRequests` to `100`.
+ * (Fedora): Edit `/etc/httpd/conf/httpd.conf`.
+ a. Change `KeepAliveTimeout` to `1`.
+ b. Change `MaxKeepAliveRequests` to `100`.
+. As the *root* Linux account, configure the prefork module to start and keep
+ enough Apache servers available to provide quick responses to clients without
+ running out of memory. The following settings are a good starting point for a
+ site that exposes the default Evergreen catalogue to the web:
++
+.Debian Wheezy (`/etc/apache2/apache2.conf`) and Fedora (`/etc/httpd/conf/httpd.conf`)
+[source,bash]
+------------------------------------------------------------------------------
+<IfModule mpm_prefork_module>
+ StartServers 15
+ MinSpareServers 5
+ MaxSpareServers 15
+ MaxClients 75
+ MaxRequestsPerChild 500
+</IfModule>
+------------------------------------------------------------------------------
++
+.Ubuntu Trusty, Ubuntu Xenial, Debian Jessie (`/etc/apache2/mods-available/mpm_prefork.conf`)
+[source,bash]
+------------------------------------------------------------------------------
+<IfModule mpm_prefork_module>
+ StartServers 15
+ MinSpareServers 5
+ MaxSpareServers 15
+ MaxRequestWorkers 75
+ MaxConnectionsPerChild 500
+</IfModule>
+------------------------------------------------------------------------------
++
+. (Ubuntu Trusty, Ubuntu Xenial, Debian Jessie) As the *root* user,
+ enable the mpm_prefork module:
++
+[source,bash]
+------------------------------------------------------------------------------
+a2dismod mpm_event
+a2enmod mpm_prefork
+------------------------------------------------------------------------------
++
+. (Fedora): As the *root* Linux account, edit the `/etc/httpd/eg_vhost.conf`
+ file to change references from the non-existent `/etc/apache2/` directory
+ to `/etc/httpd/`.
+. (Debian Wheezy): As the *root* Linux account, enable the Evergreen site:
++
+[source,bash]
+------------------------------------------------------------------------------
+a2dissite default # OPTIONAL: disable the default site (the "It Works" page)
+a2ensite eg.conf
+------------------------------------------------------------------------------
++
+(Ubuntu Trusty, Ubuntu Xenial, Debian Jessie):
++
+[source,bash]
+------------------------------------------------------------------------------
+a2dissite 000-default # OPTIONAL: disable the default site (the "It Works" page)
+a2ensite eg.conf
+------------------------------------------------------------------------------
++
+. (Debian and Ubuntu): As the *root* Linux account, enable Apache to write
+ to the lock directory; this is currently necessary because Apache
+ is running as the `opensrf` user:
++
+[source,bash]
+------------------------------------------------------------------------------
+chown opensrf /var/lock/apache2
+------------------------------------------------------------------------------
+
+Learn more about additional Apache options in the following sections:
+
+ * <<_apache_rewrite_tricks,Apache Rewrite Tricks>>
+ * <<_apache_access_handler_perl_module,Apache Access Handler Perl Module>>
+
+Configure OpenSRF for the Evergreen application
+-----------------------------------------------
+There are a number of example OpenSRF configuration files in `/openils/conf/`
+that you can use as a template for your Evergreen installation. Issue the
+following commands as the *opensrf* Linux account:
+
+[source, bash]
+------------------------------------------------------------------------------
+cp -b /openils/conf/opensrf_core.xml.example /openils/conf/opensrf_core.xml
+cp -b /openils/conf/opensrf.xml.example /openils/conf/opensrf.xml
+------------------------------------------------------------------------------
+
+When you installed OpenSRF, you created four Jabber users on two
+separate domains and edited the `opensrf_core.xml` file accordingly. Please
+refer back to the OpenSRF README and, as the *opensrf* Linux account, edit the
+Evergreen version of the `opensrf_core.xml` file using the same Jabber users
+and domains as you used while installing and testing OpenSRF.
+
+[NOTE]
+The `-b` flag tells the `cp` command to create a backup version of the
+destination file. The backup version of the destination file has a tilde (`~`)
+appended to the file name, so if you have forgotten the Jabber users and
+domains, you can retrieve the settings from the backup version of the files.
+
+`eg_db_config`, described in <<_creating_the_evergreen_database,Creating the Evergreen
+database>>, sets the database connection information in `opensrf.xml` for you.
+
+Configure action triggers for the Evergreen application
+-------------------------------------------------------
+_Action Triggers_ provide hooks for the system to perform actions when a given
+event occurs; for example, to generate reminder or overdue notices, the
+`checkout.due` hook is processed and events are triggered for potential actions
+if there is no checkin time.
+
+To enable the default set of hooks, issue the following command as the
+*opensrf* Linux account:
+
+[source, bash]
+------------------------------------------------------------------------------
+cp -b /openils/conf/action_trigger_filters.json.example /openils/conf/action_trigger_filters.json
+------------------------------------------------------------------------------
+
+For more information about configuring and using action triggers, see
+<<_notifications_action_triggers,Notifications / Action Triggers>>.
+
+Creating the Evergreen database
+-------------------------------
+
+Setting up the PostgreSQL server
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+For production use, most libraries install the PostgreSQL database server on a
+dedicated machine. Therefore, by default, the `Makefile.install` prerequisite
+installer does *not* install the PostgreSQL 9 database server that is required
+by every Evergreen system. You can install the packages required by Debian or
+Ubuntu on the machine of your choice using the following commands as the
+*root* Linux account:
+
+.(Debian / Ubuntu / Fedora) Installing PostgreSQL server packages
+
+Each OS build target provides the postgres server installation packages
+required for each operating system. To install Postgres server packages,
+use the make target 'postgres-server-<OSTYPE>'. Choose the most appropriate
+command below based on your operating system.
+
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-jessie
+make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-wheezy
+make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-trusty
+make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-xenial
+make -f Open-ILS/src/extras/Makefile.install postgres-server-fedora
+------------------------------------------------------------------------------
+
+.(Fedora) Postgres initialization
+
+Installing Postgres on Fedora also requires you to initialize the PostgreSQL
+cluster and start the service. Issue the following commands as the *root* user:
+
+[source, bash]
+------------------------------------------------------------------------------
+postgresql-setup initdb
+systemctl start postgresql
+------------------------------------------------------------------------------
+
+For a standalone PostgreSQL server, install the following Perl modules for your
+distribution as the *root* Linux account:
+
+.(Debian Wheezy, Ubuntu Trusty, and Ubuntu Xenial)
+No extra modules required for these distributions.
+
+.(Fedora)
+[source, bash]
+------------------------------------------------------------------------------
+cpan Rose::URI
+------------------------------------------------------------------------------
+
+You need to create a PostgreSQL superuser to create and access the database.
+Issue the following command as the *postgres* Linux account to create a new
+PostgreSQL superuser named `evergreen`. When prompted, enter the new user's
+password:
+
+[source, bash]
+------------------------------------------------------------------------------
+createuser -s -P evergreen
+------------------------------------------------------------------------------
+
+.Enabling connections to the PostgreSQL database
+
+Your PostgreSQL database may be configured by default to prevent connections,
+for example, it might reject attempts to connect via TCP/IP or from other
+servers. To enable TCP/IP connections from localhost, check your `pg_hba.conf`
+file, found in the `/etc/postgresql/` directory on Debian and Ubuntu, and in
+the `/var/lib/pgsql/data/` directory on Fedora. A simple way to enable TCP/IP
+connections from localhost to all databases with password authentication, which
+would be suitable for a test install of Evergreen on a single server, is to
+ensure the file contains the following entries _before_ any "host ... ident"
+entries:
+
+------------------------------------------------------------------------------
+host all all ::1/128 md5
+host all all 127.0.0.1/32 md5
+------------------------------------------------------------------------------
+
+When you change the `pg_hba.conf` file, you will need to reload PostgreSQL to
+make the changes take effect. For more information on configuring connectivity
+to PostgreSQL, see
+http://www.postgresql.org/docs/devel/static/auth-pg-hba-conf.html
+
+Creating the Evergreen database and schema
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Once you have created the *evergreen* PostgreSQL account, you also need to
+create the database and schema, and configure your configuration files to point
+at the database server. Issue the following command as the *root* Linux account
+from inside the Evergreen source directory, replacing <user>, <password>,
+<hostname>, <port>, and <dbname> with the appropriate values for your
+PostgreSQL database (where <user> and <password> are for the *evergreen*
+PostgreSQL account you just created), and replace <admin-user> and <admin-pass>
+with the values you want for the *egadmin* Evergreen administrator account:
+
+[source, bash]
+------------------------------------------------------------------------------
+perl Open-ILS/src/support-scripts/eg_db_config --update-config \
+ --service all --create-database --create-schema --create-offline \
+ --user <user> --password <password> --hostname <hostname> --port <port> \
+ --database <dbname> --admin-user <admin-user> --admin-pass <admin-pass>
+------------------------------------------------------------------------------
+
+This creates the database and schema and configures all of the services in
+your `/openils/conf/opensrf.xml` configuration file to point to that database.
+It also creates the configuration files required by the Evergreen `cgi-bin`
+administration scripts, and sets the user name and password for the *egadmin*
+Evergreen administrator account to your requested values.
+
+You can get a complete set of options for `eg_db_config` by passing the
+`--help` parameter.
+
+Loading sample data
+~~~~~~~~~~~~~~~~~~~
+If you add the `--load-all-sample` parameter to the `eg_db_config` command,
+a set of authority and bibliographic records, call numbers, copies, staff
+and regular users, and transactions will be loaded into your target
+database. This sample dataset is commonly referred to as the _concerto_
+sample data, and can be useful for testing out Evergreen functionality and
+for creating problem reports that developers can easily recreate with their
+own copy of the _concerto_ sample data.
+
+Creating the database on a remote server
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+In a production instance of Evergreen, your PostgreSQL server should be
+installed on a dedicated server.
+
+PostgreSQL 9.1 and later
+^^^^^^^^^^^^^^^^^^^^^^^^
+To create the database instance on a remote database server running PostgreSQL
+9.1 or later, simply use the `--create-database` flag on `eg_db_config`.
+
+Starting Evergreen
+------------------
+1. As the *root* Linux account, start the `memcached` and `ejabberd` services
+(if they aren't already running):
++
+[source, bash]
+------------------------------------------------------------------------------
+/etc/init.d/ejabberd start
+/etc/init.d/memcached start
+------------------------------------------------------------------------------
++
+2. As the *opensrf* Linux account, start Evergreen. The `-l` flag in the
+following command is only necessary if you want to force Evergreen to treat the
+hostname as `localhost`; if you configured `opensrf.xml` using the real
+hostname of your machine as returned by `perl -ENet::Domain 'print
+Net::Domain::hostfqdn() . "\n";'`, you should not use the `-l` flag.
++
+[source, bash]
+------------------------------------------------------------------------------
+osrf_control -l --start-all
+------------------------------------------------------------------------------
++
+ ** If you receive the error message `bash: osrf_control: command not found`,
+ then your environment variable `PATH` does not include the `/openils/bin`
+ directory; this should have been set in the *opensrf* Linux account's
+ `.bashrc` configuration file. To manually set the `PATH` variable, edit the
+ configuration file `~/.bashrc` as the *opensrf* Linux account and add the
+ following line:
++
+[source, bash]
+------------------------------------------------------------------------------
+export PATH=$PATH:/openils/bin
+------------------------------------------------------------------------------
++
+3. As the *opensrf* Linux account, generate the Web files needed by the staff
+ client and catalogue and update the organization unit proximity (you need to do
+ this the first time you start Evergreen, and after that each time you change the library org unit configuration.
+):
++
+[source, bash]
+------------------------------------------------------------------------------
+autogen.sh
+------------------------------------------------------------------------------
++
+4. As the *root* Linux account, restart the Apache Web server:
++
+[source, bash]
+------------------------------------------------------------------------------
+/etc/init.d/apache2 restart
+------------------------------------------------------------------------------
++
+If the Apache Web server was running when you started the OpenSRF services, you
+might not be able to successfully log in to the OPAC or staff client until the
+Apache Web server is restarted.
+
+Testing connections to Evergreen
+--------------------------------
+
+Once you have installed and started Evergreen, test your connection to
+Evergreen via `srfsh`. As the *opensrf* Linux account, issue the following
+commands to start `srfsh` and try to log onto the Evergreen server using the
+*egadmin* Evergreen administrator user name and password that you set using the
+`eg_db_config` command:
+
+[source, bash]
+------------------------------------------------------------------------------
+/openils/bin/srfsh
+srfsh% login <admin-user> <admin-pass>
+------------------------------------------------------------------------------
+
+You should see a result like:
+
+ Received Data: "250bf1518c7527a03249858687714376"
+ ------------------------------------
+ Request Completed Successfully
+ Request Time in seconds: 0.045286
+ ------------------------------------
+
+ Received Data: {
+ "ilsevent":0,
+ "textcode":"SUCCESS",
+ "desc":" ",
+ "pid":21616,
+ "stacktrace":"oils_auth.c:304",
+ "payload":{
+ "authtoken":"e5f9827cc0f93b503a1cc66bee6bdd1a",
+ "authtime":420
+ }
+
+ }
+
+ ------------------------------------
+ Request Completed Successfully
+ Request Time in seconds: 1.336568
+ ------------------------------------
+[[install-troubleshooting-1]]
+If this does not work, it's time to do some troubleshooting.
+
+ * As the *opensrf* Linux account, run the `settings-tester.pl` script to see
+ if it finds any system configuration problems. The script is found at
+ `Open-ILS/src/support-scripts/settings-tester.pl` in the Evergreen source
+ tree.
+ * Follow the steps in the http://evergreen-ils.org/dokuwiki/doku.php?id=troubleshooting:checking_for_errors[troubleshooting guide].
+ * If you have faithfully followed the entire set of installation steps
+ listed here, you are probably extremely close to a working system.
+ Gather your configuration files and log files and contact the
+ http://evergreen-ils.org/communicate/mailing-lists/[Evergreen development
+mailing list] for assistance before making any drastic changes to your system
+ configuration.
+
+Getting help
+------------
+
+Need help installing or using Evergreen? Join the mailing lists at
+http://evergreen-ils.org/communicate/mailing-lists/ or contact us on the Freenode
+IRC network on the #evergreen channel.
+
+License
+-------
+This work is licensed under the Creative Commons Attribution-ShareAlike 3.0
+Unported License. To view a copy of this license, visit
+http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative
+Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA.
diff --git a/configure.ac b/configure.ac
index 74e6b3b..e7ad955 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,8 +20,8 @@
export PATH=${PATH}:/usr/sbin
AC_PREREQ(2.61)
-AC_INIT(Open-ILS, trunk, open-ils-dev at list.georgialibraries.org)
-AM_INIT_AUTOMAKE([OpenILS], [trunk])
+AC_INIT(Open-ILS, 2.11.4, open-ils-dev at list.georgialibraries.org)
+AM_INIT_AUTOMAKE([OpenILS], [2.11.4])
AC_REVISION($Revision: 0.1 $)
AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_SUBDIRS([Open-ILS/xul/staff_client/external/libmar])
diff --git a/docs/installation/server_upgrade.txt b/docs/installation/server_upgrade.txt
index 18ebfe5..44c47fe 100644
--- a/docs/installation/server_upgrade.txt
+++ b/docs/installation/server_upgrade.txt
@@ -8,7 +8,7 @@ Software Prerequisites
* **PostgreSQL**: Version 9.3 is recommended. The minimum supported version
is 9.1.
- * **Linux**: Evergreen 2.11.1 has been tested on Debian Jessie (8.0),
+ * **Linux**: Evergreen 2.11.4 has been tested on Debian Jessie (8.0),
Debian Wheezy (7.0), Ubuntu Xenial Xerus (16.04), Ubuntu Trusty Tahr (14.04),
and Fedora.
If you are running an older version of these distributions, you may want
@@ -44,12 +44,12 @@ osrf_control --localhost --stop-all
.. Back up the /openils directory.
. Upgrade OpenSRF. Download and install the latest version of OpenSRF from
the https://evergreen-ils.org/opensrf-downloads/[OpenSRF download page].
-. As the *opensrf* user, download and extract Evergreen 2.11.1:
+. As the *opensrf* user, download and extract Evergreen 2.11.4:
+
[source, bash]
-----------------------------------------------
-wget https://evergreen-ils.org/downloads/Evergreen-ILS-2.11.1.tar.gz
-tar xzf Evergreen-ILS-2.11.1.tar.gz
+wget https://evergreen-ils.org/downloads/Evergreen-ILS-2.11.4.tar.gz
+tar xzf Evergreen-ILS-2.11.4.tar.gz
-----------------------------------------------
+
[NOTE]
@@ -59,7 +59,7 @@ For the latest edition of Evergreen, check the https://evergreen-ils.org/egdownl
+
[source, bash]
---------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.11.1
+cd /home/opensrf/Evergreen-ILS-2.11.4
---------------------------------------------
+
On the next command, replace `[distribution]` with one of these values for your
@@ -84,7 +84,7 @@ make -f Open-ILS/src/extras/Makefile.install [distribution]
+
[source, bash]
------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.11.1
+cd /home/opensrf/Evergreen-ILS-2.11.4
PATH=/openils/bin:$PATH ./configure --prefix=/openils --sysconfdir=/openils/conf
make
------------------------------------------------------------
@@ -95,8 +95,8 @@ These instructions assume that you have also installed OpenSRF under /openils/.
+
[source, bash]
------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.11.1
-make STAFF_CLIENT_STAMP_ID=rel_2_11_1 install
+cd /home/opensrf/Evergreen-ILS-2.11.4
+make STAFF_CLIENT_STAMP_ID=rel_2_11_4 install
------------------------------------------------------------
+
. As the *root* user, change all files to be owned by the opensrf user and group:
@@ -112,7 +112,7 @@ chown -R opensrf:opensrf /openils
-----------------------------------------------------------
cd /openils/var/web/xul/
rm server
-ln -sf rel_2_11_1/server server
+ln -sf rel_2_11_4/server server
----------------------------------------------------------
+
. As the *opensrf* user, update opensrf_core.xml and opensrf.xml by copying the
@@ -132,7 +132,7 @@ Copying these configuration files will remove any customizations you have made t
+
[source, bash]
-------------------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.11.1
+cd /home/opensrf/Evergreen-ILS-2.11.4
perl Open-ILS/src/support-scripts/eg_db_config --update-config --service all \
--create-offline --database evergreen --host localhost --user evergreen --password evergreen
-------------------------------------------------------------------------
@@ -156,21 +156,21 @@ The diff command can be used to show the differences between the distribution ve
+
[source, bash]
----------------------------------------------------------
-cp /home/opensrf/Evergreen-ILS-2.11.1/Open-ILS/examples/apache/eg_startup /etc/apache2/eg_startup
+cp /home/opensrf/Evergreen-ILS-2.11.4/Open-ILS/examples/apache/eg_startup /etc/apache2/eg_startup
----------------------------------------------------------
+
.. Update /etc/apache2/eg_vhost.conf by copying the example from Open-ILS/examples/apache/eg_vhost.conf.
+
[source, bash]
----------------------------------------------------------
-cp /home/opensrf/Evergreen-ILS-2.11.1/Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/eg_vhost.conf
+cp /home/opensrf/Evergreen-ILS-2.11.4/Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/eg_vhost.conf
----------------------------------------------------------
+
.. Update /etc/apache2/sites-available/eg.conf by copying the example from Open-ILS/examples/apache/eg.conf.
+
[source, bash]
----------------------------------------------------------
-cp /home/opensrf/Evergreen-ILS-2.11.1/Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/eg.conf
+cp /home/opensrf/Evergreen-ILS-2.11.4/Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/eg.conf
----------------------------------------------------------
Upgrade the Evergreen database schema
@@ -234,7 +234,7 @@ as a user with the ability to connect to the database server.
[source, bash]
----------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.11.1/Open-ILS/src/sql/Pg
+cd /home/opensrf/Evergreen-ILS-2.11.4/Open-ILS/src/sql/Pg
psql -U evergreen -h localhost -f version-upgrade/[appropriate versions here]-upgrade-db.sql evergreen
----------------------------------------------------------
commit 73e7d9e2ee1c83c6c8ef954dbf8b329f9fd42bb6
Author: Dan Wells <dbw2 at calvin.edu>
Date: Mon Feb 24 12:09:57 2014 -0500
Bump OpenILS.pm version
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/perlmods/lib/OpenILS.pm b/Open-ILS/src/perlmods/lib/OpenILS.pm
index d7235ce..8b1b5ef 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS.pm
@@ -6,6 +6,6 @@ OpenILS - Client and server support for the Evergreen open source library system
=cut
-our $VERSION = '2.4';
+our $VERSION = '2.1104';
1;
-----------------------------------------------------------------------
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list