Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/cdemu-client/PKGBUILD
	community/dcron/PKGBUILD
	community/freevo/PKGBUILD
	community/gmerlin-avdecoder/PKGBUILD
	community/hacburn/PKGBUILD
	community/htmldoc/PKGBUILD
	community/ibus-table/PKGBUILD
	community/iksemel/PKGBUILD
	community/isomaster/PKGBUILD
	community/libmatio/PKGBUILD
	community/libtlen/PKGBUILD
	community/luarocks/PKGBUILD
	community/lxde-common/PKGBUILD
	community/multipath-tools/PKGBUILD
	community/nvclock/PKGBUILD
	community/pam-krb5/PKGBUILD
	community/pidgin-musictracker/PKGBUILD
	community/pkgfile/PKGBUILD
	community/pkgtools/PKGBUILD
	community/print-manager/PKGBUILD
	community/python-pyro/PKGBUILD
	community/python-pyxmpp/PKGBUILD
	community/python2-simplejson/PKGBUILD
	community/rsnapshot/PKGBUILD
	community/setconf/PKGBUILD
	community/tagpy/PKGBUILD
	community/terminator/PKGBUILD
	community/udunits/PKGBUILD
	community/vlock/PKGBUILD
	community/winefish/PKGBUILD
	core/nss-myhostname/PKGBUILD
	extra/avfs/PKGBUILD
	extra/bmp-musepack/PKGBUILD
	extra/bmp-wma/PKGBUILD
	extra/bochs/PKGBUILD
	extra/botan/PKGBUILD
	extra/cdargs/PKGBUILD
	extra/cx_freeze/PKGBUILD
	extra/dcfldd/PKGBUILD
	extra/devilspie/PKGBUILD
	extra/emelfm2/PKGBUILD
	extra/evilwm/PKGBUILD
	extra/fssos-nsvs/PKGBUILD
	extra/gimp-dbp/PKGBUILD
	extra/gimp-gap/PKGBUILD
	extra/gimp-ufraw/PKGBUILD
	extra/gmpc/PKGBUILD
	extra/gtkpod/PKGBUILD
	extra/hercules/PKGBUILD
	extra/herqq/PKGBUILD
	extra/hydrogen/PKGBUILD
	extra/kdegames/PKGBUILD
	extra/kradio/PKGBUILD
	extra/kshutdown/PKGBUILD
	extra/libmusicbrainz4/PKGBUILD
	extra/mahjong/PKGBUILD
	extra/mcrypt/PKGBUILD
	extra/monica/PKGBUILD
	extra/mpck/PKGBUILD
	extra/mrtg/PKGBUILD
	extra/nicotine/PKGBUILD
	extra/normalize/PKGBUILD
	extra/oprofile/PKGBUILD
	extra/perl-event/PKGBUILD
	extra/perl-unicode-string/PKGBUILD
	extra/pidgin-encryption/PKGBUILD
	extra/proftpd/PKGBUILD
	extra/pymad/PKGBUILD
	extra/qiv/PKGBUILD
	extra/quodlibet/PKGBUILD
	extra/ratpoison/PKGBUILD
	extra/rox/PKGBUILD
	extra/scrot/PKGBUILD
	extra/stardict/PKGBUILD
	extra/terminal/PKGBUILD
	extra/usbview/PKGBUILD
	extra/xdelta/PKGBUILD
	extra/xdelta3/PKGBUILD
	extra/xorg-xlsfonts/PKGBUILD
	extra/zile/PKGBUILD
	mozilla-testing/iceweasel-libre/mozconfig
	mozilla-testing/iceweasel-libre/vendor.js
	social/tokyocabinet/PKGBUILD
	~fauno/notmuch/PKGBUILD
	~mtjm/thinkfan/PKGBUILD
	~mtjm/zbar/PKGBUILD

1 files changed, 0 insertions, 75 deletions

diff --git a/extra/libtasn1/buffer_overflow_fix.diff b/extra/libtasn1/buffer_overflow_fix.diff
deleted file mode 100644
index c1e71015c..000000000
--- a/extra/libtasn1/buffer_overflow_fix.diff
+++ /dev/null
@@ -1,75 +0,0 @@
-From aa6e97f68d6c8d06f531d9b6bb462dc1c0720f77 Mon Sep 17 00:00:00 2001
-From: Nikos Mavrogiannopoulos <nmav@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
-