Accepting request 670283 from Base:System

OBS-URL: https://build.opensuse.org/request/show/670283 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dbus-1?expand=0&rev=155
2019-02-06 13:04:59 +00:00 · 2019-02-06 13:04:59 +00:00 · 33bb6be280
commit 33bb6be280
parent 4d25b8bfea 2cce4e930f
8 changed files with 172 additions and 6 deletions
--- a/dbus-1-x11.changes
+++ b/dbus-1-x11.changes
@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Wed Jan 30 13:03:19 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Update to 1.12.12:
+  * Reference the freedesktop.org Code of Conduct (Simon McVittie)
+  * Stop the dbus-daemon leaking memory (an error message) if delivering
+    the message that triggered auto-activation is forbidden. This is
+    technically a denial of service because the dbus-daemon will
+    run out of memory eventually, but it's a very slow and noisy one,
+    because all the rejected messages are also very likely to have
+    been logged to the system log, and its scope is typically limited by
+    the finite number of activatable services available.
+    (dbus#234, Simon McVittie)
+  * Remove __attribute__((__malloc__)) attribute on dbus_realloc(),
+    which does not meet the criteria for that attribute in gcc 4.7+,
+    potentially leading to miscompilation (fd.o #107741, Simon McVittie)
+  * Fix some small O(1) memory leaks (fd.o #107320, Simon McVittie)
+  * Fix printf formats for pointer-sized integers on 64-bit Windows
+    (fd.o #105662, Ralf Habacker)
+  *  Always use select()-based poll() emulation on Darwin-based OSs
+    (macOS, etc.) and on Interix, similar to what libcurl does
+    (dbus#232, dbus!19; Simon McVittie)
+  * Extend a test timeout to avoid spurious failures in CI
+    (dbus!26, Simon McVittie)
+
+-------------------------------------------------------------------
+Wed Jan 30 12:52:25 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Add patch to build with new autoconf-archive, there is now
+  bash variable AX_BLA that gets detected and autoreconf aborts;
+  thus rather just disable the pointless check:
+  * dbus-no-ax-check.patch
+- Add patch to fix codecoverage m4 macro changes in autoconf-archive:
+  * dbus-new-autoconf-archive.patch
+
 -------------------------------------------------------------------
 Tue Jan 15 11:04:14 UTC 2019 - alarrosa@suse.com

--- a/dbus-1-x11.spec
+++ b/dbus-1-x11.spec
@ -23,7 +23,7 @@
 %endif
 %bcond_without selinux
 Name:           dbus-1-x11
-Version:        1.12.10
+Version:        1.12.12
 Release:        0
 Summary:        D-Bus Message Bus System
 License:        GPL-2.0-or-later OR AFL-2.1
@ -38,6 +38,10 @@ Patch0:         feature-suse-log-deny.patch
 Patch1:         feature-suse-do-autolaunch.patch
 # Patch-Feature-opensuse sflees@suse.de, users shouldn't be allowed to start / stop the dbus service.
 Patch2:         feature-suse-refuse-manual-start-stop.patch
+# PATCH-FIX-UPSTREAM
+Patch3:         dbus-no-ax-check.patch
+# PATCH-FIX-UPSTREAM tchvatal@suse.com -- work with new autoconf-archive
+Patch4:         dbus-new-autoconf-archive.patch
 BuildRequires:  autoconf-archive
 BuildRequires:  libcap-ng-devel
 BuildRequires:  libexpat-devel
--- a/dbus-1.12.10.tar.gz
+++ b/dbus-1.12.10.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4b693d24976258c3f2fa9cc33ad9288c5fbfa7a16481dbd9a8a429f7aa8cdcf7
-size 2073510
--- a/dbus-1.12.12.tar.gz
+++ b/dbus-1.12.12.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9546f226011a1e5d9d77245fe5549ef25af4694053189d624d0d6ac127ecf5f8
+size 2077301
--- a/dbus-1.changes
+++ b/dbus-1.changes
@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Wed Jan 30 13:03:19 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Update to 1.12.12:
+  * Reference the freedesktop.org Code of Conduct (Simon McVittie)
+  * Stop the dbus-daemon leaking memory (an error message) if delivering
+    the message that triggered auto-activation is forbidden. This is
+    technically a denial of service because the dbus-daemon will
+    run out of memory eventually, but it's a very slow and noisy one,
+    because all the rejected messages are also very likely to have
+    been logged to the system log, and its scope is typically limited by
+    the finite number of activatable services available.
+    (dbus#234, Simon McVittie)
+  * Remove __attribute__((__malloc__)) attribute on dbus_realloc(),
+    which does not meet the criteria for that attribute in gcc 4.7+,
+    potentially leading to miscompilation (fd.o #107741, Simon McVittie)
+  * Fix some small O(1) memory leaks (fd.o #107320, Simon McVittie)
+  * Fix printf formats for pointer-sized integers on 64-bit Windows
+    (fd.o #105662, Ralf Habacker)
+  *  Always use select()-based poll() emulation on Darwin-based OSs
+    (macOS, etc.) and on Interix, similar to what libcurl does
+    (dbus#232, dbus!19; Simon McVittie)
+  * Extend a test timeout to avoid spurious failures in CI
+    (dbus!26, Simon McVittie)
+
+-------------------------------------------------------------------
+Wed Jan 30 12:52:25 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Add patch to build with new autoconf-archive, there is now
+  bash variable AX_BLA that gets detected and autoreconf aborts;
+  thus rather just disable the pointless check:
+  * dbus-no-ax-check.patch
+- Add patch to fix codecoverage m4 macro changes in autoconf-archive:
+  * dbus-new-autoconf-archive.patch
+
 -------------------------------------------------------------------
 Tue Jan 15 11:04:14 UTC 2019 - alarrosa@suse.com

--- a/dbus-1.spec
+++ b/dbus-1.spec
@ -26,7 +26,7 @@
 %endif
 %bcond_without selinux
 Name:           dbus-1
-Version:        1.12.10
+Version:        1.12.12
 Release:        0
 Summary:        D-Bus Message Bus System
 License:        GPL-2.0-or-later OR AFL-2.1
@ -41,6 +41,10 @@ Patch0:         feature-suse-log-deny.patch
 Patch1:         feature-suse-do-autolaunch.patch
 # Patch-Feature-opensuse sflees@suse.de, users shouldn't be allowed to start / stop the dbus service.
 Patch2:         feature-suse-refuse-manual-start-stop.patch
+# PATCH-FIX-UPSTREAM
+Patch3:         dbus-no-ax-check.patch
+# PATCH-FIX-UPSTREAM tchvatal@suse.com -- work with new autoconf-archive
+Patch4:         dbus-new-autoconf-archive.patch
 BuildRequires:  audit-devel
 BuildRequires:  autoconf-archive
 BuildRequires:  doxygen
@ -294,7 +298,7 @@ fi
 %dir /lib/dbus-1/system-services
 %dir %{_libexecdir}/dbus-1/
 %license COPYING
-%doc AUTHORS HACKING NEWS README
+%doc AUTHORS NEWS README
 %config(noreplace) %{_sysconfdir}/dbus-1/session.conf
 %config(noreplace) %{_sysconfdir}/dbus-1/system.conf
 %{_datadir}/dbus-1/session.conf
--- a/dbus-new-autoconf-archive.patch
+++ b/dbus-new-autoconf-archive.patch
@ -0,0 +1,43 @@
+Index: dbus-1.12.12/Makefile.am
+===================================================================
+--- dbus-1.12.12.orig/Makefile.am
+++ dbus-1.12.12/Makefile.am
+@@ -51,4 +51,4 @@ DISTCHECK_CONFIGURE_FLAGS = \
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ 
+ # Add rules for code-coverage testing, as defined by AX_CODE_COVERAGE
+-@CODE_COVERAGE_RULES@
+include $(top_srcdir)/aminclude_static.am
+Index: dbus-1.12.12/bus/Makefile.am
+===================================================================
+--- dbus-1.12.12.orig/bus/Makefile.am
+++ dbus-1.12.12/bus/Makefile.am
+@@ -306,4 +306,4 @@ systemduserunit_DATA = \
+ endif
+ 
+ # Add rules for code-coverage testing, as defined by AX_CODE_COVERAGE
+-@CODE_COVERAGE_RULES@
+include $(top_srcdir)/aminclude_static.am
+Index: dbus-1.12.12/dbus/Makefile.am
+===================================================================
+--- dbus-1.12.12.orig/dbus/Makefile.am
+++ dbus-1.12.12/dbus/Makefile.am
+@@ -329,7 +329,7 @@ test_dbus_SOURCES=				\
+ test_dbus_LDADD = libdbus-internal.la
+ 
+ # Add rules for code-coverage testing, as defined by AX_CODE_COVERAGE
+-@CODE_COVERAGE_RULES@
+include $(top_srcdir)/aminclude_static.am
+ 
+ clean-local:
+ 	$(AM_V_at)rm -fr ./.dbus-keyrings
+Index: dbus-1.12.12/test/Makefile.am
+===================================================================
+--- dbus-1.12.12.orig/test/Makefile.am
+++ dbus-1.12.12/test/Makefile.am
+@@ -672,4 +672,4 @@ $(installable_test_meta_with_config): %_
+ 	) > $@.tmp && mv $@.tmp $@
+ 
+ # Add rules for code-coverage testing, as defined by AX_CODE_COVERAGE
+-@CODE_COVERAGE_RULES@
+include $(top_srcdir)/aminclude_static.am
--- a/dbus-no-ax-check.patch
+++ b/dbus-no-ax-check.patch
@ -0,0 +1,45 @@
+From ee09cc0acdc1c34e8ae999adf9922f3d0d66f407 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <smcv@collabora.com>
+Date: Mon, 21 Jan 2019 14:28:24 +0000
+Subject: configure.ac: Forbid AX_-prefixed patterns more selectively
+
+We want to make autoconf fail early and with a user-comprehensible
+message if autoconf-archive isn't installed, rather than generating
+a configure script with syntax errors, or a configure script that runs
+successfully but doesn't do what we intended.
+
+However, autoconf-archive doesn't actually guarantee not to use
+AX_-prefixed shell variable names without m4_pattern_allow'ing them
+(unlike Autoconf, Automake, Libtool and pkg-config, which explicitly use
+m4_pattern_allow for variables with AC_, AM_, LT_ and PKG_ prefixes), so
+it isn't safe to assume that they won't be used. In particular, recent
+versions of AX_CHECK_GNU_MAKE appear to be using
+$AX_CHECK_GNU_MAKE_HEADLINE as a shell variable.
+
+Instead, specifically forbid the names of the finite list of macros
+that we actually use.
+
+Signed-off-by: Simon McVittie <smcv@collabora.com>
+Resolves: dbus#249
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+(limited to 'configure.ac')
+
+diff --git a/configure.ac b/configure.ac
+index a5a7fd3..83d8b47 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -10,7 +10,7 @@ AC_INIT([dbus], [dbus_version], [https://gitlab.freedesktop.org/dbus/dbus/issues
+ 
+ AC_CONFIG_AUX_DIR([build-aux])
+ 
+-m4_pattern_forbid([^AX_],
+m4_pattern_forbid([^AX_(CHECK_ENABLE_DEBUG|CODE_COVERAGE|COMPILER_FLAGS|COMPILER_FLAGS_(CFLAGS|CXXFLAGS|LDFLAGS))\b],
+   [Unexpanded AX_ macro found. Please install GNU autoconf-archive])
+ 
+ AC_CANONICAL_HOST
+-- 
+cgit v1.1
+