rename polarssl to mbedtls, update to latest

4 files changed, 33 insertions, 116 deletions

diff --git a/package/mbedtls/Makefile b/package/mbedtls/Makefile
new file mode 100644
index 000000000..db88c8e0f
--- /dev/null
+++ b/package/mbedtls/Makefile
@@ -0,0 +1,33 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		mbedtls
+PKG_VERSION:=		1.3.10
+PKG_RELEASE:=		1
+PKG_HASH:=		bf981c989b4fddbda4c6ab448623c2f6f928a6c3ab1b0c0295084dae0f63e854
+PKG_DESCR:=		embedded ssl/tls library
+PKG_SECTION:=		libs/crypto
+PKG_URL:=		https://polarssl.org/
+PKG_SITES:=		https://github.com/polarssl/polarssl/archive/
+PKG_LIBNAME:=		libmbedtls
+PKG_OPTS:=		dev
+
+DISTFILES:=             $(PKG_NAME)-$(PKG_VERSION).tar.gz
+WRKDIST=		$(WRKDIR)/polarssl-$(PKG_NAME)-$(PKG_VERSION)
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBMBEDTLS,libmbedtls,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
+
+CONFIG_STYLE:=		manual
+ALL_TARGET:=		lib
+TARGET_CFLAGS+=		-DSHARED
+
+libpolarssl-install:
+	$(INSTALL_DIR) $(IDIR_LIBMBEDTLS)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libpolarssl.so* \
+		$(IDIR_LIBMBEDTLS)/usr/lib
+
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/polarssl/Makefile b/package/polarssl/Makefile
deleted file mode 100644
index 1a18b103b..000000000
--- a/package/polarssl/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(ADK_TOPDIR)/rules.mk
-
-PKG_NAME:=		polarssl
-PKG_VERSION:=		1.3.9
-PKG_RELEASE:=		1
-PKG_HASH:=		d3605afc28ed4b7d1d9e3142d72e42855e4a23c07c951bbb0299556b02d36755
-PKG_DESCR:=		embedded ssl/tls library
-PKG_SECTION:=		libs/crypto
-PKG_URL:=		https://polarssl.org/
-PKG_SITES:=		https://polarssl.org/download/
-PKG_LIBNAME:=		libpolarssl
-PKG_OPTS:=		dev
-
-DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}-gpl.tgz
-
-include $(ADK_TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,LIBPOLARSSL,libpolarssl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-
-CONFIG_STYLE:=		manual
-ALL_TARGET:=		lib
-TARGET_CFLAGS+=		-DSHARED
-
-libpolarssl-install:
-	$(INSTALL_DIR) $(IDIR_LIBPOLARSSL)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libpolarssl.so* \
-		$(IDIR_LIBPOLARSSL)/usr/lib
-
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/polarssl/patches/patch-Makefile b/package/polarssl/patches/patch-Makefile
deleted file mode 100644
index 9f2be0470..000000000
--- a/package/polarssl/patches/patch-Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
---- 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:
-@@ -17,18 +17,18 @@ lib:
- 	cd library  && $(MAKE) all && cd ..
- 
- install:
--	mkdir -p $(DESTDIR)/include/polarssl
--	cp -r include/polarssl $(DESTDIR)/include
-+	mkdir -p $(DESTDIR)/usr/include/polarssl
-+	cp -r include/polarssl $(DESTDIR)/usr/include
- 	
--	mkdir -p $(DESTDIR)/lib
--	cp library/libpolarssl.* $(DESTDIR)/lib
-+	mkdir -p $(DESTDIR)/usr/lib
-+	cp -fpR library/libpolarssl.* $(DESTDIR)/usr/lib
- 	
--	mkdir -p $(DESTDIR)/bin
-+	mkdir -p $(DESTDIR)/usr/bin
- 	for p in programs/*/* ; do              \
- 	    if [ -x $$p ] && [ ! -d $$p ] ;     \
- 	    then                                \
- 	        f=$(PREFIX)`basename $$p` ;     \
--	        cp $$p $(DESTDIR)/bin/$$f ;     \
-+	        cp $$p $(DESTDIR)/usr/bin/$$f ;     \
- 	    fi                                  \
- 	done
- 
diff --git a/package/polarssl/patches/patch-library_Makefile b/package/polarssl/patches/patch-library_Makefile
deleted file mode 100644
index 3971fb64b..000000000
--- a/package/polarssl/patches/patch-library_Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
---- 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
- 
- # To compile as a shared library:
--ifdef SHARED
- CFLAGS += -fPIC
--endif
- 
- SONAME=libpolarssl.so.6
- 
-@@ -65,28 +63,20 @@ OBJS=	aes.o		aesni.o		arc4.o			\
- 
- .SILENT:
- 
--ifndef SHARED
--all: static
--else
--all: shared
--endif
-+all: static shared
- 
- static: libpolarssl.a
- 
- shared: libpolarssl.$(DLEXT) libpolarssl.so
- 
- libpolarssl.a: $(OBJS)
--	echo "  AR    $@"
- 	$(AR) r $@ $(OBJS)
--	echo "  RL    $@"
- 	$(AR) s $@
- 
- libpolarssl.${DLEXT}: libpolarssl.a
--	echo "  LD    $@"
- 	$(CC) ${LDFLAGS} -shared -Wl,-soname,$(SONAME) -o $@ $(OBJS)
- 
- libpolarssl.so: libpolarssl.${DLEXT}
--	echo "  LN    $@ -> libpolarssl.${DLEXT}"
- 	ln -sf libpolarssl.${DLEXT} $@
- 
- libpolarssl.dylib: libpolarssl.a
-@@ -98,7 +88,6 @@ libpolarssl.dll: libpolarssl.a
- 	$(CC) -shared -Wl,-soname,$@ -o $@ $(OBJS) -lws2_32 -lwinmm -lgdi32
- 
- .c.o:
--	echo "  CC    $<"
- 	$(CC) $(CFLAGS) $(OFLAGS) -c $<
- 
- clean: