diff options
author | salo <salo> | 2007-05-18 21:04:25 +0000 |
---|---|---|
committer | salo <salo> | 2007-05-18 21:04:25 +0000 |
commit | 7371db921a9f0b32ba99e49bcd48f3d4bfc4faae (patch) | |
tree | bdbb1af23f24911fc84d6784db23d6be4dd89367 | |
parent | 15e696e9547d52b0cc94acb1fbd057dd1301fd04 (diff) | |
download | pkgsrc-7371db921a9f0b32ba99e49bcd48f3d4bfc4faae.tar.gz |
Update to version 1.0.4.1
Addresses PR pkg/36355
Changes:
1.0.4.1:
========
o Fix a segfault when joining an unknown channel
1.0.4:
======
- Update Makefiles so parallel make is possible
- Include scripts from the SILC Plugin for automatically signing all
messages
- Use known passwords when joining password protected channels
1.0.3:
======
- empty realname and hostname is permitted again (and the user gets to
see the error message if something goes wrong)
- various small fixes
-rw-r--r-- | chat/silc-client/Makefile | 10 | ||||
-rw-r--r-- | chat/silc-client/Makefile.common | 4 | ||||
-rw-r--r-- | chat/silc-client/PLIST | 3 | ||||
-rw-r--r-- | chat/silc-client/PLIST.perl | 3 | ||||
-rw-r--r-- | chat/silc-client/distinfo | 16 | ||||
-rw-r--r-- | chat/silc-client/patches/patch-aa | 54 | ||||
-rw-r--r-- | chat/silc-client/patches/patch-ab | 10 | ||||
-rw-r--r-- | chat/silc-client/patches/patch-ac | 26 | ||||
-rw-r--r-- | chat/silc-client/patches/patch-ad | 159 |
9 files changed, 73 insertions, 212 deletions
diff --git a/chat/silc-client/Makefile b/chat/silc-client/Makefile index 470735fe5d9..bca76101a67 100644 --- a/chat/silc-client/Makefile +++ b/chat/silc-client/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.46 2007/02/22 19:26:12 wiz Exp $ +# $NetBSD: Makefile,v 1.47 2007/05/18 21:04:25 salo Exp $ # DISTNAME= ${SILC_CLIENT_DISTNAME} -PKGREVISION= 2 CATEGORIES= chat security MASTER_SITES= http://www.silcnet.org/download/client/sources/ \ ftp://ftp.silcnet.org/silc/client/sources/ \ @@ -37,6 +36,7 @@ CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --with-simdir=${PREFIX}/lib/${PKGBASE}/modules CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_DIR:Q} CONFIGURE_ARGS+= --with-terminfo +CONFIGURE_ARGS+= --enable-shared CONFIGURE_ARGS+= --without-libtoolfix .include "../../mk/bsd.prefs.mk" @@ -62,11 +62,11 @@ CONFIGURE_ARGS+= --disable-asm PLIST_SRC+= ${PKGDIR}/PLIST post-install: - ${INSTALL_DATA} ${WRKSRC}/irssi/config.h ${SILC_CLIENT_CONFIG_H} - ${INSTALL_DATA} ${WRKSRC}/irssi/irssi-config ${SILC_CLIENT_CONFIG} + ${INSTALL_DATA} ${WRKSRC}/apps/irssi/config.h ${SILC_CLIENT_CONFIG_H} + ${INSTALL_DATA} ${WRKSRC}/apps/irssi/irssi-config ${SILC_CLIENT_CONFIG} .if !empty(PKG_OPTIONS:Mperl) ${INSTALL_DATA_DIR} ${PREFIX}/libexec/${PKGBASE}/scripts - ${INSTALL_DATA} ${WRKSRC}/irssi/scripts/*.pl \ + ${INSTALL_DATA} ${WRKSRC}/apps/irssi/scripts/*.pl \ ${PREFIX}/libexec/${PKGBASE}/scripts # Create PLIST fragment for Perl modules. # diff --git a/chat/silc-client/Makefile.common b/chat/silc-client/Makefile.common index 9d359fcfcdf..7f7e58ad547 100644 --- a/chat/silc-client/Makefile.common +++ b/chat/silc-client/Makefile.common @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.9 2005/04/08 15:12:48 salo Exp $ +# $NetBSD: Makefile.common,v 1.10 2007/05/18 21:04:25 salo Exp $ # # Distribution specific information. # -SILC_CLIENT_VERSION= 1.0.2 +SILC_CLIENT_VERSION= 1.0.4.1 SILC_CLIENT_DISTNAME= silc-client-${SILC_CLIENT_VERSION} SILC_CLIENT_EXTRACT_SUFX= .tar.bz2 SILC_CLIENT_DISTFILE= ${SILC_CLIENT_DISTNAME}${SILC_CLIENT_EXTRACT_SUFX} diff --git a/chat/silc-client/PLIST b/chat/silc-client/PLIST index bb996c80f48..bf030e5f629 100644 --- a/chat/silc-client/PLIST +++ b/chat/silc-client/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.21 2004/09/22 08:09:20 jlam Exp $ +@comment $NetBSD: PLIST,v 1.22 2007/05/18 21:04:25 salo Exp $ bin/silc lib/silc-client/libsilc.la lib/silc-client/libsilcclient.la @@ -15,7 +15,6 @@ man/man1/silc.1 share/doc/silc-client/CHANGES share/doc/silc-client/COPYING share/doc/silc-client/CREDITS -share/doc/silc-client/CodingStyle share/doc/silc-client/FAQ share/doc/silc-client/INSTALL share/doc/silc-client/README diff --git a/chat/silc-client/PLIST.perl b/chat/silc-client/PLIST.perl index 74982a5769e..02365feba66 100644 --- a/chat/silc-client/PLIST.perl +++ b/chat/silc-client/PLIST.perl @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.perl,v 1.5 2004/06/06 11:45:06 salo Exp $ +@comment $NetBSD: PLIST.perl,v 1.6 2007/05/18 21:04:25 salo Exp $ libexec/silc-client/scripts/autoop.pl libexec/silc-client/scripts/beep.pl libexec/silc-client/scripts/clones.pl @@ -7,5 +7,6 @@ libexec/silc-client/scripts/hello.pl libexec/silc-client/scripts/mail-maildir.pl libexec/silc-client/scripts/mail.pl libexec/silc-client/scripts/silc-mime.pl +libexec/silc-client/scripts/silc.pl @dirrm libexec/silc-client/scripts @dirrm libexec/silc-client diff --git a/chat/silc-client/distinfo b/chat/silc-client/distinfo index f72ec0cdbd3..0c0527d70ae 100644 --- a/chat/silc-client/distinfo +++ b/chat/silc-client/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.30 2005/09/17 17:06:27 salo Exp $ +$NetBSD: distinfo,v 1.31 2007/05/18 21:04:25 salo Exp $ -SHA1 (silc-client-1.0.2.tar.bz2) = 9ba36cfde614a9d1db742d3ff50bea6395359226 -RMD160 (silc-client-1.0.2.tar.bz2) = 8d4ca317b455f74782706e9dd685a0f707a5603b -Size (silc-client-1.0.2.tar.bz2) = 1696581 bytes -SHA1 (patch-aa) = b9ae5da26840b193d3c9484c975af89294fa8049 -SHA1 (patch-ab) = fffda0e4c9a9227c1eb8d8646a02ce9ec5cdefef -SHA1 (patch-ac) = f319907521b5d1caecfa47ac6e6239979370ea52 -SHA1 (patch-ad) = 18386dbee498403865c1c1f3c1cd995bc6efc1f7 +SHA1 (silc-client-1.0.4.1.tar.bz2) = 29d8cd4208db23e997bedf6271fc0dfd0cb84e6c +RMD160 (silc-client-1.0.4.1.tar.bz2) = 46abb8312d37842e20e01f79566460ee486c1bbf +Size (silc-client-1.0.4.1.tar.bz2) = 1445091 bytes +SHA1 (patch-aa) = cbb65b6a6eb312d79b0e1ab5915841ed7730321d +SHA1 (patch-ab) = 41bc37c379be30cab6540a3c30cad3163d30dff0 +SHA1 (patch-ac) = 8267934b89e67c3d3168bb290abcac53b9b17658 +SHA1 (patch-ad) = bd414db383a0c7d9c235523053f4d96c50be8199 diff --git a/chat/silc-client/patches/patch-aa b/chat/silc-client/patches/patch-aa index 7c903c6da24..9c9b00a9f1d 100644 --- a/chat/silc-client/patches/patch-aa +++ b/chat/silc-client/patches/patch-aa @@ -1,38 +1,26 @@ -$NetBSD: patch-aa,v 1.11 2003/10/16 12:34:50 salo Exp $ +$NetBSD: patch-aa,v 1.12 2007/05/18 21:04:25 salo Exp $ ---- Makefile.in.orig 2003-10-15 19:31:17.000000000 +0200 -+++ Makefile.in 2003-10-16 10:14:25.000000000 +0200 -@@ -706,6 +706,7 @@ - -mkdir -p $(docdir) +--- Makefile.in.orig 2006-01-06 14:46:28.000000000 +0100 ++++ Makefile.in 2006-01-08 20:45:25.000000000 +0100 +@@ -763,18 +763,18 @@ - install-dirs-client: install-dirs -+ -mkdir -p $(examplesdir) - -mkdir -p $(helpdir) - -mkdir -p $(mandir)/man1 -@@ -717,7 +718,6 @@ - doc-install: - -$(INSTALL_DATA) $(srcdir)/doc/CodingStyle $(docdir)/ - -$(INSTALL_DATA) $(srcdir)/doc/FAQ $(docdir)/ -- -$(INSTALL_DATA) $(srcdir)/doc/*.txt $(docdir)/ - -$(INSTALL_DATA) $(srcdir)/COPYING $(docdir)/ - -$(INSTALL_DATA) $(srcdir)/CHANGES $(docdir)/ - -$(INSTALL_DATA) $(srcdir)/CREDITS $(docdir)/ -@@ -726,7 +726,7 @@ - -$(INSTALL_DATA) $(srcdir)/TODO $(docdir)/ + @with_irssi_TRUE@install-dirs-client: +-@with_irssi_TRUE@ -mkdir -p $(etcdir) ++@with_irssi_TRUE@ -mkdir -p $(examplesdir) + @with_irssi_TRUE@ -mkdir -p $(helpdir) + @with_irssi_TRUE@ -mkdir -p $(mandir)/man1 - doc-install-client: doc-install -- $(INSTALL_DATA) $(srcdir)/irssi/silc.conf $(docdir)/example_silc.conf -+ $(INSTALL_DATA) $(srcdir)/irssi/silc.conf $(examplesdir)/silc.conf.default - -@if test -f $(srcdir)/doc/silc.1 ; then \ - $(INSTALL_DATA) $(srcdir)/doc/silc.1 $(mandir)/man1; \ - fi -@@ -776,7 +776,7 @@ - $(sbindir)/silcd -C $(etcdir); \ - fi + @with_irssi_TRUE@doc-install-client: +-@with_irssi_TRUE@ $(INSTALL_DATA) $(srcdir)/apps/irssi/silc.conf $(docdir)/example_silc.conf ++@with_irssi_TRUE@ $(INSTALL_DATA) $(srcdir)/apps/irssi/silc.conf $(examplesdir)/silc.conf.default + @with_irssi_TRUE@ -@if test -f $(srcdir)/doc/silc.1 ; then $(INSTALL_DATA) $(srcdir)/doc/silc.1 $(mandir)/man1; fi + + @with_irssi_TRUE@etc-install-client: + @with_irssi_TRUE@ -@if test '!' -d $(srcdir)/apps/irssi ; then if test '!' -f $(etcdir)/silc.conf ; then $(INSTALL_DATA) $(srcdir)/apps/irssi/silc.conf $(etcdir)/silc.conf; fi; fi + +-@with_irssi_TRUE@install-data-hook: install-dirs-client doc-install-client etc-install-client ++@with_irssi_TRUE@install-data-hook: install-dirs-client doc-install-client + + @INCLUDE_DEFINES_INT@ --@SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs-client sim-install doc-install-client etc-install-client -+@SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs-client sim-install doc-install-client - @SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_TRUE@install-data-hook: install-dirs-client install-dirs-server sim-install doc-install-client doc-install-server toolkit-install examples-install etc-install-client etc-install-server - @SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_FALSE@install-data-hook: install-dirs-server sim-install doc-install-server examples-install etc-install-server generate-server-key - # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/chat/silc-client/patches/patch-ab b/chat/silc-client/patches/patch-ab index 89112b2eb24..a27b00cc32e 100644 --- a/chat/silc-client/patches/patch-ab +++ b/chat/silc-client/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.11 2004/06/06 11:45:06 salo Exp $ +$NetBSD: patch-ab,v 1.12 2007/05/18 21:04:25 salo Exp $ ---- irssi/Makefile.in.orig 2004-01-14 14:29:02.000000000 +0100 -+++ irssi/Makefile.in 2004-06-05 14:36:55.000000000 +0200 -@@ -258,7 +258,7 @@ +--- apps/irssi/Makefile.in.orig 2007-03-07 19:02:19.000000000 +0000 ++++ apps/irssi/Makefile.in 2007-05-18 20:19:04.000000000 +0000 +@@ -282,7 +282,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ @BUILD_PLUGINS_TRUE@PLUGINS = plugins @BUILD_SERVERTEST_TRUE@SERVERTEST = servertest @@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.11 2004/06/06 11:45:06 salo Exp $ # # INCLUDE defines -@@ -283,7 +283,7 @@ +@@ -297,7 +297,7 @@ INCLUDES = $(ADD_INCLUDES) $(SILC_CFLAGS #confdir = $(sysconfdir) confdir = $(silc_etcdir) conffile = silc.conf diff --git a/chat/silc-client/patches/patch-ac b/chat/silc-client/patches/patch-ac index e1d3426a5cf..2769f08d957 100644 --- a/chat/silc-client/patches/patch-ac +++ b/chat/silc-client/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.8 2005/04/08 15:12:48 salo Exp $ +$NetBSD: patch-ac,v 1.9 2007/05/18 21:04:25 salo Exp $ ---- irssi/src/perl/Makefile.in.orig 2005-04-06 15:04:38.000000000 +0200 -+++ irssi/src/perl/Makefile.in 2005-04-08 16:13:33.000000000 +0200 -@@ -284,7 +284,7 @@ +--- apps/irssi/src/perl/Makefile.in.orig 2006-01-06 14:46:28.000000000 +0100 ++++ apps/irssi/src/perl/Makefile.in 2006-01-08 20:47:56.000000000 +0100 +@@ -281,7 +281,7 @@ -I$(top_srcdir)/src/fe-common/core \ -I$(top_srcdir)/src/fe-common/silc \ $(GLIB_CFLAGS) \ @@ -11,21 +11,3 @@ $NetBSD: patch-ac,v 1.8 2005/04/08 15:12:48 salo Exp $ -DPERL_USE_LIB=\""$(PERL_USE_LIB)"\" \ -DPERL_STATIC_LIBS=$(PERL_STATIC_LIBS) \ $(PERL_CFLAGS) -@@ -707,7 +707,7 @@ - $(top_srcdir)/file2header.sh $(srcdir)/irssi-core.pl irssi_core_code > irssi-core.pl.h - - all-local: -- for dir in "$(perl_dirs)"; do \ -+ for dir in $(perl_dirs); do \ - cd $$dir && \ - if [ ! -f Makefile ]; then \ - $(perlpath) Makefile.PL $(PERL_MM_PARAMS); \ -@@ -717,7 +717,7 @@ - done - - install-exec-local: -- for dir in "$(perl_dirs)"; do \ -+ for dir in $(perl_dirs); do \ - cd $$dir && $(MAKE) install && cd ..; \ - done - diff --git a/chat/silc-client/patches/patch-ad b/chat/silc-client/patches/patch-ad index 8ca75438889..3fdf26ade2c 100644 --- a/chat/silc-client/patches/patch-ad +++ b/chat/silc-client/patches/patch-ad @@ -1,137 +1,28 @@ -$NetBSD: patch-ad,v 1.3 2005/09/17 17:06:27 salo Exp $ +$NetBSD: patch-ad,v 1.4 2007/05/18 21:04:25 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); +--- doc/Makefile.in.orig 2007-03-07 19:02:19.000000000 +0000 ++++ doc/Makefile.in 2007-05-18 20:41:05.000000000 +0000 +@@ -450,15 +450,6 @@ uninstall-am: uninstall-info-am + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am uninstall uninstall-am uninstall-info-am -+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"; +-all: +- touch draft-riikonen-silc-spec-08.txt +- touch draft-riikonen-silc-pp-09.txt +- touch draft-riikonen-silc-ke-auth-08.txt +- touch draft-riikonen-silc-commands-06.txt +- touch draft-riikonen-silc-flags-payloads-04.txt +- touch draft-riikonen-presence-attrs-03.txt +- + dist-hook: + $(SILC_TOP_SRCDIR)/scripts/manpages.pl + rm draft-riikonen*.txt +@@ -472,7 +463,6 @@ dist-hook: + doc-install: + -mkdir -p $(docdir) + -$(INSTALL_DATA) $(top_srcdir)/doc/FAQ $(docdir)/ +- -$(INSTALL_DATA) $(top_srcdir)/doc/*.txt $(docdir)/ + -$(INSTALL_DATA) $(top_srcdir)/COPYING $(docdir)/ + -$(INSTALL_DATA) $(top_srcdir)/CHANGES $(docdir)/ + -$(INSTALL_DATA) $(top_srcdir)/CREDITS $(docdir)/ |