From 4592e06762a9a420d8660dad1e719e7558fc01aba3a9bb1930c075c854b59498 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Tue, 2 Apr 2013 09:13:30 +0000 Subject: [PATCH] Accepting request 161606 from home:k0da:ppc:ras - update to 1.1.23 - Legalize SQL insert command input string - Minor typo fix - repair_action : fix output format issue - drop libservicelog.install.patch - refresh libservicelog-printf_types.patch OBS-URL: https://build.opensuse.org/request/show/161606 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libservicelog?expand=0&rev=20 --- libservicelog-1.1.12.tar.bz2 | 3 - libservicelog-1.1.13.tar.bz2 | 3 + libservicelog-lib_version.patch | 4 +- libservicelog-printf_types.patch | 270 +++++++++++++++---------------- libservicelog.changes | 10 ++ libservicelog.install.patch | 9 -- libservicelog.spec | 16 +- 7 files changed, 157 insertions(+), 158 deletions(-) delete mode 100644 libservicelog-1.1.12.tar.bz2 create mode 100644 libservicelog-1.1.13.tar.bz2 delete mode 100644 libservicelog.install.patch diff --git a/libservicelog-1.1.12.tar.bz2 b/libservicelog-1.1.12.tar.bz2 deleted file mode 100644 index bfc34dd..0000000 --- a/libservicelog-1.1.12.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1a20bb23e10b173a2ca36758594a2ac3ce6975d5eb070fb886c6836c55ecefa7 -size 304822 diff --git a/libservicelog-1.1.13.tar.bz2 b/libservicelog-1.1.13.tar.bz2 new file mode 100644 index 0000000..4098b0f --- /dev/null +++ b/libservicelog-1.1.13.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d0760df056698df1070595811507b9e1dc4819b5bf011e4a658c90c50252cbf +size 299436 diff --git a/libservicelog-lib_version.patch b/libservicelog-lib_version.patch index ee0d8a5..f884cd1 100644 --- a/libservicelog-lib_version.patch +++ b/libservicelog-lib_version.patch @@ -1,7 +1,7 @@ Index: src/Makefile.am =================================================================== ---- src/Makefile.am.orig 2011-03-14 22:34:44.000000000 +0100 -+++ src/Makefile.am 2012-06-28 16:14:30.385936569 +0200 +--- src/Makefile.am.orig ++++ src/Makefile.am @@ -33,8 +33,10 @@ AM_LFLAGS = -Pv29nfy_ -olex.yy.c pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = servicelog-1.pc diff --git a/libservicelog-printf_types.patch b/libservicelog-printf_types.patch index ec82659..b2f8a9c 100644 --- a/libservicelog-printf_types.patch +++ b/libservicelog-printf_types.patch @@ -1,111 +1,7 @@ -Index: src/event.c +Index: libservicelog-1.1.13/src/addl_data.c =================================================================== ---- src/event.c.orig -+++ src/event.c -@@ -31,6 +31,7 @@ - #include - #include - #include "slog_internal.h" -+#include - - static char *severity_text[] = { "", "DEBUG", "INFO", "EVENT", "WARNING", - "ERROR_LOCAL", "ERROR", "FATAL" }; -@@ -102,7 +103,7 @@ put_blob(sqlite3 *db, char *table, uint6 - char query[80]; - sqlite3_stmt *stmt; - -- snprintf(query, 80, "UPDATE %s SET %s = ? WHERE id = %lld", -+ snprintf(query, 80, "UPDATE %s SET %s = ? WHERE id = %" PRIu64, - table, column, row); - - do { -@@ -330,7 +331,7 @@ servicelog_event_log(servicelog *slog, s - - snprintf(buf, 1024, "INSERT INTO callouts (event_id, " - "priority, type, procedure, location, fru, " -- "serial, ccin) VALUES (%llu, '%c', %d, '%s', " -+ "serial, ccin) VALUES (%" PRIu64", '%c', %d, '%s', " - "'%s', '%s', '%s', '%s');", event_id, - callout->priority, callout->type, proc, loc, - fru, serial, ccin); -@@ -422,7 +423,7 @@ servicelog_event_get(servicelog *slog, u - { - char query[30]; - -- snprintf(query, 30, "id=%llu", event_id); -+ snprintf(query, 30, "id=%" PRIu64, event_id); - return servicelog_event_query(slog, query, event); - } - -@@ -580,7 +581,7 @@ servicelog_event_query(servicelog *slog, - while (e) { - /* Retrieve any callouts associated with this event */ - snprintf(buf, 512, "SELECT * FROM callouts WHERE " -- "event_id = %lld", e->id); -+ "event_id = %" PRIu64, e->id); - rc = sqlite3_exec(slog->db, buf, build_callout, &(e->callouts), - NULL); - -@@ -590,7 +591,7 @@ servicelog_event_query(servicelog *slog, - retrieve_fcn = addl_data_fcns[e->type].retrieve; - - snprintf(buf, 512, "SELECT * FROM %s WHERE " -- "event_id = %lld", table, e->id); -+ "event_id = %" PRIu64, table, e->id); - - rc = sqlite3_exec(slog->db, buf, retrieve_fcn, e, &err); - if (rc != SQLITE_OK) { -@@ -616,7 +617,7 @@ servicelog_event_close(servicelog *slog, - if (slog == NULL) - return 1; - -- snprintf(buf, 80, "UPDATE events SET closed=1 WHERE id=%llu", -+ snprintf(buf, 80, "UPDATE events SET closed=1 WHERE id=%" PRIu64, - event_id); - - rc = sqlite3_exec(slog->db, buf, NULL, NULL, &err); -@@ -640,8 +641,8 @@ servicelog_event_repair(servicelog *slog - if (slog == NULL) - return 1; - -- snprintf(buf, 80, "UPDATE events SET closed=1, repair=%llu " -- "WHERE id=%llu", repair_id, event_id); -+ snprintf(buf, 80, "UPDATE events SET closed=1, repair=% " PRIu64 -+ "WHERE id=%" PRIu64, repair_id, event_id); - - rc = sqlite3_exec(slog->db, buf, NULL, NULL, &err); - if (rc != SQLITE_OK) { -@@ -661,7 +662,7 @@ delete_row(servicelog *slog, const char - int rc; - char buf[80], *err; - -- snprintf(buf, 80, "DELETE FROM %s WHERE %s=%llu", table, id_column, id); -+ snprintf(buf, 80, "DELETE FROM %s WHERE %s=%" PRIu64, table, id_column, id); - rc = sqlite3_exec(slog->db, buf, NULL, NULL, &err); - if (rc != SQLITE_OK) { - snprintf(slog->error, SL_MAX_ERR, "DELETE error (%d): %s", -@@ -749,7 +750,7 @@ servicelog_event_print(FILE *str, struct - struct tm time; - - /* just print param/value pairs */ -- count += fprintf(str, "ServicelogID: %llu\n", -+ count += fprintf(str, "ServicelogID: %" PRIu64 "\n", - event->id); - localtime_r(&(event->time_logged), &time); - count += fprintf(str, "LogTime: %02d/%02d/%04d " -@@ -798,7 +799,7 @@ servicelog_event_print(FILE *str, struct - count += fprintf(str, "CallHomeStatus: %d\n", - event->call_home_status); - count += fprintf(str, "Closed: %d\n", event->closed); -- count += fprintf(str, "RepairID: %llu\n", -+ count += fprintf(str, "RepairID: %" PRIu64 "\n", - event->repair); - while (callout != NULL) { - count += fprintf(str, "Callout: %c %d %s %s %s " -Index: src/addl_data.c -=================================================================== ---- src/addl_data.c.orig -+++ src/addl_data.c +--- libservicelog-1.1.13.orig/src/addl_data.c ++++ libservicelog-1.1.13/src/addl_data.c @@ -25,6 +25,7 @@ #include #include @@ -150,10 +46,114 @@ Index: src/addl_data.c "%u, %u, %d);", event->id, bmc->sel_id, bmc->sel_type, bmc->generator, bmc->version, bmc->sensor_type, bmc->sensor_number, bmc->event_class, bmc->event_type, -Index: src/v29_compat.c +Index: libservicelog-1.1.13/src/event.c =================================================================== ---- src/v29_compat.c.orig -+++ src/v29_compat.c +--- libservicelog-1.1.13.orig/src/event.c ++++ libservicelog-1.1.13/src/event.c +@@ -31,6 +31,7 @@ + #include + #include + #include "slog_internal.h" ++#include + + static char *severity_text[] = { "", "DEBUG", "INFO", "EVENT", "WARNING", + "ERROR_LOCAL", "ERROR", "FATAL" }; +@@ -102,7 +103,7 @@ put_blob(sqlite3 *db, char *table, uint6 + char query[80]; + sqlite3_stmt *stmt; + +- snprintf(query, 80, "UPDATE %s SET %s = ? WHERE id = %llu", ++ snprintf(query, 80, "UPDATE %s SET %s = ? WHERE id = %" PRIu64, + table, column, row); + + do { +@@ -334,7 +335,7 @@ servicelog_event_log(servicelog *slog, s + + snprintf(buf, SQL_MAXLEN, "INSERT INTO callouts (event_id, " + "priority, type, procedure, location, fru, " +- "serial, ccin) VALUES (%llu, '%c', %d, '%s', " ++ "serial, ccin) VALUES (%" PRIu64", '%c', %d, '%s', " + "'%s', '%s', '%s', '%s');", event_id, + callout->priority, callout->type, proc, loc, + fru, serial, ccin); +@@ -426,7 +427,7 @@ servicelog_event_get(servicelog *slog, u + { + char query[30]; + +- snprintf(query, 30, "id=%llu", event_id); ++ snprintf(query, 30, "id=%" PRIu64, event_id); + return servicelog_event_query(slog, query, event); + } + +@@ -584,7 +585,7 @@ servicelog_event_query(servicelog *slog, + while (e) { + /* Retrieve any callouts associated with this event */ + snprintf(buf, 512, "SELECT * FROM callouts WHERE " +- "event_id = %llu", e->id); ++ "event_id = %" PRIu64, e->id); + rc = sqlite3_exec(slog->db, buf, build_callout, &(e->callouts), + NULL); + +@@ -594,7 +595,7 @@ servicelog_event_query(servicelog *slog, + retrieve_fcn = addl_data_fcns[e->type].retrieve; + + snprintf(buf, 512, "SELECT * FROM %s WHERE " +- "event_id = %llu", table, e->id); ++ "event_id = %" PRIu64, table, e->id); + + rc = sqlite3_exec(slog->db, buf, retrieve_fcn, e, &err); + if (rc != SQLITE_OK) { +@@ -620,7 +621,7 @@ servicelog_event_close(servicelog *slog, + if (slog == NULL) + return 1; + +- snprintf(buf, 80, "UPDATE events SET closed=1 WHERE id=%llu", ++ snprintf(buf, 80, "UPDATE events SET closed=1 WHERE id=%" PRIu64, + event_id); + + rc = sqlite3_exec(slog->db, buf, NULL, NULL, &err); +@@ -644,8 +645,8 @@ servicelog_event_repair(servicelog *slog + if (slog == NULL) + return 1; + +- snprintf(buf, 80, "UPDATE events SET closed=1, repair=%llu " +- "WHERE id=%llu", repair_id, event_id); ++ snprintf(buf, 80, "UPDATE events SET closed=1, repair=% " PRIu64 ++ "WHERE id=%" PRIu64, repair_id, event_id); + + rc = sqlite3_exec(slog->db, buf, NULL, NULL, &err); + if (rc != SQLITE_OK) { +@@ -665,7 +666,7 @@ delete_row(servicelog *slog, const char + int rc; + char buf[80], *err; + +- snprintf(buf, 80, "DELETE FROM %s WHERE %s=%llu", table, id_column, id); ++ snprintf(buf, 80, "DELETE FROM %s WHERE %s=%" PRIu64, table, id_column, id); + rc = sqlite3_exec(slog->db, buf, NULL, NULL, &err); + if (rc != SQLITE_OK) { + snprintf(slog->error, SL_MAX_ERR, "DELETE error (%d): %s", +@@ -753,7 +754,7 @@ servicelog_event_print(FILE *str, struct + struct tm time; + + /* just print param/value pairs */ +- count += fprintf(str, "ServicelogID: %llu\n", ++ count += fprintf(str, "ServicelogID: %" PRIu64 "\n", + event->id); + localtime_r(&(event->time_logged), &time); + count += fprintf(str, "LogTime: %02d/%02d/%04d " +@@ -802,7 +803,7 @@ servicelog_event_print(FILE *str, struct + count += fprintf(str, "CallHomeStatus: %d\n", + event->call_home_status); + count += fprintf(str, "Closed: %d\n", event->closed); +- count += fprintf(str, "RepairID: %llu\n", ++ count += fprintf(str, "RepairID: %" PRIu64 "\n", + event->repair); + while (callout != NULL) { + count += fprintf(str, "Callout: %c %d %s %s %s " +Index: libservicelog-1.1.13/src/v29_compat.c +=================================================================== +--- libservicelog-1.1.13.orig/src/v29_compat.c ++++ libservicelog-1.1.13/src/v29_compat.c @@ -22,6 +22,7 @@ #include "slog_internal.h" #define EXCLUDE_SERVICELOG_COMPAT_DECLS @@ -189,10 +189,10 @@ Index: src/v29_compat.c "to v0.2.9 sl_notify", v1->match, v1->id); return ENOTSUP; } -Index: src/repair_action.c +Index: libservicelog-1.1.13/src/repair_action.c =================================================================== ---- src/repair_action.c.orig -+++ src/repair_action.c +--- libservicelog-1.1.13.orig/src/repair_action.c ++++ libservicelog-1.1.13/src/repair_action.c @@ -31,6 +31,7 @@ #include #include @@ -201,7 +201,7 @@ Index: src/repair_action.c static void add_to_list(servicelog *slog, struct sl_event **events, uint64_t id) -@@ -285,7 +286,7 @@ servicelog_repair_get(servicelog *slog, +@@ -284,7 +285,7 @@ servicelog_repair_get(servicelog *slog, { char query[30]; @@ -210,7 +210,7 @@ Index: src/repair_action.c return servicelog_repair_query(slog, query, repair); } -@@ -409,7 +410,7 @@ servicelog_repair_delete(servicelog *slo +@@ -408,7 +409,7 @@ servicelog_repair_delete(servicelog *slo if (slog == NULL) return 1; @@ -219,7 +219,7 @@ Index: src/repair_action.c repair_id); rc = sqlite3_exec(slog->db, buf, NULL, NULL, &err); -@@ -446,7 +447,7 @@ servicelog_repair_print(FILE *str, struc +@@ -445,7 +446,7 @@ servicelog_repair_print(FILE *str, struc if (verbosity < 0) { struct tm time; @@ -228,10 +228,10 @@ Index: src/repair_action.c repair->id); localtime_r(&(repair->time_logged), &time); count += fprintf(str, "LogTime: %02d/%02d/%04d " -Index: src/notify.c +Index: libservicelog-1.1.13/src/notify.c =================================================================== ---- src/notify.c.orig -+++ src/notify.c +--- libservicelog-1.1.13.orig/src/notify.c ++++ libservicelog-1.1.13/src/notify.c @@ -30,6 +30,7 @@ #include #include @@ -240,7 +240,7 @@ Index: src/notify.c static char *notify_text[] = { "EVENT", "REPAIR" }; -@@ -161,7 +162,7 @@ servicelog_notify_get(servicelog *slog, +@@ -163,7 +164,7 @@ servicelog_notify_get(servicelog *slog, { char query[30]; @@ -249,16 +249,16 @@ Index: src/notify.c return servicelog_notify_query(slog, query, notify); } -@@ -307,7 +308,7 @@ servicelog_notify_update(servicelog *slo +@@ -311,7 +312,7 @@ servicelog_notify_update(servicelog *slo + format_text_to_insert(notify->command, command, DESC_MAXLEN); - /* update the "notifications" table */ - snprintf(buf, 1024, "UPDATE notifications SET notify=%d, command='%s', " -- "method=%d, match='%s') WHERE id=%llu", notify->notify, -+ "method=%d, match='%s') WHERE id=%" PRIu64, notify->notify, - notify->command, notify->method, notify->match, notify_id); + snprintf(buf, SQL_MAXLEN, "UPDATE notifications SET notify=%d, " +- "command='%s', method=%d, match='%s') WHERE id=%llu", ++ "command='%s', method=%d, match='%s') WHERE id=%" PRIu64, + notify->notify, command, notify->method, + notify->match, notify_id); rc = sqlite3_exec(slog->db, buf, NULL, NULL, &err); - if (rc != SQLITE_OK) { -@@ -332,7 +333,7 @@ servicelog_notify_delete(servicelog *slo +@@ -337,7 +338,7 @@ servicelog_notify_delete(servicelog *slo if (slog == NULL) return 1; @@ -267,7 +267,7 @@ Index: src/notify.c notify_id); rc = sqlite3_exec(slog->db, buf, NULL, NULL, &err); -@@ -368,7 +369,7 @@ servicelog_notify_print(FILE *str, struc +@@ -373,7 +374,7 @@ servicelog_notify_print(FILE *str, struc if (verbosity < 0) { struct tm time; @@ -276,16 +276,16 @@ Index: src/notify.c notify->id); localtime_r(&(notify->time_logged), &time); count += fprintf(str, "LogTime: %02d/%02d/%04d " -@@ -466,7 +467,7 @@ run_notification_tool(struct sl_notify * +@@ -471,7 +472,7 @@ run_notification_tool(struct sl_notify * id = repair->id; if (notify->method == SL_METHOD_NUM_VIA_CMD_LINE) -- snprintf(cmd, 1024, "%s %llu", notify->command, id); -+ snprintf(cmd, 1024, "%s %" PRIu64, notify->command, id); +- snprintf(cmd, DESC_MAXLEN + 10, "%s %llu", ++ snprintf(cmd, DESC_MAXLEN + 10, "%s %" PRIu64, + notify->command, id); else { /* need pipes to pass in stdin */ - snprintf(cmd, 1024, "%s", notify->command); -@@ -530,7 +531,7 @@ run_notification_tool(struct sl_notify * +@@ -536,7 +537,7 @@ run_notification_tool(struct sl_notify * if (notify->method == SL_METHOD_NUM_VIA_STDIN) { close(pipe_fd[0]); @@ -294,7 +294,7 @@ Index: src/notify.c write(pipe_fd[1], buf, strlen(buf)); close(pipe_fd[1]); } -@@ -629,9 +630,9 @@ check_notify(void *d, int argc, char **a +@@ -635,9 +636,9 @@ check_notify(void *d, int argc, char **a } if (!notify.match || strlen(notify.match) == 0) diff --git a/libservicelog.changes b/libservicelog.changes index f1f9da1..2576f84 100644 --- a/libservicelog.changes +++ b/libservicelog.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Mar 28 12:26:33 UTC 2013 - dvaleev@suse.com + +- update to 1.1.23 +- Legalize SQL insert command input string +- Minor typo fix +- repair_action : fix output format issue +- drop libservicelog.install.patch +- refresh libservicelog-printf_types.patch + ------------------------------------------------------------------- Wed Dec 5 18:09:10 UTC 2012 - dvaleev@suse.com diff --git a/libservicelog.install.patch b/libservicelog.install.patch deleted file mode 100644 index 3e7188d..0000000 --- a/libservicelog.install.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- Makefile.am.orig 2011-11-02 12:25:32.000000000 +0100 -+++ Makefile.am 2011-11-02 12:25:49.000000000 +0100 -@@ -19,5 +19,5 @@ - library_include_HEADERS = servicelog-1/servicelog.h servicelog-1/libservicelog.h - - install-exec-hook: -- install -D --mode=754 --group=service servicelog.db \ -+ install -D --mode=754 servicelog.db \ - ${DESTDIR}/var/lib/servicelog/servicelog.db diff --git a/libservicelog.spec b/libservicelog.spec index 46189f6..6c918ac 100644 --- a/libservicelog.spec +++ b/libservicelog.spec @@ -1,7 +1,7 @@ # # spec file for package libservicelog # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define so_version 1 Name: libservicelog -Version: 1.1.12 +Version: 1.1.13 Release: 0 Summary: Servicelog Database and Library License: LGPL-2.0+ @@ -37,10 +37,9 @@ ExclusiveArch: ppc ppc64 Source0: http://downloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.bz2 Source1: baselibs.conf Source2: libservicelog-rpmlintrc -Patch0: libservicelog.install.patch -Patch4: libservicelog-pkgconfig.patch -Patch5: libservicelog-printf_types.patch -Patch6: libservicelog-lib_version.patch +Patch0: libservicelog-pkgconfig.patch +Patch1: libservicelog-lib_version.patch +Patch2: libservicelog-printf_types.patch %description The libservicelog package contains a library to create and maintain a @@ -75,9 +74,8 @@ Contains header files for building with libservicelog. %prep %setup -q %patch0 -%patch4 -%patch5 -%patch6 +%patch1 +%patch2 -p1 %build #workaround for missing servicelog.db file in upstream tarball