RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [email protected] Module: rpm Date: 18-Dec-2009 01:38:42 Branch: HEAD Handle: 2009121800384200 Modified files: rpm/rpmio rpmdav.c Log: - ssl: permit building --without-neon (and --without-ssl) with static linking. Summary: Revision Changes Path 2.112 +4 -2 rpm/rpmio/rpmdav.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/rpmio/rpmdav.c ============================================================================ $ cvs diff -u -r2.111 -r2.112 rpmdav.c --- rpm/rpmio/rpmdav.c 6 Dec 2009 20:22:01 -0000 2.111 +++ rpm/rpmio/rpmdav.c 18 Dec 2009 00:38:42 -0000 2.112 @@ -168,8 +168,9 @@ void davDestroy(void) { -#ifdef NE_FEATURE_SSL +#if defined(NE_FEATURE_SSL) if (ne_has_support(NE_FEATURE_SSL)) { +#if defined(WITH_OPENSSL) /* XXX FIXME: hard AutoFu to get right. */ /* XXX http://www.nabble.com/Memory-Leaks-in-SSL_Library_init()-t3431875.html */ ENGINE_cleanup(); CRYPTO_cleanup_all_ex_data(); @@ -178,8 +179,9 @@ EVP_cleanup(); CRYPTO_mem_leaks(NULL); CONF_modules_unload(1); +#endif /* WITH_OPENSSL */ } -#endif +#endif /* NE_FEATURE_SSL */ if (_dav_debug < 0) fprintf(stderr, "*** davDestroy()\n"); } @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
