package/cyassl: update to version 1.6.5

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24300 3c298f89-4303-0410-b956-a3cf2f4a3e73

5 files changed, 59 insertions, 66 deletions

diff --git a/package/cyassl/Makefile b/package/cyassl/Makefile
index d8e5bae139..a453151801 100644
--- a/package/cyassl/Makefile
+++ b/package/cyassl/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cyassl
-PKG_VERSION:=1.4.0
-PKG_RELEASE:=2
+PKG_VERSION:=1.6.5
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip
 PKG_SOURCE_URL:=http://www.yassl.com/
-PKG_MD5SUM:=037397c7df84b9a12e614bf46135df1c
+PKG_MD5SUM:=98c2c6350acf1d089756a1de9ccb9903
 
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
diff --git a/package/cyassl/patches/100-makefile_dollar_make.patch b/package/cyassl/patches/100-makefile_dollar_make.patch
deleted file mode 100644
index 07f7a8879e..0000000000
--- a/package/cyassl/patches/100-makefile_dollar_make.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -4,7 +4,7 @@ EXTRA_DIST = cyassl.dsp cyassl.dsw certs
-     doc/*.pdf

- 

- basic:

--	cd src; make; cd ../testsuite; make; cd ../

-+	cd src; $(MAKE); cd ../testsuite; $(MAKE); cd ../

- 

- openssl-links:

- 	cd lib; ln -s ../src/.libs/libcyassl.a libcrypto.a; \

---- a/Makefile.in
-+++ b/Makefile.in
-@@ -638,7 +638,7 @@ uninstall-am:
- 
- 
- basic:
--	cd src; make; cd ../testsuite; make; cd ../
-+	cd src; $(MAKE); cd ../testsuite; $(MAKE); cd ../
- 
- openssl-links:
- 	cd lib; ln -s ../src/.libs/libcyassl.a libcrypto.a; \
diff --git a/package/cyassl/patches/110-makefile_disable_examples_tests.patch b/package/cyassl/patches/110-makefile_disable_examples_tests.patch
index d991a336df..c66ab8c137 100644
--- a/package/cyassl/patches/110-makefile_disable_examples_tests.patch
+++ b/package/cyassl/patches/110-makefile_disable_examples_tests.patch
@@ -1,32 +1,25 @@
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -1,10 +1,10 @@
--SUBDIRS = src ctaocrypt examples testsuite

+@@ -1,4 +1,4 @@
+-SUBDIRS = src ctaocrypt examples testsuite sslSniffer

 +SUBDIRS = src ctaocrypt

  EXTRA_DIST = cyassl.dsp cyassl.dsw certs/*.pem certs/*.der certs/*.txt \

      lib/dummy cyassl.sln cyassl.vcproj cyassl-iphone.xcodeproj/project.pbxproj \

-     doc/*.pdf

- 

- basic:

--	cd src; $(MAKE); cd ../testsuite; $(MAKE); cd ../

-+	cd src; $(MAKE); cd ../

- 

- openssl-links:

- 	cd lib; ln -s ../src/.libs/libcyassl.a libcrypto.a; \

+     doc/*.pdf swig/README swig/*.i swig/cyassl_adds.c swig/*.sh swig/runme.* \

 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -190,7 +190,7 @@ target_os = @target_os@
+@@ -193,7 +193,7 @@ target_os = @target_os@
  target_vendor = @target_vendor@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
--SUBDIRS = src ctaocrypt examples testsuite
+-SUBDIRS = src ctaocrypt examples testsuite sslSniffer
 +SUBDIRS = src ctaocrypt
  EXTRA_DIST = cyassl.dsp cyassl.dsw certs/*.pem certs/*.der certs/*.txt \
      lib/dummy cyassl.sln cyassl.vcproj cyassl-iphone.xcodeproj/project.pbxproj \
-     doc/*.pdf
-@@ -638,7 +638,7 @@ uninstall-am:
- 
+     doc/*.pdf swig/README swig/*.i swig/cyassl_adds.c swig/*.sh swig/runme.* \
+@@ -643,7 +643,7 @@ uninstall-am:
  
+ # !!!! first line of rule has to start with a hard (real) tab, not spaces
  basic:
 -	cd src; $(MAKE); cd ../testsuite; $(MAKE); cd ../
 +	cd src; $(MAKE); cd ../
@@ -42,7 +35,7 @@
  

 --- a/ctaocrypt/Makefile.in
 +++ b/ctaocrypt/Makefile.in
-@@ -174,7 +174,7 @@ target_os = @target_os@
+@@ -177,7 +177,7 @@ target_os = @target_os@
  target_vendor = @target_vendor@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
diff --git a/package/cyassl/patches/120-makefile_destdir.patch b/package/cyassl/patches/120-makefile_destdir.patch
index 29b0d0a05e..bf2027440b 100644
--- a/package/cyassl/patches/120-makefile_destdir.patch
+++ b/package/cyassl/patches/120-makefile_destdir.patch
@@ -1,6 +1,6 @@
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -8,14 +8,11 @@ basic:
+@@ -10,19 +10,19 @@ basic:
  

  openssl-links:

  	cd lib; ln -s ../src/.libs/libcyassl.a libcrypto.a; \

@@ -9,21 +9,32 @@
 +	ln -s ../src/.libs/libcyassl.a libssl.a; \

 +	ln -s ../src/.libs/libcyassl.a libcyassl.a; cd ../

  

+ #  !!! test -e with a .name like .libs then a * like *dylib fails so just

+ #      look for the .dylib on OS X, and .so otherwise but copy all parts

  install:

--	mkdir ${prefix}/cyassl; \

--    mkdir ${prefix}/cyassl/include; \

--    mkdir ${prefix}/cyassl/include/openssl; \

--    cp include/openssl/*.h ${prefix}/cyassl/include/openssl; \

--    make openssl-links; \

--    mkdir ${prefix}/cyassl/lib; \

--    cp lib/*.a ${prefix}/cyassl/lib

+-	$(mkinstalldirs) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir); \

+-    cp -fpR include/* $(DESTDIR)$(includedir); \

+-    cp -fpR ctaocrypt/include/* $(DESTDIR)$(includedir); \

+-    cp -fpR src/libcyassl.la $(DESTDIR)$(libdir); \

+-    if test -e src/.libs/libcyassl.a; then \

+-    cp -fp src/.libs/libcyassl.a $(DESTDIR)$(libdir); fi; \

+-    if test -e src/.libs/libcyassl.so; then \

+-    cp -fpR src/.libs/libcyassl.so* $(DESTDIR)$(libdir); fi; \

+-    if test -e src/.libs/libcyassl.dylib; then \

+-    cp -fpR src/.libs/libcyassl.*dylib $(DESTDIR)$(libdir); fi;

 +	$(mkinstalldirs) $(DESTDIR)$(includedir)/cyassl $(DESTDIR)$(libdir); \

 +	cp -fpR include/* $(DESTDIR)$(includedir)/cyassl; \

-+	make openssl-links; \

-+	cp -fpR src/.libs/libcyassl.{a,so*} src/libcyassl.la $(DESTDIR)$(libdir)

++	cp -fpR ctaocrypt/include/* $(DESTDIR)$(includedir)/cyassl; \

++	cp -fpR src/libcyassl.la $(DESTDIR)$(libdir); \

++	if test -e src/.libs/libcyassl.a; then \

++		cp -fp src/.libs/libcyassl.a $(DESTDIR)$(libdir); fi; \

++	if test -e src/.libs/libcyassl.so; then \

++		cp -fpR src/.libs/libcyassl.so* $(DESTDIR)$(libdir); fi; \

++	if test -e src/.libs/libcyassl.dylib; then \

++		cp -fpR src/.libs/libcyassl.*dylib $(DESTDIR)$(libdir); fi;

 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -642,17 +642,14 @@ basic:
+@@ -647,22 +647,22 @@ basic:
  
  openssl-links:
  	cd lib; ln -s ../src/.libs/libcyassl.a libcrypto.a; \
@@ -32,18 +43,29 @@
 +	ln -s ../src/.libs/libcyassl.a libssl.a; \
 +	ln -s ../src/.libs/libcyassl.a libcyassl.a; cd ../
  
+ #  !!! test -e with a .name like .libs then a * like *dylib fails so just
+ #      look for the .dylib on OS X, and .so otherwise but copy all parts
  install:
--	mkdir ${prefix}/cyassl; \
--    mkdir ${prefix}/cyassl/include; \
--    mkdir ${prefix}/cyassl/include/openssl; \
--    cp include/openssl/*.h ${prefix}/cyassl/include/openssl; \
--    make openssl-links; \
--    mkdir ${prefix}/cyassl/lib; \
--    cp lib/*.a ${prefix}/cyassl/lib
+-	$(mkinstalldirs) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir); \
+-    cp -fpR include/* $(DESTDIR)$(includedir); \
+-    cp -fpR ctaocrypt/include/* $(DESTDIR)$(includedir); \
+-    cp -fpR src/libcyassl.la $(DESTDIR)$(libdir); \
+-    if test -e src/.libs/libcyassl.a; then \
+-    cp -fp src/.libs/libcyassl.a $(DESTDIR)$(libdir); fi; \
+-    if test -e src/.libs/libcyassl.so; then \
+-    cp -fpR src/.libs/libcyassl.so* $(DESTDIR)$(libdir); fi; \
+-    if test -e src/.libs/libcyassl.dylib; then \
+-    cp -fpR src/.libs/libcyassl.*dylib $(DESTDIR)$(libdir); fi;
 +	$(mkinstalldirs) $(DESTDIR)$(includedir)/cyassl $(DESTDIR)$(libdir); \
 +	cp -fpR include/* $(DESTDIR)$(includedir)/cyassl; \
-+	make openssl-links; \
-+	cp -fpR src/.libs/libcyassl.{a,so*} src/libcyassl.la $(DESTDIR)$(libdir)
++	cp -fpR ctaocrypt/include/* $(DESTDIR)$(includedir)/cyassl; \
++	cp -fpR src/libcyassl.la $(DESTDIR)$(libdir); \
++	if test -e src/.libs/libcyassl.a; then \
++		cp -fp src/.libs/libcyassl.a $(DESTDIR)$(libdir); fi; \
++	if test -e src/.libs/libcyassl.so; then \
++		cp -fpR src/.libs/libcyassl.so* $(DESTDIR)$(libdir); fi; \
++	if test -e src/.libs/libcyassl.dylib; then \
++		cp -fpR src/.libs/libcyassl.*dylib $(DESTDIR)$(libdir); fi;
  # 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.
  .NOEXPORT:
diff --git a/package/cyassl/patches/130-configure_disable_pthreads_tests.patch b/package/cyassl/patches/130-configure_disable_pthreads_tests.patch
index a109c4e0f8..44fdf6ced0 100644
--- a/package/cyassl/patches/130-configure_disable_pthreads_tests.patch
+++ b/package/cyassl/patches/130-configure_disable_pthreads_tests.patch
@@ -1,9 +1,9 @@
 --- a/configure
 +++ b/configure
-@@ -874,10 +874,6 @@ F77
- FFLAGS
- ac_ct_F77
- LIBTOOL
+@@ -888,10 +888,6 @@ BUILD_RIPEMD_TRUE
+ BUILD_RIPEMD_FALSE
+ BUILD_SHA512_TRUE
+ BUILD_SHA512_FALSE
 -acx_pthread_config
 -PTHREAD_CC
 -PTHREAD_LIBS
@@ -11,7 +11,7 @@
  LIBOBJS
  LTLIBOBJS'
  ac_subst_files=''
-@@ -21946,430 +21942,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
+@@ -22251,430 +22247,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu