upgrade to silc-server 0.9.13.1

--
From: MAINTAINER with some changes from me.
This commit is contained in:
brad 2003-05-04 04:02:53 +00:00
parent 702643e1f4
commit b266c16d40
8 changed files with 115 additions and 62 deletions

View File

@ -1,8 +1,12 @@
# $OpenBSD: Makefile,v 1.3 2003/01/26 19:11:17 brad Exp $
# $OpenBSD: Makefile,v 1.4 2003/05/04 04:02:53 brad Exp $
COMMENT= "Secure Live Internet Conferencing (SILC) server"
.if ${MACHINE_ARCH} == "powerpc"
BROKEN= "config file parser bug on ${MACHINE_ARCH}"
.endif
DISTNAME= silc-server-0.9.12
COMMENT= "Secure Internet Live Conferencing (SILC) server"
DISTNAME= silc-server-0.9.13.1
CATEGORIES= net
HOMEPAGE= http://www.silcnet.org/
@ -30,7 +34,8 @@ MODULES= iconv
PATCH_LIST= gcc-* patch-*
.endif
CONFIGURE_STYLE= gnu
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.52
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/lib/silcmath/mpi
CONFIGURE_ARGS= \
--enable-ipv6 \
@ -48,8 +53,11 @@ CONFIGURE_ARGS+= --disable-asm
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/silcd
mv -f ${PREFIX}/share/doc/silcd/examples/* \
mv -f ${PREFIX}/share/doc/silcd/example_silcd.conf \
${PREFIX}/share/examples/silcd/silcd.conf
${INSTALL_DATA} ${WRKSRC}/doc/examples/cell_*.conf \
${PREFIX}/share/examples/silcd
${INSTALL_DATA} ${WRKSRC}/doc/silcalgs.conf \
${PREFIX}/share/examples/silcd
rm -rf ${PREFIX}/share/doc/silcd/examples
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
MD5 (silc-server-0.9.12.tar.gz) = e489892c7ec92c4f12208b539f95d73a
RMD160 (silc-server-0.9.12.tar.gz) = 4c45f71190ca0c4d2e0c6a1fa07370f7f6ba9053
SHA1 (silc-server-0.9.12.tar.gz) = 9810996b4a60b6163831589c93bd0c40272c1482
MD5 (silc-server-0.9.13.1.tar.gz) = 55157926a3ccb1ad97d543c7c1effbd9
RMD160 (silc-server-0.9.13.1.tar.gz) = 81477b6428cb2bb265e951e57735364d74695188
SHA1 (silc-server-0.9.13.1.tar.gz) = 4b6b386835e38127f8b967485dc9dad56191d216

View File

@ -0,0 +1,8 @@
$OpenBSD: patch-Makefile_defines_int_in,v 1.1 2003/05/04 04:02:53 brad Exp $
--- Makefile.defines_int.in.orig Fri Apr 18 20:00:36 2003
+++ Makefile.defines_int.in Fri Apr 18 20:00:53 2003
@@ -45,3 +45,4 @@ silc_modulesdir=@MODULESDIR@
silc_helpdir=@HELPDIR@
silc_docdir=@DOCDIR@
silc_logsdir=@LOGSDIR@
+silc_mandir=@mandir@

View File

@ -1,54 +1,16 @@
$OpenBSD: patch-Makefile_in,v 1.2 2003/01/22 03:34:59 brad Exp $
--- Makefile.in.orig Wed Jan 8 10:25:40 2003
+++ Makefile.in Sat Jan 11 08:20:57 2003
@@ -709,20 +709,12 @@ install-dirs-client: install-dirs
-mkdir -p $(mandir)/man1
install-dirs-server: install-dirs
- -mkdir -p $(logsdir)
-mkdir -p $(mandir)/man5
-mkdir -p $(mandir)/man8
doc-install:
- -$(INSTALL_DATA) $(srcdir)/doc/CodingStyle $(docdir)/
-$(INSTALL_DATA) $(srcdir)/doc/FAQ $(docdir)/
- -$(INSTALL_DATA) $(srcdir)/doc/*.txt $(docdir)/
- -$(INSTALL_DATA) $(srcdir)/COPYING $(docdir)/
- -$(INSTALL_DATA) $(srcdir)/CHANGES $(docdir)/
- -$(INSTALL_DATA) $(srcdir)/CREDITS $(docdir)/
- -$(INSTALL_DATA) $(srcdir)/README* $(docdir)/
- -$(INSTALL_DATA) $(srcdir)/INSTALL $(docdir)/
- -$(INSTALL_DATA) $(srcdir)/TODO $(docdir)/
+ -$(INSTALL_DATA) $(srcdir)/README $(docdir)/
doc-install-client: doc-install
$(INSTALL_DATA) $(srcdir)/irssi/silc.conf $(docdir)/example_silc.conf
@@ -731,13 +723,8 @@ doc-install-client: doc-install
fi
doc-install-server: doc-install
- -$(INSTALL_DATA) $(srcdir)/doc/example_silcd.conf $(docdir)/
- -@if test -f $(srcdir)/doc/silcd.8 ; then \
- $(INSTALL_DATA) $(srcdir)/doc/silcd.8 $(mandir)/man8; \
- fi
- -@if test -f $(srcdir)/doc/silcd.conf.5 ; then \
- $(INSTALL_DATA) $(srcdir)/doc/silcd.conf.5 $(mandir)/man5; \
- fi
+ -$(INSTALL_DATA) $(srcdir)/doc/example_silcd.conf $(docdir)/examples/silcd.conf
+ -$(INSTALL_DATA) $(srcdir)/doc/silcalgs.conf $(docdir)/examples/
etc-install-client:
-@if test '!' -d $(srcdir)/irssi ; then \
@@ -768,7 +755,7 @@ toolkit-install:
examples-install:
-mkdir -p $(docdir)/examples/
-$(INSTALL_DATA) $(srcdir)/doc/examples/README $(docdir)/examples/
- -$(INSTALL_DATA) $(srcdir)/doc/examples/silc* $(docdir)/examples/
+ -$(INSTALL_DATA) $(srcdir)/doc/examples/*.conf $(docdir)/examples/
generate-server-key:
-@if test '!' -f $(etcdir)/silcd.pub ; then \
@@ -777,7 +764,7 @@ generate-server-key:
$OpenBSD: patch-Makefile_in,v 1.3 2003/05/04 04:02:53 brad Exp $
--- Makefile.in.orig Tue Mar 18 04:45:27 2003
+++ Makefile.in Fri Apr 18 20:14:10 2003
@@ -216,7 +216,7 @@ install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
-mansdir = $(DESTDIR)$(mandir)
+mansdir = $(DESTDIR)$(silc_mandir)
oldincludedir = @oldincludedir@
prefix = @prefix@
program_transform_name = @program_transform_name@
@@ -777,7 +777,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 generate-server-key

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-aclocal_m4,v 1.1 2003/05/04 04:02:53 brad Exp $
--- aclocal.m4.orig Mon Mar 17 11:44:34 2003
+++ aclocal.m4 Sun Apr 13 12:33:20 2003
@@ -43,7 +43,7 @@
# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-AC_PREREQ([2.54])
+AC_PREREQ([2.52])
# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
# the ones we care about.

View File

@ -0,0 +1,45 @@
$OpenBSD: patch-configure_in,v 1.1 2003/05/04 04:02:53 brad Exp $
--- configure.in.orig Mon Mar 17 11:44:33 2003
+++ configure.in Fri Apr 11 16:18:53 2003
@@ -40,7 +40,6 @@ AM_INIT_AUTOMAKE(silc-server, 0.9.13)
AC_PREREQ(2.52)
AC_CONFIG_HEADERS(includes/silcdefs.h)
-CFLAGS=
AC_PROG_CC
AC_C_INLINE
AC_C_CONST
@@ -339,33 +338,6 @@ AC_DEFUN(SILC_ADD_CFLAGS,
$2])
unset tmp_CFLAGS
])
-
-if test "$GCC"; then
- # GCC specific options
- if test "x$summary_debug" = "xyes"; then
- SILC_ADD_CFLAGS(-g -O)
- else
- SILC_ADD_CFLAGS(-g -O2)
- fi
- SILC_ADD_CFLAGS(-Wall -finline-functions)
-else
- # Other compilers
- case "$target" in
- alpha*-dec-osf*)
- 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))
- ;;
- esac
-
- # Intel C++ Compiler needs -restrict
- if test "x$CC" = "xicc"; then
- SILC_ADD_CFLAGS(-restrict)
- fi
-fi
-
##
## Installation

View File

@ -12,6 +12,7 @@ If you have not already done so, you will need to generate a keypair:
# silcd -C ${SYSCONFDIR}/silcd
# chown silcd:silcd ${SYSCONFDIR}/silcd/silcd.{pub,prv}
# chmod 600 ${SYSCONFDIR}/silcd/silcd.prv
Additionally, you may wish to start silcd at system start-up
via the /etc/rc.local script:

View File

@ -1,8 +1,24 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2002/12/16 03:40:02 brad Exp $
@comment $OpenBSD: PLIST,v 1.2 2003/05/04 04:02:53 brad Exp $
man/man5/silcd.conf.5
man/man8/silcd.8
sbin/silcd
@comment share/doc/silcd/CHANGES
@comment share/doc/silcd/COPYING
@comment share/doc/silcd/CREDITS
@comment share/doc/silcd/CodingStyle
share/doc/silcd/FAQ
@comment share/doc/silcd/INSTALL
share/doc/silcd/README
share/examples/silcd/README
@comment share/doc/silcd/TODO
@comment share/doc/silcd/draft-riikonen-presence-attrs-01.txt
@comment share/doc/silcd/draft-riikonen-silc-commands-04.txt
@comment share/doc/silcd/draft-riikonen-silc-flags-payloads-02.txt
@comment share/doc/silcd/draft-riikonen-silc-ke-auth-06.txt
@comment share/doc/silcd/draft-riikonen-silc-pp-06.txt
@comment share/doc/silcd/draft-riikonen-silc-spec-06.txt
@comment share/doc/silcd/examples/README
@comment share/doc/silcd/examples/silcd.prv
@comment share/doc/silcd/examples/silcd.pub
share/examples/silcd/cell_backup.conf
share/examples/silcd/cell_router.conf
share/examples/silcd/cell_server1.conf
@ -10,4 +26,5 @@ share/examples/silcd/cell_server2.conf
share/examples/silcd/silcalgs.conf
share/examples/silcd/silcd.conf
@dirrm share/examples/silcd
@comment @dirrm share/doc/silcd/examples
@dirrm share/doc/silcd