[pkgsrc/trunk]: pkgsrc/chat/silc-client Add patch from Patrik Weiskircher <pa...

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/91a3f12d27e9
branches:  trunk
changeset: 499267:91a3f12d27e9
user:      salo <salo%pkgsrc.org@localhost>
date:      Sat Sep 17 17:06:27 2005 +0000

description:
Add patch from Patrik Weiskircher <pat at silcnet dot org>:

- wait for user input after writing error messages on client start, irssi
  redraws the screen on exit.

Bump PKGREVISION.
Addresses PR pkg/31185

diffstat:

 chat/silc-client/Makefile         |    3 +-
 chat/silc-client/distinfo         |    3 +-
 chat/silc-client/patches/patch-ad |  137 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 141 insertions(+), 2 deletions(-)

diffs (168 lines):

diff -r cb3e4dc9e105 -r 91a3f12d27e9 chat/silc-client/Makefile
--- a/chat/silc-client/Makefile Sat Sep 17 17:06:19 2005 +0000
+++ b/chat/silc-client/Makefile Sat Sep 17 17:06:27 2005 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2005/05/22 20:07:43 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2005/09/17 17:06:27 salo Exp $
 #
 
 DISTNAME=              ${SILC_CLIENT_DISTNAME}
+PKGREVISION=           1
 CATEGORIES=            chat security
 MASTER_SITES=          http://www.silcnet.org/download/client/sources/ \
                        ftp://ftp.silcnet.org/silc/client/sources/ \
diff -r cb3e4dc9e105 -r 91a3f12d27e9 chat/silc-client/distinfo
--- a/chat/silc-client/distinfo Sat Sep 17 17:06:19 2005 +0000
+++ b/chat/silc-client/distinfo Sat Sep 17 17:06:27 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2005/04/08 15:12:48 salo Exp $
+$NetBSD: distinfo,v 1.30 2005/09/17 17:06:27 salo Exp $
 
 SHA1 (silc-client-1.0.2.tar.bz2) = 9ba36cfde614a9d1db742d3ff50bea6395359226
 RMD160 (silc-client-1.0.2.tar.bz2) = 8d4ca317b455f74782706e9dd685a0f707a5603b
@@ -6,3 +6,4 @@
 SHA1 (patch-aa) = b9ae5da26840b193d3c9484c975af89294fa8049
 SHA1 (patch-ab) = fffda0e4c9a9227c1eb8d8646a02ce9ec5cdefef
 SHA1 (patch-ac) = f319907521b5d1caecfa47ac6e6239979370ea52
+SHA1 (patch-ad) = 18386dbee498403865c1c1f3c1cd995bc6efc1f7
diff -r cb3e4dc9e105 -r 91a3f12d27e9 chat/silc-client/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/silc-client/patches/patch-ad Sat Sep 17 17:06:27 2005 +0000
@@ -0,0 +1,137 @@
+$NetBSD: patch-ad,v 1.3 2005/09/17 17:06:27 salo Exp $
+
+--- irssi/src/silc/core/silc-core.c.orig       2005-03-15 10:39:21.000000000 +0100
++++ irssi/src/silc/core/silc-core.c    2005-09-17 18:33:41.000000000 +0200
+@@ -57,6 +57,12 @@
+ void silc_lag_init(void);
+ void silc_lag_deinit(void);
+ 
++void silc_exit(int errorcode) {
++      printf("Press <Enter> to exit...\n");
++      getchar();
++      exit(errorcode);
++}
++
+ static int my_silc_scheduler(void)
+ {
+   silc_client_run_one(silc_client);
+@@ -205,7 +211,7 @@
+     
+     if (!silc_cipher_is_supported(cipher)) {
+       SILC_LOG_ERROR(("Unknown cipher `%s'", cipher));
+-      exit(1);
++      silc_exit(1);
+     }
+   }
+ 
+@@ -226,7 +232,7 @@
+     
+     if (!silc_hash_is_supported(hash)) {
+       SILC_LOG_ERROR(("Unknown hash function `%s'", hash));
+-      exit(1);
++      silc_exit(1);
+     }
+   }
+ 
+@@ -247,7 +253,7 @@
+     
+     if (!silc_hmac_is_supported(hmac)) {
+       SILC_LOG_ERROR(("Unknown HMAC `%s'", hmac));
+-      exit(1);
++      silc_exit(1);
+     }
+   }
+ 
+@@ -275,25 +281,25 @@
+   if (strcmp(opt->longName, "list-ciphers") == 0) {
+     silc_cipher_register_default();
+     silc_client_list_ciphers();
+-    exit(0);
++    silc_exit(0);
+   }
+ 
+   if (strcmp(opt->longName, "list-hash-funcs") == 0) {
+     silc_hash_register_default();
+     silc_client_list_hash_funcs();
+-    exit(0);
++    silc_exit(0);
+   }
+ 
+   if (strcmp(opt->longName, "list-hmacs") == 0) {
+     silc_hmac_register_default();
+     silc_client_list_hmacs();
+-    exit(0);
++    silc_exit(0);
+   }
+ 
+   if (strcmp(opt->longName, "list-pkcs") == 0) {
+     silc_pkcs_register_default();
+     silc_client_list_pkcs();
+-    exit(0);
++    silc_exit(0);
+   }
+ 
+   if (strcmp(opt->longName, "debug") == 0) {
+@@ -316,7 +322,7 @@
+     silc_hmac_register_default();
+     silc_create_key_pair(opt_pkcs, opt_bits, NULL, NULL, NULL,
+                        NULL, NULL, NULL, NULL, TRUE);
+-    exit(0);
++    silc_exit(0);
+   }
+ 
+   if (strcmp(opt->longName, "passphrase-change") == 0) {
+@@ -326,7 +332,7 @@
+     silc_hash_register_default();
+     silc_hmac_register_default();
+     silc_change_private_key_passphrase(arg, NULL, NULL);
+-    exit(0);
++    silc_exit(0);
+   }
+ 
+   if (strcmp(opt->longName, "show-key") == 0) {
+@@ -336,7 +342,7 @@
+     silc_hash_register_default();
+     silc_hmac_register_default();
+     silc_show_public_key((char *)arg);
+-    exit(0);
++    silc_exit(0);
+   }
+ }
+ 
+@@ -344,15 +350,20 @@
+ {
+   /* Check ~/.silc directory and public and private keys */
+   if (!silc_client_check_silc_dir())
+-    exit(1);
++    silc_exit(1);
+ 
+   /* Load public and private key */
+   if (!silc_client_load_keys(silc_client))
+-    exit(1);
++    silc_exit(1);
+ 
+   /* Initialize the SILC client */
+   if (!silc_client_init(silc_client))
+-    exit(1);
++    silc_exit(1);
++
++  silc_log_set_callback(SILC_LOG_INFO, silc_log_misc, NULL);
++  silc_log_set_callback(SILC_LOG_WARNING, silc_log_misc, NULL);
++  silc_log_set_callback(SILC_LOG_ERROR, silc_log_misc, NULL);
++  silc_log_set_callback(SILC_LOG_FATAL, silc_log_misc, NULL);
+ 
+   /* register SILC scheduler */
+   idletag = g_timeout_add(5, (GSourceFunc) my_silc_scheduler, NULL);
+@@ -461,11 +472,6 @@
+   silc_client->hostname = silc_net_localhost();
+   silc_client->realname = g_strdup(settings_get_str("real_name"));
+ 
+-  silc_log_set_callback(SILC_LOG_INFO, silc_log_misc, NULL);
+-  silc_log_set_callback(SILC_LOG_WARNING, silc_log_misc, NULL);
+-  silc_log_set_callback(SILC_LOG_ERROR, silc_log_misc, NULL);
+-  silc_log_set_callback(SILC_LOG_FATAL, silc_log_misc, NULL);
+-
+   /* Register SILC to the irssi */
+   rec = g_new0(CHAT_PROTOCOL_REC, 1);
+   rec->name = "SILC";