[libqb] Rebase to v0.10.0 (bug fix release)

Tue Feb 7 11:28:26 UTC 2012

commit 3345de3561e8bb197a6cc9a05c0570a319461f11
Author: Angus Salkeld <asalkeld at redhat.com>
Date:   Tue Feb 7 22:27:05 2012 +1100

    Rebase to v0.10.0 (bug fix release)
    
    Signed-off-by: Angus Salkeld <asalkeld at redhat.com>

 .gitignore                                         |    1 +
 0000-test-with-output.patch                        |   44 -------
 0001-LOOP-fix-the-todo-calculations.patch          |   98 ---------------
 ...check-for-a-single-job-causing-a-cpu-spin.patch |  127 --------------------
 ...-prevent-jobs-from-consuming-too-much-cpu.patch |   58 ---------
 libqb.spec                                         |   27 +++--
 sources                                            |    2 +-
 7 files changed, 21 insertions(+), 336 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 672538e..8861a4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /libqb-0.7.0.tar.gz
 /libqb-0.8.1.tar.xz
 /libqb-0.9.0.tar.xz
+/libqb-0.10.0.tar.xz
diff --git a/0000-test-with-output.patch b/0000-test-with-output.patch
index 40d0c61..d678982 100644
--- a/0000-test-with-output.patch
+++ b/0000-test-with-output.patch
@@ -22,48 +22,4 @@ index fd158aa..e2efcc8 100644
  dnl automake >= 1.11 offers --enable-silent-rules for suppressing the output from
  dnl normal compilation.  When a failure occurs, it will then display the full 
  dnl command line
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index b1108d9..32f2bd4 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -89,11 +89,13 @@ bench_log_LDADD = $(LIB_RT) $(top_builddir)/lib/libqb.la
- if HAVE_CHECK
- EXTRA_DIST += resources.test
- 
--TESTS = array.test map.test rb.test log.test loop.test ipc.test resources.test
-+TESTS = array.test map.test rb.test log.test resources.test
-+# loop.test ipc.test
- 
--resources.log: rb.log log.log ipc.log
-+resources.log: rb.log log.log
- 
--check_PROGRAMS = array.test map.test rb.test log.test loop.test ipc.test
-+check_PROGRAMS = array.test map.test rb.test log.test
-+# loop.test ipc.test
- check_SCRIPTS = resources.test
- 
- array_test_SOURCES = check_array.c $(top_builddir)/include/qb/qbarray.h
-@@ -108,13 +110,13 @@ rb_test_SOURCES = check_rb.c $(top_builddir)/include/qb/qbrb.h
- rb_test_CFLAGS = @CHECK_CFLAGS@ -I$(top_srcdir)/include
- rb_test_LDADD = $(top_builddir)/lib/libqb.la $(LIB_RT) @CHECK_LIBS@
- 
--loop_test_SOURCES = check_loop.c $(top_builddir)/include/qb/qbloop.h
--loop_test_CFLAGS = @CHECK_CFLAGS@ -I$(top_srcdir)/include
--loop_test_LDADD = $(top_builddir)/lib/libqb.la $(LIB_RT) @CHECK_LIBS@
--
--ipc_test_SOURCES = check_ipc.c $(top_builddir)/include/qb/qbipcc.h $(top_builddir)/include/qb/qbipcs.h
--ipc_test_CFLAGS = @CHECK_CFLAGS@ -I$(top_srcdir)/include
--ipc_test_LDADD = $(top_builddir)/lib/libqb.la $(LIB_RT) @CHECK_LIBS@
-+#loop_test_SOURCES = check_loop.c $(top_builddir)/include/qb/qbloop.h
-+#loop_test_CFLAGS = @CHECK_CFLAGS@ -I$(top_srcdir)/include
-+#loop_test_LDADD = $(top_builddir)/lib/libqb.la $(LIB_RT) @CHECK_LIBS@
-+#
-+#ipc_test_SOURCES = check_ipc.c $(top_builddir)/include/qb/qbipcc.h $(top_builddir)/include/qb/qbipcs.h
-+#ipc_test_CFLAGS = @CHECK_CFLAGS@ -I$(top_srcdir)/include
-+#ipc_test_LDADD = $(top_builddir)/lib/libqb.la $(LIB_RT) @CHECK_LIBS@
- 
- log_test_SOURCES = check_log.c $(top_builddir)/include/qb/qblog.h
- log_test_CFLAGS = @CHECK_CFLAGS@ -I$(top_srcdir)/include
--- 
-1.7.7.6
 
diff --git a/libqb.spec b/libqb.spec
index 4328c49..d13c740 100644
--- a/libqb.spec
+++ b/libqb.spec
@@ -1,6 +1,6 @@
 Name:           libqb
-Version:        0.9.0
-Release:        2%{?dist}
+Version:        0.10.0
+Release:        1%{?dist}
 Summary:        An IPC library for high performance servers
 
 Group:          System Environment/Libraries
@@ -10,9 +10,6 @@ Source0:        https://fedorahosted.org/releases/q/u/quarterback/%{name}-%{vers
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1:         0000-test-with-output.patch
-Patch2:         0001-LOOP-fix-the-todo-calculations.patch
-Patch3:         0002-TEST-check-for-a-single-job-causing-a-cpu-spin.patch
-Patch4:         0003-LOOP-prevent-jobs-from-consuming-too-much-cpu.patch
 
 BuildRequires:  libtool doxygen procps check-devel automake
 
@@ -26,9 +23,6 @@ Initially these are IPC and poll.
 %setup -q
 
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
 ./autogen.sh
@@ -74,6 +68,23 @@ developing applications that use %{name}.
 %{_mandir}/man3/qb*3*
 
 %changelog
+* Tue Feb 07 2012 Angus Salkeld <asalkeld at redhat.com> - 0.10.0-1
+- LOOP: handle errors from the poll function
+- LOOP: make the item type applicable to jobs too.
+- LOOP: fix the todo calculations.
+- TEST: check for a single job causing a cpu spin
+- LOOP: prevent jobs from consuming too much cpu.
+- Get coverity to ignore this warning.
+- Change example code to use fgets instead of gets
+- LOG: pass the result of qb_log_thread_start() back to the user
+- Fix some issues found by clang
+- Add clang-analyzer check
+- Add a split timer to the stopwatch.
+- IPC: merge common code into new function
+- IPC: better handle a disconnect been called from within connection_created()
+- IPC: fix scary typo
+- IPC: fix server error handling
+
 * Mon Feb 06 2012 Angus Salkeld <asalkeld at redhat.com> - 0.9.0-2
 - Fix a spin in the mainloop when a timer or poll gets removed
   When in the job queue (#787196).
diff --git a/sources b/sources
index 8100772..d982265 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-104563dd7c3ae52451663a8539ba1ca3  libqb-0.9.0.tar.xz
+4a5082a17c4dfa2ccf50dcc39d132ebc  libqb-0.10.0.tar.xz
