Author: glen Date: Sat Apr 16 17:24:46 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- new, from fedora package
---- Files affected:
packages/polarssl:
cmake-doxygen.patch (NONE -> 1.1) (NEW), cmake-shared.patch (NONE -> 1.1)
(NEW), cmake-with-install.patch (NONE -> 1.1) (NEW), polarssl.spec (NONE ->
1.1) (NEW)
---- Diffs:
================================================================
Index: packages/polarssl/cmake-doxygen.patch
diff -u /dev/null packages/polarssl/cmake-doxygen.patch:1.1
--- /dev/null Sat Apr 16 19:24:46 2011
+++ packages/polarssl/cmake-doxygen.patch Sat Apr 16 19:24:41 2011
@@ -0,0 +1,26 @@
+# 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
================================================================
Index: packages/polarssl/cmake-shared.patch
diff -u /dev/null packages/polarssl/cmake-shared.patch:1.1
--- /dev/null Sat Apr 16 19:24:46 2011
+++ packages/polarssl/cmake-shared.patch Sat Apr 16 19:24:41 2011
@@ -0,0 +1,34 @@
+# 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)
================================================================
Index: packages/polarssl/cmake-with-install.patch
diff -u /dev/null packages/polarssl/cmake-with-install.patch:1.1
--- /dev/null Sat Apr 16 19:24:46 2011
+++ packages/polarssl/cmake-with-install.patch Sat Apr 16 19:24:41 2011
@@ -0,0 +1,97 @@
+# 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)
================================================================
Index: packages/polarssl/polarssl.spec
diff -u /dev/null packages/polarssl/polarssl.spec:1.1
--- /dev/null Sat Apr 16 19:24:46 2011
+++ packages/polarssl/polarssl.spec Sat Apr 16 19:24:41 2011
@@ -0,0 +1,108 @@
+# $Revision$, $Date$
+Summary: Light-weight cryptographic and SSL/TLS library
+Name: polarssl
+Version: 0.14.3
+Release: 1
+License: GPL v2+
+Group: Libraries
+URL: http://www.polarssl.org/
+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
+BuildRequires: cmake
+BuildRequires: doxygen
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+PolarSSL is a light-weight open source cryptographic and SSL/TLS
+library written in C. PolarSSL makes it easy for developers to include
+cryptographic and SSL/TLS capabilities in their (embedded)
+applications with as little hassle as possible.
+
+%package devel
+Summary: Development files for PolarSSL
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+This package contains libraries and header files for developing
+applications that use PolarSSL
+
+%prep
+%setup -q
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%undos ChangeLog
+
+%build
+install -d build
+cd build
+%cmake .. \
+ -DUSE_SHARED_POLARSSL_LIBRARY:BOOL=1
+%{__make} VERBOSE=1
+%{__make} VERBOSE=1 apidoc
+
+%if %{with tests}
+# Tests are not stable on 64-bit
+ctest --output-on-failure
+%endif
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%{__make} install \
+ -C build \
+ DESTDIR=$RPM_BUILD_ROOT
+
+install -d $RPM_BUILD_ROOT%{_libdir}
+mv $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_libdir}/%{name}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(644,root,root,755)
+%doc ChangeLog
+%attr(755,root,root) %{_libdir}/libpolarssl.so.*.*.*
+%ghost %{_libdir}/libpolarssl.so.1
+%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}/dh_client
+%attr(755,root,root) %{_libdir}/%{name}/dh_genprime
+%attr(755,root,root) %{_libdir}/%{name}/dh_server
+%attr(755,root,root) %{_libdir}/%{name}/hello
+%attr(755,root,root) %{_libdir}/%{name}/md5sum
+%attr(755,root,root) %{_libdir}/%{name}/mpi_demo
+%attr(755,root,root) %{_libdir}/%{name}/rsa_genkey
+%attr(755,root,root) %{_libdir}/%{name}/rsa_sign
+%attr(755,root,root) %{_libdir}/%{name}/rsa_verify
+%attr(755,root,root) %{_libdir}/%{name}/selftest
+%attr(755,root,root) %{_libdir}/%{name}/sha1sum
+%attr(755,root,root) %{_libdir}/%{name}/sha2sum
+%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_server
+%attr(755,root,root) %{_libdir}/%{name}/ssl_test
+
+%files devel
+%defattr(644,root,root,755)
+%doc include/apidoc/*
+%{_libdir}/libpolarssl.so
+%{_includedir}/%{name}
+
+%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
+%changelog
+* %{date} PLD Team <[email protected]>
+All persons listed below can be reached at <cvs_login>@pld-linux.org
+
+$Log$
+Revision 1.1 2011/04/16 17:24:41 glen
+- new, from fedora package
================================================================
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
