Bug #318039: version bump.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog
index 4d2ea18e26a82446888be42c59191e58f02d43f9..ad1d4da45a001983cf7fb583f50f23746f6a70ed 100644 (file)
--- a/sys-fs/cryptsetup/ChangeLog
+++ b/sys-fs/cryptsetup/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/cryptsetup
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.80 2010/04/23 19:35:04 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.81 2010/05/01 21:40:39 robbat2 Exp $
+
+*cryptsetup-1.1.1_rc1 (01 May 2010)
+
+  01 May 2010; Robin H. Johnson <robbat2@gentoo.org>
+  +cryptsetup-1.1.1_rc1.ebuild:
+  Bug #318039: version bump.
 
   23 Apr 2010; Robin H. Johnson <robbat2@gentoo.org>
   +files/1.1.0-libudev.patch, cryptsetup-1.1.0.ebuild:

diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 30ca987243259749ff6c387ee9c7e618c765df4f..65e4f050d1b7c02d14193f92ea9fa48544a8e897 100644 (file)
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -16,11 +16,13 @@ DIST cryptsetup-1.0.5.tar.bz2 322394 RMD160 99d9b0090b297b1bc2c72c064f091c8b2f32
 DIST cryptsetup-1.0.6.tar.bz2 405713 RMD160 7ec056cf80fd25a782d3f6cc345858cf4ea988ec SHA1 dd45ad6a29c2e9af83c2c1525b02d7af88ab7212 SHA256 df7fda80cfa01f063caf39140287a47d018dfe056fc71a3ba605e690ff0183fd
 DIST cryptsetup-1.0.7.tar.bz2 417339 RMD160 0b903f14b672dfb74116864886370852c66ec425 SHA1 d955a8149d19bc9f09f20bf89f4a39771e6f5de7 SHA256 829af59ab5bb47e4ff384a927458b4ffbb86380825de5f9ac751a89df599ed99
 DIST cryptsetup-1.1.0.tar.bz2 465778 RMD160 c4e649bd8749507ee43e639f62cf2d28cc6ae412 SHA1 e28a4ec4ff9ec82eb1f4660f49cc63bf3538e4b7 SHA256 b343fa6bf3c48b633e68da25e44aebd6a32a3dc21c10604acd6faa04e41f58f3
+DIST cryptsetup-1.1.1-rc1.tar.bz2 476097 RMD160 c4ec17a7495f138098b76f52115238298740b263 SHA1 0d52bd4a152b066b37224773e642e36c1d52d79d SHA256 98720aa760741652e5280edfd5e03208a7e407c505d3ee3e9056dbb7712f0dc2
 EBUILD cryptsetup-0.1-r3.ebuild 1882 RMD160 cba167af414ab6349b172c5c8d6449ba7228458a SHA1 f9a70a151fdd2cb7e3591514f583c066e4899c0b SHA256 ffee91a66e88d879e3f6bfee3ab97e97b6735315e0d9c81d8b2ec005dcf8d473
 EBUILD cryptsetup-1.0.5-r1.ebuild 2967 RMD160 e3d53062c60387d7ed59c864a842de457f031d3f SHA1 4a603cb45fe4cf249cc6a75413d3e14481098b6e SHA256 4f305ccb9c8432becb2e4a42859305aa642d3df8c8ed04b78c5dca4f839bead7
 EBUILD cryptsetup-1.0.6-r2.ebuild 3150 RMD160 997496f32ffb972a4d21efb80cb0ccedf2a53197 SHA1 8cbe4f6a69a72faf4916f1992a4ee3febd04114e SHA256 cad92c053518bb11a2acd9e806e471117c462187c8a02f5258e933e093ab2a66
 EBUILD cryptsetup-1.0.7-r1.ebuild 3018 RMD160 2287bad817297bdfd972f3a8747d3c70be3955c6 SHA1 2cdd53dc478dfba7fba3050a2b134b52a1b65489 SHA256 7886a41d8aec79ef373a815f9860a57fbcbdf08a0323eee92cae45f423164f4d
 EBUILD cryptsetup-1.0.7.ebuild 3056 RMD160 69eb9e5572e3e0a4492dc4f470c067dc660e0a80 SHA1 777fc921347d9d4cc3f295b6021ea7aa822bed80 SHA256 bb6659123697cd5911e0535bcc913a2ad7c649f6458e29ded30304af5dd6eb01
 EBUILD cryptsetup-1.1.0.ebuild 2952 RMD160 4f790c0b7388319bc4935237a301868f443b0303 SHA1 23859d8a72aea30d92ac5c6ed63c8d63648fe6ac SHA256 7d90181d116cf2debeec1b17e4bd5e6ee12b3823f8e6af4c11a7e80ba209c0cf
-MISC ChangeLog 11441 RMD160 3f4fa0b687b2c672710779e3911beb2bf232e6dc SHA1 3e928c0df9dbd82d9d09a12cff826480e83ba492 SHA256 1e697e8d96b9d83d6f5fc8714280ec886c721f0c07027cf2de878b4c16c93472
+EBUILD cryptsetup-1.1.1_rc1.ebuild 2976 RMD160 22ebdbd9bd384c291ae7465a13030e00cda58865 SHA1 eaaf52df56624245c1e54f88c4708eba70df325a SHA256 c3a6eb7c87023c0052c0e20ba25f003d1ecf98c01cf71e2ea3c515d30d53ab8e
+MISC ChangeLog 11593 RMD160 45fa58421af1798a66ec3f04519d4153ade049d2 SHA1 0157d87cbbe1a9beb5d8f7b090d60ac78deb8306 SHA256 580fa535dc149edce21e8a1f76118579e6939493ed1fd2686f98c21ec8114dc0
 MISC metadata.xml 239 RMD160 81512c49e64b6e70c7b746ba09d3e6fce4c7bc89 SHA1 c4085a72e46fe6bcea5bdff780007791eae6db4b SHA256 aebd5282fb892100f348eba1ed27edd27e7296356897c6f5314674f8abb4b51a

diff --git a/sys-fs/cryptsetup/cryptsetup-1.1.1_rc1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.1.1_rc1.ebuild
new file mode 100644 (file)
index 0000000..942e252
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-1.1.1_rc1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.1.1_rc1.ebuild,v 1.1 2010/05/01 21:40:39 robbat2 Exp $
+
+EAPI=2
+
+inherit linux-info eutils flag-o-matic multilib autotools
+
+MY_P=${P/_rc/-rc}
+DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
+HOMEPAGE="http://code.google.com/p/cryptsetup/"
+SRC_URI="http://cryptsetup.googlecode.com/files/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="dynamic nls selinux"
+
+S=${WORKDIR}/${MY_P}
+
+DEPEND=">=sys-fs/lvm2-2.02.64
+       >=dev-libs/libgcrypt-1.1.42
+       >=dev-libs/libgpg-error-1.0-r1
+       >=dev-libs/popt-1.7
+       >=sys-fs/udev-124
+       || ( >=sys-libs/e2fsprogs-libs-1.41 <sys-fs/e2fsprogs-1.41 )
+       selinux? ( sys-libs/libselinux )
+       !sys-fs/cryptsetup-luks"
+
+pkg_setup() {
+       local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC"
+       local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
+       local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
+       local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
+       check_extra_config
+
+       if use dynamic ; then
+               ewarn "If you need cryptsetup for an initrd or initramfs then you"
+               ewarn "should NOT use the dynamic USE flag"
+               epause 5
+       fi
+}
+
+src_prepare() {
+       # Merged upstream
+       #epatch "${FILESDIR}"/1.1.0_rc3-static-no-selinux.patch
+       epatch "${FILESDIR}"/1.1.0-libudev.patch
+       eautoreconf
+       :
+}
+
+src_configure() {
+       econf \
+               --sbindir=/sbin \
+               --enable-shared \
+               $(use_enable !dynamic static) \
+               --libdir=/usr/$(get_libdir) \
+               $(use_enable nls) \
+               $(use_enable selinux) \
+               || die
+}
+
+src_compile() {
+       emake || die
+}
+
+src_install() {
+       emake DESTDIR="${D}" install || die "install failed"
+       rmdir "${D}"/usr/$(get_libdir)/cryptsetup
+       insinto /$(get_libdir)/rcscripts/addons
+       newins "${FILESDIR}"/1.0.6-r2-dm-crypt-start.sh dm-crypt-start.sh || die
+       newins "${FILESDIR}"/1.0.5-dm-crypt-stop.sh dm-crypt-stop.sh || die
+       newconfd "${FILESDIR}"/1.0.6-dmcrypt.confd dmcrypt || die
+       newinitd "${FILESDIR}"/1.0.5-dmcrypt.rc dmcrypt || die
+}
+
+pkg_postinst() {
+       ewarn "This ebuild introduces a new set of scripts and configuration"
+       ewarn "than the last version. If you are currently using /etc/conf.d/cryptfs"
+       ewarn "then you *MUST* copy your old file to:"
+       ewarn "/etc/conf.d/dmcrypt"
+       ewarn "Or your encrypted partitions will *NOT* work."
+       elog "Please see the example for configuring a LUKS mountpoint"
+       elog "in /etc/conf.d/dmcrypt"
+       elog
+       elog "If you are using baselayout-2 then please do:"
+       elog "rc-update add dmcrypt boot"
+       elog "This version introduces a command line arguement 'key_timeout'."
+       elog "If you want the search for the removable key device to timeout"
+       elog "after 10 seconds add the following to your bootloader config:"
+       elog "key_timeout=10"
+       elog "A timeout of 0 will mean it will wait indefinitely."
+}