Hello community, here is the log from the commit of package irssi for openSUSE:Factory checked in at 2013-09-27 17:37:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/irssi (Old) and /work/SRC/openSUSE:Factory/.irssi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "irssi" Changes: -------- --- /work/SRC/openSUSE:Factory/irssi/irssi.changes 2013-09-07 12:32:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.irssi.new/irssi.changes 2013-09-27 17:37:35.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Sep 26 12:38:58 UTC 2013 - [email protected] + +- irssi-0.8.15-ssl-passphrase.patch + Fix prompt breakage following SSL certificate passphrase prompt; + (bnc#842532). + +------------------------------------------------------------------- New: ---- irssi-0.8.15-ssl-passphrase.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ irssi.spec ++++++ --- /var/tmp/diff_new_pack.5NF4Wm/_old 2013-09-27 17:37:36.000000000 +0200 +++ /var/tmp/diff_new_pack.5NF4Wm/_new 2013-09-27 17:37:36.000000000 +0200 @@ -45,6 +45,8 @@ Source2: irssi.png Source99: irssi-rpmlintrc Patch: irssi-0.8.15_ssl_proxy.patch +# PATCH-FIX-OPENSUSE irssi-0.8.15-ssl-passphrase.patch bnc#842532 +Patch1: irssi-0.8.15-ssl-passphrase.patch # Summary: Modular, Secure, and Well Designed IRC Client License: GPL-2.0+ @@ -92,6 +94,7 @@ %prep %setup -q #patch +%patch1 -p1 %build # cp curses.m4 acinclude.m4 ++++++ irssi-0.8.15-ssl-passphrase.patch ++++++ From: http://bugs.irssi.org/index.php?do=details&task_id=305 -> http://bugs.irssi.org/index.php?getfile=298 Redraw logic removed. Index: irssi-0.8.15/src/core/network-openssl.c =================================================================== --- irssi-0.8.15.orig/src/core/network-openssl.c +++ irssi-0.8.15/src/core/network-openssl.c @@ -374,6 +374,16 @@ static GIOFuncs irssi_ssl_channel_funcs irssi_ssl_get_flags }; +static int getpass_cb(char *buf, int size, int rwflag, void *keyname) +{ + char *pp, prompt[256]; + snprintf(prompt, 256, "Enter PEM pass phrase:"); // for %s:", keyname); + pp = getpass(prompt); + strncpy(buf, pp, size); + buf[size - 1] = '\0'; + return(strlen(buf)); +} + static gboolean irssi_ssl_init(void) { SSL_library_init(); @@ -412,6 +422,8 @@ static GIOChannel *irssi_ssl_get_iochann scert = convert_home(mycert); if (mypkey && *mypkey) spkey = convert_home(mypkey); + SSL_CTX_set_default_passwd_cb(ctx, getpass_cb); + SSL_CTX_set_default_passwd_cb_userdata(ctx, spkey); if (! SSL_CTX_use_certificate_file(ctx, scert, SSL_FILETYPE_PEM)) g_warning("Loading of client certificate '%s' failed", mycert); else if (! SSL_CTX_use_PrivateKey_file(ctx, spkey ? spkey : scert, SSL_FILETYPE_PEM)) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
