Hello community,
here is the log from the commit of package libservicelog for openSUSE:Factory
checked in at 2012-12-14 09:40:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libservicelog (Old)
and /work/SRC/openSUSE:Factory/.libservicelog.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libservicelog", Maintainer is "jloe...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libservicelog/libservicelog.changes
2012-06-29 13:25:04.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libservicelog.new/libservicelog.changes
2012-12-14 09:40:55.000000000 +0100
@@ -1,0 +2,8 @@
+Wed Dec 5 18:09:10 UTC 2012 - dval...@suse.com
+
+- update to 1.1.12
+ Upstream changelog:
+ Minor changes
+- more printf types fixes (libservicelog-printf_types.patch)
+
+-------------------------------------------------------------------
Old:
----
libservicelog-1.1.11.tar.bz2
New:
----
libservicelog-1.1.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libservicelog.spec ++++++
--- /var/tmp/diff_new_pack.hRr2La/_old 2012-12-14 09:40:57.000000000 +0100
+++ /var/tmp/diff_new_pack.hRr2La/_new 2012-12-14 09:40:57.000000000 +0100
@@ -19,7 +19,7 @@
%define so_version 1
Name: libservicelog
-Version: 1.1.11
+Version: 1.1.12
Release: 0
Summary: Servicelog Database and Library
License: LGPL-2.0+
@@ -80,6 +80,8 @@
%patch6
%build
+#workaround for missing servicelog.db file in upstream tarball
+touch servicelog.db
autoreconf -fiv
%configure --with-pic --disable-static
make %{?_smp_mflags}
++++++ libservicelog-1.1.11.tar.bz2 -> libservicelog-1.1.12.tar.bz2 ++++++
++++ 146598 lines of diff (skipped)
++++++ libservicelog-printf_types.patch ++++++
--- /var/tmp/diff_new_pack.hRr2La/_old 2012-12-14 09:40:58.000000000 +0100
+++ /var/tmp/diff_new_pack.hRr2La/_new 2012-12-14 09:40:58.000000000 +0100
@@ -1,20 +1,308 @@
---- src/event.c.orig 2011-11-02 13:02:09.000000000 +0100
-+++ src/event.c 2011-11-02 13:01:05.000000000 +0100
-@@ -101,7 +101,7 @@
+Index: src/event.c
+===================================================================
+--- src/event.c.orig
++++ src/event.c
+@@ -31,6 +31,7 @@
+ #include <sys/utsname.h>
+ #include <sqlite3.h>
+ #include "slog_internal.h"
++#include <inttypes.h>
+
+ 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 = %llu",
++ snprintf(query, 80, "UPDATE %s SET %s = ? WHERE id = %" PRIu64,
table, column, row);
do {
-@@ -588,7 +588,7 @@
+@@ -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 = %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,
+ 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
+@@ -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
+@@ -22,6 +22,7 @@
+ #include "slog_internal.h"
+ #define EXCLUDE_SERVICELOG_COMPAT_DECLS
+ #include "../servicelog-1/libservicelog.h"
++#include <inttypes.h>
+
+ /*
+ * Error returns:
+@@ -63,7 +64,7 @@ convert_key_to_v29(servicelog *log, uint
+ *key32 = (uint32_t) key64;
+ if (*key32 != key64) {
+ snprintf(log->error, SL_MAX_ERR,
+- "v1+ %s ID %lld truncated to 32 bits", key_type, key64);
++ "v1+ %s ID %" PRIu64 "truncated to 32 bits", key_type,
key64);
+ return EDOM;
+ }
+ return 0;
+@@ -488,7 +489,7 @@ find_repaired_events(servicelog *log, ui
+ {
+ char query[40];
+
+- sprintf(query, "repair=%lld", repair_id);
++ sprintf(query, "repair=%" PRIu64, repair_id);
+ return servicelog_event_query(log, query, events);
+ }
+
+@@ -1057,7 +1058,7 @@ _convert_v1_sl_notify_to_v29(struct v29_
+ v29nfy_gram_fini();
+ if (parse_result != 0 || semantic_errors != 0) {
+ snprintf(log->error, SL_MAX_ERR, "can't translate "
+- "match string '%s' for v1+ sl_notify %llu "
++ "match string '%s' for v1+ sl_notify % "PRIu64
+ "to v0.2.9 sl_notify", v1->match, v1->id);
+ return ENOTSUP;
+ }
+Index: src/repair_action.c
+===================================================================
+--- src/repair_action.c.orig
++++ src/repair_action.c
+@@ -31,6 +31,7 @@
+ #include <sys/utsname.h>
+ #include <sqlite3.h>
+ #include "slog_internal.h"
++#include <inttypes.h>
+
+ static void
+ add_to_list(servicelog *slog, struct sl_event **events, uint64_t id)
+@@ -285,7 +286,7 @@ servicelog_repair_get(servicelog *slog,
+ {
+ char query[30];
+
+- snprintf(query, 30, "id=%llu", repair_id);
++ snprintf(query, 30, "id=%" PRIu64, repair_id);
+ return servicelog_repair_query(slog, query, repair);
+ }
+
+@@ -409,7 +410,7 @@ servicelog_repair_delete(servicelog *slo
+ if (slog == NULL)
+ return 1;
+
+- snprintf(buf, 80, "DELETE FROM repair_actions WHERE id=%llu",
++ snprintf(buf, 80, "DELETE FROM repair_actions WHERE id=%" PRIu64,
+ repair_id);
+
+ rc = sqlite3_exec(slog->db, buf, NULL, NULL, &err);
+@@ -446,7 +447,7 @@ servicelog_repair_print(FILE *str, struc
+ if (verbosity < 0) {
+ struct tm time;
+
+- count += fprintf(str, "ServicelogID: %llu\n",
++ count += fprintf(str, "ServicelogID: %" PRIu64 "\n",
+ repair->id);
+ localtime_r(&(repair->time_logged), &time);
+ count += fprintf(str, "LogTime: %02d/%02d/%04d "
+Index: src/notify.c
+===================================================================
+--- src/notify.c.orig
++++ src/notify.c
+@@ -30,6 +30,7 @@
+ #include <sys/utsname.h>
+ #include <sqlite3.h>
+ #include "slog_internal.h"
++#include <inttypes.h>
+
+ static char *notify_text[] = { "EVENT", "REPAIR" };
+
+@@ -161,7 +162,7 @@ servicelog_notify_get(servicelog *slog,
+ {
+ char query[30];
+
+- snprintf(query, 30, "id=%llu", notify_id);
++ snprintf(query, 30, "id=%" PRIu64, notify_id);
+ return servicelog_notify_query(slog, query, notify);
+ }
+
+@@ -307,7 +308,7 @@ servicelog_notify_update(servicelog *slo
+
+ /* 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);
+ rc = sqlite3_exec(slog->db, buf, NULL, NULL, &err);
+ if (rc != SQLITE_OK) {
+@@ -332,7 +333,7 @@ servicelog_notify_delete(servicelog *slo
+ if (slog == NULL)
+ return 1;
+
+- snprintf(buf, 80, "DELETE FROM notifications WHERE id=%llu",
++ snprintf(buf, 80, "DELETE FROM notifications WHERE id=%" PRIu64,
+ notify_id);
+
+ rc = sqlite3_exec(slog->db, buf, NULL, NULL, &err);
+@@ -368,7 +369,7 @@ servicelog_notify_print(FILE *str, struc
+ if (verbosity < 0) {
+ struct tm time;
+
+- count += fprintf(str, "ServicelogID: %llu\n",
++ count += fprintf(str, "ServicelogID: %" PRIu64 "\n",
+ 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 *
+ 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);
+ else {
+ /* need pipes to pass in stdin */
+ snprintf(cmd, 1024, "%s", notify->command);
+@@ -530,7 +531,7 @@ run_notification_tool(struct sl_notify *
+
+ if (notify->method == SL_METHOD_NUM_VIA_STDIN) {
+ close(pipe_fd[0]);
+- snprintf(buf, 128, "%llu", id);
++ snprintf(buf, 128, "%" PRIu64, id);
+ write(pipe_fd[1], buf, strlen(buf));
+ close(pipe_fd[1]);
+ }
+@@ -629,9 +630,9 @@ check_notify(void *d, int argc, char **a
+ }
+
+ if (!notify.match || strlen(notify.match) == 0)
+- snprintf(query, 1024, "id=%llu", data->id);
++ snprintf(query, 1024, "id=%" PRIu64, data->id);
+ else
+- snprintf(query, 1024, "(%s) AND id=%llu", notify.match,
++ snprintf(query, 1024, "(%s) AND id=%" PRIu64, notify.match,
+ data->id);
+
+ if (data->notify == SL_NOTIFY_EVENTS) {
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
