Here is an update to silc-client 1.1.11.
OK?
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/net/silc-client/Makefile,v
retrieving revision 1.71
diff -u -p -u -p -r1.71 Makefile
--- Makefile 4 Nov 2013 21:50:22 -0000 1.71
+++ Makefile 12 Jul 2014 21:04:07 -0000
@@ -2,9 +2,10 @@
COMMENT= Secure Internet Live Conferencing (SILC) client
-DISTNAME= silc-client-1.1.8
-REVISION= 9
+DISTNAME= silc-client-1.1.11
CATEGORIES= net
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=silc/}
+EXTRACT_SUFX= .tar.bz2
HOMEPAGE= http://www.silcnet.org/
@@ -12,19 +13,12 @@ MAINTAINER= Brad Smith <b...@comstyle.co
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB= c ncurses pcre pthread
-MASTER_SITES= http://ftp.silcnet.org/client/sources/ \
- ftp://ftp.silcnet.org/silc/client/sources/ \
- http://www.planetmirror.com/pub/silcnet/client/sources/ \
-
http://munitions.vipul.net/software/mirrors/silc/client/sources/ \
- ftp://ftp.no.silcnet.org/pub/silc/client/sources/ \
-
http://the.wiretapped.net/security/network-security/silc/client/sources/ \
-
ftp://ftp.wiretapped.net/pub/security/network-security/silc/client/sources/
+WANTLIB= c crypto glib-2.0>=1000 gmodule-2.0>=1000 ncurses pcre pthread \
+ ssl
MODULES= devel/gettext
LIB_DEPENDS+= devel/glib2
-WANTLIB += glib-2.0>=1000 gmodule-2.0>=1000
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
BUILD_DEPENDS+= devel/yasm
@@ -38,12 +32,11 @@ SUBST_VARS= CONFDIR
USE_LIBTOOL= gnu
LIBTOOL_FLAGS= --tag=disable-shared
CONFIGURE_STYLE= autoconf
-AUTOCONF_VERSION= 2.63
+AUTOCONF_VERSION= 2.69
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
CONFIGURE_ENV+= ac_cv_path_NASM=no YASM=${LOCALBASE}/bin/yasm
.endif
-CONFIGURE_ARGS+= --enable-ipv6 \
- --docdir=${PREFIX}/share/doc/silc \
+CONFIGURE_ARGS+= --docdir=${PREFIX}/share/doc/silc \
--sysconfdir=${CONFDIR} \
--with-helpdir=${PREFIX}/share/silc/help \
--with-iconv=${LOCALBASE} \
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/net/silc-client/distinfo,v
retrieving revision 1.30
diff -u -p -u -p -r1.30 distinfo
--- distinfo 1 Aug 2009 12:58:06 -0000 1.30
+++ distinfo 12 Jul 2014 20:26:34 -0000
@@ -1,5 +1,2 @@
-MD5 (silc-client-1.1.8.tar.gz) = F+YxpZ7u8zhA5eAAQ8uH8A==
-RMD160 (silc-client-1.1.8.tar.gz) = rRbMhNNUAWT7j31FdYQS3cam/BU=
-SHA1 (silc-client-1.1.8.tar.gz) = Uf0fItvBzrFcb7GgNOuaCbcu5wg=
-SHA256 (silc-client-1.1.8.tar.gz) =
qsQ15PvjfvGquvy8SrIk4pt20jQ5ynX0xJRdgWTtcdI=
-SIZE (silc-client-1.1.8.tar.gz) = 2007675
+SHA256 (silc-client-1.1.11.tar.bz2) =
Nt/DeC5ZSUM/uLDxrPWZQm+3BlVdNDCVZBpJ26obl40=
+SIZE (silc-client-1.1.11.tar.bz2) = 1863525
Index: patches/patch-apps_irssi_src_fe-common_core_Makefile_in
===================================================================
RCS file:
/home/cvs/ports/net/silc-client/patches/patch-apps_irssi_src_fe-common_core_Makefile_in,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-apps_irssi_src_fe-common_core_Makefile_in
--- patches/patch-apps_irssi_src_fe-common_core_Makefile_in 1 Aug 2009
12:58:06 -0000 1.3
+++ patches/patch-apps_irssi_src_fe-common_core_Makefile_in 12 Jul 2014
20:57:55 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-apps_irssi_src_fe-common_core_Makefile_in,v 1.3 2009/08/01
12:58:06 sthen Exp $
---- apps/irssi/src/fe-common/core/Makefile.in.orig Sat Aug 1 02:53:41 2009
-+++ apps/irssi/src/fe-common/core/Makefile.in Sat Aug 1 05:44:37 2009
-@@ -270,11 +270,11 @@ noinst_LIBRARIES = libfe_common_core.a
+--- apps/irssi/src/fe-common/core/Makefile.in.orig Tue May 13 02:47:22 2014
++++ apps/irssi/src/fe-common/core/Makefile.in Sat Jul 12 16:56:45 2014
+@@ -376,11 +376,11 @@ noinst_LIBRARIES = libfe_common_core.a
#
# INCLUDE defines
#
Index: patches/patch-apps_irssi_src_fe-common_core_fe-common-core_c
===================================================================
RCS file: patches/patch-apps_irssi_src_fe-common_core_fe-common-core_c
diff -N patches/patch-apps_irssi_src_fe-common_core_fe-common-core_c
--- patches/patch-apps_irssi_src_fe-common_core_fe-common-core_c 8 Nov
2007 20:51:23 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
---- apps/irssi/src/fe-common/core/fe-common-core.c.orig Thu Jan 25
13:02:14 2007
-+++ apps/irssi/src/fe-common/core/fe-common-core.c Tue Nov 6 10:48:23 2007
-@@ -176,7 +176,8 @@ void fe_common_core_init(void)
- settings_add_bool("lookandfeel", "use_msgs_window", FALSE);
- #if defined (HAVE_NL_LANGINFO) && defined(CODESET)
- settings_add_str("lookandfeel", "term_charset",
-- *nl_langinfo(CODESET) != '\0' ?
-+ ((*nl_langinfo(CODESET) != '\0') &&
-+ (strcmp(nl_langinfo(CODESET), "646") != 0)) ? /* ASCII
*/
- nl_langinfo(CODESET) : "ISO8859-1");
- #else
- settings_add_str("lookandfeel", "term_charset", "ISO8859-1");
Index: patches/patch-apps_irssi_src_fe-common_core_fe-recode_c
===================================================================
RCS file: patches/patch-apps_irssi_src_fe-common_core_fe-recode_c
diff -N patches/patch-apps_irssi_src_fe-common_core_fe-recode_c
--- patches/patch-apps_irssi_src_fe-common_core_fe-recode_c 8 Nov 2007
20:51:23 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
---- apps/irssi/src/fe-common/core/fe-recode.c.orig Thu Jan 25 13:02:14 2007
-+++ apps/irssi/src/fe-common/core/fe-recode.c Tue Nov 6 10:48:23 2007
-@@ -182,8 +182,8 @@ static void read_settings(void)
- g_free(term_charset);
- #if defined (HAVE_NL_LANGINFO) && defined(CODESET)
- term_charset = is_valid_charset(old_term_charset) ?
g_strdup(old_term_charset) :
-- *nl_langinfo(CODESET) != '\0' ?
g_strdup(nl_langinfo(CODESET)) :
-- "ISO8859-1";
-+ ((*nl_langinfo(CODESET) != '\0') &&
(strcmp(nl_langinfo(CODESET), "646") != 0)) ?
-+ g_strdup(nl_langinfo(CODESET)) : "ISO8859-1";
- #else
- term_charset = is_valid_charset(old_term_charset) ?
g_strdup(old_term_charset) : "ISO8859-1";
- #endif
Index: patches/patch-apps_irssi_src_silc_core_client_ops_c
===================================================================
RCS file: patches/patch-apps_irssi_src_silc_core_client_ops_c
diff -N patches/patch-apps_irssi_src_silc_core_client_ops_c
--- patches/patch-apps_irssi_src_silc_core_client_ops_c 2 Jun 2010 00:10:18
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-apps_irssi_src_silc_core_client_ops_c,v 1.1 2010/06/02
00:10:18 sthen Exp $
---- apps/irssi/src/silc/core/client_ops.c.orig Sat Dec 13 15:30:25 2008
-+++ apps/irssi/src/silc/core/client_ops.c Sat May 29 18:58:33 2010
-@@ -262,10 +262,11 @@ int verify_message_signature(SilcClientEntry sender,
- sizeof(sender->fingerprint));
- if (strcmp(fingerprint, fingerprint2)) {
- /* since the public key differs from the senders public key, the
-- verification _failed_ */
-+ verification won't be done */
- silc_pkcs_public_key_free(pk);
- silc_free(fingerprint);
-- ret = SILC_MSG_SIGNED_UNKNOWN;
-+ silc_free(fingerprint2);
-+ return SILC_MSG_SIGNED_UNKNOWN;
- }
- silc_free(fingerprint2);
- }
Index: patches/patch-configure_ac
===================================================================
RCS file: /home/cvs/ports/net/silc-client/patches/patch-configure_ac,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 patch-configure_ac
--- patches/patch-configure_ac 4 Nov 2013 21:50:22 -0000 1.8
+++ patches/patch-configure_ac 12 Jul 2014 20:57:55 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.8 2013/11/04 21:50:22 brad Exp $
---- configure.ac.orig Sat Aug 1 02:53:41 2009
-+++ configure.ac Sun Aug 21 01:56:13 2011
-@@ -97,9 +97,6 @@ AM_CONDITIONAL(SILC_X86_64, test x$cpu_x86_64 = xtrue)
+--- configure.ac.orig Tue May 13 02:47:22 2014
++++ configure.ac Sat Jul 12 16:56:45 2014
+@@ -100,9 +100,6 @@ AM_CONDITIONAL(SILC_X86_64, test x$cpu_x86_64 = xtrue)
AM_CONDITIONAL(SILC_POWERPC, test x$cpu_ppc = xtrue)
AM_CONDITIONAL(SILC_IA64, test x$cpu_ia64 = xtrue)
@@ -11,7 +11,7 @@ $OpenBSD: patch-configure_ac,v 1.8 2013/
AC_PROG_CC
AC_C_INLINE
AC_C_CONST
-@@ -471,59 +468,9 @@ fi
+@@ -485,59 +482,9 @@ fi
## Compiler and compiler flag checks
##
@@ -73,7 +73,7 @@ $OpenBSD: patch-configure_ac,v 1.8 2013/
#
# Workaround a bug in GCC 2.x which causes memory exhaustion
# when compiling sha1 with optimizations on UltraSPARC.
-@@ -616,8 +563,8 @@ if test -n "$with_silc_includes" || test -n "$with_sil
+@@ -630,8 +577,8 @@ if test -n "$with_silc_includes" || test -n "$with_sil
else
# pkg-config check
@@ -84,7 +84,7 @@ $OpenBSD: patch-configure_ac,v 1.8 2013/
if test x$compile_libs = xfalse; then
LIBSUBDIR=
-@@ -1294,7 +1241,7 @@ fi
+@@ -1314,7 +1261,7 @@ fi
SILC_ADD_CC_FLAGS(SILC_CRYPTO, -fno-regmove)
if test x$summary_debug = xno -a x$want_cc_optimizations = xtrue; then
@@ -93,7 +93,7 @@ $OpenBSD: patch-configure_ac,v 1.8 2013/
fi
AC_SUBST(SILC_CRYPTO_CFLAGS)
-@@ -1330,7 +1277,6 @@ if test x$compile_libs = xtrue; then
+@@ -1350,7 +1297,6 @@ if test x$compile_libs = xtrue; then
AC_MSG_NOTICE([configuring math library])
if test x$want_cc_optimizations = xtrue; then
Index: patches/patch-doc_Makefile_in
===================================================================
RCS file: /home/cvs/ports/net/silc-client/patches/patch-doc_Makefile_in,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-doc_Makefile_in
--- patches/patch-doc_Makefile_in 1 Aug 2009 12:58:06 -0000 1.5
+++ patches/patch-doc_Makefile_in 12 Jul 2014 20:57:55 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-doc_Makefile_in,v 1.5 2009/08/01 12:58:06 sthen Exp $
---- doc/Makefile.in.orig Sat Aug 1 02:53:41 2009
-+++ doc/Makefile.in Sat Aug 1 05:44:37 2009
-@@ -227,7 +227,7 @@ build_vendor = @build_vendor@
+--- doc/Makefile.in.orig Tue May 13 02:47:22 2014
++++ doc/Makefile.in Sat Jul 12 16:56:45 2014
+@@ -299,7 +299,7 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
Index: patches/patch-lib_Makefile_in
===================================================================
RCS file: /home/cvs/ports/net/silc-client/patches/patch-lib_Makefile_in,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 patch-lib_Makefile_in
--- patches/patch-lib_Makefile_in 1 Aug 2009 12:58:06 -0000 1.13
+++ patches/patch-lib_Makefile_in 12 Jul 2014 20:57:57 -0000
@@ -1,11 +1,11 @@
$OpenBSD: patch-lib_Makefile_in,v 1.13 2009/08/01 12:58:06 sthen Exp $
---- lib/Makefile.in.orig Sat Aug 1 02:53:41 2009
-+++ lib/Makefile.in Sat Aug 1 05:44:37 2009
-@@ -583,7 +583,6 @@ install-dvi: install-dvi-recursive
+--- lib/Makefile.in.orig Tue May 13 02:47:22 2014
++++ lib/Makefile.in Sat Jul 12 16:57:49 2014
+@@ -694,7 +694,6 @@ install-dvi-am:
install-exec-am:
@$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
-
install-html: install-html-recursive
+ install-html-am:
Index: patches/patch-lib_silcclient_client_connect_c
===================================================================
RCS file: patches/patch-lib_silcclient_client_connect_c
diff -N patches/patch-lib_silcclient_client_connect_c
--- patches/patch-lib_silcclient_client_connect_c 12 Oct 2009 17:28:11
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-lib_silcclient_client_connect_c,v 1.1 2009/10/12 17:28:11
sthen Exp $
---- lib/silcclient/client_connect.c.orig Mon Oct 12 13:06:36 2009
-+++ lib/silcclient/client_connect.c Mon Oct 12 13:11:08 2009
-@@ -262,6 +262,9 @@ static void silc_client_rekey_completion(SilcSKE ske,
- silc_ske_free(conn->internal->ske);
- conn->internal->ske = NULL;
- silc_fsm_finish(fsm);
-+
-+ /* Close connection */
-+ silc_client_close_connection(client, conn);
- return;
- }
-
Index: patches/patch-lib_silcclient_command_c
===================================================================
RCS file: patches/patch-lib_silcclient_command_c
diff -N patches/patch-lib_silcclient_command_c
--- patches/patch-lib_silcclient_command_c 11 Aug 2009 21:20:02 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,39 +0,0 @@
-$OpenBSD: patch-lib_silcclient_command_c,v 1.1 2009/08/11 21:20:02 sthen Exp $
---- lib/silcclient/command.c.orig Tue Aug 11 15:03:47 2009
-+++ lib/silcclient/command.c Tue Aug 11 15:05:30 2009
-@@ -956,7 +956,7 @@ SILC_FSM_STATE(silc_client_command_topic)
- }
-
- if (client->internal->params->full_channel_names)
-- silc_snprintf(tmp, sizeof(tmp), conn->current_channel->channel_name);
-+ silc_snprintf(tmp, sizeof(tmp), "%s",
conn->current_channel->channel_name);
- else
- silc_snprintf(tmp, sizeof(tmp), "%s%s%s",
- conn->current_channel->channel_name,
-@@ -2144,7 +2144,7 @@ SILC_FSM_STATE(silc_client_command_kick)
- }
-
- if (client->internal->params->full_channel_names)
-- silc_snprintf(tmp, sizeof(tmp), conn->current_channel->channel_name);
-+ silc_snprintf(tmp, sizeof(tmp), "%s",
conn->current_channel->channel_name);
- else
- silc_snprintf(tmp, sizeof(tmp), "%s%s%s",
- conn->current_channel->channel_name,
-@@ -2554,7 +2554,7 @@ SILC_FSM_STATE(silc_client_command_leave)
- }
-
- if (client->internal->params->full_channel_names)
-- silc_snprintf(tmp, sizeof(tmp), conn->current_channel->channel_name);
-+ silc_snprintf(tmp, sizeof(tmp), "%s",
conn->current_channel->channel_name);
- else
- silc_snprintf(tmp, sizeof(tmp), "%s%s%s",
- conn->current_channel->channel_name,
-@@ -2621,7 +2621,7 @@ SILC_FSM_STATE(silc_client_command_users)
- }
-
- if (conn->client->internal->params->full_channel_names)
-- silc_snprintf(tmp, sizeof(tmp), conn->current_channel->channel_name);
-+ silc_snprintf(tmp, sizeof(tmp), "%s",
conn->current_channel->channel_name);
- else
- silc_snprintf(tmp, sizeof(tmp), "%s%s%s",
- conn->current_channel->channel_name,
Index: patches/patch-lib_silccore_silcpacket_c
===================================================================
RCS file: patches/patch-lib_silccore_silcpacket_c
diff -N patches/patch-lib_silccore_silcpacket_c
--- patches/patch-lib_silccore_silcpacket_c 2 Jun 2010 00:10:18 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-lib_silccore_silcpacket_c,v 1.1 2010/06/02 00:10:18 sthen Exp $
---- lib/silccore/silcpacket.c.orig Sat May 29 18:59:19 2010
-+++ lib/silccore/silcpacket.c Sat May 29 19:00:31 2010
-@@ -2231,8 +2231,9 @@ static void silc_packet_read_process(SilcPacketStream
-
- /* Padding sanity checks */
- if (cipher && silc_cipher_get_mode(cipher) != SILC_CIPHER_MODE_CTR &&
-- ((normal && paddedlen % block_len != 0) ||
-- (!normal && silc_packet_special_len(header) % block_len != 0))) {
-+ ((normal && block_len && paddedlen % block_len != 0) ||
-+ (!normal && block_len &&
-+ silc_packet_special_len(header) % block_len != 0))) {
- SILC_LOG_DEBUG(("Packet length %d not multiple by cipher block length",
- paddedlen));
- silc_mutex_unlock(stream->lock);
Index: patches/patch-lib_silcske_silcske_c
===================================================================
RCS file: patches/patch-lib_silcske_silcske_c
diff -N patches/patch-lib_silcske_silcske_c
--- patches/patch-lib_silcske_silcske_c 2 Jun 2010 00:10:18 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-lib_silcske_silcske_c,v 1.1 2010/06/02 00:10:18 sthen Exp $
---- lib/silcske/silcske.c.orig Sat May 29 19:00:50 2010
-+++ lib/silcske/silcske.c Sat May 29 19:01:32 2010
-@@ -2387,6 +2387,8 @@ SILC_FSM_STATE(silc_ske_st_responder_failure)
- ske->packet = NULL;
- }
- ske->status = error;
-+ if (ske->status == SILC_SKE_STATUS_OK)
-+ ske->status = SILC_SKE_STATUS_ERROR;
-
- silc_packet_stream_unlink(ske->stream, &silc_ske_stream_cbs, ske);
- silc_schedule_task_del_by_context(ske->schedule, ske);
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/net/silc-client/pkg/PLIST,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 PLIST
--- pkg/PLIST 11 Jan 2009 02:03:55 -0000 1.22
+++ pkg/PLIST 12 Jul 2014 21:02:15 -0000
@@ -10,8 +10,10 @@ share/doc/silc/FAQ
share/doc/silc/README
share/doc/silc/README.PLUGIN
@comment share/doc/silc/TODO
+share/doc/silc/faq.html
share/doc/silc/formats.txt
share/doc/silc/manual.txt
+share/doc/silc/perl.txt
share/doc/silc/signals.txt
share/doc/silc/special_vars.txt
share/doc/silc/startup-HOWTO.html
@@ -123,6 +125,7 @@ share/silc/scripts/msg-event.pl
share/silc/scripts/quitmsg.pl
share/silc/scripts/redirect.pl
share/silc/scripts/scriptassist.pl
+share/silc/scripts/silc-mime.pl
share/silc/scripts/silc.pl
share/silc/scripts/splitlong.pl
share/silc/scripts/usercount.pl
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
