From 5597174923c62c9fe1a849fc87f4d1f68594984b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Wed, 22 Jul 2015 18:14:55 +0200 Subject: [PATCH 1/3] Mention which branch to use for patches/PRs Even if it's set as the default branch on github, it's probably better to mention that explicitly. --- README.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 0d9b614b4..90cec1490 100644 --- a/README.rst +++ b/README.rst @@ -150,7 +150,8 @@ Process `start a discussion `_ around a feature idea or a bug. #. Fork the `mbed TLS repository on Github `_ - to start making your changes. + to start making your changes. As a general rule, you should use the + "development" branch as a basis. #. Write a test which shows that the bug was fixed or that the feature works as expected. #. Send a pull request and bug us until it gets merged and published. We will From 6f42417ba8dd28fa77fd08d42d73c87a0253f93e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Fri, 24 Jul 2015 16:53:46 +0200 Subject: [PATCH 2/3] Fix typo in that broke installation in cmake closes #221 --- ChangeLog | 2 ++ library/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 77a5b9da7..7df2623c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,8 @@ Bugfix * Fix segfault in the benchmark program when benchmarking DHM. * Fix build error with CMake and pre-4.5 versions of GCC (found by Hugo Leisink). + * Fix bug in CMake lists that cause libmbedcrypto.a not to be installed + (found by Benoit Lecocq). = mbed TLS 2.0.0 released 2015-07-13 diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index d2a29c5b3..af5f1735c 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -131,7 +131,7 @@ if(USE_STATIC_MBEDTLS_LIBRARY) set_target_properties(${mbedtls_static_target} PROPERTIES OUTPUT_NAME mbedtls) target_link_libraries(${mbedtls_static_target} ${libs} ${mbedx509_static_target}) - install(TARGETS ${mbedtls_static_target} ${mbedx509_static_target} ${mbedcrypt_static_target} + install(TARGETS ${mbedtls_static_target} ${mbedx509_static_target} ${mbedcrypto_static_target} DESTINATION ${LIB_INSTALL_DIR} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) endif(USE_STATIC_MBEDTLS_LIBRARY) From 52a5079cf243c029e480a0d7debc80c790a14495 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Mon, 27 Jul 2015 10:36:12 +0200 Subject: [PATCH 3/3] Fix bug with install target in make closes #223 --- ChangeLog | 5 ++++- Makefile | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7df2623c1..fcd30ec01 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,8 +6,11 @@ Bugfix * Fix segfault in the benchmark program when benchmarking DHM. * Fix build error with CMake and pre-4.5 versions of GCC (found by Hugo Leisink). - * Fix bug in CMake lists that cause libmbedcrypto.a not to be installed + * Fix bug in CMake lists that caused libmbedcrypto.a not to be installed (found by Benoit Lecocq). + * Fix bug in Makefile that caused libmbedcrypto and libmbedx509 not to be + installed (found by Rawi666). + = mbed TLS 2.0.0 released 2015-07-13 diff --git a/Makefile b/Makefile index 0c489f891..1c715a6a4 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,9 @@ install: all cp -r include/mbedtls $(DESTDIR)/include mkdir -p $(DESTDIR)/lib - cp -RP library/libmbedtls.* $(DESTDIR)/lib + cp -RP library/libmbedtls.* $(DESTDIR)/lib + cp -RP library/libmbedx509.* $(DESTDIR)/lib + cp -RP library/libmbedcrypto.* $(DESTDIR)/lib mkdir -p $(DESTDIR)/bin for p in programs/*/* ; do \ @@ -40,6 +42,8 @@ install: all uninstall: rm -rf $(DESTDIR)/include/mbedtls rm -f $(DESTDIR)/lib/libmbedtls.* + rm -f $(DESTDIR)/lib/libmbedx509.* + rm -f $(DESTDIR)/lib/libmbedcrypto.* for p in programs/*/* ; do \ if [ -x $$p ] && [ ! -d $$p ] ; \