commit 7cbb5bb4ccf271b5a8c5a33bad7308bc83a62333 Author: Fredrik Rinnestam <fredrik@crux.nu> Date: Thu Jun 13 18:07:27 2013 +0200 dbus: fixed messy commit diff --git a/dbus/.footprint b/dbus/.footprint index ae74c27..bf0ffbd 100644 --- a/dbus/.footprint +++ b/dbus/.footprint @@ -46,15 +46,9 @@ drwxr-xr-x root/root usr/lib/dbus-1.0/include/dbus/ drwxr-xr-x root/root usr/lib/dbus/ -rwsr-x--- root/messagebus usr/lib/dbus/dbus-daemon-launch-helper -rwxr-xr-x root/root usr/lib/libdbus-1.la -<<<<<<< HEAD -lrwxrwxrwx root/root usr/lib/libdbus-1.so -> libdbus-1.so.3.7.2 -lrwxrwxrwx root/root usr/lib/libdbus-1.so.3 -> libdbus-1.so.3.7.2 --rwxr-xr-x root/root usr/lib/libdbus-1.so.3.7.2 -======= lrwxrwxrwx root/root usr/lib/libdbus-1.so -> libdbus-1.so.3.7.4 lrwxrwxrwx root/root usr/lib/libdbus-1.so.3 -> libdbus-1.so.3.7.4 -rwxr-xr-x root/root usr/lib/libdbus-1.so.3.7.4 ->>>>>>> 6682ce9... [notify] dbus: updated to 1.6.12. Fix for CVE-2013-2168. drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/dbus-1.pc drwxr-xr-x root/root usr/man/ diff --git a/dbus/.md5sum b/dbus/.md5sum index d87d8bc..c7b86c5 100644 --- a/dbus/.md5sum +++ b/dbus/.md5sum @@ -1,7 +1,3 @@ 23bc5ff22fe4f9a208d65fbbfd489ad9 30-dbus.launch -<<<<<<< HEAD -3bf059c7dd5eda5f539a1b7cfe7a14a2 dbus-1.6.8.tar.gz -======= a70edc50524f258eaf5c9a9994ed8748 dbus-1.6.12.tar.gz ->>>>>>> 6682ce9... [notify] dbus: updated to 1.6.12. Fix for CVE-2013-2168. dd882e45b9397a5dbf8650057ee9a340 rc.dbus diff --git a/dbus/Pkgfile b/dbus/Pkgfile index b9bb241..bd57707 100644 --- a/dbus/Pkgfile +++ b/dbus/Pkgfile @@ -5,11 +5,7 @@ # Depends on: expat name=dbus -<<<<<<< HEAD -version=1.6.8 -======= version=1.6.12 ->>>>>>> 6682ce9... [notify] dbus: updated to 1.6.12. Fix for CVE-2013-2168. release=1 source=(http://dbus.freedesktop.org/releases/dbus/$name-$version.tar.gz \ rc.dbus 30-dbus.launch)