public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/udisks/, sys-fs/udisks/files/
@ 2017-02-19  1:29 Michael Palimaka
  0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2017-02-19  1:29 UTC (permalink / raw
  To: gentoo-commits

commit:     de51cc0b6494f6b55336f7ad81c588f331827353
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 19 01:29:05 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Feb 19 01:29:18 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de51cc0b

sys-fs/udisks: remove old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-fs/udisks/Manifest                           |   2 -
 sys-fs/udisks/files/udisks-2.1.7-sysmacros.patch |  83 -----------------
 sys-fs/udisks/udisks-2.1.4.ebuild                | 102 ---------------------
 sys-fs/udisks/udisks-2.1.7-r1.ebuild             | 112 -----------------------
 sys-fs/udisks/udisks-2.1.7.ebuild                | 108 ----------------------
 5 files changed, 407 deletions(-)

diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index 5b1dc1b2ca..f5c49c2b90 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -1,4 +1,2 @@
 DIST udisks-1.0.5.tar.gz 736221 SHA256 f2ec82eb0ea7e01dc299b5b29b3c18cdf861236ec43dcff66b3552b4b31c6f71 SHA512 bdf4970113975221ff0e17866db18fd969ff9c8e1e851c8ad7572630814ab0c46b59df59433edcb2e7cc41cc8152afd35807f45e07f6d0fa87b21b5a77d0965a WHIRLPOOL 4698911bf53532b5149a71ab1a031fa836193476114ba26f0cde588c3095661f21492feb855e1eb3aa8f1c87ad8125bdc32b7cf56ac43f2de84073f3085f39eb
-DIST udisks-2.1.4.tar.bz2 901364 SHA256 a4e148dd3a4a209160452a12cfe770382836027002f6c84f2e6c17eb5be519bb SHA512 782e94d27cdacf4178fc7c39ad300168d3280be6cd434f067c6e329efe91544d5bbfe9a2499483e3f4bdce16c55a061be53d9c592943b693441db8f9cfacee12 WHIRLPOOL fbb2487dce06f241112f2ba7dadcd384dd2b448a0f15688381331d01a8f954231f1794d7e26667b30ee6f899ec516dad620082caf4b0292d6a5bc91faf52231d
-DIST udisks-2.1.7.tar.bz2 920042 SHA256 abae2bb3bdc691ca13c1e4c244630b8c881c4f3b35c207299f1b39b7bec83785 SHA512 d32ec0741b4c55e863587a27095f69cf0375e0c80db70f2540cde70382dcafdce07a098a55b52a450c2014a6e09a4af0b70192bbc5b92ffd57b05a3bf3ab3111 WHIRLPOOL 54a222e4b526795466789a86679c243133c0b303acfc1208fde162a6f8b975d731eb8669672c2846b830ad32dcb9cc778b59746bc5f5ede27ee9b1d1ad4c9f73
 DIST udisks-2.1.8.tar.bz2 931110 SHA256 da416914812a77e5f4d82b81deb8c25799fd3228d27d52f7bf89a501b1857dda SHA512 4f8adc0ebd5e8f34801722cacef09fe176a0e301889b98ecddad1bfbc61b008b2035518cdaf270258a80e087b0a5cb685ddba1373ba332a8d7967656a08156cb WHIRLPOOL 396465f32c9798495e4cd1ce541b619e5ed9d2693561da9a2630eeb27933deac8fa3959ee0c4f16d63bad297f4cadf8df9a4e5dd07b7dc06951cb84d12c64e64

diff --git a/sys-fs/udisks/files/udisks-2.1.7-sysmacros.patch b/sys-fs/udisks/files/udisks-2.1.7-sysmacros.patch
deleted file mode 100644
index a353835f08..0000000000
--- a/sys-fs/udisks/files/udisks-2.1.7-sysmacros.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-https://bugs.gentoo.org/580230
-https://bugs.freedesktop.org/95028
-
-From 245093a15abe985b1746603c00084cb972fb71ae Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 19 Apr 2016 23:04:32 -0400
-Subject: [PATCH] include sys/sysmacros.h for major/minor/makedev
-
-Linux C libraries are moving away from implicit includes of
-sys/sysmacros.h, so pull in this header directly in the files
-that use these funcs.
----
- src/udiskslinuxfilesystem.c | 2 +-
- src/udiskslinuxpartition.c  | 1 +
- src/udisksmountmonitor.c    | 1 +
- src/udisksstate.c           | 1 +
- tools/umount-udisks.c       | 1 +
- 5 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/udiskslinuxfilesystem.c b/src/udiskslinuxfilesystem.c
-index 68f7c4d..67132ab 100644
---- a/src/udiskslinuxfilesystem.c
-+++ b/src/udiskslinuxfilesystem.c
-@@ -29,7 +29,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <mntent.h>
--#include <sys/types.h>
-+#include <sys/sysmacros.h>
- #ifdef HAVE_ACL
- #include <sys/acl.h>
- #endif
-diff --git a/src/udiskslinuxpartition.c b/src/udiskslinuxpartition.c
-index bfee216..12b73bc 100644
---- a/src/udiskslinuxpartition.c
-+++ b/src/udiskslinuxpartition.c
-@@ -26,6 +26,7 @@
- #include <grp.h>
- #include <string.h>
- #include <stdlib.h>
-+#include <sys/sysmacros.h>
- #include <glib-unix.h>
- 
- #include <glib/gstdio.h>
-diff --git a/src/udisksmountmonitor.c b/src/udisksmountmonitor.c
-index 891d118..eae6c02 100644
---- a/src/udisksmountmonitor.c
-+++ b/src/udisksmountmonitor.c
-@@ -28,6 +28,7 @@
- #include <string.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <mntent.h>
- 
- #include <glib.h>
-diff --git a/src/udisksstate.c b/src/udisksstate.c
-index fc7451a..2eeaf44 100644
---- a/src/udisksstate.c
-+++ b/src/udisksstate.c
-@@ -25,6 +25,7 @@
- #include <glib/gstdio.h>
- 
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <fcntl.h>
- #include <sys/ioctl.h>
- #include <linux/loop.h>
-diff --git a/tools/umount-udisks.c b/tools/umount-udisks.c
-index 8ce5fea..73ddea7 100644
---- a/tools/umount-udisks.c
-+++ b/tools/umount-udisks.c
-@@ -25,6 +25,7 @@
- #include <stdlib.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <unistd.h>
- #include <string.h>
- 
--- 
-2.7.4
-

diff --git a/sys-fs/udisks/udisks-2.1.4.ebuild b/sys-fs/udisks/udisks-2.1.4.ebuild
deleted file mode 100644
index 0228960525..0000000000
--- a/sys-fs/udisks/udisks-2.1.4.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit bash-completion-r1 eutils linux-info systemd udev
-
-DESCRIPTION="Daemon providing interfaces to work with storage devices"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks"
-SRC_URI="https://udisks.freedesktop.org/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86"
-IUSE="debug cryptsetup +gptfdisk +introspection selinux systemd"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36
-	>=dev-libs/libatasmart-0.19
-	>=sys-auth/polkit-0.110
-	virtual/acl
-	virtual/libgudev:=
-	virtual/udev
-	introspection? ( >=dev-libs/gobject-introspection-1.30 )
-	systemd? ( sys-apps/systemd )"
-# gptfdisk -> src/udiskslinuxpartition.c -> sgdisk (see also #412801#c1)
-# util-linux -> mount, umount, swapon, swapoff (see also #403073)
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/util-linux-2.20.1-r2
-	>=sys-block/parted-3
-	virtual/eject
-	cryptsetup? (
-		sys-fs/cryptsetup[udev(+)]
-		sys-fs/lvm2[udev(+)]
-		)
-	gptfdisk? ( >=sys-apps/gptfdisk-0.8 )
-	selinux? ( sec-policy/selinux-devicekit )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.32
-	dev-util/intltool
-	>=sys-kernel/linux-headers-3.1
-	virtual/pkgconfig"
-
-QA_MULTILIB_PATHS="usr/lib/udisks2/udisksd"
-
-DOCS="AUTHORS HACKING NEWS README"
-
-pkg_setup() {
-	# Listing only major arch's here to avoid tracking kernel's defconfig
-	if use amd64 || use arm || use ppc || use ppc64 || use x86; then
-		CONFIG_CHECK="~!IDE" #319829
-		CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377
-		CONFIG_CHECK+=" ~SWAP" # https://forums.gentoo.org/viewtopic-t-923640.html
-		CONFIG_CHECK+=" ~NLS_UTF8" #425562
-		kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	use systemd || { sed -i -e 's:libsystemd-login:&disable:' configure || die; }
-
-	epatch_user
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--disable-static \
-		$(use_enable debug) \
-		--disable-gtk-doc \
-		$(use_enable introspection) \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--with-udevdir="$(get_udevdir)" \
-		"$(systemd_with_unitdir)"
-}
-
-src_install() {
-	default
-	prune_libtool_files
-	keepdir /var/lib/udisks2 #383091
-
-	rm -rf "${ED}"/usr/share/bash-completion
-	dobashcomp data/completions/udisksctl
-
-	local htmldir=udisks2
-	if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]; then
-		dosym /usr/share/doc/${PF}/html/${htmldir} /usr/share/gtk-doc/html/${htmldir}
-	fi
-}
-
-pkg_postinst() {
-	mkdir -p "${EROOT}"/run #415987
-
-	# See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync?
-	if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then
-		echo
-		ewarn "You should reboot the system now to get /run mounted with tmpfs!"
-	fi
-}

diff --git a/sys-fs/udisks/udisks-2.1.7-r1.ebuild b/sys-fs/udisks/udisks-2.1.7-r1.ebuild
deleted file mode 100644
index 59f088b9dd..0000000000
--- a/sys-fs/udisks/udisks-2.1.7-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit bash-completion-r1 eutils linux-info systemd udev xdg-utils
-
-DESCRIPTION="Daemon providing interfaces to work with storage devices"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks"
-SRC_URI="https://udisks.freedesktop.org/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="acl debug cryptsetup +gptfdisk +introspection selinux systemd"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libatasmart-0.19
-	>=sys-auth/polkit-0.110
-	>=virtual/libgudev-165:=
-	virtual/udev
-	acl? ( virtual/acl )
-	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
-	systemd? ( >=sys-apps/systemd-209 )
-"
-# gptfdisk -> src/udiskslinuxpartition.c -> sgdisk (see also #412801#c1)
-# util-linux -> mount, umount, swapon, swapoff (see also #403073)
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/util-linux-2.20.1-r2
-	>=sys-block/parted-3
-	virtual/eject
-	cryptsetup? (
-		sys-fs/cryptsetup[udev(+)]
-		sys-fs/lvm2[udev(+)]
-		)
-	gptfdisk? ( >=sys-apps/gptfdisk-0.8 )
-	selinux? ( sec-policy/selinux-devicekit )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.32
-	>=dev-util/gtk-doc-am-1.3
-	dev-util/intltool
-	>=sys-kernel/linux-headers-3.1
-	virtual/pkgconfig
-"
-
-QA_MULTILIB_PATHS="usr/lib/udisks2/udisksd"
-
-DOCS="AUTHORS HACKING NEWS README"
-
-pkg_setup() {
-	# Listing only major arch's here to avoid tracking kernel's defconfig
-	if use amd64 || use arm || use ppc || use ppc64 || use x86; then
-		CONFIG_CHECK="~!IDE" #319829
-		CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377
-		CONFIG_CHECK+=" ~SWAP" # https://forums.gentoo.org/viewtopic-t-923640.html
-		CONFIG_CHECK+=" ~NLS_UTF8" #425562
-		kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	xdg_environment_reset
-
-	use systemd || { sed -i -e 's:libsystemd-login:&disable:' configure || die; }
-	epatch "${FILESDIR}"/${PN}-2.1.7-sysmacros.patch #580230
-
-	epatch_user
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--disable-static \
-		$(use_enable acl) \
-		$(use_enable debug) \
-		--disable-gtk-doc \
-		$(use_enable introspection) \
-		--with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html \
-		--with-udevdir="$(get_udevdir)" \
-		"$(systemd_with_unitdir)"
-}
-
-src_install() {
-	default
-	prune_libtool_files
-	keepdir /var/lib/udisks2 #383091
-
-	rm -rf "${ED}"/usr/share/bash-completion
-	dobashcomp data/completions/udisksctl
-}
-
-pkg_preinst() {
-	# Remove gtk-doc symlink, #597628
-	if [[ -L "${EROOT}"/usr/share/gtk-doc/html/udisks2 ]]; then
-		rm "${EROOT}"/usr/share/gtk-doc/html/udisks2 || die
-	fi
-}
-
-pkg_postinst() {
-	mkdir -p "${EROOT}"/run #415987
-
-	# See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync?
-	if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then
-		echo
-		ewarn "You should reboot the system now to get /run mounted with tmpfs!"
-	fi
-}

diff --git a/sys-fs/udisks/udisks-2.1.7.ebuild b/sys-fs/udisks/udisks-2.1.7.ebuild
deleted file mode 100644
index 62582ad0fe..0000000000
--- a/sys-fs/udisks/udisks-2.1.7.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit bash-completion-r1 eutils linux-info systemd udev
-
-DESCRIPTION="Daemon providing interfaces to work with storage devices"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks"
-SRC_URI="https://udisks.freedesktop.org/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86"
-IUSE="acl debug cryptsetup +gptfdisk +introspection selinux systemd"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libatasmart-0.19
-	>=sys-auth/polkit-0.110
-	>=virtual/libgudev-165:=
-	virtual/udev
-	acl? ( virtual/acl )
-	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
-	systemd? ( >=sys-apps/systemd-209 )
-"
-# gptfdisk -> src/udiskslinuxpartition.c -> sgdisk (see also #412801#c1)
-# util-linux -> mount, umount, swapon, swapoff (see also #403073)
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/util-linux-2.20.1-r2
-	>=sys-block/parted-3
-	virtual/eject
-	cryptsetup? (
-		sys-fs/cryptsetup[udev(+)]
-		sys-fs/lvm2[udev(+)]
-		)
-	gptfdisk? ( >=sys-apps/gptfdisk-0.8 )
-	selinux? ( sec-policy/selinux-devicekit )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.32
-	>=dev-util/gtk-doc-am-1.3
-	dev-util/intltool
-	>=sys-kernel/linux-headers-3.1
-	virtual/pkgconfig
-"
-
-QA_MULTILIB_PATHS="usr/lib/udisks2/udisksd"
-
-DOCS="AUTHORS HACKING NEWS README"
-
-pkg_setup() {
-	# Listing only major arch's here to avoid tracking kernel's defconfig
-	if use amd64 || use arm || use ppc || use ppc64 || use x86; then
-		CONFIG_CHECK="~!IDE" #319829
-		CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377
-		CONFIG_CHECK+=" ~SWAP" # https://forums.gentoo.org/viewtopic-t-923640.html
-		CONFIG_CHECK+=" ~NLS_UTF8" #425562
-		kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	use systemd || { sed -i -e 's:libsystemd-login:&disable:' configure || die; }
-	epatch "${FILESDIR}"/${PN}-2.1.7-sysmacros.patch #580230
-
-	epatch_user
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--disable-static \
-		$(use_enable acl) \
-		$(use_enable debug) \
-		--disable-gtk-doc \
-		$(use_enable introspection) \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--with-udevdir="$(get_udevdir)" \
-		"$(systemd_with_unitdir)"
-}
-
-src_install() {
-	default
-	prune_libtool_files
-	keepdir /var/lib/udisks2 #383091
-
-	rm -rf "${ED}"/usr/share/bash-completion
-	dobashcomp data/completions/udisksctl
-
-	local htmldir=udisks2
-	if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]; then
-		dosym /usr/share/doc/${PF}/html/${htmldir} /usr/share/gtk-doc/html/${htmldir}
-	fi
-}
-
-pkg_postinst() {
-	mkdir -p "${EROOT}"/run #415987
-
-	# See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync?
-	if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then
-		echo
-		ewarn "You should reboot the system now to get /run mounted with tmpfs!"
-	fi
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-fs/udisks/, sys-fs/udisks/files/
@ 2017-05-03 12:29 Lars Wendler
  0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2017-05-03 12:29 UTC (permalink / raw
  To: gentoo-commits

commit:     0627083b68151fa5e70cb627c319fc29e4f26629
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed May  3 12:29:29 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed May  3 12:29:46 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0627083b

sys-fs/udisks: Bump to version 2.6.4 (bug #612814).

This bump introduces lvm support but yet lacks btrfs, bcache, zram and
iscsi support due to missing libblockdev package.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 sys-fs/udisks/Manifest                             |   1 +
 .../udisks/files/udisks-2.6.4-udisksdprivdir.patch |  22 ++++
 sys-fs/udisks/metadata.xml                         |   1 +
 sys-fs/udisks/udisks-2.6.4.ebuild                  | 126 +++++++++++++++++++++
 4 files changed, 150 insertions(+)

diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index f5c49c2b90e..8eeb7e09000 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -1,2 +1,3 @@
 DIST udisks-1.0.5.tar.gz 736221 SHA256 f2ec82eb0ea7e01dc299b5b29b3c18cdf861236ec43dcff66b3552b4b31c6f71 SHA512 bdf4970113975221ff0e17866db18fd969ff9c8e1e851c8ad7572630814ab0c46b59df59433edcb2e7cc41cc8152afd35807f45e07f6d0fa87b21b5a77d0965a WHIRLPOOL 4698911bf53532b5149a71ab1a031fa836193476114ba26f0cde588c3095661f21492feb855e1eb3aa8f1c87ad8125bdc32b7cf56ac43f2de84073f3085f39eb
 DIST udisks-2.1.8.tar.bz2 931110 SHA256 da416914812a77e5f4d82b81deb8c25799fd3228d27d52f7bf89a501b1857dda SHA512 4f8adc0ebd5e8f34801722cacef09fe176a0e301889b98ecddad1bfbc61b008b2035518cdaf270258a80e087b0a5cb685ddba1373ba332a8d7967656a08156cb WHIRLPOOL 396465f32c9798495e4cd1ce541b619e5ed9d2693561da9a2630eeb27933deac8fa3959ee0c4f16d63bad297f4cadf8df9a4e5dd07b7dc06951cb84d12c64e64
+DIST udisks-2.6.4.tar.gz 1242262 SHA256 7c7889dbd8f910b8a8094841168c04d48e0bdaf946b22aa5f0742a460473c191 SHA512 8cd4fa1c2873f2150448bb81268feb38802959bb860fa41f9cc4f088327faf207011a3ea15c121f531dc0a8cd65a3fff14615b79bdaa5f59f52f4ede4d44532c WHIRLPOOL cc54fe2ca683d9adc61448a48e1a9be43c1bbc5b4c1902f8ea2fbf7561e8f798edca6e7e6cfce55ad6b902ffb40045d2ae2ec49784dd88fa9f680b69e021aa1c

diff --git a/sys-fs/udisks/files/udisks-2.6.4-udisksdprivdir.patch b/sys-fs/udisks/files/udisks-2.6.4-udisksdprivdir.patch
new file mode 100644
index 00000000000..8564e2b8334
--- /dev/null
+++ b/sys-fs/udisks/files/udisks-2.6.4-udisksdprivdir.patch
@@ -0,0 +1,22 @@
+From 283e9093d541b8de0ecca324fde8fd38b560dc8e Mon Sep 17 00:00:00 2001
+From: Vojtech Trefny <vtrefny@redhat.com>
+Date: Mon, 24 Apr 2017 09:14:05 +0200
+Subject: [PATCH] Fix typo in data/Makefile.am
+
+---
+ data/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/Makefile.am b/data/Makefile.am
+index af0cce2..83af330 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -6,7 +6,7 @@ dbusservice_in_files = org.freedesktop.UDisks2.service.in
+ dbusservice_DATA     = $(dbusservice_in_files:.service.in=.service)
+ 
+ $(dbusservice_DATA): $(dbusservice_in_files) Makefile
+-	@sed -e "s|\@udisksprivdir\@|$(libexecdir)/udisks2|" $< > $@
++	@sed -e "s|\@udisksdprivdir\@|$(libexecdir)/udisks2|" $< > $@
+ 
+ dbusconfdir = $(sysconfdir)/dbus-1/system.d
+ dbusconf_in_files = org.freedesktop.UDisks2.conf.in

diff --git a/sys-fs/udisks/metadata.xml b/sys-fs/udisks/metadata.xml
index b9596e187b9..4b0d5ddb8c1 100644
--- a/sys-fs/udisks/metadata.xml
+++ b/sys-fs/udisks/metadata.xml
@@ -7,6 +7,7 @@
 	<use>
 		<flag name="cryptsetup">Enable <pkg>sys-fs/cryptsetup</pkg> support</flag>
 		<flag name="gptfdisk">Pull in <pkg>sys-apps/gptfdisk</pkg> for sgdisk command as used by partitioning functionality</flag>
+		<flag name="lvm">Add support for Logical Volume Management via <pkg>sys-fs/lvm2</pkg>.</flag>
 		<flag name="remote-access">Control whether connections from other clients over LAN are allowed</flag>
 		<flag name="systemd">Support <pkg>sys-apps/systemd</pkg>'s logind</flag>
 	</use>

diff --git a/sys-fs/udisks/udisks-2.6.4.ebuild b/sys-fs/udisks/udisks-2.6.4.ebuild
new file mode 100644
index 00000000000..bfd173772ad
--- /dev/null
+++ b/sys-fs/udisks/udisks-2.6.4.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools bash-completion-r1 eutils linux-info systemd udev xdg-utils
+
+DESCRIPTION="Daemon providing interfaces to work with storage devices"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks"
+SRC_URI="https://github.com/storaged-project/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="acl cryptsetup debug +gptfdisk +introspection lvm nls selinux systemd"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libatasmart-0.19
+	>=sys-auth/polkit-0.110
+	>=virtual/libgudev-165:=
+	virtual/udev
+	acl? ( virtual/acl )
+	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+	lvm? ( sys-fs/lvm2 )
+	systemd? ( >=sys-apps/systemd-209 )
+"
+# gptfdisk -> src/udiskslinuxpartition.c -> sgdisk (see also #412801#c1)
+# util-linux -> mount, umount, swapon, swapoff (see also #403073)
+RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/util-linux-2.20.1-r2
+	>=sys-block/parted-3
+	virtual/eject
+	cryptsetup? (
+		sys-fs/cryptsetup[udev(+)]
+		sys-fs/lvm2[udev(+)]
+	)
+	gptfdisk? ( >=sys-apps/gptfdisk-0.8 )
+	selinux? ( sec-policy/selinux-devicekit )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=dev-util/gdbus-codegen-2.32
+	>=dev-util/gtk-doc-1.3
+	>=sys-kernel/linux-headers-3.1
+	virtual/pkgconfig
+	nls? ( dev-util/intltool )
+"
+
+S="${WORKDIR}/${PN}-${P}"
+
+QA_MULTILIB_PATHS="usr/lib/udisks2/udisksd"
+
+DOCS=( AUTHORS HACKING NEWS README.md )
+
+PATCHES=(
+	"${FILESDIR}/${P}-udisksdprivdir.patch"
+)
+
+pkg_setup() {
+	# Listing only major arch's here to avoid tracking kernel's defconfig
+	if use amd64 || use arm || use ppc || use ppc64 || use x86; then
+		CONFIG_CHECK="~!IDE" #319829
+		CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377
+		CONFIG_CHECK+=" ~SWAP" # https://forums.gentoo.org/viewtopic-t-923640.html
+		CONFIG_CHECK+=" ~NLS_UTF8" #425562
+		kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	xdg_environment_reset
+
+	default
+
+	eautoreconf
+
+	if ! use systemd ; then
+		sed -i -e 's:libsystemd-login:&disable:' configure || die
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-gtk-doc
+		--disable-static
+		--localstatedir="${EPREFIX}"/var
+		--with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--with-udevdir="$(get_udevdir)"
+		$(use_enable acl)
+		$(use_enable debug)
+		$(use_enable introspection)
+		$(use_enable lvm lvm2)
+		$(use_enable lvm lvmcache)
+		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	prune_libtool_files
+	keepdir /var/lib/udisks2 #383091
+
+	rm -rf "${ED}"/usr/share/bash-completion
+	dobashcomp data/completions/udisksctl
+}
+
+pkg_preinst() {
+	# Remove gtk-doc symlink, #597628
+	if [[ -L "${EROOT}"/usr/share/gtk-doc/html/udisks2 ]]; then
+		rm "${EROOT}"/usr/share/gtk-doc/html/udisks2 || die
+	fi
+}
+
+pkg_postinst() {
+	mkdir -p "${EROOT}"/run #415987
+
+	# See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync?
+	if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then
+		echo
+		ewarn "You should reboot the system now to get /run mounted with tmpfs!"
+	fi
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-fs/udisks/, sys-fs/udisks/files/
@ 2020-03-26 22:59 Thomas Deutschmann
  0 siblings, 0 replies; 5+ messages in thread
From: Thomas Deutschmann @ 2020-03-26 22:59 UTC (permalink / raw
  To: gentoo-commits

commit:     f5ba741048051d0bbb2d60587a94ea1cf050c520
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 26 22:56:44 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Mar 26 22:56:46 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5ba7410

sys-fs/udisks: drop old

<sys-fs/lvm2-2.02.183 is gone since commit 9dc859090c6d45ef63d059138984aca4295f06b6.

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 sys-fs/udisks/Manifest                             |   1 -
 sys-fs/udisks/files/udisks-1.0.2-ntfs-3g.patch     |  12 ---
 .../udisks/files/udisks-1.0.4-revert-floppy.patch  |  18 ----
 .../udisks/files/udisks-1.0.5-stat-includes.patch  |  25 -----
 sys-fs/udisks/files/udisks-1.0.5-sysmacros.patch   |  72 --------------
 sys-fs/udisks/metadata.xml                         |   1 -
 sys-fs/udisks/udisks-1.0.5-r3.ebuild               | 108 ---------------------
 7 files changed, 237 deletions(-)

diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index 19e0dcde357..77b36088141 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -1,2 +1 @@
-DIST udisks-1.0.5.tar.gz 736221 BLAKE2B 9a709c5d4fcd390d9a52ac764d0e3c678983a14644f79cfcf92dd4ea7ddecbac90aa046b890b7bdd1ad701f1106d5956d72dab1fbb030606319b4bcc4c297bdd SHA512 bdf4970113975221ff0e17866db18fd969ff9c8e1e851c8ad7572630814ab0c46b59df59433edcb2e7cc41cc8152afd35807f45e07f6d0fa87b21b5a77d0965a
 DIST udisks-2.8.4.tar.bz2 1619051 BLAKE2B 4fdf3d5ea8ae02eb74efd552afee2dbe94137767c343034dd68f1553b224871a51bb2382eda00de90d45bad18b4088b4812e1f3fbb004cd29e753e92afb34e05 SHA512 70860e5ca9ac73d442ca67f0e0429ce2f33575d8f64945fbf06d1694b080c8b6fed8d65b2485eff0ab66eab59cdebeb9309424820a2ee82c5faaa38029e15e6c

diff --git a/sys-fs/udisks/files/udisks-1.0.2-ntfs-3g.patch b/sys-fs/udisks/files/udisks-1.0.2-ntfs-3g.patch
deleted file mode 100644
index b6ba4a4849a..00000000000
--- a/sys-fs/udisks/files/udisks-1.0.2-ntfs-3g.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Support ntfs-3g by default without entry in /etc/filesystems for write access.
-
---- src/device.c
-+++ src/device.c
-@@ -5909,6 +5909,7 @@
-   "vfat",
-   "exfat",
-   "ntfs",
-+  "ntfs-3g",
-   NULL,
- };
- 
\ No newline at end of file

diff --git a/sys-fs/udisks/files/udisks-1.0.4-revert-floppy.patch b/sys-fs/udisks/files/udisks-1.0.4-revert-floppy.patch
deleted file mode 100644
index 0f13a6aba83..00000000000
--- a/sys-fs/udisks/files/udisks-1.0.4-revert-floppy.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-This change was done upstream to prevent UDisks1 from polling for floppy drive so often but broke
-mounting floppies while at it.
-
-http://bugs.freedesktop.org/show_bug.cgi?id=30283
-http://bugs.gentoo.org/show_bug.cgi?id=338185
-
---- src/device.c
-+++ src/device.c
-@@ -4485,7 +4485,8 @@ update_info (Device *device)
-         }
-       else
-         {
--          if (g_udev_device_get_property_as_boolean (device->priv->d, "ID_CDROM_MEDIA"))
-+          if (g_udev_device_get_property_as_boolean (device->priv->d, "ID_CDROM_MEDIA") ||
-+              g_udev_device_get_property_as_boolean (device->priv->d, "ID_DRIVE_FLOPPY"))
-             {
-               media_available = TRUE;
-             }

diff --git a/sys-fs/udisks/files/udisks-1.0.5-stat-includes.patch b/sys-fs/udisks/files/udisks-1.0.5-stat-includes.patch
deleted file mode 100644
index 85ef5208049..00000000000
--- a/sys-fs/udisks/files/udisks-1.0.5-stat-includes.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0aa652a7b257f98f9e8e7dc7b0ddc9bc62377d09 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Fri, 29 May 2015 21:09:39 -0400
-Subject: [PATCH] Bug 90778 - fix build with newer glibc versions
-
-https://bugs.freedesktop.org/show_bug.cgi?id=90778
----
- 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 <sys/stat.h>
- #include <stdio.h>
- #include <string.h>
- #include <errno.h>
--- 
-2.4.2
-

diff --git a/sys-fs/udisks/files/udisks-1.0.5-sysmacros.patch b/sys-fs/udisks/files/udisks-1.0.5-sysmacros.patch
deleted file mode 100644
index 96ce943d385..00000000000
--- a/sys-fs/udisks/files/udisks-1.0.5-sysmacros.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-https://bugs.gentoo.org/580230
-https://bugs.freedesktop.org/95028
-
-From 245093a15abe985b1746603c00084cb972fb71ae Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 19 Apr 2016 23:04:32 -0400
-Subject: [PATCH] include sys/sysmacros.h for major/minor/makedev
-
-Linux C libraries are moving away from implicit includes of
-sys/sysmacros.h, so pull in this header directly in the files
-that use these funcs.
-
---- a/src/daemon.c
-+++ b/src/daemon.c
-@@ -38,6 +38,7 @@
- #include <signal.h>
- #include <errno.h>
- #include <string.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/time.h>
---- a/src/device.c
-+++ b/src/device.c
-@@ -28,6 +28,7 @@
- #include <signal.h>
- #include <errno.h>
- #include <string.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <sys/stat.h>
---- a/src/mount-monitor.c
-+++ b/src/mount-monitor.c
-@@ -27,6 +27,7 @@
- #include <signal.h>
- #include <errno.h>
- #include <string.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <mntent.h>
---- a/src/probers/part-id.c
-+++ b/src/probers/part-id.c
-@@ -23,6 +23,7 @@
- #include <string.h>
- #include <ctype.h>
- #include <unistd.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <sys/stat.h>
---- a/tools/udisks.c
-+++ b/tools/udisks.c
-@@ -28,6 +28,7 @@
- #include <signal.h>
- #include <errno.h>
- #include <string.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/wait.h>
---- a/tools/umount-udisks.c
-+++ b/tools/umount-udisks.c
-@@ -28,6 +28,7 @@
- #include <signal.h>
- #include <errno.h>
- #include <string.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>

diff --git a/sys-fs/udisks/metadata.xml b/sys-fs/udisks/metadata.xml
index a62a8bcadb9..b4357b2df5b 100644
--- a/sys-fs/udisks/metadata.xml
+++ b/sys-fs/udisks/metadata.xml
@@ -7,7 +7,6 @@
 	<use>
 		<flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking</flag>
 		<flag name="lvm">Add support for Logical Volume Management via <pkg>sys-fs/lvm2</pkg>.</flag>
-		<flag name="remote-access">Control whether connections from other clients over LAN are allowed</flag>
 		<flag name="systemd">Support <pkg>sys-apps/systemd</pkg>'s logind</flag>
 		<flag name="vdo">Enable Virtual Data Optimizer support.</flag>
 	</use>

diff --git a/sys-fs/udisks/udisks-1.0.5-r3.ebuild b/sys-fs/udisks/udisks-1.0.5-r3.ebuild
deleted file mode 100644
index f4a4725a591..00000000000
--- a/sys-fs/udisks/udisks-1.0.5-r3.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils bash-completion-r1 linux-info ltprune udev systemd
-
-DESCRIPTION="Daemon providing interfaces to work with storage devices"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks"
-SRC_URI="https://hal.freedesktop.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86"
-IUSE="debug +lvm nls remote-access selinux"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
-	>=dev-libs/glib-2.30
-	>=dev-libs/libatasmart-0.19
-	dev-libs/libgudev:=
-	>=sys-auth/polkit-0.110
-	>=sys-apps/dbus-1.6
-	>=sys-apps/sg3_utils-1.27.20090411
-	>=sys-block/parted-3
-	lvm? (
-		>=sys-fs/lvm2-2.02.66
-		<sys-fs/lvm2-2.02.183
-	)
-	virtual/libudev:=
-	virtual/udev
-	selinux? ( sec-policy/selinux-devicekit )"
-# util-linux -> mount, umount, swapon, swapoff (see also #403073)
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/util-linux-2.20.1-r2
-	virtual/eject
-	remote-access? ( net-dns/avahi )"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/intltool
-	virtual/pkgconfig"
-
-QA_MULTILIB_PATHS="usr/lib/${PN}/.*"
-
-pkg_setup() {
-	# Listing only major arch's here to avoid tracking kernel's defconfig
-	if use amd64 || use arm || use ppc || use ppc64 || use x86; then
-		CONFIG_CHECK="~!IDE" #319829
-		CONFIG_CHECK+=" ~NLS_UTF8" #425562
-		kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.0.2-ntfs-3g.patch \
-		"${FILESDIR}"/${PN}-1.0.4-revert-floppy.patch \
-		"${FILESDIR}"/${PN}-1.0.5-stat-includes.patch \
-		"${FILESDIR}"/${PN}-1.0.5-sysmacros.patch
-
-	sed -i -e "s:/lib/udev:$(get_udevdir):" data/80-udisks.rules || die
-
-	epatch_user
-}
-
-src_configure() {
-	# device-mapper -> lvm2 -> mandatory depend -> force enabled
-	econf \
-		--libexecdir=/usr/lib/${PN} \
-		--localstatedir="${EPREFIX}"/var \
-		--disable-static \
-		$(use_enable debug verbose-mode) \
-		--enable-man-pages \
-		--disable-gtk-doc \
-		$(use_enable lvm lvm2) \
-		--enable-dmmp \
-		$(use_enable remote-access) \
-		$(use_enable nls) \
-		--with-html-dir="${EPREFIX}"/deprecated \
-		"$(systemd_with_unitdir)"
-}
-
-src_test() {
-	ewarn "Skipping testsuite because sys-fs/udisks:0 is deprecated"
-	ewarn "in favour of sys-fs/udisks:2."
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		slashsbindir=/usr/sbin \
-		slashlibdir=/usr/lib \
-		udevhelperdir="$(get_udevdir)" \
-		udevrulesdir="$(get_udevdir)"/rules.d \
-		install #398081
-
-	dodoc AUTHORS HACKING NEWS README
-
-	rm -f "${ED}"/etc/profile.d/udisks-bash-completion.sh
-	newbashcomp tools/udisks-bash-completion.sh ${PN}
-
-	prune_libtool_files --all
-
-	keepdir /media
-	keepdir /var/lib/udisks #383091
-
-	rm -rf "${ED}"/deprecated
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-fs/udisks/, sys-fs/udisks/files/
@ 2022-05-11  2:07 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2022-05-11  2:07 UTC (permalink / raw
  To: gentoo-commits

commit:     18950b1eba7d8fdf98cf2795092b9c062f6536ad
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Tue May 10 23:48:52 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 11 02:07:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18950b1e

sys-fs/udisks: Fix undefined references

When building with slibtool the build fails with undefined references.
This is because slibtool respects -no-undefined while GNU libtool
silently ignores it.

Adding the missing dependency fixes the issue.

Bug: https://bugs.gentoo.org/782061
Upstream-PR: https://github.com/storaged-project/udisks/pull/978
Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/25433
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-fs/udisks/files/udisks-2.9.4-undefined.patch | 30 ++++++++++++++++++++++++
 sys-fs/udisks/udisks-2.9.4.ebuild                |  9 ++++++-
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/sys-fs/udisks/files/udisks-2.9.4-undefined.patch b/sys-fs/udisks/files/udisks-2.9.4-undefined.patch
new file mode 100644
index 000000000000..f87e145e82aa
--- /dev/null
+++ b/sys-fs/udisks/files/udisks-2.9.4-undefined.patch
@@ -0,0 +1,30 @@
+Upstream-PR: https://github.com/storaged-project/udisks/pull/978
+From 362cc8f1613193f8e68d13a416421bb36fd7f713 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Tue, 10 May 2022 09:29:10 -0700
+Subject: [PATCH] modules/btrfs: Add missing dependency
+
+When building udisks with --enable-btrfs using slibtool instead of GNU
+libtool the build will fail with undefined references.
+
+This is because of a missing dependency for libudisks2_btrfs_la_LIBADD
+and GNU libtool will hide this issue by silently ignoring -no-undefined
+while slibtool does not.
+
+Gentoo Bug: https://bugs.gentoo.org/782061
+---
+ modules/btrfs/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/modules/btrfs/Makefile.am b/modules/btrfs/Makefile.am
+index ac8c941849..f96cd16186 100644
+--- a/modules/btrfs/Makefile.am
++++ b/modules/btrfs/Makefile.am
+@@ -73,6 +73,7 @@ libudisks2_btrfs_la_LDFLAGS =                                                  \
+ 	$(NULL)
+ 
+ libudisks2_btrfs_la_LIBADD =                                                   \
++	$(top_builddir)/src/libudisks-daemon.la                                \
+ 	$(GLIB_LIBS)                                                           \
+ 	$(GIO_LIBS)                                                            \
+ 	$(GUDEV_LIBS)                                                          \

diff --git a/sys-fs/udisks/udisks-2.9.4.ebuild b/sys-fs/udisks/udisks-2.9.4.ebuild
index 3112d930e977..a939ae965757 100644
--- a/sys-fs/udisks/udisks-2.9.4.ebuild
+++ b/sys-fs/udisks/udisks-2.9.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit bash-completion-r1 linux-info systemd tmpfiles udev xdg-utils
+inherit autotools bash-completion-r1 linux-info systemd tmpfiles udev xdg-utils
 
 DESCRIPTION="Daemon providing interfaces to work with storage devices"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks"
@@ -61,6 +61,10 @@ BDEPEND="
 
 DOCS=( AUTHORS HACKING NEWS README.md )
 
+PATCHES=(
+	"${FILESDIR}/${P}-undefined.patch" # 782061
+)
+
 pkg_setup() {
 	# Listing only major arch's here to avoid tracking kernel's defconfig
 	if use amd64 || use arm || use ppc || use ppc64 || use x86; then
@@ -79,6 +83,9 @@ src_prepare() {
 	if ! use systemd ; then
 		sed -i -e 's:libsystemd-login:&disable:' configure || die
 	fi
+
+	# Added for bug # 782061
+	eautoreconf
 }
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-fs/udisks/, sys-fs/udisks/files/
@ 2024-09-15 12:25 Pacho Ramos
  0 siblings, 0 replies; 5+ messages in thread
From: Pacho Ramos @ 2024-09-15 12:25 UTC (permalink / raw
  To: gentoo-commits

commit:     379060f482819c4f29ce4774626a8aca55d6b462
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 15 12:02:33 2024 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Sep 15 12:24:58 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=379060f4

sys-fs/udisks: Multiple bugfixes from upstream

Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 .../files/udisks-2.10.1-BLKRRPART_harder.patch     |  55 ++++++++
 ....10.1-targetcli_config.json_netif_timeout.patch |  38 ++++++
 ....1-udiskslinuxblock_survive_missing_fstab.patch |  32 +++++
 ...-2.10.1-udiskslinuxmanager_use_after_free.patch | 112 ++++++++++++++++
 sys-fs/udisks/udisks-2.10.1-r1.ebuild              | 148 +++++++++++++++++++++
 5 files changed, 385 insertions(+)

diff --git a/sys-fs/udisks/files/udisks-2.10.1-BLKRRPART_harder.patch b/sys-fs/udisks/files/udisks-2.10.1-BLKRRPART_harder.patch
new file mode 100644
index 000000000000..39af1e0fe5b3
--- /dev/null
+++ b/sys-fs/udisks/files/udisks-2.10.1-BLKRRPART_harder.patch
@@ -0,0 +1,55 @@
+From eb1d4a2bcbb8744074d17553bd0d55ffbd76bdeb Mon Sep 17 00:00:00 2001
+From: Tomas Bzatek <tbzatek@redhat.com>
+Date: Tue, 14 Nov 2023 13:16:39 +0000
+Subject: [PATCH] udiskslinuxblockobject: Try issuing BLKRRPART ioctl harder
+
+For some reason even after acquiring a voluntary BSD lock on
+the device the BLKRRPART ioctl still fails with EBUSY. Wait
+a couple of msec and everything is fine.
+
+So try harder, several attempts, if busy. There might be number
+of things going on in the system and it's out of our control
+even when holding a lock.
+---
+ src/udiskslinuxblockobject.c | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/src/udiskslinuxblockobject.c b/src/udiskslinuxblockobject.c
+index d5da4bc4d9..33604df841 100644
+--- a/src/udiskslinuxblockobject.c
++++ b/src/udiskslinuxblockobject.c
+@@ -1098,23 +1098,31 @@ udisks_linux_block_object_reread_partition_table (UDisksLinuxBlockObject  *objec
+     }
+   else
+     {
+-      gint num_tries = 0;
++      gint num_tries;
+ 
+       /* acquire an exclusive BSD lock to prevent udev probes.
+        * See also https://systemd.io/BLOCK_DEVICE_LOCKING
+        */
++      num_tries = 10;
+       while (flock (fd, LOCK_EX | LOCK_NB) != 0)
+         {
+           g_usleep (100 * 1000); /* microseconds */
+-          if (num_tries++ > 5)
++          if (num_tries-- < 0)
+             break;
+         }
+ 
+-      if (ioctl (fd, BLKRRPART) != 0)
++      num_tries = 5;
++      while (ioctl (fd, BLKRRPART) != 0)
+         {
++          if (errno == EBUSY && num_tries-- >= 0)
++            {
++              g_usleep (200 * 1000); /* microseconds */
++              continue;
++            }
+           g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno),
+                        "Error re-reading partition table (BLKRRPART ioctl) on %s: %m", device_file);
+           ret = FALSE;
++          break;
+         }
+       close (fd);
+     }

diff --git a/sys-fs/udisks/files/udisks-2.10.1-targetcli_config.json_netif_timeout.patch b/sys-fs/udisks/files/udisks-2.10.1-targetcli_config.json_netif_timeout.patch
new file mode 100644
index 000000000000..e40f136dfe2d
--- /dev/null
+++ b/sys-fs/udisks/files/udisks-2.10.1-targetcli_config.json_netif_timeout.patch
@@ -0,0 +1,38 @@
+From acae6bf4594f80da57855343ab325f87386178c4 Mon Sep 17 00:00:00 2001
+From: Tomas Bzatek <tbzatek@redhat.com>
+Date: Fri, 3 Nov 2023 16:40:54 +0100
+Subject: [PATCH] tests: Fix targetcli_config.json
+
+Not all attributes are available anymore in newer kernel versions.
+---
+ src/tests/dbus-tests/targetcli_config.json | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/src/tests/dbus-tests/targetcli_config.json b/src/tests/dbus-tests/targetcli_config.json
+index 3be9eac2be..f50bf7d4d2 100644
+--- a/src/tests/dbus-tests/targetcli_config.json
++++ b/src/tests/dbus-tests/targetcli_config.json
+@@ -331,7 +331,6 @@
+             "demo_mode_write_protect": 0,
+             "generate_node_acls": 1,
+             "login_timeout": 15,
+-            "netif_timeout": 2,
+             "prod_mode_write_protect": 0,
+             "t10_pi": 0,
+             "tpg_enabled_sendtargets": 1
+@@ -393,7 +392,6 @@
+             "demo_mode_write_protect": 1,
+             "generate_node_acls": 0,
+             "login_timeout": 15,
+-            "netif_timeout": 2,
+             "prod_mode_write_protect": 0,
+             "t10_pi": 0,
+             "tpg_enabled_sendtargets": 1
+@@ -479,7 +477,6 @@
+             "demo_mode_write_protect": 1,
+             "generate_node_acls": 0,
+             "login_timeout": 15,
+-            "netif_timeout": 2,
+             "prod_mode_write_protect": 0,
+             "t10_pi": 0,
+             "tpg_enabled_sendtargets": 1

diff --git a/sys-fs/udisks/files/udisks-2.10.1-udiskslinuxblock_survive_missing_fstab.patch b/sys-fs/udisks/files/udisks-2.10.1-udiskslinuxblock_survive_missing_fstab.patch
new file mode 100644
index 000000000000..9acd8bd10331
--- /dev/null
+++ b/sys-fs/udisks/files/udisks-2.10.1-udiskslinuxblock_survive_missing_fstab.patch
@@ -0,0 +1,32 @@
+From 8f62f7c6888659f3b66d5861d46fb9b3a34ff169 Mon Sep 17 00:00:00 2001
+From: Marius Vollmer <mvollmer@redhat.com>
+Date: Thu, 22 Feb 2024 16:49:24 +0200
+Subject: [PATCH] udiskslinuxblock: Survive a missing /etc/fstab
+
+This is similar to b79f6840ca82551e672156153b7e13328f0ba19d, which
+solved the same problem for /etc/crypttab.
+---
+ src/udiskslinuxblock.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/src/udiskslinuxblock.c b/src/udiskslinuxblock.c
+index 829dd5f78..a3fa183be 100644
+--- a/src/udiskslinuxblock.c
++++ b/src/udiskslinuxblock.c
+@@ -1541,7 +1541,15 @@ add_remove_fstab_entry (UDisksBlock *block,
+                             &contents,
+                             NULL,
+                             error))
+-    goto out;
++    {
++      if (g_error_matches (*error, G_FILE_ERROR, G_FILE_ERROR_NOENT))
++        {
++          contents = g_strdup ("");
++          g_clear_error (error);
++        }
++      else
++        goto out;
++    }
+ 
+   lines = g_strsplit (contents, "\n", 0);
+ 

diff --git a/sys-fs/udisks/files/udisks-2.10.1-udiskslinuxmanager_use_after_free.patch b/sys-fs/udisks/files/udisks-2.10.1-udiskslinuxmanager_use_after_free.patch
new file mode 100644
index 000000000000..3157b10f8c87
--- /dev/null
+++ b/sys-fs/udisks/files/udisks-2.10.1-udiskslinuxmanager_use_after_free.patch
@@ -0,0 +1,112 @@
+From 3dc036fb5045fc068c6abfbe4e62d0871d7ca82a Mon Sep 17 00:00:00 2001
+From: xinpeng wang <wangxinpeng@uniontech.com>
+Date: Thu, 21 Sep 2023 13:57:40 +0800
+Subject: [PATCH] udiskslinuxmanager:use dbus interface after free
+
+In handle_get_block_devices, call get_block_objects to obtain iface_block_device
+of all current UDisksLinuxBlockObject, and then obtain the corresponding
+UDisksLinuxBlockObject's object_path through iface_block_device.iface_block_device
+is a GDBusInterfaceSkeleton, which saves the object through
+g_dbus_interface_skeleton_set_object. g_object_add_weak_pointer is used here. This
+function is not thread-safe.At this time, if other threads are releasing the object,
+the program will crash.
+This scene can be reproduced by quickly plugging and unplugging the USB disk.
+The core is as follows (the redundant stack is omitted):
+When accessing object in thread 1, the object is released by thread 2
+info threads
+   Id Target Id Frame
+* 1 Thread 0x7f80979e70 (LWP 24559) 0x0000007f8a48dda0 in
+g_dbus_object_get_object_path (object=0x0) at ../../../gio/gdbusobject.c:109
+  2 Thread 0x7f88a43010 (LWP 1159) 0x0000007f8a0a6ae8 in __GI___libc_free
+(mem=0x556a919c80) at malloc.c:3093
+
+thread 1
+(gdb) bt
+0 0x0000007f8a48dda0 in g_dbus_object_get_object_path (object=0x0) at
+../../../gio/gdbusobject.c:109
+1 0x000000556a56911c in handle_get_block_devices (object=0x7f7c007ed0, invocation=
+0x7f74016f20 [GDBusMethodInvocation], arg_options=<optimized out>)
+     at udiskslinuxmanager.c:1063
+
+(gdb) p ((GObject*)(blocks_p->data))->ref_count
+$3 = 1
+(gdb) p *((GDBusInterfaceSkeleton*)(blocks_p->data))
+$6 = {parent_instance = {g_type_instance = {g_class = 0x556a64e740
+[g_type: UDisksLinuxBlock/UDisksBlockSkeleton/GDBusInterfaceSkeleton]}, ref_count = 1,
+qdata = 0x0},  priv = 0x7f7c004ac0}
+(gdb) p *((GDBusInterfaceSkeleton*)(blocks_p->data))->priv
+$7 = {lock = {p = 0x0, i = {0, 0}}, object = 0x0,
+flags = G_DBUS_INTERFACE_SKELETON_FLAGS_HANDLE_METHOD_INVOCATIONS_IN_THREAD,
+connections = 0x0, object_path = 0x0, hooked_vtable = 0x556a62b9f0}
+
+thread 2
+(gdb) bt
+0 0x0000007f8a0a6ae8 in __GI___libc_free (mem=0x556a919c80) at malloc.c:3093
+1 0x0000007f89ff1224 in () at /lib/aarch64-linux-gnu/libudev.so.1
+2 0x0000007f89ff1348 in () at /lib/aarch64-linux-gnu/libudev.so.1
+3 0x0000007f89ff5520 in () at /lib/aarch64-linux-gnu/libudev.so.1
+4 0x0000007f89fff878 in udev_device_unref () at /lib/aarch64-linux-gnu/libudev.so.1
+5 0x0000007f8a7aeb74 in () at /lib/aarch64-linux-gnu/libgudev-1.0.so.0
+6 0x0000007f8a3193f8 in g_object_unref (_object=<optimized out>) at
+../../../gobject/gobject.c:3346
+7 0x0000007f8a3193f8 in g_object_unref (_object=0x7f680038a0) at
+../../../gobject/gobject.c:3238
+8 0x000000556a57700c in udisks_linux_device_finalize (object=0x7f5c005730
+[UDisksLinuxDevice]) at udiskslinuxdevice.c:75
+9 0x0000007f8a3193f8 in g_object_unref (_object=<optimized out>) at
+../../../gobject/gobject.c:3346
+10 0x0000007f8a3193f8 in g_object_unref (_object=0x7f5c005730) at
+../../../gobject/gobject.c:3238
+11 0x000000556a55d0fc in udisks_linux_drive_object_uevent
+     (object=object@entry=0x556a5df370 [UDisksLinuxDriveObject],
+action=action@entry=0x556a87b120
+"remove",device=device@entry=0x7f74007610 [UDisksLinuxDevice])
+     at udiskslinuxdriveobject.c:715
+12 0x000000556a54840c in handle_block_uevent_for_drive
+     (provider=provider@entry=0x556a5c8200 [UDisksLinuxProvider],
+action=action@entry=0x556a87b120 "remove",device=device@entry=0x7f74007610
+[UDisksLinuxDevice]) at udiskslinuxprovider.c:1035
+13 0x000000556a548ab8 in handle_block_uevent (device=0x7f74007610 [UDisksLinuxDevice],
+action=0x556a87b120 "remove", provider=0x556a5c8200 [UDisksLinuxProvider]) at
+udiskslinuxprovider.c:1349
+14 0x000000556a548ab8 in udisks_linux_provider_handle_uevent
+     (provider=0x556a5c8200 [UDisksLinuxProvider], action=0x556a87b120 "remove",
+device=0x7f74007610 [UDisksLinuxDevice]) at udiskslinuxprovider.c:1399
+15 0x000000556a548cac in on_idle_with_probed_uevent (user_data=0x556a7e65a0) at
+udiskslinuxprovider.c:230
+---
+ src/udiskslinuxmanager.c | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/src/udiskslinuxmanager.c b/src/udiskslinuxmanager.c
+index 5bfeec103..491edb92b 100644
+--- a/src/udiskslinuxmanager.c
++++ b/src/udiskslinuxmanager.c
+@@ -1196,8 +1196,11 @@ handle_get_block_devices (UDisksManager         *object,
+   blocks = get_block_objects (object, &num_blocks);
+   block_paths = g_new0 (const gchar *, num_blocks + 1);
+ 
+-  for (i = 0,blocks_p = blocks; blocks_p != NULL; blocks_p = blocks_p->next, i++)
+-      block_paths[i] = g_dbus_object_get_object_path (g_dbus_interface_get_object (G_DBUS_INTERFACE (blocks_p->data)));
++  for (blocks_p = blocks; blocks_p != NULL; blocks_p = blocks_p->next) {
++	  GDBusObject * block_object = g_dbus_interface_get_object (G_DBUS_INTERFACE (blocks_p->data));
++	  if (block_object)
++		  block_paths[i++] = g_dbus_object_get_object_path (block_object);
++  }
+ 
+   udisks_manager_complete_get_block_devices  (object,
+                                               invocation,
+@@ -1284,9 +1287,11 @@ handle_resolve_device (UDisksManager         *object,
+     }
+ 
+   ret_paths = g_new0 (const gchar *, num_found + 1);
+-  for (i = 0,ret_p = ret; ret_p != NULL; ret_p = ret_p->next, i++)
++  for (i = 0,ret_p = ret; ret_p != NULL; ret_p = ret_p->next)
+     {
+-      ret_paths[i] = g_dbus_object_get_object_path (g_dbus_interface_get_object (G_DBUS_INTERFACE (ret_p->data)));
++      GDBusObject *block_object = g_dbus_interface_get_object (G_DBUS_INTERFACE (ret_p->data));
++      if (block_object)
++        ret_paths[i++] = g_dbus_object_get_object_path (block_object);
+     }
+ 
+   udisks_manager_complete_resolve_device (object,

diff --git a/sys-fs/udisks/udisks-2.10.1-r1.ebuild b/sys-fs/udisks/udisks-2.10.1-r1.ebuild
new file mode 100644
index 000000000000..d2f4f213c1bb
--- /dev/null
+++ b/sys-fs/udisks/udisks-2.10.1-r1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit autotools bash-completion-r1 linux-info systemd tmpfiles udev xdg-utils
+
+DESCRIPTION="Daemon providing interfaces to work with storage devices"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks"
+SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86"
+IUSE="acl +daemon debug elogind +introspection lvm nls selinux systemd"
+
+REQUIRED_USE="
+	?? ( elogind systemd )
+	elogind? ( daemon )
+	systemd? ( daemon )
+"
+
+# See configure.ac file for the required min version
+BLOCKDEV_MIN_VER="3.0"
+
+COMMON_DEPEND="
+	>=sys-auth/polkit-0.114[daemon]
+	>=sys-libs/libblockdev-${BLOCKDEV_MIN_VER}:=[cryptsetup,lvm?,nvme]
+	virtual/udev
+	acl? ( virtual/acl )
+	daemon? (
+		>=dev-libs/glib-2.68:2
+		>=dev-libs/libatasmart-0.19
+		>=dev-libs/libgudev-165:=
+	)
+	elogind? ( >=sys-auth/elogind-219 )
+	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+	lvm? ( sys-fs/lvm2 )
+	systemd? ( >=sys-apps/systemd-209 )
+"
+# util-linux -> mount, umount, swapon, swapoff (see also #403073)
+RDEPEND="${COMMON_DEPEND}
+	>=sys-block/parted-3
+	>=sys-apps/util-linux-2.30
+	selinux? ( sec-policy/selinux-devicekit )
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.1
+"
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	>=dev-util/gdbus-codegen-2.32
+	>=dev-build/gtk-doc-am-1.3
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.19.8 )
+	dev-libs/gobject-introspection-common
+	dev-build/autoconf-archive
+"
+# If adding a eautoreconf, then these might be needed at buildtime:
+# dev-libs/gobject-introspection-common
+# dev-build/autoconf-archive
+
+DOCS=( AUTHORS HACKING NEWS README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-BLKRRPART_harder.patch
+	"${FILESDIR}"/${P}-targetcli_config.json_netif_timeout.patch
+	"${FILESDIR}"/${P}-udiskslinuxmanager_use_after_free.patch
+	"${FILESDIR}"/${P}-udiskslinuxblock_survive_missing_fstab.patch
+)
+
+pkg_setup() {
+	# Listing only major arch's here to avoid tracking kernel's defconfig
+	if use amd64 || use arm || use ppc || use ppc64 || use x86; then
+		CONFIG_CHECK="~!IDE" #319829
+		CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377
+		CONFIG_CHECK+=" ~NLS_UTF8" #425562
+		kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	xdg_environment_reset
+	default
+
+	if ! use systemd ; then
+		sed -i -e 's:libsystemd-login:&disable:' configure || die
+	fi
+
+	# Added for bug # 782061
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-btrfs
+		--disable-gtk-doc
+		--disable-static
+		--localstatedir="${EPREFIX}"/var
+		--with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html
+		--with-modprobedir="${EPREFIX}"/lib/modprobe.d
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
+		--with-udevdir="${EPREFIX}$(get_udevdir)"
+		$(use_enable acl)
+		$(use_enable daemon)
+		$(use_enable debug)
+		$(use_enable introspection)
+		$(use_enable lvm lvm2)
+		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+	keepdir /var/lib/udisks2 #383091
+
+	rm -rf "${ED}"/usr/share/bash-completion
+	dobashcomp data/completions/udisksctl
+}
+
+pkg_preinst() {
+	# Remove gtk-doc symlink, #597628
+	if [[ -L "${EROOT}"/usr/share/gtk-doc/html/udisks2 ]]; then
+		rm "${EROOT}"/usr/share/gtk-doc/html/udisks2 || die
+	fi
+}
+
+pkg_postinst() {
+	udev_reload
+
+	# TODO: obsolete with tmpfiles_process?
+	# mkdir -p "${EROOT}"/run #415987
+
+	tmpfiles_process udisks2.conf
+
+	# See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync?
+	if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then
+		echo
+		ewarn "You should reboot the system now to get /run mounted with tmpfs!"
+	fi
+}
+
+pkg_postrm() {
+	udev_reload
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2024-09-15 12:25 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-11  2:07 [gentoo-commits] repo/gentoo:master commit in: sys-fs/udisks/, sys-fs/udisks/files/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2024-09-15 12:25 Pacho Ramos
2020-03-26 22:59 Thomas Deutschmann
2017-05-03 12:29 Lars Wendler
2017-02-19  1:29 Michael Palimaka

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox