Mailinglist Archive: opensuse-commit (1301 mails)

< Previous Next >
commit xchat
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Tue, 10 Jul 2007 19:15:33 +0200
  • Message-id: <20070710171533.4D07B678186@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package xchat
checked in at Tue Jul 10 19:15:33 CEST 2007.

--------
--- GNOME/xchat/xchat.changes   2007-07-04 11:23:33.000000000 +0200
+++ /mounts/work_src_done/STABLE/xchat/xchat.changes    2007-07-09 15:21:31.553929000 +0200
@@ -1,0 +2,8 @@
+Mon Jul  9 14:47:20 CEST 2007 - bwalle@xxxxxxx
+
+- added patches from wrosenauer:
+  o xchat-desktop-launch.patch: don't remove URL handler menu item
+  o browser.patch: mozilla doesn't exist anymore -> seamonkey
+  o SSL support for encrypted RSA keys
+
+-------------------------------------------------------------------

New:
----
  browser.patch
  xchat-ssl.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ xchat.spec ++++++
--- /var/tmp/diff_new_pack.MzG616/_old  2007-07-10 19:15:23.000000000 +0200
+++ /var/tmp/diff_new_pack.MzG616/_new  2007-07-10 19:15:23.000000000 +0200
@@ -16,12 +16,14 @@
 Group:          Productivity/Networking/IRC
 Summary:        An IRC Client
 Version:        2.8.4
-Release:        1
+Release:        3
 Source:         http://xchat.org/files/source/2.4/%name-%version.tar.bz2
 Patch:          %name-gettext.diff
 Patch1:         %name-tabs_outgoing_msg.patch
 Patch2:         %name-automake-foreign.diff
 Patch3:         %name-susefont.diff
+Patch4:         %name-ssl.patch
+Patch5:         browser.patch
 Patch6:         xchat-no-versionscript.patch
 Patch7:         xchat-desktop-launch.patch
 Patch8:         fixme.diff
@@ -52,8 +54,10 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4
+%patch5
 %patch6 -p1
-%patch7 -p1
+%patch7
 %patch8 -p1
 %patch9 -p1
 %patch10
@@ -103,6 +107,11 @@
 %{_datadir}/dbus-1/services/org.xchat.service.service
 
 %changelog
+* Mon Jul 09 2007 - bwalle@xxxxxxx
+- added patches from wrosenauer:
+  o xchat-desktop-launch.patch: don't remove URL handler menu item
+  o browser.patch: mozilla doesn't exist anymore -> seamonkey
+  o SSL support for encrypted RSA keys
 * Wed Jul 04 2007 - bwalle@xxxxxxx
 - update to 2.8.4
   o added ability to move the tree and userlist

++++++ browser.patch ++++++
--- src/fe-gtk/fe-gtk.c.orig    2007-02-20 13:22:15.000000000 +0100
+++ src/fe-gtk/fe-gtk.c 2007-02-20 13:22:37.000000000 +0100
@@ -943,7 +943,7 @@ fe_open_url_locale (const char *url)
                return;
 
        /* fresh out of ideas... */
-       try_browser ("mozilla", NULL, url);
+       try_browser ("seamonkey", NULL, url);
 #endif
 }
 
++++++ xchat-desktop-launch.patch ++++++
--- /var/tmp/diff_new_pack.MzG616/_old  2007-07-10 19:15:24.000000000 +0200
+++ /var/tmp/diff_new_pack.MzG616/_new  2007-07-10 19:15:24.000000000 +0200
@@ -1,11 +1,6 @@
----
- src/fe-gtk/maingui.c |   22 ++++++++++++++++++++++
- src/fe-gtk/menu.c    |    6 ++++++
- 2 files changed, 28 insertions(+)
-
---- a/src/fe-gtk/maingui.c
-+++ b/src/fe-gtk/maingui.c
-@@ -2252,6 +2252,7 @@ mg_word_check (GtkWidget * xtext, char *
+--- src/fe-gtk/maingui.c
++++ src/fe-gtk/maingui.c
+@@ -2018,6 +2018,7 @@
  static void
  mg_word_clicked (GtkWidget *xtext, char *word, GdkEventButton *even)
  {
@@ -13,7 +8,7 @@
        session *sess = current_sess;
  
        if (even->button == 1)                       /* left button */
-@@ -2268,7 +2269,18 @@ mg_word_clicked (GtkWidget *xtext, char 
+@@ -2034,7 +2035,18 @@
                        {
                        case WORD_URL:
                        case WORD_HOST:
@@ -32,7 +27,7 @@
                        }
                }
                return;
-@@ -2290,7 +2302,17 @@ mg_word_clicked (GtkWidget *xtext, char 
+@@ -2056,7 +2068,17 @@
                break;
        case WORD_URL:
        case WORD_HOST:
@@ -49,40 +44,4 @@
 +                      g_free (free_word);
                break;
        case WORD_NICK:
-               menu_nickmenu (sess, even, (word[0]=='@' || word[0]=='+' || word[0]=='%') ?
---- a/src/fe-gtk/menu.c
-+++ b/src/fe-gtk/menu.c
-@@ -44,6 +44,8 @@
- #include <gtk/gtkversion.h>
- #include <gdk/gdkkeysyms.h>

-+#include <gtk/gtkclipboard.h>
-+
- #include "../common/xchat.h"
- #include "../common/xchatc.h"
- #include "../common/cfgfiles.h"
-@@ -1241,12 +1243,14 @@ menu_rpopup (void)
-                                                        "replace.conf", 0);
- }

-+#if 0
- static void
- menu_urlhandlers (void)
- {
-       editlist_gui_open (NULL, NULL, urlhandler_list, _("XChat: URL Handlers"), "urlhandlers",
-                                                        "urlhandlers.conf", url_help);
- }
-+#endif

- static void
- menu_evtpopup (void)
-@@ -1448,7 +1452,9 @@ static struct mymenu mymenu[] = {
-               {N_("Dialog Buttons..."), menu_dlgbuttons, 0, M_MENUITEM, 0, 0, 1},
-               {N_("Keyboard Shortcuts..."), menu_keypopup, 0, M_MENUITEM, 0, 0, 1},
-               {N_("Text Events..."), menu_evtpopup, 0, M_MENUITEM, 0, 0, 1},
-+#if 0
-               {N_("URL Handlers..."), menu_urlhandlers, 0, M_MENUITEM, 0, 0, 1},
-+#endif
-               {N_("User Commands..."), menu_usercommands, 0, M_MENUITEM, 0, 0, 1},
-               {N_("Userlist Buttons..."), menu_ulbuttons, 0, M_MENUITEM, 0, 0, 1},
-               {N_("Userlist Popup..."), menu_ulpopup, 0, M_MENUITEM, 0, 0, 1},
+               menu_nickmenu (sess, even, (word[0]=='@' || word[0]=='+') ?

++++++ xchat-ssl.patch ++++++
diff -uprN src.old/fe-gtk/fe-gtk.h src/fe-gtk/fe-gtk.h
--- src.old/fe-gtk/fe-gtk.h     2006-04-20 09:33:40.000000000 +0200
+++ src/fe-gtk/fe-gtk.h 2006-09-14 23:43:34.000000000 +0200
@@ -43,6 +43,9 @@ struct server_gui
        GtkWidget *rawlog_window;
        GtkWidget *rawlog_textlist;
 
+       /* passphrase dialog */
+       GtkWidget *passphrase_win;
+
        /* join dialog */
        GtkWidget *joind_win;
        GtkWidget *joind_entry;
diff -uprN src.old/fe-gtk/passphrase.c src/fe-gtk/passphrase.c
--- src.old/fe-gtk/passphrase.c 1970-01-01 01:00:00.000000000 +0100
+++ src/fe-gtk/passphrase.c     2006-09-15 00:03:38.000000000 +0200
@@ -0,0 +1,69 @@
+/* X-Chat
+ * Passphrase dialog
+ * Copyright (C) 2006 Wolfgang Rosenauer.
+ *
+ * This program 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.
+ *
+ * This program 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 this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <gtk/gtk.h>
+#include "../common/xchat.h"
+#include "../common/xchatc.h"
+#include "../common/server.h"
+#include "fe-gtk.h"
+
+
+static void 
+accept_passphrase_cb (GtkWidget *IGNORED, GtkDialog *dialog) 
+{
+   gtk_dialog_response (dialog, GTK_RESPONSE_ACCEPT);
+}
+
+
+char *
+passphrase_dialog (server *serv)
+{
+    GtkWidget *dialog;
+    GtkWidget *entry;
+    char *res = NULL;
+    
+    serv->gui->passphrase_win = dialog = gtk_dialog_new_with_buttons(
+                                         "Passphrase",
+                                         NULL,
+                                         GTK_DIALOG_NO_SEPARATOR,
+                                         GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+                                         GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
+                                         NULL);
+    
+    gtk_window_set_position (GTK_WINDOW(dialog), GTK_WIN_POS_MOUSE);
+    gtk_container_set_border_width (GTK_CONTAINER (dialog), 10);
+
+    /* passphrase field */
+    entry = gtk_entry_new();
+    gtk_entry_set_max_length (GTK_ENTRY(entry), 255);
+    gtk_entry_set_visibility (GTK_ENTRY(entry), FALSE);
+    gtk_signal_connect(GTK_OBJECT(entry), "activate", 
+                      G_CALLBACK(accept_passphrase_cb), 
+                      dialog);
+   
+    /* show all */
+    gtk_container_add (GTK_CONTAINER (GTK_DIALOG(dialog)->vbox), entry);
+    gtk_widget_show_all (dialog);
+
+    if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
+          res = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
+    gtk_widget_destroy (dialog);
+    serv->gui->passphrase_win = NULL;
+    return res;
+}
diff -uprN src.old/fe-gtk/passphrase.h src/fe-gtk/passphrase.h
--- src.old/fe-gtk/passphrase.h 1970-01-01 01:00:00.000000000 +0100
+++ src/fe-gtk/passphrase.h     2006-09-14 23:53:43.000000000 +0200
@@ -0,0 +1,3 @@
+
+
+char *passphrase_dialog (server *serv);
--- src/common/server.c.orig    2006-11-15 07:18:36.000000000 +0100
+++ src/common/server.c 2006-11-15 07:19:52.000000000 +0100
@@ -60,6 +60,7 @@
 #include <openssl/ssl.h>           /* SSL_() */
 #include <openssl/err.h>           /* ERR_() */
 #include "ssl.h"
+#include "../fe-gtk/passphrase.h"
 #endif
 
 #ifdef USE_MSPROXY
@@ -84,6 +85,18 @@
 static int server_cleanup (server * serv);
 static void server_connect (server *serv, char *hostname, int port, int no_login);
 
+#ifdef USE_OPENSSL
+static int
+pem_passwd_cb (char *buf, int size, int rwflag, void *userdata)
+{
+   char *passwd = NULL;
+   server *serv = userdata;
+   passwd = passphrase_dialog(serv);
+   if (passwd) { strncpy(buf, passwd, size);
+   buf[size - 1] = '\0';
+   return (strlen(buf)); } else return 0;
+}
+#endif
 
 /* actually send to the socket. This might do a character translation or
    send via SSL */
@@ -1659,6 +1672,8 @@
        {
                char cert_file[256];
 
+               SSL_CTX_set_default_passwd_cb(ctx, pem_passwd_cb);
+               SSL_CTX_set_default_passwd_cb_userdata(ctx, serv);
                snprintf (cert_file, sizeof (cert_file), "%s/%s.pem",
                                         get_xdir_fs (), server_get_network (serv, TRUE));
                if (SSL_CTX_use_certificate_file (ctx, cert_file, SSL_FILETYPE_PEM) == 1)
--- src/fe-gtk/Makefile.am.orig 2007-01-30 08:00:20.000000000 +0100
+++ src/fe-gtk/Makefile.am      2007-01-30 08:00:50.000000000 +0100
@@ -29,4 +29,4 @@
        dccgui.c editlist.c fe-gtk.c fkeys.c gtkutil.c ignoregui.c joind.c menu.c \
        maingui.c $(mmx_cmod_S) notifygui.c palette.c pixmaps.c plugin-tray.c $(plugingui_c) \
        rawlog.c search.c servlistgui.c setup.c $(sexy_spell_entry_c) textgui.c \
-       urlgrab.c userlistgui.c xtext.c
+       urlgrab.c userlistgui.c xtext.c passphrase.c

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread