[packages/polarssl] - updated to 1.2.4 - removed obsolete cmake patches

qboosh qboosh at pld-linux.org
Sun Jan 27 12:44:14 CET 2013


commit c6c41474f7b92f118c8580ac5c5c1a033e9ce1a7
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jan 27 12:45:01 2013 +0100

    - updated to 1.2.4
    - removed obsolete cmake patches

 cmake-doxygen.patch      | 26 -------------
 cmake-shared.patch       | 34 -----------------
 cmake-with-install.patch | 97 ------------------------------------------------
 polarssl.spec            | 29 +++++++++------
 4 files changed, 18 insertions(+), 168 deletions(-)
---
diff --git a/polarssl.spec b/polarssl.spec
index 2c4face..2fe0866 100644
--- a/polarssl.spec
+++ b/polarssl.spec
@@ -1,18 +1,16 @@
 Summary:	Light-weight cryptographic and SSL/TLS library
 Summary(pl.UTF-8):	Lekka biblioteka kryptograficzna oraz SSL/TLS
 Name:		polarssl
-Version:	0.14.3
+Version:	1.2.4
 Release:	1
 License:	GPL v2+
 Group:		Libraries
 Source0:	http://polarssl.org/code/releases/%{name}-%{version}-gpl.tgz
-# Source0-md5:	f1b2fe9087ab64d7ea40a276a3628583
-Patch1:		cmake-with-install.patch
-Patch2:		cmake-shared.patch
-Patch3:		cmake-doxygen.patch
+# Source0-md5:	f23fc73b0c5ef1c51294c20f3ea0dcb0
 URL:		http://www.polarssl.org/
 BuildRequires:	cmake >= 2.6
 BuildRequires:	doxygen
+BuildRequires:	rpmbuild(macros) >= 1.605
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -43,10 +41,6 @@ wykorzystujących bibliotekę PolarSSL.
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%undos ChangeLog
 
 %build
 install -d build
@@ -81,17 +75,27 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc ChangeLog
 %attr(755,root,root) %{_libdir}/libpolarssl.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpolarssl.so.1
+%attr(755,root,root) %ghost %{_libdir}/libpolarssl.so.2
 %dir %{_libdir}/%{name}
 %attr(755,root,root) %{_libdir}/%{name}/aescrypt2
 %attr(755,root,root) %{_libdir}/%{name}/benchmark
 %attr(755,root,root) %{_libdir}/%{name}/cert_app
+%attr(755,root,root) %{_libdir}/%{name}/crl_app
+%attr(755,root,root) %{_libdir}/%{name}/crypt_and_hash
 %attr(755,root,root) %{_libdir}/%{name}/dh_client
 %attr(755,root,root) %{_libdir}/%{name}/dh_genprime
 %attr(755,root,root) %{_libdir}/%{name}/dh_server
+%attr(755,root,root) %{_libdir}/%{name}/gen_entropy
+%attr(755,root,root) %{_libdir}/%{name}/gen_random_ctr_drbg
+%attr(755,root,root) %{_libdir}/%{name}/gen_random_havege
+%attr(755,root,root) %{_libdir}/%{name}/generic_sum
 %attr(755,root,root) %{_libdir}/%{name}/hello
+%attr(755,root,root) %{_libdir}/%{name}/key_app
 %attr(755,root,root) %{_libdir}/%{name}/md5sum
 %attr(755,root,root) %{_libdir}/%{name}/mpi_demo
+%attr(755,root,root) %{_libdir}/%{name}/o_p_test
+%attr(755,root,root) %{_libdir}/%{name}/rsa_decrypt
+%attr(755,root,root) %{_libdir}/%{name}/rsa_encrypt
 %attr(755,root,root) %{_libdir}/%{name}/rsa_genkey
 %attr(755,root,root) %{_libdir}/%{name}/rsa_sign
 %attr(755,root,root) %{_libdir}/%{name}/rsa_verify
@@ -101,11 +105,14 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/%{name}/ssl_cert_test
 %attr(755,root,root) %{_libdir}/%{name}/ssl_client1
 %attr(755,root,root) %{_libdir}/%{name}/ssl_client2
+%attr(755,root,root) %{_libdir}/%{name}/ssl_fork_server
+%attr(755,root,root) %{_libdir}/%{name}/ssl_mail_client
 %attr(755,root,root) %{_libdir}/%{name}/ssl_server
 %attr(755,root,root) %{_libdir}/%{name}/ssl_test
+%attr(755,root,root) %{_libdir}/%{name}/strerror
 
 %files devel
 %defattr(644,root,root,755)
-%doc include/apidoc/*
+%doc apidoc/*
 %attr(755,root,root) %{_libdir}/libpolarssl.so
 %{_includedir}/%{name}
diff --git a/cmake-doxygen.patch b/cmake-doxygen.patch
deleted file mode 100644
index de0c44f..0000000
--- a/cmake-doxygen.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-# HG changeset patch
-# Parent e7a2396134ad9dbe6355375f9864bfd9aa3725b7
-Add cmake target "apidoc" for creating doxygen API documentation
-
-Also include a minimal Doxyfile for creating include/apidoc/
-
-diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
---- a/include/CMakeLists.txt
-+++ b/include/CMakeLists.txt
-@@ -3,3 +3,7 @@
- INSTALL(FILES ${headers}
-         DESTINATION include/polarssl
-         PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
-+
-+ADD_CUSTOM_TARGET(apidoc
-+  COMMAND doxygen Doxyfile
-+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-diff --git a/include/Doxyfile b/include/Doxyfile
-new file mode 100644
---- /dev/null
-+++ b/include/Doxyfile
-@@ -0,0 +1,4 @@
-+PROJECT_NAME           = PolarSSL
-+INPUT                  = polarssl
-+HTML_OUTPUT            = apidoc
-+GENERATE_LATEX         = NO
diff --git a/cmake-shared.patch b/cmake-shared.patch
deleted file mode 100644
index 379d952..0000000
--- a/cmake-shared.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-# HG changeset patch
-# Parent 5c83e2e03294a759f45858fabfee29048252cd29
-Add cmake flag for building and using shared library
-
-Controlled with
-cmake -D USE_SHARED_POLARSSL_LIBRARY:BOOL=1 .
-
-diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
---- a/library/CMakeLists.txt
-+++ b/library/CMakeLists.txt
-@@ -1,4 +1,4 @@
--add_library(polarssl STATIC
-+set(src
-      aes.c
-      arc4.c
-      base64.c
-@@ -27,6 +27,17 @@
-      xtea.c
- )
- 
-+if(NOT USE_SHARED_POLARSSL_LIBRARY)
-+
-+add_library(polarssl STATIC ${src})
-+
-+else()
-+
-+ADD_LIBRARY(polarssl SHARED ${src})
-+SET_TARGET_PROPERTIES(polarssl PROPERTIES VERSION 1.0.0 SOVERSION 1)
-+
-+endif()
-+
- INSTALL(TARGETS polarssl
-         DESTINATION ${LIB_INSTALL_DIR}
-         PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
diff --git a/cmake-with-install.patch b/cmake-with-install.patch
deleted file mode 100644
index 472b805..0000000
--- a/cmake-with-install.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-# HG changeset patch
-# Parent 990e4de7fb3eae7574f898681ce605533402acdf
-Add cmake install targets
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -14,5 +14,6 @@
- include_directories(include/)
- 
- add_subdirectory(library)
-+add_subdirectory(include)
- add_subdirectory(tests)
- add_subdirectory(programs)
-diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
-new file mode 100644
---- /dev/null
-+++ b/include/CMakeLists.txt
-@@ -0,0 +1,5 @@
-+FILE(GLOB headers "polarssl/*.h")
-+
-+INSTALL(FILES ${headers}
-+        DESTINATION include/polarssl
-+        PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
-diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
---- a/library/CMakeLists.txt
-+++ b/library/CMakeLists.txt
-@@ -26,3 +26,7 @@
-      x509parse.c
-      xtea.c
- )
-+
-+INSTALL(TARGETS polarssl
-+        DESTINATION ${LIB_INSTALL_DIR}
-+        PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-diff --git a/programs/aes/CMakeLists.txt b/programs/aes/CMakeLists.txt
---- a/programs/aes/CMakeLists.txt
-+++ b/programs/aes/CMakeLists.txt
-@@ -1,2 +1,5 @@
- add_executable(aescrypt2 aescrypt2.c)
- target_link_libraries(aescrypt2 polarssl)
-+INSTALL(TARGETS aescrypt2
-+        DESTINATION "bin"
-+        PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-diff --git a/programs/hash/CMakeLists.txt b/programs/hash/CMakeLists.txt
---- a/programs/hash/CMakeLists.txt
-+++ b/programs/hash/CMakeLists.txt
-@@ -9,3 +9,7 @@
- 
- add_executable(sha2sum sha2sum.c)
- target_link_libraries(sha2sum polarssl)
-+
-+INSTALL(TARGETS hello md5sum sha1sum sha2sum
-+        DESTINATION "bin"
-+        PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-diff --git a/programs/pkey/CMakeLists.txt b/programs/pkey/CMakeLists.txt
---- a/programs/pkey/CMakeLists.txt
-+++ b/programs/pkey/CMakeLists.txt
-@@ -18,3 +18,7 @@
- 
- add_executable(rsa_verify rsa_verify.c)
- target_link_libraries(rsa_verify polarssl)
-+
-+INSTALL(TARGETS dh_client dh_genprime dh_server mpi_demo rsa_genkey rsa_sign rsa_verify
-+        DESTINATION "bin"
-+        PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-diff --git a/programs/ssl/CMakeLists.txt b/programs/ssl/CMakeLists.txt
---- a/programs/ssl/CMakeLists.txt
-+++ b/programs/ssl/CMakeLists.txt
-@@ -6,3 +6,8 @@
- 
- add_executable(ssl_server ssl_server.c)
- target_link_libraries(ssl_server polarssl)
-+
-+INSTALL(TARGETS ssl_client1 ssl_client2 ssl_server
-+        DESTINATION "bin"
-+        PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-+
-diff --git a/programs/test/CMakeLists.txt b/programs/test/CMakeLists.txt
---- a/programs/test/CMakeLists.txt
-+++ b/programs/test/CMakeLists.txt
-@@ -10,3 +10,6 @@
- add_executable(ssl_cert_test ssl_cert_test.c)
- target_link_libraries(ssl_cert_test polarssl)
- 
-+INSTALL(TARGETS selftest benchmark ssl_test ssl_cert_test
-+        DESTINATION "bin"
-+        PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-diff --git a/programs/x509/CMakeLists.txt b/programs/x509/CMakeLists.txt
---- a/programs/x509/CMakeLists.txt
-+++ b/programs/x509/CMakeLists.txt
-@@ -1,2 +1,5 @@
- add_executable(cert_app cert_app.c)
- target_link_libraries(cert_app polarssl)
-+INSTALL(TARGETS cert_app
-+        DESTINATION "bin"
-+        PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/polarssl.git/commitdiff/c6c41474f7b92f118c8580ac5c5c1a033e9ce1a7



More information about the pld-cvs-commit mailing list