Now install device-mapper udev rules on our own, and no longer by the udev ebuild, Bug 182957.

Package-Manager: portage-2.1.3_rc5

6 files changed, 136 insertions, 16 deletions

diff --git a/sys-fs/device-mapper/ChangeLog b/sys-fs/device-mapper/ChangeLog
index 1ff1e24dbb47..0fb6bf38ac3c 100644
--- a/sys-fs/device-mapper/ChangeLog
+++ b/sys-fs/device-mapper/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/device-mapper
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/ChangeLog,v 1.69 2007/06/27 07:24:38 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/ChangeLog,v 1.70 2007/06/27 09:53:40 zzam Exp $
+
+*device-mapper-1.02.19-r1 (27 Jun 2007)
+
+  27 Jun 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/64-device-mapper.rules-1.02.19, +device-mapper-1.02.19-r1.ebuild:
+  Now install device-mapper udev rules on our own, and no longer by the udev
+  ebuild, Bug 182957.
 
   27 Jun 2007; Christian Faulhammer <opfer@gentoo.org>
   device-mapper-1.02.19.ebuild:
diff --git a/sys-fs/device-mapper/Manifest b/sys-fs/device-mapper/Manifest
index 6191078d9c84..30069b9242dd 100644
--- a/sys-fs/device-mapper/Manifest
+++ b/sys-fs/device-mapper/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 64-device-mapper.rules-1.02.19 1247 RMD160 2fc15996575c44ffb5a12c16236e221157ff15e6 SHA1 67cd5da22219dba8232e7a95bd7f328d6eb30d90 SHA256 b8a7570321c735b06cfa97cff10a8edffcf508d4e54bd6730e482cb7bdd25347
+MD5 c0cfef18ae631c9ff6809ff40130116f files/64-device-mapper.rules-1.02.19 1247
+RMD160 2fc15996575c44ffb5a12c16236e221157ff15e6 files/64-device-mapper.rules-1.02.19 1247
+SHA256 b8a7570321c735b06cfa97cff10a8edffcf508d4e54bd6730e482cb7bdd25347 files/64-device-mapper.rules-1.02.19 1247
 AUX device-mapper.rc 607 RMD160 1f794b58d5f137b4f84d1fd5e672802726b16adc SHA1 f72e076c7205dfd836f6d0621fe759b1533987c9 SHA256 8f2e3837ec52c24f07fffbbda53f8141f2dc634aa58cdc6c32edf841bbfa76ae
 MD5 a215c687a34d701d64e599f795252160 files/device-mapper.rc 607
 RMD160 1f794b58d5f137b4f84d1fd5e672802726b16adc files/device-mapper.rc 607
@@ -38,14 +42,18 @@ EBUILD device-mapper-1.02.18.ebuild 1390 RMD160 531d21595fa6fe85248f9f11cd589cec
 MD5 18dd7f7752fe2fe546e73da1099d6cdf device-mapper-1.02.18.ebuild 1390
 RMD160 531d21595fa6fe85248f9f11cd589cecf171024c device-mapper-1.02.18.ebuild 1390
 SHA256 623dfe29e625e04e92da0b267eaea14c9c9c6a42d55ee57537ab5b7144be0288 device-mapper-1.02.18.ebuild 1390
+EBUILD device-mapper-1.02.19-r1.ebuild 1748 RMD160 71d9959608beb8377bd5068ed294c58ee7dde398 SHA1 1b29fb934c96f288d3478daa125fee952afebf68 SHA256 76f05b93b1aa65879a6b6484eb3a87f962147cd6b4a7fcb427d1ac983e0cf4c7
+MD5 58670ea7bb26ae2a6179ba88176e3cf5 device-mapper-1.02.19-r1.ebuild 1748
+RMD160 71d9959608beb8377bd5068ed294c58ee7dde398 device-mapper-1.02.19-r1.ebuild 1748
+SHA256 76f05b93b1aa65879a6b6484eb3a87f962147cd6b4a7fcb427d1ac983e0cf4c7 device-mapper-1.02.19-r1.ebuild 1748
 EBUILD device-mapper-1.02.19.ebuild 1629 RMD160 597e0a2e391b339c276739c17d2347ce45bb83c3 SHA1 3c949f68b4adfd15745b8e5721cf4d498bee7e40 SHA256 b2799fb5b71be18d295965304d61b9521e474d7155fd8c8fb6f783bb1660d6ec
 MD5 e3de50acb426113b9109b17473f392f7 device-mapper-1.02.19.ebuild 1629
 RMD160 597e0a2e391b339c276739c17d2347ce45bb83c3 device-mapper-1.02.19.ebuild 1629
 SHA256 b2799fb5b71be18d295965304d61b9521e474d7155fd8c8fb6f783bb1660d6ec device-mapper-1.02.19.ebuild 1629
-MISC ChangeLog 13342 RMD160 09c090de220bcc102d02ede0311d783cd7f388a9 SHA1 4bfebe31a4f42fb0f482fb5617a3c632f7d15766 SHA256 72a8a500d4e105b2a58e9f3096adebf817117dafc3413226570f93cd5b9ffb81
-MD5 bc0aa9280562997ac8b309af7296b272 ChangeLog 13342
-RMD160 09c090de220bcc102d02ede0311d783cd7f388a9 ChangeLog 13342
-SHA256 72a8a500d4e105b2a58e9f3096adebf817117dafc3413226570f93cd5b9ffb81 ChangeLog 13342
+MISC ChangeLog 13610 RMD160 f51fa8ec7e16f31b6aae49647780b31b0db7ebf8 SHA1 0cc8259c0259d8785b28cce804b52b366db6f94e SHA256 dae8b487b4c79024ae2766d127497650e0ed8cb60e8d65002d6014bca7ae4dfc
+MD5 0cb74e85aa78fa25746d08fb82e05751 ChangeLog 13610
+RMD160 f51fa8ec7e16f31b6aae49647780b31b0db7ebf8 ChangeLog 13610
+SHA256 dae8b487b4c79024ae2766d127497650e0ed8cb60e8d65002d6014bca7ae4dfc ChangeLog 13610
 MISC metadata.xml 300 RMD160 ede7eb0cde3ab4e83a90578f08e068486a2a59cd SHA1 2f199ce422f4fad87bcbdcb681d8197620bae236 SHA256 4f6e65a7f6e72548a3d0c35a34f7a119dc7f5c13dfc0820939bc8d1b72b75a4d
 MD5 80dc99dec1aed7022edd3fe784b02759 metadata.xml 300
 RMD160 ede7eb0cde3ab4e83a90578f08e068486a2a59cd metadata.xml 300
@@ -68,10 +76,13 @@ SHA256 c1652a136dc3701bf16366530e27044db04a6508cf13863577d524b503c70e28 files/di
 MD5 c8deb900fc9337496d60815cd1a87c2a files/digest-device-mapper-1.02.19 256
 RMD160 e13dcfbaf0f42288e47c4d246248445e9dcc0e2c files/digest-device-mapper-1.02.19 256
 SHA256 e6fe45a5e6b53426101ef858d9c530568c03b72c256296fc43ca7b16b7f34a4f files/digest-device-mapper-1.02.19 256
+MD5 c8deb900fc9337496d60815cd1a87c2a files/digest-device-mapper-1.02.19-r1 256
+RMD160 e13dcfbaf0f42288e47c4d246248445e9dcc0e2c files/digest-device-mapper-1.02.19-r1 256
+SHA256 e6fe45a5e6b53426101ef858d9c530568c03b72c256296fc43ca7b16b7f34a4f files/digest-device-mapper-1.02.19-r1 256
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGghC8NQqtfCuFneMRAmOyAJ4qljoZwF6fSIKnt/HY4FbjDsLhvgCfSDmX
-JPslsDAJcgDZnhJlvKXrqTE=
-=Whdy
+iD8DBQFGgjOtt2vP6XvVdOcRAqAFAKDU1K66w/19eGSJNR1vBMzvXvbbGwCgrix1
+yzOos8zm55Hcr9VwkE/E1kI=
+=NS7C
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/device-mapper/device-mapper-1.02.19-r1.ebuild b/sys-fs/device-mapper/device-mapper-1.02.19-r1.ebuild
new file mode 100644
index 000000000000..ff3c47d8b2e7
--- /dev/null
+++ b/sys-fs/device-mapper/device-mapper-1.02.19-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/device-mapper-1.02.19-r1.ebuild,v 1.1 2007/06/27 09:53:40 zzam Exp $
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Device mapper ioctl library for use with LVM2 utilities"
+HOMEPAGE="http://sources.redhat.com/dm/"
+SRC_URI="ftp://sources.redhat.com/pub/dm/${PN}.${PV}.tgz
+	ftp://sources.redhat.com/pub/dm/old/${PN}.${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="selinux"
+
+DEPEND="selinux? ( sys-libs/libselinux )"
+
+S=${WORKDIR}/${PN}.${PV}
+
+src_compile() {
+	econf --sbindir=/sbin $(use_enable selinux) || die "econf failed"
+	emake || die "compile problem"
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die
+
+	# move shared libs to /
+	mv "${D}"/usr/$(get_libdir) "${D}"/ || die "move libdir"
+	dolib.a lib/ioctl/libdevmapper.a || die "dolib.a"
+	gen_usr_ldscript libdevmapper.so
+
+	insinto /etc
+	doins "${FILESDIR}"/dmtab
+	insinto /lib/rcscripts/addons
+	doins "${FILESDIR}"/dm-start.sh
+
+	newinitd "${FILESDIR}"/device-mapper.rc device-mapper || die
+
+	insinto /etc/udev/rules.d/
+	newins "${FILESDIR}"/64-device-mapper.rules-1.02.19 64-device-mapper.rules
+
+	dodoc INSTALL INTRO README VERSION WHATS_NEW
+}
+
+pkg_preinst() {
+	local l=${ROOT}/$(get_libdir)/libdevmapper.so.1.01
+	[[ -e ${l} ]] && cp "${l}" "${D}"/$(get_libdir)/
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /$(get_libdir)/libdevmapper.so.1.01
+
+	elog "device-mapper volumes are no longer automatically created for"
+	elog "baselayout-2 users. If you are using baselayout-2, be sure to"
+	elog "run: # rc-update add device-mapper boot"
+}
diff --git a/sys-fs/device-mapper/files/64-device-mapper.rules-1.02.19 b/sys-fs/device-mapper/files/64-device-mapper.rules-1.02.19
new file mode 100644
index 000000000000..ace522ba10f5
--- /dev/null
+++ b/sys-fs/device-mapper/files/64-device-mapper.rules-1.02.19
@@ -0,0 +1,33 @@
+# device mapper links hook into "change" events, when the dm table
+# becomes available; some table-types must be ignored
+
+KERNEL=="device-mapper",	NAME="mapper/control"
+
+KERNEL!="dm-*", GOTO="device_mapper_end"
+ACTION!="add|change", GOTO="device_mapper_end"
+
+# lookup device name
+# use dmsetup, until devmap_name is provided by sys-fs/device-mapper
+PROGRAM=="/sbin/dmsetup -j %M -m %m --noopencount --noheadings -c -o name info",
+	ENV{DM_NAME}="%c"
+
+# do not do anything if dmsetup does not provide a name
+ENV{DM_NAME}=="", NAME="", OPTIONS="ignore_device"
+
+# ignore luks crypt devices while not fully up
+ENV{DM_NAME}=="temporary-cryptsetup-*", NAME="", OPTIONS="ignore_device"
+
+# use queried name
+ENV{DM_NAME}=="?*", NAME="mapper/$env{DM_NAME}"
+
+SYMLINK+="disk/by-id/dm-name-$env{DM_NAME}"
+
+PROGRAM!="/sbin/dmsetup status -j %M -m %m", GOTO="device_mapper_end"
+RESULT=="|*snapshot*|*error*", GOTO="device_mapper_end"
+
+IMPORT{program}="vol_id --export $tempnode"
+OPTIONS="link_priority=50"
+ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
+ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"
+
+LABEL="device_mapper_end"
diff --git a/sys-fs/device-mapper/files/digest-device-mapper-1.02.19-r1 b/sys-fs/device-mapper/files/digest-device-mapper-1.02.19-r1
new file mode 100644
index 000000000000..82157204a9af
--- /dev/null
+++ b/sys-fs/device-mapper/files/digest-device-mapper-1.02.19-r1
@@ -0,0 +1,3 @@
+MD5 37cb592a1fa8fc31dc00cb437bbb4969 device-mapper.1.02.19.tgz 183064
+RMD160 00b584c67856ab18323bcc2918aed5ac4198cb65 device-mapper.1.02.19.tgz 183064
+SHA256 4723a4ba55e10c58a4e1bd7551e1e7d90ce43d3fcdabfd78285d39c2d33cdead device-mapper.1.02.19.tgz 183064
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index ddc834856afa..a7ee3f10108d 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -124,6 +124,7 @@ SHA256 50a345d2065afeeb6d453c99596066a4054a00552896ea98ed067f128bb075b4 files/ud
 DIST udev-104.tar.bz2 187574 RMD160 269aeb9a0b2043d18c274fde749d2e0d30398b73 SHA1 53a8019f2be429be914e0283bfbcb91083fbbd9a SHA256 ec0e7bd0c322dce6149d5f94185aa477659f5030a3d684ff5428124eca684ea1
 DIST udev-111.tar.bz2 190020 RMD160 bb3f1c2b1e24092b42507b663eceffe17f8a4a06 SHA1 910e8f31835528ec45cd59ba4a00f88c7f93670e SHA256 ec47cc46b15838321c31589d7bdbdcf553c0ea4f406edc6f239cb20a3732c233
 DIST udev-112.tar.bz2 194203 RMD160 1c50bcefc04ea08eb4df5eb0b2a12de2d8ff0228 SHA1 f55270798370eb7f432c8ec0c83627ae57cc6274 SHA256 823fabbef5add28a454f3ab67cd3bcf06a41f45b976590f2fe7ea84d22b5186e
+DIST udev-113.tar.bz2 195555 RMD160 02175d9714027716b7a97f49e61625979fd0c43c SHA1 55bea7ec61026b2ecc9d2013da0ef4eed76de948 SHA256 38da4049b76b58ddbc6ead6fa84cb241d94cc38ad4ee7aefd99ae2c57a73a2d4
 EBUILD udev-104-r12.ebuild 9539 RMD160 3ea7426633221cc11168e6f67872318e55b6295e SHA1 6eace4303ec38f8d7d0887925dcaab5b1161fa96 SHA256 0cf0d7a65976ebaaa287ac3eb39b32ff91f553de5af91ad01dc5a170c97bfbe5
 MD5 aa5803220fb1e030e862367e978100bd udev-104-r12.ebuild 9539
 RMD160 3ea7426633221cc11168e6f67872318e55b6295e udev-104-r12.ebuild 9539
@@ -148,10 +149,14 @@ EBUILD udev-112.ebuild 8190 RMD160 3e10191956ed648f16cddc802d061b289702c105 SHA1
 MD5 f3155d03e463bd5b52b90fd79b00b050 udev-112.ebuild 8190
 RMD160 3e10191956ed648f16cddc802d061b289702c105 udev-112.ebuild 8190
 SHA256 9c70a091ff92d265f50834bb245288e51f8e917d8df0392cc35b6d59ddaa269e udev-112.ebuild 8190
-MISC ChangeLog 62764 RMD160 721948a95ff04a44803f6598fdef53d003e8b63e SHA1 294349ced6c5035b2f16e35aae435ec75a2fd207 SHA256 b9ce762ee64225081389fe354124a6bf49a28acd737967eededa2acb344f2ec3
-MD5 bf1adf5fe5f3e7afe5c76cafb41ab03b ChangeLog 62764
-RMD160 721948a95ff04a44803f6598fdef53d003e8b63e ChangeLog 62764
-SHA256 b9ce762ee64225081389fe354124a6bf49a28acd737967eededa2acb344f2ec3 ChangeLog 62764
+EBUILD udev-113.ebuild 8992 RMD160 95388eeddc9d94f769420319e7341596c68251bb SHA1 ccc1bfab02b826279ab9e5876c9bb8c4e1220cb2 SHA256 f8a095cf087cee16e31f6fa71a0217d41125af86e25cb6a5a9e183206cfd8b91
+MD5 3039d0ed4628e076e283b8d01b083edf udev-113.ebuild 8992
+RMD160 95388eeddc9d94f769420319e7341596c68251bb udev-113.ebuild 8992
+SHA256 f8a095cf087cee16e31f6fa71a0217d41125af86e25cb6a5a9e183206cfd8b91 udev-113.ebuild 8992
+MISC ChangeLog 63064 RMD160 9de86e30e3359893b5d1e80ed9332ebb72a0aac4 SHA1 163ddad0ad1cbad9b56f794a22516591ab689b07 SHA256 b26080d425634276255b9fd51b5bfe28cd672d4024b62302b38d3a5e564a4f46
+MD5 7d0632186db80ecf25d8fec67ff36163 ChangeLog 63064
+RMD160 9de86e30e3359893b5d1e80ed9332ebb72a0aac4 ChangeLog 63064
+SHA256 b26080d425634276255b9fd51b5bfe28cd672d4024b62302b38d3a5e564a4f46 ChangeLog 63064
 MISC metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be SHA1 70c43d2863c09958849bfce8c5bb97d406a0662b SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884
 MD5 f74bee0505505c00e76da6313db29e49 metadata.xml 447
 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be metadata.xml 447
@@ -174,10 +179,13 @@ SHA256 5a6fbdea53905f63b63d8e9c7cdd33c08241cf59dbb4aa9cfdcac6d87ec500eb files/di
 MD5 a82010635b4041c2229cf960a9d73eaf files/digest-udev-112-r1 229
 RMD160 a3a88f67863e15305a790346449792c868e00d2f files/digest-udev-112-r1 229
 SHA256 5a6fbdea53905f63b63d8e9c7cdd33c08241cf59dbb4aa9cfdcac6d87ec500eb files/digest-udev-112-r1 229
+MD5 06ae5eaf2ef4822f6277a5c4e2361438 files/digest-udev-113 229
+RMD160 44acd6ea09ff5ec7f54376dd33c1db09e18a1fb1 files/digest-udev-113 229
+SHA256 64c3a37d941e4b18999d5848050520182dc7d2096da5fd08b8d3c40928445154 files/digest-udev-113 229
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGaAu6t2vP6XvVdOcRAkCBAJsEWufs8GLn39IJ8F3iipYDDvqCTgCggMdJ
-rH2/KHdRGx4ncpqNUxPiqL4=
-=og/Y
+iD8DBQFGgjS3t2vP6XvVdOcRAghLAKCTjs17QXyNKg3f3Yl2VGdfLJBL+gCgl/ZU
+ubH+D1kxVxd5VFppEqc9IO4=
+=VF3p
 -----END PGP SIGNATURE-----