Accepting request 960246 from home:iznogood:branches:Base:System

Resub, no multibuild.

The multibuild with several specs are a valid approch - but fine, I'll remove it.

See https://openbuildservice.org/help/manuals/obs-user-guide/cha.obs.multibuild.html

OBS-URL: https://build.opensuse.org/request/show/960246
OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-1?expand=0&rev=311
This commit is contained in:
Dirk Mueller 2022-03-08 18:40:09 +00:00 committed by Git OBS Bridge
parent dec2cdcef2
commit 11f4778ee0
12 changed files with 352 additions and 121 deletions

View File

@ -1,3 +1,102 @@
-------------------------------------------------------------------
Fri Mar 4 19:36:07 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 1.14.0:
+ Dependencies:
- dbus now requires at least a basic level of support for C99
variadic macros, as implemented in gcc >= 3, all versions of
Clang, and MSVC >= 2005. In practice this requirement has
existed since version 1.9.2, but it is now official.
- dbus now requires a C99-compatible va_copy() macro
(or a __va_copy() macro with the same behaviour), except when
building for Windows using MSVC and CMake.
- On Unix platforms, if getpwnam_r() and getgrnam_r() are
implemented, they must be POSIX-conformant. The non-POSIX
signature seen in ancient Solaris versions will no longer
work.
- GLib >= 2.38 is required if full test coverage is enabled
(reduced from 2.40 in dbus 1.12.x.)
- Building using CMake now requires CMake 3.4.
- Building documentation using CMake now requires xsltproc,
Docbook DTDs (for example docbook-xml on Debian derivatives),
and Docbook XSLT stylesheets (for example docbook-xsl on
Debian derivatives). Using KDE's meinproc4 documentation
processor is no longer supported.
+ Build-time configuration changes: Move CMake build system to
top level, matching normal practice for CMake projects
+ Deprecations:
- Third-party software should install default dbus policies for
the system bus into ${datadir}/dbus-1/system.d (this has been
supported since dbus 1.10, released in August 2015).
Installing default dbus policies in
${sysconfdir}/dbus-1/system.d is now considered to be
deprecated. Policy files in ${sysconfdir}/dbus-1/system.d
continue to be read, but this directory should only be used
by system administrators wishing to override the default
policies.
- The ${datadir} applicable to dbus is usually /usr/share and
the ${sysconfdir} is usually /etc.
- A similar pattern applies to the session bus policies in
session.d.
- The dbus-send(1) man page now documents --bus and --peer
instead of the old --address synonym for --peer, which has
been deprecated since the introduction of --bus and --peer in
1.7.6
- The dbus-daemon man page now has scarier warnings about
<allow_anonymous/> and non-local TCP, which are insecure and
should not be used, particularly for the standard system and
session buses.
- DBusServer (and hence the dbus-daemon) no longer accepts
usernames (login names) for the recommended EXTERNAL
authentication mechanism, only numeric user IDs or the empty
string. See 1.13.0 release notes for full details.
+ New features:
- On Linux 4.13 or later when built against a suitable glibc
version, GetConnectionCredentials() now includes
UnixGroupIDs, the effective group IDs of the initiator of the
connection, taken from SO_PEERGROUPS.
- On Linux 4.13 or later, <policy group="…"> now uses the
SO_PEERGROUPS credentials-passing socket option to get the
effective group IDs of the initiator of the connection. See
1.13.4 release notes for details.
- Add a --sender option to dbus-send, which requests a name and
holds it until the signal has been sent
- dbus-daemon <allow> and <deny> rules can now specify a
send_destination_prefix attribute, which is like a
combination of send_destination and the arg0namespace keyword
in match rules. See 1.13.12 release notes for more details.
- The dbus-daemon now filters the messages that it relays,
removing header fields that it does not understand. Clients
must not rely on this behaviour unless they have confirmed
that they are connected to a suitable message bus
implementation, for example by querying its Features
property.
- The dbus-daemon now emits a signal,
ActivatableServicesChanged, when the list of activatable
services may have changed. Support for this signal can be
discovered by querying the Features property.
- It is now possible to disable traditional (non-systemd)
service activation at build-time (Autotools:
--disable-traditional-activation, CMake:
-DENABLE_TRADITIONAL_ACTIVATION=OFF). See 1.13.10 release
notes for details.
- The API reference manual can be built as a Qt compiled help
file if qhelpgenerator(-qt5) is available. See 1.13.16
release notes for details.
+ Miscellaneous behaviour changes:
- When using the "user bus" (--enable-user-session), put the
dbus-daemon in the session slice
- Several environment variables set by systemd are no longer
passed on to activated services
- If the dbus-daemon is compiled for Linux with systemd
support, it now informs systemd that it is ready for use via
the sd_notify() mechanism.
- Tarball releases no longer contain pre-2007 changelogs and
are now compressed with xz, making them around 35% smaller.
- Drop conditionals for old obsolete versions of openSUSE.
- Rebase patches with quilt.
- Use https for source and sig URL.
-------------------------------------------------------------------
Tue Mar 1 18:29:55 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>

View File

@ -23,21 +23,24 @@
%global _backup %{_sysconfdir}/sysconfig/services.rpmbak.%{name}-%{version}-%{release}
%bcond_without selinux
Name: dbus-1-devel-doc
Version: 1.12.22
Version: 1.14.0
Release: 0
Summary: Developer documentation package for D-Bus
License: AFL-2.1 OR GPL-2.0-or-later
URL: https://dbus.freedesktop.org/
Source0: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.gz
Source1: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.gz.asc
Source0: https://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.xz
Source1: https://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.xz.asc
Source2: dbus-1.keyring
Source3: baselibs.conf
Source4: dbus-1.desktop
# PATCH-FEATURE-OPENSUSE feature-suse-log-deny.patch
Patch0: feature-suse-log-deny.patch
# PATCH-FIX-OPENSUSE coolo@suse.de -- force a feature configure won't accept without x11 in buildrequires
Patch1: feature-suse-do-autolaunch.patch
# Patch-Feature-opensuse sflees@suse.de, users shouldn't be allowed to start / stop the dbus service.
# 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
BuildRequires: doxygen
BuildRequires: libexpat-devel >= 2.1.0
BuildRequires: xmlto
@ -82,8 +85,9 @@ doxygen -u
rm -Rf %{buildroot}/%{_mandir}/man1/*
rmdir -p --ignore-fail-on-non-empty %{buildroot}/%{_mandir}/man1
# Remove DTDs (shipped in devel subpackage)
# Remove DTDs and xml catalog (shipped in devel subpackage)
rm -Rf %{buildroot}/%{_datadir}/xml/dbus-1/*dtd
rm -Rf %{buildroot}/%{_datadir}/xml/dbus-1/*.xml
rmdir -p --ignore-fail-on-non-empty %{buildroot}/%{_datadir}/xml/dbus-1
mkdir -p %{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/

View File

@ -1,3 +1,102 @@
-------------------------------------------------------------------
Fri Mar 4 19:36:07 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 1.14.0:
+ Dependencies:
- dbus now requires at least a basic level of support for C99
variadic macros, as implemented in gcc >= 3, all versions of
Clang, and MSVC >= 2005. In practice this requirement has
existed since version 1.9.2, but it is now official.
- dbus now requires a C99-compatible va_copy() macro
(or a __va_copy() macro with the same behaviour), except when
building for Windows using MSVC and CMake.
- On Unix platforms, if getpwnam_r() and getgrnam_r() are
implemented, they must be POSIX-conformant. The non-POSIX
signature seen in ancient Solaris versions will no longer
work.
- GLib >= 2.38 is required if full test coverage is enabled
(reduced from 2.40 in dbus 1.12.x.)
- Building using CMake now requires CMake 3.4.
- Building documentation using CMake now requires xsltproc,
Docbook DTDs (for example docbook-xml on Debian derivatives),
and Docbook XSLT stylesheets (for example docbook-xsl on
Debian derivatives). Using KDE's meinproc4 documentation
processor is no longer supported.
+ Build-time configuration changes: Move CMake build system to
top level, matching normal practice for CMake projects
+ Deprecations:
- Third-party software should install default dbus policies for
the system bus into ${datadir}/dbus-1/system.d (this has been
supported since dbus 1.10, released in August 2015).
Installing default dbus policies in
${sysconfdir}/dbus-1/system.d is now considered to be
deprecated. Policy files in ${sysconfdir}/dbus-1/system.d
continue to be read, but this directory should only be used
by system administrators wishing to override the default
policies.
- The ${datadir} applicable to dbus is usually /usr/share and
the ${sysconfdir} is usually /etc.
- A similar pattern applies to the session bus policies in
session.d.
- The dbus-send(1) man page now documents --bus and --peer
instead of the old --address synonym for --peer, which has
been deprecated since the introduction of --bus and --peer in
1.7.6
- The dbus-daemon man page now has scarier warnings about
<allow_anonymous/> and non-local TCP, which are insecure and
should not be used, particularly for the standard system and
session buses.
- DBusServer (and hence the dbus-daemon) no longer accepts
usernames (login names) for the recommended EXTERNAL
authentication mechanism, only numeric user IDs or the empty
string. See 1.13.0 release notes for full details.
+ New features:
- On Linux 4.13 or later when built against a suitable glibc
version, GetConnectionCredentials() now includes
UnixGroupIDs, the effective group IDs of the initiator of the
connection, taken from SO_PEERGROUPS.
- On Linux 4.13 or later, <policy group="…"> now uses the
SO_PEERGROUPS credentials-passing socket option to get the
effective group IDs of the initiator of the connection. See
1.13.4 release notes for details.
- Add a --sender option to dbus-send, which requests a name and
holds it until the signal has been sent
- dbus-daemon <allow> and <deny> rules can now specify a
send_destination_prefix attribute, which is like a
combination of send_destination and the arg0namespace keyword
in match rules. See 1.13.12 release notes for more details.
- The dbus-daemon now filters the messages that it relays,
removing header fields that it does not understand. Clients
must not rely on this behaviour unless they have confirmed
that they are connected to a suitable message bus
implementation, for example by querying its Features
property.
- The dbus-daemon now emits a signal,
ActivatableServicesChanged, when the list of activatable
services may have changed. Support for this signal can be
discovered by querying the Features property.
- It is now possible to disable traditional (non-systemd)
service activation at build-time (Autotools:
--disable-traditional-activation, CMake:
-DENABLE_TRADITIONAL_ACTIVATION=OFF). See 1.13.10 release
notes for details.
- The API reference manual can be built as a Qt compiled help
file if qhelpgenerator(-qt5) is available. See 1.13.16
release notes for details.
+ Miscellaneous behaviour changes:
- When using the "user bus" (--enable-user-session), put the
dbus-daemon in the session slice
- Several environment variables set by systemd are no longer
passed on to activated services
- If the dbus-daemon is compiled for Linux with systemd
support, it now informs systemd that it is ready for use via
the sd_notify() mechanism.
- Tarball releases no longer contain pre-2007 changelogs and
are now compressed with xz, making them around 35% smaller.
- Drop conditionals for old obsolete versions of openSUSE.
- Rebase patches with quilt.
- Use https for source and sig URL.
-------------------------------------------------------------------
Tue Mar 1 18:29:55 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>

View File

@ -16,12 +16,6 @@
#
%if 0%{?suse_version} > 1500
%bcond_without libalternatives
%else
%bcond_with libalternatives
%endif
%define _name dbus
%define _libname libdbus-1-3
%if 0%{?suse_version} <= 1320
@ -29,21 +23,25 @@
%endif
%bcond_without selinux
Name: dbus-1-x11
Version: 1.12.22
Version: 1.14.0
Release: 0
Summary: D-Bus Message Bus System
License: AFL-2.1 OR GPL-2.0-or-later
URL: https://dbus.freedesktop.org/
Source0: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.gz
Source1: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.gz.asc
Source0: https://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.xz
Source1: https://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.xz.asc
Source2: dbus-1.keyring
Source3: baselibs.conf
Source4: dbus-1.desktop
# PATCH-FEATURE-OPENSUSE feature-suse-log-deny.patch
Patch0: feature-suse-log-deny.patch
# PATCH-FIX-OPENSUSE coolo@suse.de -- force a feature configure won't accept without x11 in buildrequires
Patch1: feature-suse-do-autolaunch.patch
# Patch-Feature-opensuse sflees@suse.de, users shouldn't be allowed to start / stop the dbus service.
# 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
BuildRequires: alts
BuildRequires: autoconf-archive
BuildRequires: libcap-ng-devel
BuildRequires: libexpat-devel >= 2.1.0
@ -51,13 +49,8 @@ BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: pkgconfig(libsystemd) >= 209
BuildRequires: pkgconfig(x11)
%if %{with libalternatives}
Requires: alts
BuildRequires: alts
%else
Requires(post): update-alternatives
Requires(preun):update-alternatives
%endif
Supplements: (dbus-1 and libX11-6)
Provides: dbus-launch
%if %{with selinux}
@ -105,11 +98,6 @@ tdir=$(mktemp -d)
make DESTDIR=$tdir install
mkdir -p %{buildroot}/%{_bindir}
mv $tdir/%{_bindir}/dbus-launch %{buildroot}/%{_bindir}/dbus-launch.x11
%if ! %{with libalternatives}
# create symlinks for update-alternatives
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
ln -s -f %{_sysconfdir}/alternatives/dbus-launch %{buildroot}%{_bindir}/dbus-launch
%else
# create entries for libalternatives
ln -sf %{_bindir}/alts %{buildroot}%{_bindir}/dbus-launch
mkdir -p %{buildroot}%{_datadir}/libalternatives/dbus-launch
@ -117,33 +105,17 @@ cat > %{buildroot}%{_datadir}/libalternatives/dbus-launch/20.conf <<EOF
binary=%{_bindir}/dbus-launch.x11
group=dbus-launch
EOF
%endif
%if %{with libalternatives}
%pre
# removing old update-alternatives entries
if [ "$1" -gt 0 ] && [ -f %{_sbindir}/update-alternatives ] ; then
%{_sbindir}/update-alternatives --remove dbus-launch %{_bindir}/dbus-launch.x11
fi
%else
%post
%{_sbindir}/update-alternatives --install %{_bindir}/dbus-launch dbus-launch %{_bindir}/dbus-launch.x11 20
%preun
if [ "$1" = 0 ] ; then
%{_sbindir}/update-alternatives --remove dbus-launch %{_bindir}/dbus-launch.x11
fi
%endif
%files
%if ! %{with libalternatives}
%ghost %{_sysconfdir}/alternatives/dbus-launch
%else
%dir %{_datadir}/libalternatives
%dir %{_datadir}/libalternatives/dbus-launch
%{_datadir}/libalternatives/dbus-launch/20.conf
%endif
%{_bindir}/dbus-launch
%{_bindir}/dbus-launch.x11

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8d25785c798ec4f892e6f9d177fb0ceeb8b29867b119798f9d5228561d3ad474
size 2108231

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEENuxaZEik9e95vv6Y4FrhR4+BTE8FAmIY+SQACgkQ4FrhR4+B
TE+7FQ/+Nm3UKhQU2LaSsH0WWoMBowC+w0vQX3yNfgTr7sIpqPIEX95gzc+lqDHW
ra2E/0wnn5xf6GKP6Q5BHfRQO4gP5wWaXjtJu0veDClE0OT5EATyXRVCNFUGK/u6
3CkUXKgiw+BRe6d2XmcDmNisv+9rUXjVymp8uiKIqp0Fc1B90TNGzagGCH8Vavan
kVJPGYnETOl0kcCc/lUf9jz30gy7a4f8fjaHEtSOyRFYpdmdPm9pNKtvs1B8bBTd
rv89lL2dH6oCT0oLl/lTnCG3WJKMzcoM8Q4hvegCXNXWCWyTOgCr6cFV5R8O7Ruc
vt7beE+OvV1fJX3ens74a9GknKsfJJqyXTmsnrk5zLXgOfz8IQtaFhzM5OVApcna
f+nPZIWByvwchhjSpO7q+vgIeO2QojeNfA5fbs2+pgl0NjXq7JaWs/6atK94Cutf
jxNd/2QPTi32kNoAa8b2/wloWttYdJ++2QHAionfJH5nB26e1P/ef9ZttxW7nryC
fKB2Y1jfLSQGey3bi0EZ1D6IowIyZaUGBY3TXOus7MO9G2CdIOQ72Tc3RsX8zVKb
ssne7ZondF1g9hjyGu6kYjK4hzktQubRjI7zzZ2abxhEVKdC1rGlZN6EjJwFtxL5
C3+N78aLJGHOWcefZrZWmtkqz/FrkpfEaQzyNFk5bijYtYQPbE4=
=NGrc
-----END PGP SIGNATURE-----

3
dbus-1.14.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ccd7cce37596e0a19558fd6648d1272ab43f011d80c8635aea8fd0bad58aebd4
size 1360228

16
dbus-1.14.0.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEENuxaZEik9e95vv6Y4FrhR4+BTE8FAmIcxWIACgkQ4FrhR4+B
TE+qGBAAhuMFDt8cwBPTGewD6vLPoVhL348QWv5jZBNFtFXzLgf8cYOqHOY/ZTfn
FmBhEziqTTr3eLUrRm71vqnTkq2mvEpQ0BGpmTD2rXbw7uluSEwX7JjA643LYo/e
XuxCGkNLDi+UOOu96DmLdHtxxX++BHvA9T29oYhE4ZtvUMyWKzCNFUlO97vy4F0p
5stUJ7lWtTnM5pKo7WL+gT0HLOp6ygAdzqFuKexToEowpHQ0nH57HjFUSbNCNjqY
TYyaFz1H0208iR0hqxiCHGTB5pgCBqXOceqaUGJVRX9mRqjr8MEvbzHV/SFkamsZ
cRaYa7k9x4IYtnIX5sotfBALo/RdwjpuytXD6JCdQP1h3cm7zrRY3VAmGJ7lZrwx
b+0Wi/9w1eDHUPnSB8z6dVMSNE+EaWLz21fpdAHj+IcXpJzbJ25fdvTU6hiTB+CB
Lm7ilO0CIYhNFzx7Ir95lT+8DuNOOCYlRLQtahbTUyYmfXmB+91PXIdl2LcOfyl0
8hwC09mALt/GBOaOQUHquRNZmkwsbA/EUfgfhhvuSA3mWH1SRHZ9ado7CD8Vyq8+
9rySEY5HvOQ/EmClrsksIqHiSeFrzp6a5PbRIYGTUPsyD1NDPOQI8l9XLIJozGEo
Lt88atg/ZuBbJtCl5GoynLU4OG5aHYJ4hBaPPuLX9vpSSZKJD8k=
=hg/h
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,102 @@
-------------------------------------------------------------------
Fri Mar 4 19:36:07 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 1.14.0:
+ Dependencies:
- dbus now requires at least a basic level of support for C99
variadic macros, as implemented in gcc >= 3, all versions of
Clang, and MSVC >= 2005. In practice this requirement has
existed since version 1.9.2, but it is now official.
- dbus now requires a C99-compatible va_copy() macro
(or a __va_copy() macro with the same behaviour), except when
building for Windows using MSVC and CMake.
- On Unix platforms, if getpwnam_r() and getgrnam_r() are
implemented, they must be POSIX-conformant. The non-POSIX
signature seen in ancient Solaris versions will no longer
work.
- GLib >= 2.38 is required if full test coverage is enabled
(reduced from 2.40 in dbus 1.12.x.)
- Building using CMake now requires CMake 3.4.
- Building documentation using CMake now requires xsltproc,
Docbook DTDs (for example docbook-xml on Debian derivatives),
and Docbook XSLT stylesheets (for example docbook-xsl on
Debian derivatives). Using KDE's meinproc4 documentation
processor is no longer supported.
+ Build-time configuration changes: Move CMake build system to
top level, matching normal practice for CMake projects
+ Deprecations:
- Third-party software should install default dbus policies for
the system bus into ${datadir}/dbus-1/system.d (this has been
supported since dbus 1.10, released in August 2015).
Installing default dbus policies in
${sysconfdir}/dbus-1/system.d is now considered to be
deprecated. Policy files in ${sysconfdir}/dbus-1/system.d
continue to be read, but this directory should only be used
by system administrators wishing to override the default
policies.
- The ${datadir} applicable to dbus is usually /usr/share and
the ${sysconfdir} is usually /etc.
- A similar pattern applies to the session bus policies in
session.d.
- The dbus-send(1) man page now documents --bus and --peer
instead of the old --address synonym for --peer, which has
been deprecated since the introduction of --bus and --peer in
1.7.6
- The dbus-daemon man page now has scarier warnings about
<allow_anonymous/> and non-local TCP, which are insecure and
should not be used, particularly for the standard system and
session buses.
- DBusServer (and hence the dbus-daemon) no longer accepts
usernames (login names) for the recommended EXTERNAL
authentication mechanism, only numeric user IDs or the empty
string. See 1.13.0 release notes for full details.
+ New features:
- On Linux 4.13 or later when built against a suitable glibc
version, GetConnectionCredentials() now includes
UnixGroupIDs, the effective group IDs of the initiator of the
connection, taken from SO_PEERGROUPS.
- On Linux 4.13 or later, <policy group="…"> now uses the
SO_PEERGROUPS credentials-passing socket option to get the
effective group IDs of the initiator of the connection. See
1.13.4 release notes for details.
- Add a --sender option to dbus-send, which requests a name and
holds it until the signal has been sent
- dbus-daemon <allow> and <deny> rules can now specify a
send_destination_prefix attribute, which is like a
combination of send_destination and the arg0namespace keyword
in match rules. See 1.13.12 release notes for more details.
- The dbus-daemon now filters the messages that it relays,
removing header fields that it does not understand. Clients
must not rely on this behaviour unless they have confirmed
that they are connected to a suitable message bus
implementation, for example by querying its Features
property.
- The dbus-daemon now emits a signal,
ActivatableServicesChanged, when the list of activatable
services may have changed. Support for this signal can be
discovered by querying the Features property.
- It is now possible to disable traditional (non-systemd)
service activation at build-time (Autotools:
--disable-traditional-activation, CMake:
-DENABLE_TRADITIONAL_ACTIVATION=OFF). See 1.13.10 release
notes for details.
- The API reference manual can be built as a Qt compiled help
file if qhelpgenerator(-qt5) is available. See 1.13.16
release notes for details.
+ Miscellaneous behaviour changes:
- When using the "user bus" (--enable-user-session), put the
dbus-daemon in the session slice
- Several environment variables set by systemd are no longer
passed on to activated services
- If the dbus-daemon is compiled for Linux with systemd
support, it now informs systemd that it is ready for use via
the sd_notify() mechanism.
- Tarball releases no longer contain pre-2007 changelogs and
are now compressed with xz, making them around 35% smaller.
- Drop conditionals for old obsolete versions of openSUSE.
- Rebase patches with quilt.
- Use https for source and sig URL.
-------------------------------------------------------------------
Tue Mar 1 18:29:55 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>

View File

@ -16,33 +16,31 @@
#
%if 0%{?suse_version} > 1500
%bcond_without libalternatives
%else
%bcond_with libalternatives
%endif
%define with_systemd 1
%define _name dbus
%define _libname libdbus-1-3
%bcond_without selinux
Name: dbus-1
Version: 1.12.22
Version: 1.14.0
Release: 0
Summary: D-Bus Message Bus System
License: AFL-2.1 OR GPL-2.0-or-later
URL: https://dbus.freedesktop.org/
Source0: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.gz
Source1: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.gz.asc
Source0: https://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.xz
Source1: https://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.xz.asc
Source2: dbus-1.keyring
Source3: baselibs.conf
Source4: dbus-1.desktop
Source5: messagebus.conf
# PATCH-FEATURE-OPENSUSE feature-suse-log-deny.patch
Patch0: feature-suse-log-deny.patch
# PATCH-FIX-OPENSUSE coolo@suse.de -- force a feature configure won't accept without x11 in buildrequires
Patch1: feature-suse-do-autolaunch.patch
# Patch-Feature-opensuse sflees@suse.de, users shouldn't be allowed to start / stop the dbus service.
# 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
BuildRequires: alts
BuildRequires: audit-devel
BuildRequires: cmake
BuildRequires: libcap-ng-devel
@ -52,16 +50,11 @@ BuildRequires: pkgconfig
BuildRequires: sysuser-tools
BuildRequires: xmlto
BuildRequires: pkgconfig(libsystemd) >= 209
Requires(post): %{_libname} = %{version}
Requires(post): diffutils
Requires(pre): permissions
%if %{with libalternatives}
Requires: alts
BuildRequires: alts
%else
Requires(post): update-alternatives
Requires(preun):update-alternatives
%endif
Provides: dbus-launch
%sysusers_requires
%if %{with selinux}
@ -157,25 +150,6 @@ done
mkdir -p %{buildroot}%{_localstatedir}/lib/dbus
%if !0%{?usrmerged}
# Link the binaries that were in /bin back to /bin for compat (maybe remove for SLE-16)
# Currently required to make upower work together with systemd
mkdir -p %{buildroot}/bin
ln -sf /%{_bindir}/dbus-cleanup-sockets %{buildroot}/bin/dbus-cleanup-sockets
ln -sf /%{_bindir}/dbus-daemon %{buildroot}/bin/dbus-daemon
ln -sf /%{_bindir}/dbus-monitor %{buildroot}/bin/dbus-monitor
ln -sf /%{_bindir}/dbus-send %{buildroot}/bin/dbus-send
ln -sf /%{_bindir}/dbus-test-tool %{buildroot}/bin/dbus-test-tool
ln -sf /%{_bindir}/dbus-update-activation-environment %{buildroot}/bin/dbus-update-activation-environment
ln -sf /%{_bindir}/dbus-uuidgen %{buildroot}/bin/dbus-uuidgen
%endif
%if ! %{with libalternatives}
# create symlinks for update-alternatives
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
ln -s -f %{_sysconfdir}/alternatives/dbus-launch %{buildroot}%{_bindir}/dbus-launch
%else
# create entries for libalternatives
ln -sf %{_bindir}/alts %{buildroot}%{_bindir}/dbus-launch
mkdir -p %{buildroot}%{_datadir}/libalternatives/dbus-launch
@ -183,7 +157,6 @@ cat > %{buildroot}%{_datadir}/libalternatives/dbus-launch/10.conf <<EOF
binary=%{_bindir}/dbus-launch.nox11
group=dbus-launch
EOF
%endif
find %{buildroot} -type f -name "*.la" -delete -print
@ -252,15 +225,6 @@ fi
%{_bindir}/dbus-test-tool
%{_bindir}/dbus-update-activation-environment
%{_bindir}/dbus-uuidgen
%if !0%{?usrmerged}
/bin/dbus-cleanup-sockets
/bin/dbus-daemon
/bin/dbus-monitor
/bin/dbus-send
/bin/dbus-test-tool
/bin/dbus-update-activation-environment
/bin/dbus-uuidgen
%endif
%{_mandir}/man1/dbus-cleanup-sockets.1%{?ext_man}
%{_mandir}/man1/dbus-daemon.1%{?ext_man}
%{_mandir}/man1/dbus-monitor.1%{?ext_man}
@ -280,8 +244,6 @@ fi
%{_prefix}/lib/tmpfiles.d/dbus.conf
%{_unitdir}/dbus.service
%{_unitdir}/dbus.socket
# %%dir %%{_unitdir}/dbus.target.wants
# %%{_unitdir}/dbus.target.wants/dbus.socket
%dir %{_unitdir}/multi-user.target.wants
%{_unitdir}/multi-user.target.wants/dbus.service
%dir %{_unitdir}/sockets.target.wants
@ -290,13 +252,9 @@ fi
%{_userunitdir}/dbus.socket
%dir %{_userunitdir}/sockets.target.wants
%{_userunitdir}/sockets.target.wants/dbus.socket
%if ! %{with libalternatives}
%ghost %{_sysconfdir}/alternatives/dbus-launch
%else
%dir %{_datadir}/libalternatives
%dir %{_datadir}/libalternatives/dbus-launch
%{_datadir}/libalternatives/dbus-launch/10.conf
%endif
%{_bindir}/dbus-launch.nox11
%{_bindir}/dbus-launch

View File

@ -2,11 +2,11 @@ From: Stephan Kulow <coolo@suse.de>
We want x11 autolaunch even if we have no x11 in the build environment
Index: dbus-1.12.2/dbus/dbus-sysdeps-unix.c
Index: dbus-1.14.0/dbus/dbus-sysdeps-unix.c
===================================================================
--- dbus-1.12.2.orig/dbus/dbus-sysdeps-unix.c
+++ dbus-1.12.2/dbus/dbus-sysdeps-unix.c
@@ -3552,7 +3552,7 @@ _dbus_get_tmpdir(void)
--- dbus-1.14.0.orig/dbus/dbus-sysdeps-unix.c
+++ dbus-1.14.0/dbus/dbus-sysdeps-unix.c
@@ -3902,7 +3902,7 @@ _dbus_get_tmpdir(void)
return tmpdir;
}
@ -15,7 +15,7 @@ Index: dbus-1.12.2/dbus/dbus-sysdeps-unix.c
/**
* Execute a subprocess, returning up to 1024 bytes of output
* into @p result.
@@ -3787,7 +3787,7 @@ _dbus_get_autolaunch_address (const char
@@ -4139,7 +4139,7 @@ _dbus_get_autolaunch_address (const char
DBusString *address,
DBusError *error)
{

View File

@ -1,7 +1,7 @@
Index: dbus-1.12.2/bus/dbus.service.in
Index: dbus-1.14.0/bus/dbus.service.in
===================================================================
--- dbus-1.12.2.orig/bus/dbus.service.in
+++ dbus-1.12.2/bus/dbus.service.in
--- dbus-1.14.0.orig/bus/dbus.service.in
+++ dbus-1.14.0/bus/dbus.service.in
@@ -2,6 +2,8 @@
Description=D-Bus System Message Bus
Documentation=man:dbus-daemon(1)
@ -10,4 +10,4 @@ Index: dbus-1.12.2/bus/dbus.service.in
+RefuseManualStop=true
[Service]
ExecStart=@EXPANDED_BINDIR@/dbus-daemon --system --address=systemd: --nofork --nopidfile --systemd-activation --syslog-only
Type=notify