openSUSE Commits
Threads by month
- ----- 2024 -----
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
November 2013
- 1 participants
- 1122 discussions
Hello community,
here is the log from the commit of package dbus-1 for openSUSE:Factory checked in at 2013-11-04 09:11:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dbus-1 (Old)
and /work/SRC/openSUSE:Factory/.dbus-1.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dbus-1"
Changes:
--------
--- /work/SRC/openSUSE:Factory/dbus-1/dbus-1-x11.changes 2013-10-10 11:26:02.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.dbus-1.new/dbus-1-x11.changes 2013-11-04 09:11:38.000000000 +0100
@@ -1,0 +2,25 @@
+Fri Nov 1 21:31:19 UTC 2013 - hrvoje.senjan(a)gmail.com
+
+- Update to 1.7.8
+ + Dependencies:
+ - If systemd support is enabled, libsystemd-journal is
+ now required.
+ + Enhancements:
+ - When activating a non-systemd service under systemd,
+ annotate its stdout/stderr with its bus name in the Journal.
+ Known limitation: because the socket is opened before forking,
+ the process will still be logged as if it had dbus-daemon's
+ process ID and user ID. (fdo#68559)
+ - Document more configuration elements in dbus-daemon(1)
+ (fdo#69125)
+ + Fixes:
+ - Don't leak string arrays or fds if
+ dbus_message_iter_get_args_valist() unpacks them and then
+ encounters an error (fdo#21259)
+ - If compiled with libaudit, retain CAP_AUDIT_WRITE so we
+ can write disallowed method calls to the audit log,
+ fixing a regression in 1.7.6 (fdo#49062)
+ - path_namespace='/' in match rules incorrectly matched nothing;
+ it now matches everything. (fdo#70799)
+
+-------------------------------------------------------------------
dbus-1.changes: same change
Old:
----
dbus-1.7.6.tar.gz
New:
----
dbus-1.7.8.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dbus-1-x11.spec ++++++
--- /var/tmp/diff_new_pack.yeN5P2/_old 2013-11-04 09:11:40.000000000 +0100
+++ /var/tmp/diff_new_pack.yeN5P2/_new 2013-11-04 09:11:40.000000000 +0100
@@ -49,7 +49,7 @@
BuildRequires: libexpat-devel
BuildRequires: libtool
BuildRequires: pkg-config
-Version: 1.7.6
+Version: 1.7.8
Release: 0
#
Source0: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.gz
dbus-1.spec: same change
++++++ dbus-1.7.6.tar.gz -> dbus-1.7.8.tar.gz ++++++
++++ 7705 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dbus-1.7.6/NEWS new/dbus-1.7.8/NEWS
--- old/dbus-1.7.6/NEWS 2013-10-09 12:29:15.000000000 +0200
+++ new/dbus-1.7.8/NEWS 2013-11-01 20:16:53.000000000 +0100
@@ -1,3 +1,35 @@
+D-Bus 1.7.8 (2013-11-01)
+==
+
+The “extreme hills” release.
+
+Dependencies:
+
+• If systemd support is enabled, libsystemd-journal is now required.
+
+Enhancements:
+
+• When activating a non-systemd service under systemd, annotate its
+ stdout/stderr with its bus name in the Journal. Known limitation:
+ because the socket is opened before forking, the process will still be
+ logged as if it had dbus-daemon's process ID and user ID.
+ (fd.o #68559, Chengwei Yang)
+
+• Document more configuration elements in dbus-daemon(1)
+ (fd.o #69125, Chengwei Yang)
+
+Fixes:
+
+• Don't leak string arrays or fds if dbus_message_iter_get_args_valist()
+ unpacks them and then encounters an error (fd.o #21259, Chengwei Yang)
+
+• If compiled with libaudit, retain CAP_AUDIT_WRITE so we can write
+ disallowed method calls to the audit log, fixing a regression in 1.7.6
+ (fd.o #49062, Colin Walters)
+
+• path_namespace='/' in match rules incorrectly matched nothing; it
+ now matches everything. (fd.o #70799, Simon McVittie)
+
D-Bus 1.7.6 (2013-10-09)
==
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dbus-1.7.6/bus/activation.c new/dbus-1.7.8/bus/activation.c
--- old/dbus-1.7.6/bus/activation.c 2013-10-09 11:51:19.000000000 +0200
+++ new/dbus-1.7.8/bus/activation.c 2013-11-01 13:39:42.000000000 +0100
@@ -2104,7 +2104,9 @@
dbus_error_init (&tmp_error);
- if (!_dbus_spawn_async_with_babysitter (&pending_activation->babysitter, argv,
+ if (!_dbus_spawn_async_with_babysitter (&pending_activation->babysitter,
+ service_name,
+ argv,
envp,
NULL, activation,
&tmp_error))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dbus-1.7.6/bus/connection.c new/dbus-1.7.8/bus/connection.c
--- old/dbus-1.7.6/bus/connection.c 2013-02-18 15:15:10.000000000 +0100
+++ new/dbus-1.7.8/bus/connection.c 2013-11-01 13:05:37.000000000 +0100
@@ -2126,6 +2126,16 @@
}
static void
+transaction_free (BusTransaction *transaction)
+{
+ _dbus_assert (transaction->connections == NULL);
+
+ free_cancel_hooks (transaction);
+
+ dbus_free (transaction);
+}
+
+static void
connection_cancel_transaction (DBusConnection *connection,
BusTransaction *transaction)
{
@@ -2163,14 +2173,10 @@
while ((connection = _dbus_list_pop_first (&transaction->connections)))
connection_cancel_transaction (connection, transaction);
- _dbus_assert (transaction->connections == NULL);
-
_dbus_list_foreach (&transaction->cancel_hooks,
cancel_hook_cancel, NULL);
- free_cancel_hooks (transaction);
-
- dbus_free (transaction);
+ transaction_free (transaction);
}
static void
@@ -2224,11 +2230,7 @@
while ((connection = _dbus_list_pop_first (&transaction->connections)))
connection_execute_transaction (connection, transaction);
- _dbus_assert (transaction->connections == NULL);
-
- free_cancel_hooks (transaction);
-
- dbus_free (transaction);
+ transaction_free (transaction);
}
static void
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dbus-1.7.6/bus/main.c new/dbus-1.7.8/bus/main.c
--- old/dbus-1.7.6/bus/main.c 2013-10-08 19:40:39.000000000 +0200
+++ new/dbus-1.7.8/bus/main.c 2013-11-01 13:05:37.000000000 +0100
@@ -61,7 +61,6 @@
{
switch (sig)
{
-#ifdef SIGHUP
case SIGHUP:
{
DBusString str;
@@ -94,7 +93,6 @@
}
}
break;
-#endif
case SIGTERM:
{
@@ -642,9 +640,7 @@
* no point in trying to make the handler portable to non-Unix. */
_dbus_set_signal_handler (SIGTERM, signal_handler);
-#ifdef SIGHUP
_dbus_set_signal_handler (SIGHUP, signal_handler);
-#endif
#endif /* DBUS_UNIX */
_dbus_verbose ("We are on D-Bus...\n");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dbus-1.7.6/bus/selinux.c new/dbus-1.7.8/bus/selinux.c
--- old/dbus-1.7.6/bus/selinux.c 2013-10-08 19:40:39.000000000 +0200
+++ new/dbus-1.7.8/bus/selinux.c 2013-11-01 20:13:20.000000000 +0100
@@ -1043,9 +1043,15 @@
if (_dbus_geteuid () == 0)
{
int rc;
+ int have_audit_write;
+ have_audit_write = capng_have_capability (CAPNG_PERMITTED, CAP_AUDIT_WRITE);
capng_clear (CAPNG_SELECT_BOTH);
- if (capng_have_capability (CAPNG_PERMITTED, CAP_AUDIT_WRITE))
+ /* Only attempt to retain CAP_AUDIT_WRITE if we had it when
+ * starting. See:
+ * https://bugs.freedesktop.org/show_bug.cgi?id=49062#c9
+ */
+ if (have_audit_write)
capng_update (CAPNG_ADD, CAPNG_EFFECTIVE | CAPNG_PERMITTED,
CAP_AUDIT_WRITE);
rc = capng_change_id (uid, gid, CAPNG_DROP_SUPP_GRP);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dbus-1.7.6/bus/signals.c new/dbus-1.7.8/bus/signals.c
--- old/dbus-1.7.6/bus/signals.c 2013-10-08 19:40:39.000000000 +0200
+++ new/dbus-1.7.8/bus/signals.c 2013-10-23 18:15:56.000000000 +0200
@@ -1836,8 +1836,11 @@
* namespace, rather than just starting with that string,
* by checking that the matched prefix is followed by a '/'
* or the end of the path.
+ *
+ * Special case: the only valid path of length 1, "/",
+ * matches everything.
*/
- if (path[len] != '\0' && path[len] != '/')
+ if (len > 1 && path[len] != '\0' && path[len] != '/')
return FALSE;
}
@@ -2717,6 +2720,7 @@
static const char*
path_namespace_should_match_message_1[] = {
+ "type='signal',path_namespace='/'",
"type='signal',path_namespace='/foo'",
"type='signal',path_namespace='/foo/TheObjectManager'",
NULL
@@ -2731,6 +2735,7 @@
static const char*
path_namespace_should_match_message_2[] = {
+ "type='signal',path_namespace='/'",
"type='signal',path_namespace='/foo/TheObjectManager'",
NULL
};
@@ -2742,6 +2747,7 @@
static const char*
path_namespace_should_match_message_3[] = {
+ "type='signal',path_namespace='/'",
NULL
};
@@ -2751,12 +2757,25 @@
NULL
};
+static const char*
+path_namespace_should_match_message_4[] = {
+ "type='signal',path_namespace='/'",
+ NULL
+};
+
+static const char*
+path_namespace_should_not_match_message_4[] = {
+ "type='signal',path_namespace='/foo/TheObjectManager'",
+ NULL
+};
+
static void
test_matching_path_namespace (void)
{
DBusMessage *message1;
DBusMessage *message2;
DBusMessage *message3;
+ DBusMessage *message4;
message1 = dbus_message_new (DBUS_MESSAGE_TYPE_SIGNAL);
_dbus_assert (message1 != NULL);
@@ -2773,6 +2792,11 @@
if (!dbus_message_set_path (message3, "/foo/TheObjectManagerOther"))
_dbus_assert_not_reached ("oom");
+ message4 = dbus_message_new (DBUS_MESSAGE_TYPE_SIGNAL);
+ _dbus_assert (message4 != NULL);
+ if (!dbus_message_set_path (message4, "/"))
+ _dbus_assert_not_reached ("oom");
+
check_matching (message1, 1,
path_namespace_should_match_message_1,
path_namespace_should_not_match_message_1);
@@ -2782,7 +2806,11 @@
check_matching (message3, 3,
path_namespace_should_match_message_3,
path_namespace_should_not_match_message_3);
+ check_matching (message4, 4,
+ path_namespace_should_match_message_4,
+ path_namespace_should_not_match_message_4);
+ dbus_message_unref (message4);
dbus_message_unref (message3);
dbus_message_unref (message2);
dbus_message_unref (message1);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dbus-1.7.6/config.h.in new/dbus-1.7.8/config.h.in
--- old/dbus-1.7.6/config.h.in 2013-10-09 13:05:14.000000000 +0200
+++ new/dbus-1.7.8/config.h.in 2013-11-01 20:20:31.000000000 +0100
@@ -357,6 +357,9 @@
*/
#undef LT_OBJDIR
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#undef NO_MINUS_C_MINUS_O
+
/* Name of package */
#undef PACKAGE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dbus-1.7.6/configure.ac new/dbus-1.7.8/configure.ac
--- old/dbus-1.7.6/configure.ac 2013-10-09 12:29:20.000000000 +0200
+++ new/dbus-1.7.8/configure.ac 2013-11-01 20:14:36.000000000 +0100
@@ -3,7 +3,7 @@
m4_define([dbus_major_version], [1])
m4_define([dbus_minor_version], [7])
-m4_define([dbus_micro_version], [6])
+m4_define([dbus_micro_version], [8])
m4_define([dbus_version],
[dbus_major_version.dbus_minor_version.dbus_micro_version])
AC_INIT([dbus],[dbus_version],[https://bugs.freedesktop.org/enter_bug.cgi?p…
@@ -37,7 +37,7 @@
## increment any time the source changes; set to
## 0 if you increment CURRENT
-LT_REVISION=2
+LT_REVISION=3
## increment if any interfaces have been added; set to 0
## if any interfaces have been changed or removed. removal has
@@ -1143,7 +1143,7 @@
have_systemd=no;
else
PKG_CHECK_MODULES(SYSTEMD,
- [libsystemd-login >= 32, libsystemd-daemon >= 32],
+ [libsystemd-login >= 32, libsystemd-daemon >= 32, libsystemd-journal >= 32],
have_systemd=yes,
have_systemd=no)
fi
@@ -1774,6 +1774,7 @@
dbus-1-uninstalled.pc
test/data/valid-config-files/debug-allow-all.conf
test/data/valid-config-files/debug-allow-all-sha1.conf
+test/data/valid-config-files/incoming-limit.conf
test/data/valid-config-files-system/debug-allow-all-pass.conf
test/data/valid-config-files-system/debug-allow-all-fail.conf
test/data/valid-service-files/org.freedesktop.DBus.TestSuite.PrivServer.service
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dbus-1.7.6/dbus/dbus-bus.c new/dbus-1.7.8/dbus/dbus-bus.c
--- old/dbus-1.7.6/dbus/dbus-bus.c 2013-10-08 19:40:39.000000000 +0200
+++ new/dbus-1.7.8/dbus/dbus-bus.c 2013-11-01 13:08:33.000000000 +0100
@@ -294,12 +294,6 @@
* the above code will work right
*/
- if (!dbus_setenv ("DBUS_ACTIVATION_ADDRESS", NULL))
- return FALSE;
-
- if (!dbus_setenv ("DBUS_ACTIVATION_BUS_TYPE", NULL))
- return FALSE;
-
if (!_dbus_register_shutdown_func (addresses_shutdown_func,
NULL))
return FALSE;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dbus-1.7.6/dbus/dbus-message-util.c new/dbus-1.7.8/dbus/dbus-message-util.c
--- old/dbus-1.7.6/dbus/dbus-message-util.c 2013-10-08 19:40:40.000000000 +0200
+++ new/dbus-1.7.8/dbus/dbus-message-util.c 2013-11-01 13:05:37.000000000 +0100
@@ -991,6 +991,161 @@
_dbus_assert_not_reached ("Didn't reach end of arguments");
}
+static void
+verify_test_message_args_ignored (DBusMessage *message)
+{
+ DBusMessageIter iter;
+ DBusError error = DBUS_ERROR_INIT;
+ dbus_uint32_t our_uint;
+ DBusInitialFDs *initial_fds;
+
+ initial_fds = _dbus_check_fdleaks_enter ();
+
+ /* parse with empty signature: "" */
+ dbus_message_iter_init (message, &iter);
+ if (!dbus_message_iter_get_args (&iter, &error,
+ DBUS_TYPE_INVALID))
+ {
+ _dbus_warn ("error: %s - %s\n", error.name,
+ (error.message != NULL) ? error.message : "no message");
+ }
+ else
+ {
+ _dbus_assert (!dbus_error_is_set (&error));
+ _dbus_verbose ("arguments ignored.\n");
+ }
+
+ /* parse with shorter signature: "u" */
+ dbus_message_iter_init (message, &iter);
+ if (!dbus_message_iter_get_args (&iter, &error,
+ DBUS_TYPE_UINT32, &our_uint,
+ DBUS_TYPE_INVALID))
+ {
+ _dbus_warn ("error: %s - %s\n", error.name,
+ (error.message != NULL) ? error.message : "no message");
+ }
+ else
+ {
+ _dbus_assert (!dbus_error_is_set (&error));
+ _dbus_verbose ("arguments ignored.\n");
+ }
+
+ _dbus_check_fdleaks_leave (initial_fds);
+}
+
+static void
+verify_test_message_memleak (DBusMessage *message)
+{
+ DBusMessageIter iter;
+ DBusError error = DBUS_ERROR_INIT;
+ dbus_uint32_t our_uint1;
+ dbus_uint32_t our_uint2;
+ dbus_uint32_t our_uint3;
+ char **our_string_array1;
+ int our_string_array_len1;
+ char **our_string_array2;
+ int our_string_array_len2;
+ int our_unix_fd1;
+ int our_unix_fd2;
+ DBusInitialFDs *initial_fds;
+
+ initial_fds = _dbus_check_fdleaks_enter ();
+
+ /* parse with wrong signature: "uashuu" */
+ dbus_error_free (&error);
+ dbus_message_iter_init (message, &iter);
+ if (!dbus_message_iter_get_args (&iter, &error,
+ DBUS_TYPE_UINT32, &our_uint1,
+ DBUS_TYPE_ARRAY, DBUS_TYPE_STRING,
+ &our_string_array1, &our_string_array_len1,
+#ifdef HAVE_UNIX_FD_PASSING
+ DBUS_TYPE_UNIX_FD, &our_unix_fd1,
+#endif
+ DBUS_TYPE_UINT32, &our_uint2,
+ DBUS_TYPE_UINT32, &our_uint3,
+ DBUS_TYPE_INVALID))
+ {
+ _dbus_verbose ("expected error: %s - %s\n", error.name,
+ (error.message != NULL) ? error.message : "no message");
+ /* ensure array of string and unix fd not leaked */
+ _dbus_assert (our_string_array1 == NULL);
+#ifdef HAVE_UNIX_FD_PASSING
+ _dbus_assert (our_unix_fd1 == -1);
+#endif
+ }
+ else
+ {
+ _dbus_warn ("error: parse with wrong signature: 'uashuu'.\n");
+ }
+
+ /* parse with wrong signature: "uashuashu" */
+ dbus_message_iter_init (message, &iter);
+ dbus_error_free (&error);
+ if (!dbus_message_iter_get_args (&iter, &error,
+ DBUS_TYPE_UINT32, &our_uint1,
+ DBUS_TYPE_ARRAY, DBUS_TYPE_STRING,
+ &our_string_array1, &our_string_array_len1,
+#ifdef HAVE_UNIX_FD_PASSING
+ DBUS_TYPE_UNIX_FD, &our_unix_fd1,
+#endif
+ DBUS_TYPE_UINT32, &our_uint2,
+ DBUS_TYPE_ARRAY, DBUS_TYPE_STRING,
+ &our_string_array2, &our_string_array_len2,
+#ifdef HAVE_UNIX_FD_PASSING
+ DBUS_TYPE_UNIX_FD, &our_unix_fd2,
+#endif
+ DBUS_TYPE_UINT32, &our_uint3,
+ DBUS_TYPE_INVALID))
+ {
+ _dbus_verbose ("expected error: %s - %s\n", error.name,
+ (error.message != NULL) ? error.message : "no message");
+ /* ensure array of string and unix fd not leaked */
+ _dbus_assert (our_string_array1 == NULL);
+ _dbus_assert (our_string_array2 == NULL);
+#ifdef HAVE_UNIX_FD_PASSING
+ _dbus_assert (our_unix_fd1 == -1);
+ _dbus_assert (our_unix_fd2 == -1);
+#endif
+ }
+ else
+ {
+ _dbus_warn ("error: parse with wrong signature: 'uashuashu'.\n");
+ }
+
+ /* parse with correct signature: "uashuash" */
+ dbus_message_iter_init (message, &iter);
+ dbus_error_free (&error);
+ if (!dbus_message_iter_get_args (&iter, &error,
+ DBUS_TYPE_UINT32, &our_uint1,
+ DBUS_TYPE_ARRAY, DBUS_TYPE_STRING,
+ &our_string_array1, &our_string_array_len1,
+#ifdef HAVE_UNIX_FD_PASSING
+ DBUS_TYPE_UNIX_FD, &our_unix_fd1,
+#endif
+ DBUS_TYPE_UINT32, &our_uint2,
+ DBUS_TYPE_ARRAY, DBUS_TYPE_STRING,
+ &our_string_array2, &our_string_array_len2,
+#ifdef HAVE_UNIX_FD_PASSING
+ DBUS_TYPE_UNIX_FD, &our_unix_fd2,
+#endif
+ DBUS_TYPE_INVALID))
+ {
+ _dbus_warn ("error: %s - %s\n", error.name,
+ (error.message != NULL) ? error.message : "no message");
+ _dbus_assert_not_reached ("Could not get arguments");
+ }
+ else
+ {
+ dbus_free_string_array (our_string_array1);
+ dbus_free_string_array (our_string_array2);
+#ifdef HAVE_UNIX_FD_PASSING
+ _dbus_close (our_unix_fd1, &error);
+ _dbus_close (our_unix_fd2, &error);
+#endif
+ }
+ _dbus_check_fdleaks_leave (initial_fds);
+}
+
/**
* @ingroup DBusMessageInternals
* Unit test for DBusMessage.
@@ -1020,7 +1175,9 @@
const dbus_uint64_t *v_ARRAY_UINT64 = our_uint64_array;
const dbus_int64_t *v_ARRAY_INT64 = our_int64_array;
const char *our_string_array[] = { "Foo", "bar", "", "woo woo woo woo" };
+ const char *our_string_array1[] = { "foo", "Bar", "", "Woo woo Woo woo" };
const char **v_ARRAY_STRING = our_string_array;
+ const char **v1_ARRAY_STRING = our_string_array1;
const double our_double_array[] = { 0.1234, 9876.54321, -300.0 };
const double *v_ARRAY_DOUBLE = our_double_array;
const unsigned char our_byte_array[] = { 'a', 'b', 'c', 234 };
@@ -1035,6 +1192,7 @@
dbus_uint16_t v_UINT16;
dbus_int32_t v_INT32;
dbus_uint32_t v_UINT32;
+ dbus_uint32_t v1_UINT32;
dbus_int64_t v_INT64;
dbus_uint64_t v_UINT64;
unsigned char v_BYTE;
@@ -1043,6 +1201,7 @@
DBusMessageIter iter, array_iter, struct_iter;
#ifdef HAVE_UNIX_FD_PASSING
int v_UNIX_FD;
+ int v1_UNIX_FD;
#endif
char **decomposed;
DBusInitialFDs *initial_fds;
@@ -1194,6 +1353,7 @@
v2_BYTE = 24;
#ifdef HAVE_UNIX_FD_PASSING
v_UNIX_FD = 1;
+ v1_UNIX_FD = 2;
#endif
dbus_message_append_args (message,
@@ -1463,6 +1623,51 @@
dbus_message_unref (message);
+ /* Check we should not leak array of string or unix fd, fd.o#21259 */
+ message = dbus_message_new_method_call ("org.freedesktop.DBus.TestService",
+ "/org/freedesktop/TestPath",
+ "Foo.TestInterface",
+ "Method");
+
+ /* signature "uashuash" */
+ dbus_message_append_args (message,
+ DBUS_TYPE_UINT32, &v_UINT32,
+ DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &v_ARRAY_STRING,
+ _DBUS_N_ELEMENTS (our_string_array),
+#ifdef HAVE_UNIX_FD_PASSING
+ DBUS_TYPE_UNIX_FD, &v_UNIX_FD,
+#endif
+ DBUS_TYPE_UINT32, &v1_UINT32,
+ DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &v1_ARRAY_STRING,
+ _DBUS_N_ELEMENTS (our_string_array1),
+#ifdef HAVE_UNIX_FD_PASSING
+ DBUS_TYPE_UNIX_FD, &v1_UNIX_FD,
+#endif
+
+ DBUS_TYPE_INVALID);
+
+ i = 0;
+ sig[i++] = DBUS_TYPE_UINT32;
+ sig[i++] = DBUS_TYPE_ARRAY;
+ sig[i++] = DBUS_TYPE_STRING;
+#ifdef HAVE_UNIX_FD_PASSING
+ sig[i++] = DBUS_TYPE_UNIX_FD;
+#endif
+ sig[i++] = DBUS_TYPE_UINT32;
+ sig[i++] = DBUS_TYPE_ARRAY;
+ sig[i++] = DBUS_TYPE_STRING;
+#ifdef HAVE_UNIX_FD_PASSING
+ sig[i++] = DBUS_TYPE_UNIX_FD;
+#endif
+ sig[i++] = DBUS_TYPE_INVALID;
+
+ _dbus_assert (i < (int) _DBUS_N_ELEMENTS (sig));
+
+ verify_test_message_args_ignored (message);
+ verify_test_message_memleak (message);
+
+ dbus_message_unref (message);
+
/* Load all the sample messages from the message factory */
{
DBusMessageDataIter diter;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dbus-1.7.6/dbus/dbus-message.c new/dbus-1.7.8/dbus/dbus-message.c
--- old/dbus-1.7.6/dbus/dbus-message.c 2013-10-08 19:40:40.000000000 +0200
+++ new/dbus-1.7.8/dbus/dbus-message.c 2013-11-01 13:05:37.000000000 +0100
@@ -784,8 +784,6 @@
* dbus_message_get_args() is the place to go for complete
* documentation.
*
- * @todo This may leak memory and file descriptors if parsing fails. See #21259
- *
* @see dbus_message_get_args
* @param iter the message iter
* @param error error to be filled in
@@ -802,6 +800,7 @@
DBusMessageRealIter *real = (DBusMessageRealIter *)iter;
int spec_type, msg_type, i, j;
dbus_bool_t retval;
+ va_list copy_args;
_dbus_assert (_dbus_message_iter_check (real));
@@ -810,12 +809,17 @@
spec_type = first_arg_type;
i = 0;
+ /* copy var_args first, then we can do another iteration over it to
+ * free memory and close unix fds if parse failed at some point.
+ */
+ va_copy (copy_args, var_args);
+
while (spec_type != DBUS_TYPE_INVALID)
{
msg_type = dbus_message_iter_get_arg_type (iter);
if (msg_type != spec_type)
- {
+ {
dbus_set_error (error, DBUS_ERROR_INVALID_ARGS,
"Argument %d is specified to be of type \"%s\", but "
"is actually of type \"%s\"\n", i,
@@ -823,7 +827,7 @@
_dbus_type_to_string (msg_type));
goto out;
- }
+ }
if (spec_type == DBUS_TYPE_UNIX_FD)
{
@@ -982,21 +986,81 @@
}
#endif
+ /* how many arguments already handled */
+ i++;
+
spec_type = va_arg (var_args, int);
if (!_dbus_type_reader_next (&real->u.reader) && spec_type != DBUS_TYPE_INVALID)
{
dbus_set_error (error, DBUS_ERROR_INVALID_ARGS,
- "Message has only %d arguments, but more were expected", i + 1);
+ "Message has only %d arguments, but more were expected", i);
goto out;
}
-
- i++;
}
retval = TRUE;
out:
+ /* there may memory or unix fd leak in the above iteration if parse failed.
+ * so we have another iteration over copy_args to free memory and close
+ * unix fds.
+ */
+ if (!retval)
+ {
+ spec_type = first_arg_type;
+ j = 0;
+
+ while (j < i)
+ {
+ if (spec_type == DBUS_TYPE_UNIX_FD)
+ {
+#ifdef HAVE_UNIX_FD_PASSING
+ int *pfd;
+
+ pfd = va_arg (copy_args, int *);
+ _dbus_assert(pfd);
+ if (*pfd >= 0)
+ {
+ _dbus_close (*pfd, NULL);
+ *pfd = -1;
+ }
+#endif
+ }
+ else if (dbus_type_is_basic (spec_type))
+ {
+ /* move the index forward */
+ va_arg (copy_args, DBusBasicValue *);
+ }
+ else if (spec_type == DBUS_TYPE_ARRAY)
+ {
+ int spec_element_type;
+
+ spec_element_type = va_arg (copy_args, int);
+ if (dbus_type_is_fixed (spec_element_type))
+ {
+ /* move the index forward */
+ va_arg (copy_args, const DBusBasicValue **);
+ va_arg (copy_args, int *);
+ }
+ else if (_DBUS_TYPE_IS_STRINGLIKE (spec_element_type))
+ {
+ char ***str_array_p;
+
+ str_array_p = va_arg (copy_args, char ***);
+ /* move the index forward */
+ va_arg (copy_args, int *);
+ _dbus_assert (str_array_p != NULL);
+ dbus_free_string_array (*str_array_p);
+ *str_array_p = NULL;
+ }
+ }
+
+ spec_type = va_arg (copy_args, int);
+ j++;
+ }
+ }
+ va_end (copy_args);
return retval;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dbus-1.7.6/dbus/dbus-spawn-win.c new/dbus-1.7.8/dbus/dbus-spawn-win.c
--- old/dbus-1.7.6/dbus/dbus-spawn-win.c 2013-10-08 19:40:40.000000000 +0200
+++ new/dbus-1.7.8/dbus/dbus-spawn-win.c 2013-11-01 13:39:42.000000000 +0100
@@ -68,7 +68,7 @@
HANDLE end_sync_event;
#endif
- char *executable;
+ char *log_name;
DBusSpawnChildSetupFunc child_setup;
void *user_data;
@@ -258,7 +258,7 @@
}
#endif
- dbus_free (sitter->executable);
+ dbus_free (sitter->log_name);
dbus_free (sitter);
}
@@ -337,7 +337,7 @@
char *emsg = _dbus_win_error_string (sitter->spawn_errno);
dbus_set_error (error, DBUS_ERROR_SPAWN_EXEC_FAILED,
"Failed to execute program %s: %s",
- sitter->executable, emsg);
+ sitter->log_name, emsg);
_dbus_win_free_error_string (emsg);
}
else if (sitter->have_child_status)
@@ -345,14 +345,14 @@
PING();
dbus_set_error (error, DBUS_ERROR_SPAWN_CHILD_EXITED,
"Process %s exited with status %d",
- sitter->executable, sitter->child_status);
+ sitter->log_name, sitter->child_status);
}
else
{
PING();
dbus_set_error (error, DBUS_ERROR_FAILED,
"Process %s exited, status unknown",
- sitter->executable);
+ sitter->log_name);
}
PING();
}
@@ -593,10 +593,10 @@
(*sitter->child_setup) (sitter->user_data);
}
- _dbus_verbose ("babysitter: spawning %s\n", sitter->executable);
+ _dbus_verbose ("babysitter: spawning %s\n", sitter->log_name);
PING();
- sitter->child_handle = spawn_program (sitter->executable,
+ sitter->child_handle = spawn_program (sitter->log_name,
sitter->argv, sitter->envp);
PING();
@@ -642,6 +642,7 @@
dbus_bool_t
_dbus_spawn_async_with_babysitter (DBusBabysitter **sitter_p,
+ const char *log_name,
char **argv,
char **envp,
DBusSpawnChildSetupFunc child_setup,
@@ -653,6 +654,7 @@
DWORD sitter_thread_id;
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
+ _dbus_assert (argv[0] != NULL);
*sitter_p = NULL;
@@ -667,8 +669,17 @@
sitter->child_setup = child_setup;
sitter->user_data = user_data;
- sitter->executable = _dbus_strdup (argv[0]);
- if (sitter->executable == NULL)
+ sitter->log_name = _dbus_strdup (log_name);
+ if (sitter->log_name == NULL && log_name != NULL)
+ {
+ _DBUS_SET_OOM (error);
+ goto out0;
+ }
+
+ if (sitter->log_name == NULL)
+ sitter->log_name = _dbus_strdup (argv[0]);
+
+ if (sitter->log_name == NULL)
{
_DBUS_SET_OOM (error);
goto out0;
@@ -804,7 +815,7 @@
/*** Test launching nonexistent binary */
argv[0] = "/this/does/not/exist/32542sdgafgafdg";
- if (_dbus_spawn_async_with_babysitter (&sitter, argv, NULL,
+ if (_dbus_spawn_async_with_babysitter (&sitter, "spawn_nonexistent", argv, NULL,
NULL, NULL,
&error))
{
@@ -857,7 +868,7 @@
return TRUE;
}
- if (_dbus_spawn_async_with_babysitter (&sitter, argv, NULL,
+ if (_dbus_spawn_async_with_babysitter (&sitter, "spawn_segfault", argv, NULL,
NULL, NULL,
&error))
{
@@ -912,7 +923,7 @@
return TRUE;
}
- if (_dbus_spawn_async_with_babysitter (&sitter, argv, NULL,
+ if (_dbus_spawn_async_with_babysitter (&sitter, "spawn_exit", argv, NULL,
NULL, NULL,
&error))
{
@@ -967,7 +978,7 @@
return TRUE;
}
- if (_dbus_spawn_async_with_babysitter (&sitter, argv, NULL,
+ if (_dbus_spawn_async_with_babysitter (&sitter, "spawn_and_kill", argv, NULL,
NULL, NULL,
&error))
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dbus-1.7.6/dbus/dbus-spawn.c new/dbus-1.7.8/dbus/dbus-spawn.c
--- old/dbus-1.7.6/dbus/dbus-spawn.c 2013-10-08 19:40:40.000000000 +0200
+++ new/dbus-1.7.8/dbus/dbus-spawn.c 2013-11-01 13:49:52.000000000 +0100
@@ -38,6 +38,9 @@
#ifdef HAVE_ERRNO_H
#include <errno.h>
#endif
+#ifdef HAVE_SYSTEMD
+#include <systemd/sd-journal.h>
+#endif
extern char **environ;
@@ -174,6 +177,48 @@
* and the grandchild. The grandchild is our spawned process. The intermediate
* child is a babysitter process; it keeps track of when the grandchild
* exits/crashes, and reaps the grandchild.
+ *
+ * We automatically reap the babysitter process, killing it if necessary,
+ * when the DBusBabysitter's refcount goes to zero.
+ *
+ * Processes:
+ *
+ * main process
+ * | fork() A
+ * \- babysitter
+ * | fork () B
+ * \- grandchild --> exec --> spawned process
+ *
+ * IPC:
+ * child_err_report_pipe
+ * /-----------<---------<--------------\
+ * | ^
+ * v |
+ * main process babysitter grandchild
+ * ^ ^
+ * v v
+ * \-------<->-------/
+ * babysitter_pipe
+ *
+ * child_err_report_pipe is genuinely a pipe.
+ * The READ_END (also called error_pipe_from_child) is used in the main
+ * process. The WRITE_END (also called child_err_report_fd) is used in
+ * the grandchild process.
+ *
+ * On failure, the grandchild process sends CHILD_EXEC_FAILED + errno.
+ * On success, the pipe just closes (because it's close-on-exec) without
+ * sending any bytes.
+ *
+ * babysitter_pipe is mis-named: it's really a bidirectional socketpair.
+ * The [0] end (also called socket_to_babysitter) is used in the main
+ * process, the [1] end (also called parent_pipe) is used in the babysitter.
+ *
+ * If the fork() labelled B in the diagram above fails, the babysitter sends
+ * CHILD_FORK_FAILED + errno.
+ * On success, the babysitter sends CHILD_PID + the grandchild's pid.
+ * On SIGCHLD, the babysitter sends CHILD_EXITED + the exit status.
+ * The main process doesn't explicitly send anything, but when it exits,
+ * the babysitter gets POLLHUP or POLLERR.
*/
/* Messages from children to parents */
@@ -192,7 +237,8 @@
{
int refcount; /**< Reference count */
- char *executable; /**< executable name to use in error messages */
+ char *log_name; /**< the name under which to log messages about this
+ process being spawned */
int socket_to_babysitter; /**< Connection to the babysitter process */
int error_pipe_from_child; /**< Connection to the process that does the exec() */
@@ -346,7 +392,7 @@
if (sitter->watches)
_dbus_watch_list_free (sitter->watches);
- dbus_free (sitter->executable);
+ dbus_free (sitter->log_name);
dbus_free (sitter);
}
@@ -701,34 +747,34 @@
{
dbus_set_error (error, DBUS_ERROR_SPAWN_EXEC_FAILED,
"Failed to execute program %s: %s",
- sitter->executable, _dbus_strerror (sitter->errnum));
+ sitter->log_name, _dbus_strerror (sitter->errnum));
}
else if (sitter->have_fork_errnum)
{
dbus_set_error (error, DBUS_ERROR_NO_MEMORY,
"Failed to fork a new process %s: %s",
- sitter->executable, _dbus_strerror (sitter->errnum));
+ sitter->log_name, _dbus_strerror (sitter->errnum));
}
else if (sitter->have_child_status)
{
if (WIFEXITED (sitter->status))
dbus_set_error (error, DBUS_ERROR_SPAWN_CHILD_EXITED,
"Process %s exited with status %d",
- sitter->executable, WEXITSTATUS (sitter->status));
+ sitter->log_name, WEXITSTATUS (sitter->status));
else if (WIFSIGNALED (sitter->status))
dbus_set_error (error, DBUS_ERROR_SPAWN_CHILD_SIGNALED,
"Process %s received signal %d",
- sitter->executable, WTERMSIG (sitter->status));
+ sitter->log_name, WTERMSIG (sitter->status));
else
dbus_set_error (error, DBUS_ERROR_FAILED,
"Process %s exited abnormally",
- sitter->executable);
+ sitter->log_name);
}
else
{
dbus_set_error (error, DBUS_ERROR_FAILED,
"Process %s exited, reason unknown",
- sitter->executable);
+ sitter->log_name);
}
}
@@ -810,9 +856,14 @@
#define WRITE_END 1
-/* Avoids a danger in threaded situations (calling close()
- * on a file descriptor twice, and another thread has
- * re-opened it since the first close)
+/* Avoids a danger in re-entrant situations (calling close()
+ * on a file descriptor twice, and another module has
+ * re-opened it since the first close).
+ *
+ * This previously claimed to be relevant for threaded situations, but by
+ * trivial inspection, it is not thread-safe. It doesn't actually
+ * matter, since this module is only used in the -util variant of the
+ * library, which is only used in single-threaded situations.
*/
static int
close_and_invalidate (int *fd)
@@ -1118,8 +1169,7 @@
}
/**
- * Spawns a new process. The executable name and argv[0]
- * are the same, both are provided in argv[0]. The child_setup
+ * Spawns a new process. The child_setup
* function is passed the given user_data and is run in the child
* just before calling exec().
*
@@ -1129,8 +1179,9 @@
* If sitter_p is #NULL, no babysitter is kept.
*
* @param sitter_p return location for babysitter or #NULL
+ * @log_name the name under which to log messages about this process being spawned
* @param argv the executable and arguments
- * @param env the environment (not used on unix yet)
+ * @param env the environment, or #NULL to copy the parent's
* @param child_setup function to call in child pre-exec()
* @param user_data user data for setup function
* @param error error object to be filled in if function fails
@@ -1138,6 +1189,7 @@
*/
dbus_bool_t
_dbus_spawn_async_with_babysitter (DBusBabysitter **sitter_p,
+ const char *log_name,
char **argv,
char **env,
DBusSpawnChildSetupFunc child_setup,
@@ -1148,8 +1200,13 @@
int child_err_report_pipe[2] = { -1, -1 };
int babysitter_pipe[2] = { -1, -1 };
pid_t pid;
+#ifdef HAVE_SYSTEMD
+ int fd_out = -1;
+ int fd_err = -1;
+#endif
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
+ _dbus_assert (argv[0] != NULL);
if (sitter_p != NULL)
*sitter_p = NULL;
@@ -1163,8 +1220,17 @@
return FALSE;
}
- sitter->executable = _dbus_strdup (argv[0]);
- if (sitter->executable == NULL)
+ sitter->log_name = _dbus_strdup (log_name);
+ if (sitter->log_name == NULL && log_name != NULL)
+ {
+ dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
+ goto cleanup_and_fail;
+ }
+
+ if (sitter->log_name == NULL)
+ sitter->log_name = _dbus_strdup (argv[0]);
+
+ if (sitter->log_name == NULL)
{
dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
goto cleanup_and_fail;
@@ -1224,7 +1290,16 @@
}
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
-
+
+#ifdef HAVE_SYSTEMD
+ /* This may fail, but it's not critical.
+ * In particular, if we were compiled with journald support but are now
+ * running on a non-systemd system, this is going to fail, so we
+ * have to cope gracefully. */
+ fd_out = sd_journal_stream_fd (sitter->log_name, LOG_INFO, FALSE);
+ fd_err = sd_journal_stream_fd (sitter->log_name, LOG_WARNING, FALSE);
+#endif
+
pid = fork ();
if (pid < 0)
@@ -1264,6 +1339,16 @@
*/
signal (SIGPIPE, SIG_IGN);
+ close_and_invalidate (&babysitter_pipe[1]);
+#ifdef HAVE_SYSTEMD
+ /* log to systemd journal if possible */
+ if (fd_out >= 0)
+ dup2 (fd_out, STDOUT_FILENO);
+ if (fd_err >= 0)
+ dup2 (fd_err, STDERR_FILENO);
+ close_and_invalidate (&fd_out);
+ close_and_invalidate (&fd_err);
+#endif
do_exec (child_err_report_pipe[WRITE_END],
argv,
env,
@@ -1272,6 +1357,11 @@
}
else
{
+ close_and_invalidate (&child_err_report_pipe[WRITE_END]);
+#ifdef HAVE_SYSTEMD
+ close_and_invalidate (&fd_out);
+ close_and_invalidate (&fd_err);
+#endif
babysit (grandchild_pid, babysitter_pipe[1]);
_dbus_assert_not_reached ("Got to code after babysit()");
}
@@ -1281,6 +1371,10 @@
/* Close the uncared-about ends of the pipes */
close_and_invalidate (&child_err_report_pipe[WRITE_END]);
close_and_invalidate (&babysitter_pipe[1]);
+#ifdef HAVE_SYSTEMD
+ close_and_invalidate (&fd_out);
+ close_and_invalidate (&fd_err);
+#endif
sitter->socket_to_babysitter = babysitter_pipe[0];
babysitter_pipe[0] = -1;
@@ -1310,6 +1404,10 @@
close_and_invalidate (&child_err_report_pipe[WRITE_END]);
close_and_invalidate (&babysitter_pipe[0]);
close_and_invalidate (&babysitter_pipe[1]);
+#ifdef HAVE_SYSTEMD
+ close_and_invalidate (&fd_out);
+ close_and_invalidate (&fd_err);
+#endif
if (sitter != NULL)
_dbus_babysitter_unref (sitter);
@@ -1371,7 +1469,7 @@
/*** Test launching nonexistent binary */
argv[0] = "/this/does/not/exist/32542sdgafgafdg";
- if (_dbus_spawn_async_with_babysitter (&sitter, argv,
+ if (_dbus_spawn_async_with_babysitter (&sitter, "spawn_nonexistent", argv,
NULL, NULL, NULL,
&error))
{
@@ -1420,7 +1518,7 @@
return TRUE;
}
- if (_dbus_spawn_async_with_babysitter (&sitter, argv,
+ if (_dbus_spawn_async_with_babysitter (&sitter, "spawn_segfault", argv,
NULL, NULL, NULL,
&error))
{
@@ -1471,7 +1569,7 @@
return TRUE;
}
- if (_dbus_spawn_async_with_babysitter (&sitter, argv,
+ if (_dbus_spawn_async_with_babysitter (&sitter, "spawn_exit", argv,
NULL, NULL, NULL,
&error))
{
@@ -1522,7 +1620,7 @@
return TRUE;
}
- if (_dbus_spawn_async_with_babysitter (&sitter, argv,
+ if (_dbus_spawn_async_with_babysitter (&sitter, "spawn_and_kill", argv,
NULL, NULL, NULL,
&error))
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dbus-1.7.6/dbus/dbus-spawn.h new/dbus-1.7.8/dbus/dbus-spawn.h
--- old/dbus-1.7.6/dbus/dbus-spawn.h 2013-02-14 19:56:21.000000000 +0100
+++ new/dbus-1.7.8/dbus/dbus-spawn.h 2013-11-01 13:39:42.000000000 +0100
@@ -39,6 +39,7 @@
void *user_data);
dbus_bool_t _dbus_spawn_async_with_babysitter (DBusBabysitter **sitter_p,
+ const char *log_name,
char **argv,
char **env,
DBusSpawnChildSetupFunc child_setup,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dbus-1.7.6/doc/dbus-daemon.1.xml.in new/dbus-1.7.8/doc/dbus-daemon.1.xml.in
--- old/dbus-1.7.6/doc/dbus-daemon.1.xml.in 2013-10-08 19:40:40.000000000 +0200
+++ new/dbus-1.7.8/doc/dbus-daemon.1.xml.in 2013-11-01 13:14:34.000000000 +0100
@@ -318,6 +318,37 @@
<itemizedlist remap='TP'>
+ <listitem><para><emphasis remap='I'><syslog></emphasis></para></listitem>
+
+
+</itemizedlist>
+
+<para>If present, the bus daemon will log to syslog.</para>
+
+<itemizedlist remap='TP'>
+
+ <listitem><para><emphasis remap='I'><pidfile></emphasis></para></listitem>
+
+
+</itemizedlist>
+
+<para>If present, the bus daemon will write its pid to the specified file.
+The --nopidfile command-line option takes precedence over this setting.</para>
+
+<itemizedlist remap='TP'>
+
+ <listitem><para><emphasis remap='I'><allow_anonymous></emphasis></para></listitem>
+
+
+</itemizedlist>
+
+<para>If present, connections that authenticated using the ANONYMOUS
+mechanism will be authorized to connect. This option has no practical
+effect unless the ANONYMOUS mechanism has also been enabled using the
+<emphasis remap='I'><auth></emphasis> element, described below.</para>
+
+<itemizedlist remap='TP'>
+
<listitem><para><emphasis remap='I'><listen></emphasis></para></listitem>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dbus-1.7.6/test/Makefile.am new/dbus-1.7.8/test/Makefile.am
--- old/dbus-1.7.6/test/Makefile.am 2013-10-08 19:40:40.000000000 +0200
+++ new/dbus-1.7.8/test/Makefile.am 2013-10-10 17:58:58.000000000 +0200
@@ -246,6 +246,7 @@
data/valid-config-files-system/debug-allow-all-pass.conf.in \
data/valid-config-files/debug-allow-all-sha1.conf.in \
data/valid-config-files/debug-allow-all.conf.in \
+ data/valid-config-files/incoming-limit.conf.in \
data/invalid-service-files-system/org.freedesktop.DBus.TestSuiteNoExec.service.in \
data/invalid-service-files-system/org.freedesktop.DBus.TestSuiteNoService.service.in \
data/invalid-service-files-system/org.freedesktop.DBus.TestSuiteNoUser.service.in \
@@ -317,7 +318,6 @@
data/valid-config-files/basic.conf \
data/valid-config-files/basic.d/basic.conf \
data/valid-config-files/entities.conf \
- data/valid-config-files/incoming-limit.conf \
data/valid-config-files/many-rules.conf \
data/valid-config-files/system.d/test.conf \
data/valid-messages/array-of-array-of-uint32.message \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dbus-1.7.6/test/data/valid-config-files/incoming-limit.conf new/dbus-1.7.8/test/data/valid-config-files/incoming-limit.conf
--- old/dbus-1.7.6/test/data/valid-config-files/incoming-limit.conf 2013-10-09 13:09:28.000000000 +0200
+++ new/dbus-1.7.8/test/data/valid-config-files/incoming-limit.conf 1970-01-01 01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
- <!-- Our well-known bus type, don't change this -->
- <type>session</type>
- <listen>unix:tmpdir=/tmp</listen>
-
- <policy context="default">
- <!-- Allow everything to be sent -->
- <allow send_destination="*" eavesdrop="true"/>
- <!-- Allow everything to be received -->
- <allow eavesdrop="true"/>
- <!-- Allow anyone to own anything -->
- <allow own="*"/>
- </policy>
-
- <limit name="max_incoming_bytes">1</limit>
-</busconfig>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dbus-1.7.6/test/data/valid-config-files/incoming-limit.conf.in new/dbus-1.7.8/test/data/valid-config-files/incoming-limit.conf.in
--- old/dbus-1.7.6/test/data/valid-config-files/incoming-limit.conf.in 1970-01-01 01:00:00.000000000 +0100
+++ new/dbus-1.7.8/test/data/valid-config-files/incoming-limit.conf.in 2013-10-10 17:55:13.000000000 +0200
@@ -0,0 +1,18 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+ <!-- Our well-known bus type, don't change this -->
+ <type>session</type>
+ <listen>@TEST_LISTEN@</listen>
+
+ <policy context="default">
+ <!-- Allow everything to be sent -->
+ <allow send_destination="*" eavesdrop="true"/>
+ <!-- Allow everything to be received -->
+ <allow eavesdrop="true"/>
+ <!-- Allow anyone to own anything -->
+ <allow own="*"/>
+ </policy>
+
+ <limit name="max_incoming_bytes">1</limit>
+</busconfig>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dbus-1.7.6/test/spawn-test.c new/dbus-1.7.8/test/spawn-test.c
--- old/dbus-1.7.6/test/spawn-test.c 2013-10-08 19:40:40.000000000 +0200
+++ new/dbus-1.7.8/test/spawn-test.c 2013-11-01 13:39:42.000000000 +0100
@@ -30,7 +30,7 @@
argv_copy [i] = argv[i + 1];
argv_copy[argc - 1] = NULL;
- if (!_dbus_spawn_async_with_babysitter (NULL, argv_copy, NULL, setup_func, NULL, &error))
+ if (!_dbus_spawn_async_with_babysitter (NULL, argv_copy[0], argv_copy, NULL, setup_func, NULL, &error))
{
fprintf (stderr, "Could not launch application: \"%s\"\n",
error.message);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dbus-1.7.6/test-driver new/dbus-1.7.8/test-driver
--- old/dbus-1.7.6/test-driver 2013-10-09 13:05:16.000000000 +0200
+++ new/dbus-1.7.8/test-driver 1970-01-01 01:00:00.000000000 +0100
@@ -1,127 +0,0 @@
-#! /bin/sh
-# test-driver - basic testsuite driver script.
-
-scriptversion=2012-06-27.10; # UTC
-
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake(a)gnu.org> or send patches to
-# <automake-patches(a)gnu.org>.
-
-# Make unconditional expansion of undefined variables an error. This
-# helps a lot in preventing typo-related bugs.
-set -u
-
-usage_error ()
-{
- echo "$0: $*" >&2
- print_usage >&2
- exit 2
-}
-
-print_usage ()
-{
- cat <<END
-Usage:
- test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
- [--expect-failure={yes|no}] [--color-tests={yes|no}]
- [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT
-The '--test-name', '--log-file' and '--trs-file' options are mandatory.
-END
-}
-
-# TODO: better error handling in option parsing (in particular, ensure
-# TODO: $log_file, $trs_file and $test_name are defined).
-test_name= # Used for reporting.
-log_file= # Where to save the output of the test script.
-trs_file= # Where to save the metadata of the test run.
-expect_failure=no
-color_tests=no
-enable_hard_errors=yes
-while test $# -gt 0; do
- case $1 in
- --help) print_usage; exit $?;;
- --version) echo "test-driver $scriptversion"; exit $?;;
- --test-name) test_name=$2; shift;;
- --log-file) log_file=$2; shift;;
- --trs-file) trs_file=$2; shift;;
- --color-tests) color_tests=$2; shift;;
- --expect-failure) expect_failure=$2; shift;;
- --enable-hard-errors) enable_hard_errors=$2; shift;;
- --) shift; break;;
- -*) usage_error "invalid option: '$1'";;
- esac
- shift
-done
-
-if test $color_tests = yes; then
- # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
- red='[0;31m' # Red.
- grn='[0;32m' # Green.
- lgn='[1;32m' # Light green.
- blu='[1;34m' # Blue.
- mgn='[0;35m' # Magenta.
- std='[m' # No color.
-else
- red= grn= lgn= blu= mgn= std=
-fi
-
-do_exit='rm -f $log_file $trs_file; (exit $st); exit $st'
-trap "st=129; $do_exit" 1
-trap "st=130; $do_exit" 2
-trap "st=141; $do_exit" 13
-trap "st=143; $do_exit" 15
-
-# Test script is run here.
-"$@" >$log_file 2>&1
-estatus=$?
-if test $enable_hard_errors = no && test $estatus -eq 99; then
- estatus=1
-fi
-
-case $estatus:$expect_failure in
- 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
- 0:*) col=$grn res=PASS recheck=no gcopy=no;;
- 77:*) col=$blu res=SKIP recheck=no gcopy=yes;;
- 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;;
- *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;;
- *:*) col=$red res=FAIL recheck=yes gcopy=yes;;
-esac
-
-# Report outcome to console.
-echo "${col}${res}${std}: $test_name"
-
-# Register the test result, and other relevant metadata.
-echo ":test-result: $res" > $trs_file
-echo ":global-test-result: $res" >> $trs_file
-echo ":recheck: $recheck" >> $trs_file
-echo ":copy-in-global-log: $gcopy" >> $trs_file
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package wireshark for openSUSE:13.1 checked in at 2013-11-04 08:51:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1/wireshark (Old)
and /work/SRC/openSUSE:13.1/.wireshark.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wireshark"
Changes:
--------
--- /work/SRC/openSUSE:13.1/wireshark/wireshark.changes 2013-10-01 08:36:03.000000000 +0200
+++ /work/SRC/openSUSE:13.1/.wireshark.new/wireshark.changes 2013-11-04 08:51:16.000000000 +0100
@@ -1,0 +2,20 @@
+Fri Nov 1 21:44:02 UTC 2013 - andreas.stieger(a)gmx.de
+
+- update to 1.10.3 [bnc#848738]
+ + vulnerabilities fixed:
+ * The IEEE 802.15.4 dissector could crash
+ wnpa-sec-2013-61 CVE-2013-6336
+ * The NBAP dissector could crash
+ wnpa-sec-2013-62 CVE-2013-6337
+ * The SIP dissector could crash
+ wnpa-sec-2013-63 CVE-2013-6338
+ * The OpenWire dissector could go into a large loop
+ wnpa-sec-2013-64 CVE-2013-6339
+ * The TCP dissector could crash
+ wnpa-sec-2013-65 CVE-2013-6340
+ + Further bug fixes and updated protocol support as listed in:
+ https://www.wireshark.org/docs/relnotes/wireshark-1.10.3.html
+- drop wireshark-1.10.x-fix-packet-gluster-duplicate_enums.patch
+ merged upstream
+
+-------------------------------------------------------------------
Old:
----
SIGNATURES-1.10.2.txt
wireshark-1.10.2.tar.bz2
wireshark-1.10.x-fix-packet-gluster-duplicate_enums.patch
New:
----
SIGNATURES-1.10.3.txt
wireshark-1.10.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wireshark.spec ++++++
--- /var/tmp/diff_new_pack.YTYhQn/_old 2013-11-04 08:51:16.000000000 +0100
+++ /var/tmp/diff_new_pack.YTYhQn/_new 2013-11-04 08:51:16.000000000 +0100
@@ -23,7 +23,7 @@
%define use_gtk3 0
Name: wireshark
-Version: 1.10.2
+Version: 1.10.3
Release: 0
Summary: A Network Traffic Analyser
License: GPL-2.0+ and GPL-3.0+
@@ -38,7 +38,6 @@
Patch2: wireshark-1.2.0-geoip.patch
Patch4: wireshark-1.10.0-enable_lua.patch
Patch5: wireshark-1.10.0-authors-pod2man.patch
-Patch6: wireshark-1.10.x-fix-packet-gluster-duplicate_enums.patch
BuildRequires: bison
BuildRequires: cairo-devel
BuildRequires: flex
@@ -131,7 +130,6 @@
%endif
%patch5 -p1
-%patch6 -p1
%build
++++++ SIGNATURES-1.10.2.txt -> SIGNATURES-1.10.3.txt ++++++
--- /work/SRC/openSUSE:13.1/wireshark/SIGNATURES-1.10.2.txt 2013-09-23 11:14:54.000000000 +0200
+++ /work/SRC/openSUSE:13.1/.wireshark.new/SIGNATURES-1.10.3.txt 2013-11-04 08:51:15.000000000 +0100
@@ -1,49 +1,49 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-wireshark-1.10.2.tar.bz2: 26667284 bytes
-MD5(wireshark-1.10.2.tar.bz2)=cd7fedd0a67df5ad4905fd356efdc1e8
-SHA1(wireshark-1.10.2.tar.bz2)=1f8f877f17dea23e1cf2bafeef0f71323df43521
-RIPEMD160(wireshark-1.10.2.tar.bz2)=675d1fb55d5b40432deb3187f5e87036f377e5df
-
-Wireshark-win32-1.10.2.exe: 22116616 bytes
-MD5(Wireshark-win32-1.10.2.exe)=daeb8836a150bd7b808cd192ff301c03
-SHA1(Wireshark-win32-1.10.2.exe)=bc71582264f96aea9f329b93604330c9ca6525e6
-RIPEMD160(Wireshark-win32-1.10.2.exe)=b93e3c7d7f52fc102cd013f93b81c2639913da4b
-
-Wireshark-win64-1.10.2.exe: 27966944 bytes
-MD5(Wireshark-win64-1.10.2.exe)=08cf4e92a785215f80cb9c0c8b20a9ee
-SHA1(Wireshark-win64-1.10.2.exe)=14d00e21405eab7b0470d4b2b9f66d7b66875d68
-RIPEMD160(Wireshark-win64-1.10.2.exe)=d6d911e19499336ae7afe637c1b60b6bc6284c2a
-
-Wireshark-1.10.2.u3p: 30586569 bytes
-MD5(Wireshark-1.10.2.u3p)=3ec1018e8aeb9d03bbaa210e6fa5690f
-SHA1(Wireshark-1.10.2.u3p)=8e766387ec0c67f35f6ce8e8d30034ac7e9cacc4
-RIPEMD160(Wireshark-1.10.2.u3p)=6eacf50eaf66048c3c600f849f4ef611741c9a86
-
-WiresharkPortable-1.10.2.paf.exe: 23474264 bytes
-MD5(WiresharkPortable-1.10.2.paf.exe)=eb83372c2444779502fb81d1146271dd
-SHA1(WiresharkPortable-1.10.2.paf.exe)=673ec8dd9d49161fb9d874b19ad8a2288d303d40
-RIPEMD160(WiresharkPortable-1.10.2.paf.exe)=15a0303b24466d5d75fbac4b9ba2adbd34009bfd
-
-Wireshark 1.10.2 Intel 32.dmg: 20413812 bytes
-MD5(Wireshark 1.10.2 Intel 32.dmg)=e8246764df76baaddddb4e726bb962c1
-SHA1(Wireshark 1.10.2 Intel 32.dmg)=cfab1eefeebd5f337bbf3aa2aec9bad058b45880
-RIPEMD160(Wireshark 1.10.2 Intel 32.dmg)=4689e3447d30578ba1c5acece3f88cedfcc8b0bb
-
-Wireshark 1.10.2 Intel 64.dmg: 24035674 bytes
-MD5(Wireshark 1.10.2 Intel 64.dmg)=c4a8684dc0421c50480410404a2cbd58
-SHA1(Wireshark 1.10.2 Intel 64.dmg)=f3af6443f7c25c27824014fd88e8cb1460ecbb08
-RIPEMD160(Wireshark 1.10.2 Intel 64.dmg)=d92a4b4c82666e1046f636747fc8c71c6e86cba0
-
-patch-wireshark-1.10.1-to-1.10.2.bz2: 707143 bytes
-MD5(patch-wireshark-1.10.1-to-1.10.2.bz2)=f2dec484abafe7172e32843b685f37d2
-SHA1(patch-wireshark-1.10.1-to-1.10.2.bz2)=be360df86926fea8ec6dbc00f6a5a1ba5dfa4b1f
-RIPEMD160(patch-wireshark-1.10.1-to-1.10.2.bz2)=6da1393ce74aa66a0c71a1d907f19ef0a6f3f189
+wireshark-1.10.3.tar.bz2: 26672853 bytes
+MD5(wireshark-1.10.3.tar.bz2)=ceb4b2bac5607d948e00bd950461be1c
+SHA1(wireshark-1.10.3.tar.bz2)=58b02d6c2f1ae086a6ec46289d1eea0cc4343309
+RIPEMD160(wireshark-1.10.3.tar.bz2)=ba8fe7da97cae0d60c32735b7fbd78662fd693bd
+
+Wireshark-win64-1.10.3.exe: 27973080 bytes
+MD5(Wireshark-win64-1.10.3.exe)=c40d2b11ab45e5192cea9d320ebce5d7
+SHA1(Wireshark-win64-1.10.3.exe)=a7f2c42e4048af4ca4eb2def3ab07e53e00271eb
+RIPEMD160(Wireshark-win64-1.10.3.exe)=63dff32be25ebe38bb80b9c96b2584c86c2240c2
+
+Wireshark-win32-1.10.3.exe: 22117888 bytes
+MD5(Wireshark-win32-1.10.3.exe)=d03156fc81100a8decca5ea435cdf1c6
+SHA1(Wireshark-win32-1.10.3.exe)=7ebca3f46633f2f527b3301f30f82e5bf7b41e18
+RIPEMD160(Wireshark-win32-1.10.3.exe)=e3c3e1678b022c23b6013504452eb78931d5328a
+
+Wireshark-1.10.3.u3p: 30593204 bytes
+MD5(Wireshark-1.10.3.u3p)=ea61d55544cb10f082406e32e3618d4b
+SHA1(Wireshark-1.10.3.u3p)=14454df922102b73222b65459d2395712b164104
+RIPEMD160(Wireshark-1.10.3.u3p)=27f3987d4da9d69264d74f785805b439edd59556
+
+WiresharkPortable-1.10.3.paf.exe: 23479992 bytes
+MD5(WiresharkPortable-1.10.3.paf.exe)=6a51abaad9fff68d386f575604955dfb
+SHA1(WiresharkPortable-1.10.3.paf.exe)=dbcca52d63eb5b92747603b1634712866f2b030d
+RIPEMD160(WiresharkPortable-1.10.3.paf.exe)=dd282fa4e0e3bd03fd7ae8eaf328fdff58e40c38
+
+Wireshark 1.10.3 Intel 64.dmg: 24048787 bytes
+MD5(Wireshark 1.10.3 Intel 64.dmg)=e80812130c3e16d0b3e177a2cef8adbe
+SHA1(Wireshark 1.10.3 Intel 64.dmg)=5fa924b3c8c3e5bd80662b95047cea51b12ec0e8
+RIPEMD160(Wireshark 1.10.3 Intel 64.dmg)=a21f9d32d20e43f65b1ccec32d90c85ce65ef10e
+
+Wireshark 1.10.3 Intel 32.dmg: 20415522 bytes
+MD5(Wireshark 1.10.3 Intel 32.dmg)=2c4867660315636fddc5cf74beccdc95
+SHA1(Wireshark 1.10.3 Intel 32.dmg)=30f35f88885e37f8c4e9ee111d24ee83f45f9845
+RIPEMD160(Wireshark 1.10.3 Intel 32.dmg)=ceee081c02059d08de8f693a0fbaa32a448e2ab1
+
+patch-wireshark-1.10.2-to-1.10.3.bz2: 83099 bytes
+MD5(patch-wireshark-1.10.2-to-1.10.3.bz2)=f2a1d956b1be09c9f0d83532ac6f322c
+SHA1(patch-wireshark-1.10.2-to-1.10.3.bz2)=831cc0fdce5e739cda85ebd5921b490985e6d40a
+RIPEMD160(patch-wireshark-1.10.2-to-1.10.3.bz2)=e90f171f50ff8e40de5ceb0813ab6c45a875ad1b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.14 (Darwin)
-iEYEARECAAYFAlIvXQIACgkQpw8IXSHylJpoAQCgsX55DYeXCvuguoQiqHbY3bfr
-bjQAnRLE97RaJJqQqt29IOgzTA9FYHeE
-=7zZi
+iEYEARECAAYFAlJz9fcACgkQpw8IXSHylJr2WQCfcdqchd8Zed3sd7Im0iFeIDxi
+KTEAn0qXzdbJDaNJbxwVfOiZI9erbzfs
+=33qi
-----END PGP SIGNATURE-----
++++++ wireshark-1.10.2.tar.bz2 -> wireshark-1.10.3.tar.bz2 ++++++
/work/SRC/openSUSE:13.1/wireshark/wireshark-1.10.2.tar.bz2 /work/SRC/openSUSE:13.1/.wireshark.new/wireshark-1.10.3.tar.bz2 differ: char 11, line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package wireshark for openSUSE:Factory checked in at 2013-11-04 08:51:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/wireshark (Old)
and /work/SRC/openSUSE:Factory/.wireshark.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wireshark"
Changes:
--------
--- /work/SRC/openSUSE:Factory/wireshark/wireshark.changes 2013-10-01 08:35:59.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.wireshark.new/wireshark.changes 2013-11-04 08:51:10.000000000 +0100
@@ -1,0 +2,20 @@
+Fri Nov 1 21:44:02 UTC 2013 - andreas.stieger(a)gmx.de
+
+- update to 1.10.3 [bnc#848738]
+ + vulnerabilities fixed:
+ * The IEEE 802.15.4 dissector could crash
+ wnpa-sec-2013-61 CVE-2013-6336
+ * The NBAP dissector could crash
+ wnpa-sec-2013-62 CVE-2013-6337
+ * The SIP dissector could crash
+ wnpa-sec-2013-63 CVE-2013-6338
+ * The OpenWire dissector could go into a large loop
+ wnpa-sec-2013-64 CVE-2013-6339
+ * The TCP dissector could crash
+ wnpa-sec-2013-65 CVE-2013-6340
+ + Further bug fixes and updated protocol support as listed in:
+ https://www.wireshark.org/docs/relnotes/wireshark-1.10.3.html
+- drop wireshark-1.10.x-fix-packet-gluster-duplicate_enums.patch
+ merged upstream
+
+-------------------------------------------------------------------
Old:
----
SIGNATURES-1.10.2.txt
wireshark-1.10.2.tar.bz2
wireshark-1.10.x-fix-packet-gluster-duplicate_enums.patch
New:
----
SIGNATURES-1.10.3.txt
wireshark-1.10.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wireshark.spec ++++++
--- /var/tmp/diff_new_pack.H1gGza/_old 2013-11-04 08:51:11.000000000 +0100
+++ /var/tmp/diff_new_pack.H1gGza/_new 2013-11-04 08:51:11.000000000 +0100
@@ -23,7 +23,7 @@
%define use_gtk3 0
Name: wireshark
-Version: 1.10.2
+Version: 1.10.3
Release: 0
Summary: A Network Traffic Analyser
License: GPL-2.0+ and GPL-3.0+
@@ -38,7 +38,6 @@
Patch2: wireshark-1.2.0-geoip.patch
Patch4: wireshark-1.10.0-enable_lua.patch
Patch5: wireshark-1.10.0-authors-pod2man.patch
-Patch6: wireshark-1.10.x-fix-packet-gluster-duplicate_enums.patch
BuildRequires: bison
BuildRequires: cairo-devel
BuildRequires: flex
@@ -131,7 +130,6 @@
%endif
%patch5 -p1
-%patch6 -p1
%build
++++++ SIGNATURES-1.10.2.txt -> SIGNATURES-1.10.3.txt ++++++
--- /work/SRC/openSUSE:Factory/wireshark/SIGNATURES-1.10.2.txt 2013-09-12 14:32:54.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.wireshark.new/SIGNATURES-1.10.3.txt 2013-11-04 08:51:09.000000000 +0100
@@ -1,49 +1,49 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-wireshark-1.10.2.tar.bz2: 26667284 bytes
-MD5(wireshark-1.10.2.tar.bz2)=cd7fedd0a67df5ad4905fd356efdc1e8
-SHA1(wireshark-1.10.2.tar.bz2)=1f8f877f17dea23e1cf2bafeef0f71323df43521
-RIPEMD160(wireshark-1.10.2.tar.bz2)=675d1fb55d5b40432deb3187f5e87036f377e5df
-
-Wireshark-win32-1.10.2.exe: 22116616 bytes
-MD5(Wireshark-win32-1.10.2.exe)=daeb8836a150bd7b808cd192ff301c03
-SHA1(Wireshark-win32-1.10.2.exe)=bc71582264f96aea9f329b93604330c9ca6525e6
-RIPEMD160(Wireshark-win32-1.10.2.exe)=b93e3c7d7f52fc102cd013f93b81c2639913da4b
-
-Wireshark-win64-1.10.2.exe: 27966944 bytes
-MD5(Wireshark-win64-1.10.2.exe)=08cf4e92a785215f80cb9c0c8b20a9ee
-SHA1(Wireshark-win64-1.10.2.exe)=14d00e21405eab7b0470d4b2b9f66d7b66875d68
-RIPEMD160(Wireshark-win64-1.10.2.exe)=d6d911e19499336ae7afe637c1b60b6bc6284c2a
-
-Wireshark-1.10.2.u3p: 30586569 bytes
-MD5(Wireshark-1.10.2.u3p)=3ec1018e8aeb9d03bbaa210e6fa5690f
-SHA1(Wireshark-1.10.2.u3p)=8e766387ec0c67f35f6ce8e8d30034ac7e9cacc4
-RIPEMD160(Wireshark-1.10.2.u3p)=6eacf50eaf66048c3c600f849f4ef611741c9a86
-
-WiresharkPortable-1.10.2.paf.exe: 23474264 bytes
-MD5(WiresharkPortable-1.10.2.paf.exe)=eb83372c2444779502fb81d1146271dd
-SHA1(WiresharkPortable-1.10.2.paf.exe)=673ec8dd9d49161fb9d874b19ad8a2288d303d40
-RIPEMD160(WiresharkPortable-1.10.2.paf.exe)=15a0303b24466d5d75fbac4b9ba2adbd34009bfd
-
-Wireshark 1.10.2 Intel 32.dmg: 20413812 bytes
-MD5(Wireshark 1.10.2 Intel 32.dmg)=e8246764df76baaddddb4e726bb962c1
-SHA1(Wireshark 1.10.2 Intel 32.dmg)=cfab1eefeebd5f337bbf3aa2aec9bad058b45880
-RIPEMD160(Wireshark 1.10.2 Intel 32.dmg)=4689e3447d30578ba1c5acece3f88cedfcc8b0bb
-
-Wireshark 1.10.2 Intel 64.dmg: 24035674 bytes
-MD5(Wireshark 1.10.2 Intel 64.dmg)=c4a8684dc0421c50480410404a2cbd58
-SHA1(Wireshark 1.10.2 Intel 64.dmg)=f3af6443f7c25c27824014fd88e8cb1460ecbb08
-RIPEMD160(Wireshark 1.10.2 Intel 64.dmg)=d92a4b4c82666e1046f636747fc8c71c6e86cba0
-
-patch-wireshark-1.10.1-to-1.10.2.bz2: 707143 bytes
-MD5(patch-wireshark-1.10.1-to-1.10.2.bz2)=f2dec484abafe7172e32843b685f37d2
-SHA1(patch-wireshark-1.10.1-to-1.10.2.bz2)=be360df86926fea8ec6dbc00f6a5a1ba5dfa4b1f
-RIPEMD160(patch-wireshark-1.10.1-to-1.10.2.bz2)=6da1393ce74aa66a0c71a1d907f19ef0a6f3f189
+wireshark-1.10.3.tar.bz2: 26672853 bytes
+MD5(wireshark-1.10.3.tar.bz2)=ceb4b2bac5607d948e00bd950461be1c
+SHA1(wireshark-1.10.3.tar.bz2)=58b02d6c2f1ae086a6ec46289d1eea0cc4343309
+RIPEMD160(wireshark-1.10.3.tar.bz2)=ba8fe7da97cae0d60c32735b7fbd78662fd693bd
+
+Wireshark-win64-1.10.3.exe: 27973080 bytes
+MD5(Wireshark-win64-1.10.3.exe)=c40d2b11ab45e5192cea9d320ebce5d7
+SHA1(Wireshark-win64-1.10.3.exe)=a7f2c42e4048af4ca4eb2def3ab07e53e00271eb
+RIPEMD160(Wireshark-win64-1.10.3.exe)=63dff32be25ebe38bb80b9c96b2584c86c2240c2
+
+Wireshark-win32-1.10.3.exe: 22117888 bytes
+MD5(Wireshark-win32-1.10.3.exe)=d03156fc81100a8decca5ea435cdf1c6
+SHA1(Wireshark-win32-1.10.3.exe)=7ebca3f46633f2f527b3301f30f82e5bf7b41e18
+RIPEMD160(Wireshark-win32-1.10.3.exe)=e3c3e1678b022c23b6013504452eb78931d5328a
+
+Wireshark-1.10.3.u3p: 30593204 bytes
+MD5(Wireshark-1.10.3.u3p)=ea61d55544cb10f082406e32e3618d4b
+SHA1(Wireshark-1.10.3.u3p)=14454df922102b73222b65459d2395712b164104
+RIPEMD160(Wireshark-1.10.3.u3p)=27f3987d4da9d69264d74f785805b439edd59556
+
+WiresharkPortable-1.10.3.paf.exe: 23479992 bytes
+MD5(WiresharkPortable-1.10.3.paf.exe)=6a51abaad9fff68d386f575604955dfb
+SHA1(WiresharkPortable-1.10.3.paf.exe)=dbcca52d63eb5b92747603b1634712866f2b030d
+RIPEMD160(WiresharkPortable-1.10.3.paf.exe)=dd282fa4e0e3bd03fd7ae8eaf328fdff58e40c38
+
+Wireshark 1.10.3 Intel 64.dmg: 24048787 bytes
+MD5(Wireshark 1.10.3 Intel 64.dmg)=e80812130c3e16d0b3e177a2cef8adbe
+SHA1(Wireshark 1.10.3 Intel 64.dmg)=5fa924b3c8c3e5bd80662b95047cea51b12ec0e8
+RIPEMD160(Wireshark 1.10.3 Intel 64.dmg)=a21f9d32d20e43f65b1ccec32d90c85ce65ef10e
+
+Wireshark 1.10.3 Intel 32.dmg: 20415522 bytes
+MD5(Wireshark 1.10.3 Intel 32.dmg)=2c4867660315636fddc5cf74beccdc95
+SHA1(Wireshark 1.10.3 Intel 32.dmg)=30f35f88885e37f8c4e9ee111d24ee83f45f9845
+RIPEMD160(Wireshark 1.10.3 Intel 32.dmg)=ceee081c02059d08de8f693a0fbaa32a448e2ab1
+
+patch-wireshark-1.10.2-to-1.10.3.bz2: 83099 bytes
+MD5(patch-wireshark-1.10.2-to-1.10.3.bz2)=f2a1d956b1be09c9f0d83532ac6f322c
+SHA1(patch-wireshark-1.10.2-to-1.10.3.bz2)=831cc0fdce5e739cda85ebd5921b490985e6d40a
+RIPEMD160(patch-wireshark-1.10.2-to-1.10.3.bz2)=e90f171f50ff8e40de5ceb0813ab6c45a875ad1b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.14 (Darwin)
-iEYEARECAAYFAlIvXQIACgkQpw8IXSHylJpoAQCgsX55DYeXCvuguoQiqHbY3bfr
-bjQAnRLE97RaJJqQqt29IOgzTA9FYHeE
-=7zZi
+iEYEARECAAYFAlJz9fcACgkQpw8IXSHylJr2WQCfcdqchd8Zed3sd7Im0iFeIDxi
+KTEAn0qXzdbJDaNJbxwVfOiZI9erbzfs
+=33qi
-----END PGP SIGNATURE-----
++++++ wireshark-1.10.2.tar.bz2 -> wireshark-1.10.3.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/wireshark/wireshark-1.10.2.tar.bz2 /work/SRC/openSUSE:Factory/.wireshark.new/wireshark-1.10.3.tar.bz2 differ: char 11, line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package vm-install for openSUSE:Factory checked in at 2013-11-04 08:50:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vm-install (Old)
and /work/SRC/openSUSE:Factory/.vm-install.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vm-install"
Changes:
--------
--- /work/SRC/openSUSE:Factory/vm-install/vm-install.changes 2013-10-25 13:00:39.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.vm-install.new/vm-install.changes 2013-11-04 08:50:59.000000000 +0100
@@ -1,0 +2,5 @@
+Fri Nov 1 09:12:25 UTC 2013 - pastakhov(a)yandex.ru
+
+- Add requirement for dbus-1-python in spec file
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vm-install.spec ++++++
--- /var/tmp/diff_new_pack.DdK6Ia/_old 2013-11-04 08:50:59.000000000 +0100
+++ /var/tmp/diff_new_pack.DdK6Ia/_new 2013-11-04 08:50:59.000000000 +0100
@@ -31,6 +31,7 @@
Source1: vm-install.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64 s390x
+Requires: dbus-1-python
Requires: kdump
Requires: libvirt-python
Requires: libxml2-python
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package vm-install for openSUSE:13.1 checked in at 2013-11-04 08:50:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1/vm-install (Old)
and /work/SRC/openSUSE:13.1/.vm-install.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vm-install"
Changes:
--------
--- /work/SRC/openSUSE:13.1/vm-install/vm-install.changes 2013-10-25 13:00:45.000000000 +0200
+++ /work/SRC/openSUSE:13.1/.vm-install.new/vm-install.changes 2013-11-04 08:50:59.000000000 +0100
@@ -1,0 +2,5 @@
+Fri Nov 1 09:12:25 UTC 2013 - pastakhov(a)yandex.ru
+
+- Add requirement for dbus-1-python in spec file
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vm-install.spec ++++++
--- /var/tmp/diff_new_pack.j9HR4S/_old 2013-11-04 08:50:59.000000000 +0100
+++ /var/tmp/diff_new_pack.j9HR4S/_new 2013-11-04 08:50:59.000000000 +0100
@@ -31,6 +31,7 @@
Source1: vm-install.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64 s390x
+Requires: dbus-1-python
Requires: kdump
Requires: libvirt-python
Requires: libxml2-python
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package seamonkey for openSUSE:13.1 checked in at 2013-11-04 08:50:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1/seamonkey (Old)
and /work/SRC/openSUSE:13.1/.seamonkey.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "seamonkey"
Changes:
--------
--- /work/SRC/openSUSE:13.1/seamonkey/seamonkey.changes 2013-09-23 11:08:56.000000000 +0200
+++ /work/SRC/openSUSE:13.1/.seamonkey.new/seamonkey.changes 2013-11-04 08:50:56.000000000 +0100
@@ -1,0 +2,29 @@
+Wed Oct 30 18:07:33 UTC 2013 - wr(a)rosenauer.org
+
+- update to SeaMonkey 2.22 (bnc#847708)
+ * rebased patches
+ * requires NSS 3.15.2 or higher
+ * MFSA 2013-93/CVE-2013-5590/CVE-2013-5591/CVE-2013-5592
+ Miscellaneous memory safety hazards
+ * MFSA 2013-94/CVE-2013-5593 (bmo#868327)
+ Spoofing addressbar through SELECT element
+ * MFSA 2013-95/CVE-2013-5604 (bmo#914017)
+ Access violation with XSLT and uninitialized data
+ * MFSA 2013-96/CVE-2013-5595 (bmo#916580)
+ Improperly initialized memory and overflows in some JavaScript
+ functions
+ * MFSA 2013-97/CVE-2013-5596 (bmo#910881)
+ Writing to cycle collected object during image decoding
+ * MFSA 2013-98/CVE-2013-5597 (bmo#918864)
+ Use-after-free when updating offline cache
+ * MFSA 2013-99/CVE-2013-5598 (bmo#920515)
+ Security bypass of PDF.js checks using iframes
+ * MFSA 2013-100/CVE-2013-5599/CVE-2013-5600/CVE-2013-5601
+ (bmo#915210, bmo#915576, bmo#916685)
+ Miscellaneous use-after-free issues found through ASAN fuzzing
+ * MFSA 2013-101/CVE-2013-5602 (bmo#897678)
+ Memory corruption in workers
+ * MFSA 2013-102/CVE-2013-5603 (bmo#916404)
+ Use-after-free in HTML document templates
+
+-------------------------------------------------------------------
Old:
----
l10n-2.21.tar.bz2
seamonkey-2.21-source.tar.bz2
New:
----
l10n-2.22.tar.bz2
seamonkey-2.22-source.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ seamonkey.spec ++++++
--- /var/tmp/diff_new_pack.VpalRY/_old 2013-11-04 08:50:58.000000000 +0100
+++ /var/tmp/diff_new_pack.VpalRY/_new 2013-11-04 08:50:58.000000000 +0100
@@ -54,9 +54,9 @@
%endif
Provides: web_browser
Provides: browser(npapi)
-Version: 2.21
+Version: 2.22
Release: 0
-%define releasedate 2013091600
+%define releasedate 2013102900
Summary: The successor of the Mozilla Application Suite
License: MPL-2.0
Group: Productivity/Networking/Web/Browsers
@@ -104,7 +104,7 @@
# so using %opensuse_bs is secure for now
BuildRequires: mozilla-nspr-devel
PreReq: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr)
-BuildRequires: mozilla-nss-devel >= 3.15.1
+BuildRequires: mozilla-nss-devel >= 3.15.2
PreReq: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss)
%description
++++++ _constraints ++++++
--- /var/tmp/diff_new_pack.VpalRY/_old 2013-11-04 08:50:58.000000000 +0100
+++ /var/tmp/diff_new_pack.VpalRY/_new 2013-11-04 08:50:58.000000000 +0100
@@ -5,7 +5,7 @@
<size unit="G">9</size>
</disk>
<memory>
- <size unit="M">3500</size>
+ <size unit="M">3800</size>
</memory>
</hardware>
</constraints>
++++++ compare-locales.tar.bz2 ++++++
++++++ create-tar.sh ++++++
--- /var/tmp/diff_new_pack.VpalRY/_old 2013-11-04 08:50:58.000000000 +0100
+++ /var/tmp/diff_new_pack.VpalRY/_new 2013-11-04 08:50:58.000000000 +0100
@@ -2,8 +2,8 @@
CHANNEL="release"
BRANCH="releases/comm-$CHANNEL"
-RELEASE_TAG="SEAMONKEY_2_21_RELEASE"
-VERSION="2.21"
+RELEASE_TAG="SEAMONKEY_2_22_RELEASE"
+VERSION="2.22"
echo "cloning $BRANCH..."
hg clone http://hg.mozilla.org/$BRANCH seamonkey
++++++ l10n-2.21.tar.bz2 -> l10n-2.22.tar.bz2 ++++++
/work/SRC/openSUSE:13.1/seamonkey/l10n-2.21.tar.bz2 /work/SRC/openSUSE:13.1/.seamonkey.new/l10n-2.22.tar.bz2 differ: char 11, line 1
++++++ mozilla-ppc.patch ++++++
--- /var/tmp/diff_new_pack.VpalRY/_old 2013-11-04 08:50:58.000000000 +0100
+++ /var/tmp/diff_new_pack.VpalRY/_new 2013-11-04 08:50:58.000000000 +0100
@@ -2,7 +2,6 @@
# Parent 21d0e194954e451f0f1935d0ed68ee9eae432ddf
# User Wolfgang Rosenauer <wr(a)rosenauer.org>
Bug 746112 - RegExp hang on ppc64 in execute.
-Bug 750620 - Make double-conversion portable to exotic architectures. TM: mozilla15
diff --git a/js/src/yarr/YarrInterpreter.h b/js/src/yarr/YarrInterpreter.h
--- a/js/src/yarr/YarrInterpreter.h
@@ -89,25 +88,3 @@
/*
* VM page size. It must divide the runtime CPU page size or the code
* will abort.
-diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/utils.h
---- a/mfbt/double-conversion/utils.h
-+++ b/mfbt/double-conversion/utils.h
-@@ -50,17 +50,17 @@
- // the result is equal to 89255e-22.
- // The best way to test this, is to create a division-function and to compare
- // the output of the division with the expected result. (Inlining must be
- // disabled.)
- // On Linux,x86 89255e-22 != Div_double(89255.0/1e22)
- #if defined(_M_X64) || defined(__x86_64__) || \
- defined(__ARMEL__) || defined(__avr32__) || \
- defined(__hppa__) || defined(__ia64__) || \
-- defined(__mips__) || defined(__powerpc__) || \
-+ defined(__mips__) || defined(__powerpc__) || defined(__powerpc64__) || \
- defined(__sparc__) || defined(__sparc) || defined(__s390__) || \
- defined(__SH4__) || defined(__alpha__) || \
- defined(_MIPS_ARCH_MIPS32R2)
- #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
- #elif defined(_M_IX86) || defined(__i386__) || defined(__i386)
- #if defined(_WIN32)
- // Windows uses a 64bit wide floating point stack.
- #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
++++++ mozilla-shared-nss-db.patch ++++++
--- /var/tmp/diff_new_pack.VpalRY/_old 2013-11-04 08:50:58.000000000 +0100
+++ /var/tmp/diff_new_pack.VpalRY/_new 2013-11-04 08:50:58.000000000 +0100
@@ -7,7 +7,7 @@
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
-@@ -8330,16 +8330,31 @@ AC_SUBST(QCMS_LIBS)
+@@ -8289,16 +8289,31 @@ AC_SUBST(QCMS_LIBS)
dnl ========================================================
dnl HarfBuzz
@@ -83,7 +83,7 @@
#include "nsComponentManagerUtils.h"
#include "nsDirectoryServiceDefs.h"
#include "nsICertOverrideService.h"
-@@ -1132,18 +1139,34 @@ nsNSSComponent::InitializeNSS(bool showW
+@@ -1144,18 +1151,34 @@ nsNSSComponent::InitializeNSS(bool showW
ConfigureInternalPKCS11Token();
// The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs
@@ -96,7 +96,7 @@
- SECMOD_DB, init_flags);
+ SECStatus init_rv = SECFailure;
+#ifdef MOZ_ENABLE_NSSHELPER
-+ if (PR_GetEnv("MOZ_XRE_NO_NSSHELPER")) {
++ if (PR_GetEnv("MOZ_SM_NO_NSSHELPER")) {
+ init_rv = ::NSS_Initialize(profileStr.get(), "", "",
+ SECMOD_DB, init_flags);
+ } else {
@@ -123,15 +123,15 @@
diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
-@@ -490,17 +490,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO
+@@ -490,17 +490,17 @@ ifneq (,$(or $(filter 1400,$(_MSC_VER)),
+ ifdef MOZ_DEBUG
+ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO
endif
endif
endif
EXTRA_DSO_LDOPTS += $(LIBS_DIR)
- DEFINES += -DIMPL_XREAPI
-
-EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB)
+EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) $(NSSHELPER_LIBS)
++++++ mozilla-sle11.patch ++++++
--- /var/tmp/diff_new_pack.VpalRY/_old 2013-11-04 08:50:58.000000000 +0100
+++ /var/tmp/diff_new_pack.VpalRY/_new 2013-11-04 08:50:58.000000000 +0100
@@ -2,9 +2,9 @@
References:
https://bugzilla.mozilla.org/show_bug.cgi?id=513422
-diff --git a/xpcom/glue/SSE.cpp b/xpcom/glue/SSE.cpp
---- a/xpcom/glue/SSE.cpp
-+++ b/xpcom/glue/SSE.cpp
+diff --git a/mozglue/build/SSE.cpp b/mozglue/build/SSE.cpp
+--- a/mozglue/build/SSE.cpp
++++ b/mozglue/build/SSE.cpp
@@ -12,26 +12,77 @@ namespace {
// SSE.h has parallel #ifs which declare MOZILLA_SSE_HAVE_CPUID_DETECTION.
// We can't declare these functions in the header file, however, because
++++++ seamonkey-2.21-source.tar.bz2 -> seamonkey-2.22-source.tar.bz2 ++++++
/work/SRC/openSUSE:13.1/seamonkey/seamonkey-2.21-source.tar.bz2 /work/SRC/openSUSE:13.1/.seamonkey.new/seamonkey-2.22-source.tar.bz2 differ: char 11, line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package seamonkey for openSUSE:Factory checked in at 2013-11-04 08:50:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/seamonkey (Old)
and /work/SRC/openSUSE:Factory/.seamonkey.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "seamonkey"
Changes:
--------
--- /work/SRC/openSUSE:Factory/seamonkey/seamonkey.changes 2013-09-23 11:18:10.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.seamonkey.new/seamonkey.changes 2013-11-04 08:50:46.000000000 +0100
@@ -1,0 +2,29 @@
+Wed Oct 30 18:07:33 UTC 2013 - wr(a)rosenauer.org
+
+- update to SeaMonkey 2.22 (bnc#847708)
+ * rebased patches
+ * requires NSS 3.15.2 or higher
+ * MFSA 2013-93/CVE-2013-5590/CVE-2013-5591/CVE-2013-5592
+ Miscellaneous memory safety hazards
+ * MFSA 2013-94/CVE-2013-5593 (bmo#868327)
+ Spoofing addressbar through SELECT element
+ * MFSA 2013-95/CVE-2013-5604 (bmo#914017)
+ Access violation with XSLT and uninitialized data
+ * MFSA 2013-96/CVE-2013-5595 (bmo#916580)
+ Improperly initialized memory and overflows in some JavaScript
+ functions
+ * MFSA 2013-97/CVE-2013-5596 (bmo#910881)
+ Writing to cycle collected object during image decoding
+ * MFSA 2013-98/CVE-2013-5597 (bmo#918864)
+ Use-after-free when updating offline cache
+ * MFSA 2013-99/CVE-2013-5598 (bmo#920515)
+ Security bypass of PDF.js checks using iframes
+ * MFSA 2013-100/CVE-2013-5599/CVE-2013-5600/CVE-2013-5601
+ (bmo#915210, bmo#915576, bmo#916685)
+ Miscellaneous use-after-free issues found through ASAN fuzzing
+ * MFSA 2013-101/CVE-2013-5602 (bmo#897678)
+ Memory corruption in workers
+ * MFSA 2013-102/CVE-2013-5603 (bmo#916404)
+ Use-after-free in HTML document templates
+
+-------------------------------------------------------------------
Old:
----
l10n-2.21.tar.bz2
seamonkey-2.21-source.tar.bz2
New:
----
l10n-2.22.tar.bz2
seamonkey-2.22-source.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ seamonkey.spec ++++++
--- /var/tmp/diff_new_pack.cjW2vo/_old 2013-11-04 08:50:51.000000000 +0100
+++ /var/tmp/diff_new_pack.cjW2vo/_new 2013-11-04 08:50:51.000000000 +0100
@@ -54,9 +54,9 @@
%endif
Provides: web_browser
Provides: browser(npapi)
-Version: 2.21
+Version: 2.22
Release: 0
-%define releasedate 2013091600
+%define releasedate 2013102900
Summary: The successor of the Mozilla Application Suite
License: MPL-2.0
Group: Productivity/Networking/Web/Browsers
@@ -104,7 +104,7 @@
# so using %opensuse_bs is secure for now
BuildRequires: mozilla-nspr-devel
PreReq: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr)
-BuildRequires: mozilla-nss-devel >= 3.15.1
+BuildRequires: mozilla-nss-devel >= 3.15.2
PreReq: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss)
%description
++++++ _constraints ++++++
--- /var/tmp/diff_new_pack.cjW2vo/_old 2013-11-04 08:50:51.000000000 +0100
+++ /var/tmp/diff_new_pack.cjW2vo/_new 2013-11-04 08:50:51.000000000 +0100
@@ -5,7 +5,7 @@
<size unit="G">9</size>
</disk>
<memory>
- <size unit="M">3500</size>
+ <size unit="M">3800</size>
</memory>
</hardware>
</constraints>
++++++ compare-locales.tar.bz2 ++++++
++++++ create-tar.sh ++++++
--- /var/tmp/diff_new_pack.cjW2vo/_old 2013-11-04 08:50:51.000000000 +0100
+++ /var/tmp/diff_new_pack.cjW2vo/_new 2013-11-04 08:50:51.000000000 +0100
@@ -2,8 +2,8 @@
CHANNEL="release"
BRANCH="releases/comm-$CHANNEL"
-RELEASE_TAG="SEAMONKEY_2_21_RELEASE"
-VERSION="2.21"
+RELEASE_TAG="SEAMONKEY_2_22_RELEASE"
+VERSION="2.22"
echo "cloning $BRANCH..."
hg clone http://hg.mozilla.org/$BRANCH seamonkey
++++++ l10n-2.21.tar.bz2 -> l10n-2.22.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/seamonkey/l10n-2.21.tar.bz2 /work/SRC/openSUSE:Factory/.seamonkey.new/l10n-2.22.tar.bz2 differ: char 11, line 1
++++++ mozilla-ppc.patch ++++++
--- /var/tmp/diff_new_pack.cjW2vo/_old 2013-11-04 08:50:51.000000000 +0100
+++ /var/tmp/diff_new_pack.cjW2vo/_new 2013-11-04 08:50:51.000000000 +0100
@@ -2,7 +2,6 @@
# Parent 21d0e194954e451f0f1935d0ed68ee9eae432ddf
# User Wolfgang Rosenauer <wr(a)rosenauer.org>
Bug 746112 - RegExp hang on ppc64 in execute.
-Bug 750620 - Make double-conversion portable to exotic architectures. TM: mozilla15
diff --git a/js/src/yarr/YarrInterpreter.h b/js/src/yarr/YarrInterpreter.h
--- a/js/src/yarr/YarrInterpreter.h
@@ -89,25 +88,3 @@
/*
* VM page size. It must divide the runtime CPU page size or the code
* will abort.
-diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/utils.h
---- a/mfbt/double-conversion/utils.h
-+++ b/mfbt/double-conversion/utils.h
-@@ -50,17 +50,17 @@
- // the result is equal to 89255e-22.
- // The best way to test this, is to create a division-function and to compare
- // the output of the division with the expected result. (Inlining must be
- // disabled.)
- // On Linux,x86 89255e-22 != Div_double(89255.0/1e22)
- #if defined(_M_X64) || defined(__x86_64__) || \
- defined(__ARMEL__) || defined(__avr32__) || \
- defined(__hppa__) || defined(__ia64__) || \
-- defined(__mips__) || defined(__powerpc__) || \
-+ defined(__mips__) || defined(__powerpc__) || defined(__powerpc64__) || \
- defined(__sparc__) || defined(__sparc) || defined(__s390__) || \
- defined(__SH4__) || defined(__alpha__) || \
- defined(_MIPS_ARCH_MIPS32R2)
- #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
- #elif defined(_M_IX86) || defined(__i386__) || defined(__i386)
- #if defined(_WIN32)
- // Windows uses a 64bit wide floating point stack.
- #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
++++++ mozilla-shared-nss-db.patch ++++++
--- /var/tmp/diff_new_pack.cjW2vo/_old 2013-11-04 08:50:51.000000000 +0100
+++ /var/tmp/diff_new_pack.cjW2vo/_new 2013-11-04 08:50:51.000000000 +0100
@@ -7,7 +7,7 @@
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
-@@ -8330,16 +8330,31 @@ AC_SUBST(QCMS_LIBS)
+@@ -8289,16 +8289,31 @@ AC_SUBST(QCMS_LIBS)
dnl ========================================================
dnl HarfBuzz
@@ -83,7 +83,7 @@
#include "nsComponentManagerUtils.h"
#include "nsDirectoryServiceDefs.h"
#include "nsICertOverrideService.h"
-@@ -1132,18 +1139,34 @@ nsNSSComponent::InitializeNSS(bool showW
+@@ -1144,18 +1151,34 @@ nsNSSComponent::InitializeNSS(bool showW
ConfigureInternalPKCS11Token();
// The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs
@@ -96,7 +96,7 @@
- SECMOD_DB, init_flags);
+ SECStatus init_rv = SECFailure;
+#ifdef MOZ_ENABLE_NSSHELPER
-+ if (PR_GetEnv("MOZ_XRE_NO_NSSHELPER")) {
++ if (PR_GetEnv("MOZ_SM_NO_NSSHELPER")) {
+ init_rv = ::NSS_Initialize(profileStr.get(), "", "",
+ SECMOD_DB, init_flags);
+ } else {
@@ -123,15 +123,15 @@
diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
-@@ -490,17 +490,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO
+@@ -490,17 +490,17 @@ ifneq (,$(or $(filter 1400,$(_MSC_VER)),
+ ifdef MOZ_DEBUG
+ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO
endif
endif
endif
EXTRA_DSO_LDOPTS += $(LIBS_DIR)
- DEFINES += -DIMPL_XREAPI
-
-EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB)
+EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) $(NSSHELPER_LIBS)
++++++ mozilla-sle11.patch ++++++
--- /var/tmp/diff_new_pack.cjW2vo/_old 2013-11-04 08:50:51.000000000 +0100
+++ /var/tmp/diff_new_pack.cjW2vo/_new 2013-11-04 08:50:51.000000000 +0100
@@ -2,9 +2,9 @@
References:
https://bugzilla.mozilla.org/show_bug.cgi?id=513422
-diff --git a/xpcom/glue/SSE.cpp b/xpcom/glue/SSE.cpp
---- a/xpcom/glue/SSE.cpp
-+++ b/xpcom/glue/SSE.cpp
+diff --git a/mozglue/build/SSE.cpp b/mozglue/build/SSE.cpp
+--- a/mozglue/build/SSE.cpp
++++ b/mozglue/build/SSE.cpp
@@ -12,26 +12,77 @@ namespace {
// SSE.h has parallel #ifs which declare MOZILLA_SSE_HAVE_CPUID_DETECTION.
// We can't declare these functions in the header file, however, because
++++++ seamonkey-2.21-source.tar.bz2 -> seamonkey-2.22-source.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/seamonkey/seamonkey-2.21-source.tar.bz2 /work/SRC/openSUSE:Factory/.seamonkey.new/seamonkey-2.22-source.tar.bz2 differ: char 11, line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package open-vm-tools for openSUSE:13.1 checked in at 2013-11-04 08:49:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1/open-vm-tools (Old)
and /work/SRC/openSUSE:13.1/.open-vm-tools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "open-vm-tools"
Changes:
--------
--- /work/SRC/openSUSE:13.1/open-vm-tools/open-vm-tools.changes 2013-09-23 11:02:05.000000000 +0200
+++ /work/SRC/openSUSE:13.1/.open-vm-tools.new/open-vm-tools.changes 2013-11-04 08:50:01.000000000 +0100
@@ -1,0 +2,7 @@
+Sat Nov 2 13:40:15 UTC 2013 - dimstar(a)opensuse.org
+
+- Supplement the -gui package on xorg-x11-server instead of
+ xorg-x11 as the latter is only a meta-package, that is not
+ installed on all machines (bnc#848505).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ open-vm-tools.spec ++++++
--- /var/tmp/diff_new_pack.RB0ixO/_old 2013-11-04 08:50:01.000000000 +0100
+++ /var/tmp/diff_new_pack.RB0ixO/_new 2013-11-04 08:50:01.000000000 +0100
@@ -151,7 +151,7 @@
Summary: Open Virtual Machine Tools - GUI
Group: System/Emulators/PC
Requires: open-vm-tools
-Supplements: packageand(open-vm-tools:xorg-x11)
+Supplements: packageand(open-vm-tools:xorg-x11-server)
Requires(pre): permissions
%description gui
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package open-vm-tools for openSUSE:Factory checked in at 2013-11-04 08:49:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/open-vm-tools (Old)
and /work/SRC/openSUSE:Factory/.open-vm-tools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "open-vm-tools"
Changes:
--------
--- /work/SRC/openSUSE:Factory/open-vm-tools/open-vm-tools.changes 2013-09-11 12:58:28.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.open-vm-tools.new/open-vm-tools.changes 2013-11-04 08:49:59.000000000 +0100
@@ -1,0 +2,7 @@
+Sat Nov 2 13:40:15 UTC 2013 - dimstar(a)opensuse.org
+
+- Supplement the -gui package on xorg-x11-server instead of
+ xorg-x11 as the latter is only a meta-package, that is not
+ installed on all machines (bnc#848505).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ open-vm-tools.spec ++++++
--- /var/tmp/diff_new_pack.bxP5e7/_old 2013-11-04 08:49:59.000000000 +0100
+++ /var/tmp/diff_new_pack.bxP5e7/_new 2013-11-04 08:49:59.000000000 +0100
@@ -151,7 +151,7 @@
Summary: Open Virtual Machine Tools - GUI
Group: System/Emulators/PC
Requires: open-vm-tools
-Supplements: packageand(open-vm-tools:xorg-x11)
+Supplements: packageand(open-vm-tools:xorg-x11-server)
Requires(pre): permissions
%description gui
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package libbluedevil for openSUSE:Factory checked in at 2013-11-04 08:49:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libbluedevil (Old)
and /work/SRC/openSUSE:Factory/.libbluedevil.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libbluedevil"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libbluedevil/libbluedevil.changes 2013-09-04 13:54:26.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libbluedevil.new/libbluedevil.changes 2013-11-04 08:49:52.000000000 +0100
@@ -1,0 +2,7 @@
+Sat Nov 2 22:17:35 UTC 2013 - tittiatcoke(a)gmail.com
+
+- Update to a git snapshot of the bluez5 branch. This would allow
+ at least some bluetooth functionality in KDE with Bluez5.
+ Will be replaced by an official version as soon as available.
+
+-------------------------------------------------------------------
Old:
----
libbluedevil-v1.9.4.tar.xz
New:
----
libbluedevil.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libbluedevil.spec ++++++
--- /var/tmp/diff_new_pack.T5vqb9/_old 2013-11-04 08:49:52.000000000 +0100
+++ /var/tmp/diff_new_pack.T5vqb9/_new 2013-11-04 08:49:52.000000000 +0100
@@ -18,13 +18,14 @@
Name: libbluedevil
-Version: 1.9.4
+Version: 1.9.4_bluez5
Release: 0
Summary: Qt Bluetooth client library
License: LGPL-2.0+
Group: System/Libraries
Url: http://www.kde.org
-Source0: http://download.kde.org/stable/libbluedevil/%{name}-v%{version}.tar.xz
+#Source0: http://download.kde.org/stable/libbluedevil/%{name}-v%{version}.tar.xz
+Source0: %{name}.tar.xz
BuildRequires: cmake
BuildRequires: kde4-filesystem
BuildRequires: libqt4-devel
@@ -36,20 +37,20 @@
%package devel
Summary: Qt Wrapper for Bluez
Group: Development/Libraries/C and C++
-Requires: libbluedevil1 = %{version}
+Requires: libbluedevil2 = %{version}
%description devel
Qt wrapper for BlueZ. This wrapper is used by KDE's Bluetooth layer.
-%package -n libbluedevil1
+%package -n libbluedevil2
Summary: Qt Wrapper for Bluez
Group: System/Libraries
-%description -n libbluedevil1
+%description -n libbluedevil2
Qt wrapper for BlueZ. This wrapper is used by KDE's Bluetooth layer.
%prep
-%setup -q -n %{name}-v%{version}
+%setup -q -n %{name}
%build
%cmake_kde4 -d build
@@ -62,13 +63,13 @@
%clean
rm -rf %{buildroot}
-%post -n libbluedevil1 -p /sbin/ldconfig
+%post -n libbluedevil2 -p /sbin/ldconfig
-%postun -n libbluedevil1 -p /sbin/ldconfig
+%postun -n libbluedevil2 -p /sbin/ldconfig
-%files -n libbluedevil1
+%files -n libbluedevil2
%defattr(-,root,root,-)
-%{_libdir}/libbluedevil.so.1*
+%{_libdir}/libbluedevil.so.2*
%files devel
%defattr(-,root,root,-)
++++++ libbluedevil-v1.9.4.tar.xz -> libbluedevil.tar.xz ++++++
++++ 6103 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0