[arch-commits] Commit in mbedtls/trunk (PKGBUILD programs.makefile.patch)

Kyle Keen kkeen at archlinux.org
Tue Jul 28 11:17:37 UTC 2015


    Date: Tuesday, July 28, 2015 @ 13:17:36
  Author: kkeen
Revision: 137553

upgpkg: mbedtls 2.0.0-1

Modified:
  mbedtls/trunk/PKGBUILD
Deleted:
  mbedtls/trunk/programs.makefile.patch

-------------------------+
 PKGBUILD                |   14 +++++---------
 programs.makefile.patch |   22 ----------------------
 2 files changed, 5 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-07-28 11:08:48 UTC (rev 137552)
+++ PKGBUILD	2015-07-28 11:17:36 UTC (rev 137553)
@@ -4,7 +4,7 @@
 # Contributor: carstene1ns <arch carsten-teibes.de>
 
 pkgname=mbedtls
-pkgver=1.3.11
+pkgver=2.0.0
 pkgrel=1
 pkgdesc="Portable cryptographic and SSL/TLS library, aka polarssl"
 arch=('i686' 'x86_64')
@@ -14,10 +14,8 @@
 replaces=('polarssl')
 conflicts=('polarssl')
 #source=("https://polarssl.org/download/$pkgname-$pkgver-gpl.tgz"
-source=("https://tls.mbed.org/download/mbedtls-$pkgver-gpl.tgz"
-        "programs.makefile.patch")
-sha1sums=('3948084c9d3312b381d458b06d9a2066c3cc0184'
-          'f175944a09caf0b5b3a397ead4f9f13c990e0382')
+source=("https://tls.mbed.org/download/mbedtls-$pkgver-gpl.tgz")
+sha1sums=('a456be169003b4644931a90613fdaa0429af06a7')
 depends=('glibc')
 options=('staticlibs')
 
@@ -27,10 +25,8 @@
 
 build() {
   cd "$pkgname-$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
-  # enable cert_write
-  patch -p1 -d programs -i "$srcdir/programs.makefile.patch"
+  sed -i 's|//\(#define MBEDTLS_THREADING_C\)|\1|' include/mbedtls/config.h
+  sed -i 's|//\(#define MBEDTLS_THREADING_PTHREAD\)|\1|' include/mbedtls/config.h
   LDFLAGS+=" -I../include " make SHARED=1 no_test
 }
 

Deleted: programs.makefile.patch
===================================================================
--- programs.makefile.patch	2015-07-28 11:08:48 UTC (rev 137552)
+++ programs.makefile.patch	2015-07-28 11:17:36 UTC (rev 137553)
@@ -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)



More information about the arch-commits mailing list