From 604171d1b545ea07009d6988eef71302e12182e6 Mon Sep 17 00:00:00 2001
From: Greg Bailey <gbailey@lxpro.com>
Date: Sun, 3 Mar 2019 16:03:12 -0700
Subject: [PATCH] Update to yapet 2.3

---
 .gitignore |  1 +
 sources    |  2 +-
 yapet.spec | 38 +++++++++++++++++++++++++-------------
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8754f10..81d7bd1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ yapet-0.6.tar.gz
 /yapet-0.8pre2.tar.bz2
 /yapet-1.0.tar.bz2
 /yapet-1.1.tar.xz
+/yapet-2.3.tar.xz
diff --git a/sources b/sources
index e5f4145..912cce7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (yapet-1.1.tar.xz) = 371d76beff7665f305f738d5f9498b9edf6fff251c620115fb5fe89da0743e2fbf920712db210076a0123d0972c15ea69227acb1d37e2aae70ffca6bab27d13a
+SHA512 (yapet-2.3.tar.xz) = 94fefabc5d90e2da1b614ec55f26d3f36d5cb423ca18fb10a895924a5fe3bd18d91636caf44cf72a63d4b212973fbd08d74848938df206f7eebf8ae591e82ffb
diff --git a/yapet.spec b/yapet.spec
index 8358b16..8dcdbe6 100644
--- a/yapet.spec
+++ b/yapet.spec
@@ -1,8 +1,8 @@
 #global pre pre2
 
 Name:           yapet
-Version:        1.1
-Release:        4%{?pre}%{?dist}
+Version:        2.3
+Release:        1%{?pre}%{?dist}
 Summary:        Yet Another Password Encryption Tool
 License:        GPLv3+ with exceptions
 URL:            http://yapet.guengel.ch/
@@ -11,23 +11,31 @@ BuildRequires:  gcc-c++
 BuildRequires:  gettext
 BuildRequires:  ncurses-devel
 BuildRequires:  openssl-devel
+BuildRequires:  cppunit-devel
+BuildRequires:  libargon2-devel
+
+%if 0%{?rhel} == 7
+BuildRequires:  devtoolset-7-gcc-c++
+%endif
 
 %description
-YAPET is a text based password manager using the Blowfish encryption algorithm.
-Because of its small footprint and very few library dependencies, it is suited
-for installing on desktop and server systems alike.
+YAPET is a text based password manager using the AES-256 encryption
+algorithm to store passwords and associated information encrypted on
+disk. Its primary aim is to provide a safe way to store passwords in a
+file on disk while having a small footprint, and compiling and running
+under today's most popular Unix Systems.
+
+The password records are protected by a master password which is used
+to encrypt and decrypt the password records.
 
 %prep
 %setup -qn %{name}-%{version}%{?pre}
 
-for f in ./DESIGN ./README
-do
-  iconv -f iso-8859-1 -t utf-8 $f |sed 's|\r||g' > $f.utf8
-  touch -c -r $f $f.utf8
-  mv $f.utf8 $f
-done
-
 %build
+%if 0%{?rhel} == 7
+source /opt/rh/devtoolset-7/enable
+%endif
+
 %configure --disable-install-doc   \
            --disable-source-doc    \
            --disable-install-doci  \
@@ -52,12 +60,16 @@ rm -frv %{buildroot}%{_docdir}
 #make check
 
 %files -f %{name}.lang -f libyacurs.lang
-%doc AUTHORS DESIGN NEWS README THANKS TODO
+%doc AUTHORS BUGS NEWS README
 %license COPYING LICENSE
 %{_bindir}/*yapet*
 %{_mandir}/man*/*yapet*
 
 %changelog
+* Sun Mar  3 2019 Greg Bailey <gbailey@lxpro.com> - 2.3-1
+- Update to 2.3 (#1678913)
+- Use devtoolset for EPEL 7 builds (needs C++14 language features)
+
 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild