Emergency update to 0.9.10.1: previous port version is incompatible

with current SILC protocol

Prompted by:	many
Approved by:	portmgr (self)
This commit is contained in:
Mario Sergio Fujikawa Ferreira 2002-12-31 20:33:56 +00:00
parent aeb84e8f92
commit ae00ad34bf
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=71998
15 changed files with 229 additions and 135 deletions

View file

@ -6,14 +6,23 @@
# #
PORTNAME= silc PORTNAME= silc
PORTVERSION= 0.9.5.1 PORTVERSION= 0.9.10.1
CATEGORIES= net ipv6 security CATEGORIES= net ipv6 security
MASTER_SITES= http://www.silcnet.org/download/client/sources/ \ MASTER_SITES= http://www.silcnet.org/download/%SUBDIR%/ \
ftp://ftp.silcnet.org/silc/client/sources/ \ http://ftp.silcnet.org/%SUBDIR%/ \
ftp://ftp.au.silcnet.org/pub/silcnet/client/sources/ \ http://www.planetmirror.com/pub/silcnet/%SUBDIR%/ \
http://www.mirrors.wiretapped.net/security/network-security/silc/client/sources/ \ http://www.nic.funet.fi/pub/mirrors/ftp.silcnet.org/silc/%SUBDIR%/ \
ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/silc/client/sources/ \ http://www.fi.silcnet.org/download/%SUBDIR%/ \
ftp://ftp.no.silcnet.org/pub/silc/client/sources/ http://munitions.vipul.net/software/mirrors/silc/%SUBDIR%/ \
http://www.pl.silcnet.org/download/%SUBDIR%/ \
http://ftp.sunet.se/pub/network/silc/%SUBDIR%/ \
ftp://ftp.silcnet.org/silc/%SUBDIR%/ \
ftp://ftp.au.silcnet.org/pub/silcnet/%SUBDIR%/ \
ftp://ftp.funet.fi/pub/mirrors/ftp.silcnet.org/silc/%SUBDIR%/ \
ftp://ftp.pl.silcnet.org/pub/silc/%SUBDIR%/ \
ftp://ftp.sunet.se/pub/network/silc/%SUBDIR%/ \
ftp://ftp.uk.silcnet.org/pub/silc/%SUBDIR%/
MASTER_SITE_SUBDIR= client/sources
PKGNAMESUFFIX= -client PKGNAMESUFFIX= -client
DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
@ -28,8 +37,11 @@ USE_PERL5= yes
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
USE_GNOMENG= yes USE_GNOMENG= yes
USE_GNOME= glib12 USE_GNOME= glib12
USE_LIBTOOL= yes
CONFIGURE_ARGS= --with-etcdir=${PREFIX}/etc/${PORTNAME} \ CONFIGURE_ARGS= --with-etcdir=${PREFIX}/etc/${PORTNAME} \
--with-simdir=${PREFIX}/lib/silcsim/client \
--with-helpdir=${PREFIX}/share/${PORTNAME}/help --with-helpdir=${PREFIX}/share/${PORTNAME}/help
INSTALLS_SHLIB= yes
PLIST_SUB= INSTALL_DIR="${INSTALL_DIR}" PLIST_SUB= INSTALL_DIR="${INSTALL_DIR}"
PKGDEINSTALL= ${PKGINSTALL} PKGDEINSTALL= ${PKGINSTALL}
@ -70,9 +82,11 @@ post-patch:
${WRKSRC}/irssi/docs/Makefile.in ${WRKSRC}/irssi/docs/Makefile.in
@${PERL} -pi -e 's/^(install-data-am:) install-moduleLTLIBRARIES$$/\1/' \ @${PERL} -pi -e 's/^(install-data-am:) install-moduleLTLIBRARIES$$/\1/' \
${WRKSRC}/irssi/src/perl/Makefile.in ${WRKSRC}/irssi/src/perl/Makefile.in
@${PERL} -pi -e 's/^(install-data-am: )install-confDATA /\1/' \ @${PERL} -pi -e 's/--libtool-enable-shared//' \
${WRKSRC}/irssi/Makefile.in ${WRKSRC}/lib/silccrypt/Makefile.in
@${PERL} -pi -e 's/silcsim//' ${WRKSRC}/lib/Makefile.in
post-configure:
@${CP} ${LOCALBASE}/bin/libtool ${WRKSRC}
post-install: post-install:
@${SETENV} PKG_PREFIX=${PREFIX} ${SH} \ @${SETENV} PKG_PREFIX=${PREFIX} ${SH} \

View file

@ -1 +1 @@
MD5 (silc-client-0.9.5.1.tar.bz2) = 5d12658655f9eb681fe769b0e2bd0d89 MD5 (silc-client-0.9.10.1.tar.bz2) = 6c6c5e0826b70dc99d7fe9710728b27e

View file

@ -1,6 +1,6 @@
--- Makefile.in.orig Wed Jul 10 16:54:28 2002 --- Makefile.in.orig Thu Dec 5 19:38:34 2002
+++ Makefile.in Wed Jul 10 18:02:37 2002 +++ Makefile.in Sun Dec 29 15:27:21 2002
@@ -151,7 +151,7 @@ @@ -231,7 +231,7 @@
AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
@ -9,36 +9,38 @@
# Sub directories defined by "distributions" file, and can be overridden # Sub directories defined by "distributions" file, and can be overridden
# with ./configure, which substitutes these variables. # with ./configure, which substitutes these variables.
@@ -531,10 +531,7 @@ @@ -700,11 +700,9 @@
install-dirs: install-dirs:
-mkdir -p $(etcdir) -mkdir -p $(etcdir)
- -mkdir -p $(modulesdir) -mkdir -p $(modulesdir)
-mkdir -p $(helpdir)
- -mkdir -p $(docdir) - -mkdir -p $(docdir)
- -mkdir -p $(logsdir)
generate-server-key: install-dirs-client: install-dirs
-@if test '!' -f $(etcdir)/silcd.pub ; then \ -mkdir -p $(helpdir)
@@ -568,19 +565,12 @@ - -mkdir -p $(mandir)/man1
$(INSTALL_DATA) $(srcdir)/doc/examples/cell* $(docdir)/examples/
etc-install: install-dirs-server: install-dirs
- -@if test '!' -f $(etcdir)/silcd.conf ; then \ -mkdir -p $(logsdir)
- $(INSTALL_DATA) $(srcdir)/doc/example_silcd.conf \ @@ -738,12 +736,8 @@
- $(etcdir)/silcd.conf; \
- $(INSTALL_DATA) $(srcdir)/doc/silcalgs.conf \
- $(etcdir)/silcalgs.conf; \
- chmod go= $(etcdir)/silcd.conf; \
- fi
-@if test '!' -f $(etcdir)/silc.conf ; then \
$(INSTALL_DATA) $(srcdir)/irssi/silc.conf \
- $(etcdir)/silc.conf; \
+ $(etcdir)/silc.conf.sample; \
fi fi
-@SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs sim-install doc-install etc-install etc-install-client:
+@SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs etc-install - -@if test '!' -d $(srcdir)/irssi ; then \
@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_TRUE@install-data-hook: install-dirs generate-server-key sim-install doc-install toolkit-install examples-install etc-install - if test '!' -f $(etcdir)/silc.conf ; then \
@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_FALSE@install-data-hook: install-dirs generate-server-key sim-install doc-install examples-install etc-install $(INSTALL_DATA) $(srcdir)/irssi/silc.conf \
- $(etcdir)/silc.conf; \
- fi; \
- fi
+ $(etcdir)/silc.conf.sample
etc-install-server:
-@if test '!' -f $(etcdir)/silcd.conf ; then \
@@ -773,7 +767,7 @@
$(sbindir)/silcd -C $(etcdir); \
fi
-@SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs-client sim-install doc-install-client etc-install-client
+@SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs-client sim-install 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
# Tell versions [3.59,3.63) of GNU make to not export all variables. # Tell versions [3.59,3.63) of GNU make to not export all variables.

View file

@ -1,8 +1,25 @@
bin/silc bin/silc
etc/silc/silc.conf.sample etc/silc/silc.conf.sample
lib/libsilc-1.0.so.1
lib/libsilc.la
lib/libsilc.so
lib/libsilcclient-1.0.so.1
lib/libsilcclient.la
lib/libsilcclient.so
lib/silcsim/client/aes.sim.so
lib/silcsim/client/blowfish.sim.so
lib/silcsim/client/cast.sim.so
lib/silcsim/client/md5.sim.so
lib/silcsim/client/none.sim.so
lib/silcsim/client/rc5.sim.so
lib/silcsim/client/rc6.sim.so
lib/silcsim/client/rsa.sim.so
lib/silcsim/client/sha1.sim.so
lib/silcsim/client/twofish.sim.so
share/silc/help/action share/silc/help/action
share/silc/help/admin share/silc/help/admin
share/silc/help/alias share/silc/help/alias
share/silc/help/attr
share/silc/help/away share/silc/help/away
share/silc/help/ban share/silc/help/ban
share/silc/help/beep share/silc/help/beep
@ -49,7 +66,6 @@ share/silc/help/motd
share/silc/help/msg share/silc/help/msg
share/silc/help/names share/silc/help/names
share/silc/help/nick share/silc/help/nick
share/silc/help/note
share/silc/help/notice share/silc/help/notice
share/silc/help/oper share/silc/help/oper
share/silc/help/part share/silc/help/part
@ -69,6 +85,8 @@ share/silc/help/server
share/silc/help/set share/silc/help/set
share/silc/help/shutdown share/silc/help/shutdown
share/silc/help/silcoper share/silc/help/silcoper
share/silc/help/smsg
share/silc/help/stats
share/silc/help/statusbar share/silc/help/statusbar
share/silc/help/toggle share/silc/help/toggle
share/silc/help/topic share/silc/help/topic
@ -77,7 +95,6 @@ share/silc/help/unalias
share/silc/help/unignore share/silc/help/unignore
share/silc/help/unload share/silc/help/unload
share/silc/help/unquery share/silc/help/unquery
share/silc/help/upgrade
share/silc/help/users share/silc/help/users
share/silc/help/version share/silc/help/version
share/silc/help/watch share/silc/help/watch
@ -96,4 +113,6 @@ share/silc/themes/default.theme
@dirrm share/silc/scripts @dirrm share/silc/scripts
@dirrm share/silc/help @dirrm share/silc/help
@dirrm share/silc @dirrm share/silc
@dirrm lib/silcsim/client
@unexec rmdir %D/lib/silcsim 2>/dev/null || true
@unexec rmdir %D/etc/silc 2>/dev/null || true @unexec rmdir %D/etc/silc 2>/dev/null || true

View file

@ -6,15 +6,23 @@
# #
PORTNAME= silc PORTNAME= silc
PORTVERSION= 0.9.5 PORTVERSION= 0.9.10.1
CATEGORIES= net security CATEGORIES= net security
MASTER_SITES= http://www.silcnet.org/download/server/sources/ \ MASTER_SITES= http://www.silcnet.org/download/%SUBDIR%/ \
ftp://ftp.silcnet.org/silc/server/sources/ \ http://ftp.silcnet.org/%SUBDIR%/ \
http://public.www.planetmirror.com/pub/silcnet/server/sources/ \ http://www.planetmirror.com/pub/silcnet/%SUBDIR%/ \
ftp://ftp.au.silcnet.org/pub/silcnet/server/sources/ \ http://www.nic.funet.fi/pub/mirrors/ftp.silcnet.org/silc/%SUBDIR%/ \
http://www.mirrors.wiretapped.net/security/network-security/silc/server/sources/ \ http://www.fi.silcnet.org/download/%SUBDIR%/ \
ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/silc/server/sources/ \ http://munitions.vipul.net/software/mirrors/silc/%SUBDIR%/ \
ftp://ftp.no.silcnet.org/pub/silc/server/sources/ http://www.pl.silcnet.org/download/%SUBDIR%/ \
http://ftp.sunet.se/pub/network/silc/%SUBDIR%/ \
ftp://ftp.silcnet.org/silc/%SUBDIR%/ \
ftp://ftp.au.silcnet.org/pub/silcnet/%SUBDIR%/ \
ftp://ftp.funet.fi/pub/mirrors/ftp.silcnet.org/silc/%SUBDIR%/ \
ftp://ftp.pl.silcnet.org/pub/silc/%SUBDIR%/ \
ftp://ftp.sunet.se/pub/network/silc/%SUBDIR%/ \
ftp://ftp.uk.silcnet.org/pub/silc/%SUBDIR%/
MASTER_SITE_SUBDIR= server/sources
PKGNAMESUFFIX= -doc PKGNAMESUFFIX= -doc
DISTNAME= ${PORTNAME}-server-${PORTVERSION} DISTNAME= ${PORTNAME}-server-${PORTVERSION}

View file

@ -1 +1 @@
MD5 (silc-server-0.9.5.tar.bz2) = 031796371828a92debcec9e33bab42e1 MD5 (silc-server-0.9.10.1.tar.bz2) = 47f687c8261f31befd16b8ae2fad2716

View file

@ -1,6 +1,6 @@
--- Makefile.in.orig Wed Jul 17 18:55:04 2002 --- Makefile.in.orig Tue Dec 31 17:07:00 2002
+++ Makefile.in Wed Jul 17 18:56:13 2002 +++ Makefile.in Tue Dec 31 17:10:23 2002
@@ -151,7 +151,7 @@ @@ -231,7 +231,7 @@
AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
@ -9,27 +9,20 @@
# Sub directories defined by "distributions" file, and can be overridden # Sub directories defined by "distributions" file, and can be overridden
# with ./configure, which substitutes these variables. # with ./configure, which substitutes these variables.
@@ -530,11 +530,7 @@ @@ -698,8 +698,6 @@
-rm -rf $(distdir) -rm -rf $(distdir)
install-dirs: install-dirs:
- -mkdir -p $(etcdir) - -mkdir -p $(etcdir)
- -mkdir -p $(modulesdir) - -mkdir -p $(modulesdir)
- -mkdir -p $(helpdir)
-mkdir -p $(docdir) -mkdir -p $(docdir)
- -mkdir -p $(logsdir)
generate-server-key: install-dirs-client: install-dirs
-@if test '!' -f $(etcdir)/silcd.pub ; then \ @@ -775,7 +773,7 @@
@@ -580,9 +576,9 @@
$(etcdir)/silc.conf; \
fi
-@SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs sim-install doc-install etc-install @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 generate-server-key sim-install doc-install toolkit-install examples-install etc-install @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 generate-server-key sim-install doc-install examples-install etc-install -@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_TRUE@install-data-hook: install-dirs doc-install
+@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_TRUE@install-data-hook: install-dirs doc-install
+@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_FALSE@install-data-hook: install-dirs doc-install +@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_FALSE@install-data-hook: install-dirs doc-install
# Tell versions [3.59,3.63) of GNU make to not export all variables. # 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. # Otherwise a system limit (for SysV at least) may be exceeded.

View file

@ -1,11 +1,11 @@
--- configure.orig Wed Jul 17 18:56:57 2002 --- configure.orig Tue Dec 31 17:10:45 2002
+++ configure Wed Jul 17 18:57:09 2002 +++ configure Tue Dec 31 17:10:58 2002
@@ -2623,7 +2623,7 @@ @@ -3052,7 +3052,7 @@
# Distribution definition. ./prepare will automatically add here a correct
# value. Do not edit! # value. Do not edit!
#
silc_dist=silc-server silc_dist=silc-server
-SILC_DIST_SUBDIRS="lib silcd doc includes" -SILC_DIST_SUBDIRS="lib silcd doc includes"
+SILC_DIST_SUBDIRS="doc" +SILC_DIST_SUBDIRS="doc"
cat >>confdefs.h <<\EOF cat >>confdefs.h <<\_ACEOF
#define SILC_DIST_SERVER 1 #define SILC_DIST_SERVER 1
EOF _ACEOF

View file

@ -6,12 +6,10 @@ share/doc/silc/FAQ
share/doc/silc/INSTALL share/doc/silc/INSTALL
share/doc/silc/README share/doc/silc/README
share/doc/silc/TODO share/doc/silc/TODO
share/doc/silc/draft-riikonen-presence-attrs-00.txt share/doc/silc/draft-riikonen-presence-attrs-01.txt
share/doc/silc/draft-riikonen-silc-commands-03.txt share/doc/silc/draft-riikonen-silc-commands-04.txt
share/doc/silc/draft-riikonen-silc-flags-payloads-00.txt share/doc/silc/draft-riikonen-silc-flags-payloads-02.txt
share/doc/silc/draft-riikonen-silc-ke-auth-05.txt share/doc/silc/draft-riikonen-silc-ke-auth-06.txt
share/doc/silc/draft-riikonen-silc-pp-05.txt share/doc/silc/draft-riikonen-silc-pp-06.txt
share/doc/silc/draft-riikonen-silc-spec-05.txt share/doc/silc/draft-riikonen-silc-spec-06.txt
share/doc/silc/example_silcd.conf @unexec %D/share/doc/silc 2>/dev/null || true
share/doc/silc/example_silcd.conf.in
@dirrm share/doc/silc

View file

@ -6,15 +6,23 @@
# #
PORTNAME= silc PORTNAME= silc
PORTVERSION= 0.9.5 PORTVERSION= 0.9.10.1
CATEGORIES= net ipv6 security CATEGORIES= net ipv6 security
MASTER_SITES= http://www.silcnet.org/download/server/sources/ \ MASTER_SITES= http://www.silcnet.org/download/%SUBDIR%/ \
ftp://ftp.silcnet.org/silc/server/sources/ \ http://ftp.silcnet.org/%SUBDIR%/ \
http://public.www.planetmirror.com/pub/silcnet/server/sources/ \ http://www.planetmirror.com/pub/silcnet/%SUBDIR%/ \
ftp://ftp.au.silcnet.org/pub/silcnet/server/sources/ \ http://www.nic.funet.fi/pub/mirrors/ftp.silcnet.org/silc/%SUBDIR%/ \
http://www.mirrors.wiretapped.net/security/network-security/silc/server/sources/ \ http://www.fi.silcnet.org/download/%SUBDIR%/ \
ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/silc/server/sources/ \ http://munitions.vipul.net/software/mirrors/silc/%SUBDIR%/ \
ftp://ftp.no.silcnet.org/pub/silc/server/sources/ http://www.pl.silcnet.org/download/%SUBDIR%/ \
http://ftp.sunet.se/pub/network/silc/%SUBDIR%/ \
ftp://ftp.silcnet.org/silc/%SUBDIR%/ \
ftp://ftp.au.silcnet.org/pub/silcnet/%SUBDIR%/ \
ftp://ftp.funet.fi/pub/mirrors/ftp.silcnet.org/silc/%SUBDIR%/ \
ftp://ftp.pl.silcnet.org/pub/silc/%SUBDIR%/ \
ftp://ftp.sunet.se/pub/network/silc/%SUBDIR%/ \
ftp://ftp.uk.silcnet.org/pub/silc/%SUBDIR%/
MASTER_SITE_SUBDIR= server/sources
PKGNAMESUFFIX= -server PKGNAMESUFFIX= -server
DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
@ -25,12 +33,14 @@ RUN_DEPENDS= ${LOCALBASE}/share/doc/silc/CREDITS:${.CURDIR}/../silc-doc
.endif .endif
USE_BZIP2= yes USE_BZIP2= yes
USE_LIBTOOL= yes
USE_REINPLACE= yes USE_REINPLACE= yes
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-silcd-config-file=${PREFIX}/etc/${PORTNAME}/silcd.conf \ CONFIGURE_ARGS= --with-silcd-config-file=${PREFIX}/etc/${PORTNAME}/silcd.conf \
--with-etcdir=${PREFIX}/etc/${PORTNAME} \ --with-etcdir=${PREFIX}/etc/${PORTNAME} \
--with-helpdir=share/${PORTNAME}/help \ --with-helpdir=share/${PORTNAME}/help \
--with-logsdir=${PORTNAME}/logs \ --with-logsdir=${PORTNAME}/logs \
--with-simdir=${PREFIX}/lib/silcsim/server \
--with-silcd-pid-file=/var/run/silcd.pid --with-silcd-pid-file=/var/run/silcd.pid
INSTALLS_SHLIB= yes INSTALLS_SHLIB= yes
PLIST_SUB= INSTALL_DIR="${INSTALL_DIR}" PLIST_SUB= INSTALL_DIR="${INSTALL_DIR}"
@ -38,6 +48,9 @@ PKGDEINSTALL= ${PKGINSTALL}
INSTALL_DIR?= ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 INSTALL_DIR?= ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755
MAN5= silcd.conf.5
MAN8= silcd.8
.ifndef(WITH_PTHREADS) .ifndef(WITH_PTHREADS)
CONFIGURE_ARGS+= --disable-threads CONFIGURE_ARGS+= --disable-threads
.else .else
@ -61,6 +74,16 @@ post-patch:
.ifndef(WITH_OPTIMIZED_CFLAGS) .ifndef(WITH_OPTIMIZED_CFLAGS)
@${REINPLACE_CMD} -e 's/-O2//' ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's/-O2//' ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
.endif .endif
.ifdef(NOPORTDOCS)
@${REINPLACE_CMD} -E -e \
's/(install-data-hook:.*)example-install/\1/' \
${WRKSRC}/Makefile.in
.endif
@${REINPLACE_CMD} -e 's/--libtool-enable-shared//' \
${WRKSRC}/lib/silccrypt/Makefile.in
post-configure:
@${CP} ${LOCALBASE}/bin/libtool ${WRKSRC}
post-install: post-install:
@${SETENV} PKG_PREFIX=${PREFIX} ${SH} \ @${SETENV} PKG_PREFIX=${PREFIX} ${SH} \

View file

@ -1 +1 @@
MD5 (silc-server-0.9.5.tar.bz2) = 031796371828a92debcec9e33bab42e1 MD5 (silc-server-0.9.10.1.tar.bz2) = 47f687c8261f31befd16b8ae2fad2716

View file

@ -1,30 +1,37 @@
--- Makefile.in.orig Mon Jul 1 13:55:06 2002 --- Makefile.in.orig Thu Dec 5 19:43:42 2002
+++ Makefile.in Wed Jul 17 18:43:13 2002 +++ Makefile.in Tue Dec 31 18:26:52 2002
@@ -151,7 +151,7 @@ @@ -231,7 +231,7 @@
AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
-COMMONDIRS = lib irssi silc silcd doc includes -COMMONDIRS = lib irssi silc silcd doc includes
+COMMONDIRS = lib irssi silcd includes +COMMONDIRS = lib irssi silcd doc includes
# Sub directories defined by "distributions" file, and can be overridden # Sub directories defined by "distributions" file, and can be overridden
# with ./configure, which substitutes these variables. # with ./configure, which substitutes these variables.
@@ -531,9 +531,6 @@ @@ -700,7 +700,6 @@
install-dirs: install-dirs:
-mkdir -p $(etcdir) -mkdir -p $(etcdir)
- -mkdir -p $(modulesdir) -mkdir -p $(modulesdir)
- -mkdir -p $(helpdir)
- -mkdir -p $(docdir) - -mkdir -p $(docdir)
-mkdir -p $(logsdir)
generate-server-key: install-dirs-client: install-dirs
@@ -568,21 +565,17 @@ -mkdir -p $(helpdir)
$(INSTALL_DATA) $(srcdir)/doc/examples/cell* $(docdir)/examples/ @@ -728,8 +727,7 @@
$(INSTALL_DATA) $(srcdir)/doc/silc.1 $(mandir)/man1; \
fi
etc-install: -doc-install-server: doc-install
- -$(INSTALL_DATA) $(srcdir)/doc/example_silcd.conf $(docdir)/
+doc-install-server:
-@if test -f $(srcdir)/doc/silcd.8 ; then \
$(INSTALL_DATA) $(srcdir)/doc/silcd.8 $(mandir)/man8; \
fi
@@ -746,13 +744,11 @@
fi
etc-install-server:
- -@if test '!' -f $(etcdir)/silcd.conf ; then \ - -@if test '!' -f $(etcdir)/silcd.conf ; then \
+ -@if test '!' -f $(etcdir)/silcd.conf.sample ; then \
$(INSTALL_DATA) $(srcdir)/doc/example_silcd.conf \ $(INSTALL_DATA) $(srcdir)/doc/example_silcd.conf \
- $(etcdir)/silcd.conf; \ - $(etcdir)/silcd.conf; \
+ $(etcdir)/silcd.conf.sample; \ + $(etcdir)/silcd.conf.sample; \
@ -32,19 +39,30 @@
- $(etcdir)/silcalgs.conf; \ - $(etcdir)/silcalgs.conf; \
- chmod go= $(etcdir)/silcd.conf; \ - chmod go= $(etcdir)/silcd.conf; \
- fi - fi
- -@if test '!' -f $(etcdir)/silc.conf ; then \
- $(INSTALL_DATA) $(srcdir)/irssi/silc.conf \
- $(etcdir)/silc.conf; \
+ $(etcdir)/silcalgs.conf.sample; \ + $(etcdir)/silcalgs.conf.sample; \
+ chmod go= $(etcdir)/silcd.conf.sample; \ + chmod go= $(etcdir)/silcd.conf.sample
fi
-@SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs sim-install doc-install etc-install sim-install:
-@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_TRUE@install-data-hook: install-dirs generate-server-key sim-install doc-install toolkit-install examples-install etc-install -$(INSTALL_DATA) $(srcdir)/lib/silcsim/*.so $(modulesdir)/
-@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_FALSE@install-data-hook: install-dirs generate-server-key sim-install doc-install examples-install etc-install @@ -764,9 +760,9 @@
+@SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs etc-install -cp -R $(srcdir)/tutorial $(prefix)
+@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_TRUE@install-data-hook: install-dirs etc-install
+@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_FALSE@install-data-hook: install-dirs etc-install examples-install:
- -mkdir -p $(docdir)/examples/
- -$(INSTALL_DATA) $(srcdir)/doc/examples/README $(docdir)/examples/
- -$(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 @@
@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. # 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. # Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: .NOEXPORT:

View file

@ -1,15 +1,6 @@
--- configure.orig Thu Sep 19 18:57:28 2002 --- configure.orig Tue Dec 31 17:49:16 2002
+++ configure Thu Sep 19 18:58:28 2002 +++ configure Tue Dec 31 17:49:55 2002
@@ -2626,7 +2626,7 @@ @@ -14526,7 +14526,7 @@
# value. Do not edit!
#
silc_dist=silc-server
-SILC_DIST_SUBDIRS="lib silcd doc includes"
+SILC_DIST_SUBDIRS="lib silcd includes"
cat >>confdefs.h <<\EOF
#define SILC_DIST_SERVER 1
EOF
@@ -11978,7 +11978,7 @@
fi fi
;; ;;
*-*-freebsd*) *-*-freebsd*)

View file

@ -1,13 +1,22 @@
--- silcd/Makefile.in.orig Wed Jul 17 18:20:09 2002 --- silcd/Makefile.in.orig Thu Dec 5 19:43:48 2002
+++ silcd/Makefile.in Wed Jul 17 18:20:33 2002 +++ silcd/Makefile.in Tue Dec 31 18:08:15 2002
@@ -259,8 +259,8 @@ @@ -130,7 +130,7 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
-LIBS = $(SILC_COMMON_LIBS) -lsilc
+LIBS = -L$(top_srcdir)/lib/.libs $(SILC_COMMON_LIBS) -lsilc
LIBSILCCLIENT_AGE = @LIBSILCCLIENT_AGE@
LIBSILCCLIENT_CURRENT = @LIBSILCCLIENT_CURRENT@
LIBSILCCLIENT_REVISION = @LIBSILCCLIENT_REVISION@
@@ -326,8 +326,8 @@
|| test -f $$p1 \ || test -f $$p1 \
; then \ ; then \
f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/$$f"; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/$$f; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f || exit 1; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/$$p"; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$p"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/$$p; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$p || exit 1; \
else :; fi; \ else :; fi; \
done done

View file

@ -1,4 +1,23 @@
etc/silc/silcalgs.conf.sample etc/silc/silcalgs.conf.sample
etc/silc/silcd.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 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 rmdir %D/etc/silc 2>/dev/null || true @unexec rmdir %D/etc/silc 2>/dev/null || true