From: Chris Sharp Date: Wed, 27 Mar 2019 14:37:35 +0000 (-0400) Subject: moving to 3.2.3 X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=a7658036466913ca4e35f3074da41a8fe9c8b1bd;p=contrib%2Fpines%2Feg-debian.git moving to 3.2.3 --- diff --git a/build_evergreen2_debs b/build_evergreen2_debs index 7d9760a..82e00d9 100755 --- a/build_evergreen2_debs +++ b/build_evergreen2_debs @@ -33,7 +33,7 @@ echo if [ ! -z $1 ]; then VERSION=$1 else -VERSION="3.0.2" +VERSION="3.2.3" fi echo "Building evergreen-ils $VERSION" # Customized files need to build the package. diff --git a/files_for_build/CONTROL b/files_for_build/CONTROL index 2266404..99d31c3 100644 --- a/files_for_build/CONTROL +++ b/files_for_build/CONTROL @@ -1,13 +1,13 @@ Package: evergreen-ils Source: evergreen -Version: 3.0.2 +Version: 3.2.3 Section: web Priority: extra Architecture: amd64 Maintainer: Pines Admins Homepage: http://open-ils.org Architecture: amd64 -Depends: ${shlibs:Depends}, ${misc:Depends}, apache2-dev, aspell, aspell-en, autoconf,automake,gcc,libapache2-mod-perl2, libbusiness-creditcard-perl, libbusiness-isbn-data-perl, libbusiness-isbn-perl,libbusiness-issn-perl, libbusiness-onlinepayment-authorizenet-perl, libbusiness-onlinepayment-payflowpro-perl, libbusiness-onlinepayment-paypal-perl, libbusiness-onlinepayment-perl, libbusiness-stripe-perl, libbz2-dev, libclass-dbi-frozen-301-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, libdbi1, libdbi-dev, libemail-send-perl, libemail-simple-perl, libexcel-writer-xlsx-perl, libgd-graph3d-perl, libjson-perl, libjson-xs-perl,liblibrary-callnumber-lc-perl,liblocale-maketext-lexicon-perl, liblog-log4perl-perl, libmarc-charset-perl, libmarc-record-perl, libmarc-xml-perl, libmodule-pluggable-perl, libncurses5-dev, libnet-ip-perl, libnet-ldap-perl,libnet-server-perl, libnet-ssh2-perl, libnet-z3950-simple2zoom-perl, libnet-z3950-simpleserver-perl, libnet-z3950-zoom-perl,libnspr4-dev, libole-storage-lite-perl, libparent-perl, libparse-recdescent-perl, libpcre3-dev, libpq5, libpq-dev, libreturn-value-perl, librose-uri-perl,librpc-xml-perl, libsoap-lite-perl, libsru-perl, libssh2-1-dev, libtemplate-plugin-posix-perl, libtest-output-perl, libtest-warn-perl, libtext-aspell-perl, libtext-csv-perl, libtool,libuniversal-require-perl, libunix-syslog-perl, libuuid-tiny-perl,libxml-libxml-perl,libxml-libxslt-perl, libyaz-dev, nodejs-legacy,npm, postgresql-9.5,postgresql-client-9.5, postgresql-contrib-9.5,postgresql-plperl-9.5,postgresql-server-dev-9.5, yaz +Depends: ${shlibs:Depends}, ${misc:Depends}, apache2-dev, aspell, aspell-en, autoconf,automake,gcc,libapache2-mod-perl2, libapache2-mod-rpaf, libbusiness-creditcard-perl, libbusiness-isbn-data-perl, libbusiness-isbn-perl,libbusiness-issn-perl, libbusiness-onlinepayment-authorizenet-perl, libbusiness-onlinepayment-payflowpro-perl, libbusiness-onlinepayment-paypal-perl, libbusiness-onlinepayment-perl, libbusiness-stripe-perl, libbz2-dev, libclass-dbi-frozen-301-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, libdbi1, libdbi-dev, libemail-address-perl, libemail-send-perl, libemail-simple-perl, libexcel-writer-xlsx-perl, libgd-graph3d-perl, libjson-perl, libjson-xs-perl,liblibrary-callnumber-lc-perl,liblocale-maketext-lexicon-perl, liblog-log4perl-perl, libmarc-charset-perl, libmarc-record-perl, libmarc-xml-perl, libmodule-pluggable-perl, libncurses5-dev, libnet-ip-perl, libnet-ldap-perl,libnet-server-perl, libnet-ssh2-perl, libnet-z3950-simple2zoom-perl, libnet-z3950-simpleserver-perl, libnet-z3950-zoom-perl,libnspr4-dev, libole-storage-lite-perl, libparent-perl, libparse-recdescent-perl, libpcre3-dev, libpq5, libpq-dev, libreturn-value-perl, librose-uri-perl,librpc-xml-perl, libsoap-lite-perl, libsru-perl, libssh2-1-dev, libtemplate-plugin-posix-perl, libtest-output-perl, libtest-warn-perl, libtext-aspell-perl, libtext-csv-perl, libtool,libuniversal-require-perl, libunix-syslog-perl, libuuid-tiny-perl,libxml-libxml-perl,libxml-libxslt-perl, libyaz-dev, nodejs-legacy,npm, postgresql-9.5,postgresql-client-9.5, postgresql-contrib-9.5,postgresql-plperl-9.5,postgresql-server-dev-9.5, yaz Description: Evergreen Library Management Sofware. Evergreen is open-source, consortial-quality diff --git a/files_for_build/CONTROL-cluster b/files_for_build/CONTROL-cluster index 2d2eb15..4b1ccd6 100644 --- a/files_for_build/CONTROL-cluster +++ b/files_for_build/CONTROL-cluster @@ -1,13 +1,13 @@ Package: evergreen-ils Source: evergreen -Version: 3.0.2 +Version: 3.2.3 Section: web Priority: extra Architecture: amd64 Maintainer: Pines Admins Homepage: http://open-ils.org Architecture: amd64 -Depends: ${shlibs:Depends}, ${misc:Depends}, apache2-dev, aspell, aspell-en, autoconf,automake,gcc,libapache2-mod-perl2, libbusiness-creditcard-perl, libbusiness-isbn-data-perl, libbusiness-isbn-perl,libbusiness-issn-perl, libbusiness-onlinepayment-authorizenet-perl, libbusiness-onlinepayment-payflowpro-perl, libbusiness-onlinepayment-paypal-perl, libbusiness-onlinepayment-perl, libbusiness-stripe-perl, libbz2-dev, libclass-dbi-frozen-301-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, libdbi1, libdbi-dev, libemail-send-perl, libemail-simple-perl, libexcel-writer-xlsx-perl, libgd-graph3d-perl, libjson-perl, libjson-xs-perl,liblibrary-callnumber-lc-perl,liblocale-maketext-lexicon-perl, liblog-log4perl-perl, libmarc-charset-perl, libmarc-record-perl, libmarc-xml-perl, libmodule-pluggable-perl, libncurses5-dev, libnet-ip-perl, libnet-ldap-perl,libnet-server-perl, libnet-ssh2-perl, libnet-z3950-simple2zoom-perl, libnet-z3950-simpleserver-perl, libnet-z3950-zoom-perl,libnspr4-dev, libole-storage-lite-perl, libparent-perl, libparse-recdescent-perl, libpcre3-dev, libpq5, libpq-dev, libreturn-value-perl, librose-uri-perl,librpc-xml-perl, libsoap-lite-perl, libsru-perl, libssh2-1-dev, libtemplate-plugin-posix-perl, libtest-output-perl, libtest-warn-perl, libtext-aspell-perl, libtext-csv-perl, libtool,libuniversal-require-perl, libunix-syslog-perl, libuuid-tiny-perl,libxml-libxml-perl,libxml-libxslt-perl, libyaz-dev, nodejs-legacy,npm, postgresql-client-9.5, yaz +Depends: ${shlibs:Depends}, ${misc:Depends}, apache2-dev, aspell, aspell-en, autoconf,automake,gcc,libapache2-mod-perl2, libapache2-mod-rpaf, libbusiness-creditcard-perl, libbusiness-isbn-data-perl, libbusiness-isbn-perl,libbusiness-issn-perl, libbusiness-onlinepayment-authorizenet-perl, libbusiness-onlinepayment-payflowpro-perl, libbusiness-onlinepayment-paypal-perl, libbusiness-onlinepayment-perl, libbusiness-stripe-perl, libbz2-dev, libclass-dbi-frozen-301-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, libdbi1, libdbi-dev, libemail-address-perl, libemail-send-perl, libemail-simple-perl, libexcel-writer-xlsx-perl, libgd-graph3d-perl, libjson-perl, libjson-xs-perl,liblibrary-callnumber-lc-perl,liblocale-maketext-lexicon-perl, liblog-log4perl-perl, libmarc-charset-perl, libmarc-record-perl, libmarc-xml-perl, libmodule-pluggable-perl, libncurses5-dev, libnet-ip-perl, libnet-ldap-perl,libnet-server-perl, libnet-ssh2-perl, libnet-z3950-simple2zoom-perl, libnet-z3950-simpleserver-perl, libnet-z3950-zoom-perl,libnspr4-dev, libole-storage-lite-perl, libparent-perl, libparse-recdescent-perl, libpcre3-dev, libpq5, libpq-dev, libreturn-value-perl, librose-uri-perl,librpc-xml-perl, libsoap-lite-perl, libsru-perl, libssh2-1-dev, libtemplate-plugin-posix-perl, libtest-output-perl, libtest-warn-perl, libtext-aspell-perl, libtext-csv-perl, libtool,libuniversal-require-perl, libunix-syslog-perl, libuuid-tiny-perl,libxml-libxml-perl,libxml-libxslt-perl, libyaz-dev, nodejs-legacy,npm, postgresql-client-9.5, yaz Description: Evergreen Library Management Sofware. Evergreen is open-source, consortial-quality diff --git a/files_for_build/control b/files_for_build/control index 87a9726..ab20018 100644 --- a/files_for_build/control +++ b/files_for_build/control @@ -8,7 +8,7 @@ Homepage: http://open-ils.org Package: evergreen-ils Architecture: amd64 -Depends: ${shlibs:Depends}, ${misc:Depends}, apache2-dev, aspell, aspell-en, autoconf,automake,gcc,libapache2-mod-perl2, libbusiness-creditcard-perl, libbusiness-isbn-data-perl, libbusiness-isbn-perl,libbusiness-issn-perl, libbusiness-onlinepayment-authorizenet-perl, libbusiness-onlinepayment-payflowpro-perl, libbusiness-onlinepayment-paypal-perl, libbusiness-onlinepayment-perl, libbusiness-stripe-perl, libbz2-dev, libclass-dbi-frozen-301-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, libdbi1, libdbi-dev, libemail-send-perl, libemail-simple-perl, libexcel-writer-xlsx-perl, libgd-graph3d-perl, libjson-perl, libjson-xs-perl,liblibrary-callnumber-lc-perl,liblocale-maketext-lexicon-perl, liblog-log4perl-perl, libmarc-charset-perl, libmarc-record-perl, libmarc-xml-perl, libmodule-pluggable-perl, libncurses5-dev, libnet-ip-perl, libnet-ldap-perl,libnet-server-perl, libnet-ssh2-perl, libnet-z3950-simple2zoom-perl, libnet-z3950-simpleserver-perl, libnet-z3950-zoom-perl,libnspr4-dev, libole-storage-lite-perl, libparent-perl, libparse-recdescent-perl, libpcre3-dev, libpq5, libpq-dev, libreturn-value-perl, librose-uri-perl,librpc-xml-perl, libsoap-lite-perl, libsru-perl, libssh2-1-dev, libtemplate-plugin-posix-perl, libtest-output-perl, libtest-warn-perl, libtext-aspell-perl, libtext-csv-perl, libtool,libuniversal-require-perl, libunix-syslog-perl, libuuid-tiny-perl,libxml-libxml-perl,libxml-libxslt-perl, libyaz-dev, nodejs-legacy,npm, postgresql-9.5,postgresql-client-9.5, postgresql-contrib-9.5,postgresql-plperl-9.5,postgresql-server-dev-9.5, yaz +Depends: ${shlibs:Depends}, ${misc:Depends}, apache2-dev, aspell, aspell-en, autoconf,automake,gcc,libapache2-mod-perl2, libapache2-mod-rpaf, libbusiness-creditcard-perl, libbusiness-isbn-data-perl, libbusiness-isbn-perl,libbusiness-issn-perl, libbusiness-onlinepayment-authorizenet-perl, libbusiness-onlinepayment-payflowpro-perl, libbusiness-onlinepayment-paypal-perl, libbusiness-onlinepayment-perl, libbusiness-stripe-perl, libbz2-dev, libclass-dbi-frozen-301-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, libdbi1, libdbi-dev, libemail-address-perl, libemail-send-perl, libemail-simple-perl, libexcel-writer-xlsx-perl, libgd-graph3d-perl, libjson-perl, libjson-xs-perl,liblibrary-callnumber-lc-perl,liblocale-maketext-lexicon-perl, liblog-log4perl-perl, libmarc-charset-perl, libmarc-record-perl, libmarc-xml-perl, libmodule-pluggable-perl, libncurses5-dev, libnet-ip-perl, libnet-ldap-perl,libnet-server-perl, libnet-ssh2-perl, libnet-z3950-simple2zoom-perl, libnet-z3950-simpleserver-perl, libnet-z3950-zoom-perl,libnspr4-dev, libole-storage-lite-perl, libparent-perl, libparse-recdescent-perl, libpcre3-dev, libpq5, libpq-dev, libreturn-value-perl, librose-uri-perl,librpc-xml-perl, libsoap-lite-perl, libsru-perl, libssh2-1-dev, libtemplate-plugin-posix-perl, libtest-output-perl, libtest-warn-perl, libtext-aspell-perl, libtext-csv-perl, libtool,libuniversal-require-perl, libunix-syslog-perl, libuuid-tiny-perl,libxml-libxml-perl,libxml-libxslt-perl, libyaz-dev, nodejs-legacy,npm, postgresql-9.5,postgresql-client-9.5, postgresql-contrib-9.5,postgresql-plperl-9.5,postgresql-server-dev-9.5, yaz Description: Evergreen Library Management Sofware. Evergreen is open-source, consortial-quality library software to help library users find diff --git a/files_for_build/control-cluster b/files_for_build/control-cluster index 49e198e..b31eada 100644 --- a/files_for_build/control-cluster +++ b/files_for_build/control-cluster @@ -8,7 +8,7 @@ Homepage: http://open-ils.org Package: evergreen-ils Architecture: amd64 -Depends: ${shlibs:Depends}, ${misc:Depends}, apache2-dev, aspell, aspell-en, autoconf,automake,gcc,libapache2-mod-perl2, libbusiness-creditcard-perl, libbusiness-isbn-data-perl, libbusiness-isbn-perl,libbusiness-issn-perl, libbusiness-onlinepayment-authorizenet-perl, libbusiness-onlinepayment-payflowpro-perl, libbusiness-onlinepayment-paypal-perl, libbusiness-onlinepayment-perl, libbusiness-stripe-perl, libbz2-dev, libclass-dbi-frozen-301-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, libdbi1, libdbi-dev, libemail-send-perl, libemail-simple-perl, libexcel-writer-xlsx-perl, libgd-graph3d-perl, libjson-perl, libjson-xs-perl,liblibrary-callnumber-lc-perl,liblocale-maketext-lexicon-perl, liblog-log4perl-perl, libmarc-charset-perl, libmarc-record-perl, libmarc-xml-perl, libmodule-pluggable-perl, libncurses5-dev, libnet-ip-perl, libnet-ldap-perl,libnet-server-perl, libnet-ssh2-perl, libnet-z3950-simple2zoom-perl, libnet-z3950-simpleserver-perl, libnet-z3950-zoom-perl,libnspr4-dev, libole-storage-lite-perl, libparent-perl, libparse-recdescent-perl, libpcre3-dev, libpq5, libpq-dev, libreturn-value-perl, librose-uri-perl,librpc-xml-perl, libsoap-lite-perl, libsru-perl, libssh2-1-dev, libtemplate-plugin-posix-perl, libtest-output-perl, libtest-warn-perl, libtext-aspell-perl, libtext-csv-perl, libtool,libuniversal-require-perl, libunix-syslog-perl, libuuid-tiny-perl,libxml-libxml-perl,libxml-libxslt-perl, libyaz-dev, nodejs-legacy,npm, postgresql-client-9.5, yaz +Depends: ${shlibs:Depends}, ${misc:Depends}, apache2-dev, aspell, aspell-en, autoconf,automake,gcc,libapache2-mod-perl2, libapache2-mod-rpaf, libbusiness-creditcard-perl, libbusiness-isbn-data-perl, libbusiness-isbn-perl,libbusiness-issn-perl, libbusiness-onlinepayment-authorizenet-perl, libbusiness-onlinepayment-payflowpro-perl, libbusiness-onlinepayment-paypal-perl, libbusiness-onlinepayment-perl, libbusiness-stripe-perl, libbz2-dev, libclass-dbi-frozen-301-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, libdbi1, libdbi-dev, libemail-address-perl, libemail-send-perl, libemail-simple-perl, libexcel-writer-xlsx-perl, libgd-graph3d-perl, libjson-perl, libjson-xs-perl,liblibrary-callnumber-lc-perl,liblocale-maketext-lexicon-perl, liblog-log4perl-perl, libmarc-charset-perl, libmarc-record-perl, libmarc-xml-perl, libmodule-pluggable-perl, libncurses5-dev, libnet-ip-perl, libnet-ldap-perl,libnet-server-perl, libnet-ssh2-perl, libnet-z3950-simple2zoom-perl, libnet-z3950-simpleserver-perl, libnet-z3950-zoom-perl,libnspr4-dev, libole-storage-lite-perl, libparent-perl, libparse-recdescent-perl, libpcre3-dev, libpq5, libpq-dev, libreturn-value-perl, librose-uri-perl,librpc-xml-perl, libsoap-lite-perl, libsru-perl, libssh2-1-dev, libtemplate-plugin-posix-perl, libtest-output-perl, libtest-warn-perl, libtext-aspell-perl, libtext-csv-perl, libtool,libuniversal-require-perl, libunix-syslog-perl, libuuid-tiny-perl,libxml-libxml-perl,libxml-libxslt-perl, libyaz-dev, nodejs-legacy,npm, postgresql-client-9.5, yaz Description: Evergreen Library Management Sofware. Evergreen is open-source, consortial-quality library software to help library users find diff --git a/files_for_build/postinst b/files_for_build/postinst index c44c2ce..e741c7a 100755 --- a/files_for_build/postinst +++ b/files_for_build/postinst @@ -16,7 +16,10 @@ DEBUG() fixup_apache() { # stop apache2 -service apache2 stop +systemctl stop apache2.service + +# give the procs a chance to die +sleep 2 # keep the bad apache modules away --esi for m in deflate mpm_event; do a2dismod -f $m > /dev/null; done; @@ -34,8 +37,10 @@ chown opensrf:opensrf /var/lock/apache2 /usr/sbin/a2dissite 000-default > /dev/null /usr/sbin/a2ensite eg.conf > /dev/null -# start apache2 -service apache2 start +# start apache2 +systemctl start apache2.service +sleep 2 +echo "exiting fixup_apache" } init_db() @@ -154,10 +159,10 @@ then configure_opensrf_xml populate_db fi -/etc/init.d/opensrf stop +systemctl stop opensrf.service fix_openils_perms ldconfig -/etc/init.d/opensrf start +systemctl start opensrf.service if [ $STANDALONE -eq 1 ] then run_autogen diff --git a/files_for_build/rules b/files_for_build/rules index 69cdda2..9d6cf74 100755 --- a/files_for_build/rules +++ b/files_for_build/rules @@ -11,7 +11,7 @@ export DH_VERBOSE=1 export DEB_LDFLAGS_MAINT_APPEND= -lm INSTALL_FOLDER=debian/evergreen-ils INSTALL_WEB=/openils/var/web -STAFF_BUILD=rel_3_0_2 +STAFF_BUILD=rel_3_2_3 %: dh $@ override_dh_auto_configure: @@ -36,7 +36,7 @@ override_dh_prep: mkdir -p debian/evergreen-ils/etc/apache2/sites-available cp -Rv Open-ILS/examples/apache_24/eg_24.conf debian/evergreen-ils/etc/apache2/sites-available/eg.conf cp -Rv Open-ILS/examples/apache_24/eg_vhost_24.conf debian/evergreen-ils/etc/apache2/eg_vhost.conf - cp -Rv Open-ILS/examples/apache/eg_startup debian/evergreen-ils/etc/apache2/ + cp -Rv Open-ILS/examples/apache_24/eg_startup debian/evergreen-ils/etc/apache2/ override_dh_fixperms: dh_fixperms @echo "DEBUG MARK" diff --git a/files_for_build/rules-custom b/files_for_build/rules-custom index 577018c..51326bb 100755 --- a/files_for_build/rules-custom +++ b/files_for_build/rules-custom @@ -13,7 +13,7 @@ INSTALL_FOLDER=debian/evergreen-ils INSTALL_WEB=/openils/var/web ## Change this to one that suits you consortium eg. pines_rel_x_x_x -STAFF_BUILD=pines_rel_3_0_2 +STAFF_BUILD=pines_rel_3_2_3 %: dh $@ override_dh_auto_configure: @@ -37,7 +37,7 @@ override_dh_prep: mkdir -p debian/evergreen-ils/etc/apache2/sites-available cp -Rv Open-ILS/examples/apache_24/eg_24.conf debian/evergreen-ils/etc/apache2/sites-available/eg.conf cp -Rv Open-ILS/examples/apache_24/eg_vhost_24.conf debian/evergreen-ils/etc/apache2/eg_vhost.conf - cp -Rv Open-ILS/examples/apache/eg_startup debian/evergreen-ils/etc/apache2/ + cp -Rv Open-ILS/examples/apache_24/eg_startup debian/evergreen-ils/etc/apache2/ override_dh_fixperms: dh_fixperms