[open-ils-commits] [GIT] Evergreen ILS branch master updated. 6174085203ce0c7ad18670f5576af153b5bfac4e
Evergreen Git
git at git.evergreen-ils.org
Fri Dec 14 14:39:01 EST 2018
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, master has been updated
via 6174085203ce0c7ad18670f5576af153b5bfac4e (commit)
via a17462f413098287b4b6d61054df9f8a382715f7 (commit)
via c656616431525e2bcb2f178ab0b3ae1739e742ac (commit)
via b10d97df412eac54423dd29d585df053bce29b57 (commit)
via d6c3fa77249d34e7627104369eae9d02340e647e (commit)
via 768e8261135d1413b6d4f3900ab41e63ead24eaf (commit)
via d46ef91807ea827f563259551ab7652ac044ac81 (commit)
via e8f4486f2b1f5abe3d374bcd9932c4d89aabc552 (commit)
via 5e6344dac1e2fdd65b5bfd2f95891d696dc5359b (commit)
via c962f16a1af9aa112dab6d824d7fbbfb9475a1b8 (commit)
via 47ddb4bf46cfbe1e3e823d9b42f2abe6715409aa (commit)
via 87fc10188dbf53c2f94286e074bcdbe4d07a9527 (commit)
via 54f1962988a4788730de83335b21b0b6a1633ba4 (commit)
from 64607a8621baf8dee9d873aad654c4dcf6b83ba1 (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 6174085203ce0c7ad18670f5576af153b5bfac4e
Author: Ben Shum <ben at evergreener.net>
Date: Fri Dec 14 14:37:45 2018 -0500
LP#1730726: Stamping upgrade script
Signed-off-by: Ben Shum <ben at evergreener.net>
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index fa9a8bb..dbe280d 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -92,7 +92,7 @@ CREATE TRIGGER no_overlapping_deps
BEFORE INSERT OR UPDATE ON config.db_patch_dependencies
FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
-INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1139', :eg_version); -- berick/kmlussier/phasefx
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1140', :eg_version); -- dyrcona/bshum
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.function.non-set-returning-evergreen.org_top.sql b/Open-ILS/src/sql/Pg/upgrade/1140.function.non-set-returning-evergreen.org_top.sql
similarity index 73%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.function.non-set-returning-evergreen.org_top.sql
rename to Open-ILS/src/sql/Pg/upgrade/1140.function.non-set-returning-evergreen.org_top.sql
index fd8c882..c7ff647 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.function.non-set-returning-evergreen.org_top.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1140.function.non-set-returning-evergreen.org_top.sql
@@ -1,6 +1,6 @@
BEGIN;
--- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('1140', :eg_version);
CREATE OR REPLACE FUNCTION evergreen.org_top()
RETURNS actor.org_unit AS $$
commit a17462f413098287b4b6d61054df9f8a382715f7
Author: Jason Stephenson <jason at sigio.com>
Date: Fri Dec 14 08:59:12 2018 -0500
LP 1730726: Add Release Notes for PostgreSQL 10 Support.
Signed-off-by: Jason Stephenson <jason at sigio.com>
Signed-off-by: Ben Shum <ben at evergreener.net>
diff --git a/docs/RELEASE_NOTES_NEXT/Architecture/postgresql10.adoc b/docs/RELEASE_NOTES_NEXT/Architecture/postgresql10.adoc
new file mode 100644
index 0000000..a4f3d06
--- /dev/null
+++ b/docs/RELEASE_NOTES_NEXT/Architecture/postgresql10.adoc
@@ -0,0 +1,34 @@
+Database Support for PostgreSQL 10
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+The Evergreen database can now be built with PostgreSQL version 10.
+
+This update has implications for developers who write PgTap tests. In
+versions of PostgreSQL prior to 10, one could write `\set ECHO` to
+disable the echoing of commands as they were run. In PostgreSQL
+version 10, using `\set` without a value is an error. One should now
+write `\set ECHO none` in order to disable the echoing of commands.
+This latter form works in all versions of PostgreSQL currently
+supported by Evergreen.
+
+Database Upgrade
+++++++++++++++++
+If you upgrade your database from a PostgreSQL version of 9.5, or
+lower, to PostgreSQL versions 9.6 or 10, you will need to recreate 3
+indexes in additon to the normal database upgrade steps. The index
+recreation is necessary because of changes to the PostgreSQL
+`unaccent` extension module.
+
+The following snippet of SQL code will do the necessary steps:
+
+[source,sql]
+------------------------------------------------------------------------
+DROP INDEX actor_usr_first_given_name_unaccent_idx;
+DROP INDEX actor_usr_second_given_name_unaccent_idx;
+DROP INDEX actor_usr_family_name_unaccent_idx;
+CREATE INDEX actor_usr_first_given_name_unaccent_idx ON actor.usr
+ (evergreen.unaccent_and_squash(first_given_name));
+CREATE INDEX actor_usr_second_given_name_unaccent_idx ON actor.usr
+ (evergreen.unaccent_and_squash(second_given_name));
+CREATE INDEX actor_usr_family_name_unaccent_idx ON actor.usr
+ (evergreen.unaccent_and_squash(family_name));
+------------------------------------------------------------------------
commit c656616431525e2bcb2f178ab0b3ae1739e742ac
Author: Jason Stephenson <jason at sigio.com>
Date: Wed Dec 12 13:24:01 2018 -0500
Lp 1730726: Fix lp1501781-unaccent_and_squash.pg for PostgreSQL 9.6
PostgreSQL 9.6 apparently exhibits the same behavior as Postgresql 10
when it comes the OE ligature in the unaccent function. We modify the
test case to take that into account.
Signed-off-by: Jason Stephenson <jason at sigio.com>
Signed-off-by: Ben Shum <ben at evergreener.net>
diff --git a/Open-ILS/src/sql/Pg/t/lp1501781-unaccent_and_squash.pg b/Open-ILS/src/sql/Pg/t/lp1501781-unaccent_and_squash.pg
index 3238804..2de74d6 100644
--- a/Open-ILS/src/sql/Pg/t/lp1501781-unaccent_and_squash.pg
+++ b/Open-ILS/src/sql/Pg/t/lp1501781-unaccent_and_squash.pg
@@ -54,7 +54,7 @@ SELECT is(evergreen.unaccent_and_squash('El Niño'),
'elnino', 'Spanish "The Kid"');
SELECT is(evergreen.unaccent_and_squash('Œuvres'),
- CASE WHEN regexp_replace(regexp_replace(version(),'\..+',''),'^PostgreSQL ','')::INT >= 10 THEN 'oeuvres' ELSE 'euvres' END, 'oe ligature');
+ CASE WHEN substring(version() from '^PostgreSQL ([0-9]+\.[0-9]+)')::DECIMAL > 9.5 THEN 'oeuvres' ELSE 'euvres' END, 'oe ligature');
-- Punctuation Tests
commit b10d97df412eac54423dd29d585df053bce29b57
Author: Jason Stephenson <jason at sigio.com>
Date: Tue Nov 6 11:00:33 2018 -0500
Lp 1730726: Fix lp1501781-unaccent_and_squash.pg for PostgreSQL 10
PostgreSQL 10 has improvements in the unaccent function used by the
evergreen.unaccent_and_squash function. The test needs a small
modification to take this into account. Actual code change from Mike
Rylander with a little typo fix.
Signed-off-by: Jason Stephenson <jason at sigio.com>
Signed-off-by: Ben Shum <ben at evergreener.net>
diff --git a/Open-ILS/src/sql/Pg/t/lp1501781-unaccent_and_squash.pg b/Open-ILS/src/sql/Pg/t/lp1501781-unaccent_and_squash.pg
index c90014f..3238804 100644
--- a/Open-ILS/src/sql/Pg/t/lp1501781-unaccent_and_squash.pg
+++ b/Open-ILS/src/sql/Pg/t/lp1501781-unaccent_and_squash.pg
@@ -54,7 +54,7 @@ SELECT is(evergreen.unaccent_and_squash('El Niño'),
'elnino', 'Spanish "The Kid"');
SELECT is(evergreen.unaccent_and_squash('Œuvres'),
- 'euvres', 'oe ligature');
+ CASE WHEN regexp_replace(regexp_replace(version(),'\..+',''),'^PostgreSQL ','')::INT >= 10 THEN 'oeuvres' ELSE 'euvres' END, 'oe ligature');
-- Punctuation Tests
commit d6c3fa77249d34e7627104369eae9d02340e647e
Author: Jason Stephenson <jason at sigio.com>
Date: Tue Nov 6 07:01:24 2018 -0500
Lp 1730726: Fix a number of PgTap tests for PostgreSQL 10.
A number of tests disabled output via "\set ECHO". In PostgreSQL 10,
the lack of a value in \set is an error. We change these lines to
"\set ECHO none".
Signed-off-by: Jason Stephenson <jason at sigio.com>
Signed-off-by: Ben Shum <ben at evergreener.net>
diff --git a/Open-ILS/src/sql/Pg/live_t/0824.item_import_defaults.pg b/Open-ILS/src/sql/Pg/live_t/0824.item_import_defaults.pg
index 3872d2c..e4fdad6 100644
--- a/Open-ILS/src/sql/Pg/live_t/0824.item_import_defaults.pg
+++ b/Open-ILS/src/sql/Pg/live_t/0824.item_import_defaults.pg
@@ -1,4 +1,4 @@
-\set ECHO
+\set ECHO none
\set QUIET 1
-- Turn off echo and keep things quiet.
diff --git a/Open-ILS/src/sql/Pg/live_t/0847.auth_overlay_generator.pg b/Open-ILS/src/sql/Pg/live_t/0847.auth_overlay_generator.pg
index c7e7f83..c841f53 100644
--- a/Open-ILS/src/sql/Pg/live_t/0847.auth_overlay_generator.pg
+++ b/Open-ILS/src/sql/Pg/live_t/0847.auth_overlay_generator.pg
@@ -1,4 +1,4 @@
-\set ECHO
+\set ECHO none
\set QUIET 1
-- Turn off echo and keep things quiet.
diff --git a/Open-ILS/src/sql/Pg/live_t/0852.prox_adjust.pg b/Open-ILS/src/sql/Pg/live_t/0852.prox_adjust.pg
index 683be42..0872da6 100644
--- a/Open-ILS/src/sql/Pg/live_t/0852.prox_adjust.pg
+++ b/Open-ILS/src/sql/Pg/live_t/0852.prox_adjust.pg
@@ -1,4 +1,4 @@
-\set ECHO
+\set ECHO none
\set QUIET 1
-- Turn off echo and keep things quiet.
diff --git a/Open-ILS/src/sql/Pg/make-pgtap-tests.pl b/Open-ILS/src/sql/Pg/make-pgtap-tests.pl
index e26fd81..ad2d21b 100755
--- a/Open-ILS/src/sql/Pg/make-pgtap-tests.pl
+++ b/Open-ILS/src/sql/Pg/make-pgtap-tests.pl
@@ -80,7 +80,7 @@ exit 0;
sub pgtap_sql_header {
return q^
-\set ECHO
+\set ECHO none
\set QUIET 1
-- Turn off echo and keep things quiet.
diff --git a/Open-ILS/src/sql/Pg/t/0799.state_field_required_toggle.pg b/Open-ILS/src/sql/Pg/t/0799.state_field_required_toggle.pg
index 4e9a8e4..20c32aa 100644
--- a/Open-ILS/src/sql/Pg/t/0799.state_field_required_toggle.pg
+++ b/Open-ILS/src/sql/Pg/t/0799.state_field_required_toggle.pg
@@ -1,4 +1,4 @@
-\set ECHO
+\set ECHO none
\set QUIET 1
-- Turn off echo and keep things quiet.
diff --git a/Open-ILS/src/sql/Pg/t/dewey.pg b/Open-ILS/src/sql/Pg/t/dewey.pg
index 50f42ba..df05f54 100644
--- a/Open-ILS/src/sql/Pg/t/dewey.pg
+++ b/Open-ILS/src/sql/Pg/t/dewey.pg
@@ -1,4 +1,4 @@
-\set ECHO
+\set ECHO none
\set QUIET 1
-- Turn off echo and keep things quiet.
diff --git a/Open-ILS/src/sql/Pg/t/lp1198475-lost-and-paid-status.pg b/Open-ILS/src/sql/Pg/t/lp1198475-lost-and-paid-status.pg
index 9c5e664..7f7de76 100644
--- a/Open-ILS/src/sql/Pg/t/lp1198475-lost-and-paid-status.pg
+++ b/Open-ILS/src/sql/Pg/t/lp1198475-lost-and-paid-status.pg
@@ -1,4 +1,4 @@
-\set ECHO
+\set ECHO none
\set QUIET 1
-- Turn off echo and keep things quiet.
diff --git a/Open-ILS/src/sql/Pg/t/lp1533329-restrict-opt-in-setting.pg b/Open-ILS/src/sql/Pg/t/lp1533329-restrict-opt-in-setting.pg
index 1bd365e..e2e0181 100644
--- a/Open-ILS/src/sql/Pg/t/lp1533329-restrict-opt-in-setting.pg
+++ b/Open-ILS/src/sql/Pg/t/lp1533329-restrict-opt-in-setting.pg
@@ -1,4 +1,4 @@
-\set ECHO
+\set ECHO none
\set QUIET 1
-- Turn off echo and keep things quiet.
diff --git a/Open-ILS/src/sql/Pg/t/lp1582354_report_able_to_show_bibs_where_the_last_copy_was_deleted_cancels.pg b/Open-ILS/src/sql/Pg/t/lp1582354_report_able_to_show_bibs_where_the_last_copy_was_deleted_cancels.pg
index b3f0a39..bbbc9aa 100644
--- a/Open-ILS/src/sql/Pg/t/lp1582354_report_able_to_show_bibs_where_the_last_copy_was_deleted_cancels.pg
+++ b/Open-ILS/src/sql/Pg/t/lp1582354_report_able_to_show_bibs_where_the_last_copy_was_deleted_cancels.pg
@@ -1,4 +1,4 @@
-\set ECHO
+\set ECHO none
\set QUIET 1
-- Turn off echo and keep things quiet.
diff --git a/Open-ILS/src/sql/Pg/t/lp1599634_Circulation_report_source_to_include_in-house_and_non_cat_circ.pg b/Open-ILS/src/sql/Pg/t/lp1599634_Circulation_report_source_to_include_in-house_and_non_cat_circ.pg
index 2795719..f74d636d 100644
--- a/Open-ILS/src/sql/Pg/t/lp1599634_Circulation_report_source_to_include_in-house_and_non_cat_circ.pg
+++ b/Open-ILS/src/sql/Pg/t/lp1599634_Circulation_report_source_to_include_in-house_and_non_cat_circ.pg
@@ -1,4 +1,4 @@
-\set ECHO
+\set ECHO none
\set QUIET 1
-- Turn off echo and keep things quiet.
diff --git a/Open-ILS/src/sql/Pg/t/lp980296-void-lost-lo-claims-returned.pg b/Open-ILS/src/sql/Pg/t/lp980296-void-lost-lo-claims-returned.pg
index 33695f1..b7ccea0 100644
--- a/Open-ILS/src/sql/Pg/t/lp980296-void-lost-lo-claims-returned.pg
+++ b/Open-ILS/src/sql/Pg/t/lp980296-void-lost-lo-claims-returned.pg
@@ -1,4 +1,4 @@
-\set ECHO
+\set ECHO none
\set QUIET 1
-- Turn off echo and keep things quiet.
diff --git a/Open-ILS/src/sql/Pg/t/regress/lp1272074_0858_fixed_field_enhancements.pg b/Open-ILS/src/sql/Pg/t/regress/lp1272074_0858_fixed_field_enhancements.pg
index d48c4a0..c6ef973 100644
--- a/Open-ILS/src/sql/Pg/t/regress/lp1272074_0858_fixed_field_enhancements.pg
+++ b/Open-ILS/src/sql/Pg/t/regress/lp1272074_0858_fixed_field_enhancements.pg
@@ -1,4 +1,4 @@
-\set ECHO
+\set ECHO none
\set QUIET 1
-- Turn off echo and keep things quiet.
diff --git a/Open-ILS/src/sql/Pg/t/schema.pg b/Open-ILS/src/sql/Pg/t/schema.pg
index 7d4feca..bfa5f7b 100644
--- a/Open-ILS/src/sql/Pg/t/schema.pg
+++ b/Open-ILS/src/sql/Pg/t/schema.pg
@@ -1,4 +1,4 @@
-\set ECHO
+\set ECHO none
\set QUIET 1
-- Turn off echo and keep things quiet.
diff --git a/Open-ILS/src/sql/Pg/t/versions.pg b/Open-ILS/src/sql/Pg/t/versions.pg
index b611cbc..4db53b1 100644
--- a/Open-ILS/src/sql/Pg/t/versions.pg
+++ b/Open-ILS/src/sql/Pg/t/versions.pg
@@ -1,4 +1,4 @@
-\set ECHO
+\set ECHO none
\set QUIET 1
-- Turn off echo and keep things quiet.
commit 768e8261135d1413b6d4f3900ab41e63ead24eaf
Author: Jason Stephenson <jason at sigio.com>
Date: Mon Nov 5 14:37:19 2018 -0500
Lp 1730726: Basic Patch to build the database with PostgreSQL 10.
* Modify the evergreen.org_top() function, with code from Galen
Charlton, to be non-set returning.
* Modify Open-ILS/src/support-scripts/eg_db_config.in to not strip the
period from PostgreSQL version numbers and to use the first two
components when checking for supported PostgreSQL versions.
* Add link from Open-ILS/src/sql/Pg/000.english.pg94.fts-config.sql
to Open-ILS/src/sql/Pg/000.english.pg10.fts-config.sql.
Signed-off-by: Jason Stephenson <jason at sigio.com>
Signed-off-by: Ben Shum <ben at evergreener.net>
diff --git a/Open-ILS/src/sql/Pg/000.english.pg10.fts-config.sql b/Open-ILS/src/sql/Pg/000.english.pg10.fts-config.sql
new file mode 120000
index 0000000..38504b5
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/000.english.pg10.fts-config.sql
@@ -0,0 +1 @@
+000.english.pg94.fts-config.sql
\ No newline at end of file
diff --git a/Open-ILS/src/sql/Pg/990.schema.unapi.sql b/Open-ILS/src/sql/Pg/990.schema.unapi.sql
index a40d66f..b761fbb 100644
--- a/Open-ILS/src/sql/Pg/990.schema.unapi.sql
+++ b/Open-ILS/src/sql/Pg/990.schema.unapi.sql
@@ -4,10 +4,9 @@ BEGIN;
CREATE SCHEMA unapi;
CREATE OR REPLACE FUNCTION evergreen.org_top()
-RETURNS SETOF actor.org_unit AS $$
+RETURNS actor.org_unit AS $$
SELECT * FROM actor.org_unit WHERE parent_ou IS NULL LIMIT 1;
-$$ LANGUAGE SQL STABLE
-ROWS 1;
+$$ LANGUAGE SQL STABLE;
CREATE OR REPLACE FUNCTION evergreen.array_remove_item_by_value(inp ANYARRAY, el ANYELEMENT)
RETURNS anyarray AS $$
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.function.non-set-returning-evergreen.org_top.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.function.non-set-returning-evergreen.org_top.sql
new file mode 100644
index 0000000..fd8c882
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.function.non-set-returning-evergreen.org_top.sql
@@ -0,0 +1,10 @@
+BEGIN;
+
+-- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+CREATE OR REPLACE FUNCTION evergreen.org_top()
+RETURNS actor.org_unit AS $$
+ SELECT * FROM actor.org_unit WHERE parent_ou IS NULL LIMIT 1;
+$$ LANGUAGE SQL STABLE;
+
+COMMIT:
diff --git a/Open-ILS/src/support-scripts/eg_db_config.in b/Open-ILS/src/support-scripts/eg_db_config.in
index dc61d09..699dc7e 100755
--- a/Open-ILS/src/support-scripts/eg_db_config.in
+++ b/Open-ILS/src/support-scripts/eg_db_config.in
@@ -142,11 +142,11 @@ sub create_database {
$ENV{'PGPASSWORD'} = $settings->{pw};
$ENV{'PGPORT'} = $settings->{port};
$ENV{'PGHOST'} = $settings->{host};
- my @temp = `psql -d postgres -qtc 'show server_version;' | xargs | cut -d. -f 1,2 | tr -d '.'`;
+ my @temp = split(/ /, `psql -d postgres -qtc 'show server_version;' | xargs | cut -d. -f 1,2`);
chomp $temp[0];
my $pgversion = $temp[0];
my $cmd;
- unless ($pgversion >= '94') {
+ unless ($pgversion >= '9.4') {
my @message = ();
push(@message,
"\n------------------------------------------------------------------------------\n",
@@ -166,7 +166,7 @@ sub create_database {
push(@output, "\nYou may need to install the postgresql plperl package on the database server.\n");
}
if(grep/No such file or directory/, @output) {
- if($pgversion >= '91') {
+ if($pgversion >= '9.1') {
push(@output, "\nYou may need to install the postgresql contrib package on the database server.\n");
} else {
push(@output, "\nYou may need to install the postgresql contrib package on this server.\n");
commit d46ef91807ea827f563259551ab7652ac044ac81
Author: Jason Stephenson <jason at sigio.com>
Date: Thu Dec 13 13:37:10 2018 -0500
LP#1793585: Add Release Notes
Signed-off-by: Jason Stephenson <jason at sigio.com>
Signed-off-by: Ben Shum <ben at evergreener.net>
diff --git a/docs/RELEASE_NOTES_NEXT/Architecture/ubuntu-bionic.adoc b/docs/RELEASE_NOTES_NEXT/Architecture/ubuntu-bionic.adoc
new file mode 100644
index 0000000..5fc8d0b
--- /dev/null
+++ b/docs/RELEASE_NOTES_NEXT/Architecture/ubuntu-bionic.adoc
@@ -0,0 +1,9 @@
+Ubuntu 18.04 Bionic Beaver
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+Evergreen can now be installed on Ubuntu 18.04 Bionic Beaver. To
+install the prerequisites, use ubuntu-bionic as the Makefile.install
+target.
+
+This update also fixes a Perl warning in the HoldNotify module that is
+an error in the version of Perl (5.26) that is installed on Ubuntu
+18.04.
commit e8f4486f2b1f5abe3d374bcd9932c4d89aabc552
Author: Ben Shum <ben at evergreener.net>
Date: Mon Nov 5 16:33:53 2018 -0500
LP#1793585: Fix PostgreSQL apt repo source setup
For standalone DB server install, ensure that we are applying the proper
PostgreSQL community apt repo for packages.
DO NOT backport this branch. There are presently known issues with
Ubuntu 18.04 and email generation from action/trigger and other
interfaces. We plan to address these before the 3.3 release, but do
not necessarily expect to backport those fixes.
Signed-off-by: Ben Shum <ben at evergreener.net>
Signed-off-by: Jason Stephenson <jason at sigio.com>
diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-bionic b/Open-ILS/src/extras/install/Makefile.ubuntu-bionic
index 41c69ec..adc3c54 100644
--- a/Open-ILS/src/extras/install/Makefile.ubuntu-bionic
+++ b/Open-ILS/src/extras/install/Makefile.ubuntu-bionic
@@ -99,6 +99,10 @@ export CPAN_MODULES_FORCE = \
export CPAN_MODULES_PGSQL = \
MARC::File::XML
+PGSQL_APT_REPO_DEBS = \
+ wget \
+ ca-certificates
+
PGSQL_SERVER_DEBS_96 = \
$(DEB_PGSQL_COMMON_MODS) \
postgresql-9.6 \
@@ -144,6 +148,8 @@ all:
make -f $(DIR)/Makefile.debian debian_sys_config
install_postgres_server:
+ make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_APT_REPO_DEBS)"
+ make -f $(DIR)/Makefile.debian debian_postgresql_repo
make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_96)"
make -f $(DIR)/Makefile.common install_cpan_pgsql
commit 5e6344dac1e2fdd65b5bfd2f95891d696dc5359b
Author: Ben Shum <ben at evergreener.net>
Date: Mon Nov 5 16:26:04 2018 -0500
LP#1793585: Change to use MARC::File::XML
Use MARC::File::XML instead of MARC::XML (this is ancient and not used)
Signed-off-by: Ben Shum <ben at evergreener.net>
Signed-off-by: Jason Stephenson <jason at sigio.com>
diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-bionic b/Open-ILS/src/extras/install/Makefile.ubuntu-bionic
index dada657..41c69ec 100644
--- a/Open-ILS/src/extras/install/Makefile.ubuntu-bionic
+++ b/Open-ILS/src/extras/install/Makefile.ubuntu-bionic
@@ -97,7 +97,7 @@ export CPAN_MODULES_FORCE = \
Class::DBI::Frozen::301
export CPAN_MODULES_PGSQL = \
- MARC::XML
+ MARC::File::XML
PGSQL_SERVER_DEBS_96 = \
$(DEB_PGSQL_COMMON_MODS) \
commit c962f16a1af9aa112dab6d824d7fbbfb9475a1b8
Author: Ben Shum <ben at evergreener.net>
Date: Mon Nov 5 15:42:51 2018 -0500
LP#1793585: PGSQL dependency update
The MARC::XML cpan dependency needs to be included as part of the standalone
Postgres server install for Ubuntu 18.04.
Signed-off-by: Ben Shum <ben at evergreener.net>
Signed-off-by: Jason Stephenson <jason at sigio.com>
diff --git a/Open-ILS/src/extras/install/Makefile.common b/Open-ILS/src/extras/install/Makefile.common
index c542287..96ec3b8 100644
--- a/Open-ILS/src/extras/install/Makefile.common
+++ b/Open-ILS/src/extras/install/Makefile.common
@@ -9,6 +9,9 @@ install_cpan_force:
echo "force install $$m" | perl -MCPAN -e shell ;\
done
+install_cpan_pgsql:
+ for m in $(CPAN_MODULES_PGSQL); do perl -MCPAN -e "install \"$$m\";"; done
+
install_net_z3950_simpleserver:
if [ ! -f $(LIBNET_Z3950_SIMPLESERVER).tar.gz ]; \
then wget $(LIBNET_Z3950_SIMPLESERVER_URL).tar.gz; \
diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-bionic b/Open-ILS/src/extras/install/Makefile.ubuntu-bionic
index 1e28f62..dada657 100644
--- a/Open-ILS/src/extras/install/Makefile.ubuntu-bionic
+++ b/Open-ILS/src/extras/install/Makefile.ubuntu-bionic
@@ -89,7 +89,6 @@ export DEB_APACHE_DISCONF = \
export CPAN_MODULES = \
Business::OnlinePayment::PayPal \
Email::Send \
- MARC::XML \
MARC::Charset \
Net::Z3950::Simple2ZOOM
@@ -97,6 +96,9 @@ export CPAN_MODULES_FORCE = \
Business::Stripe \
Class::DBI::Frozen::301
+export CPAN_MODULES_PGSQL = \
+ MARC::XML
+
PGSQL_SERVER_DEBS_96 = \
$(DEB_PGSQL_COMMON_MODS) \
postgresql-9.6 \
@@ -138,10 +140,12 @@ all:
make -f $(DIR)/Makefile.debian install_debs
make -f $(DIR)/Makefile.common install_cpan
make -f $(DIR)/Makefile.common install_cpan_force
+ make -f $(DIR)/Makefile.common install_cpan_pgsql
make -f $(DIR)/Makefile.debian debian_sys_config
install_postgres_server:
make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_96)"
+ make -f $(DIR)/Makefile.common install_cpan_pgsql
# note: if/when grunt-cli is available as a
# package, use the packaged version instead.
commit 47ddb4bf46cfbe1e3e823d9b42f2abe6715409aa
Author: Jason Stephenson <jason at sigio.com>
Date: Tue Sep 25 11:47:05 2018 -0400
LP#1793585: Fix Unescaped left brace in regex Perl error.
Running make check results in the following error on Perl 5.26:
Unescaped left brace in regex is illegal here in regex; marked by <-- HERE in m/\${ <-- HERE EMAIL_SENDER}/ at Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/HoldNotify.pm line 358.
Prior to Ubuntu 18.04 and Perl 5.26, this was a deprecation warning.
This commit fixes the regular expressions in HoldNotify.pm to escape
the left braces to make this error/warning go away.
Signed-off-by: Jason Stephenson <jason at sigio.com>
Signed-off-by: Ben Shum <ben at evergreener.net>
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/HoldNotify.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/HoldNotify.pm
index a042452..b455960 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/HoldNotify.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/HoldNotify.pm
@@ -355,22 +355,22 @@ sub flesh_template {
$sender = $bemail if $bemail;
}
- $str =~ s/\${EMAIL_SENDER}/$sender/;
- $str =~ s/\${EMAIL_RECIPIENT}/$email/;
- $str =~ s/\${EMAIL_REPLY_TO}/$reply_to/;
- $str =~ s/\${EMAIL_HEADERS}//;
-
- $str =~ s/\${DATE}/$year-$month-$day/;
- $str =~ s/\${LIBRARY}/$o_name/;
- $str =~ s/\${LIBRARY_ADDRESS}/$o_addr/;
- $str =~ s/\${PATRON_NAME}/$p_name/;
- $str =~ s/\${PATRON_ADDRESS}/$p_addr/;
-
- $str =~ s/\${TITLE}/$title/;
- $str =~ s/\${AUTHOR}/$author/;
- $str =~ s/\${CALL_NUMBER}/$cn/;
- $str =~ s/\${COPY_BARCODE}/$barcode/;
- $str =~ s/\${COPY_NUMBER}/$copy_number/;
+ $str =~ s/\$\{EMAIL_SENDER}/$sender/;
+ $str =~ s/\$\{EMAIL_RECIPIENT}/$email/;
+ $str =~ s/\$\{EMAIL_REPLY_TO}/$reply_to/;
+ $str =~ s/\$\{EMAIL_HEADERS}//;
+
+ $str =~ s/\$\{DATE}/$year-$month-$day/;
+ $str =~ s/\$\{LIBRARY}/$o_name/;
+ $str =~ s/\$\{LIBRARY_ADDRESS}/$o_addr/;
+ $str =~ s/\$\{PATRON_NAME}/$p_name/;
+ $str =~ s/\$\{PATRON_ADDRESS}/$p_addr/;
+
+ $str =~ s/\$\{TITLE}/$title/;
+ $str =~ s/\$\{AUTHOR}/$author/;
+ $str =~ s/\$\{CALL_NUMBER}/$cn/;
+ $str =~ s/\$\{COPY_BARCODE}/$barcode/;
+ $str =~ s/\$\{COPY_NUMBER}/$copy_number/;
return $str;
}
commit 87fc10188dbf53c2f94286e074bcdbe4d07a9527
Author: Ben Shum <ben at evergreener.net>
Date: Thu Sep 20 11:08:12 2018 -0400
LP#1793585: Update README to include Bionic references
Signed-off-by: Ben Shum <ben at evergreener.net>
Signed-off-by: Jason Stephenson <jason at sigio.com>
diff --git a/docs/installation/server_installation.adoc b/docs/installation/server_installation.adoc
index d854169..1fb32aa 100644
--- a/docs/installation/server_installation.adoc
+++ b/docs/installation/server_installation.adoc
@@ -55,9 +55,12 @@ Installing prerequisites
------------------------
* **PostgreSQL**: The minimum supported version is 9.4.
- * **Linux**: Evergreen has been tested on Debian Stretch (9),
- Debian Jessie (8), Ubuntu Xenial Xerus (16.04), and Ubuntu
- Trusty Tahr (14.04).
+ * **Linux**: Evergreen has been tested on
+ Debian Stretch (9),
+ Debian Jessie (8),
+ Ubuntu Bionic Beaver (18.04),
+ Ubuntu Xenial Xerus (16.04),
+ and Ubuntu Trusty Tahr (14.04).
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 or Ubuntu websites.
@@ -72,8 +75,9 @@ before you can successfully configure, compile, and install Evergreen.
2. On some distributions, it is necessary to install PostgreSQL 9.4+ from external
repositories.
+
- * Ubuntu (Trusty) comes with an older version of PostgreSQL, so
- steps are taken to automatically utilize the PostgreSQL
+ * Ubuntu (Trusty) comes with an older version of PostgreSQL
+ and Ubuntu (Bionic) comes with a newer version of PostgreSQL,
+ so steps are taken to automatically utilize the PostgreSQL
community's apt sources.
(For complete details, see: https://wiki.postgresql.org/wiki/Apt)
* Debian (Jessie/Stretch) and Ubuntu (Xenial) comes with PostgreSQL 9.4+,
@@ -81,7 +85,7 @@ before you can successfully configure, compile, and install Evergreen.
+
3. Issue the following commands as the *root* Linux account to install
prerequisites using the `Makefile.install` prerequisite installer,
- substituting `debian-stretch`, `debian-jessie`,`ubuntu-xenial`,
+ substituting `debian-stretch`,`debian-jessie`,`ubuntu-bionic`,`ubuntu-xenial`,
or `ubuntu-trusty` for <osname> below:
+
[source, bash]
@@ -434,6 +438,7 @@ make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-stretch
make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-jessie
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-ubuntu-bionic
------------------------------------------------------------------------------
For a standalone PostgreSQL server, install the following Perl modules for your
commit 54f1962988a4788730de83335b21b0b6a1633ba4
Author: Ben Shum <ben at evergreener.net>
Date: Thu Sep 20 11:03:30 2018 -0400
LP#1793585: Support Ubuntu 18.04 Bionic Beaver
Changes to Makefile.install to support this version of Ubuntu.
Note: We are using PG9.6 from the PostgreSQL apt source instead of the
standard PG10 version that ships with Ubuntu 18.04. Further testing required
before we switch PG versions so relying on a known working version for now.
Signed-off-by: Ben Shum <ben at evergreener.net>
Signed-off-by: Jason Stephenson <jason at sigio.com>
diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index 60a4ea3..d58a6f4 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -18,6 +18,8 @@
# - or -
# make -f Makefile.install ubuntu-xenial
# - or -
+# make -f Makefile.install ubuntu-bionic
+# - or -
# make -f Makefile.install fedora
#
# ---------------------------------------------------------------------
@@ -66,6 +68,8 @@ debian-stretch:
@make -f $(DIR)/Makefile.debian-stretch
debian-jessie:
@make -f $(DIR)/Makefile.debian-jessie
+ubuntu-bionic:
+ @make -f $(DIR)/Makefile.ubuntu-bionic
ubuntu-xenial:
@make -f $(DIR)/Makefile.ubuntu-xenial
ubuntu-trusty:
@@ -77,6 +81,8 @@ postgres-server-debian-stretch:
@make -f $(DIR)/Makefile.debian-stretch install_postgres_server
postgres-server-debian-jessie:
@make -f $(DIR)/Makefile.debian-jessie install_postgres_server
+postgres-server-ubuntu-bionic:
+ @make -f $(DIR)/Makefile.ubuntu-bionic install_postgres_server
postgres-server-ubuntu-xenial:
@make -f $(DIR)/Makefile.ubuntu-xenial install_postgres_server
postgres-server-ubuntu-trusty:
@@ -84,6 +90,8 @@ postgres-server-ubuntu-trusty:
postgres-server-fedora:
@make -f $(DIR)/Makefile.fedora install_postgres_server
+ubuntu-bionic-developer:
+ @make -f $(DIR)/Makefile.ubuntu-bionic install_developer
ubuntu-xenial-developer:
@make -f $(DIR)/Makefile.ubuntu-xenial install_developer
ubuntu-trusty-developer:
@@ -93,6 +101,8 @@ debian-stretch-developer:
debian-jessie-developer:
@make -f $(DIR)/Makefile.debian-jessie install_developer
+ubuntu-bionic-translator:
+ @make -f $(DIR)/Makefile.ubuntu-bionic install_translator
ubuntu-xenial-translator:
@make -f $(DIR)/Makefile.ubuntu-xenial install_translator
ubuntu-trusty-translator:
@@ -102,6 +112,8 @@ debian-stretch-translator:
debian-jessie-translator:
@make -f $(DIR)/Makefile.debian-jessie install_translator
+ubuntu-bionic-packager:
+ @make -f $(DIR)/Makefile.ubuntu-bionic install_packager
ubuntu-xenial-packager:
@make -f $(DIR)/Makefile.ubuntu-xenial install_packager
ubuntu-trusty-packager:
diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-bionic b/Open-ILS/src/extras/install/Makefile.ubuntu-bionic
new file mode 100644
index 0000000..1e28f62
--- /dev/null
+++ b/Open-ILS/src/extras/install/Makefile.ubuntu-bionic
@@ -0,0 +1,162 @@
+# install files for Ubuntu Bionic
+
+DIR = $(dir $(lastword $(MAKEFILE_LIST)))
+
+export DEB_PGSQL_COMMON_MODS = \
+ gcc \
+ libbusiness-isbn-perl \
+ libjson-xs-perl \
+ liblibrary-callnumber-lc-perl \
+ libmarc-record-perl \
+ librose-uri-perl \
+ libuuid-tiny-perl \
+ libxml-libxml-perl \
+ libxml-libxslt-perl
+
+export DEBS = \
+ $(DEB_PGSQL_COMMON_MODS) \
+ apache2-dev\
+ aspell\
+ aspell-en\
+ libapache2-mod-perl2\
+ libbusiness-creditcard-perl\
+ libbusiness-isbn-data-perl\
+ libbusiness-issn-perl\
+ libbusiness-onlinepayment-authorizenet-perl\
+ libbusiness-onlinepayment-payflowpro-perl\
+ libbusiness-onlinepayment-perl\
+ libdate-manip-perl\
+ libdatetime-format-builder-perl\
+ libdatetime-format-iso8601-perl\
+ libdatetime-format-mail-perl\
+ libdatetime-perl\
+ libdatetime-set-perl\
+ libdatetime-timezone-perl\
+ libdbd-pg-perl\
+ libdbd-pgsql\
+ libdbi-dev\
+ libdbi1\
+ libemail-simple-perl\
+ libexcel-writer-xlsx-perl\
+ libgd-graph3d-perl\
+ liblocale-maketext-lexicon-perl\
+ liblog-log4perl-perl\
+ libncurses5-dev\
+ libnet-ip-perl\
+ libnet-ldap-perl \
+ libnet-server-perl\
+ libnet-ssh2-perl\
+ libnet-z3950-simpleserver-perl\
+ libnet-z3950-zoom-perl \
+ libnspr4-dev\
+ libole-storage-lite-perl\
+ libparent-perl\
+ libpq5\
+ libpq-dev\
+ libpcre3-dev\
+ librpc-xml-perl\
+ libsru-perl\
+ libssh2-1-dev\
+ libtemplate-plugin-posix-perl\
+ libtest-warn-perl\
+ libtest-output-perl\
+ libtext-aspell-perl\
+ libtext-csv-perl\
+ libuniversal-require-perl\
+ libunix-syslog-perl\
+ libyaz-dev\
+ postgresql-client-9.6\
+ libsoap-lite-perl\
+ libbz2-dev\
+ libparse-recdescent-perl\
+ yaz
+
+export DEB_APACHE_MODS = \
+ expires\
+ include\
+ proxy\
+ proxy_http\
+ rewrite\
+ cgi\
+ perl
+
+export DEB_APACHE_DISMODS = \
+ deflate
+
+export DEB_APACHE_DISCONF = \
+ serve-cgi-bin
+
+export CPAN_MODULES = \
+ Business::OnlinePayment::PayPal \
+ Email::Send \
+ MARC::XML \
+ MARC::Charset \
+ Net::Z3950::Simple2ZOOM
+
+export CPAN_MODULES_FORCE = \
+ Business::Stripe \
+ Class::DBI::Frozen::301
+
+PGSQL_SERVER_DEBS_96 = \
+ $(DEB_PGSQL_COMMON_MODS) \
+ postgresql-9.6 \
+ postgresql-contrib-9.6 \
+ postgresql-plperl-9.6 \
+ postgresql-server-dev-9.6
+
+# note: some prereqs are repeated in the developer/packager
+# sections to support building Evergreen packages on servers
+# where Evergreen and its prereqs are not installed.
+
+DEVELOPER_DEBS = \
+ automake \
+ autoconf \
+ libtool
+
+PACKAGER_DEBS = \
+ asciidoc \
+ source-highlight \
+ zip \
+ unzip \
+ nsis
+
+TRANSLATOR_DEBS = \
+ libtemplate-perl \
+ liblocale-maketext-lexicon-perl \
+ translate-toolkit \
+ python-dev \
+ python-levenshtein \
+ python-polib \
+ python-setuptools \
+ python-simplejson \
+ python-lxml \
+ bzr
+
+all:
+ make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_APT_REPO_DEBS)"
+ make -f $(DIR)/Makefile.debian debian_postgresql_repo
+ make -f $(DIR)/Makefile.debian install_debs
+ make -f $(DIR)/Makefile.common install_cpan
+ make -f $(DIR)/Makefile.common install_cpan_force
+ make -f $(DIR)/Makefile.debian debian_sys_config
+
+install_postgres_server:
+ make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_96)"
+
+# note: if/when grunt-cli is available as a
+# package, use the packaged version instead.
+install_developer:
+ make -f $(DIR)/Makefile.debian DEBS="$(DEVELOPER_DEBS)"
+ make -f $(DIR)/Makefile.common install_nodejs_from_source
+
+install_translator: install_developer
+ make -f $(DIR)/Makefile.debian DEBS="$(TRANSLATOR_DEBS)"
+
+install_packager: install_developer install_translator
+ make -f $(DIR)/Makefile.debian DEBS="$(PACKAGER_DEBS)"
+
+clean:
+ make -f $(DIR)/Makefile.common clean
+ make -f $(DIR)/Makefile.debian clean
+
+# vim:noet:sw=4:ts=4:
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/extras/Makefile.install | 12 +++++++
Open-ILS/src/extras/install/Makefile.common | 3 ++
...efile.debian-stretch => Makefile.ubuntu-bionic} | 25 ++++++++++----
.../lib/OpenILS/Application/Circ/HoldNotify.pm | 32 +++++++++---------
...-config.sql => 000.english.pg10.fts-config.sql} | 0
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/990.schema.unapi.sql | 5 +--
.../src/sql/Pg/live_t/0824.item_import_defaults.pg | 2 +-
.../sql/Pg/live_t/0847.auth_overlay_generator.pg | 2 +-
Open-ILS/src/sql/Pg/live_t/0852.prox_adjust.pg | 2 +-
Open-ILS/src/sql/Pg/make-pgtap-tests.pl | 2 +-
.../sql/Pg/t/0799.state_field_required_toggle.pg | 2 +-
Open-ILS/src/sql/Pg/t/dewey.pg | 2 +-
.../src/sql/Pg/t/lp1198475-lost-and-paid-status.pg | 2 +-
.../src/sql/Pg/t/lp1501781-unaccent_and_squash.pg | 2 +-
.../sql/Pg/t/lp1533329-restrict-opt-in-setting.pg | 2 +-
...bibs_where_the_last_copy_was_deleted_cancels.pg | 2 +-
..._source_to_include_in-house_and_non_cat_circ.pg | 2 +-
.../Pg/t/lp980296-void-lost-lo-claims-returned.pg | 2 +-
.../lp1272074_0858_fixed_field_enhancements.pg | 2 +-
Open-ILS/src/sql/Pg/t/schema.pg | 2 +-
Open-ILS/src/sql/Pg/t/versions.pg | 2 +-
...unction.non-set-returning-evergreen.org_top.sql | 10 ++++++
Open-ILS/src/support-scripts/eg_db_config.in | 6 ++--
.../Architecture/postgresql10.adoc | 34 ++++++++++++++++++++
.../Architecture/ubuntu-bionic.adoc | 9 +++++
docs/installation/server_installation.adoc | 17 ++++++---
27 files changed, 134 insertions(+), 51 deletions(-)
copy Open-ILS/src/extras/install/{Makefile.debian-stretch => Makefile.ubuntu-bionic} (85%)
copy Open-ILS/src/sql/Pg/{000.english.pg95.fts-config.sql => 000.english.pg10.fts-config.sql} (100%)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/1140.function.non-set-returning-evergreen.org_top.sql
create mode 100644 docs/RELEASE_NOTES_NEXT/Architecture/postgresql10.adoc
create mode 100644 docs/RELEASE_NOTES_NEXT/Architecture/ubuntu-bionic.adoc
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list