From e582555d7b8d43ba77a427ef089e6b1621adc1da Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev Date: Sat, 21 Feb 2015 21:18:30 +0000 Subject: [PATCH] =?utf8?q?Version=20bump=20(bug=20#518590,=20thanks=20to?= =?utf8?q?=20Rafa=C5=82=20Mu=C5=BCy=C5=82o=20and=20Andrey=20Aleksandrovich?= =?utf8?q?);=20fixes=20hang=20on=20hardened=20kernels.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Package-Manager: portage-2.2.17/cvs/Linux x86_64 Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D --- sys-fs/vhba/ChangeLog | 11 ++++- sys-fs/vhba/Manifest | 28 +++++++---- sys-fs/vhba/vhba-20140928.ebuild | 85 ++++++++++++++++++++++++++++++++ 3 files changed, 113 insertions(+), 11 deletions(-) create mode 100644 sys-fs/vhba/vhba-20140928.ebuild diff --git a/sys-fs/vhba/ChangeLog b/sys-fs/vhba/ChangeLog index 2170659fb147..05457c47bcb8 100644 --- a/sys-fs/vhba/ChangeLog +++ b/sys-fs/vhba/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-fs/vhba -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/vhba/ChangeLog,v 1.48 2014/07/30 19:33:11 ssuominen Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/vhba/ChangeLog,v 1.49 2015/02/21 21:18:25 tetromino Exp $ + +*vhba-20140928 (21 Feb 2015) + + 21 Feb 2015; Alexandre Rostovtsev + +vhba-20140928.ebuild: + Version bump (bug #518590, thanks to Rafał Mużyło and Andrey + Aleksandrovich); fixes hang on hardened kernels. 30 Jul 2014; Samuli Suominen vhba-20130607.ebuild: Use shorter get_udevdir() instead of the longer deprecated udev_get_udevdir() diff --git a/sys-fs/vhba/Manifest b/sys-fs/vhba/Manifest index 4c5e8a4de608..931fc172f9b9 100644 --- a/sys-fs/vhba/Manifest +++ b/sys-fs/vhba/Manifest @@ -2,17 +2,27 @@ Hash: SHA256 DIST vhba-module-20130607.tar.bz2 15528 SHA256 d2c4919d2904a8f880e2730250f7ed6e3143575d5c4de6b88a97c2228aa2a185 SHA512 7ac359a3a20920a3baac81d1dd941f4ea04d77cffaf4bc63dc2d9b9d0f80883be82c00a911ab17b9b0da3719bd10f6bc392edd00f9342a332da5c5f036dfc4d7 WHIRLPOOL 85623ce6ae303ebf55512410f10c9f0b524f298104bf9305ce403516c8c12897eb253ab8163da6137c16e719d1abee4206b1864b8a73e9fd58bc95a6621d211e +DIST vhba-module-20140928.tar.bz2 15571 SHA256 45f56e4972b5aa7175903307901ca42d29da6fc8f92ab4c47007f53bc5bb55a2 SHA512 efa61b2ac44a015582f99affa4c26e4b6ccdd1506a7f14626c08833c4ffff300d128dd4e9040d83d5a51064b0bc9f95397c3cdfec7197c53c3d6f1a97953f779 WHIRLPOOL 4b96bb5010b8ab892db09f7e8f36fc67107533dd4d6beea6d5b89e6076c44ee969bee5d3b646b4ca5b1f0f6af446096fd892ab0970b8d6893fe4730f3eb18c07 EBUILD vhba-20130607.ebuild 2393 SHA256 472235baac88152395d82b8d9c285cea93432c69cc898bec550af70ad1ebfb70 SHA512 8f130846efc909688c3992abe661e35c6e7a949d5aec9cbe309a17cc70f42e7b6594c3187d02d61378525e2b8c70d078df5047e865e53f848894d42283d55ff4 WHIRLPOOL a15a2cba6784cf194869ce38cc56b97a7602008f77ad70fb4f4f71de25509cff24cd6d09622b96cfe430119991b63c001709a37bd533e1223df41edac98b8f33 -MISC ChangeLog 8830 SHA256 fb13a26b9f676f6d204a25b2813cf52f10c7db389af0d7ba200bb871f571e501 SHA512 fd2330671141cd7c37e659a5bac5db34f71f3a9fdcdb1b9587f9c9d0f1aceeb647f1446ec3360ac4ab4c70b22c1d49a1caf01e06252130f1899c4d8fa94e1732 WHIRLPOOL 9623c58c484181f311ceca6d5e0e112a8c23ab6aceb6774884ebbf28863824d60c37acfd9e72a7698809c3b1927fe5e5a63af8f0336784ef914d06ad0f87e336 +EBUILD vhba-20140928.ebuild 2395 SHA256 c908e31f4a9c7db923ad0acbec62d8af4558c03f35780b7a1f2a30348d9669b2 SHA512 4cfcd08d6dcd5879ad7adfa115eeecdb371a428dd0c1349fef3173ff25fe20c5c1d356104c57722afe5a060ca41cefb4b5dd7f54d0b6029f4fc61a40c6ef7ff0 WHIRLPOOL 15a19a45fb6a9ca96c44448bfd13735123a939ef6c6bf76bc982cf0a0eb8d7f4b78b065489b54c3ab0425453a520dd5255f86dbd897699384533bd5a5dc13e22 +MISC ChangeLog 9062 SHA256 b4a69c27326841f4720d2cd8d2ac39a94856ce318cbbca8049ef9783b7ccc3d3 SHA512 9238f63f5ba663873eea6bd14970a892c60d058aa6a126ffd744480ebc7e34799aae4e7fc0078e51e9d457b2a6c85592d69315514f07495d8cfdd6456fcc5c02 WHIRLPOOL d92729a8d3027a1518178bb42d5279365e248cd2af609d6d6f7d5278a37e2cc80da79f3de996940d0764ac16872ec4383e6bf3f81246d9f1bc1a65148e266dbd MISC metadata.xml 240 SHA256 4a0db93c159180b93d98dadc1cb36f054f18a7413357a0dd753c9264a43f7477 SHA512 14c9405275f11667ad7e035376fe7e5caf99ac982596621cda18a2f8a99e9a9b2464806be5d016d1a4c2fa794bf8b1400a5cb658a7a874e65d825b8baea69d62 WHIRLPOOL 0e2fbd97c0146322cf226d3086acf3e95dc86d17409f3d350ba2de1b81a2d93b0dc3f370d5c444475e129fa511791ea5b48ca00c47583cedc6ed60ef9e61fae7 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.0 -iQEcBAEBCAAGBQJT2Uh2AAoJEEdUh39IaPFN+8oH/3njQNDopthLFd7et2XtOLRc -sstGOR0AkRrbNFMR85Aik1OlSFuNr8IYPNHZSMrGn4X1PMsi/68bnPxmVYx3O2f/ -Rzxv0E4XoOeIf7oI6uFk9FgEbx6x2OQqgACcjdbMpeu8L5T2RZcetR2ehmUhoad1 -mF2IE5SQfanz2Hq/dDU9rJUZNrDFzTG5J9R7JT4NQDw8d/rYgQmhninn2QcU3EGO -j7+QvYoXEp3M/GRlsY/+nlA1/d5Fdyl6uuzAsHzC21WRdvCFAolnstzNwK1TAV0Y -qYO6N+uPMQUApATKuaBdAYA7hpUJZy2Zg9RbuzMStVIHituoQDNcQPSJSDKEwhM= -=RSv1 +iQJ8BAEBCABmBQJU6PYiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx +OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNQnwP/i2WPn8CWxSbtEGc82Tx/rKl +8G9ksy3EQnKZLYg5CqJGHKLzJgDqvEWjd17cZ3/W8yrpHTdX9ea0tqYGjxypSZP4 +jtoV6tI4JdpYBtniX2dytDeBaMX9yrHNFZnFnb4yfAtb7SRHoQqamXBCcXO+SlNL +v7JwW7XJpce0RnH6/Kz5spP53uRtAPIfueCItm+pe1rbQWWeqW+0enc6uebTcl5N +rC0b0wRS+vQ3MjpRU449mlslEq7bTNv/MCJ77+6uHYHGbg7R4/w+iFo+YuYxx1mM +MBiHQ2z6GytXL2S7Kg/7tJYDrjMVfrfPtoDmGrC6pZCE0TCApLEAW8OAncNVh/kq +syQttI+2dhPtE0WAPiWX+d32g+glMjo7W09wAsv5EXdoCx1MRANEi6d/nReFlY4v +VRh/nmrRw28EeHD8eUtH30BJkAj3Vi2gWwbyed0YeEpF0V4kyURjphRX3RGsQYdD +k5WV4oZn6XguQVoIAlDz71gEp8SqPbOtkWJpfkeQd/Jm5pWMMnzXqFC864IohWne +IojZFmjYQ+BzKJK3xlqGv8XhXByzbWGpWzKbYeEGK6/rHHkZtxrdeAYYtKyKJRqm +w4Gfxoz9fd+Z9gaUNIpNl0jfxYXoY+3+mROqKrYbFDdnBa5gCFcrqWAehvojjSHf +evMXTS/OuAeRKpAX1+Tj +=V70j -----END PGP SIGNATURE----- diff --git a/sys-fs/vhba/vhba-20140928.ebuild b/sys-fs/vhba/vhba-20140928.ebuild new file mode 100644 index 000000000000..fe9e91769366 --- /dev/null +++ b/sys-fs/vhba/vhba-20140928.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/vhba/vhba-20140928.ebuild,v 1.1 2015/02/21 21:18:25 tetromino Exp $ + +EAPI="5" + +inherit linux-mod user udev + +MY_P=vhba-module-${PV} +DESCRIPTION="Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite" +HOMEPAGE="http://cdemu.org" +SRC_URI="mirror://sourceforge/cdemu/${MY_P}.tar.bz2" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~x86" +IUSE="" + +RDEPEND="virtual/udev" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +S=${WORKDIR}/${MY_P} +MODULE_NAMES="vhba(block:${S})" +BUILD_TARGETS=modules + +pkg_setup() { + CONFIG_CHECK="~BLK_DEV_SR ~CHR_DEV_SG" + check_extra_config + BUILD_PARAMS="KDIR=${KV_OUT_DIR}" + linux-mod_pkg_setup + + enewgroup cdemu +} + +src_prepare() { + # Avoid "make jobserver unavailable" warning and -Werror problems + sed -e '/ccflags/s/-Werror$/-Wall/' \ + -i Makefile || die "sed failed" +} + +src_install() { + dodoc AUTHORS ChangeLog README + linux-mod_src_install + + einfo "Generating udev rules ..." + dodir "$(get_udevdir)"/rules.d + cat > "${D}/$(get_udevdir)"/rules.d/70-vhba.rules <<-EOF || die + # do not edit this file, it will be overwritten on update + # + KERNEL=="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu" + EOF +} + +pkg_postinst() { + elog "Don't forget to add your user to the cdemu group if you want to" + elog "be able to use virtual cdemu devices." + + # Older versions of vhba installed their rule file in /etc/udev/rules.d, + # which overrides rules in /lib/udev/rules.d. We remove the old file + # automatically if it is identical to the default one installed by + # vhba-1.2.1 or 20101015-r1. Note that the comment at the top of the rules + # file states that it can be automatically overwritten by the system. + old_rules="${ROOT}etc/udev/rules.d/70-vhba.rules" + if [[ -f "${old_rules}" ]]; then + case "$(md5sum ${old_rules})" in + 2959b3cf61cfe6e466cc3516a7bc19de* | 1e7a7e5d6d28c811eeec98ec26ed5d28* ) + elog + elog "Removing old ${old_rules} ..." + rm -f "${old_rules}" || + eerror "Failed, please remove ${old_rules} manually." + ;; + * ) + ewarn + ewarn "The ${old_rules} file from a previous" + ewarn "installation of ${PN} is overriding ${P}'s" + ewarn "udev rules. Unless you had deliberately customized it," + ewarn "you should remove it." + ewarn + ;; + esac + fi + + linux-mod_pkg_postinst +} -- 2.26.2