diff options
| author | Anas Nashif <anas.nashif@intel.com> | 2013-06-19 06:16:37 -0400 |
|---|---|---|
| committer | Anas Nashif <anas.nashif@intel.com> | 2013-06-20 08:43:05 -0400 |
| commit | be4690faa9ef0ea719f0484658d543a0240bc24c (patch) | |
| tree | 17e80746747b04bf67f941477a8f67ddb116c26e | |
| parent | 9b89977a1bfab3a63c7660a39ba08e767b2890b8 (diff) | |
Update to dbus 1.6.12submit/tizen/20130620.124407
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
| -rw-r--r-- | .gbs.conf | 3 | ||||
| -rw-r--r-- | packaging/dbus-x11.spec | 2 | ||||
| -rw-r--r-- | packaging/dbus.changes | 3 | ||||
| -rw-r--r-- | packaging/dbus.spec | 6 |
4 files changed, 8 insertions, 6 deletions
diff --git a/.gbs.conf b/.gbs.conf new file mode 100644 index 00000000..14ddb42c --- /dev/null +++ b/.gbs.conf @@ -0,0 +1,3 @@ +[general] +upstream_branch = upstream +upstream_tag = dbus-${upstreamversion} diff --git a/packaging/dbus-x11.spec b/packaging/dbus-x11.spec index 2a6c1a8d..10ba3334 100644 --- a/packaging/dbus-x11.spec +++ b/packaging/dbus-x11.spec @@ -23,7 +23,7 @@ BuildRequires: xmlto BuildRequires: pkgconfig(libsystemd-daemon) BuildRequires: pkgconfig(libsystemd-login) %endif -Version: 1.6.10 +Version: 1.6.12 Release: 0 Source0: http://dbus.freedesktop.org/releases/dbus/dbus-%{version}.tar.gz Source1: rc.boot.dbus diff --git a/packaging/dbus.changes b/packaging/dbus.changes index 7fe8882c..0af9ef03 100644 --- a/packaging/dbus.changes +++ b/packaging/dbus.changes @@ -1,3 +1,6 @@ +* Thu Jun 20 2013 Anas Nashif <anas.nashif@intel.com> dbus-1.6.12@46d2277 +- Update to dbus 1.6.12 + * Wed Jun 19 2013 Simon McVittie <simon.mcvittie@collabora.co.uk> accepted/tizen/20130608.001941@6389295 - TZPC-3044, CVE-2013-2168: fix local denial of service (backport from 1.6.12) - TZPC-1971: make libdbus thread-safe by default (backport from 1.7.4/1.7.6) diff --git a/packaging/dbus.spec b/packaging/dbus.spec index 71bcb747..98484498 100644 --- a/packaging/dbus.spec +++ b/packaging/dbus.spec @@ -22,7 +22,7 @@ BuildRequires: xmlto BuildRequires: pkgconfig(libsystemd-daemon) BuildRequires: pkgconfig(libsystemd-login) %endif -Version: 1.6.10 +Version: 1.6.12 Release: 0 Source0: http://dbus.freedesktop.org/releases/dbus/dbus-%{version}.tar.gz Source1: rc.boot.dbus @@ -120,15 +120,12 @@ make %{?_smp_mflags} %install # COMMON2-END make DESTDIR=%{buildroot} install -mkdir -p %{buildroot}/etc/init.d mkdir -p %{buildroot}/usr/sbin -install -m 755 %{SOURCE1} %{buildroot}/%{_sysconfdir}/init.d/dbus install -d %{buildroot}/%{_localstatedir}/run/dbus mkdir -p %{buildroot}/%{_libdir}/pkgconfig mkdir -p %{buildroot}/lib/dbus-1/system-services mkdir -p %{buildroot}/%{_datadir}/dbus-1/system-services mkdir -p %{buildroot}/%{_datadir}/dbus-1/interfaces -#mkdir -p %{buildroot}/%{_libdir}/dbus-1.0/include/ rm -f %{buildroot}/%{_libdir}/*.la # rm -f %{buildroot}/%{_bindir}/dbus-launch @@ -165,7 +162,6 @@ install -m0644 %{SOURCE6} %{buildroot}%{_unitdir_user}/dbus.socket %license COPYING %config(noreplace) %{_sysconfdir}/dbus-1/session.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.conf -%{_sysconfdir}/init.d/dbus %{_sysconfdir}/ConsoleKit %{_bindir}/dbus-cleanup-sockets %{_bindir}/dbus-daemon |