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, 86 deletions

diff --git a/extra/gnome-keyring/gpg-agent-fix-encoding.patch b/extra/gnome-keyring/gpg-agent-fix-encoding.patch
deleted file mode 100644
index e6a7412b3..000000000
--- a/extra/gnome-keyring/gpg-agent-fix-encoding.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From d31a26df7ce8d9c084b9c66fe00458683dde9864 Mon Sep 17 00:00:00 2001
-From: Stef Walter <stefw@gnome.org>
-Date: Thu, 28 Jun 2012 15:51:54 +0200
-Subject: [PATCH] gpg-agent: Encode passwords when --data was requested
-
- * Use URI encoding to return passwords when gnupg calls us with
-   a --data argument.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=678771
----
- daemon/gpg-agent/gkd-gpg-agent-ops.c |   41 ++++++++++++++++++++++++++++++----
- 1 file changed, 37 insertions(+), 4 deletions(-)
-
-diff --git a/daemon/gpg-agent/gkd-gpg-agent-ops.c b/daemon/gpg-agent/gkd-gpg-agent-ops.c
-index be6c4d3..a1a21ff 100644
---- a/daemon/gpg-agent/gkd-gpg-agent-ops.c
-+++ b/daemon/gpg-agent/gkd-gpg-agent-ops.c
-@@ -632,11 +632,12 @@ command_has_option (gchar *command, gchar *option)
- 	return has_option;
- }
- 
-+static const char HEXC[] = "0123456789abcdef";
-+
- /* Encode a password in hex */
- static gchar*
--encode_password (const gchar *pass)
-+hex_encode_password (const gchar *pass)
- {
--	static const char HEXC[] = "0123456789abcdef";
- 	int j, c;
- 	gchar *enc, *k;
- 
-@@ -656,6 +657,36 @@ encode_password (const gchar *pass)
- 	return enc;
- }
- 
-+static gchar*
-+uri_encode_password (const gchar *value)
-+{
-+	gchar *p;
-+	gchar *result;
-+
-+	/* Just allocate for worst case */
-+	result = egg_secure_alloc ((strlen (value) * 3) + 1);
-+
-+	/* Now loop through looking for escapes */
-+	p = result;
-+	while (*value) {
-+
-+		/* These characters we let through verbatim */
-+		if (*value && (g_ascii_isalnum (*value) || strchr ("_-.", *value) != NULL)) {
-+			*(p++) = *(value++);
-+
-+		/* All others get encoded */
-+		} else {
-+			*(p++) = '%';
-+			*(p++) = HEXC[((unsigned char)*value) >> 4];
-+			*(p++) = HEXC[((unsigned char)*value) & 0x0F];
-+			++value;
-+		}
-+	}
-+
-+	*p = 0;
-+	return result;
-+}
-+
- /* ----------------------------------------------------------------------------------
-  * OPERATIONS
-  */
-@@ -737,10 +768,12 @@ gkd_gpg_agent_ops_getpass (GkdGpgAgentCall *call, gchar *args)
- 	if (password == NULL) {
- 		gkd_gpg_agent_send_reply (call, FALSE, "111 cancelled");
- 	} else if (flags & GKD_GPG_AGENT_PASS_AS_DATA) {
--		gkd_gpg_agent_send_data (call, password);
-+		encoded = uri_encode_password (password);
-+		gkd_gpg_agent_send_data (call, encoded);
- 		gkd_gpg_agent_send_reply (call, TRUE, NULL);
-+		egg_secure_strfree (encoded);
- 	} else {
--		encoded = encode_password (password);
-+		encoded = hex_encode_password (password);
- 		gkd_gpg_agent_send_reply (call, TRUE, encoded);
- 		egg_secure_strfree (encoded);
- 	}
--- 
-1.7.10.2
\ No newline at end of file