Hello community, here is the log from the commit of package libservicelog for openSUSE:Factory checked in at 2013-04-05 17:28:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libservicelog (Old) and /work/SRC/openSUSE:Factory/.libservicelog.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libservicelog", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/libservicelog/libservicelog.changes 2012-12-14 09:40:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libservicelog.new/libservicelog.changes 2013-04-05 17:28:26.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Mar 28 12:26:33 UTC 2013 - [email protected] + +- 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 + +------------------------------------------------------------------- Old: ---- libservicelog-1.1.12.tar.bz2 libservicelog.install.patch New: ---- libservicelog-1.1.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libservicelog.spec ++++++ --- /var/tmp/diff_new_pack.hHQyl5/_old 2013-04-05 17:28:28.000000000 +0200 +++ /var/tmp/diff_new_pack.hHQyl5/_new 2013-04-05 17:28:28.000000000 +0200 @@ -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 @@ 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 @@ %prep %setup -q %patch0 -%patch4 -%patch5 -%patch6 +%patch1 +%patch2 -p1 %build #workaround for missing servicelog.db file in upstream tarball ++++++ libservicelog-1.1.12.tar.bz2 -> libservicelog-1.1.13.tar.bz2 ++++++ ++++ 5405 lines of diff (skipped) ++++++ libservicelog-lib_version.patch ++++++ --- /var/tmp/diff_new_pack.hHQyl5/_old 2013-04-05 17:28:28.000000000 +0200 +++ /var/tmp/diff_new_pack.hHQyl5/_new 2013-04-05 17:28:28.000000000 +0200 @@ -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 ++++++ libservicelog-printf_types.patch ++++++ --- /var/tmp/diff_new_pack.hHQyl5/_old 2013-04-05 17:28:28.000000000 +0200 +++ /var/tmp/diff_new_pack.hHQyl5/_new 2013-04-05 17:28:28.000000000 +0200 @@ -1,7 +1,55 @@ -Index: src/event.c +Index: libservicelog-1.1.13/src/addl_data.c =================================================================== ---- src/event.c.orig -+++ src/event.c +--- libservicelog-1.1.13.orig/src/addl_data.c ++++ libservicelog-1.1.13/src/addl_data.c +@@ -25,6 +25,7 @@ + #include <sys/utsname.h> + #include <sqlite3.h> + #include "slog_internal.h" ++#include <inttypes.h> + + /* + * Each time a new table to contain additional data for a new type of event +@@ -66,7 +67,7 @@ insert_addl_data_os(servicelog *slog, st + version = os->version; + + snprintf(buf, 1024, "INSERT OR REPLACE INTO os (event_id, version, subsystem, " +- "driver, device) VALUES (%llu, '%s', '%s', '%s', '%s');", ++ "driver, device) VALUES (%" PRIu64 ", '%s', '%s', '%s', '%s');", + event->id, version, os->subsystem, os->driver, os->device); + rc = sqlite3_exec(slog->db, buf, NULL, NULL, NULL); + if (rc != SQLITE_OK) +@@ -95,7 +96,7 @@ insert_addl_data_rtas(servicelog *slog, + "platform_id, creator_id, subsystem_id, pel_severity, " + "event_type, event_subtype, kernel_id, addl_word1, " + "addl_word2, addl_word3, addl_word4, addl_word5, addl_word6, " +- "addl_word7, addl_word8) VALUES (%llu, %u, %u, '%c', %u, %u, " ++ "addl_word7, addl_word8) VALUES (%" PRIu64 ", %u, %u, '%c', %u, %u, " + "%u, %u, %u, %u, %u, %u, %u, %u, %u, %u, %u);", event->id, + rtas->action_flags, rtas->platform_id, rtas->creator_id, + rtas->subsystem_id, rtas->pel_severity, rtas->event_type, +@@ -127,7 +128,7 @@ insert_addl_data_enclosure(servicelog *s + encl = (struct sl_data_enclosure *)event->addl_data; + + snprintf(buf, 1024, "INSERT OR REPLACE INTO enclosure (event_id, enclosure_model, " +- "enclosure_serial) VALUES (%llu, '%s', '%s');", event->id, ++ "enclosure_serial) VALUES (%" PRIu64 ", '%s', '%s');", event->id, + encl->enclosure_model, encl->enclosure_serial); + rc = sqlite3_exec(slog->db, buf, NULL, NULL, NULL); + if (rc != SQLITE_OK) +@@ -154,7 +155,7 @@ insert_addl_data_bmc(servicelog *slog, s + + snprintf(buf, 1024, "INSERT OR REPLACE INTO bmc (event_id, sel_id, sel_type, " + "generator, version, sensor_type, sensor_number, event_class, " +- "event_type, direction) VALUES (%llu, %u, %u, %u, %u, %u, %u, " ++ "event_type, direction) VALUES (%" PRIu64 ", %u, %u, %u, %u, %u, %u, " + "%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: libservicelog-1.1.13/src/event.c +=================================================================== +--- libservicelog-1.1.13.orig/src/event.c ++++ libservicelog-1.1.13/src/event.c @@ -31,6 +31,7 @@ #include <sys/utsname.h> #include <sqlite3.h> @@ -14,21 +62,21 @@ 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 = %llu", + snprintf(query, 80, "UPDATE %s SET %s = ? WHERE id = %" PRIu64, table, column, row); do { -@@ -330,7 +331,7 @@ servicelog_event_log(servicelog *slog, s +@@ -334,7 +335,7 @@ servicelog_event_log(servicelog *slog, s - snprintf(buf, 1024, "INSERT INTO callouts (event_id, " + 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); -@@ -422,7 +423,7 @@ servicelog_event_get(servicelog *slog, u +@@ -426,7 +427,7 @@ servicelog_event_get(servicelog *slog, u { char query[30]; @@ -37,25 +85,25 @@ return servicelog_event_query(slog, query, event); } -@@ -580,7 +581,7 @@ servicelog_event_query(servicelog *slog, +@@ -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 = %lld", e->id); +- "event_id = %llu", 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, +@@ -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 = %lld", table, e->id); +- "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) { -@@ -616,7 +617,7 @@ servicelog_event_close(servicelog *slog, +@@ -620,7 +621,7 @@ servicelog_event_close(servicelog *slog, if (slog == NULL) return 1; @@ -64,7 +112,7 @@ event_id); rc = sqlite3_exec(slog->db, buf, NULL, NULL, &err); -@@ -640,8 +641,8 @@ servicelog_event_repair(servicelog *slog +@@ -644,8 +645,8 @@ servicelog_event_repair(servicelog *slog if (slog == NULL) return 1; @@ -75,7 +123,7 @@ rc = sqlite3_exec(slog->db, buf, NULL, NULL, &err); if (rc != SQLITE_OK) { -@@ -661,7 +662,7 @@ delete_row(servicelog *slog, const char +@@ -665,7 +666,7 @@ delete_row(servicelog *slog, const char int rc; char buf[80], *err; @@ -84,7 +132,7 @@ 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 +@@ -753,7 +754,7 @@ servicelog_event_print(FILE *str, struct struct tm time; /* just print param/value pairs */ @@ -93,7 +141,7 @@ 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 +@@ -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); @@ -102,58 +150,10 @@ event->repair); while (callout != NULL) { count += fprintf(str, "Callout: %c %d %s %s %s " -Index: src/addl_data.c +Index: libservicelog-1.1.13/src/v29_compat.c =================================================================== ---- src/addl_data.c.orig -+++ src/addl_data.c -@@ -25,6 +25,7 @@ - #include <sys/utsname.h> - #include <sqlite3.h> - #include "slog_internal.h" -+#include <inttypes.h> - - /* - * Each time a new table to contain additional data for a new type of event -@@ -66,7 +67,7 @@ insert_addl_data_os(servicelog *slog, st - version = os->version; - - snprintf(buf, 1024, "INSERT OR REPLACE INTO os (event_id, version, subsystem, " -- "driver, device) VALUES (%llu, '%s', '%s', '%s', '%s');", -+ "driver, device) VALUES (%" PRIu64 ", '%s', '%s', '%s', '%s');", - event->id, version, os->subsystem, os->driver, os->device); - rc = sqlite3_exec(slog->db, buf, NULL, NULL, NULL); - if (rc != SQLITE_OK) -@@ -95,7 +96,7 @@ insert_addl_data_rtas(servicelog *slog, - "platform_id, creator_id, subsystem_id, pel_severity, " - "event_type, event_subtype, kernel_id, addl_word1, " - "addl_word2, addl_word3, addl_word4, addl_word5, addl_word6, " -- "addl_word7, addl_word8) VALUES (%llu, %u, %u, '%c', %u, %u, " -+ "addl_word7, addl_word8) VALUES (%" PRIu64 ", %u, %u, '%c', %u, %u, " - "%u, %u, %u, %u, %u, %u, %u, %u, %u, %u, %u);", event->id, - rtas->action_flags, rtas->platform_id, rtas->creator_id, - rtas->subsystem_id, rtas->pel_severity, rtas->event_type, -@@ -127,7 +128,7 @@ insert_addl_data_enclosure(servicelog *s - encl = (struct sl_data_enclosure *)event->addl_data; - - snprintf(buf, 1024, "INSERT OR REPLACE INTO enclosure (event_id, enclosure_model, " -- "enclosure_serial) VALUES (%llu, '%s', '%s');", event->id, -+ "enclosure_serial) VALUES (%" PRIu64 ", '%s', '%s');", event->id, - encl->enclosure_model, encl->enclosure_serial); - rc = sqlite3_exec(slog->db, buf, NULL, NULL, NULL); - if (rc != SQLITE_OK) -@@ -154,7 +155,7 @@ insert_addl_data_bmc(servicelog *slog, s - - snprintf(buf, 1024, "INSERT OR REPLACE INTO bmc (event_id, sel_id, sel_type, " - "generator, version, sensor_type, sensor_number, event_class, " -- "event_type, direction) VALUES (%llu, %u, %u, %u, %u, %u, %u, " -+ "event_type, direction) VALUES (%" PRIu64 ", %u, %u, %u, %u, %u, %u, " - "%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 -=================================================================== ---- src/v29_compat.c.orig -+++ 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 @@ "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 <sys/utsname.h> #include <sqlite3.h> @@ -201,7 +201,7 @@ 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 @@ 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 @@ 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 @@ 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 <sys/utsname.h> #include <sqlite3.h> @@ -240,7 +240,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
