From 3693dc71c8f79773b555b49e48b90fdb3bf0c235 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Thu, 17 Sep 2015 00:25:02 +0200 Subject: udisks: update to 1.05 and fix build with latest glibc-version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From News: This version fixes a security vulnerability (CVE-2014-0004), so please update as soon as possible! Signed-off-by: Andreas Müller Signed-off-by: Martin Jansa --- .../0001-fix-build-with-newer-glibc-versions.patch | 29 ++++++ .../udisks/udisks/add-systemd-support.patch | 112 --------------------- .../udisks/udisks-1.0.5-fix-service-file.patch | 33 ++++++ meta-oe/recipes-support/udisks/udisks_1.0.4.bb | 39 ------- meta-oe/recipes-support/udisks/udisks_1.0.5.bb | 39 +++++++ 5 files changed, 101 insertions(+), 151 deletions(-) create mode 100644 meta-oe/recipes-support/udisks/udisks/0001-fix-build-with-newer-glibc-versions.patch delete mode 100644 meta-oe/recipes-support/udisks/udisks/add-systemd-support.patch create mode 100644 meta-oe/recipes-support/udisks/udisks/udisks-1.0.5-fix-service-file.patch delete mode 100644 meta-oe/recipes-support/udisks/udisks_1.0.4.bb create mode 100644 meta-oe/recipes-support/udisks/udisks_1.0.5.bb (limited to 'meta-oe/recipes-support/udisks') diff --git a/meta-oe/recipes-support/udisks/udisks/0001-fix-build-with-newer-glibc-versions.patch b/meta-oe/recipes-support/udisks/udisks/0001-fix-build-with-newer-glibc-versions.patch new file mode 100644 index 000000000..520655a21 --- /dev/null +++ b/meta-oe/recipes-support/udisks/udisks/0001-fix-build-with-newer-glibc-versions.patch @@ -0,0 +1,29 @@ +From 9829152b12a8924d2e091a00133ed1a3a7ba75c0 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev +Date: Fri, 29 May 2015 21:09:39 -0400 +Subject: [PATCH] fix build with newer glibc versions + +https://bugs.freedesktop.org/show_bug.cgi?id=90778 + +Upstream-Status: Applied [1] + +[1] http://cgit.freedesktop.org/udisks/commit/?h=udisks1&id=9829152b12a8924d2e091a00133ed1a3a7ba75c0 +--- + src/helpers/job-drive-detach.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/helpers/job-drive-detach.c b/src/helpers/job-drive-detach.c +index eeafcab..d122a1f 100644 +--- a/src/helpers/job-drive-detach.c ++++ b/src/helpers/job-drive-detach.c +@@ -18,6 +18,7 @@ + * + */ + ++#include + #include + #include + #include +-- +2.1.0 + diff --git a/meta-oe/recipes-support/udisks/udisks/add-systemd-support.patch b/meta-oe/recipes-support/udisks/udisks/add-systemd-support.patch deleted file mode 100644 index 29df8a4da..000000000 --- a/meta-oe/recipes-support/udisks/udisks/add-systemd-support.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 7a485d491697906b445020dfcb37fe91806d7134 Mon Sep 17 00:00:00 2001 -From: Lennart Poettering -Date: Thu, 22 Jul 2010 02:20:22 +0200 -Subject: [PATCH] systemd: install systemd unit files -Upstream-Status: ? -Based on: https://www.libreoffice.org/bugzilla/show_bug.cgi?id=29205 ---- - Makefile.am | 5 ++++- - configure.ac | 9 +++++++++ - data/.gitignore | 1 + - data/Makefile.am | 11 ++++++++++- - data/org.freedesktop.UDisks.service.in | 2 +- - data/udisks-daemon.service.in | 12 ++++++++++++ - 6 files changed, 37 insertions(+), 3 deletions(-) - create mode 100644 data/udisks-daemon.service.in - -diff --git a/Makefile.am b/Makefile.am -index 588f05d..c3aaeea 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -24,7 +24,10 @@ EXTRA_DIST = \ - ChangeLog - - # xsltproc barfs on 'make distcheck'; disable for now --DISTCHECK_CONFIGURE_FLAGS=--disable-man-pages --disable-gtk-doc -+DISTCHECK_CONFIGURE_FLAGS = \ -+ --disable-man-pages \ -+ --disable-gtk-doc \ -+ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) - - clean-local : - rm -f *~ -diff --git a/configure.ac b/configure.ac -index a9141bf..39bbd7a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -232,6 +232,15 @@ AC_SUBST([GETTEXT_PACKAGE]) - AM_GLIB_GNU_GETTEXT - AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[gettext domain]) - -+# systemd -+ -+AC_ARG_WITH([systemdsystemunitdir], -+ AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), -+ [], -+ [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) -+AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) -+AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir"]) -+ - AC_OUTPUT([ - Makefile - data/Makefile -diff --git a/data/Makefile.am b/data/Makefile.am -index ca6d8ac..bf5c1a7 100644 ---- a/data/Makefile.am -+++ b/data/Makefile.am -@@ -35,6 +35,14 @@ avahiservicedir = $(sysconfdir)/avahi/services - avahiservice_DATA = udisks.service - endif # REMOTE_ACCESS_ENABLED - -+if HAVE_SYSTEMD -+systemdsystemunit_DATA = \ -+ udisks-daemon.service -+ -+udisks-daemon.service: udisks-daemon.service.in -+ @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ -+endif -+ - EXTRA_DIST = \ - 80-udisks.rules \ - $(dbusif_DATA) \ -@@ -42,7 +50,8 @@ EXTRA_DIST = \ - $(dbusconf_in_files) \ - udisks.pc.in \ - udisks.service \ -+ udisks-daemon.service.in \ - $(NULL) - - clean-local : -- rm -f *~ $(service_DATA) $(dbusconf_DATA) -+ rm -f *~ $(service_DATA) $(dbusconf_DATA) udisks-daemon.service -diff --git a/data/org.freedesktop.UDisks.service.in b/data/org.freedesktop.UDisks.service.in -index b3606a6..6ba2cd0 100644 ---- a/data/org.freedesktop.UDisks.service.in -+++ b/data/org.freedesktop.UDisks.service.in -@@ -2,4 +2,4 @@ - Name=org.freedesktop.UDisks - Exec=@libexecdir@/udisks-daemon - User=root -- -+SystemdService=udisks-daemon.service -diff --git a/data/udisks-daemon.service.in b/data/udisks-daemon.service.in -new file mode 100644 -index 0000000..78379b2 ---- /dev/null -+++ b/data/udisks-daemon.service.in -@@ -0,0 +1,12 @@ -+[Unit] -+Description=Disk Manager -+After=syslog.target -+ -+[Service] -+Type=dbus -+BusName=org.freedesktop.UDisks -+ExecStart=@libexecdir@/udisks-daemon -+StandardOutput=syslog -+ -+[Install] -+WantedBy=graphical.target --- -1.7.0.1 - diff --git a/meta-oe/recipes-support/udisks/udisks/udisks-1.0.5-fix-service-file.patch b/meta-oe/recipes-support/udisks/udisks/udisks-1.0.5-fix-service-file.patch new file mode 100644 index 000000000..d5e84d34d --- /dev/null +++ b/meta-oe/recipes-support/udisks/udisks/udisks-1.0.5-fix-service-file.patch @@ -0,0 +1,33 @@ +From 7d61ad048856ee239870b917d6933e3ad63f0789 Mon Sep 17 00:00:00 2001 +From: David King +Date: Thu, 2 Jul 2015 13:49:22 +0100 +Subject: [PATCH] Fix systemd service file + +udisks-daemon is installed to $(libexecdir), not $(prefix)/lib/udisks. + +https://bugzilla.redhat.com/show_bug.cgi?id=1238664 +https://bugs.freedesktop.org/show_bug.cgi?id=91191 + +Taken-From: [1] +[1] http://pkgs.fedoraproject.org/cgit/udisks.git/tree/udisks-1.0.5-fix-service-file.patch + +Upstream-Status: Pending +--- + data/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/Makefile.am b/data/Makefile.am +index 411ea0f..08af5f4 100644 +--- a/data/Makefile.am ++++ b/data/Makefile.am +@@ -31,7 +31,7 @@ systemdservicedir = $(systemdsystemunitdir) + systemdservice_DATA = $(systemdservice_in_files:.service.in=.service) + + $(systemdservice_DATA): $(systemdservice_in_files) Makefile +- @sed -e "s|\@libexecdir\@|$(prefix)/lib/udisks|" $< > $@ ++ @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ + endif + + udevrulesdir = $(slashlibdir)/udev/rules.d +-- +2.4.5 diff --git a/meta-oe/recipes-support/udisks/udisks_1.0.4.bb b/meta-oe/recipes-support/udisks/udisks_1.0.4.bb deleted file mode 100644 index 9923d6049..000000000 --- a/meta-oe/recipes-support/udisks/udisks_1.0.4.bb +++ /dev/null @@ -1,39 +0,0 @@ -DESCRIPTION = "A storage daemon that implements well-defined D-Bus interfaces that can be used to query and manipulate storage devices." -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=73d83aebe7e4b62346afde80e0e94273" - -DEPENDS = "libatasmart sg3-utils polkit libgudev dbus-glib glib-2.0 intltool-native lvm2" -# optional dependencies: device-mapper parted - -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" - -SRC_URI = "http://hal.freedesktop.org/releases/${BPN}-${PV}.tar.gz;name=${BPN} \ - file://optional-depends.patch" - -SRC_URI += "${@base_contains('DISTRO_FEATURES', 'systemd', 'file://add-systemd-support.patch', '', d)}" - -SRC_URI[udisks.md5sum] = "86c63b2b5484f2060499a052b5b6256b" -SRC_URI[udisks.sha256sum] = "854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5" - -PR = "r9" - -inherit autotools systemd gtk-doc - -PACKAGECONFIG ??= "" -PACKAGECONFIG[parted] = "--enable-parted,--disable-parted,parted" - -EXTRA_OECONF = "--disable-man-pages" - -FILES_${PN} += "${libdir}/polkit-1/extensions/*.so \ - ${datadir}/dbus-1/ \ - ${datadir}/polkit-1 \ - ${nonarch_base_libdir}/udev/* \ -" - -FILES_${PN}-dbg += "${nonarch_base_libdir}/udev/.debug" - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "udisks-daemon.service" -SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-oe/recipes-support/udisks/udisks_1.0.5.bb b/meta-oe/recipes-support/udisks/udisks_1.0.5.bb new file mode 100644 index 000000000..8ddc20dab --- /dev/null +++ b/meta-oe/recipes-support/udisks/udisks_1.0.5.bb @@ -0,0 +1,39 @@ +DESCRIPTION = "A storage daemon that implements well-defined D-Bus interfaces that can be used to query and manipulate storage devices." +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=73d83aebe7e4b62346afde80e0e94273" + +DEPENDS = "libatasmart sg3-utils polkit libgudev dbus-glib glib-2.0 intltool-native lvm2" +# optional dependencies: device-mapper parted + +DEPENDS += "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" + +SRC_URI = " \ + http://hal.freedesktop.org/releases/${BPN}-${PV}.tar.gz;name=${BPN} \ + file://optional-depends.patch \ + file://0001-fix-build-with-newer-glibc-versions.patch \ + file://udisks-1.0.5-fix-service-file.patch \ +" + +SRC_URI[udisks.md5sum] = "70d48dcfe523a74cd7c7fbbc2847fcdd" +SRC_URI[udisks.sha256sum] = "f2ec82eb0ea7e01dc299b5b29b3c18cdf861236ec43dcff66b3552b4b31c6f71" + +inherit autotools-brokensep systemd gtk-doc + +PACKAGECONFIG ??= "" +PACKAGECONFIG[parted] = "--enable-parted,--disable-parted,parted" + +EXTRA_OECONF = "--disable-man-pages" + +FILES_${PN} += "${libdir}/polkit-1/extensions/*.so \ + ${datadir}/dbus-1/ \ + ${datadir}/polkit-1 \ + ${nonarch_base_libdir}/udev/* \ +" + +FILES_${PN}-dbg += "${nonarch_base_libdir}/udev/.debug" + +RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" +SYSTEMD_SERVICE_${PN} = "udisks.service" +SYSTEMD_AUTO_ENABLE = "disable" -- cgit v1.2.3-54-g00ecf