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

*** empty log message ***

Browse Source
This commit is contained in:
sthen 2009-08-11 21:17:21 +00:00
parent 15eb2d9665
commit a496d4a8d8
5 changed files with 18 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devel/silc-toolkit/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.25 2009/08/01 19:24:07 sthen Exp $
# $OpenBSD: Makefile,v 1.26 2009/08/11 21:17:21 sthen Exp $
COMMENT= toolkit for the development of SILC applications
DISTNAME= silc-toolkit-1.1.9
PKGNAME= ${DISTNAME}p4
DISTNAME= silc-toolkit-1.1.10
CATEGORIES= devel
MASTER_SITES= http://www.silcnet.org/download/toolkit/sources/

10
devel/silc-toolkit/distinfo
View File

@ -1,5 +1,5 @@
MD5 (silc-toolkit-1.1.9.tar.gz) = is/FadMC9ChFgg9KzuLBWA==
RMD160 (silc-toolkit-1.1.9.tar.gz) = 0TJGoY11LYY4f3TPx/VVY80LFr4=
SHA1 (silc-toolkit-1.1.9.tar.gz) = SmcA/xs8jsO6kIgvXu7Gxi5oTbs=
SHA256 (silc-toolkit-1.1.9.tar.gz) = yuNstEbHVo6LAcYmSEwHN1FQLB2B7vbHW9KsKLInSQw=
SIZE (silc-toolkit-1.1.9.tar.gz) = 2509373
MD5 (silc-toolkit-1.1.10.tar.gz) = tLy37Gyx/YdFbRWEYuB2FA==
RMD160 (silc-toolkit-1.1.10.tar.gz) = cEdO/035JAkfTuZEG9p3q7iDzoM=
SHA1 (silc-toolkit-1.1.10.tar.gz) = Um7leDwGv7i+nUNt5SwW04Q+rm4=
SHA256 (silc-toolkit-1.1.10.tar.gz) = zFsQlLAnvYliQZk8zRYJo3hF0hsvRCVWp+ndrvBiYws=
SIZE (silc-toolkit-1.1.10.tar.gz) = 2517260

24
devel/silc-toolkit/patches/patch-configure_ac
View File

@ -1,17 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.3 2009/08/01 19:24:07 sthen Exp $
--- configure.ac.orig Thu Jan 8 09:29:31 2009
+++ configure.ac Sat Aug 1 12:09:07 2009
@@ -50,6 +50,9 @@ case "$target" in
*-*-netbsd*)
check_threads=true
;;
+ *-*-openbsd*)
+ check_threads=true
+ ;;
*-*-*bsd*)
check_threads=false
;;
@@ -94,9 +97,6 @@ AM_CONDITIONAL(SILC_X86_64, test x$cpu_x86_64 = xtrue)
$OpenBSD: patch-configure_ac,v 1.4 2009/08/11 21:17:21 sthen Exp $
--- configure.ac.orig Fri Aug 7 07:51:30 2009
+++ configure.ac Tue Aug 11 14:46:10 2009
@@ -97,9 +97,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)
@ -21,7 +11,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2009/08/01 19:24:07 sthen Exp $
AC_PROG_CC
AC_C_INLINE
AC_C_CONST
@@ -487,59 +487,9 @@ fi
@@ -490,59 +487,9 @@ fi
## Compiler and compiler flag checks
##
@ -83,7 +73,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2009/08/01 19:24:07 sthen Exp $
#
# Workaround a bug in GCC 2.x which causes memory exhaustion
# when compiling sha1 with optimizations on UltraSPARC.
@@ -1010,7 +960,7 @@ if test x$check_threads = xtrue; then
@@ -1013,7 +960,7 @@ if test x$check_threads = xtrue; then
AC_MSG_RESULT(yes)
AC_CHECK_HEADERS(pthread.h,
[
@ -92,7 +82,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2009/08/01 19:24:07 sthen Exp $
AC_CHECK_LIB(pthread, pthread_attr_init, has_threads=true,
[
# FreeBSD
@@ -1044,7 +994,7 @@ if test x$check_threads = xtrue; then
@@ -1047,7 +994,7 @@ if test x$check_threads = xtrue; then
AC_CHECK_HEADERS(pthread.h,
[

8
devel/silc-toolkit/patches/patch-lib_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lib_Makefile_in,v 1.4 2009/01/10 01:30:54 sthen Exp $
--- lib/Makefile.in.orig Thu Jan 8 09:29:31 2009
+++ lib/Makefile.in Fri Jan 9 18:39:43 2009
@@ -283,7 +283,7 @@ AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
$OpenBSD: patch-lib_Makefile_in,v 1.5 2009/08/11 21:17:21 sthen Exp $
--- lib/Makefile.in.orig Fri Aug 7 07:51:30 2009
+++ lib/Makefile.in Tue Aug 11 14:46:10 2009
@@ -285,7 +285,7 @@ AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
# SILC Library dirs
SILCLIB_DIRS = contrib silccore silcutil silcapputil silccrypt silcskr silcmath silcsim silcasn1 silcske silchttp silcsftp silcvcard
@SILC_ENABLE_SHARED_FALSE@LIBTOOL_OPTS =

41
devel/silc-toolkit/patches/patch-lib_silcclient_client_entry_c
View File

@ -1,41 +0,0 @@
$OpenBSD: patch-lib_silcclient_client_entry_c,v 1.1 2009/08/01 17:22:26 sthen Exp $
fix format-string vulnerability, from silc-client upstream
--- lib/silcclient/client_entry.c.orig Sat Aug 1 14:35:35 2009
+++ lib/silcclient/client_entry.c Sat Aug 1 14:36:18 2009
@@ -801,10 +801,10 @@ SilcClientEntry silc_client_add_client(SilcClient clie
client_entry->server, sizeof(client_entry->server));
if (nickname && client->internal->params->full_nicknames)
silc_snprintf(client_entry->nickname, sizeof(client_entry->nickname),
- nickname);
+ "%s", nickname);
else if (nickname)
silc_snprintf(client_entry->nickname, sizeof(client_entry->nickname),
- parsed);
+ "%s", parsed);
silc_parse_userfqdn(username, client_entry->username,
sizeof(client_entry->username),
@@ -900,10 +900,10 @@ void silc_client_update_client(SilcClient client,
client_entry->server, sizeof(client_entry->server));
if (client->internal->params->full_nicknames)
silc_snprintf(client_entry->nickname, sizeof(client_entry->nickname),
- nickname);
+ "%s", nickname);
else
silc_snprintf(client_entry->nickname, sizeof(client_entry->nickname),
- parsed);
+ "%s", parsed);
/* Normalize nickname */
nick = silc_identifier_check(parsed, strlen(parsed),
@@ -1206,7 +1206,7 @@ SilcClientEntry silc_client_nickname_format(SilcClient
return NULL;
silc_snprintf(client_entry->nickname, sizeof(client_entry->nickname),
- cp);
+ "%s", cp);
silc_free(cp);
}