summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoragc <agc>2004-07-15 19:38:29 +0000
committeragc <agc>2004-07-15 19:38:29 +0000
commit4738f0a0583bebd1bc81001448a905f11e789da8 (patch)
tree0e58724c18c9430ebc85051874eb7803e7cb09de
parent243f273d83c07f1e2e1766530c635d7446cecdf0 (diff)
downloadpkgsrc-4738f0a0583bebd1bc81001448a905f11e789da8.tar.gz
Pullup ticket 60 to the pkgsrc-2004Q2 branch, requested by Lubomir Sedlacik
Solaris build fix. Module Name: pkgsrc Committed By: salo Date: Mon Jul 12 21:40:02 UTC 2004 Modified Files: pkgsrc/chat/silc-server: distinfo Added Files: pkgsrc/chat/silc-server/patches: patch-af Log Message: Bring patch from SILC cvs, "extern inline" -> "static inline". Fixes build on Solaris with SunPro compiler.
-rw-r--r--chat/silc-server/distinfo3
-rw-r--r--chat/silc-server/patches/patch-af13
-rw-r--r--doc/CHANGES-pkgsrc-2004Q24
3 files changed, 18 insertions, 2 deletions
diff --git a/chat/silc-server/distinfo b/chat/silc-server/distinfo
index d1b000b0544..420501ef08f 100644
--- a/chat/silc-server/distinfo
+++ b/chat/silc-server/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2004/06/11 10:05:06 salo Exp $
+$NetBSD: distinfo,v 1.24.2.1 2004/07/15 19:38:29 agc Exp $
SHA1 (silc-server-0.9.18.tar.bz2) = 232f10fc0f587b8028346bacf80d11443c4792c8
Size (silc-server-0.9.18.tar.bz2) = 1169331 bytes
@@ -7,3 +7,4 @@ SHA1 (patch-ab) = 55b3f00076c5b8a443465753ae07b9e812236f18
SHA1 (patch-ac) = a265c4d5f98e0dc10080fbcc29a9c0c43659907d
SHA1 (patch-ad) = 9511132935ecc38e6192458e61e2445a381f0ea4
SHA1 (patch-ae) = c4d1e29691dc993a5d27b3b8242e0bb4ae4dc018
+SHA1 (patch-af) = 7ae691611573c355c401863e621435675df9cae3
diff --git a/chat/silc-server/patches/patch-af b/chat/silc-server/patches/patch-af
new file mode 100644
index 00000000000..8c9783e95ca
--- /dev/null
+++ b/chat/silc-server/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1.2.2 2004/07/15 19:38:29 agc Exp $
+
+--- silcd/route.h.orig Mon Mar 3 17:56:04 2003
++++ silcd/route.h Mon Jul 12 23:27:35 2004
+@@ -54,7 +54,7 @@
+ /* Returns route cache hash table entry index. This is IPv4 specific.
+ `port' argument may be zero (0) if it doesn't exist. This has been
+ taken from Linux kernel's route cache code. */
+-extern inline
++static inline
+ SilcUInt32 silc_server_route_hash(unsigned int addr,
+ SilcUInt16 port)
+ {
diff --git a/doc/CHANGES-pkgsrc-2004Q2 b/doc/CHANGES-pkgsrc-2004Q2
index 17a4c77cb74..f586bd9d98c 100644
--- a/doc/CHANGES-pkgsrc-2004Q2
+++ b/doc/CHANGES-pkgsrc-2004Q2
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.26 2004/07/15 19:33:08 agc Exp $
+$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.27 2004/07/15 19:38:29 agc Exp $
Changes to the packages collection and infrastructure on the
pkgsrc-2004Q2 branch:
@@ -48,3 +48,5 @@ Pullup ticket 55, requested by Lubomir Sedlacik [agc 2004-07-15]
Solaris psify build fix
Pullup ticket 59, requested by Grant Beattie [agc 2004-07-15]
libxml2 PLIST fix
+Pullup ticket 60, requested by Lubomir Sedlacik [agc 2004-07-15]
+ Solaris silc-server fix