summaryrefslogtreecommitdiff
path: root/chat/silc-client/patches
diff options
context:
space:
mode:
authorsalo <salo@pkgsrc.org>2005-09-17 17:06:27 +0000
committersalo <salo@pkgsrc.org>2005-09-17 17:06:27 +0000
commit80e1b8c4f3717c8f53efc1f5bc099179a3174a37 (patch)
treedb9cc906ed06bc8266d622094bd7213ce170dfd3 /chat/silc-client/patches
parent8b1274c47f2f4da497d7d5863b24422a8f14a441 (diff)
downloadpkgsrc-80e1b8c4f3717c8f53efc1f5bc099179a3174a37.tar.gz
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 (limited to 'chat/silc-client/patches')
-rw-r--r--chat/silc-client/patches/patch-ad137
1 files changed, 137 insertions, 0 deletions
diff --git a/chat/silc-client/patches/patch-ad b/chat/silc-client/patches/patch-ad
new file mode 100644
index 00000000000..8ca75438889
--- /dev/null
+++ b/chat/silc-client/patches/patch-ad
@@ -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";