summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2005-08-25 21:32:19 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2005-08-25 21:32:19 +0000
commit2f1db78691def71713c04649ec236cea3dc81c1b (patch)
treec2e23eb6ef0a454ff00517f8847f5b49b78d0708
parentMarking rpm-4.2.ebuild, which was ppc64, -ppc64 because it does not compile. ... (diff)
downloadgentoo-2-2f1db78691def71713c04649ec236cea3dc81c1b.tar.gz
gentoo-2-2f1db78691def71713c04649ec236cea3dc81c1b.tar.bz2
gentoo-2-2f1db78691def71713c04649ec236cea3dc81c1b.zip
Version bump to encorporate upstream post-release patches for minor bugfixes.
(Portage version: 2.0.51.22-r2)
-rw-r--r--sys-fs/evms/ChangeLog9
-rw-r--r--sys-fs/evms/Manifest8
-rw-r--r--sys-fs/evms/evms-2.5.3-r1.ebuild91
-rw-r--r--sys-fs/evms/files/2.5.3/compaq_segments.patch18
-rw-r--r--sys-fs/evms/files/2.5.3/md_expand.patch72
-rw-r--r--sys-fs/evms/files/digest-evms-2.5.3-r11
6 files changed, 196 insertions, 3 deletions
diff --git a/sys-fs/evms/ChangeLog b/sys-fs/evms/ChangeLog
index 7700d778607f..3b67920d80a7 100644
--- a/sys-fs/evms/ChangeLog
+++ b/sys-fs/evms/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sys-fs/evms
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/ChangeLog,v 1.36 2005/07/05 16:04:13 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/ChangeLog,v 1.37 2005/08/25 21:32:19 eradicator Exp $
+
+*evms-2.5.3-r1 (25 Aug 2005)
+
+ 25 Aug 2005; Jeremy Huddleston <eradicator@gentoo.org>
+ +files/2.5.3/compaq_segments.patch, +files/2.5.3/md_expand.patch,
+ +evms-2.5.3-r1.ebuild:
+ Version bump to encorporate upstream post-release patches for minor bugfixes.
05 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> evms-2.5.2-r1.ebuild:
Added ia64 to KEYWORDS. Blame plasmaroo.
diff --git a/sys-fs/evms/Manifest b/sys-fs/evms/Manifest
index 7948e85fad40..1e6544cba0ec 100644
--- a/sys-fs/evms/Manifest
+++ b/sys-fs/evms/Manifest
@@ -1,7 +1,11 @@
MD5 677800697b66d45c2b5ec92ab715be2d ChangeLog 8656
-MD5 a36fa36a0ee39f02fa7162fa72a488af evms-2.5.2-r1.ebuild 2297
MD5 56506764cd7ab73aa3b1a06b9e55f08a evms-2.5.3.ebuild 2295
+MD5 a36fa36a0ee39f02fa7162fa72a488af evms-2.5.2-r1.ebuild 2297
+MD5 60b8a2840c95958e552b536a7ef3aabe evms-2.5.3-r1.ebuild 2425
MD5 59d559390ca6a6d365a5d6c3012c0343 metadata.xml 387
+MD5 2769ffa4ae1f09667ac42e94da8036ba files/digest-evms-2.5.3 63
MD5 996ea6d43e86cc65954540da80e56061 files/digest-evms-2.5.2-r1 63
+MD5 2769ffa4ae1f09667ac42e94da8036ba files/digest-evms-2.5.3-r1 63
MD5 5eb632aa94b0537e1983f935e3706d74 files/evms2-start.sh 382
-MD5 2769ffa4ae1f09667ac42e94da8036ba files/digest-evms-2.5.3 63
+MD5 fea531c10f3cb1d47c0f0af40bad0fa9 files/2.5.3/compaq_segments.patch 478
+MD5 fbf48e09c52473403af443f9ee5d8403 files/2.5.3/md_expand.patch 2152
diff --git a/sys-fs/evms/evms-2.5.3-r1.ebuild b/sys-fs/evms/evms-2.5.3-r1.ebuild
new file mode 100644
index 000000000000..1bb243791b90
--- /dev/null
+++ b/sys-fs/evms/evms-2.5.3-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.5.3-r1.ebuild,v 1.1 2005/08/25 21:32:19 eradicator Exp $
+
+inherit eutils flag-o-matic multilib
+
+DESCRIPTION="Utilities for the IBM Enterprise Volume Management System"
+HOMEPAGE="http://www.sourceforge.net/projects/evms"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="ncurses gtk"
+
+#EVMS uses libuuid from e2fsprogs
+DEPEND="virtual/libc
+ sys-fs/e2fsprogs
+ sys-fs/device-mapper
+ >=sys-apps/baselayout-1.9.4-r6
+ gtk? ( =x11-libs/gtk+-1* )
+ ncurses? ( sys-libs/ncurses
+ =dev-libs/glib-1* )"
+
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+ epatch ${FILESDIR}/${PV}/compaq_segments.patch
+ epatch ${FILESDIR}/${PV}/md_expand.patch
+}
+
+src_compile() {
+ # Bug #54856
+ # filter-flags "-fstack-protector"
+ replace-flags -O3 -O2
+ replace-flags -Os -O2
+
+ local excluded_interfaces=""
+ use ncurses || excluded_interfaces="--disable-text-mode"
+ use gtk || excluded_interfaces="${excluded_interfaces} --disable-gui"
+
+ econf \
+ --libdir=/$(get_libdir) \
+ --sbindir=/sbin \
+ --includedir=/usr/include \
+ ${excluded_interfaces} || die "Failed configure"
+ emake || die "Failed emake"
+}
+
+src_install() {
+ make DESTDIR="${D}" install || die "Make install died"
+ dodoc ChangeLog INSTALL* PLUGIN.IDS README TERMINOLOGY doc/linuxrc
+
+ insinto /$(get_libdir)/rcscripts/addons
+ newins "${FILESDIR}"/evms2-start.sh evms-start.sh || die "rcscript addon failed"
+
+ # install the sample configuration into the doc dir
+ dodoc ${D}/etc/evms.conf.sample
+ rm -f ${D}/etc/evms.conf.sample
+
+ # the kernel patches may come handy for people compiling their own kernel
+ docinto kernel/2.4
+ dodoc kernel/2.4/*
+ docinto kernel/2.6
+ dodoc kernel/2.6/*
+
+ # move static libraries to /usr/lib
+ dodir /usr/$(get_libdir)
+ mv -f ${D}/$(get_libdir)/*.a ${D}/usr/$(get_libdir)
+
+ # Create linker scripts for dynamic libs in /lib, else gcc
+ # links to the static ones in /usr/lib first. Bug #4411.
+ for x in ${D}/usr/$(get_libdir)/*.a
+ do
+ if [ -f ${x} ]
+ then
+ local lib="${x##*/}"
+ gen_usr_ldscript ${lib/\.a/\.so}
+ fi
+ done
+
+ # the gtk+ frontend should live in /usr/sbin
+ if use gtk
+ then
+ dodir /usr/sbin
+ mv -f ${D}/sbin/evmsgui ${D}/usr/sbin
+ fi
+
+ # Needed for bug #51252
+ dosym libevms-2.5.so.0.0 /$(get_libdir)/libevms-2.5.so.0
+}
diff --git a/sys-fs/evms/files/2.5.3/compaq_segments.patch b/sys-fs/evms/files/2.5.3/compaq_segments.patch
new file mode 100644
index 000000000000..f1a90135cf39
--- /dev/null
+++ b/sys-fs/evms/files/2.5.3/compaq_segments.patch
@@ -0,0 +1,18 @@
+Fix typo in compaq segment naming.
+
+Apply with:
+cd /usr/src/evms-2.5.3
+patch -p1 < compaq_segments.patch
+make install
+
+--- evms-2.5.3a/plugins/dos/segs.c 10 Jun 2005 13:20:19 -0000
++++ evms-2.5.3b/plugins/dos/segs.c 12 Jun 2005 12:52:02 -0000
+@@ -211,7 +211,7 @@
+ char junk1[64];
+ unsigned int junk2, junk3;
+
+- rc = sscanf(name, "%63[^/]c%ud%u",
++ rc = sscanf(name, "%63[^/]/c%ud%u",
+ junk1, &junk2, &junk3);
+ if (rc == 3) {
+ strcat(name, "p");
diff --git a/sys-fs/evms/files/2.5.3/md_expand.patch b/sys-fs/evms/files/2.5.3/md_expand.patch
new file mode 100644
index 000000000000..3b8d9eadb763
--- /dev/null
+++ b/sys-fs/evms/files/2.5.3/md_expand.patch
@@ -0,0 +1,72 @@
+--- evms-2.5.3.a/plugins/md/md_main.c 2005-02-14 18:38:53.000000000 -0600
++++ evms-2.5.3.b/plugins/md/md_main.c 2005-07-13 23:32:12.000000000 -0500
+@@ -1135,9 +1135,9 @@
+ goto out;
+ }
+ if (org->saved_info) {
+- new_member->saved_info = EngFncs->engine_alloc(sizeof(*(org->saved_info)));
++ new_member->saved_info = EngFncs->engine_alloc(MD_SAVED_INFO_BYTES);
+ if (new_member->saved_info) {
+- *(new_member->saved_info) = *(org->saved_info);
++ memcpy(new_member->saved_info, org->saved_info, MD_SAVED_INFO_BYTES);
+ } else {
+ rc = ENOMEM;
+ goto out;
+@@ -1173,6 +1173,7 @@
+ new_vol = md_allocate_volume();
+ if (new_vol) {
+ *new_vol = *org;
++ new_vol->private_data = 0;
+ new_vol->nr_disks = 0;
+ new_vol->members = EngFncs->allocate_list();
+ new_vol->setup_funcs = EngFncs->allocate_list();
+--- evms-2.5.3.a/plugins/md/raid5_mgr.c 2005-05-27 13:46:14.000000000 -0500
++++ evms-2.5.3.b/plugins/md/raid5_mgr.c 2005-07-13 17:57:54.000000000 -0500
+@@ -67,9 +67,16 @@
+
+ static void raid5_free_private_data(md_volume_t * volume)
+ {
+- raid5_conf_t * conf = (raid5_conf_t *)volume->private_data;
++ raid5_conf_t * conf;
+
+ LOG_ENTRY();
++ if (!volume) {
++ LOG_WARNING("Volume is NULL!!!.\n");
++ LOG_EXIT_VOID();
++ return;
++ }
++
++ conf = (raid5_conf_t *)volume->private_data;
+
+ if (!conf) {
+ LOG_WARNING("Nothing to free!!!.\n");
+@@ -1990,7 +1997,6 @@
+ {
+ int rc;
+ md_volume_t * volume = (md_volume_t *) region->private_data;
+- raid5_conf_t * conf = mdvol_to_conf(volume);
+
+ LOG_ENTRY();
+
+@@ -2007,7 +2013,7 @@
+ /* Remove the parent/child associations with the PVs. */
+ md_clear_child_list(region, children);
+
+- EngFncs->engine_free(conf);
++ raid5_free_private_data(volume);
+ /* Delete the volume. */
+ md_delete_volume(volume, tear_down);
+ region->private_data = NULL;
+@@ -5640,9 +5646,10 @@
+ static void free_region (storage_object_t *region)
+ {
+ md_volume_t * volume = (md_volume_t *)region->private_data;
+- raid5_conf_t * conf = mdvol_to_conf(volume);
+
+- EngFncs->engine_free(conf);
++ LOG_ENTRY();
++
++ raid5_free_private_data(volume);
+
+ md_free_volume(volume);
+ LOG_EXIT_VOID();
diff --git a/sys-fs/evms/files/digest-evms-2.5.3-r1 b/sys-fs/evms/files/digest-evms-2.5.3-r1
new file mode 100644
index 000000000000..d3ac22f759f3
--- /dev/null
+++ b/sys-fs/evms/files/digest-evms-2.5.3-r1
@@ -0,0 +1 @@
+MD5 702c57921292934bb6c393a2c28c73ba evms-2.5.3.tar.gz 2239383