Subject: [alpine-aports] [PATCH 1/2] main/mbedtls: update to 1.3.16

From: Łukasz Jendrysik <[email-masked]>
Date: Thu, 4 Feb 2016 19:02:01 +0100

---
 main/mbedtls1/APKBUILD                | 16 +++++-----------
 main/mbedtls1/programs.makefile.patch | 22 ----------------------
 2 files changed, 5 insertions(+), 33 deletions(-)
 delete mode 100644 main/mbedtls1/programs.makefile.patch

diff --git a/main/mbedtls1/APKBUILD b/main/mbedtls1/APKBUILD
index 0304a81..111d1ab 100644
--- a/main/mbedtls1/APKBUILD
+++ b/main/mbedtls1/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: Bartłomiej Piotrowski <[email-masked]>
 
 pkgname=mbedtls1
-pkgver=1.3.11
+pkgver=1.3.16
 pkgrel=0
 pkgdesc='Portable cryptographic and SSL/TLS library'
 arch=all
@@ -10,16 +10,13 @@ url='https://tls.mbed.org/'
 license='GPL2'
 replaces="mbedtls"
 subpackages="$pkgname-dev $pkgname-utils"
-source="https://tls.mbed.org/download/mbedtls-$pkgver-gpl.tgz
-        programs.makefile.patch"
+source="https://tls.mbed.org/download/mbedtls-$pkgver-gpl.tgz"
 
 prepare() {
   cd "$srcdir"/mbedtls-$pkgver
   sed -i 's|//\(#define POLARSSL_THREADING_C\)|\1|' include/polarssl/config.h
   sed -i 's|//\(#define POLARSSL_THREADING_PTHREAD\)|\1|' include/polarssl/config.h
 
-  # cert_write
-  patch -p1 -d programs -i "$srcdir"/programs.makefile.patch
 }
 
 build() {
@@ -46,9 +43,6 @@ utils() {
     "$subpkgdir"/usr/bin/mbedtls_cert_write
 }
 
-md5sums="c02ce2e54862d678604794ee484fb59e  mbedtls-1.3.11-gpl.tgz
-d90f2d4cf4d4f04437a245cbaf7051ed  programs.makefile.patch"
-sha256sums="67a593027b6a442a4fa5b6c224c4ac8cdae5be721f5a28a11d34f10dcda441cb  mbedtls-1.3.11-gpl.tgz
-4310b1074ccb611bfcfc2329540ef688bcb6fc1731af61dd454248477a0f401d  programs.makefile.patch"
-sha512sums="242c486becc34d3b7ebba7624686aea6ed7713033aeabbfae7227284df322f191ddd5b9ded1228f100cd50bcfafb12396d93c30420afd3feb979b52a1860551e  mbedtls-1.3.11-gpl.tgz
-e77310e9bdd8b152838eaaf3bfc2e9fe42ab00945772d6102577062e69cd7de0992753eebcb3ae720eae2b6a2b63a02310db165a950151aaba64bbc52fd78dcf  programs.makefile.patch"
+md5sums="66ebbbf67e8a9463041846822b0a1692  mbedtls-1.3.16-gpl.tgz"
+sha256sums="f413146c177c52d4ad8f48015e2fb21dd3a029ca30a2ea000cbc4f9bd092c933  mbedtls-1.3.16-gpl.tgz"
+sha512sums="bf21e7ece8f609e80fd5f5b1af7f4da1d76e4d38e03cb5a57c9398e43b3186c68f258cceb64ec2f5d0959401956666f77de01cab921a61a9805ca688c61467a1  mbedtls-1.3.16-gpl.tgz"
diff --git a/main/mbedtls1/programs.makefile.patch b/main/mbedtls1/programs.makefile.patch
deleted file mode 100644
index 3aef5f5..0000000
--- a/main/mbedtls1/programs.makefile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- programs/Makefile	2014-07-31 12:20:17.748459143 -0400
-+++ programs/Makefile	2014-07-31 12:21:35.388454356 -0400
-@@ -43,7 +43,7 @@
- 	test/selftest$(EXEXT)		test/ssl_test$(EXEXT)		\
- 	util/pem2der$(EXEXT)		util/strerror$(EXEXT)		\
- 	x509/cert_app$(EXEXT)		x509/crl_app$(EXEXT)		\
--	x509/cert_req$(EXEXT)
-+	x509/cert_req$(EXEXT)		x509/cert_write$(EXEXT)
- 
- ifdef OPENSSL
- APPS +=	test/o_p_test
-@@ -241,6 +241,10 @@
- 	echo   "  CC    x509/cert_req.c"
- 	$(CC) $(CFLAGS) $(OFLAGS) x509/cert_req.c    $(LDFLAGS) -o $@
- 
-+x509/cert_write$(EXEXT): x509/cert_write.c ../library/libmbedtls.a
-+	echo   "  CC    x509/cert_write.c"
-+	$(CC) $(LOCAL_CFLAGS) $(CFLAGS) x509/cert_write.c    $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@
-+
- clean:
- ifndef WINDOWS
- 	rm -f $(APPS)
-- 
2.7.0

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---