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: 21-Aug-2008 05:39:25
Branch: rpm-5_1 Handle: 2008082103392401
Modified files: (Branch: rpm-5_1)
rpm CHANGES devtool.conf
rpm/rpmio rpmdav.c
Log:
- don't attempt openssl memleak cleanup w/o openssl.
- WR: add devtool windriver-{host,target} configuration targets.
Summary:
Revision Changes Path
1.2288.2.96 +2 -0 rpm/CHANGES
2.205.2.14 +56 -19 rpm/devtool.conf
2.71.2.2 +4 -0 rpm/rpmio/rpmdav.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2288.2.95 -r1.2288.2.96 CHANGES
--- rpm/CHANGES 21 Aug 2008 02:25:19 -0000 1.2288.2.95
+++ rpm/CHANGES 21 Aug 2008 03:39:24 -0000 1.2288.2.96
@@ -1,4 +1,6 @@
5.1.4 -> 5.1.5:
+ - jbj: don't attempt openssl memleak cleanup w/o openssl.
+ - jbj: WR: add devtool windriver-{host,target} configuration targets.
- jbj: adopt AM_PATH_PYTHON AutoFu variables. AM_PATH_PYTHON will be
used eventually.
- jbj: python: simplify Makefile.am
- afb: check that crc32_combine/adler32_combine really exist, for murky
old
@@ .
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
============================================================================
$ cvs diff -u -r2.205.2.13 -r2.205.2.14 devtool.conf
--- rpm/devtool.conf 19 Aug 2008 15:40:41 -0000 2.205.2.13
+++ rpm/devtool.conf 21 Aug 2008 03:39:24 -0000 2.205.2.14
@@ -133,41 +133,78 @@
--with-popt \
[EMAIL PROTECTED]
-%windriver
+%windriver-host
RPM_VENDOR_WINDRIVER=1
export RPM_VENDOR_WINDRIVER
%checkout
%autogen
%configure \
--prefix=/usr \
- --verbose \
+ --with-path-lib=/usr/lib/rpm \
+ --with-python-lib-dir=/usr/lib/python2.5 \
+ --disable-nls \
+ --with-libelf \
+ --without-selinux \
+ --without-perl \
+ --with-python=2.5 \
+ --with-zlib=external \
+ --with-bzip2=external \
+ --with-beecrypt=external \
+ --without-neon \
+ --with-file=internal \
+ --with-popt=external \
+ --with-sqlite=external \
+ --with-dbapi=sqlite \
--with-db=internal \
+ --with-lua=internal \
+ --without-apidocs \
+
--with-path-macros='%{_usrlibrpm}/5.0/macros:%{_usrlibrpm}/5.0/wrs/macros:%{_usrlibrpm}/5.0/wrs/%{_target}/macros:~/.wrsrpmmacros'
\
+ [EMAIL PROTECTED] \
+ --verbose \
--with-db-tools-integrated \
- --with-zlib \
- --with-bzip2=external \
+ --with-pcre \
--without-lzma \
+ --without-openssl \
+ --without-nss \
+ --without-gcrypt \
+ --without-uuid \
+ --without-xar \
+ --without-keyutils
+
+%windriver-target
+ RPM_VENDOR_WINDRIVER=1
+ export RPM_VENDOR_WINDRIVER
+ %checkout
+ %autogen
+ %configure \
+ --prefix=/usr \
+ --disable-nls \
+ --with-libelf \
+ --with-selinux \
+ --with-perl \
+ --with-python=2.5 \
+ --with-zlib=external \
+ --with-bzip2=external \
+ --with-beecrypt=external \
+ --with-neon \
--with-file=internal \
- --with-lua=internal \
+ --with-popt=external \
--with-sqlite=external \
- --with-beecrypt=external \
+ --with-db=internal \
+ --with-lua=internal \
+ --without-apidocs \
+
--with-path-macros='%{_usrlibrpm}/5.0/macros:%{_usrlibrpm}/5.0/wrs/macros:%{_usrlibrpm}/5.0/wrs/default-linux/macros:%{_usrlibrpm}/5.0/wrs/%{_target}/macros:%{_etcrpm}/macros.*:%{_etcrpm}/macros:%{_etcrpm}/%{_target}/macros:~/.wrsrpmmacros'
\
+ [EMAIL PROTECTED] \
+ --verbose \
+ --with-db-tools-integrated \
+ --with-pcre \
+ --without-lzma \
--without-openssl \
--without-nss \
--without-gcrypt \
- --without-neon \
- --with-pcre \
--without-uuid \
--without-xar \
- --with-popt=external \
- --with-keyutils=external \
- --with-libelf \
- --without-selinux \
- --with-python \
- --without-perl \
- --disable-nls \
- --with-dbapi=sqlite \
- --without-apidocs \
- --with-path-macros=... \
- [EMAIL PROTECTED]
+ --without-keyutils
%rse
%standalone
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmdav.c
============================================================================
$ cvs diff -u -r2.71.2.1 -r2.71.2.2 rpmdav.c
--- rpm/rpmio/rpmdav.c 19 Jun 2008 15:36:16 -0000 2.71.2.1
+++ rpm/rpmio/rpmdav.c 21 Aug 2008 03:39:25 -0000 2.71.2.2
@@ -26,6 +26,7 @@
#include "ne_utils.h"
#if !defined(HEADER_ERR_H)
+#if defined(WITH_OPENSSL)
/* cheats to avoid having to explicitly build against OpenSSL */
/[EMAIL PROTECTED]@*/
extern void ERR_remove_state(int foo);
@@ -37,6 +38,7 @@
extern void CRYPTO_mem_leaks(void * ptr);
/[EMAIL PROTECTED]@*/
#endif
+#endif
#include "ne_md5.h" /* for version detection only */
@@ -304,6 +306,7 @@
void davDestroy(void)
{
#ifdef NE_FEATURE_SSL
+#if defined(WITH_OPENSSL)
if (ne_has_support(NE_FEATURE_SSL)) {
/* XXX
http://www.nabble.com/Memory-Leaks-in-SSL_Library_init()-t3431875.html */
ENGINE_cleanup();
@@ -315,6 +318,7 @@
CONF_modules_unload(1);
}
#endif
+#endif
}
int davFree(urlinfo u)
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
