From f44c3b22aebd649ba9076c09a5a93d9844d1bd00 Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Sep 16 2018 22:15:10 +0000
Subject: Build 1.9.1 release.

Compile with -Wno-format-truncation (rhbz#1606913 comment 5)
Fix off-by-one buffer size in tests/frm-simple.c

---

diff --git a/.gitignore b/.gitignore
index fb3585c..2f8b0af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /libetpan-1.6.tar.gz
 /libetpan-1.7.2.tar.gz
 /libetpan-1.8.tar.gz
+/libetpan-1.9.1.tar.gz
diff --git a/libetpan-1.9.1-tests-snprintf.patch b/libetpan-1.9.1-tests-snprintf.patch
new file mode 100644
index 0000000..8f4a975
--- /dev/null
+++ b/libetpan-1.9.1-tests-snprintf.patch
@@ -0,0 +1,12 @@
+diff -Naur libetpan-1.9.1-orig/tests/frm-simple.c libetpan-1.9.1/tests/frm-simple.c
+--- libetpan-1.9.1-orig/tests/frm-simple.c	2018-09-12 13:54:16.000000000 +0200
++++ libetpan-1.9.1/tests/frm-simple.c	2018-09-16 15:10:09.487606911 +0200
+@@ -8,7 +8,7 @@
+ 
+ #define DEST_CHARSET "iso-8859-1"
+ 
+-#define MAX_OUTPUT 81
++#define MAX_OUTPUT 82
+ 
+ /* display information for one message */
+ 
diff --git a/libetpan.spec b/libetpan.spec
index 32106f7..7bdcdc7 100644
--- a/libetpan.spec
+++ b/libetpan.spec
@@ -1,6 +1,6 @@
 Name:           libetpan
-Version:        1.8
-Release:        3%{?dist}
+Version:        1.9.1
+Release:        1%{?dist}
 Summary:        Portable, efficient middle-ware for different kinds of mail access
 
 Group:          System Environment/Libraries
@@ -12,6 +12,9 @@ Source0:        %{name}-%{version}.tar.gz
 Patch0:         libetpan-1.6-config-script.patch
 # system crypto policy (see rhbz#1179310)
 Patch10:        libetpan-cryptopolicy.patch
+# fix compilation of tests, snprintf buffer too small
+# reported upstream
+Patch11: libetpan-1.9.1-tests-snprintf.patch
 
 
 BuildRequires:  gcc-c++
@@ -46,6 +49,7 @@ with %{name}.
 %setup -q
 
 %patch0 -b .libetpan-config-script
+%patch11 -p1 -b .tests-snprintf-truncation
 
 ./autogen.sh
 
@@ -57,6 +61,7 @@ grep 'GNUTLSLIB="-lgnutls -lgcrypt -lgpg-error -lz"' configure || exit -1
 sed -i 's!-lgcrypt -lgpg-error -lz!!g' configure
 
 %build
+%global optflags %(echo %{optflags} | sed 's/-g /-g -Wno-format-truncation /')
 %configure --disable-static --with-gnutls=yes --with-openssl=no
 make LIBTOOL=%{_bindir}/libtool %{?_smp_mflags}
 
@@ -87,6 +92,11 @@ iconv -f iso8859-1 -t utf-8 ChangeLog > ChangeLog.conv && mv -f ChangeLog.conv C
 %{_libdir}/*.so
 
 %changelog
+* Sun Sep 16 2018 Michael Schwendt <mschwendt@fedoraproject.org> - 1.9.1-1
+- Build 1.9.1 release.
+- Compile with -Wno-format-truncation (rhbz#1606913 comment 5)
+- Fix off-by-one buffer size in tests/frm-simple.c
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index c9d32ff..e10168e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libetpan-1.8.tar.gz) = a5e97998803cc56dbd54356153c8579b52a9675fe95fbf642c3158215428d9d2cb30c4e0060c5f4dd760634fff5b1c2a32ce4bb70a5f2bc6398a071ce95e1efd
+SHA512 (libetpan-1.9.1.tar.gz) = 1dd72644672e15eecc9883ffb4b29ef34d4355c55aec950cac44e7b59f252d9355f37ef0ad37007c89728c09e057144b4c3b853496a011d693598b6027356286