updates.

diff --git a/configure.ad b/configure.ad
index 1d456d282248c81fa0278a8f2e750850faedd427..d11268dcb941b1d88d9d57986f238021c4e794eb 100644 (file)
--- a/configure.ad
+++ b/configure.ad
@@ -56,7 +56,9 @@ __SILC_HAVE_SIM=""
 __SILC_ENABLE_DEBUG=""
 
 AC_PROG_RANLIB
+#ifndef SILC_DIST_TOOLKIT
 AC_DISABLE_SHARED
+#endif SILC_DIST_TOOLKIT
 AC_PROG_LIBTOOL
 
 # Header checking
@@ -1013,6 +1015,10 @@ AC_ARG_WITH(silcd,
     without_silcd=true
   ])
 #endif SILC_DIST_TOOLKIT
+#ifdef SILC_DIST_INPLACE
+without_irssi=false
+without_silcd=false
+#endif SILC_DIST_INPLACE
 
 libtoolfix=true
 AC_MSG_CHECKING(whether to do libtoolfix)

diff --git a/distdir/TOOLKIT b/distdir/TOOLKIT
new file mode 100644 (file)
index 0000000..d99d8f3
--- /dev/null
+++ b/distdir/TOOLKIT
@@ -0,0 +1,25 @@
+The SILC Toolkit distribution is dual-licensed distribution.  The 
+following licenses govern this distribution, and you are free to choose 
+either one of the licenses:
+
+ - GNU General Public License, Version 2       (see file GPL)
+ - Revised BSD License                         (see file BSD)
+
+Choose GNU GPL if your application is also GNU GPL or other similar 
+compatible Open Source licensed application.
+
+Choose Revised BSD license if your application is also BSD licensed or 
+commercial application.
+
+NOTE: The files under the subdirectory apps/ are only GNU GPL licensed 
+example application code.  They are not compiled by default in SILC 
+Toolkit, and not delivered into the any compiled binary or library.  They 
+are not dual-licensed code.
+
+Always verify the license from the file you are using.
+
+All code that is included in the compiled libraries (*) are dual-licensed
+and you may freely choose the license you wish to use from the above list.
+
+(*) lib/silcutil/silcconfig.c and lib/silcutil/silcconfig.h files are only 
+    GNU GPL licensed.  They are not dual licensed.

diff --git a/distdir/TOOLKIT-header b/distdir/TOOLKIT-header
new file mode 100644 (file)
index 0000000..e8625e8
--- /dev/null
+++ b/distdir/TOOLKIT-header
@@ -0,0 +1,8 @@
+  The contents of this file are subject to one of the Licenses specified 
+  in the COPYING file;  You may not use this file except in compliance 
+  with the License.
+
+  The software distributed under the License is distributed on an "AS IS"
+  basis, in the hope that it will be useful, but WITHOUT WARRANTY OF ANY
+  KIND, either expressed or implied.  See the COPYING file for more
+  information.

diff --git a/distdir/default b/distdir/default
index c58d4036c8fc4ab0cbdcc009af5f650d0c51a0e7..9c3a9060884bb9a6417e5c83191872d5faefb3ba 100644 (file)
--- a/distdir/default
+++ b/distdir/default
@@ -16,6 +16,6 @@ inherit toolkit
 define SILC_DIST_INPLACE
 
 # SFTP is undefined in server, so force it here
-#define SILC_DIST_SFTP
+define SILC_DIST_SFTP
 
 pre-hook distdir/pre-run

diff --git a/distdir/post-process-dist b/distdir/post-process-dist
index f6e4f38e5c253c7813ddfe81e00e46e63cf9da8e..375b98633b57e5e0149ebcd72abcb216f18f3da6 100644 (file)
--- a/distdir/post-process-dist
+++ b/distdir/post-process-dist
@@ -10,4 +10,5 @@ distdir=$4
 
 if test -d $distdir; then
   rm -rf `find $distdir -name CVS`
+  rm -rf `find $distdir -name Makefile`
 fi

diff --git a/distdir/pre-dist b/distdir/pre-dist
new file mode 100644 (file)
index 0000000..f17fad0
--- /dev/null
+++ b/distdir/pre-dist
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+distribution=$1
+dist_version=$2
+package=$3
+distdir=$4
+
+cd doc
+make dist-hook
+rm -rf toolkit
+make toolkit-ref-html
+cp ../lib/doc/*.gif toolkit
+cd ..
+

diff --git a/distdir/toolkit b/distdir/toolkit
index 0a727425ff491be3cf2fd624ebe842618785f485..b0debdbfd65847fc60d9c1accfe576a2b3be360d 100644 (file)
--- a/distdir/toolkit
+++ b/distdir/toolkit
@@ -2,15 +2,23 @@ name Toolkit
 package silc-toolkit
 bug-report silc-devel@lists.silcnet.org
 
+# Inherits
 inherit common
 inherit client
 inherit server
 
-define SILC_DIST_TOOLKIT
+# License
+license distdir/TOOLKIT
+include distdir/GPL GPL
+include distdir/BSD BSD
+license-header distdir/GPL-header distdir/TOOLKIT-header
 
+# Distdefs
+define SILC_DIST_TOOLKIT
 # SFTP is undefined in server, so force it here
-#define SILC_DIST_SFTP
+define SILC_DIST_SFTP
 
+# Includes
 include README.CVS
 include README.WIN32
 include README.MACOSX
@@ -18,6 +26,15 @@ include apps/silcer
 include apps/silc
 include tutorial
 
+# Noprocess to optimize packaging and avoid re-licensing of certain files
+noprocess COPYING GPL BSD
+noprocess doc/toolkit/
+noprocess apps/
+noprocess win32/
+noprocess lib/silcutil/silcconfig.[ch]
+
 pre-hook distdir/pre-run
 post-process-dist-hook distdir/post-process-dist
+pre-dist-hook distdir/pre-dist
 post-dist-hook distdir/post-dist
+

diff --git a/doc/Makefile.ad b/doc/Makefile.ad
index c7920dc61e88e9fb775ac714e7bdad2a81da81f2..f5926593553c7199241d5bb1445aa9be1a8ae10d 100644 (file)
--- a/doc/Makefile.ad
+++ b/doc/Makefile.ad
@@ -51,7 +51,6 @@ toolkit-ref-pdf:
         fi
 
 dist-hook:
-       rm -rf `find $(top_distdir)/doc -name CVS`
        $(SILC_TOP_SRCDIR)/scripts/manpages.pl
        touch draft-riikonen-silc-spec-08.txt
        touch draft-riikonen-silc-pp-09.txt
@@ -88,6 +87,8 @@ doc-install:
        -mkdir -p $(docdir)
 #ifdef SILC_DIST_TOOLKIT
        -$(INSTALL_DATA) $(top_srcdir)/doc/CodingStyle $(docdir)/
+       -$(INSTALL_DATA) $(top_srcdir)/GPL $(docdir)/
+       -$(INSTALL_DATA) $(top_srcdir)/BSD $(docdir)/
 #endif SILC_DIST_TOOLKIT
        -$(INSTALL_DATA) $(top_srcdir)/doc/FAQ $(docdir)/
        -$(INSTALL_DATA) $(top_srcdir)/doc/*.txt $(docdir)/

diff --git a/includes/silcincludes.h.in b/includes/silcincludes.h.in
index 9f0bcf41c34b984c4eb35773c40df9f4637637fd..50f98475e774d7534e0d2a0e424410d9ad9b3508 100644 (file)
--- a/includes/silcincludes.h.in
+++ b/includes/silcincludes.h.in
@@ -146,7 +146,9 @@ extern "C" {
 #if defined(HAVE_GETOPT_H) && defined(HAVE_GETOPT)
 #include <getopt.h>
 #else
+#if defined(HAVE_SILCDEFS_H)
 #include "getopti.h"
+#endif /* HAVE_SILCDEFS_H */
 #endif
 
 #ifdef SOCKS5
@@ -187,7 +189,9 @@ extern "C" {
 #endif
 
 #ifndef HAVE_REGEX_H
+#if defined(HAVE_SILCDEFS_H)
 #include "regexpr.h"
+#endif /* HAVE_SILCDEFS_H */
 #else
 #include <regex.h>
 #endif

diff --git a/lib/contrib/Makefile.am b/lib/contrib/Makefile.ad
similarity index 82%
rename from lib/contrib/Makefile.am
rename to lib/contrib/Makefile.ad
index 1fab5f707eb1df82c12cde11a1ed36d0a19882fc..60055fd12d60d2400105d34a0d18fbf549fadb6c 100644 (file)
--- a/lib/contrib/Makefile.am
+++ b/lib/contrib/Makefile.ad
@@ -33,6 +33,20 @@ else
 libcontrib_la_SOURCES = getopti.c $(STRINGPREP) $(REGEX)
 endif
 
+#ifdef SILC_DIST_TOOLKIT
+if HAVE_REGEX
+REGEXH =
+else
+REGEXH = regexpr.h
+endif
+include_HEADERS =       \
+       $(REGEXH)       \
+       getopti.h       \
+       gunicomp.h      \
+       gunidecomp.h    \
+       stringprep.h
+#endif SILC_DIST_TOOLKIT
+
 EXTRA_DIST = *.c *.h
 
 include $(top_srcdir)/Makefile.defines.in

diff --git a/lib/silcutil/silclog.c b/lib/silcutil/silclog.c
index a836d858e26f877d1a429112f195d6c01570a77c..2955a5dd761e2203ebb3196dc945871487eb5f4b 100644 (file)
--- a/lib/silcutil/silclog.c
+++ b/lib/silcutil/silclog.c
@@ -191,7 +191,7 @@ void silc_log_output(SilcLogType type, char *string)
 
     log = silc_log_get_context(--type);
   }
-  if (!log)
+  if (!log || !log->fp)
     goto end;
 
  found:

diff --git a/win32/libsilc/libsilc.dsp b/win32/libsilc/libsilc.dsp
index fcc2d87f55de8a06fb5e74b4781088216fe12ad0..f5988af3a0df67f4c7197b912a1aed06fa01f1dd 100644 (file)
--- a/win32/libsilc/libsilc.dsp
+++ b/win32/libsilc/libsilc.dsp
@@ -251,29 +251,13 @@ SOURCE=..\..\lib\silcutil\win32\silcwin32util.c
 # Begin Group "silcmath"\r
 \r
 # PROP Default_Filter ""\r
-# Begin Group "mpi"\r
-\r
-# PROP Default_Filter ""\r
-# Begin Source File\r
-\r
-SOURCE=..\..\lib\silcmath\mpi\mpi.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\lib\silcmath\mpi\mplogic.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\lib\silcmath\mpi\mpmontg.c\r
-# End Source File\r
-# End Group\r
 # Begin Source File\r
 \r
 SOURCE=..\..\lib\silcmath\modinv.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcmath\mp_mpi.c\r
+SOURCE=..\..\lib\silcmath\mp_tma.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -283,6 +267,10 @@ SOURCE=..\..\lib\silcmath\mpbin.c
 \r
 SOURCE=..\..\lib\silcmath\silcprimegen.c\r
 # End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcmath\tma.c\r
+# End Source File\r
 # End Group\r
 # Begin Group "silccrypt"\r
 \r
@@ -558,50 +546,30 @@ SOURCE=..\..\lib\silcutil\silcvcard.h
 # End Group\r
 # Begin Group "silcmath No. 1"\r
 \r
-# PROP Default_Filter ""\r
-# Begin Group "mpi No. 1"\r
-\r
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcmath\mpi\logtab.h\r
+SOURCE=..\..\lib\silcmath\mp_tma.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcmath\mpi\montmulf.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE="..\..\lib\silcmath\mpi\mpi-config.h"\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE="..\..\lib\silcmath\mpi\mpi-priv.h"\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\lib\silcmath\mpi\mpi.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\lib\silcmath\mpi\mplogic.h\r
+SOURCE=..\..\lib\silcmath\silcmath.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcmath\mpi\mpprime.h\r
+SOURCE=..\..\lib\silcmath\silcmp.h\r
 # End Source File\r
-# End Group\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcmath\mp_mpi.h\r
+SOURCE=..\..\lib\silcmath\tma.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcmath\silcmath.h\r
+SOURCE=..\..\lib\silcmath\tma_class.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcmath\silcmp.h\r
+SOURCE=..\..\lib\silcmath\tma_superclass.h\r
 # End Source File\r
 # End Group\r
 # Begin Group "silccrypt No. 1"\r

diff --git a/win32/libsilc_static/libsilc_static.dsp b/win32/libsilc_static/libsilc_static.dsp
index 4e28dc8e32779b62d8b57bcabeda5d25f05b1638..b87f99d93386d78f0e6a213b32402c1080fedeac 100644 (file)
--- a/win32/libsilc_static/libsilc_static.dsp
+++ b/win32/libsilc_static/libsilc_static.dsp
@@ -231,29 +231,13 @@ SOURCE=..\..\lib\silcutil\win32\silcwin32util.c
 # Begin Group "silcmath"\r
 \r
 # PROP Default_Filter ""\r
-# Begin Group "mpi"\r
-\r
-# PROP Default_Filter ""\r
-# Begin Source File\r
-\r
-SOURCE=..\..\lib\silcmath\mpi\mpi.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\lib\silcmath\mpi\mplogic.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\lib\silcmath\mpi\mpmontg.c\r
-# End Source File\r
-# End Group\r
 # Begin Source File\r
 \r
 SOURCE=..\..\lib\silcmath\modinv.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcmath\mp_mpi.c\r
+SOURCE=..\..\lib\silcmath\mp_tma.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -263,6 +247,10 @@ SOURCE=..\..\lib\silcmath\mpbin.c
 \r
 SOURCE=..\..\lib\silcmath\silcprimegen.c\r
 # End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\silcmath\tma.c\r
+# End Source File\r
 # End Group\r
 # Begin Group "silccrypt"\r
 \r
@@ -514,50 +502,30 @@ SOURCE=..\..\lib\silcutil\silcvcard.h
 # End Group\r
 # Begin Group "silcmath No. 1"\r
 \r
-# PROP Default_Filter ""\r
-# Begin Group "mpi No. 1"\r
-\r
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcmath\mpi\logtab.h\r
+SOURCE=..\..\lib\silcmath\mp_tma.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcmath\mpi\montmulf.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE="..\..\lib\silcmath\mpi\mpi-config.h"\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE="..\..\lib\silcmath\mpi\mpi-priv.h"\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\lib\silcmath\mpi\mpi.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\lib\silcmath\mpi\mplogic.h\r
+SOURCE=..\..\lib\silcmath\silcmath.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcmath\mpi\mpprime.h\r
+SOURCE=..\..\lib\silcmath\silcmp.h\r
 # End Source File\r
-# End Group\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcmath\mp_mpi.h\r
+SOURCE=..\..\lib\silcmath\tma.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcmath\silcmath.h\r
+SOURCE=..\..\lib\silcmath\tma_class.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\lib\silcmath\silcmp.h\r
+SOURCE=..\..\lib\silcmath\tma_superclass.h\r
 # End Source File\r
 # End Group\r
 # Begin Group "silccrypt No. 1"\r