From: Pekka Riikonen Date: Tue, 10 May 2005 13:39:54 +0000 (+0000) Subject: updates. X-Git-Tag: silc.1.0.branch.tag.20050510~3 X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=43d52ac0b58d4741dbb7ef25990fad457f3aed07 updates. --- diff --git a/configure.ad b/configure.ad index 1d456d28..d11268dc 100644 --- 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 index 00000000..d99d8f31 --- /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 index 00000000..e8625e8f --- /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 c58d4036..9c3a9060 100644 --- 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 f6e4f38e..375b9863 100644 --- 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 index 00000000..f17fad05 --- /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 0a727425..b0debdbf 100644 --- 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 c7920dc6..f5926593 100644 --- 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 9f0bcf41..50f98475 100644 --- 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 #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 #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 1fab5f70..60055fd1 100644 --- 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 a836d858..2955a5dd 100644 --- 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 fcc2d87f..f5988af3 100644 --- a/win32/libsilc/libsilc.dsp +++ b/win32/libsilc/libsilc.dsp @@ -251,29 +251,13 @@ SOURCE=..\..\lib\silcutil\win32\silcwin32util.c # Begin Group "silcmath" # PROP Default_Filter "" -# Begin Group "mpi" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\lib\silcmath\mpi\mpi.c -# End Source File -# Begin Source File - -SOURCE=..\..\lib\silcmath\mpi\mplogic.c -# End Source File -# Begin Source File - -SOURCE=..\..\lib\silcmath\mpi\mpmontg.c -# End Source File -# End Group # Begin Source File SOURCE=..\..\lib\silcmath\modinv.c # End Source File # Begin Source File -SOURCE=..\..\lib\silcmath\mp_mpi.c +SOURCE=..\..\lib\silcmath\mp_tma.c # End Source File # Begin Source File @@ -283,6 +267,10 @@ SOURCE=..\..\lib\silcmath\mpbin.c SOURCE=..\..\lib\silcmath\silcprimegen.c # End Source File +# Begin Source File + +SOURCE=..\..\lib\silcmath\tma.c +# End Source File # End Group # Begin Group "silccrypt" @@ -558,50 +546,30 @@ SOURCE=..\..\lib\silcutil\silcvcard.h # End Group # Begin Group "silcmath No. 1" -# PROP Default_Filter "" -# Begin Group "mpi No. 1" - # PROP Default_Filter "" # Begin Source File -SOURCE=..\..\lib\silcmath\mpi\logtab.h +SOURCE=..\..\lib\silcmath\mp_tma.h # End Source File # Begin Source File -SOURCE=..\..\lib\silcmath\mpi\montmulf.h -# End Source File -# Begin Source File - -SOURCE="..\..\lib\silcmath\mpi\mpi-config.h" -# End Source File -# Begin Source File - -SOURCE="..\..\lib\silcmath\mpi\mpi-priv.h" -# End Source File -# Begin Source File - -SOURCE=..\..\lib\silcmath\mpi\mpi.h -# End Source File -# Begin Source File - -SOURCE=..\..\lib\silcmath\mpi\mplogic.h +SOURCE=..\..\lib\silcmath\silcmath.h # End Source File # Begin Source File -SOURCE=..\..\lib\silcmath\mpi\mpprime.h +SOURCE=..\..\lib\silcmath\silcmp.h # End Source File -# End Group # Begin Source File -SOURCE=..\..\lib\silcmath\mp_mpi.h +SOURCE=..\..\lib\silcmath\tma.h # End Source File # Begin Source File -SOURCE=..\..\lib\silcmath\silcmath.h +SOURCE=..\..\lib\silcmath\tma_class.h # End Source File # Begin Source File -SOURCE=..\..\lib\silcmath\silcmp.h +SOURCE=..\..\lib\silcmath\tma_superclass.h # End Source File # End Group # Begin Group "silccrypt No. 1" diff --git a/win32/libsilc_static/libsilc_static.dsp b/win32/libsilc_static/libsilc_static.dsp index 4e28dc8e..b87f99d9 100644 --- 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" # PROP Default_Filter "" -# Begin Group "mpi" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\lib\silcmath\mpi\mpi.c -# End Source File -# Begin Source File - -SOURCE=..\..\lib\silcmath\mpi\mplogic.c -# End Source File -# Begin Source File - -SOURCE=..\..\lib\silcmath\mpi\mpmontg.c -# End Source File -# End Group # Begin Source File SOURCE=..\..\lib\silcmath\modinv.c # End Source File # Begin Source File -SOURCE=..\..\lib\silcmath\mp_mpi.c +SOURCE=..\..\lib\silcmath\mp_tma.c # End Source File # Begin Source File @@ -263,6 +247,10 @@ SOURCE=..\..\lib\silcmath\mpbin.c SOURCE=..\..\lib\silcmath\silcprimegen.c # End Source File +# Begin Source File + +SOURCE=..\..\lib\silcmath\tma.c +# End Source File # End Group # Begin Group "silccrypt" @@ -514,50 +502,30 @@ SOURCE=..\..\lib\silcutil\silcvcard.h # End Group # Begin Group "silcmath No. 1" -# PROP Default_Filter "" -# Begin Group "mpi No. 1" - # PROP Default_Filter "" # Begin Source File -SOURCE=..\..\lib\silcmath\mpi\logtab.h +SOURCE=..\..\lib\silcmath\mp_tma.h # End Source File # Begin Source File -SOURCE=..\..\lib\silcmath\mpi\montmulf.h -# End Source File -# Begin Source File - -SOURCE="..\..\lib\silcmath\mpi\mpi-config.h" -# End Source File -# Begin Source File - -SOURCE="..\..\lib\silcmath\mpi\mpi-priv.h" -# End Source File -# Begin Source File - -SOURCE=..\..\lib\silcmath\mpi\mpi.h -# End Source File -# Begin Source File - -SOURCE=..\..\lib\silcmath\mpi\mplogic.h +SOURCE=..\..\lib\silcmath\silcmath.h # End Source File # Begin Source File -SOURCE=..\..\lib\silcmath\mpi\mpprime.h +SOURCE=..\..\lib\silcmath\silcmp.h # End Source File -# End Group # Begin Source File -SOURCE=..\..\lib\silcmath\mp_mpi.h +SOURCE=..\..\lib\silcmath\tma.h # End Source File # Begin Source File -SOURCE=..\..\lib\silcmath\silcmath.h +SOURCE=..\..\lib\silcmath\tma_class.h # End Source File # Begin Source File -SOURCE=..\..\lib\silcmath\silcmp.h +SOURCE=..\..\lib\silcmath\tma_superclass.h # End Source File # End Group # Begin Group "silccrypt No. 1"