Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/crypto
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv20926

Modified Files:
        silc-toolkit.info silc-toolkit.patch silky.info 
Log Message:
mmm...smooth as fresh silc


Index: silky.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/crypto/silky.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- silky.info  1 Jul 2010 01:39:58 -0000       1.1
+++ silky.info  18 Oct 2010 07:42:53 -0000      1.2
@@ -1,7 +1,6 @@
 Package: silky
 Version: 0.5.4
-Revision: 1004
-Architecture: i386, powerpc
+Revision: 1005
 Maintainer: Scott Garman <[email protected]>
 Source: mirror:sourceforge:%n/%n-%v.tar.gz
 Source-MD5: ef7a583bfb612ec16b3437f56e5c72a3

Index: silc-toolkit.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/crypto/silc-toolkit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- silc-toolkit.patch  1 Jul 2010 01:39:58 -0000       1.1
+++ silc-toolkit.patch  18 Oct 2010 07:42:53 -0000      1.2
@@ -1,50 +1,12 @@
-diff -Naur silc-toolkit-0.9.12/Makefile.in 
silc-toolkit-0.9.12-patched/Makefile.in
---- silc-toolkit-0.9.12/Makefile.in    Sun Feb 29 15:10:00 2004
-+++ silc-toolkit-0.9.12-patched/Makefile.in    Tue Aug 31 14:57:16 2004
-@@ -770,7 +770,6 @@
-       -rm -rf $(distdir)
- 
- install-dirs:
--      -mkdir -p $(etcdir)
-       -mkdir -p $(modulesdir)
-       -mkdir -p $(docdir)
- 
-@@ -833,7 +832,7 @@
-       -mkdir -p $(docdir)/toolkit/
-       -$(INSTALL_DATA) $(srcdir)/doc/toolkit/* $(docdir)/toolkit
-       -$(INSTALL_DATA) $(srcdir)/lib/doc/*.gif $(docdir)/toolkit
--      -cp -R $(srcdir)/tutorial $(prefix)
-+      -cp -R $(srcdir)/tutorial $(DESTDIR)$(datadir)/
- 
- examples-install:
-       -mkdir -p $(docdir)/examples/
-@@ -846,7 +845,7 @@
-       fi
- 
- @silc_dist_client_t...@install-data-hook: install-dirs-client sim-install 
doc-install-client etc-install-client
-...@silc_dist_client_false@@silc_dist_toolkit_t...@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_t...@install-data-hook: 
install-dirs sim-install toolkit-install examples-install
- @SILC_DIST_CLIENT_FALSE@@silc_dist_toolkit_fa...@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.
- # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -Naur silc-toolkit-0.9.12/lib/silcsim/Makefile.in 
silc-toolkit-0.9.12-patched/lib/silcsim/Makefile.in
---- silc-toolkit-0.9.12/lib/silcsim/Makefile.in        Sun Feb 29 15:10:02 2004
-+++ silc-toolkit-0.9.12-patched/lib/silcsim/Makefile.in        Tue Aug 31 
14:58:58 2004
-@@ -593,7 +593,7 @@
- 
- $(SIM_CIPHER_OBJS):
-       @if test '!' -f lib$*.la ; then \
--        $(LIBTOOL) --mode=link $(CCLD) -rpath $(silc_modulesdir) \
-+        $(LIBTOOL) --mode=link $(CCLD) -rpath $(silc_modulesdir) -module \
-               ../silccrypt/$*.lo -o lib$*.la $(LTFLAGS); \
-         cd $(srcdir) && $(LN_S) -f $(srcdir)/.libs/lib$*.so \
-               $(srcdir)/$*.sim.so; \
-@@ -601,7 +601,7 @@
- 
- $(SIM_HASH_OBJS):
-       @if test '!' -f lib$*.la ; then \
--        $(LIBTOOL) --mode=link $(CCLD) -rpath $(silc_modulesdir) \
-+        $(LIBTOOL) --mode=link $(CCLD) -rpath $(silc_modulesdir) -module \
-               ../silccrypt/$*.lo -o lib$*.la $(LTFLAGS); \
-         cd $(srcdir) && $(LN_S) -f $(srcdir)/.libs/lib$*.so \
-               $(srcdir)/$*.sim.so; \
+diff -ru silc-toolkit-1.1.2/lib/silcclient/client_entry.h 
silc-toolkit-1.1.2-patched/lib/silcclient/client_entry.h
+--- silc-toolkit-1.1.2/lib/silcclient/client_entry.h   2007-07-04 
00:18:29.000000000 -0500
++++ silc-toolkit-1.1.2-patched/lib/silcclient/client_entry.h   2007-08-03 
21:34:29.000000000 -0500
+@@ -54,7 +54,7 @@
+                                        SilcChannelID *channel_id);
+ SilcBool silc_client_del_channel(SilcClient client, SilcClientConnection conn,
+                                SilcChannelEntry channel);
+-bool silc_client_replace_channel_id(SilcClient client,
++SilcBool silc_client_replace_channel_id(SilcClient client,
+                                   SilcClientConnection conn,
+                                   SilcChannelEntry channel,
+                                   SilcChannelID *new_id);

Index: silc-toolkit.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/crypto/silc-toolkit.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- silc-toolkit.info   1 Jul 2010 01:39:58 -0000       1.1
+++ silc-toolkit.info   18 Oct 2010 07:42:53 -0000      1.2
@@ -1,40 +1,76 @@
 Package: silc-toolkit
-Version: 0.9.12
+Version: 1.1.10
 Revision: 2
-Architecture: i386, powerpc
-Maintainer: William Dell Wisner <[email protected]>
+Maintainer: Corey Halpin <[email protected]>
 Source: http://silcnet.org/download/toolkit/sources/%n-%v.tar.bz2
-Source-MD5: f859d51fcd5284cc1bdaad0cf33a8e6a
+Source-MD5: f742b64064c40a2d22520549746cf2b4
 Depends: glib-shlibs, %n-shlibs (= %v-%r)
-BuildDepends: fink (>= 0.24.12), glib, libtool14
+BuildDepends: glib
 BuildDependsOnly: True
+SetCFLAGS: -no-cpp-precomp
 SetCPPFLAGS: -I/usr/include
 SetLDFLAGS: -L/usr/lib
-PatchFile: %n.patch
-PatchFile-MD5: 56b91686e59b12e8b4d7ef826d258b3a
-PatchScript: <<
-       %{default_script}
-       libtoolize --automake
+#Patch: %n.patch
+ConfigureParams: <<
+ --with-iconv \
+ --enable-shared \
+ --datadir=%p/share/silc-toolkit \
+ --includedir=%p/include/silc \
+ --mandir=%p/share/man \
+ --with-simdir=%p/lib/silc-toolkit/modules
 <<
-ConfigureParams: (%m = i386) --disable-asm --with-iconv --without-pthreads 
--without-irssi --without-silcd --enable-shared --datadir=%p/share/silc-toolkit 
--includedir=%p/include/silc --mandir=%p/share/man 
--with-docdir=%p/share/doc/silc-toolkit --with-etcdir=%p/etc 
--with-helpdir=%p/share/silc-toolkit/help 
--with-simdir=%p/lib/silc-toolkit/modules --with-logsdir=%p/var/log
 CompileScript: <<
   ./configure %c
-  touch lib/contrib/libcontrib.la
-  rm -r tutorial/CVS tutorial/mybot/CVS
+  find . -name Makefile -exec perl -pi -e 's:\.so:.dylib:g' {} \;
   make
 <<
 InstallScript: <<
-       install -d -m 755 %i/share/silc-toolkit
-       make -j1 install DESTDIR=%d
+  install -d -m 755 %i/share/silc-toolkit;
+  make -j1 install DESTDIR=%d
+  find %d -name \*.la -exec perl -pi -e 's:-L%b/lib::' {} \;
+  install_name_tool -id %p/lib/silc-toolkit/modules/aes.sim.dylib \
+                        %i/lib/silc-toolkit/modules/aes.sim.dylib
+  install_name_tool -id %p/lib/silc-toolkit/modules/blowfish.sim.dylib \
+                        %i/lib/silc-toolkit/modules/blowfish.sim.dylib
+  install_name_tool -id %p/lib/silc-toolkit/modules/md5.sim.dylib \
+                        %i/lib/silc-toolkit/modules/md5.sim.dylib
+  install_name_tool -id %p/lib/silc-toolkit/modules/none.sim.dylib \
+                        %i/lib/silc-toolkit/modules/none.sim.dylib
+  install_name_tool -id %p/lib/silc-toolkit/modules/rsa.sim.dylib \
+                        %i/lib/silc-toolkit/modules/rsa.sim.dylib
+  install_name_tool -id %p/lib/silc-toolkit/modules/sha1.sim.dylib \
+                        %i/lib/silc-toolkit/modules/sha1.sim.dylib
+  install_name_tool -id %p/lib/silc-toolkit/modules/sha256.sim.dylib \
+                        %i/lib/silc-toolkit/modules/sha256.sim.dylib
+  install_name_tool -id %p/lib/silc-toolkit/modules/twofish.sim.dylib \
+                        %i/lib/silc-toolkit/modules/twofish.sim.dylib
 <<
-#
 SplitOff: <<
  Package: %N-shlibs
  Replaces: %N (<<0.9.12-2)
- Files: lib/libsilc-1.0.2*.dylib lib/libsilcclient-1.0.2*.dylib
+ Files: <<
+   lib/libsilc-1.1.2.dylib
+   lib/libsilcclient-1.1.3.dylib
+   lib/silc-toolkit/modules/aes.sim.dylib
+   lib/silc-toolkit/modules/blowfish.sim.dylib
+   lib/silc-toolkit/modules/md5.sim.dylib
+   lib/silc-toolkit/modules/none.sim.dylib
+   lib/silc-toolkit/modules/rsa.sim.dylib
+   lib/silc-toolkit/modules/sha1.sim.dylib
+   lib/silc-toolkit/modules/sha256.sim.dylib
+   lib/silc-toolkit/modules/twofish.sim.dylib
+ <<
  Shlibs: <<
-  %p/lib/libsilc-1.0.2.dylib 4.0.0 %n (>= 0.9.12-2)
-  %p/lib/libsilcclient-1.0.2.dylib 4.0.0 %n (>= 0.9.12-2)
+  %p/lib/libsilc-1.1.2.dylib                     4.0.0 %n (>= 1.1.7-1)
+  %p/lib/libsilcclient-1.1.3.dylib               4.0.0 %n (>= 1.1.7-1)
+  %p/lib/silc-toolkit/modules/aes.sim.dylib      1.0.0 %n (>= 1.1.10-2)
+  %p/lib/silc-toolkit/modules/blowfish.sim.dylib 1.0.0 %n (>= 1.1.10-2)
+  %p/lib/silc-toolkit/modules/md5.sim.dylib      1.0.0 %n (>= 1.1.10-2)
+  %p/lib/silc-toolkit/modules/none.sim.dylib     1.0.0 %n (>= 1.1.10-2)
+  %p/lib/silc-toolkit/modules/rsa.sim.dylib      1.0.0 %n (>= 1.1.10-2)
+  %p/lib/silc-toolkit/modules/sha1.sim.dylib     1.0.0 %n (>= 1.1.10-2)
+  %p/lib/silc-toolkit/modules/sha256.sim.dylib   1.0.0 %n (>= 1.1.10-2)
+  %p/lib/silc-toolkit/modules/twofish.sim.dylib  1.0.0 %n (>= 1.1.10-2)
  <<
  DocFiles: COPYING
 <<
@@ -45,12 +81,8 @@
 communications are fully encrypted.
 <<
 DescPackaging: <<
-Makefiles patched to permit compilation and installation under Fink.
 Headers moved into a "silc" subdirectory in the name of tidiness.
 <<
-DescPort: <<
---without-pthreads used because dlcompat is not thread safe.
-<<
 DescUsage: <<
 This package does not install headers into the standard default location.
 To build against this toolkit, use: -I%p/include/silc


------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly 
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to