Changes 1.1.10 (toolkit):

* More string format fixes in silcd and client libary
* configure: changed AC_PROG_LIBTOOL order to fix disabling shared libs
* configure: check threads support in OpenBSD
* Fixed string format vulnerability in client entry handling
* Reported and patch provided by William Cummings
* silcd: Fixed IDENTIFY command reply handling for channels

Changes 1.1.18 (server):
* silcd: Added heartbeat support
* Added support for sending SILC_PACKET_HEARTBEAT packets to connection,
  to make sure they keep alive and to detect if they have died
* Set SO_KEEPALIVE for all accept()ed sockets
* silcd: Fixed SIGUSR1 signal handling
* Fixed the SIGUSR1 signal handling which can be used to dump the server
  internals to /tmp.
* Changed also End of Stream handling to handle NULL idata pointer instead
  of ignoring the EOS in case it is NULL.
* Changed also the DETACH timeout handling to use the packet stream
  directly instead of looking up client in the callback
* More string format fixes in silcd and client libary

1 files changed, 23 insertions, 32 deletions

diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile
index f7a05f602e6..17a7d65e921 100644
--- a/chat/silc-server/Makefile
+++ b/chat/silc-server/Makefile
@@ -1,23 +1,30 @@
-# $NetBSD: Makefile,v 1.62 2010/02/19 21:01:36 joerg Exp $
-#
+# $NetBSD: Makefile,v 1.63 2010/08/30 11:17:16 adam Exp $
 
-DISTNAME=		silc-server-1.1.6
-PKGREVISION=		1
-CATEGORIES=		chat security
-MASTER_SITES=		http://www.silcnet.org/download/server/sources/ \
-			ftp://ftp.silcnet.org/silc/server/sources/ 
-EXTRACT_SUFX=		.tar.bz2
+DISTNAME=	silc-server-1.1.18
+CATEGORIES=	chat security
+MASTER_SITES=	http://www.silcnet.org/download/server/sources/ \
+		ftp://ftp.silcnet.org/silc/server/sources/
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=		salo@NetBSD.org
-HOMEPAGE=		http://www.silcnet.org/
-COMMENT=		Server for the Secure Internet Live Conferencing (SILC) protocol
+MAINTAINER=	salo@NetBSD.org
+HOMEPAGE=	http://www.silcnet.org/
+COMMENT=	Server for the Secure Internet Live Conferencing (SILC) protocol
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-OVERRIDE_DIRDEPTH=	3
-SHLIBTOOL_OVERRIDE=	# empty
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--disable-optimizations
+CONFIGURE_ARGS+=	--with-logsdir=${VARBASE}/log/silcd
+CONFIGURE_ARGS+=	--with-silc-includes=${BUILDLINK_PREFIX.silc-toolkit}/include/silc
+CONFIGURE_ARGS+=	--with-silc-libs=${BUILDLINK_PREFIX.silc-toolkit}/libs
+CONFIGURE_ARGS+=	--with-silcd-config-file=${PKG_SYSCONFDIR}/silcd.conf
+CONFIGURE_ARGS+=	--with-silcd-pid-file=${VARBASE}/run/silcd.pid
+CONFIGURE_ARGS+=	--without-gmp
+CONFIGURE_ARGS+=	--without-iconv
+#.if ${MACHINE_ARCH} != "i386"
+#CONFIGURE_ARGS+=	--disable-asm
+#.endif
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -31,7 +38,7 @@ PKG_GROUPS_VARS+=	SILCD_GROUP
 PKG_SYSCONFSUBDIR?=	${PKGBASE}
 
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
-MAKE_ENV+=		examplesdir=${EGDIR:Q}
+MAKE_ENV+=		examplesdir=${EGDIR}
 
 CONF_FILES_MODE=	0600
 CONF_FILES+=		${EGDIR}/silcd.conf.default \
@@ -50,25 +57,8 @@ RCD_SCRIPT_SRC.silcd=	${FILESDIR}/silcd.generic
 .endif
 
 BUILD_DEFS+=		VARBASE
-
 OWN_DIRS_PERMS+=	${VARBASE}/log/silcd ${SILCD_USER} ${SILCD_GROUP} 0700
 
-CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/${PKGBASE}
-CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/${PKGBASE}
-CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+=	--with-silcd-config-file=${PKG_SYSCONFDIR}/silcd.conf
-CONFIGURE_ARGS+=	--with-simdir=${PREFIX}/lib/${PKGBASE}/modules
-CONFIGURE_ARGS+=	--with-logsdir=${VARBASE}/log/silcd
-CONFIGURE_ARGS+=	--with-silcd-pid-file=${VARBASE}/run/silcd.pid
-CONFIGURE_ARGS+=	--without-iconv
-CONFIGURE_ARGS+=	--without-libtoolfix
-# Doesn't work -- shared libraries are not installed
-#CONFIGURE_ARGS+=	--enable-shared
-
-.if ${MACHINE_ARCH} != "i386"
-CONFIGURE_ARGS+=	--disable-asm
-.endif
-
 .include "options.mk"
 
 SUBST_CLASSES+=		paths
@@ -84,4 +74,5 @@ INSTALLATION_DIRS+=	${EGDIR}
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/motd.txt ${DESTDIR}${EGDIR}/motd.txt.default
 
+.include "../../devel/silc-toolkit/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"