[Erp5-report] r41972 kazuhiko - in /erp5/trunk/buildout: software-profiles/ tests/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Tue Jan  4 05:50:31 2011
New Revision: 41972

URL: http://svn.erp5.org?rev=41972&view=rev
Log:
link with our own zlib. disable libwrap.

Modified:
    erp5/trunk/buildout/software-profiles/stunnel.cfg
    erp5/trunk/buildout/tests/assertSoftware.py

Modified: erp5/trunk/buildout/software-profiles/stunnel.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/stunnel.cfg?rev=41972&r1=41971&r2=41972&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/stunnel.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/stunnel.cfg [utf8] Tue Jan  4 05:50:31 2011
@@ -22,6 +22,8 @@ md5sum = bbd274e8364ea3ceca0ee5190e13edd
 pre-configure-hook = ${stunnel-4-hook-download:location}/${stunnel-4-hook-download:filename}:pre_configure_hook
 configure-options =
   --enable-ipv6
+  --disable-libwrap
   --with-ssl=${openssl:location}
 environment =
-  LDFLAGS=-Wl,-rpath -Wl,${openssl:location}/lib
+  CPPFLAGS=-I${zlib:location}/include
+  LDFLAGS=-Wl,-rpath -Wl,${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib

Modified: erp5/trunk/buildout/tests/assertSoftware.py
URL: http://svn.erp5.org/erp5/trunk/buildout/tests/assertSoftware.py?rev=41972&r1=41971&r2=41972&view=diff
==============================================================================
--- erp5/trunk/buildout/tests/assertSoftware.py [utf8] (original)
+++ erp5/trunk/buildout/tests/assertSoftware.py [utf8] Tue Jan  4 05:50:31 2011
@@ -2156,6 +2156,37 @@ class AssertM4(AssertSoftwareMixin):
       ], [
       ])
 
+class AssertStunnel(AssertSoftwareMixin):
+  def test_ld_stunnel(self):
+    self.assertLibraryList('parts/stunnel/bin/stunnel', [
+      'libc',
+      'libcrypto',
+      'libdl',
+      'libnsl',
+      'libpthread',
+      'libssl',
+      'libutil',
+      'libz',
+      ], [
+      'openssl',
+      'zlib',
+      ])
+
+  def test_ld_libstunnel(self):
+    self.assertLibraryList('parts/stunnel/lib/stunnel/libstunnel.so', [
+      'libc',
+      'libcrypto',
+      'libdl',
+      'libnsl',
+      'libpthread',
+      'libssl',
+      'libutil',
+      'libz',
+      ], [
+      'openssl',
+      'zlib',
+      ])
+
 # tests for Zope-2.12 buildout only
 if python_version >= '2.6':
   class AssertPython26(AssertSoftwareMixin):