- rediff patches, rel 3

diff --git a/dbus-autoconf-archive.patch b/dbus-autoconf-archive.patch
index ab4b51ccced483bdecc1fe9a94a20b0b50dc6cf3..63315aa66aa1c37d07df7b077d127947f5c77725 100644 (file)
--- a/dbus-autoconf-archive.patch
+++ b/dbus-autoconf-archive.patch
@@ -1,11 +1,11 @@
---- dbus-1.12.12/configure.ac.orig     2019-02-13 21:45:13.880746757 +0100
-+++ dbus-1.12.12/configure.ac  2019-02-13 21:51:22.655415600 +0100
-@@ -12,6 +12,7 @@
+diff -urNp -x '*.orig' dbus-1.12.20.org/configure.ac dbus-1.12.20/configure.ac
+--- dbus-1.12.20.org/configure.ac      2022-01-08 14:11:46.766881649 +0100
++++ dbus-1.12.20/configure.ac  2022-01-08 14:11:46.840212443 +0100
+@@ -12,6 +12,7 @@ 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])
 +m4_pattern_allow([AX_CHECK_GNU_MAKE_HEADLINE])
  
  AC_CANONICAL_HOST
  
-

diff --git a/dbus-config.patch b/dbus-config.patch
index 44862f6dc3db0599e771496ef9263db0b53d7c5f..c61328c77040b59be559cadb479eeba7e27d3551 100644 (file)
--- a/dbus-config.patch
+++ b/dbus-config.patch
@@ -1,7 +1,7 @@
-diff -urN dbus-0.36.2.org/bus/session.conf.in dbus-0.36.2/bus/session.conf.in
---- dbus-0.36.2.org/bus/session.conf.in        2005-08-29 20:40:15.000000000 +0200
-+++ dbus-0.36.2/bus/session.conf.in    2005-08-30 21:05:05.900734296 +0200
-@@ -19,6 +19,10 @@
+diff -urNp -x '*.orig' dbus-1.12.20.org/bus/session.conf.in dbus-1.12.20/bus/session.conf.in
+--- dbus-1.12.20.org/bus/session.conf.in       2017-10-30 13:26:18.000000000 +0100
++++ dbus-1.12.20/bus/session.conf.in   2022-01-08 14:11:46.333563322 +0100
+@@ -33,6 +33,10 @@
      <allow eavesdrop="true"/>
      <!-- Allow anyone to own anything -->
      <allow own="*"/>
@@ -11,4 +11,4 @@ diff -urN dbus-0.36.2.org/bus/session.conf.in dbus-0.36.2/bus/session.conf.in
 +    <allow receive_requested_reply="true"/>
    </policy>
  
-   <!-- This is included last so local configuration can override what's 
+   <!-- Include legacy configuration location -->

diff --git a/dbus-nolibs.patch b/dbus-nolibs.patch
index 965f9aebcdf9008656c59e5d2636bc127a9adc9b..0e18140041d7b04723fe673bedabf64124fa23fa 100644 (file)
--- a/dbus-nolibs.patch
+++ b/dbus-nolibs.patch
@@ -1,15 +1,16 @@
---- dbus-1.4.8/configure.ac.orig       2011-04-08 15:29:57.000000000 +0200
-+++ dbus-1.4.8/configure.ac    2011-04-21 19:19:14.669374081 +0200
-@@ -457,7 +457,7 @@
+diff -urNp -x '*.orig' dbus-1.12.20.org/configure.ac dbus-1.12.20/configure.ac
+--- dbus-1.12.20.org/configure.ac      2020-07-02 12:09:52.000000000 +0200
++++ dbus-1.12.20/configure.ac  2022-01-08 14:11:46.166902428 +0100
+@@ -617,7 +617,7 @@ AC_DEFINE_UNQUOTED([DBUS_USE_SYNC], [$ha
  
  #### Various functions
  AC_SEARCH_LIBS(socket,[socket network])
 -AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)])
 +AC_CHECK_FUNC(gethostbyname,,[AC_SEARCH_LIBS(gethostbyname,nsl)])
  
- AC_CHECK_FUNCS(vsnprintf vasprintf nanosleep usleep setenv clearenv unsetenv socketpair getgrouplist fpathconf setrlimit poll setlocale localeconv strtoll strtoull)
+ AC_CHECK_FUNCS([vsnprintf vasprintf nanosleep usleep setenv clearenv unsetenv socketpair getgrouplist fpathconf setrlimit poll setlocale localeconv strtoll strtoull issetugid getresuid setresuid getrlimit prlimit])
  
-@@ -1086,7 +1086,7 @@
+@@ -1209,7 +1209,7 @@ else
          have_x11=no
      else
          have_x11=yes

diff --git a/dbus.spec b/dbus.spec
index d4f1ac6d3cd3d6b25393e78219c5a342c1717246..7a9c8fdc85a23590c5fb52ee5a7a93bf12320fe9 100644 (file)
--- a/dbus.spec
+++ b/dbus.spec
@@ -13,7 +13,7 @@ Summary:      D-BUS message bus
 Summary(pl.UTF-8):     Magistrala przesyłania komunikatów D-BUS
 Name:          dbus
 Version:       1.12.20
-Release:       2
+Release:       3
 License:       AFL v2.1 or GPL v2+
 Group:         Libraries
 Source0:       https://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz