Here is an update to silc-server 1.1.19.
OK?
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/net/silc-server/Makefile,v
retrieving revision 1.69
diff -u -p -u -p -r1.69 Makefile
--- Makefile 4 Nov 2013 21:50:09 -0000 1.69
+++ Makefile 16 Jul 2014 16:17:55 -0000
@@ -2,9 +2,10 @@
COMMENT= Secure Internet Live Conferencing (SILC) server
-DISTNAME= silc-server-1.1.18
-REVISION= 4
+DISTNAME= silc-server-1.1.19
CATEGORIES= net
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=silc/}
+EXTRACT_SUFX= .tar.bz2
HOMEPAGE= http://www.silcnet.org/
@@ -12,12 +13,8 @@ MAINTAINER= Brad Smith <[email protected]
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB= c pthread
-MASTER_SITES= http://ftp.silcnet.org/server/sources/ \
- ftp://ftp.silcnet.org/silc/server/sources/ \
- ftp://ftp.no.silcnet.org/pub/silc/server/sources/ \
-
http://the.wiretapped.net/security/network-security/silc/server/sources/
+WANTLIB= c pthread
MODULES= converters/libiconv
@@ -37,7 +34,7 @@ SUBST_VARS= CONFDIR
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
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/net/silc-server/distinfo,v
retrieving revision 1.33
diff -u -p -u -p -r1.33 distinfo
--- distinfo 27 Sep 2009 19:25:02 -0000 1.33
+++ distinfo 16 Jul 2014 16:20:52 -0000
@@ -1,5 +1,2 @@
-MD5 (silc-server-1.1.18.tar.gz) = ZfmGh436FiUGjkpWwEBxZQ==
-RMD160 (silc-server-1.1.18.tar.gz) = YnPbDKbJ4xiUZ/+LNpszP9vmzoE=
-SHA1 (silc-server-1.1.18.tar.gz) = mv/OsYKpGGiwDKmkbuLysxHts4E=
-SHA256 (silc-server-1.1.18.tar.gz) =
/LJ48izqYbpuPW5Jr53lARH1yFZUCAVNgoryYvwP4pM=
-SIZE (silc-server-1.1.18.tar.gz) = 1167256
+SHA256 (silc-server-1.1.19.tar.bz2) =
sv37msociIbn3pqoiPhWJHhIqvGbeLT6ZMppxyEOds4=
+SIZE (silc-server-1.1.19.tar.bz2) = 933464
Index: patches/operops-patch-apps_silcd_command_c
===================================================================
RCS file:
/home/cvs/ports/net/silc-server/patches/operops-patch-apps_silcd_command_c,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 operops-patch-apps_silcd_command_c
--- patches/operops-patch-apps_silcd_command_c 27 Sep 2009 19:25:02 -0000
1.6
+++ patches/operops-patch-apps_silcd_command_c 16 Jul 2014 16:25:45 -0000
@@ -1,7 +1,7 @@
$OpenBSD: operops-patch-apps_silcd_command_c,v 1.6 2009/09/27 19:25:02 sthen
Exp $
---- apps/silcd/command.c.orig Sat Sep 26 16:34:12 2009
-+++ apps/silcd/command.c Sat Sep 26 22:38:46 2009
-@@ -3497,6 +3497,8 @@ SILC_SERVER_CMD_FUNC(cumode)
+--- apps/silcd/command.c.orig Tue May 6 06:28:30 2014
++++ apps/silcd/command.c Wed Jul 16 12:25:33 2014
+@@ -3531,6 +3531,8 @@ SILC_SERVER_CMD_FUNC(cumode)
TRUE, NULL);
if (target_client != client &&
@@ -10,7 +10,7 @@ $OpenBSD: operops-patch-apps_silcd_comma
!(sender_mask & SILC_CHANNEL_UMODE_CHANFO) &&
!(sender_mask & SILC_CHANNEL_UMODE_CHANOP)) {
tmp_ch_id = silc_argument_get_arg_type(cmd->args, 1, &tmp_ch_len);
-@@ -3620,7 +3622,9 @@ SILC_SERVER_CMD_FUNC(cumode)
+@@ -3654,7 +3656,9 @@ SILC_SERVER_CMD_FUNC(cumode)
/* Promote to operator */
if (!(chl->mode & SILC_CHANNEL_UMODE_CHANOP)) {
if (!(sender_mask & SILC_CHANNEL_UMODE_CHANOP) &&
@@ -21,7 +21,7 @@ $OpenBSD: operops-patch-apps_silcd_comma
tmp_ch_id = silc_argument_get_arg_type(cmd->args, 1, &tmp_ch_len);
silc_server_command_send_status_data(cmd, SILC_COMMAND_CUMODE,
SILC_STATUS_ERR_NO_CHANNEL_PRIV,
-@@ -3634,7 +3638,9 @@ SILC_SERVER_CMD_FUNC(cumode)
+@@ -3668,7 +3672,9 @@ SILC_SERVER_CMD_FUNC(cumode)
} else {
if (chl->mode & SILC_CHANNEL_UMODE_CHANOP) {
if (!(sender_mask & SILC_CHANNEL_UMODE_CHANOP) &&
Index: patches/patch-apps_silcd_Makefile_in
===================================================================
RCS file: /home/cvs/ports/net/silc-server/patches/patch-apps_silcd_Makefile_in,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-apps_silcd_Makefile_in
--- patches/patch-apps_silcd_Makefile_in 17 May 2010 22:53:37 -0000
1.7
+++ patches/patch-apps_silcd_Makefile_in 16 Jul 2014 16:24:59 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-apps_silcd_Makefile_in,v 1.7 2010/05/17 22:53:37 sthen Exp $
---- apps/silcd/Makefile.in.orig Sat Sep 26 21:34:14 2009
-+++ apps/silcd/Makefile.in Mon May 17 09:21:59 2010
-@@ -586,7 +586,6 @@ install-dirs-server:
+--- apps/silcd/Makefile.in.orig Tue May 6 06:28:34 2014
++++ apps/silcd/Makefile.in Wed Jul 16 12:21:01 2014
+@@ -736,7 +736,6 @@ install-dirs-server:
-mkdir -p $(mandir)/man8
doc-install-server:
@@ -9,7 +9,7 @@ $OpenBSD: patch-apps_silcd_Makefile_in,v
-@if test -f $(top_srcdir)/doc/silcd.8 ; then \
$(INSTALL_DATA) $(top_srcdir)/doc/silcd.8 $(mandir)/man8; \
fi
-@@ -604,8 +603,8 @@ etc-install-server:
+@@ -754,8 +753,8 @@ etc-install-server:
fi
examples-install:
@@ -20,7 +20,7 @@ $OpenBSD: patch-apps_silcd_Makefile_in,v
generate-server-key:
-@if test '!' -f $(etcdir)/silcd.pub ; then \
-@@ -613,11 +612,8 @@ generate-server-key:
+@@ -763,11 +762,8 @@ generate-server-key:
fi
install-data-hook: \
Index: patches/patch-apps_silcd_command_c
===================================================================
RCS file: patches/patch-apps_silcd_command_c
diff -N patches/patch-apps_silcd_command_c
--- patches/patch-apps_silcd_command_c 17 May 2010 08:39:24 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,73 +0,0 @@
-$OpenBSD: patch-apps_silcd_command_c,v 1.5 2010/05/17 08:39:24 sthen Exp $
---- apps/silcd/command.c.orig Sat Sep 26 16:34:12 2009
-+++ apps/silcd/command.c Sun May 16 21:05:33 2010
-@@ -85,6 +85,27 @@ SilcServerCommand silc_command_list[] =
- { NULL, 0 },
- };
-
-+/* Returns TRUE if the connection is registered. Unregistered connections
-+ usually cannot send commands hence the check. */
-+
-+static int silc_server_is_registered(SilcServer server,
-+ SilcPacketStream sock,
-+ SilcServerCommandContext cmd,
-+ SilcCommand command)
-+{
-+ SilcIDListData idata = silc_packet_get_context(sock);
-+
-+ if (!idata)
-+ return FALSE;
-+
-+ if (idata->status & SILC_IDLIST_STATUS_REGISTERED)
-+ return TRUE;
-+
-+ silc_server_command_send_status_reply(cmd, command,
-+ SILC_STATUS_ERR_NOT_REGISTERED, 0);
-+ return FALSE;
-+}
-+
- /* Performs several checks to the command. It first checks whether this
- command was called as pending command callback. If it was then it checks
- whether error occurred in the command reply where the pending command
-@@ -102,6 +123,13 @@ do {
\
- return; \
- } \
- \
-+ if (context2 && \
-+ !silc_server_is_registered(cmd->server, cmd->sock, cmd, command)) { \
-+ SILC_LOG_DEBUG(("Not registered, command not called")); \
-+ silc_server_command_free(cmd); \
-+ return; \
-+ } \
-+ \
- _argc = silc_argument_get_arg_num(cmd->args);
\
- if (_argc < min) { \
- SILC_LOG_DEBUG(("Not enough parameters in command")); \
-@@ -120,27 +148,6 @@ do {
\
- return; \
- } \
- } while(0)
--
--/* Returns TRUE if the connection is registered. Unregistered connections
-- usually cannot send commands hence the check. */
--
--static int silc_server_is_registered(SilcServer server,
-- SilcPacketStream sock,
-- SilcServerCommandContext cmd,
-- SilcCommand command)
--{
-- SilcIDListData idata = silc_packet_get_context(sock);
--
-- if (!idata)
-- return FALSE;
--
-- if (idata->status & SILC_IDLIST_STATUS_REGISTERED)
-- return TRUE;
--
-- silc_server_command_send_status_reply(cmd, command,
-- SILC_STATUS_ERR_NOT_REGISTERED, 0);
-- return FALSE;
--}
-
- /* Internal context to hold data when executed command with timeout. */
- typedef struct {
Index: patches/patch-apps_silcd_server_c
===================================================================
RCS file: patches/patch-apps_silcd_server_c
diff -N patches/patch-apps_silcd_server_c
--- patches/patch-apps_silcd_server_c 27 Sep 2009 19:25:02 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-apps_silcd_server_c,v 1.6 2009/09/27 19:25:02 sthen Exp $
---- apps/silcd/server.c.orig Sun Sep 27 11:20:35 2009
-+++ apps/silcd/server.c Sun Sep 27 11:25:03 2009
-@@ -3128,6 +3128,11 @@ void silc_server_disconnect_remote(SilcServer server,
- if (!sock)
- return;
-
-+ silc_schedule_task_del_by_all(server->schedule, 0, silc_server_do_rekey,
-+ sock);
-+ silc_schedule_task_del_by_all(server->schedule, 0, silc_server_do_heartbeat,
-+ sock);
-+
- SILC_LOG_DEBUG(("Disconnecting remote host, sock %p, status %d", sock,
- status));
-
Index: patches/patch-configure_ac
===================================================================
RCS file: /home/cvs/ports/net/silc-server/patches/patch-configure_ac,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-configure_ac
--- patches/patch-configure_ac 4 Nov 2013 21:50:09 -0000 1.6
+++ patches/patch-configure_ac 16 Jul 2014 16:24:59 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.6 2013/11/04 21:50:09 brad Exp $
---- configure.ac.orig Sat Sep 26 16:34:14 2009
-+++ configure.ac Sun Aug 21 01:54:37 2011
-@@ -97,9 +97,6 @@ AM_CONDITIONAL(SILC_X86_64, test x$cpu_x86_64 = xtrue)
+--- configure.ac.orig Tue May 6 06:28:33 2014
++++ configure.ac Wed Jul 16 12:21:01 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.6 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.6 2013/
#
# Workaround a bug in GCC 2.x which causes memory exhaustion
# when compiling sha1 with optimizations on UltraSPARC.
-@@ -579,55 +526,6 @@ AC_DEFINE_UNQUOTED([SILC_DOCDIR], "$DOCDIR", [SILC_DOC
+@@ -593,55 +540,6 @@ AC_DEFINE_UNQUOTED([SILC_DOCDIR], "$DOCDIR", [SILC_DOC
compile_libs=true
LIBSUBDIR=lib
@@ -129,7 +129,7 @@ $OpenBSD: patch-configure_ac,v 1.6 2013/
# SOCKS4 support checking
#
SAVE_LIBS="$LIBS"
-@@ -1291,7 +1189,7 @@ fi
+@@ -1311,7 +1209,7 @@ fi
SILC_ADD_CC_FLAGS(SILC_CRYPTO, -fno-regmove)
if test x$summary_debug = xno -a x$want_cc_optimizations = xtrue; then
@@ -138,7 +138,7 @@ $OpenBSD: patch-configure_ac,v 1.6 2013/
fi
AC_SUBST(SILC_CRYPTO_CFLAGS)
-@@ -1327,7 +1225,6 @@ if test x$compile_libs = xtrue; then
+@@ -1347,7 +1245,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_example_silcd_conf_in
===================================================================
RCS file:
/home/cvs/ports/net/silc-server/patches/patch-doc_example_silcd_conf_in,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 patch-doc_example_silcd_conf_in
--- patches/patch-doc_example_silcd_conf_in 26 Oct 2008 18:12:11 -0000
1.9
+++ patches/patch-doc_example_silcd_conf_in 16 Jul 2014 16:25:08 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-doc_example_silcd_conf_in,v 1.9 2008/10/26 18:12:11 sthen Exp $
---- doc/example_silcd.conf.in.orig Sat Oct 25 14:59:17 2008
-+++ doc/example_silcd.conf.in Sun Oct 26 11:10:26 2008
+--- doc/example_silcd.conf.in.orig Mon May 5 01:30:11 2014
++++ doc/example_silcd.conf.in Wed Jul 16 12:24:55 2014
@@ -22,7 +22,7 @@
# Include global algorithms from the "silcalgs.conf" file. This file defines
# ciphers, hash functions, HMACs and PKCS algorithms that can be used.
@@ -10,44 +10,7 @@ $OpenBSD: patch-doc_example_silcd_conf_i
#
# General configuration options
-@@ -186,7 +186,7 @@ ServerInfo {
- #
- # Server name (FQDN)
- #
-- hostname = "lassi.kuo.fi.ssh.com";
-+ hostname = "localhost";
-
- #
- # Primary listener. Specify the IP address and the port to bind
-@@ -194,7 +194,7 @@ ServerInfo {
- # if the server is behind NAT.
- #
- Primary {
-- ip = "10.2.1.6";
-+ ip = "127.0.0.1";
- # public_ip = "11.1.1.1";
- port = 706;
- };
-@@ -215,37 +215,37 @@ ServerInfo {
- #
- # Geographic location
- #
-- Location = "Kuopio, Finland";
-+ Location = "Earth";
-
- #
- # Full admin name
- #
-- Admin = "Foo T. Bar";
-+ Admin = "Admin";
-
- #
- # Admin's email address
- #
-- AdminEmail = "[email protected]";
-+ AdminEmail = "[email protected]";
-
- #
+@@ -231,21 +231,21 @@ ServerInfo {
# Run SILC server as specific user and group. The server must be
# initially run as root.
#
@@ -74,68 +37,3 @@ $OpenBSD: patch-doc_example_silcd_conf_i
#
# Pid file
-@@ -458,10 +458,10 @@ Client {
- # required.
- #
- Admin {
-- Host = "10.2.1.199";
-- User = "priikone";
-- Nick = "pekka";
-- Passphrase = "verysecret";
-+ Host = "127.0.0.1";
-+ User = "admin";
-+ Nick = "admin";
-+ Passphrase = "admin";
- # PublicKey = "/path/to/the/public.pub";
- };
-
-@@ -484,13 +484,13 @@ Admin {
- # to true. For normal connections set it false. If it is set to true then
- # your server will be backup router.
- #
--ServerConnection {
-- Host = "10.2.1.7";
-- Passphrase = "verysecret";
-- #PublicKey = "/path/to/the/public.pub";
-- Params = "normal";
-- Backup = false;
--};
-+#ServerConnection {
-+# Host = "10.2.1.7";
-+# Passphrase = "verysecret";
-+# #PublicKey = "/path/to/the/public.pub";
-+# Params = "normal";
-+# Backup = false;
-+#};
-
- #
- # Configured router connections
-@@ -520,17 +520,17 @@ ServerConnection {
- # backup router is in our cell then set the "BackupLocal" option to true.
- # If the backup router is in other cell then set it to false.
- #
--RouterConnection {
-- Host = "10.2.1.100";
-- Port = 706;
-- Passphrase = "verysecret";
-- #PublicKey = "/path/to/the/public.pub";
-- Params = "normal";
-- Initiator = true;
-- #BackupHost = "10.2.1.6";
-- #BackupPort = 706;
-- #BackupLocal = true;
--};
-+#RouterConnection {
-+# Host = "10.2.1.100";
-+# Port = 706;
-+# Passphrase = "verysecret";
-+# #PublicKey = "/path/to/the/public.pub";
-+# Params = "normal";
-+# Initiator = true;
-+# #BackupHost = "10.2.1.6";
-+# #BackupPort = 706;
-+# #BackupLocal = true;
-+#};
-
- #
- # Denied connections
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 17 May 2010 08:39:24 -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/05/17 08:39:24 sthen Exp $
---- lib/silccore/silcpacket.c.orig Sun May 16 21:03:25 2010
-+++ lib/silccore/silcpacket.c Sun May 16 21:04:33 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 17 May 2010 08:39:24 -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/05/17 08:39:24 sthen Exp $
---- lib/silcske/silcske.c.orig Sun May 16 21:02:21 2010
-+++ lib/silcske/silcske.c Sun May 16 21:02:54 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);
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
