[OpenSRF-GIT] OpenSRF branch master updated. f3775e2c750ce0119c1bb5c2bd286d356bca8467

Evergreen Git git at git.evergreen-ils.org
Wed Sep 20 10:42:09 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 "OpenSRF".

The branch, master has been updated
       via  f3775e2c750ce0119c1bb5c2bd286d356bca8467 (commit)
       via  cace46d9acd653234ffc298d8ea483ce3c08c54d (commit)
       via  a85132ecc7760106a317fdd967236cef99835771 (commit)
      from  1f38166249e9f8fbb58ad21d1a00b935200a9278 (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 f3775e2c750ce0119c1bb5c2bd286d356bca8467
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Wed Sep 20 10:57:09 2017 -0400

    bump up version numbers in master to reflect 3.0 as next major release branch
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/src/perl/lib/OpenSRF.pm b/src/perl/lib/OpenSRF.pm
index 33b8c83..d8040a3 100644
--- a/src/perl/lib/OpenSRF.pm
+++ b/src/perl/lib/OpenSRF.pm
@@ -12,11 +12,11 @@ OpenSRF - Top level class for OpenSRF perl modules.
 
 =head1 VERSION
 
-Version 2.1.2
+Version 3.0-dev
 
 =cut
 
-our $VERSION = "2.12";
+our $VERSION = "3.000_000";
 
 =head1 METHODS
 
diff --git a/src/python/setup.py b/src/python/setup.py
index c56df95..63c68c2 100644
--- a/src/python/setup.py
+++ b/src/python/setup.py
@@ -3,7 +3,7 @@
 from setuptools import setup
 
 setup(name='OpenSRF',
-    version='2.1.0',
+    version='3.0.dev0',
     install_requires=[
         'dnspython', # required by pyxmpp
     	'python-memcached',

commit cace46d9acd653234ffc298d8ea483ce3c08c54d
Author: Jason Stephenson <jason at sigio.com>
Date:   Tue Sep 12 11:29:41 2017 -0400

    LP#1708048: Fix ld problems by renaming libraries.
    
    We add the lib... prefix to all C library names as expected by most
    linkers.  This necessitates changes to the opensrf.xml configuration
    file.
    
    Signed-off-by: Jason Stephenson <jason at sigio.com>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/examples/opensrf.xml.example b/examples/opensrf.xml.example
index e637b10..7e1dccb 100644
--- a/examples/opensrf.xml.example
+++ b/examples/opensrf.xml.example
@@ -135,7 +135,7 @@ vim:et:ts=2:sw=2:
         <keepalive>3</keepalive>
         <stateless>1</stateless>
         <language>c</language>
-        <implementation>osrf_math.so</implementation>
+        <implementation>libosrf_math.so</implementation>
         <unix_config>
           <unix_sock>opensrf.math_unix.sock</unix_sock>
           <unix_pid>opensrf.math_unix.pid</unix_pid>
@@ -152,7 +152,7 @@ vim:et:ts=2:sw=2:
         <keepalive>3</keepalive>
         <stateless>1</stateless>
         <language>c</language>
-        <implementation>osrf_dbmath.so</implementation>
+        <implementation>libosrf_dbmath.so</implementation>
         <unix_config>
           <max_requests>1000</max_requests>
           <unix_log>opensrf.dbmath_unix.log</unix_log>
diff --git a/src/c-apps/Makefile.am b/src/c-apps/Makefile.am
index 3a5b78f..54c3cac 100644
--- a/src/c-apps/Makefile.am
+++ b/src/c-apps/Makefile.am
@@ -18,19 +18,19 @@ AM_LDFLAGS = $(DEF_LDFLAGS) -L at top_builddir@/src/libopensrf
 DISTCLEANFILES = Makefile.in Makefile
 
 noinst_PROGRAMS = timejson
-lib_LTLIBRARIES = osrf_dbmath.la osrf_math.la osrf_version.la
+lib_LTLIBRARIES = libosrf_dbmath.la libosrf_math.la libosrf_version.la
 
 timejson_SOURCES = timejson.c
 timejson_LDADD = @top_builddir@/src/libopensrf/libopensrf.la
 
-osrf_dbmath_la_SOURCES = osrf_dbmath.c 
-osrf_dbmath_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:2
-osrf_dbmath_la_LIBADD = @top_builddir@/src/libopensrf/libopensrf.la
+libosrf_dbmath_la_SOURCES = osrf_dbmath.c 
+libosrf_dbmath_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:2
+libosrf_dbmath_la_LIBADD = @top_builddir@/src/libopensrf/libopensrf.la
 
-osrf_math_la_SOURCES = osrf_math.c
-osrf_math_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:2
-osrf_math_la_LIBADD =  @top_builddir@/src/libopensrf/libopensrf.la
+libosrf_math_la_SOURCES = osrf_math.c
+libosrf_math_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:2
+libosrf_math_la_LIBADD =  @top_builddir@/src/libopensrf/libopensrf.la
 
-osrf_version_la_SOURCES = osrf_version.c 
-osrf_version_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:2
-osrf_version_la_LIBADD = @top_builddir@/src/libopensrf/libopensrf.la
+libosrf_version_la_SOURCES = osrf_version.c 
+libosrf_version_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:2
+libosrf_version_la_LIBADD = @top_builddir@/src/libopensrf/libopensrf.la

commit a85132ecc7760106a317fdd967236cef99835771
Author: Ben Shum <ben at evergreener.net>
Date:   Tue Aug 1 16:07:16 2017 -0400

    LP#1708048: Add support for Debian 9 Stretch
    
      - Add new make target "debian-stretch"
      - Add Stretch instructions to README
    
    Signed-off-by: Ben Shum <ben at evergreener.net>
    Signed-off-by: Jason Stephenson <jason at sigio.com>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/README b/README
index 33476a0..46c311e 100644
--- a/README
+++ b/README
@@ -64,8 +64,9 @@ make -f src/extras/Makefile.install <osname>
 
 Well-tested values for <osname> include:
 
-  * `debian-jessie` for Debian 8.0
-  * `debian-wheezy` for Debian 7.0
+  * `debian-stretch` for Debian 9
+  * `debian-jessie` for Debian 8
+  * `debian-wheezy` for Debian 7
   * `ubuntu-trusty` for Ubuntu 14.04
   * `ubuntu-xenial` for Ubuntu 16.04
 
@@ -212,7 +213,7 @@ work for OpenSRF.
 /etc/init.d/ejabberd stop
 ---------------------------------------------------------------------------
 +
-.(Ubuntu Xenial) Stopping ejabberd
+.(Debian Stretch / Ubuntu Xenial) Stopping ejabberd
 [source, bash]
 ---------------------------------------------------------------------------
 systemctl stop ejabberd.service
@@ -258,7 +259,7 @@ hosts:
     ##access_max_user_messages: max_user_offline_messages
 -----------------------
 +
-(Ubuntu Xenial) Ejabberd 16.x::
+(Debian Stretch / Ubuntu Xenial) Ejabberd 16.x::
 Open `/etc/ejabberd/ejabberd.yml` and make the following
 changes:
   a. Define your public and private domains in the `hosts` directive. For
@@ -290,7 +291,7 @@ hosts:
 /etc/init.d/ejabberd start
 ---------------------------------------------------------------------------
 +
-.(Ubuntu Xenial) Starting ejabberd
+.(Debian Stretch / Ubuntu Xenial) Starting ejabberd
 [source, bash]
 ---------------------------------------------------------------------------
 systemctl start ejabberd.service
@@ -449,7 +450,7 @@ apxs2 -i -a -c mod_websocket.c
 sh /usr/share/doc/apache2.2-common/examples/setup-instance websockets
 ---------------------------------------------------------------------------
 +
-.(Debian Jessie / Ubuntu Trusty / Xenial)
+.(Debian Jessie/Stretch, Ubuntu Trusty/Xenial)
 [source, bash]
 ---------------------------------------------------------------------------
 sh /usr/share/doc/apache2/examples/setup-instance websockets
@@ -472,7 +473,7 @@ cd /path/to/opensrf-OSRFVERSION
 cp examples/apache2/websockets/apache2.conf /etc/apache2-websockets/
 ---------------------------------------------------------------------------
 +
-.(Debian Jessie / Ubuntu Trusty / Xenial)
+.(Debian Jessie/Stretch, Ubuntu Trusty/Xenial)
 [source, bash]
 ---------------------------------------------------------------------------
 cd /path/to/opensrf-OSRFVERSION
diff --git a/src/extras/Makefile.install b/src/extras/Makefile.install
index 10e56ef..1a2a63c 100644
--- a/src/extras/Makefile.install
+++ b/src/extras/Makefile.install
@@ -10,6 +10,8 @@
 # Installs Perl prereqs, libjs with Perl wrapper
 #
 # usage:
+# 	make -f Makefile.install debian-stretch
+# 	- or -
 # 	make -f Makefile.install debian-jessie
 # 	- or -
 # 	make -f Makefile.install debian-wheezy
@@ -163,6 +165,11 @@ EXTRA_DEBS_JESSIE = \
 	apache2-prefork-dev \
 	libncurses5-dev
 
+EXTRA_DEBS_DEBIAN_STRETCH = \
+	apache2 \
+	apache2-dev \
+	libncurses5-dev
+
 EXTRA_DEBS_UBUNTU_TRUSTY = \
 	apache2-mpm-prefork \
 	apache2-prefork-dev \
@@ -179,8 +186,10 @@ all:
 	@echo "please specify an OS" && exit 0
 
 
+debian-stretch: generic_debian stretch apache_mpm_prefork_mods apache_perl_mod
 debian-jessie: generic_debian jessie apache_mpm_prefork_mods
 debian-wheezy: generic_debian wheezy
+stretch: install_extra_debs install_extra_debs_stretch debian_sys_config
 jessie: install_extra_debs_jessie debian_sys_config
 wheezy: install_extra_debs_wheezy debian_sys_config
 generic_debian: install_debs
@@ -208,6 +217,9 @@ install_debs:
 install_extra_debs:
 	$(APT_TOOL) install $(EXTRA_DEBS)
 
+install_extra_debs_stretch:
+	$(APT_TOOL) install $(EXTRA_DEBS_DEBIAN_STRETCH)
+
 install_extra_debs_jessie: install_extra_debs
 	$(APT_TOOL) install $(EXTRA_DEBS_JESSIE)
 

-----------------------------------------------------------------------

Summary of changes:
 README                       |   15 ++++++++-------
 examples/opensrf.xml.example |    4 ++--
 src/c-apps/Makefile.am       |   20 ++++++++++----------
 src/extras/Makefile.install  |   12 ++++++++++++
 src/perl/lib/OpenSRF.pm      |    4 ++--
 src/python/setup.py          |    2 +-
 6 files changed, 35 insertions(+), 22 deletions(-)


hooks/post-receive
-- 
OpenSRF

More information about the opensrf-commits mailing list