cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.1.18, from Brad.

Browse Source
This commit is contained in:
sthen 2009-09-27 19:25:02 +00:00
parent e29e153b41
commit 217a6c0718
5 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/silc-server/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.56 2009/08/11 21:23:14 sthen Exp $ # $OpenBSD: Makefile,v 1.57 2009/09/27 19:25:02 sthen Exp $
COMMENT= Secure Internet Live Conferencing (SILC) server COMMENT= Secure Internet Live Conferencing (SILC) server
DISTNAME= silc-server-1.1.17 DISTNAME= silc-server-1.1.18
PKGNAME= ${DISTNAME}p0
CATEGORIES= net CATEGORIES= net
HOMEPAGE= http://www.silcnet.org/ HOMEPAGE= http://www.silcnet.org/

10
net/silc-server/distinfo
View File

@ -1,5 +1,5 @@
MD5 (silc-server-1.1.17.tar.gz) = 3auRkZV2DuRGzADTlXElAA== MD5 (silc-server-1.1.18.tar.gz) = ZfmGh436FiUGjkpWwEBxZQ==
RMD160 (silc-server-1.1.17.tar.gz) = UJamoR0LIpoOQrDP+hJELeIfx0E= RMD160 (silc-server-1.1.18.tar.gz) = YnPbDKbJ4xiUZ/+LNpszP9vmzoE=
SHA1 (silc-server-1.1.17.tar.gz) = oJMj2Z7zk47KmmxvthmmH9vueS8= SHA1 (silc-server-1.1.18.tar.gz) = mv/OsYKpGGiwDKmkbuLysxHts4E=
SHA256 (silc-server-1.1.17.tar.gz) = T1NTU3Twj3l9Lq3VkopoH1SkMOQN7Q28Xp+8KmDoeng= SHA256 (silc-server-1.1.18.tar.gz) = /LJ48izqYbpuPW5Jr53lARH1yFZUCAVNgoryYvwP4pM=
SIZE (silc-server-1.1.17.tar.gz) = 1171853 SIZE (silc-server-1.1.18.tar.gz) = 1167256

12
net/silc-server/patches/operops-patch-apps_silcd_command_c
View File

@ -1,7 +1,7 @@
$OpenBSD: operops-patch-apps_silcd_command_c,v 1.5 2008/09/26 21:17:57 brad Exp $ $OpenBSD: operops-patch-apps_silcd_command_c,v 1.6 2009/09/27 19:25:02 sthen Exp $
--- apps/silcd/command.c.orig Thu Sep 25 07:09:27 2008 --- apps/silcd/command.c.orig Sat Sep 26 16:34:12 2009
+++ apps/silcd/command.c Thu Sep 25 13:24:09 2008 +++ apps/silcd/command.c Sat Sep 26 22:38:46 2009
@@ -3498,6 +3498,8 @@ SILC_SERVER_CMD_FUNC(cumode) @@ -3497,6 +3497,8 @@ SILC_SERVER_CMD_FUNC(cumode)
TRUE, NULL); TRUE, NULL);
if (target_client != client && if (target_client != client &&
@ -10,7 +10,7 @@ $OpenBSD: operops-patch-apps_silcd_command_c,v 1.5 2008/09/26 21:17:57 brad Exp
!(sender_mask & SILC_CHANNEL_UMODE_CHANFO) && !(sender_mask & SILC_CHANNEL_UMODE_CHANFO) &&
!(sender_mask & SILC_CHANNEL_UMODE_CHANOP)) { !(sender_mask & SILC_CHANNEL_UMODE_CHANOP)) {
tmp_ch_id = silc_argument_get_arg_type(cmd->args, 1, &tmp_ch_len); tmp_ch_id = silc_argument_get_arg_type(cmd->args, 1, &tmp_ch_len);
@@ -3621,7 +3623,9 @@ SILC_SERVER_CMD_FUNC(cumode) @@ -3620,7 +3622,9 @@ SILC_SERVER_CMD_FUNC(cumode)
/* Promote to operator */ /* Promote to operator */
if (!(chl->mode & SILC_CHANNEL_UMODE_CHANOP)) { if (!(chl->mode & SILC_CHANNEL_UMODE_CHANOP)) {
if (!(sender_mask & SILC_CHANNEL_UMODE_CHANOP) && if (!(sender_mask & SILC_CHANNEL_UMODE_CHANOP) &&
@ -21,7 +21,7 @@ $OpenBSD: operops-patch-apps_silcd_command_c,v 1.5 2008/09/26 21:17:57 brad Exp
tmp_ch_id = silc_argument_get_arg_type(cmd->args, 1, &tmp_ch_len); 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_server_command_send_status_data(cmd, SILC_COMMAND_CUMODE,
SILC_STATUS_ERR_NO_CHANNEL_PRIV, SILC_STATUS_ERR_NO_CHANNEL_PRIV,
@@ -3635,7 +3639,9 @@ SILC_SERVER_CMD_FUNC(cumode) @@ -3634,7 +3638,9 @@ SILC_SERVER_CMD_FUNC(cumode)
} else { } else {
if (chl->mode & SILC_CHANNEL_UMODE_CHANOP) { if (chl->mode & SILC_CHANNEL_UMODE_CHANOP) {
if (!(sender_mask & SILC_CHANNEL_UMODE_CHANOP) && if (!(sender_mask & SILC_CHANNEL_UMODE_CHANOP) &&

12
net/silc-server/patches/patch-apps_silcd_command_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-apps_silcd_command_c,v 1.3 2009/08/11 21:23:14 sthen Exp $
--- apps/silcd/command.c.orig Tue Aug 11 15:10:48 2009
+++ apps/silcd/command.c Tue Aug 11 15:11:07 2009
@@ -2379,7 +2379,7 @@ SILC_SERVER_CMD_FUNC(join)
channel will be global, based on our router name. */
if (!serv[0] && !server->config->local_channels) {
if (!server->standalone) {
- silc_snprintf(serv, sizeof(serv), server->router->server_name);
+ silc_snprintf(serv, sizeof(serv), "%s", server->router->server_name);
} else {
SilcServerConfigRouter *router;
router = silc_server_config_get_primary_router(server);

15
net/silc-server/patches/patch-apps_silcd_server_c Normal file
View File

@ -0,0 +1,15 @@
$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));