diff --git a/.gitignore b/.gitignore index a81e03a..e10b3ac 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,8 @@ /dbus-1.12.12.tar.gz /dbus-1.12.14.tar.gz /dbus-1.12.16.tar.gz +/dbus-1.12.16.tar.gz.asc +/dbus-1.12.18.tar.gz +/dbus-1.12.18.tar.gz.asc +/dbus-1.12.20.tar.gz +/dbus-1.12.20.tar.gz.asc diff --git a/dbus.spec b/dbus.spec index 52b557c..c87e4b1 100644 --- a/dbus.spec +++ b/dbus.spec @@ -22,8 +22,8 @@ Name: dbus Epoch: 1 -Version: 1.12.16 -Release: 3%{?dist} +Version: 1.12.20 +Release: 1%{?dist} Summary: D-BUS message bus # The effective license of the majority of the package, including the shared @@ -32,16 +32,21 @@ License: (GPLv2+ or AFL) and GPLv2+ URL: http://www.freedesktop.org/Software/dbus/ #VCS: git:git://git.freedesktop.org/git/dbus/dbus Source0: https://dbus.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz -Source1: 00-start-message-bus.sh -Source2: dbus.socket -Source3: dbus-daemon.service -Source4: dbus.user.socket -Source5: dbus-daemon.user.service +Source1: https://dbus.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz.asc +# gpg --keyserver keyring.debian.org --recv-keys 36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F +# gpg --export --export-options export-minimal > gpgkey-36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F.gpg +Source2: gpgkey-36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F.gpg +Source3: 00-start-message-bus.sh +Source4: dbus.socket +Source5: dbus-daemon.service +Source6: dbus.user.socket +Source7: dbus-daemon.user.service Patch0: 0001-tools-Use-Python3-for-GetAllMatchRules.patch BuildRequires: autoconf-archive BuildRequires: libtool BuildRequires: audit-libs-devel >= 0.9 +BuildRequires: gnupg2 BuildRequires: libX11-devel BuildRequires: libcap-ng-devel BuildRequires: pkgconfig(expat) @@ -68,7 +73,7 @@ BuildRequires: systemd %if %{with tests} BuildRequires: pkgconfig(gio-2.0) >= 2.40.0 BuildRequires: python3-dbus -BuildRequires: python2-gobject +BuildRequires: python3-gobject %endif %if %{with check} BuildRequires: /usr/bin/Xvfb @@ -163,6 +168,7 @@ in this separate package so server systems need not install X. %prep +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %autosetup -p1 @@ -216,11 +222,11 @@ rm -f %{buildroot}%{_userunitdir}/dbus.{socket,service} rm -f %{buildroot}%{_userunitdir}/sockets.target.wants/dbus.socket # Install downstream units -install -Dp -m755 %{SOURCE1} %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/00-start-message-bus.sh -install -Dp -m644 %{SOURCE2} %{buildroot}%{_unitdir}/dbus.socket -install -Dp -m644 %{SOURCE3} %{buildroot}%{_unitdir}/dbus-daemon.service -install -Dp -m644 %{SOURCE4} %{buildroot}%{_userunitdir}/dbus.socket -install -Dp -m644 %{SOURCE5} %{buildroot}%{_userunitdir}/dbus-daemon.service +install -Dp -m755 %{SOURCE3} %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/00-start-message-bus.sh +install -Dp -m644 %{SOURCE4} %{buildroot}%{_unitdir}/dbus.socket +install -Dp -m644 %{SOURCE5} %{buildroot}%{_unitdir}/dbus-daemon.service +install -Dp -m644 %{SOURCE6} %{buildroot}%{_userunitdir}/dbus.socket +install -Dp -m644 %{SOURCE7} %{buildroot}%{_userunitdir}/dbus-daemon.service # Obsolete, but still widely used, for drop-in configuration snippets. install --directory %{buildroot}%{_sysconfdir}/dbus-1/session.d @@ -231,6 +237,7 @@ install --directory %{buildroot}%{_datadir}/dbus-1/interfaces ## %find_lang %{gettext_package} install --directory %{buildroot}/var/lib/dbus +install --directory %{buildroot}/run/dbus install -pm 644 -t %{buildroot}%{_pkgdocdir} \ doc/introspect.dtd doc/introspect.xsl doc/system-activation.txt @@ -447,6 +454,19 @@ systemctl --no-reload --global preset dbus-daemon.service &>/dev/null || : %changelog +* Thu Jul 02 2020 David King - 1:1.12.20-1 +- Update to 1.12.20 + +* Tue Jun 02 2020 David King - 1:1.12.18-1 +- Update to 1.12.18 + +* Wed Feb 19 2020 David King - 1:1.12.16-5 +- Verify GPG signature of sources +- Improve permissions on ghosted /run/dbus + +* Fri Jan 31 2020 David King - 1:1.12.16-4 +- Update python2- to python3-gobject + * Thu Aug 01 2019 David King - 1:1.12.16-3 - Ensure that patches are applied diff --git a/gpgkey-36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F.gpg b/gpgkey-36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F.gpg new file mode 100644 index 0000000..4a5c6f8 Binary files /dev/null and b/gpgkey-36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F.gpg differ diff --git a/sources b/sources index e0dc31d..88f9199 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (dbus-1.12.16.tar.gz) = 27ae805170e9515a8bb0fba5f29d414edc70e3b6b28b7b65bbea47035b8eafa9ac4820cdc92645be6035f6748f8aa45679e1ffc84ba74a64859a3056d318b9bb +SHA512 (dbus-1.12.20.tar.gz) = 0964683bc6859374cc94e42e1ec0cdb542cca67971c205fcba4352500b6c0891665b0718e7d85eb060c81cb82e3346c313892bc02384da300ddd306c7eef0056 +SHA512 (dbus-1.12.20.tar.gz.asc) = a31207b5abb0dc81ad16eeae99b510045d57bcd6da1bb640d32efaa1f1519394fad452b455e7d4d1eaa5f1542ade5f7ba410c91ac5d2a80adec14e54ee7bd705