From d1a318349d4b6238614e92cf45d6112bd4920dfa Mon Sep 17 00:00:00 2001
From: brad <brad@openbsd.org>
Date: Wed, 14 Dec 2005 21:35:23 +0000
Subject: [PATCH] upgrade to silc-server 1.0.2; no functional change

---
 net/silc-server/Makefile                             |  4 ++--
 net/silc-server/distinfo                             |  8 ++++----
 net/silc-server/patches/patch-apps_silcd_Makefile_in | 10 +++++-----
 net/silc-server/patches/patch-lib_Makefile_in        |  8 ++++----
 net/silc-server/patches/patch-lib_silccrypt_sha256_c | 12 ------------
 .../patches/patch-lib_silcsim_Makefile_in            |  8 ++++----
 6 files changed, 19 insertions(+), 31 deletions(-)
 delete mode 100644 net/silc-server/patches/patch-lib_silccrypt_sha256_c

diff --git a/net/silc-server/Makefile b/net/silc-server/Makefile
index 1a7852221ef..1b39a5ccdd6 100644
--- a/net/silc-server/Makefile
+++ b/net/silc-server/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.28 2005/12/14 02:11:40 brad Exp $
+# $OpenBSD: Makefile,v 1.29 2005/12/14 21:35:23 brad Exp $
 
 COMMENT=	"Secure Internet Live Conferencing (SILC) server"
 
-DISTNAME=	silc-server-1.0.1
+DISTNAME=	silc-server-1.0.2
 CATEGORIES=	net
 
 HOMEPAGE=	http://www.silcnet.org/
diff --git a/net/silc-server/distinfo b/net/silc-server/distinfo
index f1226f9dd39..5d96f6f4d19 100644
--- a/net/silc-server/distinfo
+++ b/net/silc-server/distinfo
@@ -1,4 +1,4 @@
-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
+MD5 (silc-server-1.0.2.tar.gz) = 249b6743f28335ca9dcd674a91a35960
+RMD160 (silc-server-1.0.2.tar.gz) = d995bb71bac8e49db770ecd7cbbdfe667eb4ff04
+SHA1 (silc-server-1.0.2.tar.gz) = 12ec4313e2d92ad64ebee6f09a6473532aa6c0f1
+SIZE (silc-server-1.0.2.tar.gz) = 1209262
diff --git a/net/silc-server/patches/patch-apps_silcd_Makefile_in b/net/silc-server/patches/patch-apps_silcd_Makefile_in
index 2afe50c1f1e..3f294d96182 100644
--- a/net/silc-server/patches/patch-apps_silcd_Makefile_in
+++ b/net/silc-server/patches/patch-apps_silcd_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-apps_silcd_Makefile_in,v 1.2 2005/11/04 00:09:56 naddy Exp $
---- apps/silcd/Makefile.in.orig	Tue May 10 12:59:04 2005
-+++ apps/silcd/Makefile.in	Tue Jul  5 00:12:52 2005
-@@ -605,8 +605,8 @@ etc-install-server:
+$OpenBSD: patch-apps_silcd_Makefile_in,v 1.3 2005/12/14 21:35:23 brad Exp $
+--- apps/silcd/Makefile.in.orig	Wed Dec 14 08:47:35 2005
++++ apps/silcd/Makefile.in	Wed Dec 14 16:25:31 2005
+@@ -604,8 +604,8 @@ etc-install-server:
  	fi
  
  examples-install:
@@ -12,7 +12,7 @@ $OpenBSD: patch-apps_silcd_Makefile_in,v 1.2 2005/11/04 00:09:56 naddy Exp $
  
  generate-server-key:
  	-@if test '!' -f $(etcdir)/silcd.pub ; then \
-@@ -614,11 +614,8 @@ generate-server-key:
+@@ -613,11 +613,8 @@ generate-server-key:
  	fi
  
  install-data-hook: 		\
diff --git a/net/silc-server/patches/patch-lib_Makefile_in b/net/silc-server/patches/patch-lib_Makefile_in
index b47d742ebf0..17b9eeebd65 100644
--- a/net/silc-server/patches/patch-lib_Makefile_in
+++ b/net/silc-server/patches/patch-lib_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-lib_Makefile_in,v 1.7 2005/07/24 00:28:33 brad Exp $
---- lib/Makefile.in.orig	Tue May 10 12:59:04 2005
-+++ lib/Makefile.in	Mon Jul  4 22:45:40 2005
-@@ -568,7 +568,6 @@ install-data-am:
+$OpenBSD: patch-lib_Makefile_in,v 1.8 2005/12/14 21:35:23 brad Exp $
+--- lib/Makefile.in.orig	Wed Dec 14 08:47:35 2005
++++ lib/Makefile.in	Wed Dec 14 16:25:31 2005
+@@ -553,7 +553,6 @@ install-data-am:
  
  install-exec-am:
  	@$(NORMAL_INSTALL)
diff --git a/net/silc-server/patches/patch-lib_silccrypt_sha256_c b/net/silc-server/patches/patch-lib_silccrypt_sha256_c
deleted file mode 100644
index a479af0af06..00000000000
--- a/net/silc-server/patches/patch-lib_silccrypt_sha256_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$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 */
diff --git a/net/silc-server/patches/patch-lib_silcsim_Makefile_in b/net/silc-server/patches/patch-lib_silcsim_Makefile_in
index 3622ec6be09..0e8f8b27f7a 100644
--- a/net/silc-server/patches/patch-lib_silcsim_Makefile_in
+++ b/net/silc-server/patches/patch-lib_silcsim_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-lib_silcsim_Makefile_in,v 1.1 2005/07/24 00:28:33 brad Exp $
---- lib/silcsim/Makefile.in.orig	Mon Jul  4 23:56:27 2005
-+++ lib/silcsim/Makefile.in	Mon Jul  4 23:56:43 2005
-@@ -511,7 +511,6 @@ info-am:
+$OpenBSD: patch-lib_silcsim_Makefile_in,v 1.2 2005/12/14 21:35:24 brad Exp $
+--- lib/silcsim/Makefile.in.orig	Wed Dec 14 08:47:35 2005
++++ lib/silcsim/Makefile.in	Wed Dec 14 16:25:31 2005
+@@ -509,7 +509,6 @@ info-am:
  
  install-data-am:
  	@$(NORMAL_INSTALL)