[arch-commits] Commit in pidgin-encryption/repos (4 files)
Ionut Biru
ibiru at archlinux.org
Sun Jan 3 17:49:49 UTC 2010
Date: Sunday, January 3, 2010 @ 12:49:48
Author: ibiru
Revision: 62150
Merged revisions 62149 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/pidgin-encryption/trunk
........
r62149 | ibiru | 2010-01-03 19:49:11 +0200 (Sun, 03 Jan 2010) | 2 lines
upgpkg: pidgin-encryption 3.0-3
fix for working with pidgin 2.6.4 FS#17683
........
Added:
pidgin-encryption/repos/extra-i686/fix_header_escaping.patch
(from rev 62149, pidgin-encryption/trunk/fix_header_escaping.patch)
pidgin-encryption/repos/extra-i686/log_crash.patch
(from rev 62149, pidgin-encryption/trunk/log_crash.patch)
Modified:
pidgin-encryption/repos/extra-i686/ (properties)
pidgin-encryption/repos/extra-i686/PKGBUILD
---------------------------+
PKGBUILD | 17 +++++++----
fix_header_escaping.patch | 64 ++++++++++++++++++++++++++++++++++++++++++++
log_crash.patch | 11 +++++++
3 files changed, 86 insertions(+), 6 deletions(-)
Property changes on: pidgin-encryption/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /pidgin-encryption/trunk:1-55988
+ /pidgin-encryption/trunk:1-62149
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2010-01-03 17:49:11 UTC (rev 62149)
+++ extra-i686/PKGBUILD 2010-01-03 17:49:48 UTC (rev 62150)
@@ -5,20 +5,25 @@
pkgname=pidgin-encryption
pkgver=3.0
-pkgrel=2
+pkgrel=3
pkgdesc="A Pidgin plugin providing transparent RSA encryption using NSS"
arch=('i686' 'x86_64')
license=('GPL')
url="http://pidgin-encrypt.sourceforge.net/"
depends=('pidgin' 'nss')
-replaces=('gaim-encryption')
options=('!libtool')
-source=(http://downloads.sourceforge.net/pidgin-encrypt/$pkgname-$pkgver.tar.gz)
-md5sums=('3f3f8e9a15d19e084d54bfbbd2db9d77')
+source=(http://downloads.sourceforge.net/pidgin-encrypt/$pkgname-$pkgver.tar.gz
+ fix_header_escaping.patch log_crash.patch)
+md5sums=('3f3f8e9a15d19e084d54bfbbd2db9d77'
+ '06221c772419c4694eb3fe5b3e1b866d'
+ '9438d32cc1f983aa2d6b225c4f438aea')
build() {
- cd $srcdir/$pkgname-$pkgver
+ cd "$srcdir/$pkgname-$pkgver"
+ patch -Np1 -i "$srcdir/fix_header_escaping.patch" || return 1
+ patch -Np1 -i "$srcdir/log_crash.patch" || return 1
+
./configure --prefix=/usr
make || return 1
- make DESTDIR=$pkgdir install
+ make DESTDIR="$pkgdir" install
}
Copied: pidgin-encryption/repos/extra-i686/fix_header_escaping.patch (from rev 62149, pidgin-encryption/trunk/fix_header_escaping.patch)
===================================================================
--- extra-i686/fix_header_escaping.patch (rev 0)
+++ extra-i686/fix_header_escaping.patch 2010-01-03 17:49:48 UTC (rev 62150)
@@ -0,0 +1,64 @@
+--- pidgin-encryption-3.0.orig/encrypt.c 2007-05-06 23:37:55.000000000 -0400
++++ pidgin-encryption-3.0.new/encrypt.c 2009-11-22 22:28:34.052010351 -0500
+@@ -1114,21 +1114,21 @@ static void PE_headers_init() {
+ notify_table = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
+
+ g_hash_table_insert(header_table, g_strdup("prpl-toc"),
+- g_strdup("*** Encrypted with the Gaim-Encryption plugin <A HREF=\""));
++ g_strdup("--- Encrypted with the Gaim-Encryption plugin <A HREF=\""));
+ g_hash_table_insert(footer_table, g_strdup("prpl-toc"),
+ g_strdup("\"></A>"));
+ g_hash_table_insert(notify_table, g_strdup("prpl-toc"),
+ g_strdup("<A HREF=\"Gaim-Encryption Capable\"></A>"));
+
+ g_hash_table_insert(header_table, g_strdup("prpl-oscar"),
+- g_strdup("*** Encrypted with the Gaim-Encryption plugin <A HREF=\""));
++ g_strdup("--- Encrypted with the Gaim-Encryption plugin <A HREF=\""));
+ g_hash_table_insert(footer_table, g_strdup("prpl-oscar"),
+ g_strdup("\"></A>"));
+ g_hash_table_insert(notify_table, g_strdup("prpl-oscar"),
+ g_strdup("<A HREF=\"Gaim-Encryption Capable\"></A>"));
+
+ g_hash_table_insert(header_table, g_strdup("prpl-aim"),
+- g_strdup("*** Encrypted with the Gaim-Encryption plugin <A HREF=\""));
++ g_strdup("--- Encrypted with the Gaim-Encryption plugin <A HREF=\""));
+ g_hash_table_insert(footer_table, g_strdup("prpl-aim"),
+ g_strdup("\"></A>"));
+ g_hash_table_insert(notify_table, g_strdup("prpl-aim"),
+@@ -1136,7 +1136,7 @@ static void PE_headers_init() {
+
+ /* If jabber stops stripping HTML, we can go back to these headers */
+ /* g_hash_table_insert(header_table, g_strdup("prpl-jabber"), */
+-/* g_strdup("*** Encrypted with the Gaim-Encryption plugin <A HREF='")); */
++/* g_strdup("--- Encrypted with the Gaim-Encryption plugin <A HREF='")); */
+ /* g_hash_table_insert(footer_table, g_strdup("prpl-jabber"), */
+ /* g_strdup("'></A>")); */
+ /* g_hash_table_insert(notify_table, g_strdup("prpl-jabber"), */
+@@ -1144,22 +1144,22 @@ static void PE_headers_init() {
+
+
+ g_hash_table_insert(header_table, g_strdup("prpl-jabber"),
+- g_strdup("*** Encrypted with the Gaim-Encryption plugin "));
++ g_strdup("--- Encrypted with the Gaim-Encryption plugin "));
+ g_hash_table_insert(footer_table, g_strdup("prpl-jabber"),
+ g_strdup(" "));
+ g_hash_table_insert(notify_table, g_strdup("prpl-jabber"),
+ g_strdup("<A HREF='Gaim-Encryption Capable'> </A>"));
+
+- header_default = g_strdup("*** Encrypted :");
++ header_default = g_strdup("--- Encrypted :");
+ }
+
+-/* #define CRYPT_HEADER "*** Encrypted with the Gaim-Encryption plugin <A HREF=\"" */
++/* #define CRYPT_HEADER "--- Encrypted with the Gaim-Encryption plugin <A HREF=\"" */
+ /* #define CRYPT_FOOTER "\"></A>" */
+ /* #define CRYPT_NOTIFY_HEADER "<A HREF=\"Gaim-Encryption Capable\"></A>" */
+
+ // Jabber seems to turn our double quotes into single quotes at times, so define
+ // the same headers, only with single quotes. Lengths MUST be the same as above
+-/* #define CRYPT_HEADER_MANGLED "*** Encrypted with the Gaim-Encryption plugin <A HREF='" */
++/* #define CRYPT_HEADER_MANGLED "--- Encrypted with the Gaim-Encryption plugin <A HREF='" */
+ /* #define CRYPT_NOTIFY_HEADER_MANGLED "<A HREF='Gaim-Encryption Capable'></A>" */
+
+
+
Copied: pidgin-encryption/repos/extra-i686/log_crash.patch (from rev 62149, pidgin-encryption/trunk/log_crash.patch)
===================================================================
--- extra-i686/log_crash.patch (rev 0)
+++ extra-i686/log_crash.patch 2010-01-03 17:49:48 UTC (rev 62150)
@@ -0,0 +1,11 @@
+--- pidgin-encryption-3.0.orig/state_ui.c 2007-05-07 02:15:27.000000000 +0200
++++ pidgin-encryption-3.0.new/state_ui.c 2009-04-26 17:08:02.000000000 +0200
+@@ -268,6 +268,8 @@
+ static GtkIMHtmlSmiley * create_smiley_if_absent(GtkIMHtml *imhtml) {
+ GtkIMHtmlSmiley * smiley;
+ const char* category = gtk_imhtml_get_protocol_name(imhtml);
++
++ if (!category) return NULL;
+
+ /* make sure that the category we're about to use to add (based on the protocol name) */
+ /* already exists. If it doesn't, just use the default category so it isn't created. */
More information about the arch-commits
mailing list