+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.314 2013/08/14 16:14:29 ssuominen Exp $

+

+*lvm2-2.02.99-r2 (14 Aug 2013)

+

+ 14 Aug 2013; Samuli Suominen <ssuominen@gentoo.org>

+ +files/lvm2-2.02.99-fix-mda-offset-size-overflow-4g-with-lvmetad.patch,

+ +lvm2-2.02.99-r2.ebuild:

+ Upstream patch for "Fix metadata area offset/size overflow if it's >= 4g and

+ while using lvmetad."

+AUX lvm2-2.02.99-fix-mda-offset-size-overflow-4g-with-lvmetad.patch 1311 SHA256 d5547fb0eed458f13154c187037141fe3d1b3fcf049615b231afca332898c22b SHA512 400ef32d4535e45601f6d4e1f0270c0e504dfc3ad1b284b7cfe2b21d9bdc2438f24c45dc85ca51803881215c4f6f9a753fb71c7c357dc9b135bf439eba7874a5 WHIRLPOOL 870aa09765becdf90924e979376810acd060f13653f91ec0694883011570d52d5d4d22f6622313cb853eba7a6fc9cd5b85039d7d6b9f2c5dc1833c2cee1a541a

+EBUILD lvm2-2.02.99-r2.ebuild 8217 SHA256 3b2b043cb028b55af42e88a5567267ac837f648e4c5f6327b2e97989eb86d444 SHA512 1f831d00e140b6ffe5ba64a48bfef8ec11ae66981451c9d64d50a6e60c04ba05a4bdfda38400a4d1501e7d4c150e745d0e3ed9512e0f4294fa79286237b66f5a WHIRLPOOL a92d6ad1769a239a65312065074730e9ccc7149b4d71dd19cbee5eafa334c703dad24a8a55e039f0ecfa6187d5cf1e69f3ffcd022485f5f7f2498da0d6e8c929

+MISC ChangeLog 59768 SHA256 9a5273499fd8e0f1bb2a7219c608af2777457f7fc34931de35e031c7e9ce1365 SHA512 01baeb7945021cc0211c053053f017188645e59861a4e836500a9cac17d1daafa6923f09901b8e30674239dca55a790f313e6f08925a7ec1875e24b71a1ff05d WHIRLPOOL 80cbbed2591ac0284013ed1940f239d204cee635246158779c46df641311d1e42628ff2b673ae5cd9cb084f7a412d11be5ef92d0d57ca0c248db7dc0b40035ce

+iQEcBAEBCAAGBQJSC6xTAAoJEEdUh39IaPFNxLgH/2b0PMMM/AeTiCTr31159Jcb

+/YCQND0YY8KvoatD4uPLF252xX/NIH08Z6saUL0qij8ZFZiw6qA1UT+uFJAkwkvW

+dK9DS9FKTLfCorG3jwwWOh1WKV+7qvUSIP+/tQuu2KolGr5UPruObfgMCUWwF41d

+OAkVG2rRfbh1f4+ymejB19N3LwYM13OLuFTAZI6KWEaPGwjJVENRKKxDznrM3uPw

+Q7cIMnVppVCQhHDF1/ImSPfq7RlaJ9YaXuuNQ83IFlWzgb0ht7QXMhDPIfyI1Gj6

+Hysb7GGfCgxSU1jRLczoh0kN4RZ3N6OCHZkDYQZOG/Oo61uy870vowCdWZNtVYA=

+=CycY

+http://pkgs.fedoraproject.org/cgit/lvm2.git/plain/lvm2-2_02_100-fix-mda-offset-size-overflow-4g-with-lvmetad.patch

+

+WHATS_NEW | 4 ++++

+ lib/format_text/format-text.c | 4 ++--

+ 2 files changed, 6 insertions(+), 2 deletions(-)

+

+diff --git a/WHATS_NEW b/WHATS_NEW

+index 039ddec..f2f5ba4 100644

+--- a/WHATS_NEW

++++ b/WHATS_NEW

+@@ -1,3 +1,7 @@

++Version 2.02.100 -

++================================

++ Fix metadata area offset/size overflow if it's >= 4g and while using lvmetad.

++

+ Version 2.02.99 - 24th July 2013

+ ================================

+ Do not zero init 4KB of thin snapshot for non-zeroing thin pool (2.02.94).

+diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c

+index b210603..950e0d5 100644

+--- a/lib/format_text/format-text.c

++++ b/lib/format_text/format-text.c

+@@ -1688,12 +1688,12 @@ static int _mda_import_text_raw(struct lvmcache_info *info, const struct dm_conf

+

+ cn = cn->child;

+ device = lvmcache_device(info);

+- size = dm_config_find_int(cn, "size", 0);

++ size = dm_config_find_int64(cn, "size", 0);

+

+ if (!device || !size)

+ return 0;

+

+- offset = dm_config_find_int(cn, "start", 0);

++ offset = dm_config_find_int64(cn, "start", 0);

+ ignore = dm_config_find_int(cn, "ignore", 0);

+

+ lvmcache_add_mda(info, device, offset, size, ignore);

+# Copyright 1999-2013 Gentoo Foundation

+# Distributed under the terms of the GNU General Public License v2

+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.99-r2.ebuild,v 1.1 2013/08/14 16:14:29 ssuominen Exp $

+

+EAPI=5

+inherit eutils multilib toolchain-funcs autotools linux-info udev systemd

+

+DESCRIPTION="User-land utilities for LVM2 (device-mapper) software."

+HOMEPAGE="http://sources.redhat.com/lvm2/"

+SRC_URI="ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz

+ ftp://sources.redhat.com/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz"

+

+LICENSE="GPL-2"

+SLOT="0"

+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"

+

+IUSE="readline static static-libs clvm cman +lvm1 lvm2create_initrd selinux +udev +thin"

+

+DEPEND_COMMON="clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* )

+ readline? ( sys-libs/readline )

+ udev? ( >=virtual/udev-200[static-libs?] )"

+# /run is now required for locking during early boot. /var cannot be assumed to

+# be available.

+RDEPEND="${DEPEND_COMMON}

+ !<sys-apps/openrc-0.10.1

+ >=sys-apps/baselayout-2.1-r1

+ !!sys-fs/lvm-user

+ !!sys-fs/clvm

+ >=sys-apps/util-linux-2.16

+ lvm2create_initrd? ( sys-apps/makedev )

+ thin? ( sys-block/thin-provisioning-tools )"

+# Upgrading to this LVM will break older cryptsetup

+RDEPEND="${RDEPEND}

+ !<sys-fs/cryptsetup-1.1.2"

+DEPEND="${DEPEND_COMMON}

+ virtual/pkgconfig

+ >=sys-devel/binutils-2.20.1-r1

+ static? (

+ udev? ( virtual/udev[static-libs] )

+ selinux? ( sys-libs/libselinux[static-libs] )

+ )"

+

+S=${WORKDIR}/${PN/lvm/LVM}.${PV}

+

+pkg_setup() {

+ local CONFIG_CHECK="~SYSVIPC"

+

+ if use udev; then

+ local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"

+ if linux_config_exists; then

+ local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)

+ if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then

+ ewarn "It's recommended to set an empty value to the following kernel config option:"

+ ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"

+ fi

+ fi

+ fi

+

+ check_extra_config

+

+ # 1. Genkernel no longer copies /sbin/lvm blindly.

+ if use static; then

+ elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"

+ elog "their static versions. If you need the static binaries,"

+ elog "you must append .static to the filename!"

+ fi

+}

+

+src_prepare() {

+ # Gentoo specific modification(s)

+ epatch "${FILESDIR}"/${PN}-2.02.99-example.conf.in.patch

+

+ # Not merged upstream, should be reviewed and forwarded:

+ epatch \

+ "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch \

+ "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch \

+ "${FILESDIR}"/${PN}-2.02.88-respect-cc.patch

+ epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331

+ epatch "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373

+ epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed

+ epatch "${FILESDIR}"/${PN}-2.02.92-dynamic-static-ldflags.patch #332905

+ epatch "${FILESDIR}"/${PN}-2.02.97-udev-static.patch #370217

+ epatch "${FILESDIR}"/${PN}-2.02.99-selinux-static.patch #439414

+

+ sed -i -e 's:/usr/sbin/lvm:/sbin/lvm:' scripts/lvm2_activation_generator_systemd_red_hat.c || die #479626

+

+ # From upstream:

+ epatch "${FILESDIR}"/${PN}-2.02.99-fix-mda-offset-size-overflow-4g-with-lvmetad.patch

+

+ # Fix calling AR directly with USE static, bug #444082, convert to patch and forward to upstream

+ if use static ; then

+ sed -i -e "s:\$(AR) rs \$@ \$(OBJECTS) lvmcmdlib.o lvm2cmd-static.o:$(tc-getAR) rs \$@ \$(OBJECTS) lvmcmdlib.o lvm2cmd-static.o:" \

+ tools/Makefile.in || die

+ fi

+

+ eautoreconf

+}

+

+src_configure() {

+ local myconf

+ local buildmode

+

+ myconf="${myconf} --enable-dmeventd"

+ myconf="${myconf} --enable-cmdlib"

+ myconf="${myconf} --enable-applib"

+ myconf="${myconf} --enable-fsadm"

+ myconf="${myconf} --enable-lvmetad"

+

+ # Most of this package does weird stuff.

+ # The build options are tristate, and --without is NOT supported

+ # options: 'none', 'internal', 'shared'

+ if use static ; then

+ buildmode="internal"

+ # This only causes the .static versions to become available

+ myconf="${myconf} --enable-static_link"

+ else

+ buildmode="shared"

+ fi

+

+ # dmeventd requires mirrors to be internal, and snapshot available

+ # so we cannot disable them

+ myconf="${myconf} --with-mirrors=internal"

+ myconf="${myconf} --with-snapshots=internal"

+ use thin \

+ && myconf="${myconf} --with-thin=internal" \

+ || myconf="${myconf} --with-thin=none"

+

+ if use lvm1 ; then

+ myconf="${myconf} --with-lvm1=${buildmode}"

+ else

+ myconf="${myconf} --with-lvm1=none"

+ fi

+

+ # disable O_DIRECT support on hppa, breaks pv detection (#99532)

+ use hppa && myconf="${myconf} --disable-o_direct"

+

+ if use clvm; then

+ myconf="${myconf} --with-cluster=${buildmode}"

+ # 4-state! Make sure we get it right, per bug 210879

+ # Valid options are: none, cman, gulm, all

+ #

+ # 2009/02:

+ # gulm is removed now, now dual-state:

+ # cman, none

+ # all still exists, but is not needed

+ #

+ # 2009/07:

+ # TODO: add corosync and re-enable ALL

+ local clvmd=""

+ use cman && clvmd="cman"

+ #clvmd="${clvmd/cmangulm/all}"

+ [ -z "${clvmd}" ] && clvmd="none"

+ myconf="${myconf} --with-clvmd=${clvmd}"

+ myconf="${myconf} --with-pool=${buildmode}"

+ else

+ myconf="${myconf} --with-clvmd=none --with-cluster=none"

+ fi

+

+ local udevdir="${EPREFIX}/lib/udev/rules.d"

+ use udev && udevdir="${EPREFIX}/$(get_udevdir)/rules.d"

+

+ econf \

+ $(use_enable readline) \

+ $(use_enable selinux) \

+ --enable-pkgconfig \

+ --with-confdir="${EPREFIX}/etc" \

+ --sbindir="${EPREFIX}/sbin" \

+ --with-staticdir="${EPREFIX}/sbin" \

+ --libdir="${EPREFIX}/$(get_libdir)" \

+ --with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" \

+ --with-default-dm-run-dir=/run \

+ --with-default-run-dir=/run/lvm \

+ --with-default-locking-dir=/run/lock/lvm \

+ --with-dmeventd-path=/sbin/dmeventd \

+ --with-default-pid-dir=/run \

+ $(use_enable udev udev_rules) \

+ $(use_enable udev udev_sync) \

+ $(use_with udev udevdir "${udevdir}") \

+ "$(systemd_with_unitdir)" \

+ ${myconf} \

+ CLDFLAGS="${LDFLAGS}"

+}

+

+src_compile() {

+ pushd include >/dev/null

+ emake

+ popd >/dev/null

+

+ emake AR="$(tc-getAR)"

+ emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat

+}

+

+src_install() {

+ local inst

+ for inst in install install_systemd_units install_systemd_generators install_tmpfiles_configuration; do

+ emake DESTDIR="${D}" ${inst}

+ done

+

+ dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf

+ newinitd "${FILESDIR}"/lvm.rc-2.02.95-r2 lvm

+ newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.67-r2 lvm-monitoring

+ newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm

+ if use clvm; then

+ newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd

+ newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd

+ fi

+

+ # move shared libs to /lib(64)

+ if use static-libs; then

+ dolib.a libdm/ioctl/libdevmapper.a

+ dolib.a libdaemon/client/libdaemonclient.a #462908

+ #gen_usr_ldscript libdevmapper.so

+ fi

+

+ if use lvm2create_initrd; then

+ dosbin "${S}"/scripts/lvm2create_initrd/lvm2create_initrd

+ doman "${S}"/scripts/lvm2create_initrd/lvm2create_initrd.8

+ newdoc "${S}"/scripts/lvm2create_initrd/README README.lvm2create_initrd

+ fi

+

+ insinto /etc

+ doins "${FILESDIR}"/dmtab

+

+ # Device mapper stuff

+ newinitd "${FILESDIR}"/device-mapper.rc-2.02.95-r2 device-mapper

+ newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper

+

+ newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd

+ if use static-libs; then

+ dolib.a daemons/dmeventd/libdevmapper-event.a

+ #gen_usr_ldscript libdevmapper-event.so

+ fi

+

+ use static-libs || \

+ rm -f "${D}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a

+

+ # do not rely on /lib -> /libXX link

+ sed -i \

+ -e "s|/lib/rcscripts/|/$(get_libdir)/rcscripts/|" \

+ "${ED}"/etc/init.d/* || die

+}

+

+pkg_postinst() {

+ ewarn "Make sure the \"lvm\" init script is in the runlevels:"

+ ewarn "# rc-update add lvm boot"

+ ewarn

+ ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want"

+ ewarn "to enable lvm autoactivation and metadata caching."

+}

+

+src_test() {

+ einfo "Tests are disabled because of device-node mucking, if you want to"

+ einfo "run tests, compile the package and see ${S}/tests"

+}