[arch-commits] Commit in libtasn1/trunk (PKGBUILD buffer_overflow_fix.diff)

[andyrtr at archlinux.org]

    Date: Sunday, December 23, 2012 @ 19:27:50
  Author: andyrtr
Revision: 173799

upgpkg: libtasn1 3.2-1

upstream update 3.2

Modified:
  libtasn1/trunk/PKGBUILD
Deleted:
  libtasn1/trunk/buffer_overflow_fix.diff

--------------------------+
 PKGBUILD                 |   15 ++-------
 buffer_overflow_fix.diff |   75 ---------------------------------------------
 2 files changed, 4 insertions(+), 86 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-12-23 21:41:33 UTC (rev 173798)
+++ PKGBUILD	2012-12-24 00:27:50 UTC (rev 173799)
@@ -3,7 +3,7 @@
 # Contributor: judd <jvinet at zeroflux.org>
 
 pkgname=libtasn1
-pkgver=3.1
+pkgver=3.2
 pkgrel=1
 pkgdesc="The ASN.1 library used in GNUTLS"
 arch=('i686' 'x86_64')
@@ -12,19 +12,12 @@
 depends=('glibc' 'texinfo')
 options=('!libtool')
 install=libtasn1.install
-source=(http://ftp.gnu.org/gnu/libtasn1/${pkgname}-${pkgver}.tar.gz{,.sig}
-        buffer_overflow_fix.diff)
-md5sums=('a3c713c41a9a73851235dc37051be46f'
-         '43500f54858ffe021e5fd20896b165ad'
-         '4c9e248a4198d9710bf2f822a7c447a5')
+source=(http://ftp.gnu.org/gnu/libtasn1/${pkgname}-${pkgver}.tar.gz{,.sig})
+md5sums=('1b07629163025b9693aae9b8957842b2'
+         '67bdae9b78ac7bbfa2ab24c7d46bd577')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # corrected possible buffer overflow in parser errors. 
-  # http://git.savannah.gnu.org/gitweb/?p=libtasn1.git;a=commit;h=aa6e97f68d6c8d06f531d9b6bb462dc1c0720f77
-  patch -Np1 -i ${srcdir}/buffer_overflow_fix.diff
-  
   ./configure --prefix=/usr \
       --with-packager=Archlinux \
       --with-packager-bug-reports="http://bugs.archlinux.org/" \

Deleted: buffer_overflow_fix.diff
===================================================================
--- buffer_overflow_fix.diff	2012-12-23 21:41:33 UTC (rev 173798)
+++ buffer_overflow_fix.diff	2012-12-24 00:27:50 UTC (rev 173799)
@@ -1,75 +0,0 @@
-From aa6e97f68d6c8d06f531d9b6bb462dc1c0720f77 Mon Sep 17 00:00:00 2001
-From: Nikos Mavrogiannopoulos <nmav at gnutls.org>
-Date: Sun, 25 Nov 2012 14:16:24 +0100
-Subject: [PATCH] corrected possible buffer overflow in parser errors.
-
----
- lib/ASN1.c |    6 +++---
- lib/ASN1.y |    6 +++---
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/lib/ASN1.c b/lib/ASN1.c
-index 2a60527..df6fb64 100644
---- a/lib/ASN1.c
-+++ b/lib/ASN1.c
-@@ -119,7 +119,7 @@ static unsigned int line_number;	/* line number describing the
- 					   parser position inside the
- 					   file */
- static char last_error[ASN1_MAX_ERROR_DESCRIPTION_SIZE] = "";
--static char last_error_token[ASN1_MAX_NAME_SIZE+1] = ""; /* used when expected errors occur */
-+static char last_error_token[ASN1_MAX_ERROR_DESCRIPTION_SIZE+1] = ""; /* used when expected errors occur */
- static char last_token[ASN1_MAX_NAME_SIZE+1] = ""; /* last token find in the file
- 					   to parse before the 'parse
- 					   error' */
-@@ -3283,7 +3283,7 @@ _asn1_yyerror (const char *s)
-       strcmp (last_token, "TeletexString") == 0 ||
-       strcmp (last_token, "BMPString") == 0)
-     {
--      snprintf (last_error_token, ASN1_MAX_ERROR_DESCRIPTION_SIZE,
-+      snprintf (last_error_token, sizeof(last_error_token),
-                 "%s", last_token);
-       fprintf(stderr, 
-                "%s:%u: Warning: %s is a built-in ASN.1 type.\n",
-@@ -3294,7 +3294,7 @@ _asn1_yyerror (const char *s)
- 
-   if (result_parse != ASN1_NAME_TOO_LONG)
-     {
--      snprintf (last_error, ASN1_MAX_ERROR_DESCRIPTION_SIZE,
-+      snprintf (last_error, sizeof(last_error),
-                 "%s:%u: Error: %s near '%s'", file_name,
-                 line_number, s, last_token);
-       result_parse = ASN1_SYNTAX_ERROR;
-diff --git a/lib/ASN1.y b/lib/ASN1.y
-index 874eb13..e0add54 100644
---- a/lib/ASN1.y
-+++ b/lib/ASN1.y
-@@ -42,7 +42,7 @@ static unsigned int line_number;	/* line number describing the
- 					   parser position inside the
- 					   file */
- static char last_error[ASN1_MAX_ERROR_DESCRIPTION_SIZE] = "";
--static char last_error_token[ASN1_MAX_NAME_SIZE+1] = ""; /* used when expected errors occur */
-+static char last_error_token[ASN1_MAX_ERROR_DESCRIPTION_SIZE+1] = ""; /* used when expected errors occur */
- static char last_token[ASN1_MAX_NAME_SIZE+1] = ""; /* last token find in the file
- 					   to parse before the 'parse
- 					   error' */
-@@ -869,7 +869,7 @@ _asn1_yyerror (const char *s)
-       strcmp (last_token, "TeletexString") == 0 ||
-       strcmp (last_token, "BMPString") == 0)
-     {
--      snprintf (last_error_token, ASN1_MAX_ERROR_DESCRIPTION_SIZE,
-+      snprintf (last_error_token, sizeof(last_error_token),
-                 "%s", last_token);
-       fprintf(stderr, 
-                "%s:%u: Warning: %s is a built-in ASN.1 type.\n",
-@@ -880,7 +880,7 @@ _asn1_yyerror (const char *s)
- 
-   if (result_parse != ASN1_NAME_TOO_LONG)
-     {
--      snprintf (last_error, ASN1_MAX_ERROR_DESCRIPTION_SIZE,
-+      snprintf (last_error, sizeof(last_error),
-                 "%s:%u: Error: %s near '%s'", file_name,
-                 line_number, s, last_token);
-       result_parse = ASN1_SYNTAX_ERROR;
--- 
-1.7.2.5
-