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

update to 1.1.5 + a crash fix from GIT. ok brad (maintainer).

Browse Source
This commit is contained in:
sthen 2008-04-22 00:34:30 +00:00
parent e99ada19ab
commit ae4f085b3a
4 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/silc-server/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.38 2008/04/17 10:26:15 sthen Exp $
# $OpenBSD: Makefile,v 1.39 2008/04/22 00:34:30 sthen Exp $
COMMENT= Secure Internet Live Conferencing (SILC) server
DISTNAME= silc-server-1.1.4
DISTNAME= silc-server-1.1.5
CATEGORIES= net
HOMEPAGE= http://www.silcnet.org/

10
net/silc-server/distinfo
View File

@ -1,5 +1,5 @@
MD5 (silc-server-1.1.4.tar.gz) = bUD+EtemCF+9wWess1IiQA==
RMD160 (silc-server-1.1.4.tar.gz) = idxNR/AVf8CLuyaHc6OQJgax6eg=
SHA1 (silc-server-1.1.4.tar.gz) = Sq85NaZSHv/Pd2eUtAeWMS40dZ8=
SHA256 (silc-server-1.1.4.tar.gz) = rfjDnUeFsriyKmaaYkDCJciq0hWM6rvsPV9+w/SNZ9g=
SIZE (silc-server-1.1.4.tar.gz) = 1196995
MD5 (silc-server-1.1.5.tar.gz) = f63slTofRV2cbkwWupPGHw==
RMD160 (silc-server-1.1.5.tar.gz) = 66rlwXAp0j83Y7neVFn8ZP6dn18=
SHA1 (silc-server-1.1.5.tar.gz) = /l8WydoUxTOjv6gAGb9PnNYgFuk=
SHA256 (silc-server-1.1.5.tar.gz) = IRnYpfZXPnGmH6ROoaLwx/sOMTcGhm4B++xv2UYsR4Q=
SIZE (silc-server-1.1.5.tar.gz) = 1197209

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.3 2008/04/17 10:26:15 sthen Exp $
--- apps/silcd/command.c.orig Wed Apr 16 10:53:47 2008
+++ apps/silcd/command.c Wed Apr 16 13:37:43 2008
@@ -3491,6 +3491,8 @@ SILC_SERVER_CMD_FUNC(cumode)
$OpenBSD: operops-patch-apps_silcd_command_c,v 1.4 2008/04/22 00:34:30 sthen Exp $
--- apps/silcd/command.c.orig Sun Apr 20 17:01:20 2008
+++ apps/silcd/command.c Sun Apr 20 17:24:58 2008
@@ -3490,6 +3490,8 @@ SILC_SERVER_CMD_FUNC(cumode)
TRUE, NULL);
if (target_client != client &&
@ -10,7 +10,7 @@ $OpenBSD: operops-patch-apps_silcd_command_c,v 1.3 2008/04/17 10:26:15 sthen Exp
!(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);
@@ -3614,7 +3616,9 @@ SILC_SERVER_CMD_FUNC(cumode)
@@ -3613,7 +3615,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_command_c,v 1.3 2008/04/17 10:26:15 sthen Exp
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,
@@ -3628,7 +3632,9 @@ SILC_SERVER_CMD_FUNC(cumode)
@@ -3627,7 +3631,9 @@ SILC_SERVER_CMD_FUNC(cumode)
} else {
if (chl->mode & SILC_CHANNEL_UMODE_CHANOP) {
if (!(sender_mask & SILC_CHANNEL_UMODE_CHANOP) &&

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

@ -0,0 +1,14 @@
$OpenBSD: patch-apps_silcd_server_c,v 1.1 2008/04/22 00:34:30 sthen Exp $
http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff;h=e10fb3ff712f60100846064c196d5f69921d1b43
--- apps/silcd/server.c.orig Sun Apr 20 21:20:39 2008
+++ apps/silcd/server.c Sun Apr 20 21:21:19 2008
@@ -3036,7 +3036,8 @@ void silc_server_free_sock_user_data(SilcServer server
if (!idata)
return;
- // silc_schedule_task_del_by_context(server->schedule, sock);
+ silc_schedule_task_del_by_all(server->schedule, 0, silc_server_do_rekey,
+ sock);
/* Cancel active protocols */
if (idata) {