Merge branch 'master' of vparabola:abslibre

13 files changed, 382 insertions, 347 deletions

diff --git a/nonprism/bti-nonprism/PKGBUILD b/nonprism/bti-nonprism/PKGBUILD
index 378664976..e09af287c 100644
--- a/nonprism/bti-nonprism/PKGBUILD
+++ b/nonprism/bti-nonprism/PKGBUILD
@@ -1,40 +1,40 @@
-# $Id$
-# Maintainer: Kaiting Chen <kaitocracy@gmail.com>
+# $Id: PKGBUILD 105298 2014-02-04 18:30:40Z jlichtblau $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: uvok <uvok at online dot de>
 # Contributor: Urist <9362773 at gmail.com>
 
 _pkgname=bti
 pkgname=bti-nonprism
-pkgver=033
-pkgrel=1.1
+pkgver=034
+pkgrel=1
 pkgdesc='Console client for status.net, without Twitter support'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://gregkh.github.com/bti/'
 license=('GPL')
 depends=('pcre' 'libxml2' 'curl' 'liboauth' 'json-c')
-provides=$_pkgname
+provides=$_pkgname=$pkgver
 conflicts=$_pkgname
 replaces=$_pkgname
 source=(http://www.kernel.org/pub/software/web/$_pkgname/$_pkgname-$pkgver.tar.xz
         nonprism.patch)
-sha256sums=('a3d9d8a86a718a4820387c75ac2af24fecfe754ee562163d700acb7cf795d753'
-            '184f2a134d44ae4c901ffdc824f833b477148f146e23f5d3680496658c9ca393')
+sha256sums=('8b4a1a11f529f83956468acadaea9d11db4f03e82afe07fecb84b2d00e9eae83'
+            '86eab6c949e3c19d3a4088fac78fba4709845e9d5871b12c17a944127347498c')
 
 prepare() {
-  cd ${srcdir}/$_pkgname-$pkgver
+  cd "${srcdir}"/$_pkgname-$pkgver
   patch -Np1 -i ${srcdir}/nonprism.patch
 }
 
 build() {
-  cd ${srcdir}/$_pkgname-$pkgver
+  cd "${srcdir}"/$_pkgname-$pkgver
   ./configure --prefix=/usr
 
   make
 }
 
 package() {
-  cd ${srcdir}/$_pkgname-$pkgver
+  cd "${srcdir}"/$_pkgname-$pkgver
   
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="${pkgdir}" install
 }
-
diff --git a/nonprism/bti-nonprism/nonprism.patch b/nonprism/bti-nonprism/nonprism.patch
index 009c26d1e..9423d03a7 100644
--- a/nonprism/bti-nonprism/nonprism.patch
+++ b/nonprism/bti-nonprism/nonprism.patch
@@ -1,47 +1,61 @@
-diff -Nur bti-033/bti.1 bti-nonprism/bti.1
---- bti-033/bti.1	2013-06-27 18:23:38.000000000 -0300
-+++ bti-nonprism/bti.1	2013-08-21 18:24:32.693871946 -0300
+diff --git a/bti-bashcompletion b/bti-bashcompletion
+index fa55d75..f957b32 100644
+--- a/bti-bashcompletion
++++ b/bti-bashcompletion
+@@ -12,7 +12,7 @@ _bti()
+ 	fi
+ 
+ 	if [[ "${prev}" == "--host" ]] ; then
+-		COMPREPLY=( $(compgen -W "twitter identica" -- ${cur} ) )
++		COMPREPLY=( $(compgen -W "statusnet" -- ${cur} ) )
+ 	fi
+ 
+ 	if [[ "${prev}" == "--action" ]] ; then
+diff --git a/bti.1 b/bti.1
+index bdd6c76..3577e98 100644
+--- a/bti.1
++++ b/bti.1
 @@ -28,23 +28,23 @@
  .\" * MAIN CONTENT STARTS HERE *
  .\" -----------------------------------------------------------------
  .SH "NAME"
--bti \- send a tweet to twitter\&.com or identi\&.ca from the command line
+-bti \- send a tweet to twitter\&.com from the command line
 +bti \- send a tweet to status\&.net from the command line
  .SH "SYNOPSIS"
  .HP \w'\fBbti\fR\ 'u
  \fBbti\fR [\fB\-\-account\ account\fR] [\fB\-\-password\ password\fR] [\fB\-\-action\ action\fR] [\fB\-\-user\ screenname\fR] [\fB\-\-host\ HOST_NAME\fR] [\fB\-\-proxy\ PROXY:PORT\fR] [\fB\-\-logfile\ LOGFILE\fR] [\fB\-\-config\ CONFIGFILE\fR] [\fB\-\-replyto\ ID\fR] [\fB\-\-retweet\ ID\fR] [\fB\-\-page\ PAGENUMBER\fR] [\fB\-\-bash\fR] [\fB\-\-shrink\-urls\fR] [\fB\-\-debug\fR] [\fB\-\-dry\-run\fR] [\fB\-\-verbose\fR] [\fB\-\-version\fR] [\fB\-\-help\fR]
  .SH "DESCRIPTION"
  .PP
--bti sends a tweet message to twitter\&.com or identi\&.ca\&.
+-bti sends a tweet message to twitter\&.com\&.
 +bti sends a tweet message to status\&.net\&.
  .SH "OPTIONS"
  .PP
  \fB\-\-account account\fR
  .RS 4
--Specify the twitter\&.com or identi\&.ca account name\&.
+-Specify the twitter\&.com account name\&.
 +Specify the status\&.net account name\&.
  .RE
  .PP
  \fB\-\-password password\fR
  .RS 4
--Specify the password of your twitter\&.com or identi\&.ca account\&.
+-Specify the password of your twitter\&.com account\&.
 +Specify the password of your status\&.net account\&.
  .RE
  .PP
  \fB\-\-action action\fR
-@@ -59,9 +59,9 @@
+@@ -59,9 +59,9 @@ Specify the user whose messages you want to see when the action is "user", and t
  .PP
  \fB\-\-host HOST_NAME\fR
  .RS 4
--Specify the host which you want to send your message to\&. Valid options are "twitter" to send to twitter\&.com and "identica" to send to identi\&.ca\&. If you want to send the message to a custom StatusNet installation, you should specify the API URI\&. For example identi\&.ca\*(Aqs URI is: https://identi\&.ca/api/statuses
-+Specify the host which you want to send your message to\&. Valid options are "statusnet" to send to status\&.net\&. If you want to send the message to a custom StatusNet installation, you should specify the API URI\&. For example status\&.net\*(Aqs URI is: https://status\&.net/api/statuses
+-Specify the host which you want to send your message to\&. Valid options are "twitter" to send to twitter\&.com\&.
++Specify the host which you want to send your message to\&. Valid options are "statusnet" to send to status\&.net\&.
  .sp
 -If no host is specified, the default is to send to twitter\&.com\&.
 +If no host is specified, the default is to send to status\&.net\&.
  .RE
  .PP
  \fB\-\-proxy PROXY:PORT\fR
-@@ -85,8 +85,6 @@
+@@ -85,8 +85,6 @@ Specify a config file for bti to read from\&. By default, bti looks in the ~/\&.
  .RS 4
  Status ID of a single post to which you want to create a threaded reply to\&.
  .sp
@@ -50,46 +64,35 @@ diff -Nur bti-033/bti.1 bti-nonprism/bti.1
  For status\&.net, this can link any two messages into context with each other\&. Status\&.net will also link a message that contains an @name without this without regard to context\&.
  .RE
  .PP
-@@ -167,12 +165,12 @@
+@@ -167,12 +165,12 @@ The account and password can be stored in a configuration file in the users home
  .PP
  \fBaccount\fR
  .RS 4
--The twitter\&.com or identi\&.ca account name you wish to use to send this message with\&.
+-The twitter\&.com account name you wish to use to send this message with\&.
 +The status\&.net account name you wish to use to send this message with\&.
  .RE
  .PP
  \fBpassword\fR
  .RS 4
--The twitter\&.com or identi\&.ca password for the account you wish to use to send this message with\&.
+-The twitter\&.com password for the account you wish to use to send this message with\&.
 +The status\&.net password for the account you wish to use to send this message with\&.
  .RE
  .PP
  \fB\-\-action action\fR
-@@ -187,7 +185,7 @@
+@@ -187,7 +185,7 @@ Specify the user you want to see his/her messages while the action is "user"\&.
  .PP
  \fBhost\fR
  .RS 4
--The host you want to use to send the message to\&. Valid options are either "twitter" or "identica" to send to twitter\&.com or identi\&.ca respectively\&. If you want to send the message to a custom StatusNet installation, you should specify the API URI\&. For example identi\&.ca\*(Aqs URI is: https://identi\&.ca/api/statuses\&.
-+The host you want to use to send the message to\&. Valid options are either "statusnet" to send to status\&.net respectively\&. If you want to send the message to a custom StatusNet installation, you should specify the API URI\&. For example status\&.net\*(Aqs URI is: https://status\&.net/api/statuses\&.
+-The host you want to use to send the message to\&. Valid options is "twitter" or "custom" to specify your own server\&.
++The host you want to use to send the message to\&. Valid options is "statusnet" or "custom" to specify your own server\&.
  .RE
  .PP
  \fBproxy\fR
-diff -Nur bti-033/bti-bashcompletion bti-nonprism/bti-bashcompletion
---- bti-033/bti-bashcompletion	2013-06-27 18:23:38.000000000 -0300
-+++ bti-nonprism/bti-bashcompletion	2013-08-21 18:19:46.889928804 -0300
-@@ -12,7 +12,7 @@
- 	fi
- 
- 	if [[ "${prev}" == "--host" ]] ; then
--		COMPREPLY=( $(compgen -W "twitter identica" -- ${cur} ) )
-+		COMPREPLY=( $(compgen -W "statusnet" -- ${cur} ) )
- 	fi
- 
- 	if [[ "${prev}" == "--action" ]] ; then
-diff -Nur bti-033/bti.c bti-nonprism/bti.c
---- bti-033/bti.c	2013-06-27 18:23:38.000000000 -0300
-+++ bti-nonprism/bti.c	2013-08-21 18:31:54.013583020 -0300
-@@ -53,7 +53,7 @@
+diff --git a/bti.c b/bti.c
+index f4b2c4d..226e111 100644
+--- a/bti.c
++++ b/bti.c
+@@ -53,7 +53,7 @@ int debug;
  
  static void display_help(void)
  {
@@ -98,50 +101,39 @@ diff -Nur bti-033/bti.c bti-nonprism/bti.c
  		"Version: %s\n"
  		"Usage:\n"
  		"  bti [options]\n"
-@@ -258,19 +258,12 @@
+@@ -258,14 +258,12 @@ static void bti_curl_buffer_free(struct bti_curl_buffer *buffer)
  	free(buffer);
  }
  
--const char twitter_host[]  = "http://api.twitter.com/1.1/statuses";
+-const char twitter_host[]  = "https://api.twitter.com/1.1/statuses";
 -const char twitter_host_stream[]  = "https://stream.twitter.com/1.1/statuses"; /*this is not reset, and doesnt work */
--const char twitter_host_simple[]  = "http://api.twitter.com/1.1";
--const char identica_host[] = "https://identi.ca/api/statuses";
+-const char twitter_host_simple[]  = "https://api.twitter.com/1.1";
 -const char twitter_name[]  = "twitter";
--const char identica_name[] = "identi.ca";
--
++const char statusnet_host[]  = "https://status.net/api/statuses";
++const char statusnet_name[]  = "statusnet";
+ 
 -static const char twitter_request_token_uri[]  = "https://twitter.com/oauth/request_token";
 -static const char twitter_access_token_uri[]   = "https://twitter.com/oauth/access_token";
 -static const char twitter_authorize_uri[]      = "https://twitter.com/oauth/authorize?oauth_token=";
--static const char identica_request_token_uri[] = "https://identi.ca/api/oauth/request_token?oauth_callback=oob";
--static const char identica_access_token_uri[]  = "https://identi.ca/api/oauth/access_token";
--static const char identica_authorize_uri[]     = "https://identi.ca/api/oauth/authorize?oauth_token=";
-+const char statusnet_host[] = "https://status.net/api/statuses";
-+const char statusnet_name[] = "status.net";
-+
-+static const char statusnet_request_token_uri[] = "https://status.net/api/oauth/request_token?oauth_callback=oob";
-+static const char statusnet_access_token_uri[]  = "https://status.net/api/oauth/access_token";
-+static const char statusnet_authorize_uri[]     = "https://status.net/api/oauth/authorize?oauth_token=";
++static const char statusnet_request_token_uri[]  = "https://status.net/api/oauth/request_token?oauth_callback=oob";
++static const char statusnet_access_token_uri[]   = "https://status.net/api/oauth/access_token";
++static const char statusnet_authorize_uri[]      = "https://status.net/api/oauth/authorize?oauth_token=";
  static const char custom_request_token_uri[]   = "/../oauth/request_token?oauth_callback=oob";
  static const char custom_access_token_uri[]    = "/../oauth/access_token";
  static const char custom_authorize_uri[]       = "/../oauth/authorize?oauth_token=";
-@@ -855,14 +848,9 @@
+@@ -792,9 +790,9 @@ static int request_access_token(struct session *session)
  	if (!session)
  		return -EINVAL;
  
 -	if (session->host == HOST_TWITTER)
--		request_url = oauth_sign_url2(
--				twitter_request_token_uri, NULL,
--				OA_HMAC, NULL, session->consumer_key,
--				session->consumer_secret, NULL, NULL);
--	else if (session->host == HOST_IDENTICA)
 +	if (session->host == HOST_STATUSNET)
  		request_url = oauth_sign_url2(
--				identica_request_token_uri, NULL,
+-				twitter_request_token_uri, NULL,
 +				statusnet_request_token_uri, NULL,
  				OA_HMAC, NULL, session->consumer_key,
  				session->consumer_secret, NULL, NULL);
  	else {
-@@ -893,16 +881,11 @@
+@@ -825,11 +823,11 @@ static int request_access_token(struct session *session)
  		"Please open the following link in your browser, and "
  		"allow 'bti' to access your account. Then paste "
  		"back the provided PIN in here.\n");
@@ -152,16 +144,11 @@ diff -Nur bti-033/bti.c bti-nonprism/bti.c
  		verifier = session->readline(NULL);
  		sprintf(at_uri, "%s?oauth_verifier=%s",
 -			twitter_access_token_uri, verifier);
--	} else if (session->host == HOST_IDENTICA) {
--		fprintf(stdout, "%s%s\nPIN: ", identica_authorize_uri, at_key);
--		verifier = session->readline(NULL);
--		sprintf(at_uri, "%s?oauth_verifier=%s",
--			identica_access_token_uri, verifier);
 +			statusnet_access_token_uri, verifier);
  	} else {
  		fprintf(stdout, "%s%s%s\nPIN: ",
  			session->hosturl, custom_authorize_uri, at_key);
-@@ -956,7 +939,7 @@
+@@ -883,7 +881,7 @@ static int send_request(struct session *session)
  		return -EINVAL;
  
  	if (!session->hosturl)
@@ -170,7 +157,7 @@ diff -Nur bti-033/bti.c bti-nonprism/bti.c
  
  	if (session->no_oauth || session->guest) {
  		curl_buf = bti_curl_buffer_alloc(session->action);
-@@ -971,7 +954,7 @@
+@@ -898,7 +896,7 @@ static int send_request(struct session *session)
  		}
  
  		if (!session->hosturl)
@@ -179,7 +166,7 @@ diff -Nur bti-033/bti.c bti-nonprism/bti.c
  
  		switch (session->action) {
  		case ACTION_UPDATE:
-@@ -1032,7 +1015,7 @@
+@@ -959,7 +957,7 @@ static int send_request(struct session *session)
  
  		case ACTION_PUBLIC:
  			/*snprintf(endpoint, endpoint_size, "%s%s?page=%d", session->hosturl,*/
@@ -188,7 +175,7 @@ diff -Nur bti-033/bti.c bti-nonprism/bti.c
  				public_uri);
  			curl_easy_setopt(curl, CURLOPT_URL, endpoint);
  			break;
-@@ -1045,7 +1028,6 @@
+@@ -972,7 +970,6 @@ static int send_request(struct session *session)
  			break;
  
  		case ACTION_DIRECT:
@@ -196,7 +183,7 @@ diff -Nur bti-033/bti.c bti-nonprism/bti.c
  			break;
  
  		default:
-@@ -1125,7 +1107,6 @@
+@@ -1052,7 +1049,6 @@ static int send_request(struct session *session)
  	} else {
  		switch (session->action) {
  		case ACTION_UPDATE:
@@ -204,7 +191,7 @@ diff -Nur bti-033/bti.c bti-nonprism/bti.c
  			if (strlen_utf8(session->tweet) > 140 + 1000 ) {
  				printf("E: tweet is too long!\n");
  				goto skip_tweet;
-@@ -1156,7 +1137,7 @@
+@@ -1083,7 +1079,7 @@ static int send_request(struct session *session)
  				mentions_uri, session->page);
  			break;
  		case ACTION_PUBLIC:
@@ -213,7 +200,7 @@ diff -Nur bti-033/bti.c bti-nonprism/bti.c
  				public_uri);
  			break;
  		case ACTION_GROUP:
-@@ -1175,7 +1156,7 @@
+@@ -1102,7 +1098,7 @@ static int send_request(struct session *session)
  			break;
  		case ACTION_DIRECT:
  			escaped_tweet = oauth_url_escape(session->tweet);
@@ -222,7 +209,7 @@ diff -Nur bti-033/bti.c bti-nonprism/bti.c
  				direct_uri, session->user, escaped_tweet);
  			is_post = 1;
  			break;
-@@ -1766,14 +1747,10 @@
+@@ -1691,10 +1687,10 @@ int main(int argc, char *argv[], char *envp[])
  				free(session->hosturl);
  			if (session->hostname)
  				free(session->hostname);
@@ -230,10 +217,6 @@ diff -Nur bti-033/bti.c bti-nonprism/bti.c
 -				session->host = HOST_TWITTER;
 -				session->hosturl = strdup(twitter_host);
 -				session->hostname = strdup(twitter_name);
--			} else if (strcasecmp(optarg, "identica") == 0) {
--				session->host = HOST_IDENTICA;
--				session->hosturl = strdup(identica_host);
--				session->hostname = strdup(identica_name);
 +			if (strcasecmp(optarg, "statusnet") == 0) {
 +				session->host = HOST_STATUSNET;
 +				session->hosturl = strdup(statusnet_host);
@@ -241,7 +224,7 @@ diff -Nur bti-033/bti.c bti-nonprism/bti.c
  			} else {
  				session->host = HOST_CUSTOM;
  				session->hosturl = strdup(optarg);
-@@ -1829,31 +1806,8 @@
+@@ -1750,31 +1746,8 @@ int main(int argc, char *argv[], char *envp[])
  	if (debug)
  		display_version();
  
@@ -275,9 +258,10 @@ diff -Nur bti-033/bti.c bti-nonprism/bti.c
  
  	if (session->no_oauth) {
  		if (!session->account) {
-diff -Nur bti-033/bti.example bti-nonprism/bti.example
---- bti-033/bti.example	2012-06-22 18:45:42.000000000 -0300
-+++ bti-nonprism/bti.example	2013-08-21 18:24:54.398011375 -0300
+diff --git a/bti.example b/bti.example
+index 57c55c9..29afa11 100644
+--- a/bti.example
++++ b/bti.example
 @@ -5,7 +5,7 @@
  # a message.
  account=twitmaster
@@ -287,40 +271,39 @@ diff -Nur bti-033/bti.example bti-nonprism/bti.example
  # Example of a custom StatusNet installation
  #host=http://army.twit.tv/api/statuses
  logfile=.bti.log
-diff -Nur bti-033/bti.h bti-nonprism/bti.h
---- bti-033/bti.h	2013-06-27 18:23:38.000000000 -0300
-+++ bti-nonprism/bti.h	2013-08-21 18:19:22.865702111 -0300
-@@ -17,8 +17,7 @@
+diff --git a/bti.h b/bti.h
+index 3d5ed9c..e466c2a 100644
+--- a/bti.h
++++ b/bti.h
+@@ -17,7 +17,7 @@
  #define __BTI_H
  
  enum host {
 -	HOST_TWITTER  = 0,
--	HOST_IDENTICA = 1,
-+	HOST_STATUSNET = 1,
++	HOST_STATUSNET  = 1,
  	HOST_CUSTOM   = 2
  };
  
-@@ -76,10 +75,8 @@
+@@ -75,8 +75,8 @@ struct bti_curl_buffer {
  	int length;
  };
  
 -extern const char twitter_host[];
--extern const char identica_host[];
 -extern const char twitter_name[];
--extern const char identica_name[];
 +extern const char statusnet_host[];
 +extern const char statusnet_name[];
  extern int debug;
  
  extern void bti_parse_configfile(struct session *session);
-diff -Nur bti-033/bti.xml bti-nonprism/bti.xml
---- bti-033/bti.xml	2013-06-27 18:23:38.000000000 -0300
-+++ bti-nonprism/bti.xml	2013-08-21 18:22:20.722310079 -0300
+diff --git a/bti.xml b/bti.xml
+index c0b89ee..00ad9a8 100644
+--- a/bti.xml
++++ b/bti.xml
 @@ -21,7 +21,7 @@
  
        <refnamediv>
          <refname>bti</refname>
--        <refpurpose>send a tweet to twitter.com or identi.ca from the command line</refpurpose>
+-        <refpurpose>send a tweet to twitter.com from the command line</refpurpose>
 +        <refpurpose>send a tweet to status.net from the command line</refpurpose>
        </refnamediv>
  
@@ -329,8 +312,8 @@ diff -Nur bti-033/bti.xml bti-nonprism/bti.xml
        </refsynopsisdiv>
  
        <refsect1><title>DESCRIPTION</title>
--        <para>bti sends a tweet message to twitter.com or identi.ca.
-+        <para>bti sends a tweet message or status.net.
+-        <para>bti sends a tweet message to twitter.com.
++        <para>bti sends a tweet message to status.net.
          </para>
        </refsect1>
  
@@ -338,7 +321,7 @@ diff -Nur bti-033/bti.xml bti-nonprism/bti.xml
              <term><option>--account account</option></term>
              <listitem>
                <para>
--	        Specify the twitter.com or identi.ca account name.
+-	        Specify the twitter.com account name.
 +	        Specify the status.net account name.
  	      </para>
              </listitem>
@@ -347,25 +330,17 @@ diff -Nur bti-033/bti.xml bti-nonprism/bti.xml
              <term><option>--password password</option></term>
              <listitem>
                <para>
--                Specify the password of your twitter.com or identi.ca account.
+-                Specify the password of your twitter.com account.
 +                Specify the password of your status.net account.
                </para>
              </listitem>
            </varlistentry>
-@@ -100,15 +100,15 @@
+@@ -100,10 +100,10 @@
              <listitem>
                <para>
  		Specify the host which you want to send your message to.  Valid
--		options are "twitter" to send to twitter.com and "identica" to
--        send to identi.ca.
-+		options are "statusnet" to
-+        send to status.net.
- 
-         If you want to send the message to a custom StatusNet installation,
--        you should specify the API URI. For example identi.ca's URI is:
--        https://identi.ca/api/statuses
-+        you should specify the API URI. For example status.net's URI is:
-+        https://status.net/api/statuses
+-		options are "twitter" to send to twitter.com.
++		options are "statusnet" to send to status.net.
                </para>
                <para>
 -		If no host is specified, the default is to send to twitter.com.
@@ -373,7 +348,7 @@ diff -Nur bti-033/bti.xml bti-nonprism/bti.xml
                </para>
              </listitem>
            </varlistentry>
-@@ -154,10 +154,6 @@
+@@ -149,10 +149,6 @@
  		reply to.
  	      </para>
  	      <para>
@@ -384,45 +359,38 @@ diff -Nur bti-033/bti.xml bti-nonprism/bti.xml
  	        For status.net, this can link any two messages into context with
  		each other. Status.net will also link a message that contains an
  		@name without this without regard to context.
-@@ -306,7 +302,7 @@
+@@ -301,7 +297,7 @@
               <term><option>account</option></term>
               <listitem>
                 <para>
--                 The twitter.com or identi.ca account name you wish to use to send this
+-                 The twitter.com account name you wish to use to send this
 +                 The status.net account name you wish to use to send this
                   message with.
                 </para>
               </listitem>
-@@ -315,7 +311,7 @@
+@@ -310,7 +306,7 @@
               <term><option>password</option></term>
               <listitem>
                 <para>
--                 The twitter.com or identi.ca password for the account you wish to use
+-                 The twitter.com password for the account you wish to use
 +                 The status.net password for the account you wish to use
                   to send this message with.
                 </para>
               </listitem>
-@@ -346,12 +342,12 @@
+@@ -341,7 +337,7 @@
               <listitem>
                 <para>
  		 The host you want to use to send the message to.  Valid
--		 options are either "twitter" or "identica" to send to
--		 twitter.com or identi.ca respectively.
-+		 options are either "statusnet" to send to
-+		 status.net respectively.
+-		 options is "twitter" or "custom" to specify your own server.
++		 options is "statusnet" or "custom" to specify your own server.
  
-          If you want to send the message to a custom StatusNet installation,
--         you should specify the API URI. For example identi.ca's URI is:
--         https://identi.ca/api/statuses.
-+         you should specify the API URI. For example status.net's URI is:
-+         https://status.net/api/statuses.
                 </para>
               </listitem>
-            </varlistentry>
-diff -Nur bti-033/config.c bti-nonprism/config.c
---- bti-033/config.c	2013-04-23 20:18:04.000000000 -0300
-+++ bti-nonprism/config.c	2013-08-21 18:17:39.798533227 -0300
-@@ -219,14 +219,10 @@
+diff --git a/config.c b/config.c
+index e6fecc1..0bbc186 100644
+--- a/config.c
++++ b/config.c
+@@ -219,10 +219,10 @@ static int retweet_callback(struct session *session, char *value)
  
  static int host_callback(struct session *session, char *value)
  {
@@ -430,10 +398,6 @@ diff -Nur bti-033/config.c bti-nonprism/config.c
 -		session->host = HOST_TWITTER;
 -		session->hosturl = strdup(twitter_host);
 -		session->hostname = strdup(twitter_name);
--	} else if (strcasecmp(value, "identica") == 0) {
--		session->host = HOST_IDENTICA;
--		session->hosturl = strdup(identica_host);
--		session->hostname = strdup(identica_name);
 +	if (strcasecmp(value, "statusnet") == 0) {
 +		session->host = HOST_STATUSNET;
 +		session->hosturl = strdup(statusnet_host);
diff --git a/nonprism/claws-mail-nonprism/PKGBUILD b/nonprism/claws-mail-nonprism/PKGBUILD
index 1e48c65bd..fed2bb82c 100644
--- a/nonprism/claws-mail-nonprism/PKGBUILD
+++ b/nonprism/claws-mail-nonprism/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 201547 2013-12-14 21:56:36Z andyrtr $
+# $Id: PKGBUILD 205518 2014-02-06 16:12:34Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 _pkgname=claws-mail
 pkgname=$_pkgname-nonprism
 pkgver=3.9.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A GTK+ based e-mail client, without libgdata support"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
 url="http://www.$_pkgname.org"
-depends=('gtk2' 'gnutls' 'startup-notification' 'enchant' 'gpgme' 'libetpan>=1.1-4' 'compface'
+depends=('gtk2' 'gnutls' 'startup-notification' 'enchant' 'gpgme' 'libetpan' 'compface'
          'libsm' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
 makedepends=('spamassassin' 'bogofilter' 'valgrind' 
              # dependencies for plugins
diff --git a/nonprism/darktable-nonprism/PKGBUILD b/nonprism/darktable-nonprism/PKGBUILD
index 767694185..2f4b6ecca 100644
--- a/nonprism/darktable-nonprism/PKGBUILD
+++ b/nonprism/darktable-nonprism/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 104671 2014-01-24 14:19:50Z lcarlier $
+# $Id: PKGBUILD 105572 2014-02-10 13:31:04Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  Christian Himpel <chressie at gmail dot com>
 # Contributor: Johannes Hanika <hanatos at gmail dot com>
 
 _pkgname=darktable
 pkgname=darktable-nonprism
-pkgver=1.4
+pkgver=1.4.1
 _pkgver=1.4
-pkgrel=3
+pkgrel=1
 pkgdesc="Utility to organize and develop raw images, without flickcurl support"
 arch=('i686' 'x86_64' 'mips64el')
 url=http://darktable.sf.net/
@@ -21,15 +21,8 @@ depends=('exiv2>=0.18' 'intltool>=0.40' 'lcms2' 'lensfun>=0.2.3' 'libglade' 'dbu
 makedepends=('intltool>=0.40' 'cmake' 'librsvg')
 optdepends=('librsvg')
 install=darktable.install
-source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.xz
-	https://github.com/darktable-org/darktable/commit/74dbfa3b24bcc216ec91e12551b6b434e4a43a22.diff)
-md5sums=('896416931ded4579f528cd11edad470c'
-         'f959e371f8648eeef8ad6dd6e1403d29')
-
-prepare() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  patch -p1 <$srcdir/74dbfa3b24bcc216ec91e12551b6b434e4a43a22.diff
-}
+source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.xz)
+md5sums=('78252618bb7b1df30109ef5484d46f3c')
 
 build() {
   cd "$srcdir/$_pkgname-$pkgver"
diff --git a/nonprism/duplicity-nonprism/PKGBUILD b/nonprism/duplicity-nonprism/PKGBUILD
index bd0f54cb9..79163db90 100644
--- a/nonprism/duplicity-nonprism/PKGBUILD
+++ b/nonprism/duplicity-nonprism/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 105116 2014-01-31 20:58:38Z lfleischer $
+# $Id: PKGBUILD 105458 2014-02-08 15:39:04Z bgyorgy $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Aaron Schaefer <aaron@elasticdog.com>
@@ -7,7 +7,7 @@
 _pkgname=duplicity
 pkgname=duplicity-nonprism
 pkgver=0.6.23
-pkgrel=2
+pkgrel=3
 pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm, without python2-gdata recommendation'
 arch=('i686' 'x86_64')
 url='http://www.nongnu.org/duplicity/'
@@ -23,9 +23,18 @@ optdepends=('lftp: FTPS backend'
 replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
-source=("http://savannah.nongnu.org/download/$_pkgname/$_pkgname-$pkgver.tar.gz"{,.sig})
+source=("http://savannah.nongnu.org/download/$_pkgname/$_pkgname-$pkgver.tar.gz"{,.sig}
+        "gpg-encode.patch")
 md5sums=('ae0e84446bcf114735de1057ed53c977'
-         'SKIP')
+         'SKIP'
+         '366555c73aeebf7f15f6f37ec65176ce')
+
+prepare() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+
+  # Fix gpg encrypted backup (FS#38838, upstream revision 961, will be fixed in 0.6.24).
+  patch -Np0 -i ../gpg-encode.patch
+}
 
 build() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
diff --git a/nonprism/duplicity-nonprism/gpg-encode.patch b/nonprism/duplicity-nonprism/gpg-encode.patch
new file mode 100644
index 000000000..f9159a3ca
--- /dev/null
+++ b/nonprism/duplicity-nonprism/gpg-encode.patch
@@ -0,0 +1,216 @@
+=== modified file 'bin/duplicity'
+--- bin/duplicity	2014-01-21 21:04:27 +0000
++++ bin/duplicity	2014-02-05 02:57:13 +0000
+@@ -27,7 +27,7 @@
+ # Please send mail to me or the mailing list if you find bugs or have
+ # any suggestions.
+ 
+-import getpass, gzip, os, sys, time, types
++import gzip, os, sys, time, types
+ import traceback, platform, statvfs, resource, re
+ import threading
+ from datetime import datetime
+@@ -37,9 +37,6 @@
+ if os.path.exists(os.path.join(pwd, "../duplicity")):
+     sys.path.insert(0, os.path.abspath(os.path.join(pwd, "../.")))
+ 
+-import gettext
+-gettext.install('duplicity', codeset='utf8')
+-
+ from duplicity import log
+ log.setup()
+ 
+@@ -65,6 +62,13 @@
+ # If exit_val is not None, exit with given value at end.
+ exit_val = None
+ 
++def getpass_safe(message):
++    # getpass() in Python 2.x will call str() on our prompt.  So we can't pass
++    # in non-ascii characters.
++    import getpass, locale
++    message = message.encode(locale.getpreferredencoding(), 'replace')
++    return getpass.getpass(message)
++
+ def get_passphrase(n, action, for_signing = False):
+     """
+     Check to make sure passphrase is indeed needed, then get
+@@ -160,19 +164,19 @@
+                     if use_cache and globals.gpg_profile.signing_passphrase:
+                         pass1 = globals.gpg_profile.signing_passphrase
+                     else:
+-                        pass1 = getpass.getpass(_("GnuPG passphrase for signing key:")+" ")
++                        pass1 = getpass_safe(_("GnuPG passphrase for signing key:")+" ")
+                 else:
+                     if use_cache and globals.gpg_profile.passphrase:
+                         pass1 = globals.gpg_profile.passphrase
+                     else:
+-                        pass1 = getpass.getpass(_("GnuPG passphrase:")+" ")
++                        pass1 = getpass_safe(_("GnuPG passphrase:")+" ")
+ 
+             if n == 1:
+                 pass2 = pass1
+             elif for_signing:
+-                pass2 = getpass.getpass(_("Retype passphrase for signing key to confirm: "))
++                pass2 = getpass_safe(_("Retype passphrase for signing key to confirm: "))
+             else:
+-                pass2 = getpass.getpass(_("Retype passphrase to confirm: "))
++                pass2 = getpass_safe(_("Retype passphrase to confirm: "))
+ 
+             if not pass1 == pass2:
+                 print _("First and second passphrases do not match!  Please try again.")
+
+=== modified file 'bin/rdiffdir'
+--- bin/rdiffdir	2013-12-27 06:39:00 +0000
++++ bin/rdiffdir	2014-02-05 02:57:13 +0000
+@@ -27,9 +27,6 @@
+ 
+ import sys, getopt, gzip, os
+ 
+-import gettext
+-gettext.install('duplicity', codeset='utf8')
+-
+ from duplicity import diffdir
+ from duplicity import patchdir
+ from duplicity import log
+
+=== added directory 'testing/overrides'
+=== added file 'testing/overrides/gettext.py'
+--- testing/overrides/gettext.py	1970-01-01 00:00:00 +0000
++++ testing/overrides/gettext.py	2014-02-05 02:57:13 +0000
+@@ -0,0 +1,34 @@
++# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf8 -*-
++#
++# Copyright 2014 Michael Terry <mike@mterry.name>
++#
++# This file is part of duplicity.
++#
++# Duplicity is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License as published by the
++# Free Software Foundation; either version 2 of the License, or (at your
++# option) any later version.
++#
++# Duplicity is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with duplicity; if not, write to the Free Software Foundation,
++# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++
++# This is just a small override to the system gettext.py which allows us to
++# always return a string with fancy unicode characters, which will notify us
++# if we ever get a unicode->ascii translation by accident.
++
++def translation(*args, **kwargs):
++    class Translation:
++        ZWSP = u"​" # ZERO WIDTH SPACE, basically an invisible space separator
++        def install(self, **kwargs):
++            import __builtin__
++            __builtin__.__dict__['_'] = lambda x: x + self.ZWSP
++        def ungettext(self, one, more, n):
++            if n == 1: return one + self.ZWSP
++            else:      return more + self.ZWSP
++    return Translation()
+
+=== modified file 'testing/run-tests'
+--- testing/run-tests	2011-11-24 01:49:53 +0000
++++ testing/run-tests	2014-02-05 02:57:13 +0000
+@@ -25,9 +25,9 @@
+ 
+ THISDIR=$(pwd)
+ export TZ=US/Central
+-export LANG=
++export LANG=en_US.UTF-8
+ # up for 'duplicity' module and here for 'helper.py'
+-export PYTHONPATH="$(dirname $THISDIR):$THISDIR/helpers"
++export PYTHONPATH="$THISDIR/overrides:$(dirname $THISDIR):$THISDIR/helpers"
+ export GNUPGHOME="$THISDIR/gnupg"
+ export PATH="$(dirname $THISDIR)/bin:$PATH"
+ 
+
+=== modified file 'testing/tests/finaltest.py'
+--- testing/tests/finaltest.py	2012-11-24 19:45:09 +0000
++++ testing/tests/finaltest.py	2014-02-05 02:57:13 +0000
+@@ -20,6 +20,7 @@
+ # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 
+ import helper
++import pexpect
+ import sys, os, unittest
+ 
+ import duplicity.backend
+@@ -50,7 +51,8 @@
+     """
+     Test backup/restore using duplicity binary
+     """
+-    def run_duplicity(self, arglist, options = [], current_time = None):
++    def run_duplicity(self, arglist, options = [], current_time = None,
++                      passphrase_input = None):
+         """Run duplicity binary with given arguments and options"""
+         options.append("--archive-dir testfiles/cache")
+         cmd_list = ["duplicity"]
+@@ -62,22 +64,23 @@
+         cmd_list.extend(arglist)
+         cmdline = " ".join(cmd_list)
+         #print "Running '%s'." % cmdline
+-        if not os.environ.has_key('PASSPHRASE'):
++        if passphrase_input is None and not os.environ.has_key('PASSPHRASE'):
+             os.environ['PASSPHRASE'] = 'foobar'
+-        return_val = os.system(cmdline)
++        (output, return_val) = pexpect.run(cmdline, withexitstatus=True,
++            events={'passphrase.*:': passphrase_input}) 
+         if return_val:
+             raise CmdError(return_val)
+ 
+-    def backup(self, type, input_dir, options = [], current_time = None):
++    def backup(self, type, input_dir, options = [], **kwargs):
+         """Run duplicity backup to default directory"""
+         options = options[:]
+         if type == "full":
+             options.insert(0, 'full')
+         args = [input_dir, "'%s'" % backend_url]
+-        self.run_duplicity(args, options, current_time)
++        self.run_duplicity(args, options, **kwargs)
+ 
+     def restore(self, file_to_restore = None, time = None, options = [],
+-                current_time = None):
++                **kwargs):
+         options = options[:] # just nip any mutability problems in bud
+         assert not os.system("rm -rf testfiles/restore_out")
+         args = ["'%s'" % backend_url, "testfiles/restore_out"]
+@@ -85,17 +88,17 @@
+             options.extend(['--file-to-restore', file_to_restore])
+         if time:
+             options.extend(['--restore-time', str(time)])
+-        self.run_duplicity(args, options, current_time)
++        self.run_duplicity(args, options, **kwargs)
+ 
+     def verify(self, dirname, file_to_verify = None, time = None, options = [],
+-               current_time = None):
++               **kwargs):
+         options = ["verify"] + options[:]
+         args = ["'%s'" % backend_url, dirname]
+         if file_to_verify:
+             options.extend(['--file-to-restore', file_to_verify])
+         if time:
+             options.extend(['--restore-time', str(time)])
+-        self.run_duplicity(args, options, current_time)
++        self.run_duplicity(args, options, **kwargs)
+ 
+     def deltmp(self):
+         """Delete temporary directories"""
+@@ -255,6 +258,12 @@
+         assert chain.start_time == 30000, chain.start_time
+         assert chain.end_time == 40000, chain.end_time
+ 
++    def test_piped_password(self):
++        """Make sure that prompting for a password works"""
++        self.backup("full", "testfiles/empty_dir",
++                    passphrase_input="foobar\nfoobar\n")
++        self.restore(passphrase_input="foobar\n")
++
+ class FinalTest1(FinalTest, unittest.TestCase):
+     def setUp(self):
+         assert not os.system("tar xzf testfiles.tar.gz > /dev/null 2>&1")
+
diff --git a/nonprism/evolution-data-server-nonprism/PKGBUILD b/nonprism/evolution-data-server-nonprism/PKGBUILD
index f8e78ee1a..0ce7ceefd 100644
--- a/nonprism/evolution-data-server-nonprism/PKGBUILD
+++ b/nonprism/evolution-data-server-nonprism/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 201344 2013-12-09 08:01:08Z heftig $
+# $Id: PKGBUILD 205631 2014-02-10 09:46:35Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 _pkgname=evolution-data-server
 pkgname=evolution-data-server-nonprism
-pkgver=3.10.3
+pkgver=3.10.4
 pkgrel=1
 pkgdesc="Centralized access to appointments and contacts, without libgdata support"
 arch=(i686 x86_64)
@@ -16,7 +16,7 @@ replaces=("$_pkgname" 'evolution-data-server-coherence')
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz)
-sha256sums=('41af5c658255230de47423fad73f19bfab15b9e0df80141b13f66b55bf295bd2')
+sha256sums=('5c2d5e19af19ecfa81f31306411ab6155c3c62cf407d5a5aaa675a8ce940fa2d')
 
 build() {
   cd "$_pkgname-$pkgver"
diff --git a/nonprism/grilo-plugins-nonprism/PKGBUILD b/nonprism/grilo-plugins-nonprism/PKGBUILD
index b27e9ac91..ccae9590e 100644
--- a/nonprism/grilo-plugins-nonprism/PKGBUILD
+++ b/nonprism/grilo-plugins-nonprism/PKGBUILD
@@ -1,37 +1,36 @@
-# $Id: PKGBUILD 201648 2013-12-17 11:32:11Z heftig $
+# $Id: PKGBUILD 205839 2014-02-11 12:53:30Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=grilo-plugins
 pkgname=grilo-plugins-nonprism
-pkgver=0.2.9
-pkgrel=3
-pkgdesc="Plugins for Grilo, without libgdata support"
+pkgver=0.2.10
+pkgrel=1
+pkgdesc="Plugins for Grilo, without libgdata support and gnome-online-accounts recommendation"
 url="http://www.gnome.org"
 arch=(i686 x86_64)
 license=(LGPL)
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
 depends=(grilo sqlite libgcrypt)
-makedepends=(gupnp-av gmime rest libtracker-sparql totem-plparser libdmapsharing
-             json-glib intltool)
+makedepends=(gupnp-av gmime libtracker-sparql libdmapsharing
+             json-glib intltool avahi itstool)
 optdepends=('gupnp-av: uPnP plugin'
             'gmime: Podcasts plugin'
-            'rest: Blip.tv plugin'
             'libtracker-sparql: Tracker plugin'
-            'totem-plparser: Youtube plugin, Vimeo plugin, Optical media plugin'
             'libdmapsharing: DMAP sharing plugin'
-            'json-glib: TMDb plugin')
+            'json-glib: TMDb plugin'
+            'avahi: Freebox plugin')
 options=('!emptydirs')
 groups=('gnome')
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
 source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgname}/${pkgver%.*}/${_pkgname}-${pkgver}.tar.xz)
-sha256sums=('902b839bd1cdc27613d9e44af2afe00d1ef3b7471ae72c66c622560007e1023e')
+sha256sums=('5a7dd406ed58145847553e6dbb5f766e9d58dc5d4cfeb7e290d5b38c88163871')
 
 build() {
   cd $_pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --disable-static \
-    --enable-shoutcast
+    --enable-shoutcast --disable-pocket
   make
 }
 
diff --git a/nonprism/icedove-libre-nonprism/PKGBUILD b/nonprism/icedove-libre-nonprism/PKGBUILD
index 196536ea0..5097c1d2c 100644
--- a/nonprism/icedove-libre-nonprism/PKGBUILD
+++ b/nonprism/icedove-libre-nonprism/PKGBUILD
@@ -1,9 +1,9 @@
-# Maintainer : Márcio Silva <coadde@lavabit.com>
 # Maintainer : André Silva <emulatorman@parabola.nu>
+# Contributor : Márcio Silva <coadde@parabola.nu>
 
-# We're getting this from Debian Experimental
+# We're getting this from Debian Sid
 _debname=icedove
-_debver=24.1.1
+_debver=24.3.0
 _debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -16,22 +16,22 @@ pkgrel=1
 pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird, without support for unsafe and dangerous for privacy protocols"
 arch=('i686' 'x86_64' 'mips64el')
 license=('MPL' 'GPL' 'LGPL')
-url="http://packages.debian.org/experimental/${_pkgname}"
-depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification')
-makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
+url="http://packages.debian.org/sid/${_pkgname}"
+depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification')
+makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt' 'jquery-ui')
 optdepends=('libcanberra: for sound support')
 replaces=('thunderbird' "${pkgname%-nonprism}")
 conflicts=('thunderbird' "${pkgname%-nonprism}")
 provides=('thunderbird' "${pkgname%-nonprism}=$epoch:$pkgver")
 install=${_pkgname}.install
 source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz"
-        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.gz"
+        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.xz"
         mozconfig
         vendor.js
         ${_pkgname}.desktop)
 options=(!emptydirs)
-md5sums=('91ddfb44481e6cb456d835a832d885c1'
-         '9f060324dbed3f8d27c896703bda6078'
+md5sums=('cbf58e11a8eb1ded01167fa927ce9cc0'
+         'a8ef513d211c60bd2e77810c10a3c25c'
          'c46cf2a671c8fdefcabd4c87e38f3d40'
          '5a53179d14ae9631b7afe5e4d0fc0b25'
          'e785e0c267f4435ae1a9aa0b03bcacfb')
@@ -106,6 +106,10 @@ prepare() {
   # configure script misdetects the preprocessor without an optimization level
   # https://bugs.archlinux.org/task/34644
   sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' mozilla/configure
+
+  # Add symlinks to use jquery files built for us
+  ln -s /usr/share/javascript/jquery/jquery.min.js mail/jquery
+  ln -s /usr/share/javascript/jquery-ui/jquery-ui.min.js mail/jquery
 }
 
 build() {
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
index 4e904a5b7..bb3d74ade 100644
--- a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
+++ b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 203932 2014-01-14 07:49:31Z svenstaro $
+# $Id: PKGBUILD 205344 2014-02-04 14:04:24Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=kdenetwork-kopete
 pkgname=kdenetwork-kopete-libre-nonprism
-pkgver=4.12.1
+pkgver=4.12.2
 pkgrel=1
 pkgdesc='Instant Messenger, without Skype and support for unsafe and dangerous for privacy protocols'
 url='http://kde.org/applications/internet/kopete/'
@@ -20,7 +20,7 @@ conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz"
         'libre-nonprism.patch')
-sha1sums=('e6ad13cb81842961df0e6e9ecda309b47db0af29'
+sha1sums=('6b5ebab916f4527157cf7f979724538f38052bad'
           'ddde6ed0b6f281512dc12cb80f712f33c6932c92')
 
 prepare() {
diff --git a/nonprism/kdepim-runtime-nonprism/PKGBUILD b/nonprism/kdepim-runtime-nonprism/PKGBUILD
index 222f86473..ecdf5bc50 100644
--- a/nonprism/kdepim-runtime-nonprism/PKGBUILD
+++ b/nonprism/kdepim-runtime-nonprism/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 203696 2014-01-14 07:35:24Z svenstaro $
+# $Id: PKGBUILD 205108 2014-02-04 13:51:21Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=kdepim-runtime
 pkgname=kdepim-runtime-nonprism
-pkgver=4.12.1
+pkgver=4.12.2
 pkgrel=1
 pkgdesc='Extends the functionality of kdepim, without libkgapi and libkfbapi support'
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ replaces=('kdepim-runtime' 'kdepim-runtime-coherence')
 conflicts=kdepim-runtime
 provides=kdepim-runtime=$pkgver
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz")
-sha1sums=('0df4bc061f5c6aca896361358befb58a0425347f')
+sha1sums=('9ec15431754f8ea49f764cafa5bb87eda5fef5b6')
 
 prepare() {
   mkdir build
diff --git a/nonprism/pidgin-nonprism/PKGBUILD b/nonprism/pidgin-nonprism/PKGBUILD
index 9f80eb57a..848606fd0 100644
--- a/nonprism/pidgin-nonprism/PKGBUILD
+++ b/nonprism/pidgin-nonprism/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 204921 2014-01-31 12:35:03Z foutrelis $
+# $Id: PKGBUILD 205034 2014-02-03 14:10:06Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -7,20 +7,18 @@
 
 _pkgname=pidgin
 pkgname=('pidgin-nonprism' 'libpurple-nonprism' 'finch-nonprism')
-pkgver=2.10.8
-pkgrel=2
+pkgver=2.10.9
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pidgin.im/"
 license=('GPL')
 makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
              'libidn' 'python2' 'hicolor-icon-theme' 'farstream-0.1' 'avahi'
              'tk' 'ca-certificates' 'intltool' 'networkmanager')
-source=(http://downloads.sourceforge.net/$_pkgname/$_pkgname-$pkgver.tar.bz2{,.asc}
-        pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch
+source=(https://downloads.sourceforge.net/project/$_pkgname/Pidgin/$pkgver/$_pkgname-$pkgver.tar.bz2{,.asc}
         nonprism.patch)
-sha256sums=('b633367e3588ff3e615d68e812302dfdbe32e73693cbe42a0d827b7aed7a8227'
+sha256sums=('dc362ed8577f623eea4554a79e917073aa726825074fea402f2e515f0f51f319'
             'SKIP'
-            '4b4cc2d0816bbc7de83d34de6880935163007193a36dcc13afc89fc1ffacc5d2'
             'f7acfb852cdecfed16e8b116546b643cad1c44d28b56f28ff5485f92af68e9e2')
 
 prepare() {
@@ -32,9 +30,6 @@ prepare() {
   sed -i 's|on Linux|on GNU/Linux|' libpurple/valgrind.h
   sed -i 's|On Linux|On GNU/Linux|' libpurple/connection.h
 
-  # https://developer.pidgin.im/ticket/15879
-  patch -Np1 -i "$srcdir/pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch"
-
   # Use Python 2
   sed -i 's/env python$/&2/' */plugins/*.py \
     libpurple/purple-{remote,notifications-example,url-handler}
diff --git a/nonprism/pidgin-nonprism/pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch b/nonprism/pidgin-nonprism/pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch
deleted file mode 100644
index 32f28aa25..000000000
--- a/nonprism/pidgin-nonprism/pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-
-# HG changeset patch
-# User Mark Doliner <mark@kingant.net>
-# Date 1391153359 28800
-# Node ID b8e2a5fbffd3052ccba7160b56eac70f8e19c49a
-# Parent  e733020a9d3840275ffa931a9aeefe4d8befc08e
-Fix problems logging into some servers including jabber.org and
-chat.facebook.com.
-
-See my length comment in iq.c for details.
-
-diff --git a/libpurple/protocols/jabber/iq.c b/libpurple/protocols/jabber/iq.c
---- a/libpurple/protocols/jabber/iq.c
-+++ b/libpurple/protocols/jabber/iq.c
-@@ -283,6 +283,52 @@
- 	g_hash_table_remove(js->iq_callbacks, id);
- }
- 
-+/**
-+ * Verify that the 'from' attribute of an IQ reply is a valid match for
-+ * a given IQ request. The expected behavior is outlined in section
-+ * 8.1.2.1 of the XMPP CORE spec (RFC 6120). We consider the reply to
-+ * be a valid match if any of the following is true:
-+ * - Request 'to' matches reply 'from' (including the case where
-+ *   neither are set).
-+ * - Request 'to' was empty and reply 'from' is server JID.
-+ * - Request 'to' was empty and reply 'from' is my JID. The spec says
-+ *   we should only allow bare JID, but we also allow full JID for
-+ *   compatibility with some servers.
-+ *
-+ * These rules should allow valid IQ replies while preventing spoofed
-+ * ones.
-+ *
-+ * For more discussion see the "Spoofing of iq ids and misbehaving
-+ * servers" email thread from January 2014 on the jdev and security
-+ * mailing lists.
-+ *
-+ * @return TRUE if this reply is valid for the given request.
-+ */
-+static gboolean does_reply_from_match_request_to(JabberStream *js, JabberID *to, JabberID *from)
-+{
-+	if (jabber_id_equal(to, from)) {
-+		/* Request 'to' matches reply 'from' */
-+		return TRUE;
-+	}
-+
-+	if (!to && purple_strequal(from->domain, js->user->domain)) {
-+		/* Request 'to' is empty and reply 'from' domain matches our domain */
-+
-+		if (!from->node && !from->resource) {
-+			/* Reply 'from' is server bare JID */
-+			return TRUE;
-+		}
-+
-+		if (purple_strequal(from->node, js->user->node)
-+				&& (!from->resource || purple_strequal(from->resource, js->user->resource))) {
-+			/* Reply 'from' is my full or bare JID */
-+			return TRUE;
-+		}
-+	}
-+
-+	return FALSE;
-+}
-+
- void jabber_iq_parse(JabberStream *js, xmlnode *packet)
- {
- 	JabberIqCallbackData *jcd;
-@@ -377,8 +423,9 @@
- 
- 	/* First, lets see if a special callback got registered */
- 	if(type == JABBER_IQ_RESULT || type == JABBER_IQ_ERROR) {
--		if((jcd = g_hash_table_lookup(js->iq_callbacks, id))) {
--			if(jabber_id_equal(js, jcd->to, from_id)) {
-+		jcd = g_hash_table_lookup(js->iq_callbacks, id);
-+		if (jcd) {
-+			if (does_reply_from_match_request_to(js, jcd->to, from_id)) {
- 				jcd->callback(js, from, type, id, packet, jcd->data);
- 				jabber_iq_remove_callback_by_id(js, id);
- 				jabber_id_free(from_id);
-diff --git a/libpurple/protocols/jabber/jutil.c b/libpurple/protocols/jabber/jutil.c
---- a/libpurple/protocols/jabber/jutil.c
-+++ b/libpurple/protocols/jabber/jutil.c
-@@ -510,30 +510,21 @@
- 
- 
- gboolean
--jabber_id_equal(JabberStream *js, const JabberID *jid1, const JabberID *jid2)
-+jabber_id_equal(const JabberID *jid1, const JabberID *jid2)
- {
--	const JabberID *j1, *j2;
--	JabberID *bare_user_jid;
--	gboolean equal;
-+	if (!jid1 && !jid2) {
-+		/* Both are null therefore equal */
-+		return TRUE;
-+	}
- 
--	/* If an outgoing stanza has no 'to', or an incoming has no 'from',
--	 * then those are "the server acting as my account". This function will
--	 * handle that correctly.
--	 */
--	if (!jid1 && !jid2)
--		return TRUE;
-+	if (!jid1 || !jid2) {
-+		/* One is null, other is non-null, therefore not equal */
-+		return FALSE;
-+	}
- 
--	bare_user_jid = jabber_id_to_bare_jid(js->user);
--	j1 = jid1 ? jid1 : bare_user_jid;
--	j2 = jid2 ? jid2 : bare_user_jid;
--
--	equal = purple_strequal(j1->node, j2->node) &&
--			purple_strequal(j1->domain, j2->domain) &&
--			purple_strequal(j1->resource, j2->resource);
--
--	jabber_id_free(bare_user_jid);
--
--	return equal;
-+	return purple_strequal(jid1->node, jid2->node) &&
-+			purple_strequal(jid1->domain, jid2->domain) &&
-+			purple_strequal(jid1->resource, jid2->resource);
- }
- 
- char *jabber_get_domain(const char *in)
-diff --git a/libpurple/protocols/jabber/jutil.h b/libpurple/protocols/jabber/jutil.h
---- a/libpurple/protocols/jabber/jutil.h
-+++ b/libpurple/protocols/jabber/jutil.h
-@@ -46,12 +46,10 @@
- JabberID* jabber_id_new(const char *str);
- 
- /**
-- * Compare two JIDs for equality.
-- *
-- * Warning: If either JID is NULL then this function uses the user's
-- * bare JID, instead!
-+ * Compare two JIDs for equality. In addition to the node and domain,
-+ * the resources of the two JIDs must also be equal (or both absent).
-  */
--gboolean jabber_id_equal(JabberStream *js, const JabberID *jid1, const JabberID *jid2);
-+gboolean jabber_id_equal(const JabberID *jid1, const JabberID *jid2);
- 
- void jabber_id_free(JabberID *jid);
- 
-