upgrade to silc-server 1.0.1
This commit is contained in:
brad
parent
eb1c7cf92e
commit
28b0c1f6fb
@ -1,9 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.27 2005/11/04 00:09:56 naddy Exp $
|
||||
# $OpenBSD: Makefile,v 1.28 2005/12/14 02:11:40 brad Exp $
|
||||
|
||||
COMMENT= "Secure Internet Live Conferencing (SILC) server"
|
||||
|
||||
DISTNAME= silc-server-1.0
|
||||
PKGNAME= ${DISTNAME}p6
|
||||
DISTNAME= silc-server-1.0.1
|
||||
CATEGORIES= net
|
||||
|
||||
HOMEPAGE= http://www.silcnet.org/
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
MD5 (silc-server-1.0.tar.gz) = d1d8336255805a795cf2c5d6a85b82a8
|
||||
RMD160 (silc-server-1.0.tar.gz) = 7a3d8de955e22e9d0fc6d7bb7bf2196458748fcc
|
||||
SHA1 (silc-server-1.0.tar.gz) = a9d6490707fc2a00a01e9b25a417805e90a4a24b
|
||||
SIZE (silc-server-1.0.tar.gz) = 1326157
|
||||
MD5 (silc-server-1.0.1.tar.gz) = 3f73322063ec97f5847745b8d49f1680
|
||||
RMD160 (silc-server-1.0.1.tar.gz) = 8205ba0f0e4215478c66d636342596668531e81f
|
||||
SHA1 (silc-server-1.0.1.tar.gz) = b056b226ff0e87feca201d315029ef48237477e9
|
||||
SIZE (silc-server-1.0.1.tar.gz) = 1225711
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
$OpenBSD: patch-apps_silcd_command_c,v 1.1 2005/09/09 17:03:35 brad Exp $
|
||||
--- apps/silcd/command.c.orig Tue May 10 12:59:01 2005
|
||||
+++ apps/silcd/command.c Mon Sep 5 19:39:15 2005
|
||||
@@ -2964,6 +2964,10 @@ SILC_SERVER_CMD_FUNC(cmode)
|
||||
new channel key. Clients are not using private channel keys
|
||||
anymore after this. */
|
||||
|
||||
+ /* if we don't remove the flag from the mode
|
||||
+ * silc_server_create_channel_key won't create a new key */
|
||||
+ channel->mode &= ~SILC_CHANNEL_MODE_PRIVKEY;
|
||||
+
|
||||
/* Re-generate channel key */
|
||||
if (!silc_server_create_channel_key(server, channel, 0))
|
||||
goto out;
|
||||
@ -1,28 +0,0 @@
|
||||
$OpenBSD: patch-apps_silcd_server_util_c,v 1.1 2005/09/09 17:03:35 brad Exp $
|
||||
--- apps/silcd/server_util.c.orig Mon May 9 05:59:49 2005
|
||||
+++ apps/silcd/server_util.c Mon Sep 5 19:39:45 2005
|
||||
@@ -1103,6 +1103,7 @@ SilcUInt32 silc_server_num_sockets_by_ip
|
||||
|
||||
for (i = 0, count = 0; i < server->config->param.connections_max; i++) {
|
||||
if (server->sockets[i] && !SILC_IS_LISTENER(server->sockets[i]) &&
|
||||
+ !SILC_IS_HOST_LOOKUP(server->sockets[i]) &&
|
||||
!strcmp(server->sockets[i]->ip, ip) &&
|
||||
server->sockets[i]->type == type)
|
||||
count++;
|
||||
@@ -1128,6 +1129,7 @@ SilcUInt32 silc_server_num_sockets_by_re
|
||||
|
||||
for (i = 0, count = 0; i < server->config->param.connections_max; i++) {
|
||||
if (server->sockets[i] && !SILC_IS_LISTENER(server->sockets[i]) &&
|
||||
+ !SILC_IS_HOST_LOOKUP(server->sockets[i]) &&
|
||||
((ip && !strcmp(server->sockets[i]->ip, ip)) ||
|
||||
(hostname && !strcmp(server->sockets[i]->hostname, hostname))) &&
|
||||
server->sockets[i]->port == port &&
|
||||
@@ -1802,7 +1804,7 @@ silc_server_find_socket_by_host(SilcServ
|
||||
int i;
|
||||
|
||||
for (i = 0; i < server->config->param.connections_max; i++) {
|
||||
- if (!server->sockets[i])
|
||||
+ if (!server->sockets[i] || SILC_IS_HOST_LOOKUP(server->sockets[i]))
|
||||
continue;
|
||||
if (!strcmp(server->sockets[i]->ip, ip) &&
|
||||
(!port || server->sockets[i]->port == port) &&
|
||||
@ -1,28 +0,0 @@
|
||||
$OpenBSD: patch-apps_silcd_silcd_c,v 1.2 2005/09/13 02:38:52 brad Exp $
|
||||
--- apps/silcd/silcd.c.orig Tue May 10 09:22:52 2005
|
||||
+++ apps/silcd/silcd.c Mon Sep 12 14:09:54 2005
|
||||
@@ -261,13 +261,21 @@ SILC_TASK_CALLBACK(stop_server)
|
||||
SILC_TASK_CALLBACK(dump_stats)
|
||||
{
|
||||
FILE *fdd;
|
||||
+ int fild;
|
||||
char filename[256];
|
||||
|
||||
memset(filename, 0, sizeof(filename));
|
||||
- snprintf(filename, sizeof(filename) - 1, "/tmp/silcd.%d.stats", getpid());
|
||||
- fdd = fopen(filename, "w+");
|
||||
- if (!fdd)
|
||||
+ snprintf(filename, sizeof(filename) - 1, "/tmp/silcd.%d.stats-XXXXXX", getpid());
|
||||
+ fild = mkstemp(filename);
|
||||
+ if (fild == -1)
|
||||
return;
|
||||
+
|
||||
+ fdd = fdopen(fild, "w");
|
||||
+ if (fdd == NULL) {
|
||||
+ close(fild);
|
||||
+ unlink(filename);
|
||||
+ return;
|
||||
+ }
|
||||
|
||||
#define STAT_OUTPUT(fmt, stat) fprintf(fdd, fmt "\n", (int)stat);
|
||||
|
||||
12
net/silc-server/patches/patch-lib_silccrypt_sha256_c
Normal file
12
net/silc-server/patches/patch-lib_silccrypt_sha256_c
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-lib_silccrypt_sha256_c,v 1.1 2005/12/14 02:11:40 brad Exp $
|
||||
--- lib/silccrypt/sha256.c.orig Tue Dec 13 20:46:47 2005
|
||||
+++ lib/silccrypt/sha256.c Tue Dec 13 20:47:01 2005
|
||||
@@ -58,7 +58,7 @@ static inline unsigned RORc(unsigned wor
|
||||
}
|
||||
|
||||
#else
|
||||
-#define RORc(x, y) ( ((((unsigned long)(x)&0xFFFFFFFFUL)>>(unsignedlong)((y)&31)) | ((unsigned long)(x)<<(unsigned long)(32-((y)&31)))) &0xFFFFFFFFUL)
|
||||
+#define RORc(x, y) ( ((((unsigned long)(x)&0xFFFFFFFFUL)>>(unsigned long)((y)&31)) | ((unsigned long)(x)<<(unsigned long)(32-((y)&31)))) &0xFFFFFFFFUL)
|
||||
#endif /* _MSC_VER */
|
||||
|
||||
/* Various logical functions */
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-lib_silcutil_unix_silcunixutil_c,v 1.1 2005/09/09 20:10:04 brad Exp $
|
||||
--- lib/silcutil/unix/silcunixutil.c.orig Fri Sep 9 15:07:39 2005
|
||||
+++ lib/silcutil/unix/silcunixutil.c Fri Sep 9 15:08:01 2005
|
||||
@@ -98,7 +98,7 @@ int silc_string_regex_match(const char *
|
||||
regex_t preg;
|
||||
int ret = FALSE;
|
||||
|
||||
- if (regcomp(&preg, regex, REG_NOSUB | REG_EXTENDED) < 0)
|
||||
+ if (regcomp(&preg, regex, REG_NOSUB | REG_EXTENDED) != 0)
|
||||
return FALSE;
|
||||
|
||||
if (regexec(&preg, string, 0, NULL, 0) == 0)
|
||||
Loading…
Reference in New Issue
Block a user