[gentoo-commits] gentoo-x86 commit in sys-fs/cryptsetup: metadata.xml ChangeLog cryptsetup-1.6.1.ebuild

[Tim Harder (radhermit)]

radhermit    13/06/04 18:58:59

  Modified:             metadata.xml ChangeLog
  Added:                cryptsetup-1.6.1.ebuild
  Log:
  Version bump (bug #464610 by Manuel Rüger), convert to python-single-r1, add support for choosing a crypto backend (gcrypt, kernel, nettle, or openssl), remove old postinst warning, and only show postinst logs on new installs.
  
  (Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

Revision  Changes    Path
1.8                  sys-fs/cryptsetup/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/metadata.xml?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/metadata.xml?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/metadata.xml?r1=1.7&r2=1.8

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/metadata.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- metadata.xml	17 Jan 2013 23:35:08 -0000	1.7
+++ metadata.xml	4 Jun 2013 18:58:59 -0000	1.8
@@ -4,6 +4,10 @@
 	<herd>base-system</herd>
 	<use>
 		<flag name="dynamic">Build cryptsetup dynamically</flag>
+		<flag name="gcrypt">Enable the <pkg>dev-libs/libgcrypt</pkg> crypto backend</flag>
+		<flag name="kernel">Enable the kernel crypto backend</flag>
+		<flag name="nettle">Enable the <pkg>dev-libs/nettle</pkg> crypto backend</flag>
+		<flag name="openssl">Enable the <pkg>dev-libs/openssl</pkg> crypto backend</flag>
 		<flag name="urandom">Use /dev/urandom instead of /dev/random</flag>
 		<flag name="reencrypt">Build cryptsetup-reencrypt</flag>
 	</use>



1.150                sys-fs/cryptsetup/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/ChangeLog?rev=1.150&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/ChangeLog?rev=1.150&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/ChangeLog?r1=1.149&r2=1.150

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- ChangeLog	9 Apr 2013 10:06:06 -0000	1.149
+++ ChangeLog	4 Jun 2013 18:58:59 -0000	1.150
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/cryptsetup
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.149 2013/04/09 10:06:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.150 2013/06/04 18:58:59 radhermit Exp $
+
+*cryptsetup-1.6.1 (04 Jun 2013)
+
+  04 Jun 2013; Tim Harder <radhermit@g.o> +cryptsetup-1.6.1.ebuild,
+  metadata.xml:
+  Version bump (bug #464610 by Manuel Rüger), convert to python-single-r1, add
+  support for choosing a crypto backend (gcrypt, kernel, nettle, or openssl),
+  remove old postinst warning, and only show postinst logs on new installs.
 
   09 Apr 2013; Samuli Suominen <ssuominen@g.o>
   cryptsetup-1.0.6-r2.ebuild:



1.1                  sys-fs/cryptsetup/cryptsetup-1.6.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.6.1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.6.1.ebuild?rev=1.1&content-type=text/plain

Index: cryptsetup-1.6.1.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.6.1.ebuild,v 1.1 2013/06/04 18:58:59 radhermit Exp $

EAPI=5
PYTHON_COMPAT=( python{2_5,2_6,2_7} )

inherit python-single-r1 linux-info libtool eutils

DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
HOMEPAGE="http://code.google.com/p/cryptsetup/"
SRC_URI="http://cryptsetup.googlecode.com/files/${P}.tar.bz2"

LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
CRYPTO_BACKENDS="+gcrypt kernel nettle openssl"
# we don't support nss since it doesn't allow cryptsetup to be built statically
# and it's missing ripemd160 support so it can't provide full backward compatibility
IUSE="${CRYPTO_BACKENDS} nls python reencrypt selinux static static-libs udev urandom"
REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
	python? ( ${PYTHON_REQUIRED_USE} )"

LIB_DEPEND="dev-libs/libgpg-error[static-libs(+)]
	dev-libs/popt[static-libs(+)]
	sys-apps/util-linux[static-libs(+)]
	gcrypt? ( dev-libs/libgcrypt[-caps,static-libs(+)] )
	nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
	openssl? ( dev-libs/openssl[static-libs(+)] )
	sys-fs/lvm2[static-libs(+)]
	sys-libs/e2fsprogs-libs[static-libs(+)]
	udev? ( virtual/udev[static-libs(+)] )"
# We have to always depend on ${LIB_DEPEND} rather than put behind
# static? () because we provide a shared library which links against
# these other packages. #414665
RDEPEND="static-libs? ( ${LIB_DEPEND} )
	${LIB_DEPEND//\[static-libs(+)]}
	selinux? ( sys-libs/libselinux )
	python? ( ${PYTHON_DEPS} )"
DEPEND="${RDEPEND}
	virtual/pkgconfig
	static? ( ${LIB_DEPEND} )"

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

	use python && python-single-r1_pkg_setup
}

src_prepare() {
	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
	elibtoolize
}

src_configure() {
	if use kernel ; then
		ewarn "Note that kernel backend is very slow for this type of operation"
		ewarn "and is provided mainly for embedded systems wanting to avoid"
		ewarn "userspace crypto libraries."
	fi

	econf \
		--sbindir=/sbin \
		--enable-shared \
		$(use_enable static static-cryptsetup) \
		$(use_enable static-libs static) \
		$(use_enable nls) \
		$(use_enable python) \
		$(use_enable reencrypt cryptsetup-reencrypt) \
		$(use_enable selinux) \
		$(use_enable udev) \
		$(use_enable !urandom dev-random) \
		--with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/}; do use ${x} && echo ${x} ; done)
}

src_test() {
	if [[ ! -e /dev/mapper/control ]] ; then
		ewarn "No /dev/mapper/control found -- skipping tests"
		return 0
	fi
	local p
	for p in /dev/mapper /dev/loop* ; do
		addwrite ${p}
	done
	default
}

src_install() {
	default
	if use static ; then
		mv "${ED}"/sbin/cryptsetup{.static,} || die
		mv "${ED}"/sbin/veritysetup{.static,} || die
		use reencrypt && { mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die ; }
	fi
	prune_libtool_files --modules

	newconfd "${FILESDIR}"/1.0.6-dmcrypt.confd dmcrypt
	newinitd "${FILESDIR}"/1.5.1-dmcrypt.rc dmcrypt
}

pkg_postinst() {
	if [[ -z ${REPLACING_VERSIONS} ]] ; then
		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."
		elog
		elog "Users using cryptsetup-1.0.x (dm-crypt plain) volumes must use"
		elog "a compatibility mode when using cryptsetup-1.1.x. This can be"
		elog "done by specifying the cipher (-c), key size (-s) and hash (-h)."
		elog "For more info, see http://code.google.com/p/cryptsetup/wiki/FrequentlyAskedQuestions#6._Issues_with_Specific_Versions_of_cryptsetup"
	fi
}