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

SECURITY FIXES: Update to 0.9.5.1.

Browse Source 
See http://silc.silcnet.org/txt/changes-client.txt for details.

Also:
- add iconv to MODULES.
- remove deprecated NEED_VERSION.

Patches to remove mime from Maintainer. Maintainer and pvalchev@ ok.
This commit is contained in:
fgsch 2002-09-24 17:20:10 +00:00
parent adf40e56ed
commit 51f827dd89
16 changed files with 479 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/silc-client/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.11 2002/07/17 19:10:40 fgsch Exp $
# $OpenBSD: Makefile,v 1.12 2002/09/24 17:20:10 fgsch Exp $
COMMENT= "Secure Live Internet Conferencing (SILC) client"
DISTNAME= silc-client-0.9.4
DISTNAME= silc-client-0.9.5.1
CATEGORIES= net
NEED_VERSION= 1.507
HOMEPAGE= http://www.silcnet.org/
MAINTAINER= Vladimir Kotal <vlada@openbsd.cz>
@ -27,6 +26,8 @@ LIB_DEPENDS= glib.1.2,gmodule.1.2::devel/glib
USE_LIBTOOL= yes
MODULES= iconv
# XXX workaround gcc bugs on sparc64
.if ${MACHINE_ARCH:Msparc64}
PATCH_LIST= gcc-* patch-*

6
net/silc-client/distinfo
View File

@ -1,3 +1,3 @@
MD5 (silc-client-0.9.4.tar.gz) = 62c737841d50bed9f9db40a9fa6a0cc6
RMD160 (silc-client-0.9.4.tar.gz) = 3ae2bbcb085919d360c56dbc56e47fda30b91790
SHA1 (silc-client-0.9.4.tar.gz) = 8cbf4b9b3a74ab969d6eda2381787f80ba3347c5
MD5 (silc-client-0.9.5.1.tar.gz) = b14effef44ca3eb7bc97eeb13a0140d9
RMD160 (silc-client-0.9.5.1.tar.gz) = aa7d360e82919edec1ad0a770bb85b93045372c9
SHA1 (silc-client-0.9.5.1.tar.gz) = ec70c66ad3c77477817efead4a0c5e8d947365e1

21
net/silc-client/patches/patch-configure
View File

@ -1,20 +1,21 @@
$OpenBSD: patch-configure,v 1.7 2002/07/04 10:56:08 fgsch Exp $
--- configure.orig Sun Jun 23 16:25:05 2002
+++ configure Fri Jun 28 03:17:54 2002
@@ -2660,12 +2660,6 @@ else
$OpenBSD: patch-configure,v 1.8 2002/09/24 17:20:10 fgsch Exp $
--- configure.orig Thu Sep 19 06:09:58 2002
+++ configure Thu Sep 19 06:11:14 2002
@@ -2663,13 +2663,6 @@ else
SILC_DIST_WIN32DLL_FALSE=
fi
-# XXX
-# Compiler flags
-#
-if test "$GCC"; then
- CFLAGS="-Wall -finline-functions $CFLAGS"
-fi
-
# Program checking
#
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -11049,16 +11043,14 @@ echo "${ECHO_T}yes" >&6
@@ -10434,18 +10427,16 @@ echo "${ECHO_T}yes" >&6
#define SILC_DEBUG 1
EOF
@ -22,13 +23,15 @@ $OpenBSD: patch-configure,v 1.7 2002/07/04 10:56:08 fgsch Exp $
+ CFLAGS="-g $CFLAGS"
;;
*)
echo "$as_me:11055: result: no" >&5
echo "$as_me:10440: result: no" >&5
echo "${ECHO_T}no" >&6
- CFLAGS="-O2 -g $CFLAGS"
;;
esac
else
- CFLAGS="-O2 -g $CFLAGS"
echo "$as_me:11062: result: no" >&5
echo "$as_me:10449: result: no" >&5
echo "${ECHO_T}no" >&6
fi;

50
net/silc-client/patches/patch-irssi_src_core_Makefile_in Normal file
View File

@ -0,0 +1,50 @@
$OpenBSD: patch-irssi_src_core_Makefile_in,v 1.1 2002/09/24 17:20:10 fgsch Exp $
--- irssi/src/core/Makefile.in.orig Sat Sep 7 14:05:05 2002
+++ irssi/src/core/Makefile.in Tue Sep 24 02:28:01 2002
@@ -196,8 +196,7 @@ libcore_a_SOURCES = \
settings.c \
signals.c \
special-vars.c \
- write-buffer.c \
- blob.c
+ write-buffer.c
structure_headers = \
@@ -208,8 +207,7 @@ structure_headers = \
server-rec.h \
server-setup-rec.h \
server-connect-rec.h \
- window-item-rec.h \
- blob.h
+ window-item-rec.h
noinst_HEADERS = \
@@ -271,8 +269,7 @@ am_libcore_a_OBJECTS = args.$(OBJEXT) ch
nickmatch-cache.$(OBJEXT) pidwait.$(OBJEXT) queries.$(OBJEXT) \
rawlog.$(OBJEXT) servers.$(OBJEXT) servers-reconnect.$(OBJEXT) \
servers-setup.$(OBJEXT) session.$(OBJEXT) settings.$(OBJEXT) \
- signals.$(OBJEXT) special-vars.$(OBJEXT) write-buffer.$(OBJEXT) \
- blob.$(OBJEXT)
+ signals.$(OBJEXT) special-vars.$(OBJEXT) write-buffer.$(OBJEXT)
libcore_a_OBJECTS = $(am_libcore_a_OBJECTS)
DEFS = @DEFS@
@@ -281,7 +278,7 @@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
depcomp = $(SHELL) $(top_srcdir)/depcomp
-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/args.Po $(DEPDIR)/blob.Po \
+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/args.Po \
@AMDEP_TRUE@ $(DEPDIR)/channels-setup.Po $(DEPDIR)/channels.Po \
@AMDEP_TRUE@ $(DEPDIR)/chat-commands.Po \
@AMDEP_TRUE@ $(DEPDIR)/chat-protocols.Po $(DEPDIR)/chatnets.Po \
@@ -352,7 +349,6 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/args.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/blob.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/channels-setup.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/channels.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/chat-commands.Po@am__quote@

12
net/silc-client/patches/patch-irssi_src_core_blob_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-irssi_src_core_blob_c,v 1.1 2002/09/24 17:20:10 fgsch Exp $
--- irssi/src/core/blob.c.orig Sat Jul 6 05:09:39 2002
+++ irssi/src/core/blob.c Tue Sep 24 02:28:01 2002
@@ -1,8 +0,0 @@
-#include "common.h"
-#include "blob.h"
-#include "modules.h"
-
-void blob_fill(BLOB_REC *blob)
-{
- blob->type = module_get_uniq_id("BLOB", 0);
-}

20
net/silc-client/patches/patch-irssi_src_core_blob_h Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-irssi_src_core_blob_h,v 1.1 2002/09/24 17:20:10 fgsch Exp $
--- irssi/src/core/blob.h.orig Sat Jul 6 05:09:39 2002
+++ irssi/src/core/blob.h Tue Sep 24 02:28:01 2002
@@ -1,16 +0,0 @@
-#ifndef __BLOB_H__
-#define __BLOB_H__
-
-#include "modules.h"
-
-struct _BLOB_REC {
- int type;
- void *data;
- guint32 octets;
-};
-
-typedef struct _BLOB_REC BLOB_REC;
-
-void blob_fill(BLOB_REC *blob);
-
-#endif

8
net/silc-client/patches/patch-irssi_src_perl_common_Irssi_xs Normal file
View File

@ -0,0 +1,8 @@
$OpenBSD: patch-irssi_src_perl_common_Irssi_xs,v 1.1 2002/09/24 17:20:10 fgsch Exp $
--- irssi/src/perl/common/Irssi.xs.orig Sat Jul 6 05:09:39 2002
+++ irssi/src/perl/common/Irssi.xs Tue Sep 24 02:28:01 2002
@@ -31,4 +31,3 @@ BOOT:
irssi_boot(Rawlog);
irssi_boot(Server);
irssi_boot(Settings);
- irssi_boot(Blob);

16
net/silc-client/patches/patch-irssi_src_perl_common_module_h Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-irssi_src_perl_common_module_h,v 1.1 2002/09/24 17:20:10 fgsch Exp $
--- irssi/src/perl/common/module.h.orig Sat Jul 6 05:09:39 2002
+++ irssi/src/perl/common/module.h Tue Sep 24 02:28:01 2002
@@ -22,7 +22,6 @@
#include "channels.h"
#include "queries.h"
#include "nicklist.h"
-#include "blob.h"
#include "perl/perl-core.h"
#include "perl/perl-common.h"
@@ -43,4 +42,3 @@ typedef RECONNECT_REC *Irssi__Reconnect;
typedef CHANNEL_REC *Irssi__Channel;
typedef QUERY_REC *Irssi__Query;
typedef NICK_REC *Irssi__Nick;
-typedef BLOB_REC *Irssi__Blob;

11
net/silc-client/patches/patch-irssi_src_perl_common_typemap Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-irssi_src_perl_common_typemap,v 1.1 2002/09/24 17:20:10 fgsch Exp $
--- irssi/src/perl/common/typemap.orig Sat Jul 6 05:09:39 2002
+++ irssi/src/perl/common/typemap Tue Sep 24 02:28:01 2002
@@ -13,7 +13,6 @@ Irssi::Logitem T_PlainObj
Irssi::Rawlog T_PlainObj
Irssi::Module T_PlainObj
Irssi::Windowitem T_IrssiObj
-Irssi::Blob T_PlainObj
INPUT

13
net/silc-client/patches/patch-irssi_src_perl_get-signals_pl Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-irssi_src_perl_get-signals_pl,v 1.1 2002/09/24 17:20:10 fgsch Exp $
--- irssi/src/perl/get-signals.pl.orig Sat Jul 6 05:09:39 2002
+++ irssi/src/perl/get-signals.pl Tue Sep 24 02:28:01 2002
@@ -51,9 +51,6 @@ while (<STDIN>) {
s/WINDOW_REC[^,]*/Irssi::UI::Window/g;
s/WI_ITEM_REC[^,]*/iobject/g;
- # silc
- s/BLOB_REC[^,]*/siobject/g;
-
s/([\w\*:]+)(,|$)/"\1"\2/g;
print " { \"$signal\", { $_, NULL } },\n";
}

35
net/silc-client/patches/patch-irssi_src_perl_perl-common_c Normal file
View File

@ -0,0 +1,35 @@
$OpenBSD: patch-irssi_src_perl_perl-common_c,v 1.1 2002/09/24 17:20:10 fgsch Exp $
--- irssi/src/perl/perl-common.c.orig Sat Jul 6 05:09:39 2002
+++ irssi/src/perl/perl-common.c Tue Sep 24 02:28:01 2002
@@ -39,7 +39,6 @@
#include "channels.h"
#include "queries.h"
#include "nicklist.h"
-#include "blob.h"
#include "perl-common.h"
@@ -230,12 +229,6 @@ void irssi_callXS(void (*subaddr)(CV* cv
PUTBACK;
}
-static void perl_blob_fill_hash(HV *hv, BLOB_REC *blob)
-{
- hv_store(hv, "octets", 6, newSViv(blob->octets), 0);
- hv_store(hv, "data", 4, newSVpv(blob->data, blob->octets), 0);
-}
-
void perl_chatnet_fill_hash(HV *hv, CHATNET_REC *chatnet)
{
char *type, *chat_type;
@@ -631,10 +624,6 @@ void perl_common_start(void)
plain_stashes = g_hash_table_new((GHashFunc) g_str_hash,
(GCompareFunc) g_str_equal);
irssi_add_plains(core_plains);
- irssi_add_object(module_get_uniq_id("BLOB", 0), 0,
- "Irssi::Blob",
- (PERL_OBJECT_FUNC) perl_blob_fill_hash);
-
use_protocols = NULL;
g_slist_foreach(chat_protocols, (GFunc) perl_register_protocol, NULL);

91
net/silc-client/patches/patch-irssi_src_silc_core_client_ops_c Normal file
View File

@ -0,0 +1,91 @@
$OpenBSD: patch-irssi_src_silc_core_client_ops_c,v 1.1 2002/09/24 17:20:10 fgsch Exp $
--- irssi/src/silc/core/client_ops.c.orig Sat Jul 6 05:44:15 2002
+++ irssi/src/silc/core/client_ops.c Tue Sep 24 02:28:01 2002
@@ -39,7 +39,6 @@
#include "fe-common/silc/module-formats.h"
#include "core.h"
-#include "blob.h"
static void
silc_verify_public_key_internal(SilcClient client, SilcClientConnection conn,
@@ -111,20 +110,6 @@ void silc_say_error(char *msg, ...)
va_end(va);
}
-void silc_emit_mime_sig(SILC_SERVER_REC *server, SILC_CHANNEL_REC *channel,
- const char *data, SilcUInt32 data_len,
- const char *encoding, const char *type,
- const char *nick)
-{
- BLOB_REC blob;
-
- blob_fill(&blob);
- blob.octets = data_len;
- blob.data = (char *)data;
-
- signal_emit("mime", 6, server, channel, &blob, encoding, type, nick);
-}
-
/* Message for a channel. The `sender' is the nickname of the sender
received in the packet. The `channel_name' is the name of the channel. */
@@ -157,14 +142,12 @@ void silc_channel_message(SilcClient cli
if (flags & SILC_MESSAGE_FLAG_DATA) {
/* MIME object received, try to display it as well as we can */
- char type[128], enc[128];
+ char type[128];
unsigned char *data;
- SilcUInt32 data_len;
memset(type, 0, sizeof(type));
- memset(enc, 0, sizeof(enc));
if (!silc_mime_parse(message, message_len, NULL, 0, type, sizeof(type) - 1,
- enc, sizeof(enc) - 1, &data, &data_len))
+ NULL, 0, &data, NULL))
return;
/* Then figure out what we can display */
@@ -173,8 +156,9 @@ void silc_channel_message(SilcClient cli
/* It is something textual, display it */
message = (const unsigned char *)data;
} else {
- silc_emit_mime_sig(server, chanrec, data, data_len,
- enc, type, nick->nick);
+ printformat_module("fe-common/silc", server, channel->channel_name,
+ MSGLEVEL_CRAP, SILCTXT_MESSAGE_DATA,
+ nick == NULL ? "[<unknown>]" : nick->nick, type);
message = NULL;
}
}
@@ -239,14 +223,12 @@ void silc_private_message(SilcClient cli
if (flags & SILC_MESSAGE_FLAG_DATA) {
/* MIME object received, try to display it as well as we can */
- char type[128], enc[128];
+ char type[128];
unsigned char *data;
- SilcUInt32 data_len;
memset(type, 0, sizeof(type));
- memset(enc, 0, sizeof(enc));
if (!silc_mime_parse(message, message_len, NULL, 0, type, sizeof(type) - 1,
- enc, sizeof(enc) - 1, &data, &data_len))
+ NULL, 0, &data, NULL))
return;
/* Then figure out what we can display */
@@ -255,8 +237,10 @@ void silc_private_message(SilcClient cli
/* It is something textual, display it */
message = (const unsigned char *)data;
} else {
- silc_emit_mime_sig(server, NULL, data, data_len,
- enc, type, sender->nickname);
+ printformat_module("fe-common/silc", server, NULL,
+ MSGLEVEL_CRAP, SILCTXT_MESSAGE_DATA,
+ sender->nickname ? sender->nickname : "[<unknown>]",
+ type);
message = NULL;
}
}

47
net/silc-client/patches/patch-irssi_src_silc_core_silc-channels_c Normal file
View File

@ -0,0 +1,47 @@
$OpenBSD: patch-irssi_src_silc_core_silc-channels_c,v 1.3 2002/09/24 17:20:10 fgsch Exp $
--- irssi/src/silc/core/silc-channels.c.orig Sat Sep 7 06:36:41 2002
+++ irssi/src/silc/core/silc-channels.c Tue Sep 24 02:28:01 2002
@@ -31,7 +31,6 @@
#include "rawlog.h"
#include "misc.h"
#include "settings.h"
-#include "blob.h"
#include "channels-setup.h"
@@ -46,19 +45,6 @@
#include "silc-commands.h"
-void sig_mime(SILC_SERVER_REC *server, SILC_CHANNEL_REC *channel,
- BLOB_REC *blob, const char *enc, const char *type,
- const char *nick)
-{
- if (!(IS_SILC_SERVER(server)))
- return;
-
- printformat_module("fe-common/silc", server,
- channel == NULL ? NULL : channel->name,
- MSGLEVEL_CRAP, SILCTXT_MESSAGE_DATA,
- nick == NULL ? "[<unknown>]" : nick, type);
-}
-
SILC_CHANNEL_REC *silc_channel_create(SILC_SERVER_REC *server,
const char *name, int automatic)
{
@@ -987,7 +973,6 @@ void silc_channels_init(void)
signal_add("channel destroyed", (SIGNAL_FUNC) sig_channel_destroyed);
signal_add("server connected", (SIGNAL_FUNC) sig_connected);
signal_add("server quit", (SIGNAL_FUNC) sig_server_quit);
- signal_add("mime", (SIGNAL_FUNC) sig_mime);
command_bind_silc("part", MODULE_NAME, (SIGNAL_FUNC) command_part);
command_bind_silc("me", MODULE_NAME, (SIGNAL_FUNC) command_me);
@@ -1005,7 +990,6 @@ void silc_channels_deinit(void)
signal_remove("channel destroyed", (SIGNAL_FUNC) sig_channel_destroyed);
signal_remove("server connected", (SIGNAL_FUNC) sig_connected);
signal_remove("server quit", (SIGNAL_FUNC) sig_server_quit);
- signal_remove("mime", (SIGNAL_FUNC) sig_mime);
command_unbind("part", (SIGNAL_FUNC) command_part);
command_unbind("me", (SIGNAL_FUNC) command_me);

123
net/silc-client/patches/patch-irssi_src_silc_core_silc-servers_c Normal file
View File

@ -0,0 +1,123 @@
$OpenBSD: patch-irssi_src_silc_core_silc-servers_c,v 1.1 2002/09/24 17:20:10 fgsch Exp $
--- irssi/src/silc/core/silc-servers.c.orig Sat Jul 6 05:42:27 2002
+++ irssi/src/silc/core/silc-servers.c Tue Sep 24 02:28:01 2002
@@ -69,8 +69,6 @@ static void silc_send_channel(SILC_SERVE
typedef struct {
char *nick;
char *msg;
- int len;
- SilcMessageFlags flags;
SILC_SERVER_REC *server;
} PRIVMSG_REC;
@@ -123,8 +121,8 @@ static void silc_send_msg_clients(SilcCl
/* Send the private message */
silc_client_send_private_message(client, conn, target,
- rec->flags,
- rec->msg, rec->len,
+ SILC_MESSAGE_FLAG_UTF8,
+ rec->msg, strlen(rec->msg),
TRUE);
}
@@ -134,8 +132,7 @@ static void silc_send_msg_clients(SilcCl
g_free(rec);
}
-static void silc_send_msg(SILC_SERVER_REC *server, char *nick, char *msg,
- int msg_len, SilcMessageFlags flags)
+static void silc_send_msg(SILC_SERVER_REC *server, char *nick, char *msg)
{
PRIVMSG_REC *rec;
SilcClientEntry *clients;
@@ -156,8 +153,6 @@ static void silc_send_msg(SILC_SERVER_RE
rec->nick = g_strdup(nick);
rec->msg = g_strdup(msg);
rec->server = server;
- rec->flags = flags;
- rec->len = msg_len;
/* Could not find client with that nick, resolve it from server. */
silc_client_get_clients(silc_client, server->conn,
@@ -169,51 +164,8 @@ static void silc_send_msg(SILC_SERVER_RE
/* Send the private message directly */
silc_free(nickname);
silc_client_send_private_message(silc_client, server->conn,
- clients[0], flags,
- msg, msg_len, TRUE);
-}
-
-void silc_send_mime(SILC_SERVER_REC *server, WI_ITEM_REC *to,
- const char *data, int data_len,
- const char *enc, const char *type)
-{
- SILC_CHANNEL_REC *channel;
- QUERY_REC *query;
- char *mime_data;
- int mime_data_len;
-
- if (!(IS_SILC_SERVER(server)) || (data == NULL) || (to == NULL) ||
- (enc == NULL) || (type == NULL))
- return;
-
-#define SILC_MIME_HEADER "MIME-Version: 1.0\r\nContent-Type: %s\r\nContent-Transfer-Encoding: %s\r\n\r\n"
-
- mime_data_len = data_len + strlen(SILC_MIME_HEADER) - 4
- + strlen(enc) + strlen(type);
- if (mime_data_len >= SILC_PACKET_MAX_LEN)
- return;
-
- /* we risk to large packets here... */
- mime_data = silc_calloc(mime_data_len, sizeof(*mime_data));
- snprintf(mime_data, mime_data_len, SILC_MIME_HEADER, type, enc);
- memmove(mime_data + strlen(SILC_MIME_HEADER) - 4 + strlen(enc) + strlen(type),
- data, data_len);
-
-#undef SILC_MIME_HEADER
-
- if (IS_SILC_CHANNEL(to)) {
- channel = SILC_CHANNEL(to);
- silc_client_send_channel_message(silc_client, server->conn, channel->entry,
- NULL, SILC_MESSAGE_FLAG_DATA,
- mime_data, mime_data_len, TRUE);
- } else if (IS_SILC_QUERY(to)) {
- query = SILC_QUERY(to);
- silc_send_msg(server, query->name, mime_data, mime_data_len,
- SILC_MESSAGE_FLAG_DATA);
-
- }
-
- silc_free(mime_data);
+ clients[0], SILC_MESSAGE_FLAG_UTF8,
+ msg, strlen(msg), TRUE);
}
static int isnickflag_func(char flag)
@@ -251,9 +203,7 @@ static void send_message(SILC_SERVER_REC
if (target_type == SEND_TARGET_CHANNEL)
silc_send_channel(server, target, message ? message : msg);
else
- silc_send_msg(server, target, message ? message : msg,
- message ? strlen(message) : strlen(msg),
- SILC_MESSAGE_FLAG_UTF8);
+ silc_send_msg(server, target, message ? message : msg);
silc_free(message);
}
@@ -940,7 +890,6 @@ void silc_server_init(void)
signal_add_first("server connected", (SIGNAL_FUNC) sig_connected);
signal_add("server disconnected", (SIGNAL_FUNC) sig_disconnected);
- signal_add("mime-send", (SIGNAL_FUNC)silc_send_mime);
command_bind_silc("whois", MODULE_NAME, (SIGNAL_FUNC) command_self);
command_bind_silc("whowas", MODULE_NAME, (SIGNAL_FUNC) command_self);
command_bind_silc("nick", MODULE_NAME, (SIGNAL_FUNC) command_self);
@@ -976,7 +925,6 @@ void silc_server_deinit(void)
signal_remove("server connected", (SIGNAL_FUNC) sig_connected);
signal_remove("server disconnected", (SIGNAL_FUNC) sig_disconnected);
- signal_remove("mime-send", (SIGNAL_FUNC)silc_send_mime);
command_unbind("whois", (SIGNAL_FUNC) command_self);
command_unbind("whowas", (SIGNAL_FUNC) command_self);
command_unbind("nick", (SIGNAL_FUNC) command_self);

16
net/silc-client/patches/patch-lib_silcmath_mpi_configure
View File

@ -1,21 +1,21 @@
$OpenBSD: patch-lib_silcmath_mpi_configure,v 1.2 2002/05/22 09:58:37 mark Exp $
--- lib/silcmath/mpi/configure.orig Sat May 18 01:41:04 2002
+++ lib/silcmath/mpi/configure Tue May 21 20:07:34 2002
@@ -977,7 +977,7 @@ PATH_SEPARATOR="$ac_path_separator"
rm -f conftest.sh
$OpenBSD: patch-lib_silcmath_mpi_configure,v 1.3 2002/09/24 17:20:10 fgsch Exp $
--- lib/silcmath/mpi/configure.orig Sat Sep 7 14:04:50 2002
+++ lib/silcmath/mpi/configure Thu Sep 19 06:12:06 2002
@@ -978,7 +978,7 @@ rm -f conftest.sh
# Compiler settings
#
-CFLAGS="-g -O -I. -DMP_API_COMPATIBLE $CFLAGS"
+CFLAGS="-I. -DMP_API_COMPATIBLE $CFLAGS"
if test "$GCC"; then
CFLAGS="$CFLAGS -Wall"
fi
@@ -1890,7 +1890,7 @@ if test x$want_asm = xtrue; then
echo "Using assembler optimization"
@@ -1892,7 +1892,7 @@ if test x$want_asm = xtrue; then
echo "Using assembler optimization if possible."
fi
-CFLAGS="$CFLAGS -O -D_REENTRANT"
+CFLAGS="$CFLAGS -D_REENTRANT"
#
# Put here any platform specific stuff
#

18
net/silc-client/patches/patch-lib_silcsim_silcsim_h Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-lib_silcsim_silcsim_h,v 1.1 2002/09/24 17:20:10 fgsch Exp $
--- lib/silcsim/silcsim.h.orig Fri Apr 5 13:54:42 2002
+++ lib/silcsim/silcsim.h Tue Sep 24 02:30:33 2002
@@ -34,8 +34,13 @@ typedef enum {
is that the symbols are resolved as they are loaded. However, if
system doesn't support this we have no other choice but to do it lazy
thus experience some overhead when using the symbol first time. */
+#if defined(RTLD_NOW)
#define SILC_SIM_FLAGS RTLD_NOW
-/*#define SILC_SIM_FLAGS RTLD_LAZY */
+#elif defined(RTLD_LAZY)
+#define SILC_SIM_FLAGS RTLD_LAZY
+#else
+#define SILC_SIM_FLAGS 0
+#endif
/* Prototypes */
SilcSim silc_sim_alloc(SilcSimType type, const char *libname,