diff --git a/.gitignore b/.gitignore index 2e32152..b3c6caa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ /LVM2.2.02.*.tgz /LVM2.2.03.*.tgz /LVM2.2.03.07.tgz +/lvm2-4d3c2d6.tgz +/lvm2-4a1f617.tgz diff --git a/0001-print-warning-about-unrecognized-journal-option-valu.patch b/0001-print-warning-about-unrecognized-journal-option-valu.patch deleted file mode 100644 index c3be291..0000000 --- a/0001-print-warning-about-unrecognized-journal-option-valu.patch +++ /dev/null @@ -1,25 +0,0 @@ -From bea731e8f60bb5d221483a8ccb398fd0e469e908 Mon Sep 17 00:00:00 2001 -From: David Teigland -Date: Thu, 2 Dec 2021 12:40:52 -0600 -Subject: [PATCH 1/3] print warning about unrecognized journal option value - -(cherry picked from commit 455c29b10dfd15a9fa2ad72c8f9de77572328d39) ---- - lib/log/log.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/log/log.c b/lib/log/log.c -index 7b4d537b3..5771a1d01 100644 ---- a/lib/log/log.c -+++ b/lib/log/log.c -@@ -892,6 +892,7 @@ uint32_t log_journal_str_to_val(const char *str) - return LOG_JOURNAL_OUTPUT; - if (!strcasecmp(str, "debug")) - return LOG_JOURNAL_DEBUG; -+ log_warn("Ignoring unrecognized journal value."); - return 0; - } - --- -2.31.1 - diff --git a/0002-lvcreate-include-recent-options.patch b/0002-lvcreate-include-recent-options.patch deleted file mode 100644 index d938fc4..0000000 --- a/0002-lvcreate-include-recent-options.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 9bd979855bd00851540fb647d7be01271a905e72 Mon Sep 17 00:00:00 2001 -From: David Teigland -Date: Mon, 13 Dec 2021 08:59:31 -0600 -Subject: [PATCH 2/3] lvcreate: include recent options - -The permitted option list in lvcreate has not kept -up with command-lines.in. - -(cherry picked from commit c28541eccdbf76191f7728035cd2a48d26d06922) ---- - tools/lvcreate.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/tools/lvcreate.c b/tools/lvcreate.c -index 0121c09a8..79af42685 100644 ---- a/tools/lvcreate.c -+++ b/tools/lvcreate.c -@@ -824,12 +824,16 @@ static int _lvcreate_params(struct cmd_context *cmd, - autobackup_ARG,\ - available_ARG,\ - contiguous_ARG,\ -+ devices_ARG,\ -+ devicesfile_ARG,\ - ignoreactivationskip_ARG,\ - ignoremonitoring_ARG,\ -+ journal_ARG,\ - metadataprofile_ARG,\ - monitor_ARG,\ - mirrors_ARG,\ - name_ARG,\ -+ nohints_ARG,\ - noudevsync_ARG,\ - permission_ARG,\ - persistent_ARG,\ --- -2.31.1 - diff --git a/0003-device_id-handle-wwid-with-spaces-or-control-charact.patch b/0003-device_id-handle-wwid-with-spaces-or-control-charact.patch deleted file mode 100644 index 5217b39..0000000 --- a/0003-device_id-handle-wwid-with-spaces-or-control-charact.patch +++ /dev/null @@ -1,55 +0,0 @@ -From c265ff79d34e1c1c76db360a7c056c95c32ce216 Mon Sep 17 00:00:00 2001 -From: David Teigland -Date: Thu, 2 Dec 2021 13:30:36 -0600 -Subject: [PATCH 3/3] device_id: handle wwid with spaces or control characters - -non-standard wwid can be reported from sysfs with spaces/etc. -replace with "_" - -(cherry picked from commit ae54e75176d787de2d447ec40142f85f4dcc47c4) ---- - lib/device/device_id.c | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/lib/device/device_id.c b/lib/device/device_id.c -index 167bf661b..8b822e4c0 100644 ---- a/lib/device/device_id.c -+++ b/lib/device/device_id.c -@@ -302,6 +302,7 @@ const char *device_id_system_read(struct cmd_context *cmd, struct device *dev, u - { - char sysbuf[PATH_MAX] = { 0 }; - const char *idname = NULL; -+ int i; - - if (idtype == DEV_ID_TYPE_SYS_WWID) { - read_sys_block(cmd, dev, "device/wwid", sysbuf, sizeof(sysbuf)); -@@ -309,13 +310,10 @@ const char *device_id_system_read(struct cmd_context *cmd, struct device *dev, u - if (!sysbuf[0]) - read_sys_block(cmd, dev, "wwid", sysbuf, sizeof(sysbuf)); - -- /* scsi_debug wwid begins "t10.Linux scsi_debug ..." */ -- if (strstr(sysbuf, "scsi_debug")) -- sysbuf[0] = '\0'; -- - /* qemu wwid begins "t10.ATA QEMU HARDDISK ..." */ - if (strstr(sysbuf, "QEMU HARDDISK")) - sysbuf[0] = '\0'; -+ - } - - else if (idtype == DEV_ID_TYPE_SYS_SERIAL) -@@ -353,6 +351,11 @@ const char *device_id_system_read(struct cmd_context *cmd, struct device *dev, u - return idname; - } - -+ for (i = 0; i < strlen(sysbuf); i++) { -+ if (isblank(sysbuf[i]) || isspace(sysbuf[i]) || iscntrl(sysbuf[i])) -+ sysbuf[i] = '_'; -+ } -+ - if (!sysbuf[0]) - goto_bad; - --- -2.31.1 - diff --git a/LVM2.2.03.14.tgz.asc b/LVM2.2.03.14.tgz.asc deleted file mode 100644 index 8cb8ceb..0000000 --- a/LVM2.2.03.14.tgz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) - -iQIcBAABAgAGBQJhb+6rAAoJELkRJDHlCQOfBO4P/3d0ccQfFany0wbXfYRuS+1G -HYc0S5LPyhhhTIKRGpBOCEGnSwPlUxcP6mnxhwfrcDOYLl4z9Pj1NGnaYoQxpCHw -fQ4Lzzr6Fdt5TFIkGiVSbQynh/ybyOxfTuD5fMzWmEKrJ1ZNhTv0sDOqPoqLrS8o -W4C573IW9BEGN7CeHTcbcdpnUwt4GGsbsR2S5fGdKUo0Jw/PTY67wiCCTM0F92Qp -S3fkPQ+GWagXTTecrX5MeFjMrQIk3cOMBDvxccHMthzDEyjNtGoOJfmZV66eMzs2 -XDW0r6t/h5tX535QOWEjqazYavfUcTQn99+0X4dwbVxVa9h1baKo9bhOM4k7PyOx -XUXDiZYVvsCP/W+Sr69rxOSbzhClg3Y/8riw5Ttf2ygXdUgI7ce0Rnc8irslJCwJ -PyYKFMDxHDaor4LbRJL3ZpaWopoARkRKGJYMsU8VOHDPf0cIfN1JdbOiatqj5CQz -DfCKWzxqz88ZM8GyHxSHZ6bRtEOM6RtCiIONn66AgMHxObKxZ3604BFvv2jaJiVt -MvditBmlvjYaPjNjomSwxgdhs5gkbERJH7kkXgB8RNR2UIPNZhcTSd1xLrkeRpP2 -jt7kUR0NR4lab8qal8paIyQLSrcBTsngAI9EYxIgwN1gLcUWfxDJOOJt4tyrqy5v -qcvHOjD884RQSdTYXfe0 -=VTpu ------END PGP SIGNATURE----- diff --git a/LVM2.2.03.15.tgz.asc b/LVM2.2.03.15.tgz.asc new file mode 100644 index 0000000..f32d36c --- /dev/null +++ b/LVM2.2.03.15.tgz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE1QGkeEQK4v0TChvouREkMeUJA58FAmIBUeQACgkQuREkMeUJ +A58DthAA16VW+k8lVVAkX+PfcpqVgvO9M4Rhj4qPAcmwKX2z8wMo5hYnrsG3cQDg +NIbtlD05FZuFFMA7GFBdV+LtHCRF6lCe2LbuSsRWmbxz8Z8yn/h801d4Fp/SaZpm +2Itq0Ve6HLysNqA9P6Yl6YE7U6hWnR6PxoS4jl1C5ttpOlmgDHcIM5xl8Dn3PQbZ +S6ujlWl4OX+E0bG5Qg5iwpUcfZMboJ7VGGCKmXzO0Z/7ABw4Os9dgApHGFlHEsKm +XBmeKT77AQxgozPefiqve1CHFNZG8HmSyMhhstUFNl1qMvxGD3CAObdHIiGT1uQL +z6HrxANZ+5EU+sGgCtJtSBfxzPP3s8RPhUiN0WD3rgkJdshc2qBXsOfkNEUKycnq +wCZtJdh6CPsSEfRv83TrGKTKiNT4DyIzPLBh+goV5SpMc/e1kijv6uUMRwEFGb5Y +LZsMRrO8GmwhkkdIDWhdvhGtzJVhd6n80fNPuQTDm7Rp+1+fhgnV6teRNXxO9aWC +eKeZkpaj0/fjpbDc9o+y5DGpvXdbY4KfNx6nGUGEPsqnTYBnq3Ud/V1fZuaOC2AV +iZK4bXXVQoFVkLGnl3sHx2SQInuui0nDo4i2nIwI2rqIMNClb59hAotDEYdlCQc7 +GlAnvWBqrJFjPhVYj8x933lbOyie5GO4qSTI7n0O72c80f8dcbY= +=EPS0 +-----END PGP SIGNATURE----- diff --git a/lvm2.spec b/lvm2.spec index 5ab304c..34569ea 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -1,4 +1,4 @@ -%global device_mapper_version 1.02.181 +%global device_mapper_version 1.02.183 %global enable_cache 1 %global enable_cluster 1 @@ -44,22 +44,33 @@ %global configure_cluster --with-cluster=internal %endif +%global from_snapshot 1 +%if 0%{?from_snapshot} +%global commit 4a1f6173d29a7d7ecab14a9313000aa5f81170d0 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%endif +#%%global rel_suffix .test + # Do not reset Release to 1 unless both lvm2 and device-mapper # versions are increased together. - Summary: Userland logical volume management tools Name: lvm2 %if 0%{?rhel} Epoch: %{rhel} %endif -Version: 2.03.14 -Release: 3%{?dist} +Version: 2.03.15 +%if 0%{?from_snapshot} +Release: 0.1.20211115git%{shortcommit}%{?dist}%{?rel_suffix} +%else +Release: 1%{?dist} +%endif License: GPLv2 URL: http://sourceware.org/lvm2 +%if 0%{?from_snapshot} +Source0: lvm2-%{shortcommit}.tgz +%else Source0: ftp://sourceware.org/pub/lvm2/releases/LVM2.%{version}.tgz -Patch1: 0001-print-warning-about-unrecognized-journal-option-valu.patch -Patch2: 0002-lvcreate-include-recent-options.patch -Patch3: 0003-device_id-handle-wwid-with-spaces-or-control-charact.patch +%endif BuildRequires: make BuildRequires: gcc @@ -115,10 +126,11 @@ or more physical volumes and creating one or more logical volumes (kind of logical partitions) in volume groups. %prep +%if 0%{?from_snapshot} +%setup -q -n lvm2-%{commit} +%else %setup -q -n LVM2.%{version} -%patch1 -p1 -b .backup1 -%patch2 -p1 -b .backup2 -%patch3 -p1 -b .backup3 +%endif %build %global _default_pid_dir /run @@ -297,6 +309,7 @@ systemctl start lvm2-lvmpolld.socket >/dev/null 2>&1 || : %{_sbindir}/vgscan %{_sbindir}/vgsplit %{_mandir}/man5/lvm.conf.5.gz +%{_mandir}/man7/lvmautoactivation.7.gz %{_mandir}/man7/lvmcache.7.gz %{_mandir}/man7/lvmraid.7.gz %{_mandir}/man7/lvmreport.7.gz @@ -310,7 +323,6 @@ systemctl start lvm2-lvmpolld.socket >/dev/null 2>&1 || : %{_mandir}/man8/lvdisplay.8.gz %{_mandir}/man8/lvextend.8.gz %{_mandir}/man8/lvm.8.gz -%{_mandir}/man8/lvm2-activation-generator.8.gz %{_mandir}/man8/lvm-config.8.gz %{_mandir}/man8/lvmconfig.8.gz %{_mandir}/man8/lvmdevices.8.gz @@ -386,7 +398,6 @@ systemctl start lvm2-lvmpolld.socket >/dev/null 2>&1 || : %{_unitdir}/blk-availability.service %{_unitdir}/lvm2-monitor.service #%%{_unitdir}/lvm-vgchange@.service # vgchange is now part of udev rule -%attr(555, -, -) %{_prefix}/lib/systemd/system-generators/lvm2-activation-generator %if %{enable_lvmpolld} %{_unitdir}/lvm2-lvmpolld.socket %{_unitdir}/lvm2-lvmpolld.service @@ -690,6 +701,11 @@ An extensive functional testsuite for LVM2. %endif %changelog +* Tue Feb 08 2022 Marian Csontos - 2.03.15-0.1.20211115git4a1f617 +- Update to git snapshot 4a1f617. +- Remove service based autoactivation. +- New lvmautoactivation(7) man page. + * Fri Nov 19 2021 Marian Csontos - 2.03.14-3 - Fix gating tests. diff --git a/sources b/sources index 3bfacee..b444555 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (LVM2.2.03.14.tgz) = 6a93bed1d5cf36f0f48d4d413d028b0e480cd4fc20e25d173770a892f265d2a0cc68d01a720b1513469953649e989532cd0c45f9538f92a4190eb3dc4555857d +SHA512 (lvm2-4a1f617.tgz) = 4d9b1a028fa0f024efcc9d826256a7405eb7d26479ca114d6e68079dedd2ea9efaa30ce96f50fcbcd5669a06993ab1034d5f08fc433a63e4c73e418ffbbfa35c diff --git a/upstream b/upstream index 3e7c8f4..1548ae5 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -LVM2.2.03.14.tgz +LVM2.2.03.15.tgz