[mingw-libtasn1] Update to 4.1

mooninite mooninite at fedoraproject.org
Fri Sep 12 01:33:44 UTC 2014


commit 09329c5fe8959b0abe52bd1aeac77413920c0d69
Author: Michael Cronenworth <mike at cchtml.com>
Date:   Thu Sep 11 20:33:35 2014 -0500

    Update to 4.1

 .gitignore                      |   12 ++----------
 libtasn1-4.1-octet-string.patch |   20 ++++++++++++++++++++
 mingw-libtasn1.spec             |   11 ++++++++---
 sources                         |    4 ++--
 4 files changed, 32 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8dcbca3..fc82e24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,2 @@
-/libtasn1-2.9.tar.gz
-/libtasn1-2.12.tar.gz
-/libtasn1-2.13.tar.gz
-/libtasn1-2.14.tar.gz
-/libtasn1-3.2.tar.gz
-/libtasn1-3.3.tar.gz
-/libtasn1-3.6.tar.gz
-/libtasn1-3.6.tar.gz.sig
-/libtasn1-4.0.tar.gz
-/libtasn1-4.0.tar.gz.sig
+/libtasn1-4.1.tar.gz
+/libtasn1-4.1.tar.gz.sig
diff --git a/libtasn1-4.1-octet-string.patch b/libtasn1-4.1-octet-string.patch
new file mode 100644
index 0000000..2f5897a
--- /dev/null
+++ b/libtasn1-4.1-octet-string.patch
@@ -0,0 +1,20 @@
+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/mingw-libtasn1.spec b/mingw-libtasn1.spec
index 79d4ed4..292e9d9 100644
--- a/mingw-libtasn1.spec
+++ b/mingw-libtasn1.spec
@@ -1,7 +1,7 @@
 %?mingw_package_header
 
 Name:           mingw-libtasn1
-Version:        4.0
+Version:        4.1
 Release:        1%{?dist}
 Summary:        MinGW Windows libtasn1 library
 
@@ -12,6 +12,7 @@ Group:          Development/Libraries
 URL:            http://www.gnu.org/software/libtasn1/
 Source0:        http://ftp.gnu.org/gnu/libtasn1/libtasn1-%{version}.tar.gz
 Source1:        http://ftp.gnu.org/gnu/libtasn1/libtasn1-%{version}.tar.gz.sig
+Patch1:         libtasn1-4.1-octet-string.patch
 
 BuildArch:      noarch
 
@@ -59,6 +60,7 @@ This package contains the MinGW Windows cross compiled libtasn1 library.
 
 %prep
 %setup -q -n libtasn1-%{version}
+%patch1 -p1 -b .octet-string
 
 
 %build
@@ -83,14 +85,14 @@ rm -f $RPM_BUILD_ROOT%{mingw64_bindir}/*.exe
 
 
 %files -n mingw32-libtasn1
-%doc COPYING.LIB
+%license COPYING.LIB
 %{mingw32_bindir}/libtasn1-6.dll
 %{mingw32_includedir}/libtasn1.h
 %{mingw32_libdir}/libtasn1.dll.a
 %{mingw32_libdir}/pkgconfig/libtasn1.pc
 
 %files -n mingw64-libtasn1
-%doc COPYING.LIB
+%license COPYING.LIB
 %{mingw64_bindir}/libtasn1-6.dll
 %{mingw64_includedir}/libtasn1.h
 %{mingw64_libdir}/libtasn1.dll.a
@@ -98,6 +100,9 @@ rm -f $RPM_BUILD_ROOT%{mingw64_bindir}/*.exe
 
 
 %changelog
+* Thu Sep 11 2014 Michael Cronenworth <mike at cchtml.com> - 4.1-1
+- Update to 4.1
+
 * Tue Jul 01 2014 Michael Cronenworth <mike at cchtml.com> - 4.0-1
 - Update to 4.0
 
diff --git a/sources b/sources
index 840ec9e..423529b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-d3d2d9bce3b6668b9827a9df52635be1  libtasn1-4.0.tar.gz
-62254c1ececa4dcf3811ecac98fd68bd  libtasn1-4.0.tar.gz.sig
+f9b37df3c2c9c6439d8bf427bfbfc521  libtasn1-4.1.tar.gz
+2692cfa43fc667d7587b411b54566215  libtasn1-4.1.tar.gz.sig


More information about the scm-commits mailing list