From cb5b3873e5fca6c016619cddc97f84c826c1e52c Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Wed, 3 Sep 2014 10:52:23 +0000 Subject: Fix linking problem in bug #520684 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA) --- sys-fs/eudev/ChangeLog | 8 +- sys-fs/eudev/eudev-1.10-r1.ebuild | 303 +++++++++++++++++++++ sys-fs/eudev/eudev-1.10.ebuild | 302 -------------------- sys-fs/eudev/files/eudev-fix-selinux-linking.patch | 30 ++ 4 files changed, 340 insertions(+), 303 deletions(-) create mode 100644 sys-fs/eudev/eudev-1.10-r1.ebuild delete mode 100644 sys-fs/eudev/eudev-1.10.ebuild create mode 100644 sys-fs/eudev/files/eudev-fix-selinux-linking.patch (limited to 'sys-fs') diff --git a/sys-fs/eudev/ChangeLog b/sys-fs/eudev/ChangeLog index 18bafa19ba34..da575f769c7a 100644 --- a/sys-fs/eudev/ChangeLog +++ b/sys-fs/eudev/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-fs/eudev # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.136 2014/09/02 22:34:36 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.137 2014/09/03 10:52:23 blueness Exp $ + +*eudev-1.10-r1 (03 Sep 2014) + + 03 Sep 2014; Anthony G. Basile +eudev-1.10-r1.ebuild, + +files/eudev-fix-selinux-linking.patch, -eudev-1.10.ebuild: + Fix linking problem in bug #520684 02 Sep 2014; Anthony G. Basile +files/eudev-fix-selinux-headers.patch, eudev-1.10.ebuild: diff --git a/sys-fs/eudev/eudev-1.10-r1.ebuild b/sys-fs/eudev/eudev-1.10-r1.ebuild new file mode 100644 index 000000000000..d9bd2b726849 --- /dev/null +++ b/sys-fs/eudev/eudev-1.10-r1.ebuild @@ -0,0 +1,303 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1.10-r1.ebuild,v 1.1 2014/09/03 10:52:23 blueness Exp $ + +EAPI="5" + +KV_min=2.6.39 + +inherit autotools eutils linux-info multilib multilib-minimal user + +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="git://github.com/gentoo/eudev.git" + inherit git-2 +else + SRC_URI="http://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86" +fi + +DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" +HOMEPAGE="https://github.com/gentoo/eudev" + +LICENSE="LGPL-2.1 MIT GPL-2" +SLOT="0" +IUSE="doc gudev +hwdb +kmod introspection +keymap +modutils +openrc +rule-generator selinux static-libs test" + +COMMON_DEPEND=">=sys-apps/util-linux-2.20 + gudev? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] ) + introspection? ( >=dev-libs/gobject-introspection-1.38 ) + kmod? ( >=sys-apps/kmod-16 ) + selinux? ( >=sys-libs/libselinux-2.1.9 ) + !/dev/null + if [[ -d ${EROOT}dev/loop ]]; then + ewarn "Please make sure your remove /dev/loop," + ewarn "else losetup may be confused when looking for unused devices." + fi + + if use hwdb && has_version 'sys-apps/hwids[udev]'; then + udevadm hwdb --update --root="${ROOT%/}" + + # http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda + # reload database after it has be rebuilt, but only if we are not upgrading + # also pass if we are -9999 since who knows what hwdb related changes there might be + if [[ ${REPLACING_VERSIONS%-r*} == ${PV} || -z ${REPLACING_VERSIONS} ]] && \ + [[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then + udevadm control --reload + fi + fi + + ewarn + ewarn "You need to restart eudev as soon as possible to make the" + ewarn "upgrade go into effect:" + ewarn "\t/etc/init.d/udev --nodeps restart" + + if use rule-generator && use openrc && \ + [[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; then + ewarn + ewarn "Please add the udev-postmount init script to your default runlevel" + ewarn "to ensure the legacy rule-generator functionality works as reliably" + ewarn "as possible." + ewarn "\trc-update add udev-postmount default" + fi + + elog + elog "For more information on eudev on Gentoo, writing udev rules, and" + elog "fixing known issues visit:" + elog " http://www.gentoo.org/doc/en/udev-guide.xml" + elog + + # http://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69 + # http://bugs.gentoo.org/246847 + # http://bugs.gentoo.org/514174 + enewgroup input + + # Update hwdb database in case the format is changed by udev version. + if has_version 'sys-apps/hwids[udev]'; then + udevadm hwdb --update --root="${ROOT%/}" + # Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd + if [[ -z ${REPLACING_VERSIONS} ]]; then + # http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda + if [[ ${ROOT} != "" ]] && [[ ${ROOT} != "/" ]]; then + return 0 + fi + udevadm control --reload + fi + fi +} diff --git a/sys-fs/eudev/eudev-1.10.ebuild b/sys-fs/eudev/eudev-1.10.ebuild deleted file mode 100644 index 63d9106363c1..000000000000 --- a/sys-fs/eudev/eudev-1.10.ebuild +++ /dev/null @@ -1,302 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1.10.ebuild,v 1.2 2014/09/02 22:34:36 blueness Exp $ - -EAPI="5" - -KV_min=2.6.39 - -inherit autotools eutils linux-info multilib multilib-minimal user - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="git://github.com/gentoo/eudev.git" - inherit git-2 -else - SRC_URI="http://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86" -fi - -DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" -HOMEPAGE="https://github.com/gentoo/eudev" - -LICENSE="LGPL-2.1 MIT GPL-2" -SLOT="0" -IUSE="doc gudev +hwdb +kmod introspection +keymap +modutils +openrc +rule-generator selinux static-libs test" - -COMMON_DEPEND=">=sys-apps/util-linux-2.20 - gudev? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-1.38 ) - kmod? ( >=sys-apps/kmod-16 ) - selinux? ( >=sys-libs/libselinux-2.1.9 ) - !/dev/null - if [[ -d ${EROOT}dev/loop ]]; then - ewarn "Please make sure your remove /dev/loop," - ewarn "else losetup may be confused when looking for unused devices." - fi - - if use hwdb && has_version 'sys-apps/hwids[udev]'; then - udevadm hwdb --update --root="${ROOT%/}" - - # http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda - # reload database after it has be rebuilt, but only if we are not upgrading - # also pass if we are -9999 since who knows what hwdb related changes there might be - if [[ ${REPLACING_VERSIONS%-r*} == ${PV} || -z ${REPLACING_VERSIONS} ]] && \ - [[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then - udevadm control --reload - fi - fi - - ewarn - ewarn "You need to restart eudev as soon as possible to make the" - ewarn "upgrade go into effect:" - ewarn "\t/etc/init.d/udev --nodeps restart" - - if use rule-generator && use openrc && \ - [[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; then - ewarn - ewarn "Please add the udev-postmount init script to your default runlevel" - ewarn "to ensure the legacy rule-generator functionality works as reliably" - ewarn "as possible." - ewarn "\trc-update add udev-postmount default" - fi - - elog - elog "For more information on eudev on Gentoo, writing udev rules, and" - elog "fixing known issues visit:" - elog " http://www.gentoo.org/doc/en/udev-guide.xml" - elog - - # http://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69 - # http://bugs.gentoo.org/246847 - # http://bugs.gentoo.org/514174 - enewgroup input - - # Update hwdb database in case the format is changed by udev version. - if has_version 'sys-apps/hwids[udev]'; then - udevadm hwdb --update --root="${ROOT%/}" - # Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd - if [[ -z ${REPLACING_VERSIONS} ]]; then - # http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda - if [[ ${ROOT} != "" ]] && [[ ${ROOT} != "/" ]]; then - return 0 - fi - udevadm control --reload - fi - fi -} diff --git a/sys-fs/eudev/files/eudev-fix-selinux-linking.patch b/sys-fs/eudev/files/eudev-fix-selinux-linking.patch new file mode 100644 index 000000000000..6a5e05bcaf1e --- /dev/null +++ b/sys-fs/eudev/files/eudev-fix-selinux-linking.patch @@ -0,0 +1,30 @@ +From e7f7217b9b9dbb3304116eae2b0ad90c84ede034 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= +Date: Wed, 3 Sep 2014 11:01:31 +0200 +Subject: [PATCH] link libudev against SELINUX +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Amadeusz Sławiński +--- + src/libudev/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/libudev/Makefile.am b/src/libudev/Makefile.am +index 868a9fc..72e43bc 100644 +--- a/src/libudev/Makefile.am ++++ b/src/libudev/Makefile.am +@@ -54,7 +54,8 @@ libudev_la_LDFLAGS = \ + -Wl,--version-script=$(top_srcdir)/src/libudev/libudev.sym + + libudev_la_LIBADD = \ +- $(top_builddir)/src/shared/libudev_shared.la ++ $(top_builddir)/src/shared/libudev_shared.la \ ++ $(SELINUX_LIBS) + + libudev_private_la_SOURCES = \ + $(libudev_la_SOURCES) \ +-- +2.1.0 + -- cgit v1.2.3-65-gdbad