diff options
author | Kirill Ponomarev <krion@FreeBSD.org> | 2003-10-27 11:19:21 +0000 |
---|---|---|
committer | Kirill Ponomarev <krion@FreeBSD.org> | 2003-10-27 11:19:21 +0000 |
commit | b87c6e2d105d132552e8bb14bd9e0b53ada336f5 (patch) | |
tree | c80f78d069fbdc9f03be51a62ff45bab9c96f4f8 /net/silc-server | |
parent | Mark $IGNORE if PERL_LEVEL < 500600. (diff) |
- Update to version 0.9.14
PR: 58590
Submitted by: Evgueni V. Gavrilov <aquatique@rusunix.org> (maintainer)
Notes
Notes:
svn path=/head/; revision=92316
Diffstat (limited to 'net/silc-server')
-rw-r--r-- | net/silc-server/Makefile | 30 | ||||
-rw-r--r-- | net/silc-server/distinfo | 2 | ||||
-rw-r--r-- | net/silc-server/files/patch-Makefile.in | 40 | ||||
-rw-r--r-- | net/silc-server/files/patch-doc:example_silcd.conf.in | 72 | ||||
-rw-r--r-- | net/silc-server/files/patch-lib:Makefile.in | 18 | ||||
-rw-r--r-- | net/silc-server/files/patch-silcd:Makefile.in | 2 | ||||
-rw-r--r-- | net/silc-server/files/silcd.sh | 15 | ||||
-rw-r--r-- | net/silc-server/pkg-plist | 25 |
8 files changed, 142 insertions, 62 deletions
diff --git a/net/silc-server/Makefile b/net/silc-server/Makefile index 3a923ab13c5c..65fae54eb006 100644 --- a/net/silc-server/Makefile +++ b/net/silc-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME= silc -PORTVERSION= 0.9.10.1 +PORTVERSION= 0.9.14 CATEGORIES= net ipv6 security MASTER_SITES= http://www.silcnet.org/download/%SUBDIR%/ \ http://ftp.silcnet.org/%SUBDIR%/ \ @@ -28,16 +28,15 @@ MAINTAINER= aquatique@rusunix.org COMMENT= Secure Internet Live Conferencing (SILC) network server USE_BZIP2= yes -USE_LIBTOOL= yes +USE_GMAKE= yes USE_REINPLACE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-silcd-config-file=${PREFIX}/etc/${PORTNAME}/silcd.conf \ --with-etcdir=${PREFIX}/etc/${PORTNAME} \ --with-helpdir=share/${PORTNAME}/help \ - --with-logsdir=${PORTNAME}/logs \ - --with-simdir=${PREFIX}/lib/silcsim/server \ + --with-logsdir=/var/log/${PORTNAME} \ --with-silcd-pid-file=/var/run/silcd.pid -INSTALLS_SHLIB= yes + PLIST_SUB= INSTALL_DIR="${INSTALL_DIR}" PKGDEINSTALL= ${PKGINSTALL} @@ -47,7 +46,7 @@ MAN5= silcd.conf.5 MAN8= silcd.8 .ifndef(WITH_PTHREADS) -CONFIGURE_ARGS+= --disable-threads +CONFIGURE_ARGS+= --without-pthreads .else CONFIGURE_ENV+= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} ${PTHREAD_LIBS}" .endif @@ -60,15 +59,12 @@ pre-everything:: @${ECHO_MSG} '===> Define WITH_PTHREADS to enable pthreads support' .endif @${ECHO_MSG} -.ifndef(WITH_OPTIMIZED_CFLAGS) - @${ECHO_MSG} '===> Define WITH_OPTIMIZED_CFLAGS to enable compilation optimizations' - @${ECHO_MSG} '===> which is known to break some platforms (e.g., alpha)' -.endif + +post-extract: + @${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${FILESDIR}/silcd.sh \ + > ${WRKSRC}/silcd.sh post-patch: -.ifndef(WITH_OPTIMIZED_CFLAGS) - @${REINPLACE_CMD} -e 's/-O2//' ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} -.endif .ifdef(NOPORTDOCS) @${REINPLACE_CMD} -E -e \ 's/(install-data-hook:.*)example-install/\1/' \ @@ -77,12 +73,14 @@ post-patch: @${REINPLACE_CMD} -e 's/--libtool-enable-shared//' \ ${WRKSRC}/lib/silccrypt/Makefile.in -post-configure: - @${CP} ${LIBTOOL} ${WRKSRC} - post-install: @${SETENV} PKG_PREFIX=${PREFIX} ${SH} \ ${PKGINSTALL} ${PKGNAME} POST-INSTALL + ${INSTALL_DATA} ${WRKSRC}/silcd.sh ${PREFIX}/etc/rc.d/silcd.sh-dist + @if [ ! -f ${PREFIX}/etc/rc.d/silcd.sh ]; then \ + ${ECHO} "Installing ${PREFIX}/etc/rc.d/silcd.sh startup file."; \ + ${INSTALL_SCRIPT} ${WRKSRC}/silcd.sh ${PREFIX}/etc/rc.d/silcd.sh; \ + fi .include <bsd.port.pre.mk> diff --git a/net/silc-server/distinfo b/net/silc-server/distinfo index 70694ef241b7..54502351f49b 100644 --- a/net/silc-server/distinfo +++ b/net/silc-server/distinfo @@ -1 +1 @@ -MD5 (silc-server-0.9.10.1.tar.bz2) = 47f687c8261f31befd16b8ae2fad2716 +MD5 (silc-server-0.9.14.tar.bz2) = f10f423c6ccc2a8610439a517495cd58 diff --git a/net/silc-server/files/patch-Makefile.in b/net/silc-server/files/patch-Makefile.in index 0b606fc49091..1ae45b56ef2d 100644 --- a/net/silc-server/files/patch-Makefile.in +++ b/net/silc-server/files/patch-Makefile.in @@ -1,23 +1,15 @@ ---- Makefile.in.orig Thu Dec 5 19:43:42 2002 -+++ Makefile.in Tue Dec 31 18:26:52 2002 -@@ -231,7 +231,7 @@ +--- Makefile.in.orig Thu Oct 16 00:22:13 2003 ++++ Makefile.in Mon Oct 27 12:19:58 2003 +@@ -702,8 +702,6 @@ - AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign - --COMMONDIRS = lib irssi silc silcd doc includes -+COMMONDIRS = lib irssi silcd doc includes - - # Sub directories defined by "distributions" file, and can be overridden - # with ./configure, which substitutes these variables. -@@ -700,7 +700,6 @@ install-dirs: -mkdir -p $(etcdir) - -mkdir -p $(modulesdir) +- -mkdir -p $(modulesdir) - -mkdir -p $(docdir) install-dirs-client: install-dirs -mkdir -p $(helpdir) -@@ -728,8 +727,7 @@ +@@ -731,8 +729,7 @@ $(INSTALL_DATA) $(srcdir)/doc/silc.1 $(mandir)/man1; \ fi @@ -27,7 +19,7 @@ -@if test -f $(srcdir)/doc/silcd.8 ; then \ $(INSTALL_DATA) $(srcdir)/doc/silcd.8 $(mandir)/man8; \ fi -@@ -746,13 +744,11 @@ +@@ -749,16 +746,13 @@ fi etc-install-server: @@ -40,11 +32,14 @@ - chmod go= $(etcdir)/silcd.conf; \ - fi + $(etcdir)/silcalgs.conf.sample; \ -+ chmod go= $(etcdir)/silcd.conf.sample ++ chmod go= $(etcdir)/silcd.conf.sample; \ sim-install: - -$(INSTALL_DATA) $(srcdir)/lib/silcsim/*.so $(modulesdir)/ -@@ -764,9 +760,9 @@ +- -$(INSTALL_DATA) $(srcdir)/lib/silcsim/*.so $(modulesdir)/ + + toolkit-install: + -mkdir -p $(docdir)/toolkit/ +@@ -767,13 +761,13 @@ -cp -R $(srcdir)/tutorial $(prefix) examples-install: @@ -53,16 +48,11 @@ - -$(INSTALL_DATA) $(srcdir)/doc/examples/silc* $(docdir)/examples/ + -mkdir -p $(prefix)/share/examples/silc + -$(INSTALL_DATA) $(srcdir)/doc/examples/README $(prefix)/share/examples/silc -+ -$(INSTALL_DATA) $(srcdir)/doc/examples/silc* $(prefix)/share/examples/silc generate-server-key: -@if test '!' -f $(etcdir)/silcd.pub ; then \ -@@ -775,7 +771,7 @@ + $(sbindir)/silcd -C $(etcdir); \ ++ chmod 600 $(etcdir)/silcd.p*; \ + fi @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 --@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: install-dirs-server sim-install doc-install-server examples-install etc-install-server - # 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: diff --git a/net/silc-server/files/patch-doc:example_silcd.conf.in b/net/silc-server/files/patch-doc:example_silcd.conf.in new file mode 100644 index 000000000000..941fb875cf98 --- /dev/null +++ b/net/silc-server/files/patch-doc:example_silcd.conf.in @@ -0,0 +1,72 @@ +--- doc/example_silcd.conf.in.orig Mon Oct 27 12:06:06 2003 ++++ doc/example_silcd.conf.in Mon Oct 27 12:07:47 2003 +@@ -22,7 +22,6 @@ + # Include global algorithms from the "silcalgs.conf" file. This file defines + # ciphers, hash functions, HMACs and PKCS algorithms that can be used. + # +-Include "@ETCDIR@/silcalgs.conf"; + + # + # General configuration options +@@ -32,11 +31,6 @@ + # for different connections. + # + General { +- # This is the default path where to search modules. If omitted +- # built-in modules will be used. Built-in modules will also be +- # used if a module file cannot be located. +- module_path = "@MODULESDIR@"; +- + # If both passphrase and public key authentication is set for a + # connection the public key authentication is the preferred one + # to use. Set this to `true' to prefer passphrase authentication +@@ -466,13 +460,13 @@ + # to true. For normal connections set it false. If it is set to true then + # your server will be backup router. + # +-ServerConnection { +- Host = "10.2.1.7"; +- Passphrase = "verysecret"; +- #PublicKey = "/path/to/the/public.pub"; +- Params = "normal"; +- Backup = false; +-}; ++#ServerConnection { ++# Host = "10.2.1.7"; ++# Passphrase = "verysecret"; ++# #PublicKey = "/path/to/the/public.pub"; ++# Params = "normal"; ++# Backup = false; ++#}; + + # + # Configured router connections +@@ -502,17 +496,17 @@ + # 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. + # +-RouterConnection { +- Host = "10.2.1.100"; +- Port = 706; +- Passphrase = "verysecret"; +- #PublicKey = "/path/to/the/public.pub"; +- Params = "normal"; +- Initiator = true; +- #BackupHost = "10.2.1.6"; +- #BackupPort = 706; +- #BackupLocal = true; +-}; ++#RouterConnection { ++# Host = "10.2.1.100"; ++# Port = 706; ++# Passphrase = "verysecret"; ++# #PublicKey = "/path/to/the/public.pub"; ++# Params = "normal"; ++# Initiator = true; ++# #BackupHost = "10.2.1.6"; ++# #BackupPort = 706; ++# #BackupLocal = true; ++#}; + + # + # Denied connections diff --git a/net/silc-server/files/patch-lib:Makefile.in b/net/silc-server/files/patch-lib:Makefile.in new file mode 100644 index 000000000000..3b98a0d8fcb8 --- /dev/null +++ b/net/silc-server/files/patch-lib:Makefile.in @@ -0,0 +1,18 @@ +--- lib/Makefile.in.orig Mon Oct 27 11:28:00 2003 ++++ lib/Makefile.in Mon Oct 27 11:29:06 2003 +@@ -541,15 +541,7 @@ + -rm -rf libsilcclient.a + + @SILC_DIST_TOOLKIT_TRUE@install-exec-hook: +-@SILC_DIST_TOOLKIT_TRUE@ -mkdir -p $(DESTDIR)$(libdir) +-@SILC_DIST_TOOLKIT_TRUE@ -$(LIBTOOL) $(INSTALL) libsilc.la $(DESTDIR)$(libdir)/ +-@SILC_DIST_TOOLKIT_TRUE@ -$(LIBTOOL) $(INSTALL) libsilcclient.la $(DESTDIR)$(libdir)/ + @SILC_DIST_TOOLKIT_FALSE@install-exec-hook: +-@SILC_DIST_TOOLKIT_FALSE@ -mkdir -p $(libdir) +-@SILC_DIST_TOOLKIT_FALSE@ -$(LIBTOOL) $(INSTALL) libsilc.la $(DESTDIR)$(libdir)/ +-@SILC_DIST_TOOLKIT_FALSE@ -rm -rf $(DESTDIR)$(libdir)/libsilc.a +-@SILC_DIST_CLIENT_TRUE@@SILC_DIST_TOOLKIT_FALSE@ -$(LIBTOOL) $(INSTALL) libsilcclient.la $(DESTDIR)$(libdir)/ +-@SILC_DIST_CLIENT_TRUE@@SILC_DIST_TOOLKIT_FALSE@ -rm -rf $(DESTDIR)$(libdir)/libsilcclient.a + + # WIN32 DLL generation + @SILC_DIST_WIN32DLL_TRUE@silc.dll: libsilc.a diff --git a/net/silc-server/files/patch-silcd:Makefile.in b/net/silc-server/files/patch-silcd:Makefile.in index ab086f70c2ba..fb65ac5971ae 100644 --- a/net/silc-server/files/patch-silcd:Makefile.in +++ b/net/silc-server/files/patch-silcd:Makefile.in @@ -5,7 +5,7 @@ LDFLAGS = @LDFLAGS@ -LIBS = $(SILC_COMMON_LIBS) -lsilc -+LIBS = -L$(top_srcdir)/lib/.libs $(SILC_COMMON_LIBS) -lsilc ++LIBS = -L$(top_srcdir)/lib $(SILC_COMMON_LIBS) -lsilc LIBSILCCLIENT_AGE = @LIBSILCCLIENT_AGE@ LIBSILCCLIENT_CURRENT = @LIBSILCCLIENT_CURRENT@ LIBSILCCLIENT_REVISION = @LIBSILCCLIENT_REVISION@ diff --git a/net/silc-server/files/silcd.sh b/net/silc-server/files/silcd.sh new file mode 100644 index 000000000000..0155e5498210 --- /dev/null +++ b/net/silc-server/files/silcd.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +case "$1" in +start) + [ -x %%PREFIX%%/sbin/silcd ] && %%PREFIX%%/sbin/silcd > /dev/null && echo -n ' silcd' + ;; +stop) + [ -r /var/run/silcd.pid ] && /bin/kill `cat /var/run/silcd.pid` > /dev/null && echo -n ' silcd' + ;; +*) + echo "Usage: `basename $0` {start|stop}" >&2 + ;; +esac + +exit 0 diff --git a/net/silc-server/pkg-plist b/net/silc-server/pkg-plist index a15edc83d80a..235e85e6408a 100644 --- a/net/silc-server/pkg-plist +++ b/net/silc-server/pkg-plist @@ -1,23 +1,10 @@ etc/silc/silcalgs.conf.sample etc/silc/silcd.conf.sample -lib/libsilc-1.0.so.1 -lib/libsilc.la -lib/libsilc.so -lib/silcsim/server/aes.sim.so -lib/silcsim/server/blowfish.sim.so -lib/silcsim/server/cast.sim.so -lib/silcsim/server/md5.sim.so -lib/silcsim/server/none.sim.so -lib/silcsim/server/rc5.sim.so -lib/silcsim/server/rc6.sim.so -lib/silcsim/server/rsa.sim.so -lib/silcsim/server/sha1.sim.so -lib/silcsim/server/twofish.sim.so sbin/silcd -%%PORTDOCS%%share/examples/silc/README -%%PORTDOCS%%share/examples/silc/silcd.prv -%%PORTDOCS%%share/examples/silc/silcd.pub -%%PORTDOCS%%@dirrm share/examples/silc -@dirrm lib/silcsim/server -@unexec rmdir %D/lib/silcsim 2>/dev/null || true +@unexec if cmp -s %D/etc/rc.d/silcd.sh %D/etc/rc.d/silcd.sh-dist; then rm -f %D/etc/rc.d/silcd.sh; fi +etc/rc.d/silcd.sh-dist +@exec [ -f %B/silcd.sh ] || ( cp %B/%f %B/silcd.sh; chmod 755 %B/silcd.sh ) +%%PORTDOCS%%%%EXAMPLESDIR%%/README +%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% @unexec rmdir %D/etc/silc 2>/dev/null || true +@unexec rmdir /var/log/silc 2>/dev/null || true |