From: John Crispin <john@openwrt.org>
Date: Sat, 20 Oct 2007 18:53:28 +0000 (+0000)
Subject: fixed xyssl
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=59229af1a77e822891b12e2ef44fddc0a7ed7cb3;p=openwrt%2Fsvn-archive%2Fpackages.git

fixed xyssl

SVN-Revision: 9375
---

diff --git a/libs/xyssl/Makefile b/libs/xyssl/Makefile
index 64275c3a5..785408bda 100644
--- a/libs/xyssl/Makefile
+++ b/libs/xyssl/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xyssl
-PKG_VERSION:=0.7
-PKG_RELEASE:=2
+PKG_VERSION:=0.8
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=http://xyssl.org/code/download/
-PKG_MD5SUM:=f6422c393a4ca72577331f373c6c4248
+PKG_MD5SUM:=5c80e021e3bca4b77fbe2429c9e61541
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/libs/xyssl/patches/001-cross_compile.patch b/libs/xyssl/patches/001-cross_compile.patch
deleted file mode 100644
index ce3092df5..000000000
--- a/libs/xyssl/patches/001-cross_compile.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-Index: xyssl-0.7/library/Makefile
-===================================================================
---- xyssl-0.7.orig/library/Makefile	2007-09-23 23:28:33.000000000 +0200
-+++ xyssl-0.7/library/Makefile	2007-09-23 23:28:33.000000000 +0200
-@@ -9,10 +9,13 @@
- #    _BSD_EXTENSION     when compiling on Plan9
- 
- DEFINES	= -DSELF_TEST -DHAVE_RDTSC
--CFLAGS	= $(DEFINES) -I../include -O
-+CFLAGS	= $(DEFINES) -I../include
-+OFLAGS	= -O
-+
-+AR	?= ar
- 
- # To compile as a shared library:
--# CFLAGS += -fPIC
-+CFLAGS	+= -fPIC
- 
- # MicroBlaze specific options:
- # CFLAGS += -mno-xl-soft-mul -mxl-barrel-shift
-@@ -25,21 +28,21 @@
- 
- .SILENT:
- 
--all: libxyssl.a
-+all: libxyssl.a libxyssl.so
- 
- libxyssl.a: $(OBJS)
- 	echo "  AR    $@"
--	ar r $@ $(OBJS)
-+	$(AR) r $@ $(OBJS)
- 
- shared: libxyssl.so
- 
- libxyssl.so: libxyssl.a
- 	echo "  LD    $@"
--	gcc -shared -Wl,-soname,$@ -o $@ $(OBJS)
-+	$(CC) -shared -Wl,-soname,$@ -o $@ $(OBJS)
- 
- .c.o:
- 	echo "  CC    $<"
--	$(CC) $(CFLAGS) -c $<
-+	$(CC) $(CFLAGS) $(OFLAGS) -c $<
- 
- clean:
- 	rm -f *.o libxyssl.*
-Index: xyssl-0.7/programs/Makefile
-===================================================================
---- xyssl-0.7.orig/programs/Makefile	2007-09-23 23:28:33.000000000 +0200
-+++ xyssl-0.7/programs/Makefile	2007-09-23 23:28:33.000000000 +0200
-@@ -2,7 +2,8 @@
- # To compile on SunOS: add "-lsocket -lnsl" to LDFLAGS
- # To compile on MinGW: add "-lws2_32" to LDFLAGS
- 
--CFLAGS	= -I../include -O
-+CFLAGS	= -I../include
-+OFLAGS	= -O
- LDFLAGS	= -L../library -lxyssl
- 
- APPS =	aes/aescrypt2		hash/hello		\
-@@ -21,71 +22,71 @@
- 
- aes/aescrypt2: aes/aescrypt2.c ../library/libxyssl.a
- 	echo   "  CC    aes/aescrypt2.c"
--	$(CC) $(CFLAGS) aes/aescrypt2.c     $(LDFLAGS) -o $@
-+	$(CC) $(CFLAGS) $(OFLAGS) aes/aescrypt2.c     $(LDFLAGS) -o $@
- 
- hash/hello: hash/hello.c ../library/libxyssl.a
- 	echo   "  CC    hash/hello.c"
--	$(CC) $(CFLAGS) hash/hello.c        $(LDFLAGS) -o $@
-+	$(CC) $(CFLAGS) $(OFLAGS) hash/hello.c        $(LDFLAGS) -o $@
- 
- hash/md5sum: hash/md5sum.c ../library/libxyssl.a
- 	echo   "  CC    hash/md5sum.c"
--	$(CC) $(CFLAGS) hash/md5sum.c       $(LDFLAGS) -o $@
-+	$(CC) $(CFLAGS) $(OFLAGS) hash/md5sum.c       $(LDFLAGS) -o $@
- 
- hash/sha1sum: hash/sha1sum.c ../library/libxyssl.a
- 	echo   "  CC    hash/sha1sum.c"
--	$(CC) $(CFLAGS) hash/sha1sum.c      $(LDFLAGS) -o $@
-+	$(CC) $(CFLAGS) $(OFLAGS) hash/sha1sum.c      $(LDFLAGS) -o $@
- 
- hash/sha2sum: hash/sha2sum.c ../library/libxyssl.a
- 	echo   "  CC    hash/sha2sum.c"
--	$(CC) $(CFLAGS) hash/sha2sum.c      $(LDFLAGS) -o $@
-+	$(CC) $(CFLAGS) $(OFLAGS) hash/sha2sum.c      $(LDFLAGS) -o $@
- 
- pkey/dh_client: pkey/dh_client.c ../library/libxyssl.a
- 	echo   "  CC    pkey/dh_client.c"
--	$(CC) $(CFLAGS) pkey/dh_client.c    $(LDFLAGS) -o $@
-+	$(CC) $(CFLAGS) $(OFLAGS) pkey/dh_client.c    $(LDFLAGS) -o $@
- 
- pkey/dh_genprime: pkey/dh_genprime.c ../library/libxyssl.a
- 	echo   "  CC    pkey/dh_genprime.c"
--	$(CC) $(CFLAGS) pkey/dh_genprime.c  $(LDFLAGS) -o $@
-+	$(CC) $(CFLAGS) $(OFLAGS) pkey/dh_genprime.c  $(LDFLAGS) -o $@
- 
- pkey/dh_server: pkey/dh_server.c ../library/libxyssl.a
- 	echo   "  CC    pkey/dh_server.c"
--	$(CC) $(CFLAGS) pkey/dh_server.c    $(LDFLAGS) -o $@
-+	$(CC) $(CFLAGS) $(OFLAGS) pkey/dh_server.c    $(LDFLAGS) -o $@
- 
- pkey/mpi_demo: pkey/mpi_demo.c ../library/libxyssl.a
- 	echo   "  CC    pkey/mpi_demo.c"
--	$(CC) $(CFLAGS) pkey/mpi_demo.c     $(LDFLAGS) -o $@
-+	$(CC) $(CFLAGS) $(OFLAGS) pkey/mpi_demo.c     $(LDFLAGS) -o $@
- 
- pkey/rsa_genkey: pkey/rsa_genkey.c ../library/libxyssl.a
- 	echo   "  CC    pkey/rsa_genkey.c"
--	$(CC) $(CFLAGS) pkey/rsa_genkey.c   $(LDFLAGS) -o $@
-+	$(CC) $(CFLAGS) $(OFLAGS) pkey/rsa_genkey.c   $(LDFLAGS) -o $@
- 
- pkey/rsa_sign: pkey/rsa_sign.c ../library/libxyssl.a
- 	echo   "  CC    pkey/rsa_sign.c"
--	$(CC) $(CFLAGS) pkey/rsa_sign.c     $(LDFLAGS) -o $@
-+	$(CC) $(CFLAGS) $(OFLAGS) pkey/rsa_sign.c     $(LDFLAGS) -o $@
- 
- pkey/rsa_verify: pkey/rsa_verify.c ../library/libxyssl.a
- 	echo   "  CC    pkey/rsa_verify.c"
--	$(CC) $(CFLAGS) pkey/rsa_verify.c   $(LDFLAGS) -o $@
-+	$(CC) $(CFLAGS) $(OFLAGS) pkey/rsa_verify.c   $(LDFLAGS) -o $@
- 
- ssl/ssl_client1: ssl/ssl_client1.c ../library/libxyssl.a
- 	echo   "  CC    ssl/ssl_client1.c"
--	$(CC) $(CFLAGS) ssl/ssl_client1.c   $(LDFLAGS) -o $@
-+	$(CC) $(CFLAGS) $(OFLAGS) ssl/ssl_client1.c   $(LDFLAGS) -o $@
- 
- ssl/ssl_client2: ssl/ssl_client2.c ../library/libxyssl.a
- 	echo   "  CC    ssl/ssl_client2.c"
--	$(CC) $(CFLAGS) ssl/ssl_client2.c   $(LDFLAGS) -o $@
-+	$(CC) $(CFLAGS) $(OFLAGS) ssl/ssl_client2.c   $(LDFLAGS) -o $@
- 
- ssl/ssl_server: ssl/ssl_server.c ../library/libxyssl.a
- 	echo   "  CC    ssl/ssl_server.c"
--	$(CC) $(CFLAGS) ssl/ssl_server.c    $(LDFLAGS) -o $@
-+	$(CC) $(CFLAGS) $(OFLAGS) ssl/ssl_server.c    $(LDFLAGS) -o $@
- 
- test/benchmark: test/benchmark.c ../library/libxyssl.a
- 	echo   "  CC    test/benchmark.c"
--	$(CC) $(CFLAGS) test/benchmark.c    $(LDFLAGS) -o $@
-+	$(CC) $(CFLAGS) $(OFLAGS) test/benchmark.c    $(LDFLAGS) -o $@
- 
- test/selftest: test/selftest.c ../library/libxyssl.a
- 	echo   "  CC    test/selftest.c"
--	$(CC) $(CFLAGS) test/selftest.c     $(LDFLAGS) -o $@
-+	$(CC) $(CFLAGS) $(OFLAGS) test/selftest.c     $(LDFLAGS) -o $@
- 
- clean:
- 	rm -f $(APPS)
diff --git a/libs/xyssl/patches/002-install.patch b/libs/xyssl/patches/002-install.patch
deleted file mode 100644
index d4fe3d0e8..000000000
--- a/libs/xyssl/patches/002-install.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: xyssl-0.7/Makefile
-===================================================================
---- xyssl-0.7.orig/Makefile	2007-09-23 23:28:33.000000000 +0200
-+++ xyssl-0.7/Makefile	2007-09-23 23:28:34.000000000 +0200
-@@ -8,9 +8,10 @@
- 	cd programs && make all && cd ..
- 
- install:
--	mkdir -p $(DESTDIR)/{include/xyssl,lib}
--	cp -v -r include $(DESTDIR)/include
--	cp -v library/libxyssl.a $(DESTDIR)/lib
-+	mkdir -p $(DESTDIR)/include/xyssl
-+	cp -v -r include/* $(DESTDIR)/include/
-+	mkdir -p $(DESTDIR)/lib
-+	cp -v library/libxyssl.* $(DESTDIR)/lib/
- 	
- 	mkdir -p $(DESTDIR)/bin
- 	for p in programs/*/* ; do              \
diff --git a/libs/xyssl/patches/003-no_md2.patch b/libs/xyssl/patches/003-no_md2.patch
deleted file mode 100644
index 76ecbb90a..000000000
--- a/libs/xyssl/patches/003-no_md2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: xyssl-0.7/include/xyssl/ssl_conf.h
-===================================================================
---- xyssl-0.7.orig/include/xyssl/ssl_conf.h	2007-09-25 09:39:47.000000000 +0200
-+++ xyssl-0.7/include/xyssl/ssl_conf.h	2007-09-25 09:43:40.000000000 +0200
-@@ -93,6 +93,8 @@
- #define NO_SSL_SRV
-  */
- 
-+#define NO_MD2
-+
- #ifdef __cplusplus
- }
- #endif
diff --git a/libs/xyssl/patches/100-shared.patch b/libs/xyssl/patches/100-shared.patch
new file mode 100644
index 000000000..e787dbb02
--- /dev/null
+++ b/libs/xyssl/patches/100-shared.patch
@@ -0,0 +1,12 @@
+diff -urN xyssl-0.8.orig/library/Makefile xyssl-0.8/library/Makefile
+--- xyssl-0.8.orig/library/Makefile	2007-10-20 20:29:26.000000000 +0200
++++ xyssl-0.8/library/Makefile	2007-10-20 20:30:41.000000000 +0200
+@@ -28,7 +28,7 @@
+ 
+ .SILENT:
+ 
+-all: static
++all: static shared
+ 
+ static: libxyssl.a
+