diff options
-rw-r--r-- | chat/silc-server/Makefile | 10 | ||||
-rw-r--r-- | chat/silc-server/PLIST | 6 | ||||
-rw-r--r-- | chat/silc-server/distinfo | 9 | ||||
-rw-r--r-- | chat/silc-server/files/silcd.generic | 4 | ||||
-rw-r--r-- | chat/silc-server/files/silcd.sh | 4 | ||||
-rw-r--r-- | chat/silc-server/patches/patch-aa | 25 | ||||
-rw-r--r-- | chat/silc-server/patches/patch-ac | 19 |
7 files changed, 24 insertions, 53 deletions
diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile index f6260313234..12ef04e263f 100644 --- a/chat/silc-server/Makefile +++ b/chat/silc-server/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.25 2003/08/30 22:51:13 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2003/10/16 12:37:44 salo Exp $ # -DISTNAME= silc-server-0.9.13 -PKGREVISION= 1 +DISTNAME= silc-server-0.9.14 CATEGORIES= chat security MASTER_SITES= http://www.silcnet.org/download/server/sources/ \ ftp://ftp.silcnet.org/silc/server/sources/ \ @@ -18,7 +17,6 @@ COMMENT= Server for the Secure Internet Live Conferencing (SILC) USE_BUILDLINK2= YES USE_PKGINSTALL= YES GNU_CONFIGURE= YES -USE_GMAKE= YES USE_LIBTOOL= YES SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool ${WRKSRC}/lib/silcmath/mpi/libtool @@ -64,9 +62,11 @@ CONFIGURE_ARGS+= --with-silcd-pid-file=/var/run/silcd.pid CONFIGURE_ARGS+= --without-iconv CONFIGURE_ARGS+= --without-libtoolfix -# List it into IPv6-ready packages. BUILD_DEFS+= USE_INET6 + +.if defined(USE_INET6) && !empty(USE_INET6:M[Yy][Ee][Ss]) CONFIGURE_ARGS+= --enable-ipv6 +.endif # If you want to debug silc-server, uncomment this. # diff --git a/chat/silc-server/PLIST b/chat/silc-server/PLIST index 3147a8b171e..b10837d7cdc 100644 --- a/chat/silc-server/PLIST +++ b/chat/silc-server/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.10 2003/03/17 20:12:47 salo Exp $ +@comment $NetBSD: PLIST,v 1.11 2003/10/16 12:37:44 salo Exp $ etc/rc.d/silcd lib/silcd/libsilc-1.0.so -lib/silcd/libsilc-1.0.so.1 -lib/silcd/libsilc-1.0.so.1.0 +lib/silcd/libsilc-1.0.so.2 +lib/silcd/libsilc-1.0.so.2.0 lib/silcd/libsilc.la lib/silcd/libsilc.so lib/silcd/modules/aes.sim.so diff --git a/chat/silc-server/distinfo b/chat/silc-server/distinfo index 04685e6e39c..29e29df83e6 100644 --- a/chat/silc-server/distinfo +++ b/chat/silc-server/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.19 2003/03/17 20:12:47 salo Exp $ +$NetBSD: distinfo,v 1.20 2003/10/16 12:37:44 salo Exp $ -SHA1 (silc-server-0.9.13.tar.bz2) = 04740652748363aee461258202fd2ade9c268979 -Size (silc-server-0.9.13.tar.bz2) = 1084978 bytes -SHA1 (patch-aa) = 574f1c4bcbf4ef7d91b6bd53044570c99717d4cc +SHA1 (silc-server-0.9.14.tar.bz2) = c8da53bf1bfd089f5836505a7233dc1bb55e10dd +Size (silc-server-0.9.14.tar.bz2) = 1087719 bytes +SHA1 (patch-aa) = 181bf9a721abaeaaa0afd7e24017cd49a8020ac4 SHA1 (patch-ab) = 55b3f00076c5b8a443465753ae07b9e812236f18 -SHA1 (patch-ac) = cf4ba08135b9d52169e7a9dde29e53f3822d7578 diff --git a/chat/silc-server/files/silcd.generic b/chat/silc-server/files/silcd.generic index 6fceb7dd7d9..e790826bee4 100644 --- a/chat/silc-server/files/silcd.generic +++ b/chat/silc-server/files/silcd.generic @@ -1,4 +1,4 @@ -# $NetBSD: silcd.generic,v 1.2 2002/05/24 22:15:36 hubertf Exp $ +# $NetBSD: silcd.generic,v 1.3 2003/10/16 12:37:44 salo Exp $ # KILL="/bin/kill" @@ -15,7 +15,7 @@ start_precmd="silcd_precmd" silcd_precmd() { if [ ! -f $confdir/silcd.prv ]; then - $command -C $confdir + umask 7177 && $command -C $confdir fi } diff --git a/chat/silc-server/files/silcd.sh b/chat/silc-server/files/silcd.sh index f0202cbe4dc..a74b97ed2ec 100644 --- a/chat/silc-server/files/silcd.sh +++ b/chat/silc-server/files/silcd.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: silcd.sh,v 1.6 2002/09/20 02:01:55 grant Exp $ +# $NetBSD: silcd.sh,v 1.7 2003/10/16 12:37:44 salo Exp $ # # PROVIDE: silcd # REQUIRE: DAEMON @@ -23,7 +23,7 @@ stop_cmd="silcd_stop" silcd_precmd() { if [ ! -f $confdir/silcd.prv ]; then - $command -C $confdir + umask 7177 && $command -C $confdir fi } diff --git a/chat/silc-server/patches/patch-aa b/chat/silc-server/patches/patch-aa index 8acab77e8d3..566a99512bc 100644 --- a/chat/silc-server/patches/patch-aa +++ b/chat/silc-server/patches/patch-aa @@ -1,17 +1,8 @@ -$NetBSD: patch-aa,v 1.8 2003/03/17 20:12:47 salo Exp $ +$NetBSD: patch-aa,v 1.9 2003/10/16 12:37:44 salo Exp $ ---- Makefile.in.orig 2003-03-17 18:44:44.000000000 +0100 -+++ Makefile.in 2003-03-17 20:27:59.000000000 +0100 -@@ -216,7 +216,7 @@ - libdir = @libdir@ - libexecdir = @libexecdir@ - localstatedir = @localstatedir@ --mandir = $(DESTDIR)$(mandir) -+mandir = $(DESTDIR)@mandir@ - oldincludedir = @oldincludedir@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -@@ -709,14 +709,12 @@ +--- Makefile.in.orig 2003-10-15 19:22:13.000000000 +0200 ++++ Makefile.in 2003-10-16 13:16:39.000000000 +0200 +@@ -710,14 +710,12 @@ -mkdir -p $(mandir)/man1 install-dirs-server: install-dirs @@ -26,7 +17,7 @@ $NetBSD: patch-aa,v 1.8 2003/03/17 20:12:47 salo Exp $ -$(INSTALL_DATA) $(srcdir)/COPYING $(docdir)/ -$(INSTALL_DATA) $(srcdir)/CHANGES $(docdir)/ -$(INSTALL_DATA) $(srcdir)/CREDITS $(docdir)/ -@@ -731,7 +729,6 @@ +@@ -732,7 +730,6 @@ fi doc-install-server: doc-install @@ -34,7 +25,7 @@ $NetBSD: patch-aa,v 1.8 2003/03/17 20:12:47 salo Exp $ -@if test -f $(srcdir)/doc/silcd.8 ; then \ $(INSTALL_DATA) $(srcdir)/doc/silcd.8 $(mandir)/man8; \ fi -@@ -766,9 +763,12 @@ +@@ -767,9 +764,12 @@ -cp -R $(srcdir)/tutorial $(prefix) examples-install: @@ -50,10 +41,10 @@ $NetBSD: patch-aa,v 1.8 2003/03/17 20:12:47 salo Exp $ generate-server-key: -@if test '!' -f $(etcdir)/silcd.pub ; then \ -@@ -777,7 +777,7 @@ +@@ -778,7 +778,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_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: install-dirs-server sim-install doc-install-server examples-install # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/chat/silc-server/patches/patch-ac b/chat/silc-server/patches/patch-ac deleted file mode 100644 index 61afbd16562..00000000000 --- a/chat/silc-server/patches/patch-ac +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ac,v 1.8 2003/03/17 20:12:48 salo Exp $ - ---- lib/silccrypt/Makefile.in.orig Wed Jan 8 17:25:45 2003 -+++ lib/silccrypt/Makefile.in Thu Jan 9 00:15:00 2003 -@@ -366,6 +366,14 @@ - .c.obj: - $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'` - -+# Workaround a bug in GCC which causes memory exhaustion -+# when compiling sha1 with optimizations on UltraSPARC. -+# -+ifeq (sparc64, $(host_cpu)) -+sha1.lo: -+ $(LTCOMPILE) -O0 -c -o $@ `test -f 'sha1.c' || echo '$(srcdir)/'`sha1.c -+ endif -+ - .c.lo: - $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - |