Update to 0.8.3

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
This commit is contained in:
Igor Gnatenko 2019-03-27 10:55:33 +01:00
parent e4840d2c48
commit ea50b65d2a
No known key found for this signature in database
GPG Key ID: 695714BD1BBC5F4C
4 changed files with 6 additions and 46 deletions

1
.gitignore vendored
View File

@ -14,3 +14,4 @@
/snapper-0.5.4.tar.gz
/snapper-0.5.6.tar.gz
/snapper-0.8.2.tar.gz
/snapper-0.8.3.tar.gz

View File

@ -1,42 +0,0 @@
From 13dce68b20af1b2c6bb7898ba0ce74d323bccc16 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa13@gmail.com>
Date: Mon, 18 Feb 2019 22:34:17 -0500
Subject: [PATCH] Revert "- removed unused variable"
The variable previously removed is actually used when SELinux is
enabled.
This reverts commit 842721cd470ce5b97316fff250b0c1fa356a00f4.
---
snapper/Lvm.cc | 2 +-
snapper/Lvm.h | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/snapper/Lvm.cc b/snapper/Lvm.cc
index 5dd0621..a944800 100644
--- a/snapper/Lvm.cc
+++ b/snapper/Lvm.cc
@@ -63,7 +63,7 @@ namespace snapper
Lvm::Lvm(const string& subvolume, const string& root_prefix, const string& mount_type)
: Filesystem(subvolume, root_prefix), mount_type(mount_type),
caps(LvmCapabilities::get_lvm_capabilities()),
- cache(LvmCache::get_lvm_cache())
+ cache(LvmCache::get_lvm_cache()), sh(NULL)
{
if (access(LVCREATEBIN, X_OK) != 0)
{
diff --git a/snapper/Lvm.h b/snapper/Lvm.h
index 5aa3098..5f29dd9 100644
--- a/snapper/Lvm.h
+++ b/snapper/Lvm.h
@@ -115,6 +115,7 @@ namespace snapper
const string mount_type;
const LvmCapabilities* caps;
LvmCache* cache;
+ SelinuxLabelHandle* sh;
bool detectThinVolumeNames(const MtabData& mtab_data);
void activateSnapshot(const string& vg_name, const string& lv_name) const;
--
2.20.1

View File

@ -1,5 +1,5 @@
Name: snapper
Version: 0.8.2
Version: 0.8.3
Release: 1%{?dist}
Summary: Tool for filesystem snapshot management
@ -8,8 +8,6 @@ URL: http://snapper.io
Source0: https://github.com/openSUSE/snapper/archive/v%{version}/%{name}-%{version}.tar.gz
Patch0: %{name}-remove-ext4-info-xml.patch
Patch1: %{name}-securelibdir.patch
# From: https://github.com/openSUSE/snapper/pull/475
Patch2: %{name}-Revert-removed-unused-variable.patch
BuildRequires: autoconf
BuildRequires: automake
@ -135,6 +133,9 @@ make %{?_smp_mflags} check
%{_mandir}/man8/pam_snapper.8*
%changelog
* Wed Mar 27 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.8.3-1
- Update to 0.8.3
* Mon Feb 18 2019 Neal Gompa <ngompa13@gmail.com> - 0.8.2-1
- Rebase to 0.8.2 (RH#1669128) to fix FTBFS (RH#1676010)

View File

@ -1 +1 @@
SHA512 (snapper-0.8.2.tar.gz) = 53e801e5e3c939a63833fab143c665e2289e128004dd67dcc98826b994d2150b268af021505b0f98982d66ea520a2d98279da15a904a003f2a0a1f1fac80124f
SHA512 (snapper-0.8.3.tar.gz) = 60d82854a323d4a872344a147efca7344a1bbcd9f9c5e607d037f335472f83070d7d4662c53b0fbcbaedea1bf008b63226beec7318a85b7b7343eff7009f34af