RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 27-Feb-2012 02:19:52
Branch: rpm-5_4 Handle: 2012022701195100
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac devtool.conf
Log:
- macosx: permit (custom built) libtomcrypt in buildbot's.
Summary:
Revision Changes Path
1.3501.2.213+1 -0 rpm/CHANGES
2.472.2.41 +2 -1 rpm/configure.ac
2.365.2.20 +2 -2 rpm/devtool.conf
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.212 -r1.3501.2.213 CHANGES
--- rpm/CHANGES 23 Feb 2012 23:13:45 -0000 1.3501.2.212
+++ rpm/CHANGES 27 Feb 2012 01:19:51 -0000 1.3501.2.213
@@ -1,4 +1,5 @@
5.4.6 -> 5.4.7:
+ - jbj: macosx: permit (custom built) libtomcrypt in buildbot's.
- jbj: devtool: stanza for Fedorable 16.
- jbj: autofu: fix: F16 can't find db.h because of ${includdir}
expansion.
- jbj: tests: revert RPMRC_NOSIG to keep the buildbot waterfall green.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.472.2.40 -r2.472.2.41 configure.ac
--- rpm/configure.ac 26 Feb 2012 23:26:40 -0000 2.472.2.40
+++ rpm/configure.ac 27 Feb 2012 01:19:51 -0000 2.472.2.41
@@ -1375,7 +1375,8 @@
[tomcrypt], [ltc_init_multi], [tomcrypt/tomcrypt_cfg.h],
[no,external:none], [],
[ AC_DEFINE(WITH_TOMCRYPT, 1, [Define if building with LibTomCrypt])
- CPPFLAGS="$CPPFLAGS -I${includedir}/tomcrypt -I${includedir}/tommath"
+ CPPFLAGS="$CPPFLAGS -DLTM_DESC -I${includedir}/tomcrypt
-I${includedir}/tommath"
+ LIBS="$LIBS -ltommath"
], [])
dnl # IBM TPM 1.2 software emulation
@@ .
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
============================================================================
$ cvs diff -u -r2.365.2.19 -r2.365.2.20 devtool.conf
--- rpm/devtool.conf 26 Feb 2012 00:23:57 -0000 2.365.2.19
+++ rpm/devtool.conf 27 Feb 2012 01:19:51 -0000 2.365.2.20
@@ -220,7 +220,7 @@
--with-gcrypt \
--without-tomcrypt \
--without-tpm \
- --without-libtasn1 \
+ --with-libtasn1 \
--without-pakchois \
--without-gnutls \
--with-neon=external \
@@ -283,7 +283,7 @@
--with-openssl \
--with-nss \
--with-gcrypt \
- --without-tomcrypt \
+ --with-tomcrypt \
--without-tpm \
--without-libtasn1 \
--without-pakchois \
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
