From 5c37307dbcd39ea75c6ab2abdce1a39409c671fbed4e22cdd95af925a65863b1 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Wed, 31 Aug 2016 06:43:05 +0000
Subject: [PATCH] Accepting request 421175 from
 home:AndreasStieger:branches:Base:System

Diffutils 3.5

OBS-URL: https://build.opensuse.org/request/show/421175
OBS-URL: https://build.opensuse.org/package/show/Base:System/diffutils?expand=0&rev=39
---
 diffutils-3.4.tar.xz     |  3 ---
 diffutils-3.4.tar.xz.sig | 16 ----------------
 diffutils-3.5.tar.xz     |  3 +++
 diffutils-3.5.tar.xz.sig | 16 ++++++++++++++++
 diffutils.changes        |  8 ++++++++
 diffutils.spec           |  2 +-
 6 files changed, 28 insertions(+), 20 deletions(-)
 delete mode 100644 diffutils-3.4.tar.xz
 delete mode 100644 diffutils-3.4.tar.xz.sig
 create mode 100644 diffutils-3.5.tar.xz
 create mode 100644 diffutils-3.5.tar.xz.sig

diff --git a/diffutils-3.4.tar.xz b/diffutils-3.4.tar.xz
deleted file mode 100644
index f69290f..0000000
--- a/diffutils-3.4.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:db53c025f2ac3d217bcf753dad6dee7b410b33d0948495ff015aaf8b91189ce2
-size 1358392
diff --git a/diffutils-3.4.tar.xz.sig b/diffutils-3.4.tar.xz.sig
deleted file mode 100644
index 0cdda4f..0000000
--- a/diffutils-3.4.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIcBAABCgAGBQJXqMIHAAoJEH/Z/MsAC+7uruAP/Ra6aYPHVTZJYk00d8jcEVHL
-6BQxIHBx8BPCecs6BV6NxiyksnLK1IbBd8DdQ+Bpv3R0+6IaK6ZmnS3C6E4Xae8K
-b8u+1wU/F09f6HSI51M8JqCDt6ZTTAsjkHZ+UIFEzij7hYd2gWY2dP7VRCsxCNB/
-s6HediMO6pPgRBZYsTA7m7lsdlADNGBt39zF62xpdObBAlfWUa/xwSYwpFr8G9bU
-Eh05GBEsayGXqASlMsxD+Z9V8IXbLwNC89w1f4vAU5yImT21SXbNC0ThaAVHWunt
-DyrXQjISkFRexZuqkFRxIqRlgjIFs41QfGnnMzOBAglOYDEfw9xhafadvsy53mYw
-JdNrD8L1EzanSUrpDEFdSCuU2MfQwiqrzMy3W3cyc0wb7JCiHfXzVYWSkxvAiGUa
-3p2Sy9E3Za0YwS6871I6lKanpK4g7MwBcqO/fXF8u+8S6FFcWpfeSquq7rYEjNFZ
-3HBL0TE1Ep2wgJXrsrOABmF47+A1egAEEK/MWIepg6Rp/zUMyX5u6CaV5UJwAvqK
-MIGyxHS4WvQPq94R7X1ofkoK9IYDudD6ZMFuD03iSNwksGNXDMusr1ud7Mz7ZRqd
-jNLKdsstvbYDX3yoKVnSHwHWYLzw2VWWXdlvvnjx4j8tVz8WwFMCqFoe1Yzl/em3
-jMSzIz/eoRG8f25etDlg
-=cOw7
------END PGP SIGNATURE-----
diff --git a/diffutils-3.5.tar.xz b/diffutils-3.5.tar.xz
new file mode 100644
index 0000000..84acae2
--- /dev/null
+++ b/diffutils-3.5.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dad398ccd5b9faca6b0ab219a036453f62a602a56203ac659b43e889bec35533
+size 1360996
diff --git a/diffutils-3.5.tar.xz.sig b/diffutils-3.5.tar.xz.sig
new file mode 100644
index 0000000..19ff48d
--- /dev/null
+++ b/diffutils-3.5.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABCgAGBQJXuT2mAAoJEH/Z/MsAC+7uECsP/0wVZOh74XKI0Y4XPxqhgKou
+L/uFMgqpq2P9Uwr8jnJCr3xsKWCHYSYXOjmzbQ21wkqDWynT+NbLRcH4HLvO6vU3
+EWtoBor7UG0weTDanNfRBFjVLWsHsDWJj7VGMja9OAkXjpqo0f+iYHHIbJ+oKlIY
+gzNqUdjGg8RpsvNapz4XuTsoUNDrTtVOy/k9xHUZCw/h1cZBVpaAU8MEE3MReab6
+pOn660BlVqT50vMd09FKRuTLktJ2LBFZ6x+xdPBJm5LFdUFqClbiNaNv+idhlvfB
+GC8qjBr4WhuCtGpJKLFADTOZ8UOxcmx2sNz0ypiQrLT1UkTUtY3B0ADnzWuMEcwx
+eaPNzdJhPExY64i7MA2vc2MxlRb7omj8kI+n0rBpiFKLMI3x3ZWf6Papg/acYbJg
+0NHQkqdc82gH3vsp5DX/wNn+3TNwks9ziVt7Jervk7uQqWaDLrah3waBN3q5UWsk
+HLAlkhb94Ahi+cNMk1oiNKqT+en3AhZ/7O6imKzTM8bTk27Ek7q3ThLfBeUKcp2O
+j1aaPbaDGEL9pZZDCeuZCSdRZDGMY+spGNYRC4pmYCL9C2LsH5jtX5ob9gQsPHt3
+XFsi5l83i5N3amwzb2OdSTEwM0xgPX8TmcN435409gvz/VVmeSmx5jhHb9m8SLSk
+SrDXEuf5yKX8J8HXVMgt
+=e0eV
+-----END PGP SIGNATURE-----
diff --git a/diffutils.changes b/diffutils.changes
index e623cf6..474f356 100644
--- a/diffutils.changes
+++ b/diffutils.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Aug 22 20:34:19 UTC 2016 - astieger@suse.com
+
+- Diffutils 3.5:
+  * diff3 no longer malfunctions due to use-after-free
+    [bug introduced in 3.4]
+  * diff --color no longer colorizes when TERM=dumb
+
 -------------------------------------------------------------------
 Tue Aug  9 09:03:53 UTC 2016 - mpluskal@suse.com
 
diff --git a/diffutils.spec b/diffutils.spec
index d812e19..09ca69f 100644
--- a/diffutils.spec
+++ b/diffutils.spec
@@ -17,7 +17,7 @@
 
 
 Name:           diffutils
-Version:        3.4
+Version:        3.5
 Release:        0
 Summary:        GNU diff Utilities
 License:        GFDL-1.2 and GPL-3.0+