3 files changed, 23 insertions, 45 deletions
diff --git a/package/polarssl/patches/patch-Makefile b/package/polarssl/patches/patch-Makefile
index b805fbf95..9f2be0470 100644
--- a/package/polarssl/patches/patch-Makefile
+++ b/package/polarssl/patches/patch-Makefile
@@ -1,15 +1,13 @@
---- polarssl-1.2.8.orig/Makefile	2013-06-21 15:11:10.000000000 +0200
-+++ polarssl-1.2.8/Makefile	2013-08-15 16:10:58.555680994 +0200
-@@ -2,8 +2,6 @@
- DESTDIR=/usr/local
+--- polarssl-1.3.6.orig/Makefile	2014-04-11 15:33:59.000000000 +0200
++++ polarssl-1.3.6/Makefile	2014-04-25 07:48:48.000000000 +0200
+@@ -1,5 +1,5 @@
+ 
+-DESTDIR=/usr/local
++DESTDIR=/usr
  PREFIX=polarssl_
  
--.SILENT:
--
- all:
- 	cd library  && $(MAKE) all && cd ..
- 	cd programs && $(MAKE) all && cd ..
-@@ -17,18 +15,18 @@ lib:
+ .SILENT:
+@@ -17,18 +17,18 @@ lib:
  	cd library  && $(MAKE) all && cd ..
  
  install:
@@ -21,7 +19,7 @@
 -	mkdir -p $(DESTDIR)/lib
 -	cp library/libpolarssl.* $(DESTDIR)/lib
 +	mkdir -p $(DESTDIR)/usr/lib
-+	cp library/libpolarssl.* $(DESTDIR)/usr/lib
++	cp -fpR library/libpolarssl.* $(DESTDIR)/usr/lib
  	
 -	mkdir -p $(DESTDIR)/bin
 +	mkdir -p $(DESTDIR)/usr/bin
diff --git a/package/polarssl/patches/patch-library_Makefile b/package/polarssl/patches/patch-library_Makefile
index edb0791b7..3971fb64b 100644
--- a/package/polarssl/patches/patch-library_Makefile
+++ b/package/polarssl/patches/patch-library_Makefile
@@ -1,5 +1,5 @@
---- polarssl-1.2.8.orig/library/Makefile	2013-06-21 15:11:10.000000000 +0200
-+++ polarssl-1.2.8/library/Makefile	2013-08-20 18:32:08.885495858 +0200
+--- polarssl-1.3.6.orig/library/Makefile	2014-04-11 15:33:59.000000000 +0200
++++ polarssl-1.3.6/library/Makefile	2014-04-25 07:42:34.000000000 +0200
 @@ -18,9 +18,7 @@ endif
  # CFLAGS += -D_BSD_EXTENSION
  
@@ -8,14 +8,12 @@
  CFLAGS += -fPIC
 -endif
  
- SONAME=libpolarssl.so.0
+ SONAME=libpolarssl.so.6
  
-@@ -51,27 +49,19 @@ OBJS=	aes.o		arc4.o		asn1parse.o		\
- 		ssl_tls.o	timing.o	version.o		\
- 		x509parse.o	x509write.o	xtea.o
+@@ -65,28 +63,20 @@ OBJS=	aes.o		aesni.o		arc4.o			\
+ 
+ .SILENT:
  
--.SILENT:
--
 -ifndef SHARED
 -all: static
 -else
@@ -25,7 +23,7 @@
  
  static: libpolarssl.a
  
- shared: libpolarssl.$(DLEXT)
+ shared: libpolarssl.$(DLEXT) libpolarssl.so
  
  libpolarssl.a: $(OBJS)
 -	echo "  AR    $@"
@@ -33,15 +31,17 @@
 -	echo "  RL    $@"
  	$(AR) s $@
  
- libpolarssl.so: libpolarssl.a
+ libpolarssl.${DLEXT}: libpolarssl.a
 -	echo "  LD    $@"
  	$(CC) ${LDFLAGS} -shared -Wl,-soname,$(SONAME) -o $@ $(OBJS)
-+	ln -sf $@ $(SONAME)
+ 
+ libpolarssl.so: libpolarssl.${DLEXT}
+-	echo "  LN    $@ -> libpolarssl.${DLEXT}"
+ 	ln -sf libpolarssl.${DLEXT} $@
  
  libpolarssl.dylib: libpolarssl.a
- 	echo "  LD    $@"
-@@ -82,7 +72,6 @@ libpolarssl.dll: libpolarssl.a
- 	$(CC) -shared -Wl,-soname,$@ -o $@ $(OBJS) -lws2_32 -lwinmm -lgdi32 
+@@ -98,7 +88,6 @@ libpolarssl.dll: libpolarssl.a
+ 	$(CC) -shared -Wl,-soname,$@ -o $@ $(OBJS) -lws2_32 -lwinmm -lgdi32
  
  .c.o:
 -	echo "  CC    $<"
diff --git a/package/polarssl/patches/patch-programs_Makefile b/package/polarssl/patches/patch-programs_Makefile
deleted file mode 100644
index e319dce1f..000000000
--- a/package/polarssl/patches/patch-programs_Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- polarssl-1.2.8.orig/programs/Makefile	2013-06-21 15:11:10.000000000 +0200
-+++ polarssl-1.2.8/programs/Makefile	2013-08-15 16:18:39.387085302 +0200
-@@ -4,7 +4,7 @@
- # To compile with PKCS11: add "-lpkcs11-helper" to LDFLAGS
- 
- CFLAGS	+= -I../include -D_FILE_OFFSET_BITS=64 -Wall -W -Wdeclaration-after-statement
--OFLAGS	= -O2
-+#OFLAGS	= -O2
- LDFLAGS	+= -L../library -lpolarssl $(SYS_LDFLAGS)
- 
- ifdef DEBUG
-@@ -46,8 +46,6 @@ ifdef OPENSSL
- APPS +=	test/o_p_test
- endif
- 
--.SILENT:
--
- all: $(APPS)
- 
- aes/aescrypt2: aes/aescrypt2.c ../library/libpolarssl.a