updates.

diff --git a/distdir/pre-dist-toolkit b/distdir/pre-dist-toolkit
index f8a5f11de404598b14c18be85912bf87e820dbba..4f5641b10cac2fde3dc60b591df2060740f246eb 100644 (file)
--- a/distdir/pre-dist-toolkit
+++ b/distdir/pre-dist-toolkit
@@ -5,6 +5,8 @@ dist_version=$2
 package=$3
 distdir=$4
 
+sed -e "s/SILC_VERSION/$dist_version/" silc-toolkit.spec.in > silc-toolkit.spec
+
 ./configure
 
 cd doc
@@ -13,4 +15,3 @@ rm -rf toolkit
 make toolkit-ref-html
 cp ../lib/doc/*.gif toolkit
 cd ..
-

diff --git a/lib/silccrypt/Makefile.ad b/lib/silccrypt/Makefile.ad
index 766ea169a1292a572f640aec8ea36d482a3e5345..190316627fa63646a9576df3de0a28c0819eb316 100644 (file)
--- a/lib/silccrypt/Makefile.ad
+++ b/lib/silccrypt/Makefile.ad
@@ -3,7 +3,7 @@
 #
 #  Author: Pekka Riikonen <priikone@silcnet.org>
 #
-#  Copyright (C) 2000 - 2006 Pekka Riikonen
+#  Copyright (C) 2000 - 2007 Pekka Riikonen
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -32,7 +32,6 @@ endif
 
 libsilccrypt_la_SOURCES =      \
        none.c                  \
-       rc5.c                   \
        md5.c                   \
        $(SILC_AES_S)           \
        rsa.c                   \
@@ -40,7 +39,6 @@ libsilccrypt_la_SOURCES =     \
        sha256.c                \
        twofish.c               \
        blowfish.c              \
-       cast.c                  \
        silccipher.c            \
        silchash.c              \
        silchmac.c              \

diff --git a/lib/silccrypt/ciphers.h b/lib/silccrypt/ciphers.h
index 0fb9391cc0643864f149e06ca0f53c8f794f7292..27eadf24707b9de96def208742c71340b47834fb 100644 (file)
--- a/lib/silccrypt/ciphers.h
+++ b/lib/silccrypt/ciphers.h
@@ -4,12 +4,12 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 1997 - 2000 Pekka Riikonen
+  Copyright (C) 1997 - 2007 Pekka Riikonen
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; version 2 of the License.
-  
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -21,10 +21,8 @@
 #define CIPHERS_H
 
 #include "none.h"
-#include "rc5.h"
 #include "twofish.h"
 #include "aes.h"
 #include "blowfish.h"
-#include "cast.h"
 
 #endif

diff --git a/lib/silccrypt/silccipher.c b/lib/silccrypt/silccipher.c
index efb4b76a396712f8ce9c989ac3eb6ee6da303239..f7f64600b34633fc788f756d59dfffab5061f143 100644 (file)
--- a/lib/silccrypt/silccipher.c
+++ b/lib/silccrypt/silccipher.c
@@ -60,12 +60,6 @@ const SilcCipherObject silc_default_ciphers[] =
                      SILC_CIPHER_MODE_CBC),
   SILC_CIPHER_API_DEF("twofish-128-cbc", twofish_cbc, 128, 16, 16,
                      SILC_CIPHER_MODE_CBC),
-  SILC_CIPHER_API_DEF("cast-256-cbc", cast_cbc, 256, 16, 16,
-                     SILC_CIPHER_MODE_CBC),
-  SILC_CIPHER_API_DEF("cast-192-cbc", cast_cbc, 192, 16, 16,
-                     SILC_CIPHER_MODE_CBC),
-  SILC_CIPHER_API_DEF("cast-128-cbc", cast_cbc, 128, 16, 16,
-                     SILC_CIPHER_MODE_CBC),
 #ifdef SILC_DEBUG
   SILC_CIPHER_API_DEF("none", none, 0, 0, 0, 0),
 #endif /* SILC_DEBUG */

diff --git a/lib/silcsim/Makefile.ad b/lib/silcsim/Makefile.ad
index 0c9149755bfd35c836cb05c1cb49b0e97f85fe0f..e0b3fb25a2bad981d770192a719424d699841f7c 100644 (file)
--- a/lib/silcsim/Makefile.ad
+++ b/lib/silcsim/Makefile.ad
@@ -3,7 +3,7 @@
 #
 #  Author: Pekka Riikonen <priikone@silcnet.org>
 #
-#  Copyright (C) 2000 - 2005 Pekka Riikonen
+#  Copyright (C) 2000 - 2007 Pekka Riikonen
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@ AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 if SILC_SIM
 noinst_LTLIBRARIES = libsilcsim.la
 else
-noinst_LTLIBRARIES = 
+noinst_LTLIBRARIES =
 endif
 
 libsilcsim_la_SOURCES = \
@@ -33,18 +33,17 @@ libsilcsim_la_SOURCES = \
 SIM_CIPHER_OBJS = \
         none.o \
         blowfish.o \
-        rc5.o \
         aes.o \
         rsa.o \
-        twofish.o \
-       cast.o
+        twofish.o
 
 #
 # SILC Hash Functions to be compiled as modules
 #
 SIM_HASH_OBJS = \
        md5.o \
-       sha1.o
+       sha1.o \
+       sha256.o
 
 if SILC_SIM
 all: $(SIM_CIPHER_OBJS) $(SIM_HASH_OBJS)

diff --git a/silc-toolkit.spec.in b/silc-toolkit.spec.in
new file mode 100644 (file)
index 0000000..f2a1ca5
--- /dev/null
+++ b/silc-toolkit.spec.in
@@ -0,0 +1,127 @@
+Summary: SILC Toolkit
+Name: silc-toolkit
+Version: SILC_VERSION
+Release: 0.fc6
+License: GPL/BSD dual licensed
+Group: System Environment/Libraries
+URL: http://silcnet.org/
+Source0: silc-toolkit-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRequires: libtool pkgconfig
+Obsoletes: libsilc
+Obsoletes: libsilc-devel
+Obsoletes: libsilc-doc
+Provides: libsilc
+Provides: libsilc-devel
+Provides: libsilc-doc
+Epoch: 0
+
+%description
+SILC Toolkit providing SILC Protocol Core Library, SILC Client Library,
+runtime library and many other libraries.  SILC Toolkit enables SILC
+application development.
+
+%package devel
+Group: Development/Libraries
+Summary: SILC Toolkit providing headers, libraries and documentation
+Requires: silc-toolkit = %{epoch}:%{version}-%{release}
+Requires: pkgconfig
+
+%description devel
+The SILC Toolkit development libraries, headers and documentation.  SILC
+Toolkit enables SILC application development.
+
+%prep
+%setup -q -n silc-toolkit-%{version}
+
+%build
+%configure --libdir=%{_libdir} \
+           --includedir=%{_includedir}/silc \
+           --with-simdir=%{_libdir}/silc/modules \
+           --with-docdir=%{_docdir}/%{name}-%{version}
+make -j4
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT install
+chmod 0755 ${RPM_BUILD_ROOT}%{_libdir}/lib*
+chmod 0755 ${RPM_BUILD_ROOT}%{_libdir}/silc/modules/*.so
+
+# Move toolkit reference manual to root
+mv doc/toolkit toolkit
+
+# Remove files we don't want in the packages
+rm -rf \
+$RPM_BUILD_ROOT%{_sysconfdir}/silcalgs.conf \
+$RPM_BUILD_ROOT%{_sysconfdir}/silcd.conf \
+$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/INSTALL \
+$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README \
+$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README.MACOSX \
+$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README.WIN32 \
+$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README.PLUGIN \
+$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README.SYMBIAN \
+$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/TODO \
+$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/example_silc.conf \
+$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/example_silcd.conf \
+$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/examples/ \
+$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/CHANGES \
+$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/tutorial \
+$RPM_BUILD_ROOT%{_mandir}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(0755, root, root, 0755)
+%{_libdir}/libsilc-1.1.so*
+%{_libdir}/libsilcclient-1.1.so*
+%dir %_libdir/silc
+%dir %_libdir/silc/modules
+%{_libdir}/silc/modules/*.so
+%defattr(0644, root, root, 0755)
+%doc CHANGES COPYING GPL BSD
+
+%files devel
+%defattr(0644, root, root, 0755)
+%doc CHANGES COPYING GPL BSD
+%doc --parents toolkit
+%{_libdir}/libsilc.so
+%{_libdir}/libsilc.*a
+%{_libdir}/libsilcclient.so
+%{_libdir}/libsilcclient.*a
+%{_libdir}/pkgconfig/silc.pc
+%{_libdir}/pkgconfig/silcclient.pc
+%dir %_includedir/silc
+%{_includedir}/silc/*.h
+
+%changelog
+* Wed May 30 2007 Pekka Riikonen <priikone@silcnet.org>
+- Rewrote .spec for SILC Toolkit 1.1
+
+* Tue Sep 1 2004 Toni Willberg <toniw@iki.fi>
+- 0.9.12-0.fdr.6 - Had to remove smp_mflags because build fails with them
+  (Michael Schwendt)
+
+* Tue Aug 31 2004 Toni Willberg <toniw@iki.fi>
+- 0.9.12-0.fdr.5 - corrections to lib and include path (from Michael Schwendt)
+
+* Tue Aug 31 2004 Toni Willberg <toniw@iki.fi>
+- 0.9.12-0.fdr.4 - post/postun /sbin/ldconfig
+  (Patch 823 from Stu Tomlinson)
+
+* Tue Aug 31 2004 Toni Willberg <toniw@iki.fi>
+- 0.9.12-0.fdr.3 - Move libs to %{_libdir} and add a silc.pc
+  (Patch 815 from Stu Tomlinson)
+
+* Tue Aug 17 2004 Toni Willberg <toniw@iki.fi>
+- fix so permissions and hardcoded paths (patch from Michael Schwendt)
+
+* Mon Jul 5 2004 Toni Willberg <toniw@iki.fi>
+- Fixed various errors
+
+* Sun Jul 4 2004 Toni Willberg <toniw@iki.fi>
+- Initial version for Fedora