[open-ils-commits] [GIT] Evergreen ILS branch master updated. 55c4d38487deeb3de20e525af412d18989fafafe
Evergreen Git
git at git.evergreen-ils.org
Sun Mar 4 00:49:10 EST 2012
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 55c4d38487deeb3de20e525af412d18989fafafe (commit)
via 23f19fb5e2e81511f1ea0cd7ba8614bc43351dfd (commit)
via 9691c3459ef5317c628f00a9cae36113b722e1b6 (commit)
via 0f22ac1ec6e8c28b48cceb804acda40f03445aef (commit)
via 396b75525336094e1ac054159dc08b0be49c3478 (commit)
via d0ad97f2aa08f5abbe3854fde291556d9241aaa5 (commit)
via 09ed9998fcfc7ee20470b4aa87423cf28dbb9b89 (commit)
via a4904b7b6e7107eb42381921ed579395e1621c14 (commit)
via c4fd05e1951fb5a83d51287cf0cd2adf04ff43fb (commit)
via 2f3dc75e33dfd4c95c4f37cf511c27dd8d4bdb44 (commit)
from 8542b1f352017c3264a083ab1626116c75b67f2a (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 55c4d38487deeb3de20e525af412d18989fafafe
Author: Dan Scott <dscott at laurentian.ca>
Date: Sun Mar 4 00:46:38 2012 -0500
Remove reference to CentOS and RHEL from the README
Until we have a known working install for CentOS and RHEL in
Makefile.install again, let's not advertise a known non-working install.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/README b/README
index fbf631d..5cda9a8 100644
--- a/README
+++ b/README
@@ -109,19 +109,14 @@ add-apt-repository ppa:pitti/postgresql
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-squeeze`, `fedora16`, `ubuntu-lucid`, `ubuntu-precise`,
- `centos`, or `rhel` for <osname> below:
+ substituting `debian-squeeze`, `fedora16`, `ubuntu-lucid`, or
+ `ubuntu-precise` for <osname> below:
+
[source, bash]
------------------------------------------------------------------------------
make -f Open-ILS/src/extras/Makefile.install <osname>
------------------------------------------------------------------------------
+
-[NOTE]
-`centos` and `rhel` are less tested than the `debian`, `fedora`, `ubuntu-lucid`,
-and `ubuntu-precise` options. Your patches and suggestions for improvement are
-welcome!
-+
5. Add the libdbi-libdbd libraries to the system dynamic library path by
issuing the following commands as the *root* Linux account:
+
commit 23f19fb5e2e81511f1ea0cd7ba8614bc43351dfd
Author: Dan Scott <dscott at laurentian.ca>
Date: Sun Mar 4 00:43:29 2012 -0500
Default to table of contents & numbering for README
A tiny decrease in the legibility of the raw text format of the README
is traded off for consistent output formatting.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/README b/README
index 9c4828c..fbf631d 100644
--- a/README
+++ b/README
@@ -1,5 +1,7 @@
README for Evergreen master
===========================
+:toc:
+:numbered:
Preamble: referenced user accounts
----------------------------------
commit 9691c3459ef5317c628f00a9cae36113b722e1b6
Author: Dan Scott <dscott at laurentian.ca>
Date: Sun Mar 4 00:37:46 2012 -0500
Be more precise about Ubuntu Precise in the README
Avoid ambiguous references to Ubuntu when there is a need to distinguish
between Lucid and Precise.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/README b/README
index 4c8b88f..9c4828c 100644
--- a/README
+++ b/README
@@ -116,16 +116,16 @@ make -f Open-ILS/src/extras/Makefile.install <osname>
------------------------------------------------------------------------------
+
[NOTE]
-`centos` and `rhel` are less tested than the `debian`, `fedora`,
-and `ubuntu` options. Your patches and suggestions for improvement are
+`centos` and `rhel` are less tested than the `debian`, `fedora`, `ubuntu-lucid`,
+and `ubuntu-precise` options. Your patches and suggestions for improvement are
welcome!
+
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 12.04 LTS (Precise
-Pangolin). The ubuntu-precise target uses libdbd-pgsql from packages.
+You should skip this step if installing on Ubuntu Precise. The ubuntu-precise
+target uses libdbd-pgsql from packages.
+
.Debian / Ubuntu Lucid
[source, bash]
@@ -313,17 +313,17 @@ Creating the Evergreen database
By default, the `Makefile.install` prerequisite installer does not install
the PostgreSQL 9 database server required by every Evergreen system;
for production use, most libraries install the PostgreSQL database server on a
-dedicated machine. You can install the packages required by Debian or Ubuntu
+dedicated machine. You can install the packages required by Debian or Ubuntu Lucid
on the machine of your choice using the following commands as the *root*
Linux account:
-.(Debian) Installing PostgreSQL 9.1 server packages
+.(Debian and Ubuntu Lucid) Installing PostgreSQL 9.1 server packages
[source, bash]
------------------------------------------------------------------------------
make -f Open-ILS/src/extras/Makefile.install install_pgsql_server_backport_debs_91
------------------------------------------------------------------------------
-.(Ubuntu) Installing PostgreSQL 9.1 server packages
+.(Ubuntu Precise) Installing PostgreSQL 9.1 server packages
[source, bash]
------------------------------------------------------------------------------
make -f Open-ILS/src/extras/Makefile.install install_pgsql_server_debs_91
commit 0f22ac1ec6e8c28b48cceb804acda40f03445aef
Author: Jason Stephenson <jstephenson at mvlc.org>
Date: Wed Jan 11 15:09:11 2012 -0500
Update PGSQL 9.1 server install for Debian/Ubuntu.
Use install_pgsql_server_backport_debs_91 on Debian.
Use install_pgsql_server_debs_91 on Ubuntu.
Update the README to reflect this.
Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index 1512c23..6c7abe7 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -504,6 +504,9 @@ install_pgsql_client_debs_91:
$(APT_TOOL) install $(PGSQL_CLIENT_DEBS_91)
install_pgsql_server_debs_91:
+ $(APT_TOOL) install $(PGSQL_SERVER_DEBS_91)
+
+install_pgsql_server_backport_debs_91:
$(APT_BACKPORT_TOOL) install $(PGSQL_SERVER_DEBS_91)
# Install the debian-specific dependencies for more modern distros
diff --git a/README b/README
index be46619..4c8b88f 100644
--- a/README
+++ b/README
@@ -317,7 +317,13 @@ dedicated machine. 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) Installing PostgreSQL 9.1 server packages
+.(Debian) Installing PostgreSQL 9.1 server packages
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install install_pgsql_server_backport_debs_91
+------------------------------------------------------------------------------
+
+.(Ubuntu) Installing PostgreSQL 9.1 server packages
[source, bash]
------------------------------------------------------------------------------
make -f Open-ILS/src/extras/Makefile.install install_pgsql_server_debs_91
commit 396b75525336094e1ac054159dc08b0be49c3478
Author: Jason Stephenson <jstephenson at mvlc.org>
Date: Wed Jan 11 14:30:35 2012 -0500
Add Business::OnlinePayment::PayPal CPAN dependency in Makefile.install.
Add it to FEDORA_CPAN, CPAN_MODULES, and CPAN_MODULES_PRECISE, to install
it everywhere but Centos and RHEL 5. I'm not certain about Centos because
it may need a force on that platform as AuthorizeNet does.
Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index 463d37e..1512c23 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -209,6 +209,7 @@ FEDORA_RPMS = \
FEDORA_CPAN = \
Business::OnlinePayment \
Business::OnlinePayment::AuthorizeNet \
+ Business::OnlinePayment::PayPal \
MARC::Record \
UUID::Tiny
@@ -262,6 +263,7 @@ DEB_APACHE_DISMODS = \
# Chronically unpackaged CPAN modules
CPAN_MODULES = \
Business::EDI \
+ Business::OnlinePayment::PayPal \
Library::CallNumber::LC \
Net::Z3950::Simple2ZOOM \
Template::Plugin::POSIX \
@@ -300,6 +302,7 @@ CPAN_MODULES_LUCID = \
# avaialalbe as debs.
CPAN_MODULES_PRECISE = \
Business::CreditCard::Object \
+ Business::OnlinePayment::PayPal \
Template::Plugin::POSIX \
RPC::XML::Function
commit d0ad97f2aa08f5abbe3854fde291556d9241aaa5
Author: Dan Scott <dscott at laurentian.ca>
Date: Tue Jan 10 16:02:24 2012 -0500
Proceed with caution on the Squeeze backport repo
When installing on Debian Squeeze, use the same "-P" flag to prompt for
removal of the PostgreSQL 8.* packages now that we're pointing at the
9.1 backport. Create a new target to avoid trampling on Precise
Pangolin's nice, clean 9.1 target.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index 784690a..463d37e 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -98,7 +98,6 @@ DEBS = \
libnspr4-dev\
libole-storage-lite-perl\
libparent-perl \
- libpq-dev\
libreadline5-dev\
libspreadsheet-writeexcel-perl\
libssh2-1-dev\
@@ -319,7 +318,7 @@ centos_like: install_centos_rpms install_yaz install_cpan_marc install install_c
fedora16: install_fedora_rpms install_cpan_fedora install_cpan_marc install
debian-squeeze: squeeze generic_debian
-squeeze: install_pgsql_client_debs_91 install_extra_debs_squeeze
+squeeze: install_pgsql_client_backport_debs_91 install_extra_debs_squeeze
generic_debian: install_debs install_yaz test_for_libdbi_pkg install debian_sys_config install_libdbi
# Needs for Ubuntu Lucid Lynx (10.04 LTS):
@@ -468,7 +467,7 @@ install_debs:
$(APT_TOOL) install $(DEBS)
install_pgsql_client_debs_90:
- @if [ `$(APT_TOOL) versions libpq-dev | grep ^i|sed 's/^i[ \t]*//'|cut -d. -f1` -eq 8 ]; \
+ @if [ `$(APT_TOOL) versions libpq5 | grep ^i|sed 's/^i[ \t]*//'|cut -d. -f1` -eq 8 ]; \
then \
echo -e "libpq5 / libpq-dev are installed as part of OpenSRF (a dependency" \
"of apache2-prefork-dev), but these are the 8.4 versions and they" \
@@ -484,6 +483,20 @@ install_pgsql_client_debs_90:
install_pgsql_server_debs_90:
$(APT_BACKPORT_TOOL) install $(PGSQL_SERVER_DEBS_90)
+install_pgsql_client_backport_debs_91:
+ @if [ `$(APT_TOOL) versions libpq5 | grep ^i|sed 's/^i[ \t]*//'|cut -d. -f1` -eq 8 ]; \
+ then \
+ echo -e "libpq5 / libpq-dev are installed as part of OpenSRF (a dependency" \
+ "of apache2-prefork-dev), but these are the 8.4 versions and they" \
+ "conflict with the 9.0 versions - so remove them, install the pinned" \
+ "backports of 9.0, then reinstall the apache2-prefork-dev package.\n\n" \
+ "**WARNING**: Saying 'Yes' to this step will _remove_ any PostgreSQL" \
+ "databases that might currently exist on this machine." && \
+ $(APT_SAFE_TOOL) remove libpq5 libpq-dev ; \
+ fi
+ $(APT_BACKPORT_TOOL) install $(PGSQL_CLIENT_DEBS_91)
+ $(APT_TOOL) install apache2-prefork-dev
+
install_pgsql_client_debs_91:
$(APT_TOOL) install $(PGSQL_CLIENT_DEBS_91)
commit 09ed9998fcfc7ee20470b4aa87423cf28dbb9b89
Author: Mike Rylander <mrylander at gmail.com>
Date: Tue Jan 10 11:21:14 2012 -0500
Use Postgres 9.1 on Debian Squeeze, as it is now available via backports
Signed-off-by: Mike Rylander <mrylander at gmail.com>
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index a93e0b7..784690a 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -319,7 +319,7 @@ centos_like: install_centos_rpms install_yaz install_cpan_marc install install_c
fedora16: install_fedora_rpms install_cpan_fedora install_cpan_marc install
debian-squeeze: squeeze generic_debian
-squeeze: install_pgsql_client_debs_90 install_extra_debs_squeeze
+squeeze: install_pgsql_client_debs_91 install_extra_debs_squeeze
generic_debian: install_debs install_yaz test_for_libdbi_pkg install debian_sys_config install_libdbi
# Needs for Ubuntu Lucid Lynx (10.04 LTS):
commit a4904b7b6e7107eb42381921ed579395e1621c14
Author: Dan Scott <dscott at laurentian.ca>
Date: Thu Jan 5 15:41:52 2012 -0500
Improve Fedora instructions in README
A few steps required for successful installation on Fedora 16 were
missing from the README; in particular, pointing to /etc/httpd in the
Apache configuration files and initializing the PostgreSQL database
cluster.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Mike Rylander <mrylander at gmail.com>
diff --git a/README b/README
index e476035..be46619 100644
--- a/README
+++ b/README
@@ -215,7 +215,7 @@ cd /etc/apache2/ssl
.Fedora
[source,bash]
------------------------------------------------------------------------------
-cp Open-ILS/examples/apache/eg.conf /etc/httpd/sites-available/
+cp Open-ILS/examples/apache/eg.conf /etc/httpd/conf.d/
cp Open-ILS/examples/apache/eg_vhost.conf /etc/httpd/
cp Open-ILS/examples/apache/startup.pl /etc/httpd/
# Now set up SSL
@@ -239,6 +239,8 @@ place.
a. Replace `Allow from 10.0.0.0/8` with `Allow from all` (to enable
access to the offline upload / execute interface from any workstation on
any network - note that you must secure this for a production instance)
+ b. (Fedora): Change references from the non-existent `/etc/apache2/` directory
+ to `/etc/httpd/`.
4. 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
@@ -267,7 +269,10 @@ place.
</IfModule>
------------------------------------------------------------------------------
+
-6. (Debian and Ubuntu): As the *root* Linux account, enable the Evergreen site:
+6. (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/`.
+7. (Debian and Ubuntu): As the *root* Linux account, enable the Evergreen site:
+
[source,bash]
------------------------------------------------------------------------------
@@ -325,6 +330,7 @@ using the following commands as the *root* Linux account:
[source, bash]
------------------------------------------------------------------------------
make -f Open-ILS/src/extras/Makefile.install install_fedora_pgsql_server
+postgresql-setup initdb
------------------------------------------------------------------------------
For a standalone PostgreSQL server, install the following Perl modules as the
commit c4fd05e1951fb5a83d51287cf0cd2adf04ff43fb
Author: Dan Scott <dscott at laurentian.ca>
Date: Tue Jan 3 23:30:19 2012 -0500
Add tests for TPAC Perl modules
Just basic tests, but they should catch syntax problems at least.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Mike Rylander <mrylander at gmail.com>
diff --git a/Open-ILS/src/perlmods/t/19-OpenILS-WWW-EGCatLoader.t b/Open-ILS/src/perlmods/t/19-OpenILS-WWW-EGCatLoader.t
new file mode 100644
index 0000000..dc57400
--- /dev/null
+++ b/Open-ILS/src/perlmods/t/19-OpenILS-WWW-EGCatLoader.t
@@ -0,0 +1,12 @@
+#!perl -T
+
+use Test::More tests => 6;
+
+BEGIN {
+ use_ok( 'OpenILS::WWW::EGCatLoader' );
+}
+use_ok( 'OpenILS::WWW::EGCatLoader::Account' );
+use_ok( 'OpenILS::WWW::EGCatLoader::Container' );
+use_ok( 'OpenILS::WWW::EGCatLoader::Record' );
+use_ok( 'OpenILS::WWW::EGCatLoader::Search' );
+use_ok( 'OpenILS::WWW::EGCatLoader::Util' );
commit 2f3dc75e33dfd4c95c4f37cf511c27dd8d4bdb44
Author: Dan Scott <dscott at laurentian.ca>
Date: Tue Jan 3 23:26:58 2012 -0500
Add perl-Locale-Codes to Fedora prereq installer
Locale::Country isn't bundled in Fedora's core Perl modules so add it to
the RPM list.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Mike Rylander <mrylander at gmail.com>
diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index 2afc773..a93e0b7 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -189,6 +189,7 @@ FEDORA_RPMS = \
perl-Email-Simple \
perl-GDGraph3d \
perl-JSON-XS \
+ perl-Locale-Codes \
perl-Net-IP \
perl-Net-SSH2 \
perl-OLE-Storage_Lite \
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/extras/Makefile.install | 26 +++++++++++++--
.../src/perlmods/t/19-OpenILS-WWW-EGCatLoader.t | 12 +++++++
README | 35 ++++++++++++-------
3 files changed, 57 insertions(+), 16 deletions(-)
create mode 100644 Open-ILS/src/perlmods/t/19-OpenILS-WWW-EGCatLoader.t
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list