diff options
| -rw-r--r-- | sys-fs/device-mapper/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-fs/device-mapper/Manifest | 29 | ||||
| -rw-r--r-- | sys-fs/device-mapper/device-mapper-1.02.22-r4.ebuild | 69 | ||||
| -rw-r--r-- | sys-fs/device-mapper/files/device-mapper-1.02.22-export-format-r1.diff | 300 | ||||
| -rw-r--r-- | sys-fs/device-mapper/files/digest-device-mapper-1.02.22-r4 | 3 |
5 files changed, 405 insertions, 5 deletions
diff --git a/sys-fs/device-mapper/ChangeLog b/sys-fs/device-mapper/ChangeLog index 77dd12c47768..a0048cce95d8 100644 --- a/sys-fs/device-mapper/ChangeLog +++ b/sys-fs/device-mapper/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-fs/device-mapper # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/ChangeLog,v 1.91 2007/10/09 02:28:16 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/ChangeLog,v 1.92 2007/10/09 14:19:55 cardoe Exp $ + +*device-mapper-1.02.22-r4 (09 Oct 2007) + + 09 Oct 2007; Doug Goldstein <cardoe@gentoo.org> + +files/device-mapper-1.02.22-export-format-r1.diff, + +device-mapper-1.02.22-r4.ebuild: + export format patch needed to include ctype.h 09 Oct 2007; Robin H. Johnson <robbat2@gentoo.org> files/device-mapper.rc-1.02.22-r3: diff --git a/sys-fs/device-mapper/Manifest b/sys-fs/device-mapper/Manifest index 96503c864591..5816fc624846 100644 --- a/sys-fs/device-mapper/Manifest +++ b/sys-fs/device-mapper/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 1.02.22-dmeventd.initd 547 RMD160 dd73fd37016d4e3a168009574651bf31f5ec0189 SHA1 dcd11d182a3888f2efdbb535ee9f3bb5ebb4ee46 SHA256 6b55e8cac8f47ea7c00ef66ce078826628842b6d13bbebed875bec2188b5e675 MD5 65052d21ee4a81086c0b35822c7e5259 files/1.02.22-dmeventd.initd 547 RMD160 dd73fd37016d4e3a168009574651bf31f5ec0189 files/1.02.22-dmeventd.initd 547 @@ -10,6 +13,10 @@ AUX 64-device-mapper.rules-1.02.22 999 RMD160 e29014e213c2d41ae360419c038d5644cd MD5 307bdee766d6398e55306f4b2de1bbbf files/64-device-mapper.rules-1.02.22 999 RMD160 e29014e213c2d41ae360419c038d5644cd931021 files/64-device-mapper.rules-1.02.22 999 SHA256 84544cac9d4de6cfc44cec816836f194f5f69fbb74cbdd07073f96dae427c0ed files/64-device-mapper.rules-1.02.22 999 +AUX device-mapper-1.02.22-export-format-r1.diff 11073 RMD160 ac3adb7316dc4f6bb7e9ea3bcf54f8b8b878570d SHA1 208c3f92a9a257e62fb6f7b8600b22b486d473bb SHA256 8b071762684b9c72dafe7bbd0e9a508999d3d0bc34ced088baa7a206d859f331 +MD5 3c2c685b2ae1784429b1761969e6a474 files/device-mapper-1.02.22-export-format-r1.diff 11073 +RMD160 ac3adb7316dc4f6bb7e9ea3bcf54f8b8b878570d files/device-mapper-1.02.22-export-format-r1.diff 11073 +SHA256 8b071762684b9c72dafe7bbd0e9a508999d3d0bc34ced088baa7a206d859f331 files/device-mapper-1.02.22-export-format-r1.diff 11073 AUX device-mapper-1.02.22-export-format.diff 11410 RMD160 dac695aa0eef0adfa1dafea428a8c7412d96ebee SHA1 d46b4c791a4f53c932d3664362e123eecf2c39cc SHA256 e7ded5533a0a6409be967e259ecea39395e783686431567112744743d3b9e553 MD5 760a01d7927c1def3db115e16572aaed files/device-mapper-1.02.22-export-format.diff 11410 RMD160 dac695aa0eef0adfa1dafea428a8c7412d96ebee files/device-mapper-1.02.22-export-format.diff 11410 @@ -52,14 +59,18 @@ EBUILD device-mapper-1.02.22-r3.ebuild 2114 RMD160 05edc7bc37b684d4209003a007dc3 MD5 d31b7f9b075b8a186df1565642ede1ae device-mapper-1.02.22-r3.ebuild 2114 RMD160 05edc7bc37b684d4209003a007dc3834c6398a45 device-mapper-1.02.22-r3.ebuild 2114 SHA256 7de6bac16999317dd9d81a9ae0935aaa0abbeaac433a903cdd4512c6dc1055c8 device-mapper-1.02.22-r3.ebuild 2114 +EBUILD device-mapper-1.02.22-r4.ebuild 2117 RMD160 5f50d27861e038034db772ff7450a10ba5ef5ec1 SHA1 d1f052647bf1a71e0bf94b0e5e9e35f9667e1522 SHA256 b5abf6b8adce7a9a05a7114dd7d65aa69479d065c1d8cdec2e885f8f48ada901 +MD5 81c28bbdc590ab8cecb8891dbaa4bc70 device-mapper-1.02.22-r4.ebuild 2117 +RMD160 5f50d27861e038034db772ff7450a10ba5ef5ec1 device-mapper-1.02.22-r4.ebuild 2117 +SHA256 b5abf6b8adce7a9a05a7114dd7d65aa69479d065c1d8cdec2e885f8f48ada901 device-mapper-1.02.22-r4.ebuild 2117 EBUILD device-mapper-1.02.22.ebuild 1853 RMD160 a9d4a38a94e59535f65c4925e6296380c9037e77 SHA1 7ebfcbc91a491faefc310d234e49fd1559615c60 SHA256 3b047a69a1c0d04b88531f379505fbbf22ed5b4d23aee57f70245e118a26c715 MD5 2d562379212678019c5d74bfe1085775 device-mapper-1.02.22.ebuild 1853 RMD160 a9d4a38a94e59535f65c4925e6296380c9037e77 device-mapper-1.02.22.ebuild 1853 SHA256 3b047a69a1c0d04b88531f379505fbbf22ed5b4d23aee57f70245e118a26c715 device-mapper-1.02.22.ebuild 1853 -MISC ChangeLog 16699 RMD160 dc30e32e39a4cfa7d12b803e08827e4065573cf2 SHA1 5179ce5d47a6fcc879e0efe9197ff64f6f807bad SHA256 81f4356bde9448c090510a4135d9e1314df6f2a31fb252cfb1edaf680f169b0c -MD5 f24d96f332dd7927607f32b567f22a80 ChangeLog 16699 -RMD160 dc30e32e39a4cfa7d12b803e08827e4065573cf2 ChangeLog 16699 -SHA256 81f4356bde9448c090510a4135d9e1314df6f2a31fb252cfb1edaf680f169b0c ChangeLog 16699 +MISC ChangeLog 16928 RMD160 0191db2b675f472652c3921979a1dbc4293e025f SHA1 483da5bf767902b2ab2a1e3b5a3a0ecdb4dcd05c SHA256 5af0afbcd86e6a8a28ec14afb2d65a94dadd62bfccf92f4c296e7eac4835738f +MD5 875d0f57de3c81ec2ab240ad46ff0b02 ChangeLog 16928 +RMD160 0191db2b675f472652c3921979a1dbc4293e025f ChangeLog 16928 +SHA256 5af0afbcd86e6a8a28ec14afb2d65a94dadd62bfccf92f4c296e7eac4835738f ChangeLog 16928 MISC metadata.xml 300 RMD160 ede7eb0cde3ab4e83a90578f08e068486a2a59cd SHA1 2f199ce422f4fad87bcbdcb681d8197620bae236 SHA256 4f6e65a7f6e72548a3d0c35a34f7a119dc7f5c13dfc0820939bc8d1b72b75a4d MD5 80dc99dec1aed7022edd3fe784b02759 metadata.xml 300 RMD160 ede7eb0cde3ab4e83a90578f08e068486a2a59cd metadata.xml 300 @@ -79,3 +90,13 @@ SHA256 207b1f7f3f2ca78603fe601fc4341f8ecffed55fb15d0389038a56be628dcd3f files/di MD5 62e7d71d52d2cb211d70a2551fefab8b files/digest-device-mapper-1.02.22-r3 256 RMD160 496d0beb23a751b928d81fb40be062cc1db7ec3f files/digest-device-mapper-1.02.22-r3 256 SHA256 207b1f7f3f2ca78603fe601fc4341f8ecffed55fb15d0389038a56be628dcd3f files/digest-device-mapper-1.02.22-r3 256 +MD5 62e7d71d52d2cb211d70a2551fefab8b files/digest-device-mapper-1.02.22-r4 256 +RMD160 496d0beb23a751b928d81fb40be062cc1db7ec3f files/digest-device-mapper-1.02.22-r4 256 +SHA256 207b1f7f3f2ca78603fe601fc4341f8ecffed55fb15d0389038a56be628dcd3f files/digest-device-mapper-1.02.22-r4 256 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.7 (GNU/Linux) + +iD8DBQFHC456oeSe8B0zEfwRAgvuAJ0c+HSr/EC9DAjkX0/FdwxQCm3GZgCfRT6t +bHfMtXyQEdhIqwHvkarCG9A= +=qMqo +-----END PGP SIGNATURE----- diff --git a/sys-fs/device-mapper/device-mapper-1.02.22-r4.ebuild b/sys-fs/device-mapper/device-mapper-1.02.22-r4.ebuild new file mode 100644 index 000000000000..eb9b63748342 --- /dev/null +++ b/sys-fs/device-mapper/device-mapper-1.02.22-r4.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/device-mapper-1.02.22-r4.ebuild,v 1.1 2007/10/09 14:19:55 cardoe Exp $ + +inherit eutils multilib toolchain-funcs + +DESCRIPTION="Device mapper ioctl library for use with LVM2 utilities" +HOMEPAGE="http://sources.redhat.com/dm/" +SRC_URI="ftp://sources.redhat.com/pub/dm/${PN}.${PV}.tgz + ftp://sources.redhat.com/pub/dm/old/${PN}.${PV}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="selinux" + +DEPEND="selinux? ( sys-libs/libselinux )" + +S="${WORKDIR}/${PN}.${PV}" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/device-mapper-1.02.22-export-format-r1.diff +} + +src_compile() { + econf --sbindir=/sbin $(use_enable selinux) --enable-dmeventd || die "econf failed" + emake || die "compile problem" +} + +src_install() { + emake install DESTDIR="${D}" || die + + # move shared libs to / + mv "${D}"/usr/$(get_libdir) "${D}"/ || die "move libdir" + dolib.a lib/ioctl/libdevmapper.a || die "dolib.a" + gen_usr_ldscript libdevmapper.so + + insinto /etc + doins "${FILESDIR}"/dmtab + insinto /lib/rcscripts/addons + doins "${FILESDIR}"/dm-start.sh + + newinitd "${FILESDIR}"/device-mapper.rc-1.02.22-r3 device-mapper || die + newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper || die + + newinitd "${FILESDIR}"/1.02.22-dmeventd.initd dmeventd || die + dolib.a dmeventd/libdevmapper-event.a || die + gen_usr_ldscript libdevmapper-event.so + + insinto /etc/udev/rules.d/ + newins "${FILESDIR}"/64-device-mapper.rules-1.02.22 64-device-mapper.rules + + dodoc INSTALL INTRO README VERSION WHATS_NEW +} + +pkg_preinst() { + local l="${ROOT}"/$(get_libdir)/libdevmapper.so.1.01 + [[ -e ${l} ]] && cp "${l}" "${D}"/$(get_libdir)/ +} + +pkg_postinst() { + preserve_old_lib_notify /$(get_libdir)/libdevmapper.so.1.01 + + elog "device-mapper volumes are no longer automatically created for" + elog "baselayout-2 users. If you are using baselayout-2, be sure to" + elog "run: # rc-update add device-mapper boot" +} diff --git a/sys-fs/device-mapper/files/device-mapper-1.02.22-export-format-r1.diff b/sys-fs/device-mapper/files/device-mapper-1.02.22-export-format-r1.diff new file mode 100644 index 000000000000..0fef5a2558f6 --- /dev/null +++ b/sys-fs/device-mapper/files/device-mapper-1.02.22-export-format-r1.diff @@ -0,0 +1,300 @@ +diff -Nur device-mapper.1.02.22.orig/dmsetup/dmsetup.c device-mapper.1.02.22/dmsetup/dmsetup.c +--- device-mapper.1.02.22.orig/dmsetup/dmsetup.c 2007-10-09 09:51:48.000000000 -0400 ++++ device-mapper.1.02.22/dmsetup/dmsetup.c 2007-10-09 09:52:02.000000000 -0400 +@@ -107,6 +107,7 @@ + enum { + READ_ONLY = 0, + COLS_ARG, ++ EXPORT_ARG, + EXEC_ARG, + FORCE_ARG, + GID_ARG, +@@ -137,7 +138,8 @@ + DR_TASK = 1, + DR_INFO = 2, + DR_DEPS = 4, +- DR_TREE = 8 /* Complete dependency tree required */ ++ DR_TREE = 8, /* Complete dependency tree required */ ++ DR_TABLE = 0x10, /* table is required, not just info */ + } report_type_t; + + static int _switches[NUM_SWITCHES]; +@@ -1105,8 +1107,13 @@ + name = argv[1]; + } + +- if (!(dmt = dm_task_create(DM_DEVICE_INFO))) +- return 0; ++ if (_report_type & DR_TABLE ) { ++ if (!(dmt = dm_task_create(DM_DEVICE_TABLE))) ++ return 0; ++ } else { ++ if (!(dmt = dm_task_create(DM_DEVICE_INFO))) ++ return 0; ++ } + + if (!_set_task_device(dmt, name, 0)) + goto out; +@@ -1570,6 +1577,16 @@ + return dm_report_field_uint32(rh, field, &value); + } + ++static int _int_disp(struct dm_report *rh, ++ struct dm_pool *mem __attribute((unused)), ++ struct dm_report_field *field, const void *data, ++ void *private __attribute((unused))) ++{ ++ const int value = *(const int *)data; ++ ++ return dm_report_field_int(rh, field, &value); ++} ++ + static int _dm_name_disp(struct dm_report *rh, + struct dm_pool *mem __attribute((unused)), + struct dm_report_field *field, const void *data, +@@ -1611,6 +1628,66 @@ + return dm_report_field_string(rh, field, &s); + } + ++static int _dm_info_cleartext_status_disp(struct dm_report *rh, ++ struct dm_pool *mem __attribute((unused)), ++ struct dm_report_field *field, const void *data, ++ void *private __attribute((unused))) ++{ ++ const char *buf = "NOTPRESENT"; ++ const struct dm_info *info = data; ++ ++ if (info->exists) { ++ if (info->suspended) ++ buf = "SUSPENDED"; ++ else ++ buf = info->read_only ? " READONLY" : "ACTIVE"; ++ } ++ ++ return dm_report_field_string(rh, field, &buf); ++} ++ ++static int _dm_info_target_types_disp(struct dm_report *rh, ++ struct dm_pool *mem __attribute((unused)), ++ struct dm_report_field *field, const void *data, ++ void *private __attribute((unused))) ++{ ++ char buf[1024]; ++ char *dest = buf; ++ int remains = sizeof(buf); ++ int written; ++ const char *s = buf; ++ struct dm_task *dmt = (struct dm_task *) data; ++ void *next = NULL; ++ uint64_t start, length; ++ char *target_type = NULL; ++ char *params; ++ ++ ++ buf[0] = '\0'; ++ ++ next = dm_get_next_target(dmt, next, &start, &length, ++ &target_type, ¶ms); ++ if (target_type) { ++ written = snprintf(dest, remains, "%s", target_type); ++ dest += written; ++ remains -= written; ++ ++ while (remains > 0 && next) { ++ next = dm_get_next_target(dmt, next, &start, &length, ++ &target_type, ¶ms); ++ if (target_type) { ++ written = snprintf(dest, remains, ",%s", target_type); ++ dest += written; ++ remains -= written; ++ } ++ } ++ } ++ ++ buf[sizeof(buf)-1] = '\0'; ++ ++ return dm_report_field_string(rh, field, &s); ++} ++ + static int _dm_info_devno_disp(struct dm_report *rh, struct dm_pool *mem, + struct dm_report_field *field, const void *data, + void *private) +@@ -1834,11 +1911,12 @@ + { DR_INFO, "Mapped Device Information", "", _info_get_obj }, + { DR_DEPS, "Mapped Device Relationship Information", "", _deps_get_obj }, + { DR_TREE, "Mapped Device Relationship Information", "", _tree_get_obj }, ++ { DR_TABLE, "Mapped Device Table", "", _task_get_obj }, + { 0, "", "", NULL }, + }; + + /* Column definitions */ +-#define OFFSET_OF(strct, field) ((unsigned int) &((struct strct *)NULL)->field) ++#define OFFSET_OF(strct, field) ((unsigned long) &((struct strct *)NULL)->field) + #define STR (DM_REPORT_FIELD_TYPE_STRING) + #define NUM (DM_REPORT_FIELD_TYPE_NUMBER) + #define FIELD_O(type, strct, sorttype, head, field, width, func, id, desc) {DR_ ## type, sorttype, OFFSET_OF(strct, field), width, id, head, &_ ## func ## _disp, desc}, +@@ -1849,6 +1927,7 @@ + FIELD_F(TASK, STR, "Name", 16, dm_name, "name", "Name of mapped device.") + FIELD_F(TASK, STR, "UUID", 32, dm_uuid, "uuid", "Unique (optional) identifier for mapped device.") + FIELD_F(INFO, STR, "Stat", 4, dm_info_status, "attr", "(L)ive, (I)nactive, (s)uspended, (r)ead-only, read-(w)rite.") ++FIELD_F(INFO, STR, "State", 1, dm_info_cleartext_status, "status", "State as cleartext.") + FIELD_F(INFO, STR, "DevNo", 5, dm_info_devno, "devno", "Device major and minor numbers") + FIELD_O(INFO, dm_info, NUM, "Maj", major, 3, int32, "major", "Block device major number.") + FIELD_O(INFO, dm_info, NUM, "Min", minor, 3, int32, "minor", "Block device minor number.") +@@ -1856,6 +1935,11 @@ + FIELD_O(INFO, dm_info, NUM, "Targ", target_count, 4, int32, "segments", "Number of segments in live table, if present.") + FIELD_O(INFO, dm_info, NUM, "Event", event_nr, 6, uint32, "events", "Number of most recent event.") + ++FIELD_O(INFO, dm_info, NUM, "RO", read_only, 2, int, "read_only", "Read only.") ++FIELD_O(INFO, dm_info, NUM, "Ex", exists, 2, int, "exists", "Exists.") ++FIELD_O(INFO, dm_info, NUM, "Susp", suspended, 4, int, "suspended", "Suspended.") ++FIELD_O(INFO, dm_info, NUM, "tab_live", live_table, 8, int, "table_live", "Live table.") ++FIELD_O(INFO, dm_info, NUM, "tab_inact", inactive_table, 9, int, "table_inactive", "Inactive table.") + FIELD_O(DEPS, dm_deps, NUM, "#Devs", count, 5, int32, "device_count", "Number of devices used by this one.") + FIELD_F(TREE, STR, "DevNames", 8, dm_deps_names, "devs_used", "List of names of mapped devices used by this one.") + FIELD_F(DEPS, STR, "DevNos", 6, dm_deps, "devnos_used", "List of device numbers of devices used by this one.") +@@ -1863,6 +1947,7 @@ + FIELD_F(TREE, NUM, "#Refs", 5, dm_tree_parents_count, "device_ref_count", "Number of mapped devices referencing this one.") + FIELD_F(TREE, STR, "RefNames", 8, dm_tree_parents_names, "names_using_dev", "List of names of mapped devices using this one.") + FIELD_F(TREE, STR, "RefDevNos", 9, dm_tree_parents_devs, "devnos_using_dev", "List of device numbers of mapped devices using this one.") ++FIELD_F(TABLE, STR, "Targettypes", 32, dm_info_target_types, "target_types", "Used target types.") + {0, 0, 0, 0, "", "", NULL, NULL}, + /* *INDENT-ON* */ + }; +@@ -1873,13 +1958,15 @@ + #undef FIELD_F + + static const char *default_report_options = "name,major,minor,attr,open,segments,events,uuid"; ++static const char *default_export_options = "name,major,minor,status,read_only,exists,suspended,table_live,table_inactive,open,segments,events,uuid,target_types"; + + static int _report_init(struct command *c) + { +- char *options = (char *) default_report_options; ++ char *default_options = (char *) default_report_options; ++ char *options; + const char *keys = ""; + const char *separator = " "; +- int aligned = 1, headings = 1, buffered = 1; ++ int aligned = 1, headings = 1, buffered = 1, export = 0; + uint32_t flags = 0; + size_t len = 0; + int r = 0; +@@ -1894,6 +1981,15 @@ + if (_switches[UNBUFFERED_ARG]) + buffered = 0; + ++ if (_switches[EXPORT_ARG]) { ++ default_options = (char *) default_export_options; ++ separator = "\n"; ++ aligned = 0; ++ headings = 0; ++ export = 1; ++ } ++ ++ options = default_options; + if (_switches[OPTIONS_ARG] && _string_args[OPTIONS_ARG]) { + if (*_string_args[OPTIONS_ARG] != '+') + options = _string_args[OPTIONS_ARG]; +@@ -1936,6 +2032,9 @@ + if (headings) + flags |= DM_REPORT_OUTPUT_HEADINGS; + ++ if (export) ++ flags |= DM_REPORT_OUTPUT_EXPORT; ++ + if (!(_report = dm_report_init(&_report_type, + _report_types, _report_fields, + options, separator, flags, keys, NULL))) +@@ -2010,7 +2109,8 @@ + fprintf(out, "Usage:\n\n"); + fprintf(out, "dmsetup [--version] [-v|--verbose [-v|--verbose ...]]\n" + " [-r|--readonly] [--noopencount] [--nolockfs]\n" +- " [-c|-C|--columns] [-o <fields>] [-O|--sort <sort_fields>]\n" ++ " [-c|-C|--columns] [-e|--export]\n" ++ " [-o <fields>] [-O|--sort <sort_fields>]\n" + " [--noheadings] [--separator <separator>]\n\n"); + for (i = 0; _commands[i].name; i++) + fprintf(out, "\t%s %s\n", _commands[i].name, _commands[i].help); +@@ -2354,6 +2454,7 @@ + static struct option long_options[] = { + {"readonly", 0, &ind, READ_ONLY}, + {"columns", 0, &ind, COLS_ARG}, ++ {"export", 0, &ind, EXPORT_ARG}, + {"exec", 1, &ind, EXEC_ARG}, + {"force", 0, &ind, FORCE_ARG}, + {"gid", 1, &ind, GID_ARG}, +@@ -2431,12 +2532,16 @@ + + optarg = 0; + optind = OPTIND_INIT; +- while ((ind = -1, c = GETOPTLONG_FN(*argc, *argv, "cCfGj:m:Mno:O:ru:Uv", ++ while ((ind = -1, c = GETOPTLONG_FN(*argc, *argv, "cCefGj:m:Mno:O:ru:Uv", + long_options, NULL)) != -1) { + if (c == ':' || c == '?') + return 0; + if (c == 'c' || c == 'C' || ind == COLS_ARG) + _switches[COLS_ARG]++; ++ if (c == 'e' || ind == EXPORT_ARG) { ++ _switches[EXPORT_ARG]++; ++ _switches[COLS_ARG]++; ++ } + if (c == 'f' || ind == FORCE_ARG) + _switches[FORCE_ARG]++; + if (c == 'r' || ind == READ_ONLY) +diff -Nur device-mapper.1.02.22.orig/lib/libdevmapper.h device-mapper.1.02.22/lib/libdevmapper.h +--- device-mapper.1.02.22.orig/lib/libdevmapper.h 2007-10-09 09:51:48.000000000 -0400 ++++ device-mapper.1.02.22/lib/libdevmapper.h 2007-10-09 09:52:02.000000000 -0400 +@@ -715,6 +715,7 @@ + #define DM_REPORT_OUTPUT_ALIGNED 0x00000001 + #define DM_REPORT_OUTPUT_BUFFERED 0x00000002 + #define DM_REPORT_OUTPUT_HEADINGS 0x00000004 ++#define DM_REPORT_OUTPUT_EXPORT 0x00000008 + + struct dm_report *dm_report_init(uint32_t *report_types, + const struct dm_report_object_type *types, +diff -Nur device-mapper.1.02.22.orig/lib/libdm-report.c device-mapper.1.02.22/lib/libdm-report.c +--- device-mapper.1.02.22.orig/lib/libdm-report.c 2007-10-09 09:51:48.000000000 -0400 ++++ device-mapper.1.02.22/lib/libdm-report.c 2007-10-09 09:52:24.000000000 -0400 +@@ -13,6 +13,7 @@ + * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + ++#include <ctype.h> + #include "libdevmapper.h" + #include "list.h" + #include "log.h" +@@ -776,6 +777,8 @@ + char buf[4096]; + int32_t width; + uint32_t align; ++ const char *fname; ++ char tmp_char; + + if (list_empty(&rh->rows)) + return 1; +@@ -800,6 +803,25 @@ + if (field->props->flags & FLD_HIDDEN) + continue; + ++ if (rh->flags & DM_REPORT_OUTPUT_EXPORT) { ++ fname = rh->fields[field->props->field_num].id; ++ if (!dm_pool_grow_object(rh->mem, "DM_", strlen("DM_"))) { ++ log_error("dm_report: Unable to extend output line"); ++ goto bad; ++ } ++ while (fname && fname[0]) { ++ tmp_char = toupper(fname[0]); ++ if (!dm_pool_grow_object(rh->mem, &tmp_char, 1)) { ++ log_error("dm_report: Unable to extend output line"); ++ goto bad; ++ } ++ fname++; ++ } ++ if (!dm_pool_grow_object(rh->mem, "=", strlen("="))) { ++ log_error("dm_report: Unable to extend output line"); ++ goto bad; ++ } ++ } + repstr = field->report_string; + width = field->props->width; + if (!(rh->flags & DM_REPORT_OUTPUT_ALIGNED)) { diff --git a/sys-fs/device-mapper/files/digest-device-mapper-1.02.22-r4 b/sys-fs/device-mapper/files/digest-device-mapper-1.02.22-r4 new file mode 100644 index 000000000000..9b8f6a284ce3 --- /dev/null +++ b/sys-fs/device-mapper/files/digest-device-mapper-1.02.22-r4 @@ -0,0 +1,3 @@ +MD5 6b94db57cdc9022af1583b3f2acb91cd device-mapper.1.02.22.tgz 189726 +RMD160 8bf9986536c49f53c398d6a2180e21e1235bea18 device-mapper.1.02.22.tgz 189726 +SHA256 ff833a6cd6246686f5b3f5692fd6597f1ffbc60f08929e5fe68304cdafb61595 device-mapper.1.02.22.tgz 189726 |