From 70b5418b1fa8997036338b3937fc851c96da4ad7 Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Tue, 16 Sep 2014 17:55:22 +0200
Subject: [PATCH] updated to version 4.2

---
 .gitignore                      |  2 ++
 libtasn1-4.1-octet-string.patch | 20 --------------------
 libtasn1.spec                   |  9 +++++----
 sources                         |  4 ++--
 4 files changed, 9 insertions(+), 26 deletions(-)
 delete mode 100644 libtasn1-4.1-octet-string.patch

diff --git a/.gitignore b/.gitignore
index 3623c0f..55b068d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,5 @@ libtasn1-2.7.tar.gz
 /libtasn1-4.0.tar.gz.sig
 /libtasn1-4.1.tar.gz.sig
 /libtasn1-4.1.tar.gz
+/libtasn1-4.2.tar.gz.sig
+/libtasn1-4.2.tar.gz
diff --git a/libtasn1-4.1-octet-string.patch b/libtasn1-4.1-octet-string.patch
deleted file mode 100644
index 2f5897a..0000000
--- a/libtasn1-4.1-octet-string.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ur libtasn1-4.1-orig/lib/decoding.c libtasn1-4.1/lib/decoding.c
---- libtasn1-4.1-orig/lib/decoding.c	2014-08-20 21:36:55.000000000 +0200
-+++ libtasn1-4.1/lib/decoding.c	2014-09-04 12:41:11.504502584 +0200
-@@ -731,6 +731,7 @@
- {
-   int len2, len3, counter, tot_len, indefinite;
-   int result;
-+  int orig_der_len = der_len;
- 
-   counter = 0;
- 
-@@ -792,7 +793,7 @@
- 	  asn1_length_der (tot_len, temp, &len2);
- 	  _asn1_set_value (node, temp, len2);
- 
--	  ret = _asn1_extract_der_octet (node, der, der_len, flags);
-+	  ret = _asn1_extract_der_octet (node, der, orig_der_len, flags);
- 	  if (ret != ASN1_SUCCESS)
- 	    return ret;
- 
diff --git a/libtasn1.spec b/libtasn1.spec
index e37da6f..a0e9dd4 100644
--- a/libtasn1.spec
+++ b/libtasn1.spec
@@ -1,7 +1,7 @@
 Summary:	The ASN.1 library used in GNUTLS
 Name:		libtasn1
-Version:	4.1
-Release:	2%{?dist}
+Version:	4.2
+Release:	1%{?dist}
 
 # The libtasn1 library is LGPLv2+, utilities are GPLv3+
 License:	GPLv3+ and LGPLv2+
@@ -10,7 +10,6 @@ URL:		http://www.gnu.org/software/libtasn1/
 Source0:	http://ftp.gnu.org/gnu/libtasn1/%name-%version.tar.gz
 Source1:	http://ftp.gnu.org/gnu/libtasn1/%name-%version.tar.gz.sig
 Patch1:		libtasn1-3.4-rpath.patch
-Patch2:		libtasn1-4.1-octet-string.patch
 BuildRequires:	bison, pkgconfig
 %ifarch %ix86 x86_64 ppc ppc64
 BuildRequires:	valgrind
@@ -53,7 +52,6 @@ data.
 %setup -q
 
 %patch1 -p1 -b .rpath
-%patch2 -p1 -b .octet-string
 
 %build
 %configure --disable-static --disable-silent-rules
@@ -108,6 +106,9 @@ test "$1" = 0 -a -f %_infodir/%name.info.gz && \
 
 
 %changelog
+* Tue Sep 16 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 4.2-1
+- new upstream release
+
 * Mon Aug 25 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 4.1-2
 - added bug fix for octet string decoding (#1138218)
 
diff --git a/sources b/sources
index a01f6c7..32a2fb4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-2692cfa43fc667d7587b411b54566215  libtasn1-4.1.tar.gz.sig
-f9b37df3c2c9c6439d8bf427bfbfc521  libtasn1-4.1.tar.gz
+e7064dc6f8a241d470cf51de709e7dba  libtasn1-4.2.tar.gz.sig
+414df906df421dee0a5cf7548788d153  libtasn1-4.2.tar.gz