From 644bd598ea389612db140f9774e400215188119f6154dd9e6e80bf685ea1e183 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Thu, 9 Jul 2015 07:58:17 +0000
Subject: [PATCH] - Version bump to 1.31:   * Fixes bnc#923241 CVE-2015-2059
 out-of-bounds read with stringprep on     invalid UTF-8   * Few other triv
 changes

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libidn?expand=0&rev=40
---
 libidn-1.30.tar.gz     |  3 ---
 libidn-1.30.tar.gz.sig | 11 -----------
 libidn-1.31.tar.gz     |  3 +++
 libidn-1.31.tar.gz.sig | 11 +++++++++++
 libidn.changes         |  8 ++++++++
 libidn.spec            |  6 +++---
 6 files changed, 25 insertions(+), 17 deletions(-)
 delete mode 100644 libidn-1.30.tar.gz
 delete mode 100644 libidn-1.30.tar.gz.sig
 create mode 100644 libidn-1.31.tar.gz
 create mode 100644 libidn-1.31.tar.gz.sig

diff --git a/libidn-1.30.tar.gz b/libidn-1.30.tar.gz
deleted file mode 100644
index 22e6308..0000000
--- a/libidn-1.30.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:39b9fc94d74081c185757b12e0891ce5a22db55268e7d1bb24533ff4432eb053
-size 3474545
diff --git a/libidn-1.30.tar.gz.sig b/libidn-1.30.tar.gz.sig
deleted file mode 100644
index 5b0d644..0000000
--- a/libidn-1.30.tar.gz.sig
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQEcBAABCAAGBQJU9ED6AAoJEIYLf7sy+BGdGw0H/1VvmZPL6Zbb2JhWbbt7xyMK
-hf4PBUR8u9cmeAJugUB2bqMqKi1nlQSwijN/a4ZbXU2ecuw+DzogBmSL9msqu5pJ
-iflb9qO3OUqJlzBnFY0EU4TiY4dpF7UFDci/FJQblSsGtFaWLGUAE1LlGvOlz/jI
-gXvgcnCcNothxA0M4yaCkzYrX7XW29KwLGcKFG+YgIri/2G7usl3Q+xv6bufTAH7
-OWqfdAM1KfJWqYcBBSEJj1X7xDgHaDZ+YMPcS44up5c/fCBfnb3uSph8+lwBvWrk
-tBwiJolKD5DYOwbx6TkCBkxd4J8fh2Fck5xTY0swshcfGekFJDwvPDLxQVkqw1E=
-=CejY
------END PGP SIGNATURE-----
diff --git a/libidn-1.31.tar.gz b/libidn-1.31.tar.gz
new file mode 100644
index 0000000..942d23b
--- /dev/null
+++ b/libidn-1.31.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:afdf2fce91faea483ce24e26b5e3a9235e332029c9265d07214fd1cfaa08df08
+size 3481725
diff --git a/libidn-1.31.tar.gz.sig b/libidn-1.31.tar.gz.sig
new file mode 100644
index 0000000..a3c702f
--- /dev/null
+++ b/libidn-1.31.tar.gz.sig
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQEcBAABCAAGBQJVnZPOAAoJEIYLf7sy+BGd7lEH/igRdqVKOeugcbv43IN4cq/O
+i8nFhOrUvganN7nv6eQLm/qPmBcyEnanfowRKZD3fa46olkm9naei6zHy76MziIn
+tSIkgMnEsq4ZvEN/hAHxITYKWtBE8QBUmC5Kvx1C4y+pEoHYTx8UhnOck+fSeRSH
+7GA8RbF6/n99WBub9xwaWFfKOVRb1Fk5oV2oipCBrY8Obn74vbEpc5vloKoZ0Rkm
+jx6MvV9jmutHwqwJo8UOGwcMiuOtEBHj+vtsblwcVtpS2vRN3T2VrGZhbFWymxIN
+0ioPK1pHZj/ZSnsO8cvXd6hUpccgxLQE8jcqFOiKGPazDd8lRtEQ/uorRlUgBRg=
+=b2v7
+-----END PGP SIGNATURE-----
diff --git a/libidn.changes b/libidn.changes
index 8f94dcf..60c1f53 100644
--- a/libidn.changes
+++ b/libidn.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Jul  9 07:54:25 UTC 2015 - tchvatal@suse.com
+
+- Version bump to 1.31:
+  * Fixes bnc#923241 CVE-2015-2059 out-of-bounds read with stringprep on
+    invalid UTF-8
+  * Few other triv changes
+
 -------------------------------------------------------------------
 Fri Mar 13 13:49:20 UTC 2015 - tchvatal@suse.com
 
diff --git a/libidn.spec b/libidn.spec
index 3cd81d5..6e82682 100644
--- a/libidn.spec
+++ b/libidn.spec
@@ -18,7 +18,7 @@
 
 %define lname	libidn11
 Name:           libidn
-Version:        1.30
+Version:        1.31
 Release:        0
 Summary:        Support for Internationalized Domain Names (IDN)
 License:        (GPL-2.0+ or LGPL-3.0+) and GPL-3.0+
@@ -29,7 +29,7 @@ Source1:        http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz.sig
 Source2:        libidn.keyring
 Source3:        baselibs.conf
 BuildRequires:  pkg-config
-Requires(pre):  %{install_info_prereq}
+Requires(post):  %{install_info_prereq}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -126,7 +126,7 @@ make check %{?_smp_mflags}
 %post tools
 %install_info --info-dir=%{_infodir} %{_infodir}/libidn.info.*
 
-%postun tools
+%preun tools
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/libidn.info.*
 
 %post -n %{lname} -p /sbin/ldconfig