Accepting request 519092 from home:jloeser:branches:devel:libraries:c_c++

version update to 1.1.18 (fate#322223)

OBS-URL: https://build.opensuse.org/request/show/519092
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libservicelog?expand=0&rev=37

libservicelog-1.1.17-Fixes-fdopen-failure-issue-properly.patch

@@ -1,30 +0,0 @@
-From 82fbdb94cabe4dd5a1e294091d689db51112319f Mon Sep 17 00:00:00 2001
-From: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
-Date: Fri, 4 Aug 2017 19:39:34 +0530
-Subject: [PATCH] Fixes fdopen() failure issue properly
-
-Commit 9dadab0 checks for NULL value instead of non-NULL :-(
-Fix it properly so that it trigger notification scripts properly.
-
-Fixes : 9dadab0 (Fixes fdopen() failure issue)
-Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
----
- src/notify.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/notify.c b/src/notify.c
-index e7c9a2c77d78..df1b1a66d43b 100644
---- a/src/notify.c
-+++ b/src/notify.c
-@@ -617,7 +617,7 @@ run_notification_tool(struct sl_notify *notify, int type, void *records)
- 		else if (notify->method == SL_METHOD_SIMPLE_VIA_STDIN) {
- 			close(pipe_fd[0]);
- 			stream = fdopen(pipe_fd[1], "w");
--			if (!stream) {
-+			if (stream) {
- 				if (type == SL_NOTIFY_EVENTS)
- 					servicelog_event_print(stream, event, -1);
- 				else if (type == SL_NOTIFY_REPAIRS)
--- 
-2.10.2
-

libservicelog-1.1.17-Print-machine-serial-number-in-v29-path.patch

@@ -1,25 +0,0 @@
-From 6e2eda9b0b1e6b1e0adcdf9895064c7fb56c5e21 Mon Sep 17 00:00:00 2001
-From: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
-Date: Tue, 23 May 2017 23:13:28 +0530
-Subject: [PATCH] Print machine serial number in v29 path
-
-Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
----
- src/v29_compat.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/v29_compat.c b/src/v29_compat.c
-index 5559bff56b52..5eda064a56ee 100644
---- a/src/v29_compat.c
-+++ b/src/v29_compat.c
-@@ -295,6 +295,7 @@ convert_rtas_to_v29(servicelog *log, struct sl_event *ev, void **data29,
- 	cond_strcpy(rtas29.refcode, ev->refcode, 9);
- 	memcpy(rtas29.addl_words, rtas1->addl_words, 8*sizeof(uint32_t));
- 	cond_strcpy(rtas29.machine_type, ev->machine_model, 9);
-+	cond_strcpy(rtas29.machine_serial_no, ev->machine_serial, 13);
- 	if (ev->description)
- 		description_sz = strlen(ev->description) + 1;
- 	rtas29.rtas_event_len = ev->raw_data_len;
--- 
-2.10.2
-

libservicelog-1.1.17.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:54b7e0929eae3c7a182ffc35b1d43f9c5260ec1e0b68426a7173a6a01cbde2ba
-size 418573

libservicelog-1.1.18.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9069efc1f293f4b910cb3ae9a93972623ca94f12fca6c722138fda3f3dfe8446
+size 453645

libservicelog.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Aug 28 08:53:47 UTC 2017 - jloeser@suse.com
+
+- version update to 1.1.18 (fate#322223)
+  - Sqlite bind call validation
+  - Added libservicelog test cases
+  - Print machine serial number
+  - Fixed few regression issues
+
+- removed patches:
+  * libservicelog-1.1.17-Fixes-fdopen-failure-issue-properly.patch
+  * libservicelog-1.1.17-Print-machine-serial-number-in-v29-path.patch
+
 -------------------------------------------------------------------
 Thu Aug 10 12:47:12 UTC 2017 - msuchanek@suse.com
 

libservicelog.spec

@@ -18,7 +18,7 @@
 
 Name:           libservicelog
 %define lname	libservicelog-1_1-1
-Version:        1.1.17
+Version:        1.1.18
 Release:        0
 Summary:        Servicelog Database and Library
 License:        LGPL-2.0+
@@ -30,8 +30,6 @@ Url:            http://linux-diag.sourceforge.net/servicelog/
 Source0:        http://downloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz
 Source1:        baselibs.conf
 Source2:        libservicelog-rpmlintrc
-Patch0001:      libservicelog-1.1.17-Print-machine-serial-number-in-v29-path.patch
-Patch0002:      libservicelog-1.1.17-Fixes-fdopen-failure-issue-properly.patch
 PreReq:         %{_sbindir}/groupadd
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -73,8 +71,6 @@ Contains header files for building with libservicelog.
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
 
 %build
 autoreconf -fiv