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

upgrade to silc-server 1.0

Browse Source
This commit is contained in:
brad 2005-07-24 00:28:33 +00:00
parent 6f06a587a0
commit 586e707126
12 changed files with 95 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/silc-server/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.19 2005/07/05 01:40:45 brad Exp $
# $OpenBSD: Makefile,v 1.20 2005/07/24 00:28:33 brad Exp $
COMMENT= "Secure Internet Live Conferencing (SILC) server"
DISTNAME= silc-server-0.9.19p1
PKGNAME= silc-server-0.9.19.1p1
DISTNAME= silc-server-1.0
CATEGORIES= net
HOMEPAGE= http://www.silcnet.org/
@ -40,7 +39,6 @@ SUBST_VARS= CONFDIR
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.59
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/lib/silcmath/mpi
CONFIGURE_ARGS+= --enable-ipv6 \
--without-irssi \
--with-docdir=${PREFIX}/share/doc/silcd \
@ -54,8 +52,6 @@ CONFIGURE_ARGS+= --enable-ipv6 \
CONFIGURE_ARGS+= --disable-asm
.endif
WRKDIST= ${WRKDIR}/${DISTNAME:S/p1//}
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/silcd
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/silcd

8
net/silc-server/distinfo
View File

@ -1,4 +1,4 @@
MD5 (silc-server-0.9.19p1.tar.gz) = f7b59a302b9586768d41464263d15457
RMD160 (silc-server-0.9.19p1.tar.gz) = 3fc41bd6a1d2680263d1ca8d8636325b4687906d
SHA1 (silc-server-0.9.19p1.tar.gz) = 9fb0ae2ef8db671fc6d9c77d734b89479f8b8b91
SIZE (silc-server-0.9.19p1.tar.gz) = 1598090
MD5 (silc-server-1.0.tar.gz) = d1d8336255805a795cf2c5d6a85b82a8
RMD160 (silc-server-1.0.tar.gz) = 7a3d8de955e22e9d0fc6d7bb7bf2196458748fcc
SHA1 (silc-server-1.0.tar.gz) = a9d6490707fc2a00a01e9b25a417805e90a4a24b
SIZE (silc-server-1.0.tar.gz) = 1326157

12
net/silc-server/patches/patch-Makefile_defines_int_in
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-Makefile_defines_int_in,v 1.3 2004/08/21 22:41:48 naddy Exp $
--- Makefile.defines_int.in.orig Sat Aug 21 19:58:44 2004
+++ Makefile.defines_int.in Sat Aug 21 19:59:03 2004
@@ -30,7 +30,7 @@ silc_install_prefix=@prefix@
$OpenBSD: patch-Makefile_defines_int_in,v 1.4 2005/07/24 00:28:33 brad Exp $
--- Makefile.defines_int.in.orig Tue May 10 12:58:55 2005
+++ Makefile.defines_int.in Mon Jul 4 22:47:41 2005
@@ -29,7 +29,7 @@ silc_install_prefix=@prefix@
#
# Common libraries that are linked against the created executable
#
-SILC_COMMON_LIBS= @LIBS@ -L$(silc_top_srcdir)/lib -lsilc
+SILC_COMMON_LIBS= @LIBS@ $(silc_top_srcdir)/lib/libsilc.la
-SILC_COMMON_LIBS= -L$(silc_top_srcdir)/lib -lsilc @LIBS@
+SILC_COMMON_LIBS= $(silc_top_srcdir)/lib/libsilc.la @LIBS@
#
# Common compilation flags

12
net/silc-server/patches/patch-Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-Makefile_in,v 1.7 2005/04/07 00:49:18 brad Exp $
--- Makefile.in.orig Wed Apr 6 06:03:14 2005
+++ Makefile.in Wed Apr 6 11:24:05 2005
@@ -864,7 +864,7 @@ generate-server-key:
@SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs-client sim-install doc-install-client etc-install-client
@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_TRUE@install-data-hook: install-dirs-client install-dirs-server sim-install doc-install-client doc-install-server toolkit-install examples-install etc-install-client etc-install-server
-@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_FALSE@install-data-hook: install-dirs-server sim-install doc-install-server examples-install etc-install-server generate-server-key
+@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_FALSE@install-data-hook: doc-install-server examples-install
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

26
net/silc-server/patches/patch-apps_silcd_Makefile_in Normal file
View File

@ -0,0 +1,26 @@
$OpenBSD: patch-apps_silcd_Makefile_in,v 1.1 2005/07/24 00:28:33 brad 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:
fi
examples-install:
- -mkdir -p $(docdir)/examples/
- -$(INSTALL_DATA) $(top_srcdir)/doc/examples/* $(docdir)/examples/
+ -mkdir -p $(datadir)/examples/silcd/
+ -$(INSTALL_DATA) $(top_srcdir)/doc/examples/* $(datadir)/examples/silcd/
generate-server-key:
-@if test '!' -f $(etcdir)/silcd.pub ; then \
@@ -614,11 +614,8 @@ generate-server-key:
fi
install-data-hook: \
- install-dirs-server \
doc-install-server \
- etc-install-server \
examples-install \
- generate-server-key
@INCLUDE_DEFINES_INT@

24
net/silc-server/patches/patch-configure_in → net/silc-server/patches/patch-configure_ac
View File

@ -1,16 +1,17 @@
$OpenBSD: patch-configure_in,v 1.7 2005/04/07 00:49:18 brad Exp $
--- configure.in.orig Wed Apr 6 06:02:05 2005
+++ configure.in Wed Apr 6 11:24:04 2005
@@ -39,7 +39,7 @@ AM_INIT_AUTOMAKE(silc-server, 0.9.19)
AC_PREREQ(2.52)
AC_CONFIG_HEADERS(includes/silcdefs.h)
$OpenBSD: patch-configure_ac,v 1.1 2005/07/24 00:28:33 brad Exp $
--- configure.ac.orig Mon Jul 4 22:52:15 2005
+++ configure.ac Mon Jul 4 22:53:28 2005
@@ -51,9 +51,6 @@ case "$target" in
;;
esac
-CFLAGS=
+
-# Control compiler optimizations
-CFLAGS=`echo $CFLAGS | sed 's/-O[ 0123456789s]*//g'`
-
AC_PROG_CC
AC_C_INLINE
AC_C_CONST
@@ -295,31 +295,7 @@ AC_DEFUN([SILC_ADD_CFLAGS],
@@ -305,35 +302,8 @@ AC_DEFUN([SILC_ADD_CC_FLAGS],
unset tmp_CFLAGS
])
@ -22,12 +23,16 @@ $OpenBSD: patch-configure_in,v 1.7 2005/04/07 00:49:18 brad Exp $
- SILC_ADD_CFLAGS(-g -O2)
- fi
- SILC_ADD_CFLAGS(-Wall -finline-functions)
- SILC_ADD_CFLAGS(-Wno-pointer-sign)
-else
- # Other compilers
- case "$target" in
- alpha*-dec-osf*)
- SILC_ADD_CFLAGS(-g3 -O2, SILC_ADD_CFLAGS(-g3 -O, SILC_ADD_CFLAGS(-O)))
- ;;
- mips*-sgi-irix*)
- SILC_ADD_CFLAGS(-g3 -O2, SILC_ADD_CFLAGS(-g3 -O, SILC_ADD_CFLAGS(-O)))
- ;;
- *)
- SILC_ADD_CFLAGS(-g)
- SILC_ADD_CFLAGS(-O2, SILC_ADD_CFLAGS(-O))
@ -40,6 +45,7 @@ $OpenBSD: patch-configure_in,v 1.7 2005/04/07 00:49:18 brad Exp $
- fi
-fi
+SILC_ADD_CFLAGS(-Wall -finline-functions)
+SILC_ADD_CFLAGS(-Wno-pointer-sign)
#
# Workaround a bug in GCC 2.x which causes memory exhaustion

16
net/silc-server/patches/patch-doc_example_silcd_conf_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-doc_example_silcd_conf_in,v 1.5 2005/04/07 00:49:18 brad Exp $
--- doc/example_silcd.conf.in.orig Fri Mar 11 07:15:36 2005
+++ doc/example_silcd.conf.in Wed Apr 6 11:22:33 2005
$OpenBSD: patch-doc_example_silcd_conf_in,v 1.6 2005/07/24 00:28:33 brad Exp $
--- doc/example_silcd.conf.in.orig Mon May 2 03:47:47 2005
+++ doc/example_silcd.conf.in Mon Jul 4 22:45:40 2005
@@ -35,7 +35,7 @@ General {
# This is the default path where to search modules. If omitted
# built-in modules will be used. Built-in modules will also be
@ -10,7 +10,7 @@ $OpenBSD: patch-doc_example_silcd_conf_in,v 1.5 2005/04/07 00:49:18 brad Exp $
# If both passphrase and public key authentication is set for a
# connection the public key authentication is the preferred one
@@ -171,14 +171,14 @@ ServerInfo {
@@ -174,14 +174,14 @@ ServerInfo {
#
# Server name (FQDN)
#
@ -27,7 +27,7 @@ $OpenBSD: patch-doc_example_silcd_conf_in,v 1.5 2005/04/07 00:49:18 brad Exp $
port = 706;
};
@@ -198,24 +198,24 @@ ServerInfo {
@@ -201,24 +201,24 @@ ServerInfo {
#
# Geographic location
#
@ -57,7 +57,7 @@ $OpenBSD: patch-doc_example_silcd_conf_in,v 1.5 2005/04/07 00:49:18 brad Exp $
#
# Public and private keys
@@ -441,10 +441,10 @@ Client {
@@ -444,10 +444,10 @@ Client {
# required.
#
Admin {
@ -72,7 +72,7 @@ $OpenBSD: patch-doc_example_silcd_conf_in,v 1.5 2005/04/07 00:49:18 brad Exp $
# PublicKey = "/path/to/the/public.pub";
};
@@ -467,13 +467,13 @@ Admin {
@@ -470,13 +470,13 @@ Admin {
# to true. For normal connections set it false. If it is set to true then
# your server will be backup router.
#
@ -93,7 +93,7 @@ $OpenBSD: patch-doc_example_silcd_conf_in,v 1.5 2005/04/07 00:49:18 brad Exp $
#
# Configured router connections
@@ -503,17 +503,17 @@ ServerConnection {
@@ -506,17 +506,17 @@ ServerConnection {
# backup router is in our cell then set the "BackupLocal" option to true.
# If the backup router is in other cell then set it to false.
#

8
net/silc-server/patches/patch-lib_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lib_Makefile_in,v 1.6 2005/04/07 00:49:18 brad Exp $
--- lib/Makefile.in.orig Wed Apr 6 06:02:57 2005
+++ lib/Makefile.in Wed Apr 6 11:24:05 2005
@@ -591,7 +591,6 @@ install-data-am: install-pkgconfigDATA
$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:
install-exec-am:
@$(NORMAL_INSTALL)

11
net/silc-server/patches/patch-lib_silcsim_Makefile_in Normal file
View File

@ -0,0 +1,11 @@
$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:
install-data-am:
@$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) install-data-hook
install-exec-am:

14
net/silc-server/patches/patch-lib_silcutil_silcconfig_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lib_silcutil_silcconfig_c,v 1.1 2005/07/05 01:40:45 brad Exp $
--- lib/silcutil/silcconfig.c.orig Mon Jul 4 21:17:54 2005
+++ lib/silcutil/silcconfig.c Mon Jul 4 21:19:22 2005
@@ -94,7 +94,7 @@ char *silc_config_strerror(int errnum)
$OpenBSD: patch-lib_silcutil_silcconfig_c,v 1.2 2005/07/24 00:28:33 brad Exp $
--- lib/silcutil/silcconfig.c.orig Sun May 1 04:00:16 2005
+++ lib/silcutil/silcconfig.c Mon Jul 4 22:45:40 2005
@@ -93,7 +93,7 @@ char *silc_config_strerror(int errnum)
/* Points the first non-space character */
static void my_trim_spaces(SilcConfigFile *file)
{
@ -10,7 +10,7 @@ $OpenBSD: patch-lib_silcutil_silcconfig_c,v 1.1 2005/07/05 01:40:45 brad Exp $
while ((*r != '\0' && *r != EOF) && isspace(*r))
if (*r++ == '\n') file->line++;
file->p = r;
@@ -102,7 +102,7 @@ static void my_trim_spaces(SilcConfigFil
@@ -101,7 +101,7 @@ static void my_trim_spaces(SilcConfigFil
/* Skips the current line until newline (lf or cr) */
static void my_skip_line(SilcConfigFile *file)
{
@ -19,7 +19,7 @@ $OpenBSD: patch-lib_silcutil_silcconfig_c,v 1.1 2005/07/05 01:40:45 brad Exp $
while ((*r != '\0' && *r != EOF) && (*r != '\n') && (*r != '\r')) r++;
file->p = ((*r != '\0' && *r != EOF) ? r + 1 : r);
file->line++;
@@ -321,9 +321,9 @@ SilcUInt32 silc_config_get_line(SilcConf
@@ -320,9 +320,9 @@ SilcUInt32 silc_config_get_line(SilcConf
char *silc_config_read_line(SilcConfigFile *file, SilcUInt32 line)
{
@ -31,7 +31,7 @@ $OpenBSD: patch-lib_silcutil_silcconfig_c,v 1.1 2005/07/05 01:40:45 brad Exp $
if (!file || (line <= 0))
return NULL;
@@ -446,7 +446,7 @@ bool silc_config_register_table(SilcConf
@@ -445,7 +445,7 @@ bool silc_config_register_table(SilcConf
static int silc_config_main_internal(SilcConfigEntity ent)
{
SilcConfigFile *file = ent->file;

12
net/silc-server/patches/patch-silcd_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-silcd_Makefile_in,v 1.2 2005/04/07 00:49:18 brad Exp $
--- silcd/Makefile.in.orig Wed Apr 6 06:03:12 2005
+++ silcd/Makefile.in Wed Apr 6 11:24:06 2005
@@ -180,7 +180,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
-LIBS = $(SILC_COMMON_LIBS) -lsilc
+LIBS = $(SILC_COMMON_LIBS) $(top_srcdir)/lib/libsilc.la
LIBSILCCLIENT_AGE = @LIBSILCCLIENT_AGE@
LIBSILCCLIENT_CURRENT = @LIBSILCCLIENT_CURRENT@
LIBSILCCLIENT_REVISION = @LIBSILCCLIENT_REVISION@

17
net/silc-server/pkg/PLIST
View File

@ -1,16 +1,23 @@
@comment $OpenBSD: PLIST,v 1.9 2005/07/05 01:14:16 niallo Exp $
@comment $OpenBSD: PLIST,v 1.10 2005/07/24 00:28:33 brad Exp $
@newgroup _silcd:512
@newuser _silcd:512:_silcd:daemon:Silc-server Account:/nonexistent:/sbin/nologin
@man man/man5/silcd.conf.5
@man man/man8/silcd.8
sbin/silcd
share/doc/silcd/
@comment share/doc/silcd/CHANGES
@comment share/doc/silcd/COPYING
@comment share/doc/silcd/CREDITS
share/doc/silcd/FAQ
@comment share/doc/silcd/INSTALL
share/doc/silcd/README
share/doc/silcd/examples/
share/doc/silcd/examples/README
share/doc/silcd/examples/silcd.prv
share/doc/silcd/examples/silcd.pub
@comment share/doc/silcd/TODO
@comment share/doc/silcd/draft-riikonen-presence-attrs-03.txt
@comment share/doc/silcd/draft-riikonen-silc-commands-06.txt
@comment share/doc/silcd/draft-riikonen-silc-flags-payloads-04.txt
@comment share/doc/silcd/draft-riikonen-silc-ke-auth-08.txt
@comment share/doc/silcd/draft-riikonen-silc-pp-09.txt
@comment share/doc/silcd/draft-riikonen-silc-spec-08.txt
@owner _silcd
@group _silcd
@mode 0700